diff --git a/.gitattributes b/.gitattributes index bc973be0..48b1085c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,9 +10,8 @@ *.2bpp binary *.1bpp binary *.rle binary -*.tilecoll binary *.bst binary -*.map binary +*.tilemap binary *.wav binary *.blk binary *.pic binary diff --git a/.gitignore b/.gitignore index e2a884db..8643ec14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,30 @@ -# precompiled python -*.pyc - -# compiled object file +# compiled objects *.o -# no binaries -*.exe +# compiled graphics +*.1bpp +*.2bpp +*.pic -# roms +# compiled roms *.gbc *.gb # rgbds extras +*.map *.sym -# converted image data -*.2bpp -*.1bpp -*.pic +# tool binaries +*.exe -# swap files for vim -.*.swp +# precompiled python +*.pyc +*$py.class -# no data from extras/ -*.json - -# for any of the poor souls with save game files in their working directory +# save game files *.sgm *.sav -*.sys - -# for vim configuration -# url: http://www.vim.org/scripts/script.php?script_id=441 -.lvimrc +*.rtc +*.sn* +*.sa* +*.sg1 diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29b..00000000 diff --git a/.travis.yml b/.travis.yml index d3cce374..0d3b9f7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: c +os: + - linux + - osx install: - |- - path="$(pwd)"; cd; - wget https://github.com/rednex/rgbds/archive/v0.3.3.tar.gz -O rgbds.tar.gz && - tar xf rgbds.tar.gz && - cd rgbds-0.3.3 && - sudo make install && - cd - && - rm -rf rgbds && - cd "$path" + ( 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() { @@ -19,6 +19,10 @@ before_script: fi; } script: - - make -j2 - - make compare + - 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 diff --git a/.travis/webhook.sh b/.travis/webhook.sh new file mode 100755 index 00000000..e50f3c29 --- /dev/null +++ b/.travis/webhook.sh @@ -0,0 +1,15 @@ +#!/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 diff --git a/INSTALL.md b/INSTALL.md index c708a013..57c9e987 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,60 +1,154 @@ -# Linux +# Instructions - sudo apt-get install make git gcc +These instructions explain how to set up the tools required to build **pokered**, including [**rgbds**](https://github.com/gbdev/rgbds), which assembles the source files into a ROM. - sudo apt-get install byacc flex pkg-config libpng-dev - git clone https://github.com/rednex/rgbds - cd rgbds - sudo make install - cd .. - - git clone https://github.com/pret/pokered - cd pokered - -To build **pokered.gbc** and **pokeblue.gbc**: - - make - -To build them individually: - - make red - make blue +If you run into trouble, ask for help on IRC or Discord (see [README.md](README.md)). -# Mac +## Windows 10 -Get [**Homebrew**](http://brew.sh/). +Download and install [**Windows Subsystem for Linux**](https://docs.microsoft.com/en-us/windows/wsl/install-win10). Then open the **WSL terminal**. -Then in **Terminal**, run: +Update WSL's software before continuing. If you chose Debian, Ubuntu, or another distribution that uses `apt-get`, then enter this command: - xcode-select --install - brew install rgbds +```bash +apt-get update && apt-get upgrade +``` - git clone https://github.com/pret/pokered - cd pokered +WSL has its own file system that's not accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to install pokered within Windows. You'll have to change the **current working directory** every time you open WSL. -To build **pokered.gbc** and **pokeblue.gbc**: +For example, if you want to store pokered in **C:\Users\\*\*\Desktop**, enter this command: - make +```bash +cd /mnt/c/Users//Desktop +``` + +(The Windows `C:\` drive is called `/mnt/c/` in WSL. Replace *\* in the example path with your username.) + +If this works, then follow [the instructions for **Linux**](#linux) below for whatever distribution you installed for WSL. + +Otherwise, continue reading below for [the older Windows instructions](#windows). -# Windows +## Windows Download [**Cygwin**](http://cygwin.com/install.html): **setup-x86_64.exe** for 64-bit Windows, **setup-x86.exe** for 32-bit. -Run setup and leave the default settings. At "Select Packages", choose to install the following: +Run setup and leave the default settings. At the "**Select Packages**" step, choose to install the following, all of which are in the "**Devel**" category: - `make` - `git` - `gcc-core` -Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.tar.gz** or **win32.tar.gz** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**. +Double click on the text that says "**Skip**" next to each package to select the most recent version to install. -In the **Cygwin terminal**, enter these commands: +Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.4.2**. - git clone https://github.com/pret/pokered - cd pokered +**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. + +Now open the **Cygwin terminal** and enter the following commands. + +Cygwin has its own file system that's within Windows, at **C:\cygwin64\home\\*\***. If you don't want to store pokered there, you'll have to change the **current working directory** every time you open Cygwin. + +For example, if you want to store pokered in **C:\Users\\*\*\Desktop**: + +```bash +cd /cygdrive/c/Users//Desktop +``` + +(The Windows `C:\` drive is called `/cygdrive/c/` in Cygwin. Replace *\* in the example path with your username.) + +Now you're ready to [build **pokered**](#build-pokered). + + +## macOS + +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**. + +Now you're ready to [build **pokered**](#build-pokered). + + +## Linux + +Open **Terminal** and enter the following commands, depending on which distro you're using. + +### Debian or Ubuntu + +To install the software required for **pokered**: + +```bash +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. + +### OpenSUSE + +To install the software required for **pokered**: + +```bash +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. + +### Arch Linux + +To install the software required for **pokered**: + +```bash +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**. + +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. + +### Termux + +To install the software required for **pokered**: + +```bash +sudo apt install make clang git sed +``` + +To install **rgbds**: + +```bash +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. + +### Other distros + +If your distro is not listed here, try to find the required software in its repositories: + +- `make` +- `gcc` (or `clang`) +- `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. + +Now you're ready to [build **pokered**](#build-pokered). + + +## Build pokered + +To download the **pokered** source files: + +```bash +git clone https://github.com/pret/pokered +cd pokered +``` To build **pokered.gbc** and **pokeblue.gbc**: - make +```bash +make +``` diff --git a/Makefile b/Makefile index 04a08e05..6d432ec9 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,28 @@ -roms := pokered.gbc pokeblue.gbc +roms := pokered.gbc pokeblue.gbc pokeblue_debug.gbc -pokered_obj := audio_red.o main_red.o text_red.o wram_red.o -pokeblue_obj := audio_blue.o main_blue.o text_blue.o wram_blue.o +rom_obj := \ +audio.o \ +home.o \ +main.o \ +maps.o \ +text.o \ +wram.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) ### Build tools -MD5 := md5sum -c +ifeq (,$(shell which sha1sum)) +SHA1 := shasum +else +SHA1 := sha1sum +endif RGBDS ?= RGBASM ?= $(RGBDS)rgbasm @@ -21,67 +37,101 @@ RGBLINK ?= $(RGBDS)rgblink .SECONDEXPANSION: .PRECIOUS: .SECONDARY: -.PHONY: all red blue clean tidy compare tools +.PHONY: all red blue blue_debug clean tidy compare tools all: $(roms) -red: pokered.gbc -blue: pokeblue.gbc +red: pokered.gbc +blue: pokeblue.gbc +blue_debug: pokeblue_debug.gbc -# For contributors to make sure a change didn't affect the contents of the rom. -compare: $(roms) - @$(MD5) roms.md5 - -clean: - rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) - find . \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -exec rm {} + - $(MAKE) clean -C tools/ +clean: tidy + find gfx \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -delete tidy: - rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(roms:.gbc=.sym) + rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(pokeblue_debug_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o $(MAKE) clean -C tools/ +compare: $(roms) + @$(SHA1) -c roms.sha1 + tools: $(MAKE) -C tools/ +RGBASMFLAGS = -h -L -Weverything +# Create a sym/map for debug purposes if `make` run with `DEBUG=1` +ifeq ($(DEBUG),1) +RGBASMFLAGS += -E +endif + +$(pokered_obj): RGBASMFLAGS += -D _RED +$(pokeblue_obj): RGBASMFLAGS += -D _BLUE +$(pokeblue_debug_obj): RGBASMFLAGS += -D _BLUE -D _DEBUG + +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 tools,$(MAKECMDGOALS))) +ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS))) + $(info $(shell $(MAKE) -C tools)) + +# 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)))) + endif %.asm: ; -%_red.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) -$(pokered_obj): %_red.o: %.asm $$(dep) - $(RGBASM) -D _RED -h -o $@ $*.asm -%_blue.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) -$(pokeblue_obj): %_blue.o: %.asm $$(dep) - $(RGBASM) -D _BLUE -h -o $@ $*.asm +pokered_pad = 0x00 +pokeblue_pad = 0x00 +pokeblue_debug_pad = 0xff -pokered_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON RED" -pokeblue_opt = -jsv -k 01 -l 0x33 -m 0x13 -p 0 -r 03 -t "POKEMON BLUE" +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" -%.gbc: $$(%_obj) - $(RGBLINK) -d -n $*.sym -l pokered.link -o $@ $^ - $(RGBFIX) $($*_opt) $@ - sort $*.sym -o $*.sym +%.gbc: $$(%_obj) layout.link + $(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^) + $(RGBFIX) -p $($*_pad) $($*_opt) $@ ### Misc file-specific graphics rules -gfx/blue/intro_purin_1.2bpp: $(RGBGFX) += -h -gfx/blue/intro_purin_2.2bpp: $(RGBGFX) += -h -gfx/blue/intro_purin_3.2bpp: $(RGBGFX) += -h -gfx/red/intro_nido_1.2bpp: $(RGBGFX) += -h -gfx/red/intro_nido_2.2bpp: $(RGBGFX) += -h -gfx/red/intro_nido_3.2bpp: $(RGBGFX) += -h +gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace +gfx/battle/attack_anim_2.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/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76 + +gfx/credits/the_end.2bpp: tools/gfx += --interleave --png=$< + +gfx/slots/red_slots_1.2bpp: tools/gfx += --trim-whitespace +gfx/slots/blue_slots_1.2bpp: tools/gfx += --trim-whitespace -gfx/game_boy.2bpp: tools/gfx += --remove-duplicates -gfx/theend.2bpp: tools/gfx += --interleave --png=$< gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace +gfx/tilesets/reds_house.2bpp: tools/gfx += --preserve=0x48 + +gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates ### Catch-all graphics rules @@ -94,9 +144,9 @@ gfx/tilesets/%.2bpp: tools/gfx += --trim-whitespace tools/gfx $(tools/gfx) -o $@ $@) %.1bpp: %.png - $(RGBGFX) -d1 $(rgbgfx) -o $@ $< + $(RGBGFX) $(rgbgfx) -d1 -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) -%.pic: %.2bpp +%.pic: %.2bpp tools/pkmncompress $< $@ diff --git a/README.md b/README.md index af6868d1..78fab5ca 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,31 @@ -# Pokémon Red and Blue +# Pokémon Red and Blue [![Build Status][travis-badge]][travis] This is a disassembly of Pokémon Red and Blue. -It builds the following roms: +It builds the following ROMs: -* Pokemon Red (UE) [S][!].gb `md5: 3d45c1ee9abd5738df46d2bdda8b57dc` -* Pokemon Blue (UE) [S][!].gb `md5: 50927e843568814f7ed45ec4f944bd8b` +- Pokemon Red (UE) [S][!].gb `sha1: ea9bcae617fdf159b045185467ae58b2e4a48b9a` +- Pokemon Blue (UE) [S][!].gb `sha1: d7037c83e1ae5b39bde3c30787637ba1d4c48ce2` +- BLUEMONS.GB (debug build) `sha1: 5b1456177671b79b263c614ea0e7cc9ac542e9c4` To set up the repository, see [**INSTALL.md**](INSTALL.md). ## See also -* Disassembly of [**Pokémon Yellow**][pokeyellow] -* Disassembly of [**Pokémon Gold**][pokegold] -* Disassembly of [**Pokémon Crystal**][pokecrystal] -* Disassembly of [**Pokémon Pinball**][pokepinball] -* Disassembly of [**Pokémon TCG**][poketcg] -* Disassembly of [**Pokémon Ruby**][pokeruby] -* Disassembly of [**Pokémon Fire Red**][pokefirered] -* Disassembly of [**Pokémon Emerald**][pokeemerald] -* Discord: [**pret**][Discord] -* irc: **irc.freenode.net** [**#pret**][irc] +- **Discord:** [pret][discord] +- **IRC:** [freenode#pret][irc] + +Other disassembly projects: + +- [**Pokémon Yellow**][pokeyellow] +- [**Pokémon Gold/Silver**][pokegold] +- [**Pokémon Crystal**][pokecrystal] +- [**Pokémon Pinball**][pokepinball] +- [**Pokémon TCG**][poketcg] +- [**Pokémon Ruby**][pokeruby] +- [**Pokémon FireRed**][pokefirered] +- [**Pokémon Emerald**][pokeemerald] [pokeyellow]: https://github.com/pret/pokeyellow [pokegold]: https://github.com/pret/pokegold @@ -31,5 +35,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md). [pokeruby]: https://github.com/pret/pokeruby [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald -[Discord]: https://discord.gg/6EuWgX9 +[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 diff --git a/audio.asm b/audio.asm index cb207997..2a3258c2 100644 --- a/audio.asm +++ b/audio.asm @@ -1,21 +1,20 @@ INCLUDE "constants.asm" -INCLUDE "crysmacros.asm" +INCLUDE "crysaudio/macros.asm" INCLUDE "crysaudio/audio_constants.asm" INCLUDE "crysaudio/cry_constants.asm" -SECTION "Sound Effect Headers 1", ROMX ; BANK $02 +SECTION "Sound Effect Headers 1", ROMX INCLUDE "audio/headers/sfxheaders1.asm" -SECTION "Sound Effect Headers 2", ROMX ; BANK $08 +SECTION "Sound Effect Headers 2", ROMX INCLUDE "audio/headers/sfxheaders2.asm" -SECTION "Sound Effect Headers 3", ROMX ; BANK $1f +SECTION "Sound Effect Headers 3", ROMX INCLUDE "audio/headers/sfxheaders3.asm" -SECTION "Sound Effects 1", ROMX ; BANK $02 +SECTION "Sound Effects 1", ROMX -SFX_02: INCLUDE "audio/sfx/get_item1_1.asm" INCLUDE "audio/sfx/get_item2_1.asm" INCLUDE "audio/sfx/tink_1.asm" @@ -55,9 +54,8 @@ INCLUDE "audio/sfx/save_1.asm" INCLUDE "audio/sfx/pokeflute.asm" INCLUDE "audio/sfx/safari_zone_pa.asm" -SECTION "Sound Effects 2", ROMX ; BANK $08 +SECTION "Sound Effects 2", ROMX -SFX_08: INCLUDE "audio/sfx/level_up.asm" INCLUDE "audio/sfx/ball_toss.asm" INCLUDE "audio/sfx/ball_poof.asm" @@ -115,9 +113,8 @@ INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_36.asm" INCLUDE "audio/sfx/silph_scope.asm" -SECTION "Sound Effects 3", ROMX ; BANK $1f +SECTION "Sound Effects 3", ROMX -SFX_1F: INCLUDE "audio/sfx/intro_lunge.asm" INCLUDE "audio/sfx/intro_hip.asm" INCLUDE "audio/sfx/intro_hop.asm" @@ -130,128 +127,19 @@ INCLUDE "audio/sfx/slots_new_spin.asm" INCLUDE "audio/sfx/shooting_star.asm" -SECTION "Bill's PC", ROMX -INCLUDE "engine/menu/bills_pc.asm" - SECTION "Music Routines", ROMX -PlayBattleMusic:: - xor a - ld [wAudioFadeOutControl], a - ld [wLowHealthAlarm], a - ld [wMusicFade], a - dec a - ld [wNewSoundID], a - call PlayMusic ; stop music - call DelayFrame - ;ld c, BANK(Music_GymLeaderBattle) - ld a, [wGymLeaderNo] - and a - jr z, .notGymLeaderBattle - ld a, MUSIC_GYM_LEADER_BATTLE - jr .playSong -.notGymLeaderBattle - ld a, [wCurOpponent] - cp 200 - jr c, .wildBattle - cp OPP_SONY3 - jr z, .finalBattle - cp OPP_LANCE - jr nz, .normalTrainerBattle - ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme - jr .playSong -.normalTrainerBattle - ld a, MUSIC_TRAINER_BATTLE - jr .playSong -.finalBattle - ld a, MUSIC_FINAL_BATTLE - jr .playSong -.wildBattle - ld a, MUSIC_WILD_BATTLE -.playSong - jp PlayMusic + +INCLUDE "audio/play_battle_music.asm" + SECTION "Alt Music Routines", ROMX -; an alternate start for MeetRival which has a different first measure -Music_RivalAlternateStart:: - ld a, MUSIC_MEET_RIVAL - jp PlayMusic - ;ld hl, wChannelCommandPointers - ;ld de, Music_MeetRival_branch_b1a2 - ;call Audio1_OverwriteChannelPointer - ;ld de, Music_MeetRival_branch_b21d - ;call Audio1_OverwriteChannelPointer - ;ld de, Music_MeetRival_branch_b2b5 -; an alternate tempo for MeetRival which is slightly slower -Music_RivalAlternateTempo:: - ld c, BANK(Music_MeetRival) - ld a, MUSIC_MEET_RIVAL - jp PlayMusic - ;ld hl, wChannelCommandPointers - ;ld de, Music_MeetRival_branch_b119 - ;jp Audio1_OverwriteChannelPointer +INCLUDE "audio/alternate_tempo.asm" -; applies both the alternate start and alternate tempo -Music_RivalAlternateStartAndTempo:: - jp Music_RivalAlternateStart - ;ld hl, wChannelCommandPointers - ;ld de, Music_MeetRival_branch_b19b - ;jp Audio1_OverwriteChannelPointer - -; an alternate tempo for Cities1 which is used for the Hall of Fame room -Music_Cities1AlternateTempo:: - ld a, 10 - ld [wAudioFadeOutCounterReloadValue], a - ld [wAudioFadeOutCounter], a - ld a, $ff ; stop playing music after the fade-out is finished - ld [wAudioFadeOutControl], a - ld c, 100 - call DelayFrames ; wait for the fade-out to finish - ld c, BANK(Music_Cities1) - ld a, MUSIC_CITIES1 - jp PlayMusic - ;ld hl, wChannelCommandPointers - ;ld de, Music_Cities1_branch_aa6f - ;jp Audio1_OverwriteChannelPointer SECTION "Pokedex Rating SFX Routines", ROMX -PlayPokedexRatingSfx:: - ld a, [$ffdc] - ld c, $0 - ld hl, OwnedMonValues -.getSfxPointer - cp [hl] - jr c, .gotSfxPointer - inc c - inc hl - jr .getSfxPointer -.gotSfxPointer - push bc - ld a, $ff - ld [wNewSoundID], a - call PlaySoundWaitForCurrent - pop bc - ld b, $0 - ld hl, PokedexRatingSfxPointers - add hl, bc - add hl, bc - ld a, [hli] - ld c, [hl] - call PlaySound - call WaitForSoundToFinish - jp PlayDefaultMusic -PokedexRatingSfxPointers: - db SFX_DENIED, BANK(SFX_Denied_1) - db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) - db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) - db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) - db SFX_LEVEL_UP, BANK(SFX_Level_Up) - db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) - db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) - -OwnedMonValues: - db 10, 40, 60, 90, 120, 150, $ff +INCLUDE "audio/pokedex_rating_sfx.asm" ; crystal: @@ -339,8 +227,9 @@ SECTION "Songs 4", ROMX inc_section "crysaudio/music/viridiancity.asm" inc_section "crysaudio/music/celadoncity.asm" - inc_section "crysaudio/music/wildpokemonvictory.asm" - inc_section "crysaudio/music/successfulcapture.asm" +SECTION "Wild Pokemon Victory and Successful Capture", ROMX + INCLUDE "crysaudio/music/wildpokemonvictory.asm" + INCLUDE "crysaudio/music/successfulcapture.asm" inc_section "crysaudio/music/gymleadervictory.asm" inc_section "crysaudio/music/mtmoonsquare.asm" inc_section "crysaudio/music/gym.asm" @@ -488,7 +377,7 @@ SECTION "TCG Songs 2", ROMX inc_section "crysaudio/music/TCG/matchstart3.asm" inc_section "crysaudio/music/TCG/matchvictory.asm" inc_section "crysaudio/music/TCG/matchloss.asm" - inc_section "crysaudio/music/TCG/darkdiddly.asm" + inc_section "crysaudio/music/TCG/matchdraw.asm" inc_section "crysaudio/music/TCG/boosterpack.asm" inc_section "crysaudio/music/TCG/medal.asm" @@ -527,23 +416,25 @@ SECTION "TCG2 Songs 3", ROMX SECTION "Pinball Songs", ROMX inc_section "crysaudio/music/pinball/redfield.asm" - inc_section "crysaudio/music/pinball/catchem_red.asm" - inc_section "crysaudio/music/pinball/hurryup_red.asm" + inc_section "crysaudio/music/pinball/catchemred.asm" + inc_section "crysaudio/music/pinball/hurryupred.asm" inc_section "crysaudio/music/pinball/pokedex.asm" - inc_section "crysaudio/music/pinball/gengarstage_gastly.asm" - inc_section "crysaudio/music/pinball/gengarstage_hauntergengar.asm" ; the two songs are interleaved +SECTION "Gastly and Haunter Graveyard", ROMX + INCLUDE "crysaudio/music/pinball/gastlyinthegraveyard.asm" + INCLUDE "crysaudio/music/pinball/haunterinthegraveyard.asm" + inc_section "crysaudio/music/pinball/gengarinthegraveyard.asm" inc_section "crysaudio/music/pinball/bluefield.asm" - inc_section "crysaudio/music/pinball/catchem_blue.asm" - inc_section "crysaudio/music/pinball/hurryup_blue.asm" - inc_section "crysaudio/music/pinball/hiscorescreen.asm" + inc_section "crysaudio/music/pinball/catchemblue.asm" + inc_section "crysaudio/music/pinball/hurryupblue.asm" + inc_section "crysaudio/music/pinball/hiscore.asm" inc_section "crysaudio/music/pinball/gameover.asm" - inc_section "crysaudio/music/pinball/diglettstage_digletts.asm" - inc_section "crysaudio/music/pinball/diglettstage_dugtrio.asm" + inc_section "crysaudio/music/pinball/whackthediglett.asm" + inc_section "crysaudio/music/pinball/whackthedugtrio.asm" SECTION "Pinball Songs 2", ROMX inc_section "crysaudio/music/pinball/seelstage.asm" - inc_section "crysaudio/music/pinball/titlescreen.asm" + inc_section "crysaudio/music/pinball/title.asm" inc_section "crysaudio/music/pinball/mewtwostage.asm" inc_section "crysaudio/music/pinball/options.asm" inc_section "crysaudio/music/pinball/fieldselect.asm" diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm new file mode 100644 index 00000000..24c3dd9e --- /dev/null +++ b/audio/alternate_tempo.asm @@ -0,0 +1,42 @@ +; an alternate start for MeetRival which has a different first measure +Music_RivalAlternateStart:: + ld a, MUSIC_MEET_RIVAL + jp PlayMusic + ;ld hl, wChannelCommandPointers + ;ld de, Music_MeetRival_branch_b1a2 + ;call Audio1_OverwriteChannelPointer + ;ld de, Music_MeetRival_branch_b21d + ;call Audio1_OverwriteChannelPointer + ;ld de, Music_MeetRival_branch_b2b5 + +; an alternate tempo for MeetRival which is slightly slower +Music_RivalAlternateTempo:: + ld c, BANK(Music_MeetRival) + ld a, MUSIC_MEET_RIVAL + jp PlayMusic + ;ld hl, wChannelCommandPointers + ;ld de, Music_MeetRival_branch_b119 + ;jp Audio1_OverwriteChannelPointer + +; applies both the alternate start and alternate tempo +Music_RivalAlternateStartAndTempo:: + jp Music_RivalAlternateStart + ;ld hl, wChannelCommandPointers + ;ld de, Music_MeetRival_branch_b19b + ;jp Audio1_OverwriteChannelPointer + +; an alternate tempo for Cities1 which is used for the Hall of Fame room +Music_Cities1AlternateTempo:: + ld a, 10 + ld [wAudioFadeOutCounterReloadValue], a + ld [wAudioFadeOutCounter], a + ld a, $ff ; stop playing music after the fade-out is finished + ld [wAudioFadeOutControl], a + ld c, 100 + call DelayFrames ; wait for the fade-out to finish + ld c, BANK(Music_Cities1) + ld a, MUSIC_CITIES1 + jp PlayMusic + ;ld hl, wChannelCommandPointers + ;ld de, Music_Cities1_branch_aa6f + ;jp Audio1_OverwriteChannelPointer diff --git a/audio/engine_1.asm b/audio/engine_1.asm index bab1be55..f9b4166a 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,7 +1,7 @@ ; The first of three duplicated sound engines. Audio1_UpdateMusic:: - ld c, Ch0 + ld c, Ch1 .loop ld b, 0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio1_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp Ch4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -20,17 +20,17 @@ Audio1_UpdateMusic:: set 7, a ld [wMuteAudioAndPauseMusic], a xor a ; disable all channels' output - ld [rNR51], a - ld [rNR30], a + ldh [rNR51], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a jr .nextChannel .applyAffects call Audio1_ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number - cp Ch7 + cp Ch8 jr nz, .loop ret @@ -41,14 +41,14 @@ Audio1_ApplyMusicAffects: ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] - cp $1 ; if the delay is 1, play next note + cp 1 ; if the delay is 1, play next note jp z, Audio1_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp Ch4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -57,25 +57,25 @@ Audio1_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit BIT_ROTATE_DUTY, [hl] + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio1_ApplyDutyCycle + call Audio1_ApplyDutyCyclePattern .checkForExecuteMusic ld b, 0 ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] - jr nz, .checkForPitchBend + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc bit BIT_NOISE_OR_SFX, [hl] - jr nz, .skipPitchBendVibrato -.checkForPitchBend + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_ON, [hl] + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio1_ApplyPitchBend + jp Audio1_ApplyPitchSlide .checkVibratoDelay ld hl, wChannelVibratoDelayCounters add hl, bc @@ -83,7 +83,7 @@ Audio1_ApplyMusicAffects: and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.skipPitchBendVibrato +.skipPitchSlideVibrato ret .checkForVibrato ld hl, wChannelVibratoExtents @@ -142,7 +142,7 @@ Audio1_ApplyMusicAffects: ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio1_PlayNextNote: ; reload the vibrato delay counter @@ -155,23 +155,23 @@ Audio1_PlayNextNote: ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_ON, [hl] - res BIT_PITCH_BEND_DECREASING, [hl] - call Audio1_endchannel + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] + call Audio1_sound_ret ret -Audio1_endchannel: +Audio1_sound_ret: call Audio1_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio1_callchannel ; no + cp sound_ret_cmd + jp nz, Audio1_sound_call ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit BIT_CHANNEL_CALL, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c - cp Ch3 + cp Ch4 jr nc, .noiseOrSfxChannel jr .disableChannelOutput .noiseOrSfxChannel @@ -179,23 +179,23 @@ Audio1_endchannel: ld hl, wChannelFlags2 add hl, bc res BIT_EXECUTE_MUSIC, [hl] - cp Ch6 + cp Ch7 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output ld a, $0 - ld [rNR30], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a .skipSfxChannel3 - jr nz, .asm_9222 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_9222 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a jr .disableChannelOutput -.asm_9222 - jr .asm_9248 +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -215,33 +215,33 @@ Audio1_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio1_endchannel + jp Audio1_sound_ret .disableChannelOutput ld hl, Audio1_HWChannelDisableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] and [hl] - ld [rNR51], a -.asm_9248 - ld a, [wChannelSoundIDs + Ch4] + ldh [rNR51], a +.afterDisable + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START - jr nc, .asm_9251 + jr nc, .maybeCry jr .skipCry -.asm_9251 - ld a, [wChannelSoundIDs + Ch4] +.maybeCry + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_END jr z, .skipCry jr c, .cry jr .skipCry .cry ld a, c - cp Ch4 - jr z, .asm_9265 + cp Ch5 + jr z, .skipRewind call Audio1_GoBackOneCommandIfCry ret c -.asm_9265 +.skipRewind ld a, [wSavedVolume] - ld [rNR50], a + ldh [rNR50], a xor a ld [wSavedVolume], a .skipCry @@ -250,9 +250,9 @@ Audio1_endchannel: ld [hl], b ret -Audio1_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio1_loopchannel ; no +Audio1_sound_call: + cp sound_call_cmd + jp nz, Audio1_sound_loop call Audio1_GetNextMusicByte push af call Audio1_GetNextMusicByte @@ -284,12 +284,12 @@ Audio1_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set BIT_CHANNEL_CALL, [hl] ; set the call flag - jp Audio1_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio1_sound_ret -Audio1_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio1_notetype ; no +Audio1_sound_loop: + cp sound_loop_cmd + jp nz, Audio1_note_type call Audio1_GetNextMusicByte ld e, a and a @@ -304,7 +304,7 @@ Audio1_loopchannel: ld [hl], a call Audio1_GetNextMusicByte ; skip pointer call Audio1_GetNextMusicByte - jp Audio1_endchannel + jp Audio1_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -323,12 +323,12 @@ Audio1_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_notetype: +Audio1_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio1_toggleperfectpitch ; no + cp note_type_cmd + jp nz, Audio1_toggle_perfect_pitch ld a, d and $f ld b, $0 @@ -336,14 +336,14 @@ Audio1_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp Ch3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio1_GetNextMusicByte ld d, a ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 + cp Ch7 jr nz, .skipChannel3 ld hl, wSfxWaveInstrument jr .channel3 @@ -367,23 +367,23 @@ Audio1_notetype: add hl, bc ld [hl], d .noiseChannel - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_toggleperfectpitch: +Audio1_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? - jr nz, Audio1_vibrato ; no + cp toggle_perfect_pitch_cmd + jr nz, Audio1_vibrato ld b, 0 ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_vibrato: - cp $ea ; is this command a vibrato? - jr nz, Audio1_pitchbend ; no + cp vibrato_cmd + jr nz, Audio1_pitch_slide call Audio1_GetNextMusicByte ld b, 0 ld hl, wChannelVibratoDelayCounters @@ -427,14 +427,14 @@ Audio1_vibrato: or d ld [hl], a - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio1_duty ; no +Audio1_pitch_slide: + cp pitch_slide_cmd + jr nz, Audio1_duty_cycle call Audio1_GetNextMusicByte ld b, 0 - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc ld [hl], a call Audio1_GetNextMusicByte @@ -446,38 +446,38 @@ Audio1_pitchbend: and $f call Audio1_CalculateFrequency ld b, 0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld [hl], e ld b, 0 ld hl, wChannelFlags1 add hl, bc - set BIT_PITCH_BEND_ON, [hl] + set BIT_PITCH_SLIDE_ON, [hl] call Audio1_GetNextMusicByte ld d, a - jp Audio1_notelength + jp Audio1_note_length -Audio1_duty: - cp $ec ; is this command a duty? - jr nz, Audio1_tempo ; no +Audio1_duty_cycle: + cp duty_cycle_cmd + jr nz, Audio1_tempo call Audio1_GetNextMusicByte rrca rrca and $c0 ld b, 0 - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio1_endchannel + ld [hl], a ; store duty cycle + jp Audio1_sound_ret Audio1_tempo: - cp $ed ; is this command a tempo? - jr nz, Audio1_stereopanning ; no + cp tempo_cmd + jr nz, Audio1_stereo_panning ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel call Audio1_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -500,19 +500,19 @@ Audio1_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_stereopanning: - cp $ee ; is this command a stereopanning? - jr nz, Audio1_unknownmusic0xef ; no +Audio1_stereo_panning: + cp stereo_panning_cmd + jr nz, Audio1_unknownmusic0xef call Audio1_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio1_endchannel + jp Audio1_sound_ret ; this appears to never be used Audio1_unknownmusic0xef: - cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio1_dutycycle ; no + cp unknownmusic0xef_cmd + jr nz, Audio1_duty_cycle_pattern call Audio1_GetNextMusicByte push bc call Audio1_PlaySound @@ -520,77 +520,77 @@ Audio1_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .skip - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_dutycycle: - cp $fc ; is this command a dutycycle? - jr nz, Audio1_volume ; no +Audio1_duty_cycle_pattern: + cp duty_cycle_pattern_cmd + jr nz, Audio1_volume call Audio1_GetNextMusicByte ld b, 0 + ld hl, wChannelDutyCyclePatterns + add hl, bc + ld [hl], a ; store full pattern + and %11000000 ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties - add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set BIT_ROTATE_DUTY, [hl] - jp Audio1_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio1_sound_ret Audio1_volume: - cp $f0 ; is this command a volume? - jr nz, Audio1_executemusic ; no + cp volume_cmd + jr nz, Audio1_execute_music call Audio1_GetNextMusicByte - ld [rNR50], a ; store volume - jp Audio1_endchannel + ldh [rNR50], a ; store volume + jp Audio1_sound_ret -Audio1_executemusic: - cp $f8 ; is this command an executemusic? - jr nz, Audio1_octave ; no +Audio1_execute_music: + cp execute_music_cmd + jr nz, Audio1_octave ld b, $0 ld hl, wChannelFlags2 add hl, bc set BIT_EXECUTE_MUSIC, [hl] - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_octave: and $f0 - cp $e0 ; is this command an octave? - jr nz, Audio1_sfxnote ; no + cp octave_cmd + jr nz, Audio1_sfx_note ld hl, wChannelOctaves ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio1_endchannel + jp Audio1_sound_ret -; sfxnote is either squarenote or noisenote depending on the channel -Audio1_sfxnote: - cp $20 ; is this command a sfxnote? - jr nz, Audio1_pitchenvelope +; sfx_note is either square_note or noise_note depending on the channel +Audio1_sfx_note: + cp sfx_note_cmd + jr nz, Audio1_pitch_sweep ld a, c - cp Ch3 ; is this a noise or sfx channel? - jr c, Audio1_pitchenvelope ; no + cp Ch4 ; is this a noise or sfx channel? + jr c, Audio1_pitch_sweep ; no ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? - jr nz, Audio1_pitchenvelope ; yes - call Audio1_notelength + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio1_pitch_sweep ; yes + call Audio1_note_length -; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength +; This code seems to do the same thing as what Audio1_ApplyDutyCycleAndSoundLength ; does below. ld d, a ld b, 0 - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d @@ -607,7 +607,7 @@ Audio1_sfxnote: call Audio1_GetNextMusicByte ld e, a ld a, c - cp Ch7 + cp Ch8 ld a, 0 jr z, .skip ; Channels 1 through 3 have 2 registers that control frequency, but the noise @@ -619,37 +619,47 @@ Audio1_sfxnote: .skip ld d, a push de - call Audio1_ApplyDutyAndSoundLength + call Audio1_ApplyDutyCycleAndSoundLength call Audio1_EnableChannelOutput pop de call Audio1_ApplyWavePatternAndFrequency ret -Audio1_pitchenvelope: +Audio1_pitch_sweep: ld a, c - cp Ch4 + cp Ch5 jr c, Audio1_note ; if not a sfx ld a, d - cp $10 ; is this command a pitchenvelope? - jr nz, Audio1_note ; no + cp pitch_sweep_cmd + jr nz, Audio1_note ld b, $0 ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio1_note ; no call Audio1_GetNextMusicByte - ld [rNR10], a - jp Audio1_endchannel + ldh [rNR10], a + jp Audio1_sound_ret Audio1_note: ld a, c - cp Ch3 - jr nz, Audio1_notelength ; if not noise channel + cp Ch4 + jr nz, Audio1_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, Audio1_dnote - jr nc, Audio1_notelength ; no + cp drum_note_cmd + jr z, .drum_note + jr nc, Audio1_note_length + + ; this executes when on the noise channel and + ; the command id is less than drum_note_cmd ($b0) + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a drum_note command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -658,26 +668,26 @@ Audio1_note: ld a, b push de push bc - jr asm_94fd + jr .playDnote -Audio1_dnote: +.drum_note ld a, d and $f push af push bc - call Audio1_GetNextMusicByte ; get dnote instrument -asm_94fd + call Audio1_GetNextMusicByte ; get drum_note instrument +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_9508 + jr nz, .skipDnote ld a, d call Audio1_PlaySound -.asm_9508 +.skipDnote pop bc pop de -Audio1_notelength: +Audio1_note_length: ld a, d push af and $f @@ -691,7 +701,7 @@ Audio1_notelength: ld l, b call Audio1_MultiplyAdd ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -701,7 +711,7 @@ Audio1_notelength: .sfxChannel ld d, $1 ld e, $0 - cp Ch7 + cp Ch8 jr z, .skip ; if noise channel call Audio1_SetSfxTempo ld a, [wSfxTempo] @@ -727,24 +737,24 @@ Audio1_notelength: ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio1_notepitch + jr nz, Audio1_note_pitch ld hl, wChannelFlags1 add hl, bc bit BIT_NOISE_OR_SFX, [hl] - jr z, Audio1_notepitch + jr z, Audio1_note_pitch pop hl ret -Audio1_notepitch: +Audio1_note_pitch: pop af and $f0 - cp $c0 ; compare to rest + cp rest_cmd jr nz, .notRest ld a, c - cp Ch4 + cp Ch5 jr nc, .next ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -752,17 +762,17 @@ Audio1_notepitch: ; fall through .next ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 + cp Ch7 jr nz, .notChannel3 .channel3 ld b, 0 ld hl, Audio1_HWChannelDisableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] and [hl] - ld [rNR51], a ; disable hardware channel 3's output + ldh [rNR51], a ; disable hardware channel 3's output jr .done .notChannel3 ld b, REG_VOLUME_ENVELOPE @@ -784,16 +794,16 @@ Audio1_notepitch: ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_ON, [hl] - jr z, .skipPitchBend - call Audio1_InitPitchBendVars -.skipPitchBend + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio1_InitPitchSlideVars +.skipPitchSlide push de ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld d, 0 ld e, a add hl, de @@ -812,13 +822,13 @@ Audio1_notepitch: ld b, REG_VOLUME_ENVELOPE call Audio1_GetRegisterPointer ld [hl], d - call Audio1_ApplyDutyAndSoundLength + call Audio1_ApplyDutyCycleAndSoundLength call Audio1_EnableChannelOutput pop de ld b, $0 ld hl, wChannelFlags1 add hl, bc - bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used? + bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? jr z, .skipFrequencyInc inc e ; if yes, increment the frequency by 1 jr nc, .skipFrequencyInc @@ -834,16 +844,16 @@ Audio1_EnableChannelOutput: ld b, 0 ld hl, Audio1_HWChannelEnableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] or [hl] ; set this channel's bits ld d, a ld a, c - cp Ch7 + cp Ch8 jr z, .noiseChannelOrNoSfx - cp Ch4 + cp Ch5 jr nc, .skip ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -856,7 +866,7 @@ Audio1_EnableChannelOutput: add hl, bc and [hl] ld d, a - ld a, [rNR51] + ldh a, [rNR51] ld hl, Audio1_HWChannelDisableMasks add hl, bc and [hl] ; reset this channel's output bits @@ -864,24 +874,24 @@ Audio1_EnableChannelOutput: ld d, a .skip ld a, d - ld [rNR51], a + ldh [rNR51], a ret -Audio1_ApplyDutyAndSoundLength: +Audio1_ApplyDutyCycleAndSoundLength: ld b, 0 ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c - cp Ch2 + cp Ch3 jr z, .skipDuty ; if music channel 3 - cp Ch6 + cp Ch7 jr z, .skipDuty ; if sfx channel 3 -; include duty (except on channel 3 which doesn't have it) +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d @@ -894,15 +904,15 @@ Audio1_ApplyDutyAndSoundLength: Audio1_ApplyWavePatternAndFrequency: ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 + cp Ch7 jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp Ch2 + cp Ch3 jr z, .next ld de, wSfxWaveInstrument .next @@ -915,10 +925,10 @@ Audio1_ApplyWavePatternAndFrequency: ld e, [hl] inc hl ld d, [hl] - ld hl, $ff30 ; wave pattern RAM + ld hl, rWave_0 ld b, $f ld a, $0 ; stop hardware channel 3 - ld [rNR30], a + ldh [rNR30], a .loop ld a, [de] inc de @@ -928,7 +938,7 @@ Audio1_ApplyWavePatternAndFrequency: and a jr nz, .loop ld a, $80 ; start hardware channel 3 - ld [rNR30], a + ldh [rNR30], a pop de .notChannel3 ld a, d @@ -1006,7 +1016,7 @@ Audio1_GoBackOneCommandIfCry: Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START jr nc, .next jr .no @@ -1022,29 +1032,29 @@ Audio1_IsCry: scf ret -Audio1_ApplyPitchBend: +Audio1_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_DECREASING, [hl] + bit BIT_PITCH_SLIDE_DECREASING, [hl] jp nz, .frequencyDecreasing ; frequency increasing - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1056,26 +1066,26 @@ Audio1_ApplyPitchBend: ld a, 0 adc d ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .reachedTargetFrequency jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .reachedTargetFrequency jr .applyUpdatedFrequency .frequencyDecreasing - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1083,7 +1093,7 @@ Audio1_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1094,22 +1104,22 @@ Audio1_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .reachedTargetFrequency jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .reachedTargetFrequency .applyUpdatedFrequency - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, REG_FREQUENCY_LO @@ -1119,38 +1129,38 @@ Audio1_ApplyPitchBend: ld [hl], d ret .reachedTargetFrequency -; Turn off pitch bend when the target frequency has been reached. +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_ON, [hl] - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio1_InitPitchBendVars: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio1_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] jr nc, .next ld a, 1 .next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .targetFrequencyGreater @@ -1158,18 +1168,18 @@ Audio1_InitPitchBendVars: ld b, 0 ld hl, wChannelFlags1 add hl, bc - set BIT_PITCH_BEND_DECREASING, [hl] + set BIT_PITCH_SLIDE_DECREASING, [hl] jr .next2 .targetFrequencyGreater ; If the target frequency is greater, subtract the current frequency from ; the target frequency to get the absolute difference. - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1184,7 +1194,7 @@ Audio1_InitPitchBendVars: sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d @@ -1192,10 +1202,10 @@ Audio1_InitPitchBendVars: ld b, 0 ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] .next2 - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc .divideLoop inc b @@ -1214,20 +1224,20 @@ Audio1_InitPitchBendVars: add [hl] ld d, b ; d = quotient + 1 ld b, 0 - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld [hl], d ; store quotient + 1 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld [hl], a ; store remainder - dividend - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc ld [hl], a ; store remainder - dividend ret -Audio1_ApplyDutyCycle: +Audio1_ApplyDutyCyclePattern: ld b, 0 - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1320,9 +1330,9 @@ Audio1_CalculateFrequency: Audio1_PlaySound:: ld [wSoundID], a - cp $ff + cp SFX_STOP_ALL_MUSIC jp z, .stopAllAudio - cp MAX_SFX_ID + cp MAX_SFX_ID_1 jp z, .playSfx jp c, .playSfx cp $fe @@ -1336,20 +1346,20 @@ Audio1_PlaySound:: ld [wMusicTempo + 1], a ld [wMusicWaveInstrument], a ld [wSfxWaveInstrument], a - ld d, $8 + ld d, NUM_CHANNELS ld hl, wChannelReturnAddresses call .FillMem ld hl, wChannelCommandPointers call .FillMem - ld d, $4 + ld d, NUM_MUSIC_CHANS ld hl, wChannelSoundIDs call .FillMem ld hl, wChannelFlags1 call .FillMem - ld hl, wChannelDuties - call .FillMem ld hl, wChannelDutyCycles call .FillMem + ld hl, wChannelDutyCyclePatterns + call .FillMem ld hl, wChannelVibratoDelayCounters call .FillMem ld hl, wChannelVibratoExtents @@ -1362,21 +1372,21 @@ Audio1_PlaySound:: call .FillMem ld hl, wChannelFlags2 call .FillMem - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers call .FillMem - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps call .FillMem - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart call .FillMem - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart call .FillMem - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes call .FillMem - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes call .FillMem - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes call .FillMem - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes call .FillMem ld a, $1 ld hl, wChannelLoopCounters @@ -1389,17 +1399,17 @@ Audio1_PlaySound:: ld a, $ff ld [wStereoPanning], a xor a - ld [rNR50], a + ldh [rNR50], a ld a, $8 - ld [rNR10], a + ldh [rNR10], a ld a, 0 - ld [rNR51], a + ldh [rNR51], a xor a - ld [rNR30], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a ld a, $77 - ld [rNR50], a + ldh [rNR50], a jp .playSoundCommon .playSfx @@ -1441,26 +1451,26 @@ Audio1_PlaySound:: add hl, de ld a, [hl] and a - jr z, .asm_99a3 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_999a + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_9993 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_9993 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_99a3 - jr c, .asm_99a3 -.asm_999a + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_99a3 - jr c, .asm_99a3 + jr z, .playChannel + jr c, .playChannel ret -.asm_99a3 +.playChannel xor a push de ld h, d @@ -1483,10 +1493,10 @@ Audio1_PlaySound:: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -1504,28 +1514,28 @@ Audio1_PlaySound:: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -1542,11 +1552,11 @@ Audio1_PlaySound:: add hl, de ld [hl], a ld a, e - cp Ch4 - jr nz, .asm_9a2b + cp Ch5 + jr nz, .skipSweepDisable ld a, $8 - ld [rNR10], a ; sweep off -.asm_9a2b + ldh [rNR10], a ; sweep off +.skipSweepDisable ld a, c and a jp z, .playSoundCommon @@ -1555,22 +1565,22 @@ Audio1_PlaySound:: .stopAllAudio ld a, $80 - ld [rNR52], a ; sound hardware on - ld [rNR30], a ; wave playback on + ldh [rNR52], a ; sound hardware on + ldh [rNR30], a ; wave playback on xor a - ld [rNR51], a ; no sound output - ld [rNR32], a ; mute channel 3 (wave channel) + ldh [rNR51], a ; no sound output + ldh [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [rNR10], a ; sweep off - ld [rNR12], a ; mute channel 1 (pulse channel 1) - ld [rNR22], a ; mute channel 2 (pulse channel 2) - ld [rNR42], a ; mute channel 4 (noise channel) + ldh [rNR10], a ; sweep off + ldh [rNR12], a ; mute channel 1 (pulse channel 1) + ldh [rNR22], a ; mute channel 2 (pulse channel 2) + ldh [rNR42], a ; mute channel 4 (noise channel) ld a, $40 - ld [rNR14], a ; counter mode - ld [rNR24], a - ld [rNR44], a + ldh [rNR14], a ; counter mode + ldh [rNR24], a + ldh [rNR44], a ld a, $77 - ld [rNR50], a ; full volume + ldh [rNR50], a ; full volume xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1644,7 +1654,7 @@ Audio1_PlaySound:: ld a, [wSoundID] ld [hl], a pop af - cp Ch3 + cp Ch4 jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc @@ -1667,37 +1677,37 @@ Audio1_PlaySound:: jr nz, .commandPointerLoop ld a, [wSoundID] cp CRY_SFX_START - jr nc, .asm_9aeb + jr nc, .maybeCry jr .done -.asm_9aeb +.maybeCry ld a, [wSoundID] cp CRY_SFX_END jr z, .done jr c, .cry jr .done .cry - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx wave channel pointer - ld de, Audio1_CryEndchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio1_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a jr nz, .done - ld a, [rNR50] + ldh a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a ; full volume + ldh [rNR50], a ; full volume .done ret -Audio1_CryEndchannel: - endchannel +Audio1_CryRet: + sound_ret Audio1_HWChannelBaseAddresses: ; the low bytes of each HW channel's base address @@ -1713,17 +1723,4 @@ Audio1_HWChannelEnableMasks: db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio1_Pitches: - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ - - +INCLUDE "audio/notes.asm" diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 2ca5cbe8..51a5d7c4 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,16 +1,18 @@ ; The second of three duplicated sound engines. +; This copy has a few differences relating to battle sound effects +; and the low health alarm that plays in battle Audio2_UpdateMusic:: - ld c, Ch0 + ld c, Ch1 .loop - ld b, $0 + ld b, 0 ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a jr z, .nextChannel ld a, c - cp Ch4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -19,42 +21,36 @@ Audio2_UpdateMusic:: jr nz, .nextChannel set 7, a ld [wMuteAudioAndPauseMusic], a - xor a - ld [rNR51], a - ld [rNR30], a + xor a ; disable all channels' output + ldh [rNR51], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a jr .nextChannel .applyAffects call Audio2_ApplyMusicAffects .nextChannel ld a, c - inc c - cp Ch7 + inc c ; inc channel number + cp Ch8 jr nz, .loop ret ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wChannelFlags1: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag Audio2_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] - cp $1 ; if the delay is 1, play next note + cp 1 ; if the delay is 1, play next note jp z, Audio2_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp Ch4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -63,36 +59,36 @@ Audio2_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit 6, [hl] ; dutycycle + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio2_ApplyDutyCycle + call Audio2_ApplyDutyCyclePattern .checkForExecuteMusic - ld b, $0 + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, .checkForPitchBend + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato -.checkForPitchBend + bit BIT_NOISE_OR_SFX, [hl] + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] ; pitchbend + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio2_ApplyPitchBend + jp Audio2_ApplyPitchSlide .checkVibratoDelay - ld hl, wChannelVibratoDelayCounters ; vibrato delay + ld hl, wChannelVibratoDelayCounters add hl, bc ld a, [hl] and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.disablePitchBendVibrato +.skipPitchSlideVibrato ret .checkForVibrato - ld hl, wChannelVibratoExtents ; vibrato rate + ld hl, wChannelVibratoExtents add hl, bc ld a, [hl] and a @@ -105,33 +101,35 @@ Audio2_ApplyMusicAffects: ld a, [hl] and $f and a - jr z, .vibratoAlreadyDone - dec [hl] ; apply vibrato pitch change + jr z, .applyVibrato + dec [hl] ; decrement counter ret -.vibratoAlreadyDone +.applyVibrato ld a, [hl] swap [hl] or [hl] - ld [hl], a ; reset the vibrato value and start again + ld [hl], a ; reload the counter ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch ld hl, wChannelFlags1 add hl, bc - bit 3, [hl] ; this is the only code that sets/resets bit three so - jr z, .unset ; it continuously alternates which path it takes - res 3, [hl] +; This is the only code that sets/resets the vibrato direction bit, so it +; continuously alternates which path it takes. + bit BIT_VIBRATO_DIRECTION, [hl] + jr z, .unset + res BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f ld d, a ld a, e sub d jr nc, .noCarry - ld a, $0 + ld a, 0 .noCarry jr .done .unset - set 3, [hl] + set BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f0 swap a @@ -140,70 +138,75 @@ Audio2_ApplyMusicAffects: ld a, $ff .done ld d, a - ld b, $3 - call Audio2_21ff7 + ld b, REG_FREQUENCY_LO + call Audio2_GetRegisterPointer ld [hl], d ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio2_PlayNextNote: +; reload the vibrato delay counter ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] + ; --- this section is only present in this copy of the sound engine ld a, c - cp Ch4 + cp Ch5 jr nz, .beginChecks - ld a, [wLowHealthAlarm] ;low health alarm enabled? + ld a, [wLowHealthAlarm] ; low health alarm enabled? bit 7, a ret nz .beginChecks - call Audio2_endchannel + ; --- + call Audio2_sound_ret ret -Audio2_endchannel: +Audio2_sound_ret: call Audio2_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio2_callchannel ; no - ld b, $0 ; yes + cp sound_ret_cmd + jp nz, Audio2_sound_call + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 1, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c - cp Ch3 + cp Ch4 jr nc, .noiseOrSfxChannel - jr .asm_219c0 + jr .disableChannelOutput .noiseOrSfxChannel - res 2, [hl] + res BIT_NOISE_OR_SFX, [hl] ld hl, wChannelFlags2 add hl, bc - res 0, [hl] - cp Ch6 - jr nz, .notSfxChannel3 + res BIT_EXECUTE_MUSIC, [hl] + cp Ch7 + jr nz, .skipSfxChannel3 +; restart hardware channel 3 (wave channel) output ld a, $0 - ld [rNR30], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a -.notSfxChannel3 - jr nz, .asm_219a3 + ldh [rNR30], a +.skipSfxChannel3 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_219a3 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a - jr .asm_219c0 -.asm_219a3 - jr .asm_219c9 + jr .disableChannelOutput +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -223,45 +226,45 @@ Audio2_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio2_endchannel -.asm_219c0 - ld hl, Unknown_222de + jp Audio2_sound_ret +.disableChannelOutput + ld hl, Audio2_HWChannelDisableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] and [hl] - ld [rNR51], a -.asm_219c9 - ld a, [wChannelSoundIDs + Ch4] - cp $14 - jr nc, .asm_219d2 - jr .asm_219ef -.asm_219d2 - ld a, [wChannelSoundIDs + Ch4] - cp $86 - jr z, .asm_219ef - jr c, .asm_219dd - jr .asm_219ef -.asm_219dd + ldh [rNR51], a +.afterDisable + ld a, [wChannelSoundIDs + Ch5] + cp CRY_SFX_START + jr nc, .maybeCry + jr .skipCry +.maybeCry + ld a, [wChannelSoundIDs + Ch5] + cp CRY_SFX_END + jr z, .skipCry + jr c, .cry + jr .skipCry +.cry ld a, c - cp Ch4 - jr z, .asm_219e6 - call Audio2_21e6d + cp Ch5 + jr z, .skipRewind + call Audio2_GoBackOneCommandIfCry ret c -.asm_219e6 +.skipRewind ld a, [wSavedVolume] - ld [rNR50], a + ldh [rNR50], a xor a ld [wSavedVolume], a -.asm_219ef +.skipCry ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret -Audio2_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio2_loopchannel ; no - call Audio2_GetNextMusicByte ; yes +Audio2_sound_call: + cp sound_call_cmd + jp nz, Audio2_sound_loop + call Audio2_GetNextMusicByte push af call Audio2_GetNextMusicByte ld d, a @@ -292,17 +295,17 @@ Audio2_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set 1, [hl] ; set the call flag - jp Audio2_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio2_sound_ret -Audio2_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio2_notetype ; no - call Audio2_GetNextMusicByte ; yes +Audio2_sound_loop: + cp sound_loop_cmd + jp nz, Audio2_note_type + call Audio2_GetNextMusicByte ld e, a and a jr z, .infiniteLoop - ld b, $0 + ld b, 0 ld hl, wChannelLoopCounters add hl, bc ld a, [hl] @@ -312,7 +315,7 @@ Audio2_loopchannel: ld [hl], a call Audio2_GetNextMusicByte ; skip pointer call Audio2_GetNextMusicByte - jp Audio2_endchannel + jp Audio2_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -331,36 +334,36 @@ Audio2_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_notetype: +Audio2_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio2_toggleperfectpitch ; no - ld a, d ; yes + cp note_type_cmd + jp nz, Audio2_toggle_perfect_pitch + ld a, d and $f ld b, $0 ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp Ch3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio2_GetNextMusicByte ld d, a ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 - jr nz, .notChannel3 + cp Ch7 + jr nz, .skipChannel3 ld hl, wSfxWaveInstrument - jr .sfxChannel3 + jr .channel3 .musicChannel3 ld hl, wMusicWaveInstrument -.sfxChannel3 +.channel3 ld a, d and $f - ld [hl], a ; store low nibble of param as duty + ld [hl], a ; store low nibble of param as wave instrument ld a, d and $30 sla a @@ -369,31 +372,31 @@ Audio2_notetype: ; if channel 3, store high nibble as volume ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 +.skipChannel3 + ld b, 0 ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_toggleperfectpitch: +Audio2_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? - jr nz, Audio2_vibrato ; no - ld b, $0 ; yes + cp toggle_perfect_pitch_cmd + jr nz, Audio2_vibrato + ld b, 0 ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio2_endchannel + jp Audio2_sound_ret Audio2_vibrato: - cp $ea ; is this command a vibrato? - jr nz, Audio2_pitchbend ; no - call Audio2_GetNextMusicByte ; yes - ld b, $0 + cp vibrato_cmd + jr nz, Audio2_pitch_slide + call Audio2_GetNextMusicByte + ld b, 0 ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay @@ -402,9 +405,16 @@ Audio2_vibrato: ld [hl], a ; store delay call Audio2_GetNextMusicByte ld d, a + +; The high nybble of the command byte is the extent of the vibrato. +; Let n be the extent. +; The upper nybble of the channel's byte in the wChannelVibratoExtents +; array will store the extent above the note: (n / 2) + (n % 2). +; The lower nybble will store the extent below the note: (n / 2). +; These two values add to the total extent, n. and $f0 swap a - ld b, $0 + ld b, 0 ld hl, wChannelVibratoExtents add hl, bc srl a @@ -412,7 +422,13 @@ Audio2_vibrato: adc b swap a or e - ld [hl], a ; store rate as both high and low nibbles + ld [hl], a + +; The low nybble of the command byte is the rate of the vibrato. +; The high and low nybbles of the channel's byte in the wChannelVibratoRates +; array are both initialised to this value because the high nybble is the +; counter reload value and the low nybble is the counter itself, which should +; start at its value upon reload. ld a, d and $f ld d, a @@ -420,17 +436,18 @@ Audio2_vibrato: add hl, bc swap a or d - ld [hl], a ; store depth as both high and low nibbles - jp Audio2_endchannel + ld [hl], a -Audio2_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio2_duty ; no - call Audio2_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelPitchBendLengthModifiers + jp Audio2_sound_ret + +Audio2_pitch_slide: + cp pitch_slide_cmd + jr nz, Audio2_duty_cycle + call Audio2_GetNextMusicByte + ld b, 0 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc - ld [hl], a ; store first param + ld [hl], a call Audio2_GetNextMusicByte ld d, a and $f0 @@ -438,40 +455,40 @@ Audio2_pitchbend: ld b, a ld a, d and $f - call Audio2_22017 - ld b, $0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + call Audio2_CalculateFrequency + ld b, 0 + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld [hl], d + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 + ld [hl], e + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 4, [hl] ; set pitchbend flag + set BIT_PITCH_SLIDE_ON, [hl] call Audio2_GetNextMusicByte ld d, a - jp Audio2_notelength + jp Audio2_note_length -Audio2_duty: - cp $ec ; is this command a duty? - jr nz, Audio2_tempo ; no - call Audio2_GetNextMusicByte ; yes +Audio2_duty_cycle: + cp duty_cycle_cmd + jr nz, Audio2_tempo + call Audio2_GetNextMusicByte rrca rrca and $c0 - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio2_endchannel + ld [hl], a ; store duty cycle + jp Audio2_sound_ret Audio2_tempo: - cp $ed ; is this command a tempo? - jr nz, Audio2_stereopanning ; no - ld a, c ; yes - cp Ch4 + cp tempo_cmd + jr nz, Audio2_stereo_panning + ld a, c + cp Ch5 jr nc, .sfxChannel call Audio2_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -494,149 +511,166 @@ Audio2_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_stereopanning: - cp $ee ; is this command a stereopanning? - jr nz, Audio2_unknownmusic0xef ; no - call Audio2_GetNextMusicByte ; yes +Audio2_stereo_panning: + cp stereo_panning_cmd + jr nz, Audio2_unknownmusic0xef + call Audio2_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio2_endchannel + jp Audio2_sound_ret ; this appears to never be used Audio2_unknownmusic0xef: - cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio2_dutycycle ; no - call Audio2_GetNextMusicByte ; yes + cp unknownmusic0xef_cmd + jr nz, Audio2_duty_cycle_pattern + call Audio2_GetNextMusicByte push bc call Audio2_PlaySound pop bc ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .skip - jp Audio2_endchannel + jp Audio2_sound_ret -Audio2_dutycycle: - cp $fc ; is this command a dutycycle? - jr nz, Audio2_volume ; no - call Audio2_GetNextMusicByte ; yes - ld b, $0 +Audio2_duty_cycle_pattern: + cp duty_cycle_pattern_cmd + jr nz, Audio2_volume + call Audio2_GetNextMusicByte + ld b, 0 + ld hl, wChannelDutyCyclePatterns + add hl, bc + ld [hl], a ; store full pattern + and %11000000 ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties - add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set 6, [hl] ; set dutycycle flag - jp Audio2_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio2_sound_ret Audio2_volume: - cp $f0 ; is this command a volume? - jr nz, Audio2_executemusic ; no - call Audio2_GetNextMusicByte ; yes - ld [rNR50], a ; store volume - jp Audio2_endchannel + cp volume_cmd + jr nz, Audio2_execute_music + call Audio2_GetNextMusicByte + ldh [rNR50], a ; store volume + jp Audio2_sound_ret -Audio2_executemusic: - cp $f8 ; is this command an executemusic? - jr nz, Audio2_octave ; no - ld b, $0 ; yes +Audio2_execute_music: + cp execute_music_cmd + jr nz, Audio2_octave + ld b, $0 ld hl, wChannelFlags2 add hl, bc - set 0, [hl] - jp Audio2_endchannel + set BIT_EXECUTE_MUSIC, [hl] + jp Audio2_sound_ret Audio2_octave: and $f0 - cp $e0 ; is this command an octave? - jr nz, Audio2_sfxnote ; no - ld hl, wChannelOctaves ; yes - ld b, $0 + cp octave_cmd + jr nz, Audio2_sfx_note + ld hl, wChannelOctaves + ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio2_endchannel + jp Audio2_sound_ret -; sfxnote is either squarenote or noisenote depending on the channel -Audio2_sfxnote: - cp $20 ; is this command an sfxnote? - jr nz, Audio2_pitchenvelope ; no +; sfx_note is either square_note or noise_note depending on the channel +Audio2_sfx_note: + cp sfx_note_cmd + jr nz, Audio2_pitch_sweep ld a, c - cp Ch3 ; is this a noise or sfx channel? - jr c, Audio2_pitchenvelope ; no - ld b, $0 + cp Ch4 ; is this a noise or sfx channel? + jr c, Audio2_pitch_sweep ; no + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio2_pitchenvelope ; no - call Audio2_notelength + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio2_pitch_sweep ; yes + call Audio2_note_length + +; This code seems to do the same thing as what Audio2_ApplyDutyCycleAndSoundLength +; does below. ld d, a - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a - ld b, $1 - call Audio2_21ff7 + ld b, REG_DUTY_SOUND_LEN + call Audio2_GetRegisterPointer ld [hl], d + call Audio2_GetNextMusicByte ld d, a - ld b, $2 - call Audio2_21ff7 + ld b, REG_VOLUME_ENVELOPE + call Audio2_GetRegisterPointer ld [hl], d call Audio2_GetNextMusicByte ld e, a ld a, c - cp Ch7 - ld a, $0 - jr z, .sfxNoiseChannel ; only two params for noise channel + cp Ch8 + ld a, 0 + jr z, .skip +; Channels 1 through 3 have 2 registers that control frequency, but the noise +; channel a single register (the polynomial counter) that controls frequency, +; so this command has one less byte on the noise channel. push de call Audio2_GetNextMusicByte pop de -.sfxNoiseChannel +.skip ld d, a push de - call Audio2_21daa - call Audio2_21d79 + call Audio2_ApplyDutyCycleAndSoundLength + call Audio2_EnableChannelOutput pop de - call Audio2_21dcc + call Audio2_ApplyWavePatternAndFrequency ret -Audio2_pitchenvelope: +Audio2_pitch_sweep: ld a, c - cp Ch4 + cp Ch5 jr c, Audio2_note ; if not a sfx ld a, d - cp $10 ; is this command a pitchenvelope? - jr nz, Audio2_note ; no + cp pitch_sweep_cmd + jr nz, Audio2_note ld b, $0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio2_note ; no - call Audio2_GetNextMusicByte ; yes - ld [rNR10], a - jp Audio2_endchannel + call Audio2_GetNextMusicByte + ldh [rNR10], a + jp Audio2_sound_ret Audio2_note: ld a, c - cp Ch3 - jr nz, Audio2_notelength ; if not noise channel + cp Ch4 + jr nz, Audio2_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, Audio2_dnote ; yes - jr nc, Audio2_notelength ; no + cp drum_note_cmd + jr z, .drum_note + jr nc, Audio2_note_length + + ; this executes when on the noise channel and + ; the command id is less than drum_note_cmd ($b0) + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a drum_note command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -645,40 +679,40 @@ Audio2_note: ld a, b push de push bc - jr asm_21c7e + jr .playDnote -Audio2_dnote: +.drum_note ld a, d and $f push af push bc - call Audio2_GetNextMusicByte ; get dnote instrument -asm_21c7e + call Audio2_GetNextMusicByte ; get drum_note instrument +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_21c89 + jr nz, .skipDnote ld a, d call Audio2_PlaySound -.asm_21c89 +.skipDnote pop bc pop de -Audio2_notelength: +Audio2_note_length: ld a, d push af and $f inc a - ld b, $0 - ld e, a ; store note length (in 16ths) + ld b, 0 + ld e, a ; store note length (in 16ths) ld d, b ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b - call Audio2_22006 + call Audio2_MultiplyAdd ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -688,22 +722,22 @@ Audio2_notelength: .sfxChannel ld d, $1 ld e, $0 - cp Ch7 + cp Ch8 jr z, .skip ; if noise channel - call Audio2_21e2f + call Audio2_SetSfxTempo ld a, [wSfxTempo] ld d, a ld a, [wSfxTempo + 1] ld e, a .skip - ld a, l - ld b, $0 + ld a, l ; a = note_length * note_speed + ld b, 0 ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] - call Audio2_22006 + call Audio2_MultiplyAdd ld e, l - ld d, h + ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e @@ -713,193 +747,199 @@ Audio2_notelength: ld [hl], a ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio2_notepitch + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, Audio2_note_pitch ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr z, Audio2_notepitch + bit BIT_NOISE_OR_SFX, [hl] + jr z, Audio2_note_pitch pop hl ret -Audio2_notepitch: +Audio2_note_pitch: pop af and $f0 - cp $c0 ; compare to rest + cp rest_cmd jr nz, .notRest ld a, c - cp Ch4 - jr nc, .sfxChannel - ld hl, wChannelSoundIDs + Ch4 + cp Ch5 + jr nc, .next +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a jr nz, .done ; fall through -.sfxChannel +.next ld a, c - cp Ch2 - jr z, .musicChannel3 - cp Ch6 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_222de + cp Ch3 + jr z, .channel3 + cp Ch7 + jr nz, .notChannel3 +.channel3 + ld b, 0 + ld hl, Audio2_HWChannelDisableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] and [hl] - ld [rNR51], a + ldh [rNR51], a ; disable hardware channel 3's output jr .done -.notSfxChannel3 - ld b, $2 - call Audio2_21ff7 - ld a, $8 +.notChannel3 + ld b, REG_VOLUME_ENVELOPE + call Audio2_GetRegisterPointer + ld a, $8 ; fade in sound ld [hli], a inc hl - ld a, $80 + ld a, $80 ; restart sound ld [hl], a .done ret .notRest swap a - ld b, $0 + ld b, 0 ld hl, wChannelOctaves add hl, bc ld b, [hl] - call Audio2_22017 - ld b, $0 + call Audio2_CalculateFrequency + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] - jr z, .asm_21d39 - call Audio2_21f4e -.asm_21d39 + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio2_InitPitchSlideVars +.skipPitchSlide push de ld a, c - cp Ch4 - jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + Ch4 - ld d, $0 + cp Ch5 + jr nc, .sfxChannel ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + Ch5 + ld d, 0 ld e, a add hl, de ld a, [hl] and a - jr nz, .asm_21d4c - jr .skip -.asm_21d4c + jr nz, .noSfx + jr .sfxChannel +.noSfx pop de ret -.skip - ld b, $0 +.sfxChannel + ld b, 0 ld hl, wChannelVolumes add hl, bc ld d, [hl] - ld b, $2 - call Audio2_21ff7 + ld b, REG_VOLUME_ENVELOPE + call Audio2_GetRegisterPointer ld [hl], d - call Audio2_21daa - call Audio2_21d79 + call Audio2_ApplyDutyCycleAndSoundLength + call Audio2_EnableChannelOutput pop de ld b, $0 ld hl, wChannelFlags1 add hl, bc - bit 0, [hl] ; has toggleperfectpitch been used? - jr z, .skip2 - inc e ; if yes, increment the pitch by 1 - jr nc, .skip2 + bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? + jr z, .skipFrequencyInc + inc e ; if yes, increment the frequency by 1 + jr nc, .skipFrequencyInc inc d -.skip2 +.skipFrequencyInc ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e - call Audio2_21dcc + call Audio2_ApplyWavePatternAndFrequency ret -Audio2_21d79: - ld b, $0 - ld hl, Unknown_222e6 +Audio2_EnableChannelOutput: + ld b, 0 + ld hl, Audio2_HWChannelEnableMasks add hl, bc - ld a, [rNR51] - or [hl] + ldh a, [rNR51] + or [hl] ; set this channel's bits ld d, a ld a, c - cp Ch7 - jr z, .sfxNoiseChannel - cp Ch4 + cp Ch8 + jr z, .noiseChannelOrNoSfx + cp Ch5 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + Ch4 +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a jr nz, .skip -.sfxNoiseChannel +.noiseChannelOrNoSfx +; If this is the SFX noise channel or a music channel whose corresponding +; SFX channel is off, apply stereo panning. ld a, [wStereoPanning] - ld hl, Unknown_222e6 + ld hl, Audio2_HWChannelEnableMasks add hl, bc and [hl] ld d, a - ld a, [rNR51] - ld hl, Unknown_222de + ldh a, [rNR51] + ld hl, Audio2_HWChannelDisableMasks add hl, bc - and [hl] - or d + and [hl] ; reset this channel's output bits + or d ; set this channel's output bits that enabled in [wStereoPanning] ld d, a .skip ld a, d - ld [rNR51], a + ldh [rNR51], a ret -Audio2_21daa: - ld b, $0 - ld hl, wChannelNoteDelayCounters +Audio2_ApplyDutyCycleAndSoundLength: + ld b, 0 + ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c - cp Ch2 - jr z, .channel3 ; if music channel 3 - cp Ch6 - jr z, .channel3 ; if sfx channel 3 + cp Ch3 + jr z, .skipDuty ; if music channel 3 + cp Ch7 + jr z, .skipDuty ; if sfx channel 3 +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a -.channel3 - ld b, $1 - call Audio2_21ff7 +.skipDuty + ld b, REG_DUTY_SOUND_LEN + call Audio2_GetRegisterPointer ld [hl], d ret -Audio2_21dcc: +Audio2_ApplyWavePatternAndFrequency: ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 - jr nz, .notSfxChannel3 + cp Ch7 + jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp Ch2 - jr z, .musicChannel3 + cp Ch3 + jr z, .next ld de, wSfxWaveInstrument -.musicChannel3 +.next ld a, [de] add a - ld d, $0 + ld d, 0 ld e, a ld hl, Audio2_WavePointers add hl, de ld e, [hl] inc hl ld d, [hl] - ld hl, $ff30 + ld hl, rWave_0 ld b, $f - ld a, $0 - ld [rNR30], a + ld a, $0 ; stop hardware channel 3 + ldh [rNR30], a .loop ld a, [de] inc de @@ -908,196 +948,207 @@ Audio2_21dcc: dec b and a jr nz, .loop - ld a, $80 - ld [rNR30], a + ld a, $80 ; start hardware channel 3 + ldh [rNR30], a pop de -.notSfxChannel3 +.notChannel3 ld a, d - or $80 - and $c7 + or $80 ; use counter mode (i.e. disable output when the counter reaches 0) + and $c7 ; zero the unused bits in the register ld d, a - ld b, $3 - call Audio2_21ff7 - ld [hl], e + ld b, REG_FREQUENCY_LO + call Audio2_GetRegisterPointer + ld [hl], e ; store frequency low byte inc hl - ld [hl], d + ld [hl], d ; store frequency high byte + ; --- this section is only present in this copy of the sound engine ld a, c - cp Ch4 + cp Ch5 jr c, .musicChannel - call Audio2_21e56 + call Audio2_ApplyFrequencyModifier .musicChannel + ; --- ret -Audio2_21e19: +; --- this section is only present in this copy of the sound engine +; unused +Audio2_ResetCryModifiers: ld a, c - cp Ch4 - jr nz, .asm_21e2e + cp Ch5 + jr nz, .skip ld a, [wLowHealthAlarm] bit 7, a - jr z, .asm_21e2e + jr z, .skip xor a ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a -.asm_21e2e +.skip ret +; --- -Audio2_21e2f: - call Audio2_21e8b - jr c, .asm_21e39 - call Audio2_21e9f - jr nc, .asm_21e4c -.asm_21e39 - ld d, $0 +Audio2_SetSfxTempo: + call Audio2_IsCry + jr c, .skipCryCheck + call Audio2_IsBattleSFX + jr nc, .notCry +.skipCryCheck + ld d, 0 ld a, [wTempoModifier] add $80 - jr nc, .asm_21e43 + jr nc, .next inc d -.asm_21e43 +.next ld [wSfxTempo + 1], a ld a, d ld [wSfxTempo], a - jr .asm_21e55 -.asm_21e4c + jr .done +.notCry xor a ld [wSfxTempo + 1], a ld a, $1 ld [wSfxTempo], a -.asm_21e55 +.done ret -Audio2_21e56: - call Audio2_21e8b - jr c, .asm_21e60 - call Audio2_21e9f - jr nc, .asm_21e6c -.asm_21e60 +Audio2_ApplyFrequencyModifier: + call Audio2_IsCry + jr c, .skipCryCheck + call Audio2_IsBattleSFX + jr nc, .done +.skipCryCheck +; if playing a cry, add the cry's frequency modifier ld a, [wFrequencyModifier] add e - jr nc, .asm_21e67 + jr nc, .noCarry inc d -.asm_21e67 +.noCarry dec hl ld e, a ld [hl], e inc hl ld [hl], d -.asm_21e6c +.done ret -Audio2_21e6d: - call Audio2_21e8b - jr nc, .asm_21e88 +Audio2_GoBackOneCommandIfCry: + call Audio2_IsCry + jr nc, .done ld hl, wChannelCommandPointers ld e, c - ld d, $0 + ld d, 0 sla e rl d add hl, de ld a, [hl] - sub $1 + sub 1 ld [hl], a inc hl ld a, [hl] - sbc $0 + sbc 0 ld [hl], a scf ret -.asm_21e88 +.done scf ccf ret -Audio2_21e8b: - ld a, [wChannelSoundIDs + Ch4] - cp $14 - jr nc, .asm_21e94 - jr .asm_21e9a -.asm_21e94 - cp $86 - jr z, .asm_21e9a - jr c, .asm_21e9d -.asm_21e9a +Audio2_IsCry: +; Returns whether the currently playing audio is a cry in carry. + ld a, [wChannelSoundIDs + Ch5] + cp CRY_SFX_START + jr nc, .next + jr .no +.next + cp CRY_SFX_END + jr z, .no + jr c, .yes +.no scf ccf ret -.asm_21e9d +.yes scf ret -Audio2_21e9f: - ld a, [wChannelSoundIDs + Ch7] +; --- 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] ld b, a - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] or b - cp $9d - jr nc, .asm_21ead - jr .asm_21eb3 -.asm_21ead - cp $ea - jr z, .asm_21eb3 - jr c, .asm_21eb6 -.asm_21eb3 + cp BATTLE_SFX_START + jr nc, .next + jr .no +.next + cp BATTLE_SFX_END + jr z, .no + jr c, .yes +.no scf ccf ret -.asm_21eb6 +.yes scf ret +; --- -Audio2_ApplyPitchBend: +Audio2_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit 5, [hl] - jp nz, .asm_21eff - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + bit BIT_PITCH_SLIDE_DECREASING, [hl] + jp nz, .frequencyDecreasing +; frequency increasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl add [hl] ld [hl], a - ld a, $0 + ld a, 0 adc e ld e, a - ld a, $0 + ld a, 0 adc d ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d - jp c, .asm_21f45 - jr nz, .asm_21f32 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jp c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e - jp c, .asm_21f45 - jr .asm_21f32 -.asm_21eff - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jp c, .reachedTargetFrequency + jr .applyUpdatedFrequency +.frequencyDecreasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1105,7 +1156,7 @@ Audio2_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1116,129 +1167,140 @@ Audio2_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] - jr c, .asm_21f45 - jr nz, .asm_21f32 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jr c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] - jr c, .asm_21f45 -.asm_21f32 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jr c, .reachedTargetFrequency +.applyUpdatedFrequency + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld b, $3 - call Audio2_21ff7 + ld b, REG_FREQUENCY_LO + call Audio2_GetRegisterPointer ld a, e ld [hli], a ld [hl], d ret -.asm_21f45 +.reachedTargetFrequency +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio2_21f4e: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio2_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] - jr nc, .asm_21f66 - ld a, $1 -.asm_21f66 + jr nc, .next + ld a, 1 +.next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] - jr c, .asm_21f82 + jr c, .targetFrequencyGreater ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 5, [hl] - jr .asm_21fa5 -.asm_21f82 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + set BIT_PITCH_SLIDE_DECREASING, [hl] + jr .next2 +.targetFrequencyGreater +; If the target frequency is greater, subtract the current frequency from +; the target frequency to get the absolute difference. + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e ld e, a + +; Bug. Instead of borrowing from the high byte of the target frequency as it +; should, it borrows from the high byte of the current frequency instead. +; This means that the result will be 0x200 greater than it should be if the +; low byte of the current frequency is greater than the low byte of the +; target frequency. ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - res 5, [hl] -.asm_21fa5 - ld hl, wChannelPitchBendLengthModifiers + res BIT_PITCH_SLIDE_DECREASING, [hl] + +.next2 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc -.asm_21fa9 +.divideLoop inc b ld a, e sub [hl] ld e, a - jr nc, .asm_21fa9 + jr nc, .divideLoop ld a, d and a - jr z, .asm_21fb7 + jr z, .doneDividing dec a ld d, a - jr .asm_21fa9 -.asm_21fb7 - ld a, e + jr .divideLoop +.doneDividing + ld a, e ; a = remainder - dividend add [hl] - ld d, b - ld b, $0 - ld hl, wChannelPitchBendFrequencySteps + ld d, b ; d = quotient + 1 + ld b, 0 + ld hl, wChannelPitchSlideFrequencySteps add hl, bc - ld [hl], d - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld [hl], d ; store quotient + 1 + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld [hl], a ; store remainder - dividend + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc - ld [hl], a + ld [hl], a ; store remainder - dividend ret -Audio2_ApplyDutyCycle: - ld b, $0 - ld hl, wChannelDutyCycles +Audio2_ApplyDutyCyclePattern: + ld b, 0 + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1246,8 +1308,8 @@ Audio2_ApplyDutyCycle: ld [hl], a and $c0 ld d, a - ld b, $1 - call Audio2_21ff7 + ld b, REG_DUTY_SOUND_LEN + call Audio2_GetRegisterPointer ld a, [hl] and $3f or d @@ -1255,7 +1317,7 @@ Audio2_ApplyDutyCycle: ret Audio2_GetNextMusicByte: - ld d, $0 + ld d, 0 ld a, c add a ld e, a @@ -1272,9 +1334,10 @@ Audio2_GetNextMusicByte: ld [hl], d ret -Audio2_21ff7: +Audio2_GetRegisterPointer: +; hl = address of hardware sound register b for software channel c ld a, c - ld hl, Unknown_222d6 + ld hl, Audio2_HWChannelBaseAddresses add l jr nc, .noCarry inc h @@ -1286,13 +1349,14 @@ Audio2_21ff7: ld h, $ff ret -Audio2_22006: - ld h, $0 +Audio2_MultiplyAdd: +; hl = l + (a * de) + ld h, 0 .loop srl a - jr nc, .noCarry + jr nc, .skipAdd add hl, de -.noCarry +.skipAdd sla e rl d and a @@ -1301,8 +1365,9 @@ Audio2_22006: .done ret -Audio2_22017: - ld h, $0 +Audio2_CalculateFrequency: +; return the frequency for note a, octave b in de + ld h, 0 ld l, a add hl, hl ld d, h @@ -1314,105 +1379,106 @@ Audio2_22017: ld d, [hl] ld a, b .loop - cp Ch7 + cp 7 jr z, .done sra d rr e inc a jr .loop .done - ld a, $8 + ld a, 8 add d ld d, a ret Audio2_PlaySound:: ld [wSoundID], a - cp $ff - jp z, Audio2_221f3 - cp $e9 - jp z, Audio2_2210d - jp c, Audio2_2210d + cp SFX_STOP_ALL_MUSIC + jp z, .stopAllAudio + cp MAX_SFX_ID_2 + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_2204c - jp nc, Audio2_2210d -.asm_2204c + jr z, .playMusic + jp nc, .playSfx + +.playMusic xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a ld [wMusicTempo + 1], a ld [wMusicWaveInstrument], a ld [wSfxWaveInstrument], a - ld d, $8 + ld d, NUM_CHANNELS ld hl, wChannelReturnAddresses - call FillAudioRAM2 + call .FillMem ld hl, wChannelCommandPointers - call FillAudioRAM2 - ld d, $4 + call .FillMem + ld d, NUM_MUSIC_CHANS ld hl, wChannelSoundIDs - call FillAudioRAM2 + call .FillMem ld hl, wChannelFlags1 - call FillAudioRAM2 - ld hl, wChannelDuties - call FillAudioRAM2 + call .FillMem ld hl, wChannelDutyCycles - call FillAudioRAM2 + call .FillMem + ld hl, wChannelDutyCyclePatterns + call .FillMem ld hl, wChannelVibratoDelayCounters - call FillAudioRAM2 + call .FillMem ld hl, wChannelVibratoExtents - call FillAudioRAM2 + call .FillMem ld hl, wChannelVibratoRates - call FillAudioRAM2 + call .FillMem ld hl, wChannelFrequencyLowBytes - call FillAudioRAM2 + call .FillMem ld hl, wChannelVibratoDelayCounterReloadValues - call FillAudioRAM2 + call .FillMem ld hl, wChannelFlags2 - call FillAudioRAM2 - ld hl, wChannelPitchBendLengthModifiers - call FillAudioRAM2 - ld hl, wChannelPitchBendFrequencySteps - call FillAudioRAM2 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - call FillAudioRAM2 + call .FillMem + ld hl, wChannelPitchSlideLengthModifiers + call .FillMem + ld hl, wChannelPitchSlideFrequencySteps + call .FillMem + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyLowBytes + call .FillMem ld a, $1 ld hl, wChannelLoopCounters - call FillAudioRAM2 + call .FillMem ld hl, wChannelNoteDelayCounters - call FillAudioRAM2 + call .FillMem ld hl, wChannelNoteSpeeds - call FillAudioRAM2 + call .FillMem ld [wMusicTempo], a ld a, $ff ld [wStereoPanning], a xor a - ld [rNR50], a + ldh [rNR50], a ld a, $8 - ld [rNR10], a - ld a, $0 - ld [rNR51], a + ldh [rNR10], a + ld a, 0 + ldh [rNR51], a xor a - ld [rNR30], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a ld a, $77 - ld [rNR50], a - jp Audio2_2224e + ldh [rNR50], a + jp .playSoundCommon -Audio2_2210d: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1427,13 +1493,13 @@ Audio2_2210d: rlca rlca ld c, a -.asm_22126 +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 + ld b, 0 ld a, [wSfxHeaderPointer] ld h, a ld a, [wSfxHeaderPointer + 1] @@ -1442,32 +1508,32 @@ Audio2_2210d: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_22162 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_22159 + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_22152 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_22152 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_22162 - jr c, .asm_22162 -.asm_22159 + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_22162 - jr c, .asm_22162 + jr z, .playChannel + jr c, .playChannel ret -.asm_22162 +.playChannel xor a push de ld h, d @@ -1490,10 +1556,10 @@ Audio2_2210d: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -1511,28 +1577,28 @@ Audio2_2210d: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -1549,35 +1615,35 @@ Audio2_2210d: add hl, de ld [hl], a ld a, e - cp $4 - jr nz, .asm_221ea + cp Ch5 + jr nz, .skipSweepDisable ld a, $8 - ld [rNR10], a -.asm_221ea + ldh [rNR10], a ; sweep off +.skipSweepDisable ld a, c and a - jp z, Audio2_2224e + jp z, .playSoundCommon dec c - jp .asm_22126 + jp .sfxChannelLoop -Audio2_221f3: +.stopAllAudio ld a, $80 - ld [rNR52], a - ld [rNR30], a + ldh [rNR52], a ; sound hardware on + ldh [rNR30], a ; wave playback on xor a - ld [rNR51], a - ld [rNR32], a + ldh [rNR51], a ; no sound output + ldh [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [rNR10], a - ld [rNR12], a - ld [rNR22], a - ld [rNR42], a + ldh [rNR10], a ; sweep off + ldh [rNR12], a ; mute channel 1 (pulse channel 1) + ldh [rNR22], a ; mute channel 2 (pulse channel 2) + ldh [rNR42], a ; mute channel 4 (noise channel) ld a, $40 - ld [rNR14], a - ld [rNR24], a - ld [rNR44], a + ldh [rNR14], a ; counter mode + ldh [rNR24], a + ldh [rNR44], a ld a, $77 - ld [rNR50], a + ldh [rNR50], a ; full volume xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1588,11 +1654,11 @@ Audio2_221f3: ld [wSfxWaveInstrument], a ld d, $a0 ld hl, wChannelCommandPointers - call FillAudioRAM2 + call .FillMem ld a, $1 ld d, $18 ld hl, wChannelNoteDelayCounters - call FillAudioRAM2 + call .FillMem ld [wMusicTempo], a ld [wSfxTempo], a ld a, $ff @@ -1600,7 +1666,7 @@ Audio2_221f3: ret ; fills d bytes at hl with a -FillAudioRAM2: +.FillMem ld b, d .loop ld [hli], a @@ -1608,11 +1674,11 @@ FillAudioRAM2: jr nz, .loop ret -Audio2_2224e: +.playSoundCommon ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1632,31 +1698,31 @@ Audio2_2224e: ld b, c inc b inc de - ld c, $0 -.asm_22270 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_22278 + jr z, .next inc c inc hl inc hl - jr .asm_22270 -.asm_22278 + jr .commandPointerLoop +.next push hl push bc push af - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc ld a, [wSoundID] ld [hl], a pop af - cp $3 - jr c, .asm_22291 + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_22291 + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -1671,65 +1737,53 @@ Audio2_2224e: and a ld a, [de] inc de - jr nz, .asm_22270 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_222aa - jr .asm_222d4 -.asm_222aa + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_222d4 - jr c, .asm_222b5 - jr .asm_222d4 -.asm_222b5 - ld hl, wChannelSoundIDs + Ch4 + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer - ld de, Noise2_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio2_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_222d4 - ld a, [rNR50] + jr nz, .done + ldh a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a -.asm_222d4 + ldh [rNR50], a ; full volume +.done ret -Noise2_endchannel: - endchannel +Audio2_CryRet: + sound_ret -Unknown_222d6: - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 +Audio2_HWChannelBaseAddresses: +; the low bytes of each HW channel's base address + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 -Unknown_222de: - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 +Audio2_HWChannelDisableMasks: + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 -Unknown_222e6: - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 +Audio2_HWChannelEnableMasks: + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio2_Pitches: - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ - - +INCLUDE "audio/notes.asm" diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 9a95f3e1..57618486 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,16 +1,16 @@ ; The third of three duplicated sound engines. Audio3_UpdateMusic:: - ld c, Ch0 + ld c, Ch1 .loop - ld b, $0 + ld b, 0 ld hl, wChannelSoundIDs add hl, bc ld a, [hl] and a jr z, .nextChannel ld a, c - cp Ch4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -19,42 +19,36 @@ Audio3_UpdateMusic:: jr nz, .nextChannel set 7, a ld [wMuteAudioAndPauseMusic], a - xor a - ld [rNR51], a - ld [rNR30], a + xor a ; disable all channels' output + ldh [rNR51], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a jr .nextChannel .applyAffects call Audio3_ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number - cp Ch7 + cp Ch8 jr nz, .loop ret ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for wChannelFlags1: -; 0: toggleperfectpitch has been used -; 1: call has been used -; 3: a toggle used only by this routine for vibrato -; 4: pitchbend flag -; 6: dutycycle flag Audio3_ApplyMusicAffects: ld b, $0 ld hl, wChannelNoteDelayCounters ; delay until next note add hl, bc ld a, [hl] - cp $1 ; if delay is 1, play next note + cp 1 ; if the delay is 1, play next note jp z, Audio3_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp Ch4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + Ch4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -63,36 +57,36 @@ Audio3_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit 6, [hl] ; dutycycle + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio3_ApplyDutyCycle + call Audio3_ApplyDutyCyclePattern .checkForExecuteMusic - ld b, $0 + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, .checkForPitchBend + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr nz, .disablePitchBendVibrato -.checkForPitchBend + bit BIT_NOISE_OR_SFX, [hl] + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] ; pitchbend + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio3_ApplyPitchBend + jp Audio3_ApplyPitchSlide .checkVibratoDelay - ld hl, wChannelVibratoDelayCounters ; vibrato delay + ld hl, wChannelVibratoDelayCounters add hl, bc ld a, [hl] and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.disablePitchBendVibrato +.skipPitchSlideVibrato ret .checkForVibrato - ld hl, wChannelVibratoExtents ; vibrato rate + ld hl, wChannelVibratoExtents add hl, bc ld a, [hl] and a @@ -105,33 +99,35 @@ Audio3_ApplyMusicAffects: ld a, [hl] and $f and a - jr z, .vibratoAlreadyDone - dec [hl] ; apply vibrato pitch change + jr z, .applyVibrato + dec [hl] ; decrement counter ret -.vibratoAlreadyDone +.applyVibrato ld a, [hl] swap [hl] or [hl] - ld [hl], a ; reset the vibrato value and start again + ld [hl], a ; reload the counter ld hl, wChannelFrequencyLowBytes add hl, bc ld e, [hl] ; get note pitch ld hl, wChannelFlags1 add hl, bc - bit 3, [hl] ; this is the only code that sets/resets bit three so - jr z, .unset ; it continuously alternates which path it takes - res 3, [hl] +; This is the only code that sets/resets the vibrato direction bit, so it +; continuously alternates which path it takes. + bit BIT_VIBRATO_DIRECTION, [hl] + jr z, .unset + res BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f ld d, a ld a, e sub d jr nc, .noCarry - ld a, $0 + ld a, 0 .noCarry jr .done .unset - set 3, [hl] + set BIT_VIBRATO_DIRECTION, [hl] ld a, d and $f0 swap a @@ -140,63 +136,66 @@ Audio3_ApplyMusicAffects: ld a, $ff .done ld d, a - ld b, $3 - call Audio3_7d8ac + ld b, REG_FREQUENCY_LO + call Audio3_GetRegisterPointer ld [hl], d ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio3_PlayNextNote: +; reload the vibrato delay counter ld hl, wChannelVibratoDelayCounterReloadValues add hl, bc ld a, [hl] ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a + ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] - call Audio3_endchannel + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] + call Audio3_sound_ret ret -Audio3_endchannel: +Audio3_sound_ret: call Audio3_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio3_callchannel ; no - ld b, $0 ; yes + cp sound_ret_cmd + jp nz, Audio3_sound_call + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 1, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c - cp Ch3 + cp Ch4 jr nc, .noiseOrSfxChannel - jr .asm_7d2b3 + jr .disableChannelOutput .noiseOrSfxChannel - res 2, [hl] + res BIT_NOISE_OR_SFX, [hl] ld hl, wChannelFlags2 add hl, bc - res 0, [hl] - cp Ch6 - jr nz, .notSfxChannel3 + res BIT_EXECUTE_MUSIC, [hl] + cp Ch7 + jr nz, .skipSfxChannel3 +; restart hardware channel 3 (wave channel) output ld a, $0 - ld [rNR30], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a -.notSfxChannel3 - jr nz, .asm_7d296 + ldh [rNR30], a +.skipSfxChannel3 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_7d296 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a - jr .asm_7d2b3 -.asm_7d296 - jr .asm_7d2bc + jr .disableChannelOutput +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -216,45 +215,45 @@ Audio3_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio3_endchannel -.asm_7d2b3 - ld hl, Unknown_7db93 + jp Audio3_sound_ret +.disableChannelOutput + ld hl, Audio3_HWChannelDisableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] and [hl] - ld [rNR51], a -.asm_7d2bc - ld a, [wChannelSoundIDs + Ch4] - cp $14 - jr nc, .asm_7d2c5 - jr .asm_7d2e2 -.asm_7d2c5 - ld a, [wChannelSoundIDs + Ch4] - cp $86 - jr z, .asm_7d2e2 - jr c, .asm_7d2d0 - jr .asm_7d2e2 -.asm_7d2d0 + ldh [rNR51], a +.afterDisable + ld a, [wChannelSoundIDs + Ch5] + cp CRY_SFX_START + jr nc, .maybeCry + jr .skipCry +.maybeCry + ld a, [wChannelSoundIDs + Ch5] + cp CRY_SFX_END + jr z, .skipCry + jr c, .cry + jr .skipCry +.cry ld a, c - cp Ch4 - jr z, .asm_7d2d9 - call Audio3_7d73b + cp Ch5 + jr z, .skipRewind + call Audio3_GoBackOneCommandIfCry ret c -.asm_7d2d9 +.skipRewind ld a, [wSavedVolume] - ld [rNR50], a + ldh [rNR50], a xor a ld [wSavedVolume], a -.asm_7d2e2 +.skipCry ld hl, wChannelSoundIDs add hl, bc ld [hl], b ret -Audio3_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio3_loopchannel ; no - call Audio3_GetNextMusicByte ; yes +Audio3_sound_call: + cp sound_call_cmd + jp nz, Audio3_sound_loop + call Audio3_GetNextMusicByte push af call Audio3_GetNextMusicByte ld d, a @@ -285,27 +284,27 @@ Audio3_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set 1, [hl] ; set the call flag - jp Audio3_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio3_sound_ret -Audio3_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio3_notetype ; no - call Audio3_GetNextMusicByte ; yes +Audio3_sound_loop: + cp sound_loop_cmd + jp nz, Audio3_note_type + call Audio3_GetNextMusicByte ld e, a and a jr z, .infiniteLoop - ld b, $0 + ld b, 0 ld hl, wChannelLoopCounters add hl, bc ld a, [hl] cp e jr nz, .loopAgain - ld a, $1 ; if no more loops to make + ld a, $1 ; if no more loops to make, ld [hl], a call Audio3_GetNextMusicByte ; skip pointer call Audio3_GetNextMusicByte - jp Audio3_endchannel + jp Audio3_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -324,36 +323,36 @@ Audio3_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_notetype: +Audio3_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio3_toggleperfectpitch ; no - ld a, d ; yes + cp note_type_cmd + jp nz, Audio3_toggle_perfect_pitch + ld a, d and $f ld b, $0 ld hl, wChannelNoteSpeeds add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp Ch3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio3_GetNextMusicByte ld d, a ld a, c - cp Ch2 + cp Ch3 jr z, .musicChannel3 - cp Ch6 - jr nz, .notChannel3 + cp Ch7 + jr nz, .skipChannel3 ld hl, wSfxWaveInstrument - jr .sfxChannel3 + jr .channel3 .musicChannel3 ld hl, wMusicWaveInstrument -.sfxChannel3 +.channel3 ld a, d and $f - ld [hl], a ; store low nibble of param as duty + ld [hl], a ; store low nibble of param as wave instrument ld a, d and $30 sla a @@ -362,31 +361,31 @@ Audio3_notetype: ; if channel 3, store high nibble as volume ; else, store volume (high nibble) and fade (low nibble) -.notChannel3 - ld b, $0 +.skipChannel3 + ld b, 0 ld hl, wChannelVolumes add hl, bc ld [hl], d .noiseChannel - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_toggleperfectpitch: +Audio3_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? - jr nz, Audio3_vibrato ; no - ld b, $0 ; yes + cp toggle_perfect_pitch_cmd + jr nz, Audio3_vibrato + ld b, 0 ld hl, wChannelFlags1 add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio3_endchannel + jp Audio3_sound_ret Audio3_vibrato: - cp $ea ; is this command a vibrato? - jr nz, Audio3_pitchbend ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 + cp vibrato_cmd + jr nz, Audio3_pitch_slide + call Audio3_GetNextMusicByte + ld b, 0 ld hl, wChannelVibratoDelayCounters add hl, bc ld [hl], a ; store delay @@ -395,9 +394,16 @@ Audio3_vibrato: ld [hl], a ; store delay call Audio3_GetNextMusicByte ld d, a + +; The high nybble of the command byte is the extent of the vibrato. +; Let n be the extent. +; The upper nybble of the channel's byte in the wChannelVibratoExtents +; array will store the extent above the note: (n / 2) + (n % 2). +; The lower nybble will store the extent below the note: (n / 2). +; These two values add to the total extent, n. and $f0 swap a - ld b, $0 + ld b, 0 ld hl, wChannelVibratoExtents add hl, bc srl a @@ -405,7 +411,13 @@ Audio3_vibrato: adc b swap a or e - ld [hl], a ; store rate as both high and low nibbles + ld [hl], a + +; The low nybble of the command byte is the rate of the vibrato. +; The high and low nybbles of the channel's byte in the wChannelVibratoRates +; array are both initialised to this value because the high nybble is the +; counter reload value and the low nybble is the counter itself, which should +; start at its value upon reload. ld a, d and $f ld d, a @@ -413,17 +425,18 @@ Audio3_vibrato: add hl, bc swap a or d - ld [hl], a ; store depth as both high and low nibbles - jp Audio3_endchannel + ld [hl], a -Audio3_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio3_duty ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 - ld hl, wChannelPitchBendLengthModifiers + jp Audio3_sound_ret + +Audio3_pitch_slide: + cp pitch_slide_cmd + jr nz, Audio3_duty_cycle + call Audio3_GetNextMusicByte + ld b, 0 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc - ld [hl], a ; store first param + ld [hl], a call Audio3_GetNextMusicByte ld d, a and $f0 @@ -431,40 +444,40 @@ Audio3_pitchbend: ld b, a ld a, d and $f - call Audio3_7d8cc - ld b, $0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + call Audio3_CalculateFrequency + ld b, 0 + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc - ld [hl], d ; store unknown part of second param - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld [hl], d + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc - ld [hl], e ; store unknown part of second param - ld b, $0 + ld [hl], e + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 4, [hl] ; set pitchbend flag + set BIT_PITCH_SLIDE_ON, [hl] call Audio3_GetNextMusicByte ld d, a - jp Audio3_notelength + jp Audio3_note_length -Audio3_duty: - cp $ec ; is this command a duty? - jr nz, Audio3_tempo ; no - call Audio3_GetNextMusicByte ; yes +Audio3_duty_cycle: + cp duty_cycle_cmd + jr nz, Audio3_tempo + call Audio3_GetNextMusicByte rrca rrca and $c0 - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio3_endchannel + ld [hl], a ; store duty cycle + jp Audio3_sound_ret Audio3_tempo: - cp $ed ; is this command a tempo? - jr nz, Audio3_stereopanning ; no - ld a, c ; yes - cp Ch4 + cp tempo_cmd + jr nz, Audio3_stereo_panning + ld a, c + cp Ch5 jr nc, .sfxChannel call Audio3_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -487,149 +500,166 @@ Audio3_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_stereopanning: - cp $ee ; is this command a stereopanning? - jr nz, Audio3_unknownmusic0xef ; no - call Audio3_GetNextMusicByte ; yes +Audio3_stereo_panning: + cp stereo_panning_cmd + jr nz, Audio3_unknownmusic0xef + call Audio3_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio3_endchannel + jp Audio3_sound_ret ; this appears to never be used Audio3_unknownmusic0xef: - cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio3_dutycycle ; no - call Audio3_GetNextMusicByte ; yes + cp unknownmusic0xef_cmd + jr nz, Audio3_duty_cycle_pattern + call Audio3_GetNextMusicByte push bc call Audio3_PlaySound pop bc ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + Ch7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + Ch7], a + ld [wChannelSoundIDs + Ch8], a .skip - jp Audio3_endchannel + jp Audio3_sound_ret -Audio3_dutycycle: - cp $fc ; is this command a dutycycle? - jr nz, Audio3_volume ; no - call Audio3_GetNextMusicByte ; yes - ld b, $0 +Audio3_duty_cycle_pattern: + cp duty_cycle_pattern_cmd + jr nz, Audio3_volume + call Audio3_GetNextMusicByte + ld b, 0 + ld hl, wChannelDutyCyclePatterns + add hl, bc + ld [hl], a ; store full pattern + and %11000000 ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties - add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set 6, [hl] ; set duty flag - jp Audio3_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio3_sound_ret Audio3_volume: - cp $f0 ; is this command a volume? - jr nz, Audio3_executemusic ; no - call Audio3_GetNextMusicByte ; yes - ld [rNR50], a ; store volume - jp Audio3_endchannel + cp volume_cmd + jr nz, Audio3_execute_music + call Audio3_GetNextMusicByte + ldh [rNR50], a ; store volume + jp Audio3_sound_ret -Audio3_executemusic: - cp $f8 ; is this command an executemusic? - jr nz, Audio3_octave ; no - ld b, $0 ; yes +Audio3_execute_music: + cp execute_music_cmd + jr nz, Audio3_octave + ld b, $0 ld hl, wChannelFlags2 add hl, bc - set 0, [hl] - jp Audio3_endchannel + set BIT_EXECUTE_MUSIC, [hl] + jp Audio3_sound_ret Audio3_octave: and $f0 - cp $e0 ; is this command an octave? - jr nz, Audio3_sfxnote ; no - ld hl, wChannelOctaves ; yes - ld b, $0 + cp octave_cmd + jr nz, Audio3_sfx_note + ld hl, wChannelOctaves + ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio3_endchannel + jp Audio3_sound_ret -; sfxnote is either squarenote or noisenote depending on the channel -Audio3_sfxnote: - cp $20 ; is this command an sfxnote? - jr nz, Audio3_pitchenvelope ; no +; sfx_note is either square_note or noise_note depending on the channel +Audio3_sfx_note: + cp sfx_note_cmd + jr nz, Audio3_pitch_sweep ld a, c - cp Ch3 ; is this a noise or sfx channel? - jr c, Audio3_pitchenvelope ; no - ld b, $0 + cp Ch4 ; is this a noise or sfx channel? + jr c, Audio3_pitch_sweep ; no + ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio3_pitchenvelope ; no - call Audio3_notelength ; yes + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio3_pitch_sweep ; yes + call Audio3_note_length + +; This code seems to do the same thing as what Audio3_ApplyDutyCycleAndSoundLength +; does below. ld d, a - ld b, $0 - ld hl, wChannelDuties + ld b, 0 + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a - ld b, $1 - call Audio3_7d8ac + ld b, REG_DUTY_SOUND_LEN + call Audio3_GetRegisterPointer ld [hl], d + call Audio3_GetNextMusicByte ld d, a - ld b, $2 - call Audio3_7d8ac + ld b, REG_VOLUME_ENVELOPE + call Audio3_GetRegisterPointer ld [hl], d call Audio3_GetNextMusicByte ld e, a ld a, c - cp Ch7 - ld a, $0 - jr z, .sfxNoiseChannel ; only two params for noise channel + cp Ch8 + ld a, 0 + jr z, .skip +; Channels 1 through 3 have 2 registers that control frequency, but the noise +; channel a single register (the polynomial counter) that controls frequency, +; so this command has one less byte on the noise channel. push de call Audio3_GetNextMusicByte pop de -.sfxNoiseChannel +.skip ld d, a push de - call Audio3_7d69d - call Audio3_7d66c + call Audio3_ApplyDutyCycleAndSoundLength + call Audio3_EnableChannelOutput pop de - call Audio3_7d6bf + call Audio3_ApplyWavePatternAndFrequency ret -Audio3_pitchenvelope: +Audio3_pitch_sweep: ld a, c - cp Ch4 + cp Ch5 jr c, Audio3_note ; if not a sfx ld a, d - cp $10 ; is this command an pitchenvelope? - jr nz, Audio3_note ; no + cp pitch_sweep_cmd + jr nz, Audio3_note ld b, $0 ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] + bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio3_note ; no - call Audio3_GetNextMusicByte ; yes - ld [rNR10], a - jp Audio3_endchannel + call Audio3_GetNextMusicByte + ldh [rNR10], a + jp Audio3_sound_ret Audio3_note: ld a, c - cp Ch3 - jr nz, Audio3_notelength ; if not noise channel + cp Ch4 + jr nz, Audio3_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, Audio3_dnote ; yes - jr nc, Audio3_notelength ; no + cp drum_note_cmd + jr z, .drum_note + jr nc, Audio3_note_length + + ; this executes when on the noise channel and + ; the command id is less than drum_note_cmd ($b0) + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a drum_note command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -638,40 +668,40 @@ Audio3_note: ld a, b push de push bc - jr asm_7d571 + jr .playDnote -Audio3_dnote: +.drum_note ld a, d and $f push af push bc - call Audio3_GetNextMusicByte ; get dnote instrument -asm_7d571 + call Audio3_GetNextMusicByte ; get drum_note instrument +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_7d57c + jr nz, .skipDnote ld a, d call Audio3_PlaySound -.asm_7d57c +.skipDnote pop bc pop de -Audio3_notelength: +Audio3_note_length: ld a, d push af and $f inc a - ld b, $0 + ld b, 0 ld e, a ; store note length (in 16ths) ld d, b ld hl, wChannelNoteSpeeds add hl, bc ld a, [hl] ld l, b - call Audio3_7d8bb + call Audio3_MultiplyAdd ld a, c - cp Ch4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -681,22 +711,22 @@ Audio3_notelength: .sfxChannel ld d, $1 ld e, $0 - cp Ch7 + cp Ch8 jr z, .skip ; if noise channel - call Audio3_7d707 + call Audio3_SetSfxTempo ld a, [wSfxTempo] ld d, a ld a, [wSfxTempo + 1] ld e, a .skip - ld a, l - ld b, $0 + ld a, l ; a = note_length * note_speed + ld b, 0 ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld l, [hl] - call Audio3_7d8bb + call Audio3_MultiplyAdd ld e, l - ld d, h + ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) ld hl, wChannelNoteDelayCountersFractionalPart add hl, bc ld [hl], e @@ -706,193 +736,199 @@ Audio3_notelength: ld [hl], a ld hl, wChannelFlags2 add hl, bc - bit 0, [hl] - jr nz, Audio3_notepitch + bit BIT_EXECUTE_MUSIC, [hl] + jr nz, Audio3_note_pitch ld hl, wChannelFlags1 add hl, bc - bit 2, [hl] - jr z, Audio3_notepitch + bit BIT_NOISE_OR_SFX, [hl] + jr z, Audio3_note_pitch pop hl ret -Audio3_notepitch: +Audio3_note_pitch: pop af and $f0 - cp $c0 ; compare to rest + cp rest_cmd jr nz, .notRest ld a, c - cp Ch4 - jr nc, .sfxChannel - ld hl, wChannelSoundIDs + Ch4 + cp Ch5 + jr nc, .next +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a - jr nz, .quit + jr nz, .done ; fall through -.sfxChannel +.next ld a, c - cp Ch2 - jr z, .musicChannel3 - cp Ch6 - jr nz, .notSfxChannel3 -.musicChannel3 - ld b, $0 - ld hl, Unknown_7db93 + cp Ch3 + jr z, .channel3 + cp Ch7 + jr nz, .notChannel3 +.channel3 + ld b, 0 + ld hl, Audio3_HWChannelDisableMasks add hl, bc - ld a, [rNR51] + ldh a, [rNR51] and [hl] - ld [rNR51], a - jr .quit -.notSfxChannel3 - ld b, $2 - call Audio3_7d8ac - ld a, $8 + ldh [rNR51], a ; disable hardware channel 3's output + jr .done +.notChannel3 + ld b, REG_VOLUME_ENVELOPE + call Audio3_GetRegisterPointer + ld a, $8 ; fade in sound ld [hli], a inc hl - ld a, $80 + ld a, $80 ; restart sound ld [hl], a -.quit +.done ret .notRest swap a - ld b, $0 + ld b, 0 ld hl, wChannelOctaves add hl, bc ld b, [hl] - call Audio3_7d8cc - ld b, $0 + call Audio3_CalculateFrequency + ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit 4, [hl] - jr z, .asm_7d62c - call Audio3_7d803 -.asm_7d62c + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio3_InitPitchSlideVars +.skipPitchSlide push de ld a, c - cp Ch4 - jr nc, .skip ; if sfx Channel - ld hl, wChannelSoundIDs + Ch4 - ld d, $0 + cp Ch5 + jr nc, .sfxChannel ; if sfx channel +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + Ch5 + ld d, 0 ld e, a add hl, de ld a, [hl] and a - jr nz, .done - jr .skip -.done + jr nz, .noSfx + jr .sfxChannel +.noSfx pop de ret -.skip - ld b, $0 +.sfxChannel + ld b, 0 ld hl, wChannelVolumes add hl, bc ld d, [hl] - ld b, $2 - call Audio3_7d8ac + ld b, REG_VOLUME_ENVELOPE + call Audio3_GetRegisterPointer ld [hl], d - call Audio3_7d69d - call Audio3_7d66c + call Audio3_ApplyDutyCycleAndSoundLength + call Audio3_EnableChannelOutput pop de ld b, $0 ld hl, wChannelFlags1 add hl, bc - bit 0, [hl] ; has toggleperfectpitch been used? - jr z, .skip2 - inc e ; if yes, increment the pitch by 1 - jr nc, .skip2 + bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? + jr z, .skipFrequencyInc + inc e ; if yes, increment the frequency by 1 + jr nc, .skipFrequencyInc inc d -.skip2 +.skipFrequencyInc ld hl, wChannelFrequencyLowBytes add hl, bc ld [hl], e - call Audio3_7d6bf + call Audio3_ApplyWavePatternAndFrequency ret -Audio3_7d66c: - ld b, $0 - ld hl, Unknown_7db9b +Audio3_EnableChannelOutput: + ld b, 0 + ld hl, Audio3_HWChannelEnableMasks add hl, bc - ld a, [rNR51] - or [hl] + ldh a, [rNR51] + or [hl] ; set this channel's bits ld d, a ld a, c - cp Ch7 - jr z, .sfxNoiseChannel - cp Ch4 + cp Ch8 + jr z, .noiseChannelOrNoSfx + cp Ch5 jr nc, .skip ; if sfx channel - ld hl, wChannelSoundIDs + Ch4 +; If this isn't an SFX channel, try the corresponding SFX channel. + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a jr nz, .skip -.sfxNoiseChannel +.noiseChannelOrNoSfx +; If this is the SFX noise channel or a music channel whose corresponding +; SFX channel is off, apply stereo panning. ld a, [wStereoPanning] - ld hl, Unknown_7db9b + ld hl, Audio3_HWChannelEnableMasks add hl, bc and [hl] ld d, a - ld a, [rNR51] - ld hl, Unknown_7db93 + ldh a, [rNR51] + ld hl, Audio3_HWChannelDisableMasks add hl, bc - and [hl] - or d + and [hl] ; reset this channel's output bits + or d ; set this channel's output bits that enabled in [wStereoPanning] ld d, a .skip ld a, d - ld [rNR51], a + ldh [rNR51], a ret -Audio3_7d69d: - ld b, $0 - ld hl, wChannelNoteDelayCounters +Audio3_ApplyDutyCycleAndSoundLength: + ld b, 0 + ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c - cp Ch2 - jr z, .channel3 ; if music channel 3 - cp Ch6 - jr z, .channel3 ; if sfx channel 3 + cp Ch3 + jr z, .skipDuty ; if music channel 3 + cp Ch7 + jr z, .skipDuty ; if sfx channel 3 +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d ld d, a -.channel3 - ld b, $1 - call Audio3_7d8ac +.skipDuty + ld b, REG_DUTY_SOUND_LEN + call Audio3_GetRegisterPointer ld [hl], d ret -Audio3_7d6bf: +Audio3_ApplyWavePatternAndFrequency: ld a, c - cp Ch2 + cp Ch3 jr z, .channel3 - cp Ch6 - jr nz, .notSfxChannel3 + cp Ch7 + jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp Ch2 - jr z, .musicChannel3 + cp Ch3 + jr z, .next ld de, wSfxWaveInstrument -.musicChannel3 +.next ld a, [de] add a - ld d, $0 + ld d, 0 ld e, a ld hl, Audio3_WavePointers add hl, de ld e, [hl] inc hl ld d, [hl] - ld hl, $ff30 + ld hl, rWave_0 ld b, $f - ld a, $0 - ld [rNR30], a + ld a, $0 ; stop hardware channel 3 + ldh [rNR30], a .loop ld a, [de] inc de @@ -901,152 +937,155 @@ Audio3_7d6bf: dec b and a jr nz, .loop - ld a, $80 - ld [rNR30], a + ld a, $80 ; start hardware channel 3 + ldh [rNR30], a pop de -.notSfxChannel3 +.notChannel3 ld a, d - or $80 - and $c7 + or $80 ; use counter mode (i.e. disable output when the counter reaches 0) + and $c7 ; zero the unused bits in the register ld d, a - ld b, $3 - call Audio3_7d8ac - ld [hl], e + ld b, REG_FREQUENCY_LO + call Audio3_GetRegisterPointer + ld [hl], e ; store frequency low byte inc hl - ld [hl], d - call Audio3_7d729 + ld [hl], d ; store frequency high byte + call Audio3_ApplyFrequencyModifier ret -Audio3_7d707: - call Audio3_7d759 - jr nc, .asm_7d71f - ld d, $0 +Audio3_SetSfxTempo: + call Audio3_IsCry + jr nc, .notCry + ld d, 0 ld a, [wTempoModifier] add $80 - jr nc, .asm_7d716 + jr nc, .next inc d -.asm_7d716 +.next ld [wSfxTempo + 1], a ld a, d ld [wSfxTempo], a - jr .asm_7d728 -.asm_7d71f + jr .done +.notCry xor a ld [wSfxTempo + 1], a ld a, $1 ld [wSfxTempo], a -.asm_7d728 +.done ret -Audio3_7d729: - call Audio3_7d759 - jr nc, .asm_7d73a +Audio3_ApplyFrequencyModifier: + call Audio3_IsCry + jr nc, .done +; if playing a cry, add the cry's frequency modifier ld a, [wFrequencyModifier] add e - jr nc, .asm_7d735 + jr nc, .noCarry inc d -.asm_7d735 +.noCarry dec hl ld e, a ld [hl], e inc hl ld [hl], d -.asm_7d73a +.done ret -Audio3_7d73b: - call Audio3_7d759 - jr nc, .asm_7d756 +Audio3_GoBackOneCommandIfCry: + call Audio3_IsCry + jr nc, .done ld hl, wChannelCommandPointers ld e, c - ld d, $0 + ld d, 0 sla e rl d add hl, de ld a, [hl] - sub $1 + sub 1 ld [hl], a inc hl ld a, [hl] - sbc $0 + sbc 0 ld [hl], a scf ret -.asm_7d756 +.done scf ccf ret -Audio3_7d759: - ld a, [wChannelSoundIDs + Ch4] - cp $14 - jr nc, .asm_7d762 - jr .asm_7d768 -.asm_7d762 - cp $86 - jr z, .asm_7d768 - jr c, .asm_7d76b -.asm_7d768 +Audio3_IsCry: +; Returns whether the currently playing audio is a cry in carry. + ld a, [wChannelSoundIDs + Ch5] + cp CRY_SFX_START + jr nc, .next + jr .no +.next + cp CRY_SFX_END + jr z, .no + jr c, .yes +.no scf ccf ret -.asm_7d76b +.yes scf ret -Audio3_ApplyPitchBend: +Audio3_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit 5, [hl] - jp nz, .asm_7d7b4 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + bit BIT_PITCH_SLIDE_DECREASING, [hl] + jp nz, .frequencyDecreasing +; frequency increasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl add [hl] ld [hl], a - ld a, $0 + ld a, 0 adc e ld e, a - ld a, $0 + ld a, 0 adc d ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d - jp c, .asm_7d7fa - jr nz, .asm_7d7e7 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jp c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e - jp c, .asm_7d7fa - jr .asm_7d7e7 -.asm_7d7b4 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jp c, .reachedTargetFrequency + jr .applyUpdatedFrequency +.frequencyDecreasing + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1054,7 +1093,7 @@ Audio3_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1065,129 +1104,140 @@ Audio3_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] - jr c, .asm_7d7fa - jr nz, .asm_7d7e7 - ld hl, wChannelPitchBendTargetFrequencyLowBytes + jr c, .reachedTargetFrequency + jr nz, .applyUpdatedFrequency + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] - jr c, .asm_7d7fa -.asm_7d7e7 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + jr c, .reachedTargetFrequency +.applyUpdatedFrequency + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld b, $3 - call Audio3_7d8ac + ld b, REG_FREQUENCY_LO + call Audio3_GetRegisterPointer ld a, e ld [hli], a ld [hl], d ret -.asm_7d7fa +.reachedTargetFrequency +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res 4, [hl] - res 5, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio3_7d803: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio3_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] - jr nc, .asm_7d81b - ld a, $1 -.asm_7d81b + jr nc, .next + ld a, 1 +.next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] - jr c, .asm_7d837 + jr c, .targetFrequencyGreater ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - set 5, [hl] - jr .asm_7d85a -.asm_7d837 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + set BIT_PITCH_SLIDE_DECREASING, [hl] + jr .next2 +.targetFrequencyGreater +; If the target frequency is greater, subtract the current frequency from +; the target frequency to get the absolute difference. + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e ld e, a + +; Bug. Instead of borrowing from the high byte of the target frequency as it +; should, it borrows from the high byte of the current frequency instead. +; This means that the result will be 0x200 greater than it should be if the +; low byte of the current frequency is greater than the low byte of the +; target frequency. ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d ld d, a - ld b, $0 + ld b, 0 ld hl, wChannelFlags1 add hl, bc - res 5, [hl] -.asm_7d85a - ld hl, wChannelPitchBendLengthModifiers + res BIT_PITCH_SLIDE_DECREASING, [hl] + +.next2 + ld hl, wChannelPitchSlideLengthModifiers add hl, bc -.asm_7d85e +.divideLoop inc b ld a, e sub [hl] ld e, a - jr nc, .asm_7d85e + jr nc, .divideLoop ld a, d and a - jr z, .asm_7d86c + jr z, .doneDividing dec a ld d, a - jr .asm_7d85e -.asm_7d86c - ld a, e + jr .divideLoop +.doneDividing + ld a, e ; a = remainder - dividend add [hl] - ld d, b - ld b, $0 - ld hl, wChannelPitchBendFrequencySteps + ld d, b ; d = quotient + 1 + ld b, 0 + ld hl, wChannelPitchSlideFrequencySteps add hl, bc - ld [hl], d - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld [hl], d ; store quotient + 1 + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc - ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld [hl], a ; store remainder - dividend + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc - ld [hl], a + ld [hl], a ; store remainder - dividend ret -Audio3_ApplyDutyCycle: - ld b, $0 - ld hl, wChannelDutyCycles +Audio3_ApplyDutyCyclePattern: + ld b, 0 + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1195,8 +1245,8 @@ Audio3_ApplyDutyCycle: ld [hl], a and $c0 ld d, a - ld b, $1 - call Audio3_7d8ac + ld b, REG_DUTY_SOUND_LEN + call Audio3_GetRegisterPointer ld a, [hl] and $3f or d @@ -1204,7 +1254,7 @@ Audio3_ApplyDutyCycle: ret Audio3_GetNextMusicByte: - ld d, $0 + ld d, 0 ld a, c add a ld e, a @@ -1221,9 +1271,10 @@ Audio3_GetNextMusicByte: ld [hl], d ret -Audio3_7d8ac: +Audio3_GetRegisterPointer: +; hl = address of hardware sound register b for software channel c ld a, c - ld hl, Unknown_7db8b + ld hl, Audio3_HWChannelBaseAddresses add l jr nc, .noCarry inc h @@ -1235,13 +1286,14 @@ Audio3_7d8ac: ld h, $ff ret -Audio3_7d8bb: - ld h, $0 +Audio3_MultiplyAdd: +; hl = l + (a * de) + ld h, 0 .loop srl a - jr nc, .noCarry + jr nc, .skipAdd add hl, de -.noCarry +.skipAdd sla e rl d and a @@ -1250,8 +1302,9 @@ Audio3_7d8bb: .done ret -Audio3_7d8cc: - ld h, $0 +Audio3_CalculateFrequency: +; return the frequency for note a, octave b in de + ld h, 0 ld l, a add hl, hl ld d, h @@ -1263,105 +1316,106 @@ Audio3_7d8cc: ld d, [hl] ld a, b .loop - cp $7 + cp 7 jr z, .done sra d rr e inc a jr .loop .done - ld a, $8 + ld a, 8 add d ld d, a ret Audio3_PlaySound:: ld [wSoundID], a - cp $ff - jp z, Audio3_7daa8 - cp $c2 - jp z, Audio3_7d9c2 - jp c, Audio3_7d9c2 + cp SFX_STOP_ALL_MUSIC + jp z, .stopAllAudio + cp MAX_SFX_ID_3 + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_7d901 - jp nc, Audio3_7d9c2 -.asm_7d901 + jr z, .playMusic + jp nc, .playSfx + +.playMusic xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a ld [wMusicTempo + 1], a ld [wMusicWaveInstrument], a ld [wSfxWaveInstrument], a - ld d, $8 + ld d, NUM_CHANNELS ld hl, wChannelReturnAddresses - call FillAudioRAM3 + call .FillMem ld hl, wChannelCommandPointers - call FillAudioRAM3 - ld d, $4 + call .FillMem + ld d, NUM_MUSIC_CHANS ld hl, wChannelSoundIDs - call FillAudioRAM3 + call .FillMem ld hl, wChannelFlags1 - call FillAudioRAM3 - ld hl, wChannelDuties - call FillAudioRAM3 + call .FillMem ld hl, wChannelDutyCycles - call FillAudioRAM3 + call .FillMem + ld hl, wChannelDutyCyclePatterns + call .FillMem ld hl, wChannelVibratoDelayCounters - call FillAudioRAM3 + call .FillMem ld hl, wChannelVibratoExtents - call FillAudioRAM3 + call .FillMem ld hl, wChannelVibratoRates - call FillAudioRAM3 + call .FillMem ld hl, wChannelFrequencyLowBytes - call FillAudioRAM3 + call .FillMem ld hl, wChannelVibratoDelayCounterReloadValues - call FillAudioRAM3 + call .FillMem ld hl, wChannelFlags2 - call FillAudioRAM3 - ld hl, wChannelPitchBendLengthModifiers - call FillAudioRAM3 - ld hl, wChannelPitchBendFrequencySteps - call FillAudioRAM3 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - call FillAudioRAM3 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - call FillAudioRAM3 + call .FillMem + ld hl, wChannelPitchSlideLengthModifiers + call .FillMem + ld hl, wChannelPitchSlideFrequencySteps + call .FillMem + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyHighBytes + call .FillMem + ld hl, wChannelPitchSlideTargetFrequencyLowBytes + call .FillMem ld a, $1 ld hl, wChannelLoopCounters - call FillAudioRAM3 + call .FillMem ld hl, wChannelNoteDelayCounters - call FillAudioRAM3 + call .FillMem ld hl, wChannelNoteSpeeds - call FillAudioRAM3 + call .FillMem ld [wMusicTempo], a ld a, $ff ld [wStereoPanning], a xor a - ld [rNR50], a + ldh [rNR50], a ld a, $8 - ld [rNR10], a - ld a, $0 - ld [rNR51], a + ldh [rNR10], a + ld a, 0 + ldh [rNR51], a xor a - ld [rNR30], a + ldh [rNR30], a ld a, $80 - ld [rNR30], a + ldh [rNR30], a ld a, $77 - ld [rNR50], a - jp Audio3_7db03 + ldh [rNR50], a + jp .playSoundCommon -Audio3_7d9c2: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1376,13 +1430,13 @@ Audio3_7d9c2: rlca rlca ld c, a -.asm_7d9db +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 + ld b, 0 ld a, [wSfxHeaderPointer] ld h, a ld a, [wSfxHeaderPointer + 1] @@ -1391,32 +1445,32 @@ Audio3_7d9c2: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_7da17 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_7da0e + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_7da07 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_7da07 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_7da17 - jr c, .asm_7da17 -.asm_7da0e + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_7da17 - jr c, .asm_7da17 + jr z, .playChannel + jr c, .playChannel ret -.asm_7da17 +.playChannel xor a push de ld h, d @@ -1439,10 +1493,10 @@ Audio3_7d9c2: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -1460,28 +1514,28 @@ Audio3_7d9c2: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -1498,35 +1552,35 @@ Audio3_7d9c2: add hl, de ld [hl], a ld a, e - cp $4 - jr nz, .asm_7da9f + cp Ch5 + jr nz, .skipSweepDisable ld a, $8 - ld [rNR10], a -.asm_7da9f + ldh [rNR10], a ; sweep off +.skipSweepDisable ld a, c and a - jp z, Audio3_7db03 + jp z, .playSoundCommon dec c - jp .asm_7d9db + jp .sfxChannelLoop -Audio3_7daa8: +.stopAllAudio ld a, $80 - ld [rNR52], a - ld [rNR30], a + ldh [rNR52], a ; sound hardware on + ldh [rNR30], a ; wave playback on xor a - ld [rNR51], a - ld [rNR32], a + ldh [rNR51], a ; no sound output + ldh [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [rNR10], a - ld [rNR12], a - ld [rNR22], a - ld [rNR42], a + ldh [rNR10], a ; sweep off + ldh [rNR12], a ; mute channel 1 (pulse channel 1) + ldh [rNR22], a ; mute channel 2 (pulse channel 2) + ldh [rNR42], a ; mute channel 4 (noise channel) ld a, $40 - ld [rNR14], a - ld [rNR24], a - ld [rNR44], a + ldh [rNR14], a ; counter mode + ldh [rNR24], a + ldh [rNR44], a ld a, $77 - ld [rNR50], a + ldh [rNR50], a ; full volume xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1537,11 +1591,11 @@ Audio3_7daa8: ld [wSfxWaveInstrument], a ld d, $a0 ld hl, wChannelCommandPointers - call FillAudioRAM3 + call .FillMem ld a, $1 ld d, $18 ld hl, wChannelNoteDelayCounters - call FillAudioRAM3 + call .FillMem ld [wMusicTempo], a ld [wSfxTempo], a ld a, $ff @@ -1549,7 +1603,7 @@ Audio3_7daa8: ret ; fills d bytes at hl with a -FillAudioRAM3: +.FillMem ld b, d .loop ld [hli], a @@ -1557,11 +1611,11 @@ FillAudioRAM3: jr nz, .loop ret -Audio3_7db03: +.playSoundCommon ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -1581,31 +1635,31 @@ Audio3_7db03: ld b, c inc b inc de - ld c, $0 -.asm_7db25 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_7db2d + jr z, .next inc c inc hl inc hl - jr .asm_7db25 -.asm_7db2d + jr .commandPointerLoop +.next push hl push bc push af - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc ld a, [wSoundID] ld [hl], a pop af - cp $3 - jr c, .asm_7db46 + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_7db46 + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -1620,65 +1674,53 @@ Audio3_7db03: and a ld a, [de] inc de - jr nz, .asm_7db25 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_7db5f - jr .asm_7db89 -.asm_7db5f + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_7db89 - jr c, .asm_7db6a - jr .asm_7db89 -.asm_7db6a - ld hl, wChannelSoundIDs + Ch4 + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer - ld de, Noise3_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio3_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_7db89 - ld a, [rNR50] + jr nz, .done + ldh a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a -.asm_7db89 + ldh [rNR50], a ; full volume +.done ret -Noise3_endchannel: - endchannel +Audio3_CryRet: + sound_ret -Unknown_7db8b: - db $10, $15, $1A, $1F ; channels 0-3 - db $10, $15, $1A, $1F ; channels 4-7 +Audio3_HWChannelBaseAddresses: +; the low bytes of each HW channel's base address + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 + db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 -Unknown_7db93: - db $EE, $DD, $BB, $77 ; channels 0-3 - db $EE, $DD, $BB, $77 ; channels 4-7 +Audio3_HWChannelDisableMasks: + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 + db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 -Unknown_7db9b: - db $11, $22, $44, $88 ; channels 0-3 - db $11, $22, $44, $88 ; channels 4-7 +Audio3_HWChannelEnableMasks: + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 + db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio3_Pitches: - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ - - +INCLUDE "audio/notes.asm" diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm old mode 100755 new mode 100644 index 38594d41..ef85eae6 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,66 +1,66 @@ Music_PalletTown:: - audio Music_PalletTown, Ch0, Ch1, Ch2 + audio_header Music_PalletTown, Ch1, Ch2, Ch3 Music_Pokecenter:: - audio Music_Pokecenter, Ch0, Ch1, Ch2 + audio_header Music_Pokecenter, Ch1, Ch2, Ch3 Music_Gym:: - audio Music_Gym, Ch0, Ch1, Ch2 + audio_header Music_Gym, Ch1, Ch2, Ch3 ; Viridian City, Pewter City, Saffron City Music_Cities1:: - audio Music_Cities1, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4 ; Cerulean City, Fuchsia City Music_Cities2:: - audio Music_Cities2, Ch0, Ch1, Ch2 + audio_header Music_Cities2, Ch1, Ch2, Ch3 Music_Celadon:: - audio Music_Celadon, Ch0, Ch1, Ch2 + audio_header Music_Celadon, Ch1, Ch2, Ch3 Music_Cinnabar:: - audio Music_Cinnabar, Ch0, Ch1, Ch2 + audio_header Music_Cinnabar, Ch1, Ch2, Ch3 Music_Vermilion:: - audio Music_Vermilion, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4 Music_Lavender:: - audio Music_Lavender, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4 Music_SSAnne:: - audio Music_SSAnne, Ch0, Ch1, Ch2 + audio_header Music_SSAnne, Ch1, Ch2, Ch3 Music_MeetProfOak:: - audio Music_MeetProfOak, Ch0, Ch1, Ch2 + audio_header Music_MeetProfOak, Ch1, Ch2, Ch3 Music_MeetRival:: - audio Music_MeetRival, Ch0, Ch1, Ch2 + audio_header Music_MeetRival, Ch1, Ch2, Ch3 Music_MuseumGuy:: - audio Music_MuseumGuy, Ch0, Ch1, Ch2, Ch3 + audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4 Music_SafariZone:: - audio Music_SafariZone, Ch0, Ch1, Ch2 + audio_header Music_SafariZone, Ch1, Ch2, Ch3 Music_PkmnHealed:: - audio Music_PkmnHealed, Ch0, Ch1, Ch2 + audio_header Music_PkmnHealed, Ch1, Ch2, Ch3 ; Routes 1 and 2 Music_Routes1:: - audio Music_Routes1, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4 ; Routes 24 and 25 Music_Routes2:: - audio Music_Routes2, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - audio Music_Routes3, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - audio Music_Routes4, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4 ; Route 23, Indigo Plateau Music_IndigoPlateau:: - audio Music_IndigoPlateau, Ch0, Ch1, Ch2, Ch3 + audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm old mode 100755 new mode 100644 index 45557420..d6cca9a9 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,20 +1,20 @@ Music_GymLeaderBattle:: - audio Music_GymLeaderBattle, Ch0, Ch1, Ch2 + audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3 Music_TrainerBattle:: - audio Music_TrainerBattle, Ch0, Ch1, Ch2 + audio_header Music_TrainerBattle, Ch1, Ch2, Ch3 Music_WildBattle:: - audio Music_WildBattle, Ch0, Ch1, Ch2 + audio_header Music_WildBattle, Ch1, Ch2, Ch3 Music_FinalBattle:: - audio Music_FinalBattle, Ch0, Ch1, Ch2 + audio_header Music_FinalBattle, Ch1, Ch2, Ch3 Music_DefeatedTrainer:: - audio Music_DefeatedTrainer, Ch0, Ch1, Ch2 + audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3 Music_DefeatedWildMon:: - audio Music_DefeatedWildMon, Ch0, Ch1, Ch2 + audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3 Music_DefeatedGymLeader:: - audio Music_DefeatedGymLeader, Ch0, Ch1, Ch2 + audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm old mode 100755 new mode 100644 index 90798882..ca21b419 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,56 +1,56 @@ Music_TitleScreen:: - audio Music_TitleScreen, Ch0, Ch1, Ch2, Ch3 + audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4 Music_Credits:: - audio Music_Credits, Ch0, Ch1, Ch2 + audio_header Music_Credits, Ch1, Ch2, Ch3 Music_HallOfFame:: - audio Music_HallOfFame, Ch0, Ch1, Ch2 + audio_header Music_HallOfFame, Ch1, Ch2, Ch3 Music_OaksLab:: - audio Music_OaksLab, Ch0, Ch1, Ch2 + audio_header Music_OaksLab, Ch1, Ch2, Ch3 Music_JigglypuffSong:: - audio Music_JigglypuffSong, Ch0, Ch1 + audio_header Music_JigglypuffSong, Ch1, Ch2 Music_BikeRiding:: - audio Music_BikeRiding, Ch0, Ch1, Ch2, Ch3 + audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4 Music_Surfing:: - audio Music_Surfing, Ch0, Ch1, Ch2 + audio_header Music_Surfing, Ch1, Ch2, Ch3 Music_GameCorner:: - audio Music_GameCorner, Ch0, Ch1, Ch2 + audio_header Music_GameCorner, Ch1, Ch2, Ch3 Music_IntroBattle:: - audio Music_IntroBattle, Ch0, Ch1, Ch2, Ch3 + audio_header Music_IntroBattle, Ch1, Ch2, Ch3, Ch4 -; Power Plant, Unknown Dungeon, Rocket HQ +; Power Plant, Cerulean Cave, Rocket HQ Music_Dungeon1:: - audio Music_Dungeon1, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - audio Music_Dungeon2, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - audio Music_Dungeon3, Ch0, Ch1, Ch2, Ch3 + audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4 Music_CinnabarMansion:: - audio Music_CinnabarMansion, Ch0, Ch1, Ch2, Ch3 + audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4 Music_PokemonTower:: - audio Music_PokemonTower, Ch0, Ch1, Ch2 + audio_header Music_PokemonTower, Ch1, Ch2, Ch3 Music_SilphCo:: - audio Music_SilphCo, Ch0, Ch1, Ch2 + audio_header Music_SilphCo, Ch1, Ch2, Ch3 Music_MeetEvilTrainer:: - audio Music_MeetEvilTrainer, Ch0, Ch1, Ch2 + audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3 Music_MeetFemaleTrainer:: - audio Music_MeetFemaleTrainer, Ch0, Ch1, Ch2 + audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3 Music_MeetMaleTrainer:: - audio Music_MeetMaleTrainer, Ch0, Ch1, Ch2 + audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index be30979c..f6512d56 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,114 +1,114 @@ SFX_Get_Item1_1:: - audio SFX_Get_Item1_1, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7 SFX_Get_Item2_1:: - audio SFX_Get_Item2_1, Ch4, Ch5, Ch6 + audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7 SFX_Tink_1:: - audio SFX_Tink_1, Ch4 + audio_header SFX_Tink_1, Ch5 SFX_Heal_HP_1:: - audio SFX_Heal_HP_1, Ch4 + audio_header SFX_Heal_HP_1, Ch5 SFX_Heal_Ailment_1:: - audio SFX_Heal_Ailment_1, Ch4 + audio_header SFX_Heal_Ailment_1, Ch5 SFX_Start_Menu_1:: - audio SFX_Start_Menu_1, Ch7 + audio_header SFX_Start_Menu_1, Ch8 SFX_Press_AB_1:: - audio SFX_Press_AB_1, Ch4 + audio_header SFX_Press_AB_1, Ch5 SFX_Pokedex_Rating_1:: - audio SFX_Pokedex_Rating_1, Ch4, Ch5, Ch6 + audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7 SFX_Get_Key_Item_1:: - audio SFX_Get_Key_Item_1, Ch4, Ch5, Ch6 + audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7 SFX_Poisoned_1:: - audio SFX_Poisoned_1, Ch4 + audio_header SFX_Poisoned_1, Ch5 SFX_Trade_Machine_1:: - audio SFX_Trade_Machine_1, Ch4 + audio_header SFX_Trade_Machine_1, Ch5 SFX_Turn_On_PC_1:: - audio SFX_Turn_On_PC_1, Ch4 + audio_header SFX_Turn_On_PC_1, Ch5 SFX_Turn_Off_PC_1:: - audio SFX_Turn_Off_PC_1, Ch4 + audio_header SFX_Turn_Off_PC_1, Ch5 SFX_Enter_PC_1:: - audio SFX_Enter_PC_1, Ch4 + audio_header SFX_Enter_PC_1, Ch5 SFX_Shrink_1:: - audio SFX_Shrink_1, Ch4 + audio_header SFX_Shrink_1, Ch5 SFX_Switch_1:: - audio SFX_Switch_1, Ch4 + audio_header SFX_Switch_1, Ch5 SFX_Healing_Machine_1:: - audio SFX_Healing_Machine_1, Ch4 + audio_header SFX_Healing_Machine_1, Ch5 SFX_Teleport_Exit1_1:: - audio SFX_Teleport_Exit1_1, Ch4 + audio_header SFX_Teleport_Exit1_1, Ch5 SFX_Teleport_Enter1_1:: - audio SFX_Teleport_Enter1_1, Ch4 + audio_header SFX_Teleport_Enter1_1, Ch5 SFX_Teleport_Exit2_1:: - audio SFX_Teleport_Exit2_1, Ch4 + audio_header SFX_Teleport_Exit2_1, Ch5 SFX_Ledge_1:: - audio SFX_Ledge_1, Ch4 + audio_header SFX_Ledge_1, Ch5 SFX_Teleport_Enter2_1:: - audio SFX_Teleport_Enter2_1, Ch7 + audio_header SFX_Teleport_Enter2_1, Ch8 SFX_Fly_1:: - audio SFX_Fly_1, Ch7 + audio_header SFX_Fly_1, Ch8 SFX_Denied_1:: - audio SFX_Denied_1, Ch4, Ch5 + audio_header SFX_Denied_1, Ch5, Ch6 SFX_Arrow_Tiles_1:: - audio SFX_Arrow_Tiles_1, Ch4 + audio_header SFX_Arrow_Tiles_1, Ch5 SFX_Push_Boulder_1:: - audio SFX_Push_Boulder_1, Ch7 + audio_header SFX_Push_Boulder_1, Ch8 SFX_SS_Anne_Horn_1:: - audio SFX_SS_Anne_Horn_1, Ch4, Ch5 + audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6 SFX_Withdraw_Deposit_1:: - audio SFX_Withdraw_Deposit_1, Ch4 + audio_header SFX_Withdraw_Deposit_1, Ch5 SFX_Cut_1:: - audio SFX_Cut_1, Ch7 + audio_header SFX_Cut_1, Ch8 SFX_Go_Inside_1:: - audio SFX_Go_Inside_1, Ch7 + audio_header SFX_Go_Inside_1, Ch8 SFX_Swap_1:: - audio SFX_Swap_1, Ch4, Ch5 + audio_header SFX_Swap_1, Ch5, Ch6 SFX_59_1:: - audio SFX_59_1, Ch4, Ch5 + audio_header SFX_59_1, Ch5, Ch6 SFX_Purchase_1:: - audio SFX_Purchase_1, Ch4, Ch5 + audio_header SFX_Purchase_1, Ch5, Ch6 SFX_Collision_1:: - audio SFX_Collision_1, Ch4 + audio_header SFX_Collision_1, Ch5 SFX_Go_Outside_1:: - audio SFX_Go_Outside_1, Ch7 + audio_header SFX_Go_Outside_1, Ch8 SFX_Save_1:: - audio SFX_Save_1, Ch4, Ch5 + audio_header SFX_Save_1, Ch5, Ch6 -; the Pokeflute sound effect directly hijacks channel 2 (not anymore) +; the Pokeflute sound effect directly hijacks channel 3 (not anymore) SFX_Pokeflute:: - audio SFX_Pokeflute, Ch6 + audio_header SFX_Pokeflute, Ch7 SFX_Safari_Zone_PA:: - audio SFX_Safari_Zone_PA, Ch4 + audio_header SFX_Safari_Zone_PA, Ch5 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 65bad5d7..0836a8e5 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,167 +1,167 @@ SFX_Level_Up:: - audio SFX_Level_Up, Ch4, Ch5, Ch6 + audio_header SFX_Level_Up, Ch5, Ch6, Ch7 SFX_Ball_Toss:: - audio SFX_Ball_Toss, Ch4, Ch5 + audio_header SFX_Ball_Toss, Ch5, Ch6 SFX_Ball_Poof:: - audio SFX_Ball_Poof, Ch4, Ch7 + audio_header SFX_Ball_Poof, Ch5, Ch8 SFX_Faint_Thud:: - audio SFX_Faint_Thud, Ch4, Ch7 + audio_header SFX_Faint_Thud, Ch5, Ch8 SFX_Run:: - audio SFX_Run, Ch7 + audio_header SFX_Run, Ch8 SFX_Dex_Page_Added:: - audio SFX_Dex_Page_Added, Ch4, Ch5 + audio_header SFX_Dex_Page_Added, Ch5, Ch6 SFX_Caught_Mon:: - audio SFX_Caught_Mon, Ch4, Ch5, Ch6 + audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7 SFX_Peck:: - audio SFX_Peck, Ch7 + audio_header SFX_Peck, Ch8 SFX_Faint_Fall:: - audio SFX_Faint_Fall, Ch4 + audio_header SFX_Faint_Fall, Ch5 SFX_Battle_09:: - audio SFX_Battle_09, Ch4 + audio_header SFX_Battle_09, Ch5 SFX_Pound:: - audio SFX_Pound, Ch7 + audio_header SFX_Pound, Ch8 SFX_Battle_0B:: - audio SFX_Battle_0B, Ch7 + audio_header SFX_Battle_0B, Ch8 SFX_Battle_0C:: - audio SFX_Battle_0C, Ch7 + audio_header SFX_Battle_0C, Ch8 SFX_Battle_0D:: - audio SFX_Battle_0D, Ch7 + audio_header SFX_Battle_0D, Ch8 SFX_Battle_0E:: - audio SFX_Battle_0E, Ch7 + audio_header SFX_Battle_0E, Ch8 SFX_Battle_0F:: - audio SFX_Battle_0F, Ch7 + audio_header SFX_Battle_0F, Ch8 SFX_Damage:: - audio SFX_Damage, Ch7 + audio_header SFX_Damage, Ch8 SFX_Not_Very_Effective:: - audio SFX_Not_Very_Effective, Ch7 + audio_header SFX_Not_Very_Effective, Ch8 SFX_Battle_12:: - audio SFX_Battle_12, Ch7 + audio_header SFX_Battle_12, Ch8 SFX_Battle_13:: - audio SFX_Battle_13, Ch7 + audio_header SFX_Battle_13, Ch8 SFX_Battle_14:: - audio SFX_Battle_14, Ch7 + audio_header SFX_Battle_14, Ch8 SFX_Vine_Whip:: - audio SFX_Vine_Whip, Ch7 + audio_header SFX_Vine_Whip, Ch8 SFX_Battle_16:: - audio SFX_Battle_16, Ch7 + audio_header SFX_Battle_16, Ch8 SFX_Battle_17:: - audio SFX_Battle_17, Ch7 + audio_header SFX_Battle_17, Ch8 SFX_Battle_18:: - audio SFX_Battle_18, Ch7 + audio_header SFX_Battle_18, Ch8 SFX_Battle_19:: - audio SFX_Battle_19, Ch7 + audio_header SFX_Battle_19, Ch8 SFX_Super_Effective:: - audio SFX_Super_Effective, Ch7 + audio_header SFX_Super_Effective, Ch8 SFX_Battle_1B:: - audio SFX_Battle_1B, Ch7 + audio_header SFX_Battle_1B, Ch8 SFX_Battle_1C:: - audio SFX_Battle_1C, Ch7 + audio_header SFX_Battle_1C, Ch8 SFX_Doubleslap:: - audio SFX_Doubleslap, Ch7 + audio_header SFX_Doubleslap, Ch8 SFX_Battle_1E:: - audio SFX_Battle_1E, Ch4, Ch7 + audio_header SFX_Battle_1E, Ch5, Ch8 SFX_Horn_Drill:: - audio SFX_Horn_Drill, Ch7 + audio_header SFX_Horn_Drill, Ch8 SFX_Battle_20:: - audio SFX_Battle_20, Ch7 + audio_header SFX_Battle_20, Ch8 SFX_Battle_21:: - audio SFX_Battle_21, Ch7 + audio_header SFX_Battle_21, Ch8 SFX_Battle_22:: - audio SFX_Battle_22, Ch7 + audio_header SFX_Battle_22, Ch8 SFX_Battle_23:: - audio SFX_Battle_23, Ch7 + audio_header SFX_Battle_23, Ch8 SFX_Battle_24:: - audio SFX_Battle_24, Ch4, Ch7 + audio_header SFX_Battle_24, Ch5, Ch8 SFX_Battle_25:: - audio SFX_Battle_25, Ch7 + audio_header SFX_Battle_25, Ch8 SFX_Battle_26:: - audio SFX_Battle_26, Ch7 + audio_header SFX_Battle_26, Ch8 SFX_Battle_27:: - audio SFX_Battle_27, Ch4, Ch5, Ch7 + audio_header SFX_Battle_27, Ch5, Ch6, Ch8 SFX_Battle_28:: - audio SFX_Battle_28, Ch4, Ch5, Ch7 + audio_header SFX_Battle_28, Ch5, Ch6, Ch8 SFX_Battle_29:: - audio SFX_Battle_29, Ch4, Ch7 + audio_header SFX_Battle_29, Ch5, Ch8 SFX_Battle_2A:: - audio SFX_Battle_2A, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2A, Ch5, Ch6, Ch8 SFX_Battle_2B:: - audio SFX_Battle_2B, Ch4, Ch7 + audio_header SFX_Battle_2B, Ch5, Ch8 SFX_Battle_2C:: - audio SFX_Battle_2C, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2C, Ch5, Ch6, Ch8 SFX_Psybeam:: - audio SFX_Psybeam, Ch4, Ch5, Ch7 + audio_header SFX_Psybeam, Ch5, Ch6, Ch8 SFX_Battle_2E:: - audio SFX_Battle_2E, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2E, Ch5, Ch6, Ch8 SFX_Battle_2F:: - audio SFX_Battle_2F, Ch4, Ch5, Ch7 + audio_header SFX_Battle_2F, Ch5, Ch6, Ch8 SFX_Psychic_M:: - audio SFX_Psychic_M, Ch4, Ch5, Ch7 + audio_header SFX_Psychic_M, Ch5, Ch6, Ch8 SFX_Battle_31:: - audio SFX_Battle_31, Ch4, Ch5 + audio_header SFX_Battle_31, Ch5, Ch6 SFX_Battle_32:: - audio SFX_Battle_32, Ch4, Ch5 + audio_header SFX_Battle_32, Ch5, Ch6 SFX_Battle_33:: - audio SFX_Battle_33, Ch4, Ch5 + audio_header SFX_Battle_33, Ch5, Ch6 SFX_Battle_34:: - audio SFX_Battle_34, Ch4, Ch5, Ch7 + audio_header SFX_Battle_34, Ch5, Ch6, Ch8 SFX_Battle_35:: - audio SFX_Battle_35, Ch4, Ch5 + audio_header SFX_Battle_35, Ch5, Ch6 SFX_Battle_36:: - audio SFX_Battle_36, Ch4, Ch5, Ch7 + audio_header SFX_Battle_36, Ch5, Ch6, Ch8 SFX_Silph_Scope:: - audio SFX_Silph_Scope, Ch4 + audio_header SFX_Silph_Scope, Ch5 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index ff14264a..bbf4576c 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,29 +1,29 @@ SFX_Intro_Lunge:: - audio SFX_Intro_Lunge, Ch7 + audio_header SFX_Intro_Lunge, Ch8 SFX_Intro_Hip:: - audio SFX_Intro_Hip, Ch4 + audio_header SFX_Intro_Hip, Ch5 SFX_Intro_Hop:: - audio SFX_Intro_Hop, Ch4 + audio_header SFX_Intro_Hop, Ch5 SFX_Intro_Raise:: - audio SFX_Intro_Raise, Ch7 + audio_header SFX_Intro_Raise, Ch8 SFX_Intro_Crash:: - audio SFX_Intro_Crash, Ch7 + audio_header SFX_Intro_Crash, Ch8 SFX_Intro_Whoosh:: - audio SFX_Intro_Whoosh, Ch7 + audio_header SFX_Intro_Whoosh, Ch8 SFX_Slots_Stop_Wheel:: - audio SFX_Slots_Stop_Wheel, Ch4 + audio_header SFX_Slots_Stop_Wheel, Ch5 SFX_Slots_Reward:: - audio SFX_Slots_Reward, Ch4 + audio_header SFX_Slots_Reward, Ch5 SFX_Slots_New_Spin:: - audio SFX_Slots_New_Spin, Ch4, Ch5 + audio_header SFX_Slots_New_Spin, Ch5, Ch6 SFX_Shooting_Star:: - audio SFX_Shooting_Star, Ch4 + audio_header SFX_Shooting_Star, Ch5 diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm new file mode 100644 index 00000000..a550cf70 --- /dev/null +++ b/audio/low_health_alarm.asm @@ -0,0 +1,80 @@ +Music_DoLowHealthAlarm:: + ld a, [wLowHealthAlarm] + cp $ff + jr z, .disableAlarm + + bit 7, a ;alarm enabled? + ret z ;nope + + and $7f ;low 7 bits are the timer. + jr nz, .asm_21383 ;if timer > 0, play low tone. + + call .playToneHi + ld a, 30 ;keep this tone for 30 frames. + jr .asm_21395 ;reset the timer. + +.asm_21383 + cp 20 + jr nz, .asm_2138a ;if timer == 20, + call .playToneLo ;actually set the sound registers. + +.asm_2138a + ld a, $86 + ld [wChannelSoundIDs + Ch5], a ;disable sound channel? + ld a, [wLowHealthAlarm] + and $7f ;decrement alarm timer. + dec a + +.asm_21395 + ; reset the timer and enable flag. + set 7, a + ld [wLowHealthAlarm], a + ret + +.disableAlarm + xor a + ld [wLowHealthAlarm], a ;disable alarm + ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? + ld de, .toneDataSilence + jr .playTone + +;update the sound registers to change the frequency. +;the tone set here stays until we change it. +.playToneHi + ld de, .toneDataHi + jr .playTone + +.playToneLo + ld de, .toneDataLo + +;update sound channel 1 to play the alarm, overriding all other sounds. +.playTone + ld hl, rNR10 ;channel 1 sound register + ld c, $5 + xor a + +.copyLoop + ld [hli], a + ld a, [de] + inc de + dec c + jr nz, .copyLoop + ret + +alarm_tone: MACRO + db \1 ; length + db \2 ; envelope + dw \3 ; frequency +ENDM + +;bytes to write to sound channel 1 registers for health alarm. +;starting at FF11 (FF10 is always zeroed). +.toneDataHi + alarm_tone $A0, $E2, $8750 + +.toneDataLo + alarm_tone $B0, $E2, $86EE + +;written to stop the alarm +.toneDataSilence + alarm_tone $00, $00, $8000 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 87c7b5c2..302e5cf9 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,704 +1,704 @@ -Music_BikeRiding_Ch0:: +Music_BikeRiding_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - G_ 2 + note G_, 2 Music_BikeRiding_branch_7dbc9:: octave 4 - C_ 4 - D_ 4 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 4 - E_ 2 - D_ 2 - F_ 4 - D_ 4 + note C_, 4 + note D_, 4 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 4 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F_ 4 - D_ 4 - E_ 2 - F_ 2 - G_ 2 - C_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - notetype 12, 11, 6 - F_ 10 - notetype 12, 10, 6 - F_ 2 - E_ 2 - F_ 2 - G_ 10 - E_ 2 - D_ 2 - E_ 2 - F_ 6 - toggleperfectpitch - notetype 12, 11, 3 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 2 - E_ 1 - F_ 1 - toggleperfectpitch - notetype 12, 11, 5 - G_ 6 - G_ 6 - A_ 2 - F_ 2 - G_ 6 - notetype 12, 11, 4 - G_ 2 - F_ 4 - notetype 12, 10, 4 - E_ 2 - D_ 2 - notetype 12, 9, 3 + note F_, 4 + note D_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 6 + note F_, 10 + note_type 12, 10, 6 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 10 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + toggle_perfect_pitch + note_type 12, 11, 3 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 2 + note E_, 1 + note F_, 1 + toggle_perfect_pitch + note_type 12, 11, 5 + note G_, 6 + note G_, 6 + note A_, 2 + note F_, 2 + note G_, 6 + note_type 12, 11, 4 + note G_, 2 + note F_, 4 + note_type 12, 10, 4 + note E_, 2 + note D_, 2 + note_type 12, 9, 3 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 3 - B_ 2 - A_ 1 - B_ 1 - A_ 2 - B_ 2 + note B_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - C_ 4 - C_ 2 + note C_, 2 + note C_, 4 + note C_, 2 octave 3 - A_ 2 - B_ 2 - B_ 2 - A_ 2 + note A_, 2 + note B_, 2 + note B_, 2 + note A_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 2 - B_ 1 + note A_, 2 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 1 + note C_, 1 + note D_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 4 - notetype 12, 3, 13 - C_ 4 - notetype 12, 11, 4 - F_ 6 - G_ 4 - F_ 1 - G_ 1 - F_ 4 - E_ 6 - F_ 2 - E_ 2 - D_ 1 - E_ 1 - D_ 2 - C_ 2 - notetype 12, 11, 5 + note C_, 4 + note_type 12, 3, -5 + note C_, 4 + note_type 12, 11, 4 + note F_, 6 + note G_, 4 + note F_, 1 + note G_, 1 + note F_, 4 + note E_, 6 + note F_, 2 + note E_, 2 + note D_, 1 + note E_, 1 + note D_, 2 + note C_, 2 + note_type 12, 11, 5 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - C_ 4 - F_ 4 - D_ 4 - F# 4 + note E_, 4 + note C_, 4 + note F_, 4 + note D_, 4 + note F#, 4 vibrato 10, 2, 6 - notetype 12, 8, 0 - G_ 16 - G_ 4 - notetype 12, 8, 7 - G_ 12 - notetype 12, 11, 5 + note_type 12, 8, 0 + note G_, 16 + note G_, 4 + note_type 12, 8, 7 + note G_, 12 + note_type 12, 11, 5 vibrato 8, 1, 4 - loopchannel 0, Music_BikeRiding_branch_7dbc9 - - -Music_BikeRiding_Ch1:: - duty 2 - vibrato 6, 1, 5 - notetype 12, 12, 3 - octave 4 - C_ 2 - -Music_BikeRiding_branch_7dc75:: - E_ 4 - F_ 4 - G_ 4 - octave 5 - C_ 4 - octave 4 - B_ 6 - A_ 1 - B_ 1 - A_ 10 - F_ 2 - G_ 2 - A_ 2 - octave 5 - D_ 2 - C_ 2 - octave 4 - B_ 2 - A_ 1 - B_ 1 - octave 5 - C_ 6 - octave 4 - A_ 2 - G_ 4 - duty 3 - notetype 12, 8, 4 - A# 6 - duty 2 - notetype 12, 12, 5 - octave 5 - C_ 2 - octave 4 - B_ 2 - octave 5 - C_ 2 - octave 4 - A_ 10 - octave 5 - C_ 2 - octave 4 - B_ 2 - octave 5 - C_ 2 - octave 4 - G_ 10 - notetype 12, 12, 3 - octave 5 - C_ 4 - E_ 2 - D_ 2 - C_ 2 - octave 4 - B_ 2 - octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 4 - notetype 12, 12, 7 - D_ 10 - D_ 1 - C_ 1 - notetype 12, 11, 0 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 4 - F_ 6 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 6 - E_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - F_ 2 - E_ 2 - D_ 2 - F_ 2 - G_ 4 - A_ 2 - F_ 2 - E_ 2 - G_ 4 - F_ 2 - E_ 6 - notetype 6, 12, 2 - F_ 1 - G_ 1 - A_ 1 - B_ 1 - notetype 12, 12, 3 - octave 5 - C_ 2 - octave 4 - B_ 2 - A_ 2 - octave 5 - C_ 2 - octave 4 - B_ 4 - A_ 4 - G_ 2 - A# 4 - A_ 2 - G_ 4 - F_ 2 - E_ 2 - notetype 8, 12, 4 - A_ 4 - G_ 4 - F_ 4 - B_ 4 - A_ 4 - G_ 4 - octave 5 - C_ 4 - octave 4 - B_ 4 - A_ 4 - octave 5 - D_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 7 - D_ 12 - C_ 4 - notetype 12, 11, 0 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 3 - loopchannel 0, Music_BikeRiding_branch_7dc75 + sound_loop 0, Music_BikeRiding_branch_7dbc9 Music_BikeRiding_Ch2:: - notetype 12, 1, 3 + duty_cycle 2 + vibrato 6, 1, 5 + note_type 12, 12, 3 + octave 4 + note C_, 2 + +Music_BikeRiding_branch_7dc75:: + note E_, 4 + note F_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 10 + note F_, 2 + note G_, 2 + note A_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 1 + note B_, 1 + octave 5 + note C_, 6 + octave 4 + note A_, 2 + note G_, 4 + duty_cycle 3 + note_type 12, 8, 4 + note A#, 6 + duty_cycle 2 + note_type 12, 12, 5 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 10 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 10 + note_type 12, 12, 3 + octave 5 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + note_type 12, 11, 0 + note D_, 4 + note_type 12, 12, 7 + note D_, 10 + note D_, 1 + note C_, 1 + note_type 12, 11, 0 + octave 4 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 4 + note F_, 6 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note F_, 2 + note E_, 2 + note G_, 4 + note F_, 2 + note E_, 6 + note_type 6, 12, 2 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 3 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 4 + note A_, 4 + note G_, 2 + note A#, 4 + note A_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note_type 8, 12, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note B_, 4 + note A_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note A_, 4 + octave 5 + note D_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 7 + note D_, 12 + note C_, 4 + note_type 12, 11, 0 + octave 4 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 3 + sound_loop 0, Music_BikeRiding_branch_7dc75 + + +Music_BikeRiding_Ch3:: + note_type 12, 1, 3 rest 2 Music_BikeRiding_branch_7dd17:: octave 4 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - loopchannel 0, Music_BikeRiding_branch_7dd17 + sound_loop 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch3:: - dspeed 12 +Music_BikeRiding_Ch4:: + drum_speed 12 rest 2 Music_BikeRiding_branch_7de6a:: - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - loopchannel 0, 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:: rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 - endchannel + drum_note 16, 2 + sound_ret Music_BikeRiding_branch_7deb4:: rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 - triangle3 2 - triangle3 2 - endchannel + drum_note 16, 2 + drum_note 16, 2 + drum_note 16, 2 + sound_ret Music_BikeRiding_branch_7dec2:: rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 1 - triangle3 1 - endchannel + drum_note 16, 1 + drum_note 16, 1 + sound_ret diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index a1699301..5f03fc51 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,411 +1,411 @@ -Music_Celadon_Ch0:: +Music_Celadon_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 2, 15 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 2, -7 rest 8 octave 3 - D_ 8 + note D_, 8 Music_Celadon_branch_b6d4:: - duty 2 - notetype 12, 11, 2 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - E_ 1 - G_ 1 - E_ 1 - B_ 2 + duty_cycle 2 + note_type 12, 11, 2 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 8 - F# 4 - A_ 4 - F# 2 - A_ 6 - A_ 1 - B_ 1 + note A_, 8 + note F#, 4 + note A_, 4 + note F#, 2 + note A_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - A_ 2 - B_ 2 - G_ 4 + note B_, 1 + note A_, 2 + note B_, 2 + note G_, 4 octave 4 - G_ 4 + note G_, 4 octave 3 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - F# 1 - G_ 1 - A_ 1 - B_ 2 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 8 - A_ 2 - B_ 2 + note A_, 8 + note A_, 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 2 - F# 4 - D_ 1 - E_ 1 - F# 1 - G_ 1 - A_ 8 - notetype 12, 9, 4 - B_ 8 - G_ 4 - D_ 4 - G_ 4 - A_ 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 8 + note_type 12, 9, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 8 - A_ 8 - F# 4 - G_ 4 - A_ 4 - G_ 4 - F# 4 - A_ 4 - B_ 8 - G_ 4 - D_ 4 - G_ 4 - A_ 2 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 8 - A_ 8 - F# 4 - G_ 4 - A_ 4 - G_ 4 - F# 4 - A_ 4 - loopchannel 0, Music_Celadon_branch_b6d4 - - -Music_Celadon_Ch1:: - duty 3 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 10, 0 - A_ 8 - -Music_Celadon_branch_b74a:: - duty 2 - notetype 12, 12, 2 - octave 4 - B_ 4 - G_ 4 - B_ 2 - G_ 6 - B_ 1 - G_ 1 - A_ 1 - B_ 1 - octave 5 - C_ 2 - octave 4 - B_ 2 - A_ 8 - A_ 4 - F# 4 - A_ 2 - F# 6 - A_ 1 - G_ 1 - F# 1 - G_ 1 - A_ 2 - B_ 2 - G_ 4 - B_ 4 - B_ 4 - G_ 4 - B_ 2 - G_ 4 - octave 3 - B_ 2 - octave 4 - B_ 1 - G_ 1 - A_ 1 - B_ 1 - octave 5 - C_ 2 - octave 4 - B_ 2 - A_ 8 - A_ 2 - G_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 - D_ 8 - octave 5 - D_ 8 - notetype 12, 11, 4 - octave 4 - D_ 8 - C_ 2 - octave 3 - B_ 2 - A_ 2 - B_ 2 - octave 4 - E_ 4 - F# 4 - D_ 8 - C_ 8 - octave 3 - A_ 2 - B_ 2 - octave 4 - C_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - D_ 8 - D_ 8 - C_ 2 - octave 3 - B_ 2 - A_ 2 - B_ 2 - octave 4 - E_ 4 - D_ 2 - E_ 2 - D_ 8 - C_ 8 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - D_ 8 - loopchannel 0, Music_Celadon_branch_b74a + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + sound_loop 0, Music_Celadon_branch_b6d4 Music_Celadon_Ch2:: - notetype 12, 1, 3 + duty_cycle 3 + note_type 12, 12, 2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 12, 10, 0 + note A_, 8 + +Music_Celadon_branch_b74a:: + duty_cycle 2 + note_type 12, 12, 2 + octave 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 6 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 4 + note F#, 4 + note A_, 2 + note F#, 6 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + note B_, 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 4 + octave 3 + note B_, 2 + octave 4 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 8 + octave 5 + note D_, 8 + note_type 12, 11, 4 + octave 4 + note D_, 8 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note F#, 4 + note D_, 8 + note C_, 8 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + note D_, 8 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 8 + note C_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + sound_loop 0, Music_Celadon_branch_b74a + + +Music_Celadon_Ch3:: + note_type 12, 1, 3 rest 8 octave 5 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 Music_Celadon_branch_b7c1:: octave 4 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - B_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - C# 2 - D_ 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note C#, 2 + note D_, 2 rest 6 - F# 2 + note F#, 2 rest 4 - F# 2 - G_ 2 + note F#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - loopchannel 0, Music_Celadon_branch_b7c1 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + sound_loop 0, Music_Celadon_branch_b7c1 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index c6b3564d..69496af5 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,354 +1,354 @@ -Music_Cinnabar_Ch0:: +Music_Cinnabar_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Cinnabar_branch_b878:: - notetype 12, 11, 5 + note_type 12, 11, 5 rest 4 octave 3 - D_ 4 - E_ 6 - C# 2 - notetype 12, 11, 1 - D_ 4 - notetype 12, 11, 5 - B_ 4 + note D_, 4 + note E_, 6 + note C#, 2 + note_type 12, 11, 1 + note D_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - notetype 12, 11, 1 - B_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 2 - F# 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 4 - D_ 4 - E_ 4 - F# 6 - A_ 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - B_ 4 + note A_, 2 + note_type 12, 11, 1 + note B_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - B_ 4 - G_ 4 - F# 3 - E_ 1 - F# 2 - A_ 2 - notetype 12, 10, 2 - G_ 4 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + note_type 12, 10, 2 + note G_, 4 octave 4 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 7, 2 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 10, 7 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 7, 2 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 10, 7 octave 3 - B_ 6 - G_ 2 - E_ 8 + note B_, 6 + note G_, 2 + note E_, 8 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - F# 8 + note A_, 2 + note F#, 8 octave 4 - F# 6 - D_ 2 + note F#, 6 + note D_, 2 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 8 - F# 4 - E_ 4 - loopchannel 0, Music_Cinnabar_branch_b878 - - -Music_Cinnabar_Ch1:: - duty 3 - vibrato 10, 2, 3 - -Music_Cinnabar_branch_b8d9:: - notetype 12, 12, 7 - octave 3 - G_ 6 - A_ 1 - B_ 1 - octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 - octave 3 - B_ 1 - octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - octave 3 - B_ 8 - A_ 4 - G_ 6 - A_ 1 - B_ 1 - octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 - octave 3 - B_ 1 - octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - octave 3 - A_ 4 - G_ 4 - F# 4 - notetype 12, 11, 0 - octave 4 - D_ 6 - octave 3 - B_ 2 - G_ 8 - octave 4 - E_ 6 - C_ 2 - octave 3 - A_ 8 - octave 4 - A_ 6 - F# 2 - D_ 2 - C_ 2 - octave 3 - B_ 2 - A_ 2 - B_ 4 - octave 4 - D_ 4 - octave 3 - B_ 2 - A_ 6 - loopchannel 0, Music_Cinnabar_branch_b8d9 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + sound_loop 0, Music_Cinnabar_branch_b878 Music_Cinnabar_Ch2:: - notetype 12, 1, 0 + duty_cycle 3 + vibrato 10, 2, 3 + +Music_Cinnabar_branch_b8d9:: + note_type 12, 12, 7 + octave 3 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + octave 3 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + octave 3 + note A_, 4 + note G_, 4 + note F#, 4 + note_type 12, 11, 0 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + note G_, 8 + octave 4 + note E_, 6 + note C_, 2 + octave 3 + note A_, 8 + octave 4 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 6 + sound_loop 0, Music_Cinnabar_branch_b8d9 + + +Music_Cinnabar_Ch3:: + note_type 12, 1, 0 Music_Cinnabar_branch_b93f:: octave 4 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 4 - A_ 1 + note B_, 4 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 + note D_, 2 octave 4 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 octave 5 - E_ 2 - C_ 1 - C_ 1 - C_ 1 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 2 - C_ 1 + note E_, 2 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 3 octave 5 - A_ 2 - F# 1 - F# 1 - D_ 1 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 - C_ 1 - C_ 1 + note D_, 2 + note C_, 1 + note C_, 1 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 2 + note A_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 - loopchannel 0, Music_Cinnabar_branch_b93f + sound_loop 0, Music_Cinnabar_branch_b93f diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index bb54a456..ac6c08c3 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,172 +1,172 @@ -Music_CinnabarMansion_Ch0:: +Music_CinnabarMansion_Ch1:: tempo 144 volume 7, 7 vibrato 11, 2, 5 - duty 2 + duty_cycle 2 Music_CinnabarMansion_branch_7ed19:: - notetype 12, 6, 2 + note_type 12, 6, 2 octave 5 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - B_ 1 - B_ 1 - C_ 1 + note B_, 1 + note B_, 1 + note C_, 1 rest 2 octave 5 - B_ 2 - E_ 2 + note B_, 2 + note E_, 2 octave 4 - C_ 2 - B_ 2 - E_ 2 - C_ 1 + note C_, 2 + note B_, 2 + note E_, 2 + note C_, 1 octave 5 - B_ 1 + note B_, 1 rest 2 - loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, 10, 5 + sound_loop 14, Music_CinnabarMansion_branch_7ed19 + note_type 12, 10, 5 rest 16 rest 16 rest 15 octave 4 - C_ 1 + note C_, 1 octave 5 - B_ 1 - B_ 2 - loopchannel 0, Music_CinnabarMansion_branch_7ed19 + note B_, 1 + note B_, 2 + sound_loop 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch1:: - duty 2 - toggleperfectpitch +Music_CinnabarMansion_Ch2:: + duty_cycle 2 + toggle_perfect_pitch vibrato 10, 2, 4 - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed48:: rest 16 rest 16 - loopchannel 4, Music_CinnabarMansion_branch_7ed48 + sound_loop 4, Music_CinnabarMansion_branch_7ed48 Music_CinnabarMansion_branch_7ed4e:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed50:: - callchannel Music_CinnabarMansion_branch_7ed6c - loopchannel 3, Music_CinnabarMansion_branch_7ed50 + sound_call Music_CinnabarMansion_branch_7ed6c + sound_loop 3, Music_CinnabarMansion_branch_7ed50 octave 3 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 rest 4 - A# 4 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 - G_ 4 - D# 4 - loopchannel 0, Music_CinnabarMansion_branch_7ed4e + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note D#, 4 + sound_loop 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 - A_ 4 - A# 4 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 rest 4 - A# 4 - endchannel - - -Music_CinnabarMansion_Ch2:: - notetype 12, 1, 1 - -Music_CinnabarMansion_branch_7ed80:: - octave 2 - B_ 2 - rest 2 - octave 3 - E_ 2 - rest 2 - E_ 2 - rest 2 - E_ 2 - rest 2 - E_ 2 - rest 2 - E_ 2 - rest 2 - E_ 2 - rest 2 - E_ 2 - rest 2 - C_ 2 - rest 2 - octave 3 - D# 2 - rest 2 - D# 2 - rest 2 - D# 2 - rest 2 - D# 2 - rest 2 - D# 2 - rest 2 - D# 2 - rest 2 - D# 2 - rest 2 - loopchannel 8, Music_CinnabarMansion_branch_7ed80 - E_ 16 - D# 16 - G_ 16 - G# 8 - D# 8 - loopchannel 0, Music_CinnabarMansion_branch_7ed80 + note A#, 4 + sound_ret Music_CinnabarMansion_Ch3:: - dspeed 6 + note_type 12, 1, 1 + +Music_CinnabarMansion_branch_7ed80:: + octave 2 + note B_, 2 + rest 2 + octave 3 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note C_, 2 + rest 2 + octave 3 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + sound_loop 8, Music_CinnabarMansion_branch_7ed80 + note E_, 16 + note D#, 16 + note G_, 16 + note G#, 8 + note D#, 8 + sound_loop 0, Music_CinnabarMansion_branch_7ed80 + + +Music_CinnabarMansion_Ch4:: + drum_speed 6 rest 16 rest 16 rest 16 rest 16 Music_CinnabarMansion_branch_7edb5:: - cymbal1 2 - cymbal1 2 - cymbal2 4 - cymbal1 2 - cymbal1 2 - cymbal2 4 - cymbal1 2 - cymbal1 2 - cymbal2 4 - cymbal1 2 - cymbal1 2 - cymbal3 4 - cymbal1 2 - cymbal1 2 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 14, 4 + drum_note 12, 2 + drum_note 12, 2 rest 2 rest 10 rest 8 - cymbal3 8 - loopchannel 0, Music_CinnabarMansion_branch_7edb5 + drum_note 14, 8 + sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index 984202f6..00ca3b5f 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -1,657 +1,657 @@ Music_Cities1_branch_aa6f:: tempo 232 - loopchannel 0, Music_Cities1_branch_aa79 + sound_loop 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch0:: +Music_Cities1_Ch1:: tempo 144 Music_Cities1_branch_aa79:: volume 7, 7 vibrato 8, 2, 4 - duty 3 + duty_cycle 3 Music_Cities1_branch_aa80:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - G# 4 - F# 4 - E_ 2 - E_ 2 - F# 2 - D# 2 - E_ 2 - E_ 2 - D# 2 - C# 4 - D# 4 - E_ 2 - D# 4 - C# 2 - E_ 2 - E_ 4 - notetype 12, 10, 5 - C# 4 + note G#, 4 + note F#, 4 + note E_, 2 + note E_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 2 + note E_, 2 + note E_, 4 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 6 + note B_, 6 octave 3 - C# 2 - C# 4 + note C#, 2 + note C#, 4 octave 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 6 - E_ 2 + note D#, 6 + note E_, 2 octave 2 - B_ 4 - notetype 12, 10, 5 + note B_, 4 + note_type 12, 10, 5 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 - A_ 4 - B_ 4 - B_ 2 + note B_, 2 + note A_, 4 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 5 - G# 2 - E_ 2 - F# 2 - E_ 2 - E_ 4 - F# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - C# 2 - E_ 2 - E_ 4 - notetype 12, 10, 5 - C# 2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 12, 12, 5 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note E_, 2 + note E_, 4 + note_type 12, 10, 5 + note C#, 2 octave 2 - A_ 2 - B_ 6 + note A_, 2 + note B_, 6 octave 3 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 2 - B_ 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 2 + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 4 - D# 2 - E_ 2 + note D#, 4 + note D#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - E_ 4 + note C#, 2 + note G#, 2 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - notetype 12, 10, 5 - C# 4 + note E_, 2 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - C# 2 - E_ 4 - notetype 12, 11, 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 4 - F# 4 - G# 2 - E_ 2 + note D#, 4 + note C#, 2 + note E_, 4 + note_type 12, 11, 3 + sound_call Music_Cities1_branch_ab8a + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 4 - G# 2 + note E_, 4 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 Music_Cities1_branch_ab12:: - C# 2 - D# 2 - C# 2 + note C#, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 4 - B_ 2 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - loopchannel 2, Music_Cities1_branch_ab12 - E_ 2 + note C#, 2 + note D#, 2 + sound_loop 2, Music_Cities1_branch_ab12 + note E_, 2 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - G# 2 + note C#, 2 + note G#, 2 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - E_ 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - F# 2 - G# 2 - E_ 2 + sound_call Music_Cities1_branch_ab8a + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - C# 2 - G# 2 - C# 2 - D# 2 - B_ 2 - E_ 2 - G# 2 - E_ 2 - F# 2 - E_ 4 - G# 2 - F# 2 - D# 2 + note E_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note D#, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note G#, 2 + note F#, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - F# 2 - D# 2 - D# 2 - F# 2 + note D#, 4 + note F#, 2 + note D#, 2 + note D#, 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D# 2 - notetype 12, 11, 6 - F# 8 - F# 4 - D# 4 - E_ 8 - notetype 12, 8, 4 + note D#, 2 + note_type 12, 11, 6 + note F#, 8 + note F#, 4 + note D#, 4 + note E_, 8 + note_type 12, 8, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - F# 2 - loopchannel 0, Music_Cities1_branch_aa80 + note E_, 2 + note F#, 2 + sound_loop 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 - F# 2 - D# 4 - E_ 2 - D# 4 - C# 4 + note F#, 2 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 - D# 2 - C# 2 - endchannel + note C#, 2 + note D#, 2 + note C#, 2 + sound_ret Music_Cities1_branch_ab8a:: - A_ 2 - E_ 2 - C# 2 - E_ 4 - A_ 2 - C# 2 - E_ 2 - endchannel - - -Music_Cities1_Ch1:: - vibrato 5, 1, 5 - callchannel Music_Cities1_branch_ac00 - octave 4 - G# 2 - notetype 12, 12, 4 - E_ 6 - notetype 12, 12, 5 - duty 3 - octave 3 - C# 4 - D# 4 - E_ 6 - F# 6 - G# 4 - callchannel Music_Cities1_branch_ac00 - octave 4 - G# 2 - notetype 12, 12, 4 - E_ 14 - duty 3 - octave 3 - E_ 6 - F# 6 - G# 4 - notetype 12, 11, 7 - duty 2 - vibrato 8, 1, 7 - octave 5 - C# 12 - octave 4 - A_ 4 - octave 5 - E_ 8 - F# 2 - E_ 2 - D# 2 - C# 2 - octave 4 - B_ 12 - G# 4 - B_ 16 - F# 12 - G# 2 - A_ 2 - B_ 4 - A_ 4 - G# 4 - F# 4 - G# 12 - E_ 4 - B_ 16 - octave 5 - C# 12 - D# 2 - E_ 2 - F# 4 - E_ 4 - D# 4 - C# 4 - octave 4 - B_ 12 - octave 5 - C# 2 - D# 2 - C# 4 - octave 4 - B_ 4 - A_ 4 - G# 4 - A_ 12 - B_ 2 - octave 5 - C_ 2 - C_ 4 - octave 4 - B_ 4 - A_ 4 - F# 4 - notetype 12, 11, 7 - A_ 8 - octave 5 - C_ 8 - octave 4 - B_ 14 - notetype 12, 8, 4 - G# 1 - notetype 12, 10, 4 - A_ 1 - loopchannel 0, Music_Cities1_Ch1 - -Music_Cities1_branch_ac00:: - duty 2 - notetype 12, 12, 3 - octave 4 - B_ 4 - A_ 4 - notetype 12, 12, 4 - G# 10 - notetype 12, 12, 3 - G# 2 - A_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 5 - duty 3 - octave 3 - E_ 4 - D# 8 - E_ 4 - F# 4 - notetype 12, 12, 3 - duty 2 - octave 4 - A_ 4 - G# 4 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 3 - F# 2 - G# 2 - A_ 4 - A_ 2 - G# 2 - F# 2 - endchannel + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + sound_ret Music_Cities1_Ch2:: - notetype 12, 1, 1 - toggleperfectpitch + vibrato 5, 1, 5 + sound_call Music_Cities1_branch_ac00 + octave 4 + note G#, 2 + note_type 12, 12, 4 + note E_, 6 + note_type 12, 12, 5 + duty_cycle 3 + octave 3 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + sound_call Music_Cities1_branch_ac00 + octave 4 + note G#, 2 + note_type 12, 12, 4 + note E_, 14 + duty_cycle 3 + octave 3 + note E_, 6 + note F#, 6 + note G#, 4 + note_type 12, 11, 7 + duty_cycle 2 + vibrato 8, 1, 7 + octave 5 + note C#, 12 + octave 4 + note A_, 4 + octave 5 + note E_, 8 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 4 + note B_, 12 + note G#, 4 + note B_, 16 + note F#, 12 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note G#, 12 + note E_, 4 + note B_, 16 + octave 5 + note C#, 12 + note D#, 2 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 4 + note B_, 12 + octave 5 + note C#, 2 + note D#, 2 + note C#, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note A_, 12 + note B_, 2 + octave 5 + note C_, 2 + note C_, 4 + octave 4 + note B_, 4 + note A_, 4 + note F#, 4 + note_type 12, 11, 7 + note A_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 14 + note_type 12, 8, 4 + note G#, 1 + note_type 12, 10, 4 + note A_, 1 + sound_loop 0, Music_Cities1_Ch2 + +Music_Cities1_branch_ac00:: + duty_cycle 2 + note_type 12, 12, 3 + octave 4 + note B_, 4 + note A_, 4 + note_type 12, 12, 4 + note G#, 10 + note_type 12, 12, 3 + note G#, 2 + note A_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 5 + duty_cycle 3 + octave 3 + note E_, 4 + note D#, 8 + note E_, 4 + note F#, 4 + note_type 12, 12, 3 + duty_cycle 2 + octave 4 + note A_, 4 + note G#, 4 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 3 + note F#, 2 + note G#, 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + sound_ret + + +Music_Cities1_Ch3:: + note_type 12, 1, 1 + toggle_perfect_pitch Music_Cities1_branch_ac35:: vibrato 0, 0, 0 octave 4 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - B_ 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - G# 2 - E_ 2 - B_ 2 + note G#, 2 + note E_, 2 + note B_, 2 rest 2 - E_ 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - B_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 vibrato 8, 2, 5 - A_ 8 - E_ 8 - A_ 8 - F# 8 - G# 8 - E_ 8 - G# 12 - E_ 4 - F# 2 - F# 2 - D# 2 - E_ 4 - F# 2 - D# 2 - E_ 2 - F# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - G# 2 - G# 2 - E_ 2 - G# 2 + note A_, 8 + note E_, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note E_, 8 + note G#, 12 + note E_, 4 + note F#, 2 + note F#, 2 + note D#, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - A_ 8 - E_ 8 - A_ 8 - B_ 2 - A_ 2 - G# 2 - F# 2 - G# 8 - E_ 8 - B_ 4 - E_ 4 - F# 4 - G# 4 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 8 + note E_, 8 + note A_, 8 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 8 + note E_, 8 + note B_, 4 + note E_, 4 + note F#, 4 + note G#, 4 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - F# 2 - B_ 2 - A_ 2 - A_ 4 - G# 4 - F# 2 - D# 2 - A_ 2 - F# 2 + note F#, 2 + note B_, 2 + note A_, 2 + note A_, 4 + note G#, 4 + note F#, 2 + note D#, 2 + note A_, 2 + note F#, 2 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 1 - G# 1 - E_ 1 - F# 1 - G# 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - loopchannel 0, Music_Cities1_branch_ac35 + note E_, 2 + note F#, 1 + note G#, 1 + note E_, 1 + note F#, 1 + note G#, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + sound_loop 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - endchannel + note E_, 2 + note F#, 2 + note G#, 2 + sound_ret Music_Cities1_branch_acce:: - A_ 2 - F# 2 - G# 2 - A_ 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 rest 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 - D# 2 - D# 2 - E_ 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 - endchannel + note D#, 2 + note E_, 2 + note F#, 2 + sound_ret -Music_Cities1_Ch3:: - dspeed 12 - callchannel Music_Cities1_branch_ad36 +Music_Cities1_Ch4:: + drum_speed 12 + sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad45 - callchannel Music_Cities1_branch_ad45 - loopchannel 2, Music_Cities1_branch_acf3 - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 - triangle1 6 - triangle1 6 - triangle2 4 - callchannel Music_Cities1_branch_ad6e - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 - callchannel Music_Cities1_branch_ad6e - callchannel Music_Cities1_branch_ad52 - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 - triangle1 6 - triangle1 6 - triangle1 4 - triangle1 6 - snare6 6 - snare6 4 - loopchannel 0, Music_Cities1_Ch3 + 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 + 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 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 2 - snare6 2 - endchannel + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 2 + drum_note 8, 2 + sound_ret Music_Cities1_branch_ad45:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 4 - endchannel + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_ret Music_Cities1_branch_ad52:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 4 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + sound_ret Music_Cities1_branch_ad5f:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + sound_ret Music_Cities1_branch_ad6e:: - triangle1 6 - triangle1 6 - triangle2 2 - triangle2 2 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 7, 2 + sound_ret diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index fb167999..6397f965 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,416 +1,416 @@ -Music_Cities2_Ch0:: +Music_Cities2_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 2 - toggleperfectpitch - notetype 12, 11, 6 + toggle_perfect_pitch + note_type 12, 11, 6 rest 8 octave 3 - E_ 2 - D# 2 - C# 2 - C_ 2 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 octave 2 - B_ 2 + note B_, 2 rest 14 Music_Cities2_branch_b51a:: octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 - D# 1 - D_ 1 - C# 4 + note C#, 2 + note D#, 1 + note D_, 1 + note C#, 4 octave 3 - B_ 4 - G# 8 - E_ 8 - A_ 4 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note B_, 4 + note G#, 8 + note E_, 8 + note A_, 4 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 rest 16 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 1 - D# 1 - C# 4 + note C#, 1 + note D#, 1 + note C#, 4 octave 3 - B_ 4 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 3 - G# 8 - B_ 4 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - E_ 2 - F# 2 - G# 2 + note G#, 8 + note B_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - F# 2 - G# 2 - A_ 2 + note B_, 4 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 octave 4 - F# 4 - D# 4 + note F#, 4 + note D#, 4 octave 3 - E_ 2 + note E_, 2 rest 4 - F# 2 + note F#, 2 rest 4 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 16 rest 16 rest 14 - E_ 16 - F# 8 - G# 4 - F# 4 - E_ 2 + note E_, 16 + note F#, 8 + note G#, 4 + note F#, 4 + note E_, 2 rest 14 - loopchannel 0, Music_Cities2_branch_b51a - - -Music_Cities2_Ch1:: - duty 3 - vibrato 8, 2, 3 - notetype 12, 12, 2 - octave 4 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 6 - notetype 12, 12, 2 - duty 2 - octave 4 - E_ 1 - octave 3 - B_ 1 - octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - -Music_Cities2_branch_b58b:: - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 14 - notetype 12, 12, 2 - E_ 1 - octave 3 - B_ 1 - octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - notetype 12, 12, 2 - E_ 1 - G# 1 - notetype 12, 12, 5 - B_ 14 - notetype 12, 12, 2 - E_ 1 - octave 3 - B_ 1 - octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 8 - notetype 12, 10, 1 - duty 1 - octave 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 - rest 1 - notetype 12, 12, 2 - duty 2 - octave 4 - E_ 1 - octave 3 - B_ 1 - octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - E_ 1 - G# 1 - notetype 12, 12, 6 - B_ 8 - notetype 12, 12, 2 - C# 1 - octave 3 - B_ 1 - octave 4 - C# 1 - D# 1 - E_ 4 - notetype 12, 12, 7 - G# 4 - E_ 4 - notetype 12, 12, 2 - D# 1 - C# 1 - D# 1 - E_ 1 - F# 4 - notetype 12, 12, 7 - B_ 4 - F# 4 - notetype 12, 12, 2 - C# 1 - octave 3 - B_ 1 - octave 4 - C# 1 - D# 1 - E_ 2 - E_ 1 - D# 1 - E_ 1 - F# 1 - G# 2 - G# 1 - A_ 1 - G# 1 - A_ 1 - B_ 1 - F# 1 - D# 1 - C# 1 - octave 3 - B_ 1 - octave 4 - C# 1 - D# 1 - F# 1 - notetype 12, 12, 2 - B_ 8 - notetype 12, 11, 7 - octave 3 - E_ 8 - octave 2 - B_ 4 - octave 3 - F# 4 - G# 4 - A_ 4 - B_ 8 - B_ 8 - G# 4 - octave 4 - D# 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 2 - E_ 6 - E_ 1 - octave 3 - B_ 1 - octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - loopchannel 0, Music_Cities2_branch_b58b + sound_loop 0, Music_Cities2_branch_b51a Music_Cities2_Ch2:: - notetype 12, 1, 1 + duty_cycle 3 + vibrato 8, 2, 3 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 6 + note_type 12, 12, 2 + duty_cycle 2 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + +Music_Cities2_branch_b58b:: + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 14 + note_type 12, 12, 2 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note_type 12, 12, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 5 + note B_, 14 + note_type 12, 12, 2 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 8 + note_type 12, 10, 1 + duty_cycle 1 + octave 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note_type 12, 12, 2 + duty_cycle 2 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note E_, 1 + note G#, 1 + note_type 12, 12, 6 + note B_, 8 + note_type 12, 12, 2 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 4 + note_type 12, 12, 7 + note G#, 4 + note E_, 4 + note_type 12, 12, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 4 + note_type 12, 12, 7 + note B_, 4 + note F#, 4 + note_type 12, 12, 2 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note G#, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note F#, 1 + note_type 12, 12, 2 + note B_, 8 + note_type 12, 11, 7 + octave 3 + note E_, 8 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note G#, 4 + note A_, 4 + note B_, 8 + note B_, 8 + note G#, 4 + octave 4 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 12, 12, 2 + note E_, 6 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + sound_loop 0, Music_Cities2_branch_b58b + + +Music_Cities2_Ch3:: + note_type 12, 1, 1 rest 16 octave 4 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 Music_Cities2_branch_b64c:: - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 rest 2 - E_ 4 - G# 4 - F# 2 - A_ 2 - F# 2 + note E_, 4 + note G#, 4 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - F# 4 - A_ 4 - C# 2 + note F#, 4 + note A_, 4 + note C#, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - G# 2 - A_ 2 - B_ 2 + note G#, 2 + note A_, 2 + note B_, 2 rest 8 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - loopchannel 0, Music_Cities2_branch_b64c + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + sound_loop 0, Music_Cities2_branch_b64c diff --git a/audio/music/credits.asm b/audio/music/credits.asm index f092326b..b8a6d7dd 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,820 +1,820 @@ -Music_Credits_Ch0:: +Music_Credits_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 4 - E_ 6 + note E_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - E_ 1 - D_ 6 + note E_, 1 + note D_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - D_ 1 - C# 6 + note D_, 1 + note C#, 6 octave 3 - F# 1 + note F#, 1 octave 4 - C# 1 - D_ 4 - E_ 2 - C# 1 - E_ 1 - C# 1 + note C#, 1 + note D_, 4 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 1 rest 1 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 11, 6 - A_ 4 - E_ 2 - A_ 2 - G_ 4 - A_ 2 - G_ 2 - B_ 4 - A_ 4 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 6 - E_ 2 - A_ 4 - C# 4 - E_ 4 - D_ 2 - C# 2 - E_ 2 - F# 2 - G_ 2 - F# 2 - A_ 4 - E_ 2 - A_ 2 - G_ 4 - A_ 2 - G_ 2 - B_ 4 - A_ 4 - G_ 2 - A_ 2 - F# 2 - D_ 2 - E_ 6 - C# 2 - A_ 4 - C# 4 - E_ 4 - D_ 2 - C# 2 - E_ 2 - F# 2 - G_ 2 - F# 2 - G_ 4 - D_ 2 - G_ 2 - B_ 2 - A_ 2 - G_ 2 - A_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 6 - A_ 2 - G_ 4 - F# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - G_ 4 - D_ 2 - G_ 2 - B_ 2 + note E_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 12, 11, 6 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 6 + note E_, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note E_, 6 + note C#, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - notetype 12, 11, 7 - E_ 6 - A_ 2 - G_ 4 - F# 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 + note B_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note_type 12, 11, 7 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 octave 4 - C# 4 - D_ 4 + note C#, 4 + note D_, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 9, 0 - G_ 8 - F# 8 - E_ 8 - D_ 8 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note_type 12, 9, 0 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 rest 16 rest 16 rest 8 - notetype 12, 11, 6 - E_ 6 - D# 1 - D_ 1 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 + note_type 12, 11, 6 + note E_, 6 + note D#, 1 + note D_, 1 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 rest 16 rest 16 rest 8 - E_ 6 - C# 1 - E_ 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 11, 6 - G_ 6 - D_ 4 - G_ 2 - B_ 4 - notetype 12, 11, 7 - G_ 8 - F# 4 - G# 4 - notetype 12, 9, 0 - A_ 8 - F# 8 - E_ 8 - C# 8 - notetype 12, 11, 7 - D_ 8 - C# 8 + note E_, 6 + note C#, 1 + note E_, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 11, 6 + note G_, 6 + note D_, 4 + note G_, 2 + note B_, 4 + note_type 12, 11, 7 + note G_, 8 + note F#, 4 + note G#, 4 + note_type 12, 9, 0 + note A_, 8 + note F#, 8 + note E_, 8 + note C#, 8 + note_type 12, 11, 7 + note D_, 8 + note C#, 8 octave 2 - B_ 8 + note B_, 8 octave 3 - D_ 8 - notetype 12, 9, 0 - E_ 8 - D_ 8 - F# 8 - E_ 8 - notetype 12, 10, 0 - D_ 8 - E_ 8 - D_ 8 - C_ 8 - G_ 8 - F_ 8 - E_ 8 - D_ 8 - notetype 12, 10, 0 - C# 6 - notetype 12, 10, 7 - C# 6 - notetype 12, 11, 7 - D_ 4 - E_ 8 - G_ 6 - F# 1 - F_ 1 - notetype 12, 10, 0 - E_ 6 - notetype 12, 10, 7 - E_ 6 - notetype 12, 11, 7 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 7 - E_ 6 - D_ 2 - G_ 4 - F# 4 - E_ 4 - F# 4 - E_ 4 - D_ 4 - E_ 4 - D_ 4 - C# 4 - D_ 4 - C# 4 - C# 4 - E_ 4 - F# 4 - notetype 12, 10, 0 - E_ 6 - notetype 12, 11, 7 - D_ 2 - G_ 4 - F# 4 - E_ 4 - F# 4 - A_ 4 - B_ 4 - notetype 12, 10, 0 + note D_, 8 + note_type 12, 9, 0 + note E_, 8 + note D_, 8 + note F#, 8 + note E_, 8 + note_type 12, 10, 0 + note D_, 8 + note E_, 8 + note D_, 8 + note C_, 8 + note G_, 8 + note F_, 8 + note E_, 8 + note D_, 8 + note_type 12, 10, 0 + note C#, 6 + note_type 12, 10, 7 + note C#, 6 + note_type 12, 11, 7 + note D_, 4 + note E_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 10, 7 + note E_, 6 + note_type 12, 11, 7 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 11, 7 + note E_, 6 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 4 + note C#, 4 + note E_, 4 + note F#, 4 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 11, 7 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note_type 12, 10, 0 octave 4 - C# 16 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 5 + note C#, 16 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 11, 5 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - notetype 12, 11, 1 - A_ 8 - endchannel - - -Music_Credits_Ch1:: - duty 3 - vibrato 10, 2, 5 - notetype 12, 12, 5 - octave 4 - A_ 6 - E_ 1 - A_ 1 - G_ 6 - D_ 1 - G_ 1 - notetype 12, 12, 7 - F# 12 - G# 2 - E_ 1 - G# 1 - notetype 12, 12, 2 - A_ 2 - notetype 12, 12, 1 - octave 3 - A_ 4 - A_ 1 - A_ 1 - A_ 2 - A_ 2 - A_ 4 - A_ 2 - A_ 4 - A_ 1 - A_ 1 - A_ 2 - A_ 2 - notetype 12, 12, 4 - A_ 1 - F# 1 - A_ 1 - B_ 1 - notetype 12, 12, 7 - octave 4 - C# 6 - C# 1 - D_ 1 - E_ 4 - C# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - C# 6 - octave 3 - A_ 2 - octave 4 - E_ 8 - octave 3 - A_ 6 - E_ 2 - octave 4 - C# 8 - C# 6 - C# 1 - D_ 1 - E_ 4 - C# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - C# 6 - octave 3 - A_ 2 - octave 4 - E_ 8 - octave 3 - A_ 6 - E_ 2 - notetype 12, 11, 0 - octave 4 - C# 8 - notetype 12, 12, 7 - D_ 6 - octave 3 - B_ 2 - octave 4 - G_ 8 - octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 - octave 4 - C# 6 - notetype 12, 11, 7 - C# 6 - D_ 4 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 8 - notetype 12, 12, 7 - D_ 6 - octave 3 - B_ 2 - octave 4 - G_ 8 - octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 - octave 4 - E_ 7 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 3 - E_ 1 - G# 1 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 6 - G_ 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 9, 0 - octave 3 - A_ 8 - notetype 12, 9, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 12, 7 - D_ 8 - G_ 6 - F# 1 - F_ 1 - E_ 8 - notetype 12, 11, 7 - G_ 6 - F# 1 - F_ 1 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 - octave 2 - B_ 8 - octave 3 - F# 6 - D_ 1 - F# 1 - E_ 8 - B_ 6 - G_ 1 - B_ 1 - notetype 12, 11, 0 - octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 - octave 3 - B_ 8 - octave 4 - D_ 6 - octave 3 - B_ 1 - octave 4 - D_ 1 - notetype 12, 11, 0 - C# 6 - notetype 12, 11, 7 - C# 6 - notetype 12, 12, 7 - octave 3 - B_ 4 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - F# 6 - notetype 12, 11, 7 - F# 6 - notetype 12, 12, 7 - G# 4 - A_ 8 - F# 8 - notetype 12, 11, 0 - G# 6 - notetype 12, 11, 7 - G# 6 - notetype 12, 12, 7 - A_ 4 - B_ 8 - G# 8 - notetype 12, 11, 0 - A_ 6 - notetype 12, 11, 7 - A_ 6 - notetype 12, 12, 7 - B_ 4 - octave 4 - C_ 8 - octave 3 - A_ 8 - notetype 12, 11, 0 - B_ 6 - notetype 12, 11, 7 - B_ 6 - notetype 12, 12, 7 - octave 4 - C_ 4 - notetype 12, 11, 0 - D_ 8 - octave 3 - B_ 8 - notetype 12, 11, 0 - octave 4 - C# 16 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 - octave 3 - A_ 16 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - G_ 6 - B_ 2 - octave 4 - D_ 8 - octave 3 - B_ 6 - octave 4 - D_ 2 - G_ 6 - F# 1 - F_ 1 - E_ 8 - octave 3 - G_ 6 - F# 1 - F_ 1 - E_ 8 - C# 4 - D_ 4 - G_ 6 - B_ 2 - octave 4 - D_ 8 - octave 3 - B_ 6 - octave 4 - D_ 2 - G_ 8 - notetype 12, 11, 0 - A_ 16 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 12, 1 - A_ 2 - A_ 4 - A_ 1 - A_ 1 - notetype 12, 12, 1 - A_ 8 - endchannel + note A_, 1 + note A_, 1 + note_type 12, 11, 1 + note A_, 8 + sound_ret Music_Credits_Ch2:: - notetype 12, 1, 0 - octave 5 - C# 6 + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 5 octave 4 - A_ 1 - octave 5 - C# 1 - D_ 6 + note A_, 6 + note E_, 1 + note A_, 1 + note G_, 6 + note D_, 1 + note G_, 1 + note_type 12, 12, 7 + note F#, 12 + note G#, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 2 + note A_, 2 + note_type 12, 12, 1 + octave 3 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note_type 12, 12, 4 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 7 octave 4 - B_ 1 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 8 + octave 3 + note A_, 6 + note E_, 2 + octave 4 + note C#, 8 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 8 + octave 3 + note A_, 6 + note E_, 2 + note_type 12, 11, 0 + octave 4 + note C#, 8 + note_type 12, 12, 7 + note D_, 6 + octave 3 + note B_, 2 + octave 4 + note G_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note D_, 4 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 6 + octave 3 + note B_, 2 + octave 4 + note G_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note E_, 7 + note_type 12, 11, 7 + note E_, 7 + note_type 12, 12, 3 + note E_, 1 + note G#, 1 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 6 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 9, 0 + octave 3 + note A_, 8 + note_type 12, 9, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note_type 12, 11, 7 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 + octave 2 + note B_, 8 + octave 3 + note F#, 6 + note D_, 1 + note F#, 1 + note E_, 8 + note B_, 6 + note G_, 1 + note B_, 1 + note_type 12, 11, 0 + octave 4 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 + octave 3 + note B_, 8 + octave 4 + note D_, 6 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note_type 12, 11, 0 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 12, 7 + octave 3 + note B_, 4 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note F#, 6 + note_type 12, 11, 7 + note F#, 6 + note_type 12, 12, 7 + note G#, 4 + note A_, 8 + note F#, 8 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 11, 7 + note G#, 6 + note_type 12, 12, 7 + note A_, 4 + note B_, 8 + note G#, 8 + note_type 12, 11, 0 + note A_, 6 + note_type 12, 11, 7 + note A_, 6 + note_type 12, 12, 7 + note B_, 4 + octave 4 + note C_, 8 + octave 3 + note A_, 8 + note_type 12, 11, 0 + note B_, 6 + note_type 12, 11, 7 + note B_, 6 + note_type 12, 12, 7 + octave 4 + note C_, 4 + note_type 12, 11, 0 + note D_, 8 + octave 3 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note C#, 16 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 + octave 3 + note A_, 16 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + octave 3 + note B_, 6 + octave 4 + note D_, 2 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + octave 3 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note C#, 4 + note D_, 4 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + octave 3 + note B_, 6 + octave 4 + note D_, 2 + note G_, 8 + note_type 12, 11, 0 + note A_, 16 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 12, 1 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note_type 12, 12, 1 + note A_, 8 + sound_ret + + +Music_Credits_Ch3:: + note_type 12, 1, 0 octave 5 - D_ 1 - F# 6 - D_ 1 - F# 1 - A_ 4 - G# 2 - E_ 1 - G# 1 - A_ 1 + note C#, 6 + octave 4 + note A_, 1 + octave 5 + note C#, 1 + note D_, 6 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 4 + note G#, 2 + note E_, 1 + note G#, 1 + note A_, 1 rest 15 rest 16 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 octave 4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + 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 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - B_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 - callchannel Music_Credits_branch_7ffc1 + 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 octave 4 - G_ 4 - A_ 4 - B_ 4 + note G_, 4 + note A_, 4 + note B_, 4 octave 5 - D_ 4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - E_ 4 - A_ 2 - E_ 4 - A_ 2 - E_ 2 - A_ 2 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - G# 2 - A_ 2 - callchannel Music_Credits_branch_7ffd2 - callchannel Music_Credits_branch_7ffd2 - callchannel Music_Credits_branch_7ffdb - callchannel Music_Credits_branch_7ffdb - F_ 2 - A_ 2 - F_ 2 - A_ 2 - F_ 2 - A_ 2 - F_ 2 - A_ 2 - F_ 2 - A_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - E_ 4 - A_ 4 - E_ 4 - A_ 4 - E_ 4 - A_ 4 - E_ 4 - A_ 4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffe4 - callchannel Music_Credits_branch_7ffe4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffed - callchannel Music_Credits_branch_7ffed - A_ 1 + 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 + 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 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + 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 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + 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 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 7 - endchannel + sound_ret Music_Credits_branch_7ffa4:: octave 4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffae:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - endchannel + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_ret Music_Credits_branch_7ffb8:: - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - endchannel + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffc1:: octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_Credits_branch_7ffd2:: - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - endchannel + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffdb:: - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + sound_ret Music_Credits_branch_7ffe4:: - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - endchannel + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffed:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 1ea6c1ff..159bf42b 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,607 +1,607 @@ -Music_DefeatedGymLeader_Ch0:: +Music_DefeatedGymLeader_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 18, 3, 1 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 10, 6 + note_type 12, 10, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - D_ 1 - F# 6 - D_ 1 - F# 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 Music_DefeatedGymLeader_branch_23ccc:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - E_ 2 - D_ 4 - D_ 4 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - C# 2 - notetype 12, 11, 1 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 11, 2 + note B_, 8 + note_type 12, 11, 2 octave 3 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - E_ 2 - D_ 4 - D_ 4 - A_ 2 - A_ 2 - F# 4 - G_ 2 - G_ 2 - E_ 4 - D_ 2 - E_ 2 - D_ 2 - C# 2 - notetype 12, 11, 1 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 9, 7 + note B_, 8 + note_type 12, 9, 7 octave 3 - D_ 6 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 0 - F# 8 - E_ 8 - D_ 8 - C# 8 - notetype 12, 9, 7 - D_ 6 + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 0 + note F#, 8 + note E_, 8 + note D_, 8 + note C#, 8 + note_type 12, 9, 7 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 7 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 10, 7 - G_ 8 - E_ 8 - loopchannel 0, Music_DefeatedGymLeader_branch_23ccc - - -Music_DefeatedGymLeader_Ch1:: - duty 2 - vibrato 24, 2, 4 - notetype 12, 12, 4 - octave 4 - A_ 6 - F# 1 - A_ 1 - octave 5 - D_ 6 - octave 4 - A_ 1 - octave 5 - D_ 1 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - -Music_DefeatedGymLeader_branch_23d84:: - notetype 12, 12, 2 - octave 4 - D_ 2 - C# 2 - octave 3 - B_ 4 - octave 4 - C# 2 - octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 4 - notetype 12, 12, 2 - octave 4 - D_ 2 - C# 2 - octave 3 - B_ 4 - octave 4 - C# 2 - octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 6 - notetype 6, 12, 2 - G_ 1 - A_ 1 - B_ 1 - octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 - octave 3 - B_ 4 - octave 4 - C# 2 - octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 3 - notetype 6, 12, 2 - B_ 1 - octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 - octave 3 - B_ 4 - octave 4 - C# 2 - octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 - octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 - octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 8, 0 - octave 4 - E_ 8 - notetype 12, 10, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 6, 15 - octave 4 - C# 8 - notetype 12, 12, 7 - C# 8 - F# 4 - E_ 4 - notetype 12, 11, 0 - D_ 14 - octave 3 - B_ 2 - notetype 12, 10, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 - octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 - octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 4, 15 - octave 4 - E_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 11, 0 - octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 - octave 3 - A_ 4 - octave 4 - C# 4 - notetype 12, 11, 0 - D_ 14 - E_ 2 - D_ 12 - notetype 12, 12, 2 - octave 3 - G_ 1 - A_ 1 - B_ 1 - octave 4 - C# 1 - loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 7 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 10, 7 + note G_, 8 + note E_, 8 + sound_loop 0, Music_DefeatedGymLeader_branch_23ccc Music_DefeatedGymLeader_Ch2:: - notetype 12, 1, 0 + duty_cycle 2 + vibrato 24, 2, 4 + note_type 12, 12, 4 + octave 4 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 6 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + +Music_DefeatedGymLeader_branch_23d84:: + note_type 12, 12, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 4 + note_type 12, 12, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 6 + note_type 6, 12, 2 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 3 + note_type 6, 12, 2 + note B_, 1 + octave 4 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 + octave 4 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 8, 0 + octave 4 + note E_, 8 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + octave 3 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 6, -7 + octave 4 + note C#, 8 + note_type 12, 12, 7 + note C#, 8 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note D_, 14 + octave 3 + note B_, 2 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 + octave 4 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 4, -7 + octave 4 + note E_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + octave 3 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 11, 0 + octave 4 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + octave 3 + note A_, 4 + octave 4 + note C#, 4 + note_type 12, 11, 0 + note D_, 14 + note E_, 2 + note D_, 12 + note_type 12, 12, 2 + octave 3 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + sound_loop 0, Music_DefeatedGymLeader_branch_23d84 + + +Music_DefeatedGymLeader_Ch3:: + note_type 12, 1, 0 vibrato 16, 1, 2 octave 4 - F# 6 - D_ 1 - F# 1 - A_ 6 - F# 1 - A_ 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - F# 8 + note D_, 1 + note F#, 8 Music_DefeatedGymLeader_branch_23e65:: octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F# 3 + note F#, 3 rest 1 - F# 3 + note F#, 3 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 5 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 3 + note G_, 3 rest 1 - D_ 3 + note D_, 3 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 7 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - C# 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - G_ 2 - A_ 2 - G_ 2 - E_ 2 - loopchannel 0, Music_DefeatedGymLeader_branch_23e65 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note E_, 2 + sound_loop 0, Music_DefeatedGymLeader_branch_23e65 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 87c5d2c9..158d755c 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,266 +1,266 @@ -Music_DefeatedTrainer_Ch0:: +Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch tempo 224 - notetype 4, 10, 2 + note_type 4, 10, 2 octave 4 - D_ 2 + note D_, 2 tempo 224 - notetype 4, 10, 2 - D_ 2 - D_ 2 - D_ 2 + note_type 4, 10, 2 + note D_, 2 + note D_, 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 4, 11, 3 - F# 12 - duty 1 + note D_, 2 + note_type 4, 11, 3 + note F#, 12 + duty_cycle 1 tempo 224 Music_DefeatedTrainer_branch_23a76:: - notetype 4, 6, 3 + note_type 4, 6, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 - G_ 3 - A_ 3 - B_ 3 - A_ 3 - G_ 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C# 3 - D_ 3 - E_ 3 - F# 3 - C# 3 + note C#, 3 + note D_, 3 + note E_, 3 + note F#, 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 + note B_, 3 + note A_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - C_ 3 - D_ 3 + note C_, 3 + note D_, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - D_ 6 - C# 3 + note D_, 6 + note C#, 3 octave 3 - B_ 3 - A_ 3 - G_ 3 - F# 3 - G_ 3 - A_ 3 - B_ 3 - A_ 3 - G_ 3 - F# 3 - E_ 3 - F# 3 - G_ 3 - A_ 3 - B_ 3 - loopchannel 0, Music_DefeatedTrainer_branch_23a76 - - -Music_DefeatedTrainer_Ch1:: - duty 2 - notetype 4, 12, 3 - octave 4 - A_ 2 - notetype 4, 12, 3 - A_ 2 - A_ 2 - A_ 2 - B_ 2 - octave 5 - C# 2 - notetype 4, 12, 4 - D_ 12 - -Music_DefeatedTrainer_branch_23ad2:: - notetype 4, 8, 5 - octave 4 - D_ 6 - octave 3 - A_ 3 - octave 4 - D_ 3 - E_ 6 - octave 3 - B_ 3 - octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - E_ 3 - F# 3 - G_ 6 - D_ 6 - octave 3 - A_ 3 - octave 4 - D_ 3 - E_ 6 - octave 3 - B_ 3 - octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - F# 3 - G_ 3 - A_ 6 - D_ 6 - octave 3 - A_ 3 - octave 4 - D_ 3 - E_ 6 - octave 3 - B_ 3 - octave 4 - E_ 3 - F_ 6 - C_ 3 - F_ 3 - G_ 3 - D_ 3 - G_ 6 - notetype 4, 7, 0 - F# 12 - notetype 4, 7, 7 - F# 12 - notetype 4, 6, 0 - E_ 12 - notetype 4, 6, 7 - E_ 12 - loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + sound_loop 0, Music_DefeatedTrainer_branch_23a76 Music_DefeatedTrainer_Ch2:: - notetype 4, 1, 0 - octave 5 - D_ 2 - notetype 4, 1, 0 - D_ 2 - D_ 2 + duty_cycle 2 + note_type 4, 12, 3 octave 4 - B_ 2 - A_ 2 - G_ 2 - A_ 12 - notetype 4, 2, 1 + note A_, 2 + note_type 4, 12, 3 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + note_type 4, 12, 4 + note D_, 12 + +Music_DefeatedTrainer_branch_23ad2:: + note_type 4, 8, 5 + octave 4 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note E_, 3 + note F#, 3 + note G_, 6 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note G_, 3 + note A_, 6 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note G_, 3 + note D_, 3 + note G_, 6 + note_type 4, 7, 0 + note F#, 12 + note_type 4, 7, 7 + note F#, 12 + note_type 4, 6, 0 + note E_, 12 + note_type 4, 6, 7 + note E_, 12 + sound_loop 0, Music_DefeatedTrainer_branch_23ad2 + + +Music_DefeatedTrainer_Ch3:: + note_type 4, 1, 0 + octave 5 + note D_, 2 + note_type 4, 1, 0 + note D_, 2 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 12 + note_type 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 octave 5 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - F# 3 + note A_, 3 + note F#, 3 octave 5 - D_ 3 + note D_, 3 octave 4 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 octave 5 - E_ 3 + note E_, 3 octave 4 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - F_ 3 + note F_, 3 octave 4 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 octave 5 - G_ 3 + note G_, 3 octave 4 - B_ 3 - A# 3 - A_ 3 + note B_, 3 + note A#, 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - C_ 3 - C# 3 + note C_, 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - loopchannel 0, Music_DefeatedTrainer_branch_23b24 + note A_, 3 + sound_loop 0, Music_DefeatedTrainer_branch_23b24 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index ea3f733f..364f548e 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,302 +1,302 @@ -Music_DefeatedWildMon_Ch0:: +Music_DefeatedWildMon_Ch1:: tempo 112 volume 7, 7 - executemusic - duty 3 + execute_music + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - E_ 12 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 12 Music_DefeatedWildMon_branch_23b8b:: - notetype 12, 6, 2 - E_ 2 - F# 2 - E_ 2 - F# 2 - G# 2 - G# 2 - G# 4 - A_ 2 - A_ 2 - A_ 4 - G# 2 - G# 2 - G# 4 - E_ 2 - F# 2 - E_ 2 - F# 2 - G# 2 - G# 2 - G# 4 - A_ 2 - A_ 2 - A_ 4 - G# 8 - F_ 2 - G_ 2 - F_ 2 - G_ 2 - A_ 2 - A_ 2 - A_ 4 - A# 2 - A# 2 - A# 4 - A_ 2 - A_ 2 - A_ 4 - F_ 2 - G_ 2 - F_ 2 - G_ 2 - A_ 2 - A_ 2 - A_ 4 - A# 2 - A# 2 - A# 4 - A_ 8 - loopchannel 0, Music_DefeatedWildMon_branch_23b8b - - -Music_DefeatedWildMon_Ch1:: - executemusic - duty 2 - notetype 12, 12, 3 - octave 4 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 7 - B_ 12 - -Music_DefeatedWildMon_branch_23bce:: - notetype 12, 8, 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 - octave 4 - C# 2 - C# 2 - C# 4 - octave 3 - B_ 2 - B_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 - octave 4 - C# 2 - C# 2 - C# 4 - octave 3 - B_ 8 - octave 4 - C_ 2 - octave 3 - A# 2 - A_ 2 - A# 2 - octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 2 - C_ 2 - C_ 4 - C_ 2 - octave 3 - A# 2 - A_ 2 - A# 2 - octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 8 - loopchannel 0, Music_DefeatedWildMon_branch_23bce + note_type 12, 6, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 2 + note G#, 4 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 8 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 8 + sound_loop 0, Music_DefeatedWildMon_branch_23b8b Music_DefeatedWildMon_Ch2:: - executemusic - notetype 12, 2, 0 + execute_music + duty_cycle 2 + note_type 12, 12, 3 + octave 4 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 7 + note B_, 12 + +Music_DefeatedWildMon_branch_23bce:: + note_type 12, 8, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note C#, 2 + note C#, 2 + note C#, 4 + octave 3 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note C#, 2 + note C#, 2 + note C#, 4 + octave 3 + note B_, 8 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 2 + note C_, 2 + note C_, 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + sound_loop 0, Music_DefeatedWildMon_branch_23bce + + +Music_DefeatedWildMon_Ch3:: + execute_music + note_type 12, 2, 0 octave 5 - E_ 1 + note E_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 octave 5 - D# 1 + note D#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - D# 4 + note D#, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - D# 4 - loopchannel 0, Music_DefeatedWildMon_branch_23c21 + note D#, 4 + sound_loop 0, Music_DefeatedWildMon_branch_23c21 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c6f6b105..49c6f89c 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,675 +1,675 @@ -Music_Dungeon1_Ch0:: +Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 - notetype 12, 4, 13 + note_type 12, 4, -5 rest 8 - stereopanning 237 + stereo_panning %1110, %1101 octave 4 - F# 8 - stereopanning 255 + note F#, 8 + stereo_panning %1111, %1111 Music_Dungeon1_branch_7dee5:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 Music_Dungeon1_branch_7dee8:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 3, Music_Dungeon1_branch_7dee8 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 3, Music_Dungeon1_branch_7dee8 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 Music_Dungeon1_branch_7deff:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 4, Music_Dungeon1_branch_7deff - callchannel Music_Dungeon1_branch_7dfd5 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 4, Music_Dungeon1_branch_7deff + sound_call Music_Dungeon1_branch_7dfd5 octave 3 - G_ 1 - F# 1 - E_ 1 - G_ 1 - callchannel Music_Dungeon1_branch_7dfd5 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + sound_call Music_Dungeon1_branch_7dfd5 octave 3 - A_ 1 - G_ 1 - E_ 1 - A_ 1 - callchannel Music_Dungeon1_branch_7dfd5 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + sound_call Music_Dungeon1_branch_7dfd5 octave 3 - B_ 1 - A_ 1 - G_ 1 - F# 1 - notetype 12, 12, 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note_type 12, 12, 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 3 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 3 octave 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - E_ 4 - D# 4 - C_ 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 2 - B_ 4 - notetype 12, 12, 2 - B_ 1 - A# 1 - G_ 1 - A# 1 - B_ 1 - A# 1 - G_ 1 - A# 1 + note B_, 4 + note_type 12, 12, 2 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - D_ 1 - C# 1 + note C_, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 - D_ 1 - C# 1 + note C#, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 + note C#, 1 Music_Dungeon1_branch_7df6e:: rest 16 - loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, 12, 3 - callchannel Music_Dungeon1_branch_7dfbb - B_ 2 - G_ 2 + sound_loop 8, Music_Dungeon1_branch_7df6e + note_type 12, 12, 3 + sound_call Music_Dungeon1_branch_7dfbb + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - callchannel Music_Dungeon1_branch_7dfbb - A# 2 - G_ 2 - B_ 4 - G_ 2 - F# 2 - G_ 2 - D# 2 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 + note G_, 2 + note A_, 4 + note F#, 2 + sound_call Music_Dungeon1_branch_7dfbb + note A#, 2 + note G_, 2 + note B_, 4 + note G_, 2 + note F#, 2 + note G_, 2 + note D#, 2 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 7 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 7 octave 3 - F# 8 - D# 8 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfaa - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 0, Music_Dungeon1_branch_7dee5 + 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 Music_Dungeon1_branch_7dfaa:: - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - endchannel + note A#, 1 + sound_ret Music_Dungeon1_branch_7dfbb:: octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - endchannel + note G_, 2 + note A#, 2 + sound_ret Music_Dungeon1_branch_7dfc5:: octave 3 - E_ 1 - E_ 1 - F_ 1 - E_ 1 - G_ 1 - E_ 1 - A_ 1 - E_ 1 - A# 1 - E_ 1 - B_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note A#, 1 + note E_, 1 + note B_, 1 + note E_, 1 octave 4 - C_ 1 - endchannel + note C_, 1 + sound_ret Music_Dungeon1_branch_7dfd5:: - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel - - -Music_Dungeon1_Ch1:: - vibrato 11, 1, 5 - duty 3 - notetype 12, 0, 15 - octave 4 - G# 8 - notetype 12, 4, 13 - octave 5 - D_ 8 - -Music_Dungeon1_branch_7dfeb:: - notetype 12, 12, 2 - -Music_Dungeon1_branch_7dfed:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 3, Music_Dungeon1_branch_7dfed - octave 2 - E_ 1 - E_ 1 - B_ 1 - octave 3 - C_ 1 - rest 2 - C_ 1 - octave 2 - B_ 1 - E_ 1 - E_ 1 - A_ 1 - G_ 1 - F_ 1 - F# 1 - G_ 1 - D# 1 - -Music_Dungeon1_branch_7e006:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 4, Music_Dungeon1_branch_7e006 - rest 2 - callchannel Music_Dungeon1_branch_7e0ab - octave 3 - C_ 4 - callchannel Music_Dungeon1_branch_7e0ab - octave 3 - C# 4 - callchannel Music_Dungeon1_branch_7e0ab - octave 3 - D# 4 - notetype 12, 13, 3 - octave 4 - E_ 4 - D# 4 - C_ 4 - octave 3 - B_ 4 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0b5 - octave 3 - F# 4 - callchannel Music_Dungeon1_branch_7e0b5 - octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0b5 - octave 3 - A# 4 - notetype 12, 13, 3 - octave 4 - E_ 4 - D# 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - C_ 4 - octave 3 - B_ 4 - G_ 4 - F# 2 - notetype 12, 13, 6 - E_ 8 - F_ 8 - F# 8 - G_ 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0ba - rest 10 - E_ 1 - rest 1 - callchannel Music_Dungeon1_branch_7e0ba - rest 12 - callchannel Music_Dungeon1_branch_7e0ba - rest 12 - callchannel Music_Dungeon1_branch_7e0ba - rest 14 - notetype 12, 13, 3 - callchannel Music_Dungeon1_branch_7e0cd - D# 4 - callchannel Music_Dungeon1_branch_7e0cd - D# 2 - rest 2 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0c0 - rest 2 - octave 3 - F# 4 - octave 2 - E_ 1 - E_ 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C_ 1 - rest 1 - C# 1 - rest 1 - D_ 1 - C# 1 - rest 2 - octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0c0 - octave 3 - A# 4 - notetype 12, 13, 6 - B_ 8 - octave 4 - D# 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e097 - callchannel Music_Dungeon1_branch_7e097 - loopchannel 0, Music_Dungeon1_branch_7dfeb - -Music_Dungeon1_branch_7e097:: - octave 2 - E_ 1 - E_ 1 - B_ 1 - octave 3 - C_ 1 - rest 2 - C_ 1 - octave 2 - B_ 1 - E_ 1 - E_ 1 - B_ 1 - octave 3 - C_ 1 - rest 2 - C_ 1 - octave 2 - B_ 1 - endchannel - -Music_Dungeon1_branch_7e0ab:: - octave 2 - E_ 1 - E_ 1 - rest 2 - octave 1 - E_ 1 - rest 3 - E_ 1 - rest 3 - endchannel - -Music_Dungeon1_branch_7e0b5:: - octave 2 - E_ 1 - E_ 1 - rest 10 - endchannel - -Music_Dungeon1_branch_7e0ba:: - octave 1 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel - -Music_Dungeon1_branch_7e0c0:: - octave 2 - E_ 1 - E_ 1 - octave 4 - E_ 1 - rest 1 - D# 1 - rest 1 - D_ 1 - rest 1 - C# 1 - C_ 1 - endchannel - -Music_Dungeon1_branch_7e0cd:: - octave 3 - E_ 6 - G_ 6 - E_ 4 - A_ 6 - octave 4 - C_ 6 - octave 3 - B_ 4 - G_ 6 - A# 6 - F# 4 - E_ 6 - F# 6 - endchannel + sound_ret Music_Dungeon1_Ch2:: - notetype 12, 1, 1 - vibrato 8, 2, 6 + vibrato 11, 1, 5 + duty_cycle 3 + note_type 12, 0, -7 + octave 4 + note G#, 8 + note_type 12, 4, -5 + octave 5 + note D_, 8 + +Music_Dungeon1_branch_7dfeb:: + note_type 12, 12, 2 + +Music_Dungeon1_branch_7dfed:: + sound_call Music_Dungeon1_branch_7e097 + sound_loop 3, Music_Dungeon1_branch_7dfed + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + 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 + rest 2 + sound_call Music_Dungeon1_branch_7e0ab + octave 3 + note C_, 4 + sound_call Music_Dungeon1_branch_7e0ab + octave 3 + note C#, 4 + sound_call Music_Dungeon1_branch_7e0ab + octave 3 + note D#, 4 + note_type 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0b5 + octave 3 + note F#, 4 + sound_call Music_Dungeon1_branch_7e0b5 + octave 3 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0b5 + octave 3 + note A#, 4 + note_type 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + note_type 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0ba + rest 10 + note E_, 1 + rest 1 + sound_call Music_Dungeon1_branch_7e0ba + rest 12 + sound_call Music_Dungeon1_branch_7e0ba + rest 12 + sound_call Music_Dungeon1_branch_7e0ba rest 14 - octave 4 - D_ 1 - D# 1 - -Music_Dungeon1_branch_7e0e5:: - callchannel Music_Dungeon1_branch_7e140 - callchannel Music_Dungeon1_branch_7e140 - octave 5 - E_ 2 - rest 4 + note_type 12, 13, 3 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 4 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 2 + rest 2 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0c0 + rest 2 octave 3 - E_ 1 - rest 3 - E_ 1 + note F#, 4 + octave 2 + note E_, 1 + note E_, 1 + octave 3 + note B_, 1 rest 1 octave 4 - F# 4 - callchannel Music_Dungeon1_branch_7e154 + note C_, 1 + rest 1 + note C#, 1 + rest 1 + note D_, 1 + note C#, 1 + rest 2 + octave 3 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0c0 + octave 3 + note A#, 4 + note_type 12, 13, 6 + note B_, 8 octave 4 - G_ 4 - callchannel Music_Dungeon1_branch_7e154 - octave 4 - A_ 4 - B_ 4 - A# 4 - G_ 4 - F# 4 - rest 6 - callchannel Music_Dungeon1_branch_7e177 - B_ 4 - A# 4 - G_ 4 - F# 4 - G_ 4 - F# 4 - E_ 4 - D# 4 - callchannel Music_Dungeon1_branch_7e15e - rest 12 - callchannel Music_Dungeon1_branch_7e15e - rest 12 - callchannel Music_Dungeon1_branch_7e15e + 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 + +Music_Dungeon1_branch_7e097:: + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + sound_ret + +Music_Dungeon1_branch_7e0ab:: + octave 2 + note E_, 1 + note E_, 1 + rest 2 + octave 1 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + sound_ret + +Music_Dungeon1_branch_7e0b5:: + octave 2 + note E_, 1 + note E_, 1 rest 10 - E_ 1 - rest 1 - callchannel Music_Dungeon1_branch_7e15e - rest 12 - callchannel Music_Dungeon1_branch_7e15e - rest 12 - callchannel Music_Dungeon1_branch_7e15e - rest 10 - D_ 1 - D# 1 - callchannel Music_Dungeon1_branch_7e164 - callchannel Music_Dungeon1_branch_7e164 - E_ 2 - rest 4 - callchannel Music_Dungeon1_branch_7e177 - B_ 8 - F# 6 - D_ 1 - D# 1 - rest 16 - rest 16 - loopchannel 0, Music_Dungeon1_branch_7e0e5 + sound_ret -Music_Dungeon1_branch_7e140:: - octave 5 - E_ 4 - B_ 4 - A# 4 - octave 6 - D_ 4 - C# 4 - octave 5 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - endchannel +Music_Dungeon1_branch_7e0ba:: + octave 1 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret -Music_Dungeon1_branch_7e154:: - octave 6 - E_ 1 - E_ 1 - rest 4 - octave 3 - E_ 1 - rest 3 - E_ 1 - rest 1 - endchannel - -Music_Dungeon1_branch_7e15e:: - octave 3 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel - -Music_Dungeon1_branch_7e164:: - E_ 4 - B_ 4 - A# 4 +Music_Dungeon1_branch_7e0c0:: + octave 2 + note E_, 1 + note E_, 1 octave 4 - D_ 4 - C# 4 - octave 3 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - endchannel + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note D_, 1 + rest 1 + note C#, 1 + note C_, 1 + sound_ret -Music_Dungeon1_branch_7e177:: +Music_Dungeon1_branch_7e0cd:: + octave 3 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 octave 4 - E_ 1 - rest 3 - E_ 1 - rest 1 - F# 4 - rest 6 - E_ 1 - rest 3 - E_ 1 - rest 1 - G_ 4 - rest 6 - E_ 1 - rest 3 - E_ 1 - E_ 1 - A# 4 - endchannel + note C_, 6 + octave 3 + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + sound_ret Music_Dungeon1_Ch3:: - dspeed 12 + note_type 12, 1, 1 + vibrato 8, 2, 6 rest 14 - cymbal1 1 - cymbal1 1 + octave 4 + note D_, 1 + note D#, 1 + +Music_Dungeon1_branch_7e0e5:: + sound_call Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 + octave 5 + note E_, 2 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + octave 4 + note F#, 4 + sound_call Music_Dungeon1_branch_7e154 + octave 4 + note G_, 4 + sound_call Music_Dungeon1_branch_7e154 + octave 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + rest 6 + sound_call Music_Dungeon1_branch_7e177 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 10 + note E_, 1 + rest 1 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 10 + note D_, 1 + note D#, 1 + sound_call Music_Dungeon1_branch_7e164 + sound_call Music_Dungeon1_branch_7e164 + note E_, 2 + rest 4 + sound_call Music_Dungeon1_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 + rest 16 + rest 16 + sound_loop 0, Music_Dungeon1_branch_7e0e5 + +Music_Dungeon1_branch_7e140:: + octave 5 + note E_, 4 + note B_, 4 + note A#, 4 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret + +Music_Dungeon1_branch_7e154:: + octave 6 + note E_, 1 + note E_, 1 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + sound_ret + +Music_Dungeon1_branch_7e15e:: + octave 3 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret + +Music_Dungeon1_branch_7e164:: + note E_, 4 + note B_, 4 + note A#, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + sound_ret + +Music_Dungeon1_branch_7e177:: + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G_, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + 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:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e190 - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal1 2 - cymbal1 2 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e190 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 Music_Dungeon1_branch_7e1a1:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e1a1 - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal2 4 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e1a1 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 13, 4 Music_Dungeon1_branch_7e1b0:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1b0 - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1b0 + sound_call Music_Dungeon1_branch_7e202 Music_Dungeon1_branch_7e1ba:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1ba - callchannel Music_Dungeon1_branch_7e202 - snare7 4 - snare8 4 - snare8 4 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1ba + sound_call Music_Dungeon1_branch_7e202 + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 rest 2 - snare7 2 - cymbal2 4 + drum_note 9, 2 + drum_note 13, 4 Music_Dungeon1_branch_7e1cf:: rest 16 - loopchannel 13, Music_Dungeon1_branch_7e1cf + sound_loop 13, Music_Dungeon1_branch_7e1cf rest 12 Music_Dungeon1_branch_7e1d5:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1d5 - cymbal1 4 - cymbal1 4 - cymbal1 4 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1d5 + drum_note 12, 4 + drum_note 12, 4 + drum_note 12, 4 rest 2 - cymbal1 1 - cymbal1 1 - callchannel Music_Dungeon1_branch_7e1f1 - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 0, Music_Dungeon1_branch_7e190 + 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 Music_Dungeon1_branch_7e1f1:: - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal1 4 - endchannel + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 + sound_ret Music_Dungeon1_branch_7e1fa:: - cymbal1 1 - cymbal1 1 + drum_note 12, 1 + drum_note 12, 1 rest 10 - cymbal3 4 - endchannel + drum_note 14, 4 + sound_ret Music_Dungeon1_branch_7e202:: - snare7 4 - snare8 4 - snare8 4 - snare9 4 - endchannel + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 11, 4 + sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index d5f459fb..2167bfd7 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,64 +1,64 @@ -Music_Dungeon2_Ch0:: +Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - A# 4 - A# 4 - A# 4 - A# 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 octave 5 - C# 4 - C# 4 - C# 4 - C# 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 octave 3 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - A# 4 - A# 4 - A# 4 - A# 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, 1, 15 + note G_, 2 + note A_, 4 + note F#, 2 + sound_loop 2, Music_Dungeon2_branch_7e892 + note_type 12, 1, -7 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 rest 16 rest 16 rest 16 @@ -67,251 +67,251 @@ Music_Dungeon2_branch_7e892:: rest 16 rest 16 rest 16 - loopchannel 0, Music_Dungeon2_branch_7e892 - - -Music_Dungeon2_Ch1:: - vibrato 11, 1, 5 - -Music_Dungeon2_branch_7e8db:: - duty 3 - notetype 12, 12, 2 - octave 3 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - C_ 4 - C_ 4 - C_ 4 - C_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - C_ 4 - C_ 4 - C_ 4 - C_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - octave 4 - F# 4 - F# 4 - F# 4 - F# 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - G_ 4 - G_ 4 - G_ 4 - F# 4 - loopchannel 2, Music_Dungeon2_branch_7e8db - octave 3 - E_ 2 - G_ 2 - E_ 2 - D# 2 - E_ 2 - E_ 2 - octave 5 - E_ 2 - rest 2 - D# 2 - rest 2 - D_ 2 - rest 2 - C# 2 - C_ 2 - octave 4 - E_ 2 - G_ 2 - octave 3 - A# 2 - C# 2 - A# 2 - A_ 2 - A# 2 - G_ 2 - octave 5 - G_ 2 - rest 2 - F# 2 - rest 2 - F_ 2 - rest 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - rest 16 - rest 16 - rest 16 - rest 16 - notetype 12, 12, 7 - duty 1 - octave 4 - E_ 16 - D_ 16 - C_ 16 - D_ 16 - loopchannel 0, Music_Dungeon2_branch_7e8db + sound_loop 0, Music_Dungeon2_branch_7e892 Music_Dungeon2_Ch2:: - notetype 12, 1, 3 - vibrato 8, 2, 6 + vibrato 11, 1, 5 -Music_Dungeon2_branch_7e940:: - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 16, Music_Dungeon2_branch_7e940 - E_ 4 - rest 4 - rest 4 - E_ 4 - C_ 4 - rest 4 - rest 4 - C_ 4 - D_ 4 - rest 4 - rest 4 - D_ 4 +Music_Dungeon2_branch_7e8db:: + duty_cycle 3 + note_type 12, 12, 2 octave 3 - A# 4 - rest 4 - rest 4 - A# 4 - -Music_Dungeon2_branch_7e958:: + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + octave 4 + note F#, 4 + note F#, 4 + note F#, 4 + note F#, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + sound_loop 2, Music_Dungeon2_branch_7e8db + octave 3 + note E_, 2 + note G_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note E_, 2 octave 5 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note D#, 2 rest 2 - A# 2 - rest 2 - octave 6 - D_ 2 - rest 2 - C# 2 + note D_, 2 rest 2 + note C#, 2 + note C_, 2 + octave 4 + note E_, 2 + note G_, 2 + octave 3 + note A#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 5 - G# 2 + note G_, 2 rest 2 - G_ 2 + note F#, 2 rest 2 - B_ 2 + note F_, 2 rest 2 - A# 2 - rest 2 - E_ 2 - rest 2 - D# 2 - rest 2 - A_ 2 - rest 2 - G# 2 - rest 2 - E_ 2 - rest 2 - F# 2 - rest 2 - D# 2 - rest 2 - loopchannel 3, Music_Dungeon2_branch_7e958 - octave 4 - E_ 4 - B_ 4 - A# 4 - octave 5 - D_ 4 - C# 4 - octave 4 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - octave 3 - E_ 16 - C_ 16 - D_ 16 - octave 2 - A# 16 - octave 3 - E_ 16 - F_ 16 - G_ 16 - octave 3 - B_ 16 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 rest 16 rest 16 rest 16 rest 16 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 0, Music_Dungeon2_branch_7e940 - octave 2 - G_ 2 - A# 4 - G_ 2 - octave 3 - C# 4 - octave 2 - G_ 2 - A_ 2 - A# 2 - G_ 2 - octave 3 - C# 4 - octave 2 - G_ 2 - A# 2 - G_ 2 - rest 2 - endchannel - -Music_Dungeon2_branch_7e9d1:: + note_type 12, 12, 7 + duty_cycle 1 octave 4 - E_ 2 - rest 4 - octave 3 - E_ 1 - rest 3 - E_ 1 - rest 1 - octave 4 - F# 4 - endchannel + note E_, 16 + note D_, 16 + note C_, 16 + note D_, 16 + sound_loop 0, Music_Dungeon2_branch_7e8db Music_Dungeon2_Ch3:: - dspeed 12 + 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 + note E_, 4 + rest 4 + rest 4 + note E_, 4 + note C_, 4 + rest 4 + rest 4 + note C_, 4 + note D_, 4 + rest 4 + rest 4 + note D_, 4 + octave 3 + note A#, 4 + rest 4 + rest 4 + note A#, 4 + +Music_Dungeon2_branch_7e958:: + octave 5 + note E_, 2 + rest 2 + note B_, 2 + rest 2 + note A#, 2 + rest 2 + octave 6 + note D_, 2 + rest 2 + note C#, 2 + rest 2 + octave 5 + note G#, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note A#, 2 + rest 2 + note E_, 2 + rest 2 + note D#, 2 + rest 2 + note A_, 2 + rest 2 + note G#, 2 + rest 2 + note E_, 2 + rest 2 + note F#, 2 + rest 2 + note D#, 2 + rest 2 + sound_loop 3, Music_Dungeon2_branch_7e958 + octave 4 + note E_, 4 + note B_, 4 + note A#, 4 + octave 5 + note D_, 4 + note C#, 4 + octave 4 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + octave 3 + note E_, 16 + note C_, 16 + note D_, 16 + octave 2 + note A#, 16 + octave 3 + note E_, 16 + note F_, 16 + note G_, 16 + octave 3 + note B_, 16 + rest 16 + 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 + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 + rest 2 + sound_ret + +Music_Dungeon2_branch_7e9d1:: + octave 4 + note E_, 2 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + octave 4 + note F#, 4 + sound_ret + + +Music_Dungeon2_Ch4:: + drum_speed 12 Music_Dungeon2_branch_7e9dd:: - cymbal1 4 - cymbal2 4 - cymbal1 4 - snare8 4 - cymbal1 4 - cymbal2 4 - snare9 4 - snare7 4 - loopchannel 0, Music_Dungeon2_branch_7e9dd + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 10, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 11, 4 + drum_note 9, 4 + sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index f9742a26..81b2ead8 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,614 +1,614 @@ -Music_Dungeon3_Ch0:: +Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: - notetype 12, 12, 3 + note_type 12, 12, 3 Music_Dungeon3_branch_7e9fe:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 3, Music_Dungeon3_branch_7e9fe + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 3, Music_Dungeon3_branch_7e9fe octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 - D# 2 - E_ 2 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 Music_Dungeon3_branch_7ea11:: - callchannel Music_Dungeon3_branch_7eac1 - loopchannel 4, Music_Dungeon3_branch_7ea11 + sound_call Music_Dungeon3_branch_7eac1 + sound_loop 4, Music_Dungeon3_branch_7ea11 Music_Dungeon3_branch_7ea18:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 4, Music_Dungeon3_branch_7ea18 + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 4, Music_Dungeon3_branch_7ea18 octave 4 - F_ 2 - F_ 2 + note F_, 2 + note F_, 2 rest 2 - F_ 2 - E_ 2 - E_ 2 - D# 2 - D# 2 + note F_, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note D#, 2 rest 2 - D# 2 - D_ 2 - D_ 2 - callchannel Music_Dungeon3_branch_7eafc + note D#, 2 + note D_, 2 + note D_, 2 + sound_call Music_Dungeon3_branch_7eafc octave 4 - D_ 2 - D_ 2 + note D_, 2 + note D_, 2 rest 2 - D_ 2 - D# 2 - D# 2 - E_ 2 - E_ 2 + note D_, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note E_, 2 rest 2 - E_ 2 - F_ 2 - F_ 2 + note E_, 2 + note F_, 2 + note F_, 2 Music_Dungeon3_branch_7ea3c:: - callchannel Music_Dungeon3_branch_7eace - loopchannel 4, Music_Dungeon3_branch_7ea3c + sound_call Music_Dungeon3_branch_7eace + sound_loop 4, Music_Dungeon3_branch_7ea3c Music_Dungeon3_branch_7ea43:: - callchannel Music_Dungeon3_branch_7eadd - loopchannel 3, Music_Dungeon3_branch_7ea43 + sound_call Music_Dungeon3_branch_7eadd + sound_loop 3, Music_Dungeon3_branch_7ea43 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - G# 2 - E_ 2 + note A_, 2 + note F_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - callchannel Music_Dungeon3_branch_7eaea - callchannel Music_Dungeon3_branch_7eaea + note C_, 2 + sound_call Music_Dungeon3_branch_7eaea + sound_call Music_Dungeon3_branch_7eaea octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 rest 16 rest 8 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - D# 2 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + note D#, 2 rest 16 rest 16 - loopchannel 0, Music_Dungeon3_branch_7e9fc + sound_loop 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - endchannel + note D#, 2 + sound_ret Music_Dungeon3_branch_7eac1:: - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + sound_ret Music_Dungeon3_branch_7eace:: octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 - endchannel + note B_, 2 + sound_ret Music_Dungeon3_branch_7eadd:: - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 - endchannel + note A_, 2 + note F_, 2 + sound_ret Music_Dungeon3_branch_7eaea:: octave 3 - G# 2 - E_ 2 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - endchannel + note C_, 2 + sound_ret Music_Dungeon3_branch_7eaf7:: - D# 2 - G_ 2 - D# 2 - C# 6 - endchannel + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + sound_ret Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 176 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 184 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 192 octave 1 - A_ 1 - A# 1 - B_ 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 tempo 200 octave 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 tempo 208 octave 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 + note C_, 1 + note C#, 1 + note D_, 1 tempo 216 octave 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 tempo 224 octave 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 + note C_, 1 tempo 160 - endchannel - - -Music_Dungeon3_Ch1:: - vibrato 11, 1, 5 - duty 3 - -Music_Dungeon3_branch_7eb6d:: - notetype 12, 13, 3 - octave 4 - D# 6 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - A# 2 - B_ 6 - octave 4 - C# 8 - rest 2 - G# 6 - F# 6 - E_ 2 - F# 2 - G# 2 - octave 5 - C_ 2 - octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 - octave 5 - C_ 2 - octave 4 - G# 2 - F# 6 - E_ 2 - D# 2 - E_ 6 - F# 6 - E_ 4 - D# 6 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - A# 2 - B_ 6 - octave 4 - C# 8 - rest 2 - G# 2 - G# 2 - rest 2 - G# 2 - A_ 2 - A_ 2 - A# 2 - A# 2 - rest 2 - A# 2 - B_ 2 - B_ 2 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - octave 4 - B_ 2 - B_ 2 - rest 2 - B_ 2 - A# 2 - A# 2 - A_ 2 - A_ 2 - rest 2 - A_ 2 - G# 2 - G# 2 - C# 8 - rest 2 - octave 3 - B_ 6 - A# 2 - B_ 2 - octave 4 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 6 - G_ 6 - octave 3 - G_ 8 - rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 - octave 4 - C# 2 - octave 3 - A_ 2 - G_ 6 - F_ 2 - G_ 2 - A_ 2 - octave 4 - C# 2 - octave 3 - A_ 2 - G_ 6 - A_ 6 - octave 4 - C# 6 - G_ 8 - rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 - octave 5 - C# 2 - octave 4 - A_ 2 - G_ 6 - A_ 2 - octave 5 - C# 2 - octave 4 - A_ 2 - G_ 6 - A_ 6 - octave 5 - C# 6 - octave 4 - F# 8 - rest 2 - E_ 6 - D# 2 - E_ 2 - G# 2 - octave 5 - C_ 2 - octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 - octave 5 - C_ 2 - octave 4 - G# 2 - F# 6 - G# 6 - octave 5 - C_ 6 - octave 3 - D# 2 - G_ 2 - D# 2 - C# 6 - D# 2 - G_ 2 - D# 2 - C# 6 - octave 2 - E_ 2 - G# 2 - octave 3 - C_ 2 - E_ 2 - G# 2 - octave 4 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - E_ 2 - G# 2 - C_ 2 - D# 2 - octave 2 - B_ 2 - octave 3 - D# 2 - G_ 2 - octave 2 - B_ 2 - octave 3 - D# 2 - G_ 2 - octave 2 - B_ 2 - octave 3 - D# 2 - octave 2 - B_ 2 - octave 3 - D# 2 - G_ 2 - octave 2 - B_ 2 - octave 3 - D# 2 - G_ 2 - octave 2 - B_ 2 - octave 3 - D# 2 - loopchannel 0, Music_Dungeon3_branch_7eb6d + sound_ret Music_Dungeon3_Ch2:: - notetype 12, 1, 2 + vibrato 11, 1, 5 + duty_cycle 3 + +Music_Dungeon3_branch_7eb6d:: + note_type 12, 13, 3 + octave 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 + rest 2 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 6 + note F#, 6 + note E_, 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 + rest 2 + note G#, 2 + note G#, 2 + rest 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A#, 2 + note A#, 2 + rest 2 + note A#, 2 + note B_, 2 + note B_, 2 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + octave 4 + note B_, 2 + note B_, 2 + rest 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A_, 2 + note A_, 2 + rest 2 + note A_, 2 + note G#, 2 + note G#, 2 + note C#, 8 + rest 2 + octave 3 + note B_, 6 + note A#, 2 + note B_, 2 + octave 4 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 6 + note G_, 6 + octave 3 + note G_, 8 + rest 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note G_, 6 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note G_, 6 + note A_, 6 + octave 4 + note C#, 6 + note G_, 8 + rest 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G_, 6 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G_, 6 + note A_, 6 + octave 5 + note C#, 6 + octave 4 + note F#, 8 + rest 2 + note E_, 6 + note D#, 2 + note E_, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note G#, 6 + octave 5 + note C_, 6 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 2 + note E_, 2 + note G#, 2 + octave 3 + note C_, 2 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + sound_loop 0, Music_Dungeon3_branch_7eb6d + + +Music_Dungeon3_Ch3:: + note_type 12, 1, 2 rest 16 rest 16 rest 16 @@ -621,71 +621,71 @@ Music_Dungeon3_Ch2:: rest 16 rest 16 rest 12 - notetype 6, 1, 0 + note_type 6, 1, 0 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 rest 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 rest 16 rest 16 rest 10 octave 5 - E_ 8 + note E_, 8 octave 4 - B_ 8 + note B_, 8 octave 5 - D# 8 + note D#, 8 octave 4 - A# 8 + note A#, 8 octave 5 - D_ 8 + note D_, 8 octave 4 - A_ 8 + note A_, 8 octave 5 - C# 8 + note C#, 8 octave 4 - G# 8 + note G#, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - G_ 8 - B_ 8 - F# 8 - A# 8 - F_ 8 - A_ 8 - E_ 8 + note G_, 8 + note B_, 8 + note F#, 8 + note A#, 8 + note F_, 8 + note A_, 8 + note E_, 8 rest 16 rest 16 rest 8 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 rest 2 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 + note B_, 1 rest 10 rest 16 - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 rest 16 rest 16 @@ -707,11 +707,11 @@ Music_Dungeon3_Ch2:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch2 + sound_loop 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch3:: - dspeed 12 +Music_Dungeon3_Ch4:: + drum_speed 12 rest 16 rest 16 rest 16 @@ -753,4 +753,4 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - endchannel + sound_ret diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index adb0f8b9..6dec6bbb 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,1344 +1,1344 @@ -Music_FinalBattle_Ch0:: +Music_FinalBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - F# 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - G_ 1 - G# 1 - G_ 1 - notetype 12, 10, 2 - G# 1 - A_ 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - notetype 12, 9, 2 - A# 1 - B_ 1 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note_type 12, 10, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note_type 12, 9, 2 + note A#, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - C_ 1 - C# 1 - notetype 12, 8, 2 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - notetype 12, 12, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note_type 12, 8, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note_type 12, 12, 1 octave 3 - E_ 1 - E_ 7 - F_ 1 - F_ 7 - G_ 1 - G_ 7 - F_ 1 - F_ 7 - E_ 1 - E_ 7 - F_ 1 - F_ 7 - G_ 1 - G_ 7 - G# 1 - G# 3 - D# 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - G# 1 - G# 3 - notetype 12, 11, 7 - D# 4 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note F_, 1 + note F_, 7 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note G#, 1 + note G#, 3 + note D#, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note G#, 1 + note G#, 3 + note_type 12, 11, 7 + note D#, 4 Music_FinalBattle_branch_23429:: - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 4 - notetype 12, 11, 1 - F# 2 - F_ 1 - F# 1 - A_ 1 - F# 2 - F# 1 - notetype 12, 11, 7 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 12, 11, 1 + note F#, 2 + note F_, 1 + note F#, 1 + note A_, 1 + note F#, 2 + note F#, 1 + note_type 12, 11, 7 octave 2 - B_ 6 - notetype 12, 10, 0 + note B_, 6 + note_type 12, 10, 0 octave 3 - D_ 6 - notetype 12, 11, 7 - F# 4 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note D_, 6 + note_type 12, 11, 7 + note F#, 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - A# 4 - notetype 12, 5, 14 - B_ 12 - notetype 12, 11, 2 - E_ 3 - E_ 3 - E_ 2 - E_ 1 - F# 1 - E_ 1 - B_ 1 - F# 1 - E_ 1 - F# 1 - B_ 1 - F# 1 - E_ 1 - F# 1 - B_ 1 - F# 1 - E_ 1 - F# 1 - B_ 1 - F# 1 - notetype 12, 12, 2 - E_ 1 - F# 1 - B_ 1 - F# 1 - notetype 12, 13, 2 - E_ 1 - F# 1 - B_ 1 - notetype 12, 12, 1 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 1 - E_ 2 - B_ 1 - A_ 1 - E_ 2 - B_ 1 - A_ 1 - E_ 2 - B_ 1 - A_ 1 - E_ 2 - B_ 1 - A_ 3 - E_ 1 - D_ 3 - E_ 1 - D_ 3 - E_ 1 - D_ 3 - E_ 1 - D_ 1 - F_ 2 + note F#, 4 + note F_, 4 + note F#, 12 + note A#, 4 + note_type 12, 5, -6 + note B_, 12 + note_type 12, 11, 2 + note E_, 3 + note E_, 3 + note E_, 2 + note E_, 1 + note F#, 1 + note E_, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note_type 12, 12, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note_type 12, 13, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note_type 12, 12, 1 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note_type 12, 11, 7 + note E_, 7 + note_type 12, 12, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 3 - F_ 1 - E_ 1 - F# 2 + note B_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 1 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 3 + note C#, 1 + note C_, 3 octave 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - F# 1 - F_ 3 - notetype 12, 11, 7 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note_type 12, 11, 7 octave 4 - C_ 2 - notetype 12, 11, 0 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 10, 0 + note C_, 2 + note_type 12, 11, 0 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 10, 0 octave 3 - F# 8 - F# 8 - notetype 12, 11, 0 + note F#, 8 + note F#, 8 + note_type 12, 11, 0 octave 3 - A_ 8 - notetype 12, 11, 7 - A_ 8 - G_ 4 - B_ 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - A# 8 - notetype 12, 11, 7 - A# 8 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note G_, 4 + note B_, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note A#, 8 + note_type 12, 11, 7 + note A#, 8 octave 4 - F_ 8 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C# 4 - E_ 12 + note C#, 4 + note E_, 12 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 12 - notetype 12, 4, 0 - callchannel Music_FinalBattle_branch_23710 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 7 + note C#, 12 + note_type 12, 4, 0 + sound_call Music_FinalBattle_branch_23710 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - G_ 8 - notetype 12, 11, 7 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note G_, 8 + note_type 12, 11, 7 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 octave 4 - C_ 8 - notetype 12, 11, 0 + note C_, 8 + note_type 12, 11, 0 octave 3 - B_ 8 - notetype 12, 11, 7 - B_ 8 - notetype 12, 11, 0 + note B_, 8 + note_type 12, 11, 7 + note B_, 8 + note_type 12, 11, 0 octave 4 - E_ 8 - notetype 12, 11, 7 - E_ 8 - loopchannel 0, Music_FinalBattle_branch_23429 - - -Music_FinalBattle_Ch1:: - duty 3 - vibrato 8, 2, 5 - notetype 12, 12, 2 - octave 5 - C_ 1 - octave 4 - G# 1 - B_ 1 - F# 1 - A_ 1 - E_ 1 - G_ 1 - octave 5 - C_ 1 - octave 4 - F_ 1 - C# 1 - E_ 1 - C_ 1 - D# 1 - octave 3 - B_ 1 - octave 4 - D_ 1 - octave 5 - C_ 1 - octave 4 - C_ 1 - octave 3 - G# 1 - B_ 1 - F# 1 - A# 1 - F_ 1 - A_ 1 - octave 5 - C_ 1 - octave 3 - G# 1 - D# 1 - G_ 1 - D_ 1 - F_ 1 - C# 1 - E_ 1 - octave 5 - C_ 1 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - D# 4 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 4, 10 - octave 3 - G# 4 - -Music_FinalBattle_branch_235e6:: - notetype 12, 13, 7 - octave 4 - E_ 8 - D# 8 - D_ 8 - octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - notetype 12, 11, 1 - F_ 2 - F# 3 - A_ 1 - B_ 1 - A_ 1 - octave 4 - C_ 1 - octave 3 - B_ 2 - A_ 1 - B_ 1 - B_ 1 - A_ 1 - A# 1 - notetype 12, 13, 7 - octave 4 - E_ 8 - D# 8 - D_ 8 - octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - octave 4 - D# 4 - E_ 12 - notetype 12, 10, 0 - octave 3 - B_ 8 - octave 4 - D_ 8 - F_ 8 - D_ 8 - notetype 12, 13, 1 - E_ 1 - E_ 3 - notetype 12, 12, 4 - octave 3 - D_ 4 - notetype 12, 13, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 - octave 3 - F_ 4 - notetype 12, 13, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 - octave 3 - D_ 4 - notetype 12, 13, 1 - octave 4 - E_ 1 - E_ 1 - notetype 12, 12, 4 - octave 2 - B_ 4 - octave 3 - D_ 2 - notetype 12, 12, 2 - octave 4 - E_ 1 - E_ 1 - D_ 1 - E_ 1 - F_ 1 - E_ 1 - D_ 1 - F_ 1 - E_ 1 - E_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - F# 1 - E_ 1 - E_ 1 - F_ 1 - E_ 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - E_ 1 - notetype 12, 12, 4 - octave 2 - B_ 4 - octave 3 - D_ 2 - notetype 12, 13, 7 - octave 4 - E_ 4 - F_ 2 - F# 12 - notetype 12, 12, 2 - octave 3 - B_ 2 - B_ 4 - B_ 2 - B_ 4 - B_ 2 - notetype 12, 13, 7 - octave 4 - F_ 4 - F# 2 - G_ 12 - notetype 12, 12, 2 - C_ 2 - C_ 4 - C_ 2 - C_ 4 - C_ 2 - notetype 12, 13, 7 - F# 4 - G_ 2 - G# 12 - notetype 12, 8, 2 - C# 2 - C# 4 - notetype 12, 10, 2 - C# 2 - C# 4 - C# 4 - notetype 12, 13, 2 - C# 2 - C# 4 - notetype 12, 15, 2 - C# 2 - C# 4 - notetype 12, 12, 4 - E_ 1 - F_ 1 - notetype 12, 12, 0 - F# 12 - notetype 12, 12, 7 - F# 4 - notetype 12, 1, 15 - octave 3 - F# 8 - notetype 12, 9, 0 - F# 8 - notetype 12, 12, 7 - octave 4 - C# 4 - notetype 12, 12, 0 - D_ 12 - D_ 8 - notetype 12, 12, 7 - D_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - notetype 12, 12, 0 - octave 3 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 0 - octave 4 - F_ 8 - notetype 12, 12, 7 - F_ 8 - octave 5 - C_ 8 - octave 4 - A# 8 - notetype 12, 12, 0 - A_ 16 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 5 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 1 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 13, 7 - octave 4 - E_ 8 - D# 8 - D_ 8 - octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 12, 7 - octave 4 - D_ 8 - notetype 12, 4, 12 - C_ 8 - notetype 12, 13, 7 - E_ 8 - D# 8 - D_ 8 - octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 5, 13 - octave 4 - D_ 8 - notetype 12, 12, 0 - F_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - A# 4 - B_ 12 - loopchannel 0, Music_FinalBattle_branch_235e6 - -Music_FinalBattle_branch_23704:: - octave 4 - E_ 1 - E_ 1 - G_ 1 - octave 5 - C_ 1 - E_ 1 - C_ 1 - octave 4 - G_ 1 - F_ 1 - endchannel - -Music_FinalBattle_branch_23710:: - octave 4 - D_ 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - C# 2 - F# 2 - D_ 2 - endchannel + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + sound_loop 0, Music_FinalBattle_branch_23429 Music_FinalBattle_Ch2:: - notetype 12, 1, 1 - octave 4 - E_ 4 + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 2 octave 5 - E_ 4 + note C_, 1 octave 4 - F_ 4 + note G#, 1 + note B_, 1 + note F#, 1 + note A_, 1 + note E_, 1 + note G_, 1 octave 5 - D# 4 + note C_, 1 octave 4 - G_ 4 + note F_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note D#, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 octave 5 - D_ 4 + note C_, 1 octave 4 - G# 4 - B_ 4 - E_ 1 - E_ 1 + note C_, 1 + octave 3 + note G#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + octave 3 + note G#, 1 + note D#, 1 + note G_, 1 + note D_, 1 + note F_, 1 + note C#, 1 + note E_, 1 + octave 5 + note C_, 1 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + 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 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 4, -2 + octave 3 + note G#, 4 + +Music_FinalBattle_branch_235e6:: + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + note_type 12, 11, 1 + note F_, 2 + note F#, 3 + note A_, 1 + note B_, 1 + note A_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 2 + note A_, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note A#, 1 + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + octave 4 + note D#, 4 + note E_, 12 + note_type 12, 10, 0 + octave 3 + note B_, 8 + octave 4 + note D_, 8 + note F_, 8 + note D_, 8 + note_type 12, 13, 1 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 + octave 3 + note D_, 4 + note_type 12, 13, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 + octave 3 + note F_, 4 + note_type 12, 13, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 + octave 3 + note D_, 4 + note_type 12, 13, 1 + octave 4 + note E_, 1 + note E_, 1 + note_type 12, 12, 4 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + note_type 12, 12, 2 + octave 4 + note E_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note F_, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note E_, 1 + note_type 12, 12, 4 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + note_type 12, 13, 7 + octave 4 + note E_, 4 + note F_, 2 + note F#, 12 + note_type 12, 12, 2 + octave 3 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 4 + note B_, 2 + note_type 12, 13, 7 + octave 4 + note F_, 4 + note F#, 2 + note G_, 12 + note_type 12, 12, 2 + note C_, 2 + note C_, 4 + note C_, 2 + note C_, 4 + note C_, 2 + note_type 12, 13, 7 + note F#, 4 + note G_, 2 + note G#, 12 + note_type 12, 8, 2 + note C#, 2 + note C#, 4 + note_type 12, 10, 2 + note C#, 2 + note C#, 4 + note C#, 4 + note_type 12, 13, 2 + note C#, 2 + note C#, 4 + note_type 12, 15, 2 + note C#, 2 + note C#, 4 + note_type 12, 12, 4 + note E_, 1 + note F_, 1 + note_type 12, 12, 0 + note F#, 12 + note_type 12, 12, 7 + note F#, 4 + note_type 12, 1, -7 + octave 3 + note F#, 8 + note_type 12, 9, 0 + note F#, 8 + note_type 12, 12, 7 + octave 4 + note C#, 4 + note_type 12, 12, 0 + note D_, 12 + note D_, 8 + note_type 12, 12, 7 + note D_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note_type 12, 12, 0 + octave 3 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 0 + octave 4 + note F_, 8 + note_type 12, 12, 7 + note F_, 8 + octave 5 + note C_, 8 + octave 4 + note A#, 8 + note_type 12, 12, 0 + note A_, 16 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 5 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 1 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 12, 7 + octave 4 + note D_, 8 + note_type 12, 4, -4 + note C_, 8 + note_type 12, 13, 7 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 5, -5 + octave 4 + note D_, 8 + note_type 12, 12, 0 + note F_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note A#, 4 + note B_, 12 + sound_loop 0, Music_FinalBattle_branch_235e6 + +Music_FinalBattle_branch_23704:: + octave 4 + note E_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note E_, 1 + note C_, 1 + octave 4 + note G_, 1 + note F_, 1 + sound_ret + +Music_FinalBattle_branch_23710:: + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + note F#, 2 + note D_, 2 + sound_ret + + +Music_FinalBattle_Ch3:: + note_type 12, 1, 1 + octave 4 + note E_, 4 + octave 5 + note E_, 4 + octave 4 + note F_, 4 + octave 5 + note D#, 4 + octave 4 + note G_, 4 + octave 5 + note D_, 4 + octave 4 + note G#, 4 + note B_, 4 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D# 4 - E_ 1 - E_ 1 + note D#, 4 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 + note C_, 4 octave 4 - A# 2 - E_ 1 - E_ 1 + note A#, 2 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - E_ 1 - D# 1 - E_ 1 - G_ 1 + note E_, 1 + note D#, 1 + note E_, 1 + note G_, 1 Music_FinalBattle_branch_2377d:: octave 4 - E_ 1 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 - E_ 1 + note F#, 2 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 - E_ 1 - D# 1 - E_ 1 - F# 1 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 1 - E_ 1 + note F#, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - B_ 2 - F_ 2 + note B_, 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 + note C_, 2 + note C_, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 - callchannel Music_FinalBattle_branch_2395b - callchannel Music_FinalBattle_branch_2395b + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + sound_call Music_FinalBattle_branch_2395b + sound_call Music_FinalBattle_branch_2395b octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 1 - F# 1 - G_ 1 - G# 1 - callchannel Music_FinalBattle_branch_2396c - callchannel Music_FinalBattle_branch_2396c + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + sound_call Music_FinalBattle_branch_2396c + sound_call Music_FinalBattle_branch_2396c octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C# 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 4 - A# 2 - A_ 2 + note A#, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 1 - F# 1 - G_ 1 - G# 1 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - F_ 2 - F# 2 - G_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - B_ 2 - F# 2 - D# 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - F_ 2 - F# 2 - G_ 2 - F# 2 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 - F_ 2 - E_ 2 - B_ 2 + note F#, 2 + note F_, 2 + note E_, 2 + note B_, 2 octave 5 - E_ 4 + note E_, 4 octave 4 - E_ 2 - B_ 2 + note E_, 2 + note B_, 2 octave 5 - D# 4 + note D#, 4 octave 4 - E_ 2 - B_ 2 + note E_, 2 + note B_, 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 2 - A_ 2 - B_ 4 - loopchannel 0, Music_FinalBattle_branch_2377d + note E_, 2 + note A_, 2 + note B_, 4 + sound_loop 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_FinalBattle_branch_2396c:: octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 - endchannel + note E_, 2 + sound_ret diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 832bade6..f152d180 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,627 +1,627 @@ -Music_GameCorner_Ch0:: +Music_GameCorner_Ch1:: tempo 120 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - A_ 6 - notetype 12, 11, 1 - G# 2 - F# 2 - E_ 2 - D# 2 - C# 2 - D# 16 + note A_, 6 + note_type 12, 11, 1 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 Music_GameCorner_branch_7e222:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 4 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - A_ 2 - G# 8 - notetype 12, 10, 7 - G# 2 - A_ 2 - B_ 2 - notetype 12, 11, 5 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - notetype 12, 10, 7 - F# 8 - D# 8 - notetype 12, 11, 5 - D# 4 + note A_, 2 + note G#, 8 + note_type 12, 10, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note_type 12, 11, 5 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note_type 12, 10, 7 + note F#, 8 + note D#, 8 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 12, 11, 7 octave 4 - E_ 2 - D# 2 - E_ 2 - D# 6 - C# 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 6 + note C#, 2 octave 3 - D# 2 - E_ 2 - F# 2 - G_ 2 - G# 2 - notetype 12, 9, 7 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 5 - C# 4 + note D#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note_type 12, 9, 7 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 5 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - A_ 2 - G# 8 - notetype 12, 11, 7 - G# 2 - A_ 2 - B_ 2 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - F# 8 - notetype 12, 9, 7 - D# 4 - C# 4 - notetype 12, 11, 5 - D# 4 + note A_, 2 + note G#, 8 + note_type 12, 11, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 8 + note_type 12, 9, 7 + note D#, 4 + note C#, 4 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 - F# 2 - G# 2 - A_ 2 - B_ 4 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 2 - E_ 4 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 12, 11, 7 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note_type 12, 12, 2 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - E_ 4 - E_ 4 - notetype 12, 11, 7 + note E_, 2 + note E_, 4 + note E_, 4 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 octave 4 - D# 4 + note D#, 4 octave 3 - B_ 4 - F# 4 - D# 4 - notetype 12, 11, 7 - E_ 3 - D# 1 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 10 - notetype 12, 11, 7 + note B_, 4 + note F#, 4 + note D#, 4 + note_type 12, 11, 7 + note E_, 3 + note D#, 1 + note_type 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 10 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 octave 4 - D# 4 + note D#, 4 octave 3 - B_ 4 - F# 4 - A_ 4 - notetype 12, 11, 7 - G# 2 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 8 - loopchannel 0, Music_GameCorner_branch_7e222 - - -Music_GameCorner_Ch1:: - duty 2 - vibrato 10, 2, 3 - notetype 12, 12, 6 - octave 4 - C# 6 - notetype 12, 12, 1 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - duty 3 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 8 - -Music_GameCorner_branch_7e2fa:: - duty 2 - notetype 12, 12, 7 - octave 3 - E_ 4 - octave 2 - B_ 4 - octave 3 - G# 4 - E_ 4 - octave 4 - C# 2 - octave 3 - B_ 14 - octave 4 - E_ 6 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 16 - F# 4 - D# 4 - A_ 4 - F# 4 - octave 4 - D# 2 - C# 14 - F# 6 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A# 2 - B_ 16 - E_ 4 - octave 2 - B_ 4 - octave 3 - G# 4 - E_ 4 - octave 4 - C# 2 - octave 3 - B_ 14 - octave 4 - E_ 6 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 16 - F# 4 - D# 4 - A_ 4 - F# 4 - octave 4 - D# 2 - C# 14 - F# 6 - E_ 2 - D# 2 - E_ 2 - F# 2 - G# 2 - notetype 12, 12, 1 - E_ 2 - notetype 12, 10, 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - D# 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 12, 5 - F# 4 - D# 4 - octave 3 - B_ 4 - octave 4 - A_ 4 - G# 3 - A_ 1 - notetype 12, 12, 2 - G# 2 - F# 2 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - D# 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - F# 4 - D# 4 - A_ 4 - F# 4 - B_ 16 - loopchannel 0, Music_GameCorner_branch_7e2fa + note B_, 4 + note F#, 4 + note A_, 4 + note_type 12, 11, 7 + note G#, 2 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 8 + sound_loop 0, Music_GameCorner_branch_7e222 Music_GameCorner_Ch2:: - notetype 12, 1, 3 + duty_cycle 2 + vibrato 10, 2, 3 + note_type 12, 12, 6 + octave 4 + note C#, 6 + note_type 12, 12, 1 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + duty_cycle 3 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 8 + +Music_GameCorner_branch_7e2fa:: + duty_cycle 2 + note_type 12, 12, 7 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 16 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note_type 12, 12, 1 + note E_, 2 + note_type 12, 10, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 2 + note_type 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 12, 5 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note A_, 4 + note G#, 3 + note A_, 1 + note_type 12, 12, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note_type 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + note B_, 16 + sound_loop 0, Music_GameCorner_branch_7e2fa + + +Music_GameCorner_Ch3:: + note_type 12, 1, 3 octave 5 - C# 1 + note C#, 1 rest 5 octave 4 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - B_ 1 + note B_, 1 rest 9 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 Music_GameCorner_branch_7e3a5:: - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - D# 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 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - E_ 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 + note E_, 1 rest 3 octave 3 - B_ 1 + note B_, 1 rest 3 octave 4 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - E_ 1 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - callchannel Music_GameCorner_branch_7e42d - loopchannel 0, Music_GameCorner_branch_7e3a5 + 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 Music_GameCorner_branch_7e418:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e42d:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e442:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e457:: - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e46c:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e481:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e496:: - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e4ab:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm index ad99bddd..1ffc4930 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,357 +1,357 @@ -Music_Gym_Ch0:: +Music_Gym_Ch1:: tempo 138 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 2, 2 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - G_ 6 - C_ 1 - G_ 1 - F_ 6 + note G_, 6 + note C_, 1 + note G_, 1 + note F_, 6 octave 2 - A# 1 + note A#, 1 octave 3 - F_ 1 - E_ 6 + note F_, 1 + note E_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - E_ 1 - F_ 4 - G_ 4 + note E_, 1 + note F_, 4 + note G_, 4 Music_Gym_branch_bcd8:: - E_ 4 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - notetype 12, 11, 1 - D_ 3 - notetype 12, 11, 5 - E_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - E_ 4 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note_type 12, 11, 1 + note D_, 3 + note_type 12, 11, 5 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - notetype 12, 11, 1 - A# 3 - notetype 12, 11, 5 - F_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note_type 12, 11, 1 + note A#, 3 + note_type 12, 11, 5 + note F_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 4 - A# 2 - F_ 1 - A# 1 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note A#, 2 + note F_, 1 + note A#, 1 octave 4 - D_ 4 + note D_, 4 octave 3 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - C_ 2 - C_ 1 - D_ 1 - E_ 4 - C_ 2 - E_ 2 - D_ 2 - C_ 2 - E_ 2 - C_ 1 - E_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - E_ 2 - D_ 2 - F_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - C_ 2 - D_ 2 - C_ 2 - C_ 1 - D_ 1 - E_ 4 - D_ 2 - E_ 2 - F_ 2 - F_ 2 - G_ 2 - E_ 1 - G_ 1 - A# 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note C_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note C_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note D_, 2 + note E_, 2 + note F_, 2 + note F_, 2 + note G_, 2 + note E_, 1 + note G_, 1 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_Gym_branch_bcd8 - - -Music_Gym_Ch1:: - duty 3 - vibrato 10, 2, 5 - notetype 12, 12, 7 - octave 4 - C_ 6 - octave 3 - G_ 1 - octave 4 - C_ 1 - octave 3 - A# 6 - F_ 1 - A# 1 - notetype 12, 10, 0 - A_ 12 - notetype 12, 12, 7 - B_ 4 - -Music_Gym_branch_bd82:: - octave 4 - C_ 12 - octave 3 - G_ 2 - octave 4 - C_ 2 - notetype 12, 12, 2 - D_ 3 - octave 3 - A# 1 - notetype 12, 12, 7 - A# 12 - octave 4 - C_ 12 - octave 3 - G_ 2 - octave 4 - C_ 2 - notetype 12, 12, 4 - octave 3 - A# 2 - notetype 12, 12, 7 - A# 1 - octave 4 - C_ 1 - D_ 12 - E_ 12 - D_ 2 - E_ 2 - notetype 12, 12, 2 - F_ 3 - D_ 1 - notetype 12, 12, 7 - D_ 4 - notetype 12, 12, 2 - A# 3 - F_ 1 - notetype 12, 12, 7 - F_ 4 - E_ 12 - D_ 2 - E_ 2 - F_ 2 - D_ 1 - F_ 1 - A# 12 - octave 3 - G_ 6 - octave 4 - C_ 6 - octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 6 - G_ 2 - octave 4 - C_ 2 - octave 3 - G_ 2 - A# 4 - A_ 4 - G_ 4 - C_ 2 - D_ 2 - G_ 6 - octave 4 - C_ 6 - octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 4 - notetype 12, 12, 3 - G_ 2 - notetype 12, 12, 7 - G_ 1 - A_ 1 - A# 4 - notetype 12, 12, 4 - octave 4 - C_ 2 - notetype 12, 12, 7 - C_ 1 - D_ 1 - E_ 12 - loopchannel 0, Music_Gym_branch_bd82 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_Gym_branch_bcd8 Music_Gym_Ch2:: - notetype 12, 1, 1 + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 7 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note A#, 6 + note F_, 1 + note A#, 1 + note_type 12, 10, 0 + note A_, 12 + note_type 12, 12, 7 + note B_, 4 + +Music_Gym_branch_bd82:: + octave 4 + note C_, 12 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note_type 12, 12, 2 + note D_, 3 + octave 3 + note A#, 1 + note_type 12, 12, 7 + note A#, 12 + octave 4 + note C_, 12 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note_type 12, 12, 4 + octave 3 + note A#, 2 + note_type 12, 12, 7 + note A#, 1 + octave 4 + note C_, 1 + note D_, 12 + note E_, 12 + note D_, 2 + note E_, 2 + note_type 12, 12, 2 + note F_, 3 + note D_, 1 + note_type 12, 12, 7 + note D_, 4 + note_type 12, 12, 2 + note A#, 3 + note F_, 1 + note_type 12, 12, 7 + note F_, 4 + note E_, 12 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 1 + note F_, 1 + note A#, 12 + octave 3 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 6 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A#, 4 + note A_, 4 + note G_, 4 + note C_, 2 + note D_, 2 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 4 + note_type 12, 12, 3 + note G_, 2 + note_type 12, 12, 7 + note G_, 1 + note A_, 1 + note A#, 4 + note_type 12, 12, 4 + octave 4 + note C_, 2 + note_type 12, 12, 7 + note C_, 1 + note D_, 1 + note E_, 12 + sound_loop 0, Music_Gym_branch_bd82 + + +Music_Gym_Ch3:: + note_type 12, 1, 1 rest 16 rest 10 octave 4 - G_ 2 - F_ 2 - D_ 2 + note G_, 2 + note F_, 2 + note D_, 2 Music_Gym_branch_be02:: - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - A_ 2 - F_ 2 - loopchannel 0, 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 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note F_, 2 + sound_loop 0, Music_Gym_branch_be02 Music_Gym_branch_be3b:: - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - endchannel + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + sound_ret Music_Gym_branch_be44:: - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - endchannel + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + sound_ret Music_Gym_branch_be4d:: - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - endchannel + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + sound_ret diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 6c1cffb5..5befd665 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,1400 +1,1400 @@ -Music_GymLeaderBattle_Ch0:: +Music_GymLeaderBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 6 octave 3 - F# 1 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - C_ 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 + note B_, 1 octave 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 octave 2 - F# 1 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - F_ 6 - F# 1 + note F_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - A_ 6 + note A_, 6 Music_GymLeaderBattle_branch_223b0:: - F# 1 + note F#, 1 octave 3 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 octave 2 - E_ 1 - A_ 1 + note E_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 - F# 1 + note B_, 1 + note A_, 1 + note F#, 1 octave 3 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - C# 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 octave 2 - E_ 1 - A_ 1 + note E_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 rest 2 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 rest 16 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 12 - notetype 12, 11, 3 + note C#, 12 + note_type 12, 11, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - A_ 12 - notetype 12, 11, 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 + note A_, 12 + note_type 12, 11, 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - F# 2 - B_ 2 - F# 2 - D# 2 - F# 2 + note C#, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note F#, 2 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - A_ 12 - notetype 12, 11, 3 - C# 1 + note A_, 12 + note_type 12, 11, 3 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - C# 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - F# 1 - A_ 1 - G# 1 - F# 1 - E_ 1 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 5 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - E_ 2 - D# 4 - C# 6 + note C#, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + note_type 12, 11, 5 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note E_, 2 + note D#, 4 + note C#, 6 rest 16 rest 10 - E_ 6 - D# 4 - E_ 4 - C# 2 - D# 6 - E_ 4 - D# 2 - C# 4 + note E_, 6 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note E_, 4 + note D#, 2 + note C#, 4 octave 2 - B_ 6 + note B_, 6 octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 - E_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_223b0 - - -Music_GymLeaderBattle_Ch1:: - duty 3 - vibrato 8, 2, 5 - notetype 12, 12, 3 - octave 4 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - rest 5 - F# 1 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - B_ 1 - rest 15 - B_ 1 - rest 9 - octave 4 - C_ 6 - octave 3 - B_ 1 - rest 15 - B_ 1 - rest 9 - A# 6 - octave 3 - B_ 1 - rest 15 - B_ 1 - rest 9 - octave 4 - C_ 6 - octave 3 - B_ 1 - rest 15 - B_ 1 - rest 9 - octave 4 - C# 6 - -Music_GymLeaderBattle_branch_225e0:: - notetype 12, 12, 5 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - octave 3 - A_ 8 - octave 4 - C# 8 - E_ 8 - C# 8 - notetype 12, 12, 5 - duty 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 - E_ 4 - D# 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 11, 7 - duty 2 - C# 8 - octave 3 - B_ 8 - A_ 8 - notetype 12, 12, 3 - octave 4 - E_ 4 - E_ 2 - C# 2 - notetype 12, 12, 5 - duty 3 - octave 1 - B_ 1 - rest 3 - octave 3 - D_ 1 - C# 1 - octave 2 - B_ 1 - octave 3 - D_ 1 - rest 4 - E_ 1 - D_ 1 - octave 2 - B_ 1 - octave 3 - E_ 1 - rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 - rest 2 - E_ 1 - C# 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - D_ 1 - C# 1 - octave 2 - B_ 1 - octave 3 - D_ 1 - rest 4 - E_ 1 - D_ 1 - octave 2 - B_ 1 - octave 3 - E_ 1 - rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 - rest 1 - C# 1 - rest 1 - D_ 1 - rest 1 - C# 1 - rest 1 - F# 1 - rest 1 - E_ 1 - rest 1 - octave 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 11, 0 - octave 3 - B_ 4 - octave 4 - C_ 4 - octave 3 - A_ 4 - B_ 4 - octave 4 - C_ 4 - octave 3 - A_ 4 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 12, 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - octave 2 - B_ 1 - A_ 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - A_ 1 - B_ 1 - notetype 12, 11, 0 - octave 3 - B_ 4 - octave 4 - C_ 4 - octave 3 - A_ 4 - B_ 4 - octave 4 - C_ 4 - octave 3 - A_ 4 - octave 4 - C_ 4 - notetype 12, 11, 0 - octave 3 - B_ 16 - notetype 12, 3, 15 - octave 4 - F# 16 - notetype 12, 12, 3 - duty 3 - octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 12, 7 - octave 3 - A_ 12 - notetype 12, 12, 3 - octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 12, 7 - octave 4 - C# 12 - notetype 12, 11, 0 - D# 16 - notetype 12, 11, 7 - D# 16 - notetype 12, 12, 3 - octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 12, 7 - octave 4 - C# 12 - notetype 12, 12, 0 - A_ 8 - E_ 8 - B_ 16 - notetype 12, 12, 7 - B_ 16 - notetype 12, 12, 4 - octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 - rest 2 - B_ 1 - octave 4 - D# 1 - F# 1 - A# 1 - notetype 12, 12, 0 - B_ 16 - F# 16 - A_ 16 - octave 5 - C# 8 - rest 2 - notetype 12, 12, 3 - octave 4 - A_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_225e0 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note E_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_223b0 Music_GymLeaderBattle_Ch2:: + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 3 + octave 4 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + rest 5 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + note A#, 6 + octave 3 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + octave 4 + note C#, 6 + +Music_GymLeaderBattle_branch_225e0:: + note_type 12, 12, 5 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + octave 3 + note A_, 8 + octave 4 + note C#, 8 + note E_, 8 + note C#, 8 + note_type 12, 12, 5 + duty_cycle 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 11, 7 + duty_cycle 2 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + note_type 12, 12, 3 + octave 4 + note E_, 4 + note E_, 2 + note C#, 2 + note_type 12, 12, 5 + duty_cycle 3 + octave 1 + note B_, 1 + rest 3 + octave 3 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + rest 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + rest 4 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + rest 2 + note E_, 1 + note C#, 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + rest 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + rest 4 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + rest 1 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + note C#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note_type 12, 11, 0 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 12, 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note_type 12, 11, 0 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + note_type 12, 11, 0 + octave 3 + note B_, 16 + note_type 12, 3, -7 + octave 4 + note F#, 16 + note_type 12, 12, 3 + duty_cycle 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 12, 7 + octave 3 + note A_, 12 + note_type 12, 12, 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 12, 7 + octave 4 + note C#, 12 + note_type 12, 11, 0 + note D#, 16 + note_type 12, 11, 7 + note D#, 16 + note_type 12, 12, 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 12, 7 + octave 4 + note C#, 12 + note_type 12, 12, 0 + note A_, 8 + note E_, 8 + note B_, 16 + note_type 12, 12, 7 + note B_, 16 + note_type 12, 12, 4 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + rest 2 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note_type 12, 12, 0 + note B_, 16 + note F#, 16 + note A_, 16 + octave 5 + note C#, 8 + rest 2 + note_type 12, 12, 3 + octave 4 + note A_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_225e0 + + +Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 12 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - C_ 1 - C# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - F# 1 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 6 + note F_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 6 - notetype 12, 1, 4 + note C#, 6 + note_type 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - C# 12 + note C#, 12 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - D# 16 + note E_, 12 + note D#, 16 octave 3 - B_ 16 - A_ 1 + note B_, 16 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - C# 8 - E_ 8 + note E_, 12 + note C#, 8 + note E_, 8 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_227b1 + note G_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_227b1 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 098c82c8..80dafaa6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,96 +1,96 @@ -Music_HallOfFame_Ch0:: +Music_HallOfFame_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 2, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 16 rest 16 rest 16 rest 12 octave 3 - D_ 1 - E_ 1 - F_ 1 - F# 1 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 Music_HallOfFame_branch_7fbc5:: - notetype 12, 8, 0 + note_type 12, 8, 0 octave 4 - C_ 16 - E_ 16 - F# 16 - notetype 12, 6, 0 - F_ 16 - loopchannel 3, Music_HallOfFame_branch_7fbc5 + note C_, 16 + note E_, 16 + note F#, 16 + note_type 12, 6, 0 + note F_, 16 + sound_loop 3, Music_HallOfFame_branch_7fbc5 rest 16 rest 16 rest 16 rest 16 - loopchannel 0, Music_HallOfFame_branch_7fbc5 - - -Music_HallOfFame_Ch1:: - vibrato 8, 2, 5 - duty 3 - -Music_HallOfFame_branch_7fbdf:: - notetype 12, 12, 4 - octave 3 - G_ 2 - D_ 2 - G_ 2 - A_ 10 - G_ 2 - D_ 2 - G_ 2 - octave 4 - C_ 4 - octave 3 - B_ 4 - A_ 2 - G_ 2 - D_ 2 - G_ 2 - A_ 10 - F_ 2 - C_ 2 - F_ 2 - A# 4 - A_ 4 - F_ 2 - loopchannel 0, Music_HallOfFame_branch_7fbdf + sound_loop 0, Music_HallOfFame_branch_7fbc5 Music_HallOfFame_Ch2:: - notetype 12, 1, 2 + vibrato 8, 2, 5 + duty_cycle 3 + +Music_HallOfFame_branch_7fbdf:: + note_type 12, 12, 4 + octave 3 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note F_, 2 + note C_, 2 + note F_, 2 + note A#, 4 + note A_, 4 + note F_, 2 + sound_loop 0, Music_HallOfFame_branch_7fbdf + + +Music_HallOfFame_Ch3:: + note_type 12, 1, 2 Music_HallOfFame_branch_7fbfe:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - loopchannel 12, Music_HallOfFame_branch_7fbfe - D_ 4 - G_ 4 - D_ 4 - G_ 4 - E_ 4 - G_ 4 - E_ 4 - G_ 4 - F# 4 - A_ 4 - F# 4 - A_ 4 - E_ 4 - G_ 4 - E_ 4 - G_ 4 - loopchannel 0, Music_HallOfFame_Ch2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_loop 12, Music_HallOfFame_branch_7fbfe + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note F#, 4 + note A_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + sound_loop 0, Music_HallOfFame_Ch3 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index f139775b..cc3c2cef 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,321 +1,321 @@ -Music_IndigoPlateau_Ch0:: +Music_IndigoPlateau_Ch1:: tempo 132 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 2 - A_ 8 - A_ 8 - A_ 8 - A_ 4 - notetype 12, 10, 4 - A# 4 + note A_, 8 + note A_, 8 + note A_, 8 + note A_, 4 + note_type 12, 10, 4 + note A#, 4 Music_IndigoPlateau_branch_a605:: - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 10, 0 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 10, 0 octave 2 - A# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 13, 4 + note D_, 4 + note_type 12, 13, 4 octave 3 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - notetype 12, 11, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 13, 4 + note D#, 4 + note_type 12, 13, 4 octave 3 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - notetype 12, 11, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note_type 12, 11, 4 octave 3 - F_ 2 - notetype 12, 11, 4 + note F_, 2 + note_type 12, 11, 4 octave 3 - G_ 2 - notetype 12, 11, 0 - A_ 8 + note G_, 2 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 14 + note F_, 8 + note_type 12, 4, -6 octave 2 - A# 8 - loopchannel 0, Music_IndigoPlateau_branch_a605 + note A#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a605 Music_IndigoPlateau_branch_a659:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - endchannel - - -Music_IndigoPlateau_Ch1:: - duty 3 - vibrato 8, 2, 5 - notetype 12, 12, 2 - octave 3 - D_ 8 - D_ 8 - D_ 8 - D_ 4 - notetype 12, 5, 10 - D# 4 - -Music_IndigoPlateau_branch_a673:: - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 7 - C# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - octave 4 - C_ 2 - notetype 12, 12, 7 - octave 4 - C# 2 - D_ 8 - octave 3 - D_ 8 - octave 4 - C_ 8 - notetype 12, 4, 13 - octave 4 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a673 - -Music_IndigoPlateau_branch_a6af:: - notetype 12, 12, 2 - octave 3 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - endchannel + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + sound_ret Music_IndigoPlateau_Ch2:: - notetype 12, 1, 0 - octave 4 - D_ 2 - rest 6 - D_ 2 - rest 6 - D_ 2 - rest 6 - D_ 2 - rest 2 - D# 4 + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 2 + octave 3 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 4 + note_type 12, 5, -2 + note D#, 4 -Music_IndigoPlateau_branch_a6c6:: - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - F# 4 - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - A# 1 - rest 1 - A# 1 - rest 1 - A_ 8 - D_ 8 - A# 8 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a6c6 - -Music_IndigoPlateau_branch_a6fe:: +Music_IndigoPlateau_branch_a673:: + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 7 + note C#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 octave 4 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - D_ 2 - rest 2 - A_ 4 - endchannel + note C_, 2 + note_type 12, 12, 7 + octave 4 + note C#, 2 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + note_type 12, 4, -5 + octave 4 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a673 + +Music_IndigoPlateau_branch_a6af:: + note_type 12, 12, 2 + octave 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + sound_ret Music_IndigoPlateau_Ch3:: - dspeed 6 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 + note_type 12, 1, 0 + octave 4 + note D_, 2 + rest 6 + note D_, 2 + rest 6 + note D_, 2 + rest 6 + 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 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note F#, 4 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A_, 8 + note D_, 8 + note A#, 8 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a6c6 + +Music_IndigoPlateau_branch_a6fe:: + octave 4 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note A_, 4 + sound_ret + + +Music_IndigoPlateau_Ch4:: + drum_speed 6 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 Music_IndigoPlateau_branch_a728:: - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a7a8 - mutedsnare2 16 - mutedsnare2 8 - mutedsnare3 8 - mutedsnare2 16 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - loopchannel 0, 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 + drum_note 17, 16 + drum_note 17, 8 + drum_note 18, 8 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare4 2 - mutedsnare3 2 - endchannel + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 2 + drum_note 18, 2 + sound_ret Music_IndigoPlateau_branch_a791:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - endchannel + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_ret Music_IndigoPlateau_branch_a7a8:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - endchannel + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 2aad0d88..681631f6 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,329 +1,329 @@ -Music_IntroBattle_Ch0:: +Music_IntroBattle_Ch1:: tempo 98 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 1 + toggle_perfect_pitch + note_type 12, 11, 1 rest 8 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 10, 0 - A# 4 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 10, 0 + note A#, 4 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 2, 9 + note A_, 2 + note A_, 2 + note_type 12, 2, -1 octave 3 - G_ 4 - notetype 12, 11, 0 - A_ 8 + note G_, 4 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 15 + note F_, 8 + note_type 12, 4, -7 octave 2 - F_ 8 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note F_, 8 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - F_ 4 - notetype 12, 11, 1 + note F_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - G_ 4 - notetype 12, 11, 0 - F# 16 - notetype 12, 11, 1 + note G_, 4 + note_type 12, 11, 0 + note F#, 16 + note_type 12, 11, 1 octave 4 - D_ 16 - endchannel - - -Music_IntroBattle_Ch1:: - duty 3 - vibrato 8, 2, 5 - notetype 12, 12, 2 - rest 8 - octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 11, 7 - C# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 7 - octave 4 - C# 4 - D_ 8 - octave 3 - D_ 8 - octave 4 - C_ 8 - octave 3 - C_ 8 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - octave 4 - C_ 4 - notetype 12, 12, 2 - octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 - octave 4 - C# 4 - notetype 12, 2, 15 - D_ 16 - notetype 12, 12, 1 - octave 5 - D_ 16 - endchannel + note D_, 16 + sound_ret Music_IntroBattle_Ch2:: - notetype 12, 1, 0 + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 2 rest 8 + octave 3 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 11, 7 + note C#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + octave 3 + note D_, 2 + note D_, 2 + note_type 12, 12, 7 octave 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A_ 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A_ 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A_ 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - F# 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A_ 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A# 4 - A_ 8 - D_ 8 - A# 8 - D_ 8 - D_ 1 - rest 1 - D_ 1 - rest 1 - A_ 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A_ 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A# 4 - D_ 1 - rest 1 - D_ 1 - rest 1 - A# 4 - A_ 16 - D_ 1 - rest 15 - endchannel + note C#, 4 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + octave 3 + note C_, 8 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + octave 4 + note C_, 4 + note_type 12, 12, 2 + octave 3 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + octave 4 + note C#, 4 + note_type 12, 2, -7 + note D_, 16 + note_type 12, 12, 1 + octave 5 + note D_, 16 + sound_ret Music_IntroBattle_Ch3:: - dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare2 4 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 2 + note_type 12, 1, 0 + rest 8 + octave 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 4 + note A_, 8 + note D_, 8 + note A#, 8 + note D_, 8 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 4 + note A_, 16 + note D_, 1 + rest 15 + sound_ret + + +Music_IntroBattle_Ch4:: + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 2 rest 16 rest 14 - endchannel + sound_ret diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 0b791a30..d8995fbd 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,40 +1,40 @@ -Music_JigglypuffSong_Ch0:: +Music_JigglypuffSong_Ch1:: tempo 144 volume 7, 7 vibrato 8, 2, 4 - duty 2 - dutycycle 165 - toggleperfectpitch - notetype 13, 6, 7 + duty_cycle 2 + duty_cycle_pattern 2, 2, 1, 1 + toggle_perfect_pitch + note_type 13, 6, 7 octave 4 - E_ 8 - notetype 12, 6, 7 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + note E_, 8 + note_type 12, 6, 7 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + sound_ret -Music_JigglypuffSong_Ch1:: +Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 - duty 2 - dutycycle 10 - notetype 12, 10, 7 + duty_cycle 2 + duty_cycle_pattern 0, 0, 2, 2 + note_type 12, 10, 7 octave 4 - E_ 8 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + note E_, 8 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index da58e489..70fff2e5 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,199 +1,199 @@ -Music_Lavender_Ch0:: +Music_Lavender_Ch1:: tempo 152 volume 7, 7 - duty 1 - toggleperfectpitch + duty_cycle 1 + toggle_perfect_pitch vibrato 0, 8, 8 - notetype 12, 8, 7 + note_type 12, 8, 7 rest 16 rest 16 rest 16 rest 16 - notetype 12, 10, 7 + note_type 12, 10, 7 Music_Lavender_branch_bb6b:: octave 3 - G_ 8 - G_ 8 - E_ 8 - E_ 8 - G_ 4 - F# 4 - E_ 4 - B_ 4 - C# 8 - C# 8 - G_ 8 - G_ 8 - F# 8 - F# 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - C_ 8 - C_ 8 + note C_, 8 + note C_, 8 octave 3 - G_ 8 - G_ 8 - E_ 8 - E_ 8 - G_ 4 - F# 4 - E_ 4 - B_ 4 - C# 8 - C# 8 - G_ 8 - G_ 8 - F# 8 - F# 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 - C_ 8 - C_ 8 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note C_, 8 + note C_, 8 rest 16 rest 16 rest 16 rest 16 - loopchannel 0, Music_Lavender_branch_bb6b - - -Music_Lavender_Ch1:: - vibrato 0, 3, 4 - duty 3 - notetype 12, 9, 1 - -Music_Lavender_branch_bba5:: - octave 5 - C_ 4 - G_ 4 - B_ 4 - F# 4 - loopchannel 0, Music_Lavender_branch_bba5 + sound_loop 0, Music_Lavender_branch_bb6b Music_Lavender_Ch2:: - vibrato 4, 1, 1 - notetype 12, 3, 5 - rest 16 - rest 16 - rest 16 - rest 16 - notetype 12, 2, 5 + vibrato 0, 3, 4 + duty_cycle 3 + note_type 12, 9, 1 -Music_Lavender_branch_bbb9:: - octave 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - E_ 4 - notetype 12, 3, 5 - octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 - notetype 12, 2, 5 - B_ 4 - G_ 4 - F# 4 - B_ 4 - octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 - octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - E_ 4 - notetype 12, 2, 5 - octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 - octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 - octave 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 - octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - loopchannel 0, Music_Lavender_branch_bbb9 +Music_Lavender_branch_bba5:: + octave 5 + note C_, 4 + note G_, 4 + note B_, 4 + note F#, 4 + sound_loop 0, Music_Lavender_branch_bba5 Music_Lavender_Ch3:: - dspeed 12 + vibrato 4, 1, 1 + note_type 12, 3, 5 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 12, 2, 5 + +Music_Lavender_branch_bbb9:: + octave 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note_type 12, 3, 5 + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note_type 12, 2, 5 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note_type 12, 2, 5 + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + sound_loop 0, Music_Lavender_branch_bbb9 + + +Music_Lavender_Ch4:: + drum_speed 12 rest 16 rest 16 rest 16 rest 16 Music_Lavender_branch_bc26:: - triangle2 8 - triangle2 8 - loopchannel 0, Music_Lavender_branch_bc26 + drum_note 7, 8 + drum_note 7, 8 + sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 941b0c34..eb7b5944 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,80 +1,80 @@ -Music_MeetEvilTrainer_Ch0:: +Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 rest 4 octave 3 - D_ 2 - C# 2 - notetype 12, 4, 15 - D_ 4 + note D_, 2 + note C#, 2 + note_type 12, 4, -7 + note D_, 4 Music_MeetEvilTrainer_branch_7f6ae:: - notetype 12, 10, 1 - D_ 4 - D_ 4 - D_ 4 - notetype 12, 7, 0 - D_ 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae - - -Music_MeetEvilTrainer_Ch1:: - duty 1 - notetype 12, 11, 6 - octave 3 - B_ 2 - A# 2 - B_ 8 - -Music_MeetEvilTrainer_branch_7f6c2:: - notetype 12, 12, 2 - octave 4 - D# 2 - D_ 2 - C# 2 - C_ 2 - octave 3 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 4, 15 - A# 4 - notetype 12, 12, 2 - G_ 2 - G# 2 - A_ 2 - A# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 3, 15 - A# 4 - notetype 12, 12, 2 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + 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 Music_MeetEvilTrainer_Ch2:: - notetype 12, 1, 0 + duty_cycle 1 + note_type 12, 11, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 8 + +Music_MeetEvilTrainer_branch_7f6c2:: + note_type 12, 12, 2 + octave 4 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + octave 3 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note_type 12, 4, -7 + note A#, 4 + note_type 12, 12, 2 + note G_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note_type 12, 3, -7 + note A#, 4 + note_type 12, 12, 2 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 + + +Music_MeetEvilTrainer_Ch3:: + note_type 12, 1, 0 rest 8 octave 4 - F# 1 + note F#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 Music_MeetEvilTrainer_branch_7f6ee:: - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - A# 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee + note A#, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 2a5659b4..c76483e5 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,118 +1,118 @@ -Music_MeetFemaleTrainer_Ch0:: +Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 - duty 1 - toggleperfectpitch - notetype 12, 11, 2 + duty_cycle 1 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - G# 6 + note G#, 6 octave 4 - E_ 2 - D# 2 - C# 2 - C_ 2 - notetype 12, 8, 1 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + note_type 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 - E_ 4 - loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c - E_ 4 + note E_, 4 + sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 octave 2 - B_ 4 - B_ 4 + note B_, 4 + note B_, 4 octave 3 - E_ 4 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c - - -Music_MeetFemaleTrainer_Ch1:: - duty 2 - notetype 12, 12, 2 - octave 3 - B_ 2 - notetype 12, 12, 7 - octave 4 - B_ 12 - -Music_MeetFemaleTrainer_branch_7f726:: - notetype 12, 12, 2 - octave 3 - B_ 4 - octave 4 - D# 4 - E_ 4 - D# 4 - C# 2 - C_ 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - A# 2 - octave 4 - C# 2 - octave 3 - B_ 4 - octave 4 - C# 4 - octave 3 - B_ 4 - A_ 4 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 + note E_, 4 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c Music_MeetFemaleTrainer_Ch2:: - notetype 12, 1, 0 + duty_cycle 2 + note_type 12, 12, 2 + octave 3 + note B_, 2 + note_type 12, 12, 7 + octave 4 + note B_, 12 + +Music_MeetFemaleTrainer_branch_7f726:: + note_type 12, 12, 2 + octave 3 + note B_, 4 + octave 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f726 + + +Music_MeetFemaleTrainer_Ch3:: + note_type 12, 1, 0 rest 8 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 Music_MeetFemaleTrainer_branch_7f756:: - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index c13e40cb..a2786052 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,190 +1,190 @@ -Music_MeetMaleTrainer_Ch0:: +Music_MeetMaleTrainer_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 20, 3, 3 - toggleperfectpitch - notetype 12, 11, 4 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 12 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 - B_ 4 - A_ 4 - G# 2 - F# 2 - E_ 2 - D# 2 - F# 4 - E_ 6 - F_ 2 - F# 4 - G_ 8 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 4 + note E_, 6 + note F_, 2 + note F#, 4 + note G_, 8 octave 4 - D_ 8 - E_ 16 - loopchannel 0, Music_MeetMaleTrainer_branch_7f78f - - -Music_MeetMaleTrainer_Ch1:: - duty 3 - vibrato 24, 2, 2 - notetype 12, 12, 4 - octave 4 - E_ 1 - D# 1 - D_ 1 - C# 1 - octave 3 - B_ 12 - rest 2 - E_ 1 - rest 3 - E_ 1 - rest 9 - -Music_MeetMaleTrainer_branch_7f7b5:: - notetype 12, 12, 4 - octave 4 - E_ 6 - D# 6 - C# 4 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - octave 4 - C# 2 - notetype 12, 12, 7 - F_ 16 - notetype 12, 12, 5 - octave 3 - F# 8 - octave 4 - C# 8 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + note D_, 8 + note E_, 16 + sound_loop 0, Music_MeetMaleTrainer_branch_7f78f Music_MeetMaleTrainer_Ch2:: - notetype 12, 1, 0 + duty_cycle 3 + vibrato 24, 2, 2 + note_type 12, 12, 4 + octave 4 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 12 + rest 2 + note E_, 1 + rest 3 + note E_, 1 + rest 9 + +Music_MeetMaleTrainer_branch_7f7b5:: + note_type 12, 12, 4 + octave 4 + note E_, 6 + note D#, 6 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note_type 12, 12, 7 + note F_, 16 + note_type 12, 12, 5 + octave 3 + note F#, 8 + octave 4 + note C#, 8 + sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5 + + +Music_MeetMaleTrainer_Ch3:: + note_type 12, 1, 0 rest 6 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 1 Music_MeetMaleTrainer_branch_7f7ea:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea + sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 5c6ea13d..24c6741a 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,423 +1,423 @@ -Music_MeetProfOak_Ch0:: +Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 11, 4 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - F# 1 - B_ 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 - E_ 1 - F# 12 - notetype 12, 10, 2 + note D#, 1 + note E_, 1 + note F#, 12 + note_type 12, 10, 2 octave 3 - E_ 6 - B_ 10 - E_ 6 - B_ 10 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - B_ 10 - E_ 6 - B_ 10 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - D# 4 - F# 2 - F# 4 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 Music_MeetProfOak_branch_af85:: - F# 6 - E_ 4 - A_ 2 - A_ 4 - F# 6 - E_ 4 - A_ 2 - A_ 4 - F# 6 - E_ 4 - G# 2 - G# 4 - F# 6 - E_ 4 - G# 2 - G# 4 - E_ 6 - D# 4 - F# 2 - F# 4 - E_ 6 - D# 4 - F# 2 - F# 4 - F# 6 - E_ 4 - G# 2 - G# 4 - F# 6 - E_ 4 - G# 2 - G# 4 - loopchannel 0, Music_MeetProfOak_branch_af85 - - -Music_MeetProfOak_Ch1:: - vibrato 8, 1, 1 - duty 2 - notetype 12, 12, 4 - octave 3 - B_ 1 - octave 4 - D# 1 - F# 1 - A# 1 - B_ 12 - notetype 12, 11, 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 - octave 4 - B_ 2 - octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 - octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 - octave 4 - B_ 2 - octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 - octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 5 - -Music_MeetProfOak_branch_b005:: - octave 4 - C# 6 - octave 3 - A_ 1 - octave 4 - C# 1 - E_ 6 - C# 1 - E_ 1 - F# 4 - E_ 4 - D# 4 - C# 4 - octave 3 - B_ 6 - G# 1 - B_ 1 - octave 4 - E_ 8 - notetype 12, 6, 5 - octave 4 - B_ 6 - G# 1 - B_ 1 - octave 5 - E_ 8 - notetype 12, 11, 5 - octave 3 - A_ 6 - F# 1 - A_ 1 - octave 4 - D# 8 - E_ 4 - D# 4 - C# 4 - C_ 4 - octave 3 - B_ 6 - G# 1 - B_ 1 - octave 4 - E_ 6 - octave 3 - B_ 1 - octave 4 - E_ 1 - notetype 12, 11, 7 - G# 16 - loopchannel 0, Music_MeetProfOak_branch_b005 + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + sound_loop 0, Music_MeetProfOak_branch_af85 Music_MeetProfOak_Ch2:: - notetype 12, 1, 2 + vibrato 8, 1, 1 + duty_cycle 2 + note_type 12, 12, 4 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 12 + note_type 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 5 + +Music_MeetProfOak_branch_b005:: + octave 4 + note C#, 6 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 6 + note C#, 1 + note E_, 1 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 8 + note_type 12, 6, 5 + octave 4 + note B_, 6 + note G#, 1 + note B_, 1 + octave 5 + note E_, 8 + note_type 12, 11, 5 + octave 3 + note A_, 6 + note F#, 1 + note A_, 1 + octave 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note_type 12, 11, 7 + note G#, 16 + sound_loop 0, Music_MeetProfOak_branch_b005 + + +Music_MeetProfOak_Ch3:: + note_type 12, 1, 2 rest 10 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 rest 6 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G# 1 + note G#, 1 rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0d8 + sound_loop 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0ed + sound_loop 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b101 - loopchannel 0, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b101 + sound_loop 0, Music_MeetProfOak_branch_b0bc diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index a6391247..958db7be 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -1,396 +1,396 @@ Music_MeetRival_branch_b119:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b123 + sound_loop 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch0:: +Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - D_ 1 - C# 1 - C_ 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 2 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 6 - D_ 1 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 2 + note A_, 2 Music_MeetRival_branch_b140:: - B_ 4 - A# 2 - A_ 4 - G_ 2 + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 rest 4 - D_ 4 - C# 2 - C_ 2 + note D_, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 - E_ 2 - D_ 4 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 + note C_, 2 rest 4 - G_ 4 - G_ 2 - F# 2 - E_ 2 - D_ 2 - F# 2 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - F# 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - D_ 2 + note D_, 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - D_ 2 + note D_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 4 - C_ 2 - F_ 2 + note C_, 2 + note F_, 2 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - F_ 2 - D# 2 - C_ 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 octave 3 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 rest 4 - A# 4 + note A#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 - notetype 12, 11, 7 + note C_, 2 + note_type 12, 11, 7 octave 3 - G_ 4 - D_ 2 - F_ 6 - F# 4 - D_ 2 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 rest 4 - D_ 4 - notetype 12, 11, 3 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note D_, 4 + note_type 12, 11, 3 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b1a5 + sound_loop 0, Music_MeetRival_branch_b1a5 Music_MeetRival_branch_b1a2:: tempo 112 Music_MeetRival_branch_b1a5:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 - - -Music_MeetRival_Ch1:: - duty 3 - vibrato 10, 2, 6 - notetype 12, 12, 7 - octave 4 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 2 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 6 - octave 3 - G_ 1 - rest 3 - G_ 1 - rest 3 - D_ 1 - rest 1 - octave 4 - D_ 2 - F_ 2 - F# 2 - -Music_MeetRival_branch_b1d8:: - notetype 12, 12, 7 - G_ 4 - D_ 2 - F_ 6 - F# 4 - G_ 2 - rest 4 - G_ 4 - G_ 2 - A# 2 - B_ 2 - octave 5 - C_ 4 - octave 4 - G_ 2 - A# 6 - B_ 4 - octave 5 - C_ 2 - rest 4 - C_ 4 - C_ 2 - octave 4 - B_ 2 - octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 16 - notetype 12, 11, 5 - D_ 6 - notetype 12, 12, 7 - F_ 4 - D_ 2 - C_ 2 - D_ 2 - notetype 12, 11, 0 - C_ 8 - notetype 12, 12, 7 - C_ 8 - octave 4 - C_ 2 - rest 4 - A# 4 - G_ 2 - F_ 2 - notetype 12, 11, 0 - G_ 16 - notetype 12, 11, 3 - G_ 2 - octave 3 - G_ 2 - rest 4 - G_ 4 - octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 - -Music_MeetRival_branch_b21d:: - duty 3 - vibrato 10, 2, 6 - notetype 12, 12, 7 - octave 3 - G_ 1 - rest 3 - G_ 1 - rest 3 - D_ 1 - rest 1 - octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_Ch2:: - notetype 12, 1, 4 + duty_cycle 3 + vibrato 10, 2, 6 + note_type 12, 12, 7 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 6 + octave 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note D_, 1 + rest 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + +Music_MeetRival_branch_b1d8:: + note_type 12, 12, 7 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 + rest 4 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 octave 5 - D_ 2 + note C_, 4 + octave 4 + note G_, 2 + note A#, 6 + note B_, 4 + octave 5 + note C_, 2 + rest 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + note_type 12, 11, 0 + note D_, 16 + note_type 12, 11, 5 + note D_, 6 + note_type 12, 12, 7 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 + octave 4 + note C_, 2 + rest 4 + note A#, 4 + note G_, 2 + note F_, 2 + note_type 12, 11, 0 + note G_, 16 + note_type 12, 11, 3 + note G_, 2 + octave 3 + note G_, 2 + rest 4 + note G_, 4 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 + +Music_MeetRival_branch_b21d:: + duty_cycle 3 + vibrato 10, 2, 6 + note_type 12, 12, 7 + octave 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note D_, 1 + rest 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 + + +Music_MeetRival_Ch3:: + note_type 12, 1, 4 + octave 5 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 4 - B_ 2 + note B_, 2 rest 2 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 Music_MeetRival_branch_b24b:: - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 - A_ 2 - F# 2 - A_ 2 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - A_ 2 - F# 2 - A_ 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - A_ 2 - E_ 2 + note A_, 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 rest 2 octave 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - E_ 2 - F_ 2 - G_ 2 - E_ 2 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A# 2 - A_ 2 - G_ 2 - A# 2 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 rest 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 - loopchannel 0, Music_MeetRival_branch_b24b + note D_, 2 + sound_loop 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: - notetype 12, 1, 4 + note_type 12, 1, 4 octave 4 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - loopchannel 0, Music_MeetRival_branch_b24b + sound_loop 0, Music_MeetRival_branch_b24b diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index e41b37bd..60ebd553 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,337 +1,337 @@ -Music_MuseumGuy_Ch0:: +Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 octave 2 - B_ 4 - B_ 1 + note B_, 4 + note B_, 1 octave 3 - D# 1 - E_ 1 - G# 1 - B_ 10 - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 + note D#, 1 + 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 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 Music_MuseumGuy_branch_add6:: - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 - loopchannel 0, Music_MuseumGuy_branch_add6 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + sound_loop 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: - E_ 2 - E_ 6 - F# 2 - F# 6 - endchannel + note E_, 2 + note E_, 6 + note F#, 2 + note F#, 6 + sound_ret Music_MuseumGuy_branch_adec:: - E_ 2 - E_ 6 - D_ 2 - D_ 6 - endchannel - - -Music_MuseumGuy_Ch1:: - duty 2 - notetype 12, 12, 1 - octave 4 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - E_ 4 - E_ 1 - G# 1 - B_ 1 - octave 4 - D# 1 - E_ 8 - octave 3 - A_ 2 - octave 4 - C# 2 - E_ 4 - D_ 2 - F# 2 - A_ 4 - octave 3 - A_ 2 - octave 4 - C# 2 - E_ 4 - D_ 2 - C# 2 - octave 3 - B_ 4 - A_ 2 - octave 4 - C# 2 - E_ 4 - D_ 2 - F# 2 - A_ 2 - A_ 2 - G# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - A_ 2 - A_ 4 - -Music_MuseumGuy_branch_ae26:: - octave 3 - A_ 2 - octave 4 - C# 2 - E_ 3 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 9, 1 - A_ 1 - notetype 12, 12, 1 - octave 3 - A_ 2 - octave 4 - C# 2 - E_ 4 - D_ 1 - C# 1 - C_ 1 - octave 3 - B_ 1 - B_ 3 - notetype 12, 10, 1 - G# 1 - notetype 12, 12, 1 - A_ 2 - octave 4 - C# 2 - E_ 3 - notetype 12, 9, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 8, 1 - A_ 1 - notetype 12, 12, 1 - G# 2 - E_ 1 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - F# 2 - notetype 12, 8, 1 - F# 1 - notetype 12, 12, 1 - G# 1 - A_ 2 - A_ 2 - A_ 4 - loopchannel 0, Music_MuseumGuy_branch_ae26 + note E_, 2 + note E_, 6 + note D_, 2 + note D_, 6 + sound_ret Music_MuseumGuy_Ch2:: - notetype 12, 1, 0 - rest 16 + duty_cycle 2 + note_type 12, 12, 1 octave 4 - E_ 1 - rest 3 - E_ 1 - rest 3 - E_ 1 - rest 9 - callchannel Music_MuseumGuy_branch_aeb8 - A_ 1 - rest 1 - A_ 1 - rest 5 - G# 1 - rest 1 - G# 1 - rest 5 - callchannel Music_MuseumGuy_branch_aeb8 - B_ 1 - rest 3 - G# 1 - rest 3 - A_ 1 - rest 1 - A_ 1 - rest 3 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 8 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A_, 4 -Music_MuseumGuy_branch_ae8e:: - callchannel Music_MuseumGuy_branch_aec1 - rest 3 - octave 6 - E_ 1 - rest 1 - octave 5 - A_ 1 - rest 1 - A_ 1 - rest 3 - B_ 1 - rest 1 - G# 1 - rest 1 - G# 1 - rest 3 - callchannel Music_MuseumGuy_branch_aec1 - rest 1 - octave 6 - E_ 1 - rest 1 - D_ 1 - rest 1 - octave 5 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 3 - A_ 1 - rest 1 - A_ 1 - rest 3 - loopchannel 0, Music_MuseumGuy_branch_ae8e - -Music_MuseumGuy_branch_aeb8:: - A_ 1 - rest 1 - A_ 1 - rest 5 - A_ 1 - rest 1 - A_ 1 - rest 5 - endchannel - -Music_MuseumGuy_branch_aec1:: - octave 6 - C# 1 - rest 1 - octave 5 - A_ 1 - rest 1 - A_ 1 - rest 3 - octave 6 - F# 1 - rest 1 - octave 5 - A_ 1 - rest 1 - A_ 1 - endchannel +Music_MuseumGuy_branch_ae26:: + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 3 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 9, 1 + note A_, 1 + note_type 12, 12, 1 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note B_, 3 + note_type 12, 10, 1 + note G#, 1 + note_type 12, 12, 1 + note A_, 2 + octave 4 + note C#, 2 + note E_, 3 + note_type 12, 9, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 8, 1 + note A_, 1 + note_type 12, 12, 1 + note G#, 2 + note E_, 1 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note F#, 2 + note_type 12, 8, 1 + note F#, 1 + note_type 12, 12, 1 + note G#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + sound_loop 0, Music_MuseumGuy_branch_ae26 Music_MuseumGuy_Ch3:: - dspeed 12 + note_type 12, 1, 0 + rest 16 + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 9 + sound_call Music_MuseumGuy_branch_aeb8 + note A_, 1 + rest 1 + note A_, 1 + rest 5 + note G#, 1 + rest 1 + note G#, 1 + rest 5 + sound_call Music_MuseumGuy_branch_aeb8 + note B_, 1 + rest 3 + note G#, 1 + rest 3 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + +Music_MuseumGuy_branch_ae8e:: + sound_call Music_MuseumGuy_branch_aec1 + rest 3 + octave 6 + note E_, 1 + rest 1 + octave 5 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + sound_call Music_MuseumGuy_branch_aec1 + rest 1 + octave 6 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 3 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + sound_loop 0, Music_MuseumGuy_branch_ae8e + +Music_MuseumGuy_branch_aeb8:: + note A_, 1 + rest 1 + note A_, 1 + rest 5 + note A_, 1 + rest 1 + note A_, 1 + rest 5 + sound_ret + +Music_MuseumGuy_branch_aec1:: + octave 6 + note C#, 1 + rest 1 + octave 5 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + octave 6 + note F#, 1 + rest 1 + octave 5 + note A_, 1 + rest 1 + note A_, 1 + sound_ret + + +Music_MuseumGuy_Ch4:: + drum_speed 12 rest 16 rest 16 rest 16 rest 16 rest 16 rest 14 - dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_MuseumGuy_branch_aee1:: - mutedsnare2 4 - mutedsnare2 6 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare2 6 - mutedsnare2 2 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 6 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 2 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - loopchannel 0, Music_MuseumGuy_branch_aee1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 87245350..5af9f9a9 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,393 +1,393 @@ -Music_OaksLab_Ch0:: +Music_OaksLab_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 16, 1, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 2 - B_ 1 + note B_, 1 octave 3 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 - A_ 1 - B_ 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note B_, 1 Music_OaksLab_branch_7eed0:: octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 4 - G# 2 - A_ 2 - B_ 1 + note A_, 4 + note G#, 2 + note A_, 2 + note B_, 1 rest 3 - A_ 6 - G# 1 - B_ 1 + note A_, 6 + note G#, 1 + note B_, 1 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - G# 2 - A_ 2 - F# 4 - E_ 2 - F# 2 - G# 1 + note A_, 4 + note G#, 2 + note A_, 2 + note F#, 4 + note E_, 2 + note F#, 2 + note G#, 1 rest 3 - F# 8 - E_ 4 - A_ 6 - E_ 1 - A_ 1 + note F#, 8 + note E_, 4 + note A_, 6 + note E_, 1 + note A_, 1 octave 4 - D_ 8 - C# 6 + note D_, 8 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 8 - D_ 4 - C# 4 + note C#, 1 + note E_, 8 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - G# 1 + note B_, 4 + note A_, 4 + note G#, 1 rest 3 - E_ 4 - F# 4 - G# 4 - loopchannel 0, Music_OaksLab_branch_7eed0 - - -Music_OaksLab_Ch1:: - duty 3 - vibrato 10, 2, 5 - notetype 12, 12, 4 - octave 3 - G# 1 - A_ 1 - B_ 1 - octave 4 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 - -Music_OaksLab_branch_7ef16:: - A_ 6 - G# 1 - F# 1 - E_ 6 - D# 1 - E_ 1 - F# 1 - rest 3 - E_ 8 - E_ 4 - F# 6 - E_ 1 - D_ 1 - C# 6 - octave 3 - B_ 1 - octave 4 - C# 1 - D_ 1 - rest 3 - C# 8 - C# 4 - D_ 6 - octave 3 - A_ 1 - octave 4 - D_ 1 - F# 8 - E_ 6 - C# 1 - E_ 1 - A_ 8 - G# 4 - A_ 2 - G# 2 - F# 4 - G# 2 - F# 2 - E_ 1 - rest 1 - octave 3 - G# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D_ 1 - rest 1 - E_ 1 - rest 1 - F# 1 - rest 1 - loopchannel 0, Music_OaksLab_branch_7ef16 + note E_, 4 + note F#, 4 + note G#, 4 + sound_loop 0, Music_OaksLab_branch_7eed0 Music_OaksLab_Ch2:: - notetype 12, 1, 1 + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 4 + octave 3 + note G#, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + +Music_OaksLab_branch_7ef16:: + note A_, 6 + note G#, 1 + note F#, 1 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 1 + rest 3 + note E_, 8 + note E_, 4 + note F#, 6 + note E_, 1 + note D_, 1 + note C#, 6 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + rest 3 + note C#, 8 + note C#, 4 + note D_, 6 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note F#, 8 + note E_, 6 + note C#, 1 + note E_, 1 + note A_, 8 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 4 + note G#, 2 + note F#, 2 + note E_, 1 + rest 1 + octave 3 + note G#, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + sound_loop 0, Music_OaksLab_branch_7ef16 + + +Music_OaksLab_Ch3:: + note_type 12, 1, 1 rest 2 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 Music_OaksLab_branch_7ef5c:: - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 5 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - loopchannel 0, Music_OaksLab_branch_7ef5c + sound_loop 0, Music_OaksLab_branch_7ef5c diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 5ad31f81..26e5710f 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,314 +1,314 @@ -Music_PalletTown_Ch0:: +Music_PalletTown_Ch1:: tempo 160 volume 7, 7 - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 Music_PalletTown_branch_a7ce:: octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - C_ 2 + note D_, 4 + note D_, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 rest 2 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 8 + note C_, 8 rest 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 - B_ 2 - G_ 2 - A_ 2 - F# 2 - B_ 4 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F#, 2 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - G_ 2 - F# 2 - E_ 4 - D_ 2 - C_ 4 + note D_, 4 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note C_, 4 octave 3 - A_ 2 - B_ 2 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G_ 4 - F# 4 + note B_, 2 + note A_, 2 + note G_, 4 + note F#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - A_ 2 - notetype 12, 11, 3 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 + note A_, 2 + note F#, 2 + note A_, 2 + note_type 12, 11, 3 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - A_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - A_ 2 - E_ 2 - C_ 2 - E_ 2 - F# 2 - D_ 2 - C_ 2 - D_ 2 - G_ 2 - E_ 2 - C_ 2 - E_ 2 - G_ 2 - E_ 2 - C_ 2 - E_ 2 - F# 2 - D_ 2 - C_ 2 - D_ 2 - loopchannel 0, Music_PalletTown_branch_a7ce - endchannel - - -Music_PalletTown_Ch1:: - duty 2 - -Music_PalletTown_branch_a861:: - notetype 12, 13, 3 - octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 - octave 4 - B_ 2 - notetype 12, 11, 3 - A_ 2 - notetype 12, 13, 3 - octave 5 - G_ 2 - notetype 12, 11, 3 - E_ 2 - notetype 12, 13, 3 - F# 2 - E_ 2 - D_ 6 - octave 4 - B_ 2 - G_ 2 - G_ 2 - A_ 2 - B_ 2 - octave 5 - C_ 10 - octave 4 - F# 2 - G_ 2 - A_ 2 - B_ 6 - octave 5 - C_ 1 - octave 4 - B_ 1 - A_ 8 - octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 - octave 4 - B_ 2 - notetype 12, 11, 3 - octave 5 - D_ 2 - notetype 12, 13, 3 - G_ 2 - notetype 12, 10, 3 - F# 2 - notetype 12, 11, 3 - F# 2 - notetype 12, 13, 3 - G_ 2 - E_ 6 - D_ 2 - D_ 8 - C_ 2 - octave 4 - B_ 2 - A_ 2 - G_ 2 - octave 5 - D_ 2 - C_ 2 - octave 4 - B_ 2 - A_ 2 - G_ 10 - G_ 2 - A_ 2 - B_ 2 - octave 5 - C_ 8 - D_ 6 - C_ 2 - octave 4 - B_ 8 - rest 2 - G_ 2 - A_ 2 - B_ 2 - octave 5 - C_ 4 - C_ 4 - D_ 6 - C_ 1 - D_ 1 - octave 4 - B_ 8 - rest 2 - B_ 2 - A_ 2 - G_ 2 - A_ 8 - E_ 4 - B_ 4 - A_ 8 - G_ 4 - E_ 4 - F# 8 - G_ 4 - B_ 4 - B_ 8 - A_ 8 - loopchannel 0, Music_PalletTown_branch_a861 - endchannel + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + sound_loop 0, Music_PalletTown_branch_a7ce + sound_ret Music_PalletTown_Ch2:: + duty_cycle 2 + +Music_PalletTown_branch_a861:: + note_type 12, 13, 3 + octave 5 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 + octave 4 + note B_, 2 + note_type 12, 11, 3 + note A_, 2 + note_type 12, 13, 3 + octave 5 + note G_, 2 + note_type 12, 11, 3 + note E_, 2 + note_type 12, 13, 3 + note F#, 2 + note E_, 2 + note D_, 6 + octave 4 + note B_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 10 + octave 4 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note A_, 8 + octave 5 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 + octave 4 + note B_, 2 + note_type 12, 11, 3 + octave 5 + note D_, 2 + note_type 12, 13, 3 + note G_, 2 + note_type 12, 10, 3 + note F#, 2 + note_type 12, 11, 3 + note F#, 2 + note_type 12, 13, 3 + note G_, 2 + note E_, 6 + note D_, 2 + note D_, 8 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 10 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 8 + note D_, 6 + note C_, 2 + octave 4 + note B_, 8 + rest 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 4 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 + octave 4 + note B_, 8 + rest 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 8 + note E_, 4 + note B_, 4 + note A_, 8 + note G_, 4 + note E_, 4 + note F#, 8 + note G_, 4 + note B_, 4 + note B_, 8 + note A_, 8 + sound_loop 0, Music_PalletTown_branch_a861 + sound_ret + + +Music_PalletTown_Ch3:: vibrato 24, 2, 8 - notetype 12, 1, 2 + note_type 12, 1, 2 Music_PalletTown_branch_a8e3:: octave 4 - G_ 6 - E_ 6 - F# 4 - G_ 6 - A_ 6 - G_ 4 - E_ 6 - F# 6 - E_ 4 - G_ 6 - E_ 6 - D_ 4 - G_ 6 - E_ 6 - F# 4 - G_ 6 - A_ 6 - G_ 4 - E_ 6 - F# 6 - A_ 4 - G_ 6 - E_ 6 - D_ 4 - C_ 8 - D_ 8 - G_ 8 - E_ 4 - D_ 4 - C_ 8 - D_ 8 - G_ 8 - A_ 4 - G_ 4 - E_ 8 - A_ 8 - E_ 8 - G_ 8 - F# 8 - E_ 8 - E_ 8 - F# 8 - loopchannel 0, Music_PalletTown_branch_a8e3 - endchannel + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note A_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note E_, 4 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note A_, 4 + note G_, 4 + note E_, 8 + note A_, 8 + note E_, 8 + note G_, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + sound_loop 0, Music_PalletTown_branch_a8e3 + sound_ret diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 9d3cd3d0..2fe9e4ce 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,47 +1,47 @@ -Music_PkmnHealed_Ch0:: +Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 8, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 8, 1 rest 2 - pitchbend 0, 75 - B_ 2 - pitchbend 0, 84 - B_ 2 - pitchbend 0, 68 - E_ 2 + pitch_slide 1, 4, B_ + note B_, 2 + pitch_slide 1, 3, E_ + note B_, 2 + pitch_slide 1, 4, E_ + note E_, 2 rest 4 - pitchbend 0, 59 - E_ 4 - pitchbend 0, 75 - B_ 4 - endchannel - - -Music_PkmnHealed_Ch1:: - duty 2 - notetype 12, 12, 3 - octave 4 - B_ 4 - B_ 4 - B_ 2 - G# 2 - notetype 12, 12, 4 - octave 5 - E_ 8 - endchannel + pitch_slide 1, 5, B_ + note E_, 4 + pitch_slide 1, 4, B_ + note B_, 4 + sound_ret Music_PkmnHealed_Ch2:: - notetype 12, 1, 0 + duty_cycle 2 + note_type 12, 12, 3 octave 4 - E_ 2 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + note_type 12, 12, 4 + octave 5 + note E_, 8 + sound_ret + + +Music_PkmnHealed_Ch3:: + note_type 12, 1, 0 + octave 4 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 - G# 2 - E_ 6 + note E_, 2 + note G#, 2 + note E_, 6 rest 2 - endchannel + sound_ret diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 83d161d7..a4a3f2bf 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,375 +1,375 @@ -Music_Pokecenter_Ch0:: +Music_Pokecenter_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 2, 2 - toggleperfectpitch + toggle_perfect_pitch Music_Pokecenter_branch_be61:: - notetype 12, 10, 3 + note_type 12, 10, 3 octave 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - notetype 12, 10, 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note_type 12, 10, 3 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - F# 2 - E_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 4 - E_ 2 - F# 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 4 - C# 2 - D_ 2 - E_ 2 - G_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 8 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note F#, 2 + note E_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 8 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 - B_ 2 + note B_, 4 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - D_ 2 - C# 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - C# 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - G_ 2 - A_ 2 - B_ 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - F# 2 - G_ 2 - loopchannel 0, Music_Pokecenter_branch_be61 - - -Music_Pokecenter_Ch1:: - vibrato 8, 2, 5 - -Music_Pokecenter_branch_befc:: - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 - octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 2 - F# 6 - duty 3 - notetype 12, 10, 5 - octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 - octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 8 - duty 3 - notetype 12, 10, 5 - octave 3 - D_ 4 - E_ 4 - duty 2 - notetype 12, 12, 6 - octave 4 - F# 8 - A_ 8 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 8 - C# 8 - E_ 8 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 8 - F# 8 - A_ 8 - G_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 8 - A_ 4 - G_ 2 - F# 2 - G_ 8 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 8 - loopchannel 0, Music_Pokecenter_branch_befc - -Music_Pokecenter_branch_bf4e:: - duty 2 - notetype 12, 12, 2 - octave 4 - D_ 2 - octave 3 - A_ 2 - octave 4 - D_ 2 - notetype 12, 12, 3 - A_ 4 - G_ 4 - F# 2 - E_ 2 - C# 6 - endchannel - -Music_Pokecenter_branch_bf60:: - duty 2 - notetype 12, 12, 2 - octave 4 - C# 2 - octave 3 - A_ 2 - octave 4 - C# 2 - notetype 12, 12, 3 - F# 4 - E_ 4 - C# 2 - endchannel + note B_, 2 + note A_, 4 + note G_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + sound_loop 0, Music_Pokecenter_branch_be61 Music_Pokecenter_Ch2:: - notetype 12, 1, 0 + vibrato 8, 2, 5 + +Music_Pokecenter_branch_befc:: + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 + octave 3 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 2 + note F#, 6 + duty_cycle 3 + note_type 12, 10, 5 + octave 3 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 + octave 3 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 8 + duty_cycle 3 + note_type 12, 10, 5 + octave 3 + note D_, 4 + note E_, 4 + duty_cycle 2 + note_type 12, 12, 6 + octave 4 + note F#, 8 + note A_, 8 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 8 + note C#, 8 + note E_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + note F#, 8 + note A_, 8 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 8 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + sound_loop 0, Music_Pokecenter_branch_befc + +Music_Pokecenter_branch_bf4e:: + duty_cycle 2 + note_type 12, 12, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note_type 12, 12, 3 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + sound_ret + +Music_Pokecenter_branch_bf60:: + duty_cycle 2 + note_type 12, 12, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note_type 12, 12, 3 + note F#, 4 + note E_, 4 + note C#, 2 + sound_ret + + +Music_Pokecenter_Ch3:: + note_type 12, 1, 0 Music_Pokecenter_branch_bf72:: octave 4 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - F# 2 - G_ 2 - F# 2 - callchannel Music_Pokecenter_branch_bfd9 - callchannel Music_Pokecenter_branch_bfe2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - G_ 2 - A_ 2 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - F# 2 - G_ 2 - F# 2 - callchannel Music_Pokecenter_branch_bfd9 - callchannel Music_Pokecenter_branch_bfe2 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - B_ 2 - A_ 2 - G_ 2 - callchannel Music_Pokecenter_branch_bfeb - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - G# 2 - A_ 2 - callchannel Music_Pokecenter_branch_bfeb - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - loopchannel 0, Music_Pokecenter_branch_bf72 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call Music_Pokecenter_branch_bfe2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call Music_Pokecenter_branch_bfe2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + sound_call Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + sound_call Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + sound_loop 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfe2:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - G_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfeb:: - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - endchannel + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + sound_ret diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 0f17ddeb..ef3a3b88 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,458 +1,458 @@ -Music_PokemonTower_Ch0:: +Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 12, 2, 3 - notetype 12, 8, 0 + note_type 12, 8, 0 rest 4 octave 4 - B_ 12 + note B_, 12 Music_PokemonTower_branch_7f05a:: - notetype 12, 11, 4 + note_type 12, 11, 4 octave 4 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 octave 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - F# 1 + note F#, 1 rest 7 - C_ 1 + note C_, 1 octave 3 - B_ 1 - G_ 1 + note B_, 1 + note G_, 1 rest 5 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 3 - notetype 12, 8, 4 - C_ 1 + note_type 12, 8, 4 + note C_, 1 rest 3 - notetype 12, 11, 4 - D_ 1 + note_type 12, 11, 4 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 octave 3 - A_ 1 + note A_, 1 rest 7 - A_ 1 + note A_, 1 rest 7 - notetype 12, 10, 7 - B_ 8 - B_ 8 + note_type 12, 10, 7 + note B_, 8 + note B_, 8 octave 4 - C_ 8 - C_ 8 - C# 8 - C# 8 - notetype 12, 10, 6 - D_ 16 + note C_, 8 + note C_, 8 + note C#, 8 + note C#, 8 + note_type 12, 10, 6 + note D_, 16 rest 16 rest 16 rest 16 rest 16 - notetype 12, 9, 2 - B_ 4 + note_type 12, 9, 2 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 octave 5 - C_ 16 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f05a - - -Music_PokemonTower_Ch1:: - vibrato 20, 3, 4 - duty 3 - notetype 12, 10, 0 - octave 5 - C_ 12 - octave 4 - E_ 4 - -Music_PokemonTower_branch_7f0ee:: - notetype 12, 12, 1 - octave 5 - C_ 8 - octave 4 - B_ 4 - notetype 12, 12, 4 - G_ 1 - F# 1 - E_ 1 - D# 1 - notetype 12, 11, 0 - G_ 8 - octave 5 - C_ 8 - octave 4 - B_ 4 - G_ 4 - E_ 4 - G_ 4 - octave 5 - C_ 8 - notetype 12, 11, 7 - C_ 8 - notetype 12, 12, 2 - octave 4 - G_ 1 - F# 1 - E_ 1 - rest 1 - notetype 12, 9, 6 - octave 3 - G_ 4 - notetype 12, 12, 7 - G_ 4 - B_ 4 - G_ 4 - B_ 4 - octave 4 - C_ 4 - octave 3 - B_ 4 - notetype 12, 11, 0 - octave 4 - C_ 16 - E_ 8 - notetype 12, 11, 7 - E_ 12 - notetype 12, 12, 5 - octave 5 - C_ 4 - octave 4 - B_ 4 - G_ 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 11, 0 - F# 12 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 0 - B_ 4 - G_ 4 - F# 4 - E_ 4 - B_ 16 - notetype 12, 11, 0 - octave 5 - C_ 4 - octave 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 9, 0 - octave 5 - C_ 16 - notetype 12, 11, 0 - D_ 4 - octave 4 - A_ 4 - G# 4 - F# 4 - notetype 12, 2, 15 - octave 5 - D_ 16 - notetype 12, 12, 0 - E_ 4 - octave 4 - B_ 4 - A_ 4 - G_ 4 - octave 5 - F_ 4 - C_ 4 - octave 4 - A# 4 - G# 4 - octave 5 - F# 4 - D_ 4 - C_ 4 - octave 4 - A# 4 - G# 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 11, 0 - C_ 8 - notetype 12, 9, 0 - C_ 8 - notetype 12, 8, 0 - C_ 8 - notetype 12, 7, 0 - C_ 8 - notetype 12, 6, 0 - C_ 8 - notetype 12, 6, 7 - C_ 8 - rest 16 - notetype 12, 10, 0 - octave 5 - G_ 16 - octave 6 - C_ 16 - octave 5 - B_ 8 - G_ 8 - E_ 8 - G_ 8 - octave 6 - C_ 16 - vibrato 0, 3, 4 - notetype 12, 10, 7 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f0ee + note C_, 16 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f05a Music_PokemonTower_Ch2:: + vibrato 20, 3, 4 + duty_cycle 3 + note_type 12, 10, 0 + octave 5 + note C_, 12 + octave 4 + note E_, 4 + +Music_PokemonTower_branch_7f0ee:: + note_type 12, 12, 1 + octave 5 + note C_, 8 + octave 4 + note B_, 4 + note_type 12, 12, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note_type 12, 11, 0 + note G_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + octave 5 + note C_, 8 + note_type 12, 11, 7 + note C_, 8 + note_type 12, 12, 2 + octave 4 + note G_, 1 + note F#, 1 + note E_, 1 + rest 1 + note_type 12, 9, 6 + octave 3 + note G_, 4 + note_type 12, 12, 7 + note G_, 4 + note B_, 4 + note G_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note_type 12, 11, 0 + octave 4 + note C_, 16 + note E_, 8 + note_type 12, 11, 7 + note E_, 12 + note_type 12, 12, 5 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note G_, 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note F#, 12 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 0 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 16 + note_type 12, 11, 0 + octave 5 + note C_, 4 + octave 4 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 9, 0 + octave 5 + note C_, 16 + note_type 12, 11, 0 + note D_, 4 + octave 4 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 12, 2, -7 + octave 5 + note D_, 16 + note_type 12, 12, 0 + note E_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G_, 4 + octave 5 + note F_, 4 + note C_, 4 + octave 4 + note A#, 4 + note G#, 4 + octave 5 + note F#, 4 + note D_, 4 + note C_, 4 + octave 4 + note A#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 9, 0 + note C_, 8 + note_type 12, 8, 0 + note C_, 8 + note_type 12, 7, 0 + note C_, 8 + note_type 12, 6, 0 + note C_, 8 + note_type 12, 6, 7 + note C_, 8 + rest 16 + note_type 12, 10, 0 + octave 5 + note G_, 16 + octave 6 + note C_, 16 + octave 5 + note B_, 8 + note G_, 8 + note E_, 8 + note G_, 8 + octave 6 + note C_, 16 + vibrato 0, 3, 4 + note_type 12, 10, 7 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f0ee + + +Music_PokemonTower_Ch3:: vibrato 4, 1, 1 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 8 octave 5 - G_ 8 + note G_, 8 Music_PokemonTower_branch_7f1a2:: - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - E_ 1 - D# 1 - F# 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - E_ 1 - D# 1 + note E_, 1 + note D#, 1 octave 4 - B_ 1 + note B_, 1 rest 5 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 octave 4 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 15 - notetype 12, 1, 5 + note_type 12, 1, 5 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 7 - notetype 12, 1, 3 + note_type 12, 1, 3 octave 6 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 7 octave 5 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_PokemonTower_branch_7f1a2 + sound_loop 0, Music_PokemonTower_branch_7f1a2 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index fc3227ce..cdefb6ee 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,404 +1,404 @@ -Music_Routes1_Ch0:: +Music_Routes1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch Music_Routes1_branch_9be9:: - notetype 12, 10, 1 + note_type 12, 10, 1 rest 4 octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - C# 1 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 + note C#, 1 octave 3 - A_ 2 - A_ 2 - A_ 6 + note A_, 2 + note A_, 2 + note A_, 6 octave 4 - C# 2 - C# 6 - C# 2 - C# 4 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 2 - A_ 6 + note A_, 2 + note A_, 6 octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - E_ 1 - D_ 1 - C# 1 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 octave 3 - B_ 2 - A_ 2 - A_ 6 + note B_, 2 + note A_, 2 + note A_, 6 octave 4 - C# 2 - C# 6 + note C#, 2 + note C#, 6 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 - notetype 12, 10, 2 + note A_, 2 + note_type 12, 10, 2 octave 4 - G_ 4 - E_ 4 - F# 2 - notetype 12, 10, 1 + note G_, 4 + note E_, 4 + note F#, 2 + note_type 12, 10, 1 octave 3 - A_ 2 - A_ 6 - A_ 2 - F# 2 - A_ 4 - B_ 2 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 - F# 2 - A_ 4 - G_ 2 - E_ 2 - C# 4 - A_ 2 + note B_, 4 + note A_, 2 + note F#, 2 + note A_, 4 + note G_, 2 + note E_, 2 + note C#, 4 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 4 - B_ 2 - G_ 2 - B_ 4 + note A_, 4 + note B_, 2 + note G_, 2 + note B_, 4 octave 4 - D_ 2 - E_ 2 - C# 2 - D_ 2 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 octave 3 - A_ 2 - A_ 2 - loopchannel 0, Music_Routes1_branch_9be9 - endchannel - - -Music_Routes1_Ch1:: - duty 2 - -Music_Routes1_branch_9c53:: - notetype 12, 13, 1 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c78 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c8d - loopchannel 0, Music_Routes1_branch_9c53 - -Music_Routes1_branch_9c65:: - octave 4 - D_ 1 - E_ 1 - F# 2 - F# 2 - F# 2 - D_ 1 - E_ 1 - F# 2 - F# 2 - F# 2 - D_ 1 - E_ 1 - F# 2 - F# 2 - G_ 3 - F# 1 - E_ 6 - endchannel - -Music_Routes1_branch_9c78:: - C# 1 - D_ 1 - E_ 2 - E_ 2 - E_ 2 - C# 1 - D_ 1 - E_ 2 - E_ 2 - E_ 2 - C# 1 - D_ 1 - E_ 2 - E_ 2 - F# 1 - E_ 1 - E_ 1 - F# 1 - D_ 4 - F# 2 - endchannel - -Music_Routes1_branch_9c8d:: - C# 1 - D_ 1 - E_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 - octave 3 - B_ 2 - octave 4 - C# 2 - notetype 12, 13, 2 - B_ 4 - notetype 6, 13, 1 - octave 3 - B_ 1 - octave 4 - C# 1 - notetype 12, 13, 1 - octave 3 - B_ 1 - A_ 1 - octave 4 - C# 1 - D_ 6 - notetype 12, 13, 2 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - D_ 2 - octave 5 - D_ 2 - C# 2 - octave 4 - B_ 2 - octave 5 - C# 2 - octave 4 - A_ 2 - F# 2 - D_ 3 - F# 1 - E_ 6 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - A_ 2 - octave 5 - D_ 2 - C# 2 - octave 4 - B_ 3 - G_ 1 - A_ 2 - octave 5 - D_ 2 - C# 2 - E_ 2 - D_ 2 - notetype 12, 13, 1 - octave 4 - D_ 2 - D_ 2 - endchannel - endchannel + note A_, 2 + note A_, 2 + sound_loop 0, Music_Routes1_branch_9be9 + sound_ret Music_Routes1_Ch2:: + duty_cycle 2 + +Music_Routes1_branch_9c53:: + 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 + +Music_Routes1_branch_9c65:: + octave 4 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note G_, 3 + note F#, 1 + note E_, 6 + sound_ret + +Music_Routes1_branch_9c78:: + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note D_, 4 + note F#, 2 + sound_ret + +Music_Routes1_branch_9c8d:: + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note_type 12, 13, 2 + note B_, 4 + note_type 6, 13, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note_type 12, 13, 1 + octave 3 + note B_, 1 + note A_, 1 + octave 4 + note C#, 1 + note D_, 6 + note_type 12, 13, 2 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 3 + note F#, 1 + note E_, 6 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 3 + note G_, 1 + note A_, 2 + octave 5 + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note_type 12, 13, 1 + octave 4 + note D_, 2 + note D_, 2 + sound_ret + sound_ret + + +Music_Routes1_Ch3:: vibrato 8, 2, 5 - notetype 12, 1, 3 + note_type 12, 1, 3 Music_Routes1_branch_9cdd:: rest 2 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 - C# 4 + note C_, 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - C# 8 - D_ 8 + note C#, 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - D_ 6 - loopchannel 0, Music_Routes1_branch_9cdd - endchannel + note D_, 6 + sound_loop 0, Music_Routes1_branch_9cdd + sound_ret -Music_Routes1_Ch3:: - dspeed 12 +Music_Routes1_Ch4:: + drum_speed 12 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch3 - endchannel + drum_note 15, 2 + drum_note 15, 2 + sound_loop 0, Music_Routes1_Ch4 + sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index ae5b22d1..e6782df3 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,425 +1,425 @@ -Music_Routes2_Ch0:: +Music_Routes2_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 - duty 1 + duty_cycle 1 Music_Routes2_branch_9dc3:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - B_ 4 + note B_, 4 octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - E_ 2 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - F# 4 + note E_, 2 + note A_, 2 + note G#, 4 + note F#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - B_ 2 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note B_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - B_ 4 - notetype 8, 11, 2 + note E_, 2 + note A_, 2 + note G#, 4 + note B_, 4 + note_type 8, 11, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - D# 2 + note E_, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - D# 2 + note D#, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - G# 2 - A_ 2 - A_ 2 - F# 2 - A_ 2 - G# 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - A_ 2 - B_ 2 - A_ 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 + note C#, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - loopchannel 0, Music_Routes2_branch_9dc3 - endchannel - - -Music_Routes2_Ch1:: - vibrato 8, 2, 6 - duty 3 - -Music_Routes2_branch_9e54:: - notetype 12, 13, 4 - octave 4 - E_ 6 - octave 3 - B_ 1 - octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - F# 8 - octave 3 - D# 4 - octave 4 - E_ 6 - octave 3 - B_ 1 - octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - B_ 8 - octave 3 - G# 4 - octave 5 - C# 6 - octave 4 - B_ 1 - A_ 1 - B_ 6 - A_ 1 - G# 1 - A_ 6 - G# 1 - F# 1 - G# 4 - F# 2 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F# 8 - A_ 4 - G# 3 - F# 1 - E_ 8 - F# 2 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F# 2 - F# 1 - G# 1 - A_ 4 - octave 5 - C# 4 - octave 4 - B_ 3 - A_ 1 - G# 8 - rest 4 - loopchannel 0, Music_Routes2_branch_9e54 - endchannel + note E_, 2 + sound_loop 0, Music_Routes2_branch_9dc3 + sound_ret Music_Routes2_Ch2:: - vibrato 9, 2, 8 + vibrato 8, 2, 6 + duty_cycle 3 -Music_Routes2_branch_9e9e:: - notetype 12, 1, 1 +Music_Routes2_branch_9e54:: + note_type 12, 13, 4 + octave 4 + note E_, 6 octave 3 - E_ 2 - rest 2 - octave 2 - B_ 6 + note B_, 1 + octave 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 - rest 2 - octave 2 - B_ 6 + note D#, 4 + octave 4 + note E_, 6 octave 3 - D_ 1 - C# 1 - octave 2 - A_ 2 + note B_, 1 + octave 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 octave 3 - C# 2 - E_ 2 - rest 2 - octave 2 - B_ 6 - octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 - rest 2 - octave 2 - B_ 4 - octave 3 - C# 2 - octave 2 - B_ 2 - octave 3 - D_ 2 - F# 2 - E_ 2 - rest 2 - octave 2 - A_ 2 - rest 2 - octave 3 - D# 2 - rest 2 - octave 2 - G# 2 - rest 2 - octave 3 - C# 2 - rest 2 - octave 2 - F# 2 - rest 2 - B_ 2 - rest 2 - E_ 2 - G# 2 - F# 2 - rest 2 - A_ 2 - rest 2 - F# 2 - rest 2 - A_ 2 - rest 2 - G# 2 - rest 2 - B_ 2 - rest 2 - G# 2 - rest 2 - B_ 2 - rest 2 - F# 2 - rest 2 - A_ 2 - rest 2 - octave 3 - C# 2 - rest 2 - octave 2 - A_ 2 - octave 3 - C# 2 - octave 2 - B_ 2 - rest 2 - octave 3 - E_ 2 - rest 2 - G# 2 - rest 2 - E_ 2 - rest 2 - loopchannel 0, Music_Routes2_branch_9e9e - endchannel + note G#, 4 + octave 5 + note C#, 6 + octave 4 + note B_, 1 + note A_, 1 + note B_, 6 + note A_, 1 + note G#, 1 + note A_, 6 + note G#, 1 + note F#, 1 + note G#, 4 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 8 + note A_, 4 + note G#, 3 + note F#, 1 + note E_, 8 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 + octave 5 + note C#, 4 + octave 4 + note B_, 3 + note A_, 1 + note G#, 8 + rest 4 + sound_loop 0, Music_Routes2_branch_9e54 + sound_ret Music_Routes2_Ch3:: - dspeed 12 - snare3 2 + vibrato 9, 2, 8 + +Music_Routes2_branch_9e9e:: + note_type 12, 1, 1 + octave 3 + note E_, 2 rest 2 - snare3 1 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 + rest 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + rest 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 + rest 2 + octave 2 + note B_, 4 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 2 + note E_, 2 + rest 2 + octave 2 + note A_, 2 + rest 2 + octave 3 + note D#, 2 + rest 2 + octave 2 + note G#, 2 + rest 2 + octave 3 + note C#, 2 + rest 2 + octave 2 + note F#, 2 + rest 2 + note B_, 2 + rest 2 + note E_, 2 + note G#, 2 + note F#, 2 + rest 2 + note A_, 2 + rest 2 + note F#, 2 + rest 2 + note A_, 2 + rest 2 + note G#, 2 + rest 2 + note B_, 2 + rest 2 + note G#, 2 + rest 2 + note B_, 2 + rest 2 + note F#, 2 + rest 2 + note A_, 2 + rest 2 + octave 3 + note C#, 2 + rest 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + rest 2 + octave 3 + note E_, 2 + rest 2 + note G#, 2 + rest 2 + note E_, 2 + rest 2 + sound_loop 0, Music_Routes2_branch_9e9e + sound_ret + + +Music_Routes2_Ch4:: + drum_speed 12 + drum_note 3, 2 + rest 2 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - dspeed 12 - snare3 1 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_speed 12 + drum_note 3, 1 rest 3 - snare3 2 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 3 - snare3 2 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - snare3 3 - snare3 3 - snare3 3 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - snare3 3 + drum_note 3, 3 rest 3 - loopchannel 0, Music_Routes2_Ch3 - endchannel + sound_loop 0, Music_Routes2_Ch4 + sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index b384308b..26a41590 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,515 +1,515 @@ -Music_Routes3_Ch0:: +Music_Routes3_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - E_ 1 - F# 1 - G_ 6 - F_ 1 - G_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G_, 6 + note F_, 1 + note G_, 1 + note E_, 1 rest 16 rest 15 Music_Routes3_branch_9fc3:: - notetype 12, 11, 5 - E_ 6 - D_ 1 - E_ 1 - C_ 4 - E_ 4 - C_ 6 - D_ 1 - E_ 1 - F_ 2 - G_ 2 - G_ 2 - A_ 2 - notetype 12, 10, 7 - A# 8 - F_ 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - E_ 6 - D_ 1 - E_ 1 - C_ 4 - E_ 4 - C_ 6 - D_ 1 - E_ 1 - F_ 2 - G_ 2 - G_ 2 - A_ 2 - notetype 12, 10, 7 - A# 8 - A# 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - E_ 4 - E_ 2 - F_ 2 - G_ 4 - F_ 2 - E_ 2 - B_ 2 + note_type 12, 11, 5 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 7 + note A#, 8 + note F_, 8 + note D_, 8 + note F_, 8 + note_type 12, 11, 5 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note_type 12, 10, 7 + note A#, 8 + note A#, 8 + note D_, 8 + note F_, 8 + note_type 12, 11, 5 + note E_, 4 + note E_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note B_, 2 octave 2 - G_ 4 + note G_, 4 octave 3 - B_ 8 - A_ 2 - notetype 8, 12, 3 - A_ 4 - F_ 4 - A_ 4 - notetype 8, 4, 15 - A_ 12 - notetype 8, 9, 0 - F_ 12 - G_ 12 - loopchannel 0, Music_Routes3_branch_9fc3 + note B_, 8 + note A_, 2 + note_type 8, 12, 3 + note A_, 4 + note F_, 4 + note A_, 4 + note_type 8, 4, -7 + note A_, 12 + note_type 8, 9, 0 + note F_, 12 + note G_, 12 + sound_loop 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch1:: +Music_Routes3_Ch2:: vibrato 8, 2, 3 - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - G_ 1 - A# 1 - B_ 6 - A_ 1 - B_ 1 + note G_, 1 + note A#, 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 rest 15 rest 16 Music_Routes3_branch_a01a:: - notetype 12, 12, 7 - duty 2 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 - A_ 8 - notetype 12, 12, 7 - duty 2 + note A#, 8 + note A_, 8 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 + note A#, 8 octave 4 - D_ 6 - notetype 12, 12, 7 - duty 2 - C_ 1 - D_ 1 - E_ 2 - D_ 2 - E_ 2 - C_ 8 + note D_, 6 + note_type 12, 12, 7 + duty_cycle 2 + note C_, 1 + note D_, 1 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 8 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 2 + note C_, 1 + note D_, 2 octave 3 - G_ 4 + note G_, 4 octave 4 - G_ 8 - F_ 1 - E_ 1 - notetype 8, 13, 3 - F_ 4 - E_ 4 - notetype 8, 12, 4 - C_ 4 - notetype 8, 12, 5 - C_ 12 - notetype 12, 10, 0 - duty 3 + note G_, 8 + note F_, 1 + note E_, 1 + note_type 8, 13, 3 + note F_, 4 + note E_, 4 + note_type 8, 12, 4 + note C_, 4 + note_type 8, 12, 5 + note C_, 12 + note_type 12, 10, 0 + duty_cycle 3 octave 3 - A_ 8 - B_ 8 - loopchannel 0, Music_Routes3_branch_a01a - - -Music_Routes3_Ch2:: - vibrato 4, 1, 0 - notetype 6, 1, 2 - octave 4 - G_ 2 - A# 2 - B_ 8 - A_ 8 - G_ 2 - rest 2 - G_ 7 - rest 1 - G_ 1 - rest 1 - G_ 1 - rest 1 - G_ 2 - rest 2 - G_ 2 - rest 2 - G_ 8 - G_ 2 - rest 2 - G_ 7 - rest 1 - G_ 1 - rest 1 - G_ 1 - rest 1 - G_ 2 - rest 2 - G_ 2 - rest 2 - G_ 8 - -Music_Routes3_branch_a0a3:: - notetype 12, 1, 2 - E_ 1 - rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 1 - G_ 4 - E_ 1 - rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 1 - G_ 2 - A_ 2 - F_ 1 - rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - A# 4 - F_ 1 - rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - A# 2 - F_ 2 - E_ 1 - rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 1 - G_ 4 - E_ 1 - rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 1 - G_ 2 - A_ 2 - F_ 1 - rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - A# 4 - F_ 1 - rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - A# 2 - A_ 2 - G_ 1 - rest 1 - octave 5 - C_ 4 - octave 4 - G_ 1 - G_ 1 - G_ 1 - rest 1 - G_ 1 - rest 1 - octave 5 - C_ 4 - octave 4 - G_ 1 - rest 1 - octave 5 - D_ 4 - octave 4 - G_ 1 - G_ 1 - G_ 1 - rest 1 - G_ 1 - rest 1 - octave 5 - D_ 4 - octave 4 - F_ 1 - rest 1 - octave 5 - C_ 4 - octave 4 - F_ 1 - F_ 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - octave 5 - C_ 4 - octave 4 - F_ 1 - rest 1 - A_ 4 - F_ 1 - F_ 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - A_ 4 - loopchannel 0, Music_Routes3_branch_a0a3 + note A_, 8 + note B_, 8 + sound_loop 0, Music_Routes3_branch_a01a Music_Routes3_Ch3:: - dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + vibrato 4, 1, 0 + note_type 6, 1, 2 + octave 4 + note G_, 2 + note A#, 2 + note B_, 8 + note A_, 8 + note G_, 2 + rest 2 + note G_, 7 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 2 + rest 2 + note G_, 2 + rest 2 + note G_, 8 + note G_, 2 + rest 2 + note G_, 7 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 2 + rest 2 + note G_, 2 + rest 2 + note G_, 8 + +Music_Routes3_branch_a0a3:: + note_type 12, 1, 2 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 2 + note A_, 2 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 2 + note F_, 2 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 2 + note A_, 2 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 2 + note A_, 2 + note G_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note G_, 1 + note G_, 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note G_, 1 + rest 1 + octave 5 + note D_, 4 + octave 4 + note G_, 1 + note G_, 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note D_, 4 + octave 4 + note F_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note F_, 1 + rest 1 + note A_, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 4 + sound_loop 0, Music_Routes3_branch_a0a3 + + +Music_Routes3_Ch4:: + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes3_branch_a17a:: - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare2 4 - mutedsnare2 10 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare4 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 10 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 10 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 12 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - loopchannel 0, Music_Routes3_branch_a17a + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 19, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index a9149f05..50679f54 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,681 +1,681 @@ -Music_Routes4_Ch0:: +Music_Routes4_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 3, 4 - toggleperfectpitch - notetype 12, 10, 2 + toggle_perfect_pitch + note_type 12, 10, 2 octave 2 - G# 4 - G# 4 - G# 4 - notetype 12, 7, 15 - G# 4 - notetype 12, 10, 2 - G# 4 - G# 4 - G# 4 - notetype 12, 11, 7 - B_ 1 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 7, -7 + note G#, 4 + note_type 12, 10, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 11, 7 + note B_, 1 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 Music_Routes4_branch_a28a:: - notetype 12, 11, 7 - B_ 6 - E_ 2 - E_ 4 + note_type 12, 11, 7 + note B_, 6 + note E_, 2 + note E_, 4 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - notetype 12, 11, 1 - G# 3 - notetype 12, 11, 7 - E_ 1 - F# 12 - E_ 8 - D# 4 - F# 4 - B_ 6 - E_ 2 - E_ 4 + note B_, 4 + note A_, 4 + note_type 12, 11, 1 + note G#, 3 + note_type 12, 11, 7 + note E_, 1 + note F#, 12 + note E_, 8 + note D#, 4 + note F#, 4 + note B_, 6 + note E_, 2 + note E_, 4 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 - notetype 12, 11, 1 - E_ 3 - notetype 12, 11, 7 - D# 1 - E_ 12 + note C#, 4 + note_type 12, 11, 1 + note E_, 3 + note_type 12, 11, 7 + note D#, 1 + note E_, 12 octave 3 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 octave 4 - E_ 4 + note E_, 4 octave 3 - D_ 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - D_ 2 + note C#, 2 + note D_, 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - F# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note A_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - D# 2 - E_ 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - notetype 8, 11, 5 - A_ 4 - G# 4 - F# 4 + note B_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note_type 8, 11, 5 + note A_, 4 + note G#, 4 + note F#, 4 octave 4 - E_ 4 - D# 4 - C# 4 - C# 4 + note E_, 4 + note D#, 4 + note C#, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 - D# 4 + note C#, 4 + note D#, 4 octave 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - B_ 4 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 4 octave 4 - C# 4 - D# 4 - E_ 3 + note C#, 4 + note D#, 4 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - loopchannel 0, Music_Routes4_branch_a28a - - -Music_Routes4_Ch1:: - vibrato 12, 2, 4 - duty 1 - notetype 12, 9, 2 - octave 3 - E_ 3 - F# 1 - notetype 12, 9, 0 - E_ 12 - notetype 12, 9, 2 - octave 2 - B_ 3 - octave 3 - C_ 1 - notetype 12, 9, 0 - octave 2 - B_ 8 - duty 3 - notetype 12, 12, 7 - octave 3 - E_ 1 - F# 1 - B_ 1 - octave 4 - D# 1 - -Music_Routes4_branch_a325:: - notetype 12, 12, 7 - E_ 6 - octave 3 - B_ 2 - B_ 4 - octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - F# 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - G# 3 - E_ 1 - notetype 12, 10, 0 - octave 3 - B_ 12 - duty 0 - notetype 12, 12, 2 - octave 2 - B_ 3 - notetype 12, 12, 7 - octave 3 - C_ 1 - octave 2 - B_ 8 - octave 3 - D# 4 - duty 3 - octave 4 - E_ 6 - octave 3 - B_ 2 - B_ 4 - octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - A_ 1 - octave 5 - C# 1 - octave 4 - B_ 1 - A_ 1 - notetype 12, 12, 2 - B_ 3 - notetype 12, 12, 7 - A_ 1 - notetype 12, 11, 0 - G# 6 - notetype 12, 9, 0 - G# 6 - notetype 12, 7, 0 - G# 6 - notetype 12, 6, 15 - G# 6 - notetype 12, 12, 7 - G# 4 - notetype 8, 12, 3 - A_ 4 - G# 4 - F# 4 - notetype 8, 9, 0 - F# 6 - notetype 8, 7, 15 - F# 6 - duty 0 - notetype 8, 9, 0 - octave 3 - F# 4 - E_ 4 - F# 4 - A_ 6 - duty 3 - notetype 8, 12, 7 - octave 4 - F# 6 - G# 4 - F# 4 - notetype 8, 12, 4 - E_ 4 - notetype 8, 10, 0 - E_ 12 - duty 0 - notetype 8, 9, 0 - octave 3 - E_ 4 - D# 4 - E_ 4 - G# 6 - duty 3 - notetype 8, 12, 7 - octave 4 - E_ 6 - F# 4 - D# 4 - octave 3 - B_ 4 - notetype 8, 10, 0 - octave 4 - B_ 16 - notetype 8, 10, 7 - B_ 8 - notetype 8, 11, 0 - A_ 6 - notetype 8, 11, 7 - A_ 6 - notetype 12, 10, 7 - G# 1 - F# 1 - notetype 12, 11, 0 - E_ 12 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 10 - loopchannel 0, Music_Routes4_branch_a325 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + sound_loop 0, Music_Routes4_branch_a28a Music_Routes4_Ch2:: - notetype 12, 1, 0 + vibrato 12, 2, 4 + duty_cycle 1 + note_type 12, 9, 2 + octave 3 + note E_, 3 + note F#, 1 + note_type 12, 9, 0 + note E_, 12 + note_type 12, 9, 2 + octave 2 + note B_, 3 + octave 3 + note C_, 1 + note_type 12, 9, 0 + octave 2 + note B_, 8 + duty_cycle 3 + note_type 12, 12, 7 + octave 3 + note E_, 1 + note F#, 1 + note B_, 1 octave 4 - E_ 1 - rest 3 - E_ 1 - rest 3 - E_ 1 - rest 3 - E_ 1 - rest 3 - E_ 1 - rest 3 - E_ 1 - rest 3 - E_ 1 - rest 3 - D# 1 - rest 3 + note D#, 1 -Music_Routes4_branch_a3d7:: - E_ 1 - rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - rest 1 - F# 1 - rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 - rest 1 - F# 1 - rest 3 - A_ 1 - rest 1 - G# 1 - rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 - rest 1 - G# 1 - rest 3 - G# 1 - rest 1 - G# 1 - rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 - rest 1 - G# 1 - rest 3 - G# 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - rest 1 - F# 1 - rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 - rest 1 - F# 1 - rest 3 - A_ 1 - rest 1 - B_ 1 - rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - rest 1 - B_ 1 - rest 3 - B_ 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 1 - E_ 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 - rest 1 - F# 1 - rest 3 - F# 1 - rest 1 - D_ 1 - rest 3 - D_ 1 - D_ 1 - D_ 1 - D_ 1 - D_ 1 - rest 1 - D_ 1 - rest 3 - D_ 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - rest 1 - G# 1 - rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 - rest 1 - G# 1 - rest 3 - G# 1 - rest 1 - F# 1 - rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 - rest 1 - F# 1 - rest 3 - F# 1 - rest 1 - B_ 1 - rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - rest 1 - B_ 1 - rest 3 - B_ 1 - rest 1 - G# 1 - rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 - rest 1 - G# 1 - rest 3 - G# 1 - rest 1 - E_ 1 - rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - rest 1 - E_ 1 - rest 3 - D# 1 - rest 1 - loopchannel 0, Music_Routes4_branch_a3d7 +Music_Routes4_branch_a325:: + note_type 12, 12, 7 + note E_, 6 + octave 3 + note B_, 2 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note_type 12, 12, 2 + note G#, 3 + note E_, 1 + note_type 12, 10, 0 + octave 3 + note B_, 12 + duty_cycle 0 + note_type 12, 12, 2 + octave 2 + note B_, 3 + note_type 12, 12, 7 + octave 3 + note C_, 1 + octave 2 + note B_, 8 + octave 3 + note D#, 4 + duty_cycle 3 + octave 4 + note E_, 6 + octave 3 + note B_, 2 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 1 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + note A_, 1 + note_type 12, 12, 2 + note B_, 3 + note_type 12, 12, 7 + note A_, 1 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 9, 0 + note G#, 6 + note_type 12, 7, 0 + note G#, 6 + note_type 12, 6, -7 + note G#, 6 + note_type 12, 12, 7 + note G#, 4 + note_type 8, 12, 3 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 8, 9, 0 + note F#, 6 + note_type 8, 7, -7 + note F#, 6 + duty_cycle 0 + note_type 8, 9, 0 + octave 3 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 6 + duty_cycle 3 + note_type 8, 12, 7 + octave 4 + note F#, 6 + note G#, 4 + note F#, 4 + note_type 8, 12, 4 + note E_, 4 + note_type 8, 10, 0 + note E_, 12 + duty_cycle 0 + note_type 8, 9, 0 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note G#, 6 + duty_cycle 3 + note_type 8, 12, 7 + octave 4 + note E_, 6 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + note_type 8, 10, 0 + octave 4 + note B_, 16 + note_type 8, 10, 7 + note B_, 8 + note_type 8, 11, 0 + note A_, 6 + note_type 8, 11, 7 + note A_, 6 + note_type 12, 10, 7 + note G#, 1 + note F#, 1 + note_type 12, 11, 0 + note E_, 12 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 10 + sound_loop 0, Music_Routes4_branch_a325 Music_Routes4_Ch3:: - dspeed 12 + note_type 12, 1, 0 + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note D#, 1 + rest 3 + +Music_Routes4_branch_a3d7:: + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note A_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note A_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note D_, 1 + rest 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + rest 3 + note D_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note D#, 1 + rest 1 + sound_loop 0, Music_Routes4_branch_a3d7 + + +Music_Routes4_Ch4:: + drum_speed 12 rest 16 rest 12 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes4_branch_a4a8:: - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare3 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare2 2 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare2 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - mutedsnare2 2 - loopchannel 0, Music_Routes4_branch_a4a8 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 18, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index e2853646..0ca2f71a 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,111 +1,111 @@ -Music_SafariZone_Ch0:: +Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 - toggleperfectpitch - duty 2 - notetype 12, 9, 2 + toggle_perfect_pitch + duty_cycle 2 + note_type 12, 9, 2 octave 3 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc4f:: - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - loopchannel 0, Music_SafariZone_branch_bc4f + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_loop 0, Music_SafariZone_branch_bc4f Music_SafariZone_branch_bc5f:: - notetype 12, 10, 2 + note_type 12, 10, 2 octave 3 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - endchannel - - -Music_SafariZone_Ch1:: - duty 2 - vibrato 8, 2, 5 - notetype 12, 10, 2 - octave 4 - G_ 1 - D_ 1 - G_ 1 - D_ 1 - rest 4 - duty 3 - -Music_SafariZone_branch_bc79:: - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - A_ 4 - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc79 - -Music_SafariZone_branch_bc89:: - notetype 12, 11, 2 - octave 3 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - endchannel + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + sound_ret Music_SafariZone_Ch2:: - notetype 12, 1, 0 + duty_cycle 2 + vibrato 8, 2, 5 + note_type 12, 10, 2 + octave 4 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + rest 4 + duty_cycle 3 + +Music_SafariZone_branch_bc79:: + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note A_, 4 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc79 + +Music_SafariZone_branch_bc89:: + note_type 12, 11, 2 + octave 3 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + sound_ret + + +Music_SafariZone_Ch3:: + note_type 12, 1, 0 rest 8 Music_SafariZone_branch_bc97:: - callchannel Music_SafariZone_branch_bca5 + sound_call Music_SafariZone_branch_bca5 octave 4 - A_ 4 - callchannel Music_SafariZone_branch_bca5 + note A_, 4 + sound_call Music_SafariZone_branch_bca5 octave 4 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc97 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 3e1ff3fc..3c7512ba 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,323 +1,323 @@ -Music_SilphCo_Ch0:: +Music_SilphCo_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 2, 2 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - E_ 1 - F# 1 - G# 1 - A# 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 3 - C_ 1 - notetype 6, 10, 0 - C_ 12 - notetype 6, 11, 3 - C_ 2 + note C_, 1 + note_type 6, 10, 0 + note C_, 12 + note_type 6, 11, 3 + note C_, 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 Music_SilphCo_branch_7f26d:: - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 octave 3 - C_ 2 + note C_, 2 rest 2 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 10 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 6, 10, 0 - B_ 12 - notetype 6, 11, 3 - B_ 1 - A_ 1 - G_ 1 - F_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 6, 10, 0 + note B_, 12 + note_type 6, 11, 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - A_ 1 - G_ 1 - F_ 1 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 rest 11 - F# 1 - B_ 1 + note F#, 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - notetype 6, 10, 0 - D_ 12 - notetype 6, 11, 3 - D_ 1 - C_ 1 + note C_, 1 + note C#, 1 + note_type 6, 10, 0 + note D_, 12 + note_type 6, 11, 3 + note D_, 1 + note C_, 1 octave 2 - A# 1 - G_ 1 - F_ 1 + note A#, 1 + note G_, 1 + note F_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - G# 1 - F_ 1 - E_ 1 + note B_, 1 + note G#, 1 + note F_, 1 + note E_, 1 rest 7 - notetype 6, 8, 0 - B_ 16 - notetype 6, 11, 0 + note_type 6, 8, 0 + note B_, 16 + note_type 6, 11, 0 octave 3 - E_ 8 + note E_, 8 tempo 124 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 16 rest 6 - A_ 2 + note A_, 2 rest 6 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - A_ 2 - A# 2 - B_ 2 - A# 2 - callchannel Music_SilphCo_branch_7f3f0 - callchannel Music_SilphCo_branch_7f3f0 - callchannel Music_SilphCo_branch_7f3f0 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note A_, 2 + 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 rest 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - E_ 2 + note E_, 2 rest 6 - E_ 2 + note E_, 2 rest 6 - D# 2 + note D#, 2 rest 6 - D# 2 + note D#, 2 rest 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 6, 0 - E_ 16 - E_ 11 - notetype 6, 11, 3 - E_ 1 - F# 1 - G# 1 - A# 1 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 6, 0 + note E_, 16 + note E_, 11 + note_type 6, 11, 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 3 - C_ 1 - notetype 6, 3, 15 - C_ 16 - notetype 6, 10, 0 - C_ 11 - notetype 6, 9, 3 + note C_, 1 + note_type 6, 3, -7 + note C_, 16 + note_type 6, 10, 0 + note C_, 11 + note_type 6, 9, 3 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 3, 15 - E_ 16 - notetype 6, 9, 0 - E_ 11 - notetype 6, 11, 3 - F_ 1 - G_ 1 - A# 1 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 3, -7 + note E_, 16 + note_type 6, 9, 0 + note E_, 11 + note_type 6, 11, 3 + note F_, 1 + note G_, 1 + note A#, 1 octave 3 - C_ 1 - D_ 1 - notetype 6, 3, 15 - D_ 16 - notetype 6, 10, 7 - D_ 11 + note C_, 1 + note D_, 1 + note_type 6, 3, -7 + note D_, 16 + note_type 6, 10, 7 + note D_, 11 rest 4 rest 4 tempo 128 @@ -344,633 +344,633 @@ Music_SilphCo_branch_7f26d:: rest 4 tempo 160 rest 4 - notetype 6, 4, 3 + note_type 6, 4, 3 octave 2 - B_ 2 + note B_, 2 rest 6 - notetype 6, 6, 3 - B_ 2 + note_type 6, 6, 3 + note B_, 2 rest 6 - notetype 6, 8, 3 - B_ 2 + note_type 6, 8, 3 + note B_, 2 rest 6 - notetype 6, 5, 0 - B_ 8 - notetype 6, 11, 3 - B_ 2 + note_type 6, 5, 0 + note B_, 8 + note_type 6, 11, 3 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f26d + sound_loop 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 - endchannel - - -Music_SilphCo_Ch1:: - vibrato 10, 3, 2 - duty 3 - notetype 6, 12, 3 - octave 3 - E_ 1 - F# 1 - G# 1 - A# 1 - octave 4 - C_ 1 - notetype 6, 11, 0 - C_ 12 - notetype 6, 12, 3 - C_ 2 - octave 3 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 - rest 2 - octave 2 - G_ 2 - rest 6 - F# 2 - rest 6 - G_ 2 - rest 6 - G# 2 - rest 2 - -Music_SilphCo_branch_7f42e:: - E_ 2 - rest 2 - G_ 2 - rest 6 - G_ 2 - rest 6 - G_ 2 - rest 6 - F# 2 - rest 6 - G_ 2 - rest 6 - G# 2 - rest 2 - E_ 2 - rest 2 - G# 2 - rest 6 - G# 2 - rest 6 - G# 2 - rest 6 - G# 2 - rest 6 - G# 2 - rest 6 - G# 2 - rest 2 - notetype 6, 11, 7 - duty 2 - octave 4 - E_ 8 - D# 8 - E_ 8 - F_ 8 - E_ 8 - D# 8 - D_ 8 - D# 8 - E_ 8 - F_ 8 - F# 8 - G_ 8 - G# 8 - D# 8 - D_ 8 - D# 8 - duty 3 - notetype 6, 6, 15 - E_ 16 - notetype 6, 12, 0 - B_ 16 - notetype 6, 12, 4 - octave 3 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - octave 4 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - notetype 6, 12, 4 - duty 3 - octave 3 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - D# 4 - E_ 4 - notetype 6, 12, 0 - F_ 8 - notetype 6, 11, 7 - F_ 8 - notetype 6, 8, 10 - F_ 4 - notetype 6, 12, 4 - duty 3 - F_ 4 - E_ 4 - F_ 4 - notetype 6, 10, 0 - F# 8 - notetype 6, 11, 0 - F# 8 - notetype 6, 9, 9 - F# 4 - notetype 6, 12, 4 - F# 4 - F_ 4 - F# 4 - notetype 6, 9, 0 - G_ 12 - notetype 6, 5, 9 - G_ 8 - notetype 6, 12, 4 - G_ 4 - F# 4 - G_ 4 - F# 4 - F_ 4 - F# 4 - F_ 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - C# 4 - D_ 4 - D# 4 - D_ 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - A_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - A# 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - B_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - octave 4 - C_ 4 - notetype 6, 11, 4 - duty 3 - octave 3 - D# 4 - D_ 4 - D# 4 - rest 4 - G_ 2 - rest 6 - G_ 2 - rest 6 - G_ 2 - rest 6 - G_ 2 - rest 2 - duty 0 - octave 4 - E_ 2 - rest 2 - G# 2 - rest 6 - G# 2 - rest 6 - G# 2 - rest 6 - G# 2 - rest 6 - duty 3 - octave 3 - G_ 2 - rest 6 - G_ 2 - rest 6 - G_ 2 - rest 6 - G_ 2 - rest 2 - duty 0 - octave 4 - E_ 2 - rest 2 - B_ 2 - rest 6 - B_ 2 - rest 6 - B_ 2 - rest 6 - B_ 2 - rest 2 - duty 3 - octave 3 - G_ 2 - rest 2 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - octave 4 - C_ 2 - rest 2 - octave 3 - G_ 2 - rest 2 - octave 4 - C_ 2 - rest 2 - octave 3 - G_ 2 - rest 2 - octave 4 - C_ 2 - rest 2 - octave 3 - G_ 2 - rest 2 - octave 4 - C_ 2 - rest 2 - octave 3 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - E_ 2 - rest 2 - G_ 2 - rest 2 - octave 4 - C_ 2 - rest 2 - octave 3 - G_ 2 - rest 2 - E_ 2 - rest 2 - G_ 2 - rest 2 - B_ 2 - rest 2 - G_ 2 - rest 2 - octave 4 - C_ 2 - rest 2 - octave 3 - G_ 2 - rest 2 - notetype 6, 8, 7 - octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - rest 4 - notetype 6, 4, 3 - octave 2 - G_ 2 - rest 6 - notetype 6, 6, 3 - F# 2 - rest 6 - notetype 6, 8, 3 - G_ 2 - rest 6 - notetype 6, 4, 15 - G# 8 - notetype 6, 11, 4 - G_ 2 - rest 6 - F# 2 - rest 6 - G_ 2 - rest 6 - G# 2 - rest 2 - loopchannel 0, Music_SilphCo_branch_7f42e + note C_, 2 + sound_ret Music_SilphCo_Ch2:: + vibrato 10, 3, 2 + duty_cycle 3 + note_type 6, 12, 3 + octave 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 4 + note C_, 1 + note_type 6, 11, 0 + note C_, 12 + note_type 6, 12, 3 + note C_, 2 + octave 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 + rest 2 + octave 2 + note G_, 2 + rest 6 + note F#, 2 + rest 6 + note G_, 2 + rest 6 + note G#, 2 + rest 2 + +Music_SilphCo_branch_7f42e:: + note E_, 2 + rest 2 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note F#, 2 + rest 6 + note G_, 2 + rest 6 + note G#, 2 + rest 2 + note E_, 2 + rest 2 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 2 + note_type 6, 11, 7 + duty_cycle 2 + octave 4 + note E_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note E_, 8 + note D#, 8 + note D_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note G#, 8 + note D#, 8 + note D_, 8 + note D#, 8 + duty_cycle 3 + note_type 6, 6, -7 + note E_, 16 + note_type 6, 12, 0 + note B_, 16 + note_type 6, 12, 4 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + octave 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note_type 6, 12, 4 + duty_cycle 3 + octave 3 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note_type 6, 12, 0 + note F_, 8 + note_type 6, 11, 7 + note F_, 8 + note_type 6, 8, -2 + note F_, 4 + note_type 6, 12, 4 + duty_cycle 3 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 6, 10, 0 + note F#, 8 + note_type 6, 11, 0 + note F#, 8 + note_type 6, 9, -1 + note F#, 4 + note_type 6, 12, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 6, 9, 0 + note G_, 12 + note_type 6, 5, -1 + note G_, 8 + note_type 6, 12, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note D#, 4 + note D_, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note B_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + octave 4 + note C_, 4 + note_type 6, 11, 4 + duty_cycle 3 + octave 3 + note D#, 4 + note D_, 4 + note D#, 4 + rest 4 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 2 + duty_cycle 0 + octave 4 + note E_, 2 + rest 2 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + duty_cycle 3 + octave 3 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 2 + duty_cycle 0 + octave 4 + note E_, 2 + rest 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + duty_cycle 3 + octave 3 + note G_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note E_, 2 + rest 2 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + note E_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + note_type 6, 8, 7 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + rest 4 + note_type 6, 4, 3 + octave 2 + note G_, 2 + rest 6 + note_type 6, 6, 3 + note F#, 2 + rest 6 + note_type 6, 8, 3 + note G_, 2 + rest 6 + note_type 6, 4, -7 + note G#, 8 + note_type 6, 11, 4 + note G_, 2 + rest 6 + note F#, 2 + rest 6 + note G_, 2 + rest 6 + note G#, 2 + rest 2 + sound_loop 0, Music_SilphCo_branch_7f42e + + +Music_SilphCo_Ch3:: vibrato 8, 1, 1 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 12 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 Music_SilphCo_branch_7f5c9:: - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - E_ 1 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D_ 8 - F_ 8 - D_ 8 - F# 8 - D_ 8 - G_ 8 - D_ 8 - A_ 8 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note D_, 8 + note F_, 8 + note D_, 8 + note F#, 8 + note D_, 8 + note G_, 8 + note D_, 8 + note A_, 8 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 octave 5 - E_ 2 - D# 2 - E_ 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 4 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 octave 5 - E_ 2 - F_ 2 - F# 2 - G_ 2 - G# 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 6 - E_ 4 - D# 4 - E_ 4 - F_ 4 - E_ 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - notetype 6, 1, 1 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 1, 1 rest 4 rest 4 rest 4 @@ -987,14 +987,14 @@ Music_SilphCo_branch_7f5c9:: rest 4 rest 4 rest 4 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 4 rest 4 rest 4 rest 4 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 - loopchannel 0, Music_SilphCo_branch_7f5c9 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + sound_loop 0, Music_SilphCo_branch_7f5c9 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 1356c8b1..4dae83bc 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,338 +1,338 @@ -Music_SSAnne_Ch0:: +Music_SSAnne_Ch1:: tempo 128 volume 7, 7 - duty 1 + duty_cycle 1 vibrato 8, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_SSAnne_branch_b3b2:: - notetype 12, 10, 4 + note_type 12, 10, 4 rest 12 octave 3 - E_ 2 - F# 2 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 rest 4 - E_ 4 - G# 4 + note E_, 4 + note G#, 4 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 4 - E_ 4 - F# 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 4 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 8 - G# 4 - E_ 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 8 + note G#, 4 + note E_, 4 rest 4 - E_ 4 - F# 2 - E_ 2 - D_ 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D_, 4 rest 4 - D_ 4 - E_ 4 - C# 4 + note D_, 4 + note E_, 4 + note C#, 4 rest 4 - C# 4 - D_ 2 - C# 2 + note C#, 4 + note D_, 2 + note C#, 2 octave 2 - B_ 4 - E_ 4 - B_ 4 + note B_, 4 + note E_, 4 + note B_, 4 octave 3 - D_ 2 + note D_, 2 octave 2 - B_ 2 - A_ 4 + note B_, 2 + note A_, 4 rest 4 - A_ 4 - B_ 2 - A_ 2 - G# 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 4 rest 4 - C# 4 - G# 4 - A_ 4 + note C#, 4 + note G#, 4 + note A_, 4 rest 4 - A_ 4 - B_ 4 - B_ 4 + note A_, 4 + note B_, 4 + note B_, 4 rest 4 octave 3 - D_ 8 - loopchannel 0, Music_SSAnne_branch_b3b2 - - -Music_SSAnne_Ch1:: - duty 0 - vibrato 12, 2, 4 - -Music_SSAnne_branch_b41e:: - notetype 12, 12, 5 - octave 3 - A_ 2 - E_ 2 - A_ 4 - B_ 4 - octave 4 - D_ 4 - notetype 8, 12, 5 - C# 2 - D_ 2 - C# 2 - octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 - octave 4 - C# 6 - D_ 6 - C# 3 - octave 3 - B_ 3 - octave 4 - E_ 6 - D_ 3 - C# 3 - octave 3 - B_ 6 - octave 4 - C# 3 - octave 3 - B_ 3 - A_ 3 - E_ 3 - A_ 6 - B_ 6 - octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 - octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 - octave 4 - C# 6 - D_ 6 - C# 3 - octave 3 - B_ 3 - octave 4 - E_ 6 - D_ 3 - C# 3 - octave 3 - B_ 12 - A_ 3 - E_ 3 - A_ 6 - B_ 6 - octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 - octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 - octave 4 - C# 6 - D_ 6 - C# 3 - octave 3 - B_ 3 - octave 4 - E_ 6 - D_ 3 - C# 3 - octave 3 - B_ 12 - rest 3 - octave 4 - C# 3 - octave 3 - B_ 3 - octave 4 - C# 3 - C# 3 - D_ 3 - C# 3 - D_ 3 - E_ 3 - octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - B_ 3 - rest 3 - A_ 3 - G# 3 - A_ 3 - A_ 3 - B_ 3 - A_ 3 - B_ 3 - octave 4 - C# 3 - octave 3 - G# 3 - F# 3 - E_ 3 - E_ 3 - F# 3 - G# 3 - B_ 3 - rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - F# 3 - G# 3 - A_ 3 - E_ 3 - C# 3 - octave 2 - B_ 3 - A_ 3 - B_ 3 - octave 3 - C# 3 - E_ 3 - rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - A_ 3 - B_ 3 - octave 4 - C# 3 - D_ 3 - C# 3 - octave 3 - B_ 3 - octave 4 - E_ 3 - D_ 3 - C# 3 - octave 3 - B_ 3 - loopchannel 0, Music_SSAnne_branch_b41e + note D_, 8 + sound_loop 0, Music_SSAnne_branch_b3b2 Music_SSAnne_Ch2:: - notetype 12, 1, 3 + duty_cycle 0 + vibrato 12, 2, 4 + +Music_SSAnne_branch_b41e:: + note_type 12, 12, 5 + octave 3 + note A_, 2 + note E_, 2 + note A_, 4 + note B_, 4 + octave 4 + note D_, 4 + note_type 8, 12, 5 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 6 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 + octave 4 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 12 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 + octave 4 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 12 + rest 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note C#, 3 + note C#, 3 + note D_, 3 + note C#, 3 + note D_, 3 + note E_, 3 + octave 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 + rest 3 + note A_, 3 + note G#, 3 + note A_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note G#, 3 + note F#, 3 + note E_, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 + rest 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note E_, 3 + note C#, 3 + octave 2 + note B_, 3 + note A_, 3 + note B_, 3 + octave 3 + note C#, 3 + note E_, 3 + rest 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 3 + octave 4 + note C#, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + sound_loop 0, Music_SSAnne_branch_b41e + + +Music_SSAnne_Ch3:: + note_type 12, 1, 3 rest 16 rest 12 octave 4 - B_ 2 - G# 2 - A_ 8 - F# 8 - G# 4 + note B_, 2 + note G#, 2 + note A_, 8 + note F#, 8 + note G#, 4 rest 4 - B_ 8 - A_ 8 - B_ 8 - A_ 8 - G# 8 - A_ 8 - F# 8 - G# 8 - B_ 8 - A_ 4 - E_ 4 - B_ 4 - E_ 4 - A_ 4 - E_ 4 - G# 4 - E_ 4 - A_ 4 - E_ 4 - F# 4 - G_ 4 - G# 4 - A_ 4 + note B_, 8 + note A_, 8 + note B_, 8 + note A_, 8 + note G#, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note B_, 8 + note A_, 4 + note E_, 4 + note B_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note G#, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 octave 5 - D_ 8 - C# 8 - C# 8 + note D_, 8 + note C#, 8 + note C#, 8 octave 4 - B_ 8 - B_ 8 - A_ 8 - A_ 8 - G# 8 - G# 8 - F# 8 - F# 8 - E_ 8 - E_ 8 - F# 8 - F# 8 - G# 8 - B_ 8 - loopchannel 0, Music_SSAnne_Ch2 + note B_, 8 + note B_, 8 + note A_, 8 + note A_, 8 + note G#, 8 + note G#, 8 + note F#, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + note F#, 8 + note G#, 8 + note B_, 8 + sound_loop 0, Music_SSAnne_Ch3 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index c4507a55..4765f391 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,335 +1,335 @@ -Music_Surfing_Ch0:: +Music_Surfing_Ch1:: tempo 160 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 rest 6 octave 2 - A_ 2 - G# 3 - F# 1 - E_ 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 octave 3 - G# 2 - F# 2 - G# 4 + note G#, 2 + note F#, 2 + note G#, 4 Music_Surfing_branch_7fa30:: - notetype 12, 11, 2 - E_ 2 - E_ 4 - E_ 2 - E_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - notetype 12, 11, 1 - F# 3 - notetype 12, 11, 2 - D_ 3 - E_ 2 - E_ 4 - E_ 2 - E_ 4 - A_ 2 - A_ 4 - G# 2 - G# 4 - F# 2 - F# 4 - E_ 2 - E_ 4 - G# 2 - G# 4 - notetype 12, 11, 1 - F# 3 - notetype 12, 11, 2 - G# 1 - notetype 12, 11, 4 - A_ 2 - B_ 2 + note_type 12, 11, 2 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note_type 12, 11, 1 + note F#, 3 + note_type 12, 11, 2 + note D_, 3 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 4 + note F#, 2 + note F#, 4 + note E_, 2 + note E_, 4 + note G#, 2 + note G#, 4 + note_type 12, 11, 1 + note F#, 3 + note_type 12, 11, 2 + note G#, 1 + note_type 12, 11, 4 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - notetype 12, 11, 7 - C# 6 - notetype 12, 11, 3 - D_ 2 - C# 2 + note C_, 2 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 11, 3 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - G# 2 - F# 2 - E_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - G# 2 - A_ 2 - E_ 2 - G# 2 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note B_, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 4 - loopchannel 0, Music_Surfing_branch_7fa30 - - -Music_Surfing_Ch1:: - duty 3 - vibrato 16, 2, 5 - notetype 12, 12, 6 - octave 3 - A_ 2 - G# 3 - F# 1 - E_ 6 - G# 6 - octave 4 - E_ 2 - D_ 2 - octave 3 - B_ 2 - -Music_Surfing_branch_7faae:: - notetype 12, 12, 6 - octave 4 - E_ 6 - C# 5 - E_ 1 - D_ 6 - octave 3 - B_ 6 - octave 4 - D_ 6 - octave 3 - B_ 2 - notetype 12, 12, 1 - octave 4 - F# 3 - notetype 12, 12, 6 - D_ 1 - E_ 6 - C# 6 - E_ 6 - C# 5 - E_ 1 - F# 6 - D_ 6 - F# 6 - E_ 2 - notetype 12, 12, 1 - F# 3 - notetype 12, 12, 6 - E_ 1 - A_ 6 - A_ 6 - B_ 2 - A_ 3 - D_ 1 - F# 6 - E_ 2 - F# 3 - E_ 1 - C# 6 - D_ 2 - C# 3 - octave 3 - B_ 1 - octave 4 - F# 6 - E_ 2 - D# 3 - E_ 1 - A_ 6 - B_ 2 - A_ 3 - D_ 1 - F# 6 - E_ 2 - F# 3 - G# 1 - A_ 6 - G# 2 - F# 3 - E_ 1 - G# 6 - A_ 2 - G# 3 - A_ 1 - octave 5 - C# 6 - loopchannel 0, Music_Surfing_branch_7faae + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 4 + sound_loop 0, Music_Surfing_branch_7fa30 Music_Surfing_Ch2:: - notetype 12, 1, 0 + duty_cycle 3 + vibrato 16, 2, 5 + note_type 12, 12, 6 + octave 3 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + note G#, 6 + octave 4 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + +Music_Surfing_branch_7faae:: + note_type 12, 12, 6 + octave 4 + note E_, 6 + note C#, 5 + note E_, 1 + note D_, 6 + octave 3 + note B_, 6 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + note_type 12, 12, 1 + octave 4 + note F#, 3 + note_type 12, 12, 6 + note D_, 1 + note E_, 6 + note C#, 6 + note E_, 6 + note C#, 5 + note E_, 1 + note F#, 6 + note D_, 6 + note F#, 6 + note E_, 2 + note_type 12, 12, 1 + note F#, 3 + note_type 12, 12, 6 + note E_, 1 + note A_, 6 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note E_, 1 + note C#, 6 + note D_, 2 + note C#, 3 + octave 3 + note B_, 1 + octave 4 + note F#, 6 + note E_, 2 + note D#, 3 + note E_, 1 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note G#, 1 + note A_, 6 + note G#, 2 + note F#, 3 + note E_, 1 + note G#, 6 + note A_, 2 + note G#, 3 + note A_, 1 + octave 5 + note C#, 6 + sound_loop 0, Music_Surfing_branch_7faae + + +Music_Surfing_Ch3:: + note_type 12, 1, 0 rest 12 octave 5 - E_ 6 + note E_, 6 octave 4 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 Music_Surfing_branch_7fb03:: octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 2 - E_ 1 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 2 - E_ 1 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - D_ 2 - E_ 2 - loopchannel 0, Music_Surfing_branch_7fb03 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + sound_loop 0, Music_Surfing_branch_7fb03 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 2d41b082..a70b2761 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,677 +1,677 @@ -Music_TitleScreen_Ch0:: +Music_TitleScreen_Ch1:: tempo 144 volume 7, 7 vibrato 9, 3, 4 - duty 3 - notetype 12, 12, 1 + duty_cycle 3 + note_type 12, 12, 1 octave 2 - E_ 1 - G_ 1 - B_ 1 + note E_, 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 octave 2 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 12, 1 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - F# 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + note_type 8, 12, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 Music_TitleScreen_branch_7e4e2:: - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call Music_TitleScreen_branch_7e541 octave 3 - C_ 8 - notetype 8, 12, 6 - E_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 6 + note C_, 8 + note_type 8, 12, 6 + note E_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 6 octave 2 - B_ 8 - notetype 8, 14, 7 + note B_, 8 + note_type 8, 14, 7 octave 3 - F_ 4 - E_ 4 - C_ 4 - notetype 12, 14, 7 - D_ 10 - notetype 12, 12, 6 + note F_, 4 + note E_, 4 + note C_, 4 + note_type 12, 14, 7 + note D_, 10 + note_type 12, 12, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - C_ 2 - D_ 2 - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 - C_ 6 - C_ 6 - E_ 4 - D_ 6 - F_ 2 - G_ 2 - D_ 4 - G_ 2 - G_ 6 - A_ 4 - F_ 2 - A_ 2 + note C_, 2 + note D_, 2 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call Music_TitleScreen_branch_7e541 + note C_, 6 + note C_, 6 + note E_, 4 + note D_, 6 + note F_, 2 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 6 + note A_, 4 + note F_, 2 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - D_ 12 - E_ 4 - F_ 8 - G_ 4 - F_ 4 - E_ 12 - F_ 4 - G_ 8 - notetype 12, 11, 6 + note D_, 12 + note E_, 4 + note F_, 8 + note G_, 4 + note F_, 4 + note E_, 12 + note F_, 4 + note G_, 8 + note_type 12, 11, 6 octave 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 4 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 2 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 2 octave 3 - E_ 4 - E_ 4 - C# 4 - loopchannel 0, Music_TitleScreen_branch_7e4e2 + note E_, 4 + note E_, 4 + note C#, 4 + sound_loop 0, Music_TitleScreen_branch_7e4e2 Music_TitleScreen_branch_7e541:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - D_ 6 + note D_, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 8 - endchannel + note D_, 8 + sound_ret Music_TitleScreen_branch_7e54a:: - C_ 6 - F_ 6 - C_ 4 - D_ 8 - notetype 12, 14, 7 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 8, 12, 6 - C_ 4 + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 8 + note_type 12, 14, 7 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 8, 12, 6 + note C_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C_ 4 - endchannel + note C_, 4 + sound_ret Music_TitleScreen_branch_7e55c:: - notetype 12, 12, 1 - D_ 1 + note_type 12, 12, 1 + note D_, 1 rest 1 octave 2 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - endchannel - - -Music_TitleScreen_Ch1:: - vibrato 16, 4, 6 - duty 1 - notetype 12, 14, 1 - octave 2 - G_ 1 - B_ 1 - octave 3 - D_ 1 - F# 1 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 14, 1 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F# 2 - -Music_TitleScreen_branch_7e594:: - vibrato 16, 4, 6 - callchannel Music_TitleScreen_branch_7e622 - octave 2 - A_ 4 - F_ 4 - callchannel Music_TitleScreen_branch_7e62c - octave 2 - A_ 8 - B_ 16 - callchannel Music_TitleScreen_branch_7e622 - octave 2 - A_ 6 - F_ 2 - notetype 8, 14, 7 - octave 4 - C_ 4 - octave 3 - B_ 4 - octave 4 - C_ 4 - notetype 12, 14, 7 - D_ 8 - notetype 12, 9, 5 - octave 2 - D_ 6 - D_ 1 - F# 1 - G_ 16 - callchannel Music_TitleScreen_branch_7e622 - octave 2 - A_ 2 - F_ 6 - callchannel Music_TitleScreen_branch_7e62c - octave 3 - C_ 2 - octave 2 - A_ 6 - B_ 6 - G_ 2 - F_ 8 - callchannel Music_TitleScreen_branch_7e622 - notetype 8, 9, 5 - octave 2 - G_ 4 - F_ 5 - A_ 3 - notetype 8, 14, 6 - octave 4 - F_ 4 - E_ 4 - F_ 4 - notetype 12, 14, 7 - G_ 6 - A# 2 - G_ 8 - vibrato 16, 2, 6 - duty 3 - notetype 12, 0, 11 - G_ 8 - notetype 12, 14, 7 - A_ 8 - duty 1 - notetype 12, 14, 7 - A# 6 - F_ 2 - F_ 8 - octave 3 - D_ 8 - octave 4 - A# 4 - B_ 4 - octave 5 - C_ 6 - octave 4 - G_ 2 - G_ 8 - octave 3 - E_ 8 - notetype 12, 13, 7 - octave 5 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 - rest 3 - D_ 1 - rest 3 - D_ 1 - notetype 8, 14, 5 - octave 5 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 - D_ 1 - rest 2 - D_ 1 - rest 3 - D_ 1 - notetype 8, 14, 3 - octave 5 - C_ 4 - C_ 4 - octave 4 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e594 - -Music_TitleScreen_branch_7e622:: - notetype 12, 14, 7 - octave 3 - G_ 6 - B_ 2 - octave 4 - D_ 8 - notetype 12, 9, 5 - endchannel - -Music_TitleScreen_branch_7e62c:: - notetype 12, 14, 7 - octave 4 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 12, 9, 5 - endchannel - -Music_TitleScreen_branch_7e636:: - notetype 12, 14, 1 - D_ 1 - rest 2 - octave 4 - D_ 1 - rest 3 - D_ 1 - rest 3 - D_ 1 - rest 3 - D_ 1 - endchannel + note D_, 1 + note D_, 1 + sound_ret Music_TitleScreen_Ch2:: - notetype 12, 1, 0 + vibrato 16, 4, 6 + duty_cycle 1 + note_type 12, 14, 1 + octave 2 + note G_, 1 + note B_, 1 octave 3 - G_ 1 - rest 1 - D_ 1 - rest 1 - G_ 1 - rest 3 - G_ 1 - rest 5 - G_ 1 - G_ 1 - G_ 1 - rest 3 - G_ 1 - rest 3 - G_ 1 - rest 3 - notetype 8, 1, 0 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - A_ 2 + note D_, 1 + note F#, 1 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + note_type 8, 14, 1 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 -Music_TitleScreen_branch_7e65e:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 - -Music_TitleScreen_branch_7e664:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 - loopchannel 3, Music_TitleScreen_branch_7e664 - callchannel Music_TitleScreen_branch_7e6c9 - G_ 6 - D_ 3 - A_ 6 - F_ 3 - A_ 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - A# 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - B_ 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc +Music_TitleScreen_branch_7e594:: + vibrato 16, 4, 6 + sound_call Music_TitleScreen_branch_7e622 + octave 2 + note A_, 4 + note F_, 4 + sound_call Music_TitleScreen_branch_7e62c + octave 2 + note A_, 8 + note B_, 16 + sound_call Music_TitleScreen_branch_7e622 + octave 2 + note A_, 6 + note F_, 2 + note_type 8, 14, 7 octave 4 - C_ 3 + note C_, 4 octave 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + note B_, 4 octave 4 - C# 3 + note C_, 4 + note_type 12, 14, 7 + note D_, 8 + note_type 12, 9, 5 + octave 2 + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + sound_call Music_TitleScreen_branch_7e622 + octave 2 + note A_, 2 + note F_, 6 + sound_call Music_TitleScreen_branch_7e62c octave 3 - A_ 3 - callchannel Music_TitleScreen_branch_7e6e5 + note C_, 2 + octave 2 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + sound_call Music_TitleScreen_branch_7e622 + note_type 8, 9, 5 + octave 2 + note G_, 4 + note F_, 5 + note A_, 3 + note_type 8, 14, 6 + octave 4 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 12, 14, 7 + note G_, 6 + note A#, 2 + note G_, 8 + vibrato 16, 2, 6 + duty_cycle 3 + note_type 12, 0, -3 + note G_, 8 + note_type 12, 14, 7 + note A_, 8 + duty_cycle 1 + note_type 12, 14, 7 + note A#, 6 + note F_, 2 + note F_, 8 + octave 3 + note D_, 8 + octave 4 + note A#, 4 + note B_, 4 octave 5 - pitchbend 0, 66 - D_ 4 - rest 4 - octave 6 - pitchbend 0, 50 - D_ 4 + note C_, 6 + octave 4 + note G_, 2 + note G_, 8 + octave 3 + note E_, 8 + note_type 12, 13, 7 octave 5 - pitchbend 0, 66 - D_ 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 + rest 3 + note D_, 1 + rest 3 + note D_, 1 + note_type 8, 14, 5 + octave 5 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 + note D_, 1 rest 2 - notetype 8, 1, 0 - octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e6e5 - octave 6 - pitchbend 0, 50 - D_ 4 - rest 4 + note D_, 1 + rest 3 + note D_, 1 + note_type 8, 14, 3 octave 5 - pitchbend 0, 66 - D_ 4 - rest 6 - notetype 8, 1, 0 + note C_, 4 + note C_, 4 octave 4 - C_ 4 - C_ 4 + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e594 + +Music_TitleScreen_branch_7e622:: + note_type 12, 14, 7 octave 3 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e65e - -Music_TitleScreen_branch_7e6c9:: - G_ 6 - D_ 3 - G_ 6 - D_ 3 - G_ 3 - D_ 3 - endchannel - -Music_TitleScreen_branch_7e6d0:: - F_ 6 - C_ 3 - F_ 6 - C_ 3 - F_ 3 - C_ 3 - endchannel - -Music_TitleScreen_branch_7e6d7:: - A# 6 - F_ 3 - A# 6 - F_ 3 - endchannel - -Music_TitleScreen_branch_7e6dc:: + note G_, 6 + note B_, 2 octave 4 - C_ 6 - octave 3 - G_ 3 - octave 4 - C_ 6 - octave 3 - G_ 3 - endchannel + note D_, 8 + note_type 12, 9, 5 + sound_ret -Music_TitleScreen_branch_7e6e5:: - notetype 12, 1, 0 +Music_TitleScreen_branch_7e62c:: + note_type 12, 14, 7 octave 4 - D_ 1 - rest 5 - endchannel + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 12, 9, 5 + sound_ret + +Music_TitleScreen_branch_7e636:: + note_type 12, 14, 1 + note D_, 1 + rest 2 + octave 4 + note D_, 1 + rest 3 + note D_, 1 + rest 3 + note D_, 1 + rest 3 + note D_, 1 + sound_ret Music_TitleScreen_Ch3:: - dspeed 6 - rest 4 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - snare2 1 + note_type 12, 1, 0 + octave 3 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 rest 3 - snare2 1 + note G_, 1 rest 5 - snare2 1 - snare2 1 - snare2 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 3 - snare2 1 + note G_, 1 rest 3 - snare2 1 + note G_, 1 rest 3 - dspeed 8 - snare3 2 - snare4 2 - snare2 2 - snare3 2 - snare2 2 - snare1 2 + note_type 8, 1, 0 + note F_, 2 + note F_, 2 + note F_, 2 + 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 + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note A#, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note B_, 3 + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc + octave 4 + note C_, 3 + octave 3 + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc + octave 4 + note C#, 3 + octave 3 + note A_, 3 + sound_call Music_TitleScreen_branch_7e6e5 + octave 5 + pitch_slide 1, 4, D_ + note D_, 4 + rest 4 + octave 6 + pitch_slide 1, 5, D_ + note D_, 4 + octave 5 + pitch_slide 1, 4, D_ + note D_, 4 + rest 2 + note_type 8, 1, 0 + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e6e5 + octave 6 + pitch_slide 1, 5, D_ + note D_, 4 + rest 4 + octave 5 + pitch_slide 1, 4, D_ + note D_, 4 + rest 6 + note_type 8, 1, 0 + octave 4 + note C_, 4 + note C_, 4 + octave 3 + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e65e + +Music_TitleScreen_branch_7e6c9:: + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + sound_ret + +Music_TitleScreen_branch_7e6d0:: + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + sound_ret + +Music_TitleScreen_branch_7e6d7:: + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + sound_ret + +Music_TitleScreen_branch_7e6dc:: + octave 4 + note C_, 6 + octave 3 + note G_, 3 + octave 4 + note C_, 6 + octave 3 + note G_, 3 + sound_ret + +Music_TitleScreen_branch_7e6e5:: + note_type 12, 1, 0 + octave 4 + note D_, 1 + rest 5 + sound_ret + + +Music_TitleScreen_Ch4:: + drum_speed 6 + rest 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 1, 2 Music_TitleScreen_branch_7e716:: - dspeed 12 - snare2 1 + drum_speed 12 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e834 - snare2 1 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e834 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 1 - snare3 1 - snare2 1 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - snare2 1 + drum_note 2, 1 rest 1 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - snare3 1 - snare2 1 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - snare4 1 - snare3 1 - snare2 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare4 1 - snare2 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 rest 1 - dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - snare1 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 1, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare1 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare3 1 - snare2 1 - snare3 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare4 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 1 rest 1 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare5 1 + drum_note 5, 1 rest 5 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 - snare2 1 - snare1 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - snare1 1 + drum_note 1, 1 rest 1 - dspeed 8 - snare2 4 - snare3 4 - snare1 4 - dspeed 12 - snare5 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 1, 4 + drum_speed 12 + drum_note 5, 1 rest 5 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 - snare2 1 - snare3 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare1 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 1, 1 rest 1 - snare3 1 - snare2 1 - dspeed 8 - snare2 4 - snare3 4 - snare2 4 - loopchannel 0, Music_TitleScreen_branch_7e716 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 2, 4 + sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - endchannel + sound_ret Music_TitleScreen_branch_7e842:: - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 5bd2c5f8..ba5d6d1b 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,1857 +1,1857 @@ -Music_TrainerBattle_Ch0:: +Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 rest 8 octave 3 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - C_ 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - A# 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 octave 3 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 4 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 2 - C# 2 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 4 - D_ 6 - E_ 6 - F_ 4 - D_ 2 - E_ 4 - F_ 6 - C_ 2 - C# 2 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 Music_TrainerBattle_branch_22962:: - notetype 12, 11, 5 - D_ 2 - E_ 4 - C# 2 - D_ 4 + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 octave 2 - B_ 4 - F# 4 + note B_, 4 + note F#, 4 octave 3 - E_ 2 - D_ 4 - C# 2 - D_ 2 - E_ 2 - F_ 8 - notetype 12, 11, 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C_ 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C_ 1 - notetype 12, 11, 5 - D_ 2 - E_ 4 - C# 2 - D_ 4 + note E_, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 8 + note_type 12, 11, 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note_type 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 octave 2 - B_ 4 - F# 4 + note B_, 4 + note F#, 4 octave 3 - E_ 2 - D_ 4 - C# 2 + note E_, 2 + note D_, 4 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - notetype 12, 10, 7 - D_ 8 - C# 8 + note C#, 2 + note_type 12, 10, 7 + note D_, 8 + note C#, 8 octave 2 - B_ 8 + note B_, 8 octave 3 - C# 8 - notetype 12, 11, 5 - D_ 2 - C# 2 + note C#, 8 + note_type 12, 11, 5 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - E_ 4 + note C#, 2 + note E_, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - B_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note B_, 2 + note G_, 2 octave 3 - D_ 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - A_ 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 rest 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 2 - A_ 2 - E_ 2 - G_ 2 - F# 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note G_, 2 + note F#, 2 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 2 - D_ 1 - E_ 1 - F# 1 - G_ 1 - G# 1 - A# 1 - B_ 2 + note A_, 2 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - B_ 2 - F_ 2 - G_ 2 - A_ 2 + note G_, 2 + note B_, 2 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C_ 2 - D_ 2 + note C_, 2 + note D_, 2 rest 2 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 3 - F_ 1 - G_ 1 - A_ 1 - B_ 1 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C_ 1 - D_ 1 - E_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 - F_ 2 - E_ 2 + note C_, 1 + note D_, 1 + note E_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 octave 3 - B_ 2 - C_ 2 + note B_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - C_ 2 + note D_, 2 + note F_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - D_ 16 - C_ 16 + note D_, 2 + note F_, 2 + note D_, 16 + note C_, 16 octave 2 - A# 16 - G_ 12 + note A#, 16 + note G_, 12 octave 3 - D_ 1 - E_ 1 - G_ 1 + note D_, 1 + note E_, 1 + note G_, 1 octave 4 - C_ 1 - D_ 8 - F_ 8 + note C_, 1 + note D_, 8 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C_ 8 - D_ 8 - E_ 8 - F_ 8 - G_ 8 - E_ 2 + note C_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note G_, 8 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 octave 3 - C_ 2 - D_ 4 + note C_, 2 + note D_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 4 + note C#, 4 rest 2 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 2 - B_ 1 + note B_, 1 rest 1 octave 3 - C# 1 + note C#, 1 rest 9 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 rest 5 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D_ 2 - E_ 2 - F_ 2 - G_ 2 - D# 1 - E_ 1 - F_ 1 - F# 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 rest 9 - F# 2 - E_ 4 - D# 2 - E_ 2 - F# 2 - G# 2 - E_ 8 - F# 8 - G_ 8 + note F#, 2 + note E_, 4 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note E_, 8 + note F#, 8 + note G_, 8 octave 4 - C_ 4 + note C_, 4 octave 3 - G_ 1 - G# 1 - A_ 1 - A# 1 - loopchannel 0, Music_TrainerBattle_branch_22962 - - -Music_TrainerBattle_Ch1:: - duty 3 - vibrato 10, 2, 5 - notetype 12, 12, 2 - octave 4 - A_ 1 - G# 1 - G_ 1 - F# 1 - A_ 1 - F_ 1 - F# 1 - F_ 1 - A_ 1 - E_ 1 - F_ 1 - E_ 1 - A_ 1 - D# 1 - E_ 1 - D# 1 - A_ 1 - D_ 1 - D# 1 - D_ 1 - A_ 1 - C# 1 - D_ 1 - C# 1 - A_ 1 - C_ 1 - C# 1 - C_ 1 - A_ 1 - octave 3 - B_ 1 - octave 4 - C_ 1 - octave 3 - B_ 1 - notetype 12, 14, 1 - octave 4 - B_ 16 - rest 16 - notetype 12, 13, 1 - B_ 16 - rest 12 - A_ 4 - notetype 12, 12, 2 - octave 3 - B_ 6 - octave 4 - C# 6 - D_ 4 - octave 3 - B_ 2 - octave 4 - C# 4 - D_ 6 - A_ 2 - A# 2 - B_ 6 - octave 5 - C# 6 - D_ 4 - octave 4 - B_ 2 - octave 5 - C# 4 - D_ 6 - octave 4 - A_ 4 - -Music_TrainerBattle_branch_22bfc:: - notetype 12, 12, 7 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 5, 0 - octave 4 - C_ 8 - notetype 12, 3, 0 - C_ 8 - notetype 12, 4, 14 - C_ 8 - notetype 12, 12, 7 - C_ 8 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 9, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 3, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 - octave 4 - D_ 8 - octave 3 - G_ 8 - notetype 12, 8, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 6, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 - octave 4 - E_ 8 - F# 8 - E_ 16 - notetype 12, 12, 5 - G_ 4 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 5, 0 - F# 8 - notetype 12, 6, 0 - F# 8 - notetype 12, 7, 0 - F# 8 - notetype 12, 10, 0 - G_ 8 - notetype 12, 10, 7 - G_ 8 - notetype 12, 11, 7 - G_ 4 - notetype 12, 12, 5 - A_ 2 - G_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - notetype 12, 10, 0 - G# 8 - notetype 12, 7, 0 - G# 8 - notetype 12, 8, 0 - G# 8 - notetype 12, 6, 0 - G# 8 - notetype 12, 10, 0 - A_ 16 - notetype 12, 11, 0 - octave 5 - C# 8 - E_ 8 - notetype 12, 12, 0 - D_ 4 - octave 4 - A_ 4 - octave 5 - C_ 2 - notetype 12, 12, 7 - octave 4 - B_ 8 - notetype 12, 6, 0 - B_ 8 - notetype 12, 6, 9 - B_ 6 - notetype 12, 9, 6 - B_ 6 - rest 2 - notetype 12, 12, 0 - octave 5 - D_ 4 - octave 4 - A_ 4 - A# 2 - notetype 12, 11, 0 - octave 5 - F_ 14 - notetype 12, 6, 0 - G_ 16 - notetype 12, 5, 0 - E_ 16 - notetype 12, 4, 0 - E_ 16 - notetype 12, 12, 7 - octave 4 - C_ 6 - octave 3 - A_ 14 - octave 4 - C_ 4 - octave 3 - A_ 4 - octave 4 - C_ 4 - octave 3 - A# 6 - octave 4 - F_ 14 - octave 3 - A# 4 - octave 4 - F_ 4 - D_ 4 - C_ 6 - octave 3 - A_ 14 - octave 4 - C_ 4 - E_ 2 - D_ 2 - C_ 2 - E_ 2 - D_ 2 - octave 3 - A# 4 - octave 4 - F_ 10 - G_ 6 - F_ 6 - D_ 4 - notetype 12, 11, 0 - F_ 16 - E_ 16 - D_ 16 - E_ 16 - notetype 12, 10, 0 - octave 5 - F_ 16 - E_ 16 - G_ 16 - F_ 16 - notetype 12, 13, 1 - octave 3 - A# 6 - A# 6 - A# 4 - A_ 6 - A_ 6 - A_ 4 - octave 4 - C_ 6 - C_ 6 - C_ 4 - octave 3 - A# 6 - A# 6 - A_ 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - G_ 2 - A_ 10 - B_ 2 - octave 4 - C# 2 - E_ 2 - D_ 2 - C# 2 - octave 3 - B_ 2 - A# 16 - rest 2 - A# 2 - octave 4 - C_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - octave 3 - A# 2 - B_ 16 - rest 2 - B_ 2 - octave 4 - C# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - octave 3 - B_ 2 - octave 4 - C_ 16 - E_ 8 - G_ 8 - loopchannel 0, Music_TrainerBattle_branch_22bfc + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + sound_loop 0, Music_TrainerBattle_branch_22962 Music_TrainerBattle_Ch2:: + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 2 + octave 4 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note A_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note A_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note A_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note A_, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note A_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note_type 12, 14, 1 + octave 4 + note B_, 16 + rest 16 + note_type 12, 13, 1 + note B_, 16 + rest 12 + note A_, 4 + note_type 12, 12, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 6 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 4 + note D_, 6 + note A_, 2 + note A#, 2 + note B_, 6 + octave 5 + note C#, 6 + note D_, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 4 + note D_, 6 + octave 4 + note A_, 4 + +Music_TrainerBattle_branch_22bfc:: + note_type 12, 12, 7 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 5, 0 + octave 4 + note C_, 8 + note_type 12, 3, 0 + note C_, 8 + note_type 12, 4, -6 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 9, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 3, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + note_type 12, 8, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 6, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 + octave 4 + note E_, 8 + note F#, 8 + note E_, 16 + note_type 12, 12, 5 + note G_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 5, 0 + note F#, 8 + note_type 12, 6, 0 + note F#, 8 + note_type 12, 7, 0 + note F#, 8 + note_type 12, 10, 0 + note G_, 8 + note_type 12, 10, 7 + note G_, 8 + note_type 12, 11, 7 + note G_, 4 + note_type 12, 12, 5 + note A_, 2 + note G_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note_type 12, 10, 0 + note G#, 8 + note_type 12, 7, 0 + note G#, 8 + note_type 12, 8, 0 + note G#, 8 + note_type 12, 6, 0 + note G#, 8 + note_type 12, 10, 0 + note A_, 16 + note_type 12, 11, 0 + octave 5 + note C#, 8 + note E_, 8 + note_type 12, 12, 0 + note D_, 4 + octave 4 + note A_, 4 + octave 5 + note C_, 2 + note_type 12, 12, 7 + octave 4 + note B_, 8 + note_type 12, 6, 0 + note B_, 8 + note_type 12, 6, -1 + note B_, 6 + note_type 12, 9, 6 + note B_, 6 + rest 2 + note_type 12, 12, 0 + octave 5 + note D_, 4 + octave 4 + note A_, 4 + note A#, 2 + note_type 12, 11, 0 + octave 5 + note F_, 14 + note_type 12, 6, 0 + note G_, 16 + note_type 12, 5, 0 + note E_, 16 + note_type 12, 4, 0 + note E_, 16 + note_type 12, 12, 7 + octave 4 + note C_, 6 + octave 3 + note A_, 14 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 6 + octave 4 + note F_, 14 + octave 3 + note A#, 4 + octave 4 + note F_, 4 + note D_, 4 + note C_, 6 + octave 3 + note A_, 14 + octave 4 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A#, 4 + octave 4 + note F_, 10 + note G_, 6 + note F_, 6 + note D_, 4 + note_type 12, 11, 0 + note F_, 16 + note E_, 16 + note D_, 16 + note E_, 16 + note_type 12, 10, 0 + octave 5 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + note_type 12, 13, 1 + octave 3 + note A#, 6 + note A#, 6 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 4 + octave 4 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + note A#, 6 + note A#, 6 + note A_, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 + note G_, 2 + note A_, 10 + note B_, 2 + octave 4 + note C#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 16 + rest 2 + note A#, 2 + octave 4 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note B_, 16 + rest 2 + note B_, 2 + octave 4 + note C#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 16 + note E_, 8 + note G_, 8 + sound_loop 0, Music_TrainerBattle_branch_22bfc + + +Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 4 + note_type 12, 1, 4 octave 3 - B_ 1 - A# 1 - A_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - C_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - G# 1 - A_ 2 - A# 2 - B_ 2 - B_ 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 2 + note A#, 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 Music_TrainerBattle_branch_22d9c:: octave 2 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C_ 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 2 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 - D_ 2 - E_ 2 - F# 2 - E_ 2 - D_ 2 - F# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - D# 2 - F_ 2 - G_ 2 - F_ 2 - D# 2 - G_ 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - E_ 2 - F# 2 - G# 2 - F# 2 - E_ 2 - G# 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - F_ 2 - G_ 2 - A_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 4 + note F#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 4 octave 2 - A_ 4 + note A_, 4 octave 3 - C_ 2 - G_ 2 + note C_, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D_ 4 + note G_, 2 + note D_, 4 octave 2 - A_ 4 - A# 2 + note A_, 4 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - E_ 2 - D_ 2 - C_ 2 - loopchannel 0, Music_TrainerBattle_branch_22d9c + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + sound_loop 0, Music_TrainerBattle_branch_22d9c diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index fb541581..a2291a2a 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,338 +1,338 @@ -Music_UnusedSong_Ch0:: +Music_UnusedSong_Ch1:: tempo 144 volume 7, 7 vibrato 5, 1, 6 Music_UnusedSong_branch_a91b:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - D# 4 - C# 4 - D# 1 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - B_ 2 + note B_, 2 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 8 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 3 octave 5 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - E_ 2 - F# 8 + note E_, 2 + note F#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - D# 2 - E_ 8 + note D#, 2 + note E_, 8 rest 2 - D# 2 - C# 2 - D# 2 + note D#, 2 + note C#, 2 + note D#, 2 octave 5 - A_ 2 - G# 2 - A_ 2 - A# 1 - B_ 1 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 1 + note B_, 1 rest 4 - F# 2 + note F#, 2 rest 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 6 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 rest 8 octave 5 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 octave 6 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a91b - endchannel + sound_loop 0, Music_UnusedSong_branch_a91b + sound_ret -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 - toggleperfectpitch + toggle_perfect_pitch vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 8 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 2 + note F#, 2 rest 1 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - D# 8 + note D#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 + note F#, 2 rest 2 - C# 8 + note C#, 8 rest 2 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 1 - F# 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 rest 8 - B_ 2 - A# 2 - B_ 2 - A_ 1 - G# 1 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 rest 4 - G# 2 + note G#, 2 rest 2 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 - E_ 2 - C# 2 - E_ 2 - F# 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note F#, 2 rest 6 - D# 2 + note D#, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a9d8 - endchannel + sound_loop 0, Music_UnusedSong_branch_a9d8 + sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index c89c9b3b..2788cde9 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,323 +1,323 @@ -Music_Vermilion_Ch0:: +Music_Vermilion_Ch1:: tempo 156 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Vermilion_branch_b9f6:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - E_ 4 - C# 1 - D_ 1 - E_ 2 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - A_ 4 - F# 1 - G# 1 - A_ 2 - E_ 4 - C# 2 - E_ 2 - A_ 2 - G# 2 - B_ 2 - A_ 2 - G# 2 - E_ 2 - F# 2 - G# 2 - C# 2 - D_ 2 - E_ 2 - F# 2 - E_ 4 - C# 1 - D_ 1 - E_ 2 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - A_ 4 - F# 1 - G# 1 - A_ 2 - E_ 4 - C# 1 - D_ 1 - E_ 2 - A_ 2 - G# 2 - F# 2 - A_ 2 - G# 2 - E_ 2 - F# 2 - G# 2 - F# 4 - E_ 4 - F# 2 - G# 2 - F# 2 - A_ 2 - G# 2 - B_ 2 - A_ 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 4 + note E_, 4 + note F#, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 1 - A_ 1 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 2 octave 4 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - G# 2 + note G#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - F# 2 - B_ 2 - G# 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - loopchannel 0, Music_Vermilion_branch_b9f6 - - -Music_Vermilion_Ch1:: - duty 3 - vibrato 10, 2, 3 - -Music_Vermilion_branch_ba66:: - notetype 12, 12, 7 - octave 3 - A_ 8 - octave 4 - D_ 4 - C# 4 - octave 3 - B_ 6 - A_ 1 - B_ 1 - octave 4 - C# 8 - octave 3 - A_ 8 - octave 4 - D_ 4 - C# 4 - octave 3 - B_ 6 - octave 4 - C# 1 - octave 3 - B_ 1 - A_ 8 - A_ 8 - octave 4 - D_ 4 - C# 4 - octave 3 - B_ 6 - A_ 1 - B_ 1 - octave 4 - C# 8 - octave 3 - A_ 8 - octave 4 - D_ 4 - C# 4 - octave 3 - B_ 6 - octave 4 - C# 1 - octave 3 - B_ 1 - A_ 8 - B_ 4 - octave 4 - C# 4 - D_ 4 - E_ 4 - F# 8 - B_ 8 - A_ 4 - G# 4 - F# 4 - E_ 4 - F# 8 - E_ 8 - loopchannel 0, Music_Vermilion_branch_ba66 + note F#, 2 + note B_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + sound_loop 0, Music_Vermilion_branch_b9f6 Music_Vermilion_Ch2:: - notetype 12, 1, 0 + duty_cycle 3 + vibrato 10, 2, 3 -Music_Vermilion_branch_baa8:: +Music_Vermilion_branch_ba66:: + note_type 12, 12, 7 + octave 3 + note A_, 8 octave 4 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - B_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - A_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - A_ 2 - E_ 2 - G# 2 - E_ 2 - loopchannel 0, Music_Vermilion_branch_baa8 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C#, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C#, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 + note E_, 4 + note F#, 8 + note B_, 8 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 8 + note E_, 8 + sound_loop 0, Music_Vermilion_branch_ba66 Music_Vermilion_Ch3:: - dspeed 12 + note_type 12, 1, 0 + +Music_Vermilion_branch_baa8:: + octave 4 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + sound_loop 0, Music_Vermilion_branch_baa8 + + +Music_Vermilion_Ch4:: + drum_speed 12 Music_Vermilion_branch_bb0e:: - callchannel Music_Vermilion_branch_bb3f - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 1 - triangle1 1 - triangle1 1 - triangle1 1 - loopchannel 4, Music_Vermilion_branch_bb0e - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - loopchannel 0, 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:: - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - triangle1 2 - triangle1 1 - triangle1 1 - endchannel + 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, 2 + drum_note 6, 1 + drum_note 6, 1 + sound_ret diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index e9aad529..f7cfab14 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,738 +1,738 @@ -Music_WildBattle_Ch0:: +Music_WildBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - A# 1 - A_ 1 - A# 1 - A_ 1 - G# 1 - G_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - notetype 12, 4, 15 - C# 10 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - C# 10 + note C_, 1 + note C#, 1 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note_type 12, 4, -7 + note C#, 10 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note C#, 10 Music_WildBattle_branch_230e0:: - notetype 12, 11, 3 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - D_ 1 - C# 1 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note_type 12, 11, 3 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - F_ 1 - E_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - F_ 1 - E_ 1 - D# 1 - E_ 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - notetype 12, 11, 5 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - E_ 6 - D_ 6 - F_ 4 - notetype 12, 11, 7 - A_ 16 - G_ 16 - notetype 12, 11, 5 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - G_ 6 - A_ 6 - B_ 4 - notetype 12, 11, 7 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note E_, 6 + note D_, 6 + note F_, 4 + note_type 12, 11, 7 + note A_, 16 + note G_, 16 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note B_, 4 + note_type 12, 11, 7 octave 4 - C_ 16 - notetype 12, 3, 15 - G_ 16 - notetype 12, 11, 5 + note C_, 16 + note_type 12, 3, -7 + note G_, 16 + note_type 12, 11, 5 octave 3 - C_ 12 - C_ 2 + note C_, 12 + note C_, 2 rest 2 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 rest 12 - C# 12 - C# 2 + note C#, 12 + note C#, 2 rest 2 - F_ 2 - notetype 12, 10, 3 - D# 6 - notetype 12, 10, 7 - C# 8 - loopchannel 0, Music_WildBattle_branch_230e0 - - -Music_WildBattle_Ch1:: - duty 3 - vibrato 8, 2, 5 - notetype 12, 12, 3 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - octave 4 - G_ 1 - F# 1 - F_ 1 - octave 5 - G_ 1 - notetype 12, 12, 2 - octave 4 - G_ 6 - octave 3 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - notetype 12, 9, 0 - F# 10 - notetype 12, 12, 2 - G_ 6 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - G_ 10 - -Music_WildBattle_branch_23225:: - notetype 12, 12, 5 - G_ 6 - F# 6 - E_ 4 - G_ 6 - A_ 6 - G_ 4 - octave 4 - G# 12 - G_ 2 - rest 2 - G# 2 - G_ 2 - rest 4 - notetype 12, 11, 7 - octave 5 - C# 8 - notetype 12, 12, 5 - octave 4 - C_ 6 - octave 3 - A# 6 - G# 4 - octave 4 - C# 6 - C_ 6 - octave 3 - A# 4 - octave 4 - F_ 6 - E_ 6 - D_ 4 - notetype 12, 12, 7 - octave 3 - A# 4 - octave 4 - C_ 4 - D_ 4 - F_ 4 - notetype 12, 12, 0 - G# 16 - notetype 12, 11, 0 - G# 16 - notetype 12, 4, 14 - G_ 16 - notetype 12, 12, 7 - G_ 16 - octave 3 - F_ 8 - A# 8 - octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - E_ 16 - notetype 12, 12, 7 - E_ 16 - octave 3 - F_ 8 - A# 8 - octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - G_ 16 - notetype 12, 3, 15 - octave 5 - C_ 16 - notetype 12, 12, 5 - octave 4 - E_ 12 - E_ 2 - rest 2 - F_ 2 - notetype 12, 12, 1 - E_ 4 - notetype 12, 12, 5 - rest 10 - F_ 12 - F_ 2 - rest 2 - G# 2 - notetype 12, 10, 3 - G_ 6 - notetype 12, 12, 7 - F_ 8 - loopchannel 0, Music_WildBattle_branch_23225 + note F_, 2 + note_type 12, 10, 3 + note D#, 6 + note_type 12, 10, 7 + note C#, 8 + sound_loop 0, Music_WildBattle_branch_230e0 Music_WildBattle_Ch2:: - vibrato 0, 2, 0 - notetype 12, 1, 1 + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 3 octave 4 - C# 1 - rest 1 - C# 1 - C_ 1 - D_ 1 - rest 1 - D_ 1 - C_ 1 - D# 1 - rest 1 - D# 1 - C_ 1 - E_ 1 - rest 1 - E_ 1 - C_ 1 - F_ 1 - rest 1 - F_ 1 - C_ 1 - F# 1 - rest 1 - F# 1 - C_ 1 - G_ 1 - rest 1 - G_ 1 - C_ 1 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + note_type 12, 12, 2 + octave 4 + note G_, 6 octave 3 - A# 2 - B_ 2 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note_type 12, 9, 0 + note F#, 10 + note_type 12, 12, 2 + note G_, 6 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note G_, 10 + +Music_WildBattle_branch_23225:: + note_type 12, 12, 5 + note G_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note A_, 6 + note G_, 4 + octave 4 + note G#, 12 + note G_, 2 + rest 2 + note G#, 2 + note G_, 2 + rest 4 + note_type 12, 11, 7 + octave 5 + note C#, 8 + note_type 12, 12, 5 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + note G#, 4 + octave 4 + note C#, 6 + note C_, 6 + octave 3 + note A#, 4 + octave 4 + note F_, 6 + note E_, 6 + note D_, 4 + note_type 12, 12, 7 + octave 3 + note A#, 4 + octave 4 + note C_, 4 + note D_, 4 + note F_, 4 + note_type 12, 12, 0 + note G#, 16 + note_type 12, 11, 0 + note G#, 16 + note_type 12, 4, -6 + note G_, 16 + note_type 12, 12, 7 + note G_, 16 + octave 3 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note E_, 16 + note_type 12, 12, 7 + note E_, 16 + octave 3 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note G_, 16 + note_type 12, 3, -7 + octave 5 + note C_, 16 + note_type 12, 12, 5 + octave 4 + note E_, 12 + note E_, 2 + rest 2 + note F_, 2 + note_type 12, 12, 1 + note E_, 4 + note_type 12, 12, 5 + rest 10 + note F_, 12 + note F_, 2 + rest 2 + note G#, 2 + note_type 12, 10, 3 + note G_, 6 + note_type 12, 12, 7 + note F_, 8 + sound_loop 0, Music_WildBattle_branch_23225 + + +Music_WildBattle_Ch3:: + vibrato 0, 2, 0 + note_type 12, 1, 1 + octave 4 + note C#, 1 + rest 1 + note C#, 1 + note C_, 1 + note D_, 1 + rest 1 + note D_, 1 + note C_, 1 + note D#, 1 + rest 1 + note D#, 1 + note C_, 1 + note E_, 1 + rest 1 + note E_, 1 + note C_, 1 + note F_, 1 + rest 1 + note F_, 1 + note C_, 1 + note F#, 1 + rest 1 + note F#, 1 + note C_, 1 + note G_, 1 + rest 1 + note G_, 1 + note C_, 1 + octave 3 + note A#, 2 + note B_, 2 Music_WildBattle_branch_232b5:: octave 4 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C# 2 - G# 2 - C# 4 - G# 2 - A# 2 - G# 2 - G_ 2 - C# 2 - G# 2 - C# 4 - G# 2 - A# 2 - G# 2 - F_ 2 - loopchannel 2, Music_WildBattle_branch_232b5 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note F_, 2 + sound_loop 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - G# 12 - G_ 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G#, 12 + note G_, 2 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - F_ 2 - E_ 2 - D_ 2 - C# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - F_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C_ 2 - G_ 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - C# 2 - G# 2 - loopchannel 0, Music_WildBattle_branch_232d8 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + sound_loop 0, Music_WildBattle_branch_232d8 diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm deleted file mode 100644 index 086fef53..00000000 --- a/audio/music/yellow/meetjessiejames.asm +++ /dev/null @@ -1,309 +0,0 @@ -Music_MeetJessieJames_Ch1:: - tempo 144 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - G# 1 - G_ 1 - F# 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - C_ 2 - notetype 12, 11, 6 - D# 12 - C_ 4 - -Music_MeetJessieJames_branch_83187:: - notetype 12, 11, 2 - octave 4 - D_ 16 - rest 12 - notetype 12, 11, 4 - octave 3 - A# 4 - rest 16 - rest 8 - notetype 12, 11, 2 - octave 2 - A_ 2 - octave 3 - A# 2 - A_ 4 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 4 - notetype 12, 11, 4 - octave 3 - B_ 4 - notetype 12, 11, 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 2 - octave 3 - B_ 2 - notetype 12, 11, 4 - A# 4 - loopchannel 0, Music_MeetJessieJames_branch_83187 - - -Music_MeetJessieJames_Ch2:: - duty 3 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - C_ 2 - octave 3 - B_ 2 - A# 2 - A_ 2 - G# 2 - G_ 2 - F# 2 - notetype 12, 12, 7 - A_ 12 - octave 4 - C# 4 - -Music_MeetJessieJames_branch_831df:: - notetype 12, 12, 2 - octave 3 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - octave 2 - A_ 4 - notetype 12, 12, 5 - octave 4 - C# 4 - notetype 12, 12, 2 - D_ 1 - octave 3 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - notetype 12, 12, 6 - octave 4 - D_ 8 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 6 - F_ 4 - D# 2 - notetype 12, 12, 5 - D_ 4 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 4 - F_ 4 - notetype 12, 12, 5 - D# 8 - loopchannel 0, Music_MeetJessieJames_branch_831df - - -Music_MeetJessieJames_Ch3:: - notetype 12, 1, 0 - rest 16 - rest 8 - octave 4 - D_ 2 - octave 3 - A_ 2 - octave 4 - C_ 2 - D# 2 - -Music_MeetJessieJames_branch_83235:: - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A# 2 - A_ 2 - D# 2 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - octave 3 - A_ 2 - octave 4 - C_ 2 - D_ 2 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - loopchannel 0, Music_MeetJessieJames_branch_83235 - endchannel diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm deleted file mode 100644 index 1ee3f760..00000000 --- a/audio/music/yellow/surfingpikachu.asm +++ /dev/null @@ -1,690 +0,0 @@ -Music_SurfingPikachu_Ch1:: - tempo 117 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 3 - octave 3 - E_ 6 - notetype 12, 11, 2 - F# 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - F# 16 - rest 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 14 - notetype 12, 11, 2 - D# 2 - C# 1 - D# 1 - octave 2 - B_ 6 - octave 3 - E_ 4 - E_ 4 - E_ 8 - G# 4 - G# 4 - G# 2 - -Music_SurfingPikachu_branch_82d1a:: - notetype 12, 11, 3 - octave 3 - G# 4 - E_ 4 - F# 4 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 6 - F# 2 - A_ 8 - octave 2 - B_ 6 - octave 3 - E_ 2 - G# 8 - G# 4 - E_ 4 - F# 4 - E_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - G# 2 - F# 6 - E_ 2 - F# 1 - rest 3 - A_ 4 - duty 0 - notetype 12, 11, 2 - G# 1 - F# 1 - G# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 - F# 2 - F# 2 - D# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - B_ 1 - A# 1 - B_ 2 - G# 2 - E_ 2 - G# 2 - G_ 2 - G# 2 - A_ 2 - octave 4 - C# 2 - C_ 2 - C# 3 - octave 3 - F# 1 - A_ 2 - G# 2 - F# 2 - A_ 2 - E_ 3 - E_ 1 - B_ 2 - A_ 2 - G# 6 - E_ 1 - F_ 1 - F# 2 - F# 2 - D# 2 - F# 2 - B_ 2 - A_ 2 - G# 2 - F# 2 - B_ 1 - A# 1 - B_ 2 - G# 2 - E_ 2 - G# 2 - G_ 2 - G# 2 - A_ 2 - octave 4 - C# 2 - C_ 2 - C# 3 - octave 3 - F# 1 - A_ 2 - G# 2 - A_ 2 - octave 4 - D# 2 - E_ 2 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 8 - duty 3 - loopchannel 0, Music_SurfingPikachu_branch_82d1a - - -Music_SurfingPikachu_Ch2:: - duty 3 - vibrato 6, 1, 5 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 11, 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 4 - octave 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 12, 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - notetype 12, 12, 2 - E_ 6 - B_ 4 - B_ 4 - B_ 8 - B_ 4 - B_ 4 - B_ 2 - -Music_SurfingPikachu_branch_82de0:: - notetype 12, 12, 6 - octave 4 - E_ 4 - octave 3 - B_ 4 - A_ 4 - octave 4 - C# 4 - octave 3 - B_ 6 - A_ 2 - G# 8 - F# 6 - A_ 2 - octave 4 - C# 8 - octave 3 - E_ 6 - G# 2 - B_ 8 - octave 4 - E_ 4 - octave 3 - B_ 4 - A_ 4 - octave 4 - C# 4 - octave 3 - B_ 6 - octave 4 - D# 2 - E_ 8 - D# 6 - C# 2 - D# 1 - rest 3 - F# 4 - E_ 10 - notetype 12, 12, 6 - duty 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 6 - octave 4 - C# 2 - D# 4 - octave 3 - B_ 4 - octave 4 - E_ 6 - F# 2 - G# 8 - A_ 6 - G# 2 - A_ 4 - F# 4 - G# 10 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 6 - octave 4 - C# 2 - D# 4 - octave 3 - B_ 4 - octave 4 - E_ 6 - F# 2 - G# 8 - A_ 4 - F# 4 - D# 4 - octave 5 - C# 4 - octave 4 - B_ 8 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 6 - duty 3 - octave 3 - B_ 1 - A# 1 - B_ 1 - octave 4 - C# 1 - loopchannel 0, Music_SurfingPikachu_branch_82de0 - - -Music_SurfingPikachu_Ch3:: - notetype 12, 1, 0 - octave 4 - B_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - D# 1 - rest 1 - C# 1 - rest 1 - octave 4 - A_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 6 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - G# 1 - rest 1 - F# 1 - rest 1 - E_ 1 - rest 1 - F# 1 - rest 1 - G# 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D# 1 - rest 1 - -Music_SurfingPikachu_branch_82ea0:: - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - octave 5 - C# 1 - C_ 1 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - octave 5 - E_ 1 - D# 1 - E_ 1 - rest 1 - octave 4 - D# 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - F# 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D_ 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - B_ 1 - A# 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - F# 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D_ 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - D# 1 - rest 1 - F# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - F# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - D# 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D# 1 - rest 1 - loopchannel 0, Music_SurfingPikachu_branch_82ea0 diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm deleted file mode 100644 index c809d10f..00000000 --- a/audio/music/yellow/yellowintro.asm +++ /dev/null @@ -1,484 +0,0 @@ -Music_YellowIntro_Ch1:: - tempo 116 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - G# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 3 - A# 1 - B_ 2 - B_ 10 - notetype 12, 11, 6 - octave 4 - C# 1 - C_ 1 - C# 10 - octave 3 - G# 1 - G_ 1 - G# 4 - B_ 4 - octave 4 - E_ 4 - F# 8 - E_ 8 - octave 3 - A_ 4 - B_ 4 - octave 4 - C# 4 - octave 3 - B_ 4 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - octave 4 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 - octave 3 - A_ 4 - F# 4 - A_ 4 - B_ 4 - F# 4 - G# 4 - A_ 2 - G# 2 - F# 2 - D# 2 - notetype 12, 11, 3 - B_ 2 - octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 2 - C# 2 - F# 4 - F# 3 - D# 1 - F# 2 - F# 8 - notetype 12, 11, 6 - F# 1 - F_ 1 - F# 8 - octave 3 - B_ 1 - A# 1 - B_ 8 - octave 4 - F# 1 - F_ 1 - F# 2 - notetype 12, 11, 3 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 2 - octave 3 - B_ 16 - endchannel - - -Music_YellowIntro_Ch2:: - duty 2 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 3 - B_ 2 - octave 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - E_ 3 - D# 1 - E_ 2 - E_ 4 - notetype 12, 12, 5 - G# 1 - G_ 1 - G# 10 - octave 3 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 7 - octave 4 - E_ 4 - G# 4 - B_ 4 - octave 5 - C# 16 - octave 4 - A_ 4 - G# 4 - F# 4 - E_ 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - C# 4 - octave 3 - A_ 4 - octave 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 4 - D# 2 - C# 2 - octave 3 - B_ 2 - notetype 12, 12, 3 - octave 4 - E_ 2 - G# 4 - G# 4 - G# 4 - G# 2 - F# 2 - A_ 4 - A_ 3 - F# 1 - A_ 2 - A_ 4 - notetype 12, 12, 7 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - E_ 16 - endchannel - - -Music_YellowIntro_Ch3:: - notetype 12, 1, 0 - octave 4 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - E_ 1 - rest 1 - octave 3 - B_ 1 - rest 1 - octave 4 - C# 1 - rest 1 - D# 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - F# 1 - rest 1 - A_ 1 - rest 1 - C# 1 - rest 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - B_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - E_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - C# 1 - rest 1 - octave 4 - B_ 1 - rest 1 - A_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - G# 1 - rest 1 - B_ 1 - rest 1 - E_ 1 - rest 1 - B_ 1 - rest 1 - A_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - E_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - E_ 1 - rest 1 - octave 5 - E_ 1 - rest 1 - octave 4 - A_ 1 - rest 1 - octave 5 - F# 1 - rest 1 - octave 4 - F# 1 - rest 1 - octave 5 - C# 1 - rest 3 - F# 1 - rest 1 - octave 4 - F# 1 - G# 1 - A_ 1 - octave 5 - C# 1 - E_ 1 - rest 15 - endchannel diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm deleted file mode 100644 index f65ca164..00000000 --- a/audio/music/yellow/yellowunusedsong.asm +++ /dev/null @@ -1,326 +0,0 @@ -Music_YellowUnusedSong_Ch1:: - tempo 140 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 8, 11, 2 - octave 3 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - A_ 6 - G_ 6 - A_ 12 - -Music_YellowUnusedSong_branch_82fde:: - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - octave 4 - D# 6 - D_ 12 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - octave 3 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - G_ 6 - G_ 6 - A_ 6 - E_ 6 - A_ 6 - A_ 2 - A_ 2 - A_ 2 - A# 6 - A# 6 - A_ 6 - G_ 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_82fde - - -Music_YellowUnusedSong_Ch2:: - duty 2 - notetype 8, 12, 2 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 - octave 3 - A_ 6 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 - -Music_YellowUnusedSong_branch_8302a:: - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 - octave 3 - A_ 6 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - G# 6 - G_ 12 - notetype 8, 9, 0 - octave 3 - D# 16 - D# 8 - D# 16 - D# 8 - octave 2 - A# 16 - A# 8 - octave 3 - D# 12 - F_ 12 - notetype 8, 12, 2 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 - octave 3 - A_ 6 - octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_8302a - - -Music_YellowUnusedSong_Ch3:: - notetype 12, 1, 0 - vibrato 2, 1, 5 - rest 16 - rest 12 - octave 4 - C_ 4 - D_ 8 - D# 8 - G_ 8 - A# 8 - -Music_YellowUnusedSong_branch_83075:: - A_ 8 - A# 8 - G_ 8 - A_ 4 - D_ 4 - A_ 8 - A# 8 - octave 5 - C# 8 - D_ 8 - D# 16 - D# 16 - octave 4 - A# 16 - octave 5 - D# 8 - F_ 8 - octave 4 - D_ 16 - D_ 16 - octave 4 - D_ 8 - D# 8 - G_ 8 - A# 8 - loopchannel 0, Music_YellowUnusedSong_branch_83075 - - -Music_YellowUnusedSong_Ch4:: - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - -Music_YellowUnusedSong_branch_830c3:: - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 2 - snare3 2 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - loopchannel 0, Music_YellowUnusedSong_branch_830c3 diff --git a/audio/notes.asm b/audio/notes.asm new file mode 100644 index 00000000..75e1a0b7 --- /dev/null +++ b/audio/notes.asm @@ -0,0 +1,14 @@ +; This file is INCLUDEd three times, once in each audio engine. + + dw $F82C ; C_ + dw $F89D ; C# + dw $F907 ; D_ + dw $F96B ; D# + dw $F9CA ; E_ + dw $FA23 ; F_ + dw $FA77 ; F# + dw $FAC7 ; G_ + dw $FB12 ; G# + dw $FB58 ; A_ + dw $FB9B ; A# + dw $FBDA ; B_ diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm new file mode 100644 index 00000000..9b399a24 --- /dev/null +++ b/audio/play_battle_music.asm @@ -0,0 +1,35 @@ +PlayBattleMusic:: + xor a + ld [wAudioFadeOutControl], a + ld [wLowHealthAlarm], a + ld [wMusicFade], a + dec a ; SFX_STOP_ALL_MUSIC + ld [wNewSoundID], a + call PlayMusic + call DelayFrame + ;ld c, BANK(Music_GymLeaderBattle) + ld a, [wGymLeaderNo] + and a + jr z, .notGymLeaderBattle + ld a, MUSIC_GYM_LEADER_BATTLE + jr .playSong +.notGymLeaderBattle + ld a, [wCurOpponent] + cp OPP_ID_OFFSET + jr c, .wildBattle + cp OPP_RIVAL3 + jr z, .finalBattle + cp OPP_LANCE + jr nz, .normalTrainerBattle + ld a, MUSIC_GYM_LEADER_BATTLE ; lance also plays gym leader theme + jr .playSong +.normalTrainerBattle + ld a, MUSIC_TRAINER_BATTLE + jr .playSong +.finalBattle + ld a, MUSIC_FINAL_BATTLE + jr .playSong +.wildBattle + ld a, MUSIC_WILD_BATTLE +.playSong + jp PlayMusic diff --git a/audio/poke_flute.asm b/audio/poke_flute.asm new file mode 100644 index 00000000..f55a2a1f --- /dev/null +++ b/audio/poke_flute.asm @@ -0,0 +1,18 @@ +Music_PokeFluteInBattle:: + ; begin playing the "caught mon" sound effect + ld a, SFX_CAUGHT_MON + call PlaySoundWaitForCurrent + ; then immediately overwrite the channel pointers + ld hl, wChannelCommandPointers + Ch5 * 2 + ld de, SFX_Pokeflute_Ch5 + call Audio2_OverwriteChannelPointer + ld de, SFX_Pokeflute_Ch6 + call Audio2_OverwriteChannelPointer + ld de, SFX_Pokeflute_Ch7 + +Audio2_OverwriteChannelPointer: + ld a, e + ld [hli], a + ld a, d + ld [hli], a + ret diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm new file mode 100644 index 00000000..b1eeced7 --- /dev/null +++ b/audio/pokedex_rating_sfx.asm @@ -0,0 +1,37 @@ +PlayPokedexRatingSfx:: + ldh a, [hDexRatingNumMonsOwned] + ld c, $0 + ld hl, OwnedMonValues +.getSfxPointer + cp [hl] + jr c, .gotSfxPointer + inc c + inc hl + jr .getSfxPointer +.gotSfxPointer + push bc + ld a, SFX_STOP_ALL_MUSIC + ld [wNewSoundID], a + call PlaySoundWaitForCurrent + pop bc + ld b, $0 + ld hl, PokedexRatingSfxPointers + add hl, bc + add hl, bc + ld a, [hli] + ld c, [hl] + call PlaySound + call WaitForSoundToFinish + jp PlayDefaultMusic + +PokedexRatingSfxPointers: + db SFX_DENIED, BANK(SFX_Denied_1) + db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) + db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) + db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) + db SFX_LEVEL_UP, BANK(SFX_Level_Up) + db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) + db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) + +OwnedMonValues: + db 10, 40, 60, 90, 120, 150, $ff diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index ac115501..ef909832 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ -SFX_59_1_Ch4: - dutycycle 2 - squarenote 4, 15, 1, 1920 - endchannel - - SFX_59_1_Ch5: - dutycycle 2 - squarenote 1, 0, 8, 0 - squarenote 4, 10, 1, 1889 - endchannel + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret + + +SFX_59_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index b42b4cf2..30d12c8b 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_1_Ch4: - dutycycle 0 - pitchenvelope 1, 7 - squarenote 15, 13, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Arrow_Tiles_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 7201a546..396adf44 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ -SFX_Ball_Poof_Ch4: - dutycycle 2 - pitchenvelope 1, 6 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ball_Poof_Ch5: + duty_cycle 2 + pitch_sweep 1, 6 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret -SFX_Ball_Poof_Ch7: - noisenote 15, 10, 2, 34 - endchannel +SFX_Ball_Poof_Ch8: + noise_note 15, 10, 2, 34 + sound_ret diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index e9f550a8..207bf720 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch4: - dutycycle 2 - pitchenvelope 2, -7 - squarenote 15, 15, 2, 1920 - endchannel - - SFX_Ball_Toss_Ch5: - dutycycle 2 - squarenote 15, 12, 2, 1922 - endchannel + duty_cycle 2 + pitch_sweep 2, -7 + square_note 15, 15, 2, 1920 + sound_ret + + +SFX_Ball_Toss_Ch6: + duty_cycle 2 + square_note 15, 12, 2, 1922 + sound_ret diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index c5ee1afa..7a61373b 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ -SFX_Battle_09_Ch4: - dutycycle 1 - pitchenvelope 9, 7 - squarenote 15, 15, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Battle_09_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 06e2fa14..e60fe9c7 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch7: - noisenote 8, 15, 1, 84 - endchannel +SFX_Battle_0B_Ch8: + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 67e910eb..285e0d52 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ -SFX_Battle_0C_Ch7: - noisenote 15, 8, -7, 17 - noisenote 4, 15, -7, 18 - noisenote 10, 15, 1, 85 - endchannel +SFX_Battle_0C_Ch8: + noise_note 15, 8, -7, 17 + noise_note 4, 15, -7, 18 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 231d324f..293d9743 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ -SFX_Battle_0D_Ch7: - noisenote 15, 8, -7, 52 - noisenote 8, 15, 2, 53 - noisenote 10, 15, 1, 85 - endchannel +SFX_Battle_0D_Ch8: + noise_note 15, 8, -7, 52 + noise_note 8, 15, 2, 53 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index eb67a126..39d971c9 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch7: - noisenote 15, 9, -7, 35 - noisenote 8, 15, 1, 33 - endchannel +SFX_Battle_0E_Ch8: + noise_note 15, 9, -7, 35 + noise_note 8, 15, 1, 33 + sound_ret diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 26386131..ae81e747 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ -SFX_Battle_0F_Ch7: - noisenote 2, 14, 1, 75 - noisenote 10, 15, 1, 68 - noisenote 2, 14, 1, 58 - noisenote 6, 15, 1, 52 - endchannel +SFX_Battle_0F_Ch8: + noise_note 2, 14, 1, 75 + noise_note 10, 15, 1, 68 + noise_note 2, 14, 1, 58 + noise_note 6, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 86d5a815..7a092bd3 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch7: - noisenote 8, 4, -7, 35 - noisenote 4, 12, 4, 34 - noisenote 6, 15, 2, 35 - loopchannel 4, SFX_Battle_12_Ch7 - endchannel +SFX_Battle_12_Ch8: + noise_note 8, 4, -7, 35 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + sound_loop 4, SFX_Battle_12_Ch8 + sound_ret diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 882be8c7..0f910cec 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ -SFX_Battle_13_Ch7: - noisenote 8, 4, -7, 51 - noisenote 4, 12, 4, 34 - noisenote 6, 15, 2, 35 - noisenote 15, 15, 2, 34 - endchannel +SFX_Battle_13_Ch8: + noise_note 8, 4, -7, 51 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + noise_note 15, 15, 2, 34 + sound_ret diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 97a88b95..7c3a7c68 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ -SFX_Battle_14_Ch7: - noisenote 8, 15, -7, 50 - noisenote 8, 15, 4, 67 - noisenote 8, 15, 2, 84 - noisenote 8, 15, 1, 101 - endchannel +SFX_Battle_14_Ch8: + noise_note 8, 15, -7, 50 + noise_note 8, 15, 4, 67 + noise_note 8, 15, 2, 84 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index daa614cd..6e162cce 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ -SFX_Battle_16_Ch7: - noisenote 1, 9, 4, 35 - noisenote 1, 11, 4, 34 - noisenote 8, 15, 1, 68 - endchannel +SFX_Battle_16_Ch8: + noise_note 1, 9, 4, 35 + noise_note 1, 11, 4, 34 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index b6cc787e..f863f8ee 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ -SFX_Battle_17_Ch7: - noisenote 2, 9, 4, 51 - noisenote 4, 11, 4, 34 - noisenote 4, 15, 1, 68 - noisenote 8, 15, 1, 85 - endchannel +SFX_Battle_17_Ch8: + noise_note 2, 9, 4, 51 + noise_note 4, 11, 4, 34 + noise_note 4, 15, 1, 68 + noise_note 8, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index ced87cd8..f8ece58e 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch7: - noisenote 4, 15, -7, 85 - noisenote 8, 15, 1, 101 - endchannel +SFX_Battle_18_Ch8: + noise_note 4, 15, -7, 85 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 53de4341..a7cf5292 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ -SFX_Battle_19_Ch7: - noisenote 2, 8, 4, 67 - noisenote 2, 12, 4, 34 - noisenote 8, 15, 2, 52 - endchannel +SFX_Battle_19_Ch8: + noise_note 2, 8, 4, 67 + noise_note 2, 12, 4, 34 + noise_note 8, 15, 2, 52 + sound_ret diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 06c2b6f1..16ea584d 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch7: - noisenote 2, 15, 1, 34 - noisenote 15, 15, 2, 18 - endchannel +SFX_Battle_1B_Ch8: + noise_note 2, 15, 1, 34 + noise_note 15, 15, 2, 18 + sound_ret diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 7518acd9..3045576b 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ -SFX_Battle_1C_Ch7: - noisenote 2, 12, 2, 1 - noisenote 15, 15, 4, 1 - noisenote 15, 15, 2, 1 - endchannel +SFX_Battle_1C_Ch8: + noise_note 2, 12, 2, 1 + noise_note 15, 15, 4, 1 + noise_note 15, 15, 2, 1 + sound_ret diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 28736865..26820e8d 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ -SFX_Battle_1E_Ch4: - dutycycle 0 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Battle_1E_Ch5: + duty_cycle 0 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret -SFX_Battle_1E_Ch7: - noisenote 0, 13, 1, 66 - noisenote 4, 10, 1, 50 - noisenote 0, 13, 1, 34 - noisenote 6, 10, 1, 50 - endchannel +SFX_Battle_1E_Ch8: + noise_note 0, 13, 1, 66 + noise_note 4, 10, 1, 50 + noise_note 0, 13, 1, 34 + noise_note 6, 10, 1, 50 + sound_ret diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index 4e5687d8..b73b0a8f 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch7: - noisenote 12, 15, 1, 84 - noisenote 8, 15, 1, 100 - endchannel +SFX_Battle_20_Ch8: + noise_note 12, 15, 1, 84 + noise_note 8, 15, 1, 100 + sound_ret diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 616b0c42..fc1b1186 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ -SFX_Battle_21_Ch7: - noisenote 2, 15, 1, 51 - noisenote 2, 12, 1, 50 - noisenote 2, 10, 1, 49 - noisenote 15, 8, 2, 50 - noisenote 8, 15, 1, 52 - endchannel +SFX_Battle_21_Ch8: + noise_note 2, 15, 1, 51 + noise_note 2, 12, 1, 50 + noise_note 2, 10, 1, 49 + noise_note 15, 8, 2, 50 + noise_note 8, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index e19417e0..3c42996e 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch7: - noisenote 2, 13, 2, 50 - noisenote 15, 15, 2, 67 - endchannel +SFX_Battle_22_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index febce65a..bf546248 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ -SFX_Battle_23_Ch7: - noisenote 2, 15, 2, 67 - noisenote 4, 11, 5, 50 - noisenote 9, 8, 6, 49 - noisenote 7, 6, 4, 0 - noisenote 15, 15, 2, 85 - endchannel +SFX_Battle_23_Ch8: + noise_note 2, 15, 2, 67 + noise_note 4, 11, 5, 50 + noise_note 9, 8, 6, 49 + noise_note 7, 6, 4, 0 + noise_note 15, 15, 2, 85 + sound_ret diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 581edac2..f99cf59a 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ -SFX_Battle_24_Ch4: - dutycycle 1 - pitchenvelope 9, 7 - squarenote 15, 15, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Battle_24_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1792 + pitch_sweep 0, 8 + sound_ret -SFX_Battle_24_Ch7: - noisenote 15, 3, -7, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Battle_24_Ch8: + noise_note 15, 3, -7, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 1d50b391..54623b5f 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ -SFX_Battle_25_Ch7: - noisenote 15, 4, -7, 65 - noisenote 8, 8, -7, 65 - noisenote 8, 12, -7, 65 - noisenote 8, 15, 2, 66 - noisenote 15, 15, 2, 65 - endchannel +SFX_Battle_25_Ch8: + noise_note 15, 4, -7, 65 + noise_note 8, 8, -7, 65 + noise_note 8, 12, -7, 65 + noise_note 8, 15, 2, 66 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 0c0e21ae..f3baea99 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ -SFX_Battle_26_Ch7: - noisenote 10, 15, -7, 80 - noisenote 15, 15, -7, 81 - noisenote 8, 15, 2, 81 - noisenote 6, 15, -7, 82 - noisenote 6, 15, -7, 83 - noisenote 8, 15, -7, 84 - noisenote 15, 15, 2, 84 - endchannel +SFX_Battle_26_Ch8: + noise_note 10, 15, -7, 80 + noise_note 15, 15, -7, 81 + noise_note 8, 15, 2, 81 + noise_note 6, 15, -7, 82 + noise_note 6, 15, -7, 83 + noise_note 8, 15, -7, 84 + noise_note 15, 15, 2, 84 + sound_ret diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index d720d86c..1b505811 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ -SFX_Battle_27_Ch4: - dutycycle 2 - squarenote 15, 3, -7, 1984 +SFX_Battle_27_Ch5: + duty_cycle 2 + square_note 15, 3, -7, 1984 SFX_Battle_27_branch_2062a: - squarenote 15, 13, -7, 1984 - loopchannel 4, SFX_Battle_27_branch_2062a - squarenote 15, 13, 1, 1984 - endchannel + square_note 15, 13, -7, 1984 + sound_loop 4, SFX_Battle_27_branch_2062a + square_note 15, 13, 1, 1984 + sound_ret -SFX_Battle_27_Ch5: - dutycycle 179 - squarenote 15, 2, -7, 1992 +SFX_Battle_27_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: - squarenote 15, 12, -7, 1991 - loopchannel 4, SFX_Battle_27_branch_2063d - squarenote 15, 12, 1, 1992 - endchannel + square_note 15, 12, -7, 1991 + sound_loop 4, SFX_Battle_27_branch_2063d + square_note 15, 12, 1, 1992 + sound_ret -SFX_Battle_27_Ch7: - noisenote 3, 9, 7, 18 - noisenote 3, 10, 1, 17 - loopchannel 10, SFX_Battle_27_Ch7 - endchannel +SFX_Battle_27_Ch8: + noise_note 3, 9, 7, 18 + noise_note 3, 10, 1, 17 + sound_loop 10, SFX_Battle_27_Ch8 + sound_ret diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index e2023a21..467e411d 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch4: - dutycycle 0 - squarenote 0, 15, 1, 1984 - squarenote 0, 15, 1, 1792 - loopchannel 12, SFX_Battle_28_Ch4 - endchannel - - SFX_Battle_28_Ch5: - dutycycle 179 - squarenote 0, 14, 1, 1985 - squarenote 0, 14, 1, 1793 - loopchannel 12, SFX_Battle_28_Ch5 - endchannel + duty_cycle 0 + square_note 0, 15, 1, 1984 + square_note 0, 15, 1, 1792 + sound_loop 12, SFX_Battle_28_Ch5 + sound_ret -SFX_Battle_28_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 6, SFX_Battle_28_Ch7 - endchannel +SFX_Battle_28_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 0, 14, 1, 1985 + square_note 0, 14, 1, 1793 + 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 + sound_loop 6, SFX_Battle_28_Ch8 + sound_ret diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index 534826fe..c3999ec8 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ -SFX_Battle_29_Ch4: - dutycycle 201 - squarenote 11, 15, 3, 288 - squarenote 9, 13, 3, 336 - loopchannel 5, SFX_Battle_29_Ch4 - squarenote 8, 14, 3, 304 - squarenote 15, 12, 2, 272 - endchannel +SFX_Battle_29_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 11, 15, 3, 288 + square_note 9, 13, 3, 336 + sound_loop 5, SFX_Battle_29_Ch5 + square_note 8, 14, 3, 304 + square_note 15, 12, 2, 272 + sound_ret -SFX_Battle_29_Ch7: - noisenote 10, 15, 3, 53 - noisenote 14, 15, 6, 69 - loopchannel 4, SFX_Battle_29_Ch7 - noisenote 12, 15, 4, 188 - noisenote 12, 15, 5, 156 - noisenote 15, 15, 4, 172 - endchannel +SFX_Battle_29_Ch8: + noise_note 10, 15, 3, 53 + noise_note 14, 15, 6, 69 + sound_loop 4, SFX_Battle_29_Ch8 + noise_note 12, 15, 4, 188 + noise_note 12, 15, 5, 156 + noise_note 15, 15, 4, 172 + sound_ret diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index f4986805..1faf2dda 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch4: - dutycycle 57 - squarenote 4, 15, 4, 1536 - squarenote 3, 12, 4, 1280 - squarenote 5, 11, 5, 1536 - squarenote 13, 14, 2, 1728 - loopchannel 3, SFX_Battle_2A_Ch4 - squarenote 8, 13, 1, 1536 - endchannel - - SFX_Battle_2A_Ch5: - dutycycle 141 - squarenote 5, 14, 4, 1504 - squarenote 4, 11, 4, 1248 - squarenote 6, 10, 5, 1512 - squarenote 14, 13, 1, 1696 - loopchannel 3, SFX_Battle_2A_Ch5 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + square_note 4, 15, 4, 1536 + square_note 3, 12, 4, 1280 + square_note 5, 11, 5, 1536 + square_note 13, 14, 2, 1728 + sound_loop 3, SFX_Battle_2A_Ch5 + square_note 8, 13, 1, 1536 + sound_ret -SFX_Battle_2A_Ch7: - noisenote 5, 12, 3, 51 - noisenote 3, 9, 2, 67 - noisenote 10, 11, 5, 51 - noisenote 15, 12, 3, 50 - loopchannel 2, SFX_Battle_2A_Ch7 - endchannel +SFX_Battle_2A_Ch6: + duty_cycle_pattern 2, 0, 3, 1 + square_note 5, 14, 4, 1504 + square_note 4, 11, 4, 1248 + square_note 6, 10, 5, 1512 + square_note 14, 13, 1, 1696 + 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 + noise_note 10, 11, 5, 51 + noise_note 15, 12, 3, 50 + sound_loop 2, SFX_Battle_2A_Ch8 + sound_ret diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 418ab5cb..d60a96f6 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch4: - dutycycle 210 - squarenote 3, 8, 1, 768 - squarenote 3, 12, 1, 1024 - squarenote 3, 15, 1, 1280 - squarenote 3, 11, 1, 1024 - squarenote 3, 7, 1, 768 - loopchannel 5, SFX_Battle_2B_Ch4 - squarenote 8, 8, 1, 1024 - endchannel +SFX_Battle_2B_Ch5: + duty_cycle_pattern 3, 1, 0, 2 + square_note 3, 8, 1, 768 + square_note 3, 12, 1, 1024 + square_note 3, 15, 1, 1280 + square_note 3, 11, 1, 1024 + square_note 3, 7, 1, 768 + sound_loop 5, SFX_Battle_2B_Ch5 + square_note 8, 8, 1, 1024 + sound_ret -SFX_Battle_2B_Ch7: - noisenote 3, 6, 2, 34 - noisenote 3, 10, 2, 50 - noisenote 3, 13, 2, 51 - noisenote 3, 9, 2, 35 - noisenote 3, 5, 2, 18 - loopchannel 5, SFX_Battle_2B_Ch7 - noisenote 8, 8, 1, 18 - endchannel +SFX_Battle_2B_Ch8: + noise_note 3, 6, 2, 34 + noise_note 3, 10, 2, 50 + noise_note 3, 13, 2, 51 + noise_note 3, 9, 2, 35 + noise_note 3, 5, 2, 18 + sound_loop 5, SFX_Battle_2B_Ch8 + noise_note 8, 8, 1, 18 + sound_ret diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index aedb91bd..7530210f 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch4: - dutycycle 57 - squarenote 15, 15, 4, 1280 - squarenote 15, 12, 4, 1024 - squarenote 15, 14, 2, 1472 - loopchannel 3, SFX_Battle_2C_Ch4 - endchannel - - SFX_Battle_2C_Ch5: - dutycycle 141 - squarenote 7, 14, 4, 1072 - squarenote 15, 11, 4, 816 - squarenote 15, 10, 2, 1080 - loopchannel 4, SFX_Battle_2C_Ch5 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + square_note 15, 15, 4, 1280 + square_note 15, 12, 4, 1024 + square_note 15, 14, 2, 1472 + sound_loop 3, SFX_Battle_2C_Ch5 + sound_ret -SFX_Battle_2C_Ch7: - noisenote 9, 15, 4, 68 - noisenote 9, 15, 2, 67 - noisenote 15, 15, 4, 66 - noisenote 15, 15, 4, 65 - loopchannel 3, SFX_Battle_2C_Ch7 - endchannel +SFX_Battle_2C_Ch6: + duty_cycle_pattern 2, 0, 3, 1 + square_note 7, 14, 4, 1072 + square_note 15, 11, 4, 816 + square_note 15, 10, 2, 1080 + 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 + noise_note 15, 15, 4, 66 + noise_note 15, 15, 4, 65 + sound_loop 3, SFX_Battle_2C_Ch8 + sound_ret diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index e823aebb..ab5665fa 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch4: - dutycycle 0 - squarenote 2, 15, 1, 512 - squarenote 3, 15, 1, 1792 - squarenote 4, 15, 1, 1280 - squarenote 5, 15, 1, 2032 - loopchannel 8, SFX_Battle_2E_Ch4 - endchannel - - SFX_Battle_2E_Ch5: - dutycycle 179 - squarenote 2, 14, 1, 770 - squarenote 3, 14, 1, 2034 - squarenote 4, 14, 1, 1538 - squarenote 5, 14, 1, 1794 - loopchannel 8, SFX_Battle_2E_Ch5 - endchannel + duty_cycle 0 + square_note 2, 15, 1, 512 + square_note 3, 15, 1, 1792 + square_note 4, 15, 1, 1280 + square_note 5, 15, 1, 2032 + sound_loop 8, SFX_Battle_2E_Ch5 + sound_ret -SFX_Battle_2E_Ch7: - noisenote 2, 13, 3, 16 - noisenote 3, 13, 3, 17 - noisenote 2, 13, 2, 16 - noisenote 5, 13, 2, 18 - loopchannel 9, SFX_Battle_2E_Ch7 - endchannel +SFX_Battle_2E_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 14, 1, 770 + square_note 3, 14, 1, 2034 + square_note 4, 14, 1, 1538 + square_note 5, 14, 1, 1794 + 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 + noise_note 2, 13, 2, 16 + noise_note 5, 13, 2, 18 + sound_loop 9, SFX_Battle_2E_Ch8 + sound_ret diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index d8c2bd91..dd80e599 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch4: - dutycycle 43 - squarenote 3, 15, 1, 2032 - squarenote 4, 15, 2, 512 - loopchannel 8, SFX_Battle_2F_Ch4 - endchannel - - SFX_Battle_2F_Ch5: - dutycycle 179 - squarenote 4, 14, 2, 514 - squarenote 4, 14, 1, 2018 - loopchannel 9, SFX_Battle_2F_Ch5 - endchannel + duty_cycle_pattern 0, 2, 2, 3 + square_note 3, 15, 1, 2032 + square_note 4, 15, 2, 512 + sound_loop 8, SFX_Battle_2F_Ch5 + sound_ret -SFX_Battle_2F_Ch7: - noisenote 4, 15, -7, 67 - noisenote 4, 15, 2, 68 - loopchannel 9, SFX_Battle_2F_Ch7 - endchannel +SFX_Battle_2F_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 4, 14, 2, 514 + square_note 4, 14, 1, 2018 + 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 + sound_loop 9, SFX_Battle_2F_Ch8 + sound_ret diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index b5c35c90..83dc96f4 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ -SFX_Battle_31_Ch4: - dutycycle 2 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, 2, 2016 - endchannel - - SFX_Battle_31_Ch5: - dutycycle 3 - squarenote 15, 15, -7, 2018 - squarenote 15, 15, -7, 2017 - squarenote 15, 15, -7, 2018 - squarenote 15, 15, -7, 2017 - squarenote 15, 15, 2, 2018 - endchannel + duty_cycle 2 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, 2, 2016 + sound_ret + + +SFX_Battle_31_Ch6: + duty_cycle 3 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, 2, 2018 + sound_ret diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 504ba297..c906dcac 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ -SFX_Battle_32_Ch4: - dutycycle 2 - pitchenvelope 10, -7 - squarenote 8, 15, 1, 1792 - pitchenvelope 0, 0 - endchannel - - SFX_Battle_32_Ch5: - dutycycle 3 - squarenote 8, 15, 1, 1793 - endchannel + duty_cycle 2 + pitch_sweep 10, -7 + square_note 8, 15, 1, 1792 + pitch_sweep 0, 8 + sound_ret + + +SFX_Battle_32_Ch6: + duty_cycle 3 + square_note 8, 15, 1, 1793 + sound_ret diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index c7e250b9..95afe045 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ -SFX_Battle_33_Ch4: - dutycycle 2 - squarenote 6, 15, 1, 1280 - squarenote 6, 15, 1, 1408 - squarenote 6, 15, 1, 1536 - squarenote 6, 15, 1, 1664 - squarenote 8, 15, 1, 1792 - endchannel - - SFX_Battle_33_Ch5: - dutycycle 3 - squarenote 6, 14, 1, 1296 - squarenote 6, 14, 1, 1424 - squarenote 6, 14, 1, 1552 - squarenote 6, 14, 1, 1680 - squarenote 8, 14, 1, 1808 - endchannel + duty_cycle 2 + square_note 6, 15, 1, 1280 + square_note 6, 15, 1, 1408 + square_note 6, 15, 1, 1536 + square_note 6, 15, 1, 1664 + square_note 8, 15, 1, 1792 + sound_ret + + +SFX_Battle_33_Ch6: + duty_cycle 3 + square_note 6, 14, 1, 1296 + square_note 6, 14, 1, 1424 + square_note 6, 14, 1, 1552 + square_note 6, 14, 1, 1680 + square_note 8, 14, 1, 1808 + sound_ret diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index af9d5b65..654049e4 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ -SFX_Battle_34_Ch4: - dutycycle 237 - squarenote 8, 15, -7, 1016 - squarenote 15, 15, -7, 1024 - squarenote 15, 15, 3, 1024 - endchannel - - SFX_Battle_34_Ch5: - dutycycle 180 - squarenote 8, 14, -7, 960 - squarenote 15, 14, -7, 960 - squarenote 15, 14, 3, 960 - endchannel + duty_cycle_pattern 3, 2, 3, 1 + square_note 8, 15, -7, 1016 + square_note 15, 15, -7, 1024 + square_note 15, 15, 3, 1024 + sound_ret -SFX_Battle_34_Ch7: - noisenote 4, 15, -7, 81 - noisenote 8, 15, -7, 84 - noisenote 15, 15, -7, 85 - noisenote 15, 15, 3, 86 - endchannel +SFX_Battle_34_Ch6: + duty_cycle_pattern 2, 3, 1, 0 + square_note 8, 14, -7, 960 + square_note 15, 14, -7, 960 + square_note 15, 14, 3, 960 + sound_ret + + +SFX_Battle_34_Ch8: + noise_note 4, 15, -7, 81 + noise_note 8, 15, -7, 84 + noise_note 15, 15, -7, 85 + noise_note 15, 15, 3, 86 + sound_ret diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 67832140..e9f78657 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,29 +1,29 @@ -SFX_Battle_35_Ch4: - executemusic - vibrato 10, (2<<4) + 4 - dutycycle 2 - notetype 10, (8<<4) + 7 - octave 5 - note G#, 8 - octave 6 - note F#, 4 - note E_, 4 - octave 5 - note G#, 8 - endchannel - - SFX_Battle_35_Ch5: - executemusic - vibrato 10, (2<<4) + 3 - dutycycle 2 - notetype 11, (6<<4) + 7 + execute_music + vibrato 10, 2, 4 + duty_cycle 2 + note_type 10, 8, 7 octave 5 note G#, 8 - notetype 10, (6<<4) + 7 octave 6 note F#, 4 note E_, 4 octave 5 note G#, 8 - endchannel + sound_ret + + +SFX_Battle_35_Ch6: + execute_music + vibrato 10, 2, 3 + duty_cycle 2 + note_type 11, 6, 7 + octave 5 + note G#, 8 + note_type 10, 6, 7 + octave 6 + note F#, 4 + note E_, 4 + octave 5 + note G#, 8 + sound_ret diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 21f71e59..773bf753 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ -SFX_Battle_36_Ch4: - dutycycle 0 - squarenote 2, 15, 1, 1920 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1936 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1952 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1968 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1984 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2000 +SFX_Battle_36_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 SFX_Battle_36_branch_20930: - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2016 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1792 - endchannel + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1792 + sound_ret -SFX_Battle_36_Ch5: - dutycycle 179 - squarenote 2, 15, 1, 1921 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1937 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1953 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1969 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1985 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2001 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2017 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1793 - endchannel +SFX_Battle_36_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + 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 + square_note 15, 15, 1, 1793 + sound_ret -SFX_Battle_36_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 26, SFX_Battle_36_Ch7 - endchannel +SFX_Battle_36_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, SFX_Battle_36_Ch8 + sound_ret diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index 67a4fc3b..3fe278f3 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,10 +1,10 @@ -SFX_Caught_Mon_Ch4: - executemusic +SFX_Caught_Mon_Ch5: + execute_music tempo 256 - volume 119 - dutycycle 3 - toggleperfectpitch - notetype 6, (11<<4) + 2 + volume 7, 7 + duty_cycle 3 + toggle_perfect_pitch + note_type 6, 11, 2 octave 3 note E_, 2 note F#, 2 @@ -17,15 +17,15 @@ SFX_Caught_Mon_Ch4: note D#, 2 note D#, 1 note D#, 1 - notetype 6, (11<<4) + 5 + note_type 6, 11, 5 note E_, 8 - endchannel + sound_ret -SFX_Caught_Mon_Ch5: - executemusic - dutycycle 2 - notetype 6, (12<<4) + 2 +SFX_Caught_Mon_Ch6: + execute_music + duty_cycle 2 + note_type 6, 12, 2 octave 4 note G#, 2 note G#, 1 @@ -39,23 +39,23 @@ SFX_Caught_Mon_Ch5: note A_, 2 note A_, 1 note A_, 1 - notetype 6, (12<<4) + 5 + note_type 6, 12, 5 note G#, 8 - endchannel + sound_ret -SFX_Caught_Mon_Ch6: - executemusic - notetype 6, (1<<4) + 0 +SFX_Caught_Mon_Ch7: + execute_music + note_type 6, 1, 0 octave 4 note B_, 2 - note __, 2 + rest 2 octave 5 note C#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note G_, 2 note G#, 4 - endchannel + sound_ret diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 5ab3ed30..70eb33ae 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ -SFX_Collision_1_Ch4: - dutycycle 2 - pitchenvelope 5, -2 - squarenote 15, 15, 1, 768 - pitchenvelope 0, 0 - endchannel +SFX_Collision_1_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index b4466ca7..fd53e240 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ -SFX_Cut_1_Ch7: - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Cut_1_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index c96300fe..5e0665f6 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ -SFX_Damage_Ch7: - noisenote 2, 15, 4, 68 - noisenote 2, 15, 4, 20 - noisenote 15, 15, 1, 50 - endchannel +SFX_Damage_Ch8: + noise_note 2, 15, 4, 68 + noise_note 2, 15, 4, 20 + noise_note 15, 15, 1, 50 + sound_ret diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index b70ba0c1..2c132003 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ -SFX_Denied_1_Ch4: - dutycycle 3 - pitchenvelope 5, -2 - squarenote 4, 15, 0, 1280 - pitchenvelope 0, 0 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 1, 0, 0, 0 - endchannel - - SFX_Denied_1_Ch5: - dutycycle 3 - squarenote 4, 15, 0, 1025 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1025 - squarenote 1, 0, 0, 0 - endchannel + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret + + +SFX_Denied_1_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index ecb94a1c..555b3beb 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ -SFX_Dex_Page_Added_Ch4: - dutycycle 2 - pitchenvelope 4, 4 - squarenote 15, 15, 0, 1264 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel - - SFX_Dex_Page_Added_Ch5: - dutycycle 2 - squarenote 15, 9, 2, 1536 - squarenote 15, 9, 2, 1922 - endchannel + duty_cycle 2 + pitch_sweep 4, 4 + square_note 15, 15, 0, 1264 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret + + +SFX_Dex_Page_Added_Ch6: + duty_cycle 2 + square_note 15, 9, 2, 1536 + square_note 15, 9, 2, 1922 + sound_ret diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 82262b2e..14638602 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch7: - noisenote 8, 15, 1, 50 - noisenote 8, 15, 1, 51 - endchannel +SFX_Doubleslap_Ch8: + noise_note 8, 15, 1, 50 + noise_note 8, 15, 1, 51 + sound_ret diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 5d5c04db..30c3ecd1 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_1_Ch4: - dutycycle 2 - squarenote 6, 15, 0, 1792 - squarenote 4, 0, 0, 0 - squarenote 6, 15, 0, 1792 - squarenote 1, 0, 0, 0 - endchannel +SFX_Enter_PC_1_Ch5: + duty_cycle 2 + square_note 6, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 6, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index e8893ce7..47f45037 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ -SFX_Faint_Fall_Ch4: - dutycycle 1 - pitchenvelope 10, -7 - squarenote 15, 15, 2, 1920 - pitchenvelope 0, 0 - endchannel +SFX_Faint_Fall_Ch5: + duty_cycle 1 + pitch_sweep 10, -7 + square_note 15, 15, 2, 1920 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index d866b588..527e027f 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ -SFX_Faint_Thud_Ch4: - squarenote 15, 13, 1, 512 - pitchenvelope 0, 0 - endchannel +SFX_Faint_Thud_Ch5: + square_note 15, 13, 1, 512 + pitch_sweep 0, 8 + sound_ret -SFX_Faint_Thud_Ch7: - noisenote 4, 15, 5, 51 - noisenote 8, 15, 4, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Faint_Thud_Ch8: + noise_note 4, 15, 5, 51 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 567485a5..40ebb966 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ -SFX_Fly_1_Ch7: - noisenote 2, 15, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 10, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 13, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 8, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 11, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 6, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 9, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 4, 1, 18 - noisenote 2, 0, 0, 0 - endchannel +SFX_Fly_1_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 17e2140e..09f76c70 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_1_Ch4: - executemusic +SFX_Get_Item1_1_Ch5: + execute_music tempo 256 - volume 119 - vibrato 6, (2<<4) + 6 - dutycycle 2 - toggleperfectpitch - notetype 4, (11<<4) + 1 + volume 7, 7 + vibrato 6, 2, 6 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 note G#, 2 note G#, 2 note G#, 2 - notetype 12, (11<<4) + 3 + note_type 12, 11, 3 octave 4 note E_, 4 - endchannel - - -SFX_Get_Item1_1_Ch5: - executemusic - vibrato 8, (2<<4) + 7 - dutycycle 2 - notetype 4, (12<<4) + 1 - octave 4 - note E_, 2 - note E_, 2 - note E_, 2 - notetype 12, (12<<4) + 3 - note B_, 4 - endchannel + sound_ret SFX_Get_Item1_1_Ch6: - executemusic - notetype 4, (1<<4) + 0 + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 4, 12, 1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret + + +SFX_Get_Item1_1_Ch7: + execute_music + note_type 4, 1, 0 octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - notetype 12, (1<<4) + 0 + rest 1 + note_type 12, 1, 0 octave 4 note B_, 2 - note __, 2 - endchannel + rest 2 + sound_ret diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 23209bd5..04bbdae2 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,16 +1,16 @@ -SFX_Get_Item2_1_Ch4: - executemusic +SFX_Get_Item2_1_Ch5: + execute_music tempo 256 - volume 119 - dutycycle 2 - toggleperfectpitch - notetype 5, (11<<4) + 4 + volume 7, 7 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 note D_, 4 note C_, 4 octave 3 note A_, 8 - notetype 5, (11<<4) + 2 + note_type 5, 11, 2 octave 4 note D#, 2 note D#, 2 @@ -19,51 +19,51 @@ SFX_Get_Item2_1_Ch4: note C_, 2 octave 3 note A#, 2 - notetype 5, (11<<4) + 4 + note_type 5, 11, 4 octave 4 note C_, 8 - endchannel + sound_ret -SFX_Get_Item2_1_Ch5: - executemusic - vibrato 8, (2<<4) + 7 - dutycycle 2 - notetype 5, (12<<4) + 5 +SFX_Get_Item2_1_Ch6: + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 5, 12, 5 octave 4 note A_, 4 note F_, 4 note C_, 8 - notetype 5, (12<<4) + 2 + note_type 5, 12, 2 note A#, 2 note A#, 2 note A#, 2 note G_, 2 note G_, 2 note A#, 2 - notetype 5, (12<<4) + 4 + note_type 5, 12, 4 note A_, 8 - endchannel + sound_ret -SFX_Get_Item2_1_Ch6: - executemusic - notetype 5, (1<<4) + 0 +SFX_Get_Item2_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 note F_, 4 note D#, 4 note C_, 8 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 8 - endchannel + sound_ret diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index 99d7bd6a..a19f1143 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_1_Ch4: - executemusic +SFX_Get_Key_Item_1_Ch5: + execute_music tempo 256 - volume 119 - dutycycle 2 - toggleperfectpitch - notetype 5, (10<<4) + 4 + volume 7, 7 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 note A#, 4 - notetype 5, (11<<4) + 1 + note_type 5, 11, 1 octave 4 note C_, 2 note C_, 1 note C_, 1 - notetype 5, (10<<4) + 4 + note_type 5, 10, 4 note D#, 4 - notetype 5, (11<<4) + 1 + note_type 5, 11, 1 note F_, 2 note F_, 1 note F_, 1 - notetype 5, (11<<4) + 4 + note_type 5, 11, 4 note A#, 8 - endchannel + sound_ret -SFX_Get_Key_Item_1_Ch5: - executemusic - vibrato 4, (2<<4) + 3 - dutycycle 2 - notetype 5, (13<<4) + 1 +SFX_Get_Key_Item_1_Ch6: + execute_music + vibrato 4, 2, 3 + duty_cycle 2 + note_type 5, 13, 1 octave 4 note G_, 2 note G_, 1 note G_, 1 - notetype 5, (12<<4) + 4 + note_type 5, 12, 4 note D#, 4 - notetype 5, (13<<4) + 1 + note_type 5, 13, 1 note G#, 2 note G#, 1 note G#, 1 note A#, 2 note A#, 1 note A#, 1 - notetype 5, (12<<4) + 4 + note_type 5, 12, 4 octave 5 note D#, 8 - endchannel + sound_ret -SFX_Get_Key_Item_1_Ch6: - executemusic - notetype 5, (1<<4) + 0 +SFX_Get_Key_Item_1_Ch7: + execute_music + note_type 5, 1, 0 octave 4 note D#, 4 note G#, 4 note G_, 4 note F_, 4 note D#, 8 - endchannel + sound_ret diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index f45c8399..b41dc94d 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch7: - noisenote 9, 15, 1, 68 - noisenote 8, 13, 1, 67 - endchannel +SFX_Go_Inside_1_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 3156eba7..2ac3542b 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_1_Ch7: - noisenote 2, 15, 1, 84 - noisenote 12, 7, 1, 35 - noisenote 2, 11, 1, 84 - noisenote 12, 6, 1, 35 - noisenote 6, 4, 1, 84 - endchannel +SFX_Go_Outside_1_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 47628254..88a92881 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_1_Ch4: - dutycycle 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 080409ff..8dafb807 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_1_Ch4: - dutycycle 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 23b4e7a9..9350ffd3 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_1_Ch4: - dutycycle 2 - pitchenvelope 2, -4 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 2, 15, 1, 1280 - pitchenvelope 0, 0 - squarenote 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 8 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 6f126626..32541241 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ -SFX_Horn_Drill_Ch7: - noisenote 3, 9, 2, 49 - noisenote 3, 11, 2, 50 - noisenote 3, 12, 2, 51 - noisenote 8, 15, 1, 84 - endchannel +SFX_Horn_Drill_Ch8: + noise_note 3, 9, 2, 49 + noise_note 3, 11, 2, 50 + noise_note 3, 12, 2, 51 + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 41a4db84..703edf41 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch7: - noisenote 2, 13, 2, 50 - noisenote 15, 15, 2, 67 - endchannel +SFX_Intro_Crash_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index e6cdca5a..3d0f6642 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hip_Ch4: - dutycycle 2 - pitchenvelope 2, 6 - squarenote 12, 12, 2, 1856 - pitchenvelope 0, 0 - endchannel +SFX_Intro_Hip_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1856 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index f00b203d..9c7c1ad6 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hop_Ch4: - dutycycle 2 - pitchenvelope 2, 6 - squarenote 12, 12, 2, 1664 - pitchenvelope 0, 0 - endchannel +SFX_Intro_Hop_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1664 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index ecdd9428..ee41e37c 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ -SFX_Intro_Lunge_Ch7: - noisenote 6, 2, 0, 16 - noisenote 6, 2, -7, 64 - noisenote 6, 4, -7, 65 - noisenote 6, 8, -7, 65 - noisenote 6, 12, -7, 66 - noisenote 8, 13, 7, 66 - noisenote 15, 14, 7, 67 - noisenote 15, 15, 2, 67 - endchannel +SFX_Intro_Lunge_Ch8: + noise_note 6, 2, 0, 16 + noise_note 6, 2, -7, 64 + noise_note 6, 4, -7, 65 + noise_note 6, 8, -7, 65 + noise_note 6, 12, -7, 66 + noise_note 8, 13, 7, 66 + noise_note 15, 14, 7, 67 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index c972283d..1985878b 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ -SFX_Intro_Raise_Ch7: - noisenote 2, 6, -7, 33 - noisenote 2, 10, -7, 49 - noisenote 15, 15, 2, 65 - endchannel +SFX_Intro_Raise_Ch8: + noise_note 2, 6, -7, 33 + noise_note 2, 10, -7, 49 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 647fcbd2..68ba128a 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ -SFX_Intro_Whoosh_Ch7: - noisenote 4, 2, -4, 32 - noisenote 3, 10, 0, 32 - noisenote 3, 11, 0, 33 - noisenote 3, 12, 0, 34 - noisenote 15, 13, 2, 36 - endchannel +SFX_Intro_Whoosh_Ch8: + noise_note 4, 2, -4, 32 + noise_note 3, 10, 0, 32 + noise_note 3, 11, 0, 33 + noise_note 3, 12, 0, 34 + noise_note 15, 13, 2, 36 + sound_ret diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 1b28cbc7..dd798f40 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ -SFX_Ledge_1_Ch4: - dutycycle 2 - pitchenvelope 9, 5 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ledge_1_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 1e0c7672..f1af4978 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,63 +1,63 @@ -SFX_Level_Up_Ch4: - executemusic +SFX_Level_Up_Ch5: + execute_music tempo 256 - volume 119 - dutycycle 2 - toggleperfectpitch - notetype 6, (11<<4) + 4 + volume 7, 7 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 4 octave 4 note F_, 4 - notetype 4, (11<<4) + 2 + note_type 4, 11, 2 note C_, 2 note F_, 2 note C_, 2 - notetype 6, (11<<4) + 3 + note_type 6, 11, 3 note D#, 2 note D#, 2 note E_, 2 - notetype 6, (11<<4) + 4 + note_type 6, 11, 4 note F_, 8 - endchannel - - -SFX_Level_Up_Ch5: - executemusic - vibrato 4, (2<<4) + 2 - dutycycle 2 - notetype 6, (12<<4) + 4 - octave 4 - note A_, 4 - notetype 4, (12<<4) + 2 - note A_, 2 - note A_, 2 - note A_, 2 - notetype 6, (12<<4) + 4 - note A#, 2 - note A#, 2 - note A#, 2 - notetype 6, (12<<4) + 4 - note A_, 8 - endchannel + sound_ret SFX_Level_Up_Ch6: - executemusic - notetype 6, (1<<4) + 0 + execute_music + vibrato 4, 2, 2 + duty_cycle 2 + note_type 6, 12, 4 + octave 4 + note A_, 4 + note_type 4, 12, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note_type 6, 12, 4 + note A#, 2 + note A#, 2 + note A#, 2 + note_type 6, 12, 4 + note A_, 8 + sound_ret + + +SFX_Level_Up_Ch7: + execute_music + note_type 6, 1, 0 octave 5 note A_, 4 - notetype 4, (1<<4) + 0 + note_type 4, 1, 0 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 - notetype 6, (1<<4) + 0 + rest 1 + note_type 6, 1, 0 note G_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 8 - endchannel + sound_ret diff --git a/audio/sfx/noise_instrument01_1.asm b/audio/sfx/noise_instrument01_1.asm new file mode 100644 index 00000000..e545b030 --- /dev/null +++ b/audio/sfx/noise_instrument01_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_1_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_2.asm b/audio/sfx/noise_instrument01_2.asm new file mode 100644 index 00000000..3f4d2bb0 --- /dev/null +++ b/audio/sfx/noise_instrument01_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_2_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_3.asm b/audio/sfx/noise_instrument01_3.asm new file mode 100644 index 00000000..ac360f2e --- /dev/null +++ b/audio/sfx/noise_instrument01_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_3_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_1.asm b/audio/sfx/noise_instrument02_1.asm new file mode 100644 index 00000000..12a7d226 --- /dev/null +++ b/audio/sfx/noise_instrument02_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_1_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_2.asm b/audio/sfx/noise_instrument02_2.asm new file mode 100644 index 00000000..354bbdbc --- /dev/null +++ b/audio/sfx/noise_instrument02_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_2_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_3.asm b/audio/sfx/noise_instrument02_3.asm new file mode 100644 index 00000000..2f7f0d6f --- /dev/null +++ b/audio/sfx/noise_instrument02_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_3_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_1.asm b/audio/sfx/noise_instrument03_1.asm new file mode 100644 index 00000000..b75b6479 --- /dev/null +++ b/audio/sfx/noise_instrument03_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_1_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_2.asm b/audio/sfx/noise_instrument03_2.asm new file mode 100644 index 00000000..3551baef --- /dev/null +++ b/audio/sfx/noise_instrument03_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_2_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_3.asm b/audio/sfx/noise_instrument03_3.asm new file mode 100644 index 00000000..c132ab64 --- /dev/null +++ b/audio/sfx/noise_instrument03_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_3_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_1.asm b/audio/sfx/noise_instrument04_1.asm new file mode 100644 index 00000000..303f1f1f --- /dev/null +++ b/audio/sfx/noise_instrument04_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_1_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_2.asm b/audio/sfx/noise_instrument04_2.asm new file mode 100644 index 00000000..b43ae39d --- /dev/null +++ b/audio/sfx/noise_instrument04_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_2_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_3.asm b/audio/sfx/noise_instrument04_3.asm new file mode 100644 index 00000000..fcd27433 --- /dev/null +++ b/audio/sfx/noise_instrument04_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_3_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument05_1.asm b/audio/sfx/noise_instrument05_1.asm new file mode 100644 index 00000000..d119b958 --- /dev/null +++ b/audio/sfx/noise_instrument05_1.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_1_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_2.asm b/audio/sfx/noise_instrument05_2.asm new file mode 100644 index 00000000..1a0e63b5 --- /dev/null +++ b/audio/sfx/noise_instrument05_2.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_2_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_3.asm b/audio/sfx/noise_instrument05_3.asm new file mode 100644 index 00000000..a0fec98f --- /dev/null +++ b/audio/sfx/noise_instrument05_3.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_3_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument06_1.asm b/audio/sfx/noise_instrument06_1.asm new file mode 100644 index 00000000..1412fc39 --- /dev/null +++ b/audio/sfx/noise_instrument06_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_1_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_2.asm b/audio/sfx/noise_instrument06_2.asm new file mode 100644 index 00000000..bb591031 --- /dev/null +++ b/audio/sfx/noise_instrument06_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_2_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_3.asm b/audio/sfx/noise_instrument06_3.asm new file mode 100644 index 00000000..b5110d40 --- /dev/null +++ b/audio/sfx/noise_instrument06_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_3_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_1.asm b/audio/sfx/noise_instrument07_1.asm new file mode 100644 index 00000000..24f481bc --- /dev/null +++ b/audio/sfx/noise_instrument07_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_1_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_2.asm b/audio/sfx/noise_instrument07_2.asm new file mode 100644 index 00000000..87057ed1 --- /dev/null +++ b/audio/sfx/noise_instrument07_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_2_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_3.asm b/audio/sfx/noise_instrument07_3.asm new file mode 100644 index 00000000..3beb3f2c --- /dev/null +++ b/audio/sfx/noise_instrument07_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_3_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument08_1.asm b/audio/sfx/noise_instrument08_1.asm new file mode 100644 index 00000000..60db9e0f --- /dev/null +++ b/audio/sfx/noise_instrument08_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_1_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_2.asm b/audio/sfx/noise_instrument08_2.asm new file mode 100644 index 00000000..89e5b445 --- /dev/null +++ b/audio/sfx/noise_instrument08_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_2_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_3.asm b/audio/sfx/noise_instrument08_3.asm new file mode 100644 index 00000000..c63be9b4 --- /dev/null +++ b/audio/sfx/noise_instrument08_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_3_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument09_1.asm b/audio/sfx/noise_instrument09_1.asm new file mode 100644 index 00000000..047f5469 --- /dev/null +++ b/audio/sfx/noise_instrument09_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_1_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_2.asm b/audio/sfx/noise_instrument09_2.asm new file mode 100644 index 00000000..093f912e --- /dev/null +++ b/audio/sfx/noise_instrument09_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_2_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_3.asm b/audio/sfx/noise_instrument09_3.asm new file mode 100644 index 00000000..2ab061db --- /dev/null +++ b/audio/sfx/noise_instrument09_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_3_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument10_1.asm b/audio/sfx/noise_instrument10_1.asm new file mode 100644 index 00000000..1628fb88 --- /dev/null +++ b/audio/sfx/noise_instrument10_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_1_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_2.asm b/audio/sfx/noise_instrument10_2.asm new file mode 100644 index 00000000..e1ed23ce --- /dev/null +++ b/audio/sfx/noise_instrument10_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_2_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_3.asm b/audio/sfx/noise_instrument10_3.asm new file mode 100644 index 00000000..a175ad17 --- /dev/null +++ b/audio/sfx/noise_instrument10_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_3_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument11_1.asm b/audio/sfx/noise_instrument11_1.asm new file mode 100644 index 00000000..e2f8729e --- /dev/null +++ b/audio/sfx/noise_instrument11_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_1_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_2.asm b/audio/sfx/noise_instrument11_2.asm new file mode 100644 index 00000000..925c421a --- /dev/null +++ b/audio/sfx/noise_instrument11_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_2_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_3.asm b/audio/sfx/noise_instrument11_3.asm new file mode 100644 index 00000000..72f54e99 --- /dev/null +++ b/audio/sfx/noise_instrument11_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_3_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument12_1.asm b/audio/sfx/noise_instrument12_1.asm new file mode 100644 index 00000000..f1e6379a --- /dev/null +++ b/audio/sfx/noise_instrument12_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_1_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_2.asm b/audio/sfx/noise_instrument12_2.asm new file mode 100644 index 00000000..f9c2e1a9 --- /dev/null +++ b/audio/sfx/noise_instrument12_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_2_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_3.asm b/audio/sfx/noise_instrument12_3.asm new file mode 100644 index 00000000..b5347639 --- /dev/null +++ b/audio/sfx/noise_instrument12_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_3_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument13_1.asm b/audio/sfx/noise_instrument13_1.asm new file mode 100644 index 00000000..50569b26 --- /dev/null +++ b/audio/sfx/noise_instrument13_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_1_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_2.asm b/audio/sfx/noise_instrument13_2.asm new file mode 100644 index 00000000..5a5120f6 --- /dev/null +++ b/audio/sfx/noise_instrument13_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_2_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_3.asm b/audio/sfx/noise_instrument13_3.asm new file mode 100644 index 00000000..848746d7 --- /dev/null +++ b/audio/sfx/noise_instrument13_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_3_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument14_1.asm b/audio/sfx/noise_instrument14_1.asm new file mode 100644 index 00000000..9621ef42 --- /dev/null +++ b/audio/sfx/noise_instrument14_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_1_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_2.asm b/audio/sfx/noise_instrument14_2.asm new file mode 100644 index 00000000..d413fb1f --- /dev/null +++ b/audio/sfx/noise_instrument14_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_2_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_3.asm b/audio/sfx/noise_instrument14_3.asm new file mode 100644 index 00000000..bc115181 --- /dev/null +++ b/audio/sfx/noise_instrument14_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_3_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument15_1.asm b/audio/sfx/noise_instrument15_1.asm new file mode 100644 index 00000000..308746c0 --- /dev/null +++ b/audio/sfx/noise_instrument15_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_1_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_2.asm b/audio/sfx/noise_instrument15_2.asm new file mode 100644 index 00000000..c1f63942 --- /dev/null +++ b/audio/sfx/noise_instrument15_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_2_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_3.asm b/audio/sfx/noise_instrument15_3.asm new file mode 100644 index 00000000..f77872ae --- /dev/null +++ b/audio/sfx/noise_instrument15_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_3_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument16_1.asm b/audio/sfx/noise_instrument16_1.asm new file mode 100644 index 00000000..ac830985 --- /dev/null +++ b/audio/sfx/noise_instrument16_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_1_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_2.asm b/audio/sfx/noise_instrument16_2.asm new file mode 100644 index 00000000..e61531bf --- /dev/null +++ b/audio/sfx/noise_instrument16_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_2_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_3.asm b/audio/sfx/noise_instrument16_3.asm new file mode 100644 index 00000000..99dbca77 --- /dev/null +++ b/audio/sfx/noise_instrument16_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_3_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument17_1.asm b/audio/sfx/noise_instrument17_1.asm new file mode 100644 index 00000000..41565402 --- /dev/null +++ b/audio/sfx/noise_instrument17_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_1_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_2.asm b/audio/sfx/noise_instrument17_2.asm new file mode 100644 index 00000000..f89ec777 --- /dev/null +++ b/audio/sfx/noise_instrument17_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_2_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_3.asm b/audio/sfx/noise_instrument17_3.asm new file mode 100644 index 00000000..9330fbc0 --- /dev/null +++ b/audio/sfx/noise_instrument17_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_3_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_1.asm b/audio/sfx/noise_instrument18_1.asm new file mode 100644 index 00000000..e77e331d --- /dev/null +++ b/audio/sfx/noise_instrument18_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_1_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_2.asm b/audio/sfx/noise_instrument18_2.asm new file mode 100644 index 00000000..e937f9f6 --- /dev/null +++ b/audio/sfx/noise_instrument18_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_2_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_3.asm b/audio/sfx/noise_instrument18_3.asm new file mode 100644 index 00000000..59a5d069 --- /dev/null +++ b/audio/sfx/noise_instrument18_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_3_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_1.asm b/audio/sfx/noise_instrument19_1.asm new file mode 100644 index 00000000..2fa183d6 --- /dev/null +++ b/audio/sfx/noise_instrument19_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_1_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_2.asm b/audio/sfx/noise_instrument19_2.asm new file mode 100644 index 00000000..49d09fcc --- /dev/null +++ b/audio/sfx/noise_instrument19_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_2_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_3.asm b/audio/sfx/noise_instrument19_3.asm new file mode 100644 index 00000000..a90b3e4b --- /dev/null +++ b/audio/sfx/noise_instrument19_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_3_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 2220bf03..c8dfe725 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ -SFX_Not_Very_Effective_Ch7: - noisenote 4, 8, -7, 85 - noisenote 2, 15, 4, 68 - noisenote 8, 15, 4, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Not_Very_Effective_Ch8: + noise_note 4, 8, -7, 85 + noise_note 2, 15, 4, 68 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c52ce4d0..d478dff6 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch7: - noisenote 2, 10, 1, 18 - endchannel +SFX_Peck_Ch8: + noise_note 2, 10, 1, 18 + sound_ret diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index f26a50bf..6827147c 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch4: - dutycycle 0 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - loopchannel 4, SFX_Poisoned_1_Ch4 - squarenote 15, 15, 3, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Poisoned_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_1_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 99e05154..0df1138f 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,9 +1,9 @@ -SFX_Pokedex_Rating_1_Ch4: - executemusic +SFX_Pokedex_Rating_1_Ch5: + execute_music tempo 256 - volume 119 - dutycycle 2 - notetype 5, (11<<4) + 1 + volume 7, 7 + duty_cycle 2 + note_type 5, 11, 1 octave 3 note A_, 2 note A_, 2 @@ -18,20 +18,20 @@ SFX_Pokedex_Rating_1_Ch4: note E_, 4 octave 3 note F_, 4 - endchannel + sound_ret -SFX_Pokedex_Rating_1_Ch5: - executemusic - dutycycle 2 - notetype 5, (12<<4) + 2 +SFX_Pokedex_Rating_1_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 note F_, 2 note E_, 1 - note __, 1 + rest 1 note D_, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 2 octave 5 @@ -41,37 +41,37 @@ SFX_Pokedex_Rating_1_Ch5: note F_, 4 note G_, 4 note F_, 4 - endchannel + sound_ret -SFX_Pokedex_Rating_1_Ch6: - executemusic - notetype 5, (1<<4) + 0 +SFX_Pokedex_Rating_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note F_, 2 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note F_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 + rest 3 octave 4 note F_, 2 - note __, 2 - endchannel + rest 2 + sound_ret diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 00e4f1fc..cae6f105 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,7 +1,7 @@ -SFX_Pokeflute_Ch6: - togglesfx - vibrato 16, (1<<4) + 4 - notetype 12, (1<<4) + 0 +SFX_Pokeflute_Ch7: + toggle_sfx + vibrato 16, 1, 4 + note_type 12, 1, 0 octave 5 note E_, 2 note F_, 2 @@ -18,5 +18,5 @@ SFX_Pokeflute_Ch6: note A_, 2 note F_, 2 note G_, 8 - note __, 12 - endchannel + rest 12 + sound_ret diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm deleted file mode 100644 index 22c23f68..00000000 --- a/audio/sfx/pokeflute_ch4_ch5.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_08_PokeFlute_Ch4: - tempo 256 - - -SFX_08_PokeFlute_Ch5: - executemusic - notetype 8, (0<<4) + 0 - note __, 5 - note __, 7 - note __, 5 - note __, 5 - note __, 5 - note __, 5 - endchannel diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm new file mode 100644 index 00000000..4f0e96a8 --- /dev/null +++ b/audio/sfx/pokeflute_ch5_ch6.asm @@ -0,0 +1,14 @@ +SFX_Pokeflute_Ch5: + tempo 256 + + +SFX_Pokeflute_Ch6: + execute_music + note_type 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + sound_ret diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm deleted file mode 100644 index 4f69cf80..00000000 --- a/audio/sfx/pokeflute_ch6.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_PokeFlute_Ch6: - executemusic - vibrato 16, (1<<4) + 4 - notetype 8, (1<<4) + 0 - octave 5 - note E_, 3 - note F_, 3 - note G_, 7 - note A_, 3 - note G_, 3 - octave 6 - note C_, 13 - endchannel diff --git a/audio/sfx/pokeflute_ch7.asm b/audio/sfx/pokeflute_ch7.asm new file mode 100644 index 00000000..4435c0fb --- /dev/null +++ b/audio/sfx/pokeflute_ch7.asm @@ -0,0 +1,13 @@ +SFX_Pokeflute_Ch7: + execute_music + vibrato 16, 1, 4 + note_type 8, 1, 0 + octave 5 + note E_, 3 + note F_, 3 + note G_, 7 + note A_, 3 + note G_, 3 + octave 6 + note C_, 13 + sound_ret diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 3aee5836..d1891751 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch7: - noisenote 2, 10, 1, 34 - endchannel +SFX_Pound_Ch8: + noise_note 2, 10, 1, 34 + sound_ret diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index fc7208da..7767547c 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_1_Ch4: - dutycycle 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_1_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 71c7119b..2b94cf6d 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch4: - dutycycle 161 - squarenote 10, 15, 1, 1600 - squarenote 10, 15, 3, 1664 - squarenote 10, 15, 2, 1568 - loopchannel 4, SFX_Psybeam_Ch4 - squarenote 10, 15, 1, 1600 - endchannel - - SFX_Psybeam_Ch5: - dutycycle 179 - squarenote 10, 15, 3, 1393 - squarenote 7, 14, 3, 1329 - squarenote 10, 15, 1, 1361 - loopchannel 4, SFX_Psybeam_Ch5 - squarenote 10, 15, 1, 1393 - endchannel + duty_cycle_pattern 2, 2, 0, 1 + square_note 10, 15, 1, 1600 + square_note 10, 15, 3, 1664 + square_note 10, 15, 2, 1568 + sound_loop 4, SFX_Psybeam_Ch5 + square_note 10, 15, 1, 1600 + sound_ret -SFX_Psybeam_Ch7: - noisenote 2, 13, 1, 74 - noisenote 2, 13, 2, 42 - loopchannel 21, SFX_Psybeam_Ch7 - endchannel +SFX_Psybeam_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 10, 15, 3, 1393 + square_note 7, 14, 3, 1329 + square_note 10, 15, 1, 1361 + sound_loop 4, 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 + sound_loop 21, SFX_Psybeam_Ch8 + sound_ret diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 8e489d86..ff0ab384 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ -SFX_Psychic_M_Ch4: - dutycycle 2 - pitchenvelope 15, 7 - squarenote 8, 12, 4, 1981 - squarenote 8, 12, 4, 1982 - squarenote 8, 12, 4, 1983 - squarenote 8, 12, 4, 1984 - squarenote 15, 12, 4, 1985 - squarenote 15, 15, 2, 1984 - pitchenvelope 0, 0 - endchannel - - SFX_Psychic_M_Ch5: - dutycycle 2 - squarenote 8, 12, 4, 1904 - squarenote 8, 12, 4, 1889 - squarenote 8, 12, 4, 1890 - squarenote 8, 12, 4, 1891 - squarenote 15, 12, 4, 1892 - squarenote 15, 15, 2, 1892 - endchannel + duty_cycle 2 + pitch_sweep 15, 7 + square_note 8, 12, 4, 1981 + square_note 8, 12, 4, 1982 + square_note 8, 12, 4, 1983 + square_note 8, 12, 4, 1984 + square_note 15, 12, 4, 1985 + square_note 15, 15, 2, 1984 + pitch_sweep 0, 8 + sound_ret -SFX_Psychic_M_Ch7: - noisenote 15, 3, -7, 20 - noisenote 15, 12, -7, 19 - noisenote 15, 12, -7, 18 - noisenote 15, 12, -7, 17 - noisenote 15, 12, -7, 16 - noisenote 15, 12, 2, 16 - endchannel +SFX_Psychic_M_Ch6: + duty_cycle 2 + square_note 8, 12, 4, 1904 + square_note 8, 12, 4, 1889 + square_note 8, 12, 4, 1890 + square_note 8, 12, 4, 1891 + square_note 15, 12, 4, 1892 + square_note 15, 15, 2, 1892 + sound_ret + + +SFX_Psychic_M_Ch8: + noise_note 15, 3, -7, 20 + noise_note 15, 12, -7, 19 + noise_note 15, 12, -7, 18 + noise_note 15, 12, -7, 17 + noise_note 15, 12, -7, 16 + noise_note 15, 12, 2, 16 + sound_ret diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 63a37a38..9dc06f0b 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ -SFX_Purchase_1_Ch4: - dutycycle 2 - squarenote 4, 14, 1, 1792 - squarenote 8, 15, 2, 2016 - endchannel - - SFX_Purchase_1_Ch5: - dutycycle 2 - squarenote 1, 0, 8, 0 - squarenote 4, 9, 1, 1729 - squarenote 8, 10, 2, 1953 - endchannel + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret + + +SFX_Purchase_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index bf7bf116..c2155ca9 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_1_Ch7: - noisenote 4, 10, 2, 35 - noisenote 8, 15, 1, 52 - noisenote 15, 0, 0, 0 - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Push_Boulder_1_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index b59ceefa..b4ed791b 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ -SFX_Run_Ch7: - noisenote 2, 6, 1, 35 - noisenote 2, 10, 1, 51 - noisenote 2, 12, 1, 51 - noisenote 2, 5, 1, 17 - noisenote 2, 15, 1, 51 - noisenote 2, 4, 1, 17 - noisenote 2, 12, 1, 51 - noisenote 2, 3, 1, 17 - noisenote 2, 8, 1, 51 - noisenote 2, 3, 1, 17 - noisenote 8, 4, 1, 51 - endchannel +SFX_Run_Ch8: + noise_note 2, 6, 1, 35 + noise_note 2, 10, 1, 51 + noise_note 2, 12, 1, 51 + noise_note 2, 5, 1, 17 + noise_note 2, 15, 1, 51 + noise_note 2, 4, 1, 17 + noise_note 2, 12, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 2, 8, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 8, 4, 1, 51 + sound_ret diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index b73a62c9..6ce7b7c3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ -SFX_Safari_Zone_PA_Ch4: - dutycycle 2 - squarenote 15, 15, 3, 1840 - squarenote 8, 6, 5, 1840 - squarenote 15, 15, 4, 1792 - squarenote 15, 7, 4, 1792 - squarenote 15, 4, 4, 1792 - squarenote 15, 2, 4, 1792 - endchannel +SFX_Safari_Zone_PA_Ch5: + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 9622145f..d0849ff5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ -SFX_Save_1_Ch4: - dutycycle 2 - squarenote 4, 15, 4, 1792 - squarenote 2, 14, 4, 1536 - squarenote 2, 14, 4, 1664 - squarenote 2, 14, 4, 1728 - squarenote 2, 14, 4, 1792 - squarenote 2, 14, 4, 1952 - squarenote 15, 15, 2, 2016 - endchannel - - SFX_Save_1_Ch5: - dutycycle 2 - squarenote 4, 0, 8, 0 - squarenote 2, 13, 4, 1793 - squarenote 2, 12, 4, 1537 - squarenote 2, 12, 4, 1665 - squarenote 2, 12, 4, 1729 - squarenote 2, 12, 4, 1793 - squarenote 2, 12, 4, 1953 - squarenote 15, 13, 2, 2017 - endchannel + duty_cycle 2 + square_note 4, 15, 4, 1792 + square_note 2, 14, 4, 1536 + square_note 2, 14, 4, 1664 + square_note 2, 14, 4, 1728 + square_note 2, 14, 4, 1792 + square_note 2, 14, 4, 1952 + square_note 15, 15, 2, 2016 + sound_ret + + +SFX_Save_1_Ch6: + duty_cycle 2 + square_note 4, 0, 8, 0 + square_note 2, 13, 4, 1793 + square_note 2, 12, 4, 1537 + square_note 2, 12, 4, 1665 + square_note 2, 12, 4, 1729 + square_note 2, 12, 4, 1793 + square_note 2, 12, 4, 1953 + square_note 15, 13, 2, 2017 + sound_ret diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index fbd158fd..cbef7398 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ -SFX_Shooting_Star_Ch4: - dutycycle 228 - pitchenvelope 2, -7 - squarenote 4, 4, 0, 2016 - squarenote 4, 6, 0, 2016 - squarenote 4, 8, 0, 2016 - squarenote 8, 10, 0, 2016 - squarenote 8, 10, 0, 2016 - squarenote 8, 8, 0, 2016 - squarenote 8, 6, 0, 2016 - squarenote 8, 3, 0, 2016 - squarenote 15, 1, 2, 2016 - pitchenvelope 0, 0 - endchannel +SFX_Shooting_Star_Ch5: + duty_cycle_pattern 3, 2, 1, 0 + pitch_sweep 2, -7 + square_note 4, 4, 0, 2016 + square_note 4, 6, 0, 2016 + square_note 4, 8, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 8, 0, 2016 + square_note 8, 6, 0, 2016 + square_note 8, 3, 0, 2016 + square_note 15, 1, 2, 2016 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index b6489092..912dd3f9 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ -SFX_Shrink_1_Ch4: - dutycycle 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1536 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1280 - squarenote 15, 4, 7, 1152 - squarenote 15, 1, 7, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Shrink_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index 57fdc1e9..4a565740 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ -SFX_Silph_Scope_Ch4: - dutycycle 0 - squarenote 0, 13, 2, 1792 - squarenote 0, 13, 2, 1856 - squarenote 0, 13, 2, 1920 - squarenote 0, 13, 2, 1984 - squarenote 10, 14, 1, 2016 - squarenote 1, 0, 0, 0 - endchannel +SFX_Silph_Scope_Ch5: + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index c960f1d9..a8b668b8 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ -SFX_Slots_New_Spin_Ch4: - dutycycle 3 - squarenote 5, 14, 1, 1792 - squarenote 2, 14, 1, 1920 - squarenote 15, 15, 1, 1984 - endchannel - - SFX_Slots_New_Spin_Ch5: - dutycycle 2 - squarenote 4, 12, 1, 1729 - squarenote 2, 12, 1, 1857 - squarenote 15, 13, 1, 1921 - endchannel + duty_cycle 3 + square_note 5, 14, 1, 1792 + square_note 2, 14, 1, 1920 + square_note 15, 15, 1, 1984 + sound_ret + + +SFX_Slots_New_Spin_Ch6: + duty_cycle 2 + square_note 4, 12, 1, 1729 + square_note 2, 12, 1, 1857 + square_note 15, 13, 1, 1921 + sound_ret diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 3813cb83..8f2d1829 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ -SFX_Slots_Reward_Ch4: - dutycycle 2 - squarenote 2, 15, 1, 1792 - squarenote 8, 8, 1, 2016 - endchannel +SFX_Slots_Reward_Ch5: + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 8, 8, 1, 2016 + sound_ret diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 953e48e7..b9a69c19 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ -SFX_Slots_Stop_Wheel_Ch4: - dutycycle 2 - squarenote 1, 15, 2, 1696 - squarenote 1, 15, 2, 1760 - squarenote 8, 15, 1, 1792 - endchannel +SFX_Slots_Stop_Wheel_Ch5: + duty_cycle 2 + square_note 1, 15, 2, 1696 + square_note 1, 15, 2, 1760 + square_note 8, 15, 1, 1792 + sound_ret diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index ef3e3416..7f5094f4 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_1_Ch4: - dutycycle 2 - squarenote 15, 15, 0, 1280 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 2, 1280 - endchannel - - SFX_SS_Anne_Horn_1_Ch5: - dutycycle 3 - squarenote 15, 15, 0, 1154 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 2, 1154 - endchannel + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret + + +SFX_SS_Anne_Horn_1_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 84c28d8a..c82e97e1 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_1_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index ebc1e0b7..c6e25dc9 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch7: - noisenote 4, 15, 1, 52 - noisenote 15, 15, 2, 100 - endchannel +SFX_Super_Effective_Ch8: + noise_note 4, 15, 1, 52 + noise_note 15, 15, 2, 100 + sound_ret diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 3283db92..98bfff72 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ -SFX_Swap_1_Ch4: - dutycycle 2 - squarenote 8, 14, 1, 1856 - endchannel - - SFX_Swap_1_Ch5: - dutycycle 2 - squarenote 2, 0, 8, 0 - squarenote 8, 11, 1, 1857 - endchannel + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret + + +SFX_Swap_1_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index 7a55b1e0..145fd35a 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ -SFX_Switch_1_Ch4: - dutycycle 2 - squarenote 4, 0, 0, 0 - squarenote 2, 15, 1, 1664 - squarenote 1, 0, 0, 0 - squarenote 4, 15, 1, 1920 - squarenote 4, 0, 0, 0 - endchannel +SFX_Switch_1_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 88dbed49..eddaffa6 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_1_Ch4: - dutycycle 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1792 - squarenote 15, 11, 7, 1664 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1408 - squarenote 15, 1, 7, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Enter1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index b0d61646..c7901999 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_1_Ch7: - noisenote 2, 15, 1, 50 - noisenote 2, 0, 0, 0 - noisenote 2, 15, 1, 34 - noisenote 1, 0, 0, 0 - endchannel +SFX_Teleport_Enter2_1_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index df564451..5e27525e 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_1_Ch4: - dutycycle 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1280 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1664 - squarenote 15, 1, 7, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 094a359c..a2a36942 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_1_Ch4: - dutycycle 1 - pitchenvelope 1, 6 - squarenote 15, 13, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit2_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 1c652507..7d56a081 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ -SFX_Tink_1_Ch4: - dutycycle 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_1_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 76b66ae8..f09982eb 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_1_Ch4: - dutycycle 2 - pitchenvelope 1, 5 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Trade_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 3439efd1..429727b9 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_1_Ch4: - dutycycle 2 - squarenote 4, 15, 0, 1536 - squarenote 4, 15, 0, 1024 - squarenote 4, 15, 0, 512 - squarenote 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_1_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 59e5e08e..98c724b5 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ -SFX_Turn_On_PC_1_Ch4: - dutycycle 2 - squarenote 15, 15, 2, 1984 - squarenote 15, 0, 0, 0 - squarenote 3, 10, 1, 1920 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1856 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1920 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1984 - squarenote 8, 10, 1, 1792 - endchannel +SFX_Turn_On_PC_1_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1856 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1984 + square_note 8, 10, 1, 1792 + sound_ret diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm deleted file mode 100644 index 5b801321..00000000 --- a/audio/sfx/unused2_2.asm +++ /dev/null @@ -1,56 +0,0 @@ -SFX_08_unused2_Ch4: - executemusic - tempo 256 - volume 119 - vibrato 6, (2<<4) + 6 - dutycycle 2 - toggleperfectpitch - notetype 6, (11<<4) + 1 - octave 3 - note G#, 2 - note G#, 2 - notetype 6, (11<<4) + 3 - note G#, 2 - note B_, 2 - octave 4 - note E_, 8 - endchannel - - -SFX_08_unused2_Ch5: - executemusic - vibrato 8, (2<<4) + 7 - dutycycle 2 - notetype 6, (12<<4) + 1 - octave 4 - note E_, 2 - note E_, 1 - note E_, 1 - notetype 6, (12<<4) + 3 - note E_, 2 - note G#, 2 - note B_, 8 - endchannel - - -SFX_08_unused2_Ch6: - executemusic - notetype 6, (1<<4) + 0 - octave 4 - note B_, 1 - note __, 1 - notetype 3, (1<<4) + 0 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - notetype 6, (1<<4) + 0 - note B_, 1 - note __, 1 - octave 5 - note E_, 1 - note __, 1 - octave 4 - note B_, 4 - note __, 4 - endchannel diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index e805a333..b7a8b4a0 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ -SFX_Unused_1_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel - - SFX_Unused_1_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_1_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_1_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret + + +SFX_Unused_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_fanfare.asm b/audio/sfx/unused_fanfare.asm new file mode 100644 index 00000000..d41bb080 --- /dev/null +++ b/audio/sfx/unused_fanfare.asm @@ -0,0 +1,55 @@ +; This corresponds to SFX_KEY_ITEM in pokegold and pokecrystal. +SFX_UnusedFanfare_Ch5: ; unreferenced + execute_music + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note_type 6, 11, 3 + note G#, 2 + note B_, 2 + octave 4 + note E_, 8 + sound_ret + +SFX_UnusedFanfare_Ch6: ; unreferenced + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 6, 12, 1 + octave 4 + note E_, 2 + note E_, 1 + note E_, 1 + note_type 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + sound_ret + +SFX_UnusedFanfare_Ch7: ; unreferenced + execute_music + note_type 6, 1, 0 + octave 4 + note B_, 1 + rest 1 + note_type 3, 1, 0 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note_type 6, 1, 0 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note B_, 4 + rest 4 + sound_ret diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index 7699d841..c53a7d0a 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ -SFX_Vine_Whip_Ch7: - noisenote 1, 12, 2, 51 - noisenote 2, 15, 2, 33 - noisenote 1, 14, 2, 51 - noisenote 1, 12, 2, 50 - noisenote 1, 9, 2, 18 - noisenote 1, 11, 2, 49 - noisenote 12, 9, 1, 16 - noisenote 8, 15, 2, 65 - endchannel +SFX_Vine_Whip_Ch8: + noise_note 1, 12, 2, 51 + noise_note 2, 15, 2, 33 + noise_note 1, 14, 2, 51 + noise_note 1, 12, 2, 50 + noise_note 1, 9, 2, 18 + noise_note 1, 11, 2, 49 + noise_note 12, 9, 1, 16 + noise_note 8, 15, 2, 65 + sound_ret diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index a1c3482a..c7ab2447 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_1_Ch4: - dutycycle 1 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 4, 14, 2, 1280 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1792 - pitchenvelope 2, 2 - squarenote 15, 14, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Withdraw_Deposit_1_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm index fede06af..4a830f4b 100644 --- a/audio/wave_instruments.asm +++ b/audio/wave_instruments.asm @@ -1,3 +1,5 @@ +; This file is INCLUDEd three times, once for each audio engine. + dw .wave0 dw .wave1 dw .wave2 @@ -11,7 +13,7 @@ ; these are the definitions for the channel 3 instruments ; each instrument definition is made up of 32 points (nibbles) that form ; the graph of the wave -; the current instrument is copied to $FF30 +; the current instrument is copied to rWave_0--rWave_f .wave0 db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 diff --git a/charmap.asm b/charmap.asm index 4b5278c6..f0967978 100644 --- a/charmap.asm +++ b/charmap.asm @@ -1,265 +1,386 @@ -charmap "ガ", $05 -charmap "ギ", $06 -charmap "グ", $07 -charmap "ゲ", $08 -charmap "ゴ", $09 -charmap "ザ", $0A -charmap "ジ", $0B -charmap "ズ", $0C -charmap "ゼ", $0D -charmap "ゾ", $0E -charmap "ダ", $0F -charmap "ヂ", $10 -charmap "ヅ", $11 -charmap "デ", $12 -charmap "ド", $13 -charmap "バ", $19 -charmap "ビ", $1A -charmap "ブ", $1B -charmap "ボ", $1C -charmap "が", $26 -charmap "ぎ", $27 -charmap "ぐ", $28 -charmap "げ", $29 -charmap "ご", $2A -charmap "ざ", $2B -charmap "じ", $2C -charmap "ず", $2D -charmap "ぜ", $2E -charmap "ぞ", $2F -charmap "だ", $30 -charmap "ぢ", $31 -charmap "づ", $32 -charmap "で", $33 -charmap "ど", $34 -charmap "ば", $3A -charmap "び", $3B -charmap "ぶ", $3C -charmap "べ", $3D -charmap "ぼ", $3E -charmap "パ", $40 -charmap "ピ", $41 -charmap "プ", $42 -charmap "ポ", $43 -charmap "ぱ", $44 -charmap "ぴ", $45 -charmap "ぷ", $46 -charmap "ぺ", $47 -charmap "ぽ", $48 -charmap "ア", $80 -charmap "イ", $81 -charmap "ウ", $82 -charmap "エ", $83 -charmap "ォ", $84 -charmap "カ", $85 -charmap "キ", $86 -charmap "ク", $87 -charmap "ケ", $88 -charmap "コ", $89 -charmap "サ", $8A -charmap "シ", $8B -charmap "ス", $8C -charmap "セ", $8D -charmap "ソ", $8E -charmap "タ", $8F -charmap "チ", $90 -charmap "ツ", $91 -charmap "テ", $92 -charmap "ト", $93 -charmap "ナ", $94 -charmap "ニ", $95 -charmap "ヌ", $96 -charmap "ネ", $97 -charmap "ノ", $98 -charmap "ハ", $99 -charmap "ヒ", $9A -charmap "フ", $9B -charmap "ホ", $9C -charmap "マ", $9D -charmap "ミ", $9E -charmap "ム", $9F -charmap "メ", $A0 -charmap "モ", $A1 -charmap "ヤ", $A2 -charmap "ユ", $A3 -charmap "ヨ", $A4 -charmap "ラ", $A5 -charmap "ル", $A6 -charmap "レ", $A7 -charmap "ロ", $A8 -charmap "ワ", $A9 -charmap "ヲ", $AA -charmap "ン", $AB -charmap "ッ", $AC -charmap "ャ", $AD -charmap "ュ", $AE -charmap "ョ", $AF -charmap "ィ", $B0 -charmap "あ", $B1 -charmap "い", $B2 -charmap "う", $B3 -charmap "え", $B4 -charmap "お", $B5 -charmap "か", $B6 -charmap "き", $B7 -charmap "く", $B8 -charmap "け", $B9 -charmap "こ", $BA -charmap "さ", $BB -charmap "し", $BC -charmap "す", $BD -charmap "せ", $BE -charmap "そ", $BF -charmap "た", $C0 -charmap "ち", $C1 -charmap "つ", $C2 -charmap "て", $C3 -charmap "と", $C4 -charmap "な", $C5 -charmap "に", $C6 -charmap "ぬ", $C7 -charmap "ね", $C8 -charmap "の", $C9 -charmap "は", $CA -charmap "ひ", $CB -charmap "ふ", $CC -charmap "へ", $CD -charmap "ほ", $CE -charmap "ま", $CF -charmap "み", $D0 -charmap "む", $D1 -charmap "め", $D2 -charmap "も", $D3 -charmap "や", $D4 -charmap "ゆ", $D5 -charmap "よ", $D6 -charmap "ら", $D7 -charmap "り", $D8 -charmap "る", $D9 -charmap "れ", $DA -charmap "ろ", $DB -charmap "わ", $DC -charmap "を", $DD -charmap "ん", $DE -charmap "っ", $DF -charmap "ゃ", $E0 -charmap "ゅ", $E1 -charmap "ょ", $E2 -charmap "ー", $E3 +; $00-$17 are TX_* constants (see macros/scripts/text.asm) -charmap "", $4A ; PkMn -charmap "@", $50 -charmap "", $52 -charmap "", $53 -charmap "#", $54 -;charmap "POKé", $54 -charmap "", $59 -charmap "", $5A -charmap "′", $71 -charmap "″", $73 -charmap "№", $74 -charmap "…", $75 +; Control characters (see home/text.asm) -charmap "┌", $79 -charmap "─", $7A -charmap "┐", $7B -charmap "│", $7C -charmap "└", $7D -charmap "┘", $7E + charmap "", $00 + charmap "", $49 + charmap "", $4a ; "" + charmap "<_CONT>", $4b ; implements "" + charmap "", $4c + charmap "", $4e + charmap "", $4f + charmap "@", $50 ; string terminator + charmap "", $51 + charmap "", $52 ; wPlayerName + charmap "", $53 ; wRivalName + charmap "#", $54 ; "POKé" + charmap "", $55 + charmap "<……>", $56 ; "……" + charmap "", $57 + charmap "", $58 + charmap "", $59 + charmap "", $5a + charmap "", $5b ; "PC" + charmap "", $5c ; "TM" + charmap "", $5d ; "TRAINER" + charmap "", $5e ; "ROCKET" + charmap "", $5f -charmap " ", $7F -charmap "A", $80 -charmap "B", $81 -charmap "C", $82 -charmap "D", $83 -charmap "E", $84 -charmap "F", $85 -charmap "G", $86 -charmap "H", $87 -charmap "I", $88 -charmap "J", $89 -charmap "K", $8A -charmap "L", $8B -charmap "M", $8C -charmap "N", $8D -charmap "O", $8E -charmap "P", $8F -charmap "Q", $90 -charmap "R", $91 -charmap "S", $92 -charmap "T", $93 -charmap "U", $94 -charmap "V", $95 -charmap "W", $96 -charmap "X", $97 -charmap "Y", $98 -charmap "Z", $99 -charmap "(", $9A -charmap ")", $9B -charmap ":", $9C -charmap ";", $9D -charmap "[", $9E -charmap "]", $9F -charmap "a", $A0 -charmap "b", $A1 -charmap "c", $A2 -charmap "d", $A3 -charmap "e", $A4 -charmap "f", $A5 -charmap "g", $A6 -charmap "h", $A7 -charmap "i", $A8 -charmap "j", $A9 -charmap "k", $AA -charmap "l", $AB -charmap "m", $AC -charmap "n", $AD -charmap "o", $AE -charmap "p", $AF -charmap "q", $B0 -charmap "r", $B1 -charmap "s", $B2 -charmap "t", $B3 -charmap "u", $B4 -charmap "v", $B5 -charmap "w", $B6 -charmap "x", $B7 -charmap "y", $B8 -charmap "z", $B9 -charmap "é", $BA -charmap "'d", $BB -charmap "'l", $BC -charmap "'s", $BD -charmap "'t", $BE -charmap "'v", $BF +; Actual characters (from gfx/font/font_extra.png) -charmap "'", $E0 + charmap "", $60 ; unused + charmap "", $61 ; unused + charmap "", $62 ; unused + charmap "", $63 ; unused + charmap "", $64 ; unused + charmap "", $65 ; unused + charmap "", $66 ; unused + charmap "", $67 ; unused + charmap "", $68 ; unused + charmap "", $69 + charmap "", $6a + charmap "", $6b ; unused + charmap "", $6c ; unused + charmap "", $6d ; colon with tinier dots than ":" + charmap "ぃ", $6e ; hiragana small i, unused + charmap "ぅ", $6f ; hiragana small u, unused + charmap "‘", $70 ; opening single quote + charmap "’", $71 ; closing single quote + charmap "“", $72 ; opening quote + charmap "”", $73 ; closing quote + charmap "·", $74 ; middle dot, unused + charmap "…", $75 ; ellipsis + charmap "ぁ", $76 ; hiragana small a, unused + charmap "ぇ", $77 ; hiragana small e, unused + charmap "ぉ", $78 ; hiragana small o, unused -charmap "-", $E3 -charmap "'r", $E4 -charmap "'m", $E5 -charmap "?", $E6 -charmap "!", $E7 -charmap ".", $E8 + charmap "┌", $79 + charmap "─", $7a + charmap "┐", $7b + charmap "│", $7c + charmap "└", $7d + charmap "┘", $7e + charmap " ", $7f -charmap "▷", $EC -charmap "▶", $ED -charmap "▲", $ED -charmap "▼", $EE -charmap "♂", $EF -charmap "¥", $F0 -charmap "×", $F1 -charmap "⠄", $F2 -charmap "/", $F3 -charmap ",", $F4 -charmap "♀", $F5 -charmap "0", $F6 -charmap "1", $F7 -charmap "2", $F8 -charmap "3", $F9 -charmap "4", $FA -charmap "5", $FB -charmap "6", $FC -charmap "7", $FD -charmap "8", $FE -charmap "9", $FF +; Actual characters (from gfx/font/font_battle_extra.png) + + charmap "", $6e + + charmap "", $70 ; narrow "to" + + charmap "『", $72 ; Japanese opening quote, unused + charmap "", $73 + charmap "№", $74 + +; Actual characters (from other graphics files) + + ; needed for ShowPokedexDataInternal (see engine/menus/pokedex.asm) + charmap "′", $60 ; gfx/pokedex/pokedex.png + charmap "″", $61 ; gfx/pokedex/pokedex.png + + ; needed for StatusScreen (see engine/pokemon/status_screen.asm) + charmap "", $72 ; gfx/font/P.1bpp + + ; needed for LoadTownMap_Fly (see engine/items/town_map.asm) + charmap "▲", $ed ; gfx/town_map/up_arrow.1bpp + + ; needed for PrintAlphabet (see engine/menus/naming_screen.asm) + charmap "", $f0 ; gfx/font/ED.1bpp + +; Actual characters (from gfx/font/font.png) + + charmap "A", $80 + charmap "B", $81 + charmap "C", $82 + charmap "D", $83 + charmap "E", $84 + charmap "F", $85 + charmap "G", $86 + charmap "H", $87 + charmap "I", $88 + charmap "J", $89 + charmap "K", $8a + charmap "L", $8b + charmap "M", $8c + charmap "N", $8d + charmap "O", $8e + charmap "P", $8f + charmap "Q", $90 + charmap "R", $91 + charmap "S", $92 + charmap "T", $93 + charmap "U", $94 + charmap "V", $95 + charmap "W", $96 + charmap "X", $97 + charmap "Y", $98 + charmap "Z", $99 + + charmap "(", $9a + charmap ")", $9b + charmap ":", $9c + charmap ";", $9d + charmap "[", $9e + charmap "]", $9f + + charmap "a", $a0 + charmap "b", $a1 + charmap "c", $a2 + charmap "d", $a3 + charmap "e", $a4 + charmap "f", $a5 + charmap "g", $a6 + charmap "h", $a7 + charmap "i", $a8 + charmap "j", $a9 + charmap "k", $aa + charmap "l", $ab + charmap "m", $ac + charmap "n", $ad + charmap "o", $ae + charmap "p", $af + charmap "q", $b0 + charmap "r", $b1 + charmap "s", $b2 + charmap "t", $b3 + charmap "u", $b4 + charmap "v", $b5 + charmap "w", $b6 + charmap "x", $b7 + charmap "y", $b8 + charmap "z", $b9 + + charmap "é", $ba + charmap "'d", $bb + charmap "'l", $bc + charmap "'s", $bd + charmap "'t", $be + charmap "'v", $bf + + charmap "'", $e0 + charmap "", $e1 + charmap "", $e2 + charmap "-", $e3 + + charmap "'r", $e4 + charmap "'m", $e5 + + charmap "?", $e6 + charmap "!", $e7 + charmap ".", $e8 + + charmap "ァ", $e9 ; katakana small a, unused + charmap "ゥ", $ea ; katakana small u, unused + charmap "ェ", $eb ; katakana small e, unused + + charmap "▷", $ec + charmap "▶", $ed + charmap "▼", $ee + charmap "♂", $ef + charmap "¥", $f0 + charmap "×", $f1 + charmap "", $f2 ; decimal point; same as "." in English + charmap "/", $f3 + charmap ",", $f4 + charmap "♀", $f5 + + charmap "0", $f6 + charmap "1", $f7 + charmap "2", $f8 + charmap "3", $f9 + charmap "4", $fa + charmap "5", $fb + charmap "6", $fc + charmap "7", $fd + charmap "8", $fe + charmap "9", $ff + + +; Japanese kana, for those bits of text that were not translated to English + + charmap "ガ", $05 + charmap "ギ", $06 + charmap "グ", $07 + charmap "ゲ", $08 + charmap "ゴ", $09 + charmap "ザ", $0a + charmap "ジ", $0b + charmap "ズ", $0c + charmap "ゼ", $0d + charmap "ゾ", $0e + charmap "ダ", $0f + charmap "ヂ", $10 + charmap "ヅ", $11 + charmap "デ", $12 + charmap "ド", $13 + + charmap "バ", $19 + charmap "ビ", $1a + charmap "ブ", $1b + charmap "ボ", $1c + + charmap "が", $26 + charmap "ぎ", $27 + charmap "ぐ", $28 + charmap "げ", $29 + charmap "ご", $2a + charmap "ざ", $2b + charmap "じ", $2c + charmap "ず", $2d + charmap "ぜ", $2e + charmap "ぞ", $2f + charmap "だ", $30 + charmap "ぢ", $31 + charmap "づ", $32 + charmap "で", $33 + charmap "ど", $34 + + charmap "ば", $3a + charmap "び", $3b + charmap "ぶ", $3c + charmap "べ", $3d + charmap "ぼ", $3e + + charmap "パ", $40 + charmap "ピ", $41 + charmap "プ", $42 + charmap "ポ", $43 + charmap "ぱ", $44 + charmap "ぴ", $45 + charmap "ぷ", $46 + charmap "ぺ", $47 + charmap "ぽ", $48 + + charmap "「", $70 + charmap "」", $71 + charmap "』", $73 + charmap "⋯", $75 + + charmap "　", $7f + + charmap "ア", $80 + charmap "イ", $81 + charmap "ウ", $82 + charmap "エ", $83 + charmap "オ", $84 + charmap "カ", $85 + charmap "キ", $86 + charmap "ク", $87 + charmap "ケ", $88 + charmap "コ", $89 + charmap "サ", $8a + charmap "シ", $8b + charmap "ス", $8c + charmap "セ", $8d + charmap "ソ", $8e + charmap "タ", $8f + charmap "チ", $90 + charmap "ツ", $91 + charmap "テ", $92 + charmap "ト", $93 + charmap "ナ", $94 + charmap "ニ", $95 + charmap "ヌ", $96 + charmap "ネ", $97 + charmap "ノ", $98 + charmap "ハ", $99 + charmap "ヒ", $9a + charmap "フ", $9b + charmap "ホ", $9c + charmap "マ", $9d + charmap "ミ", $9e + charmap "ム", $9f + charmap "メ", $a0 + charmap "モ", $a1 + charmap "ヤ", $a2 + charmap "ユ", $a3 + charmap "ヨ", $a4 + charmap "ラ", $a5 + charmap "ル", $a6 + charmap "レ", $a7 + charmap "ロ", $a8 + charmap "ワ", $a9 + charmap "ヲ", $aa + charmap "ン", $ab + charmap "ッ", $ac + charmap "ャ", $ad + charmap "ュ", $ae + charmap "ョ", $af + charmap "ィ", $b0 + + charmap "あ", $b1 + charmap "い", $b2 + charmap "う", $b3 + charmap "え", $b4 + charmap "お", $b5 + charmap "か", $b6 + charmap "き", $b7 + charmap "く", $b8 + charmap "け", $b9 + charmap "こ", $ba + charmap "さ", $bb + charmap "し", $bc + charmap "す", $bd + charmap "せ", $be + charmap "そ", $bf + charmap "た", $c0 + charmap "ち", $c1 + charmap "つ", $c2 + charmap "て", $c3 + charmap "と", $c4 + charmap "な", $c5 + charmap "に", $c6 + charmap "ぬ", $c7 + charmap "ね", $c8 + charmap "の", $c9 + charmap "は", $ca + charmap "ひ", $cb + charmap "ふ", $cc + charmap "へ", $cd + charmap "ほ", $ce + charmap "ま", $cf + charmap "み", $d0 + charmap "む", $d1 + charmap "め", $d2 + charmap "も", $d3 + charmap "や", $d4 + charmap "ゆ", $d5 + charmap "よ", $d6 + charmap "ら", $d7 + charmap "り", $d8 + charmap "る", $d9 + charmap "れ", $da + charmap "ろ", $db + charmap "わ", $dc + charmap "を", $dd + charmap "ん", $de + charmap "っ", $df + charmap "ゃ", $e0 + charmap "ゅ", $e1 + charmap "ょ", $e2 + + charmap "ー", $e3 + charmap "ﾟ", $e4 + charmap "ﾞ", $e5 + + charmap "？", $e6 + charmap "！", $e7 + charmap "。", $e8 + + charmap "円", $f0 + + charmap "．", $f2 + charmap "／", $f3 + + charmap "ォ", $f4 + + charmap "０", $f6 + charmap "１", $f7 + charmap "２", $f8 + charmap "３", $f9 + charmap "４", $fa + charmap "５", $fb + charmap "６", $fc + charmap "７", $fd + charmap "８", $fe + charmap "９", $ff diff --git a/constants.asm b/constants.asm index c8e5a78d..36a7acf5 100644 --- a/constants.asm +++ b/constants.asm @@ -1,32 +1,37 @@ -INCLUDE "macros.asm" INCLUDE "charmap.asm" -INCLUDE "hram.asm" -INCLUDE "vram.asm" +INCLUDE "macros.asm" INCLUDE "constants/hardware_constants.asm" INCLUDE "constants/oam_constants.asm" INCLUDE "constants/misc_constants.asm" - +INCLUDE "constants/gfx_constants.asm" +INCLUDE "constants/input_constants.asm" +INCLUDE "constants/serial_constants.asm" +INCLUDE "constants/script_constants.asm" INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokedex_constants.asm" +INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/trainer_constants.asm" -INCLUDE "constants/item_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/move_animation_constants.asm" INCLUDE "constants/move_effect_constants.asm" -INCLUDE "constants/status_constants.asm" +INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/item_constants.asm" +INCLUDE "constants/icon_constants.asm" INCLUDE "constants/sprite_constants.asm" +INCLUDE "constants/sprite_data_constants.asm" INCLUDE "constants/palette_constants.asm" -INCLUDE "constants/evolution_constants.asm" INCLUDE "constants/list_constants.asm" INCLUDE "constants/map_constants.asm" -INCLUDE "constants/connection_constants.asm" +INCLUDE "constants/map_data_constants.asm" +INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/hide_show_constants.asm" INCLUDE "constants/credits_constants.asm" +INCLUDE "constants/audio_constants.asm" INCLUDE "constants/music_constants.asm" -INCLUDE "constants/tilesets.asm" -INCLUDE "constants/starter_mons.asm" +INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/menu_constants.asm" diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm new file mode 100644 index 00000000..ea2732fd --- /dev/null +++ b/constants/audio_constants.asm @@ -0,0 +1,67 @@ +; pitch +; Audio[1|2|3]_Pitches indexes (see audio/notes.asm) +; const_def +; const C_ ; 0 +; const C# ; 1 +; const D_ ; 2 +; const D# ; 3 +; const E_ ; 4 +; const F_ ; 5 +; const F# ; 6 +; const G_ ; 7 +; const G# ; 8 +; const A_ ; 9 +; const A# ; A +; const B_ ; B + +; channel +; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks, +; and Audio[1|2|3]_HWChannelEnableMasks indexes (see audio/engine_[1|2|3].asm) + const_def + const Ch1 ; 0 + const Ch2 ; 1 + const Ch3 ; 2 + const Ch4 ; 3 +;NUM_MUSIC_CHANS EQU const_value + const Ch5 ; 4 + const Ch6 ; 5 + const Ch7 ; 6 + const Ch8 ; 7 +;NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS +;NUM_CHANNELS EQU const_value + +; HW sound channel register base addresses +HW_CH1_BASE EQU LOW(rNR10) +HW_CH2_BASE EQU LOW(rNR21) - 1 +HW_CH3_BASE EQU LOW(rNR30) +HW_CH4_BASE EQU LOW(rNR41) - 1 + +; HW sound channel enable bit masks +HW_CH1_ENABLE_MASK EQU %00010001 +HW_CH2_ENABLE_MASK EQU %00100010 +HW_CH3_ENABLE_MASK EQU %01000100 +HW_CH4_ENABLE_MASK EQU %10001000 + +; HW sound channel disable bit masks +HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff) +HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff) +HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff) +HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff) + + const_def 1 + const REG_DUTY_SOUND_LEN ; 1 + const REG_VOLUME_ENVELOPE ; 2 + const REG_FREQUENCY_LO ; 3 + +; wChannelFlags1 constants + const_def + const BIT_PERFECT_PITCH ; 0 ; controlled by toggle_perfect_pitch command + const BIT_SOUND_CALL ; 1 ; if in sound call + const BIT_NOISE_OR_SFX ; 2 ; if channel is the music noise channel or an SFX channel + const BIT_VIBRATO_DIRECTION ; 3 ; if the pitch is above or below normal (cycles) + const BIT_PITCH_SLIDE_ON ; 4 ; if pitch slide is active + const BIT_PITCH_SLIDE_DECREASING ; 5 ; if the pitch slide frequency is decreasing (instead of increasing) + const BIT_ROTATE_DUTY_CYCLE ; 6 ; if rotating duty cycle + +; wChannelFlags2 constant (only has one flag) +BIT_EXECUTE_MUSIC EQU 0 ; if in execute music diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm new file mode 100644 index 00000000..99d371b2 --- /dev/null +++ b/constants/battle_constants.asm @@ -0,0 +1,73 @@ +MAX_LEVEL EQU 100 + +NUM_MOVES EQU 4 +NUM_STATS EQU 5 +NUM_STAT_MODS EQU 8 +NUM_DVS EQU 2 + +; D733 flags +BIT_TEST_BATTLE EQU 0 + +; battle type constants (wBattleType values) + const_def + const BATTLE_TYPE_NORMAL ; 0 + const BATTLE_TYPE_OLD_MAN ; 1 + const BATTLE_TYPE_SAFARI ; 2 + +; damage limits before type effectiveness +MIN_NEUTRAL_DAMAGE EQU 2 +MAX_NEUTRAL_DAMAGE EQU 999 + +; fixed damage constants +SONICBOOM_DAMAGE EQU 20 +DRAGON_RAGE_DAMAGE EQU 40 + +; type effectiveness factors, scaled by 10 +SUPER_EFFECTIVE EQU 20 +MORE_EFFECTIVE EQU 15 +EFFECTIVE EQU 10 +NOT_VERY_EFFECTIVE EQU 05 +NO_EFFECT EQU 00 + +; non-volatile statuses +SLP EQU %111 ; sleep counter + const_def 3 + const PSN ; 3 + const BRN ; 4 + const FRZ ; 5 + const PAR ; 6 + +MAX_STAT_VALUE EQU 999 + +; trainer dvs +ATKDEFDV_TRAINER EQU $98 +SPDSPCDV_TRAINER EQU $88 + +; wPlayerBattleStatus1 or wEnemyBattleStatus1 bit flags + const_def + const STORING_ENERGY ; 0 ; Bide + const THRASHING_ABOUT ; 1 ; e.g. Thrash + const ATTACKING_MULTIPLE_TIMES ; 2 ; e.g. Double Kick, Fury Attack + const FLINCHED ; 3 + const CHARGING_UP ; 4 ; e.g. Solar Beam, Fly + const USING_TRAPPING_MOVE ; 5 ; e.g. Wrap + const INVULNERABLE ; 6 ; charging up Fly/Dig + const CONFUSED ; 7 + +; wPlayerBattleStatus2 or wEnemyBattleStatus2 bit flags + const_def + const USING_X_ACCURACY ; 0 + const PROTECTED_BY_MIST ; 1 + const GETTING_PUMPED ; 2 ; Focus Energy + const_skip ; 3 ; unused + const HAS_SUBSTITUTE_UP ; 4 + const NEEDS_TO_RECHARGE ; 5 ; Hyper Beam + const USING_RAGE ; 6 + const SEEDED ; 7 + +; wPlayerBattleStatus3 or wEnemyBattleStatus3 bit flags + const_def + const BADLY_POISONED ; 0 + const HAS_LIGHT_SCREEN_UP ; 1 + const HAS_REFLECT_UP ; 2 + const TRANSFORMED ; 3 diff --git a/constants/connection_constants.asm b/constants/connection_constants.asm deleted file mode 100755 index 154c4163..00000000 --- a/constants/connection_constants.asm +++ /dev/null @@ -1,9 +0,0 @@ -; width of east/west connections -; height of north/south connections -MAP_BORDER EQU 3 - -; connection directions -EAST EQU 1 -WEST EQU 2 -SOUTH EQU 4 -NORTH EQU 8 diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index f5715072..dcf782ef 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -1,5 +1,5 @@ -const_value = 0 - +; CreditsTextPointers indexes (see data/credits/credits_text.asm) + const_def const CRED_VERSION ; $00 const CRED_TAJIRI ; $01 const CRED_TA_OOTA ; $02 @@ -65,3 +65,10 @@ const_value = 0 const CRED_CLUB ; $3E const CRED_PAAD ; $3F + const_def -1, -1 + const CRED_TEXT_FADE_MON ; $FF + const CRED_TEXT_MON ; $FE + const CRED_TEXT_FADE ; $FD + const CRED_TEXT ; $FC + const CRED_COPYRIGHT ; $FB + const CRED_THE_END ; $FA diff --git a/constants/event_constants.asm b/constants/event_constants.asm old mode 100755 new mode 100644 index 5b73012b..4f169880 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -1,2562 +1,775 @@ -const_value = 0 +; wEventFlags bit flags - const EVENT_FOLLOWED_OAK_INTO_LAB ; 000, (D747, bit 0) - const EVENT_001 ; 001, (D747, bit 1) - const EVENT_002 ; 002, (D747, bit 2) - const EVENT_HALL_OF_FAME_DEX_RATING ; 003, (D747, bit 3) - const EVENT_004 ; 004, (D747, bit 4) - const EVENT_005 ; 005, (D747, bit 5) - const EVENT_PALLET_AFTER_GETTING_POKEBALLS ; 006, (D747, bit 6) - const EVENT_007 ; 007, (D747, bit 7) - const EVENT_008 ; 008, (D748, bit 0) - const EVENT_009 ; 009, (D748, bit 1) - const EVENT_00A ; 00A, (D748, bit 2) - const EVENT_00B ; 00B, (D748, bit 3) - const EVENT_00C ; 00C, (D748, bit 4) - const EVENT_00D ; 00D, (D748, bit 5) - const EVENT_00E ; 00E, (D748, bit 6) - const EVENT_00F ; 00F, (D748, bit 7) - const EVENT_010 ; 010, (D749, bit 0) - const EVENT_011 ; 011, (D749, bit 1) - const EVENT_012 ; 012, (D749, bit 2) - const EVENT_013 ; 013, (D749, bit 3) - const EVENT_014 ; 014, (D749, bit 4) - const EVENT_015 ; 015, (D749, bit 5) - const EVENT_016 ; 016, (D749, bit 6) - const EVENT_017 ; 017, (D749, bit 7) - const EVENT_GOT_TOWN_MAP ; 018, (D74A, bit 0) - const EVENT_ENTERED_BLUES_HOUSE ; 019, (D74A, bit 1) - const EVENT_DAISY_WALKING ; 01A, (D74A, bit 2) - const EVENT_01B ; 01B, (D74A, bit 3) - const EVENT_01C ; 01C, (D74A, bit 4) - const EVENT_01D ; 01D, (D74A, bit 5) - const EVENT_01E ; 01E, (D74A, bit 6) - const EVENT_01F ; 01F, (D74A, bit 7) - const EVENT_FOLLOWED_OAK_INTO_LAB_2 ; 020, (D74B, bit 0) - const EVENT_OAK_ASKED_TO_CHOOSE_MON ; 021, (D74B, bit 1) - const EVENT_GOT_STARTER ; 022, (D74B, bit 2) - const EVENT_BATTLED_RIVAL_IN_OAKS_LAB ; 023, (D74B, bit 3) - const EVENT_GOT_POKEBALLS_FROM_OAK ; 024, (D74B, bit 4) - const EVENT_GOT_POKEDEX ; 025, (D74B, bit 5) - const EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 ; 026, (D74B, bit 6) - const EVENT_OAK_APPEARED_IN_PALLET ; 027, (D74B, bit 7) - const EVENT_VIRIDIAN_GYM_OPEN ; 028, (D74C, bit 0) - const EVENT_GOT_TM42 ; 029, (D74C, bit 1) - const EVENT_02A ; 02A, (D74C, bit 2) - const EVENT_02B ; 02B, (D74C, bit 3) - const EVENT_02C ; 02C, (D74C, bit 4) - const EVENT_02D ; 02D, (D74C, bit 5) - const EVENT_02E ; 02E, (D74C, bit 6) - const EVENT_02F ; 02F, (D74C, bit 7) - const EVENT_030 ; 030, (D74D, bit 0) - const EVENT_031 ; 031, (D74D, bit 1) - const EVENT_032 ; 032, (D74D, bit 2) - const EVENT_033 ; 033, (D74D, bit 3) - const EVENT_034 ; 034, (D74D, bit 4) - const EVENT_035 ; 035, (D74D, bit 5) - const EVENT_036 ; 036, (D74D, bit 6) - const EVENT_037 ; 037, (D74D, bit 7) - const EVENT_OAK_GOT_PARCEL ; 038, (D74E, bit 0) - const EVENT_GOT_OAKS_PARCEL ; 039, (D74E, bit 1) - const EVENT_03A ; 03A, (D74E, bit 2) - const EVENT_03B ; 03B, (D74E, bit 3) - const EVENT_03C ; 03C, (D74E, bit 4) - const EVENT_03D ; 03D, (D74E, bit 5) - const EVENT_03E ; 03E, (D74E, bit 6) - const EVENT_03F ; 03F, (D74E, bit 7) - const EVENT_040 ; 040, (D74F, bit 0) - const EVENT_041 ; 041, (D74F, bit 1) - const EVENT_042 ; 042, (D74F, bit 2) - const EVENT_043 ; 043, (D74F, bit 3) - const EVENT_044 ; 044, (D74F, bit 4) - const EVENT_045 ; 045, (D74F, bit 5) - const EVENT_046 ; 046, (D74F, bit 6) - const EVENT_047 ; 047, (D74F, bit 7) - const EVENT_048 ; 048, (D750, bit 0) - const EVENT_049 ; 049, (D750, bit 1) - const EVENT_04A ; 04A, (D750, bit 2) - const EVENT_04B ; 04B, (D750, bit 3) - const EVENT_04C ; 04C, (D750, bit 4) - const EVENT_04D ; 04D, (D750, bit 5) - const EVENT_04E ; 04E, (D750, bit 6) - const EVENT_04F ; 04F, (D750, bit 7) - const EVENT_GOT_TM27 ; 050, (D751, bit 0) - const EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI ; 051, (D751, bit 1) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 ; 052, (D751, bit 2) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 ; 053, (D751, bit 3) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 ; 054, (D751, bit 4) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 ; 055, (D751, bit 5) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 ; 056, (D751, bit 6) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 ; 057, (D751, bit 7) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6 ; 058, (D752, bit 0) - const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7 ; 059, (D752, bit 1) - const EVENT_05A ; 05A, (D752, bit 2) - const EVENT_05B ; 05B, (D752, bit 3) - const EVENT_05C ; 05C, (D752, bit 4) - const EVENT_05D ; 05D, (D752, bit 5) - const EVENT_05E ; 05E, (D752, bit 6) - const EVENT_05F ; 05F, (D752, bit 7) - const EVENT_060 ; 060, (D753, bit 0) - const EVENT_061 ; 061, (D753, bit 1) - const EVENT_062 ; 062, (D753, bit 2) - const EVENT_063 ; 063, (D753, bit 3) - const EVENT_064 ; 064, (D753, bit 4) - const EVENT_065 ; 065, (D753, bit 5) - const EVENT_066 ; 066, (D753, bit 6) - const EVENT_067 ; 067, (D753, bit 7) - const EVENT_BOUGHT_MUSEUM_TICKET ; 068, (D754, bit 0) - const EVENT_GOT_OLD_AMBER ; 069, (D754, bit 1) - const EVENT_06A ; 06A, (D754, bit 2) - const EVENT_06B ; 06B, (D754, bit 3) - const EVENT_06C ; 06C, (D754, bit 4) - const EVENT_06D ; 06D, (D754, bit 5) - const EVENT_06E ; 06E, (D754, bit 6) - const EVENT_06F ; 06F, (D754, bit 7) - const EVENT_070 ; 070, (D755, bit 0) - const EVENT_071 ; 071, (D755, bit 1) - const EVENT_BEAT_PEWTER_GYM_TRAINER_0 ; 072, (D755, bit 2) - const EVENT_073 ; 073, (D755, bit 3) - const EVENT_074 ; 074, (D755, bit 4) - const EVENT_075 ; 075, (D755, bit 5) - const EVENT_GOT_TM34 ; 076, (D755, bit 6) - const EVENT_BEAT_BROCK ; 077, (D755, bit 7) - const EVENT_078 ; 078, (D756, bit 0) - const EVENT_079 ; 079, (D756, bit 1) - const EVENT_07A ; 07A, (D756, bit 2) - const EVENT_07B ; 07B, (D756, bit 3) - const EVENT_07C ; 07C, (D756, bit 4) - const EVENT_07D ; 07D, (D756, bit 5) - const EVENT_07E ; 07E, (D756, bit 6) - const EVENT_07F ; 07F, (D756, bit 7) - const EVENT_080 ; 080, (D757, bit 0) - const EVENT_081 ; 081, (D757, bit 1) - const EVENT_082 ; 082, (D757, bit 2) - const EVENT_083 ; 083, (D757, bit 3) - const EVENT_084 ; 084, (D757, bit 4) - const EVENT_085 ; 085, (D757, bit 5) - const EVENT_086 ; 086, (D757, bit 6) - const EVENT_087 ; 087, (D757, bit 7) - const EVENT_088 ; 088, (D758, bit 0) - const EVENT_089 ; 089, (D758, bit 1) - const EVENT_08A ; 08A, (D758, bit 2) - const EVENT_08B ; 08B, (D758, bit 3) - const EVENT_08C ; 08C, (D758, bit 4) - const EVENT_08D ; 08D, (D758, bit 5) - const EVENT_08E ; 08E, (D758, bit 6) - const EVENT_08F ; 08F, (D758, bit 7) - const EVENT_090 ; 090, (D759, bit 0) - const EVENT_091 ; 091, (D759, bit 1) - const EVENT_092 ; 092, (D759, bit 2) - const EVENT_093 ; 093, (D759, bit 3) - const EVENT_094 ; 094, (D759, bit 4) - const EVENT_095 ; 095, (D759, bit 5) - const EVENT_096 ; 096, (D759, bit 6) - const EVENT_097 ; 097, (D759, bit 7) - const EVENT_BEAT_CERULEAN_RIVAL ; 098, (D75A, bit 0) - const EVENT_099 ; 099, (D75A, bit 1) - const EVENT_09A ; 09A, (D75A, bit 2) - const EVENT_09B ; 09B, (D75A, bit 3) - const EVENT_09C ; 09C, (D75A, bit 4) - const EVENT_09D ; 09D, (D75A, bit 5) - const EVENT_09E ; 09E, (D75A, bit 6) - const EVENT_09F ; 09F, (D75A, bit 7) - const EVENT_0A0 ; 0A0, (D75B, bit 0) - const EVENT_0A1 ; 0A1, (D75B, bit 1) - const EVENT_0A2 ; 0A2, (D75B, bit 2) - const EVENT_0A3 ; 0A3, (D75B, bit 3) - const EVENT_0A4 ; 0A4, (D75B, bit 4) - const EVENT_0A5 ; 0A5, (D75B, bit 5) - const EVENT_0A6 ; 0A6, (D75B, bit 6) - const EVENT_BEAT_CERULEAN_ROCKET_THIEF ; 0A7, (D75B, bit 7) - const EVENT_0A8 ; 0A8, (D75C, bit 0) - const EVENT_0A9 ; 0A9, (D75C, bit 1) - const EVENT_0AA ; 0AA, (D75C, bit 2) - const EVENT_0AB ; 0AB, (D75C, bit 3) - const EVENT_0AC ; 0AC, (D75C, bit 4) - const EVENT_0AD ; 0AD, (D75C, bit 5) - const EVENT_0AE ; 0AE, (D75C, bit 6) - const EVENT_0AF ; 0AF, (D75C, bit 7) - const EVENT_0B0 ; 0B0, (D75D, bit 0) - const EVENT_0B1 ; 0B1, (D75D, bit 1) - const EVENT_0B2 ; 0B2, (D75D, bit 2) - const EVENT_0B3 ; 0B3, (D75D, bit 3) - const EVENT_0B4 ; 0B4, (D75D, bit 4) - const EVENT_0B5 ; 0B5, (D75D, bit 5) - const EVENT_0B6 ; 0B6, (D75D, bit 6) - const EVENT_0B7 ; 0B7, (D75D, bit 7) - const EVENT_0B8 ; 0B8, (D75E, bit 0) - const EVENT_0B9 ; 0B9, (D75E, bit 1) - const EVENT_BEAT_CERULEAN_GYM_TRAINER_0 ; 0BA, (D75E, bit 2) - const EVENT_BEAT_CERULEAN_GYM_TRAINER_1 ; 0BB, (D75E, bit 3) - const EVENT_0BC ; 0BC, (D75E, bit 4) - const EVENT_0BD ; 0BD, (D75E, bit 5) - const EVENT_GOT_TM11 ; 0BE, (D75E, bit 6) - const EVENT_BEAT_MISTY ; 0BF, (D75E, bit 7) - const EVENT_GOT_BICYCLE ; 0C0, (D75F, bit 0) - const EVENT_0C1 ; 0C1, (D75F, bit 1) - const EVENT_0C2 ; 0C2, (D75F, bit 2) - const EVENT_0C3 ; 0C3, (D75F, bit 3) - const EVENT_0C4 ; 0C4, (D75F, bit 4) - const EVENT_0C5 ; 0C5, (D75F, bit 5) - const EVENT_0C6 ; 0C6, (D75F, bit 6) - const EVENT_0C7 ; 0C7, (D75F, bit 7) - const EVENT_0C8 ; 0C8, (D760, bit 0) - const EVENT_0C9 ; 0C9, (D760, bit 1) - const EVENT_0CA ; 0CA, (D760, bit 2) - const EVENT_0CB ; 0CB, (D760, bit 3) - const EVENT_0CC ; 0CC, (D760, bit 4) - const EVENT_0CD ; 0CD, (D760, bit 5) - const EVENT_0CE ; 0CE, (D760, bit 6) - const EVENT_0CF ; 0CF, (D760, bit 7) - const EVENT_0D0 ; 0D0, (D761, bit 0) - const EVENT_0D1 ; 0D1, (D761, bit 1) - const EVENT_0D2 ; 0D2, (D761, bit 2) - const EVENT_0D3 ; 0D3, (D761, bit 3) - const EVENT_0D4 ; 0D4, (D761, bit 4) - const EVENT_0D5 ; 0D5, (D761, bit 5) - const EVENT_0D6 ; 0D6, (D761, bit 6) - const EVENT_0D7 ; 0D7, (D761, bit 7) - const EVENT_0D8 ; 0D8, (D762, bit 0) - const EVENT_0D9 ; 0D9, (D762, bit 1) - const EVENT_0DA ; 0DA, (D762, bit 2) - const EVENT_0DB ; 0DB, (D762, bit 3) - const EVENT_0DC ; 0DC, (D762, bit 4) - const EVENT_0DD ; 0DD, (D762, bit 5) - const EVENT_0DE ; 0DE, (D762, bit 6) - const EVENT_0DF ; 0DF, (D762, bit 7) - const EVENT_0E0 ; 0E0, (D763, bit 0) - const EVENT_0E1 ; 0E1, (D763, bit 1) - const EVENT_0E2 ; 0E2, (D763, bit 2) - const EVENT_0E3 ; 0E3, (D763, bit 3) - const EVENT_0E4 ; 0E4, (D763, bit 4) - const EVENT_0E5 ; 0E5, (D763, bit 5) - const EVENT_0E6 ; 0E6, (D763, bit 6) - const EVENT_0E7 ; 0E7, (D763, bit 7) - const EVENT_0E8 ; 0E8, (D764, bit 0) - const EVENT_0E9 ; 0E9, (D764, bit 1) - const EVENT_0EA ; 0EA, (D764, bit 2) - const EVENT_0EB ; 0EB, (D764, bit 3) - const EVENT_0EC ; 0EC, (D764, bit 4) - const EVENT_0ED ; 0ED, (D764, bit 5) - const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT ; 0EE, (D764, bit 6) - const EVENT_BEAT_POKEMON_TOWER_RIVAL ; 0EF, (D764, bit 7) - const EVENT_0F0 ; 0F0, (D765, bit 0) - const EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 ; 0F1, (D765, bit 1) - const EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 ; 0F2, (D765, bit 2) - const EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 ; 0F3, (D765, bit 3) - const EVENT_0F4 ; 0F4, (D765, bit 4) - const EVENT_0F5 ; 0F5, (D765, bit 5) - const EVENT_0F6 ; 0F6, (D765, bit 6) - const EVENT_0F7 ; 0F7, (D765, bit 7) - const EVENT_0F8 ; 0F8, (D766, bit 0) - const EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 ; 0F9, (D766, bit 1) - const EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 ; 0FA, (D766, bit 2) - const EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 ; 0FB, (D766, bit 3) - const EVENT_0FC ; 0FC, (D766, bit 4) - const EVENT_0FD ; 0FD, (D766, bit 5) - const EVENT_0FE ; 0FE, (D766, bit 6) - const EVENT_0FF ; 0FF, (D766, bit 7) - const EVENT_100 ; 100, (D767, bit 0) - const EVENT_101 ; 101, (D767, bit 1) - const EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 ; 102, (D767, bit 2) - const EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 ; 103, (D767, bit 3) - const EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 ; 104, (D767, bit 4) - const EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 ; 105, (D767, bit 5) - const EVENT_106 ; 106, (D767, bit 6) - const EVENT_IN_PURIFIED_ZONE ; 107, (D767, bit 7) - const EVENT_108 ; 108, (D768, bit 0) - const EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 ; 109, (D768, bit 1) - const EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 ; 10A, (D768, bit 2) - const EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 ; 10B, (D768, bit 3) - const EVENT_10C ; 10C, (D768, bit 4) - const EVENT_10D ; 10D, (D768, bit 5) - const EVENT_10E ; 10E, (D768, bit 6) - const EVENT_BEAT_GHOST_MAROWAK ; 10F, (D768, bit 7) - const EVENT_110 ; 110, (D769, bit 0) - const EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 ; 111, (D769, bit 1) - const EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 ; 112, (D769, bit 2) - const EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 ; 113, (D769, bit 3) - const EVENT_114 ; 114, (D769, bit 4) - const EVENT_115 ; 115, (D769, bit 5) - const EVENT_116 ; 116, (D769, bit 6) - const EVENT_RESCUED_MR_FUJI_2 ; 117, (D769, bit 7) - const EVENT_118 ; 118, (D76A, bit 0) - const EVENT_119 ; 119, (D76A, bit 1) - const EVENT_11A ; 11A, (D76A, bit 2) - const EVENT_11B ; 11B, (D76A, bit 3) - const EVENT_11C ; 11C, (D76A, bit 4) - const EVENT_11D ; 11D, (D76A, bit 5) - const EVENT_11E ; 11E, (D76A, bit 6) - const EVENT_11F ; 11F, (D76A, bit 7) - const EVENT_120 ; 120, (D76B, bit 0) - const EVENT_121 ; 121, (D76B, bit 1) - const EVENT_122 ; 122, (D76B, bit 2) - const EVENT_123 ; 123, (D76B, bit 3) - const EVENT_124 ; 124, (D76B, bit 4) - const EVENT_125 ; 125, (D76B, bit 5) - const EVENT_126 ; 126, (D76B, bit 6) - const EVENT_127 ; 127, (D76B, bit 7) - const EVENT_GOT_POKE_FLUTE ; 128, (D76C, bit 0) - const EVENT_129 ; 129, (D76C, bit 1) - const EVENT_12A ; 12A, (D76C, bit 2) - const EVENT_12B ; 12B, (D76C, bit 3) - const EVENT_12C ; 12C, (D76C, bit 4) - const EVENT_12D ; 12D, (D76C, bit 5) - const EVENT_12E ; 12E, (D76C, bit 6) - const EVENT_12F ; 12F, (D76C, bit 7) - const EVENT_130 ; 130, (D76D, bit 0) - const EVENT_131 ; 131, (D76D, bit 1) - const EVENT_132 ; 132, (D76D, bit 2) - const EVENT_133 ; 133, (D76D, bit 3) - const EVENT_134 ; 134, (D76D, bit 4) - const EVENT_135 ; 135, (D76D, bit 5) - const EVENT_136 ; 136, (D76D, bit 6) - const EVENT_137 ; 137, (D76D, bit 7) - const EVENT_138 ; 138, (D76E, bit 0) - const EVENT_139 ; 139, (D76E, bit 1) - const EVENT_13A ; 13A, (D76E, bit 2) - const EVENT_13B ; 13B, (D76E, bit 3) - const EVENT_13C ; 13C, (D76E, bit 4) - const EVENT_13D ; 13D, (D76E, bit 5) - const EVENT_13E ; 13E, (D76E, bit 6) - const EVENT_13F ; 13F, (D76E, bit 7) - const EVENT_140 ; 140, (D76F, bit 0) - const EVENT_141 ; 141, (D76F, bit 1) - const EVENT_142 ; 142, (D76F, bit 2) - const EVENT_143 ; 143, (D76F, bit 3) - const EVENT_144 ; 144, (D76F, bit 4) - const EVENT_145 ; 145, (D76F, bit 5) - const EVENT_146 ; 146, (D76F, bit 6) - const EVENT_147 ; 147, (D76F, bit 7) - const EVENT_148 ; 148, (D770, bit 0) - const EVENT_149 ; 149, (D770, bit 1) - const EVENT_14A ; 14A, (D770, bit 2) - const EVENT_14B ; 14B, (D770, bit 3) - const EVENT_14C ; 14C, (D770, bit 4) - const EVENT_14D ; 14D, (D770, bit 5) - const EVENT_14E ; 14E, (D770, bit 6) - const EVENT_14F ; 14F, (D770, bit 7) - const EVENT_150 ; 150, (D771, bit 0) - const EVENT_GOT_BIKE_VOUCHER ; 151, (D771, bit 1) - const EVENT_152 ; 152, (D771, bit 2) - const EVENT_153 ; 153, (D771, bit 3) - const EVENT_154 ; 154, (D771, bit 4) - const EVENT_155 ; 155, (D771, bit 5) - const EVENT_SEEL_FAN_BOAST ; 156, (D771, bit 6) - const EVENT_PIKACHU_FAN_BOAST ; 157, (D771, bit 7) - const EVENT_158 ; 158, (D772, bit 0) - const EVENT_159 ; 159, (D772, bit 1) - const EVENT_15A ; 15A, (D772, bit 2) - const EVENT_15B ; 15B, (D772, bit 3) - const EVENT_15C ; 15C, (D772, bit 4) - const EVENT_15D ; 15D, (D772, bit 5) - const EVENT_15E ; 15E, (D772, bit 6) - const EVENT_15F ; 15F, (D772, bit 7) - const EVENT_2ND_LOCK_OPENED ; 160, (D773, bit 0) - const EVENT_1ST_LOCK_OPENED ; 161, (D773, bit 1) - const EVENT_BEAT_VERMILION_GYM_TRAINER_0 ; 162, (D773, bit 2) - const EVENT_BEAT_VERMILION_GYM_TRAINER_1 ; 163, (D773, bit 3) - const EVENT_BEAT_VERMILION_GYM_TRAINER_2 ; 164, (D773, bit 4) - const EVENT_165 ; 165, (D773, bit 5) - const EVENT_GOT_TM24 ; 166, (D773, bit 6) - const EVENT_BEAT_LT_SURGE ; 167, (D773, bit 7) - const EVENT_168 ; 168, (D774, bit 0) - const EVENT_169 ; 169, (D774, bit 1) - const EVENT_16A ; 16A, (D774, bit 2) - const EVENT_16B ; 16B, (D774, bit 3) - const EVENT_16C ; 16C, (D774, bit 4) - const EVENT_16D ; 16D, (D774, bit 5) - const EVENT_16E ; 16E, (D774, bit 6) - const EVENT_16F ; 16F, (D774, bit 7) - const EVENT_170 ; 170, (D775, bit 0) - const EVENT_171 ; 171, (D775, bit 1) - const EVENT_172 ; 172, (D775, bit 2) - const EVENT_173 ; 173, (D775, bit 3) - const EVENT_174 ; 174, (D775, bit 4) - const EVENT_175 ; 175, (D775, bit 5) - const EVENT_176 ; 176, (D775, bit 6) - const EVENT_177 ; 177, (D775, bit 7) - const EVENT_178 ; 178, (D776, bit 0) - const EVENT_179 ; 179, (D776, bit 1) - const EVENT_17A ; 17A, (D776, bit 2) - const EVENT_17B ; 17B, (D776, bit 3) - const EVENT_17C ; 17C, (D776, bit 4) - const EVENT_17D ; 17D, (D776, bit 5) - const EVENT_17E ; 17E, (D776, bit 6) - const EVENT_17F ; 17F, (D776, bit 7) - const EVENT_GOT_TM41 ; 180, (D777, bit 0) - const EVENT_181 ; 181, (D777, bit 1) - const EVENT_182 ; 182, (D777, bit 2) - const EVENT_183 ; 183, (D777, bit 3) - const EVENT_184 ; 184, (D777, bit 4) - const EVENT_185 ; 185, (D777, bit 5) - const EVENT_186 ; 186, (D777, bit 6) - const EVENT_187 ; 187, (D777, bit 7) - const EVENT_188 ; 188, (D778, bit 0) - const EVENT_189 ; 189, (D778, bit 1) - const EVENT_18A ; 18A, (D778, bit 2) - const EVENT_18B ; 18B, (D778, bit 3) - const EVENT_GOT_TM13 ; 18C, (D778, bit 4) - const EVENT_GOT_TM48 ; 18D, (D778, bit 5) - const EVENT_GOT_TM49 ; 18E, (D778, bit 6) - const EVENT_GOT_TM18 ; 18F, (D778, bit 7) - const EVENT_190 ; 190, (D779, bit 0) - const EVENT_191 ; 191, (D779, bit 1) - const EVENT_192 ; 192, (D779, bit 2) - const EVENT_193 ; 193, (D779, bit 3) - const EVENT_194 ; 194, (D779, bit 4) - const EVENT_195 ; 195, (D779, bit 5) - const EVENT_196 ; 196, (D779, bit 6) - const EVENT_197 ; 197, (D779, bit 7) - const EVENT_198 ; 198, (D77A, bit 0) - const EVENT_199 ; 199, (D77A, bit 1) - const EVENT_19A ; 19A, (D77A, bit 2) - const EVENT_19B ; 19B, (D77A, bit 3) - const EVENT_19C ; 19C, (D77A, bit 4) - const EVENT_19D ; 19D, (D77A, bit 5) - const EVENT_19E ; 19E, (D77A, bit 6) - const EVENT_19F ; 19F, (D77A, bit 7) - const EVENT_1A0 ; 1A0, (D77B, bit 0) - const EVENT_1A1 ; 1A1, (D77B, bit 1) - const EVENT_1A2 ; 1A2, (D77B, bit 2) - const EVENT_1A3 ; 1A3, (D77B, bit 3) - const EVENT_1A4 ; 1A4, (D77B, bit 4) - const EVENT_1A5 ; 1A5, (D77B, bit 5) - const EVENT_1A6 ; 1A6, (D77B, bit 6) - const EVENT_1A7 ; 1A7, (D77B, bit 7) - const EVENT_GOT_TM21 ; 1A8, (D77C, bit 0) - const EVENT_BEAT_ERIKA ; 1A9, (D77C, bit 1) - const EVENT_BEAT_CELADON_GYM_TRAINER_0 ; 1AA, (D77C, bit 2) - const EVENT_BEAT_CELADON_GYM_TRAINER_1 ; 1AB, (D77C, bit 3) - const EVENT_BEAT_CELADON_GYM_TRAINER_2 ; 1AC, (D77C, bit 4) - const EVENT_BEAT_CELADON_GYM_TRAINER_3 ; 1AD, (D77C, bit 5) - const EVENT_BEAT_CELADON_GYM_TRAINER_4 ; 1AE, (D77C, bit 6) - const EVENT_BEAT_CELADON_GYM_TRAINER_5 ; 1AF, (D77C, bit 7) - const EVENT_BEAT_CELADON_GYM_TRAINER_6 ; 1B0, (D77D, bit 0) - const EVENT_1B1 ; 1B1, (D77D, bit 1) - const EVENT_1B2 ; 1B2, (D77D, bit 2) - const EVENT_1B3 ; 1B3, (D77D, bit 3) - const EVENT_1B4 ; 1B4, (D77D, bit 4) - const EVENT_1B5 ; 1B5, (D77D, bit 5) - const EVENT_1B6 ; 1B6, (D77D, bit 6) - const EVENT_1B7 ; 1B7, (D77D, bit 7) - const EVENT_1B8 ; 1B8, (D77E, bit 0) - const EVENT_FOUND_ROCKET_HIDEOUT ; 1B9, (D77E, bit 1) - const EVENT_GOT_10_COINS ; 1BA, (D77E, bit 2) - const EVENT_GOT_20_COINS ; 1BB, (D77E, bit 3) - const EVENT_GOT_20_COINS_2 ; 1BC, (D77E, bit 4) - const EVENT_1BD ; 1BD, (D77E, bit 5) - const EVENT_1BE ; 1BE, (D77E, bit 6) - const EVENT_1BF ; 1BF, (D77E, bit 7) - const EVENT_1C0 ; 1C0, (D77F, bit 0) - const EVENT_1C1 ; 1C1, (D77F, bit 1) - const EVENT_1C2 ; 1C2, (D77F, bit 2) - const EVENT_1C3 ; 1C3, (D77F, bit 3) - const EVENT_1C4 ; 1C4, (D77F, bit 4) - const EVENT_1C5 ; 1C5, (D77F, bit 5) - const EVENT_1C6 ; 1C6, (D77F, bit 6) - const EVENT_1C7 ; 1C7, (D77F, bit 7) - const EVENT_1C8 ; 1C8, (D780, bit 0) - const EVENT_1C9 ; 1C9, (D780, bit 1) - const EVENT_1CA ; 1CA, (D780, bit 2) - const EVENT_1CB ; 1CB, (D780, bit 3) - const EVENT_1CC ; 1CC, (D780, bit 4) - const EVENT_1CD ; 1CD, (D780, bit 5) - const EVENT_1CE ; 1CE, (D780, bit 6) - const EVENT_1CF ; 1CF, (D780, bit 7) - const EVENT_1D0 ; 1D0, (D781, bit 0) - const EVENT_1D1 ; 1D1, (D781, bit 1) - const EVENT_1D2 ; 1D2, (D781, bit 2) - const EVENT_1D3 ; 1D3, (D781, bit 3) - const EVENT_1D4 ; 1D4, (D781, bit 4) - const EVENT_1D5 ; 1D5, (D781, bit 5) - const EVENT_1D6 ; 1D6, (D781, bit 6) - const EVENT_1D7 ; 1D7, (D781, bit 7) - const EVENT_1D8 ; 1D8, (D782, bit 0) - const EVENT_1D9 ; 1D9, (D782, bit 1) - const EVENT_1DA ; 1DA, (D782, bit 2) - const EVENT_1DB ; 1DB, (D782, bit 3) - const EVENT_1DC ; 1DC, (D782, bit 4) - const EVENT_1DD ; 1DD, (D782, bit 5) - const EVENT_1DE ; 1DE, (D782, bit 6) - const EVENT_1DF ; 1DF, (D782, bit 7) - const EVENT_GOT_COIN_CASE ; 1E0, (D783, bit 0) - const EVENT_1E1 ; 1E1, (D783, bit 1) - const EVENT_1E2 ; 1E2, (D783, bit 2) - const EVENT_1E3 ; 1E3, (D783, bit 3) - const EVENT_1E4 ; 1E4, (D783, bit 4) - const EVENT_1E5 ; 1E5, (D783, bit 5) - const EVENT_1E6 ; 1E6, (D783, bit 6) - const EVENT_1E7 ; 1E7, (D783, bit 7) - const EVENT_1E8 ; 1E8, (D784, bit 0) - const EVENT_1E9 ; 1E9, (D784, bit 1) - const EVENT_1EA ; 1EA, (D784, bit 2) - const EVENT_1EB ; 1EB, (D784, bit 3) - const EVENT_1EC ; 1EC, (D784, bit 4) - const EVENT_1ED ; 1ED, (D784, bit 5) - const EVENT_1EE ; 1EE, (D784, bit 6) - const EVENT_1EF ; 1EF, (D784, bit 7) - const EVENT_1F0 ; 1F0, (D785, bit 0) - const EVENT_1F1 ; 1F1, (D785, bit 1) - const EVENT_1F2 ; 1F2, (D785, bit 2) - const EVENT_1F3 ; 1F3, (D785, bit 3) - const EVENT_1F4 ; 1F4, (D785, bit 4) - const EVENT_1F5 ; 1F5, (D785, bit 5) - const EVENT_1F6 ; 1F6, (D785, bit 6) - const EVENT_1F7 ; 1F7, (D785, bit 7) - const EVENT_1F8 ; 1F8, (D786, bit 0) - const EVENT_1F9 ; 1F9, (D786, bit 1) - const EVENT_1FA ; 1FA, (D786, bit 2) - const EVENT_1FB ; 1FB, (D786, bit 3) - const EVENT_1FC ; 1FC, (D786, bit 4) - const EVENT_1FD ; 1FD, (D786, bit 5) - const EVENT_1FE ; 1FE, (D786, bit 6) - const EVENT_1FF ; 1FF, (D786, bit 7) - const EVENT_200 ; 200, (D787, bit 0) - const EVENT_201 ; 201, (D787, bit 1) - const EVENT_202 ; 202, (D787, bit 2) - const EVENT_203 ; 203, (D787, bit 3) - const EVENT_204 ; 204, (D787, bit 4) - const EVENT_205 ; 205, (D787, bit 5) - const EVENT_206 ; 206, (D787, bit 6) - const EVENT_207 ; 207, (D787, bit 7) - const EVENT_208 ; 208, (D788, bit 0) - const EVENT_209 ; 209, (D788, bit 1) - const EVENT_20A ; 20A, (D788, bit 2) - const EVENT_20B ; 20B, (D788, bit 3) - const EVENT_20C ; 20C, (D788, bit 4) - const EVENT_20D ; 20D, (D788, bit 5) - const EVENT_20E ; 20E, (D788, bit 6) - const EVENT_20F ; 20F, (D788, bit 7) - const EVENT_210 ; 210, (D789, bit 0) - const EVENT_211 ; 211, (D789, bit 1) - const EVENT_212 ; 212, (D789, bit 2) - const EVENT_213 ; 213, (D789, bit 3) - const EVENT_214 ; 214, (D789, bit 4) - const EVENT_215 ; 215, (D789, bit 5) - const EVENT_216 ; 216, (D789, bit 6) - const EVENT_217 ; 217, (D789, bit 7) - const EVENT_218 ; 218, (D78A, bit 0) - const EVENT_219 ; 219, (D78A, bit 1) - const EVENT_21A ; 21A, (D78A, bit 2) - const EVENT_21B ; 21B, (D78A, bit 3) - const EVENT_21C ; 21C, (D78A, bit 4) - const EVENT_21D ; 21D, (D78A, bit 5) - const EVENT_21E ; 21E, (D78A, bit 6) - const EVENT_21F ; 21F, (D78A, bit 7) - const EVENT_220 ; 220, (D78B, bit 0) - const EVENT_221 ; 221, (D78B, bit 1) - const EVENT_222 ; 222, (D78B, bit 2) - const EVENT_223 ; 223, (D78B, bit 3) - const EVENT_224 ; 224, (D78B, bit 4) - const EVENT_225 ; 225, (D78B, bit 5) - const EVENT_226 ; 226, (D78B, bit 6) - const EVENT_227 ; 227, (D78B, bit 7) - const EVENT_228 ; 228, (D78C, bit 0) - const EVENT_229 ; 229, (D78C, bit 1) - const EVENT_22A ; 22A, (D78C, bit 2) - const EVENT_22B ; 22B, (D78C, bit 3) - const EVENT_22C ; 22C, (D78C, bit 4) - const EVENT_22D ; 22D, (D78C, bit 5) - const EVENT_22E ; 22E, (D78C, bit 6) - const EVENT_22F ; 22F, (D78C, bit 7) - const EVENT_230 ; 230, (D78D, bit 0) - const EVENT_231 ; 231, (D78D, bit 1) - const EVENT_232 ; 232, (D78D, bit 2) - const EVENT_233 ; 233, (D78D, bit 3) - const EVENT_234 ; 234, (D78D, bit 4) - const EVENT_235 ; 235, (D78D, bit 5) - const EVENT_236 ; 236, (D78D, bit 6) - const EVENT_237 ; 237, (D78D, bit 7) - const EVENT_GOT_HM04 ; 238, (D78E, bit 0) - const EVENT_GAVE_GOLD_TEETH ; 239, (D78E, bit 1) - const EVENT_23A ; 23A, (D78E, bit 2) - const EVENT_23B ; 23B, (D78E, bit 3) - const EVENT_23C ; 23C, (D78E, bit 4) - const EVENT_23D ; 23D, (D78E, bit 5) - const EVENT_23E ; 23E, (D78E, bit 6) - const EVENT_23F ; 23F, (D78E, bit 7) - const EVENT_240 ; 240, (D78F, bit 0) - const EVENT_241 ; 241, (D78F, bit 1) - const EVENT_242 ; 242, (D78F, bit 2) - const EVENT_243 ; 243, (D78F, bit 3) - const EVENT_244 ; 244, (D78F, bit 4) - const EVENT_245 ; 245, (D78F, bit 5) - const EVENT_246 ; 246, (D78F, bit 6) - const EVENT_247 ; 247, (D78F, bit 7) - const EVENT_248 ; 248, (D790, bit 0) - const EVENT_249 ; 249, (D790, bit 1) - const EVENT_24A ; 24A, (D790, bit 2) - const EVENT_24B ; 24B, (D790, bit 3) - const EVENT_24C ; 24C, (D790, bit 4) - const EVENT_24D ; 24D, (D790, bit 5) - const EVENT_SAFARI_GAME_OVER ; 24E, (D790, bit 6) - const EVENT_IN_SAFARI_ZONE ; 24F, (D790, bit 7) - const EVENT_250 ; 250, (D791, bit 0) - const EVENT_251 ; 251, (D791, bit 1) - const EVENT_252 ; 252, (D791, bit 2) - const EVENT_253 ; 253, (D791, bit 3) - const EVENT_254 ; 254, (D791, bit 4) - const EVENT_255 ; 255, (D791, bit 5) - const EVENT_256 ; 256, (D791, bit 6) - const EVENT_257 ; 257, (D791, bit 7) - const EVENT_GOT_TM06 ; 258, (D792, bit 0) - const EVENT_BEAT_KOGA ; 259, (D792, bit 1) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 ; 25A, (D792, bit 2) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 ; 25B, (D792, bit 3) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 ; 25C, (D792, bit 4) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 ; 25D, (D792, bit 5) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 ; 25E, (D792, bit 6) - const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 ; 25F, (D792, bit 7) - const EVENT_260 ; 260, (D793, bit 0) - const EVENT_261 ; 261, (D793, bit 1) - const EVENT_262 ; 262, (D793, bit 2) - const EVENT_263 ; 263, (D793, bit 3) - const EVENT_264 ; 264, (D793, bit 4) - const EVENT_265 ; 265, (D793, bit 5) - const EVENT_266 ; 266, (D793, bit 6) - const EVENT_267 ; 267, (D793, bit 7) - const EVENT_268 ; 268, (D794, bit 0) - const EVENT_269 ; 269, (D794, bit 1) - const EVENT_26A ; 26A, (D794, bit 2) - const EVENT_26B ; 26B, (D794, bit 3) - const EVENT_26C ; 26C, (D794, bit 4) - const EVENT_26D ; 26D, (D794, bit 5) - const EVENT_26E ; 26E, (D794, bit 6) - const EVENT_26F ; 26F, (D794, bit 7) - const EVENT_270 ; 270, (D795, bit 0) - const EVENT_271 ; 271, (D795, bit 1) - const EVENT_272 ; 272, (D795, bit 2) - const EVENT_273 ; 273, (D795, bit 3) - const EVENT_274 ; 274, (D795, bit 4) - const EVENT_275 ; 275, (D795, bit 5) - const EVENT_276 ; 276, (D795, bit 6) - const EVENT_277 ; 277, (D795, bit 7) - const EVENT_MANSION_SWITCH_ON ; 278, (D796, bit 0) - const EVENT_279 ; 279, (D796, bit 1) - const EVENT_27A ; 27A, (D796, bit 2) - const EVENT_27B ; 27B, (D796, bit 3) - const EVENT_27C ; 27C, (D796, bit 4) - const EVENT_27D ; 27D, (D796, bit 5) - const EVENT_27E ; 27E, (D796, bit 6) - const EVENT_27F ; 27F, (D796, bit 7) - const EVENT_280 ; 280, (D797, bit 0) - const EVENT_281 ; 281, (D797, bit 1) - const EVENT_282 ; 282, (D797, bit 2) - const EVENT_283 ; 283, (D797, bit 3) - const EVENT_284 ; 284, (D797, bit 4) - const EVENT_285 ; 285, (D797, bit 5) - const EVENT_286 ; 286, (D797, bit 6) - const EVENT_287 ; 287, (D797, bit 7) - const EVENT_288 ; 288, (D798, bit 0) - const EVENT_BEAT_MANSION_1_TRAINER_0 ; 289, (D798, bit 1) - const EVENT_28A ; 28A, (D798, bit 2) - const EVENT_28B ; 28B, (D798, bit 3) - const EVENT_28C ; 28C, (D798, bit 4) - const EVENT_28D ; 28D, (D798, bit 5) - const EVENT_28E ; 28E, (D798, bit 6) - const EVENT_28F ; 28F, (D798, bit 7) - const EVENT_290 ; 290, (D799, bit 0) - const EVENT_291 ; 291, (D799, bit 1) - const EVENT_292 ; 292, (D799, bit 2) - const EVENT_293 ; 293, (D799, bit 3) - const EVENT_294 ; 294, (D799, bit 4) - const EVENT_295 ; 295, (D799, bit 5) - const EVENT_296 ; 296, (D799, bit 6) - const EVENT_297 ; 297, (D799, bit 7) - const EVENT_GOT_TM38 ; 298, (D79A, bit 0) - const EVENT_BEAT_BLAINE ; 299, (D79A, bit 1) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_0 ; 29A, (D79A, bit 2) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_1 ; 29B, (D79A, bit 3) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_2 ; 29C, (D79A, bit 4) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_3 ; 29D, (D79A, bit 5) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_4 ; 29E, (D79A, bit 6) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_5 ; 29F, (D79A, bit 7) - const EVENT_BEAT_CINNABAR_GYM_TRAINER_6 ; 2A0, (D79B, bit 0) - const EVENT_2A1 ; 2A1, (D79B, bit 1) - const EVENT_2A2 ; 2A2, (D79B, bit 2) - const EVENT_2A3 ; 2A3, (D79B, bit 3) - const EVENT_2A4 ; 2A4, (D79B, bit 4) - const EVENT_2A5 ; 2A5, (D79B, bit 5) - const EVENT_2A6 ; 2A6, (D79B, bit 6) - const EVENT_2A7 ; 2A7, (D79B, bit 7) - const EVENT_CINNABAR_GYM_GATE0_UNLOCKED ; 2A8, (D79C, bit 0) doesn't exist, but the bit is set - const EVENT_CINNABAR_GYM_GATE1_UNLOCKED ; 2A9, (D79C, bit 1) - const EVENT_CINNABAR_GYM_GATE2_UNLOCKED ; 2AA, (D79C, bit 2) - const EVENT_CINNABAR_GYM_GATE3_UNLOCKED ; 2AB, (D79C, bit 3) - const EVENT_CINNABAR_GYM_GATE4_UNLOCKED ; 2AC, (D79C, bit 4) - const EVENT_CINNABAR_GYM_GATE5_UNLOCKED ; 2AD, (D79C, bit 5) - const EVENT_CINNABAR_GYM_GATE6_UNLOCKED ; 2AE, (D79C, bit 6) - const EVENT_2AF ; 2AF, (D79C, bit 7) - const EVENT_2B0 ; 2B0, (D79D, bit 0) - const EVENT_2B1 ; 2B1, (D79D, bit 1) - const EVENT_2B2 ; 2B2, (D79D, bit 2) - const EVENT_2B3 ; 2B3, (D79D, bit 3) - const EVENT_2B4 ; 2B4, (D79D, bit 4) - const EVENT_2B5 ; 2B5, (D79D, bit 5) - const EVENT_2B6 ; 2B6, (D79D, bit 6) - const EVENT_2B7 ; 2B7, (D79D, bit 7) - const EVENT_2B8 ; 2B8, (D79E, bit 0) - const EVENT_2B9 ; 2B9, (D79E, bit 1) - const EVENT_2BA ; 2BA, (D79E, bit 2) - const EVENT_2BB ; 2BB, (D79E, bit 3) - const EVENT_2BC ; 2BC, (D79E, bit 4) - const EVENT_2BD ; 2BD, (D79E, bit 5) - const EVENT_2BE ; 2BE, (D79E, bit 6) - const EVENT_2BF ; 2BF, (D79E, bit 7) - const EVENT_2C0 ; 2C0, (D79F, bit 0) - const EVENT_2C1 ; 2C1, (D79F, bit 1) - const EVENT_2C2 ; 2C2, (D79F, bit 2) - const EVENT_2C3 ; 2C3, (D79F, bit 3) - const EVENT_2C4 ; 2C4, (D79F, bit 4) - const EVENT_2C5 ; 2C5, (D79F, bit 5) - const EVENT_2C6 ; 2C6, (D79F, bit 6) - const EVENT_2C7 ; 2C7, (D79F, bit 7) - const EVENT_2C8 ; 2C8, (D7A0, bit 0) - const EVENT_2C9 ; 2C9, (D7A0, bit 1) - const EVENT_2CA ; 2CA, (D7A0, bit 2) - const EVENT_2CB ; 2CB, (D7A0, bit 3) - const EVENT_2CC ; 2CC, (D7A0, bit 4) - const EVENT_2CD ; 2CD, (D7A0, bit 5) - const EVENT_2CE ; 2CE, (D7A0, bit 6) - const EVENT_2CF ; 2CF, (D7A0, bit 7) - const EVENT_2D0 ; 2D0, (D7A1, bit 0) - const EVENT_2D1 ; 2D1, (D7A1, bit 1) - const EVENT_2D2 ; 2D2, (D7A1, bit 2) - const EVENT_2D3 ; 2D3, (D7A1, bit 3) - const EVENT_2D4 ; 2D4, (D7A1, bit 4) - const EVENT_2D5 ; 2D5, (D7A1, bit 5) - const EVENT_2D6 ; 2D6, (D7A1, bit 6) - const EVENT_GOT_TM35 ; 2D7, (D7A1, bit 7) - const EVENT_2D8 ; 2D8, (D7A2, bit 0) - const EVENT_2D9 ; 2D9, (D7A2, bit 1) - const EVENT_2DA ; 2DA, (D7A2, bit 2) - const EVENT_2DB ; 2DB, (D7A2, bit 3) - const EVENT_2DC ; 2DC, (D7A2, bit 4) - const EVENT_2DD ; 2DD, (D7A2, bit 5) - const EVENT_2DE ; 2DE, (D7A2, bit 6) - const EVENT_2DF ; 2DF, (D7A2, bit 7) - const EVENT_GAVE_FOSSIL_TO_LAB ; 2E0, (D7A3, bit 0) - const EVENT_LAB_STILL_REVIVING_FOSSIL ; 2E1, (D7A3, bit 1) - const EVENT_LAB_HANDING_OVER_FOSSIL_MON ; 2E2, (D7A3, bit 2) - const EVENT_2E3 ; 2E3, (D7A3, bit 3) - const EVENT_2E4 ; 2E4, (D7A3, bit 4) - const EVENT_2E5 ; 2E5, (D7A3, bit 5) - const EVENT_2E6 ; 2E6, (D7A3, bit 6) - const EVENT_2E7 ; 2E7, (D7A3, bit 7) - const EVENT_2E8 ; 2E8, (D7A4, bit 0) - const EVENT_2E9 ; 2E9, (D7A4, bit 1) - const EVENT_2EA ; 2EA, (D7A4, bit 2) - const EVENT_2EB ; 2EB, (D7A4, bit 3) - const EVENT_2EC ; 2EC, (D7A4, bit 4) - const EVENT_2ED ; 2ED, (D7A4, bit 5) - const EVENT_2EE ; 2EE, (D7A4, bit 6) - const EVENT_2EF ; 2EF, (D7A4, bit 7) - const EVENT_2F0 ; 2F0, (D7A5, bit 0) - const EVENT_2F1 ; 2F1, (D7A5, bit 1) - const EVENT_2F2 ; 2F2, (D7A5, bit 2) - const EVENT_2F3 ; 2F3, (D7A5, bit 3) - const EVENT_2F4 ; 2F4, (D7A5, bit 4) - const EVENT_2F5 ; 2F5, (D7A5, bit 5) - const EVENT_2F6 ; 2F6, (D7A5, bit 6) - const EVENT_2F7 ; 2F7, (D7A5, bit 7) - const EVENT_2F8 ; 2F8, (D7A6, bit 0) - const EVENT_2F9 ; 2F9, (D7A6, bit 1) - const EVENT_2FA ; 2FA, (D7A6, bit 2) - const EVENT_2FB ; 2FB, (D7A6, bit 3) - const EVENT_2FC ; 2FC, (D7A6, bit 4) - const EVENT_2FD ; 2FD, (D7A6, bit 5) - const EVENT_2FE ; 2FE, (D7A6, bit 6) - const EVENT_2FF ; 2FF, (D7A6, bit 7) - const EVENT_300 ; 300, (D7A7, bit 0) - const EVENT_301 ; 301, (D7A7, bit 1) - const EVENT_302 ; 302, (D7A7, bit 2) - const EVENT_303 ; 303, (D7A7, bit 3) - const EVENT_304 ; 304, (D7A7, bit 4) - const EVENT_305 ; 305, (D7A7, bit 5) - const EVENT_306 ; 306, (D7A7, bit 6) - const EVENT_307 ; 307, (D7A7, bit 7) - const EVENT_308 ; 308, (D7A8, bit 0) - const EVENT_309 ; 309, (D7A8, bit 1) - const EVENT_30A ; 30A, (D7A8, bit 2) - const EVENT_30B ; 30B, (D7A8, bit 3) - const EVENT_30C ; 30C, (D7A8, bit 4) - const EVENT_30D ; 30D, (D7A8, bit 5) - const EVENT_30E ; 30E, (D7A8, bit 6) - const EVENT_30F ; 30F, (D7A8, bit 7) - const EVENT_310 ; 310, (D7A9, bit 0) - const EVENT_311 ; 311, (D7A9, bit 1) - const EVENT_312 ; 312, (D7A9, bit 2) - const EVENT_313 ; 313, (D7A9, bit 3) - const EVENT_314 ; 314, (D7A9, bit 4) - const EVENT_315 ; 315, (D7A9, bit 5) - const EVENT_316 ; 316, (D7A9, bit 6) - const EVENT_317 ; 317, (D7A9, bit 7) - const EVENT_318 ; 318, (D7AA, bit 0) - const EVENT_319 ; 319, (D7AA, bit 1) - const EVENT_31A ; 31A, (D7AA, bit 2) - const EVENT_31B ; 31B, (D7AA, bit 3) - const EVENT_31C ; 31C, (D7AA, bit 4) - const EVENT_31D ; 31D, (D7AA, bit 5) - const EVENT_31E ; 31E, (D7AA, bit 6) - const EVENT_31F ; 31F, (D7AA, bit 7) - const EVENT_320 ; 320, (D7AB, bit 0) - const EVENT_321 ; 321, (D7AB, bit 1) - const EVENT_322 ; 322, (D7AB, bit 2) - const EVENT_323 ; 323, (D7AB, bit 3) - const EVENT_324 ; 324, (D7AB, bit 4) - const EVENT_325 ; 325, (D7AB, bit 5) - const EVENT_326 ; 326, (D7AB, bit 6) - const EVENT_327 ; 327, (D7AB, bit 7) - const EVENT_328 ; 328, (D7AC, bit 0) - const EVENT_329 ; 329, (D7AC, bit 1) - const EVENT_32A ; 32A, (D7AC, bit 2) - const EVENT_32B ; 32B, (D7AC, bit 3) - const EVENT_32C ; 32C, (D7AC, bit 4) - const EVENT_32D ; 32D, (D7AC, bit 5) - const EVENT_32E ; 32E, (D7AC, bit 6) - const EVENT_32F ; 32F, (D7AC, bit 7) - const EVENT_330 ; 330, (D7AD, bit 0) - const EVENT_331 ; 331, (D7AD, bit 1) - const EVENT_332 ; 332, (D7AD, bit 2) - const EVENT_333 ; 333, (D7AD, bit 3) - const EVENT_334 ; 334, (D7AD, bit 4) - const EVENT_335 ; 335, (D7AD, bit 5) - const EVENT_336 ; 336, (D7AD, bit 6) - const EVENT_337 ; 337, (D7AD, bit 7) - const EVENT_338 ; 338, (D7AE, bit 0) - const EVENT_339 ; 339, (D7AE, bit 1) - const EVENT_33A ; 33A, (D7AE, bit 2) - const EVENT_33B ; 33B, (D7AE, bit 3) - const EVENT_33C ; 33C, (D7AE, bit 4) - const EVENT_33D ; 33D, (D7AE, bit 5) - const EVENT_33E ; 33E, (D7AE, bit 6) - const EVENT_33F ; 33F, (D7AE, bit 7) - const EVENT_GOT_TM31 ; 340, (D7AF, bit 0) - const EVENT_341 ; 341, (D7AF, bit 1) - const EVENT_342 ; 342, (D7AF, bit 2) - const EVENT_343 ; 343, (D7AF, bit 3) - const EVENT_344 ; 344, (D7AF, bit 4) - const EVENT_345 ; 345, (D7AF, bit 5) - const EVENT_346 ; 346, (D7AF, bit 6) - const EVENT_347 ; 347, (D7AF, bit 7) - const EVENT_348 ; 348, (D7B0, bit 0) - const EVENT_349 ; 349, (D7B0, bit 1) - const EVENT_34A ; 34A, (D7B0, bit 2) - const EVENT_34B ; 34B, (D7B0, bit 3) - const EVENT_34C ; 34C, (D7B0, bit 4) - const EVENT_34D ; 34D, (D7B0, bit 5) - const EVENT_34E ; 34E, (D7B0, bit 6) - const EVENT_34F ; 34F, (D7B0, bit 7) - const EVENT_DEFEATED_FIGHTING_DOJO ; 350, (D7B1, bit 0) - const EVENT_BEAT_KARATE_MASTER ; 351, (D7B1, bit 1) - const EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 ; 352, (D7B1, bit 2) - const EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 ; 353, (D7B1, bit 3) - const EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 ; 354, (D7B1, bit 4) - const EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 ; 355, (D7B1, bit 5) - const EVENT_GOT_HITMONLEE ; 356, (D7B1, bit 6) - const EVENT_GOT_HITMONCHAN ; 357, (D7B1, bit 7) - const EVENT_358 ; 358, (D7B2, bit 0) - const EVENT_359 ; 359, (D7B2, bit 1) - const EVENT_35A ; 35A, (D7B2, bit 2) - const EVENT_35B ; 35B, (D7B2, bit 3) - const EVENT_35C ; 35C, (D7B2, bit 4) - const EVENT_35D ; 35D, (D7B2, bit 5) - const EVENT_35E ; 35E, (D7B2, bit 6) - const EVENT_35F ; 35F, (D7B2, bit 7) - const EVENT_GOT_TM46 ; 360, (D7B3, bit 0) - const EVENT_BEAT_SABRINA ; 361, (D7B3, bit 1) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_0 ; 362, (D7B3, bit 2) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_1 ; 363, (D7B3, bit 3) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_2 ; 364, (D7B3, bit 4) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_3 ; 365, (D7B3, bit 5) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_4 ; 366, (D7B3, bit 6) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_5 ; 367, (D7B3, bit 7) - const EVENT_BEAT_SAFFRON_GYM_TRAINER_6 ; 368, (D7B4, bit 0) - const EVENT_369 ; 369, (D7B4, bit 1) - const EVENT_36A ; 36A, (D7B4, bit 2) - const EVENT_36B ; 36B, (D7B4, bit 3) - const EVENT_36C ; 36C, (D7B4, bit 4) - const EVENT_36D ; 36D, (D7B4, bit 5) - const EVENT_36E ; 36E, (D7B4, bit 6) - const EVENT_36F ; 36F, (D7B4, bit 7) - const EVENT_370 ; 370, (D7B5, bit 0) - const EVENT_371 ; 371, (D7B5, bit 1) - const EVENT_372 ; 372, (D7B5, bit 2) - const EVENT_373 ; 373, (D7B5, bit 3) - const EVENT_374 ; 374, (D7B5, bit 4) - const EVENT_375 ; 375, (D7B5, bit 5) - const EVENT_376 ; 376, (D7B5, bit 6) - const EVENT_377 ; 377, (D7B5, bit 7) - const EVENT_378 ; 378, (D7B6, bit 0) - const EVENT_379 ; 379, (D7B6, bit 1) - const EVENT_37A ; 37A, (D7B6, bit 2) - const EVENT_37B ; 37B, (D7B6, bit 3) - const EVENT_37C ; 37C, (D7B6, bit 4) - const EVENT_37D ; 37D, (D7B6, bit 5) - const EVENT_37E ; 37E, (D7B6, bit 6) - const EVENT_37F ; 37F, (D7B6, bit 7) - const EVENT_380 ; 380, (D7B7, bit 0) - const EVENT_381 ; 381, (D7B7, bit 1) - const EVENT_382 ; 382, (D7B7, bit 2) - const EVENT_383 ; 383, (D7B7, bit 3) - const EVENT_384 ; 384, (D7B7, bit 4) - const EVENT_385 ; 385, (D7B7, bit 5) - const EVENT_386 ; 386, (D7B7, bit 6) - const EVENT_387 ; 387, (D7B7, bit 7) - const EVENT_388 ; 388, (D7B8, bit 0) - const EVENT_389 ; 389, (D7B8, bit 1) - const EVENT_38A ; 38A, (D7B8, bit 2) - const EVENT_38B ; 38B, (D7B8, bit 3) - const EVENT_38C ; 38C, (D7B8, bit 4) - const EVENT_38D ; 38D, (D7B8, bit 5) - const EVENT_38E ; 38E, (D7B8, bit 6) - const EVENT_38F ; 38F, (D7B8, bit 7) - const EVENT_390 ; 390, (D7B9, bit 0) - const EVENT_391 ; 391, (D7B9, bit 1) - const EVENT_392 ; 392, (D7B9, bit 2) - const EVENT_393 ; 393, (D7B9, bit 3) - const EVENT_394 ; 394, (D7B9, bit 4) - const EVENT_395 ; 395, (D7B9, bit 5) - const EVENT_396 ; 396, (D7B9, bit 6) - const EVENT_SILPH_CO_RECEPTIONIST_AT_DESK ; 397, (D7B9, bit 7) - const EVENT_398 ; 398, (D7BA, bit 0) - const EVENT_399 ; 399, (D7BA, bit 1) - const EVENT_39A ; 39A, (D7BA, bit 2) - const EVENT_39B ; 39B, (D7BA, bit 3) - const EVENT_39C ; 39C, (D7BA, bit 4) - const EVENT_39D ; 39D, (D7BA, bit 5) - const EVENT_39E ; 39E, (D7BA, bit 6) - const EVENT_39F ; 39F, (D7BA, bit 7) - const EVENT_3A0 ; 3A0, (D7BB, bit 0) - const EVENT_3A1 ; 3A1, (D7BB, bit 1) - const EVENT_3A2 ; 3A2, (D7BB, bit 2) - const EVENT_3A3 ; 3A3, (D7BB, bit 3) - const EVENT_3A4 ; 3A4, (D7BB, bit 4) - const EVENT_3A5 ; 3A5, (D7BB, bit 5) - const EVENT_3A6 ; 3A6, (D7BB, bit 6) - const EVENT_3A7 ; 3A7, (D7BB, bit 7) - const EVENT_3A8 ; 3A8, (D7BC, bit 0) - const EVENT_3A9 ; 3A9, (D7BC, bit 1) - const EVENT_3AA ; 3AA, (D7BC, bit 2) - const EVENT_3AB ; 3AB, (D7BC, bit 3) - const EVENT_3AC ; 3AC, (D7BC, bit 4) - const EVENT_3AD ; 3AD, (D7BC, bit 5) - const EVENT_3AE ; 3AE, (D7BC, bit 6) - const EVENT_3AF ; 3AF, (D7BC, bit 7) - const EVENT_GOT_TM29 ; 3B0, (D7BD, bit 0) - const EVENT_3B1 ; 3B1, (D7BD, bit 1) - const EVENT_3B2 ; 3B2, (D7BD, bit 2) - const EVENT_3B3 ; 3B3, (D7BD, bit 3) - const EVENT_3B4 ; 3B4, (D7BD, bit 4) - const EVENT_3B5 ; 3B5, (D7BD, bit 5) - const EVENT_3B6 ; 3B6, (D7BD, bit 6) - const EVENT_3B7 ; 3B7, (D7BD, bit 7) - const EVENT_3B8 ; 3B8, (D7BE, bit 0) - const EVENT_3B9 ; 3B9, (D7BE, bit 1) - const EVENT_3BA ; 3BA, (D7BE, bit 2) - const EVENT_3BB ; 3BB, (D7BE, bit 3) - const EVENT_3BC ; 3BC, (D7BE, bit 4) - const EVENT_3BD ; 3BD, (D7BE, bit 5) - const EVENT_3BE ; 3BE, (D7BE, bit 6) - const EVENT_3BF ; 3BF, (D7BE, bit 7) - const EVENT_GOT_POTION_SAMPLE ; 3C0, (D7BF, bit 0) - const EVENT_3C1 ; 3C1, (D7BF, bit 1) - const EVENT_3C2 ; 3C2, (D7BF, bit 2) - const EVENT_3C3 ; 3C3, (D7BF, bit 3) - const EVENT_3C4 ; 3C4, (D7BF, bit 4) - const EVENT_3C5 ; 3C5, (D7BF, bit 5) - const EVENT_3C6 ; 3C6, (D7BF, bit 6) - const EVENT_3C7 ; 3C7, (D7BF, bit 7) - const EVENT_3C8 ; 3C8, (D7C0, bit 0) - const EVENT_3C9 ; 3C9, (D7C0, bit 1) - const EVENT_3CA ; 3CA, (D7C0, bit 2) - const EVENT_3CB ; 3CB, (D7C0, bit 3) - const EVENT_3CC ; 3CC, (D7C0, bit 4) - const EVENT_3CD ; 3CD, (D7C0, bit 5) - const EVENT_3CE ; 3CE, (D7C0, bit 6) - const EVENT_3CF ; 3CF, (D7C0, bit 7) - const EVENT_3D0 ; 3D0, (D7C1, bit 0) - const EVENT_3D1 ; 3D1, (D7C1, bit 1) - const EVENT_3D2 ; 3D2, (D7C1, bit 2) - const EVENT_3D3 ; 3D3, (D7C1, bit 3) - const EVENT_3D4 ; 3D4, (D7C1, bit 4) - const EVENT_3D5 ; 3D5, (D7C1, bit 5) - const EVENT_3D6 ; 3D6, (D7C1, bit 6) - const EVENT_3D7 ; 3D7, (D7C1, bit 7) - const EVENT_GOT_HM05 ; 3D8, (D7C2, bit 0) - const EVENT_3D9 ; 3D9, (D7C2, bit 1) - const EVENT_3DA ; 3DA, (D7C2, bit 2) - const EVENT_3DB ; 3DB, (D7C2, bit 3) - const EVENT_3DC ; 3DC, (D7C2, bit 4) - const EVENT_3DD ; 3DD, (D7C2, bit 5) - const EVENT_3DE ; 3DE, (D7C2, bit 6) - const EVENT_3DF ; 3DF, (D7C2, bit 7) - const EVENT_3E0 ; 3E0, (D7C3, bit 0) - const EVENT_3E1 ; 3E1, (D7C3, bit 1) - const EVENT_BEAT_ROUTE_3_TRAINER_0 ; 3E2, (D7C3, bit 2) - const EVENT_BEAT_ROUTE_3_TRAINER_1 ; 3E3, (D7C3, bit 3) - const EVENT_BEAT_ROUTE_3_TRAINER_2 ; 3E4, (D7C3, bit 4) - const EVENT_BEAT_ROUTE_3_TRAINER_3 ; 3E5, (D7C3, bit 5) - const EVENT_BEAT_ROUTE_3_TRAINER_4 ; 3E6, (D7C3, bit 6) - const EVENT_BEAT_ROUTE_3_TRAINER_5 ; 3E7, (D7C3, bit 7) - const EVENT_BEAT_ROUTE_3_TRAINER_6 ; 3E8, (D7C4, bit 0) - const EVENT_BEAT_ROUTE_3_TRAINER_7 ; 3E9, (D7C4, bit 1) - const EVENT_3EA ; 3EA, (D7C4, bit 2) - const EVENT_3EB ; 3EB, (D7C4, bit 3) - const EVENT_3EC ; 3EC, (D7C4, bit 4) - const EVENT_3ED ; 3ED, (D7C4, bit 5) - const EVENT_3EE ; 3EE, (D7C4, bit 6) - const EVENT_3EF ; 3EF, (D7C4, bit 7) - const EVENT_3F0 ; 3F0, (D7C5, bit 0) - const EVENT_3F1 ; 3F1, (D7C5, bit 1) - const EVENT_BEAT_ROUTE_4_TRAINER_0 ; 3F2, (D7C5, bit 2) - const EVENT_3F3 ; 3F3, (D7C5, bit 3) - const EVENT_3F4 ; 3F4, (D7C5, bit 4) - const EVENT_3F5 ; 3F5, (D7C5, bit 5) - const EVENT_3F6 ; 3F6, (D7C5, bit 6) - const EVENT_3F7 ; 3F7, (D7C5, bit 7) - const EVENT_3F8 ; 3F8, (D7C6, bit 0) - const EVENT_3F9 ; 3F9, (D7C6, bit 1) - const EVENT_3FA ; 3FA, (D7C6, bit 2) - const EVENT_3FB ; 3FB, (D7C6, bit 3) - const EVENT_3FC ; 3FC, (D7C6, bit 4) - const EVENT_3FD ; 3FD, (D7C6, bit 5) - const EVENT_3FE ; 3FE, (D7C6, bit 6) - const EVENT_BOUGHT_MAGIKARP ; 3FF, (D7C6, bit 7) - const EVENT_400 ; 400, (D7C7, bit 0) - const EVENT_401 ; 401, (D7C7, bit 1) - const EVENT_402 ; 402, (D7C7, bit 2) - const EVENT_403 ; 403, (D7C7, bit 3) - const EVENT_404 ; 404, (D7C7, bit 4) - const EVENT_405 ; 405, (D7C7, bit 5) - const EVENT_406 ; 406, (D7C7, bit 6) - const EVENT_407 ; 407, (D7C7, bit 7) - const EVENT_408 ; 408, (D7C8, bit 0) - const EVENT_409 ; 409, (D7C8, bit 1) - const EVENT_40A ; 40A, (D7C8, bit 2) - const EVENT_40B ; 40B, (D7C8, bit 3) - const EVENT_40C ; 40C, (D7C8, bit 4) - const EVENT_40D ; 40D, (D7C8, bit 5) - const EVENT_40E ; 40E, (D7C8, bit 6) - const EVENT_40F ; 40F, (D7C8, bit 7) - const EVENT_410 ; 410, (D7C9, bit 0) - const EVENT_BEAT_ROUTE_6_TRAINER_0 ; 411, (D7C9, bit 1) - const EVENT_BEAT_ROUTE_6_TRAINER_1 ; 412, (D7C9, bit 2) - const EVENT_BEAT_ROUTE_6_TRAINER_2 ; 413, (D7C9, bit 3) - const EVENT_BEAT_ROUTE_6_TRAINER_3 ; 414, (D7C9, bit 4) - const EVENT_BEAT_ROUTE_6_TRAINER_4 ; 415, (D7C9, bit 5) - const EVENT_BEAT_ROUTE_6_TRAINER_5 ; 416, (D7C9, bit 6) - const EVENT_417 ; 417, (D7C9, bit 7) - const EVENT_418 ; 418, (D7CA, bit 0) - const EVENT_419 ; 419, (D7CA, bit 1) - const EVENT_41A ; 41A, (D7CA, bit 2) - const EVENT_41B ; 41B, (D7CA, bit 3) - const EVENT_41C ; 41C, (D7CA, bit 4) - const EVENT_41D ; 41D, (D7CA, bit 5) - const EVENT_41E ; 41E, (D7CA, bit 6) - const EVENT_41F ; 41F, (D7CA, bit 7) - const EVENT_420 ; 420, (D7CB, bit 0) - const EVENT_421 ; 421, (D7CB, bit 1) - const EVENT_422 ; 422, (D7CB, bit 2) - const EVENT_423 ; 423, (D7CB, bit 3) - const EVENT_424 ; 424, (D7CB, bit 4) - const EVENT_425 ; 425, (D7CB, bit 5) - const EVENT_426 ; 426, (D7CB, bit 6) - const EVENT_427 ; 427, (D7CB, bit 7) - const EVENT_428 ; 428, (D7CC, bit 0) - const EVENT_429 ; 429, (D7CC, bit 1) - const EVENT_42A ; 42A, (D7CC, bit 2) - const EVENT_42B ; 42B, (D7CC, bit 3) - const EVENT_42C ; 42C, (D7CC, bit 4) - const EVENT_42D ; 42D, (D7CC, bit 5) - const EVENT_42E ; 42E, (D7CC, bit 6) - const EVENT_42F ; 42F, (D7CC, bit 7) - const EVENT_430 ; 430, (D7CD, bit 0) - const EVENT_BEAT_ROUTE_8_TRAINER_0 ; 431, (D7CD, bit 1) - const EVENT_BEAT_ROUTE_8_TRAINER_1 ; 432, (D7CD, bit 2) - const EVENT_BEAT_ROUTE_8_TRAINER_2 ; 433, (D7CD, bit 3) - const EVENT_BEAT_ROUTE_8_TRAINER_3 ; 434, (D7CD, bit 4) - const EVENT_BEAT_ROUTE_8_TRAINER_4 ; 435, (D7CD, bit 5) - const EVENT_BEAT_ROUTE_8_TRAINER_5 ; 436, (D7CD, bit 6) - const EVENT_BEAT_ROUTE_8_TRAINER_6 ; 437, (D7CD, bit 7) - const EVENT_BEAT_ROUTE_8_TRAINER_7 ; 438, (D7CE, bit 0) - const EVENT_BEAT_ROUTE_8_TRAINER_8 ; 439, (D7CE, bit 1) - const EVENT_43A ; 43A, (D7CE, bit 2) - const EVENT_43B ; 43B, (D7CE, bit 3) - const EVENT_43C ; 43C, (D7CE, bit 4) - const EVENT_43D ; 43D, (D7CE, bit 5) - const EVENT_43E ; 43E, (D7CE, bit 6) - const EVENT_43F ; 43F, (D7CE, bit 7) - const EVENT_440 ; 440, (D7CF, bit 0) - const EVENT_BEAT_ROUTE_9_TRAINER_0 ; 441, (D7CF, bit 1) - const EVENT_BEAT_ROUTE_9_TRAINER_1 ; 442, (D7CF, bit 2) - const EVENT_BEAT_ROUTE_9_TRAINER_2 ; 443, (D7CF, bit 3) - const EVENT_BEAT_ROUTE_9_TRAINER_3 ; 444, (D7CF, bit 4) - const EVENT_BEAT_ROUTE_9_TRAINER_4 ; 445, (D7CF, bit 5) - const EVENT_BEAT_ROUTE_9_TRAINER_5 ; 446, (D7CF, bit 6) - const EVENT_BEAT_ROUTE_9_TRAINER_6 ; 447, (D7CF, bit 7) - const EVENT_BEAT_ROUTE_9_TRAINER_7 ; 448, (D7D0, bit 0) - const EVENT_BEAT_ROUTE_9_TRAINER_8 ; 449, (D7D0, bit 1) - const EVENT_44A ; 44A, (D7D0, bit 2) - const EVENT_44B ; 44B, (D7D0, bit 3) - const EVENT_44C ; 44C, (D7D0, bit 4) - const EVENT_44D ; 44D, (D7D0, bit 5) - const EVENT_44E ; 44E, (D7D0, bit 6) - const EVENT_44F ; 44F, (D7D0, bit 7) - const EVENT_450 ; 450, (D7D1, bit 0) - const EVENT_BEAT_ROUTE_10_TRAINER_0 ; 451, (D7D1, bit 1) - const EVENT_BEAT_ROUTE_10_TRAINER_1 ; 452, (D7D1, bit 2) - const EVENT_BEAT_ROUTE_10_TRAINER_2 ; 453, (D7D1, bit 3) - const EVENT_BEAT_ROUTE_10_TRAINER_3 ; 454, (D7D1, bit 4) - const EVENT_BEAT_ROUTE_10_TRAINER_4 ; 455, (D7D1, bit 5) - const EVENT_BEAT_ROUTE_10_TRAINER_5 ; 456, (D7D1, bit 6) - const EVENT_457 ; 457, (D7D1, bit 7) - const EVENT_458 ; 458, (D7D2, bit 0) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 ; 459, (D7D2, bit 1) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 ; 45A, (D7D2, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 ; 45B, (D7D2, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 ; 45C, (D7D2, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 ; 45D, (D7D2, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 ; 45E, (D7D2, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 ; 45F, (D7D2, bit 7) - const EVENT_460 ; 460, (D7D3, bit 0) - const EVENT_BEAT_POWER_PLANT_VOLTORB_0 ; 461, (D7D3, bit 1) - const EVENT_BEAT_POWER_PLANT_VOLTORB_1 ; 462, (D7D3, bit 2) - const EVENT_BEAT_POWER_PLANT_VOLTORB_2 ; 463, (D7D3, bit 3) - const EVENT_BEAT_POWER_PLANT_VOLTORB_3 ; 464, (D7D3, bit 4) - const EVENT_BEAT_POWER_PLANT_VOLTORB_4 ; 465, (D7D3, bit 5) - const EVENT_BEAT_POWER_PLANT_VOLTORB_5 ; 466, (D7D3, bit 6) - const EVENT_BEAT_POWER_PLANT_VOLTORB_6 ; 467, (D7D3, bit 7) - const EVENT_BEAT_POWER_PLANT_VOLTORB_7 ; 468, (D7D4, bit 0) - const EVENT_BEAT_ZAPDOS ; 469, (D7D4, bit 1) - const EVENT_46A ; 46A, (D7D4, bit 2) - const EVENT_46B ; 46B, (D7D4, bit 3) - const EVENT_46C ; 46C, (D7D4, bit 4) - const EVENT_46D ; 46D, (D7D4, bit 5) - const EVENT_46E ; 46E, (D7D4, bit 6) - const EVENT_46F ; 46F, (D7D4, bit 7) - const EVENT_470 ; 470, (D7D5, bit 0) - const EVENT_BEAT_ROUTE_11_TRAINER_0 ; 471, (D7D5, bit 1) - const EVENT_BEAT_ROUTE_11_TRAINER_1 ; 472, (D7D5, bit 2) - const EVENT_BEAT_ROUTE_11_TRAINER_2 ; 473, (D7D5, bit 3) - const EVENT_BEAT_ROUTE_11_TRAINER_3 ; 474, (D7D5, bit 4) - const EVENT_BEAT_ROUTE_11_TRAINER_4 ; 475, (D7D5, bit 5) - const EVENT_BEAT_ROUTE_11_TRAINER_5 ; 476, (D7D5, bit 6) - const EVENT_BEAT_ROUTE_11_TRAINER_6 ; 477, (D7D5, bit 7) - const EVENT_BEAT_ROUTE_11_TRAINER_7 ; 478, (D7D6, bit 0) - const EVENT_BEAT_ROUTE_11_TRAINER_8 ; 479, (D7D6, bit 1) - const EVENT_BEAT_ROUTE_11_TRAINER_9 ; 47A, (D7D6, bit 2) - const EVENT_47B ; 47B, (D7D6, bit 3) - const EVENT_47C ; 47C, (D7D6, bit 4) - const EVENT_47D ; 47D, (D7D6, bit 5) - const EVENT_47E ; 47E, (D7D6, bit 6) - const EVENT_GOT_ITEMFINDER ; 47F, (D7D6, bit 7) - const EVENT_GOT_TM39 ; 480, (D7D7, bit 0) - const EVENT_481 ; 481, (D7D7, bit 1) - const EVENT_BEAT_ROUTE_12_TRAINER_0 ; 482, (D7D7, bit 2) - const EVENT_BEAT_ROUTE_12_TRAINER_1 ; 483, (D7D7, bit 3) - const EVENT_BEAT_ROUTE_12_TRAINER_2 ; 484, (D7D7, bit 4) - const EVENT_BEAT_ROUTE_12_TRAINER_3 ; 485, (D7D7, bit 5) - const EVENT_BEAT_ROUTE_12_TRAINER_4 ; 486, (D7D7, bit 6) - const EVENT_BEAT_ROUTE_12_TRAINER_5 ; 487, (D7D7, bit 7) - const EVENT_BEAT_ROUTE_12_TRAINER_6 ; 488, (D7D8, bit 0) - const EVENT_489 ; 489, (D7D8, bit 1) - const EVENT_48A ; 48A, (D7D8, bit 2) - const EVENT_48B ; 48B, (D7D8, bit 3) - const EVENT_48C ; 48C, (D7D8, bit 4) - const EVENT_48D ; 48D, (D7D8, bit 5) - const EVENT_FIGHT_ROUTE12_SNORLAX ; 48E, (D7D8, bit 6) - const EVENT_BEAT_ROUTE12_SNORLAX ; 48F, (D7D8, bit 7) - const EVENT_490 ; 490, (D7D9, bit 0) - const EVENT_BEAT_ROUTE_13_TRAINER_0 ; 491, (D7D9, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_1 ; 492, (D7D9, bit 2) - const EVENT_BEAT_ROUTE_13_TRAINER_2 ; 493, (D7D9, bit 3) - const EVENT_BEAT_ROUTE_13_TRAINER_3 ; 494, (D7D9, bit 4) - const EVENT_BEAT_ROUTE_13_TRAINER_4 ; 495, (D7D9, bit 5) - const EVENT_BEAT_ROUTE_13_TRAINER_5 ; 496, (D7D9, bit 6) - const EVENT_BEAT_ROUTE_13_TRAINER_6 ; 497, (D7D9, bit 7) - const EVENT_BEAT_ROUTE_13_TRAINER_7 ; 498, (D7DA, bit 0) - const EVENT_BEAT_ROUTE_13_TRAINER_8 ; 499, (D7DA, bit 1) - const EVENT_BEAT_ROUTE_13_TRAINER_9 ; 49A, (D7DA, bit 2) - const EVENT_49B ; 49B, (D7DA, bit 3) - const EVENT_49C ; 49C, (D7DA, bit 4) - const EVENT_49D ; 49D, (D7DA, bit 5) - const EVENT_49E ; 49E, (D7DA, bit 6) - const EVENT_49F ; 49F, (D7DA, bit 7) - const EVENT_4A0 ; 4A0, (D7DB, bit 0) - const EVENT_BEAT_ROUTE_14_TRAINER_0 ; 4A1, (D7DB, bit 1) - const EVENT_BEAT_ROUTE_14_TRAINER_1 ; 4A2, (D7DB, bit 2) - const EVENT_BEAT_ROUTE_14_TRAINER_2 ; 4A3, (D7DB, bit 3) - const EVENT_BEAT_ROUTE_14_TRAINER_3 ; 4A4, (D7DB, bit 4) - const EVENT_BEAT_ROUTE_14_TRAINER_4 ; 4A5, (D7DB, bit 5) - const EVENT_BEAT_ROUTE_14_TRAINER_5 ; 4A6, (D7DB, bit 6) - const EVENT_BEAT_ROUTE_14_TRAINER_6 ; 4A7, (D7DB, bit 7) - const EVENT_BEAT_ROUTE_14_TRAINER_7 ; 4A8, (D7DC, bit 0) - const EVENT_BEAT_ROUTE_14_TRAINER_8 ; 4A9, (D7DC, bit 1) - const EVENT_BEAT_ROUTE_14_TRAINER_9 ; 4AA, (D7DC, bit 2) - const EVENT_4AB ; 4AB, (D7DC, bit 3) - const EVENT_4AC ; 4AC, (D7DC, bit 4) - const EVENT_4AD ; 4AD, (D7DC, bit 5) - const EVENT_4AE ; 4AE, (D7DC, bit 6) - const EVENT_4AF ; 4AF, (D7DC, bit 7) - const EVENT_GOT_EXP_ALL ; 4B0, (D7DD, bit 0) - const EVENT_BEAT_ROUTE_15_TRAINER_0 ; 4B1, (D7DD, bit 1) - const EVENT_BEAT_ROUTE_15_TRAINER_1 ; 4B2, (D7DD, bit 2) - const EVENT_BEAT_ROUTE_15_TRAINER_2 ; 4B3, (D7DD, bit 3) - const EVENT_BEAT_ROUTE_15_TRAINER_3 ; 4B4, (D7DD, bit 4) - const EVENT_BEAT_ROUTE_15_TRAINER_4 ; 4B5, (D7DD, bit 5) - const EVENT_BEAT_ROUTE_15_TRAINER_5 ; 4B6, (D7DD, bit 6) - const EVENT_BEAT_ROUTE_15_TRAINER_6 ; 4B7, (D7DD, bit 7) - const EVENT_BEAT_ROUTE_15_TRAINER_7 ; 4B8, (D7DE, bit 0) - const EVENT_BEAT_ROUTE_15_TRAINER_8 ; 4B9, (D7DE, bit 1) - const EVENT_BEAT_ROUTE_15_TRAINER_9 ; 4BA, (D7DE, bit 2) - const EVENT_4BB ; 4BB, (D7DE, bit 3) - const EVENT_4BC ; 4BC, (D7DE, bit 4) - const EVENT_4BD ; 4BD, (D7DE, bit 5) - const EVENT_4BE ; 4BE, (D7DE, bit 6) - const EVENT_4BF ; 4BF, (D7DE, bit 7) - const EVENT_4C0 ; 4C0, (D7DF, bit 0) - const EVENT_BEAT_ROUTE_16_TRAINER_0 ; 4C1, (D7DF, bit 1) - const EVENT_BEAT_ROUTE_16_TRAINER_1 ; 4C2, (D7DF, bit 2) - const EVENT_BEAT_ROUTE_16_TRAINER_2 ; 4C3, (D7DF, bit 3) - const EVENT_BEAT_ROUTE_16_TRAINER_3 ; 4C4, (D7DF, bit 4) - const EVENT_BEAT_ROUTE_16_TRAINER_4 ; 4C5, (D7DF, bit 5) - const EVENT_BEAT_ROUTE_16_TRAINER_5 ; 4C6, (D7DF, bit 6) - const EVENT_4C7 ; 4C7, (D7DF, bit 7) - const EVENT_FIGHT_ROUTE16_SNORLAX ; 4C8, (D7E0, bit 0) - const EVENT_BEAT_ROUTE16_SNORLAX ; 4C9, (D7E0, bit 1) - const EVENT_4CA ; 4CA, (D7E0, bit 2) - const EVENT_4CB ; 4CB, (D7E0, bit 3) - const EVENT_4CC ; 4CC, (D7E0, bit 4) - const EVENT_4CD ; 4CD, (D7E0, bit 5) - const EVENT_GOT_HM02 ; 4CE, (D7E0, bit 6) - const EVENT_RESCUED_MR_FUJI ; 4CF, (D7E0, bit 7) - const EVENT_4D0 ; 4D0, (D7E1, bit 0) - const EVENT_BEAT_ROUTE_17_TRAINER_0 ; 4D1, (D7E1, bit 1) - const EVENT_BEAT_ROUTE_17_TRAINER_1 ; 4D2, (D7E1, bit 2) - const EVENT_BEAT_ROUTE_17_TRAINER_2 ; 4D3, (D7E1, bit 3) - const EVENT_BEAT_ROUTE_17_TRAINER_3 ; 4D4, (D7E1, bit 4) - const EVENT_BEAT_ROUTE_17_TRAINER_4 ; 4D5, (D7E1, bit 5) - const EVENT_BEAT_ROUTE_17_TRAINER_5 ; 4D6, (D7E1, bit 6) - const EVENT_BEAT_ROUTE_17_TRAINER_6 ; 4D7, (D7E1, bit 7) - const EVENT_BEAT_ROUTE_17_TRAINER_7 ; 4D8, (D7E2, bit 0) - const EVENT_BEAT_ROUTE_17_TRAINER_8 ; 4D9, (D7E2, bit 1) - const EVENT_BEAT_ROUTE_17_TRAINER_9 ; 4DA, (D7E2, bit 2) - const EVENT_4DB ; 4DB, (D7E2, bit 3) - const EVENT_4DC ; 4DC, (D7E2, bit 4) - const EVENT_4DD ; 4DD, (D7E2, bit 5) - const EVENT_4DE ; 4DE, (D7E2, bit 6) - const EVENT_4DF ; 4DF, (D7E2, bit 7) - const EVENT_4E0 ; 4E0, (D7E3, bit 0) - const EVENT_BEAT_ROUTE_18_TRAINER_0 ; 4E1, (D7E3, bit 1) - const EVENT_BEAT_ROUTE_18_TRAINER_1 ; 4E2, (D7E3, bit 2) - const EVENT_BEAT_ROUTE_18_TRAINER_2 ; 4E3, (D7E3, bit 3) - const EVENT_4E4 ; 4E4, (D7E3, bit 4) - const EVENT_4E5 ; 4E5, (D7E3, bit 5) - const EVENT_4E6 ; 4E6, (D7E3, bit 6) - const EVENT_4E7 ; 4E7, (D7E3, bit 7) - const EVENT_4E8 ; 4E8, (D7E4, bit 0) - const EVENT_4E9 ; 4E9, (D7E4, bit 1) - const EVENT_4EA ; 4EA, (D7E4, bit 2) - const EVENT_4EB ; 4EB, (D7E4, bit 3) - const EVENT_4EC ; 4EC, (D7E4, bit 4) - const EVENT_4ED ; 4ED, (D7E4, bit 5) - const EVENT_4EE ; 4EE, (D7E4, bit 6) - const EVENT_4EF ; 4EF, (D7E4, bit 7) - const EVENT_4F0 ; 4F0, (D7E5, bit 0) - const EVENT_BEAT_ROUTE_19_TRAINER_0 ; 4F1, (D7E5, bit 1) - const EVENT_BEAT_ROUTE_19_TRAINER_1 ; 4F2, (D7E5, bit 2) - const EVENT_BEAT_ROUTE_19_TRAINER_2 ; 4F3, (D7E5, bit 3) - const EVENT_BEAT_ROUTE_19_TRAINER_3 ; 4F4, (D7E5, bit 4) - const EVENT_BEAT_ROUTE_19_TRAINER_4 ; 4F5, (D7E5, bit 5) - const EVENT_BEAT_ROUTE_19_TRAINER_5 ; 4F6, (D7E5, bit 6) - const EVENT_BEAT_ROUTE_19_TRAINER_6 ; 4F7, (D7E5, bit 7) - const EVENT_BEAT_ROUTE_19_TRAINER_7 ; 4F8, (D7E6, bit 0) - const EVENT_BEAT_ROUTE_19_TRAINER_8 ; 4F9, (D7E6, bit 1) - const EVENT_BEAT_ROUTE_19_TRAINER_9 ; 4FA, (D7E6, bit 2) - const EVENT_4FB ; 4FB, (D7E6, bit 3) - const EVENT_4FC ; 4FC, (D7E6, bit 4) - const EVENT_4FD ; 4FD, (D7E6, bit 5) - const EVENT_4FE ; 4FE, (D7E6, bit 6) - const EVENT_4FF ; 4FF, (D7E6, bit 7) - const EVENT_IN_SEAFOAM_ISLANDS ; 500, (D7E7, bit 0) - const EVENT_BEAT_ROUTE_20_TRAINER_0 ; 501, (D7E7, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_1 ; 502, (D7E7, bit 2) - const EVENT_BEAT_ROUTE_20_TRAINER_2 ; 503, (D7E7, bit 3) - const EVENT_BEAT_ROUTE_20_TRAINER_3 ; 504, (D7E7, bit 4) - const EVENT_BEAT_ROUTE_20_TRAINER_4 ; 505, (D7E7, bit 5) - const EVENT_BEAT_ROUTE_20_TRAINER_5 ; 506, (D7E7, bit 6) - const EVENT_BEAT_ROUTE_20_TRAINER_6 ; 507, (D7E7, bit 7) - const EVENT_BEAT_ROUTE_20_TRAINER_7 ; 508, (D7E8, bit 0) - const EVENT_BEAT_ROUTE_20_TRAINER_8 ; 509, (D7E8, bit 1) - const EVENT_BEAT_ROUTE_20_TRAINER_9 ; 50A, (D7E8, bit 2) - const EVENT_50B ; 50B, (D7E8, bit 3) - const EVENT_50C ; 50C, (D7E8, bit 4) - const EVENT_50D ; 50D, (D7E8, bit 5) - const EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE ; 50E, (D7E8, bit 6) - const EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE ; 50F, (D7E8, bit 7) - const EVENT_510 ; 510, (D7E9, bit 0) - const EVENT_BEAT_ROUTE_21_TRAINER_0 ; 511, (D7E9, bit 1) - const EVENT_BEAT_ROUTE_21_TRAINER_1 ; 512, (D7E9, bit 2) - const EVENT_BEAT_ROUTE_21_TRAINER_2 ; 513, (D7E9, bit 3) - const EVENT_BEAT_ROUTE_21_TRAINER_3 ; 514, (D7E9, bit 4) - const EVENT_BEAT_ROUTE_21_TRAINER_4 ; 515, (D7E9, bit 5) - const EVENT_BEAT_ROUTE_21_TRAINER_5 ; 516, (D7E9, bit 6) - const EVENT_BEAT_ROUTE_21_TRAINER_6 ; 517, (D7E9, bit 7) - const EVENT_BEAT_ROUTE_21_TRAINER_7 ; 518, (D7EA, bit 0) - const EVENT_BEAT_ROUTE_21_TRAINER_8 ; 519, (D7EA, bit 1) - const EVENT_51A ; 51A, (D7EA, bit 2) - const EVENT_51B ; 51B, (D7EA, bit 3) - const EVENT_51C ; 51C, (D7EA, bit 4) - const EVENT_51D ; 51D, (D7EA, bit 5) - const EVENT_51E ; 51E, (D7EA, bit 6) - const EVENT_51F ; 51F, (D7EA, bit 7) - const EVENT_1ST_ROUTE22_RIVAL_BATTLE ; 520, (D7EB, bit 0) - const EVENT_2ND_ROUTE22_RIVAL_BATTLE ; 521, (D7EB, bit 1) - const EVENT_522 ; 522, (D7EB, bit 2) - const EVENT_523 ; 523, (D7EB, bit 3) - const EVENT_524 ; 524, (D7EB, bit 4) - const EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE ; 525, (D7EB, bit 5) - const EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE ; 526, (D7EB, bit 6) - const EVENT_ROUTE22_RIVAL_WANTS_BATTLE ; 527, (D7EB, bit 7) - const EVENT_528 ; 528, (D7EC, bit 0) - const EVENT_529 ; 529, (D7EC, bit 1) - const EVENT_52A ; 52A, (D7EC, bit 2) - const EVENT_52B ; 52B, (D7EC, bit 3) - const EVENT_52C ; 52C, (D7EC, bit 4) - const EVENT_52D ; 52D, (D7EC, bit 5) - const EVENT_52E ; 52E, (D7EC, bit 6) - const EVENT_52F ; 52F, (D7EC, bit 7) - const EVENT_PASSED_CASCADEBADGE_CHECK ; 530, (D7ED, bit 0) - const EVENT_PASSED_THUNDERBADGE_CHECK ; 531, (D7ED, bit 1) - const EVENT_PASSED_RAINBOWBADGE_CHECK ; 532, (D7ED, bit 2) - const EVENT_PASSED_SOULBADGE_CHECK ; 533, (D7ED, bit 3) - const EVENT_PASSED_MARSHBADGE_CHECK ; 534, (D7ED, bit 4) - const EVENT_PASSED_VOLCANOBADGE_CHECK ; 535, (D7ED, bit 5) - const EVENT_PASSED_EARTHBADGE_CHECK ; 536, (D7ED, bit 6) - const EVENT_537 ; 537, (D7ED, bit 7) - const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ; 538, (D7EE, bit 0) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 ; 539, (D7EE, bit 1) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 ; 53A, (D7EE, bit 2) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 ; 53B, (D7EE, bit 3) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 ; 53C, (D7EE, bit 4) - const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 ; 53D, (D7EE, bit 5) - const EVENT_BEAT_MOLTRES ; 53E, (D7EE, bit 6) - const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ; 53F, (D7EE, bit 7) - const EVENT_GOT_NUGGET ; 540, (D7EF, bit 0) - const EVENT_BEAT_ROUTE24_ROCKET ; 541, (D7EF, bit 1) - const EVENT_BEAT_ROUTE_24_TRAINER_0 ; 542, (D7EF, bit 2) - const EVENT_BEAT_ROUTE_24_TRAINER_1 ; 543, (D7EF, bit 3) - const EVENT_BEAT_ROUTE_24_TRAINER_2 ; 544, (D7EF, bit 4) - const EVENT_BEAT_ROUTE_24_TRAINER_3 ; 545, (D7EF, bit 5) - const EVENT_BEAT_ROUTE_24_TRAINER_4 ; 546, (D7EF, bit 6) - const EVENT_BEAT_ROUTE_24_TRAINER_5 ; 547, (D7EF, bit 7) - const EVENT_548 ; 548, (D7F0, bit 0) - const EVENT_NUGGET_REWARD_AVAILABLE ; 549, (D7F0, bit 1) - const EVENT_54A ; 54A, (D7F0, bit 2) - const EVENT_54B ; 54B, (D7F0, bit 3) - const EVENT_54C ; 54C, (D7F0, bit 4) - const EVENT_54D ; 54D, (D7F0, bit 5) - const EVENT_54E ; 54E, (D7F0, bit 6) - const EVENT_54F ; 54F, (D7F0, bit 7) - const EVENT_MET_BILL ; 550, (D7F1, bit 0) - const EVENT_BEAT_ROUTE_25_TRAINER_0 ; 551, (D7F1, bit 1) - const EVENT_BEAT_ROUTE_25_TRAINER_1 ; 552, (D7F1, bit 2) - const EVENT_BEAT_ROUTE_25_TRAINER_2 ; 553, (D7F1, bit 3) - const EVENT_BEAT_ROUTE_25_TRAINER_3 ; 554, (D7F1, bit 4) - const EVENT_BEAT_ROUTE_25_TRAINER_4 ; 555, (D7F1, bit 5) - const EVENT_BEAT_ROUTE_25_TRAINER_5 ; 556, (D7F1, bit 6) - const EVENT_BEAT_ROUTE_25_TRAINER_6 ; 557, (D7F1, bit 7) - const EVENT_BEAT_ROUTE_25_TRAINER_7 ; 558, (D7F2, bit 0) - const EVENT_BEAT_ROUTE_25_TRAINER_8 ; 559, (D7F2, bit 1) - const EVENT_55A ; 55A, (D7F2, bit 2) - const EVENT_USED_CELL_SEPARATOR_ON_BILL ; 55B, (D7F2, bit 3) - const EVENT_GOT_SS_TICKET ; 55C, (D7F2, bit 4) - const EVENT_MET_BILL_2 ; 55D, (D7F2, bit 5) - const EVENT_BILL_SAID_USE_CELL_SEPARATOR ; 55E, (D7F2, bit 6) - const EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ; 55F, (D7F2, bit 7) - const EVENT_560 ; 560, (D7F3, bit 0) - const EVENT_561 ; 561, (D7F3, bit 1) - const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 ; 562, (D7F3, bit 2) - const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 ; 563, (D7F3, bit 3) - const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 ; 564, (D7F3, bit 4) - const EVENT_565 ; 565, (D7F3, bit 5) - const EVENT_566 ; 566, (D7F3, bit 6) - const EVENT_567 ; 567, (D7F3, bit 7) - const EVENT_568 ; 568, (D7F4, bit 0) - const EVENT_569 ; 569, (D7F4, bit 1) - const EVENT_56A ; 56A, (D7F4, bit 2) - const EVENT_56B ; 56B, (D7F4, bit 3) - const EVENT_56C ; 56C, (D7F4, bit 4) - const EVENT_56D ; 56D, (D7F4, bit 5) - const EVENT_56E ; 56E, (D7F4, bit 6) - const EVENT_56F ; 56F, (D7F4, bit 7) - const EVENT_570 ; 570, (D7F5, bit 0) - const EVENT_BEAT_MT_MOON_1_TRAINER_0 ; 571, (D7F5, bit 1) - const EVENT_BEAT_MT_MOON_1_TRAINER_1 ; 572, (D7F5, bit 2) - const EVENT_BEAT_MT_MOON_1_TRAINER_2 ; 573, (D7F5, bit 3) - const EVENT_BEAT_MT_MOON_1_TRAINER_3 ; 574, (D7F5, bit 4) - const EVENT_BEAT_MT_MOON_1_TRAINER_4 ; 575, (D7F5, bit 5) - const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 576, (D7F5, bit 6) - const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 577, (D7F5, bit 7) - const EVENT_578 ; 578, (D7F6, bit 0) - const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ; 579, (D7F6, bit 1) - const EVENT_BEAT_MT_MOON_3_TRAINER_0 ; 57A, (D7F6, bit 2) - const EVENT_BEAT_MT_MOON_3_TRAINER_1 ; 57B, (D7F6, bit 3) - const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57C, (D7F6, bit 4) - const EVENT_BEAT_MT_MOON_3_TRAINER_3 ; 57D, (D7F6, bit 5) - const EVENT_GOT_DOME_FOSSIL ; 57E, (D7F6, bit 6) - const EVENT_GOT_HELIX_FOSSIL ; 57F, (D7F6, bit 7) - const EVENT_580 ; 580, (D7F7, bit 0) - const EVENT_581 ; 581, (D7F7, bit 1) - const EVENT_582 ; 582, (D7F7, bit 2) - const EVENT_583 ; 583, (D7F7, bit 3) - const EVENT_584 ; 584, (D7F7, bit 4) - const EVENT_585 ; 585, (D7F7, bit 5) - const EVENT_586 ; 586, (D7F7, bit 6) - const EVENT_587 ; 587, (D7F7, bit 7) - const EVENT_588 ; 588, (D7F8, bit 0) - const EVENT_589 ; 589, (D7F8, bit 1) - const EVENT_58A ; 58A, (D7F8, bit 2) - const EVENT_58B ; 58B, (D7F8, bit 3) - const EVENT_58C ; 58C, (D7F8, bit 4) - const EVENT_58D ; 58D, (D7F8, bit 5) - const EVENT_58E ; 58E, (D7F8, bit 6) - const EVENT_58F ; 58F, (D7F8, bit 7) - const EVENT_590 ; 590, (D7F9, bit 0) - const EVENT_591 ; 591, (D7F9, bit 1) - const EVENT_592 ; 592, (D7F9, bit 2) - const EVENT_593 ; 593, (D7F9, bit 3) - const EVENT_594 ; 594, (D7F9, bit 4) - const EVENT_595 ; 595, (D7F9, bit 5) - const EVENT_596 ; 596, (D7F9, bit 6) - const EVENT_597 ; 597, (D7F9, bit 7) - const EVENT_598 ; 598, (D7FA, bit 0) - const EVENT_599 ; 599, (D7FA, bit 1) - const EVENT_59A ; 59A, (D7FA, bit 2) - const EVENT_59B ; 59B, (D7FA, bit 3) - const EVENT_59C ; 59C, (D7FA, bit 4) - const EVENT_59D ; 59D, (D7FA, bit 5) - const EVENT_59E ; 59E, (D7FA, bit 6) - const EVENT_59F ; 59F, (D7FA, bit 7) - const EVENT_5A0 ; 5A0, (D7FB, bit 0) - const EVENT_5A1 ; 5A1, (D7FB, bit 1) - const EVENT_5A2 ; 5A2, (D7FB, bit 2) - const EVENT_5A3 ; 5A3, (D7FB, bit 3) - const EVENT_5A4 ; 5A4, (D7FB, bit 4) - const EVENT_5A5 ; 5A5, (D7FB, bit 5) - const EVENT_5A6 ; 5A6, (D7FB, bit 6) - const EVENT_5A7 ; 5A7, (D7FB, bit 7) - const EVENT_5A8 ; 5A8, (D7FC, bit 0) - const EVENT_5A9 ; 5A9, (D7FC, bit 1) - const EVENT_5AA ; 5AA, (D7FC, bit 2) - const EVENT_5AB ; 5AB, (D7FC, bit 3) - const EVENT_5AC ; 5AC, (D7FC, bit 4) - const EVENT_5AD ; 5AD, (D7FC, bit 5) - const EVENT_5AE ; 5AE, (D7FC, bit 6) - const EVENT_5AF ; 5AF, (D7FC, bit 7) - const EVENT_5B0 ; 5B0, (D7FD, bit 0) - const EVENT_5B1 ; 5B1, (D7FD, bit 1) - const EVENT_5B2 ; 5B2, (D7FD, bit 2) - const EVENT_5B3 ; 5B3, (D7FD, bit 3) - const EVENT_5B4 ; 5B4, (D7FD, bit 4) - const EVENT_5B5 ; 5B5, (D7FD, bit 5) - const EVENT_5B6 ; 5B6, (D7FD, bit 6) - const EVENT_5B7 ; 5B7, (D7FD, bit 7) - const EVENT_5B8 ; 5B8, (D7FE, bit 0) - const EVENT_5B9 ; 5B9, (D7FE, bit 1) - const EVENT_5BA ; 5BA, (D7FE, bit 2) - const EVENT_5BB ; 5BB, (D7FE, bit 3) - const EVENT_5BC ; 5BC, (D7FE, bit 4) - const EVENT_5BD ; 5BD, (D7FE, bit 5) - const EVENT_5BE ; 5BE, (D7FE, bit 6) - const EVENT_5BF ; 5BF, (D7FE, bit 7) - const EVENT_5C0 ; 5C0, (D7FF, bit 0) - const EVENT_5C1 ; 5C1, (D7FF, bit 1) - const EVENT_5C2 ; 5C2, (D7FF, bit 2) - const EVENT_5C3 ; 5C3, (D7FF, bit 3) - const EVENT_BEAT_SS_ANNE_5_TRAINER_0 ; 5C4, (D7FF, bit 4) - const EVENT_BEAT_SS_ANNE_5_TRAINER_1 ; 5C5, (D7FF, bit 5) - const EVENT_5C6 ; 5C6, (D7FF, bit 6) - const EVENT_5C7 ; 5C7, (D7FF, bit 7) - const EVENT_5C8 ; 5C8, (D800, bit 0) - const EVENT_5C9 ; 5C9, (D800, bit 1) - const EVENT_5CA ; 5CA, (D800, bit 2) - const EVENT_5CB ; 5CB, (D800, bit 3) - const EVENT_5CC ; 5CC, (D800, bit 4) - const EVENT_5CD ; 5CD, (D800, bit 5) - const EVENT_5CE ; 5CE, (D800, bit 6) - const EVENT_5CF ; 5CF, (D800, bit 7) - const EVENT_5D0 ; 5D0, (D801, bit 0) - const EVENT_5D1 ; 5D1, (D801, bit 1) - const EVENT_5D2 ; 5D2, (D801, bit 2) - const EVENT_5D3 ; 5D3, (D801, bit 3) - const EVENT_5D4 ; 5D4, (D801, bit 4) - const EVENT_5D5 ; 5D5, (D801, bit 5) - const EVENT_5D6 ; 5D6, (D801, bit 6) - const EVENT_5D7 ; 5D7, (D801, bit 7) - const EVENT_5D8 ; 5D8, (D802, bit 0) - const EVENT_5D9 ; 5D9, (D802, bit 1) - const EVENT_5DA ; 5DA, (D802, bit 2) - const EVENT_5DB ; 5DB, (D802, bit 3) - const EVENT_5DC ; 5DC, (D802, bit 4) - const EVENT_5DD ; 5DD, (D802, bit 5) - const EVENT_5DE ; 5DE, (D802, bit 6) - const EVENT_5DF ; 5DF, (D802, bit 7) - const EVENT_GOT_HM01 ; 5E0, (D803, bit 0) - const EVENT_RUBBED_CAPTAINS_BACK ; 5E1, (D803, bit 1) - const EVENT_SS_ANNE_LEFT ; 5E2, (D803, bit 2) - const EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ; 5E3, (D803, bit 3) - const EVENT_STARTED_WALKING_OUT_OF_DOCK ; 5E4, (D803, bit 4) - const EVENT_WALKED_OUT_OF_DOCK ; 5E5, (D803, bit 5) - const EVENT_5E6 ; 5E6, (D803, bit 6) - const EVENT_5E7 ; 5E7, (D803, bit 7) - const EVENT_5E8 ; 5E8, (D804, bit 0) - const EVENT_5E9 ; 5E9, (D804, bit 1) - const EVENT_5EA ; 5EA, (D804, bit 2) - const EVENT_5EB ; 5EB, (D804, bit 3) - const EVENT_5EC ; 5EC, (D804, bit 4) - const EVENT_5ED ; 5ED, (D804, bit 5) - const EVENT_5EE ; 5EE, (D804, bit 6) - const EVENT_5EF ; 5EF, (D804, bit 7) - const EVENT_5F0 ; 5F0, (D805, bit 0) - const EVENT_BEAT_SS_ANNE_8_TRAINER_0 ; 5F1, (D805, bit 1) - const EVENT_BEAT_SS_ANNE_8_TRAINER_1 ; 5F2, (D805, bit 2) - const EVENT_BEAT_SS_ANNE_8_TRAINER_2 ; 5F3, (D805, bit 3) - const EVENT_BEAT_SS_ANNE_8_TRAINER_3 ; 5F4, (D805, bit 4) - const EVENT_5F5 ; 5F5, (D805, bit 5) - const EVENT_5F6 ; 5F6, (D805, bit 6) - const EVENT_5F7 ; 5F7, (D805, bit 7) - const EVENT_5F8 ; 5F8, (D806, bit 0) - const EVENT_5F9 ; 5F9, (D806, bit 1) - const EVENT_5FA ; 5FA, (D806, bit 2) - const EVENT_5FB ; 5FB, (D806, bit 3) - const EVENT_5FC ; 5FC, (D806, bit 4) - const EVENT_5FD ; 5FD, (D806, bit 5) - const EVENT_5FE ; 5FE, (D806, bit 6) - const EVENT_5FF ; 5FF, (D806, bit 7) - const EVENT_600 ; 600, (D807, bit 0) - const EVENT_BEAT_SS_ANNE_9_TRAINER_0 ; 601, (D807, bit 1) - const EVENT_BEAT_SS_ANNE_9_TRAINER_1 ; 602, (D807, bit 2) - const EVENT_BEAT_SS_ANNE_9_TRAINER_2 ; 603, (D807, bit 3) - const EVENT_BEAT_SS_ANNE_9_TRAINER_3 ; 604, (D807, bit 4) - const EVENT_605 ; 605, (D807, bit 5) - const EVENT_606 ; 606, (D807, bit 6) - const EVENT_607 ; 607, (D807, bit 7) - const EVENT_608 ; 608, (D808, bit 0) - const EVENT_609 ; 609, (D808, bit 1) - const EVENT_60A ; 60A, (D808, bit 2) - const EVENT_60B ; 60B, (D808, bit 3) - const EVENT_60C ; 60C, (D808, bit 4) - const EVENT_60D ; 60D, (D808, bit 5) - const EVENT_60E ; 60E, (D808, bit 6) - const EVENT_60F ; 60F, (D808, bit 7) - const EVENT_610 ; 610, (D809, bit 0) - const EVENT_BEAT_SS_ANNE_10_TRAINER_0 ; 611, (D809, bit 1) - const EVENT_BEAT_SS_ANNE_10_TRAINER_1 ; 612, (D809, bit 2) - const EVENT_BEAT_SS_ANNE_10_TRAINER_2 ; 613, (D809, bit 3) - const EVENT_BEAT_SS_ANNE_10_TRAINER_3 ; 614, (D809, bit 4) - const EVENT_BEAT_SS_ANNE_10_TRAINER_4 ; 615, (D809, bit 5) - const EVENT_BEAT_SS_ANNE_10_TRAINER_5 ; 616, (D809, bit 6) - const EVENT_617 ; 617, (D809, bit 7) - const EVENT_618 ; 618, (D80A, bit 0) - const EVENT_619 ; 619, (D80A, bit 1) - const EVENT_61A ; 61A, (D80A, bit 2) - const EVENT_61B ; 61B, (D80A, bit 3) - const EVENT_61C ; 61C, (D80A, bit 4) - const EVENT_61D ; 61D, (D80A, bit 5) - const EVENT_61E ; 61E, (D80A, bit 6) - const EVENT_61F ; 61F, (D80A, bit 7) - const EVENT_620 ; 620, (D80B, bit 0) - const EVENT_621 ; 621, (D80B, bit 1) - const EVENT_622 ; 622, (D80B, bit 2) - const EVENT_623 ; 623, (D80B, bit 3) - const EVENT_624 ; 624, (D80B, bit 4) - const EVENT_625 ; 625, (D80B, bit 5) - const EVENT_626 ; 626, (D80B, bit 6) - const EVENT_627 ; 627, (D80B, bit 7) - const EVENT_628 ; 628, (D80C, bit 0) - const EVENT_629 ; 629, (D80C, bit 1) - const EVENT_62A ; 62A, (D80C, bit 2) - const EVENT_62B ; 62B, (D80C, bit 3) - const EVENT_62C ; 62C, (D80C, bit 4) - const EVENT_62D ; 62D, (D80C, bit 5) - const EVENT_62E ; 62E, (D80C, bit 6) - const EVENT_62F ; 62F, (D80C, bit 7) - const EVENT_630 ; 630, (D80D, bit 0) - const EVENT_631 ; 631, (D80D, bit 1) - const EVENT_632 ; 632, (D80D, bit 2) - const EVENT_633 ; 633, (D80D, bit 3) - const EVENT_634 ; 634, (D80D, bit 4) - const EVENT_635 ; 635, (D80D, bit 5) - const EVENT_636 ; 636, (D80D, bit 6) - const EVENT_637 ; 637, (D80D, bit 7) - const EVENT_638 ; 638, (D80E, bit 0) - const EVENT_639 ; 639, (D80E, bit 1) - const EVENT_63A ; 63A, (D80E, bit 2) - const EVENT_63B ; 63B, (D80E, bit 3) - const EVENT_63C ; 63C, (D80E, bit 4) - const EVENT_63D ; 63D, (D80E, bit 5) - const EVENT_63E ; 63E, (D80E, bit 6) - const EVENT_63F ; 63F, (D80E, bit 7) - const EVENT_640 ; 640, (D80F, bit 0) - const EVENT_641 ; 641, (D80F, bit 1) - const EVENT_642 ; 642, (D80F, bit 2) - const EVENT_643 ; 643, (D80F, bit 3) - const EVENT_644 ; 644, (D80F, bit 4) - const EVENT_645 ; 645, (D80F, bit 5) - const EVENT_646 ; 646, (D80F, bit 6) - const EVENT_647 ; 647, (D80F, bit 7) - const EVENT_648 ; 648, (D810, bit 0) - const EVENT_649 ; 649, (D810, bit 1) - const EVENT_64A ; 64A, (D810, bit 2) - const EVENT_64B ; 64B, (D810, bit 3) - const EVENT_64C ; 64C, (D810, bit 4) - const EVENT_64D ; 64D, (D810, bit 5) - const EVENT_64E ; 64E, (D810, bit 6) - const EVENT_64F ; 64F, (D810, bit 7) - const EVENT_650 ; 650, (D811, bit 0) - const EVENT_651 ; 651, (D811, bit 1) - const EVENT_652 ; 652, (D811, bit 2) - const EVENT_653 ; 653, (D811, bit 3) - const EVENT_654 ; 654, (D811, bit 4) - const EVENT_655 ; 655, (D811, bit 5) - const EVENT_656 ; 656, (D811, bit 6) - const EVENT_657 ; 657, (D811, bit 7) - const EVENT_658 ; 658, (D812, bit 0) - const EVENT_659 ; 659, (D812, bit 1) - const EVENT_65A ; 65A, (D812, bit 2) - const EVENT_65B ; 65B, (D812, bit 3) - const EVENT_65C ; 65C, (D812, bit 4) - const EVENT_65D ; 65D, (D812, bit 5) - const EVENT_65E ; 65E, (D812, bit 6) - const EVENT_65F ; 65F, (D812, bit 7) - const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ; 660, (D813, bit 0) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 ; 661, (D813, bit 1) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 ; 662, (D813, bit 2) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 ; 663, (D813, bit 3) - const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 ; 664, (D813, bit 4) - const EVENT_665 ; 665, (D813, bit 5) - const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 ; 666, (D813, bit 6) - const EVENT_667 ; 667, (D813, bit 7) - const EVENT_668 ; 668, (D814, bit 0) - const EVENT_669 ; 669, (D814, bit 1) - const EVENT_66A ; 66A, (D814, bit 2) - const EVENT_66B ; 66B, (D814, bit 3) - const EVENT_66C ; 66C, (D814, bit 4) - const EVENT_66D ; 66D, (D814, bit 5) - const EVENT_66E ; 66E, (D814, bit 6) - const EVENT_66F ; 66F, (D814, bit 7) - const EVENT_670 ; 670, (D815, bit 0) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 ; 671, (D815, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 ; 672, (D815, bit 2) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 ; 673, (D815, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 ; 674, (D815, bit 4) - const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ; 675, (D815, bit 5) - const EVENT_676 ; 676, (D815, bit 6) - const EVENT_677 ; 677, (D815, bit 7) - const EVENT_678 ; 678, (D816, bit 0) - const EVENT_679 ; 679, (D816, bit 1) - const EVENT_67A ; 67A, (D816, bit 2) - const EVENT_67B ; 67B, (D816, bit 3) - const EVENT_67C ; 67C, (D816, bit 4) - const EVENT_67D ; 67D, (D816, bit 5) - const EVENT_67E ; 67E, (D816, bit 6) - const EVENT_67F ; 67F, (D816, bit 7) - const EVENT_680 ; 680, (D817, bit 0) - const EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 ; 681, (D817, bit 1) - const EVENT_682 ; 682, (D817, bit 2) - const EVENT_683 ; 683, (D817, bit 3) - const EVENT_684 ; 684, (D817, bit 4) - const EVENT_685 ; 685, (D817, bit 5) - const EVENT_686 ; 686, (D817, bit 6) - const EVENT_687 ; 687, (D817, bit 7) - const EVENT_688 ; 688, (D818, bit 0) - const EVENT_689 ; 689, (D818, bit 1) - const EVENT_68A ; 68A, (D818, bit 2) - const EVENT_68B ; 68B, (D818, bit 3) - const EVENT_68C ; 68C, (D818, bit 4) - const EVENT_68D ; 68D, (D818, bit 5) - const EVENT_68E ; 68E, (D818, bit 6) - const EVENT_68F ; 68F, (D818, bit 7) - const EVENT_690 ; 690, (D819, bit 0) - const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 ; 691, (D819, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 ; 692, (D819, bit 2) - const EVENT_693 ; 693, (D819, bit 3) - const EVENT_694 ; 694, (D819, bit 4) - const EVENT_695 ; 695, (D819, bit 5) - const EVENT_696 ; 696, (D819, bit 6) - const EVENT_697 ; 697, (D819, bit 7) - const EVENT_698 ; 698, (D81A, bit 0) - const EVENT_699 ; 699, (D81A, bit 1) - const EVENT_69A ; 69A, (D81A, bit 2) - const EVENT_69B ; 69B, (D81A, bit 3) - const EVENT_69C ; 69C, (D81A, bit 4) - const EVENT_69D ; 69D, (D81A, bit 5) - const EVENT_69E ; 69E, (D81A, bit 6) - const EVENT_69F ; 69F, (D81A, bit 7) - const EVENT_6A0 ; 6A0, (D81B, bit 0) - const EVENT_6A1 ; 6A1, (D81B, bit 1) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 ; 6A2, (D81B, bit 2) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 ; 6A3, (D81B, bit 3) - const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 ; 6A4, (D81B, bit 4) - const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED ; 6A5, (D81B, bit 5) - const EVENT_ROCKET_DROPPED_LIFT_KEY ; 6A6, (D81B, bit 6) - const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI ; 6A7, (D81B, bit 7) - const EVENT_6A8 ; 6A8, (D81C, bit 0) - const EVENT_6A9 ; 6A9, (D81C, bit 1) - const EVENT_6AA ; 6AA, (D81C, bit 2) - const EVENT_6AB ; 6AB, (D81C, bit 3) - const EVENT_6AC ; 6AC, (D81C, bit 4) - const EVENT_6AD ; 6AD, (D81C, bit 5) - const EVENT_6AE ; 6AE, (D81C, bit 6) - const EVENT_6AF ; 6AF, (D81C, bit 7) - const EVENT_6B0 ; 6B0, (D81D, bit 0) - const EVENT_6B1 ; 6B1, (D81D, bit 1) - const EVENT_6B2 ; 6B2, (D81D, bit 2) - const EVENT_6B3 ; 6B3, (D81D, bit 3) - const EVENT_6B4 ; 6B4, (D81D, bit 4) - const EVENT_6B5 ; 6B5, (D81D, bit 5) - const EVENT_6B6 ; 6B6, (D81D, bit 6) - const EVENT_6B7 ; 6B7, (D81D, bit 7) - const EVENT_6B8 ; 6B8, (D81E, bit 0) - const EVENT_6B9 ; 6B9, (D81E, bit 1) - const EVENT_6BA ; 6BA, (D81E, bit 2) - const EVENT_6BB ; 6BB, (D81E, bit 3) - const EVENT_6BC ; 6BC, (D81E, bit 4) - const EVENT_6BD ; 6BD, (D81E, bit 5) - const EVENT_6BE ; 6BE, (D81E, bit 6) - const EVENT_6BF ; 6BF, (D81E, bit 7) - const EVENT_6C0 ; 6C0, (D81F, bit 0) - const EVENT_6C1 ; 6C1, (D81F, bit 1) - const EVENT_6C2 ; 6C2, (D81F, bit 2) - const EVENT_6C3 ; 6C3, (D81F, bit 3) - const EVENT_6C4 ; 6C4, (D81F, bit 4) - const EVENT_6C5 ; 6C5, (D81F, bit 5) - const EVENT_6C6 ; 6C6, (D81F, bit 6) - const EVENT_6C7 ; 6C7, (D81F, bit 7) - const EVENT_6C8 ; 6C8, (D820, bit 0) - const EVENT_6C9 ; 6C9, (D820, bit 1) - const EVENT_6CA ; 6CA, (D820, bit 2) - const EVENT_6CB ; 6CB, (D820, bit 3) - const EVENT_6CC ; 6CC, (D820, bit 4) - const EVENT_6CD ; 6CD, (D820, bit 5) - const EVENT_6CE ; 6CE, (D820, bit 6) - const EVENT_6CF ; 6CF, (D820, bit 7) - const EVENT_6D0 ; 6D0, (D821, bit 0) - const EVENT_6D1 ; 6D1, (D821, bit 1) - const EVENT_6D2 ; 6D2, (D821, bit 2) - const EVENT_6D3 ; 6D3, (D821, bit 3) - const EVENT_6D4 ; 6D4, (D821, bit 4) - const EVENT_6D5 ; 6D5, (D821, bit 5) - const EVENT_6D6 ; 6D6, (D821, bit 6) - const EVENT_6D7 ; 6D7, (D821, bit 7) - const EVENT_6D8 ; 6D8, (D822, bit 0) - const EVENT_6D9 ; 6D9, (D822, bit 1) - const EVENT_6DA ; 6DA, (D822, bit 2) - const EVENT_6DB ; 6DB, (D822, bit 3) - const EVENT_6DC ; 6DC, (D822, bit 4) - const EVENT_6DD ; 6DD, (D822, bit 5) - const EVENT_6DE ; 6DE, (D822, bit 6) - const EVENT_6DF ; 6DF, (D822, bit 7) - const EVENT_6E0 ; 6E0, (D823, bit 0) - const EVENT_6E1 ; 6E1, (D823, bit 1) - const EVENT_6E2 ; 6E2, (D823, bit 2) - const EVENT_6E3 ; 6E3, (D823, bit 3) - const EVENT_6E4 ; 6E4, (D823, bit 4) - const EVENT_6E5 ; 6E5, (D823, bit 5) - const EVENT_6E6 ; 6E6, (D823, bit 6) - const EVENT_6E7 ; 6E7, (D823, bit 7) - const EVENT_6E8 ; 6E8, (D824, bit 0) - const EVENT_6E9 ; 6E9, (D824, bit 1) - const EVENT_6EA ; 6EA, (D824, bit 2) - const EVENT_6EB ; 6EB, (D824, bit 3) - const EVENT_6EC ; 6EC, (D824, bit 4) - const EVENT_6ED ; 6ED, (D824, bit 5) - const EVENT_6EE ; 6EE, (D824, bit 6) - const EVENT_6EF ; 6EF, (D824, bit 7) - const EVENT_6F0 ; 6F0, (D825, bit 0) - const EVENT_6F1 ; 6F1, (D825, bit 1) - const EVENT_BEAT_SILPH_CO_2F_TRAINER_0 ; 6F2, (D825, bit 2) - const EVENT_BEAT_SILPH_CO_2F_TRAINER_1 ; 6F3, (D825, bit 3) - const EVENT_BEAT_SILPH_CO_2F_TRAINER_2 ; 6F4, (D825, bit 4) - const EVENT_BEAT_SILPH_CO_2F_TRAINER_3 ; 6F5, (D825, bit 5) - const EVENT_6F6 ; 6F6, (D825, bit 6) - const EVENT_6F7 ; 6F7, (D825, bit 7) - const EVENT_6F8 ; 6F8, (D826, bit 0) - const EVENT_6F9 ; 6F9, (D826, bit 1) - const EVENT_6FA ; 6FA, (D826, bit 2) - const EVENT_6FB ; 6FB, (D826, bit 3) - const EVENT_6FC ; 6FC, (D826, bit 4) - const EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ; 6FD, (D826, bit 5) - const EVENT_SILPH_CO_2_UNLOCKED_DOOR2 ; 6FE, (D826, bit 6) - const EVENT_GOT_TM36 ; 6FF, (D826, bit 7) - const EVENT_700 ; 700, (D827, bit 0) - const EVENT_701 ; 701, (D827, bit 1) - const EVENT_BEAT_SILPH_CO_3F_TRAINER_0 ; 702, (D827, bit 2) - const EVENT_BEAT_SILPH_CO_3F_TRAINER_1 ; 703, (D827, bit 3) - const EVENT_704 ; 704, (D827, bit 4) - const EVENT_705 ; 705, (D827, bit 5) - const EVENT_706 ; 706, (D827, bit 6) - const EVENT_707 ; 707, (D827, bit 7) - const EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ; 708, (D828, bit 0) - const EVENT_SILPH_CO_3_UNLOCKED_DOOR2 ; 709, (D828, bit 1) - const EVENT_70A ; 70A, (D828, bit 2) - const EVENT_70B ; 70B, (D828, bit 3) - const EVENT_70C ; 70C, (D828, bit 4) - const EVENT_70D ; 70D, (D828, bit 5) - const EVENT_70E ; 70E, (D828, bit 6) - const EVENT_70F ; 70F, (D828, bit 7) - const EVENT_710 ; 710, (D829, bit 0) - const EVENT_711 ; 711, (D829, bit 1) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_0 ; 712, (D829, bit 2) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_1 ; 713, (D829, bit 3) - const EVENT_BEAT_SILPH_CO_4F_TRAINER_2 ; 714, (D829, bit 4) - const EVENT_715 ; 715, (D829, bit 5) - const EVENT_716 ; 716, (D829, bit 6) - const EVENT_717 ; 717, (D829, bit 7) - const EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ; 718, (D82A, bit 0) - const EVENT_SILPH_CO_4_UNLOCKED_DOOR2 ; 719, (D82A, bit 1) - const EVENT_71A ; 71A, (D82A, bit 2) - const EVENT_71B ; 71B, (D82A, bit 3) - const EVENT_71C ; 71C, (D82A, bit 4) - const EVENT_71D ; 71D, (D82A, bit 5) - const EVENT_71E ; 71E, (D82A, bit 6) - const EVENT_71F ; 71F, (D82A, bit 7) - const EVENT_720 ; 720, (D82B, bit 0) - const EVENT_721 ; 721, (D82B, bit 1) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_0 ; 722, (D82B, bit 2) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_1 ; 723, (D82B, bit 3) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 ; 724, (D82B, bit 4) - const EVENT_BEAT_SILPH_CO_5F_TRAINER_3 ; 725, (D82B, bit 5) - const EVENT_726 ; 726, (D82B, bit 6) - const EVENT_727 ; 727, (D82B, bit 7) - const EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ; 728, (D82C, bit 0) - const EVENT_SILPH_CO_5_UNLOCKED_DOOR2 ; 729, (D82C, bit 1) - const EVENT_SILPH_CO_5_UNLOCKED_DOOR3 ; 72A, (D82C, bit 2) - const EVENT_72B ; 72B, (D82C, bit 3) - const EVENT_72C ; 72C, (D82C, bit 4) - const EVENT_72D ; 72D, (D82C, bit 5) - const EVENT_72E ; 72E, (D82C, bit 6) - const EVENT_72F ; 72F, (D82C, bit 7) - const EVENT_730 ; 730, (D82D, bit 0) - const EVENT_731 ; 731, (D82D, bit 1) - const EVENT_732 ; 732, (D82D, bit 2) - const EVENT_733 ; 733, (D82D, bit 3) - const EVENT_734 ; 734, (D82D, bit 4) - const EVENT_735 ; 735, (D82D, bit 5) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_0 ; 736, (D82D, bit 6) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_1 ; 737, (D82D, bit 7) - const EVENT_BEAT_SILPH_CO_6F_TRAINER_2 ; 738, (D82E, bit 0) - const EVENT_739 ; 739, (D82E, bit 1) - const EVENT_73A ; 73A, (D82E, bit 2) - const EVENT_73B ; 73B, (D82E, bit 3) - const EVENT_73C ; 73C, (D82E, bit 4) - const EVENT_73D ; 73D, (D82E, bit 5) - const EVENT_73E ; 73E, (D82E, bit 6) - const EVENT_SILPH_CO_6_UNLOCKED_DOOR ; 73F, (D82E, bit 7) - const EVENT_BEAT_SILPH_CO_RIVAL ; 740, (D82F, bit 0) - const EVENT_741 ; 741, (D82F, bit 1) - const EVENT_742 ; 742, (D82F, bit 2) - const EVENT_743 ; 743, (D82F, bit 3) - const EVENT_744 ; 744, (D82F, bit 4) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_0 ; 745, (D82F, bit 5) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_1 ; 746, (D82F, bit 6) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 ; 747, (D82F, bit 7) - const EVENT_BEAT_SILPH_CO_7F_TRAINER_3 ; 748, (D830, bit 0) - const EVENT_749 ; 749, (D830, bit 1) - const EVENT_74A ; 74A, (D830, bit 2) - const EVENT_74B ; 74B, (D830, bit 3) - const EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ; 74C, (D830, bit 4) - const EVENT_SILPH_CO_7_UNLOCKED_DOOR2 ; 74D, (D830, bit 5) - const EVENT_SILPH_CO_7_UNLOCKED_DOOR3 ; 74E, (D830, bit 6) - const EVENT_74F ; 74F, (D830, bit 7) - const EVENT_750 ; 750, (D831, bit 0) - const EVENT_751 ; 751, (D831, bit 1) - const EVENT_BEAT_SILPH_CO_8F_TRAINER_0 ; 752, (D831, bit 2) - const EVENT_BEAT_SILPH_CO_8F_TRAINER_1 ; 753, (D831, bit 3) - const EVENT_BEAT_SILPH_CO_8F_TRAINER_2 ; 754, (D831, bit 4) - const EVENT_755 ; 755, (D831, bit 5) - const EVENT_756 ; 756, (D831, bit 6) - const EVENT_757 ; 757, (D831, bit 7) - const EVENT_SILPH_CO_8_UNLOCKED_DOOR ; 758, (D832, bit 0) - const EVENT_759 ; 759, (D832, bit 1) - const EVENT_75A ; 75A, (D832, bit 2) - const EVENT_75B ; 75B, (D832, bit 3) - const EVENT_75C ; 75C, (D832, bit 4) - const EVENT_75D ; 75D, (D832, bit 5) - const EVENT_75E ; 75E, (D832, bit 6) - const EVENT_75F ; 75F, (D832, bit 7) - const EVENT_760 ; 760, (D833, bit 0) - const EVENT_761 ; 761, (D833, bit 1) - const EVENT_BEAT_SILPH_CO_9F_TRAINER_0 ; 762, (D833, bit 2) - const EVENT_BEAT_SILPH_CO_9F_TRAINER_1 ; 763, (D833, bit 3) - const EVENT_BEAT_SILPH_CO_9F_TRAINER_2 ; 764, (D833, bit 4) - const EVENT_765 ; 765, (D833, bit 5) - const EVENT_766 ; 766, (D833, bit 6) - const EVENT_767 ; 767, (D833, bit 7) - const EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ; 768, (D834, bit 0) - const EVENT_SILPH_CO_9_UNLOCKED_DOOR2 ; 769, (D834, bit 1) - const EVENT_SILPH_CO_9_UNLOCKED_DOOR3 ; 76A, (D834, bit 2) - const EVENT_SILPH_CO_9_UNLOCKED_DOOR4 ; 76B, (D834, bit 3) - const EVENT_76C ; 76C, (D834, bit 4) - const EVENT_76D ; 76D, (D834, bit 5) - const EVENT_76E ; 76E, (D834, bit 6) - const EVENT_76F ; 76F, (D834, bit 7) - const EVENT_770 ; 770, (D835, bit 0) - const EVENT_BEAT_SILPH_CO_10F_TRAINER_0 ; 771, (D835, bit 1) - const EVENT_BEAT_SILPH_CO_10F_TRAINER_1 ; 772, (D835, bit 2) - const EVENT_773 ; 773, (D835, bit 3) - const EVENT_774 ; 774, (D835, bit 4) - const EVENT_775 ; 775, (D835, bit 5) - const EVENT_776 ; 776, (D835, bit 6) - const EVENT_777 ; 777, (D835, bit 7) - const EVENT_SILPH_CO_10_UNLOCKED_DOOR ; 778, (D836, bit 0) - const EVENT_779 ; 779, (D836, bit 1) - const EVENT_77A ; 77A, (D836, bit 2) - const EVENT_77B ; 77B, (D836, bit 3) - const EVENT_77C ; 77C, (D836, bit 4) - const EVENT_77D ; 77D, (D836, bit 5) - const EVENT_77E ; 77E, (D836, bit 6) - const EVENT_77F ; 77F, (D836, bit 7) - const EVENT_780 ; 780, (D837, bit 0) - const EVENT_781 ; 781, (D837, bit 1) - const EVENT_782 ; 782, (D837, bit 2) - const EVENT_783 ; 783, (D837, bit 3) - const EVENT_BEAT_SILPH_CO_11F_TRAINER_0 ; 784, (D837, bit 4) - const EVENT_BEAT_SILPH_CO_11F_TRAINER_1 ; 785, (D837, bit 5) - const EVENT_786 ; 786, (D837, bit 6) - const EVENT_787 ; 787, (D837, bit 7) - const EVENT_SILPH_CO_11_UNLOCKED_DOOR ; 788, (D838, bit 0) - const EVENT_789 ; 789, (D838, bit 1) - const EVENT_78A ; 78A, (D838, bit 2) - const EVENT_78B ; 78B, (D838, bit 3) - const EVENT_78C ; 78C, (D838, bit 4) - const EVENT_GOT_MASTER_BALL ; 78D, (D838, bit 5) - const EVENT_78E ; 78E, (D838, bit 6) - const EVENT_BEAT_SILPH_CO_GIOVANNI ; 78F, (D838, bit 7) - const EVENT_790 ; 790, (D839, bit 0) - const EVENT_791 ; 791, (D839, bit 1) - const EVENT_792 ; 792, (D839, bit 2) - const EVENT_793 ; 793, (D839, bit 3) - const EVENT_794 ; 794, (D839, bit 4) - const EVENT_795 ; 795, (D839, bit 5) - const EVENT_796 ; 796, (D839, bit 6) - const EVENT_797 ; 797, (D839, bit 7) - const EVENT_798 ; 798, (D83A, bit 0) - const EVENT_799 ; 799, (D83A, bit 1) - const EVENT_79A ; 79A, (D83A, bit 2) - const EVENT_79B ; 79B, (D83A, bit 3) - const EVENT_79C ; 79C, (D83A, bit 4) - const EVENT_79D ; 79D, (D83A, bit 5) - const EVENT_79E ; 79E, (D83A, bit 6) - const EVENT_79F ; 79F, (D83A, bit 7) - const EVENT_7A0 ; 7A0, (D83B, bit 0) - const EVENT_7A1 ; 7A1, (D83B, bit 1) - const EVENT_7A2 ; 7A2, (D83B, bit 2) - const EVENT_7A3 ; 7A3, (D83B, bit 3) - const EVENT_7A4 ; 7A4, (D83B, bit 4) - const EVENT_7A5 ; 7A5, (D83B, bit 5) - const EVENT_7A6 ; 7A6, (D83B, bit 6) - const EVENT_7A7 ; 7A7, (D83B, bit 7) - const EVENT_7A8 ; 7A8, (D83C, bit 0) - const EVENT_7A9 ; 7A9, (D83C, bit 1) - const EVENT_7AA ; 7AA, (D83C, bit 2) - const EVENT_7AB ; 7AB, (D83C, bit 3) - const EVENT_7AC ; 7AC, (D83C, bit 4) - const EVENT_7AD ; 7AD, (D83C, bit 5) - const EVENT_7AE ; 7AE, (D83C, bit 6) - const EVENT_7AF ; 7AF, (D83C, bit 7) - const EVENT_7B0 ; 7B0, (D83D, bit 0) - const EVENT_7B1 ; 7B1, (D83D, bit 1) - const EVENT_7B2 ; 7B2, (D83D, bit 2) - const EVENT_7B3 ; 7B3, (D83D, bit 3) - const EVENT_7B4 ; 7B4, (D83D, bit 4) - const EVENT_7B5 ; 7B5, (D83D, bit 5) - const EVENT_7B6 ; 7B6, (D83D, bit 6) - const EVENT_7B7 ; 7B7, (D83D, bit 7) - const EVENT_7B8 ; 7B8, (D83E, bit 0) - const EVENT_7B9 ; 7B9, (D83E, bit 1) - const EVENT_7BA ; 7BA, (D83E, bit 2) - const EVENT_7BB ; 7BB, (D83E, bit 3) - const EVENT_7BC ; 7BC, (D83E, bit 4) - const EVENT_7BD ; 7BD, (D83E, bit 5) - const EVENT_7BE ; 7BE, (D83E, bit 6) - const EVENT_7BF ; 7BF, (D83E, bit 7) - const EVENT_7C0 ; 7C0, (D83F, bit 0) - const EVENT_7C1 ; 7C1, (D83F, bit 1) - const EVENT_7C2 ; 7C2, (D83F, bit 2) - const EVENT_7C3 ; 7C3, (D83F, bit 3) - const EVENT_7C4 ; 7C4, (D83F, bit 4) - const EVENT_7C5 ; 7C5, (D83F, bit 5) - const EVENT_7C6 ; 7C6, (D83F, bit 6) - const EVENT_7C7 ; 7C7, (D83F, bit 7) - const EVENT_7C8 ; 7C8, (D840, bit 0) - const EVENT_7C9 ; 7C9, (D840, bit 1) - const EVENT_7CA ; 7CA, (D840, bit 2) - const EVENT_7CB ; 7CB, (D840, bit 3) - const EVENT_7CC ; 7CC, (D840, bit 4) - const EVENT_7CD ; 7CD, (D840, bit 5) - const EVENT_7CE ; 7CE, (D840, bit 6) - const EVENT_7CF ; 7CF, (D840, bit 7) - const EVENT_7D0 ; 7D0, (D841, bit 0) - const EVENT_7D1 ; 7D1, (D841, bit 1) - const EVENT_7D2 ; 7D2, (D841, bit 2) - const EVENT_7D3 ; 7D3, (D841, bit 3) - const EVENT_7D4 ; 7D4, (D841, bit 4) - const EVENT_7D5 ; 7D5, (D841, bit 5) - const EVENT_7D6 ; 7D6, (D841, bit 6) - const EVENT_7D7 ; 7D7, (D841, bit 7) - const EVENT_7D8 ; 7D8, (D842, bit 0) - const EVENT_7D9 ; 7D9, (D842, bit 1) - const EVENT_7DA ; 7DA, (D842, bit 2) - const EVENT_7DB ; 7DB, (D842, bit 3) - const EVENT_7DC ; 7DC, (D842, bit 4) - const EVENT_7DD ; 7DD, (D842, bit 5) - const EVENT_7DE ; 7DE, (D842, bit 6) - const EVENT_7DF ; 7DF, (D842, bit 7) - const EVENT_7E0 ; 7E0, (D843, bit 0) - const EVENT_7E1 ; 7E1, (D843, bit 1) - const EVENT_7E2 ; 7E2, (D843, bit 2) - const EVENT_7E3 ; 7E3, (D843, bit 3) - const EVENT_7E4 ; 7E4, (D843, bit 4) - const EVENT_7E5 ; 7E5, (D843, bit 5) - const EVENT_7E6 ; 7E6, (D843, bit 6) - const EVENT_7E7 ; 7E7, (D843, bit 7) - const EVENT_7E8 ; 7E8, (D844, bit 0) - const EVENT_7E9 ; 7E9, (D844, bit 1) - const EVENT_7EA ; 7EA, (D844, bit 2) - const EVENT_7EB ; 7EB, (D844, bit 3) - const EVENT_7EC ; 7EC, (D844, bit 4) - const EVENT_7ED ; 7ED, (D844, bit 5) - const EVENT_7EE ; 7EE, (D844, bit 6) - const EVENT_7EF ; 7EF, (D844, bit 7) - const EVENT_7F0 ; 7F0, (D845, bit 0) - const EVENT_7F1 ; 7F1, (D845, bit 1) - const EVENT_7F2 ; 7F2, (D845, bit 2) - const EVENT_7F3 ; 7F3, (D845, bit 3) - const EVENT_7F4 ; 7F4, (D845, bit 4) - const EVENT_7F5 ; 7F5, (D845, bit 5) - const EVENT_7F6 ; 7F6, (D845, bit 6) - const EVENT_7F7 ; 7F7, (D845, bit 7) - const EVENT_7F8 ; 7F8, (D846, bit 0) - const EVENT_7F9 ; 7F9, (D846, bit 1) - const EVENT_7FA ; 7FA, (D846, bit 2) - const EVENT_7FB ; 7FB, (D846, bit 3) - const EVENT_7FC ; 7FC, (D846, bit 4) - const EVENT_7FD ; 7FD, (D846, bit 5) - const EVENT_7FE ; 7FE, (D846, bit 6) - const EVENT_7FF ; 7FF, (D846, bit 7) - const EVENT_800 ; 800, (D847, bit 0) - const EVENT_BEAT_MANSION_2_TRAINER_0 ; 801, (D847, bit 1) - const EVENT_802 ; 802, (D847, bit 2) - const EVENT_803 ; 803, (D847, bit 3) - const EVENT_804 ; 804, (D847, bit 4) - const EVENT_805 ; 805, (D847, bit 5) - const EVENT_806 ; 806, (D847, bit 6) - const EVENT_807 ; 807, (D847, bit 7) - const EVENT_808 ; 808, (D848, bit 0) - const EVENT_809 ; 809, (D848, bit 1) - const EVENT_80A ; 80A, (D848, bit 2) - const EVENT_80B ; 80B, (D848, bit 3) - const EVENT_80C ; 80C, (D848, bit 4) - const EVENT_80D ; 80D, (D848, bit 5) - const EVENT_80E ; 80E, (D848, bit 6) - const EVENT_80F ; 80F, (D848, bit 7) - const EVENT_810 ; 810, (D849, bit 0) - const EVENT_BEAT_MANSION_3_TRAINER_0 ; 811, (D849, bit 1) - const EVENT_BEAT_MANSION_3_TRAINER_1 ; 812, (D849, bit 2) - const EVENT_813 ; 813, (D849, bit 3) - const EVENT_814 ; 814, (D849, bit 4) - const EVENT_815 ; 815, (D849, bit 5) - const EVENT_816 ; 816, (D849, bit 6) - const EVENT_817 ; 817, (D849, bit 7) - const EVENT_818 ; 818, (D84A, bit 0) - const EVENT_819 ; 819, (D84A, bit 1) - const EVENT_81A ; 81A, (D84A, bit 2) - const EVENT_81B ; 81B, (D84A, bit 3) - const EVENT_81C ; 81C, (D84A, bit 4) - const EVENT_81D ; 81D, (D84A, bit 5) - const EVENT_81E ; 81E, (D84A, bit 6) - const EVENT_81F ; 81F, (D84A, bit 7) - const EVENT_820 ; 820, (D84B, bit 0) - const EVENT_BEAT_MANSION_4_TRAINER_0 ; 821, (D84B, bit 1) - const EVENT_BEAT_MANSION_4_TRAINER_1 ; 822, (D84B, bit 2) - const EVENT_823 ; 823, (D84B, bit 3) - const EVENT_824 ; 824, (D84B, bit 4) - const EVENT_825 ; 825, (D84B, bit 5) - const EVENT_826 ; 826, (D84B, bit 6) - const EVENT_827 ; 827, (D84B, bit 7) - const EVENT_828 ; 828, (D84C, bit 0) - const EVENT_829 ; 829, (D84C, bit 1) - const EVENT_82A ; 82A, (D84C, bit 2) - const EVENT_82B ; 82B, (D84C, bit 3) - const EVENT_82C ; 82C, (D84C, bit 4) - const EVENT_82D ; 82D, (D84C, bit 5) - const EVENT_82E ; 82E, (D84C, bit 6) - const EVENT_82F ; 82F, (D84C, bit 7) - const EVENT_830 ; 830, (D84D, bit 0) - const EVENT_831 ; 831, (D84D, bit 1) - const EVENT_832 ; 832, (D84D, bit 2) - const EVENT_833 ; 833, (D84D, bit 3) - const EVENT_834 ; 834, (D84D, bit 4) - const EVENT_835 ; 835, (D84D, bit 5) - const EVENT_836 ; 836, (D84D, bit 6) - const EVENT_837 ; 837, (D84D, bit 7) - const EVENT_838 ; 838, (D84E, bit 0) - const EVENT_839 ; 839, (D84E, bit 1) - const EVENT_83A ; 83A, (D84E, bit 2) - const EVENT_83B ; 83B, (D84E, bit 3) - const EVENT_83C ; 83C, (D84E, bit 4) - const EVENT_83D ; 83D, (D84E, bit 5) - const EVENT_83E ; 83E, (D84E, bit 6) - const EVENT_83F ; 83F, (D84E, bit 7) - const EVENT_840 ; 840, (D84F, bit 0) - const EVENT_841 ; 841, (D84F, bit 1) - const EVENT_842 ; 842, (D84F, bit 2) - const EVENT_843 ; 843, (D84F, bit 3) - const EVENT_844 ; 844, (D84F, bit 4) - const EVENT_845 ; 845, (D84F, bit 5) - const EVENT_846 ; 846, (D84F, bit 6) - const EVENT_847 ; 847, (D84F, bit 7) - const EVENT_848 ; 848, (D850, bit 0) - const EVENT_849 ; 849, (D850, bit 1) - const EVENT_84A ; 84A, (D850, bit 2) - const EVENT_84B ; 84B, (D850, bit 3) - const EVENT_84C ; 84C, (D850, bit 4) - const EVENT_84D ; 84D, (D850, bit 5) - const EVENT_84E ; 84E, (D850, bit 6) - const EVENT_84F ; 84F, (D850, bit 7) - const EVENT_850 ; 850, (D851, bit 0) - const EVENT_851 ; 851, (D851, bit 1) - const EVENT_852 ; 852, (D851, bit 2) - const EVENT_853 ; 853, (D851, bit 3) - const EVENT_854 ; 854, (D851, bit 4) - const EVENT_855 ; 855, (D851, bit 5) - const EVENT_856 ; 856, (D851, bit 6) - const EVENT_857 ; 857, (D851, bit 7) - const EVENT_858 ; 858, (D852, bit 0) - const EVENT_859 ; 859, (D852, bit 1) - const EVENT_85A ; 85A, (D852, bit 2) - const EVENT_85B ; 85B, (D852, bit 3) - const EVENT_85C ; 85C, (D852, bit 4) - const EVENT_85D ; 85D, (D852, bit 5) - const EVENT_85E ; 85E, (D852, bit 6) - const EVENT_85F ; 85F, (D852, bit 7) - const EVENT_860 ; 860, (D853, bit 0) - const EVENT_861 ; 861, (D853, bit 1) - const EVENT_862 ; 862, (D853, bit 2) - const EVENT_863 ; 863, (D853, bit 3) - const EVENT_864 ; 864, (D853, bit 4) - const EVENT_865 ; 865, (D853, bit 5) - const EVENT_866 ; 866, (D853, bit 6) - const EVENT_867 ; 867, (D853, bit 7) - const EVENT_868 ; 868, (D854, bit 0) - const EVENT_869 ; 869, (D854, bit 1) - const EVENT_86A ; 86A, (D854, bit 2) - const EVENT_86B ; 86B, (D854, bit 3) - const EVENT_86C ; 86C, (D854, bit 4) - const EVENT_86D ; 86D, (D854, bit 5) - const EVENT_86E ; 86E, (D854, bit 6) - const EVENT_86F ; 86F, (D854, bit 7) - const EVENT_870 ; 870, (D855, bit 0) - const EVENT_871 ; 871, (D855, bit 1) - const EVENT_872 ; 872, (D855, bit 2) - const EVENT_873 ; 873, (D855, bit 3) - const EVENT_874 ; 874, (D855, bit 4) - const EVENT_875 ; 875, (D855, bit 5) - const EVENT_876 ; 876, (D855, bit 6) - const EVENT_877 ; 877, (D855, bit 7) - const EVENT_878 ; 878, (D856, bit 0) - const EVENT_879 ; 879, (D856, bit 1) - const EVENT_87A ; 87A, (D856, bit 2) - const EVENT_87B ; 87B, (D856, bit 3) - const EVENT_87C ; 87C, (D856, bit 4) - const EVENT_87D ; 87D, (D856, bit 5) - const EVENT_87E ; 87E, (D856, bit 6) - const EVENT_87F ; 87F, (D856, bit 7) - const EVENT_GOT_HM03 ; 880, (D857, bit 0) - const EVENT_881 ; 881, (D857, bit 1) - const EVENT_882 ; 882, (D857, bit 2) - const EVENT_883 ; 883, (D857, bit 3) - const EVENT_884 ; 884, (D857, bit 4) - const EVENT_885 ; 885, (D857, bit 5) - const EVENT_886 ; 886, (D857, bit 6) - const EVENT_887 ; 887, (D857, bit 7) - const EVENT_888 ; 888, (D858, bit 0) - const EVENT_889 ; 889, (D858, bit 1) - const EVENT_88A ; 88A, (D858, bit 2) - const EVENT_88B ; 88B, (D858, bit 3) - const EVENT_88C ; 88C, (D858, bit 4) - const EVENT_88D ; 88D, (D858, bit 5) - const EVENT_88E ; 88E, (D858, bit 6) - const EVENT_88F ; 88F, (D858, bit 7) - const EVENT_890 ; 890, (D859, bit 0) - const EVENT_891 ; 891, (D859, bit 1) - const EVENT_892 ; 892, (D859, bit 2) - const EVENT_893 ; 893, (D859, bit 3) - const EVENT_894 ; 894, (D859, bit 4) - const EVENT_895 ; 895, (D859, bit 5) - const EVENT_896 ; 896, (D859, bit 6) - const EVENT_897 ; 897, (D859, bit 7) - const EVENT_898 ; 898, (D85A, bit 0) - const EVENT_899 ; 899, (D85A, bit 1) - const EVENT_89A ; 89A, (D85A, bit 2) - const EVENT_89B ; 89B, (D85A, bit 3) - const EVENT_89C ; 89C, (D85A, bit 4) - const EVENT_89D ; 89D, (D85A, bit 5) - const EVENT_89E ; 89E, (D85A, bit 6) - const EVENT_89F ; 89F, (D85A, bit 7) - const EVENT_8A0 ; 8A0, (D85B, bit 0) - const EVENT_8A1 ; 8A1, (D85B, bit 1) - const EVENT_8A2 ; 8A2, (D85B, bit 2) - const EVENT_8A3 ; 8A3, (D85B, bit 3) - const EVENT_8A4 ; 8A4, (D85B, bit 4) - const EVENT_8A5 ; 8A5, (D85B, bit 5) - const EVENT_8A6 ; 8A6, (D85B, bit 6) - const EVENT_8A7 ; 8A7, (D85B, bit 7) - const EVENT_8A8 ; 8A8, (D85C, bit 0) - const EVENT_8A9 ; 8A9, (D85C, bit 1) - const EVENT_8AA ; 8AA, (D85C, bit 2) - const EVENT_8AB ; 8AB, (D85C, bit 3) - const EVENT_8AC ; 8AC, (D85C, bit 4) - const EVENT_8AD ; 8AD, (D85C, bit 5) - const EVENT_8AE ; 8AE, (D85C, bit 6) - const EVENT_8AF ; 8AF, (D85C, bit 7) - const EVENT_8B0 ; 8B0, (D85D, bit 0) - const EVENT_8B1 ; 8B1, (D85D, bit 1) - const EVENT_8B2 ; 8B2, (D85D, bit 2) - const EVENT_8B3 ; 8B3, (D85D, bit 3) - const EVENT_8B4 ; 8B4, (D85D, bit 4) - const EVENT_8B5 ; 8B5, (D85D, bit 5) - const EVENT_8B6 ; 8B6, (D85D, bit 6) - const EVENT_8B7 ; 8B7, (D85D, bit 7) - const EVENT_8B8 ; 8B8, (D85E, bit 0) - const EVENT_8B9 ; 8B9, (D85E, bit 1) - const EVENT_8BA ; 8BA, (D85E, bit 2) - const EVENT_8BB ; 8BB, (D85E, bit 3) - const EVENT_8BC ; 8BC, (D85E, bit 4) - const EVENT_8BD ; 8BD, (D85E, bit 5) - const EVENT_8BE ; 8BE, (D85E, bit 6) - const EVENT_8BF ; 8BF, (D85E, bit 7) - const EVENT_8C0 ; 8C0, (D85F, bit 0) - const EVENT_BEAT_MEWTWO ; 8C1, (D85F, bit 1) - const EVENT_8C2 ; 8C2, (D85F, bit 2) - const EVENT_8C3 ; 8C3, (D85F, bit 3) - const EVENT_8C4 ; 8C4, (D85F, bit 4) - const EVENT_8C5 ; 8C5, (D85F, bit 5) - const EVENT_8C6 ; 8C6, (D85F, bit 6) - const EVENT_8C7 ; 8C7, (D85F, bit 7) - const EVENT_8C8 ; 8C8, (D860, bit 0) - const EVENT_8C9 ; 8C9, (D860, bit 1) - const EVENT_8CA ; 8CA, (D860, bit 2) - const EVENT_8CB ; 8CB, (D860, bit 3) - const EVENT_8CC ; 8CC, (D860, bit 4) - const EVENT_8CD ; 8CD, (D860, bit 5) - const EVENT_8CE ; 8CE, (D860, bit 6) - const EVENT_8CF ; 8CF, (D860, bit 7) - const EVENT_8D0 ; 8D0, (D861, bit 0) - const EVENT_8D1 ; 8D1, (D861, bit 1) - const EVENT_8D2 ; 8D2, (D861, bit 2) - const EVENT_8D3 ; 8D3, (D861, bit 3) - const EVENT_8D4 ; 8D4, (D861, bit 4) - const EVENT_8D5 ; 8D5, (D861, bit 5) - const EVENT_8D6 ; 8D6, (D861, bit 6) - const EVENT_8D7 ; 8D7, (D861, bit 7) - const EVENT_8D8 ; 8D8, (D862, bit 0) - const EVENT_8D9 ; 8D9, (D862, bit 1) - const EVENT_8DA ; 8DA, (D862, bit 2) - const EVENT_8DB ; 8DB, (D862, bit 3) - const EVENT_8DC ; 8DC, (D862, bit 4) - const EVENT_8DD ; 8DD, (D862, bit 5) - const EVENT_8DE ; 8DE, (D862, bit 6) - const EVENT_8DF ; 8DF, (D862, bit 7) - const ELITE4_EVENTS_START ; 8E0, (D863, bit 0) - const EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 ; 8E1, (D863, bit 1) - const EVENT_8E2 ; 8E2, (D863, bit 2) - const EVENT_8E3 ; 8E3, (D863, bit 3) - const EVENT_8E4 ; 8E4, (D863, bit 4) - const EVENT_8E5 ; 8E5, (D863, bit 5) - const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM ; 8E6, (D863, bit 6) - const EVENT_8E7 ; 8E7, (D863, bit 7) - const EVENT_8E8 ; 8E8, (D864, bit 0) - const EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 ; 8E9, (D864, bit 1) - const EVENT_8EA ; 8EA, (D864, bit 2) - const EVENT_8EB ; 8EB, (D864, bit 3) - const EVENT_8EC ; 8EC, (D864, bit 4) - const EVENT_8ED ; 8ED, (D864, bit 5) - const EVENT_AUTOWALKED_INTO_BRUNOS_ROOM ; 8EE, (D864, bit 6) - const EVENT_8EF ; 8EF, (D864, bit 7) - const EVENT_8F0 ; 8F0, (D865, bit 0) - const EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 ; 8F1, (D865, bit 1) - const EVENT_8F2 ; 8F2, (D865, bit 2) - const EVENT_8F3 ; 8F3, (D865, bit 3) - const EVENT_8F4 ; 8F4, (D865, bit 4) - const EVENT_8F5 ; 8F5, (D865, bit 5) - const EVENT_AUTOWALKED_INTO_AGATHAS_ROOM ; 8F6, (D865, bit 6) - const EVENT_8F7 ; 8F7, (D865, bit 7) - const EVENT_8F8 ; 8F8, (D866, bit 0) - const EVENT_BEAT_LANCES_ROOM_TRAINER_0 ; 8F9, (D866, bit 1) - const EVENT_8FA ; 8FA, (D866, bit 2) - const EVENT_8FB ; 8FB, (D866, bit 3) - const EVENT_8FC ; 8FC, (D866, bit 4) - const EVENT_8FD ; 8FD, (D866, bit 5) - const EVENT_BEAT_LANCE ; 8FE, (D866, bit 6) - const EVENT_LANCES_ROOM_LOCK_DOOR ; 8FF, (D866, bit 7) - const EVENT_900 ; 900, (D867, bit 0) - const EVENT_BEAT_CHAMPION_RIVAL ; 901, (D867, bit 1) - const EVENT_902 ; 902, (D867, bit 2) - const EVENT_903 ; 903, (D867, bit 3) - const EVENT_904 ; 904, (D867, bit 4) - const EVENT_905 ; 905, (D867, bit 5) - const EVENT_906 ; 906, (D867, bit 6) - const ELITE4_CHAMPION_EVENTS_END ; 907, (D867, bit 7) - const EVENT_908 ; 908, (D868, bit 0) - const EVENT_909 ; 909, (D868, bit 1) - const EVENT_90A ; 90A, (D868, bit 2) - const EVENT_90B ; 90B, (D868, bit 3) - const EVENT_90C ; 90C, (D868, bit 4) - const EVENT_90D ; 90D, (D868, bit 5) - const EVENT_90E ; 90E, (D868, bit 6) - const EVENT_90F ; 90F, (D868, bit 7) - const EVENT_910 ; 910, (D869, bit 0) - const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 ; 911, (D869, bit 1) - const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 ; 912, (D869, bit 2) - const EVENT_913 ; 913, (D869, bit 3) - const EVENT_914 ; 914, (D869, bit 4) - const EVENT_915 ; 915, (D869, bit 5) - const EVENT_916 ; 916, (D869, bit 6) - const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ; 917, (D869, bit 7) - const EVENT_918 ; 918, (D86A, bit 0) - const EVENT_919 ; 919, (D86A, bit 1) - const EVENT_91A ; 91A, (D86A, bit 2) - const EVENT_91B ; 91B, (D86A, bit 3) - const EVENT_91C ; 91C, (D86A, bit 4) - const EVENT_91D ; 91D, (D86A, bit 5) - const EVENT_91E ; 91E, (D86A, bit 6) - const EVENT_91F ; 91F, (D86A, bit 7) - const EVENT_920 ; 920, (D86B, bit 0) - const EVENT_921 ; 921, (D86B, bit 1) - const EVENT_922 ; 922, (D86B, bit 2) - const EVENT_923 ; 923, (D86B, bit 3) - const EVENT_924 ; 924, (D86B, bit 4) - const EVENT_925 ; 925, (D86B, bit 5) - const EVENT_926 ; 926, (D86B, bit 6) - const EVENT_927 ; 927, (D86B, bit 7) - const EVENT_928 ; 928, (D86C, bit 0) - const EVENT_929 ; 929, (D86C, bit 1) - const EVENT_92A ; 92A, (D86C, bit 2) - const EVENT_92B ; 92B, (D86C, bit 3) - const EVENT_92C ; 92C, (D86C, bit 4) - const EVENT_92D ; 92D, (D86C, bit 5) - const EVENT_92E ; 92E, (D86C, bit 6) - const EVENT_92F ; 92F, (D86C, bit 7) - const EVENT_930 ; 930, (D86D, bit 0) - const EVENT_931 ; 931, (D86D, bit 1) - const EVENT_932 ; 932, (D86D, bit 2) - const EVENT_933 ; 933, (D86D, bit 3) - const EVENT_934 ; 934, (D86D, bit 4) - const EVENT_935 ; 935, (D86D, bit 5) - const EVENT_936 ; 936, (D86D, bit 6) - const EVENT_937 ; 937, (D86D, bit 7) - const EVENT_938 ; 938, (D86E, bit 0) - const EVENT_939 ; 939, (D86E, bit 1) - const EVENT_93A ; 93A, (D86E, bit 2) - const EVENT_93B ; 93B, (D86E, bit 3) - const EVENT_93C ; 93C, (D86E, bit 4) - const EVENT_93D ; 93D, (D86E, bit 5) - const EVENT_93E ; 93E, (D86E, bit 6) - const EVENT_93F ; 93F, (D86E, bit 7) - const EVENT_940 ; 940, (D86F, bit 0) - const EVENT_941 ; 941, (D86F, bit 1) - const EVENT_942 ; 942, (D86F, bit 2) - const EVENT_943 ; 943, (D86F, bit 3) - const EVENT_944 ; 944, (D86F, bit 4) - const EVENT_945 ; 945, (D86F, bit 5) - const EVENT_946 ; 946, (D86F, bit 6) - const EVENT_947 ; 947, (D86F, bit 7) - const EVENT_948 ; 948, (D870, bit 0) - const EVENT_949 ; 949, (D870, bit 1) - const EVENT_94A ; 94A, (D870, bit 2) - const EVENT_94B ; 94B, (D870, bit 3) - const EVENT_94C ; 94C, (D870, bit 4) - const EVENT_94D ; 94D, (D870, bit 5) - const EVENT_94E ; 94E, (D870, bit 6) - const EVENT_94F ; 94F, (D870, bit 7) - const EVENT_950 ; 950, (D871, bit 0) - const EVENT_951 ; 951, (D871, bit 1) - const EVENT_952 ; 952, (D871, bit 2) - const EVENT_953 ; 953, (D871, bit 3) - const EVENT_954 ; 954, (D871, bit 4) - const EVENT_955 ; 955, (D871, bit 5) - const EVENT_956 ; 956, (D871, bit 6) - const EVENT_957 ; 957, (D871, bit 7) - const EVENT_958 ; 958, (D872, bit 0) - const EVENT_959 ; 959, (D872, bit 1) - const EVENT_95A ; 95A, (D872, bit 2) - const EVENT_95B ; 95B, (D872, bit 3) - const EVENT_95C ; 95C, (D872, bit 4) - const EVENT_95D ; 95D, (D872, bit 5) - const EVENT_95E ; 95E, (D872, bit 6) - const EVENT_95F ; 95F, (D872, bit 7) - const EVENT_960 ; 960, (D873, bit 0) - const EVENT_961 ; 961, (D873, bit 1) - const EVENT_962 ; 962, (D873, bit 2) - const EVENT_963 ; 963, (D873, bit 3) - const EVENT_964 ; 964, (D873, bit 4) - const EVENT_965 ; 965, (D873, bit 5) - const EVENT_966 ; 966, (D873, bit 6) - const EVENT_967 ; 967, (D873, bit 7) - const EVENT_968 ; 968, (D874, bit 0) - const EVENT_969 ; 969, (D874, bit 1) - const EVENT_96A ; 96A, (D874, bit 2) - const EVENT_96B ; 96B, (D874, bit 3) - const EVENT_96C ; 96C, (D874, bit 4) - const EVENT_96D ; 96D, (D874, bit 5) - const EVENT_96E ; 96E, (D874, bit 6) - const EVENT_96F ; 96F, (D874, bit 7) - const EVENT_970 ; 970, (D875, bit 0) - const EVENT_971 ; 971, (D875, bit 1) - const EVENT_972 ; 972, (D875, bit 2) - const EVENT_973 ; 973, (D875, bit 3) - const EVENT_974 ; 974, (D875, bit 4) - const EVENT_975 ; 975, (D875, bit 5) - const EVENT_976 ; 976, (D875, bit 6) - const EVENT_977 ; 977, (D875, bit 7) - const EVENT_978 ; 978, (D876, bit 0) - const EVENT_979 ; 979, (D876, bit 1) - const EVENT_97A ; 97A, (D876, bit 2) - const EVENT_97B ; 97B, (D876, bit 3) - const EVENT_97C ; 97C, (D876, bit 4) - const EVENT_97D ; 97D, (D876, bit 5) - const EVENT_97E ; 97E, (D876, bit 6) - const EVENT_97F ; 97F, (D876, bit 7) - const EVENT_980 ; 980, (D877, bit 0) - const EVENT_981 ; 981, (D877, bit 1) - const EVENT_982 ; 982, (D877, bit 2) - const EVENT_983 ; 983, (D877, bit 3) - const EVENT_984 ; 984, (D877, bit 4) - const EVENT_985 ; 985, (D877, bit 5) - const EVENT_986 ; 986, (D877, bit 6) - const EVENT_987 ; 987, (D877, bit 7) - const EVENT_988 ; 988, (D878, bit 0) - const EVENT_989 ; 989, (D878, bit 1) - const EVENT_98A ; 98A, (D878, bit 2) - const EVENT_98B ; 98B, (D878, bit 3) - const EVENT_98C ; 98C, (D878, bit 4) - const EVENT_98D ; 98D, (D878, bit 5) - const EVENT_98E ; 98E, (D878, bit 6) - const EVENT_98F ; 98F, (D878, bit 7) - const EVENT_990 ; 990, (D879, bit 0) - const EVENT_991 ; 991, (D879, bit 1) - const EVENT_992 ; 992, (D879, bit 2) - const EVENT_993 ; 993, (D879, bit 3) - const EVENT_994 ; 994, (D879, bit 4) - const EVENT_995 ; 995, (D879, bit 5) - const EVENT_996 ; 996, (D879, bit 6) - const EVENT_997 ; 997, (D879, bit 7) - const EVENT_998 ; 998, (D87A, bit 0) - const EVENT_999 ; 999, (D87A, bit 1) - const EVENT_99A ; 99A, (D87A, bit 2) - const EVENT_99B ; 99B, (D87A, bit 3) - const EVENT_99C ; 99C, (D87A, bit 4) - const EVENT_99D ; 99D, (D87A, bit 5) - const EVENT_99E ; 99E, (D87A, bit 6) - const EVENT_99F ; 99F, (D87A, bit 7) - const EVENT_9A0 ; 9A0, (D87B, bit 0) - const EVENT_9A1 ; 9A1, (D87B, bit 1) - const EVENT_9A2 ; 9A2, (D87B, bit 2) - const EVENT_9A3 ; 9A3, (D87B, bit 3) - const EVENT_9A4 ; 9A4, (D87B, bit 4) - const EVENT_9A5 ; 9A5, (D87B, bit 5) - const EVENT_9A6 ; 9A6, (D87B, bit 6) - const EVENT_9A7 ; 9A7, (D87B, bit 7) - const EVENT_9A8 ; 9A8, (D87C, bit 0) - const EVENT_9A9 ; 9A9, (D87C, bit 1) - const EVENT_9AA ; 9AA, (D87C, bit 2) - const EVENT_9AB ; 9AB, (D87C, bit 3) - const EVENT_9AC ; 9AC, (D87C, bit 4) - const EVENT_9AD ; 9AD, (D87C, bit 5) - const EVENT_9AE ; 9AE, (D87C, bit 6) - const EVENT_9AF ; 9AF, (D87C, bit 7) - const EVENT_9B0 ; 9B0, (D87D, bit 0) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 ; 9B1, (D87D, bit 1) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 ; 9B2, (D87D, bit 2) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 ; 9B3, (D87D, bit 3) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 ; 9B4, (D87D, bit 4) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 ; 9B5, (D87D, bit 5) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 ; 9B6, (D87D, bit 6) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 ; 9B7, (D87D, bit 7) - const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 ; 9B8, (D87E, bit 0) - const EVENT_9B9 ; 9B9, (D87E, bit 1) - const EVENT_9BA ; 9BA, (D87E, bit 2) - const EVENT_9BB ; 9BB, (D87E, bit 3) - const EVENT_9BC ; 9BC, (D87E, bit 4) - const EVENT_9BD ; 9BD, (D87E, bit 5) - const EVENT_9BE ; 9BE, (D87E, bit 6) - const EVENT_9BF ; 9BF, (D87E, bit 7) - const EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE ; 9C0, (D87F, bit 0) - const EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE ; 9C1, (D87F, bit 1) - const EVENT_9C2 ; 9C2, (D87F, bit 2) - const EVENT_9C3 ; 9C3, (D87F, bit 3) - const EVENT_9C4 ; 9C4, (D87F, bit 4) - const EVENT_9C5 ; 9C5, (D87F, bit 5) - const EVENT_9C6 ; 9C6, (D87F, bit 6) - const EVENT_9C7 ; 9C7, (D87F, bit 7) - const EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE ; 9C8, (D880, bit 0) - const EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ; 9C9, (D880, bit 1) - const EVENT_9CA ; 9CA, (D880, bit 2) - const EVENT_9CB ; 9CB, (D880, bit 3) - const EVENT_9CC ; 9CC, (D880, bit 4) - const EVENT_9CD ; 9CD, (D880, bit 5) - const EVENT_9CE ; 9CE, (D880, bit 6) - const EVENT_9CF ; 9CF, (D880, bit 7) - const EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE ; 9D0, (D881, bit 0) - const EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ; 9D1, (D881, bit 1) - const EVENT_9D2 ; 9D2, (D881, bit 2) - const EVENT_9D3 ; 9D3, (D881, bit 3) - const EVENT_9D4 ; 9D4, (D881, bit 4) - const EVENT_9D5 ; 9D5, (D881, bit 5) - const EVENT_9D6 ; 9D6, (D881, bit 6) - const EVENT_9D7 ; 9D7, (D881, bit 7) - const EVENT_9D8 ; 9D8, (D882, bit 0) - const EVENT_9D9 ; 9D9, (D882, bit 1) - const EVENT_BEAT_ARTICUNO ; 9DA, (D882, bit 2) - const EVENT_9DB ; 9DB, (D882, bit 3) - const EVENT_9DC ; 9DC, (D882, bit 4) - const EVENT_9DD ; 9DD, (D882, bit 5) - const EVENT_9DE ; 9DE, (D882, bit 6) - const EVENT_9DF ; 9DF, (D882, bit 7) - const EVENT_9E0 ; 9E0, (D883, bit 0) - const EVENT_9E1 ; 9E1, (D883, bit 1) - const EVENT_9E2 ; 9E2, (D883, bit 2) - const EVENT_9E3 ; 9E3, (D883, bit 3) - const EVENT_9E4 ; 9E4, (D883, bit 4) - const EVENT_9E5 ; 9E5, (D883, bit 5) - const EVENT_9E6 ; 9E6, (D883, bit 6) - const EVENT_9E7 ; 9E7, (D883, bit 7) - const EVENT_9E8 ; 9E8, (D884, bit 0) - const EVENT_9E9 ; 9E9, (D884, bit 1) - const EVENT_9EA ; 9EA, (D884, bit 2) - const EVENT_9EB ; 9EB, (D884, bit 3) - const EVENT_9EC ; 9EC, (D884, bit 4) - const EVENT_9ED ; 9ED, (D884, bit 5) - const EVENT_9EE ; 9EE, (D884, bit 6) - const EVENT_9EF ; 9EF, (D884, bit 7) - const EVENT_9F0 ; 9F0, (D885, bit 0) - const EVENT_9F1 ; 9F1, (D885, bit 1) - const EVENT_9F2 ; 9F2, (D885, bit 2) - const EVENT_9F3 ; 9F3, (D885, bit 3) - const EVENT_9F4 ; 9F4, (D885, bit 4) - const EVENT_9F5 ; 9F5, (D885, bit 5) - const EVENT_9F6 ; 9F6, (D885, bit 6) - const EVENT_9F7 ; 9F7, (D885, bit 7) - const EVENT_9F8 ; 9F8, (D886, bit 0) - const EVENT_9F9 ; 9F9, (D886, bit 1) - const EVENT_9FA ; 9FA, (D886, bit 2) - const EVENT_9FB ; 9FB, (D886, bit 3) - const EVENT_9FC ; 9FC, (D886, bit 4) - const EVENT_9FD ; 9FD, (D886, bit 5) - const EVENT_9FE ; 9FE, (D886, bit 6) - const EVENT_9FF ; 9FF, (D886, bit 7) +; Pallet Town events + const_def + const EVENT_FOLLOWED_OAK_INTO_LAB + const_skip 2 + const EVENT_HALL_OF_FAME_DEX_RATING + const_skip 2 + const EVENT_PALLET_AFTER_GETTING_POKEBALLS + const_skip 17 + const EVENT_GOT_TOWN_MAP + const EVENT_ENTERED_BLUES_HOUSE + const EVENT_DAISY_WALKING + const_skip 5 + const EVENT_FOLLOWED_OAK_INTO_LAB_2 + const EVENT_OAK_ASKED_TO_CHOOSE_MON + const EVENT_GOT_STARTER + const EVENT_BATTLED_RIVAL_IN_OAKS_LAB + const EVENT_GOT_POKEBALLS_FROM_OAK + const EVENT_GOT_POKEDEX + const EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 + const EVENT_OAK_APPEARED_IN_PALLET + +; Viridian City events + const_next $28 + const EVENT_VIRIDIAN_GYM_OPEN + const EVENT_GOT_TM42 + const_skip 14 + const EVENT_OAK_GOT_PARCEL + const EVENT_GOT_OAKS_PARCEL + const_skip 22 + const EVENT_GOT_TM27 + const EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6 + const EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7 + +; Pewter City events + const_next $68 + const EVENT_BOUGHT_MUSEUM_TICKET + const EVENT_GOT_OLD_AMBER + const_skip 8 + const EVENT_BEAT_PEWTER_GYM_TRAINER_0 + const_skip 3 + const EVENT_GOT_TM34 + const EVENT_BEAT_BROCK + +; Cerulean City events + const_next $98 + const EVENT_BEAT_CERULEAN_RIVAL + const_skip 14 + const EVENT_BEAT_CERULEAN_ROCKET_THIEF + const_skip 18 + const EVENT_BEAT_CERULEAN_GYM_TRAINER_0 + const EVENT_BEAT_CERULEAN_GYM_TRAINER_1 + const_skip 2 + const EVENT_GOT_TM11 + const EVENT_BEAT_MISTY + const EVENT_GOT_BICYCLE + +; Lavender Town events + const_next $F0 - 2 + const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT + const EVENT_BEAT_POKEMON_TOWER_RIVAL + const_skip + const EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 + const EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 + const EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 + const_skip 5 + const EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 + const EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 + const EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 + const_skip 6 + const EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 + const EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 + const EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 + const EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 + const_skip + const EVENT_IN_PURIFIED_ZONE + const_skip + const EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 + const EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 + const EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 + const_skip 3 + const EVENT_BEAT_GHOST_MAROWAK + const_skip + const EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 + const EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 + const EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 + const_skip 3 + const EVENT_RESCUED_MR_FUJI_2 + const_skip 16 + const EVENT_GOT_POKE_FLUTE + +; Vermilion City events + const_next $150 + const_skip + const EVENT_GOT_BIKE_VOUCHER + const_skip 4 + const EVENT_SEEL_FAN_BOAST + const EVENT_PIKACHU_FAN_BOAST + const_skip 8 + const EVENT_2ND_LOCK_OPENED + const EVENT_1ST_LOCK_OPENED + const EVENT_BEAT_VERMILION_GYM_TRAINER_0 + const EVENT_BEAT_VERMILION_GYM_TRAINER_1 + const EVENT_BEAT_VERMILION_GYM_TRAINER_2 + const_skip + const EVENT_GOT_TM24 + const EVENT_BEAT_LT_SURGE + +; Celadon City events + const_next $180 + const EVENT_GOT_TM41 + const_skip 11 + const EVENT_GOT_TM13 + const EVENT_GOT_TM48 + const EVENT_GOT_TM49 + const EVENT_GOT_TM18 + const_skip 24 + const EVENT_GOT_TM21 + const EVENT_BEAT_ERIKA + const EVENT_BEAT_CELADON_GYM_TRAINER_0 + const EVENT_BEAT_CELADON_GYM_TRAINER_1 + const EVENT_BEAT_CELADON_GYM_TRAINER_2 + const EVENT_BEAT_CELADON_GYM_TRAINER_3 + const EVENT_BEAT_CELADON_GYM_TRAINER_4 + const EVENT_BEAT_CELADON_GYM_TRAINER_5 + const EVENT_BEAT_CELADON_GYM_TRAINER_6 + const_skip 7 + const EVENT_1B8 ; ??? + const EVENT_FOUND_ROCKET_HIDEOUT + const EVENT_GOT_10_COINS + const EVENT_GOT_20_COINS + const EVENT_GOT_20_COINS_2 + const_skip 2 + const EVENT_1BF ; ??? + const_skip 32 + const EVENT_GOT_COIN_CASE + +; Fuchsia City events + const_next $238 + const EVENT_GOT_HM04 + const EVENT_GAVE_GOLD_TEETH + const_skip 20 + const EVENT_SAFARI_GAME_OVER + const EVENT_IN_SAFARI_ZONE + const_skip 8 + const EVENT_GOT_TM06 + const EVENT_BEAT_KOGA + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 + const EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 + +; Cinnabar Island events + const_next $278 + const EVENT_MANSION_SWITCH_ON + const_skip 16 + const EVENT_BEAT_MANSION_1_TRAINER_0 + const_skip 14 + const EVENT_GOT_TM38 + const EVENT_BEAT_BLAINE + const EVENT_BEAT_CINNABAR_GYM_TRAINER_0 + const EVENT_BEAT_CINNABAR_GYM_TRAINER_1 + const EVENT_BEAT_CINNABAR_GYM_TRAINER_2 + const EVENT_BEAT_CINNABAR_GYM_TRAINER_3 + const EVENT_BEAT_CINNABAR_GYM_TRAINER_4 + const EVENT_BEAT_CINNABAR_GYM_TRAINER_5 + const EVENT_BEAT_CINNABAR_GYM_TRAINER_6 + const_skip 6 + const EVENT_2A7 ; ??? + const EVENT_CINNABAR_GYM_GATE0_UNLOCKED + const EVENT_CINNABAR_GYM_GATE1_UNLOCKED + const EVENT_CINNABAR_GYM_GATE2_UNLOCKED + const EVENT_CINNABAR_GYM_GATE3_UNLOCKED + const EVENT_CINNABAR_GYM_GATE4_UNLOCKED + const EVENT_CINNABAR_GYM_GATE5_UNLOCKED + const EVENT_CINNABAR_GYM_GATE6_UNLOCKED + const_skip 40 + const EVENT_GOT_TM35 + const_skip 8 + const EVENT_GAVE_FOSSIL_TO_LAB + const EVENT_LAB_STILL_REVIVING_FOSSIL + const EVENT_LAB_HANDING_OVER_FOSSIL_MON + +; Saffron City events + const_next $340 + const EVENT_GOT_TM31 + const_skip 15 + const EVENT_DEFEATED_FIGHTING_DOJO + const EVENT_BEAT_KARATE_MASTER + const EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 + const EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 + const EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 + const EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 + const EVENT_GOT_HITMONLEE + const EVENT_GOT_HITMONCHAN + const_skip 8 + const EVENT_GOT_TM46 + const EVENT_BEAT_SABRINA + const EVENT_BEAT_SAFFRON_GYM_TRAINER_0 + const EVENT_BEAT_SAFFRON_GYM_TRAINER_1 + const EVENT_BEAT_SAFFRON_GYM_TRAINER_2 + const EVENT_BEAT_SAFFRON_GYM_TRAINER_3 + const EVENT_BEAT_SAFFRON_GYM_TRAINER_4 + const EVENT_BEAT_SAFFRON_GYM_TRAINER_5 + const EVENT_BEAT_SAFFRON_GYM_TRAINER_6 + const_skip 46 + const EVENT_SILPH_CO_RECEPTIONIST_AT_DESK + const_skip 24 + const EVENT_GOT_TM29 + +; Route 1 events + const_next $3C0 + const EVENT_GOT_POTION_SAMPLE + +; Route 2 events + const_next $3D8 + const EVENT_GOT_HM05 + +; Route 3 events + const_next $3E0 + const_skip 2 + const EVENT_BEAT_ROUTE_3_TRAINER_0 + const EVENT_BEAT_ROUTE_3_TRAINER_1 + const EVENT_BEAT_ROUTE_3_TRAINER_2 + const EVENT_BEAT_ROUTE_3_TRAINER_3 + const EVENT_BEAT_ROUTE_3_TRAINER_4 + const EVENT_BEAT_ROUTE_3_TRAINER_5 + const EVENT_BEAT_ROUTE_3_TRAINER_6 + const EVENT_BEAT_ROUTE_3_TRAINER_7 + +; Route 4 events + const_next $3F0 + const_skip 2 + const EVENT_BEAT_ROUTE_4_TRAINER_0 + const_skip 12 + const EVENT_BOUGHT_MAGIKARP + +; Route 6 events + const_next $410 + const_skip + const EVENT_BEAT_ROUTE_6_TRAINER_0 + const EVENT_BEAT_ROUTE_6_TRAINER_1 + const EVENT_BEAT_ROUTE_6_TRAINER_2 + const EVENT_BEAT_ROUTE_6_TRAINER_3 + const EVENT_BEAT_ROUTE_6_TRAINER_4 + const EVENT_BEAT_ROUTE_6_TRAINER_5 + +; Route 8 events + const_next $430 + const_skip + const EVENT_BEAT_ROUTE_8_TRAINER_0 + const EVENT_BEAT_ROUTE_8_TRAINER_1 + const EVENT_BEAT_ROUTE_8_TRAINER_2 + const EVENT_BEAT_ROUTE_8_TRAINER_3 + const EVENT_BEAT_ROUTE_8_TRAINER_4 + const EVENT_BEAT_ROUTE_8_TRAINER_5 + const EVENT_BEAT_ROUTE_8_TRAINER_6 + const EVENT_BEAT_ROUTE_8_TRAINER_7 + const EVENT_BEAT_ROUTE_8_TRAINER_8 + +; Route 9 events + const_next $440 + const_skip + const EVENT_BEAT_ROUTE_9_TRAINER_0 + const EVENT_BEAT_ROUTE_9_TRAINER_1 + const EVENT_BEAT_ROUTE_9_TRAINER_2 + const EVENT_BEAT_ROUTE_9_TRAINER_3 + const EVENT_BEAT_ROUTE_9_TRAINER_4 + const EVENT_BEAT_ROUTE_9_TRAINER_5 + const EVENT_BEAT_ROUTE_9_TRAINER_6 + const EVENT_BEAT_ROUTE_9_TRAINER_7 + const EVENT_BEAT_ROUTE_9_TRAINER_8 + +; Route 10 events + const_next $450 + const_skip + const EVENT_BEAT_ROUTE_10_TRAINER_0 + const EVENT_BEAT_ROUTE_10_TRAINER_1 + const EVENT_BEAT_ROUTE_10_TRAINER_2 + const EVENT_BEAT_ROUTE_10_TRAINER_3 + const EVENT_BEAT_ROUTE_10_TRAINER_4 + const EVENT_BEAT_ROUTE_10_TRAINER_5 + const_skip 2 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 + const EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 + const_skip + const EVENT_BEAT_POWER_PLANT_VOLTORB_0 + const EVENT_BEAT_POWER_PLANT_VOLTORB_1 + const EVENT_BEAT_POWER_PLANT_VOLTORB_2 + const EVENT_BEAT_POWER_PLANT_VOLTORB_3 + const EVENT_BEAT_POWER_PLANT_VOLTORB_4 + const EVENT_BEAT_POWER_PLANT_VOLTORB_5 + const EVENT_BEAT_POWER_PLANT_VOLTORB_6 + const EVENT_BEAT_POWER_PLANT_VOLTORB_7 + const EVENT_BEAT_ZAPDOS + +; Route 11 events + const_next $470 + const_skip + const EVENT_BEAT_ROUTE_11_TRAINER_0 + const EVENT_BEAT_ROUTE_11_TRAINER_1 + const EVENT_BEAT_ROUTE_11_TRAINER_2 + const EVENT_BEAT_ROUTE_11_TRAINER_3 + const EVENT_BEAT_ROUTE_11_TRAINER_4 + const EVENT_BEAT_ROUTE_11_TRAINER_5 + const EVENT_BEAT_ROUTE_11_TRAINER_6 + const EVENT_BEAT_ROUTE_11_TRAINER_7 + const EVENT_BEAT_ROUTE_11_TRAINER_8 + const EVENT_BEAT_ROUTE_11_TRAINER_9 + const_skip 4 + const EVENT_GOT_ITEMFINDER + +; Route 12 events + const_next $480 + const EVENT_GOT_TM39 + const_skip + const EVENT_BEAT_ROUTE_12_TRAINER_0 + const EVENT_BEAT_ROUTE_12_TRAINER_1 + const EVENT_BEAT_ROUTE_12_TRAINER_2 + const EVENT_BEAT_ROUTE_12_TRAINER_3 + const EVENT_BEAT_ROUTE_12_TRAINER_4 + const EVENT_BEAT_ROUTE_12_TRAINER_5 + const EVENT_BEAT_ROUTE_12_TRAINER_6 + const_skip 5 + const EVENT_FIGHT_ROUTE12_SNORLAX + const EVENT_BEAT_ROUTE12_SNORLAX + +; Route 13 events + const_next $490 + const_skip + const EVENT_BEAT_ROUTE_13_TRAINER_0 + const EVENT_BEAT_ROUTE_13_TRAINER_1 + const EVENT_BEAT_ROUTE_13_TRAINER_2 + const EVENT_BEAT_ROUTE_13_TRAINER_3 + const EVENT_BEAT_ROUTE_13_TRAINER_4 + const EVENT_BEAT_ROUTE_13_TRAINER_5 + const EVENT_BEAT_ROUTE_13_TRAINER_6 + const EVENT_BEAT_ROUTE_13_TRAINER_7 + const EVENT_BEAT_ROUTE_13_TRAINER_8 + const EVENT_BEAT_ROUTE_13_TRAINER_9 + +; Route 14 events + const_next $4A0 + const_skip + const EVENT_BEAT_ROUTE_14_TRAINER_0 + const EVENT_BEAT_ROUTE_14_TRAINER_1 + const EVENT_BEAT_ROUTE_14_TRAINER_2 + const EVENT_BEAT_ROUTE_14_TRAINER_3 + const EVENT_BEAT_ROUTE_14_TRAINER_4 + const EVENT_BEAT_ROUTE_14_TRAINER_5 + const EVENT_BEAT_ROUTE_14_TRAINER_6 + const EVENT_BEAT_ROUTE_14_TRAINER_7 + const EVENT_BEAT_ROUTE_14_TRAINER_8 + const EVENT_BEAT_ROUTE_14_TRAINER_9 + +; Route 15 events + const_next $4B0 + const EVENT_GOT_EXP_ALL + const EVENT_BEAT_ROUTE_15_TRAINER_0 + const EVENT_BEAT_ROUTE_15_TRAINER_1 + const EVENT_BEAT_ROUTE_15_TRAINER_2 + const EVENT_BEAT_ROUTE_15_TRAINER_3 + const EVENT_BEAT_ROUTE_15_TRAINER_4 + const EVENT_BEAT_ROUTE_15_TRAINER_5 + const EVENT_BEAT_ROUTE_15_TRAINER_6 + const EVENT_BEAT_ROUTE_15_TRAINER_7 + const EVENT_BEAT_ROUTE_15_TRAINER_8 + const EVENT_BEAT_ROUTE_15_TRAINER_9 + +; Route 16 events + const_next $4C0 + const_skip + const EVENT_BEAT_ROUTE_16_TRAINER_0 + const EVENT_BEAT_ROUTE_16_TRAINER_1 + const EVENT_BEAT_ROUTE_16_TRAINER_2 + const EVENT_BEAT_ROUTE_16_TRAINER_3 + const EVENT_BEAT_ROUTE_16_TRAINER_4 + const EVENT_BEAT_ROUTE_16_TRAINER_5 + const_skip + const EVENT_FIGHT_ROUTE16_SNORLAX + const EVENT_BEAT_ROUTE16_SNORLAX + const_skip 4 + const EVENT_GOT_HM02 + const EVENT_RESCUED_MR_FUJI + +; Route 17 events + const_next $4D0 + const_skip + const EVENT_BEAT_ROUTE_17_TRAINER_0 + const EVENT_BEAT_ROUTE_17_TRAINER_1 + const EVENT_BEAT_ROUTE_17_TRAINER_2 + const EVENT_BEAT_ROUTE_17_TRAINER_3 + const EVENT_BEAT_ROUTE_17_TRAINER_4 + const EVENT_BEAT_ROUTE_17_TRAINER_5 + const EVENT_BEAT_ROUTE_17_TRAINER_6 + const EVENT_BEAT_ROUTE_17_TRAINER_7 + const EVENT_BEAT_ROUTE_17_TRAINER_8 + const EVENT_BEAT_ROUTE_17_TRAINER_9 + +; Route 18 events + const_next $4E0 + const_skip + const EVENT_BEAT_ROUTE_18_TRAINER_0 + const EVENT_BEAT_ROUTE_18_TRAINER_1 + const EVENT_BEAT_ROUTE_18_TRAINER_2 + +; Route 19 events + const_next $4F0 + const_skip + const EVENT_BEAT_ROUTE_19_TRAINER_0 + const EVENT_BEAT_ROUTE_19_TRAINER_1 + const EVENT_BEAT_ROUTE_19_TRAINER_2 + const EVENT_BEAT_ROUTE_19_TRAINER_3 + const EVENT_BEAT_ROUTE_19_TRAINER_4 + const EVENT_BEAT_ROUTE_19_TRAINER_5 + const EVENT_BEAT_ROUTE_19_TRAINER_6 + const EVENT_BEAT_ROUTE_19_TRAINER_7 + const EVENT_BEAT_ROUTE_19_TRAINER_8 + const EVENT_BEAT_ROUTE_19_TRAINER_9 + +; Route 20 events + const_next $500 + const EVENT_IN_SEAFOAM_ISLANDS + const EVENT_BEAT_ROUTE_20_TRAINER_0 + const EVENT_BEAT_ROUTE_20_TRAINER_1 + const EVENT_BEAT_ROUTE_20_TRAINER_2 + const EVENT_BEAT_ROUTE_20_TRAINER_3 + const EVENT_BEAT_ROUTE_20_TRAINER_4 + const EVENT_BEAT_ROUTE_20_TRAINER_5 + const EVENT_BEAT_ROUTE_20_TRAINER_6 + const EVENT_BEAT_ROUTE_20_TRAINER_7 + const EVENT_BEAT_ROUTE_20_TRAINER_8 + const EVENT_BEAT_ROUTE_20_TRAINER_9 + const_skip 3 + const EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE + const EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE + +; Route 21 events + const_next $510 + const_skip + const EVENT_BEAT_ROUTE_21_TRAINER_0 + const EVENT_BEAT_ROUTE_21_TRAINER_1 + const EVENT_BEAT_ROUTE_21_TRAINER_2 + const EVENT_BEAT_ROUTE_21_TRAINER_3 + const EVENT_BEAT_ROUTE_21_TRAINER_4 + const EVENT_BEAT_ROUTE_21_TRAINER_5 + const EVENT_BEAT_ROUTE_21_TRAINER_6 + const EVENT_BEAT_ROUTE_21_TRAINER_7 + const EVENT_BEAT_ROUTE_21_TRAINER_8 + +; Route 22 events + const_next $520 + const EVENT_1ST_ROUTE22_RIVAL_BATTLE + const EVENT_2ND_ROUTE22_RIVAL_BATTLE + const_skip 3 + const EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE + const EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE + const EVENT_ROUTE22_RIVAL_WANTS_BATTLE + +; Route 23 events + const_next $530 + const EVENT_PASSED_CASCADEBADGE_CHECK + const EVENT_PASSED_THUNDERBADGE_CHECK + const EVENT_PASSED_RAINBOWBADGE_CHECK + const EVENT_PASSED_SOULBADGE_CHECK + const EVENT_PASSED_MARSHBADGE_CHECK + const EVENT_PASSED_VOLCANOBADGE_CHECK + const EVENT_PASSED_EARTHBADGE_CHECK + const_skip + const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 + const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 + const EVENT_BEAT_MOLTRES + const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 + +; Route 24 events + const_next $540 + const EVENT_GOT_NUGGET + const EVENT_BEAT_ROUTE24_ROCKET + const EVENT_BEAT_ROUTE_24_TRAINER_0 + const EVENT_BEAT_ROUTE_24_TRAINER_1 + const EVENT_BEAT_ROUTE_24_TRAINER_2 + const EVENT_BEAT_ROUTE_24_TRAINER_3 + const EVENT_BEAT_ROUTE_24_TRAINER_4 + const EVENT_BEAT_ROUTE_24_TRAINER_5 + const_skip + const EVENT_NUGGET_REWARD_AVAILABLE + +; Route 25 events + const_next $550 + const EVENT_MET_BILL + const EVENT_BEAT_ROUTE_25_TRAINER_0 + const EVENT_BEAT_ROUTE_25_TRAINER_1 + const EVENT_BEAT_ROUTE_25_TRAINER_2 + const EVENT_BEAT_ROUTE_25_TRAINER_3 + const EVENT_BEAT_ROUTE_25_TRAINER_4 + const EVENT_BEAT_ROUTE_25_TRAINER_5 + const EVENT_BEAT_ROUTE_25_TRAINER_6 + const EVENT_BEAT_ROUTE_25_TRAINER_7 + const EVENT_BEAT_ROUTE_25_TRAINER_8 + const_skip + const EVENT_USED_CELL_SEPARATOR_ON_BILL + const EVENT_GOT_SS_TICKET + const EVENT_MET_BILL_2 + const EVENT_BILL_SAID_USE_CELL_SEPARATOR + const EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING + +; Viridian Forest events + const_next $560 + const_skip 2 + const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 + const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 + const EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 + +; Mt. Moon events + const_next $570 + const_skip + const EVENT_BEAT_MT_MOON_1_TRAINER_0 + const EVENT_BEAT_MT_MOON_1_TRAINER_1 + const EVENT_BEAT_MT_MOON_1_TRAINER_2 + const EVENT_BEAT_MT_MOON_1_TRAINER_3 + const EVENT_BEAT_MT_MOON_1_TRAINER_4 + const EVENT_BEAT_MT_MOON_1_TRAINER_5 + const EVENT_BEAT_MT_MOON_1_TRAINER_6 + const_skip + const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD + const EVENT_BEAT_MT_MOON_3_TRAINER_0 + const EVENT_BEAT_MT_MOON_3_TRAINER_1 + const EVENT_BEAT_MT_MOON_3_TRAINER_2 + const EVENT_BEAT_MT_MOON_3_TRAINER_3 + const EVENT_GOT_DOME_FOSSIL + const EVENT_GOT_HELIX_FOSSIL + +; S.S. Anne events + const_next $5C0 + const_skip 4 + const EVENT_BEAT_SS_ANNE_5_TRAINER_0 + const EVENT_BEAT_SS_ANNE_5_TRAINER_1 + const_skip 26 + const EVENT_GOT_HM01 + const EVENT_RUBBED_CAPTAINS_BACK + const EVENT_SS_ANNE_LEFT + const EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT + const EVENT_STARTED_WALKING_OUT_OF_DOCK + const EVENT_WALKED_OUT_OF_DOCK + const_skip 11 + const EVENT_BEAT_SS_ANNE_8_TRAINER_0 + const EVENT_BEAT_SS_ANNE_8_TRAINER_1 + const EVENT_BEAT_SS_ANNE_8_TRAINER_2 + const EVENT_BEAT_SS_ANNE_8_TRAINER_3 + const_skip 12 + const EVENT_BEAT_SS_ANNE_9_TRAINER_0 + const EVENT_BEAT_SS_ANNE_9_TRAINER_1 + const EVENT_BEAT_SS_ANNE_9_TRAINER_2 + const EVENT_BEAT_SS_ANNE_9_TRAINER_3 + const_skip 12 + const EVENT_BEAT_SS_ANNE_10_TRAINER_0 + const EVENT_BEAT_SS_ANNE_10_TRAINER_1 + const EVENT_BEAT_SS_ANNE_10_TRAINER_2 + const EVENT_BEAT_SS_ANNE_10_TRAINER_3 + const EVENT_BEAT_SS_ANNE_10_TRAINER_4 + const EVENT_BEAT_SS_ANNE_10_TRAINER_5 + +; Victory Road 3F events + const_next $660 + const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 + const EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 + const_skip + const EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 + +; Rocket Hideout events + const_next $670 + const_skip + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 + const EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + const_skip + const EVENT_677 ; ??? + const_skip 7 + const EVENT_67F ; ??? + const_skip + const EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 + const_skip 15 + const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 + const EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 + const_skip 15 + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 + const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED + const EVENT_ROCKET_DROPPED_LIFT_KEY + const EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI + +; Silph Co. events + const_next $6F0 + const_skip 2 + const EVENT_BEAT_SILPH_CO_2F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_2F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_2F_TRAINER_2 + const EVENT_BEAT_SILPH_CO_2F_TRAINER_3 + const_skip 7 + const EVENT_SILPH_CO_2_UNLOCKED_DOOR1 + const EVENT_SILPH_CO_2_UNLOCKED_DOOR2 + const EVENT_GOT_TM36 + const_skip 2 + const EVENT_BEAT_SILPH_CO_3F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_3F_TRAINER_1 + const_skip 4 + const EVENT_SILPH_CO_3_UNLOCKED_DOOR1 + const EVENT_SILPH_CO_3_UNLOCKED_DOOR2 + const_skip 8 + const EVENT_BEAT_SILPH_CO_4F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_4F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_4F_TRAINER_2 + const_skip 3 + const EVENT_SILPH_CO_4_UNLOCKED_DOOR1 + const EVENT_SILPH_CO_4_UNLOCKED_DOOR2 + const_skip 8 + const EVENT_BEAT_SILPH_CO_5F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_5F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + const EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + const_skip 2 + const EVENT_SILPH_CO_5_UNLOCKED_DOOR1 + const EVENT_SILPH_CO_5_UNLOCKED_DOOR2 + const EVENT_SILPH_CO_5_UNLOCKED_DOOR3 + const_skip 11 + const EVENT_BEAT_SILPH_CO_6F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_6F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_6F_TRAINER_2 + const_skip 6 + const EVENT_SILPH_CO_6_UNLOCKED_DOOR + const EVENT_BEAT_SILPH_CO_RIVAL + const_skip 4 + const EVENT_BEAT_SILPH_CO_7F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_7F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_7F_TRAINER_2 + const EVENT_BEAT_SILPH_CO_7F_TRAINER_3 + const_skip 3 + const EVENT_SILPH_CO_7_UNLOCKED_DOOR1 + const EVENT_SILPH_CO_7_UNLOCKED_DOOR2 + const EVENT_SILPH_CO_7_UNLOCKED_DOOR3 + const_skip 3 + const EVENT_BEAT_SILPH_CO_8F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_8F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_8F_TRAINER_2 + const_skip 3 + const EVENT_SILPH_CO_8_UNLOCKED_DOOR + const_skip 9 + const EVENT_BEAT_SILPH_CO_9F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_9F_TRAINER_1 + const EVENT_BEAT_SILPH_CO_9F_TRAINER_2 + const_skip 3 + const EVENT_SILPH_CO_9_UNLOCKED_DOOR1 + const EVENT_SILPH_CO_9_UNLOCKED_DOOR2 + const EVENT_SILPH_CO_9_UNLOCKED_DOOR3 + const EVENT_SILPH_CO_9_UNLOCKED_DOOR4 + const_skip 5 + const EVENT_BEAT_SILPH_CO_10F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_10F_TRAINER_1 + const_skip 5 + const EVENT_SILPH_CO_10_UNLOCKED_DOOR + const_skip 11 + const EVENT_BEAT_SILPH_CO_11F_TRAINER_0 + const EVENT_BEAT_SILPH_CO_11F_TRAINER_1 + const_skip 2 + const EVENT_SILPH_CO_11_UNLOCKED_DOOR + const_skip 4 + const EVENT_GOT_MASTER_BALL + const_skip + const EVENT_BEAT_SILPH_CO_GIOVANNI + +; Pokémon Mansion events + const_next $800 + const_skip + const EVENT_BEAT_MANSION_2_TRAINER_0 + const_skip 15 + const EVENT_BEAT_MANSION_3_TRAINER_0 + const EVENT_BEAT_MANSION_3_TRAINER_1 + const_skip 14 + const EVENT_BEAT_MANSION_4_TRAINER_0 + const EVENT_BEAT_MANSION_4_TRAINER_1 + +; Safari Zone events + const_next $880 + const EVENT_GOT_HM03 + +; Cerulean Cave events + const_next $8C0 + const_skip + const EVENT_BEAT_MEWTWO + +; Indigo Plateau events + const_next $8E0 + const ELITE4_EVENTS_START + const EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 + const_skip 4 + const EVENT_AUTOWALKED_INTO_LORELEIS_ROOM + const_skip 2 + const EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 + const_skip 4 + const EVENT_AUTOWALKED_INTO_BRUNOS_ROOM + const_skip 2 + const EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 + const_skip 4 + const EVENT_AUTOWALKED_INTO_AGATHAS_ROOM + const_skip 2 + const EVENT_BEAT_LANCES_ROOM_TRAINER_0 + const_skip 4 + const EVENT_BEAT_LANCE + const EVENT_LANCES_ROOM_LOCK_DOOR + const_skip + const EVENT_BEAT_CHAMPION_RIVAL + const_skip 5 + const ELITE4_CHAMPION_EVENTS_END + +; Victory Road 1F events + const_next $910 + const_skip + const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 + const EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 + const_skip 4 + const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH + +; Rock Tunnel events + const_next $9B0 + const_skip + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 + const EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 + +; Seafoam Islands events + const_next $9C0 + const EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE + const EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE + const_skip 6 + const EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE + const EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE + const_skip 6 + const EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE + const EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE + const_skip 8 + const EVENT_BEAT_ARTICUNO + +; End of events + const_next $A00 +NUM_EVENTS EQU const_value diff --git a/constants/evolution_constants.asm b/constants/evolution_constants.asm deleted file mode 100755 index 86c466d8..00000000 --- a/constants/evolution_constants.asm +++ /dev/null @@ -1,9 +0,0 @@ -; See data/evos_moves.asm - -; Evolution types -EV_LEVEL EQU 1 -EV_ITEM EQU 2 -EV_TRADE EQU 3 - -MAX_EVOLUTIONS EQU 3 -EVOLUTION_SIZE EQU 4 diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm new file mode 100644 index 00000000..dd9de6b6 --- /dev/null +++ b/constants/gfx_constants.asm @@ -0,0 +1,39 @@ +TILE_WIDTH EQU 8 ; pixels +LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes +LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes + +SCREEN_WIDTH EQU 20 +SCREEN_HEIGHT EQU 18 +SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels +SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels + +BG_MAP_WIDTH EQU 32 ; tiles +BG_MAP_HEIGHT EQU 32 ; tiles + +SPRITEBUFFERSIZE EQU 7 * 7 * LEN_1BPP_TILE + +; HP bar +HP_BAR_GREEN EQU 0 +HP_BAR_YELLOW EQU 1 +HP_BAR_RED EQU 2 + +; hAutoBGTransferEnabled +TRANSFERTOP EQU 0 +TRANSFERMIDDLE EQU 1 +TRANSFERBOTTOM EQU 2 + +; hRedrawRowOrColumnMode +REDRAW_COL EQU 1 +REDRAW_ROW EQU 2 + +; tile list ids +; TileIDListPointerTable indexes (see data/tilemaps.asm) + const_def + const TILEMAP_MON_PIC + const TILEMAP_SLIDE_DOWN_MON_PIC_7X5 + const TILEMAP_SLIDE_DOWN_MON_PIC_7X3 + const TILEMAP_GENGAR_INTRO_1 + const TILEMAP_GENGAR_INTRO_2 + const TILEMAP_GENGAR_INTRO_3 + const TILEMAP_GAME_BOY + const TILEMAP_LINK_CABLE diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index b9aa240d..9de9918d 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -2,6 +2,19 @@ GBC EQU $11 +; memory map +VRAM_Begin EQU $8000 +VRAM_End EQU $a000 +SRAM_Begin EQU $a000 +SRAM_End EQU $c000 +WRAM0_Begin EQU $c000 +WRAM0_End EQU $d000 +WRAM1_Begin EQU $d000 +WRAM1_End EQU $e000 +; hardware registers $ff00-$ff80 (see below) +HRAM_Begin EQU $ff80 +HRAM_End EQU $ffff + ; MBC1 MBC1SRamEnable EQU $0000 MBC1RomBank EQU $2000 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm old mode 100755 new mode 100644 index d2077629..82e80bae --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -1,11 +1,14 @@ +HIDE EQU $11 +SHOW EQU $15 + +; MissableObjects indexes (see data/maps/hide_show_data.asm) ; this is a list of the sprites that can be enabled/disabled during the game ; sprites marked with an X are constants that are never used ; because those sprites are not (de)activated in a map's script ; (they are either items or sprites that deactivate after battle ; and are detected in wMissableObjectList) -const_value = 0 - + const_def const HS_PALLET_TOWN_OAK ; 00 const HS_LYING_OLD_MAN ; 01 const HS_OLD_MAN ; 02 @@ -14,7 +17,7 @@ const_value = 0 const HS_CERULEAN_RIVAL ; 05 const HS_CERULEAN_ROCKET ; 06 const HS_CERULEAN_GUARD_1 ; 07 - const HS_UNKNOWN_DUNGEON_GUY ; 08 + const HS_CERULEAN_CAVE_GUY ; 08 const HS_CERULEAN_GUARD_2 ; 09 const HS_SAFFRON_CITY_1 ; 0A const HS_SAFFRON_CITY_2 ; 0B diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm new file mode 100644 index 00000000..14202da3 --- /dev/null +++ b/constants/icon_constants.asm @@ -0,0 +1,17 @@ +; party menu icons +; used in MonPartySpritePointers (see data/icon_pointers.asm) + const_def + const ICON_MON ; $0 + const ICON_BALL ; $1 + const ICON_HELIX ; $2 + const ICON_FAIRY ; $3 + const ICON_BIRD ; $4 + const ICON_WATER ; $5 + const ICON_BUG ; $6 + const ICON_GRASS ; $7 + const ICON_SNAKE ; $8 + const ICON_QUADRUPED ; $9 + +ICON_TRADEBUBBLE EQU $e + +ICONOFFSET EQU $40 ; difference between alternating icon frames' tile IDs diff --git a/constants/input_constants.asm b/constants/input_constants.asm new file mode 100644 index 00000000..7984d5a9 --- /dev/null +++ b/constants/input_constants.asm @@ -0,0 +1,20 @@ +; joypad buttons + const_def + const BIT_A_BUTTON + const BIT_B_BUTTON + const BIT_SELECT + const BIT_START + const BIT_D_RIGHT + const BIT_D_LEFT + const BIT_D_UP + const BIT_D_DOWN + +NO_INPUT EQU 0 +A_BUTTON EQU 1 << BIT_A_BUTTON +B_BUTTON EQU 1 << BIT_B_BUTTON +SELECT EQU 1 << BIT_SELECT +START EQU 1 << BIT_START +D_RIGHT EQU 1 << BIT_D_RIGHT +D_LEFT EQU 1 << BIT_D_LEFT +D_UP EQU 1 << BIT_D_UP +D_DOWN EQU 1 << BIT_D_DOWN diff --git a/constants/item_constants.asm b/constants/item_constants.asm old mode 100755 new mode 100644 index fe6fcb15..d0c25202 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -1,5 +1,12 @@ -const_value = 1 - +; item ids +; indexes for: +; - ItemNames (see data/items/names.asm) +; - ItemPrices (see data/items/prices.asm) +; - TechnicalMachinePrices (see data/items/tm_prices.asm) +; - KeyItemBitfield (see data/items/key_items.asm) +; - ItemUsePtrTable (see engine/items/item_effects.asm) + const_def + const NO_ITEM ; $00 const MASTER_BALL ; $01 const ULTRA_BALL ; $02 const GREAT_BALL ; $03 @@ -100,60 +107,121 @@ SAFARI_ROCK EQU $16 ; overload const FLOOR_11F ; $60 const FLOOR_B4F ; $61 -const_value = $C4 + const_next $C4 - const HM_01 ; $C4 - const HM_02 ; $C5 - const HM_03 ; $C6 - const HM_04 ; $C7 - const HM_05 ; $C8 - const TM_01 ; $C9 - const TM_02 ; $CA - const TM_03 ; $CB - const TM_04 ; $CC - const TM_05 ; $CD - const TM_06 ; $CE - const TM_07 ; $CF - const TM_08 ; $D0 - const TM_09 ; $D1 - const TM_10 ; $D2 - const TM_11 ; $D3 - const TM_12 ; $D4 - const TM_13 ; $D5 - const TM_14 ; $D6 - const TM_15 ; $D7 - const TM_16 ; $D8 - const TM_17 ; $D9 - const TM_18 ; $DA - const TM_19 ; $DB - const TM_20 ; $DC - const TM_21 ; $DD - const TM_22 ; $DE - const TM_23 ; $DF - const TM_24 ; $E0 - const TM_25 ; $E1 - const TM_26 ; $E2 - const TM_27 ; $E3 - const TM_28 ; $E4 - const TM_29 ; $E5 - const TM_30 ; $E6 - const TM_31 ; $E7 - const TM_32 ; $E8 - const TM_33 ; $E9 - const TM_34 ; $EA - const TM_35 ; $EB - const TM_36 ; $EC - const TM_37 ; $ED - const TM_38 ; $EE - const TM_39 ; $EF - const TM_40 ; $F0 - const TM_41 ; $F1 - const TM_42 ; $F2 - const TM_43 ; $F3 - const TM_44 ; $F4 - const TM_45 ; $F5 - const TM_46 ; $F6 - const TM_47 ; $F7 - const TM_48 ; $F8 - const TM_49 ; $F9 - const TM_50 ; $FA +; HMs are defined before TMs, so the actual number of TM definitions +; is not yet available. The TM quantity is hard-coded here and must +; match the actual number below. +NUM_TMS EQU 50 + +add_hm: MACRO +; Defines three constants: +; - HM_\1: the item id, starting at $C4 +; - \1_TMNUM: the learnable TM/HM flag, starting at 51 +; - HM##_MOVE: alias for the move id, equal to the value of \1 +; The first usage also defines HM01 as the first HM item id. +IF !DEF(HM01) +HM01 EQU const_value +__tmhm_value__ = NUM_TMS + 1 +ENDC +HM_VALUE EQU __tmhm_value__ - NUM_TMS +IF HM_VALUE < 10 +MOVE_FOR_HM EQUS "HM0{d:HM_VALUE}_MOVE" +ELSE +MOVE_FOR_HM EQUS "HM{d:HM_VALUE}_MOVE" +ENDC +MOVE_FOR_HM = \1 +PURGE MOVE_FOR_HM +PURGE HM_VALUE + const HM_\1 +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 +ENDM + + add_hm CUT ; $C4 + add_hm FLY ; $C5 + add_hm SURF ; $C6 + add_hm STRENGTH ; $C7 + add_hm FLASH ; $C8 +NUM_HMS EQU const_value - HM01 + +add_tm: MACRO +; Defines three constants: +; - TM_\1: the item id, starting at $C9 +; - \1_TMNUM: the learnable TM/HM flag, starting at 1 +; - TM##_MOVE: alias for the move id, equal to the value of \1 +; The first usage also defines TM01 as the first TM item id. +IF !DEF(TM01) +TM01 EQU const_value +__tmhm_value__ = 1 +ENDC +IF __tmhm_value__ < 10 +MOVE_FOR_TM EQUS "TM0{d:__tmhm_value__}_MOVE" +ELSE +MOVE_FOR_TM EQUS "TM{d:__tmhm_value__}_MOVE" +ENDC +MOVE_FOR_TM = \1 +PURGE MOVE_FOR_TM + const TM_\1 +\1_TMNUM EQU __tmhm_value__ +__tmhm_value__ = __tmhm_value__ + 1 +ENDM + + add_tm MEGA_PUNCH ; $C9 + add_tm RAZOR_WIND ; $CA + add_tm SWORDS_DANCE ; $CB + add_tm WHIRLWIND ; $CC + add_tm MEGA_KICK ; $CD + add_tm TOXIC ; $CE + add_tm HORN_DRILL ; $CF + add_tm BODY_SLAM ; $D0 + add_tm TAKE_DOWN ; $D1 + add_tm DOUBLE_EDGE ; $D2 + add_tm BUBBLEBEAM ; $D3 + add_tm WATER_GUN ; $D4 + add_tm ICE_BEAM ; $D5 + add_tm BLIZZARD ; $D6 + add_tm HYPER_BEAM ; $D7 + add_tm PAY_DAY ; $D8 + add_tm SUBMISSION ; $D9 + add_tm COUNTER ; $DA + add_tm SEISMIC_TOSS ; $DB + add_tm RAGE ; $DC + add_tm MEGA_DRAIN ; $DD + add_tm SOLARBEAM ; $DE + add_tm DRAGON_RAGE ; $DF + add_tm THUNDERBOLT ; $E0 + add_tm THUNDER ; $E1 + add_tm EARTHQUAKE ; $E2 + add_tm FISSURE ; $E3 + add_tm DIG ; $E4 + add_tm PSYCHIC_M ; $E5 + add_tm TELEPORT ; $E6 + add_tm MIMIC ; $E7 + add_tm DOUBLE_TEAM ; $E8 + add_tm REFLECT ; $E9 + add_tm BIDE ; $EA + add_tm METRONOME ; $EB + add_tm SELFDESTRUCT ; $EC + add_tm EGG_BOMB ; $ED + add_tm FIRE_BLAST ; $EE + add_tm SWIFT ; $EF + add_tm SKULL_BASH ; $F0 + add_tm SOFTBOILED ; $F1 + add_tm DREAM_EATER ; $F2 + add_tm SKY_ATTACK ; $F3 + add_tm REST ; $F4 + add_tm THUNDER_WAVE ; $F5 + add_tm PSYWAVE ; $F6 + add_tm EXPLOSION ; $F7 + add_tm ROCK_SLIDE ; $F8 + add_tm TRI_ATTACK ; $F9 + add_tm SUBSTITUTE ; $FA +assert NUM_TMS == const_value - TM01, "NUM_TMS ({d:NUM_TMS}) does not match the number of add_tm definitions" + +NUM_TM_HM EQU NUM_TMS + NUM_HMS + +; 50 TMs + 5 HMs = 55 learnable TM/HM flags per Pokémon. +; These fit in 7 bytes, with one unused bit left over. +__tmhm_value__ = NUM_TM_HM + 1 +UNUSED_TMNUM EQU __tmhm_value__ diff --git a/constants/list_constants.asm b/constants/list_constants.asm old mode 100755 new mode 100644 index 7e26a6b6..840856df --- a/constants/list_constants.asm +++ b/constants/list_constants.asm @@ -1,20 +1,24 @@ -; list menu ID's -PCPOKEMONLISTMENU EQU $00 ; PC pokemon withdraw/deposit lists -MOVESLISTMENU EQU $01 ; XXX where is this used? -PRICEDITEMLISTMENU EQU $02 ; Pokemart buy menu / Pokemart buy/sell choose quantity menu -ITEMLISTMENU EQU $03 ; Start menu Item menu / Pokemart sell menu -SPECIALLISTMENU EQU $04 ; list of special "items" e.g. floor list in elevators / list of badges +; list menu IDs + const_def + const PCPOKEMONLISTMENU ; $00 ; PC pokemon withdraw/deposit lists + const MOVESLISTMENU ; $01 ; XXX where is this used? + const PRICEDITEMLISTMENU ; $02 ; Pokemart buy menu / Pokemart buy/sell choose quantity menu + const ITEMLISTMENU ; $03 ; Start menu Item menu / Pokemart sell menu + const SPECIALLISTMENU ; $04 ; list of special "items" e.g. floor list in elevators / list of badges -MONSTER_NAME EQU 1 -MOVE_NAME EQU 2 -; ???_NAME EQU 3 -ITEM_NAME EQU 4 -PLAYEROT_NAME EQU 5 -ENEMYOT_NAME EQU 6 -TRAINER_NAME EQU 7 +; NamePointers indexes (see home/names2.asm) + const_def 1 + const MONSTER_NAME ; 1 + const MOVE_NAME ; 2 + const UNUSED_NAME ; 3 + const ITEM_NAME ; 4 + const PLAYEROT_NAME ; 5 + const ENEMYOT_NAME ; 6 + const TRAINER_NAME ; 7 -INIT_ENEMYOT_LIST EQU 1 -INIT_BAG_ITEM_LIST EQU 2 -INIT_OTHER_ITEM_LIST EQU 3 -INIT_PLAYEROT_LIST EQU 4 -INIT_MON_LIST EQU 5 + const_def 1 + const INIT_ENEMYOT_LIST ; 1 + const INIT_BAG_ITEM_LIST ; 2 + const INIT_OTHER_ITEM_LIST ; 3 + const INIT_PLAYEROT_LIST ; 4 + const INIT_MON_LIST ; 5 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 3ddc5746..d33ffe12 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -4,6 +4,16 @@ mapconst: MACRO \1_WIDTH EQU \3 ENDM +; map ids +; indexes for: +; - MapHeaderBanks (see data/maps/map_header_banks.asm) +; - MapHeaderPointers (see data/maps/map_header_pointers.asm) +; - MapSongBanks (see data/maps/songs.asm) +; - MapHSPointers (see data/maps/hide_show_data.asm) +; - MapSpriteSets (see data/maps/sprite_sets.asm) +; - ExternalMapEntries (see data/maps/town_map_entries.asm) +; Each map also has associated data in maps.asm. +; Order: towns/cities, then routes, then indoor/dungeon maps const_def mapconst PALLET_TOWN, 9, 10 ; $00 mapconst VIRIDIAN_CITY, 18, 20 ; $01 @@ -16,7 +26,9 @@ ENDM mapconst CINNABAR_ISLAND, 9, 10 ; $08 mapconst INDIGO_PLATEAU, 9, 10 ; $09 mapconst SAFFRON_CITY, 18, 20 ; $0A +NUM_CITY_MAPS EQU const_value mapconst UNUSED_MAP_0B, 0, 0 ; $0B +FIRST_ROUTE_MAP EQU const_value mapconst ROUTE_1, 18, 10 ; $0C mapconst ROUTE_2, 36, 10 ; $0D mapconst ROUTE_3, 9, 35 ; $0E @@ -42,6 +54,7 @@ ENDM mapconst ROUTE_23, 72, 10 ; $22 mapconst ROUTE_24, 18, 10 ; $23 mapconst ROUTE_25, 9, 30 ; $24 +FIRST_INDOOR_MAP EQU const_value mapconst REDS_HOUSE_1F, 4, 4 ; $25 mapconst REDS_HOUSE_2F, 4, 4 ; $26 mapconst BLUES_HOUSE, 4, 4 ; $27 @@ -253,3 +266,7 @@ ENDM mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst BRUNOS_ROOM, 6, 5 ; $F6 mapconst AGATHAS_ROOM, 6, 5 ; $F7 + +; Indoor maps, such as houses, use this as the Map ID in their exit warps +; This map ID takes the player back to the last outdoor map they were on, stored in wLastMap +LAST_MAP EQU -1 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm new file mode 100644 index 00000000..605e7013 --- /dev/null +++ b/constants/map_data_constants.asm @@ -0,0 +1,16 @@ +; width of east/west connections +; height of north/south connections +MAP_BORDER EQU 3 + +; connection directions + const_def + shift_const EAST ; 1 + shift_const WEST ; 2 + shift_const SOUTH ; 4 + shift_const NORTH ; 8 + +; flower and water tile animations + const_def + const TILEANIM_NONE ; 0 + const TILEANIM_WATER ; 1 + const TILEANIM_WATER_FLOWER ; 2 diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm new file mode 100644 index 00000000..9993a6a9 --- /dev/null +++ b/constants/map_object_constants.asm @@ -0,0 +1,57 @@ +; spritestatedata1 struct members (see macros/wram.asm) + const_def + const SPRITESTATEDATA1_PICTUREID ; 0 + const SPRITESTATEDATA1_MOVEMENTSTATUS ; 1 + const SPRITESTATEDATA1_IMAGEINDEX ; 2 + const SPRITESTATEDATA1_YSTEPVECTOR ; 3 + const SPRITESTATEDATA1_YPIXELS ; 4 + const SPRITESTATEDATA1_XSTEPVECTOR ; 5 + const SPRITESTATEDATA1_XPIXELS ; 6 + const SPRITESTATEDATA1_INTRAANIMFRAMECOUNTER ; 7 + const SPRITESTATEDATA1_ANIMFRAMECOUNTER ; 8 + const SPRITESTATEDATA1_FACINGDIRECTION ; 9 + const SPRITESTATEDATA1_YADJUSTED ; a + const SPRITESTATEDATA1_XADJUSTED ; b + const SPRITESTATEDATA1_COLLISIONDATA ; c + const SPRITESTATEDATA1_0D ; d + const SPRITESTATEDATA1_0E ; e + const SPRITESTATEDATA1_0F ; f +SPRITESTATEDATA1_LENGTH EQU const_value + +; spritestatedata2 struct members (see macros/wram.asm) + const_def + const SPRITESTATEDATA2_WALKANIMATIONCOUNTER ; 0 + const SPRITESTATEDATA2_01 ; 1 + const SPRITESTATEDATA2_YDISPLACEMENT ; 2 + const SPRITESTATEDATA2_XDISPLACEMENT ; 3 + const SPRITESTATEDATA2_MAPY ; 4 + const SPRITESTATEDATA2_MAPX ; 5 + const SPRITESTATEDATA2_MOVEMENTBYTE1 ; 6 + const SPRITESTATEDATA2_GRASSPRIORITY ; 7 + const SPRITESTATEDATA2_MOVEMENTDELAY ; 8 + const SPRITESTATEDATA2_ORIGFACINGDIRECTION ; 9 + const SPRITESTATEDATA2_0A ; a + const SPRITESTATEDATA2_0B ; b + const SPRITESTATEDATA2_0C ; c + const SPRITESTATEDATA2_PICTUREID ; d + const SPRITESTATEDATA2_IMAGEBASEOFFSET ; e + const SPRITESTATEDATA2_0F ; f +SPRITESTATEDATA2_LENGTH EQU const_value + +; different kinds of people events +ITEM EQU $80 +TRAINER EQU $40 + +WALK EQU $FE +STAY EQU $FF + +ANY_DIR EQU $00 +UP_DOWN EQU $01 +LEFT_RIGHT EQU $02 +DOWN EQU $D0 +UP EQU $D1 +LEFT EQU $D2 +RIGHT EQU $D3 +NONE EQU $FF + +BOULDER_MOVEMENT_BYTE_2 EQU $10 diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm new file mode 100644 index 00000000..a53adfdc --- /dev/null +++ b/constants/menu_constants.asm @@ -0,0 +1,88 @@ +BAG_ITEM_CAPACITY EQU 20 +PC_ITEM_CAPACITY EQU 50 + +; text box IDs + const_def 1 + const MESSAGE_BOX ; $01 + const_skip ; $02 + const MENU_TEMPLATE_03 ; $03 unused + const FIELD_MOVE_MON_MENU ; $04 + const JP_MOCHIMONO_MENU_TEMPLATE ; $05 + const USE_TOSS_MENU_TEMPLATE ; $06 + const MENU_TEMPLATE_07 ; $07 unused + const JP_SAVE_MESSAGE_MENU_TEMPLATE ; $08 + const JP_SPEED_OPTIONS_MENU_TEMPLATE ; $09 + const_skip ; $0a + const BATTLE_MENU_TEMPLATE ; $0b + const SWITCH_STATS_CANCEL_MENU_TEMPLATE ; $0c + const LIST_MENU_BOX ; $0d + const BUY_SELL_QUIT_MENU_TEMPLATE ; $0e + const MONEY_BOX_TEMPLATE ; $0f + const MENU_TEMPLATE_10 ; $10 unused + const MON_SPRITE_POPUP ; $11 + const JP_AH_MENU_TEMPLATE ; $12 + const MONEY_BOX ; $13 + const TWO_OPTION_MENU ; $14 + const BUY_SELL_QUIT_MENU ; $15 + const_skip ; $16 + const_skip ; $17 + const_skip ; $18 + const_skip ; $19 + const JP_POKEDEX_MENU_TEMPLATE ; $1a + const SAFARI_BATTLE_MENU_TEMPLATE ; $1b + +; two option menu constants +; TwoOptionMenuStrings indexes (see data/yes_no_menu_strings.asm) + const_def + const YES_NO_MENU ; 0 + const NORTH_WEST_MENU ; 1 + const SOUTH_EAST_MENU ; 2 + const WIDE_YES_NO_MENU ; 3 + const NORTH_EAST_MENU ; 4 + const TRADE_CANCEL_MENU ; 5 + const HEAL_CANCEL_MENU ; 6 + const NO_YES_MENU ; 7 + +; menu exit method constants for list menus and the buy/sell/quit menu +CHOSE_MENU_ITEM EQU 1 ; pressed A +CANCELLED_MENU EQU 2 ; pressed B + +; menu exit method constants for two-option menus +CHOSE_FIRST_ITEM EQU 1 +CHOSE_SECOND_ITEM EQU 2 + +; move mon constants + const_def + const BOX_TO_PARTY ; 0 + const PARTY_TO_BOX ; 1 + const DAYCARE_TO_PARTY ; 2 + const PARTY_TO_DAYCARE ; 3 + +; party menu types +; PartyMenuMessagePointers indexes (see engine/menus/party_menu.asm) + const_def + const NORMAL_PARTY_MENU ; $00 + const USE_ITEM_PARTY_MENU ; $01 + const BATTLE_PARTY_MENU ; $02 + const TMHM_PARTY_MENU ; $03 + const SWAP_MONS_PARTY_MENU ; $04 + const EVO_STONE_PARTY_MENU ; $05 +; party menu message IDs +; PartyMenuItemUseMessagePointers indexes (see engine/menus/party_menu.asm) + const_next $F0 +FIRST_PARTY_MENU_TEXT_ID EQU const_value + const ANTIDOTE_MSG ; $F0 + const BURN_HEAL_MSG ; $F1 + const ICE_HEAL_MSG ; $F2 + const AWAKENING_MSG ; $F3 + const PARALYZ_HEAL_MSG ; $F4 + const POTION_MSG ; $F5 + const FULL_HEAL_MSG ; $F6 + const REVIVE_MSG ; $F7 + const RARE_CANDY_MSG ; $F8 + +; naming screen types + const_def + const NAME_PLAYER_SCREEN ; 0 + const NAME_RIVAL_SCREEN ; 1 + const NAME_MON_SCREEN ; 2 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index d6a935f8..1bb32f8e 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -1,208 +1,9 @@ -MAX_LEVEL EQU 100 - -NUM_MOVES EQU 4 -NUM_STATS EQU 5 -NUM_STAT_MODS EQU 8 -NUM_DVS EQU 2 - -PARTY_LENGTH EQU 6 - -MONS_PER_BOX EQU 20 -NUM_BOXES EQU 12 - -BAG_ITEM_CAPACITY EQU 20 -PC_ITEM_CAPACITY EQU 50 - -HOF_MON EQU $10 -HOF_TEAM EQU PARTY_LENGTH * HOF_MON -HOF_TEAM_CAPACITY EQU 50 - -NAME_LENGTH EQU 11 -ITEM_NAME_LENGTH EQU 13 - -A_BUTTON EQU %00000001 -B_BUTTON EQU %00000010 -SELECT EQU %00000100 -START EQU %00001000 -D_RIGHT EQU %00010000 -D_LEFT EQU %00100000 -D_UP EQU %01000000 -D_DOWN EQU %10000000 - -const_value set 0 - const BIT_A_BUTTON - const BIT_B_BUTTON - const BIT_SELECT - const BIT_START - const BIT_D_RIGHT - const BIT_D_LEFT - const BIT_D_UP - const BIT_D_DOWN - -SCREEN_WIDTH EQU 20 -SCREEN_HEIGHT EQU 18 - -SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * 8 -SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8 - -BYTES_PER_TILE EQU 16 - -BG_MAP_WIDTH EQU 32 -BG_MAP_HEIGHT EQU 32 - -SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) - -NPC_MOVEMENT_DOWN EQU $00 -NPC_MOVEMENT_UP EQU $40 -NPC_MOVEMENT_LEFT EQU $80 -NPC_MOVEMENT_RIGHT EQU $C0 - -; text box IDs -MESSAGE_BOX EQU $01 -FIELD_MOVE_MON_MENU EQU $04 -JP_MOCHIMONO_MENU_TEMPLATE EQU $05 -USE_TOSS_MENU_TEMPLATE EQU $06 -JP_SAVE_MESSAGE_MENU_TEMPLATE EQU $08 -JP_SPEED_OPTIONS_MENU_TEMPLATE EQU $09 -BATTLE_MENU_TEMPLATE EQU $0b -SWITCH_STATS_CANCEL_MENU_TEMPLATE EQU $0c -LIST_MENU_BOX EQU $0d -BUY_SELL_QUIT_MENU_TEMPLATE EQU $0e -MONEY_BOX_TEMPLATE EQU $0f -MON_SPRITE_POPUP EQU $11 -JP_AH_MENU_TEMPLATE EQU $12 -MONEY_BOX EQU $13 -TWO_OPTION_MENU EQU $14 -BUY_SELL_QUIT_MENU EQU $15 -JP_POKEDEX_MENU_TEMPLATE EQU $1a -SAFARI_BATTLE_MENU_TEMPLATE EQU $1b - -; two option menu constants -YES_NO_MENU EQU 0 -NORTH_WEST_MENU EQU 1 -SOUTH_EAST_MENU EQU 2 -WIDE_YES_NO_MENU EQU 3 -NORTH_EAST_MENU EQU 4 -TRADE_CANCEL_MENU EQU 5 -HEAL_CANCEL_MENU EQU 6 -NO_YES_MENU EQU 7 - -; menu exit method constants for list menus and the buy/sell/quit menu -CHOSE_MENU_ITEM EQU 1 ; pressed A -CANCELLED_MENU EQU 2 ; pressed B - -; menu exit method constants for two-option menus -CHOSE_FIRST_ITEM EQU 1 -CHOSE_SECOND_ITEM EQU 2 - -; move mon constants -BOX_TO_PARTY EQU 0 -PARTY_TO_BOX EQU 1 -DAYCARE_TO_PARTY EQU 2 -PARTY_TO_DAYCARE EQU 3 - -; emotion bubbles -EXCLAMATION_BUBBLE EQU 0 -QUESTION_BUBBLE EQU 1 -SMILE_BUBBLE EQU 2 - -; slot symbols -SLOTS7 EQU $0200 -SLOTSBAR EQU $0604 -SLOTSCHERRY EQU $0A08 -SLOTSFISH EQU $0E0C -SLOTSBIRD EQU $1210 -SLOTSMOUSE EQU $1614 - -; party menu types -NORMAL_PARTY_MENU EQU 0 -USE_ITEM_PARTY_MENU EQU 1 -BATTLE_PARTY_MENU EQU 2 -TMHM_PARTY_MENU EQU 3 -SWAP_MONS_PARTY_MENU EQU 4 -EVO_STONE_PARTY_MENU EQU 5 - -; party menu message IDs -ANTIDOTE_MSG EQU $F0 -BURN_HEAL_MSG EQU $F1 -ICE_HEAL_MSG EQU $F2 -AWAKENING_MSG EQU $F3 -PARALYZ_HEAL_MSG EQU $F4 -POTION_MSG EQU $F5 -FULL_HEAL_MSG EQU $F6 -REVIVE_MSG EQU $F7 -RARE_CANDY_MSG EQU $F8 - -; naming screen types -NAME_PLAYER_SCREEN EQU 0 -NAME_RIVAL_SCREEN EQU 1 -NAME_MON_SCREEN EQU 2 - -; mon data locations -; Note that some values are not supported by all functions that use these values. -PLAYER_PARTY_DATA EQU 0 -ENEMY_PARTY_DATA EQU 1 -BOX_DATA EQU 2 -DAYCARE_DATA EQU 3 -BATTLE_MON_DATA EQU 4 - -; player direction constants - -PLAYER_DIR_BIT_RIGHT EQU 0 -PLAYER_DIR_BIT_LEFT EQU 1 -PLAYER_DIR_BIT_DOWN EQU 2 -PLAYER_DIR_BIT_UP EQU 3 - -PLAYER_DIR_RIGHT EQU (1 << PLAYER_DIR_BIT_RIGHT) -PLAYER_DIR_LEFT EQU (1 << PLAYER_DIR_BIT_LEFT) -PLAYER_DIR_DOWN EQU (1 << PLAYER_DIR_BIT_DOWN) -PLAYER_DIR_UP EQU (1 << PLAYER_DIR_BIT_UP) +; Boolean checks +FALSE EQU 0 +TRUE EQU 1 ; flag operations - -FLAG_RESET EQU 0 -FLAG_SET EQU 1 -FLAG_TEST EQU 2 - -; HP bar -HP_BAR_GREEN EQU 0 -HP_BAR_YELLOW EQU 1 -HP_BAR_RED EQU 2 - -; D733 flags -BIT_TEST_BATTLE EQU 0 - -; battle type constants -BATTLE_TYPE_NORMAL EQU 0 -BATTLE_TYPE_OLD_MAN EQU 1 -BATTLE_TYPE_SAFARI EQU 2 - -; serial - -ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 -ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK EQU $02 - -USING_EXTERNAL_CLOCK EQU $01 -USING_INTERNAL_CLOCK EQU $02 -CONNECTION_NOT_ESTABLISHED EQU $ff - -; signals the start of an array of bytes transferred over the link cable -SERIAL_PREAMBLE_BYTE EQU $FD - -; this byte is used when there is no data to send -SERIAL_NO_DATA_BYTE EQU $FE - -; signals the end of one part of a patch list (there are two parts) for player/enemy party data -SERIAL_PATCH_LIST_PART_TERMINATOR EQU $FF - -LINK_STATE_NONE EQU $00 ; not using link -LINK_STATE_IN_CABLE_CLUB EQU $01 ; in a cable club room (Colosseum or Trade Centre) -LINK_STATE_START_TRADE EQU $02 ; pre-trade selection screen initialisation -LINK_STATE_START_BATTLE EQU $03 ; pre-battle initialisation -LINK_STATE_BATTLING EQU $04 ; in a link battle -LINK_STATE_RESET EQU $05 ; reset game (unused) -LINK_STATE_TRADING EQU $32 ; in a link trade - -LINKBATTLE_RUN EQU $F -LINKBATTLE_STRUGGLE EQU $E -LINKBATTLE_NO_ACTION EQU $D + const_def + const FLAG_RESET ; 0 + const FLAG_SET ; 1 + const FLAG_TEST ; 2 diff --git a/constants/move_animation_constants.asm b/constants/move_animation_constants.asm index 27658c83..f7617544 100644 --- a/constants/move_animation_constants.asm +++ b/constants/move_animation_constants.asm @@ -1,8 +1,8 @@ -; subanimations - -const_value = $D8 - -; special effects, prefaced with "SE" for "Special Effect" +; special effects that are part of move animations +; SpecialEffectPointers associates them with effect routines (see data/battle_anims/special_effect_pointers.asm) + const_def $C0 +FIRST_SE_ID EQU const_value + const_skip $18 const SE_WAVY_SCREEN ; $D8 used in Psywave/Night Shade/Psychic etc. const SE_SUBSTITUTE_MON ; $D9 used in Substitute (turns the pokemon into a mini sprite) const SE_SHAKE_BACK_AND_FORTH ; $DA used in Double Team @@ -42,3 +42,417 @@ const_value = $D8 const SE_RESET_SCREEN_PALETTE ; $FC used in Leer/Thunderpunch/etc. const SE_DARK_SCREEN_PALETTE ; $FD used in Hyper Beam/Thunderpunch/etc. const SE_DARK_SCREEN_FLASH ; $FE used in Cut/Take Down/etc. + +; subanimations that are part of move animations +; SubanimationPointers indexes (see data/battle_anims/subanimations.asm) + const_def + const SUBANIM_00 + const SUBANIM_01 + const SUBANIM_02 + const SUBANIM_03 + const SUBANIM_04 + const SUBANIM_05 + const SUBANIM_06 + const SUBANIM_07 + const SUBANIM_08 + const SUBANIM_09 + const SUBANIM_0A + const SUBANIM_0B + const SUBANIM_0C + const SUBANIM_0D + const SUBANIM_0E + const SUBANIM_0F + const SUBANIM_10 + const SUBANIM_11 + const SUBANIM_12 + const SUBANIM_13 + const SUBANIM_14 + const SUBANIM_15 + const SUBANIM_16 + const SUBANIM_17 + const SUBANIM_18 + const SUBANIM_19 + const SUBANIM_1A + const SUBANIM_1B + const SUBANIM_1C + const SUBANIM_1D + const SUBANIM_1E + const SUBANIM_1F + const SUBANIM_20 + const SUBANIM_21 + const SUBANIM_22 + const SUBANIM_23 + const SUBANIM_24 + const SUBANIM_25 + const SUBANIM_26 + const SUBANIM_27 + const SUBANIM_28 + const SUBANIM_29 + const SUBANIM_2A + const SUBANIM_2B + const SUBANIM_2C + const SUBANIM_2D + const SUBANIM_2E + const SUBANIM_2F + const SUBANIM_30 + const SUBANIM_31 + const SUBANIM_32 + const SUBANIM_33 + const SUBANIM_34 + const SUBANIM_35 + const SUBANIM_36 + const SUBANIM_37 + const SUBANIM_38 + const SUBANIM_39 + const SUBANIM_3A + const SUBANIM_3B + const SUBANIM_3C + const SUBANIM_3D + const SUBANIM_3E + const SUBANIM_3F + const SUBANIM_40 + const SUBANIM_41 + const SUBANIM_42 + const SUBANIM_43 + const SUBANIM_44 + const SUBANIM_45 + const SUBANIM_46 + const SUBANIM_47 + const SUBANIM_48 + const SUBANIM_49 + const SUBANIM_4A + const SUBANIM_4B + const SUBANIM_4C + const SUBANIM_4D + const SUBANIM_4E + const SUBANIM_4F + const SUBANIM_50 + const SUBANIM_51 + const SUBANIM_52 + const SUBANIM_53 + const SUBANIM_54 + const SUBANIM_55 + +; types of subanimations + const_def + const SUBANIMTYPE_NORMAL + const SUBANIMTYPE_HVFLIP + const SUBANIMTYPE_HFLIP + const SUBANIMTYPE_COORDFLIP + const SUBANIMTYPE_REVERSE + const SUBANIMTYPE_ENEMY + +; frame blocks that are part of subanimations +; FrameBlockPointers indexes (see data/battle_anims/frame_blocks.asm) + const_def + const FRAMEBLOCK_00 + const FRAMEBLOCK_01 + const FRAMEBLOCK_02 + const FRAMEBLOCK_03 + const FRAMEBLOCK_04 + const FRAMEBLOCK_05 + const FRAMEBLOCK_06 + const FRAMEBLOCK_07 + const FRAMEBLOCK_08 + const FRAMEBLOCK_09 + const FRAMEBLOCK_0A + const FRAMEBLOCK_0B + const FRAMEBLOCK_0C + const FRAMEBLOCK_0D + const FRAMEBLOCK_0E + const FRAMEBLOCK_0F + const FRAMEBLOCK_10 + const FRAMEBLOCK_11 + const FRAMEBLOCK_12 + const FRAMEBLOCK_13 + const FRAMEBLOCK_14 + const FRAMEBLOCK_15 + const FRAMEBLOCK_16 + const FRAMEBLOCK_17 + const FRAMEBLOCK_18 + const FRAMEBLOCK_19 + const FRAMEBLOCK_1A + const FRAMEBLOCK_1B + const FRAMEBLOCK_1C + const FRAMEBLOCK_1D + const FRAMEBLOCK_1E + const FRAMEBLOCK_1F + const FRAMEBLOCK_20 + const FRAMEBLOCK_21 + const FRAMEBLOCK_22 + const FRAMEBLOCK_23 + const FRAMEBLOCK_24 + const FRAMEBLOCK_25 + const FRAMEBLOCK_26 + const FRAMEBLOCK_27 + const FRAMEBLOCK_28 + const FRAMEBLOCK_29 + const FRAMEBLOCK_2A + const FRAMEBLOCK_2B + const FRAMEBLOCK_2C + const FRAMEBLOCK_2D + const FRAMEBLOCK_2E + const FRAMEBLOCK_2F + const FRAMEBLOCK_30 + const FRAMEBLOCK_31 + const FRAMEBLOCK_32 + const FRAMEBLOCK_33 + const FRAMEBLOCK_34 + const FRAMEBLOCK_35 + const FRAMEBLOCK_36 + const FRAMEBLOCK_37 + const FRAMEBLOCK_38 + const FRAMEBLOCK_39 + const FRAMEBLOCK_3A + const FRAMEBLOCK_3B + const FRAMEBLOCK_3C + const FRAMEBLOCK_3D + const FRAMEBLOCK_3E + const FRAMEBLOCK_3F + const FRAMEBLOCK_40 + const FRAMEBLOCK_41 + const FRAMEBLOCK_42 + const FRAMEBLOCK_43 + const FRAMEBLOCK_44 + const FRAMEBLOCK_45 + const FRAMEBLOCK_46 + const FRAMEBLOCK_47 + const FRAMEBLOCK_SMALL_BLACK_CIRCLE + const FRAMEBLOCK_LARGE_BLACK_CIRCLE + const FRAMEBLOCK_4A + const FRAMEBLOCK_4B + const FRAMEBLOCK_4C + const FRAMEBLOCK_4D + const FRAMEBLOCK_4E + const FRAMEBLOCK_4F + const FRAMEBLOCK_50 + const FRAMEBLOCK_51 + const FRAMEBLOCK_52 + const FRAMEBLOCK_53 + const FRAMEBLOCK_54 + const FRAMEBLOCK_55 + const FRAMEBLOCK_56 + const FRAMEBLOCK_57 + const FRAMEBLOCK_58 + const FRAMEBLOCK_59 + const FRAMEBLOCK_5A + const FRAMEBLOCK_5B + const FRAMEBLOCK_5C + const FRAMEBLOCK_5D + const FRAMEBLOCK_5E + const FRAMEBLOCK_5F + const FRAMEBLOCK_60 + const FRAMEBLOCK_61 + const FRAMEBLOCK_62 + const FRAMEBLOCK_63 + const FRAMEBLOCK_64 + const FRAMEBLOCK_65 + const FRAMEBLOCK_66 + const FRAMEBLOCK_67 + const FRAMEBLOCK_68 + const FRAMEBLOCK_69 + const FRAMEBLOCK_6A + const FRAMEBLOCK_6B + const FRAMEBLOCK_6C + const FRAMEBLOCK_6D + const FRAMEBLOCK_6E + const FRAMEBLOCK_6F + const FRAMEBLOCK_70 + const FRAMEBLOCK_71 + const FRAMEBLOCK_72 + const FRAMEBLOCK_73 + const FRAMEBLOCK_74 + const FRAMEBLOCK_75 + const FRAMEBLOCK_76 + const FRAMEBLOCK_77 + const FRAMEBLOCK_78 + const FRAMEBLOCK_79 + +; base coordinates that are part of subanimations +; FrameBlockBaseCoords indexes (see data/battle_anims/base_coords.asm) + const_def + const BASECOORD_00 + const BASECOORD_01 + const BASECOORD_02 + const BASECOORD_03 + const BASECOORD_04 + const BASECOORD_05 + const BASECOORD_06 + const BASECOORD_07 + const BASECOORD_08 + const BASECOORD_09 + const BASECOORD_0A + const BASECOORD_0B + const BASECOORD_0C + const BASECOORD_0D + const BASECOORD_0E + const BASECOORD_0F + const BASECOORD_10 + const BASECOORD_11 + const BASECOORD_12 + const BASECOORD_13 + const BASECOORD_14 + const BASECOORD_15 + const BASECOORD_16 + const BASECOORD_17 + const BASECOORD_18 + const BASECOORD_19 + const BASECOORD_1A + const BASECOORD_1B + const BASECOORD_1C + const BASECOORD_1D + const BASECOORD_1E + const BASECOORD_1F + const BASECOORD_20 + const BASECOORD_21 + const BASECOORD_22 + const BASECOORD_23 + const BASECOORD_24 + const BASECOORD_25 + const BASECOORD_26 + const BASECOORD_27 + const BASECOORD_28 + const BASECOORD_29 + const BASECOORD_2A + const BASECOORD_2B + const BASECOORD_2C + const BASECOORD_2D + const BASECOORD_2E + const BASECOORD_2F + const BASECOORD_30 + const BASECOORD_31 + const BASECOORD_32 + const BASECOORD_33 + const BASECOORD_34 + const BASECOORD_35 + const BASECOORD_36 + const BASECOORD_37 + const BASECOORD_38 + const BASECOORD_39 + const BASECOORD_3A + const BASECOORD_3B + const BASECOORD_3C + const BASECOORD_3D + const BASECOORD_3E + const BASECOORD_3F + const BASECOORD_40 + const BASECOORD_41 + const BASECOORD_42 + const BASECOORD_43 + const BASECOORD_44 + const BASECOORD_45 + const BASECOORD_46 + const BASECOORD_47 + const BASECOORD_48 + const BASECOORD_49 + const BASECOORD_4A + const BASECOORD_4B + const BASECOORD_4C + const BASECOORD_4D + const BASECOORD_4E + const BASECOORD_4F + const BASECOORD_50 + const BASECOORD_51 + const BASECOORD_52 + const BASECOORD_53 + const BASECOORD_54 + const BASECOORD_55 + const BASECOORD_56 + const BASECOORD_57 + const BASECOORD_58 + const BASECOORD_59 + const BASECOORD_5A + const BASECOORD_5B + const BASECOORD_5C + const BASECOORD_5D + const BASECOORD_5E + const BASECOORD_5F + const BASECOORD_60 + const BASECOORD_61 + const BASECOORD_62 + const BASECOORD_63 + const BASECOORD_64 + const BASECOORD_65 + const BASECOORD_66 + const BASECOORD_67 + const BASECOORD_68 + const BASECOORD_69 + const BASECOORD_6A + const BASECOORD_6B + const BASECOORD_6C + const BASECOORD_6D + const BASECOORD_6E + const BASECOORD_6F + const BASECOORD_70 + const BASECOORD_71 + const BASECOORD_72 + const BASECOORD_73 + const BASECOORD_74 + const BASECOORD_75 + const BASECOORD_76 + const BASECOORD_77 + const BASECOORD_78 + const BASECOORD_79 + const BASECOORD_7A + const BASECOORD_7B + const BASECOORD_7C + const BASECOORD_7D + const BASECOORD_7E + const BASECOORD_7F + const BASECOORD_80 + const BASECOORD_81 + const BASECOORD_82 + const BASECOORD_83 + const BASECOORD_84 + const BASECOORD_85 + const BASECOORD_86 + const BASECOORD_87 + const BASECOORD_88 + const BASECOORD_89 + const BASECOORD_8A + const BASECOORD_8B + const BASECOORD_8C + const BASECOORD_8D + const BASECOORD_8E + const BASECOORD_8F + const BASECOORD_90 + const BASECOORD_91 + const BASECOORD_92 + const BASECOORD_93 + const BASECOORD_94 + const BASECOORD_95 + const BASECOORD_96 + const BASECOORD_97 + const BASECOORD_98 + const BASECOORD_99 + const BASECOORD_9A + const BASECOORD_9B + const BASECOORD_9C + const BASECOORD_9D + const BASECOORD_9E + const BASECOORD_9F + const BASECOORD_A0 + const BASECOORD_A1 + const BASECOORD_A2 + const BASECOORD_A3 + const BASECOORD_A4 + const BASECOORD_A5 + const BASECOORD_A6 + const BASECOORD_A7 + const BASECOORD_A8 + const BASECOORD_A9 + const BASECOORD_AA + const BASECOORD_AB + const BASECOORD_AC + const BASECOORD_AD + const BASECOORD_AE + const BASECOORD_AF + const BASECOORD_B0 + +; frame block modes that are part of subanimations + const_def + const FRAMEBLOCKMODE_00 + const FRAMEBLOCKMODE_01 + const FRAMEBLOCKMODE_02 + const FRAMEBLOCKMODE_03 + const FRAMEBLOCKMODE_04 diff --git a/constants/move_constants.asm b/constants/move_constants.asm index dfbb500e..ecc28078 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -1,5 +1,11 @@ -const_value = 1 - +; move ids +; indexes for: +; - Moves (see data/moves/moves.asm) +; - MoveNames (see data/moves/names.asm) +; - AttackAnimationPointers (see data/moves/animations.asm) +; - MoveSoundTable (see data/moves/sfx.asm) + const_def + const NO_MOVE ; 00 const POUND ; 01 const KARATE_CHOP ; 02 const DOUBLESLAP ; 03 @@ -165,9 +171,9 @@ const_value = 1 const SLASH ; a3 const SUBSTITUTE ; a4 -NUM_ATTACKS EQU const_value + -1 +NUM_ATTACKS EQU const_value - 1 - const STRUGGLE + const STRUGGLE ; a5 ; Moves do double duty as animation identifiers. diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index b66772d1..5b81300f 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -1,11 +1,11 @@ -; tentative move effect constants ; {stat}_(UP|DOWN)(1|2) means that the move raises the user's (or lowers the target's) corresponding stat modifier by 1 (or 2) stages -; {status condition}_side_effect means that the move has a side chance of causing that condition -; {status condition}_effect means that the move causes the status condition every time it hits the target -const_value = 0 +; {status condition}_SIDE_EFFECT means that the move has a side chance of causing that condition +; {status condition}_EFFECT means that the move causes the status condition every time it hits the target +; MoveEffectPointerTable indexes (see data/moves/effects_pointers.asm) + const_def const NO_ADDITIONAL_EFFECT ; $00 - const UNUSED_EFFECT_01 ; $01 + const EFFECT_01 ; $01 unused const POISON_SIDE_EFFECT1 ; $02 const DRAIN_HP_EFFECT ; $03 const BURN_SIDE_EFFECT1 ; $04 @@ -34,12 +34,12 @@ const_value = 0 const THRASH_PETAL_DANCE_EFFECT ; $1B const SWITCH_AND_TELEPORT_EFFECT ; $1C const TWO_TO_FIVE_ATTACKS_EFFECT ; $1D - const UNUSED_EFFECT_1E ; $1E + const EFFECT_1E ; $1E unused const FLINCH_SIDE_EFFECT1 ; $1F const SLEEP_EFFECT ; $20 const POISON_SIDE_EFFECT2 ; $21 const BURN_SIDE_EFFECT2 ; $22 - const UNUSED_EFFECT_23 ; $23 + const_skip ; $23 const PARALYZE_SIDE_EFFECT2 ; $24 const FLINCH_SIDE_EFFECT2 ; $25 const OHKO_EFFECT ; $26 moves like Horn Drill @@ -76,13 +76,13 @@ const_value = 0 const DEFENSE_DOWN_SIDE_EFFECT ; $45 const SPEED_DOWN_SIDE_EFFECT ; $46 const SPECIAL_DOWN_SIDE_EFFECT ; $47 - const UNUSED_EFFECT_48 ; $48 - const UNUSED_EFFECT_49 ; $49 - const UNUSED_EFFECT_4A ; $4A - const UNUSED_EFFECT_4B ; $4B + const_skip ; $48 + const_skip ; $49 + const_skip ; $4A + const_skip ; $4B const CONFUSION_SIDE_EFFECT ; $4C const TWINEEDLE_EFFECT ; $4D - const UNUSED_EFFECT_4E ; $4E + const_skip ; $4E const SUBSTITUTE_EFFECT ; $4F const HYPER_BEAM_EFFECT ; $50 const RAGE_EFFECT ; $51 @@ -91,7 +91,3 @@ const_value = 0 const LEECH_SEED_EFFECT ; $54 const SPLASH_EFFECT ; $55 const DISABLE_EFFECT ; $56 - -; fixed damage constants -SONICBOOM_DAMAGE EQU 20 -DRAGON_RAGE_DAMAGE EQU 40 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index b12d3474..c99e60bc 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,43 +1,5 @@ -; HW sound channel register base addresses -HW_CH1_BASE EQU (rNR10 % $100) -HW_CH2_BASE EQU ((rNR21 % $100) - 1) -HW_CH3_BASE EQU (rNR30 % $100) -HW_CH4_BASE EQU ((rNR41 % $100) - 1) - -; HW sound channel enable bit masks -HW_CH1_ENABLE_MASK EQU %00010001 -HW_CH2_ENABLE_MASK EQU %00100010 -HW_CH3_ENABLE_MASK EQU %01000100 -HW_CH4_ENABLE_MASK EQU %10001000 - -; HW sound channel disable bit masks -HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff) -HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff) -HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff) -HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff) - -REG_DUTY_SOUND_LEN EQU 1 -REG_VOLUME_ENVELOPE EQU 2 -REG_FREQUENCY_LO EQU 3 - -MAX_SFX_ID EQU $B9 - -CRY_SFX_START EQU $14 -CRY_SFX_END EQU $86 - -; wChannelFlags1 constants -BIT_PERFECT_PITCH EQU 0 ; controlled by toggleperfectpitch command -BIT_CHANNEL_CALL EQU 1 ; if in channel call -BIT_NOISE_OR_SFX EQU 2 ; if channel is the music noise channel or an SFX channel -BIT_VIBRATO_DIRECTION EQU 3 ; if the pitch is above or below normal (cycles) -BIT_PITCH_BEND_ON EQU 4 ; if pitch bend is active -BIT_PITCH_BEND_DECREASING EQU 5 ; if the pitch bend frequency is decreasing (instead of increasing) -BIT_ROTATE_DUTY EQU 6 ; if rotating duty - -; wChannelFlags2 constant (only has one flag) -BIT_EXECUTE_MUSIC EQU 0 ; if in execute music - ; Song ids are calculated by address to save space. +; SFX_Headers_(1|2|3) indexes (see audio/headers/*.asm) ;music_const: MACRO ;\1 EQUS "RB(\2)" @@ -94,6 +56,45 @@ const_value = 1 const NUM_SONGS + const_def + const SFX_CRY_00 + const SFX_CRY_01 + const SFX_CRY_02 + const SFX_CRY_03 + const SFX_CRY_04 + const SFX_CRY_05 + const SFX_CRY_06 + const SFX_CRY_07 + const SFX_CRY_08 + const SFX_CRY_09 + const SFX_CRY_0A + const SFX_CRY_0B + const SFX_CRY_0C + const SFX_CRY_0D + const SFX_CRY_0E + const SFX_CRY_0F + const SFX_CRY_10 + const SFX_CRY_11 + const SFX_CRY_12 + const SFX_CRY_13 + const SFX_CRY_14 + const SFX_CRY_15 + const SFX_CRY_16 + const SFX_CRY_17 + const SFX_CRY_18 + const SFX_CRY_19 + const SFX_CRY_1A + const SFX_CRY_1B + const SFX_CRY_1C + const SFX_CRY_1D + const SFX_CRY_1E + const SFX_CRY_1F + const SFX_CRY_20 + const SFX_CRY_21 + const SFX_CRY_22 + const SFX_CRY_23 + const SFX_CRY_24 + const SFX_CRY_25 const_value = 1 ; AUDIO_1 AUDIO_3 @@ -216,3 +217,5 @@ const_value = 1 const GSSFX_NOT_VERY_EFFECTIVE const GSSFX_DAMAGE const GSSFX_SUPER_EFFECTIVE + +SFX_STOP_ALL_MUSIC EQU $ff diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm old mode 100755 new mode 100644 index 2d34048d..be63dc24 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -1,8 +1,6 @@ ; OAM flags used by this game OAMFLAG_ENDOFDATA EQU %00000001 ; pseudo OAM flag, only used by game logic OAMFLAG_CANBEMASKED EQU %00000010 ; pseudo OAM flag, only used by game logic -OAMFLAG_VFLIPPED EQU %00100000 ; OAM flag flips the sprite vertically. -; Used for making left facing sprites face right and to alternate between left and right foot animation when walking up or down ; OAM attribute flags OAM_PALETTE EQU %111 @@ -13,6 +11,7 @@ OAM_Y_FLIP EQU 6 OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) ; OAM attribute masks -OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip -OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip +OAM_OBP1 EQU 1 << OAM_OBP_NUM ; OBJ palette 1 +OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip +OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0) diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm old mode 100755 new mode 100644 index 1413ad98..177f8b81 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,29 +1,38 @@ ; monochrome palette color ids const_def - const WHITE - const LIGHT_GRAY - const DARK_GRAY - const BLACK + const SHADE_WHITE ; %00 + const SHADE_LIGHT ; %01 + const SHADE_DARK ; %10 + const SHADE_BLACK ; %11 +NUM_PAL_COLORS EQU const_value -SET_PAL_BATTLE_BLACK EQU $00 -SET_PAL_BATTLE EQU $01 -SET_PAL_TOWN_MAP EQU $02 -SET_PAL_STATUS_SCREEN EQU $03 -SET_PAL_POKEDEX EQU $04 -SET_PAL_SLOTS EQU $05 -SET_PAL_TITLE_SCREEN EQU $06 -SET_PAL_NIDORINO_INTRO EQU $07 -SET_PAL_GENERIC EQU $08 -SET_PAL_OVERWORLD EQU $09 -SET_PAL_PARTY_MENU EQU $0A -SET_PAL_POKEMON_WHOLE_SCREEN EQU $0B -SET_PAL_GAME_FREAK_INTRO EQU $0C -SET_PAL_TRAINER_CARD EQU $0D -UPDATE_PARTY_MENU_BLK_PACKET EQU $FC +PAL_COLOR_SIZE EQU 2 +PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE -; super game boy palettes -const_value = 0 +; pal/blk packets +; SetPalFunctions indexes (see engine/gfx/palettes.asm) + const_def + const SET_PAL_BATTLE_BLACK ; $00 + const SET_PAL_BATTLE ; $01 + const SET_PAL_TOWN_MAP ; $02 + const SET_PAL_STATUS_SCREEN ; $03 + const SET_PAL_POKEDEX ; $04 + const SET_PAL_SLOTS ; $05 + const SET_PAL_TITLE_SCREEN ; $06 + const SET_PAL_NIDORINO_INTRO ; $07 + const SET_PAL_GENERIC ; $08 + const SET_PAL_OVERWORLD ; $09 + const SET_PAL_PARTY_MENU ; $0A + const SET_PAL_POKEMON_WHOLE_SCREEN ; $0B + const SET_PAL_GAME_FREAK_INTRO ; $0C + const SET_PAL_TRAINER_CARD ; $0D +SET_PAL_PARTY_MENU_HP_BARS EQU $fc +SET_PAL_DEFAULT EQU $ff + +; sgb palettes +; SuperPalettes indexes (see data/sgb/sgb_palettes.asm) + const_def const PAL_ROUTE ; $00 const PAL_PALLET ; $01 const PAL_VIRIDIAN ; $02 diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 360fbb4c..a805b261 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -1,5 +1,9 @@ -const_value = 1 - +; pokedex ids +; indexes for: +; - BaseStats (see data/pokemon/base_stats.asm) +; - MonPartyData (see data/pokemon/menu_icons.asm) +; - MonsterPalettes (see data/pokemon/palettes.asm) + const_def 1 const DEX_BULBASAUR ; 1 const DEX_IVYSAUR ; 2 const DEX_VENUSAUR ; 3 @@ -152,4 +156,4 @@ const_value = 1 const DEX_MEWTWO ; 150 const DEX_MEW ; 151 -NUM_POKEMON EQU 151 +NUM_POKEMON EQU const_value - 1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index c4189911..d01398b8 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,192 +1,209 @@ -const_value = 1 +; pokemon ids +; indexes for: +; - MonsterNames (see data/pokemon/names.asm) +; - EvosMovesPointerTable (see data/pokemon/evos_moves.asm) +; - CryData (see data/pokemon/cries.asm) +; - PokedexOrder (see data/pokemon/dex_order.asm) +; - PokedexEntryPointers (see data/pokemon/dex_entries.asm) + const_def + const NO_MON ; $00 + const RHYDON ; $01 + const KANGASKHAN ; $02 + const NIDORAN_M ; $03 + const CLEFAIRY ; $04 + const SPEAROW ; $05 + const VOLTORB ; $06 + const NIDOKING ; $07 + const SLOWBRO ; $08 + const IVYSAUR ; $09 + const EXEGGUTOR ; $0A + const LICKITUNG ; $0B + const EXEGGCUTE ; $0C + const GRIMER ; $0D + const GENGAR ; $0E + const NIDORAN_F ; $0F + const NIDOQUEEN ; $10 + const CUBONE ; $11 + const RHYHORN ; $12 + const LAPRAS ; $13 + const ARCANINE ; $14 + const MEW ; $15 + const GYARADOS ; $16 + const SHELLDER ; $17 + const TENTACOOL ; $18 + const GASTLY ; $19 + const SCYTHER ; $1A + const STARYU ; $1B + const BLASTOISE ; $1C + const PINSIR ; $1D + const TANGELA ; $1E + const_skip ; $1F + const_skip ; $20 + const GROWLITHE ; $21 + const ONIX ; $22 + const FEAROW ; $23 + const PIDGEY ; $24 + const SLOWPOKE ; $25 + const KADABRA ; $26 + const GRAVELER ; $27 + const CHANSEY ; $28 + const MACHOKE ; $29 + const MR_MIME ; $2A + const HITMONLEE ; $2B + const HITMONCHAN ; $2C + const ARBOK ; $2D + const PARASECT ; $2E + const PSYDUCK ; $2F + const DROWZEE ; $30 + const GOLEM ; $31 + const_skip ; $32 + const MAGMAR ; $33 + const_skip ; $34 + const ELECTABUZZ ; $35 + const MAGNETON ; $36 + const KOFFING ; $37 + const_skip ; $38 + const MANKEY ; $39 + const SEEL ; $3A + const DIGLETT ; $3B + const TAUROS ; $3C + const_skip ; $3D + const_skip ; $3E + const_skip ; $3F + const FARFETCHD ; $40 + const VENONAT ; $41 + const DRAGONITE ; $42 + const_skip ; $43 + const_skip ; $44 + const_skip ; $45 + const DODUO ; $46 + const POLIWAG ; $47 + const JYNX ; $48 + const MOLTRES ; $49 + const ARTICUNO ; $4A + const ZAPDOS ; $4B + const DITTO ; $4C + const MEOWTH ; $4D + const KRABBY ; $4E + const_skip ; $4F + const_skip ; $50 + const_skip ; $51 + const VULPIX ; $52 + const NINETALES ; $53 + const PIKACHU ; $54 + const RAICHU ; $55 + const_skip ; $56 + const_skip ; $57 + const DRATINI ; $58 + const DRAGONAIR ; $59 + const KABUTO ; $5A + const KABUTOPS ; $5B + const HORSEA ; $5C + const SEADRA ; $5D + const_skip ; $5E + const_skip ; $5F + const SANDSHREW ; $60 + const SANDSLASH ; $61 + const OMANYTE ; $62 + const OMASTAR ; $63 + const JIGGLYPUFF ; $64 + const WIGGLYTUFF ; $65 + const EEVEE ; $66 + const FLAREON ; $67 + const JOLTEON ; $68 + const VAPOREON ; $69 + const MACHOP ; $6A + const ZUBAT ; $6B + const EKANS ; $6C + const PARAS ; $6D + const POLIWHIRL ; $6E + const POLIWRATH ; $6F + const WEEDLE ; $70 + const KAKUNA ; $71 + const BEEDRILL ; $72 + const_skip ; $73 + const DODRIO ; $74 + const PRIMEAPE ; $75 + const DUGTRIO ; $76 + const VENOMOTH ; $77 + const DEWGONG ; $78 + const_skip ; $79 + const_skip ; $7A + const CATERPIE ; $7B + const METAPOD ; $7C + const BUTTERFREE ; $7D + const MACHAMP ; $7E + const_skip ; $7F + const GOLDUCK ; $80 + const HYPNO ; $81 + const GOLBAT ; $82 + const MEWTWO ; $83 + const SNORLAX ; $84 + const MAGIKARP ; $85 + const_skip ; $86 + const_skip ; $87 + const MUK ; $88 + const_skip ; $89 + const KINGLER ; $8A + const CLOYSTER ; $8B + const_skip ; $8C + const ELECTRODE ; $8D + const CLEFABLE ; $8E + const WEEZING ; $8F + const PERSIAN ; $90 + const MAROWAK ; $91 + const_skip ; $92 + const HAUNTER ; $93 + const ABRA ; $94 + const ALAKAZAM ; $95 + const PIDGEOTTO ; $96 + const PIDGEOT ; $97 + const STARMIE ; $98 + const BULBASAUR ; $99 + const VENUSAUR ; $9A + const TENTACRUEL ; $9B + const_skip ; $9C + const GOLDEEN ; $9D + const SEAKING ; $9E + const_skip ; $9F + const_skip ; $A0 + const_skip ; $A1 + const_skip ; $A2 + const PONYTA ; $A3 + const RAPIDASH ; $A4 + const RATTATA ; $A5 + const RATICATE ; $A6 + const NIDORINO ; $A7 + const NIDORINA ; $A8 + const GEODUDE ; $A9 + const PORYGON ; $AA + const AERODACTYL ; $AB + const_skip ; $AC + const MAGNEMITE ; $AD + const_skip ; $AE + const_skip ; $AF + const CHARMANDER ; $B0 + const SQUIRTLE ; $B1 + const CHARMELEON ; $B2 + const WARTORTLE ; $B3 + const CHARIZARD ; $B4 + const_skip ; $B5 + const FOSSIL_KABUTOPS ; $B6 + const FOSSIL_AERODACTYL ; $B7 + const MON_GHOST ; $B8 + const ODDISH ; $B9 + const GLOOM ; $BA + const VILEPLUME ; $BB + const BELLSPROUT ; $BC + const WEEPINBELL ; $BD + const VICTREEBEL ; $BE - const RHYDON ; $01 - const KANGASKHAN ; $02 - const NIDORAN_M ; $03 - const CLEFAIRY ; $04 - const SPEAROW ; $05 - const VOLTORB ; $06 - const NIDOKING ; $07 - const SLOWBRO ; $08 - const IVYSAUR ; $09 - const EXEGGUTOR ; $0A - const LICKITUNG ; $0B - const EXEGGCUTE ; $0C - const GRIMER ; $0D - const GENGAR ; $0E - const NIDORAN_F ; $0F - const NIDOQUEEN ; $10 - const CUBONE ; $11 - const RHYHORN ; $12 - const LAPRAS ; $13 - const ARCANINE ; $14 - const MEW ; $15 - const GYARADOS ; $16 - const SHELLDER ; $17 - const TENTACOOL ; $18 - const GASTLY ; $19 - const SCYTHER ; $1A - const STARYU ; $1B - const BLASTOISE ; $1C - const PINSIR ; $1D - const TANGELA ; $1E - const MISSINGNO_1F ; $1F - const MISSINGNO_20 ; $20 - const GROWLITHE ; $21 - const ONIX ; $22 - const FEAROW ; $23 - const PIDGEY ; $24 - const SLOWPOKE ; $25 - const KADABRA ; $26 - const GRAVELER ; $27 - const CHANSEY ; $28 - const MACHOKE ; $29 - const MR_MIME ; $2A - const HITMONLEE ; $2B - const HITMONCHAN ; $2C - const ARBOK ; $2D - const PARASECT ; $2E - const PSYDUCK ; $2F - const DROWZEE ; $30 - const GOLEM ; $31 - const MISSINGNO_32 ; $32 - const MAGMAR ; $33 - const MISSINGNO_34 ; $34 - const ELECTABUZZ ; $35 - const MAGNETON ; $36 - const KOFFING ; $37 - const MISSINGNO_38 ; $38 - const MANKEY ; $39 - const SEEL ; $3A - const DIGLETT ; $3B - const TAUROS ; $3C - const MISSINGNO_3D ; $3D - const MISSINGNO_3E ; $3E - const MISSINGNO_3F ; $3F - const FARFETCHD ; $40 - const VENONAT ; $41 - const DRAGONITE ; $42 - const MISSINGNO_43 ; $43 - const MISSINGNO_44 ; $44 - const MISSINGNO_45 ; $45 - const DODUO ; $46 - const POLIWAG ; $47 - const JYNX ; $48 - const MOLTRES ; $49 - const ARTICUNO ; $4A - const ZAPDOS ; $4B - const DITTO ; $4C - const MEOWTH ; $4D - const KRABBY ; $4E - const MISSINGNO_4F ; $4F - const MISSINGNO_50 ; $50 - const MISSINGNO_51 ; $51 - const VULPIX ; $52 - const NINETALES ; $53 - const PIKACHU ; $54 - const RAICHU ; $55 - const MISSINGNO_56 ; $56 - const MISSINGNO_57 ; $57 - const DRATINI ; $58 - const DRAGONAIR ; $59 - const KABUTO ; $5A - const KABUTOPS ; $5B - const HORSEA ; $5C - const SEADRA ; $5D - const MISSINGNO_5E ; $5E - const MISSINGNO_5F ; $5F - const SANDSHREW ; $60 - const SANDSLASH ; $61 - const OMANYTE ; $62 - const OMASTAR ; $63 - const JIGGLYPUFF ; $64 - const WIGGLYTUFF ; $65 - const EEVEE ; $66 - const FLAREON ; $67 - const JOLTEON ; $68 - const VAPOREON ; $69 - const MACHOP ; $6A - const ZUBAT ; $6B - const EKANS ; $6C - const PARAS ; $6D - const POLIWHIRL ; $6E - const POLIWRATH ; $6F - const WEEDLE ; $70 - const KAKUNA ; $71 - const BEEDRILL ; $72 - const MISSINGNO_73 ; $73 - const DODRIO ; $74 - const PRIMEAPE ; $75 - const DUGTRIO ; $76 - const VENOMOTH ; $77 - const DEWGONG ; $78 - const MISSINGNO_79 ; $79 - const MISSINGNO_7A ; $7A - const CATERPIE ; $7B - const METAPOD ; $7C - const BUTTERFREE ; $7D - const MACHAMP ; $7E - const MISSINGNO_7F ; $7F - const GOLDUCK ; $80 - const HYPNO ; $81 - const GOLBAT ; $82 - const MEWTWO ; $83 - const SNORLAX ; $84 - const MAGIKARP ; $85 - const MISSINGNO_86 ; $86 - const MISSINGNO_87 ; $87 - const MUK ; $88 - const MISSINGNO_89 ; $89 - const KINGLER ; $8A - const CLOYSTER ; $8B - const MISSINGNO_8C ; $8C - const ELECTRODE ; $8D - const CLEFABLE ; $8E - const WEEZING ; $8F - const PERSIAN ; $90 - const MAROWAK ; $91 - const MISSINGNO_92 ; $92 - const HAUNTER ; $93 - const ABRA ; $94 - const ALAKAZAM ; $95 - const PIDGEOTTO ; $96 - const PIDGEOT ; $97 - const STARMIE ; $98 - const BULBASAUR ; $99 - const VENUSAUR ; $9A - const TENTACRUEL ; $9B - const MISSINGNO_9C ; $9C - const GOLDEEN ; $9D - const SEAKING ; $9E - const MISSINGNO_9F ; $9F - const MISSINGNO_A0 ; $A0 - const MISSINGNO_A1 ; $A1 - const MISSINGNO_A2 ; $A2 - const PONYTA ; $A3 - const RAPIDASH ; $A4 - const RATTATA ; $A5 - const RATICATE ; $A6 - const NIDORINO ; $A7 - const NIDORINA ; $A8 - const GEODUDE ; $A9 - const PORYGON ; $AA - const AERODACTYL ; $AB - const MISSINGNO_AC ; $AC - const MAGNEMITE ; $AD - const MISSINGNO_AE ; $AE - const MISSINGNO_AF ; $AF - const CHARMANDER ; $B0 - const SQUIRTLE ; $B1 - const CHARMELEON ; $B2 - const WARTORTLE ; $B3 - const CHARIZARD ; $B4 - const MISSINGNO_B5 ; $B5 - const FOSSIL_KABUTOPS ; $B6 - const FOSSIL_AERODACTYL ; $B7 - const MON_GHOST ; $B8 - const ODDISH ; $B9 - const GLOOM ; $BA - const VILEPLUME ; $BB - const BELLSPROUT ; $BC - const WEEPINBELL ; $BD - const VICTREEBEL ; $BE +NUM_POKEMON_INDEXES EQU const_value - 1 + +; starters +STARTER1 EQU CHARMANDER +STARTER2 EQU SQUIRTLE +STARTER3 EQU BULBASAUR + +; ghost Marowak in Pokémon Tower +RESTLESS_SOUL EQU MAROWAK diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm new file mode 100644 index 00000000..a0e5b257 --- /dev/null +++ b/constants/pokemon_data_constants.asm @@ -0,0 +1,41 @@ +PARTY_LENGTH EQU 6 + +MONS_PER_BOX EQU 20 +NUM_BOXES EQU 12 + +HOF_MON EQU $10 +HOF_TEAM EQU PARTY_LENGTH * HOF_MON +HOF_TEAM_CAPACITY EQU 50 + + +; mon data locations +; Note that some values are not supported by all functions that use these values. + const_def + const PLAYER_PARTY_DATA ; 0 + const ENEMY_PARTY_DATA ; 1 + const BOX_DATA ; 2 + const DAYCARE_DATA ; 3 + const BATTLE_MON_DATA ; 4 + + +; See data/pokemon/evos_moves.asm + +; Evolution types + const_def 1 + const EV_LEVEL ; 1 + const EV_ITEM ; 2 + const EV_TRADE ; 3 + +MAX_EVOLUTIONS EQU 3 +EVOLUTION_SIZE EQU 4 + + +; wMonHGrowthRate values +; GrowthRateTable indexes (see data/growth_rates.asm) + const_def + const GROWTH_MEDIUM_FAST + const GROWTH_SLIGHTLY_FAST + const GROWTH_SLIGHTLY_SLOW + const GROWTH_MEDIUM_SLOW + const GROWTH_FAST + const GROWTH_SLOW diff --git a/constants/script_constants.asm b/constants/script_constants.asm new file mode 100644 index 00000000..b651a76d --- /dev/null +++ b/constants/script_constants.asm @@ -0,0 +1,58 @@ +; EmotionBubblesPointerTable indexes (see engine/overworld/emotion_bubbles.asm) + const_def + const EXCLAMATION_BUBBLE ; 0 + const QUESTION_BUBBLE ; 1 + const SMILE_BUBBLE ; 2 + +; slot symbols +SLOTS7 EQU $0200 +SLOTSBAR EQU $0604 +SLOTSCHERRY EQU $0A08 +SLOTSFISH EQU $0E0C +SLOTSBIRD EQU $1210 +SLOTSMOUSE EQU $1614 + +; StartSlotMachine dialogs +SLOTS_OUTOFORDER EQU $fd +SLOTS_OUTTOLUNCH EQU $fe +SLOTS_SOMEONESKEYS EQU $ff + +; in game trades +; TradeMons indexes (see data/events/trades.asm) + const_def + const TRADE_FOR_TERRY + const TRADE_FOR_MARCEL + const TRADE_FOR_CHIKUCHIKU + const TRADE_FOR_SAILOR + const TRADE_FOR_DUX + const TRADE_FOR_MARC + const TRADE_FOR_LOLA + const TRADE_FOR_DORIS + const TRADE_FOR_CRINKLES + const TRADE_FOR_SPOT + +; in game trade dialog sets +; InGameTradeTextPointers indexes (see engine/events/in_game_trades.asm) + const_def + const TRADE_DIALOGSET_CASUAL + const TRADE_DIALOGSET_POLITE + const TRADE_DIALOGSET_HAPPY + +; badges +; wObtainedBadges and wBeatGymFlags bits + const_def + const BIT_BOULDERBADGE ; 0 + const BIT_CASCADEBADGE ; 1 + const BIT_THUNDERBADGE ; 2 + const BIT_RAINBOWBADGE ; 3 + const BIT_SOULBADGE ; 4 + const BIT_MARSHBADGE ; 5 + const BIT_VOLCANOBADGE ; 6 + const BIT_EARTHBADGE ; 7 +NUM_BADGES EQU const_value + +; OaksAideScript results +OAKS_AIDE_BAG_FULL EQU $00 +OAKS_AIDE_GOT_ITEM EQU $01 +OAKS_AIDE_NOT_ENOUGH_MONS EQU $80 +OAKS_AIDE_REFUSED EQU $ff diff --git a/constants/serial_constants.asm b/constants/serial_constants.asm new file mode 100644 index 00000000..a6aae315 --- /dev/null +++ b/constants/serial_constants.asm @@ -0,0 +1,27 @@ +ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01 +ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK EQU $02 + +USING_EXTERNAL_CLOCK EQU $01 +USING_INTERNAL_CLOCK EQU $02 +CONNECTION_NOT_ESTABLISHED EQU $ff + +; signals the start of an array of bytes transferred over the link cable +SERIAL_PREAMBLE_BYTE EQU $FD + +; this byte is used when there is no data to send +SERIAL_NO_DATA_BYTE EQU $FE + +; signals the end of one part of a patch list (there are two parts) for player/enemy party data +SERIAL_PATCH_LIST_PART_TERMINATOR EQU $FF + +LINK_STATE_NONE EQU $00 ; not using link +LINK_STATE_IN_CABLE_CLUB EQU $01 ; in a cable club room (Colosseum or Trade Centre) +LINK_STATE_START_TRADE EQU $02 ; pre-trade selection screen initialisation +LINK_STATE_START_BATTLE EQU $03 ; pre-battle initialisation +LINK_STATE_BATTLING EQU $04 ; in a link battle +LINK_STATE_RESET EQU $05 ; reset game (unused) +LINK_STATE_TRADING EQU $32 ; in a link trade + +LINKBATTLE_RUN EQU $F +LINKBATTLE_STRUGGLE EQU $E +LINKBATTLE_NO_ACTION EQU $D diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm old mode 100755 new mode 100644 index 11973648..a4354996 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,101 +1,77 @@ -; pokemon's overworld sprites -const_value = 0 - - const SPRITE_MON ; $0 - const SPRITE_BALL_M ; $1 - const SPRITE_HELIX ; $2 - const SPRITE_FAIRY ; $3 - const SPRITE_BIRD_M ; $4 - const SPRITE_WATER ; $5 - const SPRITE_BUG ; $6 - const SPRITE_GRASS ; $7 - const SPRITE_SNAKE ; $8 - const SPRITE_QUADRUPED ; $9 - ; overworld sprites -const_value = 1 - - const SPRITE_RED ; $01 - const SPRITE_BLUE ; $02 - const SPRITE_OAK ; $03 - const SPRITE_BUG_CATCHER ; $04 - const SPRITE_SLOWBRO ; $05 - const SPRITE_LASS ; $06 - const SPRITE_BLACK_HAIR_BOY_1 ; $07 - const SPRITE_LITTLE_GIRL ; $08 - const SPRITE_BIRD ; $09 - const SPRITE_FAT_BALD_GUY ; $0a - const SPRITE_GAMBLER ; $0b - const SPRITE_BLACK_HAIR_BOY_2 ; $0c - const SPRITE_GIRL ; $0d - const SPRITE_HIKER ; $0e - const SPRITE_FOULARD_WOMAN ; $0f - const SPRITE_GENTLEMAN ; $10 - const SPRITE_DAISY ; $11 - const SPRITE_BIKER ; $12 - const SPRITE_SAILOR ; $13 - const SPRITE_COOK ; $14 - const SPRITE_BIKE_SHOP_GUY ; $15 - const SPRITE_MR_FUJI ; $16 - const SPRITE_GIOVANNI ; $17 - const SPRITE_ROCKET ; $18 - const SPRITE_MEDIUM ; $19 - const SPRITE_WAITER ; $1a - const SPRITE_ERIKA ; $1b - const SPRITE_MOM_GEISHA ; $1c - const SPRITE_BRUNETTE_GIRL ; $1d - const SPRITE_LANCE ; $1e - const SPRITE_OAK_SCIENTIST_AIDE ; $1f - const SPRITE_OAK_AIDE ; $20 - const SPRITE_ROCKER ; $21 - const SPRITE_SWIMMER ; $22 - const SPRITE_WHITE_PLAYER ; $23 - const SPRITE_GYM_HELPER ; $24 - const SPRITE_OLD_PERSON ; $25 - const SPRITE_MART_GUY ; $26 - const SPRITE_FISHER ; $27 - const SPRITE_OLD_MEDIUM_WOMAN ; $28 - const SPRITE_NURSE ; $29 - const SPRITE_CABLE_CLUB_WOMAN ; $2a - const SPRITE_MR_MASTERBALL ; $2b - const SPRITE_LAPRAS_GIVER ; $2c - const SPRITE_WARDEN ; $2d - const SPRITE_SS_CAPTAIN ; $2e - const SPRITE_FISHER2 ; $2f - const SPRITE_BLACKBELT ; $30 - const SPRITE_GUARD ; $31 - const SPRITE_COP_GUARD ; $32 - const SPRITE_MOM ; $33 - const SPRITE_BALDING_GUY ; $34 - const SPRITE_YOUNG_BOY ; $35 - const SPRITE_GAMEBOY_KID ; $36 - const SPRITE_GAMEBOY_KID_COPY ; $37 - const SPRITE_CLEFAIRY ; $38 - const SPRITE_AGATHA ; $39 - const SPRITE_BRUNO ; $3a - const SPRITE_LORELEI ; $3b - const SPRITE_SEEL ; $3c - const SPRITE_BALL ; $3d - const SPRITE_OMANYTE ; $3e - const SPRITE_BOULDER ; $3f - const SPRITE_PAPER_SHEET ; $40 - const SPRITE_BOOK_MAP_DEX ; $41 - const SPRITE_CLIPBOARD ; $42 - const SPRITE_SNORLAX ; $43 - const SPRITE_OLD_AMBER_COPY ; $44 - const SPRITE_OLD_AMBER ; $45 - const SPRITE_LYING_OLD_MAN_UNUSED_1 ; $46 - const SPRITE_LYING_OLD_MAN_UNUSED_2 ; $47 - const SPRITE_LYING_OLD_MAN ; $48 - -; different kinds of people events -ITEM EQU $80 -TRAINER EQU $40 - -BOULDER_MOVEMENT_BYTE_2 EQU $10 - -; sprite facing directions -SPRITE_FACING_DOWN EQU $00 -SPRITE_FACING_UP EQU $04 -SPRITE_FACING_LEFT EQU $08 -SPRITE_FACING_RIGHT EQU $0C +; SpriteSheetPointerTable indexes (see data/sprites/sprites.asm) + const_def + const SPRITE_NONE ; $00 + const SPRITE_RED ; $01 + const SPRITE_BLUE ; $02 + const SPRITE_OAK ; $03 + const SPRITE_YOUNGSTER ; $04 + const SPRITE_MONSTER ; $05 + const SPRITE_COOLTRAINER_F ; $06 + const SPRITE_COOLTRAINER_M ; $07 + const SPRITE_LITTLE_GIRL ; $08 + const SPRITE_BIRD ; $09 + const SPRITE_MIDDLE_AGED_MAN ; $0a + const SPRITE_GAMBLER ; $0b + const SPRITE_SUPER_NERD ; $0c + const SPRITE_GIRL ; $0d + const SPRITE_HIKER ; $0e + const SPRITE_BEAUTY ; $0f + const SPRITE_GENTLEMAN ; $10 + const SPRITE_DAISY ; $11 + const SPRITE_BIKER ; $12 + const SPRITE_SAILOR ; $13 + const SPRITE_COOK ; $14 + const SPRITE_BIKE_SHOP_CLERK ; $15 + const SPRITE_MR_FUJI ; $16 + const SPRITE_GIOVANNI ; $17 + const SPRITE_ROCKET ; $18 + const SPRITE_CHANNELER ; $19 + const SPRITE_WAITER ; $1a + const SPRITE_ERIKA ; $1b + const SPRITE_MIDDLE_AGED_WOMAN ; $1c + const SPRITE_BRUNETTE_GIRL ; $1d + const SPRITE_LANCE ; $1e + const SPRITE_UNUSED_SCIENTIST ; $1f + const SPRITE_SCIENTIST ; $20 + const SPRITE_ROCKER ; $21 + const SPRITE_SWIMMER ; $22 + const SPRITE_SAFARI_ZONE_WORKER ; $23 + const SPRITE_GYM_GUIDE ; $24 + const SPRITE_GRAMPS ; $25 + const SPRITE_CLERK ; $26 + const SPRITE_FISHING_GURU ; $27 + const SPRITE_GRANNY ; $28 + const SPRITE_NURSE ; $29 + const SPRITE_LINK_RECEPTIONIST ; $2a + const SPRITE_SILPH_PRESIDENT ; $2b + const SPRITE_SILPH_WORKER ; $2c + const SPRITE_WARDEN ; $2d + const SPRITE_CAPTAIN ; $2e + const SPRITE_FISHER ; $2f + const SPRITE_KOGA ; $30 + const SPRITE_GUARD ; $31 + const SPRITE_UNUSED_GUARD ; $32 + const SPRITE_MOM ; $33 + const SPRITE_BALDING_GUY ; $34 + const SPRITE_LITTLE_BOY ; $35 + const SPRITE_UNUSED_GAMEBOY_KID ; $36 + const SPRITE_GAMEBOY_KID ; $37 + const SPRITE_FAIRY ; $38 + const SPRITE_AGATHA ; $39 + const SPRITE_BRUNO ; $3a + const SPRITE_LORELEI ; $3b + const SPRITE_SEEL ; $3c +FIRST_STILL_SPRITE EQU const_value + const SPRITE_POKE_BALL ; $3d + const SPRITE_FOSSIL ; $3e + const SPRITE_BOULDER ; $3f + const SPRITE_PAPER ; $40 + const SPRITE_POKEDEX ; $41 + const SPRITE_CLIPBOARD ; $42 + const SPRITE_SNORLAX ; $43 + const SPRITE_UNUSED_OLD_AMBER ; $44 + const SPRITE_OLD_AMBER ; $45 + const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $46 + const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $47 + const SPRITE_GAMBLER_ASLEEP ; $48 diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm new file mode 100644 index 00000000..e1104262 --- /dev/null +++ b/constants/sprite_data_constants.asm @@ -0,0 +1,26 @@ +; sprite facing directions + const_def 0, $04 + const SPRITE_FACING_DOWN ; $00 + const SPRITE_FACING_UP ; $04 + const SPRITE_FACING_LEFT ; $08 + const SPRITE_FACING_RIGHT ; $0C + + const_def 0, $40 + const NPC_MOVEMENT_DOWN ; $00 + const NPC_MOVEMENT_UP ; $40 + const NPC_MOVEMENT_LEFT ; $80 + const NPC_MOVEMENT_RIGHT ; $C0 + +NPC_CHANGE_FACING EQU $E0 + +; player direction constants + const_def + const PLAYER_DIR_BIT_RIGHT ; 0 + const PLAYER_DIR_BIT_LEFT ; 1 + const PLAYER_DIR_BIT_DOWN ; 2 + const PLAYER_DIR_BIT_UP ; 3 + +PLAYER_DIR_RIGHT EQU 1 << PLAYER_DIR_BIT_RIGHT +PLAYER_DIR_LEFT EQU 1 << PLAYER_DIR_BIT_LEFT +PLAYER_DIR_DOWN EQU 1 << PLAYER_DIR_BIT_DOWN +PLAYER_DIR_UP EQU 1 << PLAYER_DIR_BIT_UP diff --git a/constants/starter_mons.asm b/constants/starter_mons.asm deleted file mode 100755 index 16de35d4..00000000 --- a/constants/starter_mons.asm +++ /dev/null @@ -1,3 +0,0 @@ -STARTER1 EQU CHARMANDER -STARTER2 EQU SQUIRTLE -STARTER3 EQU BULBASAUR diff --git a/constants/status_constants.asm b/constants/status_constants.asm deleted file mode 100755 index 25babb82..00000000 --- a/constants/status_constants.asm +++ /dev/null @@ -1,32 +0,0 @@ -; non-volatile statuses -SLP EQU %111 ; sleep counter -PSN EQU 3 -BRN EQU 4 -FRZ EQU 5 -PAR EQU 6 - -; volatile statuses 1 -STORING_ENERGY EQU 0 ; Bide -THRASHING_ABOUT EQU 1 ; e.g. Thrash -ATTACKING_MULTIPLE_TIMES EQU 2 ; e.g. Double Kick, Fury Attack -FLINCHED EQU 3 -CHARGING_UP EQU 4 ; e.g. Solar Beam, Fly -USING_TRAPPING_MOVE EQU 5 ; e.g. Wrap -INVULNERABLE EQU 6 ; charging up Fly/Dig -CONFUSED EQU 7 - -; volatile statuses 2 -USING_X_ACCURACY EQU 0 -PROTECTED_BY_MIST EQU 1 -GETTING_PUMPED EQU 2 ; Focus Energy -; EQU 3 ; unused -HAS_SUBSTITUTE_UP EQU 4 -NEEDS_TO_RECHARGE EQU 5 ; Hyper Beam -USING_RAGE EQU 6 -SEEDED EQU 7 - -; volatile statuses 3 -BADLY_POISONED EQU 0 -HAS_LIGHT_SCREEN_UP EQU 1 -HAS_REFLECT_UP EQU 2 -TRANSFORMED EQU 3 diff --git a/constants/text_constants.asm b/constants/text_constants.asm index 3cddce26..aa8374e5 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -1,14 +1,21 @@ -; special text IDs -TEXT_MON_FAINTED EQU $d0 -TEXT_BLACKED_OUT EQU $d1 -TEXT_REPEL_WORE_OFF EQU $d2 -TEXT_SAFARI_GAME_OVER EQU $d3 +NAME_LENGTH EQU 11 +ITEM_NAME_LENGTH EQU 13 ; PrintNumber -BIT_MONEY_SIGN EQU 5 -BIT_LEFT_ALIGN EQU 6 -BIT_LEADING_ZEROES EQU 7 + const_def 5 + const BIT_MONEY_SIGN ; 5 + const BIT_LEFT_ALIGN ; 6 + const BIT_LEADING_ZEROES ; 7 MONEY_SIGN EQU (1 << BIT_MONEY_SIGN) LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) + +; special text IDs (see home/text_script.asm) + const_def $d0 + const TEXT_MON_FAINTED ; $d0 + const TEXT_BLACKED_OUT ; $d1 + const TEXT_REPEL_WORE_OFF ; $d2 + const TEXT_SAFARI_GAME_OVER ; $d3 + +TEXT_START_MENU EQU $00 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm new file mode 100644 index 00000000..95473081 --- /dev/null +++ b/constants/tileset_constants.asm @@ -0,0 +1,27 @@ +; tileset ids +; Tilesets indexes (see data/tilesets/tileset_headers.asm) + const_def + const OVERWORLD ; 0 + const REDS_HOUSE_1 ; 1 + const MART ; 2 + const FOREST ; 3 + const REDS_HOUSE_2 ; 4 + const DOJO ; 5 + const POKECENTER ; 6 + const GYM ; 7 + const HOUSE ; 8 + const FOREST_GATE ; 9 + const MUSEUM ; 10 + const UNDERGROUND ; 11 + const GATE ; 12 + const SHIP ; 13 + const SHIP_PORT ; 14 + const CEMETERY ; 15 + const INTERIOR ; 16 + const CAVERN ; 17 + const LOBBY ; 18 + const MANSION ; 19 + const LAB ; 20 + const CLUB ; 21 + const FACILITY ; 22 + const PLATEAU ; 23 diff --git a/constants/tilesets.asm b/constants/tilesets.asm deleted file mode 100644 index f10e4d92..00000000 --- a/constants/tilesets.asm +++ /dev/null @@ -1,26 +0,0 @@ -const_value = 0 - - const OVERWORLD ; 0 - const REDS_HOUSE_1 ; 1 - const MART ; 2 - const FOREST ; 3 - const REDS_HOUSE_2 ; 4 - const DOJO ; 5 - const POKECENTER ; 6 - const GYM ; 7 - const HOUSE ; 8 - const FOREST_GATE ; 9 - const MUSEUM ; 10 - const UNDERGROUND ; 11 - const GATE ; 12 - const SHIP ; 13 - const SHIP_PORT ; 14 - const CEMETERY ; 15 - const INTERIOR ; 16 - const CAVERN ; 17 - const LOBBY ; 18 - const MANSION ; 19 - const LAB ; 20 - const CLUB ; 21 - const FACILITY ; 22 - const PLATEAU ; 23 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm old mode 100755 new mode 100644 index ee890282..6fdc5d4e --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,55 +1,64 @@ +OPP_ID_OFFSET EQU 200 + trainer_const: MACRO -\1 EQU const_value -OPP_\1 EQU const_value + 200 -const_value = const_value + 1 + const \1 +OPP_\1 EQU OPP_ID_OFFSET + \1 ENDM -const_value = 1 - - trainer_const YOUNGSTER ; $01 - trainer_const BUG_CATCHER ; $02 - trainer_const LASS ; $03 - trainer_const SAILOR ; $04 - trainer_const JR_TRAINER_M ; $05 - trainer_const JR_TRAINER_F ; $06 - trainer_const POKEMANIAC ; $07 - trainer_const SUPER_NERD ; $08 - trainer_const HIKER ; $09 - trainer_const BIKER ; $0A - trainer_const BURGLAR ; $0B - trainer_const ENGINEER ; $0C - trainer_const JUGGLER_X ; $0D - trainer_const FISHER ; $0E - trainer_const SWIMMER ; $0F - trainer_const CUE_BALL ; $10 - trainer_const GAMBLER ; $11 - trainer_const BEAUTY ; $12 - trainer_const PSYCHIC_TR ; $13 - trainer_const ROCKER ; $14 - trainer_const JUGGLER ; $15 - trainer_const TAMER ; $16 - trainer_const BIRD_KEEPER ; $17 - trainer_const BLACKBELT ; $18 - trainer_const SONY1 ; $19 - trainer_const PROF_OAK ; $1A - trainer_const CHIEF ; $1B - trainer_const SCIENTIST ; $1C - trainer_const GIOVANNI ; $1D - trainer_const ROCKET ; $1E - trainer_const COOLTRAINER_M ; $1F - trainer_const COOLTRAINER_F ; $20 - trainer_const BRUNO ; $21 - trainer_const BROCK ; $22 - trainer_const MISTY ; $23 - trainer_const LT_SURGE ; $24 - trainer_const ERIKA ; $25 - trainer_const KOGA ; $26 - trainer_const BLAINE ; $27 - trainer_const SABRINA ; $28 - trainer_const GENTLEMAN ; $29 - trainer_const SONY2 ; $2A - trainer_const SONY3 ; $2B - trainer_const LORELEI ; $2C - trainer_const CHANNELER ; $2D - trainer_const AGATHA ; $2E - trainer_const LANCE ; $2F +; trainer class ids +; indexes for: +; - TrainerNames (see data/trainers/names.asm) +; - TrainerNamePointers (see data/trainers/name_pointers.asm) +; - TrainerDataPointers (see data/trainers/parties.asm) +; - TrainerPicAndMoneyPointers (see data/trainers/pic_pointers_money.asm) +; - TrainerAIPointers (see data/trainers/ai_pointers.asm) +; - TrainerClassMoveChoiceModifications (see data/trainers/move_choices.asm) + const_def + trainer_const NOBODY ; $00 + trainer_const YOUNGSTER ; $01 + trainer_const BUG_CATCHER ; $02 + trainer_const LASS ; $03 + trainer_const SAILOR ; $04 + trainer_const JR_TRAINER_M ; $05 + trainer_const JR_TRAINER_F ; $06 + trainer_const POKEMANIAC ; $07 + trainer_const SUPER_NERD ; $08 + trainer_const HIKER ; $09 + trainer_const BIKER ; $0A + trainer_const BURGLAR ; $0B + trainer_const ENGINEER ; $0C + trainer_const UNUSED_JUGGLER ; $0D + trainer_const FISHER ; $0E + trainer_const SWIMMER ; $0F + trainer_const CUE_BALL ; $10 + trainer_const GAMBLER ; $11 + trainer_const BEAUTY ; $12 + trainer_const PSYCHIC_TR ; $13 + trainer_const ROCKER ; $14 + trainer_const JUGGLER ; $15 + trainer_const TAMER ; $16 + trainer_const BIRD_KEEPER ; $17 + trainer_const BLACKBELT ; $18 + trainer_const RIVAL1 ; $19 + trainer_const PROF_OAK ; $1A + trainer_const CHIEF ; $1B + trainer_const SCIENTIST ; $1C + trainer_const GIOVANNI ; $1D + trainer_const ROCKET ; $1E + trainer_const COOLTRAINER_M ; $1F + trainer_const COOLTRAINER_F ; $20 + trainer_const BRUNO ; $21 + trainer_const BROCK ; $22 + trainer_const MISTY ; $23 + trainer_const LT_SURGE ; $24 + trainer_const ERIKA ; $25 + trainer_const KOGA ; $26 + trainer_const BLAINE ; $27 + trainer_const SABRINA ; $28 + trainer_const GENTLEMAN ; $29 + trainer_const RIVAL2 ; $2A + trainer_const RIVAL3 ; $2B + trainer_const LORELEI ; $2C + trainer_const CHANNELER ; $2D + trainer_const AGATHA ; $2E + trainer_const LANCE ; $2F diff --git a/constants/type_constants.asm b/constants/type_constants.asm old mode 100755 new mode 100644 index b36dc179..6ae3408d --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -1,16 +1,24 @@ -; Elemental types -NORMAL EQU $00 -FIGHTING EQU $01 -FLYING EQU $02 -POISON EQU $03 -GROUND EQU $04 -ROCK EQU $05 -BUG EQU $07 -GHOST EQU $08 -FIRE EQU $14 -WATER EQU $15 -GRASS EQU $16 -ELECTRIC EQU $17 -PSYCHIC EQU $18 -ICE EQU $19 -DRAGON EQU $1A +; TypeNames indexes (see data/types/names.asm) + const_def + +PHYSICAL EQU const_value + const NORMAL ; $00 + const FIGHTING ; $01 + const FLYING ; $02 + const POISON ; $03 + const GROUND ; $04 + const ROCK ; $05 + const BIRD ; $06 + const BUG ; $07 + const GHOST ; $08 + + const_next 20 + +SPECIAL EQU const_value + const FIRE ; $14 + const WATER ; $15 + const GRASS ; $16 + const ELECTRIC ; $17 + const PSYCHIC_TYPE ; $18 + const ICE ; $19 + const DRAGON ; $1A diff --git a/crysaudio/audio_constants.asm b/crysaudio/audio_constants.asm index f0708d77..f5895dd9 100644 --- a/crysaudio/audio_constants.asm +++ b/crysaudio/audio_constants.asm @@ -1,7 +1,6 @@ ; pitch ; FrequencyTable indexes (see audio/notes.asm) - const_def - const __ ; 0 + const_def 1 const C_ ; 1 const C# ; 2 const D_ ; 3 @@ -14,7 +13,6 @@ const A_ ; a const A# ; b const B_ ; c - const CC ; d (used for pitchoffset) ; channel ; ChannelPointers indexes (see audio/engine.asm) @@ -42,26 +40,26 @@ CHANNEL_LAST_MUSIC_ADDRESS EQUS "(wChannel1LastMusicAddress - wChannel1 CHANNEL_NOTE_FLAGS EQUS "(wChannel1NoteFlags - wChannel1)" CHANNEL_CONDITION EQUS "(wChannel1Condition - wChannel1)" CHANNEL_DUTY_CYCLE EQUS "(wChannel1DutyCycle - wChannel1)" -CHANNEL_INTENSITY EQUS "(wChannel1Intensity - wChannel1)" +CHANNEL_VOLUME_ENVELOPE EQUS "(wChannel1VolumeEnvelope - wChannel1)" CHANNEL_FREQUENCY EQUS "(wChannel1Frequency - wChannel1)" CHANNEL_PITCH EQUS "(wChannel1Pitch - wChannel1)" CHANNEL_OCTAVE EQUS "(wChannel1Octave - wChannel1)" -CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" +CHANNEL_TRANSPOSITION EQUS "(wChannel1Transposition - wChannel1)" CHANNEL_NOTE_DURATION EQUS "(wChannel1NoteDuration - wChannel1)" CHANNEL_FIELD16 EQUS "(wChannel1Field16 - wChannel1)" CHANNEL_LOOP_COUNT EQUS "(wChannel1LoopCount - wChannel1)" CHANNEL_TEMPO EQUS "(wChannel1Tempo - wChannel1)" CHANNEL_TRACKS EQUS "(wChannel1Tracks - wChannel1)" -CHANNEL_SFX_DUTY_LOOP EQUS "(wChannel1SFXDutyLoop - wChannel1)" +CHANNEL_DUTY_CYCLE_PATTERN EQUS "(wChannel1DutyCyclePattern - wChannel1)" CHANNEL_VIBRATO_DELAY_COUNT EQUS "(wChannel1VibratoDelayCount - wChannel1)" CHANNEL_VIBRATO_DELAY EQUS "(wChannel1VibratoDelay - wChannel1)" CHANNEL_VIBRATO_EXTENT EQUS "(wChannel1VibratoExtent - wChannel1)" CHANNEL_VIBRATO_RATE EQUS "(wChannel1VibratoRate - wChannel1)" -CHANNEL_PITCH_WHEEL_TARGET EQUS "(wChannel1PitchWheelTarget - wChannel1)" -CHANNEL_PITCH_WHEEL_AMOUNT EQUS "(wChannel1PitchWheelAmount - wChannel1)" -CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION EQUS "(wChannel1PitchWheelAmountFraction - wChannel1)" +CHANNEL_PITCH_SLIDE_TARGET EQUS "(wChannel1PitchSlideTarget - wChannel1)" +CHANNEL_PITCH_SLIDE_AMOUNT EQUS "(wChannel1PitchSlideAmount - wChannel1)" +CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION EQUS "(wChannel1PitchSlideAmountFraction - wChannel1)" CHANNEL_FIELD25 EQUS "(wChannel1Field25 - wChannel1)" -CHANNEL_CRY_PITCH EQUS "(wChannel1CryPitch - wChannel1)" +CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" CHANNEL_FIELD29 EQUS "(wChannel1Field29 - wChannel1)" CHANNEL_FIELD2A EQUS "(wChannel1Field2a - wChannel1)" CHANNEL_FIELD2C EQUS "(wChannel1Field2c - wChannel1)" @@ -84,26 +82,26 @@ NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 ; Flags2 const_def - const SOUND_VIBRATO ; 0 - const SOUND_PITCH_WHEEL ; 1 - const SOUND_DUTY ; 2 - const SOUND_UNKN_0B ; 3 - const SOUND_CRY_PITCH ; 4 - const SOUND_UNKN_0D ; 5 - const SOUND_UNKN_0E ; 6 - const SOUND_UNKN_0F ; 7 + const SOUND_VIBRATO ; 0 + const SOUND_PITCH_SLIDE ; 1 + const SOUND_DUTY_LOOP ; 2 + const SOUND_UNKN_0B ; 3 + const SOUND_PITCH_OFFSET ; 4 + const SOUND_UNKN_0D ; 5 + const SOUND_UNKN_0E ; 6 + const SOUND_UNKN_0F ; 7 ; Flags3 const_def const SOUND_VIBRATO_DIR ; 0 - const SOUND_PITCH_WHEEL_DIR ; 1 + const SOUND_PITCH_SLIDE_DIR ; 1 ; NoteFlags const_def const NOTE_DUTY_OVERRIDE ; 0 const NOTE_FREQ_OVERRIDE ; 1 const NOTE_UNUSED ; 2 - const NOTE_UNKN_3 ; 3 + const NOTE_PITCH_SWEEP ; 3 const NOTE_NOISE_SAMPLING ; 4 const NOTE_REST ; 5 const NOTE_VIBRATO_OVERRIDE ; 6 @@ -128,5 +126,3 @@ DANGER_ON_F EQU 7 ; wMusicFade MUSIC_FADE_IN_F EQU 7 - -TRUE EQU 1 diff --git a/crysaudio/cries.asm b/crysaudio/cries.asm index b8d9d214..cf2ead18 100644 --- a/crysaudio/cries.asm +++ b/crysaudio/cries.asm @@ -1,2045 +1,2110 @@ Cry_Marill: - musicheader 3, 5, Cry_Marill_Ch5 - musicheader 1, 6, Cry_Marill_Ch6 - musicheader 1, 8, Cry_Marill_Ch8 + channel_count 3 + channel 5, Cry_Marill_Ch5 + channel 6, Cry_Marill_Ch6 + channel 8, Cry_Marill_Ch8 Cry_Togepi: - musicheader 2, 5, Cry_Togepi_Ch5 - musicheader 1, 6, Cry_Togepi_Ch6 + channel_count 2 + channel 5, Cry_Togepi_Ch5 + channel 6, Cry_Togepi_Ch6 Cry_Togetic: - musicheader 2, 5, Cry_Togetic_Ch5 - musicheader 1, 6, Cry_Togetic_Ch6 + channel_count 2 + channel 5, Cry_Togetic_Ch5 + channel 6, Cry_Togetic_Ch6 Cry_Spinarak: - musicheader 3, 5, Cry_Spinarak_Ch5 - musicheader 1, 6, Cry_Spinarak_Ch6 - musicheader 1, 8, Cry_Spinarak_Ch8 + channel_count 3 + channel 5, Cry_Spinarak_Ch5 + channel 6, Cry_Spinarak_Ch6 + channel 8, Cry_Spinarak_Ch8 Cry_Raikou: - musicheader 3, 5, Cry_Raikou_Ch5 - musicheader 1, 6, Cry_Raikou_Ch6 - musicheader 1, 8, Cry_Raikou_Ch8 + channel_count 3 + channel 5, Cry_Raikou_Ch5 + channel 6, Cry_Raikou_Ch6 + channel 8, Cry_Raikou_Ch8 Cry_Hoothoot: - musicheader 3, 5, Cry_Hoothoot_Ch5 - musicheader 1, 6, Cry_Hoothoot_Ch6 - musicheader 1, 8, Cry_Hoothoot_Ch8 + channel_count 3 + channel 5, Cry_Hoothoot_Ch5 + channel 6, Cry_Hoothoot_Ch6 + channel 8, Cry_Hoothoot_Ch8 Cry_Sentret: - musicheader 2, 5, Cry_Sentret_Ch5 - musicheader 1, 6, Cry_Sentret_Ch6 + channel_count 2 + channel 5, Cry_Sentret_Ch5 + channel 6, Cry_Sentret_Ch6 Cry_Slowking: - musicheader 3, 5, Cry_Slowking_Ch5 - musicheader 1, 6, Cry_Slowking_Ch6 - musicheader 1, 8, Cry_Slowking_Ch8 + channel_count 3 + channel 5, Cry_Slowking_Ch5 + channel 6, Cry_Slowking_Ch6 + channel 8, Cry_Slowking_Ch8 Cry_Mareep: - musicheader 2, 5, Cry_Mareep_Ch5 - musicheader 1, 6, Cry_Mareep_Ch6 + channel_count 2 + channel 5, Cry_Mareep_Ch5 + channel 6, Cry_Mareep_Ch6 Cry_Cyndaquil: - musicheader 3, 5, Cry_Cyndaquil_Ch5 - musicheader 1, 6, Cry_Cyndaquil_Ch6 - musicheader 1, 8, Cry_Cyndaquil_Ch8 + channel_count 3 + channel 5, Cry_Cyndaquil_Ch5 + channel 6, Cry_Cyndaquil_Ch6 + channel 8, Cry_Cyndaquil_Ch8 Cry_Chikorita: - musicheader 3, 5, Cry_Chikorita_Ch5 - musicheader 1, 6, Cry_Chikorita_Ch6 - musicheader 1, 8, Cry_Chikorita_Ch8 + channel_count 3 + channel 5, Cry_Chikorita_Ch5 + channel 6, Cry_Chikorita_Ch6 + channel 8, Cry_Chikorita_Ch8 Cry_Gligar: - musicheader 2, 5, Cry_Gligar_Ch5 - musicheader 1, 8, Cry_Gligar_Ch8 + channel_count 2 + channel 5, Cry_Gligar_Ch5 + channel 8, Cry_Gligar_Ch8 Cry_Girafarig: - musicheader 3, 5, Cry_Girafarig_Ch5 - musicheader 1, 6, Cry_Girafarig_Ch6 - musicheader 1, 8, Cry_Girafarig_Ch8 + channel_count 3 + channel 5, Cry_Girafarig_Ch5 + channel 6, Cry_Girafarig_Ch6 + channel 8, Cry_Girafarig_Ch8 Cry_Slugma: - musicheader 2, 5, Cry_Slugma_Ch5 - musicheader 1, 8, Cry_Slugma_Ch8 + channel_count 2 + channel 5, Cry_Slugma_Ch5 + channel 8, Cry_Slugma_Ch8 Cry_Ledyba: - musicheader 3, 5, Cry_Ledyba_Ch5 - musicheader 1, 6, Cry_Ledyba_Ch6 - musicheader 1, 8, Cry_Ledyba_Ch8 + channel_count 3 + channel 5, Cry_Ledyba_Ch5 + channel 6, Cry_Ledyba_Ch6 + channel 8, Cry_Ledyba_Ch8 Cry_Wooper: - musicheader 3, 5, Cry_Wooper_Ch5 - musicheader 1, 6, Cry_Wooper_Ch6 - musicheader 1, 8, Cry_Wooper_Ch8 + channel_count 3 + channel 5, Cry_Wooper_Ch5 + channel 6, Cry_Wooper_Ch6 + channel 8, Cry_Wooper_Ch8 Cry_Donphan: - musicheader 3, 5, Cry_Donphan_Ch5 - musicheader 1, 6, Cry_Donphan_Ch6 - musicheader 1, 8, Cry_Donphan_Ch8 + channel_count 3 + channel 5, Cry_Donphan_Ch5 + channel 6, Cry_Donphan_Ch6 + channel 8, Cry_Donphan_Ch8 Cry_Typhlosion: - musicheader 3, 5, Cry_Typhlosion_Ch5 - musicheader 1, 6, Cry_Typhlosion_Ch6 - musicheader 1, 8, Cry_Typhlosion_Ch8 + channel_count 3 + channel 5, Cry_Typhlosion_Ch5 + channel 6, Cry_Typhlosion_Ch6 + channel 8, Cry_Typhlosion_Ch8 Cry_Natu: - musicheader 3, 5, Cry_Natu_Ch5 - musicheader 1, 6, Cry_Natu_Ch6 - musicheader 1, 8, Cry_Natu_Ch8 + channel_count 3 + channel 5, Cry_Natu_Ch5 + channel 6, Cry_Natu_Ch6 + channel 8, Cry_Natu_Ch8 Cry_Teddiursa: - musicheader 3, 5, Cry_Teddiursa_Ch5 - musicheader 1, 6, Cry_Teddiursa_Ch6 - musicheader 1, 8, Cry_Teddiursa_Ch8 + channel_count 3 + channel 5, Cry_Teddiursa_Ch5 + channel 6, Cry_Teddiursa_Ch6 + channel 8, Cry_Teddiursa_Ch8 Cry_Sunflora: - musicheader 3, 5, Cry_Sunflora_Ch5 - musicheader 1, 6, Cry_Sunflora_Ch6 - musicheader 1, 8, Cry_Sunflora_Ch8 + channel_count 3 + channel 5, Cry_Sunflora_Ch5 + channel 6, Cry_Sunflora_Ch6 + channel 8, Cry_Sunflora_Ch8 Cry_Ampharos: - musicheader 3, 5, Cry_Ampharos_Ch5 - musicheader 1, 6, Cry_Ampharos_Ch6 - musicheader 1, 8, Cry_Ampharos_Ch8 + channel_count 3 + channel 5, Cry_Ampharos_Ch5 + channel 6, Cry_Ampharos_Ch6 + channel 8, Cry_Ampharos_Ch8 Cry_Totodile: - musicheader 3, 5, Cry_Totodile_Ch5 - musicheader 1, 6, Cry_Totodile_Ch6 - musicheader 1, 8, Cry_Totodile_Ch8 + channel_count 3 + channel 5, Cry_Totodile_Ch5 + channel 6, Cry_Totodile_Ch6 + channel 8, Cry_Totodile_Ch8 Cry_Cleffa: - musicheader 3, 5, Cry_Cleffa_Ch5 - musicheader 1, 6, Cry_Cleffa_Ch6 - musicheader 1, 8, Cry_Cleffa_Ch8 + channel_count 3 + channel 5, Cry_Cleffa_Ch5 + channel 6, Cry_Cleffa_Ch6 + channel 8, Cry_Cleffa_Ch8 Cry_Pichu: - musicheader 3, 5, Cry_Pichu_Ch5 - musicheader 1, 6, Cry_Pichu_Ch6 - musicheader 1, 8, Cry_Pichu_Ch8 + channel_count 3 + channel 5, Cry_Pichu_Ch5 + channel 6, Cry_Pichu_Ch6 + channel 8, Cry_Pichu_Ch8 Cry_Aipom: - musicheader 3, 5, Cry_Aipom_Ch5 - musicheader 1, 6, Cry_Aipom_Ch6 - musicheader 1, 8, Cry_Aipom_Ch8 + channel_count 3 + channel 5, Cry_Aipom_Ch5 + channel 6, Cry_Aipom_Ch6 + channel 8, Cry_Aipom_Ch8 Cry_Dunsparce: - musicheader 3, 5, Cry_Dunsparce_Ch5 - musicheader 1, 6, Cry_Dunsparce_Ch6 - musicheader 1, 8, Cry_Dunsparce_Ch8 + channel_count 3 + channel 5, Cry_Dunsparce_Ch5 + channel 6, Cry_Dunsparce_Ch6 + channel 8, Cry_Dunsparce_Ch8 Cry_Magcargo: - musicheader 3, 5, Cry_Magcargo_Ch5 - musicheader 1, 6, Cry_Magcargo_Ch6 - musicheader 1, 8, Cry_Magcargo_Ch8 + channel_count 3 + channel 5, Cry_Magcargo_Ch5 + channel 6, Cry_Magcargo_Ch6 + channel 8, Cry_Magcargo_Ch8 Cry_Entei: - musicheader 3, 5, Cry_Entei_Ch5 - musicheader 1, 6, Cry_Entei_Ch6 - musicheader 1, 8, Cry_Entei_Ch8 + channel_count 3 + channel 5, Cry_Entei_Ch5 + channel 6, Cry_Entei_Ch6 + channel 8, Cry_Entei_Ch8 Cry_Mantine: - musicheader 3, 5, Cry_Mantine_Ch5 - musicheader 1, 6, Cry_Mantine_Ch6 - musicheader 1, 8, Cry_Mantine_Ch8 + channel_count 3 + channel 5, Cry_Mantine_Ch5 + channel 6, Cry_Mantine_Ch6 + channel 8, Cry_Mantine_Ch8 Cry_Entei_Ch5: - soundinput $ff - sound_duty 3, 0, 2, 1 - sound __, 2, $f8, $05f8 - sound __, 9, $9f, $04d8 - sound __, 7, $f8, $05c4 - sound C_, 5, $f2, $0574 - soundinput $88 - endchannel + pitch_sweep 15, -7 + duty_cycle_pattern 1, 2, 0, 3 + square_note 1, 15, 8, 1528 + square_note 8, 9, -7, 1240 + square_note 6, 15, 8, 1476 + square_note 20, 15, 2, 1396 + pitch_sweep 8, 8 + sound_ret Cry_Entei_Ch6: - sound_duty 3, 0, 3, 0 - sound __, 2, $c8, $0640 - sound __, 7, $ff, $0668 - sound __, 8, $a8, $0534 - sound C_, 5, $a2, $04a4 - endchannel + duty_cycle_pattern 0, 3, 0, 3 + square_note 1, 12, 8, 1600 + square_note 6, 15, -7, 1640 + square_note 7, 10, 8, 1332 + square_note 20, 10, 2, 1188 + sound_ret Cry_Entei_Ch8: - noise __, 11, $d6, $6a - noise __, 7, $bc, $6c - noise __, 7, $e2, $5c - noise C#, 1, $b4, $6c - endchannel + noise_note 10, 13, 6, 106 + noise_note 6, 11, -4, 108 + noise_note 6, 14, 2, 92 + noise_note 32, 11, 4, 108 + sound_ret Cry_Magcargo_Ch5: - sound_duty 0, 1, 0, 3 - sound __, 5, $af, $0720 - sound __, 3, $f8, $071c - sound __, 3, $f8, $0718 - sound __, 3, $f8, $0708 - sound __, 3, $f8, $070e - sound __, 13, $c8, $0712 - sound __, 5, $91, $070e - endchannel + duty_cycle_pattern 3, 0, 1, 0 + square_note 4, 10, -7, 1824 + square_note 2, 15, 8, 1820 + square_note 2, 15, 8, 1816 + square_note 2, 15, 8, 1800 + square_note 2, 15, 8, 1806 + square_note 12, 12, 8, 1810 + square_note 4, 9, 1, 1806 + sound_ret Cry_Magcargo_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 2, $b8, $0710 - sound __, 4, $d8, $072c - sound __, 5, $d8, $0665 - sound __, 2, $b8, $0656 - sound __, 2, $d8, $065c - sound __, 13, $f8, $0760 - sound __, 5, $c1, $0750 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 1, 11, 8, 1808 + square_note 3, 13, 8, 1836 + square_note 4, 13, 8, 1637 + square_note 1, 11, 8, 1622 + square_note 1, 13, 8, 1628 + square_note 12, 15, 8, 1888 + square_note 4, 12, 1, 1872 + sound_ret Cry_Magcargo_Ch8: - noise __, 3, $e8, $3b -.loop - noise __, 2, $f1, $4e - loopchannel 5, .loop - noise __, 3, $d8, $3f - noise C_, 5, $c2, $5f - endchannel + noise_note 2, 14, 8, 59 +.loop: + noise_note 1, 15, 1, 78 + sound_loop 5, .loop + noise_note 2, 13, 8, 63 + noise_note 20, 12, 2, 95 + sound_ret Cry_Dunsparce_Ch5: - sound_duty 2, 0, 2, 0 - sound __, 2, $f8, $05b0 - sound __, 2, $f8, $04b4 - sound __, 2, $f8, $05b8 - sound __, 4, $f8, $05c0 - sound __, 9, $c8, $0490 - sound __, 9, $c8, $0480 - soundinput $fe - sound C_, 1, $c3, $0490 - soundinput $88 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 1, 15, 8, 1456 + square_note 1, 15, 8, 1204 + square_note 1, 15, 8, 1464 + square_note 3, 15, 8, 1472 + square_note 8, 12, 8, 1168 + square_note 8, 12, 8, 1152 + pitch_sweep 15, -6 + square_note 16, 12, 3, 1168 + pitch_sweep 8, 8 + sound_ret Cry_Dunsparce_Ch6: - sound_duty 2, 0, 2, 0 - sound __, 9, $b8, $04c8 - sound C#, 1, $b5, $0410 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 8, 11, 8, 1224 + square_note 32, 11, 5, 1040 + sound_ret Cry_Dunsparce_Ch8: - noise __, 4, $ff, $4b - noise __, 4, $ef, $4c - noise C#, 1, $b5, $5f - endchannel + noise_note 3, 15, -7, 75 + noise_note 3, 14, -7, 76 + noise_note 32, 11, 5, 95 + sound_ret Cry_Slowking_Ch5: - sound_duty 3, 0, 3, 0 - sound __, 3, $f1, $0550 - sound __, 3, $f1, $0530 - sound __, 3, $f1, $0510 - sound __, 3, $f2, $0650 - sound __, 3, $f2, $0640 - sound __, 3, $f2, $0630 - sound C_, 1, $f2, $0550 - endchannel + duty_cycle_pattern 0, 3, 0, 3 + square_note 2, 15, 1, 1360 + square_note 2, 15, 1, 1328 + square_note 2, 15, 1, 1296 + square_note 2, 15, 2, 1616 + square_note 2, 15, 2, 1600 + square_note 2, 15, 2, 1584 + square_note 16, 15, 2, 1360 + sound_ret Cry_Slowking_Ch6: - sound_duty 2, 0, 3, 3 - sound __, 5, $e1, $0620 - sound __, 6, $e2, $0500 - sound __, 7, $e1, $0620 - sound __, 3, $e1, $0520 - sound C_, 1, $e2, $0500 - endchannel + duty_cycle_pattern 3, 3, 0, 2 + square_note 4, 14, 1, 1568 + square_note 5, 14, 2, 1280 + square_note 6, 14, 1, 1568 + square_note 2, 14, 1, 1312 + square_note 16, 14, 2, 1280 + sound_ret Cry_Slowking_Ch8: - noise __, 3, $8a, $5d - noise __, 3, $9a, $4c - noise __, 6, $9a, $5d - noise __, 3, $9a, $4d - noise __, 3, $9a, $4b - noise __, 3, $9a, $4d - noise __, 3, $9a, $5f - noise C_, 1, $b2, $6f - endchannel + noise_note 2, 8, -2, 93 + noise_note 2, 9, -2, 76 + noise_note 5, 9, -2, 93 + noise_note 2, 9, -2, 77 + noise_note 2, 9, -2, 75 + noise_note 2, 9, -2, 77 + noise_note 2, 9, -2, 95 + noise_note 16, 11, 2, 111 + sound_ret Cry_Pichu_Ch5: - dutycycle $0 - soundinput $f7 - sound __, 3, $f8, $078d - sound __, 3, $f8, $0791 - soundinput $ff - sound __, 3, $f8, $07ad - soundinput $88 - sound __, 3, $f8, $07b4 - soundinput $f7 - sound __, 3, $f8, $07b8 - soundinput $88 - endchannel + duty_cycle 0 + pitch_sweep 15, 7 + square_note 2, 15, 8, 1933 + square_note 2, 15, 8, 1937 + pitch_sweep 15, -7 + square_note 2, 15, 8, 1965 + pitch_sweep 8, 8 + square_note 2, 15, 8, 1972 + pitch_sweep 15, 7 + square_note 2, 15, 8, 1976 + pitch_sweep 8, 8 + sound_ret Cry_Pichu_Ch6: - sound_duty 0, 0, 1, 0 - sound __, 3, $c8, $076d - sound __, 3, $c8, $0771 - sound __, 3, $c8, $078d - sound __, 3, $c8, $0794 - sound __, 3, $c8, $0798 - endchannel + duty_cycle_pattern 0, 1, 0, 0 + square_note 2, 12, 8, 1901 + square_note 2, 12, 8, 1905 + square_note 2, 12, 8, 1933 + square_note 2, 12, 8, 1940 + square_note 2, 12, 8, 1944 + sound_ret Cry_Pichu_Ch8: - noise __, 3, $b8, $1 - noise __, 3, $b8, $19 - noise __, 3, $c8, $18 - noise __, 3, $b8, $10 - noise __, 9, $c2, $18 - endchannel + noise_note 2, 11, 8, 1 + noise_note 2, 11, 8, 25 + noise_note 2, 12, 8, 24 + noise_note 2, 11, 8, 16 + noise_note 8, 12, 2, 24 + sound_ret Cry_Marill_Ch5: - sound_duty 2, 0, 2, 0 - sound __, 3, $88, $06d8 - sound __, 9, $e2, $06e0 - sound __, 3, $61, $06e5 - sound __, 3, $e8, $06c0 - sound __, 3, $e8, $06b8 - sound __, 3, $d8, $06b0 - sound __, 9, $c1, $06aa - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 2, 8, 8, 1752 + square_note 8, 14, 2, 1760 + square_note 2, 6, 1, 1765 + square_note 2, 14, 8, 1728 + square_note 2, 14, 8, 1720 + square_note 2, 13, 8, 1712 + square_note 8, 12, 1, 1706 + sound_ret Cry_Marill_Ch6: - sound_duty 3, 0, 2, 1 - sound __, 3, $68, $06b1 - sound __, 6, $c1, $06b9 - sound __, 6, $99, $0760 - sound __, 3, $b8, $068c - sound __, 3, $a8, $0684 - sound __, 11, $92, $067b - endchannel + duty_cycle_pattern 1, 2, 0, 3 + square_note 2, 6, 8, 1713 + square_note 5, 12, 1, 1721 + square_note 5, 9, -1, 1888 + square_note 2, 11, 8, 1676 + square_note 2, 10, 8, 1668 + square_note 10, 9, 2, 1659 + sound_ret Cry_Marill_Ch8: - noise __, 2, $99, $6c - noise __, 2, $92, $5c - noise __, 11, $62, $4c - noise __, 3, $68, $6a - noise __, 3, $68, $6b - noise __, 11, $62, $6c - endchannel + noise_note 1, 9, -1, 108 + noise_note 1, 9, 2, 92 + noise_note 10, 6, 2, 76 + noise_note 2, 6, 8, 106 + noise_note 2, 6, 8, 107 + noise_note 10, 6, 2, 108 + sound_ret Cry_Togepi_Ch5: - tone $0002 + pitch_offset 2 Cry_Togepi_Ch6: -Cry_Togetic_branch_f3022: - sound_duty 2, 0, 1, 1 - sound __, 5, $f1, $0796 - sound __, 5, $f1, $072d - sound __, 8, $0, 0 - sound C_, 1, $f1, $07a7 - endchannel + duty_cycle_pattern 1, 1, 0, 2 + square_note 4, 15, 1, 1942 + square_note 4, 15, 1, 1837 + square_note 7, 0, 0, 0 + square_note 16, 15, 1, 1959 + sound_ret Cry_Togetic_Ch5: - tone $0002 + pitch_offset 2 Cry_Togetic_Ch6: - callchannel Cry_Togetic_branch_f3022 - loopchannel 2, Cry_Togetic_Ch6 - sound __, 15, $0, 0 - sound __, 9, $f2, $07c2 - endchannel + sound_call Cry_Togepi_Ch6 + sound_loop 2, Cry_Togetic_Ch6 + square_note 14, 0, 0, 0 + square_note 8, 15, 2, 1986 + sound_ret Cry_Spinarak_Ch5: - dutycycle $1 - sound __, 4, $2c, $07c4 - sound __, 2, $0, $0001 - sound __, 6, $59, $07b9 - sound __, 7, $b4, $07bb - endchannel + duty_cycle 1 + square_note 3, 2, -4, 1988 + square_note 1, 0, 0, 1 + square_note 5, 5, -1, 1977 + square_note 6, 11, 4, 1979 + sound_ret Cry_Spinarak_Ch6: - sound_duty 2, 2, 2, 0 - sound __, 4, $2c, $07c7 - sound __, 2, $0, 0 - sound __, 6, $59, $07be - sound __, 7, $b4, $07bd - endchannel + duty_cycle_pattern 0, 2, 2, 2 + square_note 3, 2, -4, 1991 + square_note 1, 0, 0, 0 + square_note 5, 5, -1, 1982 + square_note 6, 11, 4, 1981 + sound_ret Cry_Spinarak_Ch8: - noise __, 4, $92, $10 - noise __, 2, $39, $0 - noise __, 6, $69, $10 - noise __, 7, $93, $0 - endchannel + noise_note 3, 9, 2, 16 + noise_note 1, 3, -1, 0 + noise_note 5, 6, -1, 16 + noise_note 6, 9, 3, 0 + sound_ret Cry_Raikou_Ch5: - sound_duty 0, 2, 3, 3 - sound __, 3, $f1, $04b0 - sound __, 3, $f7, $0590 - sound __, 9, $f8, $0510 - sound __, 4, $f2, $06c0 - sound __, 4, $f8, $06ba - sound __, 4, $f2, $06b0 - sound C_, 1, $f2, $0690 - endchannel + duty_cycle_pattern 3, 3, 2, 0 + square_note 2, 15, 1, 1200 + square_note 2, 15, 7, 1424 + square_note 8, 15, 8, 1296 + square_note 3, 15, 2, 1728 + square_note 3, 15, 8, 1722 + square_note 3, 15, 2, 1712 + square_note 16, 15, 2, 1680 + sound_ret Cry_Raikou_Ch6: - sound_duty 2, 0, 3, 3 - sound __, 3, $f1, $0720 - sound __, 3, $e1, $0650 - sound __, 5, $f1, $0750 - sound __, 5, $d1, $03a0 - sound __, 4, $f1, $0670 - sound __, 4, $e1, $0680 - sound __, 4, $f2, $0690 - sound C_, 1, $e2, $06a0 - endchannel + duty_cycle_pattern 3, 3, 0, 2 + square_note 2, 15, 1, 1824 + square_note 2, 14, 1, 1616 + square_note 4, 15, 1, 1872 + square_note 4, 13, 1, 928 + square_note 3, 15, 1, 1648 + square_note 3, 14, 1, 1664 + square_note 3, 15, 2, 1680 + square_note 16, 14, 2, 1696 + sound_ret Cry_Raikou_Ch8: - noise __, 3, $89, $2e - noise __, 3, $99, $1f - noise __, 5, $89, $4e - noise __, 5, $89, $7b - noise __, 4, $d8, $4b - noise __, 4, $e7, $4c - noise __, 4, $ec, $4d - noise C_, 1, $d2, $4f - endchannel + noise_note 2, 8, -1, 46 + noise_note 2, 9, -1, 31 + noise_note 4, 8, -1, 78 + noise_note 4, 8, -1, 123 + noise_note 3, 13, 8, 75 + noise_note 3, 14, 7, 76 + noise_note 3, 14, -4, 77 + noise_note 16, 13, 2, 79 + sound_ret Cry_Hoothoot_Ch5: - sound_duty 2, 1, 2, 1 - sound __, 5, $78, $0650 - sound __, 5, $f8, $0660 - sound __, 5, $f8, $065c - sound __, 2, $f8, $067c - sound __, 5, $f8, $0680 - sound __, 5, $f8, $067c - sound __, 5, $f8, $0678 - sound __, 5, $f1, $0674 - endchannel + duty_cycle_pattern 1, 2, 1, 2 + square_note 4, 7, 8, 1616 + square_note 4, 15, 8, 1632 + square_note 4, 15, 8, 1628 + square_note 1, 15, 8, 1660 + square_note 4, 15, 8, 1664 + square_note 4, 15, 8, 1660 + square_note 4, 15, 8, 1656 + square_note 4, 15, 1, 1652 + sound_ret Cry_Hoothoot_Ch6: - sound_duty 2, 0, 2, 0 -.loop1 - sound __, 3, $a1, $0600 - loopchannel 3, .loop1 -.loop2 - sound __, 3, $a1, $0630 - loopchannel 4, .loop2 - sound __, 5, $a2, $0634 - sound __, 5, $91, $0638 - endchannel + duty_cycle_pattern 0, 2, 0, 2 +.loop1: + square_note 2, 10, 1, 1536 + sound_loop 3, .loop1 +.loop2: + square_note 2, 10, 1, 1584 + sound_loop 4, .loop2 + square_note 4, 10, 2, 1588 + square_note 4, 9, 1, 1592 + sound_ret Cry_Hoothoot_Ch8: - noise __, 2, $68, $36 - noise C_, 1, $88, $6a - noise __, 2, $98, $5e - noise C_, 1, $a7, $6e - endchannel + noise_note 1, 6, 8, 54 + noise_note 16, 8, 8, 106 + noise_note 1, 9, 8, 94 + noise_note 16, 10, 7, 110 + sound_ret Cry_Sentret_Ch5: - tone $0020 - dutycycle $0 - jumpchannel Cry_Sentret_branch_f312b + pitch_offset 32 + duty_cycle 0 + sound_jump Cry_Sentret_Ch6.body Cry_Sentret_Ch6: - sound_duty 3, 2, 1, 0 -Cry_Sentret_branch_f312b: - sound __, 9, $39, $072d - sound __, 9, $f1, $0720 - endchannel + duty_cycle_pattern 0, 1, 2, 3 +.body: + square_note 8, 3, -1, 1837 + square_note 8, 15, 1, 1824 + sound_ret -Cry_Sentret_Ch8: - noise __, 9, $3b, $0 - noise __, 9, $92, $0 - endchannel +Cry_Sentret_Ch8: ; unreferenced + noise_note 8, 3, -3, 0 + noise_note 8, 9, 2, 0 + sound_ret Cry_Mareep_Ch5: - tone $0020 - dutycycle $0 - jumpchannel Cry_Mareep_branch_f3145 + pitch_offset 32 + duty_cycle 0 + sound_jump Cry_Mareep_Ch6.body Cry_Mareep_Ch6: - sound_duty 1, 0, 0, 0 -Cry_Mareep_branch_f3145: -Cry_Gligar_branch_f3145: - sound __, 5, $3a, $073d - sound __, 7, $f8, $0762 - sound __, 7, $f8, $0760 - sound __, 7, $f1, $075e - endchannel + duty_cycle_pattern 0, 0, 0, 1 +.body: + square_note 4, 3, -2, 1853 + square_note 6, 15, 8, 1890 + square_note 6, 15, 8, 1888 + square_note 6, 15, 1, 1886 + sound_ret Cry_Cyndaquil_Ch5: - tone $0020 + pitch_offset 32 Cry_Cyndaquil_Ch6: - dutycycle $2 - sound __, 9, $2f, $0107 -.loop1 - sound __, 1, $e1, $0483 - sound __, 1, $51, $044e - loopchannel 4, .loop1 -.loop2 - sound __, 1, $e1, $03da - sound __, 2, $51, $0312 - loopchannel 4, .loop2 - endchannel + duty_cycle 2 + square_note 8, 2, -7, 263 +.loop1: + square_note 0, 14, 1, 1155 + square_note 0, 5, 1, 1102 + sound_loop 4, .loop1 +.loop2: + square_note 0, 14, 1, 986 + square_note 1, 5, 1, 786 + sound_loop 4, .loop2 + sound_ret -Cry_Cyndaquil_Ch8: Cry_Gligar_Ch8: - noise __, 9, $3f, $52 - noise C#, 1, $93, $4f - endchannel +Cry_Cyndaquil_Ch8: + noise_note 8, 3, -7, 82 + noise_note 32, 9, 3, 79 + sound_ret Cry_Chikorita_Ch5: - tone $0020 + pitch_offset 32 Cry_Chikorita_Ch6: - sound_duty 1, 0, 2, 0 - sound __, 3, $c8, $0641 - sound __, 3, $48, $0641 - sound __, 7, $f8, $0790 - sound __, 5, $f8, $078e - sound __, 5, $f1, $078b - endchannel + duty_cycle_pattern 0, 2, 0, 1 + square_note 2, 12, 8, 1601 + square_note 2, 4, 8, 1601 + square_note 6, 15, 8, 1936 + square_note 4, 15, 8, 1934 + square_note 4, 15, 1, 1931 + sound_ret Cry_Chikorita_Ch8: - noise __, 5, $91, $10 - noise __, 9, $94, $3 - endchannel + noise_note 4, 9, 1, 16 + noise_note 8, 9, 4, 3 + sound_ret Cry_Gligar_Ch5: - sound_duty 2, 0, 2, 2 - jumpchannel Cry_Gligar_branch_f3145 + duty_cycle_pattern 2, 2, 0, 2 + sound_jump Cry_Mareep_Ch6.body Cry_Girafarig_Ch5: - dutycycle $1 - tone $0004 - jumpchannel Cry_Girafarig_branch_f31af + duty_cycle 1 + pitch_offset 4 + sound_jump Cry_Girafarig_Ch6.body Cry_Girafarig_Ch6: - sound_duty 1, 0, 0, 1 -Cry_Girafarig_branch_f31af: - sound __, 5, $68, $0758 - sound __, 3, $e8, $0760 - sound __, 3, $e8, $0767 - sound __, 3, $e8, $076c - sound __, 8, $f1, $0767 - endchannel + duty_cycle_pattern 1, 0, 0, 1 +.body: + square_note 4, 6, 8, 1880 + square_note 2, 14, 8, 1888 + square_note 2, 14, 8, 1895 + square_note 2, 14, 8, 1900 + square_note 7, 15, 1, 1895 + sound_ret Cry_Girafarig_Ch8: - noise __, 5, $29, $0 - noise __, 3, $39, $1 - noise __, 3, $49, $2 - noise __, 3, $59, $1 - noise __, 8, $41, $0 - endchannel + noise_note 4, 2, -1, 0 + noise_note 2, 3, -1, 1 + noise_note 2, 4, -1, 2 + noise_note 2, 5, -1, 1 + noise_note 7, 4, 1, 0 + sound_ret Cry_Slugma_Ch5: - sound_duty 1, 0, 1, 2 - sound __, 13, $f2, $07a6 - sound __, 5, $f8, $07b0 - sound __, 5, $e8, $03b0 - sound __, 7, $f8, $03a0 - sound __, 9, $e1, $0290 - endchannel + duty_cycle_pattern 2, 1, 0, 1 + square_note 12, 15, 2, 1958 + square_note 4, 15, 8, 1968 + square_note 4, 14, 8, 944 + square_note 6, 15, 8, 928 + square_note 8, 14, 1, 656 + sound_ret Cry_Slugma_Ch8: - noise __, 13, $b2, $50 - noise __, 9, $a8, $60 - noise __, 7, $a8, $5b - noise __, 9, $a1, $5c - endchannel + noise_note 12, 11, 2, 80 + noise_note 8, 10, 8, 96 + noise_note 6, 10, 8, 91 + noise_note 8, 10, 1, 92 + sound_ret Cry_Ledyba_Ch5: - tone $0002 - dutycycle $2 - jumpchannel Cry_Ledyba_branch_f3202 + pitch_offset 2 + duty_cycle 2 + sound_jump Cry_Ledyba_Ch6.body Cry_Ledyba_Ch6: - sound_duty 1, 0, 0, 0 -Cry_Ledyba_branch_f3202: - sound __, 4, $f8, $0791 - sound __, 4, $d8, $078d - sound __, 3, $0, 0 - sound __, 2, $78, $06c1 - sound __, 2, $f8, $0741 - sound __, 5, $e1, $0751 - endchannel + duty_cycle_pattern 0, 0, 0, 1 +.body: + square_note 3, 15, 8, 1937 + square_note 3, 13, 8, 1933 + square_note 2, 0, 0, 0 + square_note 1, 7, 8, 1729 + square_note 1, 15, 8, 1857 + square_note 4, 14, 1, 1873 + sound_ret Cry_Ledyba_Ch8: - noise __, 4, $59, $21 - noise __, 4, $81, $0 - noise __, 3, $20, $0 - noise __, 2, $80, $21 - noise __, 2, $80, $10 - noise __, 5, $87, $0 - endchannel + noise_note 3, 5, -1, 33 + noise_note 3, 8, 1, 0 + noise_note 2, 2, 0, 0 + noise_note 1, 8, 0, 33 + noise_note 1, 8, 0, 16 + noise_note 4, 8, 7, 0 + sound_ret Cry_Wooper_Ch5: Cry_Donphan_Ch5: - dutycycle $2 - sound __, 3, $99, $0718 - sound __, 5, $ab, $0722 - sound __, 9, $ab, $0734 - sound __, 5, $d6, $0716 - sound __, 9, $d1, $0712 - sound __, 9, $0, 0 - endchannel + duty_cycle 2 + square_note 2, 9, -1, 1816 + square_note 4, 10, -3, 1826 + square_note 8, 10, -3, 1844 + square_note 4, 13, 6, 1814 + square_note 8, 13, 1, 1810 + square_note 8, 0, 0, 0 + sound_ret Cry_Wooper_Ch6: Cry_Donphan_Ch6: - sound_duty 3, 1, 0, 0 - sound __, 3, $b9, $0738 - sound __, 5, $cb, $0742 - sound __, 9, $cb, $0754 - sound __, 5, $f6, $0736 - sound __, 9, $f1, $0732 - sound __, 9, $0, 0 - endchannel + duty_cycle_pattern 0, 0, 1, 3 + square_note 2, 11, -1, 1848 + square_note 4, 12, -3, 1858 + square_note 8, 12, -3, 1876 + square_note 4, 15, 6, 1846 + square_note 8, 15, 1, 1842 + square_note 8, 0, 0, 0 + sound_ret Cry_Wooper_Ch8: - noise __, 3, $5b, $4 - noise __, 5, $68, $13 - noise __, 9, $68, $20 - noise __, 5, $68, $13 - noise C_, 1, $51, $4 - endchannel + noise_note 2, 5, -3, 4 + noise_note 4, 6, 8, 19 + noise_note 8, 6, 8, 32 + noise_note 4, 6, 8, 19 + noise_note 16, 5, 1, 4 + sound_ret Cry_Donphan_Ch8: - noise __, 3, $8b, $59 - noise __, 5, $a8, $6a - noise __, 9, $a8, $70 - noise __, 5, $a8, $69 - noise C_, 1, $92, $6c - endchannel + noise_note 2, 8, -3, 89 + noise_note 4, 10, 8, 106 + noise_note 8, 10, 8, 112 + noise_note 4, 10, 8, 105 + noise_note 16, 9, 2, 108 + sound_ret -Cry_Typhlosion_Ch5: Cry_Teddiursa_Ch5: - sound_duty 2, 0, 1, 0 -.loop1 - sound __, 4, $c1, $0791 - loopchannel 3, .loop1 -.loop2 - sound __, 4, $d1, $04b1 - loopchannel 6, .loop2 -.loop3 - sound __, 2, $d1, $0491 - sound __, 2, $b1, $0451 - loopchannel 6, .loop3 -.loop4 - sound __, 2, $a3, $0471 - sound __, 2, $81, $0441 - loopchannel 6, .loop4 -.loop5 - sound __, 2, $41, $0421 - sound __, 2, $21, $0401 - loopchannel 4, .loop5 - endchannel +Cry_Typhlosion_Ch5: + duty_cycle_pattern 0, 1, 0, 2 +.loop1: + square_note 3, 12, 1, 1937 + sound_loop 3, .loop1 +.loop2: + square_note 3, 13, 1, 1201 + sound_loop 6, .loop2 +.loop3: + square_note 1, 13, 1, 1169 + square_note 1, 11, 1, 1105 + sound_loop 6, .loop3 +.loop4: + square_note 1, 10, 3, 1137 + square_note 1, 8, 1, 1089 + sound_loop 6, .loop4 +.loop5: + square_note 1, 4, 1, 1057 + square_note 1, 2, 1, 1025 + sound_loop 4, .loop5 + sound_ret -Cry_Typhlosion_Ch6: Cry_Teddiursa_Ch6: - sound_duty 0, 2, 3, 1 - sound __, 9, $99, $0740 - sound __, 9, $79, $0746 - sound C_, 1, $f6, $078d - sound __, 9, $f8, $0791 - sound __, 9, $f8, $078d - sound __, 9, $f8, $0787 - sound C_, 9, $e2, $0783 - endchannel +Cry_Typhlosion_Ch6: + duty_cycle_pattern 1, 3, 2, 0 + square_note 8, 9, -1, 1856 + square_note 8, 7, -1, 1862 + square_note 16, 15, 6, 1933 + square_note 8, 15, 8, 1937 + square_note 8, 15, 8, 1933 + square_note 8, 15, 8, 1927 + square_note 24, 14, 2, 1923 + sound_ret Cry_Typhlosion_Ch8: - noise C_, 1, $a6, $16 - noise C_, 9, $98, $3d - noise C#, 1, $98, $5c - noise C#, 1, $75, $5f - endchannel + noise_note 16, 10, 6, 22 + noise_note 24, 9, 8, 61 + noise_note 32, 9, 8, 92 + noise_note 32, 7, 5, 95 + sound_ret Cry_Natu_Ch5: - sound_duty 2, 3, 1, 3 -Cry_Mantine_branch_f32e9: -Cry_Sunflora_branch_f32e9: - sound __, 5, $f8, $07b1 - sound __, 5, $f8, $07b0 - sound __, 5, $48, $07af -Cry_Mantine_branch_f32f5: - sound __, 5, $f8, $07b2 - sound __, 5, $f8, $07b3 - sound __, 5, $48, $07b4 - endchannel + duty_cycle_pattern 3, 1, 3, 2 +.body1: + square_note 4, 15, 8, 1969 + square_note 4, 15, 8, 1968 + square_note 4, 4, 8, 1967 +.body2: + square_note 4, 15, 8, 1970 + square_note 4, 15, 8, 1971 + square_note 4, 4, 8, 1972 + sound_ret -Cry_Mantine_branch_f3302: Cry_Natu_Ch6: Cry_Sunflora_Ch6: - sound_duty 2, 0, 3, 3 - sound __, 5, $f8, $07b2 - sound __, 5, $f8, $07b1 - sound __, 5, $28, $07b0 -Cry_Mantine_branch_f3310: - sound __, 5, $f8, $07b4 - sound __, 5, $f8, $07b6 - sound __, 5, $48, $07b8 - endchannel +.body1: + duty_cycle_pattern 3, 3, 0, 2 + square_note 4, 15, 8, 1970 + square_note 4, 15, 8, 1969 + square_note 4, 2, 8, 1968 +.body2: + square_note 4, 15, 8, 1972 + square_note 4, 15, 8, 1974 + square_note 4, 4, 8, 1976 + sound_ret -Cry_Mantine_branch_f331d: Cry_Natu_Ch8: Cry_Sunflora_Ch8: - noise __, 5, $88, $5 - noise __, 5, $88, $4 - noise __, 5, $38, $3 -Cry_Mantine_branch_f3326: - noise __, 5, $88, $5 - noise __, 5, $88, $4 - noise __, 5, $87, $4 - endchannel +.body1: + noise_note 4, 8, 8, 5 + noise_note 4, 8, 8, 4 + noise_note 4, 3, 8, 3 +.body2: + noise_note 4, 8, 8, 5 + noise_note 4, 8, 8, 4 + noise_note 4, 8, 7, 4 + sound_ret Cry_Teddiursa_Ch8: - noise __, 9, $a6, $3a - noise __, 9, $a1, $5a - endchannel + noise_note 8, 10, 6, 58 + noise_note 8, 10, 1, 90 + sound_ret Cry_Sunflora_Ch5: - dutycycle $0 - jumpchannel Cry_Sunflora_branch_f32e9 + duty_cycle 0 + sound_jump Cry_Natu_Ch5.body1 Cry_Mantine_Ch5: - dutycycle $0 - callchannel Cry_Mantine_branch_f32e9 - callchannel Cry_Mantine_branch_f32f5 - endchannel + duty_cycle 0 + sound_call Cry_Natu_Ch5.body1 + sound_call Cry_Natu_Ch5.body2 + sound_ret Cry_Mantine_Ch6: - callchannel Cry_Mantine_branch_f3302 - callchannel Cry_Mantine_branch_f3310 - endchannel + sound_call Cry_Sunflora_Ch6.body1 + sound_call Cry_Sunflora_Ch6.body2 + sound_ret Cry_Mantine_Ch8: - callchannel Cry_Mantine_branch_f331d - callchannel Cry_Mantine_branch_f3326 - endchannel + sound_call Cry_Sunflora_Ch8.body1 + sound_call Cry_Sunflora_Ch8.body2 + sound_ret Cry_Ampharos_Ch5: - sound_duty 2, 3, 1, 3 -.loop - sound __, 2, $c1, $0520 - sound __, 2, $a1, $0420 - loopchannel 4, .loop - dutycycle $0 - sound __, 5, $78, $0760 - sound __, 5, $78, $0730 - sound C_, 9, $c2, $0420 - endchannel + duty_cycle_pattern 3, 1, 3, 2 +.loop: + square_note 1, 12, 1, 1312 + square_note 1, 10, 1, 1056 + sound_loop 4, .loop + duty_cycle 0 + square_note 4, 7, 8, 1888 + square_note 4, 7, 8, 1840 + square_note 24, 12, 2, 1056 + sound_ret Cry_Ampharos_Ch6: - sound_duty 2, 0, 3, 0 - sound __, 9, $f8, $0700 - sound __, 8, $f8, $0720 - sound __, 5, $f8, $0790 - sound __, 5, $f8, $0760 - sound C_, 9, $f2, $0730 - endchannel + duty_cycle_pattern 0, 3, 0, 2 + square_note 8, 15, 8, 1792 + square_note 7, 15, 8, 1824 + square_note 4, 15, 8, 1936 + square_note 4, 15, 8, 1888 + square_note 24, 15, 2, 1840 + sound_ret Cry_Ampharos_Ch8: - noise __, 5, $88, $6d - noise __, 5, $d8, $68 - noise __, 8, $c8, $69 - noise __, 5, $98, $3a - noise __, 5, $98, $3c - noise C_, 9, $d2, $5b - endchannel + noise_note 4, 8, 8, 109 + noise_note 4, 13, 8, 104 + noise_note 7, 12, 8, 105 + noise_note 4, 9, 8, 58 + noise_note 4, 9, 8, 60 + noise_note 24, 13, 2, 91 + sound_ret Cry_Totodile_Ch5: - sound_duty 2, 0, 3, 0 - sound __, 9, $f8, $0330 - sound __, 9, $f8, $0340 - sound __, 9, $c8, $07b2 - sound __, 9, $b8, $07b3 - sound C#, 1, $b2, $07b4 - endchannel + duty_cycle_pattern 0, 3, 0, 2 + square_note 8, 15, 8, 816 + square_note 8, 15, 8, 832 + square_note 8, 12, 8, 1970 + square_note 8, 11, 8, 1971 + square_note 32, 11, 2, 1972 + sound_ret Cry_Totodile_Ch6: - sound_duty 2, 0, 1, 0 - sound __, 9, $e8, $0320 - sound __, 9, $e8, $0328 - sound __, 9, $98, $0780 - sound __, 9, $88, $0782 - sound C#, 1, $72, $0784 - endchannel + duty_cycle_pattern 0, 1, 0, 2 + square_note 8, 14, 8, 800 + square_note 8, 14, 8, 808 + square_note 8, 9, 8, 1920 + square_note 8, 8, 8, 1922 + square_note 32, 7, 2, 1924 + sound_ret Cry_Totodile_Ch8: - noise __, 3, $be, $49 - noise __, 6, $be, $3a - noise __, 3, $be, $29 - noise C#, 9, $d3, $6e - endchannel + noise_note 2, 11, -6, 73 + noise_note 5, 11, -6, 58 + noise_note 2, 11, -6, 41 + noise_note 40, 13, 3, 110 + sound_ret Cry_Cleffa_Ch5: - sound_duty 1, 2, 3, 0 - soundinput $ff - sound __, 3, $f8, $0720 - sound __, 3, $f8, $0727 - sound __, 3, $f8, $0780 - soundinput $88 - sound __, 3, $f8, $0779 - sound __, 5, $f8, $0740 - sound __, 5, $f8, $073c - soundinput $ff - sound __, 9, $f1, $0737 - soundinput $88 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + pitch_sweep 15, -7 + square_note 2, 15, 8, 1824 + square_note 2, 15, 8, 1831 + square_note 2, 15, 8, 1920 + pitch_sweep 8, 8 + square_note 2, 15, 8, 1913 + square_note 4, 15, 8, 1856 + square_note 4, 15, 8, 1852 + pitch_sweep 15, -7 + square_note 8, 15, 1, 1847 + pitch_sweep 8, 8 + sound_ret Cry_Cleffa_Ch6: - sound_duty 2, 0, 2, 0 - sound __, 7, $b2, $071e - sound __, 6, $92, $0779 - sound __, 5, $82, $073e - sound __, 9, $a1, $0735 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 6, 11, 2, 1822 + square_note 5, 9, 2, 1913 + square_note 4, 8, 2, 1854 + square_note 8, 10, 1, 1845 + sound_ret Cry_Cleffa_Ch8: - noise __, 3, $64, $7f - noise __, 3, $84, $7d - noise __, 3, $a4, $6f - noise __, 3, $64, $6c - noise __, 3, $94, $6f - noise __, 3, $61, $6b - endchannel + noise_note 2, 6, 4, 127 + noise_note 2, 8, 4, 125 + noise_note 2, 10, 4, 111 + noise_note 2, 6, 4, 108 + noise_note 2, 9, 4, 111 + noise_note 2, 6, 1, 107 + sound_ret Cry_Aipom_Ch5: - sound_duty 2, 0, 1, 3 - sound __, 4, $f8, $06b0 - sound __, 2, $f8, $06a5 - sound __, 2, $f8, $069d - sound __, 8, $f1, $068a - sound __, 4, $f8, $0736 - sound __, 4, $f8, $0720 - sound C_, 5, $f2, $070e - endchannel + duty_cycle_pattern 3, 1, 0, 2 + square_note 3, 15, 8, 1712 + square_note 1, 15, 8, 1701 + square_note 1, 15, 8, 1693 + square_note 7, 15, 1, 1674 + square_note 3, 15, 8, 1846 + square_note 3, 15, 8, 1824 + square_note 20, 15, 2, 1806 + sound_ret Cry_Aipom_Ch6: - sound_duty 3, 1, 2, 0 -.loop1 - sound __, 2, $f1, $07b4 - loopchannel 8, .loop1 -.loop2 - sound __, 2, $c1, $0790 - loopchannel 3, .loop2 -.loop3 - sound __, 2, $b1, $078d - loopchannel 2, .loop3 - sound C_, 1, $92, $0795 - endchannel + duty_cycle_pattern 0, 2, 1, 3 +.loop1: + square_note 1, 15, 1, 1972 + sound_loop 8, .loop1 +.loop2: + square_note 1, 12, 1, 1936 + sound_loop 3, .loop2 +.loop3: + square_note 1, 11, 1, 1933 + sound_loop 2, .loop3 + square_note 16, 9, 2, 1941 + sound_ret Cry_Aipom_Ch8: - noise __, 1, $f1, $28 - loopchannel 4, Cry_Aipom_Ch8 - noise __, 1, $91, $49 - noise __, 2, $a8, $4a - noise __, 1, $e1, $4b - noise __, 6, $d2, $4f - noise __, 4, $c2, $4e - noise __, 4, $b2, $4d - noise C_, 5, $a3, $4c - endchannel + noise_note 0, 15, 1, 40 + sound_loop 4, Cry_Aipom_Ch8 + noise_note 0, 9, 1, 73 + noise_note 1, 10, 8, 74 + noise_note 0, 14, 1, 75 + noise_note 5, 13, 2, 79 + noise_note 3, 12, 2, 78 + noise_note 3, 11, 2, 77 + noise_note 20, 10, 3, 76 + sound_ret Cry_Nidoran_M: - musicheader 3, 5, Cry_Nidoran_M_Ch5 - musicheader 1, 6, Cry_Nidoran_M_Ch6 - musicheader 1, 8, Cry_Nidoran_M_Ch8 + channel_count 3 + channel 5, Cry_Nidoran_M_Ch5 + channel 6, Cry_Nidoran_M_Ch6 + channel 8, Cry_Nidoran_M_Ch8 Cry_Nidoran_F: - musicheader 3, 5, Cry_Nidoran_F_Ch5 - musicheader 1, 6, Cry_Nidoran_F_Ch6 - musicheader 1, 8, Cry_Nidoran_F_Ch8 + channel_count 3 + channel 5, Cry_Nidoran_F_Ch5 + channel 6, Cry_Nidoran_F_Ch6 + channel 8, Cry_Nidoran_F_Ch8 Cry_Slowpoke: - musicheader 3, 5, Cry_Slowpoke_Ch5 - musicheader 1, 6, Cry_Slowpoke_Ch6 - musicheader 1, 8, Cry_Slowpoke_Ch8 + channel_count 3 + channel 5, Cry_Slowpoke_Ch5 + channel 6, Cry_Slowpoke_Ch6 + channel 8, Cry_Slowpoke_Ch8 Cry_Kangaskhan: - musicheader 3, 5, Cry_Kangaskhan_Ch5 - musicheader 1, 6, Cry_Kangaskhan_Ch6 - musicheader 1, 8, Cry_Kangaskhan_Ch8 + channel_count 3 + channel 5, Cry_Kangaskhan_Ch5 + channel 6, Cry_Kangaskhan_Ch6 + channel 8, Cry_Kangaskhan_Ch8 Cry_Charmander: - musicheader 3, 5, Cry_Charmander_Ch5 - musicheader 1, 6, Cry_Charmander_Ch6 - musicheader 1, 8, Cry_Charmander_Ch8 + channel_count 3 + channel 5, Cry_Charmander_Ch5 + channel 6, Cry_Charmander_Ch6 + channel 8, Cry_Charmander_Ch8 Cry_Grimer: - musicheader 3, 5, Cry_Grimer_Ch5 - musicheader 1, 6, Cry_Grimer_Ch6 - musicheader 1, 8, Cry_Grimer_Ch8 + channel_count 3 + channel 5, Cry_Grimer_Ch5 + channel 6, Cry_Grimer_Ch6 + channel 8, Cry_Grimer_Ch8 Cry_Voltorb: - musicheader 3, 5, Cry_Voltorb_Ch5 - musicheader 1, 6, Cry_Voltorb_Ch6 - musicheader 1, 8, Cry_Voltorb_Ch8 + channel_count 3 + channel 5, Cry_Voltorb_Ch5 + channel 6, Cry_Voltorb_Ch6 + channel 8, Cry_Voltorb_Ch8 Cry_Muk: - musicheader 3, 5, Cry_Muk_Ch5 - musicheader 1, 6, Cry_Muk_Ch6 - musicheader 1, 8, Cry_Muk_Ch8 + channel_count 3 + channel 5, Cry_Muk_Ch5 + channel 6, Cry_Muk_Ch6 + channel 8, Cry_Muk_Ch8 Cry_Oddish: - musicheader 3, 5, Cry_Oddish_Ch5 - musicheader 1, 6, Cry_Oddish_Ch6 - musicheader 1, 8, Cry_Oddish_Ch8 + channel_count 3 + channel 5, Cry_Oddish_Ch5 + channel 6, Cry_Oddish_Ch6 + channel 8, Cry_Oddish_Ch8 Cry_Raichu: - musicheader 3, 5, Cry_Raichu_Ch5 - musicheader 1, 6, Cry_Raichu_Ch6 - musicheader 1, 8, Cry_Raichu_Ch8 + channel_count 3 + channel 5, Cry_Raichu_Ch5 + channel 6, Cry_Raichu_Ch6 + channel 8, Cry_Raichu_Ch8 Cry_Nidoqueen: - musicheader 3, 5, Cry_Nidoqueen_Ch5 - musicheader 1, 6, Cry_Nidoqueen_Ch6 - musicheader 1, 8, Cry_Nidoqueen_Ch8 + channel_count 3 + channel 5, Cry_Nidoqueen_Ch5 + channel 6, Cry_Nidoqueen_Ch6 + channel 8, Cry_Nidoqueen_Ch8 Cry_Diglett: - musicheader 3, 5, Cry_Diglett_Ch5 - musicheader 1, 6, Cry_Diglett_Ch6 - musicheader 1, 8, Cry_Diglett_Ch8 + channel_count 3 + channel 5, Cry_Diglett_Ch5 + channel 6, Cry_Diglett_Ch6 + channel 8, Cry_Diglett_Ch8 Cry_Seel: - musicheader 3, 5, Cry_Seel_Ch5 - musicheader 1, 6, Cry_Seel_Ch6 - musicheader 1, 8, Cry_Seel_Ch8 + channel_count 3 + channel 5, Cry_Seel_Ch5 + channel 6, Cry_Seel_Ch6 + channel 8, Cry_Seel_Ch8 Cry_Drowzee: - musicheader 3, 5, Cry_Drowzee_Ch5 - musicheader 1, 6, Cry_Drowzee_Ch6 - musicheader 1, 8, Cry_Drowzee_Ch8 + channel_count 3 + channel 5, Cry_Drowzee_Ch5 + channel 6, Cry_Drowzee_Ch6 + channel 8, Cry_Drowzee_Ch8 Cry_Pidgey: - musicheader 3, 5, Cry_Pidgey_Ch5 - musicheader 1, 6, Cry_Pidgey_Ch6 - musicheader 1, 8, Cry_Pidgey_Ch8 + channel_count 3 + channel 5, Cry_Pidgey_Ch5 + channel 6, Cry_Pidgey_Ch6 + channel 8, Cry_Pidgey_Ch8 Cry_Bulbasaur: - musicheader 3, 5, Cry_Bulbasaur_Ch5 - musicheader 1, 6, Cry_Bulbasaur_Ch6 - musicheader 1, 8, Cry_Bulbasaur_Ch8 + channel_count 3 + channel 5, Cry_Bulbasaur_Ch5 + channel 6, Cry_Bulbasaur_Ch6 + channel 8, Cry_Bulbasaur_Ch8 Cry_Spearow: - musicheader 3, 5, Cry_Spearow_Ch5 - musicheader 1, 6, Cry_Spearow_Ch6 - musicheader 1, 8, Cry_Spearow_Ch8 + channel_count 3 + channel 5, Cry_Spearow_Ch5 + channel 6, Cry_Spearow_Ch6 + channel 8, Cry_Spearow_Ch8 Cry_Rhydon: - musicheader 3, 5, Cry_Rhydon_Ch5 - musicheader 1, 6, Cry_Rhydon_Ch6 - musicheader 1, 8, Cry_Rhydon_Ch8 + channel_count 3 + channel 5, Cry_Rhydon_Ch5 + channel 6, Cry_Rhydon_Ch6 + channel 8, Cry_Rhydon_Ch8 Cry_Golem: - musicheader 3, 5, Cry_Golem_Ch5 - musicheader 1, 6, Cry_Golem_Ch6 - musicheader 1, 8, Cry_Golem_Ch8 + channel_count 3 + channel 5, Cry_Golem_Ch5 + channel 6, Cry_Golem_Ch6 + channel 8, Cry_Golem_Ch8 Cry_Blastoise: - musicheader 3, 5, Cry_Blastoise_Ch5 - musicheader 1, 6, Cry_Blastoise_Ch6 - musicheader 1, 8, Cry_Blastoise_Ch8 + channel_count 3 + channel 5, Cry_Blastoise_Ch5 + channel 6, Cry_Blastoise_Ch6 + channel 8, Cry_Blastoise_Ch8 Cry_Pidgeotto: - musicheader 3, 5, Cry_Pidgeotto_Ch5 - musicheader 1, 6, Cry_Pidgeotto_Ch6 - musicheader 1, 8, Cry_Pidgeotto_Ch8 + channel_count 3 + channel 5, Cry_Pidgeotto_Ch5 + channel 6, Cry_Pidgeotto_Ch6 + channel 8, Cry_Pidgeotto_Ch8 Cry_Weedle: - musicheader 3, 5, Cry_Weedle_Ch5 - musicheader 1, 6, Cry_Weedle_Ch6 - musicheader 1, 8, Cry_Weedle_Ch8 + channel_count 3 + channel 5, Cry_Weedle_Ch5 + channel 6, Cry_Weedle_Ch6 + channel 8, Cry_Weedle_Ch8 Cry_Caterpie: - musicheader 3, 5, Cry_Caterpie_Ch5 - musicheader 1, 6, Cry_Caterpie_Ch6 - musicheader 1, 8, Cry_Caterpie_Ch8 + channel_count 3 + channel 5, Cry_Caterpie_Ch5 + channel 6, Cry_Caterpie_Ch6 + channel 8, Cry_Caterpie_Ch8 Cry_Ekans: - musicheader 3, 5, Cry_Ekans_Ch5 - musicheader 1, 6, Cry_Ekans_Ch6 - musicheader 1, 8, Cry_Ekans_Ch8 + channel_count 3 + channel 5, Cry_Ekans_Ch5 + channel 6, Cry_Ekans_Ch6 + channel 8, Cry_Ekans_Ch8 Cry_Fearow: - musicheader 3, 5, Cry_Fearow_Ch5 - musicheader 1, 6, Cry_Fearow_Ch6 - musicheader 1, 8, Cry_Fearow_Ch8 + channel_count 3 + channel 5, Cry_Fearow_Ch5 + channel 6, Cry_Fearow_Ch6 + channel 8, Cry_Fearow_Ch8 Cry_Clefairy: - musicheader 3, 5, Cry_Clefairy_Ch5 - musicheader 1, 6, Cry_Clefairy_Ch6 - musicheader 1, 8, Cry_Clefairy_Ch8 + channel_count 3 + channel 5, Cry_Clefairy_Ch5 + channel 6, Cry_Clefairy_Ch6 + channel 8, Cry_Clefairy_Ch8 Cry_Venonat: - musicheader 3, 5, Cry_Venonat_Ch5 - musicheader 1, 6, Cry_Venonat_Ch6 - musicheader 1, 8, Cry_Venonat_Ch8 + channel_count 3 + channel 5, Cry_Venonat_Ch5 + channel 6, Cry_Venonat_Ch6 + channel 8, Cry_Venonat_Ch8 Cry_Lapras: - musicheader 3, 5, Cry_Lapras_Ch5 - musicheader 1, 6, Cry_Lapras_Ch6 - musicheader 1, 8, Cry_Lapras_Ch8 + channel_count 3 + channel 5, Cry_Lapras_Ch5 + channel 6, Cry_Lapras_Ch6 + channel 8, Cry_Lapras_Ch8 Cry_Metapod: - musicheader 3, 5, Cry_Metapod_Ch5 - musicheader 1, 6, Cry_Metapod_Ch6 - musicheader 1, 8, Cry_Metapod_Ch8 + channel_count 3 + channel 5, Cry_Metapod_Ch5 + channel 6, Cry_Metapod_Ch6 + channel 8, Cry_Metapod_Ch8 Cry_Squirtle: - musicheader 3, 5, Cry_Squirtle_Ch5 - musicheader 1, 6, Cry_Squirtle_Ch6 - musicheader 1, 8, Cry_Squirtle_Ch8 + channel_count 3 + channel 5, Cry_Squirtle_Ch5 + channel 6, Cry_Squirtle_Ch6 + channel 8, Cry_Squirtle_Ch8 Cry_Paras: - musicheader 3, 5, Cry_Paras_Ch5 - musicheader 1, 6, Cry_Paras_Ch6 - musicheader 1, 8, Cry_Paras_Ch8 + channel_count 3 + channel 5, Cry_Paras_Ch5 + channel 6, Cry_Paras_Ch6 + channel 8, Cry_Paras_Ch8 Cry_Growlithe: - musicheader 3, 5, Cry_Growlithe_Ch5 - musicheader 1, 6, Cry_Growlithe_Ch6 - musicheader 1, 8, Cry_Growlithe_Ch8 + channel_count 3 + channel 5, Cry_Growlithe_Ch5 + channel 6, Cry_Growlithe_Ch6 + channel 8, Cry_Growlithe_Ch8 Cry_Krabby: - musicheader 3, 5, Cry_Krabby_Ch5 - musicheader 1, 6, Cry_Krabby_Ch6 - musicheader 1, 8, Cry_Krabby_Ch8 + channel_count 3 + channel 5, Cry_Krabby_Ch5 + channel 6, Cry_Krabby_Ch6 + channel 8, Cry_Krabby_Ch8 Cry_Psyduck: - musicheader 3, 5, Cry_Psyduck_Ch5 - musicheader 1, 6, Cry_Psyduck_Ch6 - musicheader 1, 8, Cry_Psyduck_Ch8 + channel_count 3 + channel 5, Cry_Psyduck_Ch5 + channel 6, Cry_Psyduck_Ch6 + channel 8, Cry_Psyduck_Ch8 Cry_Rattata: - musicheader 3, 5, Cry_Rattata_Ch5 - musicheader 1, 6, Cry_Rattata_Ch6 - musicheader 1, 8, Cry_Rattata_Ch8 + channel_count 3 + channel 5, Cry_Rattata_Ch5 + channel 6, Cry_Rattata_Ch6 + channel 8, Cry_Rattata_Ch8 Cry_Vileplume: - musicheader 3, 5, Cry_Vileplume_Ch5 - musicheader 1, 6, Cry_Vileplume_Ch6 - musicheader 1, 8, Cry_Vileplume_Ch8 + channel_count 3 + channel 5, Cry_Vileplume_Ch5 + channel 6, Cry_Vileplume_Ch6 + channel 8, Cry_Vileplume_Ch8 Cry_Vulpix: - musicheader 3, 5, Cry_Vulpix_Ch5 - musicheader 1, 6, Cry_Vulpix_Ch6 - musicheader 1, 8, Cry_Vulpix_Ch8 + channel_count 3 + channel 5, Cry_Vulpix_Ch5 + channel 6, Cry_Vulpix_Ch6 + channel 8, Cry_Vulpix_Ch8 Cry_Weepinbell: - musicheader 3, 5, Cry_Weepinbell_Ch5 - musicheader 1, 6, Cry_Weepinbell_Ch6 - musicheader 1, 8, Cry_Weepinbell_Ch8 + channel_count 3 + channel 5, Cry_Weepinbell_Ch5 + channel 6, Cry_Weepinbell_Ch6 + channel 8, Cry_Weepinbell_Ch8 -Unused_Cry_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $e0, $0780 - sound __, 16, $f0, $0784 - sound __, 16, $c3, $05e0 - sound __, 16, $c4, $0600 - sound __, 11, $6c, $0780 - sound __, 9, $71, $0784 - endchannel +Cry_Unused_Ch5: ; unreferenced + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -Unused_Cry_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 16, $a0, $0741 - sound __, 16, $b0, $0743 - sound __, 16, $93, $05b1 - sound __, 16, $94, $05c1 - sound __, 11, $4c, $0741 - sound __, 9, $31, $0746 - endchannel +Cry_Unused_Ch6: ; unreferenced + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -Unused_Cry_Ch8: - noise __, 3, $f2, $4c - noise __, 7, $e0, $3a - noise __, 16, $d0, $3a - noise __, 9, $d0, $2c - noise __, 7, $e6, $4c - noise __, 13, $7d, $4c - noise __, 16, $d3, $4c - endchannel +Cry_Unused_Ch8: ; unreferenced + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret Cry_Raichu_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f7, $07a0 - sound __, 7, $e6, $07a3 - sound __, 11, $f4, $07a0 - sound_duty 1, 1, 2, 2 - sound __, 11, $f6, $07d8 - sound __, 5, $e3, $07d7 - sound __, 16, $f2, $07d8 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret Cry_Raichu_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 3, $8, 0 - sound __, 16, $a7, $06a1 - sound __, 7, $86, $06a2 - sound __, 11, $74, $06a1 - sound_duty 3, 3, 1, 1 - sound __, 11, $76, $06d6 - sound __, 5, $83, $06d9 - sound __, 16, $a2, $06d7 - endchannel + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret Cry_Raichu_Ch8: - noise __, 3, $f2, $3c - noise __, 9, $e4, $3e - noise __, 16, $d7, $3c - noise __, 7, $c5, $3b - noise __, 7, $e4, $3d - noise __, 9, $b6, $3c - noise __, 7, $d4, $3d - noise __, 9, $c1, $3b - endchannel + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret Cry_Vileplume_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f7, $07c0 - sound __, 7, $e4, $07c1 - sound __, 11, $f6, $07c0 - sound __, 5, $d3, $07c2 - sound __, 9, $c1, $07c0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret Cry_Vileplume_Ch6: - sound_duty 3, 3, 1, 1 - sound __, 16, $97, $0781 - sound __, 7, $84, $0780 - sound __, 11, $96, $0781 - sound __, 16, $83, $0781 - endchannel + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret Cry_Vileplume_Ch8: - noise __, 4, $f2, $3c - noise __, 14, $e6, $2c - noise __, 16, $d7, $3c - noise __, 9, $c1, $2c - endchannel + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret Cry_Vulpix_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f7, $0680 - sound __, 11, $e6, $0684 - sound __, 16, $d7, $0690 - sound __, 9, $d5, $0690 - sound __, 7, $c4, $0688 - sound __, 6, $d3, $0670 - sound __, 5, $d3, $0660 - sound __, 9, $c1, $0640 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret Cry_Vulpix_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 16, $b7, $0641 - sound __, 11, $96, $0642 - sound __, 16, $a7, $0651 - sound __, 9, $a5, $0651 - sound __, 7, $94, $0647 - sound __, 6, $a3, $0631 - sound __, 5, $93, $0622 - sound __, 9, $71, $0601 - endchannel + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret Cry_Vulpix_Ch8: - noise __, 16, $e4, $3c - noise __, 11, $c7, $4c - noise __, 11, $c7, $3c - noise __, 13, $b7, $4c - noise __, 16, $a2, $5c - endchannel + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret Cry_Rhydon_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f7, $07a0 - sound __, 9, $e6, $07a4 - sound __, 5, $d6, $07a0 - sound __, 16, $d3, $0720 - sound __, 9, $c3, $0723 - sound __, 3, $c2, $0728 - sound __, 9, $b1, $0730 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret Cry_Rhydon_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 5, $8, 0 - sound __, 7, $a7, $0741 - sound __, 9, $86, $0743 - sound __, 5, $76, $0741 - sound __, 14, $83, $06c2 - sound __, 8, $73, $06c1 - sound __, 4, $82, $06cc - sound __, 9, $71, $06d8 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret Cry_Rhydon_Ch8: - noise __, 3, $f2, $4c - noise __, 7, $e6, $3a - noise __, 5, $d7, $3a - noise __, 7, $d6, $2c - noise __, 9, $e5, $3c - noise __, 13, $d2, $3d - noise __, 9, $d1, $2c - endchannel + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret Cry_Weepinbell_Ch5: - sound_duty 1, 1, 2, 2 - sound __, 7, $f4, $0740 - sound __, 16, $e3, $0730 - sound __, 5, $f4, $0740 - sound __, 6, $b3, $0748 - sound __, 9, $d1, $0750 - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret Cry_Weepinbell_Ch6: - sound_duty 3, 1, 3, 1 - sound __, 7, $c3, $0712 - sound __, 16, $b3, $0704 - sound __, 4, $c3, $0712 - sound __, 5, $c3, $0721 - sound __, 9, $b1, $0732 - endchannel + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret Cry_Weepinbell_Ch8: - noise __, 9, $d6, $2c - noise __, 13, $c6, $3c - noise __, 11, $b6, $2c - noise __, 9, $91, $1c - endchannel + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret Cry_Kangaskhan_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f7, $0608 - sound __, 7, $e6, $0600 - sound __, 7, $d7, $05f0 - sound __, 7, $c4, $05e0 - sound __, 6, $d3, $05c0 - sound __, 5, $d3, $05a0 - sound __, 9, $e1, $0580 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret Cry_Kangaskhan_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 5, $c7, $0504 - sound __, 7, $a6, $0502 - sound __, 7, $97, $04f1 - sound __, 5, $b4, $04e1 - sound __, 6, $a3, $04c2 - sound __, 5, $b3, $04a3 - sound __, 9, $c1, $0482 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret Cry_Kangaskhan_Ch8: - noise __, 13, $e4, $4c - noise __, 11, $c7, $5c - noise __, 13, $b6, $4c - noise __, 16, $a2, $5c - endchannel + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret Cry_Bulbasaur_Ch5: - sound_duty 1, 0, 3, 3 - sound __, 5, $f7, $07c0 - sound __, 13, $e6, $07c2 - sound __, 7, $b5, $0680 - sound __, 5, $c4, $0670 - sound __, 5, $b5, $0660 - sound __, 9, $c1, $0640 - endchannel + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret Cry_Bulbasaur_Ch6: - sound_duty 0, 3, 0, 3 - sound __, 4, $c7, $0781 - sound __, 13, $b6, $0780 - sound __, 7, $a5, $0641 - sound __, 5, $c4, $0632 - sound __, 7, $b5, $0621 - sound __, 9, $a1, $0602 - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret Cry_Bulbasaur_Ch8: - noise __, 4, $e4, $3c - noise __, 13, $d6, $2c - noise __, 5, $e4, $3c - noise __, 9, $b7, $5c - noise __, 16, $c2, $5d - endchannel + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret Cry_Spearow_Ch5: - sound_duty 1, 2, 0, 3 - sound __, 9, $f7, $0680 - sound __, 3, $f7, $0660 - sound __, 2, $e7, $0640 - sound __, 2, $e7, $0620 - sound __, 16, $d1, $0600 - sound __, 5, $c7, $0740 - sound __, 5, $a7, $0730 - sound __, 16, $91, $0720 - endchannel + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret Cry_Spearow_Ch6: - sound_duty 1, 2, 3, 1 - sound __, 11, $e7, $0682 - sound __, 3, $e7, $0662 - sound __, 2, $d7, $0642 - sound __, 2, $d7, $0622 - sound __, 16, $c1, $0602 - sound __, 5, $b7, $0742 - sound __, 3, $97, $0732 - sound __, 16, $81, $0722 - endchannel + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret Cry_Spearow_Ch8: - noise __, 5, $74, $21 - noise __, 5, $74, $10 - noise __, 5, $71, $20 - endchannel + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret Cry_Nidoran_M_Ch5: - sound_duty 1, 1, 3, 3 - sound __, 5, $f3, $0718 - sound __, 16, $e5, $0798 - sound __, 9, $91, $0758 - endchannel + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret Cry_Nidoran_M_Ch6: - sound_duty 0, 0, 2, 2 - sound __, 6, $b3, $0708 - sound __, 16, $c5, $0788 - sound __, 9, $71, $0748 - endchannel + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret Cry_Nidoran_M_Ch8: - noise __, 4, $a1, $1c - noise __, 15, $94, $2c - noise __, 9, $81, $1c - endchannel + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret Cry_Pidgey_Ch5: - sound_duty 1, 1, 2, 2 - sound __, 5, $e1, $0700 - sound __, 5, $f2, $0780 - sound __, 3, $92, $0740 - sound __, 9, $e1, $0600 - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret Cry_Pidgey_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 5, $b1, $06e1 - sound __, 4, $c2, $06e1 - sound __, 4, $62, $0681 - sound __, 9, $b1, $05e1 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret Cry_Pidgey_Ch8: - noise __, 3, $61, $32 - noise __, 3, $61, $21 - noise __, 9, $61, $11 - endchannel + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret Cry_Voltorb_Ch5: - sound_duty 2, 2, 3, 3 - sound __, 7, $83, $0247 - sound __, 16, $62, $0226 - sound __, 5, $52, $0245 - sound __, 10, $63, $0206 - sound __, 16, $82, $0225 - sound __, 16, $42, $0207 + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 Cry_Voltorb_Ch6: - endchannel + sound_ret Cry_Voltorb_Ch8: - noise __, 9, $d4, $8c - noise __, 5, $e2, $9c - noise __, 16, $c6, $8c - noise __, 9, $e4, $ac - noise __, 16, $d7, $9c - noise __, 16, $f2, $ac - endchannel + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret Cry_Muk_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f3, $06e0 - sound __, 16, $e4, $0640 - sound __, 9, $c1, $0620 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret Cry_Muk_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 4, $c3, $0683 - sound __, 15, $b4, $0602 - sound __, 9, $a1, $0601 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret Cry_Muk_Ch8: - noise __, 5, $d3, $5c - noise __, 16, $e6, $4c - noise __, 9, $b1, $5c - endchannel + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret Cry_Grimer_Ch5: - sound_duty 2, 2, 0, 0 - sound __, 7, $e2, $0500 - sound __, 7, $e3, $0580 - sound __, 7, $d3, $0570 - sound __, 9, $a1, $0560 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret Cry_Grimer_Ch6: - sound_duty 1, 1, 3, 3 - sound __, 7, $e2, $0482 - sound __, 7, $d3, $0501 - sound __, 7, $b2, $04e2 - sound __, 9, $81, $04c1 + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 Cry_Grimer_Ch8: - endchannel + sound_ret Cry_Diglett_Ch5: - sound_duty 0, 3, 0, 3 - sound __, 5, $f1, $0700 - sound __, 5, $e1, $0780 - sound __, 5, $d1, $0740 - sound __, 5, $e1, $0740 - sound __, 5, $f1, $0780 - sound __, 5, $d1, $0700 - sound __, 5, $f1, $0701 - sound __, 5, $d1, $0782 - sound __, 5, $c1, $0742 - sound __, 9, $b1, $0741 - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret Cry_Diglett_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 13, $8, 0 - sound __, 5, $f1, $0701 - sound __, 5, $e1, $0782 - sound __, 5, $d1, $0741 - sound __, 5, $e1, $0741 - sound __, 5, $f1, $0782 - sound __, 9, $d1, $0701 - endchannel + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret Cry_Diglett_Ch8: - noise __, 16, $8, $0 - noise __, 5, $8, $0 - noise __, 5, $d1, $4c - noise __, 5, $b1, $2c - noise __, 5, $d1, $3c - noise __, 5, $b1, $3c - noise __, 5, $c1, $2c - noise __, 9, $a1, $4c - endchannel + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret Cry_Seel_Ch5: - sound_duty 0, 3, 0, 3 - sound __, 9, $f5, $0600 - sound __, 3, $d2, $0638 - sound __, 3, $c2, $0630 - sound __, 3, $c2, $0628 - sound __, 3, $b2, $0620 - sound __, 3, $b2, $0610 - sound __, 3, $a2, $0618 - sound __, 3, $b2, $0610 - sound __, 9, $c1, $0620 - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret Cry_Seel_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 13, $c3, $05c0 - sound __, 4, $b1, $05f9 - sound __, 3, $a1, $05f1 - sound __, 3, $a1, $05e9 - sound __, 3, $91, $05e1 - sound __, 3, $91, $05d9 - sound __, 3, $81, $05d1 - sound __, 3, $91, $05d9 - sound __, 9, $91, $05e1 + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 Cry_Seel_Ch8: - endchannel + sound_ret Cry_Slowpoke_Ch5: - sound_duty 0, 0, 0, 0 - sound __, 9, $f5, $0480 - sound __, 3, $e1, $05e0 - sound __, 9, $d1, $05dc - endchannel + duty_cycle_pattern 0, 0, 0, 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret Cry_Slowpoke_Ch6: - sound_duty 1, 1, 2, 2 - sound __, 8, $95, $0441 - sound __, 3, $81, $0521 - sound __, 9, $61, $051a + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 Cry_Slowpoke_Ch8: - endchannel + sound_ret Cry_Drowzee_Ch5: - sound_duty 0, 2, 0, 2 - sound __, 6, $f2, $0650 - sound __, 10, $d1, $0660 - sound __, 6, $e2, $0612 - sound __, 10, $c1, $0622 - sound __, 6, $f2, $0610 - sound __, 7, $d1, $0620 - loopchannel 2, Cry_Drowzee_Ch5 - endchannel + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, Cry_Drowzee_Ch5 + sound_ret Cry_Drowzee_Ch6: - sound_duty 0, 0, 0, 1 - sound __, 5, $8, 0 - sound __, 6, $f2, $0651 - sound __, 10, $d1, $0661 - sound __, 6, $e2, $0614 - sound __, 9, $c1, $0624 - sound __, 6, $f2, $0611 - sound __, 13, $d1, $0621 - sound __, 6, $e2, $0614 - sound __, 9, $c1, $0624 - sound __, 6, $f2, $0611 - sound __, 5, $d1, $0621 - endchannel + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret Cry_Drowzee_Ch8: - noise __, 7, $d2, $1c - noise __, 10, $b1, $2c - noise __, 9, $c2, $2c - noise __, 10, $b1, $3c - noise __, 7, $c2, $2c - noise __, 10, $a2, $3c - noise __, 8, $c2, $2c - noise __, 6, $a1, $3c - noise __, 10, $c2, $2c - noise __, 5, $a1, $3c - endchannel + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret Cry_Nidoran_F_Ch5: - sound_duty 0, 0, 2, 2 - sound __, 5, $f3, $0600 - sound __, 9, $d5, $0760 - sound __, 4, $e2, $0720 - sound __, 9, $d1, $0710 - endchannel + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret Cry_Nidoran_F_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 6, $b3, $06f1 - sound __, 8, $c5, $0752 - sound __, 4, $a2, $0711 - sound __, 9, $b1, $0601 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret Cry_Nidoran_F_Ch8: - noise __, 4, $a2, $3c - noise __, 13, $94, $2c - noise __, 4, $82, $1c - noise __, 9, $71, $2c - endchannel + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret Cry_Nidoqueen_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 9, $f7, $06e0 - sound __, 7, $e6, $06e5 - sound __, 4, $f4, $06e0 - sound __, 4, $f6, $06d0 - sound __, 4, $e3, $06c0 - sound __, 5, $f2, $06b0 - sound __, 16, $a2, $06c8 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret Cry_Nidoqueen_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 4, $8, 0 - sound __, 9, $a7, $06a1 - sound __, 7, $86, $06a3 - sound __, 4, $74, $06a1 - sound __, 4, $76, $0691 - sound __, 4, $83, $0682 - sound __, 5, $a2, $0671 - sound __, 16, $72, $0689 - endchannel + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret Cry_Nidoqueen_Ch8: - noise __, 3, $f2, $3c - noise __, 9, $e4, $3e - noise __, 9, $d7, $3c - noise __, 6, $c5, $3b - noise __, 4, $d4, $2c - noise __, 3, $b6, $3c - noise __, 4, $a4, $2c - noise __, 9, $91, $3c - endchannel + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret Cry_Oddish_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f6, $0565 - sound __, 11, $e4, $057c - sound __, 4, $c2, $055c - sound __, 16, $b2, $053c - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret Cry_Oddish_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 15, $d6, $0503 - sound __, 10, $b4, $051b - sound __, 5, $92, $04fa - sound __, 16, $a2, $04db - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret Cry_Oddish_Ch8: - noise __, 13, $e6, $4c - noise __, 12, $d7, $5c - noise __, 16, $c2, $4c - endchannel + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret Cry_Charmander_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f7, $06a0 - sound __, 9, $e6, $06a4 - sound __, 5, $d6, $06a0 - sound __, 13, $d3, $0620 - sound __, 9, $c3, $0624 - sound __, 5, $c2, $0620 - sound __, 9, $b1, $0610 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret Cry_Charmander_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 5, $e7, $0601 - sound __, 9, $d6, $0603 - sound __, 5, $c6, $0601 - sound __, 13, $c3, $0581 - sound __, 9, $b3, $0583 - sound __, 5, $b2, $0582 - sound __, 9, $a1, $0571 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret Cry_Charmander_Ch8: - noise __, 8, $d6, $5c - noise __, 9, $e6, $4c - noise __, 5, $d4, $5c - noise __, 5, $d4, $4c - noise __, 8, $c3, $4c - noise __, 9, $a1, $5c - endchannel + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret Cry_Clefairy_Ch5: - sound_duty 3, 2, 1, 0 - sound __, 8, $d2, $0740 - sound __, 16, $e5, $0760 - sound C_, 9, $c1, $0730 - endchannel + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 24, 12, 1, 1840 + sound_ret Cry_Clefairy_Ch6: - sound_duty 1, 0, 0, 2 - sound __, 3, $c2, $0701 - sound __, 5, $c2, $0708 - sound __, 16, $d7, $0741 - sound C_, 9, $a2, $0701 + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 24, 10, 2, 1793 Cry_Clefairy_Ch8: - endchannel + sound_ret Cry_Caterpie_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $d7, $0780 - sound __, 5, $e6, $07a0 - sound __, 16, $d2, $0740 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret Cry_Caterpie_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 16, $c7, $0753 - sound __, 6, $b6, $0772 - sound __, 16, $c2, $0711 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret Cry_Caterpie_Ch8: - noise __, 14, $f6, $4c - noise __, 5, $e6, $3c - noise __, 16, $f2, $4c - endchannel + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret Cry_Lapras_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f7, $06c0 - sound __, 16, $e7, $0700 - sound __, 5, $f4, $06f0 - sound __, 5, $e4, $06e0 - sound __, 9, $d1, $06d0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret Cry_Lapras_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 8, $e6, $0681 - sound __, 15, $d5, $06c1 - sound __, 5, $c4, $06b1 - sound __, 5, $d4, $06a1 - sound __, 9, $c1, $0691 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret Cry_Lapras_Ch8: - noise __, 11, $a6, $3c - noise __, 15, $94, $2c - noise __, 6, $a3, $3c - noise __, 9, $91, $2c - endchannel + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret Cry_Golem_Ch5: - sound_duty 1, 1, 2, 2 - sound __, 13, $f2, $0440 - sound __, 16, $e3, $04a0 - sound __, 5, $d2, $0490 - sound __, 9, $d1, $0480 - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret Cry_Golem_Ch6: - sound_duty 2, 3, 2, 3 - sound __, 12, $d2, $0438 - sound __, 15, $c6, $0498 - sound __, 4, $b2, $0488 - sound __, 9, $b1, $0478 - endchannel + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret Cry_Golem_Ch8: - noise __, 11, $e6, $6c - noise __, 16, $d2, $5c - noise __, 4, $c2, $6c - noise __, 9, $d1, $5c - endchannel + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret Cry_Blastoise_Ch5: - sound_duty 3, 0, 3, 0 - sound __, 16, $f6, $05c0 - sound __, 9, $e3, $05bc - sound __, 7, $d2, $05d0 - sound __, 7, $b2, $05e0 - sound __, 7, $c2, $05f0 - sound __, 9, $b1, $0600 - endchannel + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret Cry_Blastoise_Ch6: - sound_duty 1, 2, 1, 2 - sound __, 15, $c6, $04b1 - sound __, 8, $c3, $04ad - sound __, 6, $b2, $04c1 - sound __, 9, $92, $04d1 - sound __, 7, $a2, $04e1 - sound __, 9, $91, $04f1 - endchannel + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret Cry_Blastoise_Ch8: - noise __, 11, $e6, $5c - noise __, 11, $d6, $6c - noise __, 5, $c2, $4c - noise __, 7, $d3, $5c - noise __, 9, $b3, $4c - noise __, 9, $a1, $5c - endchannel + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret Cry_Pidgeotto_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 9, $e4, $0790 - sound __, 16, $f5, $07c0 - sound __, 9, $d1, $07d8 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret Cry_Pidgeotto_Ch6: - sound_duty 1, 1, 2, 2 - sound __, 11, $c4, $0771 - sound __, 16, $b6, $07a2 - sound __, 9, $a1, $07b7 - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret Cry_Pidgeotto_Ch8: - noise __, 9, $e4, $4c - noise __, 15, $c4, $3c - noise __, 9, $d1, $2c - endchannel + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret Cry_Paras_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f2, $0600 - sound __, 7, $e2, $0640 - sound __, 7, $d2, $0680 - sound __, 7, $e2, $06c0 - sound __, 7, $d2, $0700 - sound __, 7, $c2, $0740 - sound __, 7, $b2, $0780 - sound __, 9, $a1, $07c0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret Cry_Paras_Ch6: - sound_duty 1, 0, 1, 0 - sound __, 4, $8, $0001 - sound __, 7, $c2, $05c1 - sound __, 7, $b2, $0602 - sound __, 7, $a2, $0641 - sound __, 7, $b2, $0682 - sound __, 7, $a2, $06c2 - sound __, 7, $92, $0701 - sound __, 7, $a2, $0742 - sound __, 9, $81, $0781 - endchannel + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret Cry_Paras_Ch8: - noise __, 7, $8, $1 - noise __, 6, $e2, $5c - noise __, 6, $c2, $4c - noise __, 6, $d2, $3c - noise __, 6, $b2, $2c - noise __, 6, $c2, $1c - noise __, 6, $a2, $1b - noise __, 6, $92, $1a - noise __, 9, $81, $18 - endchannel + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret Cry_Weedle_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f3, $0780 - sound __, 16, $e7, $0700 - sound __, 9, $d3, $0710 - sound __, 5, $c2, $0700 - sound __, 5, $d2, $06f0 - sound __, 9, $c1, $06e0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret Cry_Weedle_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 7, $c3, $0701 - sound __, 15, $b7, $0681 - sound __, 8, $b3, $0692 - sound __, 4, $a2, $0681 - sound __, 5, $b2, $0672 - sound __, 9, $a1, $0661 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret Cry_Weedle_Ch8: - noise __, 7, $e3, $5c - noise __, 15, $d6, $4c - noise __, 7, $c6, $3c - noise __, 4, $b3, $4c - noise __, 4, $a2, $5c - noise __, 9, $b1, $6c - endchannel + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret Cry_Ekans_Ch5: - sound_duty 3, 3, 0, 0 - sound __, 16, $f7, $0500 - sound __, 16, $e7, $0508 - sound __, 9, $b4, $0480 - sound __, 16, $a2, $0460 - endchannel + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret Cry_Ekans_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 15, $d7, $0481 - sound __, 15, $c7, $0489 - sound __, 11, $b4, $0401 - sound __, 16, $c2, $03e1 - endchannel + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret Cry_Ekans_Ch8: - noise __, 15, $f7, $7c - noise __, 13, $f6, $6c - noise __, 10, $e4, $7c - noise __, 16, $e2, $6c - endchannel + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret Cry_Metapod_Ch5: - sound_duty 1, 1, 3, 3 - sound __, 8, $d6, $07e1 - sound __, 7, $c6, $07e2 - sound __, 10, $d6, $07e1 - sound __, 8, $c6, $07e0 - sound __, 6, $b6, $07e2 - sound __, 8, $c6, $07e1 - sound __, 7, $b6, $07e0 - sound __, 9, $a1, $07df - endchannel + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret Cry_Metapod_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 7, $c3, $07c9 - sound __, 7, $b3, $07c7 - sound __, 11, $c4, $07c3 - sound __, 9, $b4, $07c7 - sound __, 7, $c3, $07c9 - sound __, 16, $a2, $07c5 - endchannel + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret Cry_Metapod_Ch8: - noise __, 14, $19, $7c - noise __, 14, $f7, $8c - noise __, 13, $d6, $7c - noise __, 9, $c4, $6c - noise __, 16, $b3, $5c - endchannel + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret Cry_Venonat_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f7, $0740 - sound __, 13, $e6, $0744 - sound __, 7, $d5, $0750 - sound __, 5, $c3, $0760 - sound __, 4, $c3, $0780 - sound __, 9, $d1, $07a0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret Cry_Venonat_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 7, $c7, $0701 - sound __, 12, $b6, $0702 - sound __, 7, $a5, $0711 - sound __, 5, $93, $0721 - sound __, 4, $a3, $0741 - sound __, 9, $91, $0762 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret Cry_Venonat_Ch8: - noise __, 4, $e2, $3c - noise __, 9, $d6, $4c - noise __, 6, $d4, $3c - noise __, 13, $c7, $4c - noise __, 3, $e2, $3c - noise __, 9, $d1, $2c - endchannel + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret Cry_Squirtle_Ch5: - sound_duty 0, 1, 3, 3 - sound __, 16, $f0, $0705 - sound __, 11, $e0, $0700 - sound __, 7, $b4, $0710 - sound __, 5, $d3, $0700 - sound __, 7, $b2, $0620 - sound __, 9, $a1, $0624 - endchannel + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret Cry_Squirtle_Ch6: - sound_duty 2, 0, 2, 0 - sound __, 16, $b0, $06c3 - sound __, 11, $a0, $06c1 - sound __, 7, $84, $06d2 - sound __, 5, $93, $06c1 - sound __, 7, $82, $05e1 - sound __, 9, $61, $05e8 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret Cry_Squirtle_Ch8: - noise __, 7, $e6, $4c - noise __, 16, $d6, $3c - noise __, 11, $c5, $4a - noise __, 2, $b2, $5b - noise __, 16, $c2, $4c - endchannel + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret Cry_Fearow_Ch5: - sound_duty 0, 0, 1, 1 - sound __, 11, $f5, $0680 - sound __, 4, $e2, $06a0 - sound __, 4, $f2, $06c0 - sound __, 4, $e2, $06e0 - sound __, 4, $d2, $0700 - sound __, 4, $c2, $06e0 - sound __, 4, $d2, $06c0 - sound __, 9, $c1, $06a0 - endchannel + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret Cry_Fearow_Ch6: - sound_duty 3, 3, 0, 0 - sound __, 10, $d5, $0631 - sound __, 4, $d2, $0652 - sound __, 4, $e2, $0671 - sound __, 4, $b2, $0691 - sound __, 4, $c2, $06b2 - sound __, 4, $b2, $0691 - sound __, 4, $c2, $0671 - sound __, 9, $b1, $0651 - endchannel + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret Cry_Fearow_Ch8: - noise __, 7, $e3, $4c - noise __, 5, $c3, $3c - noise __, 6, $d4, $3c - noise __, 5, $c4, $2c - noise __, 7, $b4, $3c - noise __, 9, $c1, $2c - endchannel + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret Cry_Growlithe_Ch5: - sound_duty 1, 1, 2, 2 - sound __, 4, $f4, $0641 - sound __, 14, $d6, $0721 - sound __, 9, $f4, $0719 - sound __, 9, $c1, $071a - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret Cry_Growlithe_Ch6: - sound_duty 0, 3, 0, 3 - sound __, 5, $f4, $0580 - sound __, 15, $e6, $06e0 - sound __, 9, $d5, $06d8 - sound __, 9, $d1, $06dc - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret Cry_Growlithe_Ch8: - noise __, 6, $c4, $46 - noise __, 14, $a5, $44 - noise __, 9, $c4, $45 - noise __, 9, $b1, $44 - endchannel + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret Cry_Krabby_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 14, $f1, $0511 - sound __, 14, $e1, $0515 - sound __, 14, $e1, $0511 - sound __, 9, $d1, $0511 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret Cry_Krabby_Ch6: - sound_duty 1, 1, 1, 0 - sound __, 13, $e1, $050c - sound __, 13, $d1, $0510 - sound __, 15, $c1, $050c - sound __, 9, $c1, $050a - endchannel + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret Cry_Krabby_Ch8: - noise __, 15, $f2, $65 - noise __, 14, $e2, $55 - noise __, 15, $d2, $56 - noise __, 9, $d1, $66 - endchannel + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret Cry_Psyduck_Ch5: - sound_duty 3, 2, 1, 0 - sound __, 4, $f3, $0564 - sound __, 3, $e2, $0544 - sound __, 6, $d1, $0522 - sound __, 3, $b2, $0484 - sound __, 9, $d1, $04a2 - sound __, 4, $f3, $0524 - sound __, 5, $e4, $04e4 - sound __, 9, $d1, $0502 - endchannel + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret Cry_Psyduck_Ch6: - sound_duty 0, 3, 0, 3 - sound __, 4, $d3, $0560 - sound __, 3, $c2, $0540 - sound __, 6, $c1, $0520 - sound __, 3, $92, $0480 - sound __, 9, $c1, $04a0 - sound __, 4, $d3, $0520 - sound __, 4, $c4, $04e0 - sound __, 9, $c1, $0500 + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 Cry_Psyduck_Ch8: - endchannel + sound_ret Cry_Rattata_Ch5: - sound_duty 1, 0, 1, 0 - sound __, 3, $3d, $0381 - sound __, 8, $f5, $0601 - sound __, 2, $c2, $0481 - sound __, 9, $91, $0381 - endchannel + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret Cry_Rattata_Ch6: - sound_duty 2, 3, 2, 3 - sound __, 3, $3e, $05b0 - sound __, 8, $d5, $075d - sound __, 2, $b2, $06b0 - sound __, 9, $61, $05b0 - endchannel + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret Cry_Rattata_Ch8: - noise __, 3, $92, $49 - noise __, 8, $b5, $29 - noise __, 2, $a2, $39 - noise __, 9, $91, $49 - endchannel + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index a57eac98..e6255e04 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -5,258 +5,258 @@ ENDM PokemonCries:: ; entries correspond to constants/pokemon_constants.asm - mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR - mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR - mon_cry CRY_BULBASAUR, $000, $140 ; VENUSAUR - mon_cry CRY_CHARMANDER, $060, $0c0 ; CHARMANDER - mon_cry CRY_CHARMANDER, $020, $0c0 ; CHARMELEON - mon_cry CRY_CHARMANDER, $000, $100 ; CHARIZARD - mon_cry CRY_SQUIRTLE, $060, $0c0 ; SQUIRTLE - mon_cry CRY_SQUIRTLE, $020, $0c0 ; WARTORTLE - mon_cry CRY_BLASTOISE, $000, $100 ; BLASTOISE - mon_cry CRY_CATERPIE, $080, $0a0 ; CATERPIE - mon_cry CRY_METAPOD, $0cc, $081 ; METAPOD - mon_cry CRY_CATERPIE, $077, $0c0 ; BUTTERFREE - mon_cry CRY_WEEDLE, $0ee, $081 ; WEEDLE - mon_cry CRY_BLASTOISE, $0ff, $081 ; KAKUNA - mon_cry CRY_BLASTOISE, $060, $100 ; BEEDRILL - mon_cry CRY_PIDGEY, $0df, $084 ; PIDGEY - mon_cry CRY_PIDGEOTTO, $028, $140 ; PIDGEOTTO - mon_cry CRY_PIDGEOTTO, $011, $17f ; PIDGEOT - mon_cry CRY_RATTATA, $000, $100 ; RATTATA - mon_cry CRY_RATTATA, $020, $17f ; RATICATE - mon_cry CRY_SPEAROW, $000, $100 ; SPEAROW - mon_cry CRY_FEAROW, $040, $120 ; FEAROW - mon_cry CRY_EKANS, $012, $0c0 ; EKANS - mon_cry CRY_EKANS, $0e0, $090 ; ARBOK - mon_cry CRY_BULBASAUR, $0ee, $081 ; PIKACHU - mon_cry CRY_RAICHU, $0ee, $088 ; RAICHU - mon_cry CRY_NIDORAN_M, $020, $0c0 ; SANDSHREW - mon_cry CRY_NIDORAN_M, $0ff, $17f ; SANDSLASH - mon_cry CRY_NIDORAN_F, $000, $100 ; NIDORAN_F - mon_cry CRY_NIDORAN_F, $02c, $160 ; NIDORINA - mon_cry CRY_NIDOQUEEN, $000, $100 ; NIDOQUEEN - mon_cry CRY_NIDORAN_M, $000, $100 ; NIDORAN_M - mon_cry CRY_NIDORAN_M, $02c, $140 ; NIDORINO - mon_cry CRY_RAICHU, $000, $100 ; NIDOKING - mon_cry CRY_CLEFAIRY, $0cc, $081 ; CLEFAIRY - mon_cry CRY_CLEFAIRY, $0aa, $0a0 ; CLEFABLE - mon_cry CRY_VULPIX, $04f, $090 ; VULPIX - mon_cry CRY_VULPIX, $088, $0e0 ; NINETALES - mon_cry CRY_PIDGEY, $0ff, $0b5 ; JIGGLYPUFF - mon_cry CRY_PIDGEY, $068, $0e0 ; WIGGLYTUFF - mon_cry CRY_SQUIRTLE, $0e0, $100 ; ZUBAT - mon_cry CRY_SQUIRTLE, $0fa, $100 ; GOLBAT - mon_cry CRY_ODDISH, $0dd, $081 ; ODDISH - mon_cry CRY_ODDISH, $0aa, $0c0 ; GLOOM - mon_cry CRY_VILEPLUME, $022, $17f ; VILEPLUME - mon_cry CRY_PARAS, $020, $160 ; PARAS - mon_cry CRY_PARAS, $042, $17f ; PARASECT - mon_cry CRY_VENONAT, $044, $0c0 ; VENONAT - mon_cry CRY_VENONAT, $029, $100 ; VENOMOTH - mon_cry CRY_DIGLETT, $0aa, $081 ; DIGLETT - mon_cry CRY_DIGLETT, $02a, $090 ; DUGTRIO - mon_cry CRY_CLEFAIRY, $077, $090 ; MEOWTH - mon_cry CRY_CLEFAIRY, $099, $17f ; PERSIAN - mon_cry CRY_PSYDUCK, $020, $0e0 ; PSYDUCK - mon_cry CRY_PSYDUCK, $0ff, $0c0 ; GOLDUCK - mon_cry CRY_NIDOQUEEN, $0dd, $0e0 ; MANKEY - mon_cry CRY_NIDOQUEEN, $0af, $0c0 ; PRIMEAPE - mon_cry CRY_GROWLITHE, $020, $0c0 ; GROWLITHE - mon_cry CRY_WEEDLE, $000, $100 ; ARCANINE - mon_cry CRY_PIDGEY, $0ff, $17f ; POLIWAG - mon_cry CRY_PIDGEY, $077, $0e0 ; POLIWHIRL - mon_cry CRY_PIDGEY, $000, $17f ; POLIWRATH - mon_cry CRY_METAPOD, $0c0, $081 ; ABRA - mon_cry CRY_METAPOD, $0a8, $140 ; KADABRA - mon_cry CRY_METAPOD, $098, $17f ; ALAKAZAM - mon_cry CRY_GROWLITHE, $0ee, $081 ; MACHOP - mon_cry CRY_GROWLITHE, $048, $0e0 ; MACHOKE - mon_cry CRY_GROWLITHE, $008, $140 ; MACHAMP - mon_cry CRY_PSYDUCK, $055, $081 ; BELLSPROUT - mon_cry CRY_WEEPINBELL, $044, $0a0 ; WEEPINBELL - mon_cry CRY_WEEPINBELL, $066, $14c ; VICTREEBEL - mon_cry CRY_VENONAT, $000, $100 ; TENTACOOL - mon_cry CRY_VENONAT, $0ee, $17f ; TENTACRUEL - mon_cry CRY_VULPIX, $0f0, $090 ; GEODUDE - mon_cry CRY_VULPIX, $000, $100 ; GRAVELER - mon_cry CRY_GOLEM, $0e0, $0c0 ; GOLEM - mon_cry CRY_WEEPINBELL, $000, $100 ; PONYTA - mon_cry CRY_WEEPINBELL, $020, $140 ; RAPIDASH - mon_cry CRY_SLOWPOKE, $000, $100 ; SLOWPOKE - mon_cry CRY_GROWLITHE, $000, $100 ; SLOWBRO - mon_cry CRY_METAPOD, $080, $0e0 ; MAGNEMITE - mon_cry CRY_METAPOD, $020, $140 ; MAGNETON - mon_cry CRY_SPEAROW, $0dd, $081 ; FARFETCH_D - mon_cry CRY_DIGLETT, $0bb, $081 ; DODUO - mon_cry CRY_DIGLETT, $099, $0a0 ; DODRIO - mon_cry CRY_SEEL, $088, $140 ; SEEL - mon_cry CRY_SEEL, $023, $17f ; DEWGONG - mon_cry CRY_GRIMER, $000, $100 ; GRIMER - mon_cry CRY_MUK, $0ef, $17f ; MUK - mon_cry CRY_FEAROW, $000, $100 ; SHELLDER - mon_cry CRY_FEAROW, $06f, $160 ; CLOYSTER - mon_cry CRY_METAPOD, $000, $100 ; GASTLY - mon_cry CRY_METAPOD, $030, $0c0 ; HAUNTER - mon_cry CRY_MUK, $000, $17f ; GENGAR - mon_cry CRY_EKANS, $0ff, $140 ; ONIX - mon_cry CRY_DROWZEE, $088, $0a0 ; DROWZEE - mon_cry CRY_DROWZEE, $0ee, $0c0 ; HYPNO - mon_cry CRY_KRABBY, $020, $160 ; KRABBY - mon_cry CRY_KRABBY, $0ee, $160 ; KINGLER - mon_cry CRY_VOLTORB, $0ed, $100 ; VOLTORB - mon_cry CRY_VOLTORB, $0a8, $110 ; ELECTRODE - mon_cry CRY_DIGLETT, $000, $100 ; EXEGGCUTE - mon_cry CRY_DROWZEE, $000, $100 ; EXEGGUTOR - mon_cry CRY_CLEFAIRY, $000, $100 ; CUBONE - mon_cry CRY_ODDISH, $04f, $0e0 ; MAROWAK - mon_cry CRY_GOLEM, $080, $140 ; HITMONLEE - mon_cry CRY_SEEL, $0ee, $140 ; HITMONCHAN - mon_cry CRY_SEEL, $000, $100 ; LICKITUNG - mon_cry CRY_GOLEM, $0e6, $15d ; KOFFING - mon_cry CRY_GOLEM, $0ff, $17f ; WEEZING - mon_cry CRY_CHARMANDER, $000, $100 ; RHYHORN - mon_cry CRY_RHYDON, $000, $100 ; RHYDON - mon_cry CRY_PIDGEOTTO, $00a, $140 ; CHANSEY - mon_cry CRY_GOLEM, $000, $100 ; TANGELA - mon_cry CRY_KANGASKHAN, $000, $100 ; KANGASKHAN - mon_cry CRY_CLEFAIRY, $099, $090 ; HORSEA - mon_cry CRY_CLEFAIRY, $03c, $081 ; SEADRA - mon_cry CRY_CATERPIE, $080, $0c0 ; GOLDEEN - mon_cry CRY_CATERPIE, $010, $17f ; SEAKING - mon_cry CRY_PARAS, $002, $0a0 ; STARYU - mon_cry CRY_PARAS, $000, $100 ; STARMIE - mon_cry CRY_KRABBY, $008, $0c0 ; MR__MIME - mon_cry CRY_CATERPIE, $000, $100 ; SCYTHER - mon_cry CRY_DROWZEE, $0ff, $17f ; JYNX - mon_cry CRY_VOLTORB, $08f, $17f ; ELECTABUZZ - mon_cry CRY_CHARMANDER, $0ff, $0b0 ; MAGMAR - mon_cry CRY_PIDGEOTTO, $000, $100 ; PINSIR - mon_cry CRY_SQUIRTLE, $011, $0c0 ; TAUROS - mon_cry CRY_EKANS, $080, $080 ; MAGIKARP - mon_cry CRY_EKANS, $000, $100 ; GYARADOS - mon_cry CRY_LAPRAS, $000, $100 ; LAPRAS - mon_cry CRY_PIDGEY, $0ff, $17f ; DITTO - mon_cry CRY_VENONAT, $088, $0e0 ; EEVEE - mon_cry CRY_VENONAT, $0aa, $17f ; VAPOREON - mon_cry CRY_VENONAT, $03d, $100 ; JOLTEON - mon_cry CRY_VENONAT, $010, $0a0 ; FLAREON - mon_cry CRY_WEEPINBELL, $0aa, $17f ; PORYGON - mon_cry CRY_GROWLITHE, $0f0, $081 ; OMANYTE - mon_cry CRY_GROWLITHE, $0ff, $0c0 ; OMASTAR - mon_cry CRY_CATERPIE, $0bb, $0c0 ; KABUTO - mon_cry CRY_FEAROW, $0ee, $081 ; KABUTOPS - mon_cry CRY_VILEPLUME, $020, $170 ; AERODACTYL - mon_cry CRY_GRIMER, $055, $081 ; SNORLAX - mon_cry CRY_RAICHU, $080, $0c0 ; ARTICUNO - mon_cry CRY_FEAROW, $0ff, $100 ; ZAPDOS - mon_cry CRY_RAICHU, $0f8, $0c0 ; MOLTRES - mon_cry CRY_BULBASAUR, $060, $0c0 ; DRATINI - mon_cry CRY_BULBASAUR, $040, $100 ; DRAGONAIR - mon_cry CRY_BULBASAUR, $03c, $140 ; DRAGONITE - mon_cry CRY_PARAS, $099, $17f ; MEWTWO - mon_cry CRY_PARAS, $0ee, $17f ; MEW - mon_cry CRY_CHIKORITA, -$010, $0b0 ; CHIKORITA - mon_cry CRY_CHIKORITA, -$022, $120 ; BAYLEEF - mon_cry CRY_CHIKORITA, -$0b7, $200 ; MEGANIUM - mon_cry CRY_CYNDAQUIL, $347, $080 ; CYNDAQUIL - mon_cry CRY_CYNDAQUIL, $321, $120 ; QUILAVA - mon_cry CRY_TYPHLOSION, $f00, $0d4 ; TYPHLOSION - mon_cry CRY_TOTODILE, $46c, $0e8 ; TOTODILE - mon_cry CRY_TOTODILE, $440, $110 ; CROCONAW - mon_cry CRY_TOTODILE, $3fc, $180 ; FERALIGATR - mon_cry CRY_SENTRET, $08a, $0b8 ; SENTRET - mon_cry CRY_SENTRET, $06b, $102 ; FURRET - mon_cry CRY_HOOTHOOT, $091, $0d8 ; HOOTHOOT - mon_cry CRY_HOOTHOOT, $000, $1a0 ; NOCTOWL - mon_cry CRY_LEDYBA, $000, $0de ; LEDYBA - mon_cry CRY_LEDYBA, -$096, $138 ; LEDIAN - mon_cry CRY_SPINARAK, $011, $200 ; SPINARAK - mon_cry CRY_SPINARAK, -$0ae, $1e2 ; ARIADOS - mon_cry CRY_SQUIRTLE, -$010, $140 ; CROBAT - mon_cry CRY_CYNDAQUIL, $3c9, $140 ; CHINCHOU - mon_cry CRY_CYNDAQUIL, $2d0, $110 ; LANTURN - mon_cry CRY_PICHU, $000, $140 ; PICHU - mon_cry CRY_CLEFFA, $061, $091 ; CLEFFA - mon_cry CRY_CHIKORITA, $0e8, $0e8 ; IGGLYBUFF - mon_cry CRY_TOGEPI, $010, $100 ; TOGEPI - mon_cry CRY_TOGETIC, $03b, $038 ; TOGETIC - mon_cry CRY_NATU, -$067, $100 ; NATU - mon_cry CRY_NATU, -$0a7, $168 ; XATU - mon_cry CRY_MAREEP, $022, $0d8 ; MAREEP - mon_cry CRY_MAREEP, -$007, $180 ; FLAAFFY - mon_cry CRY_AMPHAROS, -$07c, $0e8 ; AMPHAROS - mon_cry CRY_CLEFFA, $084, $150 ; BELLOSSOM - mon_cry CRY_MARILL, $11b, $120 ; MARILL - mon_cry CRY_MARILL, $0b6, $180 ; AZUMARILL - mon_cry CRY_CLEFFA, $f40, $180 ; SUDOWOODO - mon_cry CRY_CLEFFA, -$2a3, $1c8 ; POLITOED - mon_cry CRY_CLEFFA, $03b, $0c8 ; HOPPIP - mon_cry CRY_CLEFFA, $027, $138 ; SKIPLOOM - mon_cry CRY_CLEFFA, $000, $180 ; JUMPLUFF - mon_cry CRY_AIPOM, -$051, $0e8 ; AIPOM - mon_cry CRY_MARILL, $12b, $0b8 ; SUNKERN - mon_cry CRY_SUNFLORA, -$020, $180 ; SUNFLORA - mon_cry CRY_TOTODILE, $031, $0c8 ; YANMA - mon_cry CRY_WOOPER, $093, $0af ; WOOPER - mon_cry CRY_WOOPER, -$0c6, $140 ; QUAGSIRE - mon_cry CRY_AIPOM, $0a2, $140 ; ESPEON - mon_cry CRY_VENONAT, -$0e9, $0f0 ; UMBREON - mon_cry CRY_MARILL, -$01f, $180 ; MURKROW - mon_cry CRY_SLOWKING, $104, $200 ; SLOWKING - mon_cry CRY_HOOTHOOT, $130, $0e8 ; MISDREAVUS - mon_cry CRY_HOOTHOOT, $162, $100 ; UNOWN - mon_cry CRY_AMPHAROS, $27b, $144 ; WOBBUFFET - mon_cry CRY_GIRAFARIG, $041, $200 ; GIRAFARIG - mon_cry CRY_SLOWKING, $080, $100 ; PINECO - mon_cry CRY_SLOWKING, $000, $180 ; FORRETRESS - mon_cry CRY_DUNSPARCE, $1c4, $100 ; DUNSPARCE - mon_cry CRY_GLIGAR, -$102, $100 ; GLIGAR - mon_cry CRY_TYPHLOSION, $0ef, $0f7 ; STEELIX - mon_cry CRY_DUNSPARCE, $112, $0e8 ; SNUBBULL - mon_cry CRY_DUNSPARCE, $000, $180 ; GRANBULL - mon_cry CRY_SLOWKING, $160, $0e0 ; QWILFISH - mon_cry CRY_AMPHAROS, $000, $160 ; SCIZOR - mon_cry CRY_DUNSPARCE, $290, $0a8 ; SHUCKLE - mon_cry CRY_AMPHAROS, $035, $0e0 ; HERACROSS - mon_cry CRY_WOOPER, $053, $0af ; SNEASEL - mon_cry CRY_TEDDIURSA, $7a2, $06e ; TEDDIURSA - mon_cry CRY_TEDDIURSA, $640, $0d8 ; URSARING - mon_cry CRY_SLUGMA, -$1d8, $140 ; SLUGMA - mon_cry CRY_MAGCARGO, -$20d, $1c0 ; MAGCARGO - mon_cry CRY_CYNDAQUIL, $1fe, $140 ; SWINUB - mon_cry CRY_MAGCARGO, -$109, $100 ; PILOSWINE - mon_cry CRY_MAGCARGO, $0a1, $0e8 ; CORSOLA - mon_cry CRY_SUNFLORA, $00d, $100 ; REMORAID - mon_cry CRY_TOTODILE, $000, $180 ; OCTILLERY - mon_cry CRY_TEDDIURSA, $002, $06a ; DELIBIRD - mon_cry CRY_MANTINE, -$0be, $0f0 ; MANTINE - mon_cry CRY_AMPHAROS, $8a9, $180 ; SKARMORY - mon_cry CRY_CYNDAQUIL, $039, $140 ; HOUNDOUR - mon_cry CRY_TOTODILE, -$10a, $100 ; HOUNDOOM - mon_cry CRY_SLUGMA, $2fb, $100 ; KINGDRA - mon_cry CRY_SENTRET, $048, $230 ; PHANPY - mon_cry CRY_DONPHAN, $000, $1a0 ; DONPHAN - mon_cry CRY_GIRAFARIG, $073, $240 ; PORYGON2 - mon_cry CRY_AIPOM, -$160, $180 ; STANTLER - mon_cry CRY_PICHU, -$21a, $1f0 ; SMEARGLE - mon_cry CRY_AIPOM, $02c, $108 ; TYROGUE - mon_cry CRY_SLUGMA, $000, $100 ; HITMONTOP - mon_cry CRY_MARILL, $068, $100 ; SMOOCHUM - mon_cry CRY_SUNFLORA, -$2d8, $0b4 ; ELEKID - mon_cry CRY_TEDDIURSA, $176, $03a ; MAGBY - mon_cry CRY_GLIGAR, -$1cd, $1a0 ; MILTANK - mon_cry CRY_SLOWKING, $293, $140 ; BLISSEY - mon_cry CRY_RAIKOU, $22e, $120 ; RAIKOU - mon_cry CRY_ENTEI, $000, $1a0 ; ENTEI - mon_cry CRY_MAGCARGO, $000, $180 ; SUICUNE - mon_cry CRY_RAIKOU, $05f, $0d0 ; LARVITAR - mon_cry CRY_SPINARAK, -$1db, $150 ; PUPITAR - mon_cry CRY_RAIKOU, -$100, $180 ; TYRANITAR - mon_cry CRY_TYPHLOSION, $000, $100 ; LUGIA - mon_cry CRY_AIPOM, $000, $180 ; HO_OH - mon_cry CRY_ENTEI, $14a, $111 ; CELEBI - mon_cry CRY_NIDORAN_M, 0, 0 ; 252 - mon_cry CRY_NIDORAN_M, 0, 0 ; 253 - mon_cry CRY_NIDORAN_M, 0, 0 ; 254 - mon_cry CRY_NIDORAN_M, 0, 0 ; 255 + mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR + mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR + mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR + mon_cry CRY_CHARMANDER, 96, 192 ; CHARMANDER + mon_cry CRY_CHARMANDER, 32, 192 ; CHARMELEON + mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD + mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE + mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE + mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE + mon_cry CRY_CATERPIE, 128, 160 ; CATERPIE + mon_cry CRY_METAPOD, 204, 129 ; METAPOD + mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE + mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE + mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA + mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL + mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY + mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO + mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT + mon_cry CRY_RATTATA, 0, 256 ; RATTATA + mon_cry CRY_RATTATA, 32, 383 ; RATICATE + mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW + mon_cry CRY_FEAROW, 64, 288 ; FEAROW + mon_cry CRY_EKANS, 18, 192 ; EKANS + mon_cry CRY_EKANS, 224, 144 ; ARBOK + mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU + mon_cry CRY_RAICHU, 238, 136 ; RAICHU + mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW + mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH + mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F + mon_cry CRY_NIDORAN_F, 44, 352 ; NIDORINA + mon_cry CRY_NIDOQUEEN, 0, 256 ; NIDOQUEEN + mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M + mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO + mon_cry CRY_RAICHU, 0, 256 ; NIDOKING + mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY + mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE + mon_cry CRY_VULPIX, 79, 144 ; VULPIX + mon_cry CRY_VULPIX, 136, 224 ; NINETALES + mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF + mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF + mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT + mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT + mon_cry CRY_ODDISH, 221, 129 ; ODDISH + mon_cry CRY_ODDISH, 170, 192 ; GLOOM + mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME + mon_cry CRY_PARAS, 32, 352 ; PARAS + mon_cry CRY_PARAS, 66, 383 ; PARASECT + mon_cry CRY_VENONAT, 68, 192 ; VENONAT + mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH + mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT + mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO + mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH + mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN + mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK + mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK + mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY + mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE + mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE + mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE + mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG + mon_cry CRY_PIDGEY, 119, 224 ; POLIWHIRL + mon_cry CRY_PIDGEY, 0, 383 ; POLIWRATH + mon_cry CRY_METAPOD, 192, 129 ; ABRA + mon_cry CRY_METAPOD, 168, 320 ; KADABRA + mon_cry CRY_METAPOD, 152, 383 ; ALAKAZAM + mon_cry CRY_GROWLITHE, 238, 129 ; MACHOP + mon_cry CRY_GROWLITHE, 72, 224 ; MACHOKE + mon_cry CRY_GROWLITHE, 8, 320 ; MACHAMP + mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT + mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL + mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL + mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL + mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL + mon_cry CRY_VULPIX, 240, 144 ; GEODUDE + mon_cry CRY_VULPIX, 0, 256 ; GRAVELER + mon_cry CRY_GOLEM, 224, 192 ; GOLEM + mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA + mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH + mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE + mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO + mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE + mon_cry CRY_METAPOD, 32, 320 ; MAGNETON + mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D + mon_cry CRY_DIGLETT, 187, 129 ; DODUO + mon_cry CRY_DIGLETT, 153, 160 ; DODRIO + mon_cry CRY_SEEL, 136, 320 ; SEEL + mon_cry CRY_SEEL, 35, 383 ; DEWGONG + mon_cry CRY_GRIMER, 0, 256 ; GRIMER + mon_cry CRY_MUK, 239, 383 ; MUK + mon_cry CRY_FEAROW, 0, 256 ; SHELLDER + mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER + mon_cry CRY_METAPOD, 0, 256 ; GASTLY + mon_cry CRY_METAPOD, 48, 192 ; HAUNTER + mon_cry CRY_MUK, 0, 383 ; GENGAR + mon_cry CRY_EKANS, 255, 320 ; ONIX + mon_cry CRY_DROWZEE, 136, 160 ; DROWZEE + mon_cry CRY_DROWZEE, 238, 192 ; HYPNO + mon_cry CRY_KRABBY, 32, 352 ; KRABBY + mon_cry CRY_KRABBY, 238, 352 ; KINGLER + mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB + mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE + mon_cry CRY_DIGLETT, 0, 256 ; EXEGGCUTE + mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR + mon_cry CRY_CLEFAIRY, 0, 256 ; CUBONE + mon_cry CRY_ODDISH, 79, 224 ; MAROWAK + mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE + mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN + mon_cry CRY_SEEL, 0, 256 ; LICKITUNG + mon_cry CRY_GOLEM, 230, 349 ; KOFFING + mon_cry CRY_GOLEM, 255, 383 ; WEEZING + mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN + mon_cry CRY_RHYDON, 0, 256 ; RHYDON + mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY + mon_cry CRY_GOLEM, 0, 256 ; TANGELA + mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN + mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA + mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA + mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN + mon_cry CRY_CATERPIE, 16, 383 ; SEAKING + mon_cry CRY_PARAS, 2, 160 ; STARYU + mon_cry CRY_PARAS, 0, 256 ; STARMIE + mon_cry CRY_KRABBY, 8, 192 ; MR__MIME + mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER + mon_cry CRY_DROWZEE, 255, 383 ; JYNX + mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ + mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR + mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR + mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS + mon_cry CRY_EKANS, 128, 128 ; MAGIKARP + mon_cry CRY_EKANS, 0, 256 ; GYARADOS + mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS + mon_cry CRY_PIDGEY, 255, 383 ; DITTO + mon_cry CRY_VENONAT, 136, 224 ; EEVEE + mon_cry CRY_VENONAT, 170, 383 ; VAPOREON + mon_cry CRY_VENONAT, 61, 256 ; JOLTEON + mon_cry CRY_VENONAT, 16, 160 ; FLAREON + mon_cry CRY_WEEPINBELL, 170, 383 ; PORYGON + mon_cry CRY_GROWLITHE, 240, 129 ; OMANYTE + mon_cry CRY_GROWLITHE, 255, 192 ; OMASTAR + mon_cry CRY_CATERPIE, 187, 192 ; KABUTO + mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS + mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL + mon_cry CRY_GRIMER, 85, 129 ; SNORLAX + mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO + mon_cry CRY_FEAROW, 255, 256 ; ZAPDOS + mon_cry CRY_RAICHU, 248, 192 ; MOLTRES + mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI + mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR + mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE + mon_cry CRY_PARAS, 153, 383 ; MEWTWO + mon_cry CRY_PARAS, 238, 383 ; MEW + mon_cry CRY_CHIKORITA, -16, 176 ; CHIKORITA + mon_cry CRY_CHIKORITA, -34, 288 ; BAYLEEF + mon_cry CRY_CHIKORITA, -183, 512 ; MEGANIUM + mon_cry CRY_CYNDAQUIL, 839, 128 ; CYNDAQUIL + mon_cry CRY_CYNDAQUIL, 801, 288 ; QUILAVA + mon_cry CRY_TYPHLOSION, 3840, 212 ; TYPHLOSION + mon_cry CRY_TOTODILE, 1132, 232 ; TOTODILE + mon_cry CRY_TOTODILE, 1088, 272 ; CROCONAW + mon_cry CRY_TOTODILE, 1020, 384 ; FERALIGATR + mon_cry CRY_SENTRET, 138, 184 ; SENTRET + mon_cry CRY_SENTRET, 107, 258 ; FURRET + mon_cry CRY_HOOTHOOT, 145, 216 ; HOOTHOOT + mon_cry CRY_HOOTHOOT, 0, 416 ; NOCTOWL + mon_cry CRY_LEDYBA, 0, 222 ; LEDYBA + mon_cry CRY_LEDYBA, -150, 312 ; LEDIAN + mon_cry CRY_SPINARAK, 17, 512 ; SPINARAK + mon_cry CRY_SPINARAK, -174, 482 ; ARIADOS + mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT + mon_cry CRY_CYNDAQUIL, 969, 320 ; CHINCHOU + mon_cry CRY_CYNDAQUIL, 720, 272 ; LANTURN + mon_cry CRY_PICHU, 0, 320 ; PICHU + mon_cry CRY_CLEFFA, 97, 145 ; CLEFFA + mon_cry CRY_CHIKORITA, 232, 232 ; IGGLYBUFF + mon_cry CRY_TOGEPI, 16, 256 ; TOGEPI + mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC + mon_cry CRY_NATU, -103, 256 ; NATU + mon_cry CRY_NATU, -167, 360 ; XATU + mon_cry CRY_MAREEP, 34, 216 ; MAREEP + mon_cry CRY_MAREEP, -7, 384 ; FLAAFFY + mon_cry CRY_AMPHAROS, -124, 232 ; AMPHAROS + mon_cry CRY_CLEFFA, 132, 336 ; BELLOSSOM + mon_cry CRY_MARILL, 283, 288 ; MARILL + mon_cry CRY_MARILL, 182, 384 ; AZUMARILL + mon_cry CRY_CLEFFA, 3904, 384 ; SUDOWOODO + mon_cry CRY_CLEFFA, -675, 456 ; POLITOED + mon_cry CRY_CLEFFA, 59, 200 ; HOPPIP + mon_cry CRY_CLEFFA, 39, 312 ; SKIPLOOM + mon_cry CRY_CLEFFA, 0, 384 ; JUMPLUFF + mon_cry CRY_AIPOM, -81, 232 ; AIPOM + mon_cry CRY_MARILL, 299, 184 ; SUNKERN + mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA + mon_cry CRY_TOTODILE, 49, 200 ; YANMA + mon_cry CRY_WOOPER, 147, 175 ; WOOPER + mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE + mon_cry CRY_AIPOM, 162, 320 ; ESPEON + mon_cry CRY_VENONAT, -233, 240 ; UMBREON + mon_cry CRY_MARILL, -31, 384 ; MURKROW + mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING + mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS + mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN + mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET + mon_cry CRY_GIRAFARIG, 65, 512 ; GIRAFARIG + mon_cry CRY_SLOWKING, 128, 256 ; PINECO + mon_cry CRY_SLOWKING, 0, 384 ; FORRETRESS + mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE + mon_cry CRY_GLIGAR, -258, 256 ; GLIGAR + mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX + mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL + mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL + mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH + mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR + mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE + mon_cry CRY_AMPHAROS, 53, 224 ; HERACROSS + mon_cry CRY_WOOPER, 83, 175 ; SNEASEL + mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA + mon_cry CRY_TEDDIURSA, 1600, 216 ; URSARING + mon_cry CRY_SLUGMA, -472, 320 ; SLUGMA + mon_cry CRY_MAGCARGO, -525, 448 ; MAGCARGO + mon_cry CRY_CYNDAQUIL, 510, 320 ; SWINUB + mon_cry CRY_MAGCARGO, -265, 256 ; PILOSWINE + mon_cry CRY_MAGCARGO, 161, 232 ; CORSOLA + mon_cry CRY_SUNFLORA, 13, 256 ; REMORAID + mon_cry CRY_TOTODILE, 0, 384 ; OCTILLERY + mon_cry CRY_TEDDIURSA, 2, 106 ; DELIBIRD + mon_cry CRY_MANTINE, -190, 240 ; MANTINE + mon_cry CRY_AMPHAROS, 2217, 384 ; SKARMORY + mon_cry CRY_CYNDAQUIL, 57, 320 ; HOUNDOUR + mon_cry CRY_TOTODILE, -266, 256 ; HOUNDOOM + mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA + mon_cry CRY_SENTRET, 72, 560 ; PHANPY + mon_cry CRY_DONPHAN, 0, 416 ; DONPHAN + mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2 + mon_cry CRY_AIPOM, -352, 384 ; STANTLER + mon_cry CRY_PICHU, -538, 496 ; SMEARGLE + mon_cry CRY_AIPOM, 44, 264 ; TYROGUE + mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP + mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM + mon_cry CRY_SUNFLORA, -728, 180 ; ELEKID + mon_cry CRY_TEDDIURSA, 374, 58 ; MAGBY + mon_cry CRY_GLIGAR, -461, 416 ; MILTANK + mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY + mon_cry CRY_RAIKOU, 558, 288 ; RAIKOU + mon_cry CRY_ENTEI, 0, 416 ; ENTEI + mon_cry CRY_MAGCARGO, 0, 384 ; SUICUNE + mon_cry CRY_RAIKOU, 95, 208 ; LARVITAR + mon_cry CRY_SPINARAK, -475, 336 ; PUPITAR + mon_cry CRY_RAIKOU, -256, 384 ; TYRANITAR + mon_cry CRY_TYPHLOSION, 0, 256 ; LUGIA + mon_cry CRY_AIPOM, 0, 384 ; HO_OH + mon_cry CRY_ENTEI, 330, 273 ; CELEBI + mon_cry CRY_NIDORAN_M, 0, 0 ; 252 + mon_cry CRY_NIDORAN_M, 0, 0 ; 253 + mon_cry CRY_NIDORAN_M, 0, 0 ; 254 + mon_cry CRY_NIDORAN_M, 0, 0 ; 255 diff --git a/crysaudio/cry_pointers.asm b/crysaudio/cry_pointers.asm index ec6b17e0..d479a601 100644 --- a/crysaudio/cry_pointers.asm +++ b/crysaudio/cry_pointers.asm @@ -1,4 +1,5 @@ Cries: +; entries correspond to CRY_* constants (see constants/cry_constants.asm) dba Cry_Nidoran_M dba Cry_Nidoran_F dba Cry_Slowpoke diff --git a/crysaudio/drumkits.asm b/crysaudio/drumkits.asm index 9bdbc553..1d6abf5a 100644 --- a/crysaudio/drumkits.asm +++ b/crysaudio/drumkits.asm @@ -8,19 +8,19 @@ Drumkits: dw Drumkit6 Drumkit0: - dw Drum00 ; rest - dw Snare1 ; c - dw Snare2 ; c# - dw Snare3 ; d - dw Snare4 ; d# - dw Drum05 ; e - dw Triangle1 ; f - dw Triangle2 ; f# - dw HiHat1 ; g - dw Snare5 ; g# - dw Snare6 ; a - dw Snare7 ; a# - dw HiHat2 ; b + dw Drum00 + dw Snare1 + dw Snare2 + dw Snare3 + dw Snare4 + dw Drum05 + dw Triangle1 + dw Triangle2 + dw HiHat1 + dw Snare5 + dw Snare6 + dw Snare7 + dw HiHat2 Drumkit1: dw Drum00 dw HiHat1 @@ -106,170 +106,169 @@ Drumkit6: dw Snare9 Drum00: -; unused - noise C#, 1, $11, $00 - endchannel + noise_note 32, 1, 1, 0 + sound_ret Snare1: - noise C#, 1, $c1, $33 - endchannel + noise_note 32, 12, 1, 51 + sound_ret Snare2: - noise C#, 1, $b1, $33 - endchannel + noise_note 32, 11, 1, 51 + sound_ret Snare3: - noise C#, 1, $a1, $33 - endchannel + noise_note 32, 10, 1, 51 + sound_ret Snare4: - noise C#, 1, $81, $33 - endchannel + noise_note 32, 8, 1, 51 + sound_ret Drum05: - noise C#, 8, $84, $37 - noise C#, 7, $84, $36 - noise C#, 6, $83, $35 - noise C#, 5, $83, $34 - noise C#, 4, $82, $33 - noise C#, 3, $81, $32 - endchannel + noise_note 39, 8, 4, 55 + noise_note 38, 8, 4, 54 + noise_note 37, 8, 3, 53 + noise_note 36, 8, 3, 52 + noise_note 35, 8, 2, 51 + noise_note 34, 8, 1, 50 + sound_ret Triangle1: - noise C#, 1, $51, $2a - endchannel + noise_note 32, 5, 1, 42 + sound_ret Triangle2: - noise C#, 2, $41, $2b - noise C#, 1, $61, $2a - endchannel + noise_note 33, 4, 1, 43 + noise_note 32, 6, 1, 42 + sound_ret HiHat1: - noise C#, 1, $81, $10 - endchannel + noise_note 32, 8, 1, 16 + sound_ret Snare5: - noise C#, 1, $82, $23 - endchannel + noise_note 32, 8, 2, 35 + sound_ret Snare6: - noise C#, 1, $82, $25 - endchannel + noise_note 32, 8, 2, 37 + sound_ret Snare7: - noise C#, 1, $82, $26 - endchannel + noise_note 32, 8, 2, 38 + sound_ret HiHat2: - noise C#, 1, $a1, $10 - endchannel + noise_note 32, 10, 1, 16 + sound_ret HiHat3: - noise C#, 1, $a2, $11 - endchannel + noise_note 32, 10, 2, 17 + sound_ret Snare8: - noise C#, 1, $a2, $50 - endchannel + noise_note 32, 10, 2, 80 + sound_ret Triangle3: - noise C#, 1, $a1, $18 - noise C#, 1, $31, $33 - endchannel + noise_note 32, 10, 1, 24 + noise_note 32, 3, 1, 51 + sound_ret Triangle4: - noise C#, 3, $91, $28 - noise C#, 1, $71, $18 - endchannel + noise_note 34, 9, 1, 40 + noise_note 32, 7, 1, 24 + sound_ret Snare9: - noise C#, 1, $91, $22 - endchannel + noise_note 32, 9, 1, 34 + sound_ret Snare10: - noise C#, 1, $71, $22 - endchannel + noise_note 32, 7, 1, 34 + sound_ret Snare11: - noise C#, 1, $61, $22 - endchannel + noise_note 32, 6, 1, 34 + sound_ret Drum20: - noise C#, 1, $11, $11 - endchannel + noise_note 32, 1, 1, 17 + sound_ret Drum21: - endchannel + sound_ret Snare12: - noise C#, 1, $91, $33 - endchannel + noise_note 32, 9, 1, 51 + sound_ret Snare13: - noise C#, 1, $51, $32 - endchannel + noise_note 32, 5, 1, 50 + sound_ret Snare14: - noise C#, 1, $81, $31 - endchannel + noise_note 32, 8, 1, 49 + sound_ret Kick1: - noise C#, 1, $88, $6b - noise C#, 1, $71, $00 - endchannel + noise_note 32, 8, 8, 107 + noise_note 32, 7, 1, 0 + sound_ret Triangle5: - noise D_, 1, $91, $18 - endchannel + noise_note 48, 9, 1, 24 + sound_ret Drum27: - noise C#, 8, $92, $10 - endchannel + noise_note 39, 9, 2, 16 + sound_ret Drum28: - noise D_, 4, $91, $00 - noise D_, 4, $11, $00 - endchannel + noise_note 51, 9, 1, 0 + noise_note 51, 1, 1, 0 + sound_ret Drum29: - noise D_, 4, $91, $11 - noise D_, 4, $11, $00 - endchannel + noise_note 51, 9, 1, 17 + noise_note 51, 1, 1, 0 + sound_ret Crash1: - noise D_, 4, $88, $15 - noise C#, 1, $65, $12 - endchannel + noise_note 51, 8, 8, 21 + noise_note 32, 6, 5, 18 + sound_ret Drum31: - noise D_, 4, $51, $21 - noise D_, 4, $11, $11 - endchannel + noise_note 51, 5, 1, 33 + noise_note 51, 1, 1, 17 + sound_ret Drum32: - noise D_, 4, $51, $50 - noise D_, 4, $11, $11 - endchannel + noise_note 51, 5, 1, 80 + noise_note 51, 1, 1, 17 + sound_ret Drum33: - noise C#, 1, $a1, $31 - endchannel + noise_note 32, 10, 1, 49 + sound_ret Crash2: - noise C#, 1, $84, $12 - endchannel + noise_note 32, 8, 4, 18 + sound_ret Drum35: - noise D_, 4, $81, $00 - noise D_, 4, $11, $00 - endchannel + noise_note 51, 8, 1, 0 + noise_note 51, 1, 1, 0 + sound_ret Drum36: - noise D_, 4, $81, $21 - noise D_, 4, $11, $11 - endchannel + noise_note 51, 8, 1, 33 + noise_note 51, 1, 1, 17 + sound_ret Kick2: - noise C#, 1, $a8, $6b - noise C#, 1, $71, $00 - endchannel + noise_note 32, 10, 8, 107 + noise_note 32, 7, 1, 0 + sound_ret diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index 1e7cef4b..93101c94 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -6,7 +6,7 @@ ; FadeMusic ; PlayStereoSFX -_MapSetup_Sound_Off:: +_InitSound:: ; restart sound operation ; clear all relevant hardware registers & wram push hl @@ -19,7 +19,7 @@ _MapSetup_Sound_Off:: ld [hli], a ; rNR50 ; volume/vin ld [hli], a ; rNR51 ; sfx channels ld a, $80 ; all channels on - ld [hli], a ; ff26 ; music channels + ld [hli], a ; rNR52 ; music channels ld hl, rNR10 ; sound channel registers ld e, NUM_MUSIC_CHANS @@ -38,15 +38,16 @@ _MapSetup_Sound_Off:: dec e jr nz, .clearsound - ld hl, wChannels ; start of channel data - ld de, wChannelsEnd - wChannels ; length of area to clear (entire sound wram area) -.clearchannels + ld hl, wAudio + ld de, wAudioEnd - wAudio +.clearaudio xor a ld [hli], a dec de ld a, e or d - jr nz, .clearchannels + jr nz, .clearaudio + ld a, MAX_VOLUME ld [wVolume], a call MusicOn @@ -62,7 +63,7 @@ MusicFadeRestart: push af ld a, [wMusicFadeID] push af - call _MapSetup_Sound_Off + call _InitSound pop af ld [wMusicFadeID], a pop af @@ -101,7 +102,7 @@ _UpdateSound:: ld hl, CHANNEL_NOTE_DURATION add hl, bc ld a, [hl] - cp $2 ; 1 or 0? + cp 2 ; 1 or 0? jr c, .noteover dec [hl] jr .continue_sound_update @@ -117,19 +118,19 @@ _UpdateSound:: ; turn vibrato off for now ld hl, CHANNEL_FLAGS2 add hl, bc - res SOUND_PITCH_WHEEL, [hl] + res SOUND_PITCH_SLIDE, [hl] ; get next note call ParseMusic .continue_sound_update - call ApplyPitchWheel + call ApplyPitchSlide ; duty cycle ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld a, [hli] ld [wCurTrackDuty], a - ; intensity + ; volume envelope ld a, [hli] - ld [wCurTrackIntensity], a + ld [wCurTrackVolumeEnvelope], a ; frequency ld a, [hli] ld [wCurTrackFrequency], a @@ -210,9 +211,9 @@ _UpdateSound:: ret UpdateChannels: - ld hl, .ChannelFnPtrs + ld hl, .ChannelFunctions ld a, [wCurChannel] - and $7 + maskbits NUM_CHANNELS add a ld e, a ld d, 0 @@ -222,7 +223,7 @@ UpdateChannels: ld l, a jp hl -.ChannelFnPtrs: +.ChannelFunctions: dw .Channel1 dw .Channel2 dw .Channel3 @@ -241,28 +242,28 @@ UpdateChannels: .Channel5: ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit NOTE_UNKN_3, [hl] - jr z, .asm_e8159 + bit NOTE_PITCH_SWEEP, [hl] + jr z, .noPitchSweep ; - ld a, [wSoundInput] + ld a, [wPitchSweep] ldh [rNR10], a -.asm_e8159 +.noPitchSweep bit NOTE_REST, [hl] ; rest - jr nz, .ch1rest + jr nz, .ch1_rest bit NOTE_NOISE_SAMPLING, [hl] - jr nz, .asm_e81a2 + jr nz, .ch1_noise_sampling bit NOTE_FREQ_OVERRIDE, [hl] - jr nz, .frequency_override + jr nz, .ch1_frequency_override bit NOTE_VIBRATO_OVERRIDE, [hl] - jr nz, .asm_e8184 - jr .check_duty_override + jr nz, .ch1_vibrato_override + jr .ch1_check_duty_override -.frequency_override +.ch1_frequency_override ld a, [wCurTrackFrequency] ldh [rNR13], a ld a, [wCurTrackFrequency + 1] ldh [rNR14], a -.check_duty_override +.ch1_check_duty_override bit NOTE_DUTY_OVERRIDE, [hl] ret z ld a, [wCurTrackDuty] @@ -273,7 +274,7 @@ UpdateChannels: ldh [rNR11], a ret -.asm_e8184 +.ch1_vibrato_override ld a, [wCurTrackDuty] ld d, a ldh a, [rNR11] @@ -284,7 +285,7 @@ UpdateChannels: ldh [rNR13], a ret -.ch1rest +.ch1_rest ldh a, [rNR52] and %10001110 ; ch1 off ldh [rNR52], a @@ -292,12 +293,12 @@ UpdateChannels: call ClearChannel ret -.asm_e81a2 +.ch1_noise_sampling ld hl, wCurTrackDuty ld a, $3f ; sound length or [hl] ldh [rNR11], a - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] ldh [rNR12], a ld a, [wCurTrackFrequency] ldh [rNR13], a @@ -311,11 +312,11 @@ UpdateChannels: ld hl, CHANNEL_NOTE_FLAGS add hl, bc bit NOTE_REST, [hl] ; rest - jr nz, .ch2rest + jr nz, .ch2_rest bit NOTE_NOISE_SAMPLING, [hl] - jr nz, .asm_e8204 + jr nz, .ch2_noise_sampling bit NOTE_VIBRATO_OVERRIDE, [hl] - jr nz, .asm_e81e6 + jr nz, .ch2_vibrato_override bit NOTE_DUTY_OVERRIDE, [hl] ret z ld a, [wCurTrackDuty] @@ -326,14 +327,14 @@ UpdateChannels: ldh [rNR21], a ret -.asm_e81db ; unused +.ch2_frequency_override ; unreferenced ld a, [wCurTrackFrequency] ldh [rNR23], a ld a, [wCurTrackFrequency + 1] ldh [rNR24], a ret -.asm_e81e6 +.ch2_vibrato_override ld a, [wCurTrackDuty] ld d, a ldh a, [rNR21] @@ -344,7 +345,7 @@ UpdateChannels: ldh [rNR23], a ret -.ch2rest +.ch2_rest ldh a, [rNR52] and %10001101 ; ch2 off ldh [rNR52], a @@ -352,12 +353,12 @@ UpdateChannels: call ClearChannel ret -.asm_e8204 +.ch2_noise_sampling ld hl, wCurTrackDuty ld a, $3f ; sound length or [hl] ldh [rNR21], a - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] ldh [rNR22], a ld a, [wCurTrackFrequency] ldh [rNR23], a @@ -370,27 +371,27 @@ UpdateChannels: .Channel7: ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit NOTE_REST, [hl] ; rest - jr nz, .ch3rest + bit NOTE_REST, [hl] + jr nz, .ch3_rest bit NOTE_NOISE_SAMPLING, [hl] - jr nz, .asm_e824d + jr nz, .ch3_noise_sampling bit NOTE_VIBRATO_OVERRIDE, [hl] - jr nz, .asm_e823a + jr nz, .ch3_vibrato_override ret -.asm_e822f ; unused +.ch3_frequency_override ; unreferenced ld a, [wCurTrackFrequency] ldh [rNR33], a ld a, [wCurTrackFrequency + 1] ldh [rNR34], a ret -.asm_e823a +.ch3_vibrato_override ld a, [wCurTrackFrequency] ldh [rNR33], a ret -.ch3rest +.ch3_rest ldh a, [rNR52] and %10001011 ; ch3 off ldh [rNR52], a @@ -398,12 +399,12 @@ UpdateChannels: call ClearChannel ret -.asm_e824d +.ch3_noise_sampling ld a, $3f ; sound length ldh [rNR31], a xor a ldh [rNR30], a - call .asm_e8268 + call .load_wave_pattern ld a, $80 ldh [rNR30], a ld a, [wCurTrackFrequency] @@ -413,9 +414,9 @@ UpdateChannels: ldh [rNR34], a ret -.asm_e8268 +.load_wave_pattern push hl - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] and $f ; only 0-9 are valid ld l, a ld h, 0 @@ -464,7 +465,7 @@ endr ldh [rWave_f], a .skip pop hl - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] and $f0 sla a ldh [rNR32], a @@ -474,18 +475,18 @@ endr .Channel8: ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit NOTE_REST, [hl] ; rest - jr nz, .ch4rest + bit NOTE_REST, [hl] + jr nz, .ch4_rest bit NOTE_NOISE_SAMPLING, [hl] - jr nz, .asm_e82d4 + jr nz, .ch4_noise_sampling ret -.asm_e82c1 ; unused +.ch4_frequency_override ; unreferenced ld a, [wCurTrackFrequency] ldh [rNR43], a ret -.ch4rest +.ch4_rest ldh a, [rNR52] and %10000111 ; ch4 off ldh [rNR52], a @@ -493,10 +494,10 @@ endr call ClearChannel ret -.asm_e82d4 +.ch4_noise_sampling ld a, $3f ; sound length ldh [rNR41], a - ld a, [wCurTrackIntensity] + ld a, [wCurTrackVolumeEnvelope] ldh [rNR42], a ld a, [wCurTrackFrequency] ldh [rNR43], a @@ -710,10 +711,10 @@ FadeMusic: ret LoadNote: - ; wait for pitch wheel to finish + ; wait for pitch slide to finish ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_PITCH_WHEEL, [hl] + bit SOUND_PITCH_SLIDE, [hl] ret z ; get note duration ld hl, CHANNEL_NOTE_DURATION @@ -731,8 +732,8 @@ LoadNote: ld e, [hl] inc hl ld d, [hl] - ; get direction of pitch wheel - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ; get direction of pitch slide + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, e sub [hl] @@ -740,13 +741,13 @@ LoadNote: ld a, d sbc 0 ld d, a - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc sub [hl] jr nc, .greater_than ld hl, CHANNEL_FLAGS3 add hl, bc - set SOUND_PITCH_WHEEL_DIR, [hl] + set SOUND_PITCH_SLIDE_DIR, [hl] ; get frequency ld hl, CHANNEL_FREQUENCY add hl, bc @@ -754,7 +755,7 @@ LoadNote: inc hl ld d, [hl] ; ???? - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, [hl] sub e @@ -763,7 +764,7 @@ LoadNote: sbc 0 ld d, a ; ???? - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld a, [hl] sub d @@ -773,15 +774,15 @@ LoadNote: .greater_than ld hl, CHANNEL_FLAGS3 add hl, bc - res SOUND_PITCH_WHEEL_DIR, [hl] + res SOUND_PITCH_SLIDE_DIR, [hl] ; get frequency ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] - ; get distance from pitch wheel target - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ; get distance from pitch slide target + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, e sub [hl] @@ -789,7 +790,7 @@ LoadNote: ld a, d sbc 0 ld d, a - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc sub [hl] ld d, a @@ -817,10 +818,10 @@ LoadNote: add [hl] ld d, b ; quotient pop bc - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT add hl, bc ld [hl], d ; quotient - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION add hl, bc ld [hl], a ; remainder ld hl, CHANNEL_FIELD25 @@ -833,9 +834,9 @@ HandleTrackVibrato: ; handle duty, cry pitch, and vibrato ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_DUTY, [hl] ; duty + bit SOUND_DUTY_LOOP, [hl] ; duty cycle looping jr z, .next - ld hl, CHANNEL_SFX_DUTY_LOOP + ld hl, CHANNEL_DUTY_CYCLE_PATTERN add hl, bc ld a, [hl] rlca @@ -849,9 +850,9 @@ HandleTrackVibrato: .next ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_CRY_PITCH, [hl] + bit SOUND_PITCH_OFFSET, [hl] jr z, .vibrato - ld hl, CHANNEL_CRY_PITCH + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld e, [hl] inc hl @@ -946,11 +947,11 @@ HandleTrackVibrato: .quit ret -ApplyPitchWheel: - ; quit if pitch wheel inactive +ApplyPitchSlide: + ; quit if pitch slide inactive ld hl, CHANNEL_FLAGS2 add hl, bc - bit SOUND_PITCH_WHEEL, [hl] + bit SOUND_PITCH_SLIDE, [hl] ret z ; de = Frequency ld hl, CHANNEL_FREQUENCY @@ -958,22 +959,22 @@ ApplyPitchWheel: ld e, [hl] inc hl ld d, [hl] - ; check whether pitch wheel is going up or down + ; check whether pitch slide is going up or down ld hl, CHANNEL_FLAGS3 add hl, bc - bit SOUND_PITCH_WHEEL_DIR, [hl] + bit SOUND_PITCH_SLIDE_DIR, [hl] jr z, .decreasing - ; frequency += [Channel*PitchWheelAmount] - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT + ; frequency += [Channel*PitchSlideAmount] + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT add hl, bc ld l, [hl] ld h, 0 add hl, de ld d, h ld e, l - ; [Channel*Field25] += [Channel*PitchWheelAmountFraction] + ; [Channel*Field25] += [Channel*PitchSlideAmountFraction] ; if rollover: Frequency += 1 - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION add hl, bc ld a, [hl] ld hl, CHANNEL_FIELD25 @@ -986,26 +987,26 @@ ApplyPitchWheel: ld a, 0 adc d ld d, a - ; Compare the dw at [Channel*PitchWheelTarget] to de. + ; Compare the dw at [Channel*PitchSlideTarget] to de. ; If frequency is greater, we're finished. ; Otherwise, load the frequency and set two flags. - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld a, [hl] cp d - jp c, .finished_pitch_wheel - jr nz, .continue_pitch_wheel - ld hl, CHANNEL_PITCH_WHEEL_TARGET + jp c, .finished_pitch_slide + jr nz, .continue_pitch_slide + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, [hl] cp e - jp c, .finished_pitch_wheel - jr .continue_pitch_wheel + jp c, .finished_pitch_slide + jr .continue_pitch_slide .decreasing - ; frequency -= [Channel*PitchWheelAmount] + ; frequency -= [Channel*PitchSlideAmount] ld a, e - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT add hl, bc ld e, [hl] sub e @@ -1015,7 +1016,7 @@ ApplyPitchWheel: ld d, a ; [Channel*Field25] *= 2 ; if rollover: Frequency -= 1 - ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION + ld hl, CHANNEL_PITCH_SLIDE_AMOUNT_FRACTION add hl, bc ld a, [hl] add a @@ -1026,30 +1027,30 @@ ApplyPitchWheel: ld a, d sbc 0 ld d, a - ; Compare the dw at [Channel*PitchWheelTarget] to de. + ; Compare the dw at [Channel*PitchSlideTarget] to de. ; If frequency is lower, we're finished. ; Otherwise, load the frequency and set two flags. - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld a, d cp [hl] - jr c, .finished_pitch_wheel - jr nz, .continue_pitch_wheel - ld hl, CHANNEL_PITCH_WHEEL_TARGET + jr c, .finished_pitch_slide + jr nz, .continue_pitch_slide + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld a, e cp [hl] - jr nc, .continue_pitch_wheel -.finished_pitch_wheel + jr nc, .continue_pitch_slide +.finished_pitch_slide ld hl, CHANNEL_FLAGS2 add hl, bc - res SOUND_PITCH_WHEEL, [hl] + res SOUND_PITCH_SLIDE, [hl] ld hl, CHANNEL_FLAGS3 add hl, bc - res SOUND_PITCH_WHEEL_DIR, [hl] + res SOUND_PITCH_SLIDE_DIR, [hl] ret -.continue_pitch_wheel +.continue_pitch_slide ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], e @@ -1092,7 +1093,7 @@ ReadNoiseSample: ; [wx] [yy] [zz] ; w: ? either 2 or 3 ; x: duration -; zz: intensity +; zz: volume envelope ; yy: frequency ; de = [wNoiseSampleAddress] @@ -1109,7 +1110,7 @@ ReadNoiseSample: ld a, [de] inc de - cp endchannel_cmd + cp sound_ret_cmd jr z, .quit and $f @@ -1117,7 +1118,7 @@ ReadNoiseSample: ld [wNoiseSampleDelay], a ld a, [de] inc de - ld [wCurTrackIntensity], a + ld [wCurTrackVolumeEnvelope], a ld a, [de] inc de ld [wCurTrackFrequency], a @@ -1140,11 +1141,10 @@ ReadNoiseSample: ParseMusic: ; parses until a note is read or the song is ended call GetMusicByte ; store next byte in a - cp endchannel_cmd - jr z, .endchannel + cp sound_ret_cmd + jr z, .sound_ret cp FIRST_MUSIC_CMD jr c, .readnote - ; then it's a command .readcommand call ParseMusicCommand jr ParseMusic ; start over @@ -1169,7 +1169,7 @@ ParseMusic: ld a, [wCurMusicByte] swap a and $f - jr z, .rest ; pitch 0-> rest + jr z, .rest ; pitch 0 -> rest ; update pitch ld hl, CHANNEL_PITCH add hl, bc @@ -1200,7 +1200,7 @@ ParseMusic: set NOTE_REST, [hl] ; Rest ret -.endchannel +.sound_ret ; $ff is reached in music data ld hl, CHANNEL_FLAGS1 add hl, bc @@ -1251,10 +1251,10 @@ RestoreVolume: cp CHAN5 ret nz xor a - ld hl, wChannel6CryPitch + ld hl, wChannel6PitchOffset ld [hli], a ld [hl], a - ld hl, wChannel8CryPitch + ld hl, wChannel8PitchOffset ld [hli], a ld [hl], a ld a, [wLastVolume] @@ -1272,9 +1272,9 @@ ParseSFXOrRest: ; update note duration ld a, [wCurMusicByte] call SetNoteDuration ; top nybble doesnt matter? - ; update intensity from next param + ; update volume envelope from next param call GetMusicByte - ld hl, CHANNEL_INTENSITY + ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc ld [hl], a ; update lo frequency from next param @@ -1298,7 +1298,7 @@ GetNoiseSample: ; load ptr to sample header in wNoiseSampleAddress ; are we on the last channel? ld a, [wCurChannel] - and NUM_MUSIC_CHANS + -1 + and NUM_MUSIC_CHANS - 1 cp CHAN4 ; ret if not ret nz @@ -1368,40 +1368,40 @@ ParseMusicCommand: jp hl MusicCommands: -; entries correspond to macros/sound.asm enumeration - dw Music_Octave8 ; octave 8 - dw Music_Octave7 ; octave 7 - dw Music_Octave6 ; octave 6 - dw Music_Octave5 ; octave 5 - dw Music_Octave4 ; octave 4 - dw Music_Octave3 ; octave 3 - dw Music_Octave2 ; octave 2 - dw Music_Octave1 ; octave 1 - dw Music_NoteType ; note length + intensity - dw Music_ForceOctave ; set starting octave - dw Music_Tempo ; tempo - dw Music_DutyCycle ; duty cycle - dw Music_Intensity ; intensity - dw Music_SoundStatus ; update sound status - dw Music_SoundDuty ; sfx duty - dw Music_ToggleSFX ; sound on/off - dw Music_SlidePitchTo ; pitch wheel - dw Music_Vibrato ; vibrato +; entries correspond to audio constants (see macros/scripts/audio.asm) + dw Music_Octave8 + dw Music_Octave7 + dw Music_Octave6 + dw Music_Octave5 + dw Music_Octave4 + dw Music_Octave3 + dw Music_Octave2 + dw Music_Octave1 + dw Music_NoteType ; note length + volume envelope + dw Music_Transpose + dw Music_Tempo + dw Music_DutyCycle + dw Music_VolumeEnvelope + dw Music_PitchSweep + dw Music_DutyCyclePattern + dw Music_ToggleSFX + dw Music_PitchSlide + dw Music_Vibrato dw MusicE2 ; unused - dw Music_ToggleNoise ; music noise sampling - dw Music_Panning ; force panning - dw Music_Volume ; volume - dw Music_Tone ; tone + dw Music_ToggleNoise + dw Music_ForceStereoPanning + dw Music_Volume + dw Music_PitchOffset dw MusicE7 ; unused dw MusicE8 ; unused - dw Music_TempoRelative ; global tempo - dw Music_RestartChannel ; restart current channel from header - dw Music_NewSong ; new song - dw Music_SFXPriorityOn ; sfx priority on - dw Music_SFXPriorityOff ; sfx priority off + dw Music_TempoRelative + dw Music_RestartChannel + dw Music_NewSong + dw Music_SFXPriorityOn + dw Music_SFXPriorityOff dw MusicEE ; unused - dw Music_StereoPanning ; stereo panning - dw Music_SFXToggleNoise ; sfx noise sampling + dw Music_StereoPanning + dw Music_SFXToggleNoise dw MusicF1 ; nothing dw MusicF2 ; nothing dw MusicF3 ; nothing @@ -1411,12 +1411,12 @@ MusicCommands: dw MusicF7 ; nothing dw MusicF8 ; nothing dw MusicF9 ; unused - dw Music_SetCondition ; setcondition - dw Music_JumpIf ; jumpif - dw Music_JumpChannel ; jump - dw Music_LoopChannel ; loop - dw Music_CallChannel ; call - dw Music_EndChannel ; return + dw Music_SetCondition + dw Music_JumpIf + dw Music_Jump + dw Music_Loop + dw Music_Call + dw Music_Ret MusicF1: MusicF2: @@ -1462,7 +1462,7 @@ MusicF6: MusicF7: ;notetype1 call GetMusicByte - ld hl, CHANNEL_INTENSITY + ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc rla rla @@ -1481,7 +1481,7 @@ MusicF7: MusicF8: ;notetype2 call GetMusicByte - ld hl, CHANNEL_INTENSITY + ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc push bc ld b, a @@ -1492,7 +1492,7 @@ MusicF8: ld [hl], a ret -Music_EndChannel: +Music_Ret: ; called when $ff is encountered w/ subroutine flag set ; end music stream ; return to caller of the subroutine @@ -1513,7 +1513,7 @@ Music_EndChannel: ld [hl], d ret -Music_CallChannel: +Music_Call: ; call music stream (subroutine) ; parameters: ll hh ; pointer to subroutine ; get pointer from next 2 bytes @@ -1546,7 +1546,7 @@ Music_CallChannel: set SOUND_SUBROUTINE, [hl] ret -Music_JumpChannel: +Music_Jump: ; jump ; parameters: ll hh ; pointer ; get pointer from next 2 bytes @@ -1561,7 +1561,7 @@ Music_JumpChannel: ld [hl], d ret -Music_LoopChannel: +Music_Loop: ; loops xx - 1 times ; 00: infinite ; params: 3 @@ -1682,9 +1682,9 @@ Music_JumpIf: ret MusicEE: +; unused ; conditional jump ; checks a byte in ram corresponding to the current channel -; doesn't seem to be set by any commands ; params: 2 ; ll hh ; pointer @@ -1734,15 +1734,15 @@ MusicEE: ret MusicF9: +; unused ; sets some flag -; seems to be unused ; params: 0 ld a, TRUE ld [wUnusedMusicF9Flag], a ret MusicE2: -; seems to have been dummied out +; unused ; params: 1 call GetMusicByte ld hl, CHANNEL_FIELD2C @@ -1808,8 +1808,8 @@ Music_Vibrato: ld [hl], a ret -Music_SlidePitchTo: -; set the target for pitch wheel +Music_PitchSlide: +; set the target for pitch slide ; params: 2 ; note duration ; target note @@ -1828,24 +1828,25 @@ Music_SlidePitchTo: and $f ld d, a call GetFrequency - ld hl, CHANNEL_PITCH_WHEEL_TARGET + ld hl, CHANNEL_PITCH_SLIDE_TARGET add hl, bc ld [hl], e - ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 + ld hl, CHANNEL_PITCH_SLIDE_TARGET + 1 add hl, bc ld [hl], d ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_PITCH_WHEEL, [hl] + set SOUND_PITCH_SLIDE, [hl] ret -Music_Tone: +Music_PitchOffset: ; tone ; params: 1 (dw) +; offset to add to each note frequency ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_CRY_PITCH, [hl] - ld hl, CHANNEL_CRY_PITCH + 1 + set SOUND_PITCH_OFFSET, [hl] + ld hl, CHANNEL_PITCH_OFFSET + 1 add hl, bc call GetMusicByte ld [hld], a @@ -1865,17 +1866,17 @@ MusicE7: ld [hl], a ret -Music_SoundDuty: +Music_DutyCyclePattern: ; sequence of 4 duty cycles to be looped ; params: 1 (4 2-bit duty cycle arguments) ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_DUTY, [hl] ; duty cycle + set SOUND_DUTY_LOOP, [hl] ; duty cycle looping ; sound duty sequence call GetMusicByte rrca rrca - ld hl, CHANNEL_SFX_DUTY_LOOP + ld hl, CHANNEL_DUTY_CYCLE_PATTERN add hl, bc ld [hl], a ; update duty cycle @@ -1957,7 +1958,7 @@ Music_SFXToggleNoise: Music_NoteType: ; note length ; # frames per 16th note -; intensity: see Music_Intensity +; volume envelope: see Music_VolumeEnvelope ; params: 2 ; note length call GetMusicByte @@ -1968,18 +1969,18 @@ Music_NoteType: maskbits NUM_MUSIC_CHANS cp CHAN4 ret z - ; intensity - call Music_Intensity + ; volume envelope + call Music_VolumeEnvelope ret -Music_SoundStatus: -; update sound status +Music_PitchSweep: +; update pitch sweep ; params: 1 call GetMusicByte - ld [wSoundInput], a + ld [wPitchSweep], a ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set NOTE_UNKN_3, [hl] + set NOTE_PITCH_SWEEP, [hl] ret Music_DutyCycle: @@ -1994,13 +1995,13 @@ Music_DutyCycle: ld [hl], a ret -Music_Intensity: -; intensity +Music_VolumeEnvelope: +; volume envelope ; params: 1 -; hi: pressure -; lo: velocity +; hi: volume +; lo: fade call GetMusicByte - ld hl, CHANNEL_INTENSITY + ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc ld [hl], a ret @@ -2032,12 +2033,12 @@ Music_Octave1: ld [hl], a ret -Music_ForceOctave: +Music_Transpose: ; set starting octave ; this forces all notes up by the starting octave ; params: 1 call GetMusicByte - ld hl, CHANNEL_PITCH_OFFSET + ld hl, CHANNEL_TRANSPOSITION add hl, bc ld [hl], a ret @@ -2048,12 +2049,12 @@ Music_StereoPanning: ; ; stereo on? ; ld a, [wOptions] ; bit STEREO, a -; jr nz, Music_Panning +; jr nz, Music_ForceStereoPanning ; ; skip param ; call GetMusicByte ; ret -Music_Panning: +Music_ForceStereoPanning: ; force panning ; params: 1 call SetLRTracks @@ -2173,29 +2174,23 @@ GetMusicByte: ; input: bc = start of current channel push hl push de - ; load address into de ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld a, [hli] ld e, a ld d, [hl] - ; load bank into a ld hl, CHANNEL_MUSIC_BANK add hl, bc ld a, [hl] - ; get byte - call _LoadMusicByte ; load data into wCurMusicByte + call _LoadMusicByte ; load data into [wCurMusicByte] inc de ; advance to next byte for next time this is called - ; update channeldata address ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld a, e ld [hli], a ld [hl], d - ; cleanup pop de pop hl - ; store channeldata in a ld a, [wCurMusicByte] ret @@ -2209,7 +2204,7 @@ GetFrequency: ; get octave ; get starting octave - ld hl, CHANNEL_PITCH_OFFSET + ld hl, CHANNEL_TRANSPOSITION add hl, bc ld a, [hl] swap a ; hi nybble @@ -2218,7 +2213,7 @@ GetFrequency: add d push af ; we'll use this later ; get starting octave - ld hl, CHANNEL_PITCH_OFFSET + ld hl, CHANNEL_TRANSPOSITION add hl, bc ld a, [hl] and $f ; lo nybble @@ -2257,7 +2252,6 @@ SetNoteDuration: inc a ld e, a ld d, 0 - ; store NoteLength in a ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld a, [hl] @@ -2372,7 +2366,6 @@ SetLRTracks: maskbits NUM_MUSIC_CHANS ld e, a ld d, 0 - ; get this channel's lr tracks call GetLRTracks add hl, de ; de = channel 0-3 ld a, [hl] @@ -2474,7 +2467,7 @@ _PlayCry:: inc a .loop push af - call LoadChannel + call LoadChannel ; bc = current channel ld hl, CHANNEL_FLAGS1 add hl, bc @@ -2482,9 +2475,9 @@ _PlayCry:: ld hl, CHANNEL_FLAGS2 add hl, bc - set SOUND_CRY_PITCH, [hl] + set SOUND_PITCH_OFFSET, [hl] - ld hl, CHANNEL_CRY_PITCH + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld a, [wCryPitch] ld [hli], a @@ -2517,7 +2510,7 @@ _PlayCry:: ; bit STEREO, a ; jr z, .next -; [Tracks] &= [wCryTracks] +; [CHANNEL_TRACKS] &= [wCryTracks] ld hl, CHANNEL_TRACKS add hl, bc ld a, [hl] @@ -2564,8 +2557,8 @@ _PlaySFX:: ld a, $80 ldh [rNR14], a ; restart sound (freq hi = 0) xor a - ld [wSoundInput], a ; global sound off - ldh [rNR10], a ; sweep = 0 + ld [wPitchSweep], a ; pitch sweep off + ldh [rNR10], a ; pitch sweep off .ch6 ld hl, wChannel6Flags1 bit SOUND_CHANNEL_ON, [hl] @@ -2749,13 +2742,11 @@ PlayStereoSFX:: ret LoadChannel: -; prep channel for use -; input: -; de: - ; get pointer to current channel +; input: de = audio pointer +; sets bc to current channel pointer call LoadMusicByte inc de - and $7 ; bit 0-2 (current channel) + maskbits NUM_CHANNELS ld [wCurChannel], a ld c, a ld b, 0 @@ -2877,7 +2868,7 @@ ChannelPointers: ClearChannels:: ; runs ClearChannel for all 4 channels -; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off +; doesn't seem to be used, but functionally identical to InitSound ld hl, rNR50 xor a ld [hli], a @@ -2908,3 +2899,23 @@ ClearChannel: ld a, $80 ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0) ret + +;PlayTrainerEncounterMusic:: +; input: e = trainer type +; ; turn fade off +; xor a +; ld [wMusicFade], a +; ; play nothing for one frame +; push de +; ld de, MUSIC_NONE +; call PlayMusic +; call DelayFrame +; ; play new song +; call MaxVolume +; pop de +; ld d, $00 +; ld hl, TrainerEncounterMusic +; add hl, de +; ld e, [hl] +; call PlayMusic +; ret diff --git a/crysaudio/enum.asm b/crysaudio/enum.asm deleted file mode 100644 index 4c1cb9b8..00000000 --- a/crysaudio/enum.asm +++ /dev/null @@ -1,23 +0,0 @@ -; Enumerate variables - -enum_start: MACRO -if _NARG >= 1 -__enum__ = \1 -else -__enum__ = 0 -endc -if _NARG >= 2 -__enumdir__ = \2 -else -__enumdir__ = +1 -endc -ENDM - -enum: MACRO -\1 = __enum__ -__enum__ = __enum__ + __enumdir__ -ENDM - -enum_set: MACRO -__enum__ = \1 -ENDM diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm new file mode 100644 index 00000000..fcfa08dc --- /dev/null +++ b/crysaudio/macros.asm @@ -0,0 +1,420 @@ +bigdw: MACRO ; big-endian word + dw ((\1)/$100) + (((\1)&$ff)*$100) +ENDM + +dt: MACRO ; three-byte (big-endian) + db (\1 >> 16) & $ff + db (\1 >> 8) & $ff + db \1 & $ff +ENDM + +inc_section: MACRO + SECTION \1, ROMX + include \1 ; "" ; trick scan_includes to ignore +ENDM + +maskbits: MACRO +; masks just enough bits to cover the first argument +; the second argument is an optional shift amount +; e.g. "maskbits 26" becomes "and %00011111" (since 26 - 1 = %00011001) +; and "maskbits 3, 2" becomes "and %00001100" (since "maskbits 3" becomes %00000011) +; example usage in rejection sampling: +; .loop +; call Random +; maskbits 26 +; cp 26 +; jr nc, .loop +x = 1 +rept 8 +if x + 1 < (\1) +x = x << 1 | 1 +endc +endr +if _NARG == 2 + and x << (\2) +else + and x +endc +ENDM + +audio_header: MACRO + db (_NARG - 2) << 6 | \2 + dw \1_\2 + IF _NARG > 2 + db \3 + dw \1_\3 + ENDC + IF _NARG > 3 + db \4 + dw \1_\4 + ENDC + IF _NARG > 4 + db \5 + dw \1_\5 + ENDC +ENDM + +channel_count: MACRO + assert 0 < (\1) && (\1) <= NUM_MUSIC_CHANS, \ + "channel_count must be 1-{d:NUM_MUSIC_CHANS}" +_num_channels = \1 - 1 +ENDM + +channel: MACRO + assert 0 < (\1) && (\1) <= NUM_CHANNELS, \ + "channel id must be 1-{d:NUM_CHANNELS}" + dn (_num_channels << 2), \1 - 1 ; channel id + dw \2 ; address +_num_channels = 0 +ENDM + +note: MACRO + dn (\1), (\2) - 1 ; pitch, length +ENDM + +drum_note: MACRO + note \1, \2 ; drum instrument, length +ENDM + +rest: MACRO + note 0, \1 ; length +ENDM + +square_note: MACRO + db \1 ; length + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC + dw \4 ; frequency +ENDM + +noise_note: MACRO + db \1 ; length + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC + db \4 ; frequency +ENDM + +; MusicCommands indexes (see audio/engine.asm) + const_def $d0 +FIRST_MUSIC_CMD EQU const_value + + const octave_cmd ; $d0 +octave: MACRO + assert 0 < (\1) && (\1) <= 8, "octave must be 1-8" + db octave_cmd | 8 - (\1) ; octave +ENDM + + const_skip 7 ; all octave values + + const note_type_cmd ; $d8 +note_type: MACRO + db note_type_cmd + db \1 ; note length + IF _NARG >= 2 + IF \3 < 0 + dn \2, %1000 | (\3 * -1) ; volume envelope + ELSE + dn \2, \3 ; volume envelope + ENDC + ENDC +ENDM + +; only valid on the noise channel +drum_speed: MACRO + note_type \1 ; note length +ENDM + + const transpose_cmd ; $d9 +transpose: MACRO + db transpose_cmd + dn \1, \2 ; num octaves, num pitches +ENDM + + const tempo_cmd ; $da +tempo: MACRO + db tempo_cmd + bigdw \1 ; tempo +ENDM + + const duty_cycle_cmd ; $db +duty_cycle: MACRO + db duty_cycle_cmd + db \1 ; duty cycle +ENDM + + const volume_envelope_cmd ; $dc +volume_envelope: MACRO + db volume_envelope_cmd + IF \2 < 0 + dn \1, %1000 | (\2 * -1) ; volume envelope + ELSE + dn \1, \2 ; volume envelope + ENDC +ENDM + + const pitch_sweep_cmd ; $dd +pitch_sweep: MACRO + db pitch_sweep_cmd + IF \2 < 0 + dn \1, %1000 | (\2 * -1) ; pitch sweep + ELSE + dn \1, \2 ; pitch sweep + ENDC +ENDM + + const duty_cycle_pattern_cmd ; $de +duty_cycle_pattern: MACRO + db duty_cycle_pattern_cmd + db (\1 << 6) | (\2 << 4) | (\3 << 2) | (\4 << 0) ; duty cycle pattern +ENDM + + const toggle_sfx_cmd ; $df +toggle_sfx: MACRO + db toggle_sfx_cmd +ENDM +execute_music EQUS "toggle_sfx" + + const pitch_slide_cmd ; $e0 +pitch_slide: MACRO + db pitch_slide_cmd + db \1 - 1 ; duration + dn 8 - \2, \3 % 12 ; octave, pitch +ENDM + + const vibrato_cmd ; $e1 +vibrato: MACRO + db vibrato_cmd + db \1 ; delay + IF _NARG > 2 + dn \2, \3 ; extent, rate + ELSE + db \2 ; LEGACY: Support for 1-arg extent + ENDC +ENDM + + const unknownmusic0xe2_cmd ; $e2 +unknownmusic0xe2: MACRO + db unknownmusic0xe2_cmd + db \1 ; unknown +ENDM + + const toggle_noise_cmd ; $e3 +toggle_noise: MACRO + db toggle_noise_cmd + IF _NARG > 0 + db \1 ; drum kit + ENDC +ENDM + + const force_stereo_panning_cmd ; $e4 +force_stereo_panning: MACRO + db force_stereo_panning_cmd + dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable +ENDM + + const volume_cmd ; $e5 +volume: MACRO + db volume_cmd + IF _NARG > 1 + dn \1, \2 ; left volume, right volume + ELSE + db \1 ; LEGACY: Support for 1-arg volume + ENDC +ENDM + + const pitch_offset_cmd ; $e6 +pitch_offset: MACRO + db pitch_offset_cmd + bigdw \1 ; pitch offset +ENDM + + const unknownmusic0xe7_cmd ; $e7 +unknownmusic0xe7: MACRO + db unknownmusic0xe7_cmd + db \1 ; unknown +ENDM + + const unknownmusic0xe8_cmd ; $e8 +unknownmusic0xe8: MACRO + db unknownmusic0xe8_cmd + db \1 ; unknown +ENDM + + const tempo_relative_cmd ; $e9 +tempo_relative: MACRO + db tempo_relative_cmd + bigdw \1 ; tempo adjustment +ENDM + + const restart_channel_cmd ; $ea +restart_channel: MACRO + db restart_channel_cmd + dw \1 ; address +ENDM + + const new_song_cmd ; $eb +new_song: MACRO + db new_song_cmd + bigdw \1 ; id +ENDM + + const sfx_priority_on_cmd ; $ec +sfx_priority_on: MACRO + db sfx_priority_on_cmd +ENDM + + const sfx_priority_off_cmd ; $ed +sfx_priority_off: MACRO + db sfx_priority_off_cmd +ENDM + + const unknownmusic0xee_cmd ; $ee +unknownmusic0xee: MACRO + db unknownmusic0xee_cmd + dw \1 ; address +ENDM + + const stereo_panning_cmd ; $ef +stereo_panning: MACRO + db stereo_panning_cmd + dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable +ENDM + + const sfx_toggle_noise_cmd ; $f0 +sfx_toggle_noise: MACRO + db sfx_toggle_noise_cmd + IF _NARG > 0 + db \1 ; drum kit + ENDC +ENDM + + const music0xf1_cmd ; $f1 +music0xf1: MACRO + db music0xf1_cmd +ENDM + + const music0xf2_cmd ; $f2 +music0xf2: MACRO + db music0xf2_cmd +ENDM + + const music0xf3_cmd ; $f3 +music0xf3: MACRO + db music0xf3_cmd +ENDM + + const music0xf4_cmd ; $f4 +music0xf4: MACRO + db music0xf4_cmd +ENDM + + const music0xf5_cmd ; $f5 +music0xf5: MACRO + db music0xf5_cmd +ENDM + + const music0xf6_cmd ; $f6 +music0xf6: MACRO + db music0xf6_cmd +ENDM + + const music0xf7_cmd ; $f7 +music0xf7: MACRO + db music0xf7_cmd +ENDM + + const music0xf8_cmd ; $f8 +music0xf8: MACRO + db music0xf8_cmd +ENDM + + const unknownmusic0xf9_cmd ; $f9 +unknownmusic0xf9: MACRO + db unknownmusic0xf9_cmd +ENDM + + const set_condition_cmd ; $fa +set_condition: MACRO + db set_condition_cmd + db \1 ; condition +ENDM + + const sound_jump_if_cmd ; $fb +sound_jump_if: MACRO + db sound_jump_if_cmd + db \1 ; condition + dw \2 ; address +ENDM + + const sound_jump_cmd ; $fc +sound_jump: MACRO + db sound_jump_cmd + dw \1 ; address +ENDM + + const sound_loop_cmd ; $fd +sound_loop: MACRO + db sound_loop_cmd + db \1 ; count + dw \2 ; address +ENDM + + const sound_call_cmd ; $fe +sound_call: MACRO + db sound_call_cmd + dw \1 ; address +ENDM + + const sound_ret_cmd ; $ff +sound_ret: MACRO + db sound_ret_cmd +ENDM + +; custom commands: + +load_wave: MACRO + db $f3 + IF _NARG > 16 + REPT 16 + dn \1, \2 + SHIFT + SHIFT + ENDR + ELSE + REPT 16 + db \1 + SHIFT + ENDR + ENDC +ENDM + +inc_octave: MACRO + db $f4 +ENDM + +dec_octave: MACRO + db $f5 +ENDM + +notetype0: MACRO + db $f6, \1 +ENDM + +notetype1: MACRO + db $f7, \1 +ENDM + +notetype2: MACRO + db $f8, \1 +ENDM + + +; not reimplemented yet +toggle_perfect_pitch: MACRO +ENDM diff --git a/crysaudio/music/RBY/bikeriding.asm b/crysaudio/music/RBY/bikeriding.asm index 18c3af09..93e1a5a4 100644 --- a/crysaudio/music/RBY/bikeriding.asm +++ b/crysaudio/music/RBY/bikeriding.asm @@ -1,15 +1,16 @@ Music_BikeRiding:: - musicheader 4, 1, Music_BikeRiding_Ch0 - musicheader 1, 2, Music_BikeRiding_Ch1 - musicheader 1, 3, Music_BikeRiding_Ch2 - musicheader 1, 4, Music_BikeRiding_Ch3 + channel_count 4 + channel 1, Music_BikeRiding_Ch1 + channel 2, Music_BikeRiding_Ch2 + channel 3, Music_BikeRiding_Ch3 + channel 4, Music_BikeRiding_Ch4 -Music_BikeRiding_Ch0:: +Music_BikeRiding_Ch1:: tempo 144 - volume $77 - dutycycle 3 - vibrato 8, $14 - notetype 12, $b5 + volume 7, 7 + duty_cycle 3 + vibrato 8, 1, 4 + note_type 12, 11, 5 octave 3 note G_, 2 @@ -42,9 +43,9 @@ Music_BikeRiding_branch_7dbc9:: note C_, 2 note D_, 2 note E_, 2 - notetype 12, $b6 + note_type 12, 11, 6 note F_, 10 - notetype 12, $a6 + note_type 12, 10, 6 note F_, 2 note E_, 2 note F_, 2 @@ -53,8 +54,8 @@ Music_BikeRiding_branch_7dbc9:: note D_, 2 note E_, 2 note F_, 6 - ;toggleperfectpitch - notetype 12, $b3 + ;toggle_perfect_pitch + note_type 12, 11, 3 note E_, 2 note D_, 2 note D_, 1 @@ -62,20 +63,20 @@ Music_BikeRiding_branch_7dbc9:: note F_, 2 note E_, 1 note F_, 1 - ;toggleperfectpitch - notetype 12, $b5 + ;toggle_perfect_pitch + note_type 12, 11, 5 note G_, 6 note G_, 6 note A_, 2 note F_, 2 note G_, 6 - notetype 12, $b4 + note_type 12, 11, 4 note G_, 2 note F_, 4 - notetype 12, $a4 + note_type 12, 10, 4 note E_, 2 note D_, 2 - notetype 12, $93 + note_type 12, 9, 3 octave 3 note A_, 2 octave 4 @@ -120,9 +121,9 @@ Music_BikeRiding_branch_7dbc9:: note B_, 1 octave 4 note C_, 4 - notetype 12, $3d + note_type 12, 3, -5 note C_, 4 - notetype 12, $b4 + note_type 12, 11, 4 note F_, 6 note G_, 4 note F_, 1 @@ -135,7 +136,7 @@ Music_BikeRiding_branch_7dbc9:: note E_, 1 note D_, 2 note C_, 2 - notetype 12, $b5 + note_type 12, 11, 5 octave 3 note A_, 4 octave 4 @@ -148,21 +149,21 @@ Music_BikeRiding_branch_7dbc9:: note F_, 4 note D_, 4 note F#, 4 - vibrato 10, $26 - notetype 12, $80 + vibrato 10, 2, 6 + note_type 12, 8, 0 note G_, 16 note G_, 4 - notetype 12, $87 + note_type 12, 8, 7 note G_, 12 - notetype 12, $b5 - vibrato 8, $14 - loopchannel 0, Music_BikeRiding_branch_7dbc9 + note_type 12, 11, 5 + vibrato 8, 1, 4 + sound_loop 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch1:: - dutycycle 2 - vibrato 6, $15 - notetype 12, $c3 +Music_BikeRiding_Ch2:: + duty_cycle 2 + vibrato 6, 1, 5 + note_type 12, 12, 3 octave 4 note C_, 2 @@ -192,11 +193,11 @@ Music_BikeRiding_branch_7dc75:: octave 4 note A_, 2 note G_, 4 - dutycycle 3 - notetype 12, $84 + duty_cycle 3 + note_type 12, 8, 4 note A#, 6 - dutycycle 2 - notetype 12, $c5 + duty_cycle 2 + note_type 12, 12, 5 octave 5 note C_, 2 octave 4 @@ -213,7 +214,7 @@ Music_BikeRiding_branch_7dc75:: note C_, 2 octave 4 note G_, 10 - notetype 12, $c3 + note_type 12, 12, 3 octave 5 note C_, 4 note E_, 2 @@ -223,18 +224,18 @@ Music_BikeRiding_branch_7dc75:: note B_, 2 octave 5 note C_, 2 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 10 note D_, 1 note C_, 1 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note B_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 12 - notetype 12, $c4 + note_type 12, 12, 4 note F_, 6 note F_, 2 note G_, 2 @@ -258,12 +259,12 @@ Music_BikeRiding_branch_7dc75:: note G_, 4 note F_, 2 note E_, 6 - notetype 6, $c2 + note_type 6, 12, 2 note F_, 1 note G_, 1 note A_, 1 note B_, 1 - notetype 12, $c3 + note_type 12, 12, 3 octave 5 note C_, 2 octave 4 @@ -280,7 +281,7 @@ Music_BikeRiding_branch_7dc75:: note G_, 4 note F_, 2 note E_, 2 - notetype 8, $c4 + note_type 8, 12, 4 note A_, 4 note G_, 4 note F_, 4 @@ -296,416 +297,416 @@ Music_BikeRiding_branch_7dc75:: note D_, 4 note E_, 4 note C_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 12 note C_, 4 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note B_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 12 - notetype 12, $c3 - loopchannel 0, Music_BikeRiding_branch_7dc75 + note_type 12, 12, 3 + sound_loop 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch2:: - notetype 12, $13 - note __, 2 +Music_BikeRiding_Ch3:: + note_type 12, 1, 3 + rest 2 Music_BikeRiding_branch_7dd17:: octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 - loopchannel 0, Music_BikeRiding_branch_7dd17 + rest 1 + sound_loop 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch3:: - togglenoise 1 - notetype 12 - note __, 2 +Music_BikeRiding_Ch4:: + toggle_noise 1 + drum_speed 12 + rest 2 Music_BikeRiding_branch_7de6a:: - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - loopchannel 0, 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:: - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - endchannel + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + sound_ret Music_BikeRiding_branch_7deb4:: - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - note G#, 2 - note G#, 2 - endchannel + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + drum_note 9, 2 + drum_note 9, 2 + sound_ret Music_BikeRiding_branch_7dec2:: - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - note __, 2 - note G#, 2 - note __, 2 - note G#, 1 - note G#, 1 - endchannel + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 2 + rest 2 + drum_note 9, 1 + drum_note 9, 1 + sound_ret diff --git a/crysaudio/music/RBY/celadon.asm b/crysaudio/music/RBY/celadon.asm index e180ef10..bb050e94 100644 --- a/crysaudio/music/RBY/celadon.asm +++ b/crysaudio/music/RBY/celadon.asm @@ -1,21 +1,22 @@ Music_Celadon:: - musicheader 3, 1, Music_Celadon_Ch0 - musicheader 1, 2, Music_Celadon_Ch1 - musicheader 1, 3, Music_Celadon_Ch2 + channel_count 3 + channel 1, Music_Celadon_Ch1 + channel 2, Music_Celadon_Ch2 + channel 3, Music_Celadon_Ch3 -Music_Celadon_Ch0:: +Music_Celadon_Ch1:: tempo 144 - volume $77 - dutycycle 3 - ;toggleperfectpitch - notetype 12, $2f - note __, 8 + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + note_type 12, 2, -7 + rest 8 octave 3 note D_, 8 Music_Celadon_branch_b6d4:: - dutycycle 2 - notetype 12, $b2 + duty_cycle 2 + note_type 12, 11, 2 note G_, 4 note B_, 4 note G_, 2 @@ -76,7 +77,7 @@ Music_Celadon_branch_b6d4:: note F#, 1 note G_, 1 note A_, 8 - notetype 12, $94 + note_type 12, 9, 4 note B_, 8 note G_, 4 note D_, 4 @@ -109,12 +110,12 @@ Music_Celadon_branch_b6d4:: note G_, 4 note F#, 4 note A_, 4 - loopchannel 0, Music_Celadon_branch_b6d4 + sound_loop 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch1:: - dutycycle 3 - notetype 12, $c2 +Music_Celadon_Ch2:: + duty_cycle 3 + note_type 12, 12, 2 octave 4 note D_, 1 note C#, 1 @@ -124,12 +125,12 @@ Music_Celadon_Ch1:: note E_, 1 note F#, 1 note G_, 1 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 8 Music_Celadon_branch_b74a:: - dutycycle 2 - notetype 12, $c2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 note B_, 4 note G_, 4 @@ -183,7 +184,7 @@ Music_Celadon_branch_b74a:: note D_, 8 octave 5 note D_, 8 - notetype 12, $b4 + note_type 12, 11, 4 octave 4 note D_, 8 note C_, 2 @@ -228,12 +229,12 @@ Music_Celadon_branch_b74a:: note D_, 2 note E_, 2 note D_, 8 - loopchannel 0, Music_Celadon_branch_b74a + sound_loop 0, Music_Celadon_branch_b74a -Music_Celadon_Ch2:: - notetype 12, $13 - note __, 8 +Music_Celadon_Ch3:: + note_type 12, 1, 3 + rest 8 octave 5 note D_, 1 note C#, 1 @@ -303,9 +304,9 @@ Music_Celadon_branch_b7c1:: note E_, 2 note C#, 2 note D_, 2 - note __, 6 + rest 6 note F#, 2 - note __, 4 + rest 4 note F#, 2 note G_, 2 octave 5 @@ -413,4 +414,4 @@ Music_Celadon_branch_b7c1:: note G_, 2 note F#, 2 note E_, 2 - loopchannel 0, Music_Celadon_branch_b7c1 + sound_loop 0, Music_Celadon_branch_b7c1 diff --git a/crysaudio/music/RBY/cinnabar.asm b/crysaudio/music/RBY/cinnabar.asm index 9fadd661..40a13cd9 100644 --- a/crysaudio/music/RBY/cinnabar.asm +++ b/crysaudio/music/RBY/cinnabar.asm @@ -1,40 +1,41 @@ Music_Cinnabar:: - musicheader 3, 1, Music_Cinnabar_Ch0 - musicheader 1, 2, Music_Cinnabar_Ch1 - musicheader 1, 3, Music_Cinnabar_Ch2 + channel_count 3 + channel 1, Music_Cinnabar_Ch1 + channel 2, Music_Cinnabar_Ch2 + channel 3, Music_Cinnabar_Ch3 -Music_Cinnabar_Ch0:: +Music_Cinnabar_Ch1:: tempo 144 - volume $77 - dutycycle 3 - vibrato 12, $34 - ;toggleperfectpitch + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + ;toggle_perfect_pitch Music_Cinnabar_branch_b878:: - notetype 12, $b5 - note __, 4 + note_type 12, 11, 5 + rest 4 octave 3 note D_, 4 note E_, 6 note C#, 2 - notetype 12, $b1 + note_type 12, 11, 1 note D_, 4 - notetype 12, $b5 + note_type 12, 11, 5 note B_, 4 octave 4 note C_, 6 octave 3 note A_, 2 - notetype 12, $b1 + note_type 12, 11, 1 note B_, 4 - notetype 12, $b5 + note_type 12, 11, 5 note G_, 4 note F#, 4 note E_, 2 note F#, 2 - notetype 12, $b1 + note_type 12, 11, 1 note G_, 4 - notetype 12, $b5 + note_type 12, 11, 5 note G_, 4 note F#, 4 note E_, 4 @@ -42,9 +43,9 @@ Music_Cinnabar_branch_b878:: note E_, 4 note F#, 6 note A_, 2 - notetype 12, $b1 + note_type 12, 11, 1 note G_, 4 - notetype 12, $b5 + note_type 12, 11, 5 note B_, 4 octave 4 note C_, 6 @@ -56,17 +57,17 @@ Music_Cinnabar_branch_b878:: note E_, 1 note F#, 2 note A_, 2 - notetype 12, $a2 + note_type 12, 10, 2 note G_, 4 octave 4 note D_, 1 note E_, 1 note D_, 4 - notetype 12, $72 + note_type 12, 7, 2 note D_, 1 note E_, 1 note D_, 4 - notetype 12, $a7 + note_type 12, 10, 7 octave 3 note B_, 6 note G_, 2 @@ -87,15 +88,15 @@ Music_Cinnabar_branch_b878:: note G_, 8 note F#, 4 note E_, 4 - loopchannel 0, Music_Cinnabar_branch_b878 + sound_loop 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch1:: - dutycycle 3 - vibrato 10, $23 +Music_Cinnabar_Ch2:: + duty_cycle 3 + vibrato 10, 2, 3 Music_Cinnabar_branch_b8d9:: - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note G_, 6 note A_, 1 @@ -104,9 +105,9 @@ Music_Cinnabar_branch_b8d9:: note C_, 6 note D_, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 4 note A_, 6 note G_, 1 @@ -120,9 +121,9 @@ Music_Cinnabar_branch_b8d9:: note C_, 2 note D_, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 4 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 8 note A_, 4 @@ -133,9 +134,9 @@ Music_Cinnabar_branch_b8d9:: note C_, 6 note D_, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 4 note A_, 6 note G_, 1 @@ -149,14 +150,14 @@ Music_Cinnabar_branch_b8d9:: note C_, 2 note D_, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 4 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note A_, 4 note G_, 4 note F#, 4 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note D_, 6 octave 3 @@ -181,179 +182,179 @@ Music_Cinnabar_branch_b8d9:: octave 3 note B_, 2 note A_, 6 - loopchannel 0, Music_Cinnabar_branch_b8d9 + sound_loop 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch2:: - notetype 12, $10 +Music_Cinnabar_Ch3:: + note_type 12, 1, 0 Music_Cinnabar_branch_b93f:: octave 4 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 2 note G_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note B_, 4 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 4 octave 4 note B_, 1 - note __, 3 + rest 3 octave 5 note D_, 2 octave 4 note B_, 1 note B_, 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 octave 4 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 octave 5 note E_, 2 note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 3 + rest 3 octave 5 note A_, 2 note F#, 1 note F#, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 3 + rest 3 octave 5 note D_, 2 note C_, 1 note C_, 1 octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 2 octave 5 note C_, 1 - note __, 1 - loopchannel 0, Music_Cinnabar_branch_b93f + rest 1 + sound_loop 0, Music_Cinnabar_branch_b93f diff --git a/crysaudio/music/RBY/cinnabarmansion.asm b/crysaudio/music/RBY/cinnabarmansion.asm index 8b255e29..572d9c84 100644 --- a/crysaudio/music/RBY/cinnabarmansion.asm +++ b/crysaudio/music/RBY/cinnabarmansion.asm @@ -1,17 +1,18 @@ Music_CinnabarMansion:: - musicheader 4, 1, Music_CinnabarMansion_Ch0 - musicheader 1, 2, Music_CinnabarMansion_Ch1 - musicheader 1, 3, Music_CinnabarMansion_Ch2 - musicheader 1, 4, Music_CinnabarMansion_Ch3 + channel_count 4 + channel 1, Music_CinnabarMansion_Ch1 + channel 2, Music_CinnabarMansion_Ch2 + channel 3, Music_CinnabarMansion_Ch3 + channel 4, Music_CinnabarMansion_Ch4 -Music_CinnabarMansion_Ch0:: +Music_CinnabarMansion_Ch1:: tempo 144 - volume $77 - vibrato 11, $25 - dutycycle 2 + volume 7, 7 + vibrato 11, 2, 5 + duty_cycle 2 Music_CinnabarMansion_branch_7ed19:: - notetype 12, $62 + note_type 12, 6, 2 octave 5 note E_, 1 note E_, 1 @@ -19,7 +20,7 @@ Music_CinnabarMansion_branch_7ed19:: note B_, 1 note B_, 1 note C_, 1 - note __, 2 + rest 2 octave 5 note B_, 2 note E_, 2 @@ -30,37 +31,37 @@ Music_CinnabarMansion_branch_7ed19:: note C_, 1 octave 5 note B_, 1 - note __, 2 - loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, $a5 - note __, 16 - note __, 16 - note __, 15 + rest 2 + sound_loop 14, Music_CinnabarMansion_branch_7ed19 + note_type 12, 10, 5 + rest 16 + rest 16 + rest 15 octave 4 note C_, 1 octave 5 note B_, 1 note B_, 2 - loopchannel 0, Music_CinnabarMansion_branch_7ed19 + sound_loop 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch1:: - dutycycle 2 - ;toggleperfectpitch - vibrato 10, $24 - notetype 12, $c2 +Music_CinnabarMansion_Ch2:: + duty_cycle 2 + ;toggle_perfect_pitch + vibrato 10, 2, 4 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed48:: - note __, 16 - note __, 16 - loopchannel 4, Music_CinnabarMansion_branch_7ed48 + rest 16 + rest 16 + sound_loop 4, Music_CinnabarMansion_branch_7ed48 Music_CinnabarMansion_branch_7ed4e:: - notetype 12, $c2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed50:: - callchannel Music_CinnabarMansion_branch_7ed6c - loopchannel 3, Music_CinnabarMansion_branch_7ed50 + sound_call Music_CinnabarMansion_branch_7ed6c + sound_loop 3, Music_CinnabarMansion_branch_7ed50 octave 3 note E_, 4 note D#, 4 @@ -68,7 +69,7 @@ Music_CinnabarMansion_branch_7ed50:: note A#, 4 note G_, 4 note G#, 4 - note __, 4 + rest 4 note A#, 4 note E_, 4 note D#, 4 @@ -78,7 +79,7 @@ Music_CinnabarMansion_branch_7ed50:: note G#, 4 note G_, 4 note D#, 4 - loopchannel 0, Music_CinnabarMansion_branch_7ed4e + sound_loop 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 @@ -96,84 +97,84 @@ Music_CinnabarMansion_branch_7ed6c:: note A#, 4 note G_, 4 note G#, 4 - note __, 4 + rest 4 note A#, 4 - endchannel + sound_ret -Music_CinnabarMansion_Ch2:: - notetype 12, $11 +Music_CinnabarMansion_Ch3:: + note_type 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - loopchannel 8, Music_CinnabarMansion_branch_7ed80 + rest 2 + sound_loop 8, Music_CinnabarMansion_branch_7ed80 note E_, 16 note D#, 16 note G_, 16 note G#, 8 note D#, 8 - loopchannel 0, Music_CinnabarMansion_branch_7ed80 + sound_loop 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch3:: - togglenoise 1 - notetype 6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 +Music_CinnabarMansion_Ch4:: + toggle_noise 1 + drum_speed 6 + rest 16 + rest 16 + rest 16 + rest 16 Music_CinnabarMansion_branch_7edb5:: - note E_, 2 - note E_, 2 - note F_, 4 - note E_, 2 - note E_, 2 - note F_, 4 - note E_, 2 - note E_, 2 - note F_, 4 - note E_, 2 - note E_, 2 - note F#, 4 - note E_, 2 - note E_, 2 - note __, 2 - note __, 10 - note __, 8 - note F#, 8 - loopchannel 0, Music_CinnabarMansion_branch_7edb5 + drum_note 5, 2 + drum_note 5, 2 + drum_note 6, 4 + drum_note 5, 2 + drum_note 5, 2 + drum_note 6, 4 + drum_note 5, 2 + drum_note 5, 2 + drum_note 6, 4 + drum_note 5, 2 + drum_note 5, 2 + drum_note 7, 4 + drum_note 5, 2 + drum_note 5, 2 + rest 2 + rest 10 + rest 8 + drum_note 7, 8 + sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm index 723de9c1..dbd83d29 100644 --- a/crysaudio/music/RBY/cities1.asm +++ b/crysaudio/music/RBY/cities1.asm @@ -1,23 +1,24 @@ Music_Cities1:: - musicheader 4, 1, Music_Cities1_Ch0 - musicheader 1, 2, Music_Cities1_Ch1 - musicheader 1, 3, Music_Cities1_Ch2 - musicheader 1, 4, Music_Cities1_Ch3 + channel_count 4 + channel 1, Music_Cities1_Ch1 + channel 2, Music_Cities1_Ch2 + channel 3, Music_Cities1_Ch3 + channel 4, Music_Cities1_Ch4 Music_Cities1_branch_aa6f:: tempo 232 - loopchannel 0, Music_Cities1_branch_aa79 + sound_loop 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch0:: +Music_Cities1_Ch1:: tempo 144 Music_Cities1_branch_aa79:: - volume $77 - vibrato 8, $24 - dutycycle 3 + volume 7, 7 + vibrato 8, 2, 4 + duty_cycle 3 Music_Cities1_branch_aa80:: - notetype 12, $c5 + note_type 12, 12, 5 octave 3 note G#, 4 note F#, 4 @@ -35,7 +36,7 @@ Music_Cities1_branch_aa80:: note C#, 2 note E_, 2 note E_, 4 - notetype 12, $a5 + note_type 12, 10, 5 note C#, 4 octave 2 note B_, 6 @@ -44,14 +45,14 @@ Music_Cities1_branch_aa80:: note C#, 4 octave 2 note B_, 4 - notetype 12, $c5 - callchannel Music_Cities1_branch_ab7d + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 note D#, 6 note E_, 2 octave 2 note B_, 4 - notetype 12, $a5 + note_type 12, 10, 5 octave 3 note C#, 2 octave 2 @@ -66,7 +67,7 @@ Music_Cities1_branch_aa80:: note D#, 2 note C#, 2 note D#, 2 - notetype 12, $c5 + note_type 12, 12, 5 note G#, 2 note E_, 2 note F#, 2 @@ -84,7 +85,7 @@ Music_Cities1_branch_aa80:: note C#, 2 note E_, 2 note E_, 4 - notetype 12, $a5 + note_type 12, 10, 5 note C#, 2 octave 2 note A_, 2 @@ -95,8 +96,8 @@ Music_Cities1_branch_aa80:: octave 2 note B_, 2 note B_, 4 - notetype 12, $c5 - callchannel Music_Cities1_branch_ab7d + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 note D#, 4 note D#, 2 @@ -111,7 +112,7 @@ Music_Cities1_branch_aa80:: note B_, 2 octave 3 note E_, 2 - notetype 12, $a5 + note_type 12, 10, 5 note C#, 4 octave 2 note B_, 2 @@ -119,8 +120,8 @@ Music_Cities1_branch_aa80:: note D#, 4 note C#, 2 note E_, 4 - notetype 12, $b3 - callchannel Music_Cities1_branch_ab8a + note_type 12, 11, 3 + sound_call Music_Cities1_branch_ab8a note A_, 2 note B_, 2 note A_, 2 @@ -159,7 +160,7 @@ Music_Cities1_branch_ab12:: octave 3 note C#, 2 note D#, 2 - loopchannel 2, Music_Cities1_branch_ab12 + sound_loop 2, Music_Cities1_branch_ab12 note E_, 2 octave 2 note B_, 4 @@ -186,7 +187,7 @@ Music_Cities1_branch_ab12:: octave 2 note B_, 2 octave 3 - callchannel Music_Cities1_branch_ab8a + sound_call Music_Cities1_branch_ab8a note A_, 2 note E_, 2 note A_, 2 @@ -235,18 +236,18 @@ Music_Cities1_branch_ab12:: note B_, 2 octave 3 note D#, 2 - notetype 12, $b6 + note_type 12, 11, 6 note F#, 8 note F#, 4 note D#, 4 note E_, 8 - notetype 12, $84 + note_type 12, 8, 4 octave 2 note B_, 4 octave 3 note E_, 2 note F#, 2 - loopchannel 0, Music_Cities1_branch_aa80 + sound_loop 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 @@ -261,7 +262,7 @@ Music_Cities1_branch_ab7d:: note C#, 2 note D#, 2 note C#, 2 - endchannel + sound_ret Music_Cities1_branch_ab8a:: note A_, 2 @@ -271,37 +272,37 @@ Music_Cities1_branch_ab8a:: note A_, 2 note C#, 2 note E_, 2 - endchannel + sound_ret -Music_Cities1_Ch1:: - vibrato 5, $15 - callchannel Music_Cities1_branch_ac00 +Music_Cities1_Ch2:: + vibrato 5, 1, 5 + sound_call Music_Cities1_branch_ac00 octave 4 note G#, 2 - notetype 12, $c4 + note_type 12, 12, 4 note E_, 6 - notetype 12, $c5 - dutycycle 3 + note_type 12, 12, 5 + duty_cycle 3 octave 3 note C#, 4 note D#, 4 note E_, 6 note F#, 6 note G#, 4 - callchannel Music_Cities1_branch_ac00 + sound_call Music_Cities1_branch_ac00 octave 4 note G#, 2 - notetype 12, $c4 + note_type 12, 12, 4 note E_, 14 - dutycycle 3 + duty_cycle 3 octave 3 note E_, 6 note F#, 6 note G#, 4 - notetype 12, $b7 - dutycycle 2 - vibrato 8, $17 + note_type 12, 11, 7 + duty_cycle 2 + vibrato 8, 1, 7 octave 5 note C#, 12 octave 4 @@ -353,27 +354,27 @@ Music_Cities1_Ch1:: note B_, 4 note A_, 4 note F#, 4 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 octave 5 note C_, 8 octave 4 note B_, 14 - notetype 12, $84 + note_type 12, 8, 4 note G#, 1 - notetype 12, $a4 + note_type 12, 10, 4 note A_, 1 - loopchannel 0, Music_Cities1_Ch1 + sound_loop 0, Music_Cities1_Ch2 Music_Cities1_branch_ac00:: - dutycycle 2 - notetype 12, $c3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 note B_, 4 note A_, 4 - notetype 12, $c4 + note_type 12, 12, 4 note G#, 10 - notetype 12, $c3 + note_type 12, 12, 3 note G#, 2 note A_, 2 note B_, 4 @@ -381,70 +382,70 @@ Music_Cities1_branch_ac00:: note A_, 2 note G#, 2 note A_, 2 - notetype 12, $c4 + note_type 12, 12, 4 note F#, 10 - notetype 12, $c5 - dutycycle 3 + note_type 12, 12, 5 + duty_cycle 3 octave 3 note E_, 4 note D#, 8 note E_, 4 note F#, 4 - notetype 12, $c3 - dutycycle 2 + note_type 12, 12, 3 + duty_cycle 2 octave 4 note A_, 4 note G#, 4 - notetype 12, $c4 + note_type 12, 12, 4 note F#, 10 - notetype 12, $c3 + note_type 12, 12, 3 note F#, 2 note G#, 2 note A_, 4 note A_, 2 note G#, 2 note F#, 2 - endchannel + sound_ret -Music_Cities1_Ch2:: - notetype 12, $11 - ;toggleperfectpitch +Music_Cities1_Ch3:: + note_type 12, 1, 1 + ;toggle_perfect_pitch Music_Cities1_branch_ac35:: - vibrato 0, $00 + vibrato 0, 0, 0 octave 4 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce note G#, 2 note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 - callchannel Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acc5 note B_, 2 note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce note G#, 2 note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 note G#, 2 note E_, 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note E_, 2 @@ -452,7 +453,7 @@ Music_Cities1_branch_ac35:: note E_, 2 note B_, 2 note E_, 2 - vibrato 8, $25 + vibrato 8, 2, 5 note A_, 8 note E_, 8 note A_, 8 @@ -480,11 +481,11 @@ Music_Cities1_branch_ac35:: note G#, 2 note E_, 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 @@ -505,11 +506,11 @@ Music_Cities1_branch_ac35:: note E_, 4 note F#, 4 note G#, 4 - note __, 2 + rest 2 note D#, 2 note E_, 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note B_, 2 note A_, 2 @@ -519,11 +520,11 @@ Music_Cities1_branch_ac35:: note D#, 2 note A_, 2 note F#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 1 note G#, 1 @@ -536,33 +537,33 @@ Music_Cities1_branch_ac35:: note A_, 2 note G#, 2 note F#, 2 - loopchannel 0, Music_Cities1_branch_ac35 + sound_loop 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G#, 2 - endchannel + sound_ret Music_Cities1_branch_acce:: note A_, 2 note F#, 2 note G#, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 note G#, 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note G#, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 note G#, 2 note F#, 2 @@ -570,95 +571,95 @@ Music_Cities1_branch_acce:: note D#, 2 note E_, 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note E_, 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note E_, 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note E_, 2 note F#, 2 - endchannel + sound_ret -Music_Cities1_Ch3:: - togglenoise 0 - notetype 12 - callchannel Music_Cities1_branch_ad36 +Music_Cities1_Ch4:: + toggle_noise 0 + drum_speed 12 + sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad45 - callchannel Music_Cities1_branch_ad45 - loopchannel 2, Music_Cities1_branch_acf3 - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 - note F_, 6 - note F_, 6 - note F#, 4 - callchannel Music_Cities1_branch_ad6e - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 - callchannel Music_Cities1_branch_ad6e - callchannel Music_Cities1_branch_ad52 - note F_, 6 - note F_, 6 - note F#, 2 - note F_, 2 - note F_, 6 - note F_, 6 - note F_, 4 - note F_, 6 - note G_, 6 - note G_, 4 - loopchannel 0, Music_Cities1_Ch3 + 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 + 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 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - note G_, 6 - note G_, 6 - note G_, 4 - note G_, 6 - note G_, 6 - note G_, 2 - note G_, 2 - endchannel + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 2 + drum_note 8, 2 + sound_ret Music_Cities1_branch_ad45:: - note G_, 6 - note G_, 6 - note G_, 4 - note G_, 6 - note G_, 6 - note G_, 4 - endchannel + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_ret Music_Cities1_branch_ad52:: - note F_, 6 - note F_, 6 - note F#, 4 - note F_, 6 - note F_, 6 - note F#, 4 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + sound_ret Music_Cities1_branch_ad5f:: - note F_, 6 - note F_, 6 - note F#, 4 - note F_, 6 - note F_, 6 - note F#, 2 - note F_, 2 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + sound_ret Music_Cities1_branch_ad6e:: - note F_, 6 - note F_, 6 - note F#, 2 - note F#, 2 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 7, 2 + sound_ret diff --git a/crysaudio/music/RBY/cities2.asm b/crysaudio/music/RBY/cities2.asm index e42c5b74..9063d106 100644 --- a/crysaudio/music/RBY/cities2.asm +++ b/crysaudio/music/RBY/cities2.asm @@ -1,16 +1,17 @@ Music_Cities2:: - musicheader 3, 1, Music_Cities2_Ch0 - musicheader 1, 2, Music_Cities2_Ch1 - musicheader 1, 3, Music_Cities2_Ch2 + channel_count 3 + channel 1, Music_Cities2_Ch1 + channel 2, Music_Cities2_Ch2 + channel 3, Music_Cities2_Ch3 -Music_Cities2_Ch0:: +Music_Cities2_Ch1:: tempo 148 - volume $77 - dutycycle 3 - vibrato 8, $32 - ;toggleperfectpitch - notetype 12, $b6 - note __, 8 + volume 7, 7 + duty_cycle 3 + vibrato 8, 3, 2 + ;toggle_perfect_pitch + note_type 12, 11, 6 + rest 8 octave 3 note E_, 2 note D#, 2 @@ -18,7 +19,7 @@ Music_Cities2_Ch0:: note C_, 2 octave 2 note B_, 2 - note __, 14 + rest 14 Music_Cities2_branch_b51a:: octave 3 @@ -40,7 +41,7 @@ Music_Cities2_branch_b51a:: note B_, 2 octave 4 note C#, 2 - note __, 16 + rest 16 note C#, 4 octave 3 note B_, 2 @@ -55,7 +56,7 @@ Music_Cities2_branch_b51a:: note E_, 1 note E_, 1 note E_, 1 - note __, 3 + rest 3 note G#, 8 note B_, 4 note A_, 2 @@ -67,7 +68,7 @@ Music_Cities2_branch_b51a:: note E_, 2 note F#, 2 note G#, 2 - note __, 2 + rest 2 octave 4 note E_, 4 octave 3 @@ -75,34 +76,34 @@ Music_Cities2_branch_b51a:: note F#, 2 note G#, 2 note A_, 2 - note __, 2 + rest 2 octave 4 note F#, 4 note D#, 4 octave 3 note E_, 2 - note __, 4 + rest 4 note F#, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 16 - note __, 16 - note __, 14 + rest 16 + rest 16 + rest 14 note E_, 16 note F#, 8 note G#, 4 note F#, 4 note E_, 2 - note __, 14 - loopchannel 0, Music_Cities2_branch_b51a + rest 14 + sound_loop 0, Music_Cities2_branch_b51a -Music_Cities2_Ch1:: - dutycycle 3 - vibrato 8, $23 - notetype 12, $c2 +Music_Cities2_Ch2:: + duty_cycle 3 + vibrato 8, 2, 3 + note_type 12, 12, 2 octave 4 note E_, 2 note D#, 2 @@ -115,8 +116,8 @@ Music_Cities2_Ch1:: note C#, 2 note D#, 2 note E_, 6 - notetype 12, $c2 - dutycycle 2 + note_type 12, 12, 2 + duty_cycle 2 octave 4 note E_, 1 octave 3 @@ -130,14 +131,14 @@ Music_Cities2_Ch1:: note A_, 1 Music_Cities2_branch_b58b:: - notetype 12, $a6 + note_type 12, 10, 6 note G#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note A_, 1 note G#, 1 - notetype 12, $c4 + note_type 12, 12, 4 note F#, 14 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 1 octave 3 note B_, 1 @@ -148,14 +149,14 @@ Music_Cities2_branch_b58b:: note F#, 1 note G#, 1 note A_, 1 - notetype 12, $c4 + note_type 12, 12, 4 note G#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 1 note G#, 1 - notetype 12, $c5 + note_type 12, 12, 5 note B_, 14 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 1 octave 3 note B_, 1 @@ -166,24 +167,24 @@ Music_Cities2_branch_b58b:: note F#, 1 note G#, 1 note A_, 1 - notetype 12, $a6 + note_type 12, 10, 6 note G#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note A_, 1 note G#, 1 - notetype 12, $c4 + note_type 12, 12, 4 note F#, 8 - notetype 12, $a1 - dutycycle 1 + note_type 12, 10, 1 + duty_cycle 1 octave 3 note G#, 1 note G#, 1 note G#, 1 note G#, 1 note G#, 1 - note __, 1 - notetype 12, $c2 - dutycycle 2 + rest 1 + note_type 12, 12, 2 + duty_cycle 2 octave 4 note E_, 1 octave 3 @@ -195,13 +196,13 @@ Music_Cities2_branch_b58b:: note F#, 1 note G#, 1 note A_, 1 - notetype 12, $c4 + note_type 12, 12, 4 note G#, 6 note E_, 1 note G#, 1 - notetype 12, $c6 + note_type 12, 12, 6 note B_, 8 - notetype 12, $c2 + note_type 12, 12, 2 note C#, 1 octave 3 note B_, 1 @@ -209,19 +210,19 @@ Music_Cities2_branch_b58b:: note C#, 1 note D#, 1 note E_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note G#, 4 note E_, 4 - notetype 12, $c2 + note_type 12, 12, 2 note D#, 1 note C#, 1 note D#, 1 note E_, 1 note F#, 4 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 4 note F#, 4 - notetype 12, $c2 + note_type 12, 12, 2 note C#, 1 octave 3 note B_, 1 @@ -248,9 +249,9 @@ Music_Cities2_branch_b58b:: note C#, 1 note D#, 1 note F#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note B_, 8 - notetype 12, $b7 + note_type 12, 11, 7 octave 3 note E_, 8 octave 2 @@ -270,7 +271,7 @@ Music_Cities2_branch_b58b:: note D#, 2 note C#, 2 note D#, 2 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 6 note E_, 1 octave 3 @@ -282,12 +283,12 @@ Music_Cities2_branch_b58b:: note F#, 1 note G#, 1 note A_, 1 - loopchannel 0, Music_Cities2_branch_b58b + sound_loop 0, Music_Cities2_branch_b58b -Music_Cities2_Ch2:: - notetype 12, $11 - note __, 16 +Music_Cities2_Ch3:: + note_type 12, 1, 1 + rest 16 octave 4 note E_, 2 note G#, 2 @@ -358,23 +359,23 @@ Music_Cities2_branch_b64c:: note E_, 2 note G#, 2 note E_, 2 - note __, 2 + rest 2 note E_, 4 note G#, 4 note F#, 2 note A_, 2 note F#, 2 - note __, 2 + rest 2 note F#, 4 note A_, 4 note C#, 2 - note __, 4 + rest 4 note E_, 2 - note __, 4 + rest 4 note G#, 2 note A_, 2 note B_, 2 - note __, 8 + rest 8 note A_, 2 note G#, 2 note F#, 2 @@ -418,4 +419,4 @@ Music_Cities2_branch_b64c:: note G#, 2 note E_, 2 note G#, 2 - loopchannel 0, Music_Cities2_branch_b64c + sound_loop 0, Music_Cities2_branch_b64c diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm index 2ee5d47b..25a960a5 100644 --- a/crysaudio/music/RBY/credits.asm +++ b/crysaudio/music/RBY/credits.asm @@ -1,15 +1,16 @@ Music_RBYCredits:: - musicheader 3, 1, Music_RBYCredits_Ch0 - musicheader 1, 2, Music_RBYCredits_Ch1 - musicheader 1, 3, Music_RBYCredits_Ch2 + channel_count 3 + channel 1, Music_RBYCredits_Ch1 + channel 2, Music_RBYCredits_Ch2 + channel 3, Music_RBYCredits_Ch3 -Music_RBYCredits_Ch0:: +Music_RBYCredits_Ch1:: tempo 140 - volume $77 - dutycycle 3 - vibrato 8, $34 - ;toggleperfectpitch - notetype 12, $b5 + volume 7, 7 + duty_cycle 3 + vibrato 8, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 5 octave 4 note E_, 6 octave 3 @@ -31,33 +32,33 @@ Music_RBYCredits_Ch0:: note C#, 1 note E_, 1 note C#, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 note E_, 1 note F#, 1 note G_, 1 - notetype 12, $b6 + note_type 12, 11, 6 note A_, 4 note E_, 2 note A_, 2 @@ -142,12 +143,12 @@ Music_RBYCredits_Ch0:: note F#, 2 note E_, 2 note D_, 2 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 6 note A_, 2 note G_, 4 note F#, 4 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 4 note B_, 4 octave 4 @@ -162,59 +163,59 @@ Music_RBYCredits_Ch0:: note F#, 2 note G_, 2 note A_, 2 - notetype 12, $90 + note_type 12, 9, 0 note G_, 8 note F#, 8 note E_, 8 note D_, 8 - note __, 16 - note __, 16 - note __, 8 - notetype 12, $b6 + rest 16 + rest 16 + rest 8 + note_type 12, 11, 6 note E_, 6 note D#, 1 note D_, 1 - notetype 12, $a0 + note_type 12, 10, 0 note C#, 8 - notetype 12, $a7 + note_type 12, 10, 7 note C#, 8 - note __, 16 - note __, 16 - note __, 8 + rest 16 + rest 16 + rest 8 note E_, 6 note C#, 1 note E_, 1 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note A_, 8 - notetype 12, $b6 + note_type 12, 11, 6 note G_, 6 note D_, 4 note G_, 2 note B_, 4 - notetype 12, $b7 + note_type 12, 11, 7 note G_, 8 note F#, 4 note G#, 4 - notetype 12, $90 + note_type 12, 9, 0 note A_, 8 note F#, 8 note E_, 8 note C#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note D_, 8 note C#, 8 octave 2 note B_, 8 octave 3 note D_, 8 - notetype 12, $90 + note_type 12, 9, 0 note E_, 8 note D_, 8 note F#, 8 note E_, 8 - notetype 12, $a0 + note_type 12, 10, 0 note D_, 8 note E_, 8 note D_, 8 @@ -223,27 +224,27 @@ Music_RBYCredits_Ch0:: note F_, 8 note E_, 8 note D_, 8 - notetype 12, $a0 + note_type 12, 10, 0 note C#, 6 - notetype 12, $a7 + note_type 12, 10, 7 note C#, 6 - notetype 12, $b7 + note_type 12, 11, 7 note D_, 4 note E_, 8 note G_, 6 note F#, 1 note F_, 1 - notetype 12, $a0 + note_type 12, 10, 0 note E_, 6 - notetype 12, $a7 + note_type 12, 10, 7 note E_, 6 - notetype 12, $b7 + note_type 12, 11, 7 note D_, 4 - notetype 12, $a0 + note_type 12, 10, 0 note C#, 8 - notetype 12, $a7 + note_type 12, 10, 7 note C#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 6 note D_, 2 note G_, 4 @@ -260,9 +261,9 @@ Music_RBYCredits_Ch0:: note C#, 4 note E_, 4 note F#, 4 - notetype 12, $a0 + note_type 12, 10, 0 note E_, 6 - notetype 12, $b7 + note_type 12, 11, 7 note D_, 2 note G_, 4 note F#, 4 @@ -270,29 +271,29 @@ Music_RBYCredits_Ch0:: note F#, 4 note A_, 4 note B_, 4 - notetype 12, $a0 + note_type 12, 10, 0 octave 4 note C#, 16 note C#, 8 - notetype 12, $a7 + note_type 12, 10, 7 note C#, 8 - notetype 12, $b5 + note_type 12, 11, 5 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 1 note A_, 1 - notetype 12, $b1 + note_type 12, 11, 1 note A_, 8 - endchannel + sound_ret -Music_RBYCredits_Ch1:: - dutycycle 3 - vibrato 10, $25 - notetype 12, $c5 +Music_RBYCredits_Ch2:: + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 5 octave 4 note A_, 6 note E_, 1 @@ -300,14 +301,14 @@ Music_RBYCredits_Ch1:: note G_, 6 note D_, 1 note G_, 1 - notetype 12, $c7 + note_type 12, 12, 7 note F#, 12 note G#, 2 note E_, 1 note G#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note A_, 2 - notetype 12, $c1 + note_type 12, 12, 1 octave 3 note A_, 4 note A_, 1 @@ -321,12 +322,12 @@ Music_RBYCredits_Ch1:: note A_, 1 note A_, 2 note A_, 2 - notetype 12, $c4 + note_type 12, 12, 4 note A_, 1 note F#, 1 note A_, 1 note B_, 1 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note C#, 6 note C#, 1 @@ -364,10 +365,10 @@ Music_RBYCredits_Ch1:: octave 3 note A_, 6 note E_, 2 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note C#, 8 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 6 octave 3 note B_, 2 @@ -377,17 +378,17 @@ Music_RBYCredits_Ch1:: note G_, 6 note D_, 2 note B_, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note C#, 6 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 6 note D_, 4 - notetype 12, $a0 + note_type 12, 10, 0 note E_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note E_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 6 octave 3 note B_, 2 @@ -397,55 +398,55 @@ Music_RBYCredits_Ch1:: note G_, 6 note D_, 2 note B_, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note E_, 7 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 7 - notetype 12, $c3 + note_type 12, 12, 3 note E_, 1 note G#, 1 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 - notetype 12, $c6 + note_type 12, 12, 6 note G_, 4 note F#, 4 note E_, 4 note D_, 4 - notetype 12, $a0 + note_type 12, 10, 0 note C#, 8 - notetype 12, $a7 + note_type 12, 10, 7 note C#, 8 - notetype 12, $90 + note_type 12, 9, 0 octave 3 note A_, 8 - notetype 12, $97 + note_type 12, 9, 7 note A_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 8 note G_, 6 note F#, 1 note F_, 1 note E_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note G_, 6 note F#, 1 note F_, 1 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note D_, 8 - notetype 12, $c7 + note_type 12, 12, 7 octave 2 note B_, 8 octave 3 @@ -456,16 +457,16 @@ Music_RBYCredits_Ch1:: note B_, 6 note G_, 1 note B_, 1 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note C#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note D_, 8 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 8 octave 4 @@ -474,67 +475,67 @@ Music_RBYCredits_Ch1:: note B_, 1 octave 4 note D_, 1 - notetype 12, $b0 + note_type 12, 11, 0 note C#, 6 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 6 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 6 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 6 - notetype 12, $c7 + note_type 12, 12, 7 note G#, 4 note A_, 8 note F#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note G#, 6 - notetype 12, $b7 + note_type 12, 11, 7 note G#, 6 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 4 note B_, 8 note G#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 6 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 6 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 4 octave 4 note C_, 8 octave 3 note A_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note B_, 6 - notetype 12, $b7 + note_type 12, 11, 7 note B_, 6 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note C_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 8 octave 3 note B_, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note C#, 16 note C#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 3 note A_, 16 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 6 note B_, 2 octave 4 @@ -563,24 +564,24 @@ Music_RBYCredits_Ch1:: octave 4 note D_, 2 note G_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 16 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note A_, 8 - notetype 12, $c1 + note_type 12, 12, 1 note A_, 2 note A_, 4 note A_, 1 note A_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note A_, 8 - endchannel + sound_ret -Music_RBYCredits_Ch2:: - notetype 12, $10 +Music_RBYCredits_Ch3:: + note_type 12, 1, 0 octave 5 note C#, 6 octave 4 @@ -600,11 +601,11 @@ Music_RBYCredits_Ch2:: note E_, 1 note G#, 1 note A_, 1 - note __, 15 - note __, 16 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffae - callchannel Music_RBYCredits_branch_7ffa4 + rest 15 + rest 16 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffae + sound_call Music_RBYCredits_branch_7ffa4 octave 4 note E_, 2 note A_, 2 @@ -614,13 +615,13 @@ Music_RBYCredits_Ch2:: note F#, 2 note G_, 2 note A_, 2 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffae - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffc1 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffae + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffc1 octave 4 note A_, 2 octave 5 @@ -636,34 +637,34 @@ Music_RBYCredits_Ch2:: octave 4 note B_, 2 note A_, 2 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffc1 - callchannel Music_RBYCredits_branch_7ffc1 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffc1 + sound_call Music_RBYCredits_branch_7ffc1 octave 4 note G_, 4 note A_, 4 note B_, 4 octave 5 note D_, 4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffae - callchannel Music_RBYCredits_branch_7ffae - callchannel Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffae + sound_call Music_RBYCredits_branch_7ffae + sound_call Music_RBYCredits_branch_7ffa4 note E_, 4 note A_, 2 note E_, 4 note A_, 2 note E_, 2 note A_, 2 - callchannel Music_RBYCredits_branch_7ffae - callchannel Music_RBYCredits_branch_7ffae - callchannel Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffae + sound_call Music_RBYCredits_branch_7ffae + sound_call Music_RBYCredits_branch_7ffa4 note E_, 2 note A_, 2 note E_, 2 @@ -672,10 +673,10 @@ Music_RBYCredits_Ch2:: note A_, 2 note G#, 2 note A_, 2 - callchannel Music_RBYCredits_branch_7ffd2 - callchannel Music_RBYCredits_branch_7ffd2 - callchannel Music_RBYCredits_branch_7ffdb - callchannel Music_RBYCredits_branch_7ffdb + sound_call Music_RBYCredits_branch_7ffd2 + sound_call Music_RBYCredits_branch_7ffd2 + sound_call Music_RBYCredits_branch_7ffdb + sound_call Music_RBYCredits_branch_7ffdb note F_, 2 note A_, 2 note F_, 2 @@ -692,8 +693,8 @@ Music_RBYCredits_Ch2:: note D_, 2 note E_, 2 note F_, 2 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffb8 note E_, 4 note A_, 4 note E_, 4 @@ -702,25 +703,25 @@ Music_RBYCredits_Ch2:: note A_, 4 note E_, 4 note A_, 4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffe4 - callchannel Music_RBYCredits_branch_7ffe4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffa4 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffb8 - callchannel Music_RBYCredits_branch_7ffed - callchannel Music_RBYCredits_branch_7ffed + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffe4 + sound_call Music_RBYCredits_branch_7ffe4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffa4 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffb8 + sound_call Music_RBYCredits_branch_7ffed + sound_call Music_RBYCredits_branch_7ffed note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 1 note A_, 1 note A_, 1 - note __, 7 - endchannel + rest 7 + sound_ret Music_RBYCredits_branch_7ffa4:: octave 4 @@ -732,7 +733,7 @@ Music_RBYCredits_branch_7ffa4:: note A_, 2 note E_, 2 note A_, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffae:: octave 4 @@ -744,7 +745,7 @@ Music_RBYCredits_branch_7ffae:: note G_, 2 note D_, 2 note G_, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffb8:: note G_, 2 @@ -755,7 +756,7 @@ Music_RBYCredits_branch_7ffb8:: note B_, 2 note G_, 2 note B_, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffc1:: octave 4 @@ -774,7 +775,7 @@ Music_RBYCredits_branch_7ffc1:: note A_, 2 octave 5 note C#, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffd2:: note D_, 2 @@ -785,7 +786,7 @@ Music_RBYCredits_branch_7ffd2:: note A_, 2 note D_, 2 note A_, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffdb:: note E_, 2 @@ -796,7 +797,7 @@ Music_RBYCredits_branch_7ffdb:: note G#, 2 note E_, 2 note G#, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffe4:: note E_, 2 @@ -807,19 +808,19 @@ Music_RBYCredits_branch_7ffe4:: note B_, 2 note E_, 2 note B_, 2 - endchannel + sound_ret Music_RBYCredits_branch_7ffed:: note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - endchannel + rest 3 + sound_ret diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm index 4dd1c30f..48a65ad5 100644 --- a/crysaudio/music/RBY/defeatedgymleader.asm +++ b/crysaudio/music/RBY/defeatedgymleader.asm @@ -1,16 +1,17 @@ Music_DefeatedGymLeader:: - musicheader 3, 1, Music_DefeatedGymLeader_Ch0 - musicheader 1, 2, Music_DefeatedGymLeader_Ch1 - musicheader 1, 3, Music_DefeatedGymLeader_Ch2 + channel_count 3 + channel 1, Music_DefeatedGymLeader_Ch1 + channel 2, Music_DefeatedGymLeader_Ch2 + channel 3, Music_DefeatedGymLeader_Ch3 -Music_DefeatedGymLeader_Ch0:: +Music_DefeatedGymLeader_Ch1:: tempo 112 - volume $77 - dutycycle 3 - vibrato 18, $31 - ;toggleperfectpitch + volume 7, 7 + duty_cycle 3 + vibrato 18, 3, 1 + ;toggle_perfect_pitch tempo 112 - notetype 12, $a6 + note_type 12, 10, 6 octave 4 note D_, 6 octave 3 @@ -20,13 +21,13 @@ Music_DefeatedGymLeader_Ch0:: note F#, 6 note D_, 1 note F#, 1 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note A_, 8 Music_DefeatedGymLeader_branch_23ccc:: - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note A_, 2 note A_, 2 @@ -50,10 +51,10 @@ Music_DefeatedGymLeader_branch_23ccc:: note E_, 2 note D_, 2 note C#, 2 - notetype 12, $b1 + note_type 12, 11, 1 octave 2 note B_, 8 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note A_, 2 note A_, 2 @@ -77,10 +78,10 @@ Music_DefeatedGymLeader_branch_23ccc:: note E_, 2 note D_, 2 note C#, 2 - notetype 12, $b1 + note_type 12, 11, 1 octave 2 note B_, 8 - notetype 12, $97 + note_type 12, 9, 7 octave 3 note D_, 6 octave 2 @@ -88,89 +89,89 @@ Music_DefeatedGymLeader_branch_23ccc:: octave 3 note D_, 1 note F#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, $97 + note_type 12, 9, 7 note E_, 6 note C#, 1 note E_, 1 note G#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note G#, 6 note E_, 1 note G#, 1 note B_, 8 - notetype 12, $97 + note_type 12, 9, 7 note C#, 6 octave 2 note A_, 1 octave 3 note C#, 1 note E_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 6 note C#, 1 note E_, 1 note E_, 4 note G_, 4 - notetype 12, $90 + note_type 12, 9, 0 note F#, 8 note E_, 8 note D_, 8 note C#, 8 - notetype 12, $97 + note_type 12, 9, 7 note D_, 6 octave 2 note A_, 1 octave 3 note D_, 1 note F#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, $97 + note_type 12, 9, 7 note E_, 6 note C#, 1 note E_, 1 note G#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note G#, 6 note E_, 1 note G#, 1 note B_, 8 - notetype 12, $97 + note_type 12, 9, 7 note C#, 6 octave 2 note A_, 1 octave 3 note C#, 1 note E_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 6 note C#, 1 note E_, 1 note E_, 4 note G_, 4 - notetype 12, $97 + note_type 12, 9, 7 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note G_, 8 note E_, 8 - loopchannel 0, Music_DefeatedGymLeader_branch_23ccc + sound_loop 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch1:: - dutycycle 2 - vibrato 24, $24 - notetype 12, $c4 +Music_DefeatedGymLeader_Ch2:: + duty_cycle 2 + vibrato 24, 2, 4 + note_type 12, 12, 4 octave 4 note A_, 6 note F#, 1 @@ -181,13 +182,13 @@ Music_DefeatedGymLeader_Ch1:: note A_, 1 octave 5 note D_, 1 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 8 Music_DefeatedGymLeader_branch_23d84:: - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note D_, 2 note C#, 2 @@ -202,10 +203,10 @@ Music_DefeatedGymLeader_branch_23d84:: note A_, 2 note G_, 2 note F#, 2 - notetype 12, $c4 + note_type 12, 12, 4 note A_, 4 note A_, 4 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note D_, 2 note C#, 2 @@ -220,15 +221,15 @@ Music_DefeatedGymLeader_branch_23d84:: note A_, 2 note G_, 2 note F#, 2 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 6 - notetype 6, $c2 + note_type 6, 12, 2 note G_, 1 note A_, 1 note B_, 1 octave 4 note C#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note D_, 2 note C#, 2 octave 3 @@ -242,14 +243,14 @@ Music_DefeatedGymLeader_branch_23d84:: note A_, 2 note G_, 2 note F#, 2 - notetype 12, $c4 + note_type 12, 12, 4 note A_, 4 note A_, 3 - notetype 6, $c2 + note_type 6, 12, 2 note B_, 1 octave 4 note C#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note D_, 2 note C#, 2 octave 3 @@ -263,103 +264,103 @@ Music_DefeatedGymLeader_branch_23d84:: note A_, 2 note G_, 2 note F#, 2 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 6 note F#, 1 note A_, 1 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note D_, 8 - notetype 12, $a0 + note_type 12, 10, 0 note D_, 8 - notetype 12, $97 + note_type 12, 9, 7 note D_, 8 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 6 note G#, 1 note B_, 1 - notetype 12, $80 + note_type 12, 8, 0 octave 4 note E_, 8 - notetype 12, $a0 + note_type 12, 10, 0 note E_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 8 octave 3 note G_, 6 note E_, 1 note G_, 1 - notetype 12, $6f + note_type 12, 6, -7 octave 4 note C#, 8 - notetype 12, $c7 + note_type 12, 12, 7 note C#, 8 note F#, 4 note E_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 14 octave 3 note B_, 2 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 6 note F#, 1 note A_, 1 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note D_, 8 - notetype 12, $a0 + note_type 12, 10, 0 note D_, 8 - notetype 12, $97 + note_type 12, 9, 7 note D_, 8 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 6 note G#, 1 note B_, 1 - notetype 12, $4f + note_type 12, 4, -7 octave 4 note E_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 8 octave 3 note G_, 6 note E_, 1 note G_, 1 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note C#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 8 octave 3 note A_, 4 octave 4 note C#, 4 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 14 note E_, 2 note D_, 12 - notetype 12, $c2 + note_type 12, 12, 2 octave 3 note G_, 1 note A_, 1 note B_, 1 octave 4 note C#, 1 - loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + sound_loop 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch2:: - notetype 12, $10 - vibrato 16, $12 +Music_DefeatedGymLeader_Ch3:: + note_type 12, 1, 0 + vibrato 16, 1, 2 octave 4 note F#, 6 note D_, 1 @@ -378,109 +379,109 @@ Music_DefeatedGymLeader_Ch2:: Music_DefeatedGymLeader_branch_23e65:: octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 3 - note __, 1 + rest 1 note F#, 3 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 5 + rest 5 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 3 - note __, 1 + rest 1 note D_, 3 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 7 + rest 7 note D_, 2 note A_, 2 note D_, 2 @@ -609,4 +610,4 @@ Music_DefeatedGymLeader_branch_23e65:: note A_, 2 note G_, 2 note E_, 2 - loopchannel 0, Music_DefeatedGymLeader_branch_23e65 + sound_loop 0, Music_DefeatedGymLeader_branch_23e65 diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm index 597aaa8e..fbb3994b 100644 --- a/crysaudio/music/RBY/defeatedtrainer.asm +++ b/crysaudio/music/RBY/defeatedtrainer.asm @@ -1,19 +1,20 @@ Music_DefeatedTrainer:: - musicheader 3, 1, Music_DefeatedTrainer_Ch0 - musicheader 1, 2, Music_DefeatedTrainer_Ch1 - musicheader 1, 3, Music_DefeatedTrainer_Ch2 + channel_count 3 + channel 1, Music_DefeatedTrainer_Ch1 + channel 2, Music_DefeatedTrainer_Ch2 + channel 3, Music_DefeatedTrainer_Ch3 -Music_DefeatedTrainer_Ch0:: +Music_DefeatedTrainer_Ch1:: tempo 224 - volume $77 - dutycycle 2 - ;toggleperfectpitch + volume 7, 7 + duty_cycle 2 + ;toggle_perfect_pitch tempo 224 - notetype 4, $a2 + note_type 4, 10, 2 octave 4 note D_, 2 tempo 224 - notetype 4, $a2 + note_type 4, 10, 2 note D_, 2 note D_, 2 note D_, 2 @@ -21,13 +22,13 @@ Music_DefeatedTrainer_Ch0:: note A_, 2 octave 4 note D_, 2 - notetype 4, $b3 + note_type 4, 11, 3 note F#, 12 - dutycycle 1 + duty_cycle 1 tempo 224 Music_DefeatedTrainer_branch_23a76:: - notetype 4, $63 + note_type 4, 6, 3 octave 3 note A_, 6 note F#, 3 @@ -97,26 +98,26 @@ Music_DefeatedTrainer_branch_23a76:: note G_, 3 note A_, 3 note B_, 3 - loopchannel 0, Music_DefeatedTrainer_branch_23a76 + sound_loop 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch1:: - dutycycle 2 - notetype 4, $c3 +Music_DefeatedTrainer_Ch2:: + duty_cycle 2 + note_type 4, 12, 3 octave 4 note A_, 2 - notetype 4, $c3 + note_type 4, 12, 3 note A_, 2 note A_, 2 note A_, 2 note B_, 2 octave 5 note C#, 2 - notetype 4, $c4 + note_type 4, 12, 4 note D_, 12 Music_DefeatedTrainer_branch_23ad2:: - notetype 4, $85 + note_type 4, 8, 5 octave 4 note D_, 6 octave 3 @@ -166,22 +167,22 @@ Music_DefeatedTrainer_branch_23ad2:: note G_, 3 note D_, 3 note G_, 6 - notetype 4, $70 + note_type 4, 7, 0 note F#, 12 - notetype 4, $77 + note_type 4, 7, 7 note F#, 12 - notetype 4, $60 + note_type 4, 6, 0 note E_, 12 - notetype 4, $67 + note_type 4, 6, 7 note E_, 12 - loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + sound_loop 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch2:: - notetype 4, $10 +Music_DefeatedTrainer_Ch3:: + note_type 4, 1, 0 octave 5 note D_, 2 - notetype 4, $10 + note_type 4, 1, 0 note D_, 2 note D_, 2 octave 4 @@ -189,40 +190,40 @@ Music_DefeatedTrainer_Ch2:: note A_, 2 note G_, 2 note A_, 12 - notetype 4, $21 + note_type 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: note F#, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note G#, 3 - note __, 3 + rest 3 note G#, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 note B_, 3 - note __, 3 + rest 3 note B_, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note G#, 3 - note __, 3 + rest 3 note G#, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 octave 5 note C#, 3 - note __, 3 + rest 3 note C#, 3 octave 4 note A_, 3 @@ -231,19 +232,19 @@ Music_DefeatedTrainer_branch_23b24:: note D_, 3 octave 4 note F#, 3 - note __, 3 + rest 3 note G#, 3 octave 5 note E_, 3 octave 4 note G#, 3 - note __, 3 + rest 3 note A_, 3 octave 5 note F_, 3 octave 4 note A_, 3 - note __, 3 + rest 3 note B_, 3 octave 5 note G_, 3 @@ -251,21 +252,21 @@ Music_DefeatedTrainer_branch_23b24:: note B_, 3 note A#, 3 note A_, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 note A_, 3 octave 5 note C_, 3 note C#, 3 - note __, 3 + rest 3 note C#, 3 - note __, 3 + rest 3 note C#, 3 - note __, 3 + rest 3 note C#, 3 octave 4 note A_, 3 - loopchannel 0, Music_DefeatedTrainer_branch_23b24 + sound_loop 0, Music_DefeatedTrainer_branch_23b24 diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm index a81ec045..dee90553 100644 --- a/crysaudio/music/RBY/defeatedwildmon.asm +++ b/crysaudio/music/RBY/defeatedwildmon.asm @@ -1,17 +1,18 @@ Music_DefeatedWildMon:: - musicheader 3, 1, Music_DefeatedWildMon_Ch0 - musicheader 1, 2, Music_DefeatedWildMon_Ch1 - musicheader 1, 3, Music_DefeatedWildMon_Ch2 + channel_count 3 + channel 1, Music_DefeatedWildMon_Ch1 + channel 2, Music_DefeatedWildMon_Ch2 + channel 3, Music_DefeatedWildMon_Ch3 -Music_DefeatedWildMon_Ch0:: +Music_DefeatedWildMon_Ch1:: tempo 112 - volume $77 - ;executemusic - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch + volume 7, 7 + ;execute_music + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch tempo 112 - notetype 12, $b7 + note_type 12, 11, 7 octave 3 note B_, 1 note A_, 1 @@ -20,7 +21,7 @@ Music_DefeatedWildMon_Ch0:: note E_, 12 Music_DefeatedWildMon_branch_23b8b:: - notetype 12, $62 + note_type 12, 6, 2 note E_, 2 note F#, 2 note E_, 2 @@ -69,23 +70,23 @@ Music_DefeatedWildMon_branch_23b8b:: note A#, 2 note A#, 4 note A_, 8 - loopchannel 0, Music_DefeatedWildMon_branch_23b8b + sound_loop 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch1:: - ;executemusic - dutycycle 2 - notetype 12, $c3 +Music_DefeatedWildMon_Ch2:: + ;execute_music + duty_cycle 2 + note_type 12, 12, 3 octave 4 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 12 Music_DefeatedWildMon_branch_23bce:: - notetype 12, $82 + note_type 12, 8, 2 octave 3 note B_, 2 note A_, 2 @@ -144,164 +145,164 @@ Music_DefeatedWildMon_branch_23bce:: note D_, 2 note D_, 4 note C_, 8 - loopchannel 0, Music_DefeatedWildMon_branch_23bce + sound_loop 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch2:: - ;executemusic - notetype 12, $20 +Music_DefeatedWildMon_Ch3:: + ;execute_music + note_type 12, 2, 0 octave 5 note E_, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 6 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 3 + rest 3 octave 5 note E_, 1 - note __, 3 + rest 3 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note F#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 octave 5 note D#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 3 + rest 3 octave 5 note E_, 1 - note __, 3 + rest 3 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note F#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 octave 5 note E_, 1 - note __, 3 + rest 3 octave 4 note D#, 4 octave 4 note F_, 1 - note __, 1 + rest 1 octave 5 note F_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 octave 5 note F_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 3 + rest 3 octave 5 note F_, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 octave 5 note F_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 5 note F_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 octave 5 note F_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 3 + rest 3 octave 5 note F_, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 3 + rest 3 octave 5 note F_, 1 - note __, 3 + rest 3 octave 4 note D#, 4 - loopchannel 0, Music_DefeatedWildMon_branch_23c21 + sound_loop 0, Music_DefeatedWildMon_branch_23c21 diff --git a/crysaudio/music/RBY/dungeon1.asm b/crysaudio/music/RBY/dungeon1.asm index 04b6d27b..0e02edde 100644 --- a/crysaudio/music/RBY/dungeon1.asm +++ b/crysaudio/music/RBY/dungeon1.asm @@ -1,37 +1,39 @@ Music_Dungeon1:: - musicheader 4, 1, Music_Dungeon1_Ch0 - musicheader 1, 2, Music_Dungeon1_Ch1 - musicheader 1, 3, Music_Dungeon1_Ch2 - musicheader 1, 4, Music_Dungeon1_Ch3 + channel_count 4 + channel 1, Music_Dungeon1_Ch1 + channel 2, Music_Dungeon1_Ch2 + channel 3, Music_Dungeon1_Ch3 + channel 4, Music_Dungeon1_Ch4 -Music_Dungeon1_Ch0:: +Music_Dungeon1_Ch1:: tempo 144 - volume $77 - dutycycle 3 - ;toggleperfectpitch - vibrato 10, $14 - notetype 12, $4d - note __, 8 - ;stereopanning 237 - stereopanning $0f + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + vibrato 10, 1, 4 + note_type 12, 4, -5 + rest 8 + ;stereo_panning %1110, %1101 + stereo_panning FALSE, TRUE octave 4 note F#, 8 - stereopanning $ff + ;stereo_panning %1111, %1111 + stereo_panning TRUE, TRUE Music_Dungeon1_branch_7dee5:: - notetype 12, $b2 + note_type 12, 11, 2 octave 3 Music_Dungeon1_branch_7dee8:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 3, Music_Dungeon1_branch_7dee8 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 3, Music_Dungeon1_branch_7dee8 note E_, 1 note D#, 1 note B_, 1 note A#, 1 note G_, 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 note E_, 1 note D#, 1 @@ -43,40 +45,40 @@ Music_Dungeon1_branch_7dee8:: note A#, 1 Music_Dungeon1_branch_7deff:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 4, Music_Dungeon1_branch_7deff - callchannel Music_Dungeon1_branch_7dfd5 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 4, Music_Dungeon1_branch_7deff + sound_call Music_Dungeon1_branch_7dfd5 octave 3 note G_, 1 note F#, 1 note E_, 1 note G_, 1 - callchannel Music_Dungeon1_branch_7dfd5 + sound_call Music_Dungeon1_branch_7dfd5 octave 3 note A_, 1 note G_, 1 note E_, 1 note A_, 1 - callchannel Music_Dungeon1_branch_7dfd5 + sound_call Music_Dungeon1_branch_7dfd5 octave 3 note B_, 1 note A_, 1 note G_, 1 note F#, 1 - notetype 12, $c3 + note_type 12, 12, 3 note G_, 4 note F#, 4 note E_, 4 note D#, 4 - notetype 12, $c2 - callchannel Music_Dungeon1_branch_7dfc5 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 octave 3 note B_, 3 - callchannel Music_Dungeon1_branch_7dfc5 + sound_call Music_Dungeon1_branch_7dfc5 note C_, 3 - callchannel Music_Dungeon1_branch_7dfc5 + sound_call Music_Dungeon1_branch_7dfc5 note C#, 3 - notetype 12, $c3 + note_type 12, 12, 3 octave 3 note G_, 4 note F#, 4 @@ -87,7 +89,7 @@ Music_Dungeon1_branch_7deff:: note C_, 4 octave 2 note B_, 4 - notetype 12, $c2 + note_type 12, 12, 2 note B_, 1 note A#, 1 note G_, 1 @@ -135,10 +137,10 @@ Music_Dungeon1_branch_7deff:: note C#, 1 Music_Dungeon1_branch_7df6e:: - note __, 16 - loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, $c3 - callchannel Music_Dungeon1_branch_7dfbb + rest 16 + sound_loop 8, Music_Dungeon1_branch_7df6e + note_type 12, 12, 3 + sound_call Music_Dungeon1_branch_7dfbb note B_, 2 note G_, 2 octave 3 @@ -147,7 +149,7 @@ Music_Dungeon1_branch_7df6e:: note G_, 2 note A_, 4 note F#, 2 - callchannel Music_Dungeon1_branch_7dfbb + sound_call Music_Dungeon1_branch_7dfbb note A#, 2 note G_, 2 note B_, 4 @@ -155,22 +157,22 @@ Music_Dungeon1_branch_7df6e:: note F#, 2 note G_, 2 note D#, 2 - notetype 12, $c2 - callchannel Music_Dungeon1_branch_7dfc5 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 octave 3 note B_, 3 - callchannel Music_Dungeon1_branch_7dfc5 + sound_call Music_Dungeon1_branch_7dfc5 note C_, 3 - callchannel Music_Dungeon1_branch_7dfc5 + sound_call Music_Dungeon1_branch_7dfc5 note C#, 3 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note F#, 8 note D#, 8 - notetype 12, $c2 - callchannel Music_Dungeon1_branch_7dfaa - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 0, Music_Dungeon1_branch_7dee5 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfaa + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 0, Music_Dungeon1_branch_7dee5 Music_Dungeon1_branch_7dfaa:: note E_, 1 @@ -179,7 +181,7 @@ Music_Dungeon1_branch_7dfaa:: note A#, 1 note G_, 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 note E_, 1 note D#, 1 @@ -187,9 +189,9 @@ Music_Dungeon1_branch_7dfaa:: note A#, 1 note G_, 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - endchannel + sound_ret Music_Dungeon1_branch_7dfbb:: octave 2 @@ -201,7 +203,7 @@ Music_Dungeon1_branch_7dfbb:: octave 2 note G_, 2 note A#, 2 - endchannel + sound_ret Music_Dungeon1_branch_7dfc5:: octave 3 @@ -219,45 +221,45 @@ Music_Dungeon1_branch_7dfc5:: note E_, 1 octave 4 note C_, 1 - endchannel + sound_ret Music_Dungeon1_branch_7dfd5:: note E_, 1 note E_, 1 - note __, 4 + rest 4 octave 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_Dungeon1_Ch1:: - vibrato 11, $15 - dutycycle 3 - notetype 12, $0f +Music_Dungeon1_Ch2:: + vibrato 11, 1, 5 + duty_cycle 3 + note_type 12, 0, -7 octave 4 note G#, 8 - stereopanning $f0 - notetype 12, $4d + stereo_panning TRUE, FALSE + note_type 12, 4, -5 octave 5 note D_, 8 - stereopanning $ff + stereo_panning TRUE, TRUE Music_Dungeon1_branch_7dfeb:: - notetype 12, $c2 + note_type 12, 12, 2 Music_Dungeon1_branch_7dfed:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 3, Music_Dungeon1_branch_7dfed + sound_call Music_Dungeon1_branch_7e097 + sound_loop 3, Music_Dungeon1_branch_7dfed octave 2 note E_, 1 note E_, 1 note B_, 1 octave 3 note C_, 1 - note __, 2 + rest 2 note C_, 1 octave 2 note B_, 1 @@ -271,36 +273,36 @@ Music_Dungeon1_branch_7dfed:: note D#, 1 Music_Dungeon1_branch_7e006:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 4, Music_Dungeon1_branch_7e006 - note __, 2 - callchannel Music_Dungeon1_branch_7e0ab + sound_call Music_Dungeon1_branch_7e097 + sound_loop 4, Music_Dungeon1_branch_7e006 + rest 2 + sound_call Music_Dungeon1_branch_7e0ab octave 3 note C_, 4 - callchannel Music_Dungeon1_branch_7e0ab + sound_call Music_Dungeon1_branch_7e0ab octave 3 note C#, 4 - callchannel Music_Dungeon1_branch_7e0ab + sound_call Music_Dungeon1_branch_7e0ab octave 3 note D#, 4 - notetype 12, $d3 + note_type 12, 13, 3 octave 4 note E_, 4 note D#, 4 note C_, 4 octave 3 note B_, 4 - notetype 12, $d2 - callchannel Music_Dungeon1_branch_7e0b5 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 note F#, 4 - callchannel Music_Dungeon1_branch_7e0b5 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 note G_, 4 - callchannel Music_Dungeon1_branch_7e0b5 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 note A#, 4 - notetype 12, $d3 + note_type 12, 13, 3 octave 4 note E_, 4 note D#, 4 @@ -313,31 +315,31 @@ Music_Dungeon1_branch_7e006:: note B_, 4 note G_, 4 note F#, 2 - notetype 12, $d6 + note_type 12, 13, 6 note E_, 8 note F_, 8 note F#, 8 note G_, 8 - notetype 12, $d2 - callchannel Music_Dungeon1_branch_7e0ba - note __, 10 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0ba + rest 10 note E_, 1 - note __, 1 - callchannel Music_Dungeon1_branch_7e0ba - note __, 12 - callchannel Music_Dungeon1_branch_7e0ba - note __, 12 - callchannel Music_Dungeon1_branch_7e0ba - note __, 14 - notetype 12, $d3 - callchannel Music_Dungeon1_branch_7e0cd + rest 1 + sound_call Music_Dungeon1_branch_7e0ba + rest 12 + sound_call Music_Dungeon1_branch_7e0ba + rest 12 + sound_call Music_Dungeon1_branch_7e0ba + rest 14 + note_type 12, 13, 3 + sound_call Music_Dungeon1_branch_7e0cd note D#, 4 - callchannel Music_Dungeon1_branch_7e0cd + sound_call Music_Dungeon1_branch_7e0cd note D#, 2 - note __, 2 - notetype 12, $d2 - callchannel Music_Dungeon1_branch_7e0c0 - note __, 2 + rest 2 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0c0 + rest 2 octave 3 note F#, 4 octave 2 @@ -345,28 +347,28 @@ Music_Dungeon1_branch_7e006:: note E_, 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 1 note C#, 1 - note __, 2 + rest 2 octave 3 note G_, 4 - callchannel Music_Dungeon1_branch_7e0c0 + sound_call Music_Dungeon1_branch_7e0c0 octave 3 note A#, 4 - notetype 12, $d6 + note_type 12, 13, 6 note B_, 8 octave 4 note D#, 8 - notetype 12, $d2 - callchannel Music_Dungeon1_branch_7e097 - callchannel Music_Dungeon1_branch_7e097 - loopchannel 0, Music_Dungeon1_branch_7dfeb + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e097 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 0, Music_Dungeon1_branch_7dfeb Music_Dungeon1_branch_7e097:: octave 2 @@ -375,7 +377,7 @@ Music_Dungeon1_branch_7e097:: note B_, 1 octave 3 note C_, 1 - note __, 2 + rest 2 note C_, 1 octave 2 note B_, 1 @@ -384,30 +386,30 @@ Music_Dungeon1_branch_7e097:: note B_, 1 octave 3 note C_, 1 - note __, 2 + rest 2 note C_, 1 octave 2 note B_, 1 - endchannel + sound_ret Music_Dungeon1_branch_7e0ab:: octave 2 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_Dungeon1_branch_7e0b5:: octave 2 note E_, 1 note E_, 1 - note __, 10 - endchannel + rest 10 + sound_ret Music_Dungeon1_branch_7e0ba:: octave 1 @@ -415,7 +417,7 @@ Music_Dungeon1_branch_7e0ba:: note G_, 1 note E_, 1 note D#, 1 - endchannel + sound_ret Music_Dungeon1_branch_7e0c0:: octave 2 @@ -423,14 +425,14 @@ Music_Dungeon1_branch_7e0c0:: note E_, 1 octave 4 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 note C_, 1 - endchannel + sound_ret Music_Dungeon1_branch_7e0cd:: octave 3 @@ -447,42 +449,42 @@ Music_Dungeon1_branch_7e0cd:: note F#, 4 note E_, 6 note F#, 6 - endchannel + sound_ret -Music_Dungeon1_Ch2:: - notetype 12, $11 - vibrato 8, $26 - note __, 14 +Music_Dungeon1_Ch3:: + note_type 12, 1, 1 + vibrato 8, 2, 6 + rest 14 octave 4 note D_, 1 note D#, 1 Music_Dungeon1_branch_7e0e5:: - callchannel Music_Dungeon1_branch_7e140 - callchannel Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 octave 5 note E_, 2 - note __, 4 + rest 4 octave 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 octave 4 note F#, 4 - callchannel Music_Dungeon1_branch_7e154 + sound_call Music_Dungeon1_branch_7e154 octave 4 note G_, 4 - callchannel Music_Dungeon1_branch_7e154 + sound_call Music_Dungeon1_branch_7e154 octave 4 note A_, 4 note B_, 4 note A#, 4 note G_, 4 note F#, 4 - note __, 6 - callchannel Music_Dungeon1_branch_7e177 + rest 6 + sound_call Music_Dungeon1_branch_7e177 note B_, 4 note A#, 4 note G_, 4 @@ -491,34 +493,34 @@ Music_Dungeon1_branch_7e0e5:: note F#, 4 note E_, 4 note D#, 4 - callchannel Music_Dungeon1_branch_7e15e - note __, 12 - callchannel Music_Dungeon1_branch_7e15e - note __, 12 - callchannel Music_Dungeon1_branch_7e15e - note __, 10 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 10 note E_, 1 - note __, 1 - callchannel Music_Dungeon1_branch_7e15e - note __, 12 - callchannel Music_Dungeon1_branch_7e15e - note __, 12 - callchannel Music_Dungeon1_branch_7e15e - note __, 10 + rest 1 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 12 + sound_call Music_Dungeon1_branch_7e15e + rest 10 note D_, 1 note D#, 1 - callchannel Music_Dungeon1_branch_7e164 - callchannel Music_Dungeon1_branch_7e164 + sound_call Music_Dungeon1_branch_7e164 + sound_call Music_Dungeon1_branch_7e164 note E_, 2 - note __, 4 - callchannel Music_Dungeon1_branch_7e177 + rest 4 + sound_call Music_Dungeon1_branch_7e177 note B_, 8 note F#, 6 note D_, 1 note D#, 1 - note __, 16 - note __, 16 - loopchannel 0, Music_Dungeon1_branch_7e0e5 + rest 16 + rest 16 + sound_loop 0, Music_Dungeon1_branch_7e0e5 Music_Dungeon1_branch_7e140:: octave 5 @@ -540,19 +542,19 @@ Music_Dungeon1_branch_7e140:: note E_, 4 note F#, 4 note D#, 4 - endchannel + sound_ret Music_Dungeon1_branch_7e154:: octave 6 note E_, 1 note E_, 1 - note __, 4 + rest 4 octave 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_Dungeon1_branch_7e15e:: octave 3 @@ -560,7 +562,7 @@ Music_Dungeon1_branch_7e15e:: note G_, 1 note E_, 1 note D#, 1 - endchannel + sound_ret Music_Dungeon1_branch_7e164:: note E_, 4 @@ -581,105 +583,105 @@ Music_Dungeon1_branch_7e164:: note E_, 4 note F#, 4 note D#, 4 - endchannel + sound_ret Music_Dungeon1_branch_7e177:: octave 4 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note F#, 4 - note __, 6 + rest 6 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 6 + rest 6 note E_, 1 - note __, 3 + rest 3 note E_, 1 note E_, 1 note A#, 4 - endchannel + sound_ret -Music_Dungeon1_Ch3:: - togglenoise 1 - notetype 12 - note __, 14 - note E_, 1 - note E_, 1 +Music_Dungeon1_Ch4:: + toggle_noise 1 + drum_speed 12 + rest 14 + drum_note 5, 1 + drum_note 5, 1 Music_Dungeon1_branch_7e190:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e190 - note F_, 4 - note E_, 4 - note F_, 4 - note E_, 2 - note E_, 2 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e190 + drum_note 6, 4 + drum_note 5, 4 + drum_note 6, 4 + drum_note 5, 2 + drum_note 5, 2 Music_Dungeon1_branch_7e1a1:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e1a1 - note F_, 4 - note E_, 4 - note F_, 4 - note F_, 4 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e1a1 + drum_note 6, 4 + drum_note 5, 4 + drum_note 6, 4 + drum_note 6, 4 Music_Dungeon1_branch_7e1b0:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1b0 - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1b0 + sound_call Music_Dungeon1_branch_7e202 Music_Dungeon1_branch_7e1ba:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1ba - callchannel Music_Dungeon1_branch_7e202 - note C#, 4 - note D_, 4 - note D_, 4 - note __, 2 - note C#, 2 - note F_, 4 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1ba + sound_call Music_Dungeon1_branch_7e202 + drum_note 2, 4 + drum_note 3, 4 + drum_note 3, 4 + rest 2 + drum_note 2, 2 + drum_note 6, 4 Music_Dungeon1_branch_7e1cf:: - note __, 16 - loopchannel 13, Music_Dungeon1_branch_7e1cf - note __, 12 + rest 16 + sound_loop 13, Music_Dungeon1_branch_7e1cf + rest 12 Music_Dungeon1_branch_7e1d5:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1d5 - note E_, 4 - note E_, 4 - note E_, 4 - note __, 2 - note E_, 1 - note E_, 1 - callchannel Music_Dungeon1_branch_7e1f1 - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 0, Music_Dungeon1_branch_7e190 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1d5 + drum_note 5, 4 + drum_note 5, 4 + drum_note 5, 4 + rest 2 + drum_note 5, 1 + drum_note 5, 1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - note F_, 4 - note E_, 4 - note F_, 4 - note E_, 4 - endchannel + drum_note 6, 4 + drum_note 5, 4 + drum_note 6, 4 + drum_note 5, 4 + sound_ret Music_Dungeon1_branch_7e1fa:: - note E_, 1 - note E_, 1 - note __, 10 - note F#, 4 - endchannel + drum_note 5, 1 + drum_note 5, 1 + rest 10 + drum_note 7, 4 + sound_ret Music_Dungeon1_branch_7e202:: - note C#, 4 - note D_, 4 - note D_, 4 - note D#, 4 - endchannel + drum_note 2, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 4, 4 + sound_ret diff --git a/crysaudio/music/RBY/dungeon2.asm b/crysaudio/music/RBY/dungeon2.asm index 42623ced..51b0dce6 100644 --- a/crysaudio/music/RBY/dungeon2.asm +++ b/crysaudio/music/RBY/dungeon2.asm @@ -1,18 +1,19 @@ Music_Dungeon2:: - musicheader 4, 1, Music_Dungeon2_Ch0 - musicheader 1, 2, Music_Dungeon2_Ch1 - musicheader 1, 3, Music_Dungeon2_Ch2 - musicheader 1, 4, Music_Dungeon2_Ch3 + channel_count 4 + channel 1, Music_Dungeon2_Ch1 + channel 2, Music_Dungeon2_Ch2 + channel 3, Music_Dungeon2_Ch3 + channel 4, Music_Dungeon2_Ch4 -Music_Dungeon2_Ch0:: +Music_Dungeon2_Ch1:: tempo 144 - volume $77 - dutycycle 3 - ;toggleperfectpitch - vibrato 10, $14 + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: - notetype 12, $b2 + note_type 12, 11, 2 octave 4 note E_, 4 note E_, 4 @@ -57,31 +58,31 @@ Music_Dungeon2_branch_7e892:: note G_, 2 note A_, 4 note F#, 2 - loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, $1f + sound_loop 2, Music_Dungeon2_branch_7e892 + note_type 12, 1, -7 octave 3 note E_, 16 note C_, 16 note D_, 16 octave 2 note A#, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_Dungeon2_branch_7e892 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch1:: - vibrato 11, $15 +Music_Dungeon2_Ch2:: + vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: - dutycycle 3 - notetype 12, $c2 + duty_cycle 3 + note_type 12, 12, 2 octave 3 note E_, 4 note E_, 4 @@ -116,7 +117,7 @@ Music_Dungeon2_branch_7e8db:: note G_, 4 note G_, 4 note F#, 4 - loopchannel 2, Music_Dungeon2_branch_7e8db + sound_loop 2, Music_Dungeon2_branch_7e8db octave 3 note E_, 2 note G_, 2 @@ -126,11 +127,11 @@ Music_Dungeon2_branch_7e8db:: note E_, 2 octave 5 note E_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note C#, 2 note C_, 2 octave 4 @@ -145,91 +146,91 @@ Music_Dungeon2_branch_7e8db:: note G_, 2 octave 5 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note E_, 2 note D#, 2 note D_, 2 note C#, 2 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype 12, $c7 - dutycycle 1 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 12, 12, 7 + duty_cycle 1 octave 4 note E_, 16 note D_, 16 note C_, 16 note D_, 16 - loopchannel 0, Music_Dungeon2_branch_7e8db + sound_loop 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch2:: - notetype 12, $13 - vibrato 8, $26 +Music_Dungeon2_Ch3:: + note_type 12, 1, 3 + vibrato 8, 2, 6 Music_Dungeon2_branch_7e940:: - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 16, Music_Dungeon2_branch_7e940 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 16, Music_Dungeon2_branch_7e940 note E_, 4 - note __, 4 - note __, 4 + rest 4 + rest 4 note E_, 4 note C_, 4 - note __, 4 - note __, 4 + rest 4 + rest 4 note C_, 4 note D_, 4 - note __, 4 - note __, 4 + rest 4 + rest 4 note D_, 4 octave 3 note A#, 4 - note __, 4 - note __, 4 + rest 4 + rest 4 note A#, 4 Music_Dungeon2_branch_7e958:: octave 5 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 octave 6 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 5 note G#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - loopchannel 3, Music_Dungeon2_branch_7e958 + rest 2 + sound_loop 3, Music_Dungeon2_branch_7e958 octave 4 note E_, 4 note B_, 4 @@ -261,19 +262,19 @@ Music_Dungeon2_branch_7e958:: note G_, 16 octave 3 note B_, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 0, Music_Dungeon2_branch_7e940 + rest 16 + 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 octave 2 note G_, 2 note A#, 4 @@ -291,34 +292,34 @@ Music_Dungeon2_branch_7e958:: note G_, 2 note A#, 2 note G_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_Dungeon2_branch_7e9d1:: octave 4 note E_, 2 - note __, 4 + rest 4 octave 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 octave 4 note F#, 4 - endchannel + sound_ret -Music_Dungeon2_Ch3:: - togglenoise 1 - notetype 12 +Music_Dungeon2_Ch4:: + toggle_noise 1 + drum_speed 12 Music_Dungeon2_branch_7e9dd:: - note E_, 4 - note F_, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note F_, 4 - note D#, 4 - note C#, 4 - loopchannel 0, Music_Dungeon2_branch_7e9dd + drum_note 5, 4 + drum_note 6, 4 + drum_note 5, 4 + drum_note 3, 4 + drum_note 5, 4 + drum_note 6, 4 + drum_note 4, 4 + drum_note 2, 4 + sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/crysaudio/music/RBY/dungeon3.asm b/crysaudio/music/RBY/dungeon3.asm index ab63f4db..d9b77522 100644 --- a/crysaudio/music/RBY/dungeon3.asm +++ b/crysaudio/music/RBY/dungeon3.asm @@ -1,22 +1,23 @@ Music_Dungeon3:: - musicheader 4, 1, Music_Dungeon3_Ch0 - musicheader 1, 2, Music_Dungeon3_Ch1 - musicheader 1, 3, Music_Dungeon3_Ch2 - musicheader 1, 4, Music_Dungeon3_Ch3 + channel_count 4 + channel 1, Music_Dungeon3_Ch1 + channel 2, Music_Dungeon3_Ch2 + channel 3, Music_Dungeon3_Ch3 + channel 4, Music_Dungeon3_Ch4 -Music_Dungeon3_Ch0:: +Music_Dungeon3_Ch1:: tempo 160 - volume $77 - dutycycle 3 - ;toggleperfectpitch - vibrato 8, $14 + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: - notetype 12, $c3 + note_type 12, 12, 3 Music_Dungeon3_branch_7e9fe:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 3, Music_Dungeon3_branch_7e9fe + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 3, Music_Dungeon3_branch_7e9fe octave 2 note B_, 2 octave 3 @@ -31,47 +32,47 @@ Music_Dungeon3_branch_7e9fe:: note E_, 2 Music_Dungeon3_branch_7ea11:: - callchannel Music_Dungeon3_branch_7eac1 - loopchannel 4, Music_Dungeon3_branch_7ea11 + sound_call Music_Dungeon3_branch_7eac1 + sound_loop 4, Music_Dungeon3_branch_7ea11 Music_Dungeon3_branch_7ea18:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 4, Music_Dungeon3_branch_7ea18 + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 4, Music_Dungeon3_branch_7ea18 octave 4 note F_, 2 note F_, 2 - note __, 2 + rest 2 note F_, 2 note E_, 2 note E_, 2 note D#, 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 note D_, 2 note D_, 2 - callchannel Music_Dungeon3_branch_7eafc + sound_call Music_Dungeon3_branch_7eafc octave 4 note D_, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 note D#, 2 note D#, 2 note E_, 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note F_, 2 note F_, 2 Music_Dungeon3_branch_7ea3c:: - callchannel Music_Dungeon3_branch_7eace - loopchannel 4, Music_Dungeon3_branch_7ea3c + sound_call Music_Dungeon3_branch_7eace + sound_loop 4, Music_Dungeon3_branch_7ea3c Music_Dungeon3_branch_7ea43:: - callchannel Music_Dungeon3_branch_7eadd - loopchannel 3, Music_Dungeon3_branch_7ea43 + sound_call Music_Dungeon3_branch_7eadd + sound_loop 3, Music_Dungeon3_branch_7ea43 octave 3 note C#, 2 octave 2 @@ -136,8 +137,8 @@ Music_Dungeon3_branch_7ea43:: note E_, 2 octave 4 note C_, 2 - callchannel Music_Dungeon3_branch_7eaea - callchannel Music_Dungeon3_branch_7eaea + sound_call Music_Dungeon3_branch_7eaea + sound_call Music_Dungeon3_branch_7eaea octave 3 note G#, 2 note E_, 2 @@ -151,16 +152,16 @@ Music_Dungeon3_branch_7ea43:: octave 3 note G#, 2 note E_, 2 - note __, 16 - note __, 8 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 - callchannel Music_Dungeon3_branch_7eaf7 + 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 note D#, 2 - note __, 16 - note __, 16 - loopchannel 0, Music_Dungeon3_branch_7e9fc + rest 16 + rest 16 + sound_loop 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 @@ -177,7 +178,7 @@ Music_Dungeon3_branch_7eab2:: note B_, 2 octave 3 note D#, 2 - endchannel + sound_ret Music_Dungeon3_branch_7eac1:: note E_, 2 @@ -192,7 +193,7 @@ Music_Dungeon3_branch_7eac1:: octave 3 note E_, 2 note G#, 2 - endchannel + sound_ret Music_Dungeon3_branch_7eace:: octave 3 @@ -209,7 +210,7 @@ Music_Dungeon3_branch_7eace:: note D#, 2 octave 2 note B_, 2 - endchannel + sound_ret Music_Dungeon3_branch_7eadd:: note A_, 2 @@ -224,7 +225,7 @@ Music_Dungeon3_branch_7eadd:: octave 2 note A_, 2 note F_, 2 - endchannel + sound_ret Music_Dungeon3_branch_7eaea:: octave 3 @@ -239,14 +240,14 @@ Music_Dungeon3_branch_7eaea:: note E_, 2 octave 4 note C_, 2 - endchannel + sound_ret Music_Dungeon3_branch_7eaf7:: note D#, 2 note G_, 2 note D#, 2 note C#, 6 - endchannel + sound_ret Music_Dungeon3_branch_7eafc:: tempo 168 @@ -338,15 +339,15 @@ Music_Dungeon3_branch_7eafc:: octave 2 note C_, 1 tempo 160 - endchannel + sound_ret -Music_Dungeon3_Ch1:: - vibrato 11, $15 - dutycycle 3 +Music_Dungeon3_Ch2:: + vibrato 11, 1, 5 + duty_cycle 3 Music_Dungeon3_branch_7eb6d:: - notetype 12, $d3 + note_type 12, 13, 3 octave 4 note D#, 6 note C#, 6 @@ -372,7 +373,7 @@ Music_Dungeon3_branch_7eb6d:: note B_, 6 octave 4 note C#, 8 - note __, 2 + rest 2 note G#, 6 note F#, 6 note E_, 2 @@ -420,42 +421,42 @@ Music_Dungeon3_branch_7eb6d:: note B_, 6 octave 4 note C#, 8 - note __, 2 + rest 2 note G#, 2 note G#, 2 - note __, 2 + rest 2 note G#, 2 note A_, 2 note A_, 2 note A#, 2 note A#, 2 - note __, 2 + rest 2 note A#, 2 note B_, 2 note B_, 2 - note __, 8 - note __, 8 - note __, 8 - note __, 8 - note __, 8 - note __, 8 - note __, 8 - note __, 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 octave 4 note B_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 note A#, 2 note A#, 2 note A_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 note G#, 2 note G#, 2 note C#, 8 - note __, 2 + rest 2 octave 3 note B_, 6 note A#, 2 @@ -481,7 +482,7 @@ Music_Dungeon3_branch_7eb6d:: note G_, 6 octave 3 note G_, 8 - note __, 2 + rest 2 note F_, 6 note E_, 2 note F_, 2 @@ -503,7 +504,7 @@ Music_Dungeon3_branch_7eb6d:: octave 4 note C#, 6 note G_, 8 - note __, 2 + rest 2 note F_, 6 note E_, 2 note F_, 2 @@ -524,7 +525,7 @@ Music_Dungeon3_branch_7eb6d:: note C#, 6 octave 4 note F#, 8 - note __, 2 + rest 2 note E_, 6 note D#, 2 note E_, 2 @@ -610,24 +611,24 @@ Music_Dungeon3_branch_7eb6d:: note B_, 2 octave 3 note D#, 2 - loopchannel 0, Music_Dungeon3_branch_7eb6d + sound_loop 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch2:: - notetype 12, $12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 12 - notetype 6, $10 +Music_Dungeon3_Ch3:: + note_type 12, 1, 2 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 12 + note_type 6, 1, 0 octave 3 note B_, 1 octave 4 @@ -636,16 +637,16 @@ Music_Dungeon3_Ch2:: note D_, 1 note D#, 1 note E_, 1 - note __, 2 + rest 2 note C_, 1 note C#, 1 note D_, 1 note D#, 1 note E_, 1 note F_, 1 - note __, 16 - note __, 16 - note __, 10 + rest 16 + rest 16 + rest 10 octave 5 note E_, 8 octave 4 @@ -672,16 +673,16 @@ Music_Dungeon3_Ch2:: note F_, 8 note A_, 8 note E_, 8 - note __, 16 - note __, 16 - note __, 8 + rest 16 + rest 16 + rest 8 note F_, 1 note E_, 1 note D#, 1 note D_, 1 note C#, 1 note C_, 1 - note __, 2 + rest 2 note E_, 1 note D#, 1 note D_, 1 @@ -689,75 +690,75 @@ Music_Dungeon3_Ch2:: note C_, 1 octave 3 note B_, 1 - note __, 10 - note __, 16 - notetype 12, $10 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 10 - loopchannel 0, Music_Dungeon3_Ch2 + rest 10 + rest 16 + note_type 12, 1, 0 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 10 + sound_loop 0, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch3:: - togglenoise 0 - notetype 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 10 - endchannel +Music_Dungeon3_Ch4:: + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 10 + sound_ret diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm index 35c3813c..0daac932 100644 --- a/crysaudio/music/RBY/finalbattle.asm +++ b/crysaudio/music/RBY/finalbattle.asm @@ -1,15 +1,16 @@ Music_FinalBattle:: - musicheader 3, 1, Music_FinalBattle_Ch0 - musicheader 1, 2, Music_FinalBattle_Ch1 - musicheader 1, 3, Music_FinalBattle_Ch2 + channel_count 3 + channel 1, Music_FinalBattle_Ch1 + channel 2, Music_FinalBattle_Ch2 + channel 3, Music_FinalBattle_Ch3 -Music_FinalBattle_Ch0:: +Music_FinalBattle_Ch1:: tempo 112 - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b2 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 2 octave 3 note F#, 1 note F_, 1 @@ -19,7 +20,7 @@ Music_FinalBattle_Ch0:: note G_, 1 note G#, 1 note G_, 1 - notetype 12, $a2 + note_type 12, 10, 2 note G#, 1 note A_, 1 note G#, 1 @@ -28,7 +29,7 @@ Music_FinalBattle_Ch0:: note A_, 1 note A#, 1 note B_, 1 - notetype 12, $92 + note_type 12, 9, 2 note A#, 1 note B_, 1 octave 4 @@ -40,7 +41,7 @@ Music_FinalBattle_Ch0:: note C#, 1 note C_, 1 note C#, 1 - notetype 12, $82 + note_type 12, 8, 2 note D_, 1 note C#, 1 note D_, 1 @@ -49,7 +50,7 @@ Music_FinalBattle_Ch0:: note D#, 1 note E_, 1 note D#, 1 - notetype 12, $c1 + note_type 12, 12, 1 octave 3 note E_, 1 note E_, 7 @@ -68,49 +69,49 @@ Music_FinalBattle_Ch0:: note G#, 1 note G#, 3 note D#, 4 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 1 note E_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note E_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note F_, 1 note F_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note F_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note G_, 1 note G_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note G_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note F_, 1 note F_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note F_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 1 note E_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note E_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note F_, 1 note F_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note F_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note G_, 1 note G_, 3 - notetype 12, $b3 + note_type 12, 11, 3 note G_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note G#, 1 note G#, 3 - notetype 12, $b7 + note_type 12, 11, 7 note D#, 4 Music_FinalBattle_branch_23429:: - notetype 12, $b7 + note_type 12, 11, 7 octave 3 note E_, 4 note B_, 4 @@ -124,20 +125,20 @@ Music_FinalBattle_branch_23429:: note F#, 4 note F_, 4 note F#, 4 - notetype 12, $b1 + note_type 12, 11, 1 note F#, 2 note F_, 1 note F#, 1 note A_, 1 note F#, 2 note F#, 1 - notetype 12, $b7 + note_type 12, 11, 7 octave 2 note B_, 6 - notetype 12, $a0 + note_type 12, 10, 0 octave 3 note D_, 6 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 4 note E_, 4 note B_, 4 @@ -152,9 +153,9 @@ Music_FinalBattle_branch_23429:: note F_, 4 note F#, 12 note A#, 4 - notetype 12, $5e + note_type 12, 5, -6 note B_, 12 - notetype 12, $b2 + note_type 12, 11, 2 note E_, 3 note E_, 3 note E_, 2 @@ -175,16 +176,16 @@ Music_FinalBattle_branch_23429:: note F#, 1 note B_, 1 note F#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 1 note F#, 1 note B_, 1 note F#, 1 - notetype 12, $d2 + note_type 12, 13, 2 note E_, 1 note F#, 1 note B_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 1 note E_, 7 note E_, 1 @@ -195,23 +196,23 @@ Music_FinalBattle_branch_23429:: note E_, 7 note E_, 1 note E_, 3 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 1 note E_, 3 - notetype 12, $b5 + note_type 12, 11, 5 note F_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 1 note E_, 3 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 4 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 1 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 7 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 2 note B_, 1 note A_, 1 @@ -294,35 +295,35 @@ Music_FinalBattle_branch_23429:: note F_, 3 note F#, 1 note F_, 3 - notetype 12, $b7 + note_type 12, 11, 7 octave 4 note C_, 2 - notetype 12, $b0 + note_type 12, 11, 0 note C#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 8 - notetype 12, $a0 + note_type 12, 10, 0 octave 3 note F#, 8 note F#, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 3 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 note G_, 4 note B_, 12 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 8 - notetype 12, $b0 + note_type 12, 11, 0 note A#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note A#, 8 octave 4 note F_, 8 @@ -335,10 +336,10 @@ Music_FinalBattle_branch_23429:: note A_, 4 octave 4 note C#, 12 - notetype 12, $40 - callchannel Music_FinalBattle_branch_23710 - callchannel Music_FinalBattle_branch_23710 - notetype 12, $b7 + note_type 12, 4, 0 + sound_call Music_FinalBattle_branch_23710 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 7 octave 3 note E_, 4 note B_, 4 @@ -352,10 +353,10 @@ Music_FinalBattle_branch_23429:: note F#, 4 note F_, 4 note F#, 12 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 8 note G_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 4 note B_, 4 note D#, 4 @@ -368,28 +369,28 @@ Music_FinalBattle_branch_23429:: note F#, 4 note F_, 4 note F#, 12 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 octave 4 note C_, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 3 note B_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note B_, 8 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note E_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 8 - loopchannel 0, Music_FinalBattle_branch_23429 + sound_loop 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch1:: - dutycycle 3 - vibrato 8, $25 - notetype 12, $c2 +Music_FinalBattle_Ch2:: + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 2 octave 5 note C_, 1 octave 4 @@ -434,7 +435,7 @@ Music_FinalBattle_Ch1:: note E_, 1 octave 5 note C_, 1 - notetype 12, $c1 + note_type 12, 12, 1 octave 4 note E_, 1 note E_, 7 @@ -446,56 +447,56 @@ Music_FinalBattle_Ch1:: note E_, 7 note E_, 1 note E_, 3 - notetype 12, $c2 + note_type 12, 12, 2 octave 5 note E_, 4 - notetype 12, $c1 + note_type 12, 12, 1 octave 4 note E_, 1 note E_, 3 - notetype 12, $c2 + note_type 12, 12, 2 octave 5 note E_, 4 - notetype 12, $c1 + note_type 12, 12, 1 octave 4 note E_, 1 note E_, 3 - notetype 12, $c2 + note_type 12, 12, 2 octave 5 note E_, 4 - notetype 12, $c1 + note_type 12, 12, 1 octave 4 note E_, 1 note E_, 3 - notetype 12, $c2 + note_type 12, 12, 2 note D#, 4 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - notetype 12, $c1 + 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 + note_type 12, 12, 1 octave 4 note E_, 1 note E_, 3 - notetype 12, $4a + note_type 12, 4, -2 octave 3 note G#, 4 Music_FinalBattle_branch_235e6:: - notetype 12, $d7 + note_type 12, 13, 7 octave 4 note E_, 8 note D#, 8 note D_, 8 octave 3 note B_, 8 - notetype 12, $d7 + note_type 12, 13, 7 note A#, 4 note B_, 12 - notetype 12, $b1 + note_type 12, 11, 1 note F_, 2 note F#, 3 note A_, 1 @@ -510,56 +511,56 @@ Music_FinalBattle_branch_235e6:: note B_, 1 note A_, 1 note A#, 1 - notetype 12, $d7 + note_type 12, 13, 7 octave 4 note E_, 8 note D#, 8 note D_, 8 octave 3 note B_, 8 - notetype 12, $d7 + note_type 12, 13, 7 note A#, 4 note B_, 12 octave 4 note D#, 4 note E_, 12 - notetype 12, $a0 + note_type 12, 10, 0 octave 3 note B_, 8 octave 4 note D_, 8 note F_, 8 note D_, 8 - notetype 12, $d1 + note_type 12, 13, 1 note E_, 1 note E_, 3 - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note D_, 4 - notetype 12, $d1 + note_type 12, 13, 1 octave 4 note E_, 1 note E_, 3 - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note F_, 4 - notetype 12, $d1 + note_type 12, 13, 1 octave 4 note E_, 1 note E_, 3 - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note D_, 4 - notetype 12, $d1 + note_type 12, 13, 1 octave 4 note E_, 1 note E_, 1 - notetype 12, $c4 + note_type 12, 12, 4 octave 2 note B_, 4 octave 3 note D_, 2 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note E_, 1 note E_, 1 @@ -587,99 +588,99 @@ Music_FinalBattle_branch_235e6:: note D#, 1 note E_, 1 note E_, 1 - notetype 12, $c4 + note_type 12, 12, 4 octave 2 note B_, 4 octave 3 note D_, 2 - notetype 12, $d7 + note_type 12, 13, 7 octave 4 note E_, 4 note F_, 2 note F#, 12 - notetype 12, $c2 + note_type 12, 12, 2 octave 3 note B_, 2 note B_, 4 note B_, 2 note B_, 4 note B_, 2 - notetype 12, $d7 + note_type 12, 13, 7 octave 4 note F_, 4 note F#, 2 note G_, 12 - notetype 12, $c2 + note_type 12, 12, 2 note C_, 2 note C_, 4 note C_, 2 note C_, 4 note C_, 2 - notetype 12, $d7 + note_type 12, 13, 7 note F#, 4 note G_, 2 note G#, 12 - notetype 12, $82 + note_type 12, 8, 2 note C#, 2 note C#, 4 - notetype 12, $a2 + note_type 12, 10, 2 note C#, 2 note C#, 4 note C#, 4 - notetype 12, $d2 + note_type 12, 13, 2 note C#, 2 note C#, 4 - notetype 12, $f2 + note_type 12, 15, 2 note C#, 2 note C#, 4 - notetype 12, $c4 + note_type 12, 12, 4 note E_, 1 note F_, 1 - notetype 12, $c0 + note_type 12, 12, 0 note F#, 12 - notetype 12, $c7 + note_type 12, 12, 7 note F#, 4 - notetype 12, $1f + note_type 12, 1, -7 octave 3 note F#, 8 - notetype 12, $90 + note_type 12, 9, 0 note F#, 8 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note C#, 4 - notetype 12, $c0 + note_type 12, 12, 0 note D_, 12 note D_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 8 - notetype 12, $c0 + note_type 12, 12, 0 note E_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 8 - notetype 12, $c0 + note_type 12, 12, 0 octave 3 note A_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 8 - notetype 12, $c0 + note_type 12, 12, 0 octave 4 note F_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note F_, 8 octave 5 note C_, 8 octave 4 note A#, 8 - notetype 12, $c0 + note_type 12, 12, 0 note A_, 16 note A_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 8 - notetype 12, $c5 - callchannel Music_FinalBattle_branch_23710 - notetype 12, $b1 - callchannel Music_FinalBattle_branch_23710 - notetype 12, $d7 + note_type 12, 12, 5 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 1 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 13, 7 octave 4 note E_, 8 note D#, 8 @@ -688,12 +689,12 @@ Music_FinalBattle_branch_235e6:: note B_, 8 note A#, 4 note B_, 12 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note D_, 8 - notetype 12, $4c + note_type 12, 4, -4 note C_, 8 - notetype 12, $d7 + note_type 12, 13, 7 note E_, 8 note D#, 8 note D_, 8 @@ -701,18 +702,18 @@ Music_FinalBattle_branch_235e6:: note B_, 8 note A#, 4 note B_, 12 - notetype 12, $5d + note_type 12, 5, -5 octave 4 note D_, 8 - notetype 12, $c0 + note_type 12, 12, 0 note F_, 8 - notetype 12, $c0 + note_type 12, 12, 0 note E_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 8 note A#, 4 note B_, 12 - loopchannel 0, Music_FinalBattle_branch_235e6 + sound_loop 0, Music_FinalBattle_branch_235e6 Music_FinalBattle_branch_23704:: octave 4 @@ -726,7 +727,7 @@ Music_FinalBattle_branch_23704:: octave 4 note G_, 1 note F_, 1 - endchannel + sound_ret Music_FinalBattle_branch_23710:: octave 4 @@ -740,11 +741,11 @@ Music_FinalBattle_branch_23710:: note C#, 2 note F#, 2 note D_, 2 - endchannel + sound_ret -Music_FinalBattle_Ch2:: - notetype 12, $11 +Music_FinalBattle_Ch3:: + note_type 12, 1, 1 octave 4 note E_, 4 octave 5 @@ -762,30 +763,30 @@ Music_FinalBattle_Ch2:: note B_, 4 note E_, 1 note E_, 1 - note __, 6 + rest 6 note E_, 1 note E_, 1 - note __, 6 + rest 6 note E_, 1 note E_, 1 - note __, 6 + rest 6 note E_, 1 note E_, 1 - note __, 2 + rest 2 note D#, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note B_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 5 note C_, 4 octave 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 5 note D_, 4 octave 4 @@ -797,17 +798,17 @@ Music_FinalBattle_Ch2:: note A#, 2 note E_, 1 note E_, 1 - note __, 2 + rest 2 note B_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 5 note C_, 4 octave 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 5 note D_, 4 octave 4 @@ -819,23 +820,23 @@ Music_FinalBattle_Ch2:: octave 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note B_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 5 note C_, 4 octave 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 octave 5 note D_, 4 octave 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note E_, 1 note D#, 1 note E_, 1 @@ -846,25 +847,25 @@ Music_FinalBattle_branch_2377d:: note E_, 1 octave 3 note E_, 1 - note __, 2 + rest 2 octave 4 note F#, 4 note D#, 1 octave 3 note D#, 1 - note __, 2 + rest 2 octave 4 note F_, 4 note D_, 1 octave 3 note D_, 1 - note __, 2 + rest 2 octave 4 note E_, 4 note F#, 1 octave 3 note F#, 1 - note __, 2 + rest 2 octave 4 note F#, 4 note F_, 4 @@ -899,25 +900,25 @@ Music_FinalBattle_branch_2377d:: note E_, 1 octave 3 note E_, 1 - note __, 2 + rest 2 octave 4 note F#, 4 note D#, 1 octave 3 note D#, 1 - note __, 2 + rest 2 octave 4 note F_, 4 note D_, 1 octave 3 note D_, 1 - note __, 2 + rest 2 octave 4 note E_, 4 note F#, 1 octave 3 note F#, 1 - note __, 2 + rest 2 octave 4 note F#, 4 note F_, 4 @@ -961,15 +962,15 @@ Music_FinalBattle_branch_2377d:: note B_, 2 note E_, 1 note E_, 1 - note __, 2 + rest 2 note D_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note F_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note D_, 4 note E_, 1 note E_, 1 @@ -978,15 +979,15 @@ Music_FinalBattle_branch_2377d:: octave 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note D_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note F_, 4 note E_, 1 note E_, 1 - note __, 2 + rest 2 note D_, 4 note E_, 1 note E_, 1 @@ -1086,8 +1087,8 @@ Music_FinalBattle_branch_2377d:: note C#, 2 note E_, 2 note C#, 2 - callchannel Music_FinalBattle_branch_2395b - callchannel Music_FinalBattle_branch_2395b + sound_call Music_FinalBattle_branch_2395b + sound_call Music_FinalBattle_branch_2395b octave 4 note G_, 2 octave 5 @@ -1121,8 +1122,8 @@ Music_FinalBattle_branch_2377d:: note F#, 1 note G_, 1 note G#, 1 - callchannel Music_FinalBattle_branch_2396c - callchannel Music_FinalBattle_branch_2396c + sound_call Music_FinalBattle_branch_2396c + sound_call Music_FinalBattle_branch_2396c octave 4 note A#, 2 octave 5 @@ -1308,7 +1309,7 @@ Music_FinalBattle_branch_2377d:: note E_, 2 note A_, 2 note B_, 4 - loopchannel 0, Music_FinalBattle_branch_2377d + sound_loop 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 @@ -1327,7 +1328,7 @@ Music_FinalBattle_branch_2395b:: note F#, 2 octave 5 note C#, 2 - endchannel + sound_ret Music_FinalBattle_branch_2396c:: octave 4 @@ -1346,4 +1347,4 @@ Music_FinalBattle_branch_2396c:: note A_, 2 octave 5 note E_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/RBY/gamecorner.asm b/crysaudio/music/RBY/gamecorner.asm index c30cf042..f50e11b0 100644 --- a/crysaudio/music/RBY/gamecorner.asm +++ b/crysaudio/music/RBY/gamecorner.asm @@ -1,18 +1,19 @@ Music_RBYGameCorner:: - musicheader 3, 1, Music_RBYGameCorner_Ch0 - musicheader 1, 2, Music_RBYGameCorner_Ch1 - musicheader 1, 3, Music_RBYGameCorner_Ch2 + channel_count 3 + channel 1, Music_RBYGameCorner_Ch1 + channel 2, Music_RBYGameCorner_Ch2 + channel 3, Music_RBYGameCorner_Ch3 -Music_RBYGameCorner_Ch0:: +Music_RBYGameCorner_Ch1:: tempo 120 - volume $77 - dutycycle 3 - vibrato 12, $34 - ;toggleperfectpitch - notetype 12, $b5 + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 5 octave 3 note A_, 6 - notetype 12, $b1 + note_type 12, 11, 1 note G#, 2 note F#, 2 note E_, 2 @@ -21,7 +22,7 @@ Music_RBYGameCorner_Ch0:: note D#, 16 Music_RBYGameCorner_branch_7e222:: - notetype 12, $b5 + note_type 12, 11, 5 octave 3 note C#, 4 octave 2 @@ -33,21 +34,21 @@ Music_RBYGameCorner_branch_7e222:: octave 3 note A_, 2 note G#, 8 - notetype 12, $a7 + note_type 12, 10, 7 note G#, 2 note A_, 2 note B_, 2 - notetype 12, $b5 + note_type 12, 11, 5 note G#, 6 note E_, 2 note F#, 2 note E_, 2 note D#, 2 note E_, 2 - notetype 12, $a7 + note_type 12, 10, 7 note F#, 8 note D#, 8 - notetype 12, $b5 + note_type 12, 11, 5 note D#, 4 octave 2 note B_, 4 @@ -56,7 +57,7 @@ Music_RBYGameCorner_branch_7e222:: note D#, 4 note B_, 2 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 octave 4 note E_, 2 note D#, 2 @@ -69,15 +70,15 @@ Music_RBYGameCorner_branch_7e222:: note F#, 2 note G_, 2 note G#, 2 - notetype 12, $97 + note_type 12, 9, 7 note G#, 1 note G_, 1 note G#, 1 note G_, 1 note G#, 2 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 8 - notetype 12, $b5 + note_type 12, 11, 5 note C#, 4 octave 2 note G#, 4 @@ -88,7 +89,7 @@ Music_RBYGameCorner_branch_7e222:: octave 3 note A_, 2 note G#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note G#, 2 note A_, 2 note B_, 2 @@ -99,10 +100,10 @@ Music_RBYGameCorner_branch_7e222:: note D#, 2 note E_, 2 note F#, 8 - notetype 12, $97 + note_type 12, 9, 7 note D#, 4 note C#, 4 - notetype 12, $b5 + note_type 12, 11, 5 note D#, 4 octave 2 note B_, 4 @@ -111,7 +112,7 @@ Music_RBYGameCorner_branch_7e222:: note D#, 4 note B_, 2 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 2 note G#, 2 note A_, 2 @@ -121,7 +122,7 @@ Music_RBYGameCorner_branch_7e222:: note A_, 2 note G#, 2 note F#, 2 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 4 octave 2 note B_, 4 @@ -129,7 +130,7 @@ Music_RBYGameCorner_branch_7e222:: note E_, 2 note E_, 4 note E_, 4 - notetype 12, $b7 + note_type 12, 11, 7 octave 2 note B_, 2 octave 3 @@ -142,21 +143,21 @@ Music_RBYGameCorner_branch_7e222:: note C#, 2 note D#, 2 note E_, 8 - notetype 12, $b5 + note_type 12, 11, 5 octave 4 note D#, 4 octave 3 note B_, 4 note F#, 4 note D#, 4 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 3 note D#, 1 - notetype 12, $b2 + note_type 12, 11, 2 note C#, 2 note D#, 2 note E_, 10 - notetype 12, $b7 + note_type 12, 11, 7 octave 2 note B_, 2 octave 3 @@ -169,14 +170,14 @@ Music_RBYGameCorner_branch_7e222:: note C#, 2 note D#, 2 note E_, 8 - notetype 12, $b5 + note_type 12, 11, 5 octave 4 note D#, 4 octave 3 note B_, 4 note F#, 4 note A_, 4 - notetype 12, $b7 + note_type 12, 11, 7 note G#, 2 note G#, 1 note G_, 1 @@ -185,16 +186,16 @@ Music_RBYGameCorner_branch_7e222:: note G#, 1 note G_, 1 note G#, 8 - loopchannel 0, Music_RBYGameCorner_branch_7e222 + sound_loop 0, Music_RBYGameCorner_branch_7e222 -Music_RBYGameCorner_Ch1:: - dutycycle 2 - vibrato 10, $23 - notetype 12, $c6 +Music_RBYGameCorner_Ch2:: + duty_cycle 2 + vibrato 10, 2, 3 + note_type 12, 12, 6 octave 4 note C#, 6 - notetype 12, $c1 + note_type 12, 12, 1 octave 3 note B_, 2 note A_, 2 @@ -202,7 +203,7 @@ Music_RBYGameCorner_Ch1:: note F#, 2 note E_, 2 note F#, 2 - dutycycle 3 + duty_cycle 3 note B_, 1 note A#, 1 note B_, 1 @@ -212,8 +213,8 @@ Music_RBYGameCorner_Ch1:: note B_, 8 Music_RBYGameCorner_branch_7e2fa:: - dutycycle 2 - notetype 12, $c7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 note E_, 4 octave 2 @@ -281,9 +282,9 @@ Music_RBYGameCorner_branch_7e2fa:: note E_, 2 note F#, 2 note G#, 2 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 2 - notetype 12, $a1 + note_type 12, 10, 1 note E_, 1 note D#, 1 note E_, 1 @@ -291,7 +292,7 @@ Music_RBYGameCorner_branch_7e2fa:: note E_, 1 note D#, 1 note E_, 2 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 2 octave 4 @@ -309,7 +310,7 @@ Music_RBYGameCorner_branch_7e2fa:: octave 4 note C#, 2 note D#, 2 - notetype 12, $c5 + note_type 12, 12, 5 note F#, 4 note D#, 4 octave 3 @@ -318,11 +319,11 @@ Music_RBYGameCorner_branch_7e2fa:: note A_, 4 note G#, 3 note A_, 1 - notetype 12, $c2 + note_type 12, 12, 2 note G#, 2 note F#, 2 note E_, 2 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 2 octave 4 @@ -345,288 +346,288 @@ Music_RBYGameCorner_branch_7e2fa:: note A_, 4 note F#, 4 note B_, 16 - loopchannel 0, Music_RBYGameCorner_branch_7e2fa + sound_loop 0, Music_RBYGameCorner_branch_7e2fa -Music_RBYGameCorner_Ch2:: - notetype 12, $13 +Music_RBYGameCorner_Ch3:: + note_type 12, 1, 3 octave 5 note C#, 1 - note __, 5 + rest 5 octave 4 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 9 + rest 9 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 Music_RBYGameCorner_branch_7e3a5:: - callchannel Music_RBYGameCorner_branch_7e418 - callchannel Music_RBYGameCorner_branch_7e42d - callchannel Music_RBYGameCorner_branch_7e442 - callchannel Music_RBYGameCorner_branch_7e457 - callchannel Music_RBYGameCorner_branch_7e46c - callchannel Music_RBYGameCorner_branch_7e481 - callchannel Music_RBYGameCorner_branch_7e496 + sound_call Music_RBYGameCorner_branch_7e418 + sound_call Music_RBYGameCorner_branch_7e42d + sound_call Music_RBYGameCorner_branch_7e442 + sound_call Music_RBYGameCorner_branch_7e457 + sound_call Music_RBYGameCorner_branch_7e46c + sound_call Music_RBYGameCorner_branch_7e481 + sound_call Music_RBYGameCorner_branch_7e496 note D#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_RBYGameCorner_branch_7e418 - callchannel Music_RBYGameCorner_branch_7e42d - callchannel Music_RBYGameCorner_branch_7e442 - callchannel Music_RBYGameCorner_branch_7e457 - callchannel Music_RBYGameCorner_branch_7e46c - callchannel Music_RBYGameCorner_branch_7e481 - callchannel Music_RBYGameCorner_branch_7e496 + rest 1 + sound_call Music_RBYGameCorner_branch_7e418 + sound_call Music_RBYGameCorner_branch_7e42d + sound_call Music_RBYGameCorner_branch_7e442 + sound_call Music_RBYGameCorner_branch_7e457 + sound_call Music_RBYGameCorner_branch_7e46c + sound_call Music_RBYGameCorner_branch_7e481 + sound_call Music_RBYGameCorner_branch_7e496 note E_, 1 - note __, 3 + rest 3 octave 3 note B_, 1 - note __, 3 + rest 3 octave 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 - callchannel Music_RBYGameCorner_branch_7e46c - callchannel Music_RBYGameCorner_branch_7e418 - callchannel Music_RBYGameCorner_branch_7e4ab + rest 1 + sound_call Music_RBYGameCorner_branch_7e46c + sound_call Music_RBYGameCorner_branch_7e418 + sound_call Music_RBYGameCorner_branch_7e4ab note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - callchannel Music_RBYGameCorner_branch_7e46c - callchannel Music_RBYGameCorner_branch_7e418 - callchannel Music_RBYGameCorner_branch_7e4ab - callchannel Music_RBYGameCorner_branch_7e42d - loopchannel 0, Music_RBYGameCorner_branch_7e3a5 + rest 1 + sound_call Music_RBYGameCorner_branch_7e46c + sound_call Music_RBYGameCorner_branch_7e418 + sound_call Music_RBYGameCorner_branch_7e4ab + sound_call Music_RBYGameCorner_branch_7e42d + sound_loop 0, Music_RBYGameCorner_branch_7e3a5 Music_RBYGameCorner_branch_7e418:: note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e42d:: note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e442:: note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e457:: note D#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e46c:: note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e481:: note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e496:: note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_RBYGameCorner_branch_7e4ab:: note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret diff --git a/crysaudio/music/RBY/gym.asm b/crysaudio/music/RBY/gym.asm index 51ffc721..4cc62a6b 100644 --- a/crysaudio/music/RBY/gym.asm +++ b/crysaudio/music/RBY/gym.asm @@ -1,15 +1,16 @@ Music_RBYGym:: - musicheader 3, 1, Music_RBYGym_Ch0 - musicheader 1, 2, Music_RBYGym_Ch1 - musicheader 1, 3, Music_RBYGym_Ch2 + channel_count 3 + channel 1, Music_RBYGym_Ch1 + channel 2, Music_RBYGym_Ch2 + channel 3, Music_RBYGym_Ch3 -Music_RBYGym_Ch0:: +Music_RBYGym_Ch1:: tempo 138 - volume $77 - dutycycle 3 - vibrato 8, $22 - ;toggleperfectpitch - notetype 12, $b5 + volume 7, 7 + duty_cycle 3 + vibrato 8, 2, 2 + ;toggle_perfect_pitch + note_type 12, 11, 5 octave 3 note G_, 6 note C_, 1 @@ -35,9 +36,9 @@ Music_RBYGym_branch_bcd8:: note E_, 2 note D_, 2 note C_, 2 - notetype 12, $b1 + note_type 12, 11, 1 note D_, 3 - notetype 12, $b5 + note_type 12, 11, 5 note E_, 1 note F_, 4 note E_, 2 @@ -70,9 +71,9 @@ Music_RBYGym_branch_bcd8:: note A_, 2 note G_, 2 note F_, 2 - notetype 12, $b1 + note_type 12, 11, 1 note A#, 3 - notetype 12, $b5 + note_type 12, 11, 5 note F_, 1 note F_, 4 note E_, 2 @@ -167,13 +168,13 @@ Music_RBYGym_branch_bcd8:: note A_, 2 note G_, 2 note A_, 2 - loopchannel 0, Music_RBYGym_branch_bcd8 + sound_loop 0, Music_RBYGym_branch_bcd8 -Music_RBYGym_Ch1:: - dutycycle 3 - vibrato 10, $25 - notetype 12, $c7 +Music_RBYGym_Ch2:: + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 7 octave 4 note C_, 6 octave 3 @@ -184,9 +185,9 @@ Music_RBYGym_Ch1:: note A#, 6 note F_, 1 note A#, 1 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 12 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 4 Music_RBYGym_branch_bd82:: @@ -196,11 +197,11 @@ Music_RBYGym_branch_bd82:: note G_, 2 octave 4 note C_, 2 - notetype 12, $c2 + note_type 12, 12, 2 note D_, 3 octave 3 note A#, 1 - notetype 12, $c7 + note_type 12, 12, 7 note A#, 12 octave 4 note C_, 12 @@ -208,10 +209,10 @@ Music_RBYGym_branch_bd82:: note G_, 2 octave 4 note C_, 2 - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note A#, 2 - notetype 12, $c7 + note_type 12, 12, 7 note A#, 1 octave 4 note C_, 1 @@ -219,15 +220,15 @@ Music_RBYGym_branch_bd82:: note E_, 12 note D_, 2 note E_, 2 - notetype 12, $c2 + note_type 12, 12, 2 note F_, 3 note D_, 1 - notetype 12, $c7 + note_type 12, 12, 7 note D_, 4 - notetype 12, $c2 + note_type 12, 12, 2 note A#, 3 note F_, 1 - notetype 12, $c7 + note_type 12, 12, 7 note F_, 4 note E_, 12 note D_, 2 @@ -246,9 +247,9 @@ Music_RBYGym_branch_bd82:: note A_, 4 note G_, 4 note F_, 4 - notetype 12, $c3 + note_type 12, 12, 3 note E_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 1 note F_, 1 note G_, 6 @@ -271,53 +272,53 @@ Music_RBYGym_branch_bd82:: note A_, 4 note G_, 4 note F_, 4 - notetype 12, $c3 + note_type 12, 12, 3 note E_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 1 note F_, 1 note G_, 4 - notetype 12, $c3 + note_type 12, 12, 3 note G_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 1 note A_, 1 note A#, 4 - notetype 12, $c4 + note_type 12, 12, 4 octave 4 note C_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note C_, 1 note D_, 1 note E_, 12 - loopchannel 0, Music_RBYGym_branch_bd82 + sound_loop 0, Music_RBYGym_branch_bd82 -Music_RBYGym_Ch2:: - notetype 12, $11 - note __, 16 - note __, 10 +Music_RBYGym_Ch3:: + note_type 12, 1, 1 + rest 16 + rest 10 octave 4 note G_, 2 note F_, 2 note D_, 2 Music_RBYGym_branch_be02:: - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be44 - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be44 - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be44 - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be44 - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be4d - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be4d - callchannel Music_RBYGym_branch_be3b - callchannel Music_RBYGym_branch_be4d - callchannel Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be44 + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be44 + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be44 + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be44 + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be4d + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be4d + sound_call Music_RBYGym_branch_be3b + sound_call Music_RBYGym_branch_be4d + sound_call Music_RBYGym_branch_be3b note F_, 2 note A#, 2 note F_, 2 @@ -326,7 +327,7 @@ Music_RBYGym_branch_be02:: note A#, 2 note A_, 2 note F_, 2 - loopchannel 0, Music_RBYGym_branch_be02 + sound_loop 0, Music_RBYGym_branch_be02 Music_RBYGym_branch_be3b:: note E_, 2 @@ -337,7 +338,7 @@ Music_RBYGym_branch_be3b:: note G_, 2 note E_, 2 note G_, 2 - endchannel + sound_ret Music_RBYGym_branch_be44:: note D_, 2 @@ -348,7 +349,7 @@ Music_RBYGym_branch_be44:: note F_, 2 note D_, 2 note F_, 2 - endchannel + sound_ret Music_RBYGym_branch_be4d:: note F_, 2 @@ -359,4 +360,4 @@ Music_RBYGym_branch_be4d:: note A#, 2 note F_, 2 note A#, 2 - endchannel + sound_ret diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm index 2cd305ef..76742532 100644 --- a/crysaudio/music/RBY/gymleaderbattle.asm +++ b/crysaudio/music/RBY/gymleaderbattle.asm @@ -1,16 +1,17 @@ Music_GymLeaderBattle:: - musicheader 3, 1, Music_GymLeaderBattle_Ch0 - musicheader 1, 2, Music_GymLeaderBattle_Ch1 - musicheader 1, 3, Music_GymLeaderBattle_Ch2 + channel_count 3 + channel 1, Music_GymLeaderBattle_Ch1 + channel 2, Music_GymLeaderBattle_Ch2 + channel 3, Music_GymLeaderBattle_Ch3 -Music_GymLeaderBattle_Ch0:: +Music_GymLeaderBattle_Ch1:: tempo 104 - volume $77 - dutycycle 3 - vibrato 8, $34 - ;toggleperfectpitch - notetype 12, $b3 - note __, 6 + volume 7, 7 + duty_cycle 3 + vibrato 8, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 3 + rest 6 octave 3 note F#, 1 note F_, 1 @@ -42,24 +43,24 @@ Music_GymLeaderBattle_Ch0:: note B_, 1 octave 2 note F#, 1 - note __, 15 + rest 15 note F#, 1 - note __, 9 + rest 9 note G_, 6 note F#, 1 - note __, 15 + rest 15 note F#, 1 - note __, 9 + rest 9 note F_, 6 note F#, 1 - note __, 15 + rest 15 note F#, 1 - note __, 9 + rest 9 note G_, 6 note F#, 1 - note __, 15 + rest 15 note F#, 1 - note __, 9 + rest 9 note A_, 6 Music_GymLeaderBattle_branch_223b0:: @@ -235,57 +236,57 @@ Music_GymLeaderBattle_branch_223b0:: octave 2 note B_, 1 note A_, 1 - note __, 2 + rest 2 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 4 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 4 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 4 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 4 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 4 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 4 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 1 @@ -295,9 +296,9 @@ Music_GymLeaderBattle_branch_223b0:: note C#, 2 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 octave 2 @@ -364,12 +365,12 @@ Music_GymLeaderBattle_branch_223b0:: note B_, 1 note A_, 1 note B_, 1 - note __, 16 + rest 16 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 octave 2 @@ -462,22 +463,22 @@ Music_GymLeaderBattle_branch_223b0:: note B_, 1 octave 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype 12, $b5 + rest 1 + note_type 12, 11, 5 octave 3 note C#, 12 - notetype 12, $b3 + note_type 12, 11, 3 octave 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype 12, $b5 + rest 1 + note_type 12, 11, 5 octave 3 note A_, 12 - notetype 12, $b3 + note_type 12, 11, 3 note D#, 4 note C#, 4 note D#, 4 @@ -494,13 +495,13 @@ Music_GymLeaderBattle_branch_223b0:: note F#, 2 octave 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype 12, $b5 + rest 1 + note_type 12, 11, 5 octave 3 note A_, 12 - notetype 12, $b3 + note_type 12, 11, 3 note C#, 1 octave 2 note B_, 1 @@ -519,7 +520,7 @@ Music_GymLeaderBattle_branch_223b0:: note E_, 1 note D#, 1 note C#, 1 - notetype 12, $b5 + note_type 12, 11, 5 note D#, 4 note E_, 4 note C#, 2 @@ -528,8 +529,8 @@ Music_GymLeaderBattle_branch_223b0:: note E_, 2 note D#, 4 note C#, 6 - note __, 16 - note __, 10 + rest 16 + rest 10 note E_, 6 note D#, 4 note E_, 4 @@ -549,13 +550,13 @@ Music_GymLeaderBattle_branch_223b0:: note A_, 2 note G#, 4 note E_, 6 - loopchannel 0, Music_GymLeaderBattle_branch_223b0 + sound_loop 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch1:: - dutycycle 3 - vibrato 8, $25 - notetype 12, $c3 +Music_GymLeaderBattle_Ch2:: + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 3 octave 4 note F_, 1 note E_, 1 @@ -571,7 +572,7 @@ Music_GymLeaderBattle_Ch1:: note C_, 1 octave 3 note B_, 1 - note __, 5 + rest 5 note F#, 1 note F_, 1 note E_, 1 @@ -587,34 +588,34 @@ Music_GymLeaderBattle_Ch1:: note D_, 1 note C#, 1 note B_, 1 - note __, 15 + rest 15 note B_, 1 - note __, 9 + rest 9 octave 4 note C_, 6 octave 3 note B_, 1 - note __, 15 + rest 15 note B_, 1 - note __, 9 + rest 9 note A#, 6 octave 3 note B_, 1 - note __, 15 + rest 15 note B_, 1 - note __, 9 + rest 9 octave 4 note C_, 6 octave 3 note B_, 1 - note __, 15 + rest 15 note B_, 1 - note __, 9 + rest 9 octave 4 note C#, 6 Music_GymLeaderBattle_branch_225e0:: - notetype 12, $c5 + note_type 12, 12, 5 note D#, 4 note C#, 4 note D#, 4 @@ -628,16 +629,16 @@ Music_GymLeaderBattle_branch_225e0:: octave 4 note C#, 2 note D#, 2 - notetype 12, $b7 - dutycycle 2 + note_type 12, 11, 7 + duty_cycle 2 octave 3 note A_, 8 octave 4 note C#, 8 note E_, 8 note C#, 8 - notetype 12, $c5 - dutycycle 3 + note_type 12, 12, 5 + duty_cycle 3 note D#, 4 note C#, 4 note D#, 4 @@ -651,22 +652,22 @@ Music_GymLeaderBattle_branch_225e0:: octave 4 note C#, 2 note D#, 2 - notetype 12, $b7 - dutycycle 2 + note_type 12, 11, 7 + duty_cycle 2 note C#, 8 octave 3 note B_, 8 note A_, 8 - notetype 12, $c3 + note_type 12, 12, 3 octave 4 note E_, 4 note E_, 2 note C#, 2 - notetype 12, $c5 - dutycycle 3 + note_type 12, 12, 5 + duty_cycle 3 octave 1 note B_, 1 - note __, 3 + rest 3 octave 3 note D_, 1 note C#, 1 @@ -674,61 +675,61 @@ Music_GymLeaderBattle_branch_225e0:: note B_, 1 octave 3 note D_, 1 - note __, 4 + rest 4 note E_, 1 note D_, 1 octave 2 note B_, 1 octave 3 note E_, 1 - note __, 4 + rest 4 note F#, 1 note E_, 1 note C#, 1 note F#, 1 - note __, 2 + rest 2 note E_, 1 note C#, 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 1 note C#, 1 octave 2 note B_, 1 octave 3 note D_, 1 - note __, 4 + rest 4 note E_, 1 note D_, 1 octave 2 note B_, 1 octave 3 note E_, 1 - note __, 4 + rest 4 note F#, 1 note E_, 1 note C#, 1 note F#, 1 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - notetype 12, $b0 + rest 1 + note_type 12, 11, 0 octave 3 note B_, 4 octave 4 @@ -741,11 +742,11 @@ Music_GymLeaderBattle_branch_225e0:: octave 3 note A_, 4 note G_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 8 - notetype 12, $c3 + note_type 12, 12, 3 note C_, 1 note C#, 1 note D_, 1 @@ -767,7 +768,7 @@ Music_GymLeaderBattle_branch_225e0:: note G_, 1 note A_, 1 note B_, 1 - notetype 12, $b0 + note_type 12, 11, 0 octave 3 note B_, 4 octave 4 @@ -781,51 +782,51 @@ Music_GymLeaderBattle_branch_225e0:: note A_, 4 octave 4 note C_, 4 - notetype 12, $b0 + note_type 12, 11, 0 octave 3 note B_, 16 - notetype 12, $3f + note_type 12, 3, -7 octave 4 note F#, 16 - notetype 12, $c3 - dutycycle 3 + note_type 12, 12, 3 + duty_cycle 3 octave 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype 12, $c7 + rest 1 + note_type 12, 12, 7 octave 3 note A_, 12 - notetype 12, $c3 + note_type 12, 12, 3 octave 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype 12, $c7 + rest 1 + note_type 12, 12, 7 octave 4 note C#, 12 - notetype 12, $b0 + note_type 12, 11, 0 note D#, 16 - notetype 12, $b7 + note_type 12, 11, 7 note D#, 16 - notetype 12, $c3 + note_type 12, 12, 3 octave 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype 12, $c7 + rest 1 + note_type 12, 12, 7 octave 4 note C#, 12 - notetype 12, $c0 + note_type 12, 12, 0 note A_, 8 note E_, 8 note B_, 16 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 16 - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note D#, 4 note E_, 4 @@ -834,29 +835,29 @@ Music_GymLeaderBattle_branch_225e0:: note F#, 4 note A_, 2 note G#, 4 - note __, 2 + rest 2 note B_, 1 octave 4 note D#, 1 note F#, 1 note A#, 1 - notetype 12, $c0 + note_type 12, 12, 0 note B_, 16 note F#, 16 note A_, 16 octave 5 note C#, 8 - note __, 2 - notetype 12, $c3 + rest 2 + note_type 12, 12, 3 octave 4 note A_, 6 - loopchannel 0, Music_GymLeaderBattle_branch_225e0 + sound_loop 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch2:: - vibrato 0, $20 - notetype 12, $13 - note __, 12 +Music_GymLeaderBattle_Ch3:: + vibrato 0, 2, 0 + note_type 12, 1, 3 + rest 12 octave 3 note B_, 1 octave 4 @@ -881,169 +882,169 @@ Music_GymLeaderBattle_Ch2:: note F#, 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C_, 6 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F_, 6 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C_, 6 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 6 - notetype 12, $14 + note_type 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 @@ -1176,56 +1177,56 @@ Music_GymLeaderBattle_branch_227b1:: note E_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 3 @@ -1235,57 +1236,57 @@ Music_GymLeaderBattle_branch_227b1:: note C#, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 13 + rest 13 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 12 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 12 note D#, 16 octave 3 note B_, 16 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 12 note C#, 8 @@ -1402,4 +1403,4 @@ Music_GymLeaderBattle_branch_227b1:: note B_, 2 octave 4 note G_, 6 - loopchannel 0, Music_GymLeaderBattle_branch_227b1 + sound_loop 0, Music_GymLeaderBattle_branch_227b1 diff --git a/crysaudio/music/RBY/halloffame.asm b/crysaudio/music/RBY/halloffame.asm index cce7c36c..9707d6bc 100644 --- a/crysaudio/music/RBY/halloffame.asm +++ b/crysaudio/music/RBY/halloffame.asm @@ -1,19 +1,20 @@ Music_RBYHallOfFame:: - musicheader 3, 1, Music_RBYHallOfFame_Ch0 - musicheader 1, 2, Music_RBYHallOfFame_Ch1 - musicheader 1, 3, Music_RBYHallOfFame_Ch2 + channel_count 3 + channel 1, Music_RBYHallOfFame_Ch1 + channel 2, Music_RBYHallOfFame_Ch2 + channel 3, Music_RBYHallOfFame_Ch3 -Music_RBYHallOfFame_Ch0:: +Music_RBYHallOfFame_Ch1:: tempo 112 - volume $77 - dutycycle 3 - vibrato 12, $22 - ;toggleperfectpitch - notetype 12, $b3 - note __, 16 - note __, 16 - note __, 16 - note __, 12 + volume 7, 7 + duty_cycle 3 + vibrato 12, 2, 2 + ;toggle_perfect_pitch + note_type 12, 11, 3 + rest 16 + rest 16 + rest 16 + rest 12 octave 3 note D_, 1 note E_, 1 @@ -21,27 +22,27 @@ Music_RBYHallOfFame_Ch0:: note F#, 1 Music_RBYHallOfFame_branch_7fbc5:: - notetype 12, $80 + note_type 12, 8, 0 octave 4 note C_, 16 note E_, 16 note F#, 16 - notetype 12, $60 + note_type 12, 6, 0 note F_, 16 - loopchannel 3, Music_RBYHallOfFame_branch_7fbc5 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_RBYHallOfFame_branch_7fbc5 + sound_loop 3, Music_RBYHallOfFame_branch_7fbc5 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_RBYHallOfFame_branch_7fbc5 -Music_RBYHallOfFame_Ch1:: - vibrato 8, $25 - dutycycle 3 +Music_RBYHallOfFame_Ch2:: + vibrato 8, 2, 5 + duty_cycle 3 Music_RBYHallOfFame_branch_7fbdf:: - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note G_, 2 note D_, 2 @@ -65,11 +66,11 @@ Music_RBYHallOfFame_branch_7fbdf:: note A#, 4 note A_, 4 note F_, 2 - loopchannel 0, Music_RBYHallOfFame_branch_7fbdf + sound_loop 0, Music_RBYHallOfFame_branch_7fbdf -Music_RBYHallOfFame_Ch2:: - notetype 12, $12 +Music_RBYHallOfFame_Ch3:: + note_type 12, 1, 2 Music_RBYHallOfFame_branch_7fbfe:: octave 4 @@ -81,7 +82,7 @@ Music_RBYHallOfFame_branch_7fbfe:: note G_, 2 note D_, 2 note G_, 2 - loopchannel 12, Music_RBYHallOfFame_branch_7fbfe + sound_loop 12, Music_RBYHallOfFame_branch_7fbfe note D_, 4 note G_, 4 note D_, 4 @@ -98,4 +99,4 @@ Music_RBYHallOfFame_branch_7fbfe:: note G_, 4 note E_, 4 note G_, 4 - loopchannel 0, Music_RBYHallOfFame_Ch2 + sound_loop 0, Music_RBYHallOfFame_Ch3 diff --git a/crysaudio/music/RBY/indigoplateau.asm b/crysaudio/music/RBY/indigoplateau.asm index 976bf0b4..fd79121e 100644 --- a/crysaudio/music/RBY/indigoplateau.asm +++ b/crysaudio/music/RBY/indigoplateau.asm @@ -1,46 +1,47 @@ Music_RBYIndigoPlateau:: - musicheader 4, 1, Music_RBYIndigoPlateau_Ch0 - musicheader 1, 2, Music_RBYIndigoPlateau_Ch1 - musicheader 1, 3, Music_RBYIndigoPlateau_Ch2 - musicheader 1, 4, Music_RBYIndigoPlateau_Ch3 + channel_count 4 + channel 1, Music_RBYIndigoPlateau_Ch1 + channel 2, Music_RBYIndigoPlateau_Ch2 + channel 3, Music_RBYIndigoPlateau_Ch3 + channel 4, Music_RBYIndigoPlateau_Ch4 -Music_RBYIndigoPlateau_Ch0:: +Music_RBYIndigoPlateau_Ch1:: tempo 132 - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b2 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 2 octave 2 note A_, 8 note A_, 8 note A_, 8 note A_, 4 - notetype 12, $a4 + note_type 12, 10, 4 note A#, 4 Music_RBYIndigoPlateau_branch_a605:: - callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, $b4 + sound_call Music_RBYIndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 note D_, 4 - callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, $b4 + sound_call Music_RBYIndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 note D#, 4 - callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, $b4 + sound_call Music_RBYIndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 note D_, 4 - callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, $a0 + sound_call Music_RBYIndigoPlateau_branch_a659 + note_type 12, 10, 0 octave 2 note A#, 4 - callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, $b4 + sound_call Music_RBYIndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 note D_, 4 - notetype 12, $d4 + note_type 12, 13, 4 octave 3 note A_, 4 note A_, 4 @@ -49,10 +50,10 @@ Music_RBYIndigoPlateau_branch_a605:: note A_, 4 note A_, 4 note A_, 4 - notetype 12, $b4 + note_type 12, 11, 4 octave 3 note D#, 4 - notetype 12, $d4 + note_type 12, 13, 4 octave 3 note A#, 4 note A#, 4 @@ -61,26 +62,26 @@ Music_RBYIndigoPlateau_branch_a605:: note A#, 4 note A#, 4 note A#, 4 - notetype 12, $b4 + note_type 12, 11, 4 octave 3 note F_, 2 - notetype 12, $b4 + note_type 12, 11, 4 octave 3 note G_, 2 - notetype 12, $b0 + note_type 12, 11, 0 note A_, 8 octave 2 note A_, 8 - notetype 12, $b7 + note_type 12, 11, 7 octave 3 note F_, 8 - notetype 12, $4e + note_type 12, 4, -6 octave 2 note A#, 8 - loopchannel 0, Music_RBYIndigoPlateau_branch_a605 + sound_loop 0, Music_RBYIndigoPlateau_branch_a605 Music_RBYIndigoPlateau_branch_a659:: - notetype 12, $b2 + note_type 12, 11, 2 octave 2 note A_, 4 note A_, 4 @@ -89,45 +90,45 @@ Music_RBYIndigoPlateau_branch_a659:: note A_, 4 note A_, 4 note A_, 4 - endchannel + sound_ret -Music_RBYIndigoPlateau_Ch1:: - dutycycle 3 - vibrato 8, $25 - notetype 12, $c2 +Music_RBYIndigoPlateau_Ch2:: + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 2 octave 3 note D_, 8 note D_, 8 note D_, 8 note D_, 4 - notetype 12, $5a + note_type 12, 5, -2 note D#, 4 Music_RBYIndigoPlateau_branch_a673:: - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c5 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 5 note A_, 4 - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c5 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 5 note A#, 4 - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c5 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 5 note A_, 4 - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c7 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 7 note C#, 4 - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c5 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 5 note A_, 4 - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c5 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 5 note A#, 4 - callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, $c5 + sound_call Music_RBYIndigoPlateau_branch_a6af + note_type 12, 12, 5 octave 4 note C_, 2 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note C#, 2 note D_, 8 @@ -135,13 +136,13 @@ Music_RBYIndigoPlateau_branch_a673:: note D_, 8 octave 4 note C_, 8 - notetype 12, $4d + note_type 12, 4, -5 octave 4 note D#, 8 - loopchannel 0, Music_RBYIndigoPlateau_branch_a673 + sound_loop 0, Music_RBYIndigoPlateau_branch_a673 Music_RBYIndigoPlateau_branch_a6af:: - notetype 12, $c2 + note_type 12, 12, 2 octave 3 note D_, 4 note D_, 4 @@ -150,179 +151,179 @@ Music_RBYIndigoPlateau_branch_a6af:: note D_, 4 note D_, 4 note D_, 4 - endchannel + sound_ret -Music_RBYIndigoPlateau_Ch2:: - notetype 12, $10 +Music_RBYIndigoPlateau_Ch3:: + note_type 12, 1, 0 octave 4 note D_, 2 - note __, 6 + rest 6 note D_, 2 - note __, 6 + rest 6 note D_, 2 - note __, 6 + rest 6 note D_, 2 - note __, 2 + rest 2 note D#, 4 Music_RBYIndigoPlateau_branch_a6c6:: - callchannel Music_RBYIndigoPlateau_branch_a6fe - callchannel Music_RBYIndigoPlateau_branch_a6fe - callchannel Music_RBYIndigoPlateau_branch_a6fe + sound_call Music_RBYIndigoPlateau_branch_a6fe + sound_call Music_RBYIndigoPlateau_branch_a6fe + sound_call Music_RBYIndigoPlateau_branch_a6fe note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note F#, 4 - callchannel Music_RBYIndigoPlateau_branch_a6fe - callchannel Music_RBYIndigoPlateau_branch_a6fe + sound_call Music_RBYIndigoPlateau_branch_a6fe + sound_call Music_RBYIndigoPlateau_branch_a6fe note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A_, 8 note D_, 8 note A#, 8 note D#, 8 - loopchannel 0, Music_RBYIndigoPlateau_branch_a6c6 + sound_loop 0, Music_RBYIndigoPlateau_branch_a6c6 Music_RBYIndigoPlateau_branch_a6fe:: octave 4 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note A_, 4 - endchannel + sound_ret -Music_RBYIndigoPlateau_Ch3:: - togglenoise 1 - notetype 6 - note A_, 16 - note A_, 16 - note A_, 16 - note A_, 8 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 +Music_RBYIndigoPlateau_Ch4:: + toggle_noise 1 + drum_speed 6 + drum_note 10, 16 + drum_note 10, 16 + drum_note 10, 16 + drum_note 10, 8 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 Music_RBYIndigoPlateau_branch_a728:: - callchannel Music_RBYIndigoPlateau_branch_a791 - callchannel Music_RBYIndigoPlateau_branch_a77e - callchannel Music_RBYIndigoPlateau_branch_a791 - callchannel Music_RBYIndigoPlateau_branch_a7a8 - callchannel Music_RBYIndigoPlateau_branch_a791 - callchannel Music_RBYIndigoPlateau_branch_a77e - callchannel Music_RBYIndigoPlateau_branch_a791 - callchannel Music_RBYIndigoPlateau_branch_a7a8 - callchannel Music_RBYIndigoPlateau_branch_a791 - callchannel Music_RBYIndigoPlateau_branch_a77e - callchannel Music_RBYIndigoPlateau_branch_a791 - callchannel Music_RBYIndigoPlateau_branch_a7a8 - callchannel Music_RBYIndigoPlateau_branch_a77e - callchannel Music_RBYIndigoPlateau_branch_a7a8 - note A_, 16 - note A_, 8 - note A#, 8 - note A_, 16 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - note A_, 1 - note A_, 1 - loopchannel 0, Music_RBYIndigoPlateau_branch_a728 + sound_call Music_RBYIndigoPlateau_branch_a791 + sound_call Music_RBYIndigoPlateau_branch_a77e + sound_call Music_RBYIndigoPlateau_branch_a791 + sound_call Music_RBYIndigoPlateau_branch_a7a8 + sound_call Music_RBYIndigoPlateau_branch_a791 + sound_call Music_RBYIndigoPlateau_branch_a77e + sound_call Music_RBYIndigoPlateau_branch_a791 + sound_call Music_RBYIndigoPlateau_branch_a7a8 + sound_call Music_RBYIndigoPlateau_branch_a791 + sound_call Music_RBYIndigoPlateau_branch_a77e + sound_call Music_RBYIndigoPlateau_branch_a791 + sound_call Music_RBYIndigoPlateau_branch_a7a8 + sound_call Music_RBYIndigoPlateau_branch_a77e + sound_call Music_RBYIndigoPlateau_branch_a7a8 + drum_note 10, 16 + drum_note 10, 8 + drum_note 11, 8 + drum_note 10, 16 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 10, 1 + sound_loop 0, Music_RBYIndigoPlateau_branch_a728 Music_RBYIndigoPlateau_branch_a77e:: - note A_, 4 - note A#, 4 - note B_, 4 - note A#, 4 - note A_, 4 - note A#, 4 - note B_, 4 - note B_, 2 - note A#, 2 - endchannel + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 12, 2 + drum_note 11, 2 + sound_ret Music_RBYIndigoPlateau_branch_a791:: - note A_, 4 - note A#, 4 - note B_, 4 - note A#, 4 - note A_, 4 - note A#, 4 - note B_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - endchannel + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + sound_ret Music_RBYIndigoPlateau_branch_a7a8:: - note A_, 4 - note A#, 4 - note A_, 4 - note A#, 4 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - endchannel + drum_note 10, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + sound_ret diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm index 68b0a3b2..514e3a4b 100644 --- a/crysaudio/music/RBY/introbattle.asm +++ b/crysaudio/music/RBY/introbattle.asm @@ -1,336 +1,337 @@ Music_IntroBattle:: - musicheader 4, 1, Music_IntroBattle_Ch0 - musicheader 1, 2, Music_IntroBattle_Ch1 - musicheader 1, 3, Music_IntroBattle_Ch2 - musicheader 1, 4, Music_IntroBattle_Ch3 - -Music_IntroBattle_Ch0:: - tempo 98 - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b1 - note __, 8 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note D_, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note D#, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note D_, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $a0 - note A#, 4 - notetype 12, $b1 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note D_, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $29 - octave 3 - note G_, 4 - notetype 12, $b0 - note A_, 8 - octave 2 - note A_, 8 - notetype 12, $b7 - octave 3 - note F_, 8 - notetype 12, $4f - octave 2 - note F_, 8 - notetype 12, $b1 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note D_, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note D#, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note F_, 4 - notetype 12, $b1 - octave 2 - note A_, 2 - note A_, 2 - notetype 12, $b4 - octave 3 - note G_, 4 - notetype 12, $b0 - note F#, 16 - notetype 12, $b1 - octave 4 - note D_, 16 - endchannel - + channel_count 4 + channel 1, Music_IntroBattle_Ch1 + channel 2, Music_IntroBattle_Ch2 + channel 3, Music_IntroBattle_Ch3 + channel 4, Music_IntroBattle_Ch4 Music_IntroBattle_Ch1:: - dutycycle 3 - vibrato 8, $25 - notetype 12, $c2 - note __, 8 + tempo 98 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 1 + rest 8 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - note D_, 2 - note D_, 2 - notetype 12, $c5 - note A_, 4 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $c5 + note D_, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 + octave 3 + note D#, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 + octave 3 + note D_, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 10, 0 note A#, 4 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $c5 - note A_, 4 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $b7 - note C#, 4 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $c5 - note A_, 4 - notetype 12, $c2 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - note D_, 2 - note D_, 2 - notetype 12, $c7 - octave 4 - note C#, 4 - note D_, 8 + note D_, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 2, -1 octave 3 - note D_, 8 - octave 4 - note C_, 8 + note G_, 4 + note_type 12, 11, 0 + note A_, 8 + octave 2 + note A_, 8 + note_type 12, 11, 7 octave 3 - note C_, 8 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $c5 - note A_, 4 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $c5 - note A#, 4 - notetype 12, $c2 - note D_, 2 - note D_, 2 - notetype 12, $c5 - octave 4 - note C_, 4 - notetype 12, $c2 + note F_, 8 + note_type 12, 4, -7 + octave 2 + note F_, 8 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - note D_, 2 - note D_, 2 - notetype 12, $c5 + note D_, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 + octave 3 + note D#, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 + octave 3 + note F_, 4 + note_type 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 + octave 3 + note G_, 4 + note_type 12, 11, 0 + note F#, 16 + note_type 12, 11, 1 octave 4 - note C#, 4 - notetype 12, $2f note D_, 16 - notetype 12, $c1 - octave 5 - note D_, 16 - endchannel + sound_ret Music_IntroBattle_Ch2:: - notetype 12, $10 - note __, 8 + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 2 + rest 8 + octave 3 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 11, 7 + note C#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + octave 3 + note D_, 2 + note D_, 2 + note_type 12, 12, 7 + octave 4 + note C#, 4 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + octave 3 + note C_, 8 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + octave 4 + note C_, 4 + note_type 12, 12, 2 + octave 3 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + octave 4 + note C#, 4 + note_type 12, 2, -7 + note D_, 16 + note_type 12, 12, 1 + octave 5 + note D_, 16 + sound_ret + + +Music_IntroBattle_Ch3:: + note_type 12, 1, 0 + rest 8 octave 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A#, 4 note A_, 8 note D_, 8 note A#, 8 note D_, 8 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A#, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A#, 4 note A_, 16 note D_, 1 - note __, 15 - endchannel + rest 15 + sound_ret -Music_IntroBattle_Ch3:: - togglenoise 1 - notetype 6 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 4 - note A_, 8 - note A_, 4 - note A_, 4 - note A_, 8 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 4 - note A_, 8 - note A_, 4 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 16 - note A_, 16 - note A_, 16 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - note A_, 1 - note A_, 1 - note A_, 4 - note A_, 4 - note A_, 8 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 4 - note A_, 8 - note A_, 4 - note A_, 8 - note A_, 4 - note A_, 16 - note A_, 16 - note A_, 2 - note __, 16 - note __, 14 - endchannel +Music_IntroBattle_Ch4:: + toggle_noise 1 + drum_speed 6 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 8 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 8 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 8 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 16 + drum_note 10, 16 + drum_note 10, 16 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 8 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 8 + drum_note 10, 4 + drum_note 10, 8 + drum_note 10, 4 + drum_note 10, 16 + drum_note 10, 16 + drum_note 10, 2 + rest 16 + rest 14 + sound_ret diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm index 541b81ee..98a4d6db 100644 --- a/crysaudio/music/RBY/jigglypuffsong.asm +++ b/crysaudio/music/RBY/jigglypuffsong.asm @@ -1,35 +1,36 @@ Music_JigglypuffSong:: - musicheader 2, 1, Music_JigglypuffSong_Ch0 - musicheader 1, 2, Music_JigglypuffSong_Ch1 - -Music_JigglypuffSong_Ch0:: - tempo 144 - volume $77 - vibrato 8, $24 - dutycycle 2 - sound_duty 1, 1, 2, 2 - ;toggleperfectpitch - notetype 13, $67 - octave 4 - note E_, 8 - notetype 12, $67 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 - endchannel - + channel_count 2 + channel 1, Music_JigglypuffSong_Ch1 + channel 2, Music_JigglypuffSong_Ch2 Music_JigglypuffSong_Ch1:: - vibrato 5, $15 - dutycycle 2 - sound_duty 2, 2, 0, 0 - notetype 12, $a7 + tempo 144 + volume 7, 7 + vibrato 8, 2, 4 + duty_cycle 2 + duty_cycle_pattern 2, 2, 1, 1 + ;toggle_perfect_pitch + note_type 13, 6, 7 + octave 4 + note E_, 8 + note_type 12, 6, 7 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + sound_ret + + +Music_JigglypuffSong_Ch2:: + vibrato 5, 1, 5 + duty_cycle 2 + duty_cycle_pattern 0, 0, 2, 2 + note_type 12, 10, 7 octave 4 note E_, 8 note B_, 2 @@ -41,4 +42,4 @@ Music_JigglypuffSong_Ch1:: note F#, 4 note G#, 4 note E_, 10 - endchannel + sound_ret diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm index 60d01507..3efe199e 100644 --- a/crysaudio/music/RBY/lavender.asm +++ b/crysaudio/music/RBY/lavender.asm @@ -1,21 +1,22 @@ Music_Lavender:: - musicheader 4, 1, Music_Lavender_Ch0 - musicheader 1, 2, Music_Lavender_Ch1 - musicheader 1, 3, Music_Lavender_Ch2 - musicheader 1, 4, Music_Lavender_Ch3 + channel_count 4 + channel 1, Music_Lavender_Ch1 + channel 2, Music_Lavender_Ch2 + channel 3, Music_Lavender_Ch3 + channel 4, Music_Lavender_Ch4 -Music_Lavender_Ch0:: +Music_Lavender_Ch1:: tempo 152 - volume $77 - dutycycle 1 - ;toggleperfectpitch - vibrato 0, $88 - notetype 12, $87 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype 12, $a7 + volume 7, 7 + duty_cycle 1 + ;toggle_perfect_pitch + vibrato 0, 8, 8 + note_type 12, 8, 7 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 12, 10, 7 Music_Lavender_branch_bb6b:: octave 3 @@ -61,17 +62,17 @@ Music_Lavender_branch_bb6b:: note B_, 4 note C_, 8 note C_, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_Lavender_branch_bb6b + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch1:: - vibrato 0, $34 - dutycycle 3 - notetype 12, $91 +Music_Lavender_Ch2:: + vibrato 0, 3, 4 + duty_cycle 3 + note_type 12, 9, 1 Music_Lavender_branch_bba5:: octave 5 @@ -79,17 +80,17 @@ Music_Lavender_branch_bba5:: note G_, 4 note B_, 4 note F#, 4 - loopchannel 0, Music_Lavender_branch_bba5 + sound_loop 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch2:: - vibrato 4, $11 - notetype 12, $3f - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype 12, $2f +Music_Lavender_Ch3:: + vibrato 4, 1, 1 + note_type 12, 3, 15 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 12, 2, 15 load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3 Music_Lavender_branch_bbb9:: @@ -121,13 +122,13 @@ Music_Lavender_branch_bbb9:: note B_, 4 octave 4 note E_, 4 - notetype 12, $3f + note_type 12, 3, 15 octave 6 note B_, 4 note G_, 4 note F#, 4 note B_, 4 - notetype 12, $2f + note_type 12, 2, 15 note B_, 4 note G_, 4 note F#, 4 @@ -169,7 +170,7 @@ Music_Lavender_branch_bbb9:: note B_, 4 octave 4 note E_, 4 - notetype 12, $2f + note_type 12, 2, 15 octave 6 note B_, 4 note G_, 4 @@ -190,18 +191,18 @@ Music_Lavender_branch_bbb9:: note G_, 4 note F#, 4 note B_, 4 - loopchannel 0, Music_Lavender_branch_bbb9 + sound_loop 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch3:: - togglenoise 0 - notetype 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 +Music_Lavender_Ch4:: + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 16 Music_Lavender_branch_bc26:: - note F#, 8 - note F#, 8 - loopchannel 0, Music_Lavender_branch_bc26 + drum_note 7, 8 + drum_note 7, 8 + sound_loop 0, Music_Lavender_branch_bc26 diff --git a/crysaudio/music/RBY/meeteviltrainer.asm b/crysaudio/music/RBY/meeteviltrainer.asm index aa7cd9be..6925954d 100644 --- a/crysaudio/music/RBY/meeteviltrainer.asm +++ b/crysaudio/music/RBY/meeteviltrainer.asm @@ -1,41 +1,42 @@ Music_MeetEvilTrainer:: - musicheader 3, 1, Music_MeetEvilTrainer_Ch0 - musicheader 1, 2, Music_MeetEvilTrainer_Ch1 - musicheader 1, 3, Music_MeetEvilTrainer_Ch2 + channel_count 3 + channel 1, Music_MeetEvilTrainer_Ch1 + channel 2, Music_MeetEvilTrainer_Ch2 + channel 3, Music_MeetEvilTrainer_Ch3 -Music_MeetEvilTrainer_Ch0:: +Music_MeetEvilTrainer_Ch1:: tempo 124 - volume $77 - dutycycle 2 - ;toggleperfectpitch - notetype 12, $b1 - note __, 4 + volume 7, 7 + duty_cycle 2 + ;toggle_perfect_pitch + note_type 12, 11, 1 + rest 4 octave 3 note D_, 2 note C#, 2 - notetype 12, $4f + note_type 12, 4, -7 note D_, 4 Music_MeetEvilTrainer_branch_7f6ae:: - notetype 12, $a1 + note_type 12, 10, 1 note D_, 4 note D_, 4 note D_, 4 - notetype 12, $70 + note_type 12, 7, 0 note D_, 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch1:: - dutycycle 1 - notetype 12, $b6 +Music_MeetEvilTrainer_Ch2:: + duty_cycle 1 + note_type 12, 11, 6 octave 3 note B_, 2 note A#, 2 note B_, 8 Music_MeetEvilTrainer_branch_7f6c2:: - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note D#, 2 note D_, 2 @@ -47,9 +48,9 @@ Music_MeetEvilTrainer_branch_7f6c2:: note B_, 4 note B_, 4 note B_, 4 - notetype 12, $4f + note_type 12, 4, -7 note A#, 4 - notetype 12, $c2 + note_type 12, 12, 2 note G_, 2 note G#, 2 note A_, 2 @@ -59,27 +60,27 @@ Music_MeetEvilTrainer_branch_7f6c2:: note B_, 4 note B_, 4 note B_, 4 - notetype 12, $3f + note_type 12, 3, -7 note A#, 4 - notetype 12, $c2 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + note_type 12, 12, 2 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch2:: - notetype 12, $10 - note __, 8 +Music_MeetEvilTrainer_Ch3:: + note_type 12, 1, 0 + rest 8 octave 4 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 Music_MeetEvilTrainer_branch_7f6ee:: note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note A#, 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee diff --git a/crysaudio/music/RBY/meetfemaletrainer.asm b/crysaudio/music/RBY/meetfemaletrainer.asm index a252ea1b..8e8459b6 100644 --- a/crysaudio/music/RBY/meetfemaletrainer.asm +++ b/crysaudio/music/RBY/meetfemaletrainer.asm @@ -1,14 +1,15 @@ Music_MeetFemaleTrainer:: - musicheader 3, 1, Music_MeetFemaleTrainer_Ch0 - musicheader 1, 2, Music_MeetFemaleTrainer_Ch1 - musicheader 1, 3, Music_MeetFemaleTrainer_Ch2 + channel_count 3 + channel 1, Music_MeetFemaleTrainer_Ch1 + channel 2, Music_MeetFemaleTrainer_Ch2 + channel 3, Music_MeetFemaleTrainer_Ch3 -Music_MeetFemaleTrainer_Ch0:: +Music_MeetFemaleTrainer_Ch1:: tempo 124 - volume $77 - dutycycle 1 - ;toggleperfectpitch - notetype 12, $b2 + volume 7, 7 + duty_cycle 1 + ;toggle_perfect_pitch + note_type 12, 11, 2 octave 3 note G#, 6 octave 4 @@ -16,32 +17,32 @@ Music_MeetFemaleTrainer_Ch0:: note D#, 2 note C#, 2 note C_, 2 - notetype 12, $81 + note_type 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 note E_, 4 - loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c + sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c note E_, 4 octave 2 note B_, 4 note B_, 4 octave 3 note E_, 4 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c + sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch1:: - dutycycle 2 - notetype 12, $c2 +Music_MeetFemaleTrainer_Ch2:: + duty_cycle 2 + note_type 12, 12, 2 octave 3 note B_, 2 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note B_, 12 Music_MeetFemaleTrainer_branch_7f726:: - notetype 12, $c2 + note_type 12, 12, 2 octave 3 note B_, 4 octave 4 @@ -73,51 +74,51 @@ Music_MeetFemaleTrainer_branch_7f726:: note F#, 2 note G#, 2 note A_, 2 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch2:: - notetype 12, $10 - note __, 8 +Music_MeetFemaleTrainer_Ch3:: + note_type 12, 1, 0 + rest 8 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 Music_MeetFemaleTrainer_branch_7f756:: - callchannel Music_MeetFemaleTrainer_branch_7f770 + sound_call Music_MeetFemaleTrainer_branch_7f770 note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - callchannel Music_MeetFemaleTrainer_branch_7f770 + rest 3 + sound_call Music_MeetFemaleTrainer_branch_7f770 note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + rest 3 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret diff --git a/crysaudio/music/RBY/meetjessiejames.asm b/crysaudio/music/RBY/meetjessiejames.asm index 92667ec8..c5fc4ff7 100644 --- a/crysaudio/music/RBY/meetjessiejames.asm +++ b/crysaudio/music/RBY/meetjessiejames.asm @@ -1,14 +1,15 @@ Music_MeetJessieJames:: - musicheader 3, 1, Music_MeetJessieJames_Ch1 - musicheader 1, 2, Music_MeetJessieJames_Ch2 - musicheader 1, 3, Music_MeetJessieJames_Ch3 + channel_count 3 + channel 1, Music_MeetJessieJames_Ch1 + channel 2, Music_MeetJessieJames_Ch2 + channel 3, Music_MeetJessieJames_Ch3 Music_MeetJessieJames_Ch1:: tempo 144 - volume $77 - dutycycle 3 - vibrato 8, $14 - notetype 12, $b2 + volume 7, 7 + duty_cycle 3 + vibrato 8, 1, 4 + note_type 12, 11, 2 octave 3 note G#, 1 note G_, 1 @@ -19,21 +20,21 @@ Music_MeetJessieJames_Ch1:: note D_, 2 note C#, 2 note C_, 2 - notetype 12, $b6 + note_type 12, 11, 6 note D#, 12 note C_, 4 Music_MeetJessieJames_branch_83187:: - notetype 12, $b2 + note_type 12, 11, 2 octave 4 note D_, 16 - note __, 12 - notetype 12, $b4 + rest 12 + note_type 12, 11, 4 octave 3 note A#, 4 - note __, 16 - note __, 8 - notetype 12, $b2 + rest 16 + rest 8 + note_type 12, 11, 2 octave 2 note A_, 2 octave 3 @@ -55,10 +56,10 @@ Music_MeetJessieJames_branch_83187:: note D_, 2 octave 2 note A#, 4 - notetype 12, $b4 + note_type 12, 11, 4 octave 3 note B_, 4 - notetype 12, $b2 + note_type 12, 11, 2 note D_, 1 note D#, 1 note D#, 2 @@ -77,15 +78,15 @@ Music_MeetJessieJames_branch_83187:: note A#, 2 octave 3 note B_, 2 - notetype 12, $b4 + note_type 12, 11, 4 note A#, 4 - loopchannel 0, Music_MeetJessieJames_branch_83187 + sound_loop 0, Music_MeetJessieJames_branch_83187 Music_MeetJessieJames_Ch2:: - dutycycle 3 - vibrato 6, $15 - notetype 12, $c2 + duty_cycle 3 + vibrato 6, 1, 5 + note_type 12, 12, 2 octave 4 note D_, 1 note C#, 1 @@ -97,13 +98,13 @@ Music_MeetJessieJames_Ch2:: note G#, 2 note G_, 2 note F#, 2 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 12 octave 4 note C#, 4 Music_MeetJessieJames_branch_831df:: - notetype 12, $c2 + note_type 12, 12, 2 octave 3 note C#, 1 note D_, 1 @@ -121,10 +122,10 @@ Music_MeetJessieJames_branch_831df:: note C#, 2 octave 2 note A_, 4 - notetype 12, $c5 + note_type 12, 12, 5 octave 4 note C#, 4 - notetype 12, $c2 + note_type 12, 12, 2 note D_, 1 octave 3 note D_, 1 @@ -140,10 +141,10 @@ Music_MeetJessieJames_branch_831df:: note D_, 2 note D_, 2 note C#, 2 - notetype 12, $c6 + note_type 12, 12, 6 octave 4 note D_, 8 - notetype 12, $c2 + note_type 12, 12, 2 note D#, 6 note F_, 4 note D#, 4 @@ -153,9 +154,9 @@ Music_MeetJessieJames_branch_831df:: note D#, 6 note F_, 4 note D#, 2 - notetype 12, $c5 + note_type 12, 12, 5 note D_, 4 - notetype 12, $c2 + note_type 12, 12, 2 note D#, 6 note F_, 4 note D#, 4 @@ -164,15 +165,15 @@ Music_MeetJessieJames_branch_831df:: octave 4 note D#, 4 note F_, 4 - notetype 12, $c5 + note_type 12, 12, 5 note D#, 8 - loopchannel 0, Music_MeetJessieJames_branch_831df + sound_loop 0, Music_MeetJessieJames_branch_831df Music_MeetJessieJames_Ch3:: - notetype 12, $10 - note __, 16 - note __, 8 + note_type 12, 1, 0 + rest 16 + rest 8 octave 4 note D_, 2 octave 3 @@ -183,132 +184,132 @@ Music_MeetJessieJames_Ch3:: Music_MeetJessieJames_branch_83235:: note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A#, 2 note A_, 2 note D#, 2 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 note C_, 2 note D_, 2 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - loopchannel 0, Music_MeetJessieJames_branch_83235 - endchannel + rest 1 + sound_loop 0, Music_MeetJessieJames_branch_83235 + sound_ret diff --git a/crysaudio/music/RBY/meetmaletrainer.asm b/crysaudio/music/RBY/meetmaletrainer.asm index c993ba8c..a4190068 100644 --- a/crysaudio/music/RBY/meetmaletrainer.asm +++ b/crysaudio/music/RBY/meetmaletrainer.asm @@ -1,22 +1,23 @@ Music_MeetMaleTrainer:: - musicheader 3, 1, Music_MeetMaleTrainer_Ch0 - musicheader 1, 2, Music_MeetMaleTrainer_Ch1 - musicheader 1, 3, Music_MeetMaleTrainer_Ch2 + channel_count 3 + channel 1, Music_MeetMaleTrainer_Ch1 + channel 2, Music_MeetMaleTrainer_Ch2 + channel 3, Music_MeetMaleTrainer_Ch3 -Music_MeetMaleTrainer_Ch0:: +Music_MeetMaleTrainer_Ch1:: tempo 112 - volume $77 - dutycycle 3 - vibrato 20, $33 - ;toggleperfectpitch - notetype 12, $b4 + volume 7, 7 + duty_cycle 3 + vibrato 20, 3, 3 + ;toggle_perfect_pitch + note_type 12, 11, 4 octave 3 note C#, 1 note D_, 1 note D#, 1 note E_, 1 note F_, 12 - note __, 16 + rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 @@ -34,13 +35,13 @@ Music_MeetMaleTrainer_branch_7f78f:: octave 4 note D_, 8 note E_, 16 - loopchannel 0, Music_MeetMaleTrainer_branch_7f78f + sound_loop 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch1:: - dutycycle 3 - vibrato 24, $22 - notetype 12, $c4 +Music_MeetMaleTrainer_Ch2:: + duty_cycle 3 + vibrato 24, 2, 2 + note_type 12, 12, 4 octave 4 note E_, 1 note D#, 1 @@ -48,14 +49,14 @@ Music_MeetMaleTrainer_Ch1:: note C#, 1 octave 3 note B_, 12 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 9 + rest 9 Music_MeetMaleTrainer_branch_7f7b5:: - notetype 12, $c4 + note_type 12, 12, 4 octave 4 note E_, 6 note D#, 6 @@ -70,126 +71,126 @@ Music_MeetMaleTrainer_branch_7f7b5:: note B_, 2 octave 4 note C#, 2 - notetype 12, $c7 + note_type 12, 12, 7 note F_, 16 - notetype 12, $c5 + note_type 12, 12, 5 octave 3 note F#, 8 octave 4 note C#, 8 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch2:: - notetype 12, $10 - note __, 6 +Music_MeetMaleTrainer_Ch3:: + note_type 12, 1, 0 + rest 6 octave 4 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 Music_MeetMaleTrainer_branch_7f7ea:: note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea + rest 1 + sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea diff --git a/crysaudio/music/RBY/meetprofoak.asm b/crysaudio/music/RBY/meetprofoak.asm index 7d3da517..09913ddd 100644 --- a/crysaudio/music/RBY/meetprofoak.asm +++ b/crysaudio/music/RBY/meetprofoak.asm @@ -1,14 +1,15 @@ Music_MeetProfOak:: - musicheader 3, 1, Music_MeetProfOak_Ch0 - musicheader 1, 2, Music_MeetProfOak_Ch1 - musicheader 1, 3, Music_MeetProfOak_Ch2 + channel_count 3 + channel 1, Music_MeetProfOak_Ch1 + channel 2, Music_MeetProfOak_Ch2 + channel 3, Music_MeetProfOak_Ch3 -Music_MeetProfOak_Ch0:: +Music_MeetProfOak_Ch1:: tempo 112 - volume $77 - dutycycle 3 - ;toggleperfectpitch - notetype 12, $b4 + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + note_type 12, 11, 4 octave 3 note F#, 1 note B_, 1 @@ -16,7 +17,7 @@ Music_MeetProfOak_Ch0:: note D#, 1 note E_, 1 note F#, 12 - notetype 12, $a2 + note_type 12, 10, 2 octave 3 note E_, 6 note B_, 10 @@ -76,13 +77,13 @@ Music_MeetProfOak_branch_af85:: note E_, 4 note G#, 2 note G#, 4 - loopchannel 0, Music_MeetProfOak_branch_af85 + sound_loop 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch1:: - vibrato 8, $11 - dutycycle 2 - notetype 12, $c4 +Music_MeetProfOak_Ch2:: + vibrato 8, 1, 1 + duty_cycle 2 + note_type 12, 12, 4 octave 3 note B_, 1 octave 4 @@ -90,7 +91,7 @@ Music_MeetProfOak_Ch1:: note F#, 1 note A#, 1 note B_, 12 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 octave 4 @@ -99,7 +100,7 @@ Music_MeetProfOak_Ch1:: note E_, 4 note D#, 2 note C#, 4 - notetype 12, $64 + note_type 12, 6, 4 octave 4 note B_, 2 octave 5 @@ -108,7 +109,7 @@ Music_MeetProfOak_Ch1:: note E_, 4 note D#, 2 note C#, 4 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note A_, 2 @@ -116,7 +117,7 @@ Music_MeetProfOak_Ch1:: note A_, 4 note B_, 2 note B_, 4 - notetype 12, $81 + note_type 12, 8, 1 octave 4 note B_, 2 note A_, 2 @@ -124,7 +125,7 @@ Music_MeetProfOak_Ch1:: note A_, 4 note B_, 2 note B_, 4 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 octave 4 @@ -133,7 +134,7 @@ Music_MeetProfOak_Ch1:: note E_, 4 note D#, 2 note C#, 4 - notetype 12, $64 + note_type 12, 6, 4 octave 4 note B_, 2 octave 5 @@ -142,7 +143,7 @@ Music_MeetProfOak_Ch1:: note E_, 4 note D#, 2 note C#, 4 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note A_, 2 @@ -150,7 +151,7 @@ Music_MeetProfOak_Ch1:: note A_, 4 note B_, 2 note B_, 4 - notetype 12, $81 + note_type 12, 8, 1 octave 4 note B_, 2 note A_, 2 @@ -158,7 +159,7 @@ Music_MeetProfOak_Ch1:: note A_, 4 note B_, 2 note B_, 4 - notetype 12, $b5 + note_type 12, 11, 5 Music_MeetProfOak_branch_b005:: octave 4 @@ -180,14 +181,14 @@ Music_MeetProfOak_branch_b005:: note B_, 1 octave 4 note E_, 8 - notetype 12, $65 + note_type 12, 6, 5 octave 4 note B_, 6 note G#, 1 note B_, 1 octave 5 note E_, 8 - notetype 12, $b5 + note_type 12, 11, 5 octave 3 note A_, 6 note F#, 1 @@ -208,221 +209,221 @@ Music_MeetProfOak_branch_b005:: note B_, 1 octave 4 note E_, 1 - notetype 12, $b7 + note_type 12, 11, 7 note G#, 16 - loopchannel 0, Music_MeetProfOak_branch_b005 + sound_loop 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch2:: - notetype 12, $12 - note __, 10 +Music_MeetProfOak_Ch3:: + note_type 12, 1, 2 + rest 10 octave 4 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 5 + rest 5 octave 5 note E_, 4 - note __, 6 + rest 6 octave 4 note B_, 1 - note __, 5 + rest 5 octave 5 note E_, 4 octave 4 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 - loopchannel 2, Music_MeetProfOak_branch_b0bc + rest 1 + sound_loop 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - loopchannel 2, Music_MeetProfOak_branch_b0d8 + rest 1 + sound_loop 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - loopchannel 2, Music_MeetProfOak_branch_b0ed + rest 1 + sound_loop 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - loopchannel 2, Music_MeetProfOak_branch_b101 - loopchannel 0, Music_MeetProfOak_branch_b0bc + rest 1 + sound_loop 2, Music_MeetProfOak_branch_b101 + sound_loop 0, Music_MeetProfOak_branch_b0bc diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm index baca30e4..a0d7dd0f 100644 --- a/crysaudio/music/RBY/meetrival.asm +++ b/crysaudio/music/RBY/meetrival.asm @@ -1,26 +1,28 @@ Music_MeetRival:: - musicheader 3, 1, Music_MeetRival_Ch0 - musicheader 1, 2, Music_MeetRival_Ch1 - musicheader 1, 3, Music_MeetRival_Ch2 + channel_count 3 + channel 1, Music_MeetRival_Ch1 + channel 2, Music_MeetRival_Ch2 + channel 3, Music_MeetRival_Ch3 Music_FarewellRival: - musicheader 3, 1, Music_MeetRival_branch_b1a2 - musicheader 1, 2, Music_MeetRival_branch_b21d - musicheader 1, 3, Music_MeetRival_branch_b2b5 + channel_count 3 + channel 1, Music_MeetRival_branch_b1a2 + channel 2, Music_MeetRival_branch_b21d + channel 3, Music_MeetRival_branch_b2b5 Music_MeetRival_branch_b119:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b123 + sound_loop 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch0:: +Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b3 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 3 octave 4 note D_, 1 note C#, 1 @@ -34,9 +36,9 @@ Music_MeetRival_branch_b123:: note F#, 1 note F_, 6 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 5 + rest 5 note A_, 2 note G_, 2 note A_, 2 @@ -49,7 +51,7 @@ Music_MeetRival_branch_b140:: octave 4 note C_, 4 note D_, 2 - note __, 4 + rest 4 note D_, 4 note C#, 2 note C_, 2 @@ -64,7 +66,7 @@ Music_MeetRival_branch_b140:: note B_, 4 octave 4 note C_, 2 - note __, 4 + rest 4 note G_, 4 note G_, 2 note F#, 2 @@ -84,7 +86,7 @@ Music_MeetRival_branch_b140:: note D_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 octave 4 @@ -106,7 +108,7 @@ Music_MeetRival_branch_b140:: octave 3 note A#, 2 note G_, 2 - note __, 4 + rest 4 note A#, 4 octave 4 note C_, 2 @@ -114,49 +116,49 @@ Music_MeetRival_branch_b140:: note A#, 2 octave 4 note C_, 2 - notetype 12, $b7 + note_type 12, 11, 7 octave 3 note G_, 4 note D_, 2 note F_, 6 note F#, 4 note D_, 2 - note __, 4 + rest 4 note D_, 4 - notetype 12, $b3 + note_type 12, 11, 3 note A_, 2 note G_, 2 note A_, 2 - loopchannel 0, Music_MeetRival_branch_b140 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b1a5 + sound_loop 0, Music_MeetRival_branch_b1a5 Music_MeetRival_branch_b1a2:: tempo 112 Music_MeetRival_branch_b1a5:: - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b3 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 3 octave 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 5 + rest 5 note A_, 2 note G_, 2 note A_, 2 - loopchannel 0, Music_MeetRival_branch_b140 + sound_loop 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch1:: - dutycycle 3 - vibrato 10, $26 - notetype 12, $c7 +Music_MeetRival_Ch2:: + duty_cycle 3 + vibrato 10, 2, 6 + note_type 12, 12, 7 octave 4 note B_, 1 note A#, 1 @@ -170,24 +172,24 @@ Music_MeetRival_Ch1:: note D_, 6 octave 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 note F_, 2 note F#, 2 Music_MeetRival_branch_b1d8:: - notetype 12, $c7 + note_type 12, 12, 7 note G_, 4 note D_, 2 note F_, 6 note F#, 4 note G_, 2 - note __, 4 + rest 4 note G_, 4 note G_, 2 note A#, 2 @@ -200,88 +202,88 @@ Music_MeetRival_branch_b1d8:: note B_, 4 octave 5 note C_, 2 - note __, 4 + rest 4 note C_, 4 note C_, 2 octave 4 note B_, 2 octave 5 note C_, 2 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 16 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 6 - notetype 12, $c7 + note_type 12, 12, 7 note F_, 4 note D_, 2 note C_, 2 note D_, 2 - notetype 12, $b0 + note_type 12, 11, 0 note C_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note C_, 8 octave 4 note C_, 2 - note __, 4 + rest 4 note A#, 4 note G_, 2 note F_, 2 - notetype 12, $b0 + note_type 12, 11, 0 note G_, 16 - notetype 12, $b3 + note_type 12, 11, 3 note G_, 2 octave 3 note G_, 2 - note __, 4 + rest 4 note G_, 4 octave 4 note D_, 2 note F_, 2 note F#, 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + sound_loop 0, Music_MeetRival_branch_b1d8 Music_MeetRival_branch_b21d:: - dutycycle 3 - vibrato 10, $26 - notetype 12, $c7 + duty_cycle 3 + vibrato 10, 2, 6 + note_type 12, 12, 7 octave 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 note F_, 2 note F#, 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + sound_loop 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch2:: - notetype 12, $14 +Music_MeetRival_Ch3:: + note_type 12, 1, 4 octave 5 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note B_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 Music_MeetRival_branch_b24b:: note G_, 2 @@ -289,17 +291,17 @@ Music_MeetRival_branch_b24b:: note D_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 octave 5 note D_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 octave 5 note D_, 2 octave 4 note G_, 2 - note __, 4 + rest 4 octave 5 note D_, 4 octave 4 @@ -311,16 +313,16 @@ Music_MeetRival_branch_b24b:: note C_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 octave 5 note C_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 note B_, 2 octave 5 note C_, 2 - note __, 4 + rest 4 note C_, 4 note C_, 2 octave 4 @@ -328,15 +330,15 @@ Music_MeetRival_branch_b24b:: note A_, 2 note F#, 2 note A_, 2 - note __, 2 + rest 2 note F#, 2 note A_, 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 note F#, 2 note A_, 2 - note __, 2 + rest 2 note F#, 2 note A_, 2 note F#, 2 @@ -347,7 +349,7 @@ Music_MeetRival_branch_b24b:: note E_, 2 octave 5 note C_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 octave 5 @@ -357,7 +359,7 @@ Music_MeetRival_branch_b24b:: note F_, 2 note G_, 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 octave 5 note C_, 2 @@ -367,40 +369,40 @@ Music_MeetRival_branch_b24b:: note A_, 2 note G_, 2 note A#, 2 - note __, 2 + rest 2 note G_, 2 note A#, 2 note G_, 2 - note __, 2 + rest 2 note A#, 2 note G_, 2 octave 5 note D_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 octave 5 note D_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 octave 5 note D_, 2 - loopchannel 0, Music_MeetRival_branch_b24b + sound_loop 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: - notetype 12, $14 + note_type 12, 1, 4 octave 4 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_MeetRival_branch_b24b + rest 1 + sound_loop 0, Music_MeetRival_branch_b24b diff --git a/crysaudio/music/RBY/museumguy.asm b/crysaudio/music/RBY/museumguy.asm index ac32e923..5f460ac2 100644 --- a/crysaudio/music/RBY/museumguy.asm +++ b/crysaudio/music/RBY/museumguy.asm @@ -1,15 +1,16 @@ Music_MuseumGuy:: - musicheader 4, 1, Music_MuseumGuy_Ch0 - musicheader 1, 2, Music_MuseumGuy_Ch1 - musicheader 1, 3, Music_MuseumGuy_Ch2 - musicheader 1, 4, Music_MuseumGuy_Ch3 + channel_count 4 + channel 1, Music_MuseumGuy_Ch1 + channel 2, Music_MuseumGuy_Ch2 + channel 3, Music_MuseumGuy_Ch3 + channel 4, Music_MuseumGuy_Ch4 -Music_MuseumGuy_Ch0:: +Music_MuseumGuy_Ch1:: tempo 128 - volume $77 - dutycycle 2 - ;toggleperfectpitch - notetype 12, $b1 + volume 7, 7 + duty_cycle 2 + ;toggle_perfect_pitch + note_type 12, 11, 1 octave 3 note B_, 2 note A_, 2 @@ -27,42 +28,42 @@ Music_MuseumGuy_Ch0:: note E_, 1 note G#, 1 note B_, 10 - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 note E_, 4 note E_, 4 note E_, 2 note E_, 6 Music_MuseumGuy_branch_add6:: - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 note E_, 4 note E_, 4 note E_, 2 note E_, 6 - loopchannel 0, Music_MuseumGuy_branch_add6 + sound_loop 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: note E_, 2 note E_, 6 note F#, 2 note F#, 6 - endchannel + sound_ret Music_MuseumGuy_branch_adec:: note E_, 2 note E_, 6 note D_, 2 note D_, 6 - endchannel + sound_ret -Music_MuseumGuy_Ch1:: - dutycycle 2 - notetype 12, $c1 +Music_MuseumGuy_Ch2:: + duty_cycle 2 + note_type 12, 12, 1 octave 4 note E_, 2 note D_, 2 @@ -119,15 +120,15 @@ Music_MuseumGuy_branch_ae26:: octave 4 note C#, 2 note E_, 3 - notetype 12, $81 + note_type 12, 8, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 2 note F#, 2 note A_, 3 - notetype 12, $91 + note_type 12, 9, 1 note A_, 1 - notetype 12, $c1 + note_type 12, 12, 1 octave 3 note A_, 2 octave 4 @@ -139,206 +140,206 @@ Music_MuseumGuy_branch_ae26:: octave 3 note B_, 1 note B_, 3 - notetype 12, $a1 + note_type 12, 10, 1 note G#, 1 - notetype 12, $c1 + note_type 12, 12, 1 note A_, 2 octave 4 note C#, 2 note E_, 3 - notetype 12, $91 + note_type 12, 9, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note D_, 2 note F#, 2 note A_, 3 - notetype 12, $81 + note_type 12, 8, 1 note A_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note G#, 2 note E_, 1 - notetype 12, $81 + note_type 12, 8, 1 note E_, 1 - notetype 12, $c1 + note_type 12, 12, 1 note F#, 2 - notetype 12, $81 + note_type 12, 8, 1 note F#, 1 - notetype 12, $c1 + note_type 12, 12, 1 note G#, 1 note A_, 2 note A_, 2 note A_, 4 - loopchannel 0, Music_MuseumGuy_branch_ae26 + sound_loop 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch2:: - notetype 12, $10 - note __, 16 +Music_MuseumGuy_Ch3:: + note_type 12, 1, 0 + rest 16 octave 4 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 9 - callchannel Music_MuseumGuy_branch_aeb8 + rest 9 + sound_call Music_MuseumGuy_branch_aeb8 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 5 + rest 5 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 5 - callchannel Music_MuseumGuy_branch_aeb8 + rest 5 + sound_call Music_MuseumGuy_branch_aeb8 note B_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 Music_MuseumGuy_branch_ae8e:: - callchannel Music_MuseumGuy_branch_aec1 - note __, 3 + sound_call Music_MuseumGuy_branch_aec1 + rest 3 octave 6 note E_, 1 - note __, 1 + rest 1 octave 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 - callchannel Music_MuseumGuy_branch_aec1 - note __, 1 + rest 3 + sound_call Music_MuseumGuy_branch_aec1 + rest 1 octave 6 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - loopchannel 0, Music_MuseumGuy_branch_ae8e + rest 3 + sound_loop 0, Music_MuseumGuy_branch_ae8e Music_MuseumGuy_branch_aeb8:: note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 5 + rest 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 5 - endchannel + rest 5 + sound_ret Music_MuseumGuy_branch_aec1:: octave 6 note C#, 1 - note __, 1 + rest 1 octave 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 octave 6 note F#, 1 - note __, 1 + rest 1 octave 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - endchannel + sound_ret -Music_MuseumGuy_Ch3:: - togglenoise 1 - notetype 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 14 - notetype 6 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 +Music_MuseumGuy_Ch4:: + toggle_noise 1 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 14 + drum_speed 6 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 Music_MuseumGuy_branch_aee1:: - note A_, 4 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note B_, 1 - note B_, 1 - note A_, 6 - note B_, 1 - note B_, 1 - note A_, 4 - note A_, 6 - note A_, 2 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 6 - note A_, 2 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note A_, 2 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 4 - note A_, 4 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 6 - note B_, 1 - note B_, 1 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - loopchannel 0, Music_MuseumGuy_branch_aee1 + drum_note 10, 4 + drum_note 10, 6 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 6 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + drum_note 10, 6 + drum_note 10, 2 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 6 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 2 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 6 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/crysaudio/music/RBY/oakslab.asm b/crysaudio/music/RBY/oakslab.asm index 7355a26a..c17b9665 100644 --- a/crysaudio/music/RBY/oakslab.asm +++ b/crysaudio/music/RBY/oakslab.asm @@ -1,15 +1,16 @@ Music_OaksLab:: - musicheader 3, 1, Music_OaksLab_Ch0 - musicheader 1, 2, Music_OaksLab_Ch1 - musicheader 1, 3, Music_OaksLab_Ch2 + channel_count 3 + channel 1, Music_OaksLab_Ch1 + channel 2, Music_OaksLab_Ch2 + channel 3, Music_OaksLab_Ch3 -Music_OaksLab_Ch0:: +Music_OaksLab_Ch1:: tempo 140 - volume $77 - dutycycle 3 - vibrato 16, $12 - ;toggleperfectpitch - notetype 12, $b3 + volume 7, 7 + duty_cycle 3 + vibrato 16, 1, 2 + ;toggle_perfect_pitch + note_type 12, 11, 3 octave 2 note B_, 1 octave 3 @@ -33,7 +34,7 @@ Music_OaksLab_branch_7eed0:: note G#, 2 note A_, 2 note B_, 1 - note __, 3 + rest 3 note A_, 6 note G#, 1 note B_, 1 @@ -47,7 +48,7 @@ Music_OaksLab_branch_7eed0:: note E_, 2 note F#, 2 note G#, 1 - note __, 3 + rest 3 note F#, 8 note E_, 4 note A_, 6 @@ -67,17 +68,17 @@ Music_OaksLab_branch_7eed0:: note B_, 4 note A_, 4 note G#, 1 - note __, 3 + rest 3 note E_, 4 note F#, 4 note G#, 4 - loopchannel 0, Music_OaksLab_branch_7eed0 + sound_loop 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch1:: - dutycycle 3 - vibrato 10, $25 - notetype 12, $c4 +Music_OaksLab_Ch2:: + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 4 octave 3 note G#, 1 note A_, 1 @@ -97,7 +98,7 @@ Music_OaksLab_branch_7ef16:: note D#, 1 note E_, 1 note F#, 1 - note __, 3 + rest 3 note E_, 8 note E_, 4 note F#, 6 @@ -109,7 +110,7 @@ Music_OaksLab_branch_7ef16:: octave 4 note C#, 1 note D_, 1 - note __, 3 + rest 3 note C#, 8 note C#, 4 note D_, 6 @@ -129,270 +130,270 @@ Music_OaksLab_branch_7ef16:: note G#, 2 note F#, 2 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - loopchannel 0, Music_OaksLab_branch_7ef16 + rest 1 + sound_loop 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch2:: - notetype 12, $11 - note __, 2 +Music_OaksLab_Ch3:: + note_type 12, 1, 1 + rest 2 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 Music_OaksLab_branch_7ef5c:: note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note G#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - loopchannel 0, Music_OaksLab_branch_7ef5c + rest 3 + sound_loop 0, Music_OaksLab_branch_7ef5c diff --git a/crysaudio/music/RBY/pallettown.asm b/crysaudio/music/RBY/pallettown.asm index 0254dc21..84426675 100644 --- a/crysaudio/music/RBY/pallettown.asm +++ b/crysaudio/music/RBY/pallettown.asm @@ -1,13 +1,14 @@ Music_RBYPalletTown:: - musicheader 3, 1, Music_RBYPalletTown_Ch0 - musicheader 1, 2, Music_RBYPalletTown_Ch1 - musicheader 1, 3, Music_RBYPalletTown_Ch2 + channel_count 3 + channel 1, Music_RBYPalletTown_Ch1 + channel 2, Music_RBYPalletTown_Ch2 + channel 3, Music_RBYPalletTown_Ch3 -Music_RBYPalletTown_Ch0:: +Music_RBYPalletTown_Ch1:: tempo 160 - volume $77 - dutycycle 2 - notetype 12, $c3 + volume 7, 7 + duty_cycle 2 + note_type 12, 12, 3 Music_RBYPalletTown_branch_a7ce:: octave 3 @@ -27,7 +28,7 @@ Music_RBYPalletTown_branch_a7ce:: note C_, 2 octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 2 octave 4 note C_, 2 @@ -35,7 +36,7 @@ Music_RBYPalletTown_branch_a7ce:: note B_, 2 octave 4 note C_, 8 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 @@ -88,7 +89,7 @@ Music_RBYPalletTown_branch_a7ce:: note A_, 2 note F#, 2 note A_, 2 - notetype 12, $b3 + note_type 12, 11, 3 note B_, 2 note G_, 2 note D_, 2 @@ -149,30 +150,30 @@ Music_RBYPalletTown_branch_a7ce:: note D_, 2 note C_, 2 note D_, 2 - loopchannel 0, Music_RBYPalletTown_branch_a7ce - endchannel + sound_loop 0, Music_RBYPalletTown_branch_a7ce + sound_ret -Music_RBYPalletTown_Ch1:: - dutycycle 2 +Music_RBYPalletTown_Ch2:: + duty_cycle 2 Music_RBYPalletTown_branch_a861:: - notetype 12, $d3 + note_type 12, 13, 3 octave 5 note D_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note C_, 2 - notetype 12, $d3 + note_type 12, 13, 3 octave 4 note B_, 2 - notetype 12, $b3 + note_type 12, 11, 3 note A_, 2 - notetype 12, $d3 + note_type 12, 13, 3 octave 5 note G_, 2 - notetype 12, $b3 + note_type 12, 11, 3 note E_, 2 - notetype 12, $d3 + note_type 12, 13, 3 note F#, 2 note E_, 2 note D_, 6 @@ -196,21 +197,21 @@ Music_RBYPalletTown_branch_a861:: note A_, 8 octave 5 note D_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note C_, 2 - notetype 12, $d3 + note_type 12, 13, 3 octave 4 note B_, 2 - notetype 12, $b3 + note_type 12, 11, 3 octave 5 note D_, 2 - notetype 12, $d3 + note_type 12, 13, 3 note G_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note F#, 2 - notetype 12, $b3 + note_type 12, 11, 3 note F#, 2 - notetype 12, $d3 + note_type 12, 13, 3 note G_, 2 note E_, 6 note D_, 2 @@ -236,7 +237,7 @@ Music_RBYPalletTown_branch_a861:: note C_, 2 octave 4 note B_, 8 - note __, 2 + rest 2 note G_, 2 note A_, 2 note B_, 2 @@ -248,7 +249,7 @@ Music_RBYPalletTown_branch_a861:: note D_, 1 octave 4 note B_, 8 - note __, 2 + rest 2 note B_, 2 note A_, 2 note G_, 2 @@ -263,13 +264,13 @@ Music_RBYPalletTown_branch_a861:: note B_, 4 note B_, 8 note A_, 8 - loopchannel 0, Music_RBYPalletTown_branch_a861 - endchannel + sound_loop 0, Music_RBYPalletTown_branch_a861 + sound_ret -Music_RBYPalletTown_Ch2:: - vibrato 24, $28 - notetype 12, $12 +Music_RBYPalletTown_Ch3:: + vibrato 24, 2, 8 + note_type 12, 1, 2 Music_RBYPalletTown_branch_a8e3:: octave 4 @@ -315,5 +316,5 @@ Music_RBYPalletTown_branch_a8e3:: note E_, 8 note E_, 8 note F#, 8 - loopchannel 0, Music_RBYPalletTown_branch_a8e3 - endchannel + sound_loop 0, Music_RBYPalletTown_branch_a8e3 + sound_ret diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm index 09f69cc1..ae025ac7 100644 --- a/crysaudio/music/RBY/pkmnhealed.asm +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -1,53 +1,54 @@ Music_PkmnHealed:: - musicheader 3, 1, Music_PkmnHealed_Ch0 - musicheader 1, 2, Music_PkmnHealed_Ch1 - musicheader 1, 3, Music_PkmnHealed_Ch2 - -Music_PkmnHealed_Ch0:: - tempo 144 - volume $77 - dutycycle 2 - ;toggleperfectpitch - notetype 12, $81 - note __, 2 - octave 3 - slidepitchto 1, 4, A# - note B_, 2 - slidepitchto 1, 5, D# - note B_, 2 - slidepitchto 1, 4, D# - note E_, 2 - note __, 4 - slidepitchto 1, 3, A# - note E_, 4 - slidepitchto 1, 4, A# - note B_, 4 - endchannel - + channel_count 3 + channel 1, Music_PkmnHealed_Ch1 + channel 2, Music_PkmnHealed_Ch2 + channel 3, Music_PkmnHealed_Ch3 Music_PkmnHealed_Ch1:: - dutycycle 2 - notetype 12, $c3 - octave 4 - note B_, 4 - note B_, 4 + tempo 144 + volume 7, 7 + duty_cycle 2 + ;toggle_perfect_pitch + note_type 12, 8, 1 + rest 2 + octave 3 + pitch_slide 1, 4, B_ note B_, 2 - note G#, 2 - notetype 12, $c4 - octave 5 - note E_, 8 - endchannel + pitch_slide 1, 3, E_ + note B_, 2 + pitch_slide 1, 4, E_ + note E_, 2 + rest 4 + pitch_slide 1, 5, B_ + note E_, 4 + pitch_slide 1, 4, B_ + note B_, 4 + sound_ret Music_PkmnHealed_Ch2:: - notetype 12, $10 + duty_cycle 2 + note_type 12, 12, 3 + octave 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + note_type 12, 12, 4 + octave 5 + note E_, 8 + sound_ret + + +Music_PkmnHealed_Ch3:: + note_type 12, 1, 0 octave 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 note E_, 6 - note __, 2 - endchannel + rest 2 + sound_ret diff --git a/crysaudio/music/RBY/pokecenter.asm b/crysaudio/music/RBY/pokecenter.asm index eb3b9405..57ee3f6a 100644 --- a/crysaudio/music/RBY/pokecenter.asm +++ b/crysaudio/music/RBY/pokecenter.asm @@ -1,22 +1,23 @@ Music_Pokecenter:: - musicheader 3, 1, Music_Pokecenter_Ch0 - musicheader 1, 2, Music_Pokecenter_Ch1 - musicheader 1, 3, Music_Pokecenter_Ch2 + channel_count 3 + channel 1, Music_Pokecenter_Ch1 + channel 2, Music_Pokecenter_Ch2 + channel 3, Music_Pokecenter_Ch3 -Music_Pokecenter_Ch0:: +Music_Pokecenter_Ch1:: tempo 144 - volume $77 - dutycycle 3 - vibrato 10, $22 - ;toggleperfectpitch + volume 7, 7 + duty_cycle 3 + vibrato 10, 2, 2 + ;toggle_perfect_pitch Music_Pokecenter_branch_be61:: - notetype 12, $a3 + note_type 12, 10, 3 octave 3 note F#, 2 note F_, 2 note F#, 2 - notetype 12, $b5 + note_type 12, 11, 5 octave 4 note D_, 4 note C#, 2 @@ -31,11 +32,11 @@ Music_Pokecenter_branch_be61:: note F#, 2 note G_, 2 note A_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note A_, 2 note E_, 2 note A_, 2 - notetype 12, $b5 + note_type 12, 11, 5 octave 4 note C#, 4 octave 3 @@ -52,11 +53,11 @@ Music_Pokecenter_branch_be61:: octave 3 note B_, 2 note A_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note F#, 2 note F_, 2 note F#, 2 - notetype 12, $b5 + note_type 12, 11, 5 octave 4 note D_, 4 note C#, 2 @@ -71,11 +72,11 @@ Music_Pokecenter_branch_be61:: note F#, 2 note G_, 2 note A_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note A_, 2 note E_, 2 note A_, 2 - notetype 12, $b5 + note_type 12, 11, 5 octave 4 note C#, 4 octave 3 @@ -151,42 +152,42 @@ Music_Pokecenter_branch_be61:: note E_, 2 note F#, 2 note G_, 2 - loopchannel 0, Music_Pokecenter_branch_be61 + sound_loop 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch1:: - vibrato 8, $25 +Music_Pokecenter_Ch2:: + vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: - callchannel Music_Pokecenter_branch_bf4e - dutycycle 3 - notetype 12, $a5 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - callchannel Music_Pokecenter_branch_bf60 + sound_call Music_Pokecenter_branch_bf60 note D_, 2 note F#, 6 - dutycycle 3 - notetype 12, $a5 + duty_cycle 3 + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - callchannel Music_Pokecenter_branch_bf4e - dutycycle 3 - notetype 12, $a5 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - callchannel Music_Pokecenter_branch_bf60 + sound_call Music_Pokecenter_branch_bf60 note D_, 8 - dutycycle 3 - notetype 12, $a5 + duty_cycle 3 + note_type 12, 10, 5 octave 3 note D_, 4 note E_, 4 - dutycycle 2 - notetype 12, $c6 + duty_cycle 2 + note_type 12, 12, 6 octave 4 note F#, 8 note A_, 8 @@ -218,43 +219,43 @@ Music_Pokecenter_branch_befc:: note F#, 2 note E_, 2 note D_, 8 - loopchannel 0, Music_Pokecenter_branch_befc + sound_loop 0, Music_Pokecenter_branch_befc Music_Pokecenter_branch_bf4e:: - dutycycle 2 - notetype 12, $c2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 note D_, 2 octave 3 note A_, 2 octave 4 note D_, 2 - notetype 12, $c3 + note_type 12, 12, 3 note A_, 4 note G_, 4 note F#, 2 note E_, 2 note C#, 6 - endchannel + sound_ret Music_Pokecenter_branch_bf60:: - dutycycle 2 - notetype 12, $c2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 note C#, 2 octave 3 note A_, 2 octave 4 note C#, 2 - notetype 12, $c3 + note_type 12, 12, 3 note F#, 4 note E_, 4 note C#, 2 - endchannel + sound_ret -Music_Pokecenter_Ch2:: - notetype 12, $10 +Music_Pokecenter_Ch3:: + note_type 12, 1, 0 Music_Pokecenter_branch_bf72:: octave 4 @@ -266,8 +267,8 @@ Music_Pokecenter_branch_bf72:: note F#, 2 note G_, 2 note F#, 2 - callchannel Music_Pokecenter_branch_bfd9 - callchannel Music_Pokecenter_branch_bfe2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call Music_Pokecenter_branch_bfe2 note F#, 2 note A_, 2 note F#, 2 @@ -284,8 +285,8 @@ Music_Pokecenter_branch_bf72:: note F#, 2 note G_, 2 note F#, 2 - callchannel Music_Pokecenter_branch_bfd9 - callchannel Music_Pokecenter_branch_bfe2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call Music_Pokecenter_branch_bfe2 note D_, 2 note F#, 2 note D_, 2 @@ -294,7 +295,7 @@ Music_Pokecenter_branch_bf72:: note B_, 2 note A_, 2 note G_, 2 - callchannel Music_Pokecenter_branch_bfeb + sound_call Music_Pokecenter_branch_bfeb note G_, 2 note B_, 2 note G_, 2 @@ -319,7 +320,7 @@ Music_Pokecenter_branch_bf72:: note A_, 2 note G#, 2 note A_, 2 - callchannel Music_Pokecenter_branch_bfeb + sound_call Music_Pokecenter_branch_bfeb note G_, 2 note B_, 2 note G_, 2 @@ -344,7 +345,7 @@ Music_Pokecenter_branch_bf72:: note G_, 2 note F#, 2 note E_, 2 - loopchannel 0, Music_Pokecenter_branch_bf72 + sound_loop 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: note E_, 2 @@ -355,7 +356,7 @@ Music_Pokecenter_branch_bfd9:: note A_, 2 note E_, 2 note A_, 2 - endchannel + sound_ret Music_Pokecenter_branch_bfe2:: note E_, 2 @@ -366,7 +367,7 @@ Music_Pokecenter_branch_bfe2:: note A_, 2 note G_, 2 note A_, 2 - endchannel + sound_ret Music_Pokecenter_branch_bfeb:: note F#, 2 @@ -377,4 +378,4 @@ Music_Pokecenter_branch_bfeb:: note A_, 2 note F#, 2 note A_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm index 78727e0d..1f4a044f 100644 --- a/crysaudio/music/RBY/pokemontower.asm +++ b/crysaudio/music/RBY/pokemontower.asm @@ -1,108 +1,109 @@ Music_PokemonTower:: - musicheader 3, 1, Music_PokemonTower_Ch0 - musicheader 1, 2, Music_PokemonTower_Ch1 - musicheader 1, 3, Music_PokemonTower_Ch2 + channel_count 3 + channel 1, Music_PokemonTower_Ch1 + channel 2, Music_PokemonTower_Ch2 + channel 3, Music_PokemonTower_Ch3 -Music_PokemonTower_Ch0:: +Music_PokemonTower_Ch1:: tempo 152 - volume $77 - dutycycle 3 - ;toggleperfectpitch - vibrato 12, $23 - notetype 12, $80 - note __, 4 + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + vibrato 12, 2, 3 + note_type 12, 8, 0 + rest 4 octave 4 note B_, 12 Music_PokemonTower_branch_7f05a:: - notetype 12, $b4 + note_type 12, 11, 4 octave 4 note G_, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 octave 3 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 octave 4 note F#, 1 - note __, 7 + rest 7 note C_, 1 octave 3 note B_, 1 note G_, 1 - note __, 5 + rest 5 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note D_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 octave 4 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note C#, 1 - note __, 7 + rest 7 note C#, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 3 - notetype 12, $84 + rest 3 + note_type 12, 8, 4 note C_, 1 - note __, 3 - notetype 12, $b4 + rest 3 + note_type 12, 11, 4 note D_, 1 - note __, 7 + rest 7 note D_, 1 - note __, 7 + rest 7 octave 3 note A_, 1 - note __, 7 + rest 7 note A_, 1 - note __, 7 - notetype 12, $a7 + rest 7 + note_type 12, 10, 7 note B_, 8 note B_, 8 octave 4 @@ -110,13 +111,13 @@ Music_PokemonTower_branch_7f05a:: note C_, 8 note C#, 8 note C#, 8 - notetype 12, $a6 + note_type 12, 10, 6 note D_, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype 12, $92 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 12, 9, 2 note B_, 4 octave 5 note E_, 4 @@ -142,30 +143,30 @@ Music_PokemonTower_branch_7f05a:: octave 5 note C_, 16 note C_, 16 - loopchannel 0, Music_PokemonTower_branch_7f05a + sound_loop 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch1:: - vibrato 20, $34 - dutycycle 3 - notetype 12, $a0 +Music_PokemonTower_Ch2:: + vibrato 20, 3, 4 + duty_cycle 3 + note_type 12, 10, 0 octave 5 note C_, 12 octave 4 note E_, 4 Music_PokemonTower_branch_7f0ee:: - notetype 12, $c1 + note_type 12, 12, 1 octave 5 note C_, 8 octave 4 note B_, 4 - notetype 12, $c4 + note_type 12, 12, 4 note G_, 1 note F#, 1 note E_, 1 note D#, 1 - notetype 12, $b0 + note_type 12, 11, 0 note G_, 8 octave 5 note C_, 8 @@ -176,18 +177,18 @@ Music_PokemonTower_branch_7f0ee:: note G_, 4 octave 5 note C_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note C_, 8 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note G_, 1 note F#, 1 note E_, 1 - note __, 1 - notetype 12, $96 + rest 1 + note_type 12, 9, 6 octave 3 note G_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 4 note B_, 4 note G_, 4 @@ -196,13 +197,13 @@ Music_PokemonTower_branch_7f0ee:: note C_, 4 octave 3 note B_, 4 - notetype 12, $b0 + note_type 12, 11, 0 octave 4 note C_, 16 note E_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 12 - notetype 12, $c5 + note_type 12, 12, 5 octave 5 note C_, 4 octave 4 @@ -212,39 +213,39 @@ Music_PokemonTower_branch_7f0ee:: note G_, 4 note F#, 4 note E_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 12 note G_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note F#, 8 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 8 - notetype 12, $b0 + note_type 12, 11, 0 note B_, 4 note G_, 4 note F#, 4 note E_, 4 note B_, 16 - notetype 12, $b0 + note_type 12, 11, 0 octave 5 note C_, 4 octave 4 note G_, 4 note F#, 4 note E_, 4 - notetype 12, $90 + note_type 12, 9, 0 octave 5 note C_, 16 - notetype 12, $b0 + note_type 12, 11, 0 note D_, 4 octave 4 note A_, 4 note G#, 4 note F#, 4 - notetype 12, $2f + note_type 12, 2, -7 octave 5 note D_, 16 - notetype 12, $c0 + note_type 12, 12, 0 note E_, 4 octave 4 note B_, 4 @@ -266,20 +267,20 @@ Music_PokemonTower_branch_7f0ee:: note F#, 4 note E_, 4 note D_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note C_, 8 - notetype 12, $90 + note_type 12, 9, 0 note C_, 8 - notetype 12, $80 + note_type 12, 8, 0 note C_, 8 - notetype 12, $70 + note_type 12, 7, 0 note C_, 8 - notetype 12, $60 + note_type 12, 6, 0 note C_, 8 - notetype 12, $67 + note_type 12, 6, 7 note C_, 8 - note __, 16 - notetype 12, $a0 + rest 16 + note_type 12, 10, 0 octave 5 note G_, 16 octave 6 @@ -291,174 +292,174 @@ Music_PokemonTower_branch_7f0ee:: note G_, 8 octave 6 note C_, 16 - vibrato 0, $34 - notetype 12, $a7 + vibrato 0, 3, 4 + note_type 12, 10, 7 note C_, 16 - loopchannel 0, Music_PokemonTower_branch_7f0ee + sound_loop 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch2:: - vibrato 4, $11 - notetype 12, $13 - note __, 8 +Music_PokemonTower_Ch3:: + vibrato 4, 1, 1 + note_type 12, 1, 3 + rest 8 octave 5 note G_, 8 Music_PokemonTower_branch_7f1a2:: note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 3 + rest 3 note E_, 1 note D#, 1 note F#, 1 note D#, 1 note E_, 1 - note __, 7 + rest 7 note G_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 note E_, 1 note D#, 1 octave 4 note B_, 1 - note __, 5 + rest 5 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 octave 5 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 octave 4 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 note B_, 1 - note __, 7 + rest 7 octave 5 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note C_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note F#, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note D_, 1 - note __, 7 + rest 7 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 7 + rest 7 note F_, 1 - note __, 7 + rest 7 note F_, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note F#, 1 - note __, 7 + rest 7 note G_, 1 - note __, 15 - notetype 12, $1f + rest 15 + note_type 12, 1, 15 load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 2, 2, 15, 7, 2, 4, 2, 2, 15, 7, 3, 4, 2, 4, 15, 7, 4, 4 octave 4 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 15 + rest 15 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 7 - notetype 12, $13 + rest 7 + note_type 12, 1, 3 octave 6 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 15 + rest 15 note E_, 1 - note __, 15 + rest 15 note E_, 1 - note __, 15 + rest 15 note E_, 1 - note __, 15 + rest 15 note E_, 1 - note __, 15 + rest 15 note E_, 1 - note __, 7 + rest 7 octave 5 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - loopchannel 0, Music_PokemonTower_branch_7f1a2 + rest 1 + sound_loop 0, Music_PokemonTower_branch_7f1a2 diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm index 398c93cd..e0bc11db 100644 --- a/crysaudio/music/RBY/routes1.asm +++ b/crysaudio/music/RBY/routes1.asm @@ -1,19 +1,20 @@ Music_Routes1:: - musicheader 4, 1, Music_Routes1_Ch0 - musicheader 1, 2, Music_Routes1_Ch1 - musicheader 1, 3, Music_Routes1_Ch2 - musicheader 1, 4, Music_Routes1_Ch3 + channel_count 4 + channel 1, Music_Routes1_Ch1 + channel 2, Music_Routes1_Ch2 + channel 3, Music_Routes1_Ch3 + channel 4, Music_Routes1_Ch4 -Music_Routes1_Ch0:: +Music_Routes1_Ch1:: tempo 152 - volume $77 - vibrato 4, $23 - dutycycle 2 - ;toggleperfectpitch + volume 7, 7 + vibrato 4, 2, 3 + duty_cycle 2 + ;toggle_perfect_pitch Music_Routes1_branch_9be9:: - notetype 12, $a1 - note __, 4 + note_type 12, 10, 1 + rest 4 octave 4 note D_, 2 note D_, 6 @@ -69,12 +70,12 @@ Music_Routes1_branch_9be9:: note E_, 2 octave 3 note A_, 2 - notetype 12, $a2 + note_type 12, 10, 2 octave 4 note G_, 4 note E_, 4 note F#, 2 - notetype 12, $a1 + note_type 12, 10, 1 octave 3 note A_, 2 note A_, 6 @@ -108,20 +109,20 @@ Music_Routes1_branch_9be9:: octave 3 note A_, 2 note A_, 2 - loopchannel 0, Music_Routes1_branch_9be9 - endchannel + sound_loop 0, Music_Routes1_branch_9be9 + sound_ret -Music_Routes1_Ch1:: - dutycycle 2 +Music_Routes1_Ch2:: + duty_cycle 2 Music_Routes1_branch_9c53:: - notetype 12, $d1 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c78 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c8d - loopchannel 0, Music_Routes1_branch_9c53 + 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 Music_Routes1_branch_9c65:: octave 4 @@ -142,7 +143,7 @@ Music_Routes1_branch_9c65:: note G_, 3 note F#, 1 note E_, 6 - endchannel + sound_ret Music_Routes1_branch_9c78:: note C#, 1 @@ -165,7 +166,7 @@ Music_Routes1_branch_9c78:: note F#, 1 note D_, 4 note F#, 2 - endchannel + sound_ret Music_Routes1_branch_9c8d:: note C#, 1 @@ -180,21 +181,21 @@ Music_Routes1_branch_9c8d:: note B_, 2 octave 4 note C#, 2 - notetype 12, $d2 + note_type 12, 13, 2 note B_, 4 - notetype 6, $d1 + note_type 6, 13, 1 octave 3 note B_, 1 octave 4 note C#, 1 - notetype 12, $d1 + note_type 12, 13, 1 octave 3 note B_, 1 note A_, 1 octave 4 note C#, 1 note D_, 6 - notetype 12, $d2 + note_type 12, 13, 2 note F#, 1 note G_, 1 note A_, 2 @@ -232,20 +233,20 @@ Music_Routes1_branch_9c8d:: note C#, 2 note E_, 2 note D_, 2 - notetype 12, $d1 + note_type 12, 13, 1 octave 4 note D_, 2 note D_, 2 - endchannel - endchannel + sound_ret + sound_ret -Music_Routes1_Ch2:: - vibrato 8, $25 - notetype 12, $13 +Music_Routes1_Ch3:: + vibrato 8, 2, 5 + note_type 12, 1, 3 Music_Routes1_branch_9cdd:: - note __, 2 + rest 2 octave 4 note D_, 4 note C#, 4 @@ -311,101 +312,101 @@ Music_Routes1_branch_9cdd:: note A_, 8 octave 4 note D_, 6 - loopchannel 0, Music_Routes1_branch_9cdd - endchannel + sound_loop 0, Music_Routes1_branch_9cdd + sound_ret -Music_Routes1_Ch3:: - togglenoise 1 - notetype 12 - note __, 4 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note __, 4 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note __, 4 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note __, 4 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note __, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note __, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note __, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note __, 2 - note G_, 2 - note G_, 2 - loopchannel 0, Music_Routes1_Ch3 - endchannel +Music_Routes1_Ch4:: + toggle_noise 1 + drum_speed 12 + rest 4 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + rest 4 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + rest 4 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + rest 4 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + rest 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + rest 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + rest 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + rest 2 + drum_note 8, 2 + drum_note 8, 2 + sound_loop 0, Music_Routes1_Ch4 + sound_ret diff --git a/crysaudio/music/RBY/routes2.asm b/crysaudio/music/RBY/routes2.asm index 6bcc041b..6dfced01 100644 --- a/crysaudio/music/RBY/routes2.asm +++ b/crysaudio/music/RBY/routes2.asm @@ -1,17 +1,18 @@ Music_Routes2:: - musicheader 4, 1, Music_Routes2_Ch0 - musicheader 1, 2, Music_Routes2_Ch1 - musicheader 1, 3, Music_Routes2_Ch2 - musicheader 1, 4, Music_Routes2_Ch3 + channel_count 4 + channel 1, Music_Routes2_Ch1 + channel 2, Music_Routes2_Ch2 + channel 3, Music_Routes2_Ch3 + channel 4, Music_Routes2_Ch4 -Music_Routes2_Ch0:: +Music_Routes2_Ch1:: tempo 152 - volume $77 - vibrato 9, $25 - dutycycle 1 + volume 7, 7 + vibrato 9, 2, 5 + duty_cycle 1 Music_Routes2_branch_9dc3:: - notetype 12, $b2 + note_type 12, 11, 2 octave 2 note B_, 4 octave 3 @@ -44,7 +45,7 @@ Music_Routes2_branch_9dc3:: note A_, 2 note G#, 4 note B_, 4 - notetype 8, $b2 + note_type 8, 11, 2 octave 4 note E_, 2 octave 3 @@ -144,16 +145,16 @@ Music_Routes2_branch_9dc3:: note B_, 2 octave 4 note E_, 2 - loopchannel 0, Music_Routes2_branch_9dc3 - endchannel + sound_loop 0, Music_Routes2_branch_9dc3 + sound_ret -Music_Routes2_Ch1:: - vibrato 8, $26 - dutycycle 3 +Music_Routes2_Ch2:: + vibrato 8, 2, 6 + duty_cycle 3 Music_Routes2_branch_9e54:: - notetype 12, $d4 + note_type 12, 13, 4 octave 4 note E_, 6 octave 3 @@ -217,19 +218,19 @@ Music_Routes2_branch_9e54:: note B_, 3 note A_, 1 note G#, 8 - note __, 4 - loopchannel 0, Music_Routes2_branch_9e54 - endchannel + rest 4 + sound_loop 0, Music_Routes2_branch_9e54 + sound_ret -Music_Routes2_Ch2:: - vibrato 9, $28 +Music_Routes2_Ch3:: + vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: - notetype 12, $11 + note_type 12, 1, 1 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 6 octave 3 @@ -238,7 +239,7 @@ Music_Routes2_branch_9e9e:: note D_, 2 note D#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 6 octave 3 @@ -249,7 +250,7 @@ Music_Routes2_branch_9e9e:: octave 3 note C#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 6 octave 3 @@ -258,7 +259,7 @@ Music_Routes2_branch_9e9e:: note D_, 2 note D#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 4 octave 3 @@ -269,164 +270,164 @@ Music_Routes2_branch_9e9e:: note D_, 2 note F#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note F#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note C#, 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 - loopchannel 0, Music_Routes2_branch_9e9e - endchannel + rest 2 + sound_loop 0, Music_Routes2_branch_9e9e + sound_ret -Music_Routes2_Ch3:: - togglenoise 0 - notetype 12 - note D_, 2 - note __, 2 - note D_, 1 - note __, 5 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note __, 2 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note D_, 3 - notetype 12 - note D_, 1 - note __, 3 - note D_, 2 - note __, 2 - note D_, 2 - note __, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note __, 2 - note D_, 2 - note __, 2 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note D_, 3 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note __, 3 - notetype 12 - note D_, 1 - note __, 5 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note __, 2 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note __, 3 - notetype 12 - note D_, 1 - note __, 3 - note D_, 2 - note __, 2 - note D_, 2 - note __, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note __, 2 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note __, 3 - note D_, 3 - note D_, 3 - note D_, 3 - note __, 3 - notetype 12 - note D_, 1 - note __, 5 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note __, 2 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note __, 3 - note D_, 3 - note __, 3 - loopchannel 0, Music_Routes2_Ch3 - endchannel +Music_Routes2_Ch4:: + toggle_noise 0 + drum_speed 12 + drum_note 3, 2 + rest 2 + drum_note 3, 1 + rest 5 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_speed 12 + drum_note 3, 1 + rest 3 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + rest 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + rest 3 + drum_speed 12 + drum_note 3, 1 + rest 5 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + rest 3 + drum_speed 12 + drum_note 3, 1 + rest 3 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + rest 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + rest 3 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 3 + rest 3 + drum_speed 12 + drum_note 3, 1 + rest 5 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + rest 3 + drum_note 3, 3 + rest 3 + sound_loop 0, Music_Routes2_Ch4 + sound_ret diff --git a/crysaudio/music/RBY/routes3.asm b/crysaudio/music/RBY/routes3.asm index a6c22731..a538e2d0 100644 --- a/crysaudio/music/RBY/routes3.asm +++ b/crysaudio/music/RBY/routes3.asm @@ -1,16 +1,17 @@ Music_Routes3:: - musicheader 4, 1, Music_Routes3_Ch0 - musicheader 1, 2, Music_Routes3_Ch1 - musicheader 1, 3, Music_Routes3_Ch2 - musicheader 1, 4, Music_Routes3_Ch3 + channel_count 4 + channel 1, Music_Routes3_Ch1 + channel 2, Music_Routes3_Ch2 + channel 3, Music_Routes3_Ch3 + channel 4, Music_Routes3_Ch4 -Music_Routes3_Ch0:: +Music_Routes3_Ch1:: tempo 148 - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b5 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 5 octave 3 note E_, 1 note F#, 1 @@ -18,11 +19,11 @@ Music_Routes3_Ch0:: note F_, 1 note G_, 1 note E_, 1 - note __, 16 - note __, 15 + rest 16 + rest 15 Music_Routes3_branch_9fc3:: - notetype 12, $b5 + note_type 12, 11, 5 note E_, 6 note D_, 1 note E_, 1 @@ -35,12 +36,12 @@ Music_Routes3_branch_9fc3:: note G_, 2 note G_, 2 note A_, 2 - notetype 12, $a7 + note_type 12, 10, 7 note A#, 8 note F_, 8 note D_, 8 note F_, 8 - notetype 12, $b5 + note_type 12, 11, 5 note E_, 6 note D_, 1 note E_, 1 @@ -53,12 +54,12 @@ Music_Routes3_branch_9fc3:: note G_, 2 note G_, 2 note A_, 2 - notetype 12, $a7 + note_type 12, 10, 7 note A#, 8 note A#, 8 note D_, 8 note F_, 8 - notetype 12, $b5 + note_type 12, 11, 5 note E_, 4 note E_, 2 note F_, 2 @@ -71,22 +72,22 @@ Music_Routes3_branch_9fc3:: octave 3 note B_, 8 note A_, 2 - notetype 8, $c3 + note_type 8, 12, 3 note A_, 4 note F_, 4 note A_, 4 - notetype 8, $4f + note_type 8, 4, -7 note A_, 12 - notetype 8, $90 + note_type 8, 9, 0 note F_, 12 note G_, 12 - loopchannel 0, Music_Routes3_branch_9fc3 + sound_loop 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch1:: - vibrato 8, $23 - dutycycle 2 - notetype 12, $c7 +Music_Routes3_Ch2:: + vibrato 8, 2, 3 + duty_cycle 2 + note_type 12, 12, 7 octave 3 note G_, 1 note A#, 1 @@ -95,12 +96,12 @@ Music_Routes3_Ch1:: note B_, 1 octave 4 note C_, 1 - note __, 15 - note __, 16 + rest 15 + rest 16 Music_Routes3_branch_a01a:: - notetype 12, $c7 - dutycycle 2 + note_type 12, 12, 7 + duty_cycle 2 octave 4 note C_, 6 octave 3 @@ -119,13 +120,13 @@ Music_Routes3_branch_a01a:: note C_, 2 note D_, 8 note F_, 8 - notetype 12, $c5 - dutycycle 3 + note_type 12, 12, 5 + duty_cycle 3 octave 3 note A#, 8 note A_, 8 - notetype 12, $c7 - dutycycle 2 + note_type 12, 12, 7 + duty_cycle 2 octave 4 note C_, 6 octave 3 @@ -144,14 +145,14 @@ Music_Routes3_branch_a01a:: note C_, 2 note D_, 8 note F_, 8 - notetype 12, $c5 - dutycycle 3 + note_type 12, 12, 5 + duty_cycle 3 octave 3 note A#, 8 octave 4 note D_, 6 - notetype 12, $c7 - dutycycle 2 + note_type 12, 12, 7 + duty_cycle 2 note C_, 1 note D_, 1 note E_, 2 @@ -169,354 +170,354 @@ Music_Routes3_branch_a01a:: note G_, 8 note F_, 1 note E_, 1 - notetype 8, $d3 + note_type 8, 13, 3 note F_, 4 note E_, 4 - notetype 8, $c4 + note_type 8, 12, 4 note C_, 4 - notetype 8, $c5 + note_type 8, 12, 5 note C_, 12 - notetype 12, $a0 - dutycycle 3 + note_type 12, 10, 0 + duty_cycle 3 octave 3 note A_, 8 note B_, 8 - loopchannel 0, Music_Routes3_branch_a01a + sound_loop 0, Music_Routes3_branch_a01a -Music_Routes3_Ch2:: - vibrato 4, $10 - notetype 6, $12 +Music_Routes3_Ch3:: + vibrato 4, 1, 0 + note_type 6, 1, 2 octave 4 note G_, 2 note A#, 2 note B_, 8 note A_, 8 note G_, 2 - note __, 2 + rest 2 note G_, 7 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 8 note G_, 2 - note __, 2 + rest 2 note G_, 7 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 8 Music_Routes3_branch_a0a3:: - notetype 12, $12 + note_type 12, 1, 2 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 2 note A_, 2 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 2 note F_, 2 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 2 note A_, 2 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 2 note A_, 2 note G_, 1 - note __, 1 + rest 1 octave 5 note C_, 4 octave 4 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 5 note C_, 4 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note D_, 4 octave 4 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 5 note D_, 4 octave 4 note F_, 1 - note __, 1 + rest 1 octave 5 note C_, 4 octave 4 note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 5 note C_, 4 octave 4 note F_, 1 - note __, 1 + rest 1 note A_, 4 note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 4 - loopchannel 0, Music_Routes3_branch_a0a3 + sound_loop 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch3:: - togglenoise 1 - notetype 6 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 8 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A#, 2 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A#, 2 - note A_, 4 - note A#, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 +Music_Routes3_Ch4:: + toggle_noise 1 + drum_speed 6 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 8 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 11, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 11, 2 + drum_note 10, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 Music_Routes3_branch_a17a:: - note A_, 12 - note A_, 2 - note A#, 2 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 8 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A#, 2 - note A_, 4 - note A_, 10 - note B_, 1 - note B_, 1 - note A_, 12 - note A_, 2 - note B_, 2 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 8 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 10 - note B_, 1 - note B_, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 8 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 10 - note B_, 1 - note B_, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 8 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 8 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 12 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - loopchannel 0, Music_Routes3_branch_a17a + drum_note 10, 12 + drum_note 10, 2 + drum_note 11, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 8 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 11, 2 + drum_note 10, 4 + drum_note 10, 10 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 8 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 10 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 8 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 10 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 8 + drum_note 11, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 8 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 12 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + sound_loop 0, Music_Routes3_branch_a17a diff --git a/crysaudio/music/RBY/routes4.asm b/crysaudio/music/RBY/routes4.asm index eef93c63..bad933c5 100644 --- a/crysaudio/music/RBY/routes4.asm +++ b/crysaudio/music/RBY/routes4.asm @@ -1,27 +1,28 @@ Music_Routes4:: - musicheader 4, 1, Music_Routes4_Ch0 - musicheader 1, 2, Music_Routes4_Ch1 - musicheader 1, 3, Music_Routes4_Ch2 - musicheader 1, 4, Music_Routes4_Ch3 + channel_count 4 + channel 1, Music_Routes4_Ch1 + channel 2, Music_Routes4_Ch2 + channel 3, Music_Routes4_Ch3 + channel 4, Music_Routes4_Ch4 -Music_Routes4_Ch0:: +Music_Routes4_Ch1:: tempo 148 - volume $77 - dutycycle 3 - vibrato 10, $34 - ;toggleperfectpitch - notetype 12, $a2 + volume 7, 7 + duty_cycle 3 + vibrato 10, 3, 4 + ;toggle_perfect_pitch + note_type 12, 10, 2 octave 2 note G#, 4 note G#, 4 note G#, 4 - notetype 12, $7f + note_type 12, 7, -7 note G#, 4 - notetype 12, $a2 + note_type 12, 10, 2 note G#, 4 note G#, 4 note G#, 4 - notetype 12, $b7 + note_type 12, 11, 7 note B_, 1 octave 3 note E_, 1 @@ -29,7 +30,7 @@ Music_Routes4_Ch0:: note B_, 1 Music_Routes4_branch_a28a:: - notetype 12, $b7 + note_type 12, 11, 7 note B_, 6 note E_, 2 note E_, 4 @@ -40,9 +41,9 @@ Music_Routes4_branch_a28a:: octave 3 note B_, 4 note A_, 4 - notetype 12, $b1 + note_type 12, 11, 1 note G#, 3 - notetype 12, $b7 + note_type 12, 11, 7 note E_, 1 note F#, 12 note E_, 8 @@ -59,9 +60,9 @@ Music_Routes4_branch_a28a:: note B_, 4 octave 4 note C#, 4 - notetype 12, $b1 + note_type 12, 11, 1 note E_, 3 - notetype 12, $b7 + note_type 12, 11, 7 note D#, 1 note E_, 12 octave 3 @@ -107,7 +108,7 @@ Music_Routes4_branch_a28a:: note F#, 2 note G#, 2 note B_, 2 - notetype 8, $b5 + note_type 8, 11, 5 note A_, 4 note G#, 4 note F#, 4 @@ -141,28 +142,28 @@ Music_Routes4_branch_a28a:: note F#, 3 note G#, 3 note A_, 3 - loopchannel 0, Music_Routes4_branch_a28a + sound_loop 0, Music_Routes4_branch_a28a -Music_Routes4_Ch1:: - vibrato 12, $24 - dutycycle 1 - notetype 12, $92 +Music_Routes4_Ch2:: + vibrato 12, 2, 4 + duty_cycle 1 + note_type 12, 9, 2 octave 3 note E_, 3 note F#, 1 - notetype 12, $90 + note_type 12, 9, 0 note E_, 12 - notetype 12, $92 + note_type 12, 9, 2 octave 2 note B_, 3 octave 3 note C_, 1 - notetype 12, $90 + note_type 12, 9, 0 octave 2 note B_, 8 - dutycycle 3 - notetype 12, $c7 + duty_cycle 3 + note_type 12, 12, 7 octave 3 note E_, 1 note F#, 1 @@ -171,7 +172,7 @@ Music_Routes4_Ch1:: note D#, 1 Music_Routes4_branch_a325:: - notetype 12, $c7 + note_type 12, 12, 7 note E_, 6 octave 3 note B_, 2 @@ -185,24 +186,24 @@ Music_Routes4_branch_a325:: note A_, 1 note G#, 1 note F#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note G#, 3 note E_, 1 - notetype 12, $a0 + note_type 12, 10, 0 octave 3 note B_, 12 - dutycycle 0 - notetype 12, $c2 + duty_cycle 0 + note_type 12, 12, 2 octave 2 note B_, 3 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note C_, 1 octave 2 note B_, 8 octave 3 note D#, 4 - dutycycle 3 + duty_cycle 3 octave 4 note E_, 6 octave 3 @@ -219,470 +220,470 @@ Music_Routes4_branch_a325:: octave 4 note B_, 1 note A_, 1 - notetype 12, $c2 + note_type 12, 12, 2 note B_, 3 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 1 - notetype 12, $b0 + note_type 12, 11, 0 note G#, 6 - notetype 12, $90 + note_type 12, 9, 0 note G#, 6 - notetype 12, $70 + note_type 12, 7, 0 note G#, 6 - notetype 12, $6f + note_type 12, 6, -7 note G#, 6 - notetype 12, $c7 + note_type 12, 12, 7 note G#, 4 - notetype 8, $c3 + note_type 8, 12, 3 note A_, 4 note G#, 4 note F#, 4 - notetype 8, $90 + note_type 8, 9, 0 note F#, 6 - notetype 8, $7f + note_type 8, 7, -7 note F#, 6 - dutycycle 0 - notetype 8, $90 + duty_cycle 0 + note_type 8, 9, 0 octave 3 note F#, 4 note E_, 4 note F#, 4 note A_, 6 - dutycycle 3 - notetype 8, $c7 + duty_cycle 3 + note_type 8, 12, 7 octave 4 note F#, 6 note G#, 4 note F#, 4 - notetype 8, $c4 + note_type 8, 12, 4 note E_, 4 - notetype 8, $a0 + note_type 8, 10, 0 note E_, 12 - dutycycle 0 - notetype 8, $90 + duty_cycle 0 + note_type 8, 9, 0 octave 3 note E_, 4 note D#, 4 note E_, 4 note G#, 6 - dutycycle 3 - notetype 8, $c7 + duty_cycle 3 + note_type 8, 12, 7 octave 4 note E_, 6 note F#, 4 note D#, 4 octave 3 note B_, 4 - notetype 8, $a0 + note_type 8, 10, 0 octave 4 note B_, 16 - notetype 8, $a7 + note_type 8, 10, 7 note B_, 8 - notetype 8, $b0 + note_type 8, 11, 0 note A_, 6 - notetype 8, $b7 + note_type 8, 11, 7 note A_, 6 - notetype 12, $a7 + note_type 12, 10, 7 note G#, 1 note F#, 1 - notetype 12, $b0 + note_type 12, 11, 0 note E_, 12 - notetype 12, $a0 + note_type 12, 10, 0 note E_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note E_, 10 - loopchannel 0, Music_Routes4_branch_a325 - - -Music_Routes4_Ch2:: - notetype 12, $10 - octave 4 - note E_, 1 - note __, 3 - note E_, 1 - note __, 3 - note E_, 1 - note __, 3 - note E_, 1 - note __, 3 - note E_, 1 - note __, 3 - note E_, 1 - note __, 3 - note E_, 1 - note __, 3 - note D#, 1 - note __, 3 - -Music_Routes4_branch_a3d7:: - note E_, 1 - note __, 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note A_, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note A_, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note A_, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note __, 1 - note D_, 1 - note __, 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 3 - note D_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 3 - note D#, 1 - note __, 1 - loopchannel 0, Music_Routes4_branch_a3d7 + sound_loop 0, Music_Routes4_branch_a325 Music_Routes4_Ch3:: - togglenoise 1 - notetype 12 - note __, 16 - note __, 12 + note_type 12, 1, 0 + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note D#, 1 + rest 3 + +Music_Routes4_branch_a3d7:: + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note A_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note A_, 1 + rest 1 + note B_, 1 + rest 3 note B_, 1 note B_, 1 - note A#, 1 - note A#, 1 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note D_, 1 + rest 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + rest 3 + note D_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note D#, 1 + rest 1 + sound_loop 0, Music_Routes4_branch_a3d7 + + +Music_Routes4_Ch4:: + toggle_noise 1 + drum_speed 12 + rest 16 + rest 12 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 Music_Routes4_branch_a4a8:: - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A#, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 2 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A#, 1 - note A#, 1 - note B_, 1 - note B_, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 2 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 2 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A_, 4 - note A_, 2 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 1 - note A#, 1 - note A_, 4 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - loopchannel 0, Music_Routes4_branch_a4a8 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 11, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 11, 1 + drum_note 11, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 1 + drum_note 11, 1 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm index c44f8e2e..9f4a0ba4 100644 --- a/crysaudio/music/RBY/safarizone.asm +++ b/crysaudio/music/RBY/safarizone.asm @@ -1,116 +1,117 @@ Music_SafariZone:: - musicheader 3, 1, Music_SafariZone_Ch0 - musicheader 1, 2, Music_SafariZone_Ch1 - musicheader 1, 3, Music_SafariZone_Ch2 - -Music_SafariZone_Ch0:: - tempo 132 - volume $77 - vibrato 6, $34 - ;toggleperfectpitch - dutycycle 2 - notetype 12, $92 - octave 3 - slidepitchto 1, 4, G# - note C_, 1 - slidepitchto 1, 4, G# - note G_, 1 - slidepitchto 1, 4, G# - note C_, 1 - slidepitchto 1, 4, G# - note G_, 1 - note __, 4 - dutycycle 3 - -Music_SafariZone_branch_bc4f:: - callchannel Music_SafariZone_branch_bc5f - notetype 12, $a4 - note F#, 4 - callchannel Music_SafariZone_branch_bc5f - notetype 12, $a4 - note F#, 4 - loopchannel 0, Music_SafariZone_branch_bc4f - -Music_SafariZone_branch_bc5f:: - notetype 12, $a2 - octave 3 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 - endchannel - + channel_count 3 + channel 1, Music_SafariZone_Ch1 + channel 2, Music_SafariZone_Ch2 + channel 3, Music_SafariZone_Ch3 Music_SafariZone_Ch1:: - dutycycle 2 - vibrato 8, $25 - notetype 12, $a2 - octave 4 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note __, 4 - dutycycle 3 - -Music_SafariZone_branch_bc79:: - callchannel Music_SafariZone_branch_bc89 - notetype 12, $b5 - note A_, 4 - callchannel Music_SafariZone_branch_bc89 - notetype 12, $b5 - note B_, 4 - loopchannel 0, Music_SafariZone_branch_bc79 - -Music_SafariZone_branch_bc89:: - notetype 12, $b2 + tempo 132 + volume 7, 7 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + duty_cycle 2 + note_type 12, 9, 2 octave 3 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 + rest 4 + duty_cycle 3 + +Music_SafariZone_branch_bc4f:: + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_loop 0, Music_SafariZone_branch_bc4f + +Music_SafariZone_branch_bc5f:: + note_type 12, 10, 2 + octave 3 + note C_, 4 note G_, 4 - note D_, 4 + note C_, 4 note G_, 4 - note D_, 4 + note C_, 4 note G_, 4 - note D_, 4 - note G_, 4 - endchannel + note C_, 4 + sound_ret Music_SafariZone_Ch2:: - notetype 12, $10 - note __, 8 + duty_cycle 2 + vibrato 8, 2, 5 + note_type 12, 10, 2 + octave 4 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + rest 4 + duty_cycle 3 + +Music_SafariZone_branch_bc79:: + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note A_, 4 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc79 + +Music_SafariZone_branch_bc89:: + note_type 12, 11, 2 + octave 3 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + sound_ret + + +Music_SafariZone_Ch3:: + note_type 12, 1, 0 + rest 8 Music_SafariZone_branch_bc97:: - callchannel Music_SafariZone_branch_bca5 + sound_call Music_SafariZone_branch_bca5 octave 4 note A_, 4 - callchannel Music_SafariZone_branch_bca5 + sound_call Music_SafariZone_branch_bca5 octave 4 note B_, 4 - loopchannel 0, Music_SafariZone_branch_bc97 + sound_loop 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 - endchannel + rest 2 + sound_ret diff --git a/crysaudio/music/RBY/silphco.asm b/crysaudio/music/RBY/silphco.asm index 83398588..984eb19d 100644 --- a/crysaudio/music/RBY/silphco.asm +++ b/crysaudio/music/RBY/silphco.asm @@ -1,15 +1,16 @@ Music_SilphCo:: - musicheader 3, 1, Music_SilphCo_Ch0 - musicheader 1, 2, Music_SilphCo_Ch1 - musicheader 1, 3, Music_SilphCo_Ch2 + channel_count 3 + channel 1, Music_SilphCo_Ch1 + channel 2, Music_SilphCo_Ch2 + channel 3, Music_SilphCo_Ch3 -Music_SilphCo_Ch0:: +Music_SilphCo_Ch1:: tempo 160 - volume $77 - dutycycle 3 - ;toggleperfectpitch - vibrato 8, $22 - notetype 6, $b3 + volume 7, 7 + duty_cycle 3 + ;toggle_perfect_pitch + vibrato 8, 2, 2 + note_type 6, 11, 3 octave 2 note E_, 1 note F#, 1 @@ -17,9 +18,9 @@ Music_SilphCo_Ch0:: note A#, 1 octave 3 note C_, 1 - notetype 6, $a0 + note_type 6, 10, 0 note C_, 12 - notetype 6, $b3 + note_type 6, 11, 3 note C_, 2 octave 2 note B_, 1 @@ -28,126 +29,126 @@ Music_SilphCo_Ch0:: note F#, 1 note E_, 1 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 + rest 2 Music_SilphCo_branch_7f26d:: note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 octave 2 note A#, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 10 + rest 10 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - notetype 6, $a0 + note_type 6, 10, 0 note B_, 12 - notetype 6, $b3 + note_type 6, 11, 3 note B_, 1 note A_, 1 note G_, 1 note F_, 1 note E_, 1 - note __, 11 + rest 11 note F_, 1 note G#, 1 note A#, 1 note B_, 1 - notetype 6, $a0 + note_type 6, 10, 0 octave 3 note C_, 12 - notetype 6, $b3 + note_type 6, 11, 3 note C_, 1 octave 2 note B_, 1 note A_, 1 note G_, 1 note F_, 1 - note __, 11 + rest 11 note F#, 1 note B_, 1 octave 3 note C_, 1 note C#, 1 - notetype 6, $a0 + note_type 6, 10, 0 note D_, 12 - notetype 6, $b3 + note_type 6, 11, 3 note D_, 1 note C_, 1 octave 2 note A#, 1 note G_, 1 note F_, 1 - note __, 11 + rest 11 note F_, 1 note G#, 1 note A#, 1 note B_, 1 - notetype 6, $a0 + note_type 6, 10, 0 octave 3 note C_, 12 - notetype 6, $b3 + note_type 6, 11, 3 note C_, 1 octave 2 note B_, 1 note G#, 1 note F_, 1 note E_, 1 - note __, 7 - notetype 6, $80 + rest 7 + note_type 6, 8, 0 note B_, 16 - notetype 6, $b0 + note_type 6, 11, 0 octave 3 note E_, 8 tempo 124 - notetype 6, $b3 + note_type 6, 11, 3 octave 2 note B_, 2 - note __, 10 + rest 10 note B_, 2 - note __, 10 + rest 10 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 16 - note __, 6 + rest 16 + rest 6 note A_, 2 - note __, 6 + rest 6 note B_, 2 note A#, 2 note B_, 2 @@ -190,187 +191,187 @@ Music_SilphCo_branch_7f26d:: note A#, 2 note B_, 2 note A#, 2 - callchannel Music_SilphCo_branch_7f3f0 - callchannel Music_SilphCo_branch_7f3f0 - callchannel Music_SilphCo_branch_7f3f0 - note __, 4 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 + rest 4 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 octave 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 + rest 6 note A_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 octave 3 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 octave 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 octave 3 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 octave 4 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 6 + rest 6 octave 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 6 + rest 6 note E_, 2 - note __, 6 + rest 6 note D#, 2 - note __, 6 + rest 6 note D#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 note A#, 1 note G#, 1 note F#, 1 note E_, 1 - notetype 6, $60 + note_type 6, 6, 0 note E_, 16 note E_, 11 - notetype 6, $b3 + note_type 6, 11, 3 note E_, 1 note F#, 1 note G#, 1 note A#, 1 octave 3 note C_, 1 - notetype 6, $3f + note_type 6, 3, -7 note C_, 16 - notetype 6, $a0 + note_type 6, 10, 0 note C_, 11 - notetype 6, $93 + note_type 6, 9, 3 octave 2 note B_, 1 note A#, 1 note G#, 1 note F#, 1 note E_, 1 - notetype 6, $3f + note_type 6, 3, -7 note E_, 16 - notetype 6, $90 + note_type 6, 9, 0 note E_, 11 - notetype 6, $b3 + note_type 6, 11, 3 note F_, 1 note G_, 1 note A#, 1 octave 3 note C_, 1 note D_, 1 - notetype 6, $3f + note_type 6, 3, -7 note D_, 16 - notetype 6, $a7 + note_type 6, 10, 7 note D_, 11 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 128 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 136 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 144 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 160 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 192 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 288 - note __, 4 - note __, 4 + rest 4 + rest 4 tempo 416 - note __, 4 + rest 4 tempo 1024 - note __, 4 + rest 4 tempo 160 - note __, 4 - notetype 6, $43 + rest 4 + note_type 6, 4, 3 octave 2 note B_, 2 - note __, 6 - notetype 6, $63 + rest 6 + note_type 6, 6, 3 note B_, 2 - note __, 6 - notetype 6, $83 + rest 6 + note_type 6, 8, 3 note B_, 2 - note __, 6 - notetype 6, $50 + rest 6 + note_type 6, 5, 0 note B_, 8 - notetype 6, $b3 + note_type 6, 11, 3 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 - loopchannel 0, Music_SilphCo_branch_7f26d + rest 2 + sound_loop 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 @@ -397,13 +398,13 @@ Music_SilphCo_branch_7f3f0:: note B_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_SilphCo_Ch1:: - vibrato 10, $32 - dutycycle 3 - notetype 6, $c3 +Music_SilphCo_Ch2:: + vibrato 10, 3, 2 + duty_cycle 3 + note_type 6, 12, 3 octave 3 note E_, 1 note F#, 1 @@ -411,9 +412,9 @@ Music_SilphCo_Ch1:: note A#, 1 octave 4 note C_, 1 - notetype 6, $b0 + note_type 6, 11, 0 note C_, 12 - notetype 6, $c3 + note_type 6, 12, 3 note C_, 2 octave 3 note B_, 1 @@ -422,48 +423,48 @@ Music_SilphCo_Ch1:: note F#, 1 note E_, 1 note E_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 - note __, 6 + rest 6 note F#, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G#, 2 - note __, 2 + rest 2 Music_SilphCo_branch_7f42e:: note E_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note F#, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 2 - notetype 6, $b7 - dutycycle 2 + rest 2 + note_type 6, 11, 7 + duty_cycle 2 octave 4 note E_, 8 note D#, 8 @@ -481,12 +482,12 @@ Music_SilphCo_branch_7f42e:: note D#, 8 note D_, 8 note D#, 8 - dutycycle 3 - notetype 6, $6f + duty_cycle 3 + note_type 6, 6, -7 note E_, 16 - notetype 6, $c0 + note_type 6, 12, 0 note B_, 16 - notetype 6, $c4 + note_type 6, 12, 4 octave 3 note E_, 4 note D#, 4 @@ -504,8 +505,8 @@ Music_SilphCo_branch_7f42e:: note D#, 4 note D_, 4 note D#, 4 - notetype 6, $c2 - dutycycle 1 + note_type 6, 12, 2 + duty_cycle 1 octave 4 note E_, 4 note D#, 4 @@ -516,8 +517,8 @@ Music_SilphCo_branch_7f42e:: note D_, 4 note D#, 4 note E_, 4 - notetype 6, $c4 - dutycycle 3 + note_type 6, 12, 4 + duty_cycle 3 octave 3 note F_, 4 note F#, 4 @@ -529,32 +530,32 @@ Music_SilphCo_branch_7f42e:: note E_, 4 note D#, 4 note E_, 4 - notetype 6, $c0 + note_type 6, 12, 0 note F_, 8 - notetype 6, $b7 + note_type 6, 11, 7 note F_, 8 - notetype 6, $8a + note_type 6, 8, -2 note F_, 4 - notetype 6, $c4 - dutycycle 3 + note_type 6, 12, 4 + duty_cycle 3 note F_, 4 note E_, 4 note F_, 4 - notetype 6, $a0 + note_type 6, 10, 0 note F#, 8 - notetype 6, $b0 + note_type 6, 11, 0 note F#, 8 - notetype 6, $99 + note_type 6, 9, -1 note F#, 4 - notetype 6, $c4 + note_type 6, 12, 4 note F#, 4 note F_, 4 note F#, 4 - notetype 6, $90 + note_type 6, 9, 0 note G_, 12 - notetype 6, $59 + note_type 6, 5, -1 note G_, 8 - notetype 6, $c4 + note_type 6, 12, 4 note G_, 4 note F#, 4 note G_, 4 @@ -571,178 +572,178 @@ Music_SilphCo_branch_7f42e:: note D_, 4 note D#, 4 note D_, 4 - notetype 6, $c2 - dutycycle 1 + note_type 6, 12, 2 + duty_cycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note A_, 4 - notetype 6, $b4 - dutycycle 3 + note_type 6, 11, 4 + duty_cycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, $c2 - dutycycle 1 + note_type 6, 12, 2 + duty_cycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note A#, 4 - notetype 6, $b4 - dutycycle 3 + note_type 6, 11, 4 + duty_cycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, $c2 - dutycycle 1 + note_type 6, 12, 2 + duty_cycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note B_, 4 - notetype 6, $b4 - dutycycle 3 + note_type 6, 11, 4 + duty_cycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, $c2 - dutycycle 1 + note_type 6, 12, 2 + duty_cycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 octave 4 note C_, 4 - notetype 6, $b4 - dutycycle 3 + note_type 6, 11, 4 + duty_cycle 3 octave 3 note D#, 4 note D_, 4 note D#, 4 - note __, 4 + rest 4 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 - dutycycle 0 + rest 2 + duty_cycle 0 octave 4 note E_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 + rest 6 note G#, 2 - note __, 6 - dutycycle 3 + rest 6 + duty_cycle 3 octave 3 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 - dutycycle 0 + rest 2 + duty_cycle 0 octave 4 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 - dutycycle 3 + rest 2 + duty_cycle 3 octave 3 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 - notetype 6, $87 + rest 2 + note_type 6, 8, 7 octave 5 note E_, 4 note D#, 4 @@ -760,35 +761,35 @@ Music_SilphCo_branch_7f42e:: note D#, 4 note D_, 4 note D#, 4 - note __, 4 - notetype 6, $43 + rest 4 + note_type 6, 4, 3 octave 2 note G_, 2 - note __, 6 - notetype 6, $63 + rest 6 + note_type 6, 6, 3 note F#, 2 - note __, 6 - notetype 6, $83 + rest 6 + note_type 6, 8, 3 note G_, 2 - note __, 6 - notetype 6, $4f + rest 6 + note_type 6, 4, -7 note G#, 8 - notetype 6, $b4 + note_type 6, 11, 4 note G_, 2 - note __, 6 + rest 6 note F#, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G#, 2 - note __, 2 - loopchannel 0, Music_SilphCo_branch_7f42e + rest 2 + sound_loop 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch2:: - vibrato 8, $11 - notetype 12, $11 - note __, 12 +Music_SilphCo_Ch3:: + vibrato 8, 1, 1 + note_type 12, 1, 1 + rest 12 octave 5 note E_, 4 note D#, 4 @@ -809,120 +810,120 @@ Music_SilphCo_branch_7f5c9:: note D_, 4 note D#, 4 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 5 + rest 5 note F_, 1 - note __, 5 + rest 5 note F_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 11 + rest 11 note D#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 5 + rest 5 note F_, 1 - note __, 5 + rest 5 note F_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 11 + rest 11 note D#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note D_, 8 note F_, 8 note D_, 8 @@ -975,31 +976,31 @@ Music_SilphCo_branch_7f5c9:: note D#, 4 note D_, 4 note D#, 4 - notetype 6, $11 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - note __, 4 - notetype 12, $11 - note __, 4 - note __, 4 - note __, 4 - note __, 4 + note_type 6, 1, 1 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + note_type 12, 1, 1 + rest 4 + rest 4 + rest 4 + rest 4 octave 5 note E_, 4 note D#, 4 note E_, 4 note F_, 4 - loopchannel 0, Music_SilphCo_branch_7f5c9 + sound_loop 0, Music_SilphCo_branch_7f5c9 diff --git a/crysaudio/music/RBY/ssanne.asm b/crysaudio/music/RBY/ssanne.asm index a65095da..b098cc4d 100644 --- a/crysaudio/music/RBY/ssanne.asm +++ b/crysaudio/music/RBY/ssanne.asm @@ -1,18 +1,19 @@ Music_SSAnne:: - musicheader 3, 1, Music_SSAnne_Ch0 - musicheader 1, 2, Music_SSAnne_Ch1 - musicheader 1, 3, Music_SSAnne_Ch2 + channel_count 3 + channel 1, Music_SSAnne_Ch1 + channel 2, Music_SSAnne_Ch2 + channel 3, Music_SSAnne_Ch3 -Music_SSAnne_Ch0:: +Music_SSAnne_Ch1:: tempo 128 - volume $77 - dutycycle 1 - vibrato 8, $34 - ;toggleperfectpitch + volume 7, 7 + duty_cycle 1 + vibrato 8, 3, 4 + ;toggle_perfect_pitch Music_SSAnne_branch_b3b2:: - notetype 12, $a4 - note __, 12 + note_type 12, 10, 4 + rest 12 octave 3 note E_, 2 note F#, 2 @@ -21,17 +22,17 @@ Music_SSAnne_branch_b3b2:: note C#, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note E_, 4 note F#, 2 note D_, 2 note E_, 4 note F#, 4 note G#, 4 - note __, 4 + rest 4 note E_, 4 note G#, 4 - note __, 4 + rest 4 note C#, 2 note E_, 2 note F#, 4 @@ -41,7 +42,7 @@ Music_SSAnne_branch_b3b2:: note C#, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note E_, 4 note F#, 2 note D_, 2 @@ -51,7 +52,7 @@ Music_SSAnne_branch_b3b2:: note F#, 4 note E_, 4 note F#, 4 - note __, 4 + rest 4 note C#, 2 note E_, 2 note F#, 4 @@ -61,7 +62,7 @@ Music_SSAnne_branch_b3b2:: note C#, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note E_, 4 note F#, 2 note D_, 2 @@ -71,16 +72,16 @@ Music_SSAnne_branch_b3b2:: note F#, 8 note G#, 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F#, 2 note E_, 2 note D_, 4 - note __, 4 + rest 4 note D_, 4 note E_, 4 note C#, 4 - note __, 4 + rest 4 note C#, 4 note D_, 2 note C#, 2 @@ -93,31 +94,31 @@ Music_SSAnne_branch_b3b2:: octave 2 note B_, 2 note A_, 4 - note __, 4 + rest 4 note A_, 4 note B_, 2 note A_, 2 note G#, 4 - note __, 4 + rest 4 note C#, 4 note G#, 4 note A_, 4 - note __, 4 + rest 4 note A_, 4 note B_, 4 note B_, 4 - note __, 4 + rest 4 octave 3 note D_, 8 - loopchannel 0, Music_SSAnne_branch_b3b2 + sound_loop 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch1:: - dutycycle 0 - vibrato 12, $24 +Music_SSAnne_Ch2:: + duty_cycle 0 + vibrato 12, 2, 4 Music_SSAnne_branch_b41e:: - notetype 12, $c5 + note_type 12, 12, 5 octave 3 note A_, 2 note E_, 2 @@ -125,7 +126,7 @@ Music_SSAnne_branch_b41e:: note B_, 4 octave 4 note D_, 4 - notetype 8, $c5 + note_type 8, 12, 5 note C#, 2 note D_, 2 note C#, 2 @@ -208,7 +209,7 @@ Music_SSAnne_branch_b41e:: note C#, 3 octave 3 note B_, 12 - note __, 3 + rest 3 octave 4 note C#, 3 octave 3 @@ -228,7 +229,7 @@ Music_SSAnne_branch_b41e:: note F#, 3 note G#, 3 note B_, 3 - note __, 3 + rest 3 note A_, 3 note G#, 3 note A_, 3 @@ -246,7 +247,7 @@ Music_SSAnne_branch_b41e:: note F#, 3 note G#, 3 note B_, 3 - note __, 3 + rest 3 note F#, 3 note E_, 3 note F#, 3 @@ -264,7 +265,7 @@ Music_SSAnne_branch_b41e:: octave 3 note C#, 3 note E_, 3 - note __, 3 + rest 3 note F#, 3 note E_, 3 note F#, 3 @@ -284,20 +285,20 @@ Music_SSAnne_branch_b41e:: note C#, 3 octave 3 note B_, 3 - loopchannel 0, Music_SSAnne_branch_b41e + sound_loop 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch2:: - notetype 12, $13 - note __, 16 - note __, 12 +Music_SSAnne_Ch3:: + note_type 12, 1, 3 + rest 16 + rest 12 octave 4 note B_, 2 note G#, 2 note A_, 8 note F#, 8 note G#, 4 - note __, 4 + rest 4 note B_, 8 note A_, 8 note B_, 8 @@ -340,4 +341,4 @@ Music_SSAnne_Ch2:: note F#, 8 note G#, 8 note B_, 8 - loopchannel 0, Music_SSAnne_Ch2 + sound_loop 0, Music_SSAnne_Ch3 diff --git a/crysaudio/music/RBY/surfing.asm b/crysaudio/music/RBY/surfing.asm index 66052f42..05e422ee 100644 --- a/crysaudio/music/RBY/surfing.asm +++ b/crysaudio/music/RBY/surfing.asm @@ -1,16 +1,17 @@ Music_Surfing:: - musicheader 3, 1, Music_Surfing_Ch0 - musicheader 1, 2, Music_Surfing_Ch1 - musicheader 1, 3, Music_Surfing_Ch2 + channel_count 3 + channel 1, Music_Surfing_Ch1 + channel 2, Music_Surfing_Ch2 + channel 3, Music_Surfing_Ch3 -Music_Surfing_Ch0:: +Music_Surfing_Ch1:: tempo 160 - volume $77 - dutycycle 3 - vibrato 12, $34 - ;toggleperfectpitch - notetype 12, $b5 - note __, 6 + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 5 + rest 6 octave 2 note A_, 2 note G#, 3 @@ -22,7 +23,7 @@ Music_Surfing_Ch0:: note G#, 4 Music_Surfing_branch_7fa30:: - notetype 12, $b2 + note_type 12, 11, 2 note E_, 2 note E_, 4 note E_, 2 @@ -33,9 +34,9 @@ Music_Surfing_branch_7fa30:: note D_, 4 note D_, 2 note D_, 4 - notetype 12, $b1 + note_type 12, 11, 1 note F#, 3 - notetype 12, $b2 + note_type 12, 11, 2 note D_, 3 note E_, 2 note E_, 4 @@ -51,18 +52,18 @@ Music_Surfing_branch_7fa30:: note E_, 4 note G#, 2 note G#, 4 - notetype 12, $b1 + note_type 12, 11, 1 note F#, 3 - notetype 12, $b2 + note_type 12, 11, 2 note G#, 1 - notetype 12, $b4 + note_type 12, 11, 4 note A_, 2 note B_, 2 octave 4 note C_, 2 - notetype 12, $b7 + note_type 12, 11, 7 note C#, 6 - notetype 12, $b3 + note_type 12, 11, 3 note D_, 2 note C#, 2 octave 3 @@ -118,13 +119,13 @@ Music_Surfing_branch_7fa30:: note G#, 2 note F#, 2 note E_, 4 - loopchannel 0, Music_Surfing_branch_7fa30 + sound_loop 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch1:: - dutycycle 3 - vibrato 16, $25 - notetype 12, $c6 +Music_Surfing_Ch2:: + duty_cycle 3 + vibrato 16, 2, 5 + note_type 12, 12, 6 octave 3 note A_, 2 note G#, 3 @@ -138,7 +139,7 @@ Music_Surfing_Ch1:: note B_, 2 Music_Surfing_branch_7faae:: - notetype 12, $c6 + note_type 12, 12, 6 octave 4 note E_, 6 note C#, 5 @@ -150,10 +151,10 @@ Music_Surfing_branch_7faae:: note D_, 6 octave 3 note B_, 2 - notetype 12, $c1 + note_type 12, 12, 1 octave 4 note F#, 3 - notetype 12, $c6 + note_type 12, 12, 6 note D_, 1 note E_, 6 note C#, 6 @@ -164,9 +165,9 @@ Music_Surfing_branch_7faae:: note D_, 6 note F#, 6 note E_, 2 - notetype 12, $c1 + note_type 12, 12, 1 note F#, 3 - notetype 12, $c6 + note_type 12, 12, 6 note E_, 1 note A_, 6 note A_, 6 @@ -205,12 +206,12 @@ Music_Surfing_branch_7faae:: note A_, 1 octave 5 note C#, 6 - loopchannel 0, Music_Surfing_branch_7faae + sound_loop 0, Music_Surfing_branch_7faae -Music_Surfing_Ch2:: - notetype 12, $10 - note __, 12 +Music_Surfing_Ch3:: + note_type 12, 1, 0 + rest 12 octave 5 note E_, 6 octave 4 @@ -242,7 +243,7 @@ Music_Surfing_branch_7fb03:: note G#, 2 note E_, 2 note G#, 1 - note __, 2 + rest 2 note E_, 1 note C#, 2 note A_, 2 @@ -271,7 +272,7 @@ Music_Surfing_branch_7fb03:: note G#, 2 note E_, 2 note G#, 1 - note __, 2 + rest 2 note E_, 1 note C#, 2 note A_, 2 @@ -337,4 +338,4 @@ Music_Surfing_branch_7fb03:: note C#, 2 note D_, 2 note E_, 2 - loopchannel 0, Music_Surfing_branch_7fb03 + sound_loop 0, Music_Surfing_branch_7fb03 diff --git a/crysaudio/music/RBY/surfingpikachu.asm b/crysaudio/music/RBY/surfingpikachu.asm index fdcd1ea0..8636d960 100644 --- a/crysaudio/music/RBY/surfingpikachu.asm +++ b/crysaudio/music/RBY/surfingpikachu.asm @@ -1,32 +1,33 @@ Music_SurfingPikachu:: - musicheader 3, 1, Music_SurfingPikachu_Ch1 - musicheader 1, 2, Music_SurfingPikachu_Ch2 - musicheader 1, 3, Music_SurfingPikachu_Ch3 + channel_count 3 + channel 1, Music_SurfingPikachu_Ch1 + channel 2, Music_SurfingPikachu_Ch2 + channel 3, Music_SurfingPikachu_Ch3 Music_SurfingPikachu_Ch1:: tempo 117 - volume $77 - dutycycle 3 - vibrato 8, $14 - notetype 12, $b3 + volume 7, 7 + duty_cycle 3 + vibrato 8, 1, 4 + note_type 12, 11, 3 octave 3 note E_, 6 - notetype 12, $b2 + note_type 12, 11, 2 note F#, 2 - notetype 12, $b3 + note_type 12, 11, 3 note E_, 6 - notetype 12, $b2 + note_type 12, 11, 2 note F#, 16 - note __, 2 - notetype 12, $b3 + rest 2 + note_type 12, 11, 3 note E_, 6 - notetype 12, $b2 + note_type 12, 11, 2 note A_, 2 - notetype 12, $b3 + note_type 12, 11, 3 note E_, 6 - notetype 12, $b2 + note_type 12, 11, 2 note A_, 14 - notetype 12, $b2 + note_type 12, 11, 2 note D#, 2 note C#, 1 note D#, 1 @@ -41,7 +42,7 @@ Music_SurfingPikachu_Ch1:: note G#, 2 Music_SurfingPikachu_branch_82d1a:: - notetype 12, $b3 + note_type 12, 11, 3 octave 3 note G#, 4 note E_, 4 @@ -80,10 +81,10 @@ Music_SurfingPikachu_branch_82d1a:: note F#, 6 note E_, 2 note F#, 1 - note __, 3 + rest 3 note A_, 4 - dutycycle 0 - notetype 12, $b2 + duty_cycle 0 + note_type 12, 11, 2 note G#, 1 note F#, 1 note G#, 2 @@ -163,26 +164,26 @@ Music_SurfingPikachu_branch_82d1a:: note E_, 1 note D#, 1 note E_, 8 - dutycycle 3 - loopchannel 0, Music_SurfingPikachu_branch_82d1a + duty_cycle 3 + sound_loop 0, Music_SurfingPikachu_branch_82d1a Music_SurfingPikachu_Ch2:: - dutycycle 3 - vibrato 6, $15 - notetype 12, $c4 + duty_cycle 3 + vibrato 6, 1, 5 + note_type 12, 12, 4 octave 3 note B_, 6 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note E_, 2 - notetype 12, $c4 + note_type 12, 12, 4 octave 3 note B_, 6 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note E_, 2 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 octave 4 @@ -194,16 +195,16 @@ Music_SurfingPikachu_Ch2:: note A_, 2 note G#, 2 note F#, 2 - notetype 12, $c4 + note_type 12, 12, 4 octave 4 note C#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note F#, 2 - notetype 12, $c4 + note_type 12, 12, 4 note C#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note F#, 2 - notetype 12, $b2 + note_type 12, 11, 2 note C#, 2 note D#, 2 note E_, 2 @@ -213,7 +214,7 @@ Music_SurfingPikachu_Ch2:: note B_, 2 note A_, 2 note G#, 2 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 6 note B_, 4 note B_, 4 @@ -223,7 +224,7 @@ Music_SurfingPikachu_Ch2:: note B_, 2 Music_SurfingPikachu_branch_82de0:: - notetype 12, $c6 + note_type 12, 12, 6 octave 4 note E_, 4 octave 3 @@ -258,11 +259,11 @@ Music_SurfingPikachu_branch_82de0:: note D#, 6 note C#, 2 note D#, 1 - note __, 3 + rest 3 note F#, 4 note E_, 10 - notetype 12, $c6 - dutycycle 2 + note_type 12, 12, 6 + duty_cycle 2 note E_, 2 note D#, 2 note C#, 2 @@ -303,393 +304,393 @@ Music_SurfingPikachu_branch_82de0:: note C#, 4 octave 4 note B_, 8 - notetype 12, $c2 + note_type 12, 12, 2 octave 5 note E_, 4 - notetype 12, $c6 - dutycycle 3 + note_type 12, 12, 6 + duty_cycle 3 octave 3 note B_, 1 note A#, 1 note B_, 1 octave 4 note C#, 1 - loopchannel 0, Music_SurfingPikachu_branch_82de0 + sound_loop 0, Music_SurfingPikachu_branch_82de0 Music_SurfingPikachu_Ch3:: - notetype 12, $10 + note_type 12, 1, 0 octave 4 note B_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 Music_SurfingPikachu_branch_82ea0:: note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 note C_, 1 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 note A#, 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - loopchannel 0, Music_SurfingPikachu_branch_82ea0 + rest 1 + sound_loop 0, Music_SurfingPikachu_branch_82ea0 diff --git a/crysaudio/music/RBY/titlescreen.asm b/crysaudio/music/RBY/titlescreen.asm index 81d02f16..44c73b16 100644 --- a/crysaudio/music/RBY/titlescreen.asm +++ b/crysaudio/music/RBY/titlescreen.asm @@ -1,15 +1,16 @@ Music_RBYTitleScreen:: - musicheader 4, 1, Music_RBYTitleScreen_Ch0 - musicheader 1, 2, Music_RBYTitleScreen_Ch1 - musicheader 1, 3, Music_RBYTitleScreen_Ch2 - musicheader 1, 4, Music_RBYTitleScreen_Ch3 + channel_count 4 + channel 1, Music_RBYTitleScreen_Ch1 + channel 2, Music_RBYTitleScreen_Ch2 + channel 3, Music_RBYTitleScreen_Ch3 + channel 4, Music_RBYTitleScreen_Ch4 -Music_RBYTitleScreen_Ch0:: +Music_RBYTitleScreen_Ch1:: tempo 144 - volume $77 - vibrato 9, $34 - dutycycle 3 - notetype 12, $c1 + volume 7, 7 + vibrato 9, 3, 4 + duty_cycle 3 + note_type 12, 12, 1 octave 2 note E_, 1 note G_, 1 @@ -24,7 +25,7 @@ Music_RBYTitleScreen_Ch0:: note G_, 4 note G_, 4 note G_, 4 - notetype 8, $c1 + note_type 8, 12, 1 note A_, 2 note A_, 2 note A_, 2 @@ -33,34 +34,34 @@ Music_RBYTitleScreen_Ch0:: note F#, 2 Music_RBYTitleScreen_branch_7e4e2:: - callchannel Music_RBYTitleScreen_branch_7e541 - callchannel Music_RBYTitleScreen_branch_7e54a - callchannel Music_RBYTitleScreen_branch_7e541 + sound_call Music_RBYTitleScreen_branch_7e541 + sound_call Music_RBYTitleScreen_branch_7e54a + sound_call Music_RBYTitleScreen_branch_7e541 octave 3 note C_, 8 - notetype 8, $c6 + note_type 8, 12, 6 note E_, 4 note E_, 4 note C_, 4 - notetype 12, $c6 + note_type 12, 12, 6 octave 2 note B_, 8 - notetype 8, $e7 + note_type 8, 14, 7 octave 3 note F_, 4 note E_, 4 note C_, 4 - notetype 12, $e7 + note_type 12, 14, 7 note D_, 10 - notetype 12, $c6 + note_type 12, 12, 6 octave 2 note B_, 2 octave 3 note C_, 2 note D_, 2 - callchannel Music_RBYTitleScreen_branch_7e541 - callchannel Music_RBYTitleScreen_branch_7e54a - callchannel Music_RBYTitleScreen_branch_7e541 + sound_call Music_RBYTitleScreen_branch_7e541 + sound_call Music_RBYTitleScreen_branch_7e54a + sound_call Music_RBYTitleScreen_branch_7e541 note C_, 6 note C_, 6 note E_, 4 @@ -84,86 +85,86 @@ Music_RBYTitleScreen_branch_7e4e2:: note E_, 12 note F_, 4 note G_, 8 - notetype 12, $b6 + note_type 12, 11, 6 octave 4 note C_, 4 note C#, 4 - callchannel Music_RBYTitleScreen_branch_7e55c - notetype 8, $b4 + sound_call Music_RBYTitleScreen_branch_7e55c + note_type 8, 11, 4 octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_RBYTitleScreen_branch_7e55c - notetype 8, $b2 + sound_call Music_RBYTitleScreen_branch_7e55c + note_type 8, 11, 2 octave 3 note E_, 4 note E_, 4 note C#, 4 - loopchannel 0, Music_RBYTitleScreen_branch_7e4e2 + sound_loop 0, Music_RBYTitleScreen_branch_7e4e2 Music_RBYTitleScreen_branch_7e541:: - notetype 12, $c6 + note_type 12, 12, 6 octave 3 note D_, 6 octave 2 note B_, 2 octave 3 note D_, 8 - endchannel + sound_ret Music_RBYTitleScreen_branch_7e54a:: note C_, 6 note F_, 6 note C_, 4 note D_, 8 - notetype 12, $e7 + note_type 12, 14, 7 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype 8, $c6 + note_type 8, 12, 6 note C_, 4 octave 2 note B_, 4 octave 3 note C_, 4 - endchannel + sound_ret Music_RBYTitleScreen_branch_7e55c:: - notetype 12, $c1 + note_type 12, 12, 1 note D_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 note D_, 1 - endchannel + sound_ret -Music_RBYTitleScreen_Ch1:: - vibrato 16, $46 - dutycycle 1 - notetype 12, $e1 +Music_RBYTitleScreen_Ch2:: + vibrato 16, 4, 6 + duty_cycle 1 + note_type 12, 14, 1 octave 2 note G_, 1 note B_, 1 @@ -177,7 +178,7 @@ Music_RBYTitleScreen_Ch1:: note G_, 4 note G_, 4 note G_, 4 - notetype 8, $e1 + note_type 8, 14, 1 note F_, 2 note F_, 2 note F_, 2 @@ -186,39 +187,39 @@ Music_RBYTitleScreen_Ch1:: note F#, 2 Music_RBYTitleScreen_branch_7e594:: - vibrato 16, $46 - callchannel Music_RBYTitleScreen_branch_7e622 + vibrato 16, 4, 6 + sound_call Music_RBYTitleScreen_branch_7e622 octave 2 note A_, 4 note F_, 4 - callchannel Music_RBYTitleScreen_branch_7e62c + sound_call Music_RBYTitleScreen_branch_7e62c octave 2 note A_, 8 note B_, 16 - callchannel Music_RBYTitleScreen_branch_7e622 + sound_call Music_RBYTitleScreen_branch_7e622 octave 2 note A_, 6 note F_, 2 - notetype 8, $e7 + note_type 8, 14, 7 octave 4 note C_, 4 octave 3 note B_, 4 octave 4 note C_, 4 - notetype 12, $e7 + note_type 12, 14, 7 note D_, 8 - notetype 12, $95 + note_type 12, 9, 5 octave 2 note D_, 6 note D_, 1 note F#, 1 note G_, 16 - callchannel Music_RBYTitleScreen_branch_7e622 + sound_call Music_RBYTitleScreen_branch_7e622 octave 2 note A_, 2 note F_, 6 - callchannel Music_RBYTitleScreen_branch_7e62c + sound_call Music_RBYTitleScreen_branch_7e62c octave 3 note C_, 2 octave 2 @@ -226,29 +227,29 @@ Music_RBYTitleScreen_branch_7e594:: note B_, 6 note G_, 2 note F_, 8 - callchannel Music_RBYTitleScreen_branch_7e622 - notetype 8, $95 + sound_call Music_RBYTitleScreen_branch_7e622 + note_type 8, 9, 5 octave 2 note G_, 4 note F_, 5 note A_, 3 - notetype 8, $e6 + note_type 8, 14, 6 octave 4 note F_, 4 note E_, 4 note F_, 4 - notetype 12, $e7 + note_type 12, 14, 7 note G_, 6 note A#, 2 note G_, 8 - vibrato 16, $26 - dutycycle 3 - notetype 12, $0b + vibrato 16, 2, 6 + duty_cycle 3 + note_type 12, 0, -3 note G_, 8 - notetype 12, $e7 + note_type 12, 14, 7 note A_, 8 - dutycycle 1 - notetype 12, $e7 + duty_cycle 1 + note_type 12, 14, 7 note A#, 6 note F_, 2 note F_, 8 @@ -264,89 +265,89 @@ Music_RBYTitleScreen_branch_7e594:: note G_, 8 octave 3 note E_, 8 - notetype 12, $d7 + note_type 12, 13, 7 octave 5 note C_, 4 note C#, 4 - callchannel Music_RBYTitleScreen_branch_7e636 - note __, 3 + sound_call Music_RBYTitleScreen_branch_7e636 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - notetype 8, $e5 + note_type 8, 14, 5 octave 5 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_RBYTitleScreen_branch_7e636 + sound_call Music_RBYTitleScreen_branch_7e636 note D_, 1 - note __, 2 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - notetype 8, $e3 + note_type 8, 14, 3 octave 5 note C_, 4 note C_, 4 octave 4 note B_, 4 - loopchannel 0, Music_RBYTitleScreen_branch_7e594 + sound_loop 0, Music_RBYTitleScreen_branch_7e594 Music_RBYTitleScreen_branch_7e622:: - notetype 12, $e7 + note_type 12, 14, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - notetype 12, $95 - endchannel + note_type 12, 9, 5 + sound_ret Music_RBYTitleScreen_branch_7e62c:: - notetype 12, $e7 + note_type 12, 14, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype 12, $95 - endchannel + note_type 12, 9, 5 + sound_ret Music_RBYTitleScreen_branch_7e636:: - notetype 12, $e1 + note_type 12, 14, 1 note D_, 1 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - endchannel + sound_ret -Music_RBYTitleScreen_Ch2:: - notetype 12, $10 +Music_RBYTitleScreen_Ch3:: + note_type 12, 1, 0 octave 3 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - notetype 8, $10 + rest 3 + note_type 8, 1, 0 note F_, 2 note F_, 2 note F_, 2 @@ -355,44 +356,44 @@ Music_RBYTitleScreen_Ch2:: note A_, 2 Music_RBYTitleScreen_branch_7e65e:: - callchannel Music_RBYTitleScreen_branch_7e6c9 - callchannel Music_RBYTitleScreen_branch_7e6d0 + sound_call Music_RBYTitleScreen_branch_7e6c9 + sound_call Music_RBYTitleScreen_branch_7e6d0 Music_RBYTitleScreen_branch_7e664:: - callchannel Music_RBYTitleScreen_branch_7e6c9 - callchannel Music_RBYTitleScreen_branch_7e6c9 - callchannel Music_RBYTitleScreen_branch_7e6c9 - callchannel Music_RBYTitleScreen_branch_7e6d0 - loopchannel 3, Music_RBYTitleScreen_branch_7e664 - callchannel Music_RBYTitleScreen_branch_7e6c9 + sound_call Music_RBYTitleScreen_branch_7e6c9 + sound_call Music_RBYTitleScreen_branch_7e6c9 + sound_call Music_RBYTitleScreen_branch_7e6c9 + sound_call Music_RBYTitleScreen_branch_7e6d0 + sound_loop 3, Music_RBYTitleScreen_branch_7e664 + sound_call Music_RBYTitleScreen_branch_7e6c9 note G_, 6 note D_, 3 note A_, 6 note F_, 3 note A_, 3 note F_, 3 - callchannel Music_RBYTitleScreen_branch_7e6d7 + sound_call Music_RBYTitleScreen_branch_7e6d7 note A#, 3 note F_, 3 - callchannel Music_RBYTitleScreen_branch_7e6d7 + sound_call Music_RBYTitleScreen_branch_7e6d7 note B_, 3 note G_, 3 - callchannel Music_RBYTitleScreen_branch_7e6dc + sound_call Music_RBYTitleScreen_branch_7e6dc octave 4 note C_, 3 octave 3 note G_, 3 - callchannel Music_RBYTitleScreen_branch_7e6dc + sound_call Music_RBYTitleScreen_branch_7e6dc octave 4 note C#, 3 octave 3 note A_, 3 - callchannel Music_RBYTitleScreen_branch_7e6e5 + sound_call Music_RBYTitleScreen_branch_7e6e5 octave 5 - ;slidepitchto 1, 3, C# + ;pitch_slide 1, 4, D_ ;note D_, 4 - ;note __, 4 - notetype 3, $10 ; XXX + ;rest 4 + note_type 3, 1, 0 ; XXX note D_, 1 ; XXX note C#, 1 ; XXX note C_, 1 ; XXX @@ -407,9 +408,9 @@ Music_RBYTitleScreen_branch_7e664:: note E_, 1 ; XXX note D#, 1 ; XXX note D_, 4 ; XXX - note __, 16 ; XXX + rest 16 ; XXX octave 6 - ;slidepitchto 1, 2, C# + ;pitch_slide 1, 5, D_ ;note D_, 4 note D_, 1 ; XXX note C#, 1 ; XXX @@ -426,9 +427,9 @@ Music_RBYTitleScreen_branch_7e664:: note D#, 1 ; XXX note D_, 4 ; XXX octave 5 - ;slidepitchto 1, 3, C# + ;pitch_slide 1, 4, D_ ;note D_, 4 - ;note __, 2 + ;rest 2 note D_, 1 ; XXX note C#, 1 ; XXX note C_, 1 ; XXX @@ -443,18 +444,18 @@ Music_RBYTitleScreen_branch_7e664:: note E_, 1 ; XXX note D#, 1 ; XXX note D_, 4 ; XXX - note __, 8 ; XXX - notetype 8, $10 + rest 8 ; XXX + note_type 8, 1, 0 octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_RBYTitleScreen_branch_7e6e5 + sound_call Music_RBYTitleScreen_branch_7e6e5 octave 6 - ;slidepitchto 1, 2, C# + ;pitch_slide 1, 5, D_ ;note D_, 4 - ;note __, 4 - notetype 3, $10 ; XXX + ;rest 4 + note_type 3, 1, 0 ; XXX note D_, 1 ; XXX note C#, 1 ; XXX note C_, 1 ; XXX @@ -469,11 +470,11 @@ Music_RBYTitleScreen_branch_7e664:: note E_, 1 ; XXX note D#, 1 ; XXX note D_, 4 ; XXX - note __, 16 ; XXX + rest 16 ; XXX octave 5 - ;slidepitchto 1, 3, C# + ;pitch_slide 1, 4, D_ ;note D_, 4 - ;note __, 6 + ;rest 6 note D_, 1 ; XXX note C#, 1 ; XXX note C_, 1 ; XXX @@ -488,15 +489,15 @@ Music_RBYTitleScreen_branch_7e664:: note E_, 1 ; XXX note D#, 1 ; XXX note D_, 4 ; XXX - note __, 12 ; XXX - note __, 12 ; XXX - notetype 8, $10 + rest 12 ; XXX + rest 12 ; XXX + note_type 8, 1, 0 octave 4 note C_, 4 note C_, 4 octave 3 note B_, 4 - loopchannel 0, Music_RBYTitleScreen_branch_7e65e + sound_loop 0, Music_RBYTitleScreen_branch_7e65e Music_RBYTitleScreen_branch_7e6c9:: note G_, 6 @@ -505,7 +506,7 @@ Music_RBYTitleScreen_branch_7e6c9:: note D_, 3 note G_, 3 note D_, 3 - endchannel + sound_ret Music_RBYTitleScreen_branch_7e6d0:: note F_, 6 @@ -514,14 +515,14 @@ Music_RBYTitleScreen_branch_7e6d0:: note C_, 3 note F_, 3 note C_, 3 - endchannel + sound_ret Music_RBYTitleScreen_branch_7e6d7:: note A#, 6 note F_, 3 note A#, 6 note F_, 3 - endchannel + sound_ret Music_RBYTitleScreen_branch_7e6dc:: octave 4 @@ -532,230 +533,230 @@ Music_RBYTitleScreen_branch_7e6dc:: note C_, 6 octave 3 note G_, 3 - endchannel + sound_ret Music_RBYTitleScreen_branch_7e6e5:: - notetype 12, $10 + note_type 12, 1, 0 octave 4 note D_, 1 - note __, 5 - endchannel + rest 5 + sound_ret -Music_RBYTitleScreen_Ch3:: - togglenoise 0 - notetype 6 - note __, 4 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - notetype 12 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note C#, 1 - note C#, 1 - note __, 3 - note C#, 1 - note __, 3 - note C#, 1 - note __, 3 - notetype 8 - note D_, 2 - note D#, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note C_, 2 +Music_RBYTitleScreen_Ch4:: + toggle_noise 0 + drum_speed 6 + rest 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 1, 2 Music_RBYTitleScreen_branch_7e716:: - notetype 12 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note C#, 1 - note D_, 1 - note __, 3 - callchannel Music_RBYTitleScreen_branch_7e834 - callchannel Music_RBYTitleScreen_branch_7e834 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note C#, 1 - note D_, 1 - note __, 1 - note D_, 1 - note C#, 1 - callchannel Music_RBYTitleScreen_branch_7e842 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C#, 1 - note __, 1 - note C#, 1 - note __, 1 - callchannel Music_RBYTitleScreen_branch_7e842 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C#, 1 - note __, 1 - notetype 6 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - notetype 12 - callchannel Music_RBYTitleScreen_branch_7e834 - callchannel Music_RBYTitleScreen_branch_7e842 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C#, 1 - note __, 3 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note D_, 1 - note C#, 1 - note C#, 1 - note __, 1 - note D_, 1 - note C#, 1 - callchannel Music_RBYTitleScreen_branch_7e834 - callchannel Music_RBYTitleScreen_branch_7e842 - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note D_, 1 - note C#, 1 - note C#, 1 - note __, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note __, 3 - note D_, 1 - note __, 5 - note C#, 1 - note D#, 1 - note C#, 1 - note __, 1 - notetype 6 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - notetype 12 - note C_, 1 - note __, 3 - note C#, 1 - note __, 5 - note D_, 1 - note C#, 1 - note C_, 1 - note __, 3 - note C#, 1 - note __, 3 - note D_, 1 - note __, 5 - note D_, 1 - note C#, 1 - note D_, 1 - note __, 3 - note C#, 1 - note __, 3 - note D_, 1 - note __, 5 - note C#, 1 - note D_, 1 - note D#, 1 - note __, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note __, 3 - note D_, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C#, 1 - note __, 3 - note E_, 1 - note __, 5 - note C#, 1 - note __, 3 - note D_, 1 - note C#, 1 - note C_, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C#, 1 - note __, 1 - note C_, 1 - note __, 1 - notetype 8 - note C#, 4 - note D_, 4 - note C_, 4 - notetype 12 - note E_, 1 - note __, 5 - note C#, 1 - note __, 3 - note D_, 1 - note C#, 1 - note D_, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C_, 1 - note __, 1 - note D_, 1 - note C#, 1 - notetype 8 - note C#, 4 - note D_, 4 - note C#, 4 - loopchannel 0, Music_RBYTitleScreen_branch_7e716 + drum_speed 12 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + rest 3 + sound_call Music_RBYTitleScreen_branch_7e834 + sound_call Music_RBYTitleScreen_branch_7e834 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + rest 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_RBYTitleScreen_branch_7e842 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 1 + drum_note 2, 1 + rest 1 + sound_call Music_RBYTitleScreen_branch_7e842 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + sound_call Music_RBYTitleScreen_branch_7e834 + sound_call Music_RBYTitleScreen_branch_7e842 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + rest 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_RBYTitleScreen_branch_7e834 + sound_call Music_RBYTitleScreen_branch_7e842 + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + rest 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 3 + drum_note 3, 1 + rest 5 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 + rest 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 1, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_note 3, 1 + rest 5 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + rest 3 + drum_note 2, 1 + rest 3 + drum_note 3, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 1 + rest 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + rest 3 + drum_note 3, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 3 + drum_note 5, 1 + rest 5 + drum_note 2, 1 + rest 3 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 1 + drum_note 1, 1 + rest 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 1, 4 + drum_speed 12 + drum_note 5, 1 + rest 5 + drum_note 2, 1 + rest 3 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 1, 1 + rest 1 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 2, 4 + sound_loop 0, Music_RBYTitleScreen_branch_7e716 Music_RBYTitleScreen_branch_7e834:: - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note C#, 1 - note D_, 1 - note C#, 1 - note __, 3 - endchannel + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + rest 3 + sound_ret Music_RBYTitleScreen_branch_7e842:: - note C#, 1 - note __, 3 - note C#, 1 - note __, 5 - note D_, 1 - note C#, 1 - note C#, 1 - note __, 3 - endchannel + drum_note 2, 1 + rest 3 + drum_note 2, 1 + rest 5 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + rest 3 + sound_ret diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm index 351c2b47..5b177730 100644 --- a/crysaudio/music/RBY/trainerbattle.asm +++ b/crysaudio/music/RBY/trainerbattle.asm @@ -1,16 +1,17 @@ Music_TrainerBattle:: - musicheader 3, 1, Music_TrainerBattle_Ch0 - musicheader 1, 2, Music_TrainerBattle_Ch1 - musicheader 1, 3, Music_TrainerBattle_Ch2 + channel_count 3 + channel 1, Music_TrainerBattle_Ch1 + channel 2, Music_TrainerBattle_Ch2 + channel 3, Music_TrainerBattle_Ch3 -Music_TrainerBattle_Ch0:: +Music_TrainerBattle_Ch1:: tempo 112 - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b2 - note __, 8 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 2 + rest 8 octave 3 note F_, 1 note E_, 1 @@ -72,7 +73,7 @@ Music_TrainerBattle_Ch0:: note C#, 2 Music_TrainerBattle_branch_22962:: - notetype 12, $b5 + note_type 12, 11, 5 note D_, 2 note E_, 4 note C#, 2 @@ -87,7 +88,7 @@ Music_TrainerBattle_branch_22962:: note D_, 2 note E_, 2 note F_, 8 - notetype 12, $b2 + note_type 12, 11, 2 note C_, 1 note C#, 1 note D_, 1 @@ -112,7 +113,7 @@ Music_TrainerBattle_branch_22962:: note D#, 1 note D_, 1 note C_, 1 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 2 note E_, 4 note C#, 2 @@ -128,21 +129,21 @@ Music_TrainerBattle_branch_22962:: note B_, 2 octave 3 note C#, 2 - notetype 12, $a7 + note_type 12, 10, 7 note D_, 8 note C#, 8 octave 2 note B_, 8 octave 3 note C#, 8 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 2 note C#, 2 octave 2 note B_, 2 note A_, 2 note G_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note C#, 2 @@ -150,7 +151,7 @@ Music_TrainerBattle_branch_22962:: note B_, 2 note A_, 2 note G_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note C#, 2 @@ -192,7 +193,7 @@ Music_TrainerBattle_branch_22962:: note B_, 2 note A_, 2 note G_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note C#, 2 @@ -211,7 +212,7 @@ Music_TrainerBattle_branch_22962:: note A_, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 note B_, 2 note A_, 2 @@ -389,7 +390,7 @@ Music_TrainerBattle_branch_22962:: octave 4 note C_, 2 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 4 octave 4 @@ -558,29 +559,29 @@ Music_TrainerBattle_branch_22962:: note F_, 8 note G_, 8 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 note D_, 4 @@ -588,19 +589,19 @@ Music_TrainerBattle_branch_22962:: note B_, 2 octave 3 note C#, 4 - note __, 2 + rest 2 note C#, 1 note D_, 1 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 9 + rest 9 note D_, 1 note D#, 1 note E_, 1 @@ -610,17 +611,17 @@ Music_TrainerBattle_branch_22962:: note D#, 1 note D_, 1 note C#, 1 - note __, 5 + rest 5 note C#, 1 note D_, 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 note E_, 2 note F_, 2 @@ -634,7 +635,7 @@ Music_TrainerBattle_branch_22962:: note E_, 1 note D#, 1 note D_, 1 - note __, 9 + rest 9 note F#, 2 note E_, 4 note D#, 2 @@ -651,13 +652,13 @@ Music_TrainerBattle_branch_22962:: note G#, 1 note A_, 1 note A#, 1 - loopchannel 0, Music_TrainerBattle_branch_22962 + sound_loop 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch1:: - dutycycle 3 - vibrato 10, $25 - notetype 12, $c2 +Music_TrainerBattle_Ch2:: + duty_cycle 3 + vibrato 10, 2, 5 + note_type 12, 12, 2 octave 4 note A_, 1 note G#, 1 @@ -694,15 +695,15 @@ Music_TrainerBattle_Ch1:: note C_, 1 octave 3 note B_, 1 - notetype 12, $e1 + note_type 12, 14, 1 octave 4 note B_, 16 - note __, 16 - notetype 12, $d1 + rest 16 + note_type 12, 13, 1 note B_, 16 - note __, 12 + rest 12 note A_, 4 - notetype 12, $c2 + note_type 12, 12, 2 octave 3 note B_, 6 octave 4 @@ -728,21 +729,21 @@ Music_TrainerBattle_Ch1:: note A_, 4 Music_TrainerBattle_branch_22bfc:: - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 6 note F#, 14 note B_, 4 note F#, 4 note B_, 4 - notetype 12, $50 + note_type 12, 5, 0 octave 4 note C_, 8 - notetype 12, $30 + note_type 12, 3, 0 note C_, 8 - notetype 12, $4e + note_type 12, 4, -6 note C_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note C_, 8 octave 3 note B_, 6 @@ -750,35 +751,35 @@ Music_TrainerBattle_branch_22bfc:: note B_, 4 note F#, 4 note B_, 4 - notetype 12, $90 + note_type 12, 9, 0 note A_, 8 - notetype 12, $50 + note_type 12, 5, 0 note A_, 8 - notetype 12, $40 + note_type 12, 4, 0 note A_, 8 - notetype 12, $30 + note_type 12, 3, 0 note A_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 16 octave 4 note D_, 8 octave 3 note G_, 8 - notetype 12, $80 + note_type 12, 8, 0 note A_, 8 - notetype 12, $50 + note_type 12, 5, 0 note A_, 8 - notetype 12, $40 + note_type 12, 4, 0 note A_, 8 - notetype 12, $60 + note_type 12, 6, 0 note A_, 8 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 16 octave 4 note E_, 8 note F#, 8 note E_, 16 - notetype 12, $c5 + note_type 12, 12, 5 note G_, 4 note A_, 2 note G_, 2 @@ -786,73 +787,73 @@ Music_TrainerBattle_branch_22bfc:: note E_, 2 note D_, 2 note E_, 2 - notetype 12, $b7 + note_type 12, 11, 7 note F#, 8 - notetype 12, $50 + note_type 12, 5, 0 note F#, 8 - notetype 12, $60 + note_type 12, 6, 0 note F#, 8 - notetype 12, $70 + note_type 12, 7, 0 note F#, 8 - notetype 12, $a0 + note_type 12, 10, 0 note G_, 8 - notetype 12, $a7 + note_type 12, 10, 7 note G_, 8 - notetype 12, $b7 + note_type 12, 11, 7 note G_, 4 - notetype 12, $c5 + note_type 12, 12, 5 note A_, 2 note G_, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - notetype 12, $a0 + note_type 12, 10, 0 note G#, 8 - notetype 12, $70 + note_type 12, 7, 0 note G#, 8 - notetype 12, $80 + note_type 12, 8, 0 note G#, 8 - notetype 12, $60 + note_type 12, 6, 0 note G#, 8 - notetype 12, $a0 + note_type 12, 10, 0 note A_, 16 - notetype 12, $b0 + note_type 12, 11, 0 octave 5 note C#, 8 note E_, 8 - notetype 12, $c0 + note_type 12, 12, 0 note D_, 4 octave 4 note A_, 4 octave 5 note C_, 2 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note B_, 8 - notetype 12, $60 + note_type 12, 6, 0 note B_, 8 - notetype 12, $69 + note_type 12, 6, -1 note B_, 6 - notetype 12, $96 + note_type 12, 9, 6 note B_, 6 - note __, 2 - notetype 12, $c0 + rest 2 + note_type 12, 12, 0 octave 5 note D_, 4 octave 4 note A_, 4 note A#, 2 - notetype 12, $b0 + note_type 12, 11, 0 octave 5 note F_, 14 - notetype 12, $60 + note_type 12, 6, 0 note G_, 16 - notetype 12, $50 + note_type 12, 5, 0 note E_, 16 - notetype 12, $40 + note_type 12, 4, 0 note E_, 16 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note C_, 6 octave 3 @@ -889,18 +890,18 @@ Music_TrainerBattle_branch_22bfc:: note G_, 6 note F_, 6 note D_, 4 - notetype 12, $b0 + note_type 12, 11, 0 note F_, 16 note E_, 16 note D_, 16 note E_, 16 - notetype 12, $a0 + note_type 12, 10, 0 octave 5 note F_, 16 note E_, 16 note G_, 16 note F_, 16 - notetype 12, $d1 + note_type 12, 13, 1 octave 3 note A#, 6 note A#, 6 @@ -916,7 +917,7 @@ Music_TrainerBattle_branch_22bfc:: note A#, 6 note A#, 6 note A_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note A_, 4 note B_, 4 note G_, 2 @@ -930,7 +931,7 @@ Music_TrainerBattle_branch_22bfc:: octave 3 note B_, 2 note A#, 16 - note __, 2 + rest 2 note A#, 2 octave 4 note C_, 2 @@ -941,7 +942,7 @@ Music_TrainerBattle_branch_22bfc:: octave 3 note A#, 2 note B_, 16 - note __, 2 + rest 2 note B_, 2 octave 4 note C#, 2 @@ -955,12 +956,12 @@ Music_TrainerBattle_branch_22bfc:: note C_, 16 note E_, 8 note G_, 8 - loopchannel 0, Music_TrainerBattle_branch_22bfc + sound_loop 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch2:: - vibrato 0, $20 - notetype 12, $14 +Music_TrainerBattle_Ch3:: + vibrato 0, 2, 0 + note_type 12, 1, 4 octave 3 note B_, 1 note A#, 1 @@ -1859,4 +1860,4 @@ Music_TrainerBattle_branch_22d9c:: note E_, 2 note D_, 2 note C_, 2 - loopchannel 0, Music_TrainerBattle_branch_22d9c + sound_loop 0, Music_TrainerBattle_branch_22d9c diff --git a/crysaudio/music/RBY/unusedsong.asm b/crysaudio/music/RBY/unusedsong.asm index 8d523ebd..5bf7f966 100644 --- a/crysaudio/music/RBY/unusedsong.asm +++ b/crysaudio/music/RBY/unusedsong.asm @@ -1,153 +1,154 @@ Music_UnusedSong:: - musicheader 2, 1, Music_UnusedSong_Ch0 - musicheader 1, 2, Music_UnusedSong_Ch1 + channel_count 2 + channel 1, Music_UnusedSong_Ch1 + channel 2, Music_UnusedSong_Ch2 -Music_UnusedSong_Ch0:: +Music_UnusedSong_Ch1:: tempo 144 - volume $77 - vibrato 5, $16 + volume 7, 7 + vibrato 5, 1, 6 Music_UnusedSong_branch_a91b:: - notetype 12, $10 + note_type 12, 1, 0 octave 6 note E_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 octave 6 note E_, 1 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 octave 6 note D#, 1 - note __, 8 + rest 8 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 octave 5 note B_, 1 - note __, 2 + rest 2 octave 6 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 octave 5 note B_, 1 - note __, 2 + rest 2 octave 6 note D#, 4 note C#, 4 note D#, 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 5 note B_, 2 - note __, 1 + rest 1 octave 6 note E_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 octave 6 note E_, 1 - note __, 8 + rest 8 note D#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 octave 5 note B_, 1 octave 6 note D#, 1 - note __, 4 + rest 4 octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 octave 5 note B_, 1 - note __, 2 + rest 2 octave 6 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 - note __, 2 + rest 2 note F#, 4 note E_, 4 note F#, 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 2 - note __, 3 + rest 3 octave 5 note A_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 6 note C#, 2 - note __, 2 + rest 2 note E_, 2 note F#, 8 - note __, 2 + rest 2 note E_, 2 note D#, 2 note C#, 2 - note __, 2 + rest 2 octave 5 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 6 note D#, 2 note E_, 8 - note __, 2 + rest 2 note D#, 2 note C#, 2 note D#, 2 @@ -157,16 +158,16 @@ Music_UnusedSong_branch_a91b:: note A_, 2 note A#, 1 note B_, 1 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note B_, 2 note A#, 2 note B_, 2 octave 6 note C_, 1 note C#, 1 - note __, 8 + rest 8 octave 5 note F#, 2 note F_, 2 @@ -179,135 +180,135 @@ Music_UnusedSong_branch_a91b:: note C#, 2 octave 5 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 - loopchannel 0, Music_UnusedSong_branch_a91b - endchannel + rest 6 + sound_loop 0, Music_UnusedSong_branch_a91b + sound_ret -Music_UnusedSong_Ch1:: +Music_UnusedSong_Ch2:: tempo 144 - volume $77 - ;toggleperfectpitch - vibrato 6, $15 + volume 7, 7 + toggle_perfect_pitch + vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8:: - notetype 12, $10 + note_type 12, 1, 0 octave 6 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 note G#, 1 - note __, 8 + rest 8 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 note F#, 1 - note __, 4 + rest 4 octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 - note __, 2 + rest 2 note F#, 4 note E_, 4 note F#, 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 2 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 note G#, 1 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 note F#, 1 - note __, 8 + rest 8 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 - note __, 2 + rest 2 note F#, 4 note E_, 4 note F#, 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 2 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note D#, 8 - note __, 2 + rest 2 note E_, 2 note D#, 2 note C#, 2 octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note C#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note C#, 8 - note __, 2 + rest 2 note D#, 2 note C#, 2 octave 5 @@ -317,15 +318,15 @@ Music_UnusedSong_branch_a9d8:: note A_, 2 note G#, 1 note F#, 1 - note __, 8 + rest 8 note B_, 2 note A#, 2 note B_, 2 note A_, 1 note G#, 1 - note __, 4 + rest 4 note G#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 note F#, 2 @@ -335,8 +336,8 @@ Music_UnusedSong_branch_a9d8:: note C#, 2 note E_, 2 note F#, 2 - note __, 6 + rest 6 note D#, 2 - note __, 6 - loopchannel 0, Music_UnusedSong_branch_a9d8 - endchannel + rest 6 + sound_loop 0, Music_UnusedSong_branch_a9d8 + sound_ret diff --git a/crysaudio/music/RBY/vermilion.asm b/crysaudio/music/RBY/vermilion.asm index ca7bfe84..c3156806 100644 --- a/crysaudio/music/RBY/vermilion.asm +++ b/crysaudio/music/RBY/vermilion.asm @@ -1,18 +1,19 @@ Music_Vermilion:: - musicheader 4, 1, Music_Vermilion_Ch0 - musicheader 1, 2, Music_Vermilion_Ch1 - musicheader 1, 3, Music_Vermilion_Ch2 - musicheader 1, 4, Music_Vermilion_Ch3 + channel_count 4 + channel 1, Music_Vermilion_Ch1 + channel 2, Music_Vermilion_Ch2 + channel 3, Music_Vermilion_Ch3 + channel 4, Music_Vermilion_Ch4 -Music_Vermilion_Ch0:: +Music_Vermilion_Ch1:: tempo 156 - volume $77 - dutycycle 3 - vibrato 12, $34 - ;toggleperfectpitch + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + ;toggle_perfect_pitch Music_Vermilion_branch_b9f6:: - notetype 12, $b5 + note_type 12, 11, 5 octave 3 note E_, 4 note C#, 1 @@ -114,15 +115,15 @@ Music_Vermilion_branch_b9f6:: note F#, 2 note G#, 2 note B_, 2 - loopchannel 0, Music_Vermilion_branch_b9f6 + sound_loop 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch1:: - dutycycle 3 - vibrato 10, $23 +Music_Vermilion_Ch2:: + duty_cycle 3 + vibrato 10, 2, 3 Music_Vermilion_branch_ba66:: - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note A_, 8 octave 4 @@ -181,11 +182,11 @@ Music_Vermilion_branch_ba66:: note E_, 4 note F#, 8 note E_, 8 - loopchannel 0, Music_Vermilion_branch_ba66 + sound_loop 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch2:: - notetype 12, $10 +Music_Vermilion_Ch3:: + note_type 12, 1, 0 Music_Vermilion_branch_baa8:: octave 4 @@ -285,46 +286,46 @@ Music_Vermilion_branch_baa8:: note E_, 2 note G#, 2 note E_, 2 - loopchannel 0, Music_Vermilion_branch_baa8 + sound_loop 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch3:: - togglenoise 0 - notetype 12 +Music_Vermilion_Ch4:: + toggle_noise 0 + drum_speed 12 Music_Vermilion_branch_bb0e:: - callchannel Music_Vermilion_branch_bb3f - note F_, 2 - note F_, 1 - note F_, 1 - note F_, 2 - note F_, 1 - note F_, 1 - note F_, 2 - note F_, 1 - note F_, 1 - note F_, 1 - note F_, 1 - note F_, 1 - note F_, 1 - loopchannel 4, Music_Vermilion_branch_bb0e - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - loopchannel 0, 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:: - note F_, 2 - note F_, 1 - note F_, 1 - note F_, 2 - note F_, 1 - note F_, 1 - note F_, 2 - note F_, 1 - note F_, 1 - note F_, 2 - note F_, 1 - note F_, 1 - endchannel + 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, 2 + drum_note 6, 1 + drum_note 6, 1 + sound_ret diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm index 8836f8f4..638041df 100644 --- a/crysaudio/music/RBY/wildbattle.asm +++ b/crysaudio/music/RBY/wildbattle.asm @@ -1,15 +1,16 @@ Music_WildBattle:: - musicheader 3, 1, Music_WildBattle_Ch0 - musicheader 1, 2, Music_WildBattle_Ch1 - musicheader 1, 3, Music_WildBattle_Ch2 + channel_count 3 + channel 1, Music_WildBattle_Ch1 + channel 2, Music_WildBattle_Ch2 + channel 3, Music_WildBattle_Ch3 -Music_WildBattle_Ch0:: +Music_WildBattle_Ch1:: tempo 104 - volume $77 - dutycycle 3 - vibrato 6, $34 - ;toggleperfectpitch - notetype 12, $b3 + volume 7, 7 + duty_cycle 3 + vibrato 6, 3, 4 + ;toggle_perfect_pitch + note_type 12, 11, 3 octave 4 note C_, 1 octave 3 @@ -48,16 +49,16 @@ Music_WildBattle_Ch0:: octave 3 note C_, 1 note C#, 1 - notetype 12, $b1 + note_type 12, 11, 1 note G_, 6 note E_, 6 note D#, 12 note C#, 14 note E_, 6 note D#, 10 - notetype 12, $4f + note_type 12, 4, -7 note C#, 10 - notetype 12, $b1 + note_type 12, 11, 1 note G_, 6 note E_, 6 note D#, 12 @@ -67,7 +68,7 @@ Music_WildBattle_Ch0:: note C#, 10 Music_WildBattle_branch_230e0:: - notetype 12, $b3 + note_type 12, 11, 3 note C#, 1 note D_, 1 note C#, 1 @@ -262,7 +263,7 @@ Music_WildBattle_branch_230e0:: note F#, 1 note G_, 1 note G#, 1 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 4 note C_, 4 note D_, 4 @@ -270,10 +271,10 @@ Music_WildBattle_branch_230e0:: note E_, 6 note D_, 6 note F_, 4 - notetype 12, $b7 + note_type 12, 11, 7 note A_, 16 note G_, 16 - notetype 12, $b5 + note_type 12, 11, 5 note D_, 4 note C_, 4 note D_, 4 @@ -281,34 +282,34 @@ Music_WildBattle_branch_230e0:: note G_, 6 note A_, 6 note B_, 4 - notetype 12, $b7 + note_type 12, 11, 7 octave 4 note C_, 16 - notetype 12, $3f + note_type 12, 3, -7 note G_, 16 - notetype 12, $b5 + note_type 12, 11, 5 octave 3 note C_, 12 note C_, 2 - note __, 2 + rest 2 note D_, 2 note C_, 2 - note __, 12 + rest 12 note C#, 12 note C#, 2 - note __, 2 + rest 2 note F_, 2 - notetype 12, $a3 + note_type 12, 10, 3 note D#, 6 - notetype 12, $a7 + note_type 12, 10, 7 note C#, 8 - loopchannel 0, Music_WildBattle_branch_230e0 + sound_loop 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch1:: - dutycycle 3 - vibrato 8, $25 - notetype 12, $c3 +Music_WildBattle_Ch2:: + duty_cycle 3 + vibrato 8, 2, 5 + note_type 12, 12, 3 octave 4 note G_, 1 note F#, 1 @@ -357,7 +358,7 @@ Music_WildBattle_Ch1:: note F_, 1 octave 5 note G_, 1 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note G_, 6 octave 3 @@ -366,9 +367,9 @@ Music_WildBattle_Ch1:: note G_, 14 note G_, 6 note G_, 10 - notetype 12, $90 + note_type 12, 9, 0 note F#, 10 - notetype 12, $c2 + note_type 12, 12, 2 note G_, 6 note G_, 6 note G_, 12 @@ -378,7 +379,7 @@ Music_WildBattle_Ch1:: note G_, 10 Music_WildBattle_branch_23225:: - notetype 12, $c5 + note_type 12, 12, 5 note G_, 6 note F#, 6 note E_, 4 @@ -388,14 +389,14 @@ Music_WildBattle_branch_23225:: octave 4 note G#, 12 note G_, 2 - note __, 2 + rest 2 note G#, 2 note G_, 2 - note __, 4 - notetype 12, $b7 + rest 4 + note_type 12, 11, 7 octave 5 note C#, 8 - notetype 12, $c5 + note_type 12, 12, 5 octave 4 note C_, 6 octave 3 @@ -410,20 +411,20 @@ Music_WildBattle_branch_23225:: note F_, 6 note E_, 6 note D_, 4 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note A#, 4 octave 4 note C_, 4 note D_, 4 note F_, 4 - notetype 12, $c0 + note_type 12, 12, 0 note G#, 16 - notetype 12, $b0 + note_type 12, 11, 0 note G#, 16 - notetype 12, $4e + note_type 12, 4, -6 note G_, 16 - notetype 12, $c7 + note_type 12, 12, 7 note G_, 16 octave 3 note F_, 8 @@ -431,9 +432,9 @@ Music_WildBattle_branch_23225:: octave 4 note D_, 8 note F_, 8 - notetype 12, $c0 + note_type 12, 12, 0 note E_, 16 - notetype 12, $c7 + note_type 12, 12, 7 note E_, 16 octave 3 note F_, 8 @@ -441,62 +442,62 @@ Music_WildBattle_branch_23225:: octave 4 note D_, 8 note F_, 8 - notetype 12, $c0 + note_type 12, 12, 0 note G_, 16 - notetype 12, $3f + note_type 12, 3, -7 octave 5 note C_, 16 - notetype 12, $c5 + note_type 12, 12, 5 octave 4 note E_, 12 note E_, 2 - note __, 2 + rest 2 note F_, 2 - notetype 12, $c1 + note_type 12, 12, 1 note E_, 4 - notetype 12, $c5 - note __, 10 + note_type 12, 12, 5 + rest 10 note F_, 12 note F_, 2 - note __, 2 + rest 2 note G#, 2 - notetype 12, $a3 + note_type 12, 10, 3 note G_, 6 - notetype 12, $c7 + note_type 12, 12, 7 note F_, 8 - loopchannel 0, Music_WildBattle_branch_23225 + sound_loop 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch2:: - vibrato 0, $20 - notetype 12, $11 +Music_WildBattle_Ch3:: + vibrato 0, 2, 0 + note_type 12, 1, 1 octave 4 note C#, 1 - note __, 1 + rest 1 note C#, 1 note C_, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 note C_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 note C_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 note C_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 note C_, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 note C_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 note C_, 1 octave 3 @@ -535,7 +536,7 @@ Music_WildBattle_branch_232b5:: note A#, 2 note G#, 2 note F_, 2 - loopchannel 2, Music_WildBattle_branch_232b5 + sound_loop 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: note C_, 2 @@ -556,10 +557,10 @@ Music_WildBattle_branch_232d8:: note G_, 2 note G#, 12 note G_, 2 - note __, 2 + rest 2 note G#, 2 note G_, 2 - note __, 4 + rest 4 note F_, 2 note E_, 2 note D_, 2 @@ -740,4 +741,4 @@ Music_WildBattle_branch_232d8:: note G#, 2 note C#, 2 note G#, 2 - loopchannel 0, Music_WildBattle_branch_232d8 + sound_loop 0, Music_WildBattle_branch_232d8 diff --git a/crysaudio/music/RBY/yellowintro.asm b/crysaudio/music/RBY/yellowintro.asm index 2b1ba6b5..ca35f5fb 100644 --- a/crysaudio/music/RBY/yellowintro.asm +++ b/crysaudio/music/RBY/yellowintro.asm @@ -1,14 +1,15 @@ Music_YellowIntro:: - musicheader 3, 1, Music_YellowIntro_Ch1 - musicheader 1, 2, Music_YellowIntro_Ch2 - musicheader 1, 3, Music_YellowIntro_Ch3 + channel_count 3 + channel 1, Music_YellowIntro_Ch1 + channel 2, Music_YellowIntro_Ch2 + channel 3, Music_YellowIntro_Ch3 Music_YellowIntro_Ch1:: tempo 116 - volume $77 - dutycycle 3 - vibrato 8, $14 - notetype 12, $b2 + volume 7, 7 + duty_cycle 3 + vibrato 8, 1, 4 + note_type 12, 11, 2 octave 3 note G#, 2 note B_, 4 @@ -20,7 +21,7 @@ Music_YellowIntro_Ch1:: note A#, 1 note B_, 2 note B_, 10 - notetype 12, $b6 + note_type 12, 11, 6 octave 4 note C#, 1 note C_, 1 @@ -42,22 +43,22 @@ Music_YellowIntro_Ch1:: octave 3 note B_, 4 note G#, 6 - notetype 12, $b2 + note_type 12, 11, 2 note B_, 2 - notetype 12, $b6 + note_type 12, 11, 6 note G#, 6 - notetype 12, $b2 + note_type 12, 11, 2 note B_, 2 - notetype 12, $b6 + note_type 12, 11, 6 octave 4 note E_, 6 - notetype 12, $b2 + note_type 12, 11, 2 note G#, 2 - notetype 12, $b6 + note_type 12, 11, 6 note E_, 6 - notetype 12, $b2 + note_type 12, 11, 2 note G#, 2 - notetype 12, $b6 + note_type 12, 11, 6 octave 3 note A_, 4 note F#, 4 @@ -69,7 +70,7 @@ Music_YellowIntro_Ch1:: note G#, 2 note F#, 2 note D#, 2 - notetype 12, $b3 + note_type 12, 11, 3 note B_, 2 octave 4 note E_, 4 @@ -82,7 +83,7 @@ Music_YellowIntro_Ch1:: note D#, 1 note F#, 2 note F#, 8 - notetype 12, $b6 + note_type 12, 11, 6 note F#, 1 note F_, 1 note F#, 8 @@ -94,21 +95,21 @@ Music_YellowIntro_Ch1:: note F#, 1 note F_, 1 note F#, 2 - notetype 12, $b3 + note_type 12, 11, 3 note F#, 1 note E_, 1 note D#, 1 note C#, 1 - notetype 12, $b2 + note_type 12, 11, 2 octave 3 note B_, 16 - endchannel + sound_ret Music_YellowIntro_Ch2:: - dutycycle 2 - vibrato 6, $15 - notetype 12, $c2 + duty_cycle 2 + vibrato 6, 1, 5 + note_type 12, 12, 2 octave 3 note B_, 2 octave 4 @@ -121,7 +122,7 @@ Music_YellowIntro_Ch2:: note D#, 1 note E_, 2 note E_, 4 - notetype 12, $c5 + note_type 12, 12, 5 note G#, 1 note G_, 1 note G#, 10 @@ -129,7 +130,7 @@ Music_YellowIntro_Ch2:: note B_, 1 note A#, 1 note B_, 6 - notetype 12, $c7 + note_type 12, 12, 7 octave 4 note E_, 4 note G#, 4 @@ -143,24 +144,24 @@ Music_YellowIntro_Ch2:: note E_, 4 octave 3 note B_, 6 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note E_, 2 - notetype 12, $c7 + note_type 12, 12, 7 octave 3 note B_, 6 - notetype 12, $c2 + note_type 12, 12, 2 octave 4 note E_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note G#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note B_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note G#, 6 - notetype 12, $c2 + note_type 12, 12, 2 note B_, 2 - notetype 12, $c7 + note_type 12, 12, 7 note C#, 4 octave 3 note A_, 4 @@ -175,7 +176,7 @@ Music_YellowIntro_Ch2:: note C#, 2 octave 3 note B_, 2 - notetype 12, $c3 + note_type 12, 12, 3 octave 4 note E_, 2 note G#, 4 @@ -188,7 +189,7 @@ Music_YellowIntro_Ch2:: note F#, 1 note A_, 2 note A_, 4 - notetype 12, $c7 + note_type 12, 12, 7 note B_, 1 note A#, 1 note B_, 8 @@ -198,286 +199,286 @@ Music_YellowIntro_Ch2:: note B_, 1 note A#, 1 note B_, 6 - notetype 12, $c3 + note_type 12, 12, 3 note B_, 1 note A_, 1 note G#, 1 note F#, 1 - notetype 12, $c2 + note_type 12, 12, 2 note E_, 16 - endchannel + sound_ret Music_YellowIntro_Ch3:: - notetype 12, $10 + note_type 12, 1, 0 octave 4 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note F#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 note G#, 1 @@ -485,5 +486,5 @@ Music_YellowIntro_Ch3:: octave 5 note C#, 1 note E_, 1 - note __, 15 - endchannel + rest 15 + sound_ret diff --git a/crysaudio/music/RBY/yellowunusedsong.asm b/crysaudio/music/RBY/yellowunusedsong.asm index 0ffad520..3c7676af 100644 --- a/crysaudio/music/RBY/yellowunusedsong.asm +++ b/crysaudio/music/RBY/yellowunusedsong.asm @@ -1,15 +1,16 @@ Music_YellowUnusedSong:: - musicheader 4, 1, Music_YellowUnusedSong_Ch1 - musicheader 1, 2, Music_YellowUnusedSong_Ch2 - musicheader 1, 3, Music_YellowUnusedSong_Ch3 - musicheader 1, 4, Music_YellowUnusedSong_Ch4 + channel_count 4 + channel 1, Music_YellowUnusedSong_Ch1 + channel 2, Music_YellowUnusedSong_Ch2 + channel 3, Music_YellowUnusedSong_Ch3 + channel 4, Music_YellowUnusedSong_Ch4 Music_YellowUnusedSong_Ch1:: tempo 140 - volume $77 - dutycycle 3 - vibrato 8, $14 - notetype 8, $b2 + volume 7, 7 + duty_cycle 3 + vibrato 8, 1, 4 + note_type 8, 11, 2 octave 3 note A_, 6 note A_, 2 @@ -52,12 +53,12 @@ Music_YellowUnusedSong_branch_82fde:: octave 4 note D#, 6 note D_, 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 octave 3 note A_, 6 note A_, 2 @@ -78,12 +79,12 @@ Music_YellowUnusedSong_branch_82fde:: note A_, 6 note G_, 6 note A_, 12 - loopchannel 0, Music_YellowUnusedSong_branch_82fde + sound_loop 0, Music_YellowUnusedSong_branch_82fde Music_YellowUnusedSong_Ch2:: - dutycycle 2 - notetype 8, $c2 + duty_cycle 2 + note_type 8, 12, 2 octave 4 note D_, 6 note D_, 2 @@ -129,7 +130,7 @@ Music_YellowUnusedSong_branch_8302a:: note C_, 6 note G#, 6 note G_, 12 - notetype 8, $90 + note_type 8, 9, 0 octave 3 note D#, 16 note D#, 8 @@ -141,7 +142,7 @@ Music_YellowUnusedSong_branch_8302a:: octave 3 note D#, 12 note F_, 12 - notetype 8, $c2 + note_type 8, 12, 2 octave 4 note D_, 6 note D_, 2 @@ -164,14 +165,14 @@ Music_YellowUnusedSong_branch_8302a:: note D_, 6 note A#, 6 note A_, 12 - loopchannel 0, Music_YellowUnusedSong_branch_8302a + sound_loop 0, Music_YellowUnusedSong_branch_8302a Music_YellowUnusedSong_Ch3:: - notetype 12, $10 - vibrato 2, $15 - note __, 16 - note __, 12 + note_type 12, 1, 0 + vibrato 2, 1, 5 + rest 16 + rest 12 octave 4 note C_, 4 note D_, 8 @@ -205,129 +206,129 @@ Music_YellowUnusedSong_branch_83075:: note D#, 8 note G_, 8 note A#, 8 - loopchannel 0, Music_YellowUnusedSong_branch_83075 + sound_loop 0, Music_YellowUnusedSong_branch_83075 Music_YellowUnusedSong_Ch4:: - togglenoise 0 - notetype 12 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 + toggle_noise 0 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 Music_YellowUnusedSong_branch_830c3:: - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - notetype 8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype 12 - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - loopchannel 0, Music_YellowUnusedSong_branch_830c3 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + sound_loop 0, Music_YellowUnusedSong_branch_830c3 diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm index 6eaeff94..d120c5d9 100644 --- a/crysaudio/music/TCG/boosterpack.asm +++ b/crysaudio/music/TCG/boosterpack.asm @@ -1,16 +1,16 @@ -Music_TCGBoosterPack: - db $80 - dw Music_TCGBoosterPack_Ch1 - db $01 - dw Music_TCGBoosterPack_Ch2 - db $02 - dw Music_TCGBoosterPack_Ch3 +Music_BoosterPack: + channel_count 3 + channel 1, Music_BoosterPack_Ch1 + channel 2, Music_BoosterPack_Ch2 + channel 3, Music_BoosterPack_Ch3 -Music_TCGBoosterPack_Ch1: - vibrato 20, $33 +Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 4 - dutycycle 1 + duty_cycle 1 notetype0 1 notetype1 10 note D#, 5 @@ -40,18 +40,22 @@ Music_TCGBoosterPack_Ch1: dec_octave notetype1 10 note B_, 16 + ;tie note B_, 16 + ;tie note B_, 6 notetype1 3 note B_, 9 - endchannel + sound_ret -Music_TCGBoosterPack_Ch2: - vibrato 20, $33 +Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 3 - dutycycle 1 + duty_cycle 1 notetype0 1 notetype1 9 note A#, 5 @@ -80,16 +84,21 @@ Music_TCGBoosterPack_Ch2: note A_, 2 notetype1 9 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 6 notetype1 2 note G_, 9 - endchannel + sound_ret -Music_TCGBoosterPack_Ch3: +Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) + ;stereo_panning 1, 1 notetype2 11 notetype1 1 + ;cutoff 8 + ;echo 0 octave 2 notetype0 1 note D#, 6 @@ -103,7 +112,9 @@ Music_TCGBoosterPack_Ch3: note F_, 7 dec_octave note G_, 16 + ;tie note G_, 16 + ;tie note G_, 6 - endchannel - + sound_ret +; 0xf7df8 diff --git a/crysaudio/music/TCG/cardpop.asm b/crysaudio/music/TCG/cardpop.asm index 5815bc54..489e8a48 100644 --- a/crysaudio/music/TCG/cardpop.asm +++ b/crysaudio/music/TCG/cardpop.asm @@ -1,23 +1,21 @@ -Music_TCGCardPop: - db $C0 - dw Music_TCGCardPop_Ch1 - db $01 - dw Music_TCGCardPop_Ch2 - db $02 - dw Music_TCGCardPop_Ch3 - db $03 - dw Music_TCGCardPop_Ch4 +Music_CardPop: + channel_count 4 + channel 1, Music_CardPop_Ch1 + channel 2, Music_CardPop_Ch2 + channel 3, Music_CardPop_Ch3 + channel 4, Music_CardPop_Ch4 -Music_TCGCardPop_Ch1: +Music_CardPop_Ch1: ; f703a (3d:703a) notetype0 4 + ;stereo_panning 1, 1 notetype2 8 - dutycycle 2 + duty_cycle 2 notetype1 9 .MainLoop .Loop1 - note __, 16 - loopchannel 7, .Loop1 - note __, 14 + rest 16 + sound_loop 7, .Loop1 + rest 14 .Loop2 octave 5 notetype2 8 @@ -65,11 +63,11 @@ Music_TCGCardPop_Ch1: note F#, 1 notetype1 3 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 12 - note __, 16 - note __, 14 + rest 12 + rest 16 + rest 14 octave 5 notetype1 9 notetype2 8 @@ -117,21 +115,22 @@ Music_TCGCardPop_Ch1: note E_, 1 notetype1 3 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 12 - note __, 16 + rest 12 + rest 16 notetype1 9 - note __, 14 - loopchannel 2, .Loop2 - note __, 2 - loopchannel 0, .MainLoop + rest 14 + sound_loop 2, .Loop2 + rest 2 + sound_loop 0, .MainLoop -Music_TCGCardPop_Ch2: +Music_CardPop_Ch2: ; f70df (3d:70df) notetype0 4 + ;stereo_panning 1, 1 notetype2 8 - dutycycle 2 + duty_cycle 2 notetype1 6 notetype2 3 .Loop1 @@ -171,7 +170,7 @@ Music_TCGCardPop_Ch2: inc_octave inc_octave note A_, 2 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 .Loop2 octave 2 note G_, 2 @@ -209,98 +208,101 @@ Music_TCGCardPop_Ch2: inc_octave inc_octave note G_, 2 - loopchannel 2, .Loop2 - loopchannel 0, Music_TCGCardPop_Ch2 + sound_loop 2, .Loop2 + sound_loop 0, Music_CardPop_Ch2 -Music_TCGCardPop_Ch3: +Music_CardPop_Ch3: ; f713a (3d:713a) notetype0 4 notetype2 11 + ;stereo_panning 1, 1 notetype1 1 - callchannel Branch_f715b + ;echo 0 + ;cutoff 8 + sound_call Branch_f715b note C_, 2 note C#, 2 - callchannel Branch_f715b + sound_call Branch_f715b note D_, 2 note C#, 2 - callchannel Branch_f716c + sound_call Branch_f716c note D_, 2 note C#, 2 - callchannel Branch_f716c + sound_call Branch_f716c note C_, 2 note C#, 2 - loopchannel 0, Music_TCGCardPop_Ch3 + sound_loop 0, Music_CardPop_Ch3 Branch_f715b: octave 2 note D_, 2 - note __, 2 + rest 2 note D_, 4 inc_octave note D_, 2 dec_octave note D_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - endchannel + sound_ret Branch_f716c: octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 4 inc_octave note C_, 2 dec_octave note C_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - endchannel + sound_ret -Music_TCGCardPop_Ch4: - togglenoise $06 +Music_CardPop_Ch4: ; f717d (3d:717d) + toggle_noise 6 .MainLoop - notetype 4 + drum_speed 4 octave 1 .Loop1 - callchannel Branch_f7196 - note E_, 4 - note C#, 2 - note D#, 2 - note E_, 2 - note C#, 2 - loopchannel 11, .Loop1 - callchannel Branch_f7196 - note E_, 2 - note D_, 1 - note D_, 1 + sound_call Branch_f7196 + drum_note 5, 4 + drum_note 2, 2 + drum_note 4, 2 + drum_note 5, 2 + drum_note 2, 2 + sound_loop 11, .Loop1 + sound_call Branch_f7196 + drum_note 5, 2 + drum_note 3, 1 + drum_note 3, 1 .Loop2 - note C#, 2 - loopchannel 4, .Loop2 - loopchannel 0, .MainLoop + drum_note 2, 2 + sound_loop 4, .Loop2 + sound_loop 0, .MainLoop Branch_f7196: - note C_, 2 - note D#, 2 - note E_, 4 - note C#, 2 - note D#, 2 - note E_, 2 - note C#, 2 - note C_, 2 - note C#, 2 - endchannel - + drum_note 1, 2 + drum_note 4, 2 + drum_note 5, 4 + drum_note 2, 2 + drum_note 4, 2 + drum_note 5, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 2, 2 + sound_ret +; 0xf71a0 diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm index 86ecf68a..e9b27ec5 100644 --- a/crysaudio/music/TCG/challengehall.asm +++ b/crysaudio/music/TCG/challengehall.asm @@ -1,18 +1,17 @@ -Music_TCGChallengeHall: - db $C0 - dw Music_TCGChallengeHall_Ch1 - db $01 - dw Music_TCGChallengeHall_Ch2 - db $02 - dw Music_TCGChallengeHall_Ch3 - db $03 - dw Music_TCGChallengeHall_Ch4 +Music_ChallengeHall: + channel_count 4 + channel 1, Music_ChallengeHall_Ch1 + channel 2, Music_ChallengeHall_Ch2 + channel 3, Music_ChallengeHall_Ch3 + channel 4, Music_ChallengeHall_Ch4 -Music_TCGChallengeHall_Ch1: - vibrato 15, $33 +Music_ChallengeHall_Ch1: ; f9646 (3e:5646) + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 15, 3, 3 notetype2 7 octave 3 - dutycycle 2 + duty_cycle 2 notetype1 8 notetype2 8 notetype0 1 @@ -74,8 +73,8 @@ Music_TCGChallengeHall_Ch1: note F#, 3 note E_, 4 note F#, 4 - loopchannel 8, .Loop1 - dutycycle 1 + sound_loop 8, .Loop1 + duty_cycle 1 notetype1 8 dec_octave dec_octave @@ -104,68 +103,70 @@ Music_TCGChallengeHall_Ch1: note D_, 15 note E_, 15 inc_octave - dutycycle 0 + duty_cycle 0 notetype1 10 - callchannel Branch_f9848 + sound_call Branch_f9848 notetype1 10 note D_, 8 notetype0 10 note C#, 6 + ;tie note C#, 6 notetype1 3 notetype0 1 note C#, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 note C#, 7 notetype1 2 note C#, 8 - note __, 15 + rest 15 notetype1 8 note C#, 7 notetype1 2 note C#, 8 - note __, 15 + rest 15 notetype1 8 note D_, 7 notetype1 2 note D_, 8 - note __, 15 + rest 15 notetype1 8 note D_, 7 notetype1 2 note D_, 8 - dutycycle 0 + duty_cycle 0 notetype1 10 - callchannel Branch_f9848 + sound_call Branch_f9848 notetype1 10 note C#, 8 dec_octave notetype0 10 note A_, 6 + ;tie note A_, 6 notetype1 3 notetype0 1 note A_, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 inc_octave note C#, 7 notetype1 2 note C#, 8 - note __, 15 + rest 15 notetype1 8 note C#, 7 notetype1 2 note C#, 8 - note __, 15 + rest 15 notetype1 8 note C#, 15 note D_, 15 note E_, 15 notetype1 2 note E_, 15 - dutycycle 0 + duty_cycle 0 notetype1 10 note F#, 7 note F_, 7 @@ -181,17 +182,18 @@ Music_TCGChallengeHall_Ch1: notetype1 10 notetype0 10 note A_, 3 + ;tie notetype0 1 note A_, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - dutycycle 0 + duty_cycle 0 notetype1 10 - note __, 15 + rest 15 inc_octave note E_, 7 note D#, 7 @@ -209,14 +211,14 @@ Music_TCGChallengeHall_Ch1: note A_, 5 notetype0 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - dutycycle 0 + duty_cycle 0 notetype1 10 - note __, 15 + rest 15 inc_octave note D_, 7 note C#, 8 @@ -229,6 +231,7 @@ Music_TCGChallengeHall_Ch1: note A_, 8 notetype1 10 note G#, 15 + ;tie note G#, 7 notetype1 3 note G#, 8 @@ -270,11 +273,11 @@ Music_TCGChallengeHall_Ch1: notetype0 1 note G#, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note B_, 7 inc_octave - dutycycle 0 + duty_cycle 0 notetype1 10 note F#, 6 notetype1 3 @@ -285,12 +288,12 @@ Music_TCGChallengeHall_Ch1: note E_, 15 notetype1 10 note B_, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 dec_octave note B_, 7 inc_octave - dutycycle 0 + duty_cycle 0 notetype1 10 note G#, 6 notetype1 3 @@ -333,7 +336,7 @@ Music_TCGChallengeHall_Ch1: note G#, 11 notetype1 3 note G#, 4 - note __, 7 + rest 7 notetype1 10 note A_, 7 notetype1 3 @@ -341,7 +344,7 @@ Music_TCGChallengeHall_Ch1: notetype1 10 notetype0 10 note A_, 6 - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 inc_octave @@ -357,7 +360,7 @@ Music_TCGChallengeHall_Ch1: inc_octave note C#, 4 note D_, 3 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f9848: note C#, 15 @@ -401,23 +404,26 @@ Branch_f9848: notetype1 3 note B_, 7 inc_octave - endchannel + sound_ret -Music_TCGChallengeHall_Ch2: - vibrato 15, $33 +Music_ChallengeHall_Ch2: ; f9883 (3e:5883) + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 15, 3, 3 notetype2 7 octave 3 notetype0 10 .Loop1 - note __, 6 - loopchannel 2, .Loop1 + rest 6 + sound_loop 2, .Loop1 .MainLoop - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 notetype0 10 note E_, 6 + ;tie note E_, 6 notetype0 1 note E_, 7 @@ -442,51 +448,53 @@ Music_TCGChallengeHall_Ch2: note E_, 15 note F#, 15 note G#, 15 - callchannel Branch_f9a28 + sound_call Branch_f9a28 note B_, 8 notetype0 10 note A_, 6 + ;tie note A_, 6 notetype0 1 - note __, 15 - dutycycle 1 + rest 15 + duty_cycle 1 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - note __, 15 + rest 15 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - note __, 15 + rest 15 notetype1 8 note B_, 7 notetype1 2 note B_, 8 - note __, 15 + rest 15 notetype1 8 note B_, 7 notetype1 2 note B_, 8 - callchannel Branch_f9a28 + sound_call Branch_f9a28 note G#, 8 notetype0 10 note E_, 6 + ;tie note E_, 6 notetype0 1 - note __, 15 - dutycycle 1 + rest 15 + duty_cycle 1 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - note __, 15 + rest 15 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - note __, 15 + rest 15 notetype1 8 note A_, 15 note B_, 15 @@ -498,17 +506,17 @@ Music_TCGChallengeHall_Ch2: note D_, 7 notetype1 2 note D_, 8 - note __, 15 + rest 15 dec_octave notetype1 8 note A_, 7 notetype1 2 note A_, 8 - note __, 15 + rest 15 inc_octave notetype1 8 note D_, 7 - dutycycle 2 + duty_cycle 2 notetype1 6 inc_octave note D_, 8 @@ -526,17 +534,17 @@ Music_TCGChallengeHall_Ch2: note F#, 3 note E_, 4 note F#, 4 - loopchannel 4, .Loop2 + sound_loop 4, .Loop2 notetype1 2 note F#, 5 - note __, 10 + rest 10 dec_octave dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note C#, 7 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 6 note E_, 8 note A_, 7 @@ -553,7 +561,7 @@ Music_TCGChallengeHall_Ch2: note E_, 3 note D_, 4 note E_, 4 - loopchannel 4, .Loop3 + sound_loop 4, .Loop3 dec_octave note B_, 15 inc_octave @@ -562,13 +570,14 @@ Music_TCGChallengeHall_Ch2: note D_, 8 notetype1 5 note C#, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 octave 2 note B_, 7 inc_octave inc_octave - dutycycle 2 + ;vibrato_type 1 + duty_cycle 2 notetype1 5 note B_, 8 inc_octave @@ -577,31 +586,32 @@ Music_TCGChallengeHall_Ch2: notetype1 2 notetype0 1 note C#, 15 - dutycycle 0 + ;vibrato_type 8 + duty_cycle 0 notetype1 7 octave 2 note E_, 15 note F#, 15 note A#, 15 - note __, 15 - dutycycle 1 + rest 15 + duty_cycle 1 notetype1 8 inc_octave note D_, 7 notetype1 2 note D_, 8 - note __, 15 + rest 15 dec_octave notetype1 8 note B_, 7 notetype1 2 note B_, 8 - note __, 15 + rest 15 inc_octave notetype1 8 note D_, 7 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 6 note D_, 8 note A_, 7 @@ -618,60 +628,60 @@ Music_TCGChallengeHall_Ch2: note F#, 3 note E_, 4 note F#, 4 - loopchannel 2, .Loop4 - dutycycle 0 + sound_loop 2, .Loop4 + duty_cycle 0 notetype1 7 dec_octave dec_octave note F_, 15 - note __, 7 + rest 7 note F_, 6 - note __, 2 + rest 2 notetype0 10 note F#, 3 notetype0 1 - note __, 15 - dutycycle 1 + rest 15 + duty_cycle 1 notetype1 8 note C#, 7 - dutycycle 0 + duty_cycle 0 notetype1 7 note E_, 6 - note __, 2 + rest 2 notetype0 10 note F#, 3 notetype0 1 - note __, 15 + rest 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note B_, 7 inc_octave - dutycycle 0 + duty_cycle 0 notetype1 7 note D_, 6 - note __, 2 + rest 2 note E_, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 note E_, 7 notetype1 2 note E_, 8 - dutycycle 0 + duty_cycle 0 notetype1 7 note D_, 11 - note __, 4 - dutycycle 1 + rest 4 + duty_cycle 1 notetype1 8 dec_octave note B_, 7 inc_octave - dutycycle 0 + duty_cycle 0 notetype1 7 note D_, 6 - note __, 2 + rest 2 note C#, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 notetype2 7 note C#, 5 @@ -685,135 +695,143 @@ Music_TCGChallengeHall_Ch2: note C#, 7 notetype1 2 note C#, 8 - dutycycle 0 + duty_cycle 0 notetype1 10 note A_, 7 notetype1 3 note A_, 8 - note __, 15 + rest 15 notetype0 10 - note __, 3 - loopchannel 0, .MainLoop + rest 3 + sound_loop 0, .MainLoop Branch_f9a28: - dutycycle 0 + duty_cycle 0 notetype1 7 note A_, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 note A_, 7 notetype1 2 note A_, 8 - dutycycle 0 + duty_cycle 0 notetype1 7 inc_octave note C#, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note A_, 7 - dutycycle 0 + duty_cycle 0 notetype1 7 note A_, 8 note B_, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 note B_, 7 notetype1 2 note B_, 8 - dutycycle 0 + duty_cycle 0 notetype1 7 inc_octave note D_, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note B_, 7 - dutycycle 0 + duty_cycle 0 notetype1 7 note B_, 8 inc_octave note C#, 7 notetype1 3 note C#, 8 - dutycycle 1 + duty_cycle 1 notetype1 8 note C#, 7 notetype1 2 note C#, 8 - dutycycle 0 + duty_cycle 0 notetype1 7 note E_, 7 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 notetype1 7 note D_, 15 - dutycycle 1 + duty_cycle 1 notetype1 8 note D_, 7 notetype1 2 note D_, 8 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 7 note G#, 15 inc_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note D_, 7 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 7 - endchannel + sound_ret -Music_TCGChallengeHall_Ch3: +Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 0 + ;cutoff 8 + ;cutoff 8 notetype0 10 .Loop1 - note __, 6 - loopchannel 2, .Loop1 + rest 6 + sound_loop 2, .Loop1 .MainLoop octave 2 + ;cutoff 8 note E_, 6 + ;tie note E_, 6 notetype0 1 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave + ;cutoff 7 note E_, 7 note E_, 8 + ;cutoff 8 note E_, 7 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 note E_, 15 note F#, 15 note G#, 15 - callchannel Branch_f9b7d - callchannel Branch_f9b92 + sound_call Branch_f9b7d + sound_call Branch_f9b92 .Loop2 - callchannel Branch_f9b7d - loopchannel 3, .Loop2 - callchannel Branch_f9b92 - callchannel Branch_f9b7d + sound_call Branch_f9b7d + sound_loop 3, .Loop2 + sound_call Branch_f9b92 + sound_call Branch_f9b7d note A_, 15 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave note A_, 7 - note __, 8 + rest 8 note A_, 15 note B_, 15 inc_octave @@ -823,253 +841,255 @@ Music_TCGChallengeHall_Ch3: note D_, 15 inc_octave note A_, 7 - note __, 8 + rest 8 dec_octave note A_, 15 inc_octave note F#, 7 - note __, 8 + rest 8 dec_octave - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 note C#, 15 inc_octave note A_, 7 - note __, 8 + rest 8 dec_octave note A_, 15 inc_octave note A_, 7 - note __, 8 + rest 8 dec_octave note C#, 15 inc_octave note A_, 7 - note __, 8 + rest 8 dec_octave note A_, 15 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave note B_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note F#, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note G#, 15 inc_octave note G#, 7 - note __, 8 + rest 8 dec_octave note A_, 15 inc_octave inc_octave note C#, 7 - note __, 8 + rest 8 dec_octave dec_octave note G_, 15 inc_octave inc_octave note C#, 7 - note __, 8 + rest 8 dec_octave dec_octave note F#, 7 - note __, 8 + rest 8 note F#, 15 note G#, 15 note A#, 15 note B_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note C#, 15 inc_octave note F#, 7 - note __, 8 + rest 8 dec_octave note D_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note D#, 15 inc_octave note F#, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave note F_, 15 inc_octave note G#, 7 - note __, 8 + rest 8 dec_octave note F#, 15 inc_octave inc_octave note C#, 7 - note __, 8 + rest 8 dec_octave dec_octave note C#, 15 inc_octave note A_, 7 - note __, 8 + rest 8 dec_octave note B_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note F#, 15 inc_octave note F#, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note G#, 15 inc_octave note G#, 7 - note __, 8 + rest 8 dec_octave note A_, 7 - note __, 8 + rest 8 + ;cutoff 7 note A_, 5 note A_, 5 note A_, 5 + ;cutoff 8 note A_, 7 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 note A_, 7 - note __, 8 - note __, 15 + rest 8 + rest 15 notetype0 10 - note __, 3 - loopchannel 0, .MainLoop + rest 3 + sound_loop 0, .MainLoop Branch_f9b7d: note A_, 15 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note E_, 7 - note __, 8 + rest 8 dec_octave note A_, 15 inc_octave note F#, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note F#, 7 - note __, 8 + rest 8 dec_octave - endchannel + sound_ret Branch_f9b92: note A_, 15 inc_octave note A_, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave inc_octave note C#, 7 - note __, 8 + rest 8 dec_octave dec_octave note A_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave note E_, 15 inc_octave note B_, 7 - note __, 8 + rest 8 dec_octave - endchannel + sound_ret -Music_TCGChallengeHall_Ch4: - togglenoise $06 - notetype 1 - notetype 10 +Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) + toggle_noise 6 + drum_speed 1 + drum_speed 10 .Loop1 - note __, 6 - loopchannel 2, .Loop1 + rest 6 + sound_loop 2, .Loop1 .MainLoop - notetype 1 - note C#, 4 - note D_, 3 - note D_, 4 - note D_, 4 + drum_speed 1 + drum_note 2, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 .Loop2 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 4 - loopchannel 7, .Loop2 - note C#, 15 - note C#, 7 - note C#, 8 - note C#, 15 - note C#, 15 - note C#, 15 - note C#, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note C#, 15 - note C#, 15 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + sound_loop 7, .Loop2 + drum_note 2, 15 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 15 + drum_note 2, 15 + drum_note 2, 15 + drum_note 2, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 15 + drum_note 2, 15 .Loop3 - note C_, 15 - note C#, 15 - note C_, 15 - note C#, 15 - note C_, 15 - note C#, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note C_, 15 - note C#, 15 - loopchannel 15, .Loop3 - note C_, 15 - note C#, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note C#, 15 - note C#, 15 - notetype 10 - note C#, 3 - note __, 3 - loopchannel 0, .MainLoop - + drum_note 1, 15 + drum_note 2, 15 + drum_note 1, 15 + drum_note 2, 15 + drum_note 1, 15 + drum_note 2, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 1, 15 + drum_note 2, 15 + sound_loop 15, .Loop3 + drum_note 1, 15 + drum_note 2, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 15 + drum_note 2, 15 + drum_speed 10 + drum_note 2, 3 + rest 3 + sound_loop 0, .MainLoop +; 0xf9be5 diff --git a/crysaudio/music/TCG/club1.asm b/crysaudio/music/TCG/club1.asm index f6d31822..8405c309 100644 --- a/crysaudio/music/TCG/club1.asm +++ b/crysaudio/music/TCG/club1.asm @@ -1,19 +1,18 @@ -Music_TCGClub1: - db $C0 - dw Music_TCGClub1_Ch1 - db $01 - dw Music_TCGClub1_Ch2 - db $02 - dw Music_TCGClub1_Ch3 - db $03 - dw Music_TCGClub1_Ch4 +Music_Club1: + channel_count 4 + channel 1, Music_Club1_Ch1 + channel 2, Music_Club1_Ch2 + channel 3, Music_Club1_Ch3 + channel 4, Music_Club1_Ch4 -Music_TCGClub1_Ch1: +Music_Club1_Ch1: ; f9be5 (3e:5be5) notetype0 5 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 8 octave 3 - dutycycle 0 + duty_cycle 0 notetype1 9 notetype2 8 note C#, 2 @@ -22,7 +21,7 @@ Music_TCGClub1_Ch1: inc_octave note C#, 2 note A_, 2 - dutycycle 2 + duty_cycle 2 notetype1 7 inc_octave notetype0 1 @@ -36,7 +35,7 @@ Music_TCGClub1_Ch1: notetype1 2 note A_, 2 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 9 notetype0 5 note C#, 2 @@ -45,7 +44,7 @@ Music_TCGClub1_Ch1: inc_octave note C#, 2 note A#, 2 - dutycycle 2 + duty_cycle 2 notetype1 7 inc_octave notetype0 1 @@ -58,10 +57,12 @@ Music_TCGClub1_Ch1: note B_, 1 inc_octave note C_, 1 - vibrato 10, $33 + ;vibrato_type 1 + vibrato 10, 3, 3 note C#, 4 dec_octave - vibrato 20, $33 + ;vibrato_type 8 + vibrato 20, 3, 3 note A_, 2 inc_octave note C#, 4 @@ -69,17 +70,17 @@ Music_TCGClub1_Ch1: note B_, 2 notetype1 2 note B_, 2 - note __, 2 - dutycycle 0 + rest 2 + duty_cycle 0 notetype1 9 notetype2 8 note E_, 6 - note __, 2 + rest 2 .MainLoop - dutycycle 0 + duty_cycle 0 notetype1 10 octave 3 - note __, 6 + rest 6 note A_, 4 note E_, 2 note A_, 4 @@ -95,7 +96,7 @@ Music_TCGClub1_Ch1: note E_, 2 notetype1 4 note E_, 2 - note __, 2 + rest 2 notetype1 10 note D#, 1 note E_, 7 @@ -105,7 +106,7 @@ Music_TCGClub1_Ch1: note F#, 2 notetype1 4 note F#, 2 - note __, 2 + rest 2 inc_octave notetype1 10 note C_, 1 @@ -119,10 +120,11 @@ Music_TCGClub1_Ch1: note B_, 6 notetype1 9 note D_, 4 - note __, 2 + rest 2 dec_octave note A_, 2 - dutycycle 2 + ;vibrato_type 1 + duty_cycle 2 notetype1 5 inc_octave inc_octave @@ -131,7 +133,8 @@ Music_TCGClub1_Ch1: note C#, 5 dec_octave dec_octave - dutycycle 0 + ;vibrato_type 8 + duty_cycle 0 notetype1 10 note A_, 4 note E_, 2 @@ -144,7 +147,7 @@ Music_TCGClub1_Ch1: dec_octave notetype1 9 note A#, 1 - note __, 5 + rest 5 inc_octave inc_octave notetype1 10 @@ -153,7 +156,7 @@ Music_TCGClub1_Ch1: note E_, 2 notetype1 4 note E_, 2 - note __, 2 + rest 2 notetype1 10 note D#, 1 note E_, 7 @@ -163,7 +166,7 @@ Music_TCGClub1_Ch1: note F#, 2 notetype1 4 note F#, 2 - note __, 2 + rest 2 notetype1 10 inc_octave note C_, 1 @@ -186,7 +189,7 @@ Music_TCGClub1_Ch1: note A_, 2 notetype1 4 note A_, 2 - note __, 2 + rest 2 notetype1 10 note E_, 1 note F_, 7 @@ -195,7 +198,7 @@ Music_TCGClub1_Ch1: note A_, 2 notetype1 4 note A_, 2 - note __, 2 + rest 2 inc_octave notetype1 10 note C_, 1 @@ -214,7 +217,7 @@ Music_TCGClub1_Ch1: note F#, 2 notetype1 4 note F#, 2 - note __, 2 + rest 2 inc_octave notetype1 10 note D#, 1 @@ -233,7 +236,7 @@ Music_TCGClub1_Ch1: note F#, 2 notetype1 4 note F#, 2 - note __, 2 + rest 2 notetype1 10 inc_octave note C_, 1 @@ -247,7 +250,7 @@ Music_TCGClub1_Ch1: note F#, 2 notetype1 4 note F#, 2 - note __, 2 + rest 2 inc_octave notetype1 10 note C_, 1 @@ -266,7 +269,7 @@ Music_TCGClub1_Ch1: note C#, 4 dec_octave note B_, 14 - dutycycle 2 + duty_cycle 2 notetype1 6 note G#, 2 note B_, 1 @@ -290,15 +293,17 @@ Music_TCGClub1_Ch1: note E_, 1 notetype1 3 note E_, 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGClub1_Ch2: +Music_Club1_Ch2: ; f9d5f (3e:5d5f) notetype0 5 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 7 octave 2 - dutycycle 0 + duty_cycle 0 notetype1 9 notetype2 8 note A_, 2 @@ -306,16 +311,16 @@ Music_TCGClub1_Ch2: note A_, 2 inc_octave note C#, 2 - dutycycle 2 + duty_cycle 2 notetype1 5 notetype0 1 note A_, 8 - note __, 2 + rest 2 inc_octave note C#, 8 - note __, 2 + rest 2 notetype0 5 - dutycycle 0 + duty_cycle 0 notetype1 9 dec_octave dec_octave @@ -324,14 +329,14 @@ Music_TCGClub1_Ch2: note A#, 2 inc_octave note C#, 2 - dutycycle 2 + duty_cycle 2 notetype1 5 notetype0 1 note A#, 8 - note __, 2 + rest 2 dec_octave notetype0 5 - dutycycle 0 + duty_cycle 0 notetype1 9 note G_, 1 note G#, 1 @@ -341,24 +346,24 @@ Music_TCGClub1_Ch2: note A_, 2 note F#, 2 note G#, 3 - note __, 3 + rest 3 notetype1 9 note B_, 6 - note __, 2 + rest 2 .MainLoop octave 2 - note __, 4 + rest 4 inc_octave notetype1 9 note C#, 5 - note __, 7 + rest 7 note C#, 4 - note __, 2 + rest 2 note C#, 2 - note __, 4 + rest 4 dec_octave note A#, 2 - dutycycle 2 + duty_cycle 2 notetype1 5 octave 5 note C#, 1 @@ -367,49 +372,51 @@ Music_TCGClub1_Ch2: dec_octave note A#, 4 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 9 note E_, 4 - note __, 2 - dutycycle 2 + rest 2 + ;vibrato_type 1 + duty_cycle 2 notetype1 5 octave 5 note C_, 1 note C#, 5 - dutycycle 0 + duty_cycle 0 notetype1 9 octave 3 note D_, 2 - dutycycle 2 + duty_cycle 2 notetype1 5 inc_octave note A_, 4 note F#, 2 note E_, 4 note D_, 2 - note __, 4 + rest 4 note E_, 4 - note __, 2 + rest 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 note F#, 4 note A_, 2 note B_, 4 note A_, 2 - note __, 2 - dutycycle 0 + rest 2 + duty_cycle 0 notetype1 9 - note __, 2 + rest 2 dec_octave note C#, 2 notetype1 6 note C#, 4 notetype1 3 note C#, 4 - note __, 2 + rest 2 notetype1 9 note C#, 2 + ;vibrato_type 8 notetype1 6 note D#, 4 note E_, 6 @@ -417,7 +424,8 @@ Music_TCGClub1_Ch2: note E_, 2 inc_octave inc_octave - dutycycle 2 + ;vibrato_type 1 + duty_cycle 2 notetype1 5 note C#, 1 note D_, 3 @@ -425,39 +433,39 @@ Music_TCGClub1_Ch2: dec_octave note A#, 4 note F#, 2 - note __, 4 + rest 4 inc_octave note C_, 1 note C#, 5 dec_octave dec_octave - dutycycle 0 + duty_cycle 0 notetype1 9 note D_, 2 - dutycycle 2 + duty_cycle 2 notetype1 5 inc_octave note A_, 4 note F#, 2 note E_, 4 note D_, 2 - note __, 4 + rest 4 note D#, 1 note E_, 3 - note __, 2 + rest 2 note E_, 2 note D#, 4 note D_, 6 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 9 note D_, 4 - note __, 2 + rest 2 dec_octave note A_, 2 - note __, 4 + rest 4 note A_, 2 - dutycycle 2 + duty_cycle 2 notetype1 5 inc_octave inc_octave @@ -466,47 +474,48 @@ Music_TCGClub1_Ch2: note D_, 2 note C#, 4 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 9 note D_, 4 - note __, 2 + rest 2 dec_octave note A_, 2 - note __, 4 + rest 4 note A_, 2 inc_octave inc_octave - dutycycle 2 + duty_cycle 2 notetype1 5 note E_, 1 note F_, 3 note D_, 2 note C#, 4 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 9 note D_, 4 - note __, 2 + rest 2 dec_octave note A_, 2 - note __, 4 + rest 4 note B_, 2 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 5 note E_, 4 note G#, 2 note B_, 4 inc_octave note E_, 2 - note __, 4 + rest 4 dec_octave - dutycycle 0 + ;vibrato_type 8 + duty_cycle 0 notetype1 6 note A#, 2 notetype1 3 note A#, 2 - note __, 2 + rest 2 inc_octave notetype1 6 note C_, 1 @@ -514,7 +523,7 @@ Music_TCGClub1_Ch2: dec_octave note B_, 6 note A#, 4 - note __, 2 + rest 2 note G#, 1 note A_, 5 notetype1 9 @@ -526,7 +535,7 @@ Music_TCGClub1_Ch2: dec_octave notetype1 9 note A_, 4 - note __, 2 + rest 2 notetype1 6 inc_octave note G#, 1 @@ -540,7 +549,7 @@ Music_TCGClub1_Ch2: dec_octave notetype1 9 note A_, 4 - note __, 2 + rest 2 inc_octave notetype1 6 note G#, 1 @@ -549,7 +558,7 @@ Music_TCGClub1_Ch2: note D_, 2 notetype1 6 note A_, 4 - note __, 2 + rest 2 note A_, 4 dec_octave notetype1 9 @@ -561,38 +570,45 @@ Music_TCGClub1_Ch2: dec_octave notetype1 9 note A_, 4 - note __, 2 + rest 2 note B_, 4 - note __, 2 + rest 2 inc_octave note D_, 2 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGClub1_Ch3: +Music_Club1_Ch3: ; f9ec4 (3e:5ec4) notetype0 5 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 96 + ;cutoff 7 octave 2 note A_, 2 - note __, 2 + rest 2 note E_, 2 note A_, 2 - note __, 4 + rest 4 note A#, 2 - note __, 2 + rest 2 note E_, 2 note A#, 2 - note __, 4 + rest 4 note B_, 2 + ;cutoff 4 note B_, 2 + ;cutoff 7 note F#, 2 note F_, 2 inc_octave + ;cutoff 4 note D_, 2 dec_octave + ;cutoff 7 note E_, 2 - note __, 4 + rest 4 inc_octave note E_, 6 dec_octave @@ -601,236 +617,312 @@ Music_TCGClub1_Ch3: octave 2 note A_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note C#, 6 note E_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note F_, 4 inc_octave + ;cutoff 4 note A#, 2 dec_octave + ;cutoff 7 note F#, 4 inc_octave + ;cutoff 4 note F#, 2 + ;cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave inc_octave + ;cutoff 4 note C#, 2 dec_octave dec_octave + ;cutoff 7 note F#, 6 - callchannel Branch_fa01a + sound_call Branch_fa01a octave 2 + ;cutoff 7 note A_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note C#, 6 note E_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note F_, 4 inc_octave inc_octave + ;cutoff 4 note C#, 2 dec_octave dec_octave + ;cutoff 7 note F#, 4 inc_octave + ;cutoff 4 note F#, 2 + ;cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave inc_octave + ;cutoff 4 note E_, 2 dec_octave dec_octave + ;cutoff 7 note F#, 6 - callchannel Branch_fa01a + sound_call Branch_fa01a octave 2 + ;cutoff 7 note D_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note D_, 4 - note __, 2 + rest 2 note D_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note D_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note D_, 4 inc_octave + ;cutoff 4 note F_, 2 dec_octave + ;cutoff 7 note D_, 4 - note __, 2 + rest 2 note D_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note D_, 4 inc_octave + ;cutoff 4 note F_, 2 dec_octave + ;cutoff 7 note C#, 4 inc_octave + ;cutoff 4 note E_, 2 dec_octave + ;cutoff 7 note C#, 6 note E_, 4 inc_octave inc_octave + ;cutoff 4 note E_, 2 dec_octave dec_octave + ;cutoff 7 note F_, 6 note F#, 4 inc_octave + ;cutoff 4 note A#, 2 + ;cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note F#, 6 note B_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note F#, 6 note A_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note A#, 4 inc_octave inc_octave + ;cutoff 4 note D_, 2 dec_octave dec_octave + ;cutoff 7 note B_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note F#, 6 note D_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note F#, 6 note E_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 6 note E_, 6 + ;cutoff 7 note E_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note E_, 4 inc_octave + ;cutoff 4 note F#, 2 + ;cutoff 7 note E_, 4 + ;cutoff 4 note G#, 2 dec_octave + ;cutoff 7 note E_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note F#, 4 inc_octave + ;cutoff 4 note G#, 2 dec_octave + ;cutoff 7 note G#, 4 inc_octave + ;cutoff 4 note B_, 2 - loopchannel 0, .MainLoop + ;cutoff 7 + sound_loop 0, .MainLoop Branch_fa01a: octave 2 note B_, 4 inc_octave + ;cutoff 4 note A_, 2 dec_octave + ;cutoff 7 note C#, 6 note D_, 4 inc_octave + ;cutoff 4 note F#, 2 dec_octave + ;cutoff 7 note D#, 6 note E_, 4 inc_octave + ;cutoff 4 note B_, 2 dec_octave + ;cutoff 7 note B_, 6 note G#, 4 inc_octave + ;cutoff 4 note B_, 2 dec_octave + ;cutoff 7 note E_, 4 inc_octave + ;cutoff 4 note E_, 2 - endchannel + sound_ret -Music_TCGClub1_Ch4: - togglenoise $06 - notetype 5 +Music_Club1_Ch4: ; fa044 (3e:6044) + toggle_noise 6 + drum_speed 5 octave 1 - note C_, 2 - note __, 2 - note C_, 2 - note C#, 2 - note D#, 2 - note E_, 2 - note C_, 2 - note __, 2 - note C_, 2 - note C#, 2 - note D#, 2 - note E_, 2 - note C#, 4 - note D_, 1 - note D_, 1 - note C#, 4 - note C#, 2 - note __, 4 - note D_, 1 - note D_, 1 - note C#, 4 - note C#, 2 + drum_note 1, 2 + rest 2 + drum_note 1, 2 + drum_note 2, 2 + drum_note 4, 2 + drum_note 5, 2 + drum_note 1, 2 + rest 2 + drum_note 1, 2 + drum_note 2, 2 + drum_note 4, 2 + drum_note 5, 2 + drum_note 2, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 4 + drum_note 2, 2 + rest 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 4 + drum_note 2, 2 .MainLoop - callchannel Branch_fa06f - note C_, 4 + sound_call Branch_fa06f + drum_note 1, 4 .Loop1 - note C#, 2 - loopchannel 4, .Loop1 - callchannel Branch_fa06f - note C_, 4 - note D_, 1 - note D_, 1 - note C#, 4 - note C#, 2 - loopchannel 0, .MainLoop + drum_note 2, 2 + sound_loop 4, .Loop1 + sound_call Branch_fa06f + drum_note 1, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 4 + drum_note 2, 2 + sound_loop 0, .MainLoop Branch_fa06f: .Loop2 - note C_, 4 - note D#, 2 - note C#, 4 - note D#, 2 - loopchannel 15, .Loop2 - endchannel - + drum_note 1, 4 + drum_note 4, 2 + drum_note 2, 4 + drum_note 4, 2 + sound_loop 15, .Loop2 + sound_ret +; 0xfa077 diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 9c16a635..5706dc9b 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -1,14 +1,13 @@ -Music_TCGClub2: - db $80 - dw Music_TCGClub2_Ch1 - db $01 - dw Music_TCGClub2_Ch2 - db $02 - dw Music_TCGClub2_Ch3 +Music_Club2: + channel_count 3 + channel 1, Music_Club2_Ch1 + channel 2, Music_Club2_Ch2 + channel 3, Music_Club2_Ch3 -Music_TCGClub2_Ch1: +Music_Club2_Ch1: ; fa077 (3e:6077) notetype0 6 - dutycycle 2 + duty_cycle 2 + ;stereo_panning 1, 1 notetype2 6 .MainLoop octave 4 @@ -20,6 +19,7 @@ Music_TCGClub2_Ch1: notetype1 7 notetype2 0 note F#, 4 + ;tie notetype2 6 note F#, 16 notetype1 7 @@ -29,9 +29,10 @@ Music_TCGClub2_Ch1: notetype1 7 notetype2 0 note F#, 4 + ;tie notetype2 6 note F#, 16 - loopchannel 8, .Loop1 + sound_loop 8, .Loop1 notetype1 7 note G_, 4 note D_, 4 @@ -41,6 +42,7 @@ Music_TCGClub2_Ch1: notetype1 7 notetype2 0 note B_, 4 + ;tie notetype2 6 note B_, 16 notetype1 7 @@ -50,6 +52,7 @@ Music_TCGClub2_Ch1: notetype1 7 notetype2 0 note B_, 4 + ;tie notetype2 6 note B_, 16 dec_octave @@ -88,23 +91,27 @@ Music_TCGClub2_Ch1: note F#, 4 note A_, 4 note A_, 3 + ;tie notetype0 1 note A_, 3 inc_octave notetype1 7 - note __, 4 + rest 4 note D_, 5 + ;tie notetype0 6 notetype2 0 note D_, 15 + ;tie notetype2 6 note D_, 16 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGClub2_Ch2: +Music_Club2_Ch2: ; fa0e3 (3e:60e3) notetype0 6 - dutycycle 2 + duty_cycle 2 + ;stereo_panning 1, 1 notetype2 6 .MainLoop octave 2 @@ -118,6 +125,7 @@ Music_TCGClub2_Ch2: notetype1 7 notetype2 0 note D_, 4 + ;tie notetype2 6 note D_, 16 dec_octave @@ -131,11 +139,12 @@ Music_TCGClub2_Ch2: notetype1 7 notetype2 0 note D_, 4 + ;tie notetype2 6 note D_, 16 dec_octave dec_octave - loopchannel 8, .Loop1 + sound_loop 8, .Loop1 dec_octave notetype1 7 note B_, 4 @@ -147,6 +156,7 @@ Music_TCGClub2_Ch2: notetype1 7 notetype2 0 note G_, 4 + ;tie notetype2 6 note G_, 16 dec_octave @@ -162,6 +172,7 @@ Music_TCGClub2_Ch2: notetype1 7 notetype2 0 note C_, 4 + ;tie notetype2 6 note C_, 16 dec_octave @@ -202,6 +213,7 @@ Music_TCGClub2_Ch2: inc_octave note D_, 4 note E_, 3 + ;tie notetype0 1 note E_, 3 dec_octave @@ -210,109 +222,148 @@ Music_TCGClub2_Ch2: inc_octave notetype1 7 note F#, 7 + ;tie notetype0 6 notetype2 0 note F#, 14 + ;tie notetype2 6 note F#, 16 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGClub2_Ch3: +Music_Club2_Ch3: ; fa164 (3e:6164) notetype0 6 notetype1 1 + ;stereo_panning 1, 1 notetype2 10 - vibrato 35, $33 + ;vibrato_type 4 + vibrato 35, 3, 3 + ;cutoff 6 + ;echo 64 .MainLoop notetype1 3 - note __, 2 + ;cutoff 8 + rest 2 octave 5 note G_, 4 note E_, 4 note C_, 4 note F#, 2 - note __, 2 - note __, 16 + rest 2 + rest 16 note G_, 4 note A_, 4 note B_, 4 note F#, 2 - note __, 2 - note __, 14 + rest 2 + rest 14 notetype1 2 - callchannel Branch_fa1cf + ;echo 96 + sound_call Branch_fa1cf octave 5 + ;cutoff 8 note G_, 8 - callchannel Branch_fa1cf + sound_call Branch_fa1cf + ;echo 64 notetype1 1 octave 4 + ;cutoff 8 note G_, 8 - callchannel Branch_fa1f3 + sound_call Branch_fa1f3 octave 4 note G_, 16 + ;tie note G_, 12 - note __, 16 - note __, 8 + rest 16 + rest 8 + ;cutoff 8 note E_, 8 - callchannel Branch_fa1f3 + sound_call Branch_fa1f3 octave 4 note G_, 16 + ;tie note G_, 12 + ;tie note G_, 16 + ;tie note G_, 8 - note __, 4 + rest 4 + ;cutoff 8 note A_, 2 note G_, 2 + ;cutoff 6 note F#, 16 + ;tie note F#, 12 - note __, 4 + rest 4 note F#, 1 + ;tie note G_, 15 + ;tie note G_, 12 - note __, 4 + rest 4 note G#, 1 + ;tie note A_, 15 + ;tie note A_, 16 - note __, 16 - note __, 16 - loopchannel 0, .MainLoop + rest 16 + rest 16 + ;echo 96 + sound_loop 0, .MainLoop Branch_fa1cf: + ;cutoff 6 octave 6 note C#, 1 + ;tie note D_, 15 + ;tie note D_, 12 + ;cutoff 8 note C_, 2 dec_octave note B_, 2 + ;cutoff 6 note G_, 16 + ;tie note G_, 8 - note __, 4 + rest 4 + ;cutoff 8 note E_, 4 note B_, 4 inc_octave note C_, 4 dec_octave note B_, 4 + ;cutoff 6 note A_, 16 + ;tie note A_, 8 + ;tie note A_, 16 - note __, 4 - endchannel + rest 4 + sound_ret Branch_fa1f3: octave 5 note C#, 1 + ;tie note D_, 15 + ;tie note D_, 4 note E_, 4 dec_octave note B_, 4 inc_octave note C_, 4 + ;cutoff 6 note D_, 16 + ;tie note D_, 8 - note __, 4 + rest 4 + ;cutoff 8 note C_, 2 dec_octave note B_, 2 @@ -320,5 +371,6 @@ Branch_fa1f3: note C_, 2 dec_octave note B_, 2 - endchannel - + ;cutoff 6 + sound_ret +; 0xfa210 diff --git a/crysaudio/music/TCG/club3.asm b/crysaudio/music/TCG/club3.asm index dcb10b6a..b3f81b42 100644 --- a/crysaudio/music/TCG/club3.asm +++ b/crysaudio/music/TCG/club3.asm @@ -1,23 +1,22 @@ -Music_TCGClub3: - db $C0 - dw Music_TCGClub3_Ch1 - db $01 - dw Music_TCGClub3_Ch2 - db $02 - dw Music_TCGClub3_Ch3 - db $03 - dw Music_TCGClub3_Ch4 +Music_Club3: + channel_count 4 + channel 1, Music_Club3_Ch1 + channel 2, Music_Club3_Ch2 + channel 3, Music_Club3_Ch3 + channel 4, Music_Club3_Ch4 -Music_TCGClub3_Ch1: +Music_Club3_Ch1: ; fa210 (3e:6210) notetype0 9 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 5 + vibrato 20, 3, 3 notetype2 8 .MainLoop - dutycycle 0 + duty_cycle 0 .Loop1 octave 2 notetype1 9 - note __, 4 + rest 4 note G_, 2 notetype1 3 note G_, 1 @@ -29,10 +28,11 @@ Music_TCGClub3_Ch1: dec_octave notetype1 9 note A#, 6 + ;tie note A#, 12 notetype1 3 note A#, 4 - note __, 4 + rest 4 notetype1 9 note G_, 2 notetype1 3 @@ -41,7 +41,9 @@ Music_TCGClub3_Ch1: notetype1 9 notetype0 1 note C_, 5 + ;tie note C#, 4 + ;tie notetype0 9 note C_, 1 notetype1 3 @@ -49,15 +51,16 @@ Music_TCGClub3_Ch1: dec_octave notetype1 9 note A#, 6 + ;tie note A#, 12 notetype1 3 note A#, 4 - loopchannel 2, .Loop1 - dutycycle 1 + sound_loop 2, .Loop1 + duty_cycle 1 notetype1 9 notetype2 7 - callchannel Branch_fa330 - callchannel Branch_fa403 + sound_call Branch_fa330 + sound_call Branch_fa403 note A#, 1 note F_, 1 note F#, 1 @@ -96,8 +99,8 @@ Music_TCGClub3_Ch1: note A#, 1 notetype1 9 notetype2 7 - callchannel Branch_fa330 - callchannel Branch_fa403 + sound_call Branch_fa330 + sound_call Branch_fa403 inc_octave note D_, 1 dec_octave @@ -125,7 +128,7 @@ Music_TCGClub3_Ch1: octave 2 note G_, 1 octave 4 - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 notetype2 8 @@ -139,11 +142,11 @@ Music_TCGClub3_Ch1: note C_, 5 dec_octave note A#, 4 - dutycycle 1 + duty_cycle 1 notetype2 7 notetype0 9 - callchannel Branch_fa370 - callchannel Branch_fa403 + sound_call Branch_fa370 + sound_call Branch_fa403 note A#, 1 note F_, 1 note F#, 1 @@ -180,8 +183,8 @@ Music_TCGClub3_Ch1: note C_, 1 dec_octave note A#, 1 - callchannel Branch_fa370 - callchannel Branch_fa403 + sound_call Branch_fa370 + sound_call Branch_fa403 inc_octave note D_, 1 dec_octave @@ -209,7 +212,7 @@ Music_TCGClub3_Ch1: dec_octave note A#, 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype0 1 notetype2 8 notetype1 7 @@ -225,7 +228,7 @@ Music_TCGClub3_Ch1: note A#, 4 notetype0 9 notetype2 8 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_fa330: octave 2 @@ -287,7 +290,7 @@ Branch_fa330: dec_octave note F_, 1 note F#, 1 - endchannel + sound_ret Branch_fa370: octave 2 @@ -317,7 +320,7 @@ Branch_fa370: note F_, 5 note F#, 4 octave 4 - dutycycle 2 + duty_cycle 2 notetype1 7 note G_, 3 notetype1 1 @@ -358,7 +361,7 @@ Branch_fa370: notetype1 1 note G_, 2 notetype0 9 - dutycycle 1 + duty_cycle 1 notetype2 7 notetype1 9 octave 2 @@ -384,7 +387,7 @@ Branch_fa370: octave 2 note G_, 1 octave 5 - dutycycle 2 + duty_cycle 2 notetype0 1 notetype2 8 notetype1 7 @@ -400,10 +403,10 @@ Branch_fa370: dec_octave note A#, 4 notetype0 9 - dutycycle 1 + duty_cycle 1 notetype2 7 notetype1 9 - endchannel + sound_ret Branch_fa403: octave 2 @@ -433,19 +436,21 @@ Branch_fa403: notetype0 9 notetype2 7 note G_, 1 - endchannel + sound_ret -Music_TCGClub3_Ch2: +Music_Club3_Ch2: ; fa423 (3e:6423) notetype0 9 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 5 + vibrato 20, 3, 3 notetype2 8 .MainLoop - dutycycle 0 + duty_cycle 0 .Loop1 octave 2 notetype1 7 - note __, 4 + rest 4 note D_, 2 notetype1 3 note D_, 1 @@ -455,10 +460,11 @@ Music_TCGClub3_Ch2: note F_, 2 notetype1 7 note E_, 6 + ;tie note E_, 12 notetype1 3 note E_, 4 - note __, 4 + rest 4 notetype1 7 note D_, 2 notetype1 3 @@ -466,6 +472,7 @@ Music_TCGClub3_Ch2: notetype1 7 notetype0 1 note F_, 5 + ;tie note F#, 4 notetype0 9 note F_, 1 @@ -473,15 +480,16 @@ Music_TCGClub3_Ch2: note F_, 1 notetype1 7 note E_, 6 + ;tie note E_, 12 notetype1 3 note E_, 4 - loopchannel 2, .Loop1 - dutycycle 1 + sound_loop 2, .Loop1 + duty_cycle 1 .Loop2 - callchannel Branch_fa5a6 + sound_call Branch_fa5a6 notetype0 9 - note __, 1 + rest 1 inc_octave notetype1 8 notetype0 1 @@ -522,7 +530,7 @@ Music_TCGClub3_Ch2: note D_, 4 notetype1 9 notetype0 9 - note __, 1 + rest 1 dec_octave notetype0 1 notetype2 8 @@ -540,7 +548,7 @@ Music_TCGClub3_Ch2: note D_, 4 notetype0 9 notetype1 8 - note __, 1 + rest 1 dec_octave notetype0 1 note D_, 5 @@ -580,7 +588,7 @@ Music_TCGClub3_Ch2: notetype1 3 note C_, 4 notetype0 9 - note __, 1 + rest 1 dec_octave notetype1 8 notetype2 8 @@ -588,9 +596,9 @@ Music_TCGClub3_Ch2: note B_, 1 inc_octave note C_, 1 - callchannel Branch_fa5a6 + sound_call Branch_fa5a6 notetype0 9 - note __, 1 + rest 1 inc_octave notetype0 1 notetype1 8 @@ -628,7 +636,7 @@ Music_TCGClub3_Ch2: notetype1 3 note G_, 4 notetype0 9 - note __, 1 + rest 1 dec_octave dec_octave notetype0 1 @@ -642,8 +650,8 @@ Music_TCGClub3_Ch2: notetype1 3 note D_, 4 notetype0 9 - note __, 1 - note __, 1 + rest 1 + rest 1 notetype0 1 notetype1 8 note D_, 5 @@ -683,18 +691,18 @@ Music_TCGClub3_Ch2: note F_, 4 notetype1 8 notetype0 9 - note __, 1 + rest 1 dec_octave notetype2 8 note D_, 1 note D#, 1 note E_, 1 - loopchannel 2, .Loop2 - loopchannel 0, .MainLoop + sound_loop 2, .Loop2 + sound_loop 0, .MainLoop Branch_fa5a6: octave 3 - note __, 1 + rest 1 notetype1 8 notetype0 1 note D_, 5 @@ -733,7 +741,7 @@ Branch_fa5a6: note D_, 4 notetype1 8 notetype0 9 - note __, 1 + rest 1 dec_octave notetype0 1 notetype2 8 @@ -750,7 +758,7 @@ Branch_fa5a6: notetype1 3 note D_, 4 notetype0 9 - note __, 1 + rest 1 dec_octave notetype0 1 notetype1 8 @@ -794,267 +802,309 @@ Branch_fa5a6: note A#, 1 notetype1 3 note A#, 2 - endchannel + sound_ret -Music_TCGClub3_Ch3: +Music_Club3_Ch3: ; fa63e (3e:663e) notetype0 9 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 0 + ;cutoff 8 .Loop1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 14 - note __, 1 + rest 1 inc_octave note F_, 1 - note __, 2 + rest 2 note G_, 1 - note __, 2 + rest 2 dec_octave note G_, 1 - note __, 1 + rest 1 note E_, 3 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - loopchannel 4, .Loop1 + rest 1 + sound_loop 4, .Loop1 .Loop2 octave 2 note G_, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note G_, 1 inc_octave note F_, 1 note G_, 1 - note __, 1 + rest 1 dec_octave note G_, 1 - note __, 1 + rest 1 inc_octave note G_, 1 - note __, 1 + rest 1 octave 5 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note E_, 1 note F_, 1 octave 5 + ;cutoff 4 note G_, 1 octave 2 + ;cutoff 8 note G_, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note G_, 1 inc_octave note F_, 1 note G_, 1 - note __, 1 + rest 1 dec_octave note G_, 1 - note __, 1 + rest 1 inc_octave note G_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 4 note F_, 1 - note __, 1 + rest 1 + ;cutoff 8 note E_, 1 octave 2 note F_, 1 note F#, 1 note D#, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note D#, 1 inc_octave note D_, 1 note D#, 1 - note __, 1 + rest 1 dec_octave note D#, 1 - note __, 1 + rest 1 inc_octave note D#, 1 - note __, 1 + rest 1 octave 5 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note C_, 1 note C#, 1 octave 5 + ;cutoff 4 note G_, 1 octave 2 + ;cutoff 8 note D#, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note D#, 1 inc_octave note D_, 1 note D#, 1 - note __, 1 + rest 1 dec_octave note D#, 1 - note __, 1 + rest 1 inc_octave note D#, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 4 note F_, 1 - note __, 1 + rest 1 dec_octave + ;cutoff 8 note D_, 1 note D#, 1 note E_, 1 dec_octave note C_, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note C_, 1 note A#, 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave note C_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - note __, 1 + rest 1 octave 5 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note A_, 1 note A#, 1 octave 5 + ;cutoff 4 note G_, 1 octave 2 + ;cutoff 8 note C_, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note C_, 1 note A#, 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave note C_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 4 note F_, 1 - note __, 1 + rest 1 + ;cutoff 8 note E_, 1 octave 2 note A#, 1 note B_, 1 note D_, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note D_, 1 inc_octave note C_, 1 note D_, 1 - note __, 1 + rest 1 dec_octave note D_, 1 - note __, 1 + rest 1 inc_octave note D_, 1 - note __, 1 + rest 1 octave 5 + ;cutoff 4 note C_, 1 - note __, 1 + rest 1 octave 3 + ;cutoff 6 note A#, 1 dec_octave + ;cutoff 8 note C_, 1 note C#, 1 note D_, 1 octave 4 + ;cutoff 4 note G_, 1 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note D_, 1 inc_octave note C_, 1 note D_, 1 - note __, 1 + rest 1 dec_octave note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 4 note A#, 1 - note __, 1 + rest 1 dec_octave + ;cutoff 8 note A#, 1 note B_, 1 inc_octave note C_, 1 - loopchannel 2, .Loop2 - loopchannel 0, Music_TCGClub3_Ch3 + sound_loop 2, .Loop2 + sound_loop 0, Music_Club3_Ch3 -Music_TCGClub3_Ch4: - togglenoise $06 - notetype 9 +Music_Club3_Ch4: ; fa772 (3e:6772) + toggle_noise 6 + drum_speed 9 octave 1 .MainLoop .Loop1 - callchannel Branch_fa796 - note C#, 2 - note E_, 2 - callchannel Branch_fa796 - note C#, 2 - note D#, 1 - note C#, 1 - loopchannel 3, .Loop1 - callchannel Branch_fa796 - note C#, 2 - note E_, 2 - callchannel Branch_fa796 - note C#, 1 - notetype 1 - note D#, 5 - note C#, 4 - notetype 9 - note C#, 1 - note C#, 1 - loopchannel 0, .MainLoop + sound_call Branch_fa796 + drum_note 2, 2 + drum_note 5, 2 + sound_call Branch_fa796 + drum_note 2, 2 + drum_note 4, 1 + drum_note 2, 1 + sound_loop 3, .Loop1 + sound_call Branch_fa796 + drum_note 2, 2 + drum_note 5, 2 + sound_call Branch_fa796 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 2, 4 + drum_speed 9 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .MainLoop Branch_fa796: - note C_, 2 - note D#, 2 - note C#, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note E_, 1 - note C_, 1 - endchannel - + drum_note 1, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 1 + drum_note 1, 1 + sound_ret +; 0xfa7a0 diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index 857086f3..be7dd53c 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -1,23 +1,23 @@ Music_TCGCredits: - db $C0 - dw Music_TCGCredits_Ch1 - db $01 - dw Music_TCGCredits_Ch2 - db $02 - dw Music_TCGCredits_Ch3 - db $03 - dw Music_TCGCredits_Ch4 + channel_count 4 + channel 1, Music_TCGCredits_Ch1 + channel 2, Music_TCGCredits_Ch2 + channel 3, Music_TCGCredits_Ch3 + channel 4, Music_TCGCredits_Ch4 -Music_TCGCredits_Ch1: +Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) notetype0 13 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 2 - dutycycle 1 + duty_cycle 1 notetype1 5 note F_, 1 notetype1 6 note F_, 2 + ;tie notetype0 1 note F_, 6 notetype1 3 @@ -27,6 +27,7 @@ Music_TCGCredits_Ch1: note G_, 1 notetype1 7 note G_, 2 + ;tie notetype0 1 note G_, 6 notetype1 4 @@ -36,6 +37,7 @@ Music_TCGCredits_Ch1: note A_, 1 notetype1 8 note A_, 2 + ;tie notetype0 1 note A_, 6 notetype1 4 @@ -50,16 +52,18 @@ Music_TCGCredits_Ch1: note C_, 1 notetype1 3 note C_, 1 - callchannel Branch_fb5bc + sound_call Branch_fb5bc octave 2 note F_, 1 notetype1 3 note F_, 1 + ; + ;sound_call Branch_fb36b notetype0 13 octave 2 notetype1 8 note A_, 1 - note __, 1 + rest 1 note G_, 1 notetype1 3 note G_, 1 @@ -70,8 +74,8 @@ Music_TCGCredits_Ch1: note C_, 1 notetype1 3 note C_, 1 - note __, 1 - callchannel Branch_fb5bc + rest 1 + sound_call Branch_fb5bc octave 2 note A_, 2 note A_, 1 @@ -84,7 +88,7 @@ Music_TCGCredits_Ch1: notetype1 8 note B_, 1 inc_octave - callchannel Branch_fb5e4 + sound_call Branch_fb5e4 octave 4 notetype1 10 note C_, 1 @@ -93,6 +97,7 @@ Music_TCGCredits_Ch1: dec_octave notetype1 10 note G_, 4 + ;tie note G_, 8 notetype1 3 note G_, 1 @@ -106,6 +111,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 4 notetype1 3 @@ -118,9 +124,11 @@ Music_TCGCredits_Ch1: notetype0 1 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 2 note E_, 1 + ;tie notetype0 1 note E_, 6 note F_, 4 @@ -132,12 +140,14 @@ Music_TCGCredits_Ch1: notetype1 10 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 4 + ;tie note D_, 8 notetype1 3 note D_, 2 - callchannel Branch_fb5e4 + sound_call Branch_fb5e4 octave 4 notetype1 10 note E_, 1 @@ -146,6 +156,7 @@ Music_TCGCredits_Ch1: dec_octave notetype1 10 note G_, 4 + ;tie note G_, 8 notetype1 3 note G_, 1 @@ -159,6 +170,7 @@ Music_TCGCredits_Ch1: notetype1 10 note G_, 3 note G#, 10 + ;tie note G#, 13 notetype1 3 note G#, 13 @@ -176,6 +188,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 2 note F_, 1 @@ -190,9 +203,10 @@ Music_TCGCredits_Ch1: notetype0 1 note D#, 3 note E_, 10 + ;tie notetype0 13 note E_, 8 - callchannel Branch_fb60c + sound_call Branch_fb60c notetype0 13 octave 4 note G_, 8 @@ -230,7 +244,7 @@ Music_TCGCredits_Ch1: note F_, 6 notetype1 3 note F_, 13 - note __, 7 + rest 7 notetype1 10 note A_, 13 inc_octave @@ -240,6 +254,7 @@ Music_TCGCredits_Ch1: notetype1 10 note D#, 3 note E_, 10 + ;tie note E_, 13 note F_, 6 notetype1 3 @@ -252,10 +267,11 @@ Music_TCGCredits_Ch1: note C_, 6 notetype1 3 note C_, 13 - note __, 7 + rest 7 notetype1 10 note C#, 3 note D_, 10 + ;tie note D_, 13 note C#, 6 note C_, 7 @@ -272,7 +288,7 @@ Music_TCGCredits_Ch1: notetype1 10 notetype0 13 note E_, 5 - callchannel Branch_fb60c + sound_call Branch_fb60c notetype0 13 octave 4 note G_, 3 @@ -311,6 +327,7 @@ Music_TCGCredits_Ch1: notetype1 10 note E_, 3 note F_, 10 + ;tie note F_, 13 note E_, 13 note C_, 6 @@ -321,7 +338,7 @@ Music_TCGCredits_Ch1: note A_, 6 notetype1 3 note A_, 7 - note __, 13 + rest 13 inc_octave notetype1 10 note C_, 13 @@ -333,6 +350,7 @@ Music_TCGCredits_Ch1: notetype1 10 note E_, 3 note F_, 10 + ;tie note F_, 13 note E_, 13 note C_, 6 @@ -343,16 +361,17 @@ Music_TCGCredits_Ch1: note G#, 6 notetype1 3 note G#, 7 - note __, 13 + rest 13 inc_octave notetype1 10 note C_, 6 notetype1 3 note C_, 7 - note __, 13 + rest 13 notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 8 notetype1 3 @@ -380,11 +399,12 @@ Music_TCGCredits_Ch1: note E_, 3 note F_, 3 note G_, 4 - callchannel Branch_fb651 + sound_call Branch_fb651 octave 3 notetype1 10 note G#, 3 note A_, 10 + ;tie note A_, 13 notetype1 3 note A_, 13 @@ -401,6 +421,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie note G_, 13 notetype1 3 note G_, 13 @@ -417,8 +438,10 @@ Music_TCGCredits_Ch1: notetype1 10 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 4 + ;tie note D_, 8 notetype1 3 note D_, 1 @@ -433,11 +456,12 @@ Music_TCGCredits_Ch1: note B_, 6 notetype1 2 note B_, 7 - callchannel Branch_fb651 + sound_call Branch_fb651 octave 3 notetype1 10 note G_, 3 note G#, 10 + ;tie note G#, 13 notetype1 3 note G#, 13 @@ -455,6 +479,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 2 note F_, 1 @@ -465,11 +490,13 @@ Music_TCGCredits_Ch1: note D_, 1 notetype1 3 note D_, 1 + ; octave 4 notetype1 10 notetype0 1 note D#, 3 note E_, 10 + ;tie notetype0 13 note E_, 4 notetype1 3 @@ -502,11 +529,12 @@ Music_TCGCredits_Ch1: note A_, 6 notetype1 3 note A_, 13 - note __, 7 + rest 7 inc_octave notetype1 10 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 2 notetype1 3 @@ -524,6 +552,7 @@ Music_TCGCredits_Ch1: notetype0 1 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 3 notetype1 3 @@ -542,13 +571,15 @@ Music_TCGCredits_Ch1: note B_, 3 inc_octave note C_, 10 + ;tie notetype0 13 note C_, 2 + ;tie notetype0 1 note C_, 6 notetype1 3 note C_, 13 - note __, 7 + rest 7 dec_octave notetype1 10 note B_, 3 @@ -569,42 +600,49 @@ Music_TCGCredits_Ch1: note C_, 6 notetype1 3 note C_, 13 - note __, 7 + rest 7 dec_octave notetype1 10 note A_, 6 notetype1 3 note A_, 13 - note __, 7 + rest 7 notetype1 10 note B_, 3 inc_octave note C_, 10 + ;tie notetype0 13 note C_, 2 + ;tie notetype0 1 note C_, 6 notetype1 3 note C_, 13 - note __, 7 + rest 7 notetype1 10 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 2 notetype1 3 note D_, 1 notetype1 10 note C_, 8 + ;tie note C_, 8 + ;tie note C_, 8 notetype1 3 note C_, 1 + ; + ;sound_call Branch_fb36b notetype0 13 octave 2 notetype1 8 note A_, 1 - note __, 1 + rest 1 note G_, 1 notetype1 3 note G_, 1 @@ -615,8 +653,8 @@ Music_TCGCredits_Ch1: note C_, 1 notetype1 3 note C_, 1 - note __, 1 - callchannel Branch_fb5bc + rest 1 + sound_call Branch_fb5bc octave 2 note A_, 2 note A_, 1 @@ -629,7 +667,7 @@ Music_TCGCredits_Ch1: notetype1 8 note B_, 1 inc_octave - callchannel Branch_fb5e4 + sound_call Branch_fb5e4 octave 4 notetype1 10 note C_, 1 @@ -638,6 +676,7 @@ Music_TCGCredits_Ch1: dec_octave notetype1 10 note G_, 4 + ;tie note G_, 8 notetype1 3 note G_, 1 @@ -651,6 +690,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 4 notetype1 3 @@ -663,9 +703,11 @@ Music_TCGCredits_Ch1: notetype0 1 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 2 note E_, 1 + ;tie notetype0 1 note E_, 6 note F_, 4 @@ -677,12 +719,14 @@ Music_TCGCredits_Ch1: notetype1 10 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 4 + ;tie note D_, 8 notetype1 3 note D_, 2 - callchannel Branch_fb5e4 + sound_call Branch_fb5e4 octave 4 notetype1 10 note E_, 1 @@ -691,6 +735,7 @@ Music_TCGCredits_Ch1: dec_octave notetype1 10 note G_, 4 + ;tie note G_, 8 notetype1 3 note G_, 1 @@ -704,6 +749,7 @@ Music_TCGCredits_Ch1: notetype1 10 note G_, 3 note G#, 10 + ;tie note G#, 13 notetype1 3 note G#, 13 @@ -721,6 +767,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 2 note F_, 1 @@ -735,9 +782,10 @@ Music_TCGCredits_Ch1: notetype0 1 note D#, 3 note E_, 10 + ;tie notetype0 13 note E_, 8 - callchannel Branch_fb60c + sound_call Branch_fb60c notetype0 13 octave 4 note G_, 8 @@ -775,7 +823,7 @@ Music_TCGCredits_Ch1: note F_, 6 notetype1 3 note F_, 13 - note __, 7 + rest 7 notetype1 10 note A_, 13 inc_octave @@ -785,6 +833,7 @@ Music_TCGCredits_Ch1: notetype1 10 note D#, 3 note E_, 10 + ;tie note E_, 13 note F_, 6 notetype1 3 @@ -797,10 +846,11 @@ Music_TCGCredits_Ch1: note C_, 6 notetype1 3 note C_, 13 - note __, 7 + rest 7 notetype1 10 note C#, 3 note D_, 10 + ;tie note D_, 13 note C#, 6 note C_, 7 @@ -817,7 +867,7 @@ Music_TCGCredits_Ch1: notetype1 10 notetype0 13 note E_, 5 - callchannel Branch_fb60c + sound_call Branch_fb60c notetype0 13 octave 4 note G_, 3 @@ -856,6 +906,7 @@ Music_TCGCredits_Ch1: notetype1 10 note E_, 3 note F_, 10 + ;tie note F_, 13 note E_, 13 note C_, 6 @@ -866,7 +917,7 @@ Music_TCGCredits_Ch1: note A_, 6 notetype1 3 note A_, 7 - note __, 13 + rest 13 inc_octave notetype1 10 note C_, 13 @@ -878,6 +929,7 @@ Music_TCGCredits_Ch1: notetype1 10 note E_, 3 note F_, 10 + ;tie note F_, 13 note E_, 13 note C_, 6 @@ -888,16 +940,17 @@ Music_TCGCredits_Ch1: note G#, 6 notetype1 3 note G#, 7 - note __, 13 + rest 13 inc_octave notetype1 10 note C_, 6 notetype1 3 note C_, 7 - note __, 13 + rest 13 notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 8 notetype1 3 @@ -925,11 +978,12 @@ Music_TCGCredits_Ch1: note E_, 3 note F_, 3 note G_, 4 - callchannel Branch_fb651 + sound_call Branch_fb651 octave 3 notetype1 10 note G#, 3 note A_, 10 + ;tie note A_, 13 notetype1 3 note A_, 13 @@ -946,6 +1000,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie note G_, 13 notetype1 3 note G_, 13 @@ -962,8 +1017,10 @@ Music_TCGCredits_Ch1: notetype1 10 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 4 + ;tie note D_, 8 notetype1 3 note D_, 1 @@ -978,11 +1035,12 @@ Music_TCGCredits_Ch1: note B_, 6 notetype1 2 note B_, 7 - callchannel Branch_fb651 + sound_call Branch_fb651 octave 3 notetype1 10 note G_, 3 note G#, 10 + ;tie note G#, 13 notetype1 3 note G#, 13 @@ -1000,6 +1058,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 2 note F_, 1 @@ -1010,11 +1069,13 @@ Music_TCGCredits_Ch1: note D_, 1 notetype1 3 note D_, 1 + ; octave 4 notetype0 1 notetype1 10 note D_, 3 note D#, 10 + ;tie notetype0 13 note D#, 4 notetype1 3 @@ -1028,6 +1089,7 @@ Music_TCGCredits_Ch1: notetype1 10 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 3 notetype1 3 @@ -1041,6 +1103,7 @@ Music_TCGCredits_Ch1: notetype1 10 note F#, 3 note G_, 10 + ;tie notetype0 13 note G_, 4 dec_octave @@ -1060,44 +1123,45 @@ Music_TCGCredits_Ch1: note D_, 7 notetype0 13 note E_, 8 + ;tie note E_, 1 notetype1 3 note E_, 2 - endchannel + sound_ret Branch_fb5bc: octave 2 notetype0 13 - note __, 2 + rest 2 notetype1 8 note G_, 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave note A_, 1 notetype1 3 note A_, 1 - note __, 2 + rest 2 notetype1 8 note B_, 1 notetype1 3 note B_, 1 notetype1 8 note A_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 notetype1 3 note C_, 1 - note __, 3 + rest 3 dec_octave notetype1 8 note G_, 1 inc_octave note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Branch_fb5e4: octave 3 @@ -1122,11 +1186,12 @@ Branch_fb5e4: notetype0 1 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 4 notetype1 3 note D_, 1 - endchannel + sound_ret Branch_fb60c: octave 4 @@ -1152,6 +1217,7 @@ Branch_fb60c: notetype0 1 note G#, 3 note A_, 10 + ;tie notetype0 13 note A_, 8 notetype1 3 @@ -1173,7 +1239,8 @@ Branch_fb60c: notetype1 10 note F#, 3 note G_, 10 - endchannel + ;tie + sound_ret Branch_fb651: octave 3 @@ -1191,16 +1258,19 @@ Branch_fb651: notetype1 10 note C#, 3 note D_, 10 + ;tie note D_, 13 note C_, 6 notetype1 3 note C_, 13 - note __, 7 + rest 7 dec_octave notetype0 13 notetype1 10 note G_, 6 + ;tie note G_, 6 + ;tie note G_, 8 notetype1 3 note G_, 1 @@ -1215,19 +1285,22 @@ Branch_fb651: note G_, 5 notetype1 3 note G_, 8 - endchannel + sound_ret -Music_TCGCredits_Ch2: - vibrato 20, $33 +Music_TCGCredits_Ch2: ; fb68a (3e:768a) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 - dutycycle 1 + duty_cycle 1 octave 2 notetype0 13 notetype1 4 note A_, 1 notetype1 7 note A_, 2 + ;tie notetype0 1 note A_, 6 notetype1 2 @@ -1237,6 +1310,7 @@ Music_TCGCredits_Ch2: note B_, 1 notetype1 8 note B_, 2 + ;tie notetype0 1 note B_, 6 notetype1 3 @@ -1247,6 +1321,7 @@ Music_TCGCredits_Ch2: note C_, 1 notetype1 9 note C_, 2 + ;tie notetype0 1 note C_, 6 notetype1 3 @@ -1256,13 +1331,15 @@ Music_TCGCredits_Ch2: note D_, 3 notetype1 3 note D_, 1 + ; + ;sound_call Branch_fb79e notetype0 13 octave 3 notetype1 9 note E_, 1 notetype1 3 note E_, 1 - callchannel Branch_fba68 + sound_call Branch_fba68 octave 2 notetype1 9 note A_, 1 @@ -1285,13 +1362,14 @@ Music_TCGCredits_Ch2: note E_, 1 notetype1 3 note E_, 1 - note __, 1 - callchannel Branch_fba68 + rest 1 + sound_call Branch_fba68 notetype1 9 octave 3 notetype0 1 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 1 note E_, 1 @@ -1304,34 +1382,34 @@ Music_TCGCredits_Ch2: notetype1 9 note D_, 3 notetype1 9 - dutycycle 1 + duty_cycle 1 .Loop1 - note __, 2 + rest 2 note C_, 1 - note __, 1 - loopchannel 2, .Loop1 + rest 1 + sound_loop 2, .Loop1 .Loop2 - note __, 2 + rest 2 note D_, 1 - note __, 1 - loopchannel 2, .Loop2 - note __, 2 + rest 1 + sound_loop 2, .Loop2 + rest 2 note C_, 1 - note __, 2 - callchannel Branch_fba9d - note __, 2 - dutycycle 1 + rest 2 + sound_call Branch_fba9d + rest 2 + duty_cycle 1 notetype1 9 octave 3 note C_, 1 - note __, 1 + rest 1 .Loop3 - note __, 2 + rest 2 note C_, 1 - note __, 1 - loopchannel 4, .Loop3 - note __, 2 - dutycycle 2 + rest 1 + sound_loop 4, .Loop3 + rest 2 + duty_cycle 2 notetype1 7 notetype0 1 note E_, 3 @@ -1350,22 +1428,23 @@ Music_TCGCredits_Ch2: note E_, 8 dec_octave notetype1 9 - dutycycle 1 + duty_cycle 1 note C_, 13 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note E_, 3 note F_, 10 + ;tie note F_, 13 note E_, 5 note F_, 4 note E_, 4 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 - dutycycle 2 + duty_cycle 2 notetype1 7 note A_, 5 notetype1 2 @@ -1379,18 +1458,19 @@ Music_TCGCredits_Ch2: note C#, 3 note D_, 10 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 - note __, 13 + rest 13 dec_octave notetype1 8 note B_, 3 inc_octave note C_, 10 + ;tie notetype0 13 note C_, 3 - note __, 1 + rest 1 note E_, 1 notetype1 9 note C_, 1 @@ -1398,20 +1478,21 @@ Music_TCGCredits_Ch2: notetype1 8 note A#, 3 note B_, 10 + ;tie notetype0 13 note B_, 4 - note __, 1 + rest 1 inc_octave note C_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note D_, 1 notetype1 8 note E_, 5 - note __, 1 - callchannel Branch_fba9d - dutycycle 1 + rest 1 + sound_call Branch_fba9d + duty_cycle 1 octave 3 note C_, 1 note D_, 1 @@ -1421,11 +1502,12 @@ Music_TCGCredits_Ch2: notetype1 8 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 note F_, 1 notetype1 9 @@ -1435,13 +1517,14 @@ Music_TCGCredits_Ch2: notetype0 1 note D_, 3 note D#, 10 + ;tie notetype0 13 note D#, 2 dec_octave dec_octave notetype1 9 note G#, 1 - note __, 1 + rest 1 inc_octave notetype1 8 note G#, 1 @@ -1456,7 +1539,7 @@ Music_TCGCredits_Ch2: dec_octave notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 8 notetype0 1 note F#, 3 @@ -1469,8 +1552,8 @@ Music_TCGCredits_Ch2: note B_, 1 notetype2 8 note A#, 1 - note __, 1 - callchannel Branch_fbacb + rest 1 + sound_call Branch_fbacb octave 3 notetype1 9 notetype2 8 @@ -1481,7 +1564,7 @@ Music_TCGCredits_Ch2: inc_octave note C_, 10 notetype0 13 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -1489,7 +1572,7 @@ Music_TCGCredits_Ch2: inc_octave notetype1 8 note C_, 1 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -1507,7 +1590,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note D_, 1 - note __, 1 + rest 1 notetype2 8 note F_, 1 notetype1 9 @@ -1524,7 +1607,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note A_, 1 - note __, 1 + rest 1 notetype2 8 note B_, 1 notetype1 9 @@ -1553,13 +1636,13 @@ Music_TCGCredits_Ch2: note B_, 1 notetype2 6 note A#, 2 - callchannel Branch_fbacb + sound_call Branch_fbacb octave 4 note G_, 1 notetype2 8 note E_, 1 notetype0 13 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -1567,7 +1650,7 @@ Music_TCGCredits_Ch2: inc_octave notetype1 8 note C_, 1 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -1584,7 +1667,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note F_, 1 - note __, 1 + rest 1 notetype2 8 note A_, 1 notetype1 9 @@ -1601,7 +1684,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note F_, 1 - note __, 1 + rest 1 note G#, 1 notetype2 8 notetype1 9 @@ -1611,9 +1694,10 @@ Music_TCGCredits_Ch2: note B_, 3 inc_octave note C_, 10 + ;tie notetype0 13 note C_, 3 - note __, 1 + rest 1 dec_octave note A_, 1 inc_octave @@ -1627,7 +1711,7 @@ Music_TCGCredits_Ch2: notetype1 8 note A#, 3 note B_, 10 - note __, 13 + rest 13 dec_octave notetype1 9 note A#, 3 @@ -1644,11 +1728,11 @@ Music_TCGCredits_Ch2: note D_, 2 notetype1 2 note D_, 1 - callchannel Branch_fbb10 - note __, 1 + sound_call Branch_fbb10 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 note A_, 1 inc_octave @@ -1656,9 +1740,9 @@ Music_TCGCredits_Ch2: note C_, 1 notetype1 8 note E_, 2 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 dec_octave notetype2 7 note G_, 1 @@ -1672,11 +1756,12 @@ Music_TCGCredits_Ch2: notetype1 8 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note F_, 13 @@ -1693,14 +1778,15 @@ Music_TCGCredits_Ch2: notetype1 2 note E_, 7 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note D#, 3 note E_, 10 + ;tie notetype0 13 note E_, 1 note F_, 1 @@ -1713,11 +1799,11 @@ Music_TCGCredits_Ch2: notetype1 2 note D_, 8 notetype0 13 - note __, 1 + rest 1 dec_octave dec_octave notetype1 9 - dutycycle 1 + duty_cycle 1 note B_, 1 inc_octave notetype0 1 @@ -1728,11 +1814,11 @@ Music_TCGCredits_Ch2: note D_, 6 notetype1 2 note D_, 7 - callchannel Branch_fbb10 + sound_call Branch_fbb10 octave 3 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 note F_, 1 notetype1 9 @@ -1742,15 +1828,16 @@ Music_TCGCredits_Ch2: notetype1 8 note D_, 3 note D#, 10 + ;tie notetype0 13 note D#, 2 dec_octave dec_octave notetype1 9 note G#, 1 - note __, 1 + rest 1 notetype0 1 - note __, 6 + rest 6 notetype1 9 note G#, 7 inc_octave @@ -1758,6 +1845,7 @@ Music_TCGCredits_Ch2: note D#, 7 note G_, 6 note A#, 7 + ; octave 4 notetype0 13 notetype1 8 @@ -1765,7 +1853,7 @@ Music_TCGCredits_Ch2: dec_octave notetype1 9 note C_, 1 - note __, 2 + rest 2 inc_octave notetype1 8 note D_, 1 @@ -1776,7 +1864,7 @@ Music_TCGCredits_Ch2: dec_octave notetype1 9 note D_, 1 - note __, 2 + rest 2 inc_octave notetype1 8 note D_, 1 @@ -1787,7 +1875,7 @@ Music_TCGCredits_Ch2: note A_, 3 notetype1 9 note C_, 1 - note __, 2 + rest 2 notetype2 4 notetype1 8 note F_, 1 @@ -1800,7 +1888,7 @@ Music_TCGCredits_Ch2: note C_, 1 notetype1 8 note G#, 1 - note __, 1 + rest 1 note F_, 1 notetype1 9 note C_, 1 @@ -1808,7 +1896,7 @@ Music_TCGCredits_Ch2: note E_, 3 notetype1 9 note D_, 1 - note __, 1 + rest 1 dec_octave notetype1 8 note B_, 1 @@ -1822,7 +1910,7 @@ Music_TCGCredits_Ch2: note E_, 3 notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 8 note E_, 1 notetype2 4 @@ -1836,7 +1924,7 @@ Music_TCGCredits_Ch2: note C_, 1 notetype2 4 note A_, 1 - note __, 1 + rest 1 note F_, 1 notetype2 8 notetype1 9 @@ -1845,17 +1933,19 @@ Music_TCGCredits_Ch2: note A_, 3 notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 8 note G#, 3 - note __, 1 + rest 1 + ; + ;sound_call Branch_fb79e notetype0 13 octave 3 notetype1 9 note E_, 1 notetype1 3 note E_, 1 - callchannel Branch_fba68 + sound_call Branch_fba68 octave 2 notetype1 9 note A_, 1 @@ -1878,13 +1968,14 @@ Music_TCGCredits_Ch2: note E_, 1 notetype1 3 note E_, 1 - note __, 1 - callchannel Branch_fba68 + rest 1 + sound_call Branch_fba68 notetype1 9 octave 3 notetype0 1 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 1 note E_, 1 @@ -1897,34 +1988,34 @@ Music_TCGCredits_Ch2: notetype1 9 note D_, 3 notetype1 9 - dutycycle 1 + duty_cycle 1 .Loop4 - note __, 2 + rest 2 note C_, 1 - note __, 1 - loopchannel 2, .Loop4 + rest 1 + sound_loop 2, .Loop4 .Loop5 - note __, 2 + rest 2 note D_, 1 - note __, 1 - loopchannel 2, .Loop5 - note __, 2 + rest 1 + sound_loop 2, .Loop5 + rest 2 note C_, 1 - note __, 2 - callchannel Branch_fba9d - note __, 2 - dutycycle 1 + rest 2 + sound_call Branch_fba9d + rest 2 + duty_cycle 1 notetype1 9 octave 3 note C_, 1 - note __, 1 + rest 1 .Loop6 - note __, 2 + rest 2 note C_, 1 - note __, 1 - loopchannel 4, .Loop6 - note __, 2 - dutycycle 2 + rest 1 + sound_loop 4, .Loop6 + rest 2 + duty_cycle 2 notetype1 7 notetype0 1 note E_, 3 @@ -1943,22 +2034,23 @@ Music_TCGCredits_Ch2: note E_, 8 dec_octave notetype1 9 - dutycycle 1 + duty_cycle 1 note C_, 13 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note E_, 3 note F_, 10 + ;tie note F_, 13 note E_, 5 note F_, 4 note E_, 4 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 - dutycycle 2 + duty_cycle 2 notetype1 7 note A_, 5 notetype1 2 @@ -1972,18 +2064,19 @@ Music_TCGCredits_Ch2: note C#, 3 note D_, 10 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 - note __, 13 + rest 13 dec_octave notetype1 8 note B_, 3 inc_octave note C_, 10 + ;tie notetype0 13 note C_, 3 - note __, 1 + rest 1 note E_, 1 notetype1 9 note C_, 1 @@ -1991,20 +2084,21 @@ Music_TCGCredits_Ch2: notetype1 8 note A#, 3 note B_, 10 + ;tie notetype0 13 note B_, 4 - note __, 1 + rest 1 inc_octave note C_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note D_, 1 notetype1 8 note E_, 5 - note __, 1 - callchannel Branch_fba9d - dutycycle 1 + rest 1 + sound_call Branch_fba9d + duty_cycle 1 octave 3 note C_, 1 note D_, 1 @@ -2014,11 +2108,12 @@ Music_TCGCredits_Ch2: notetype1 8 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 note F_, 1 notetype1 9 @@ -2028,13 +2123,14 @@ Music_TCGCredits_Ch2: notetype0 1 note D_, 3 note D#, 10 + ;tie notetype0 13 note D#, 2 dec_octave dec_octave notetype1 9 note G#, 1 - note __, 1 + rest 1 inc_octave notetype1 8 note G#, 1 @@ -2049,7 +2145,7 @@ Music_TCGCredits_Ch2: dec_octave notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 8 notetype0 1 note F#, 3 @@ -2062,8 +2158,8 @@ Music_TCGCredits_Ch2: note B_, 1 notetype2 8 note A#, 1 - note __, 1 - callchannel Branch_fbacb + rest 1 + sound_call Branch_fbacb octave 3 notetype1 9 notetype2 8 @@ -2074,7 +2170,7 @@ Music_TCGCredits_Ch2: inc_octave note C_, 10 notetype0 13 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -2082,7 +2178,7 @@ Music_TCGCredits_Ch2: inc_octave notetype1 8 note C_, 1 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -2100,7 +2196,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note D_, 1 - note __, 1 + rest 1 notetype2 8 note F_, 1 notetype1 9 @@ -2117,7 +2213,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note A_, 1 - note __, 1 + rest 1 notetype2 8 note B_, 1 notetype1 9 @@ -2146,13 +2242,13 @@ Music_TCGCredits_Ch2: note B_, 1 notetype2 6 note A#, 2 - callchannel Branch_fbacb + sound_call Branch_fbacb octave 4 note G_, 1 notetype2 8 note E_, 1 notetype0 13 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -2160,7 +2256,7 @@ Music_TCGCredits_Ch2: inc_octave notetype1 8 note C_, 1 - note __, 1 + rest 1 note C_, 1 dec_octave notetype1 9 @@ -2177,7 +2273,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note F_, 1 - note __, 1 + rest 1 notetype2 8 note A_, 1 notetype1 9 @@ -2194,7 +2290,7 @@ Music_TCGCredits_Ch2: notetype1 8 notetype2 4 note F_, 1 - note __, 1 + rest 1 note G#, 1 notetype2 8 notetype1 9 @@ -2204,9 +2300,10 @@ Music_TCGCredits_Ch2: note B_, 3 inc_octave note C_, 10 + ;tie notetype0 13 note C_, 3 - note __, 1 + rest 1 dec_octave note A_, 1 inc_octave @@ -2220,7 +2317,7 @@ Music_TCGCredits_Ch2: notetype1 8 note A#, 3 note B_, 10 - note __, 13 + rest 13 dec_octave notetype1 9 note A#, 3 @@ -2237,11 +2334,11 @@ Music_TCGCredits_Ch2: note D_, 2 notetype1 2 note D_, 1 - callchannel Branch_fbb10 - note __, 1 + sound_call Branch_fbb10 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 note A_, 1 inc_octave @@ -2249,9 +2346,9 @@ Music_TCGCredits_Ch2: note C_, 1 notetype1 8 note E_, 2 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 dec_octave notetype2 7 note G_, 1 @@ -2265,11 +2362,12 @@ Music_TCGCredits_Ch2: notetype1 8 note E_, 3 note F_, 10 + ;tie notetype0 13 note F_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note F_, 13 @@ -2286,14 +2384,15 @@ Music_TCGCredits_Ch2: notetype1 2 note E_, 7 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note D#, 3 note E_, 10 + ;tie notetype0 13 note E_, 1 note F_, 1 @@ -2306,11 +2405,11 @@ Music_TCGCredits_Ch2: notetype1 2 note D_, 8 notetype0 13 - note __, 1 + rest 1 dec_octave dec_octave notetype1 9 - dutycycle 1 + duty_cycle 1 note B_, 1 inc_octave notetype0 1 @@ -2321,11 +2420,11 @@ Music_TCGCredits_Ch2: note D_, 6 notetype1 2 note D_, 7 - callchannel Branch_fbb10 + sound_call Branch_fbb10 octave 3 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 note F_, 1 notetype1 9 @@ -2335,15 +2434,16 @@ Music_TCGCredits_Ch2: notetype1 8 note D_, 3 note D#, 10 + ;tie notetype0 13 note D#, 2 dec_octave dec_octave notetype1 9 note G#, 1 - note __, 1 + rest 1 notetype0 1 - note __, 6 + rest 6 notetype1 9 note G#, 7 inc_octave @@ -2351,16 +2451,18 @@ Music_TCGCredits_Ch2: note D#, 7 note G_, 6 note A#, 7 + ; octave 4 notetype0 13 notetype1 8 note C_, 1 + ;tie note C_, 2 dec_octave dec_octave notetype1 9 note G#, 1 - note __, 2 + rest 2 inc_octave notetype1 8 note A#, 1 @@ -2371,11 +2473,12 @@ Music_TCGCredits_Ch2: inc_octave notetype1 8 note C_, 1 + ;tie note C_, 2 dec_octave notetype1 9 note C_, 1 - note __, 1 + rest 1 inc_octave notetype1 8 note C_, 1 @@ -2386,6 +2489,7 @@ Music_TCGCredits_Ch2: inc_octave notetype1 8 note E_, 1 + ;tie note E_, 4 dec_octave dec_octave @@ -2404,16 +2508,17 @@ Music_TCGCredits_Ch2: inc_octave notetype0 13 note C_, 8 + ;tie note C_, 1 notetype1 2 note C_, 2 - endchannel + sound_ret Branch_fba68: octave 3 notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 9 note C_, 1 note E_, 1 @@ -2423,7 +2528,7 @@ Branch_fba68: note F_, 1 notetype1 3 note F_, 1 - note __, 1 + rest 1 notetype1 9 note C_, 1 notetype1 9 @@ -2438,30 +2543,30 @@ Branch_fba68: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 9 note C_, 1 note E_, 1 notetype1 9 note C_, 1 - endchannel + sound_ret Branch_fba9d: octave 4 - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note F#, 3 note G_, 10 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 13 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note E_, 5 notetype1 2 @@ -2474,27 +2579,27 @@ Branch_fba9d: note E_, 8 dec_octave notetype0 13 - dutycycle 1 + duty_cycle 1 notetype1 9 note C_, 1 - dutycycle 2 + duty_cycle 2 notetype1 7 note G_, 1 - endchannel + sound_ret Branch_fbacb: octave 3 notetype2 8 .Loop4 note A#, 1 - note __, 1 - loopchannel 3, .Loop4 + rest 1 + sound_loop 3, .Loop4 inc_octave note C_, 3 dec_octave notetype1 9 note C_, 1 - note __, 1 + rest 1 notetype1 8 note A_, 1 inc_octave @@ -2508,7 +2613,7 @@ Branch_fbacb: notetype1 8 note A#, 3 note B_, 16 - note __, 7 + rest 7 note A#, 3 note B_, 10 dec_octave @@ -2518,7 +2623,7 @@ Branch_fbacb: inc_octave notetype1 8 note B_, 1 - note __, 1 + rest 1 note A_, 1 dec_octave notetype1 9 @@ -2528,13 +2633,13 @@ Branch_fbacb: note B_, 3 notetype1 9 note D_, 1 - note __, 1 + rest 1 notetype1 8 note B_, 1 inc_octave notetype2 4 note D_, 1 - endchannel + sound_ret Branch_fbb10: octave 3 @@ -2557,12 +2662,13 @@ Branch_fbb10: notetype1 8 note D#, 3 note E_, 10 + ;tie notetype0 13 note E_, 2 notetype1 9 note D_, 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note G_, 5 @@ -2576,11 +2682,11 @@ Branch_fbb10: notetype1 2 note E_, 8 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 note D_, 13 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note C_, 5 notetype1 2 @@ -2622,7 +2728,7 @@ Branch_fbb10: note G_, 8 dec_octave dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note B_, 3 inc_octave @@ -2633,18 +2739,21 @@ Branch_fbb10: note E_, 1 notetype2 8 note F_, 2 - endchannel + sound_ret -Music_TCGCredits_Ch3: +Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) notetype0 1 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 96 + ;cutoff 8 octave 2 .Loop1 note G_, 6 - note __, 7 - loopchannel 12, .Loop1 + rest 7 + sound_loop 12, .Loop1 note G_, 6 note A_, 7 note B_, 6 @@ -2654,121 +2763,134 @@ Music_TCGCredits_Ch3: note E_, 7 note F_, 6 note G_, 7 + ; + ;sound_call Branch_fbc46 notetype0 1 octave 3 - callchannel Branch_fbd47 - callchannel Branch_fbe23 - callchannel Branch_fbd47 + sound_call Branch_fbd47 + sound_call Branch_fbe23 + sound_call Branch_fbd47 .Loop7 note C_, 6 - note __, 7 - loopchannel 2, .Loop7 + rest 7 + sound_loop 2, .Loop7 + ;cutoff 4 note A_, 13 + ;cutoff 8 note C_, 6 - note __, 7 + rest 7 .Loop8 note C_, 6 - note __, 7 - loopchannel 2, .Loop8 + rest 7 + sound_loop 2, .Loop8 inc_octave + ;cutoff 4 note C_, 13 dec_octave + ;cutoff 8 note C_, 6 - note __, 7 - callchannel Branch_fbd47 - callchannel Branch_fbe23 + rest 7 + sound_call Branch_fbd47 + sound_call Branch_fbe23 octave 3 .Loop9 note C_, 6 - note __, 7 - loopchannel 2, .Loop9 + rest 7 + sound_loop 2, .Loop9 + ;cutoff 4 note G_, 13 + ;cutoff 8 note C_, 6 - note __, 7 + rest 7 .Loop10 note C_, 6 - note __, 7 - loopchannel 2, .Loop10 + rest 7 + sound_loop 2, .Loop10 + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note G_, 13 + ;tie notetype0 13 note G_, 7 - note __, 1 + rest 1 notetype0 1 - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbd91 - callchannel Branch_fbda4 - callchannel Branch_fbdb7 - callchannel Branch_fbdca - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbddd - callchannel Branch_fbdf0 - callchannel Branch_fbd47 - callchannel Branch_fbe03 - callchannel Branch_fbd91 - callchannel Branch_fbdca - callchannel Branch_fbe10 - callchannel Branch_fbd6b - callchannel Branch_fbdb7 - callchannel Branch_fbdca - callchannel Branch_fbd47 - callchannel Branch_fbe03 - callchannel Branch_fbd91 - callchannel Branch_fbdca - callchannel Branch_fbe10 - callchannel Branch_fbd6b - callchannel Branch_fbdb7 - callchannel Branch_fbdf0 - callchannel Branch_fbdca + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbd91 + sound_call Branch_fbda4 + sound_call Branch_fbdb7 + sound_call Branch_fbdca + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbddd + sound_call Branch_fbdf0 + sound_call Branch_fbd47 + sound_call Branch_fbe03 + sound_call Branch_fbd91 + sound_call Branch_fbdca + sound_call Branch_fbe10 + sound_call Branch_fbd6b + sound_call Branch_fbdb7 + sound_call Branch_fbdca + sound_call Branch_fbd47 + sound_call Branch_fbe03 + sound_call Branch_fbd91 + sound_call Branch_fbdca + sound_call Branch_fbe10 + sound_call Branch_fbd6b + sound_call Branch_fbdb7 + sound_call Branch_fbdf0 + sound_call Branch_fbdca octave 2 note G_, 6 - note __, 7 + rest 7 note G_, 13 inc_octave note G_, 6 - note __, 7 + rest 7 dec_octave note A_, 6 - note __, 7 + rest 7 note A_, 6 - note __, 7 + rest 7 notetype0 13 note B_, 2 note G_, 1 notetype0 1 - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbd91 - callchannel Branch_fbda4 - callchannel Branch_fbdb7 - callchannel Branch_fbe3d + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbd91 + sound_call Branch_fbda4 + sound_call Branch_fbdb7 + sound_call Branch_fbe3d octave 2 note B_, 6 - note __, 7 - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbddd + rest 7 + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbddd octave 2 .Loop11 note A#, 6 - note __, 7 - loopchannel 2, .Loop11 + rest 7 + sound_loop 2, .Loop11 inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note A#, 6 - note __, 7 + rest 7 note A#, 6 inc_octave note F_, 7 @@ -2780,163 +2902,183 @@ Music_TCGCredits_Ch3: dec_octave dec_octave note A#, 6 - note __, 7 - callchannel Branch_fbd47 + rest 7 + ; + sound_call Branch_fbd47 octave 2 .Loop2 rept 2 note B_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note B_, 6 - note __, 7 - loopchannel 2, .Loop2 + rest 7 + sound_loop 2, .Loop2 .Loop3 rept 2 note A_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note A_, 6 - note __, 7 - loopchannel 2, .Loop3 + rest 7 + sound_loop 2, .Loop3 .Loop4 rept 2 note G#, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note G#, 6 - note __, 7 - loopchannel 2, .Loop4 - callchannel Branch_fbe10 - callchannel Branch_fbd6b - callchannel Branch_fbdb7 - callchannel Branch_fbe3d + rest 7 + sound_loop 2, .Loop4 + sound_call Branch_fbe10 + sound_call Branch_fbd6b + sound_call Branch_fbdb7 + sound_call Branch_fbe3d octave 2 note B_, 13 + ; + ;sound_call Branch_fbc46 notetype0 1 octave 3 - callchannel Branch_fbd47 - callchannel Branch_fbe23 - callchannel Branch_fbd47 + sound_call Branch_fbd47 + sound_call Branch_fbe23 + sound_call Branch_fbd47 .Loop12 note C_, 6 - note __, 7 - loopchannel 2, .Loop12 + rest 7 + sound_loop 2, .Loop12 + ;cutoff 4 note A_, 13 + ;cutoff 8 note C_, 6 - note __, 7 + rest 7 .Loop13 note C_, 6 - note __, 7 - loopchannel 2, .Loop13 + rest 7 + sound_loop 2, .Loop13 inc_octave + ;cutoff 4 note C_, 13 dec_octave + ;cutoff 8 note C_, 6 - note __, 7 - callchannel Branch_fbd47 - callchannel Branch_fbe23 + rest 7 + sound_call Branch_fbd47 + sound_call Branch_fbe23 octave 3 .Loop14 note C_, 6 - note __, 7 - loopchannel 2, .Loop14 + rest 7 + sound_loop 2, .Loop14 + ;cutoff 4 note G_, 13 + ;cutoff 8 note C_, 6 - note __, 7 + rest 7 .Loop15 note C_, 6 - note __, 7 - loopchannel 2, .Loop15 + rest 7 + sound_loop 2, .Loop15 + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note G_, 13 + ;tie notetype0 13 note G_, 7 - note __, 1 + rest 1 notetype0 1 - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbd91 - callchannel Branch_fbda4 - callchannel Branch_fbdb7 - callchannel Branch_fbdca - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbddd - callchannel Branch_fbdf0 - callchannel Branch_fbd47 - callchannel Branch_fbe03 - callchannel Branch_fbd91 - callchannel Branch_fbdca - callchannel Branch_fbe10 - callchannel Branch_fbd6b - callchannel Branch_fbdb7 - callchannel Branch_fbdca - callchannel Branch_fbd47 - callchannel Branch_fbe03 - callchannel Branch_fbd91 - callchannel Branch_fbdca - callchannel Branch_fbe10 - callchannel Branch_fbd6b - callchannel Branch_fbdb7 - callchannel Branch_fbdf0 - callchannel Branch_fbdca + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbd91 + sound_call Branch_fbda4 + sound_call Branch_fbdb7 + sound_call Branch_fbdca + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbddd + sound_call Branch_fbdf0 + sound_call Branch_fbd47 + sound_call Branch_fbe03 + sound_call Branch_fbd91 + sound_call Branch_fbdca + sound_call Branch_fbe10 + sound_call Branch_fbd6b + sound_call Branch_fbdb7 + sound_call Branch_fbdca + sound_call Branch_fbd47 + sound_call Branch_fbe03 + sound_call Branch_fbd91 + sound_call Branch_fbdca + sound_call Branch_fbe10 + sound_call Branch_fbd6b + sound_call Branch_fbdb7 + sound_call Branch_fbdf0 + sound_call Branch_fbdca octave 2 note G_, 6 - note __, 7 + rest 7 note G_, 13 inc_octave note G_, 6 - note __, 7 + rest 7 dec_octave note A_, 6 - note __, 7 + rest 7 note A_, 6 - note __, 7 + rest 7 notetype0 13 note B_, 2 note G_, 1 notetype0 1 - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbd91 - callchannel Branch_fbda4 - callchannel Branch_fbdb7 - callchannel Branch_fbe3d + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbd91 + sound_call Branch_fbda4 + sound_call Branch_fbdb7 + sound_call Branch_fbe3d octave 2 note B_, 6 - note __, 7 - callchannel Branch_fbd47 - callchannel Branch_fbd58 - callchannel Branch_fbd6b - callchannel Branch_fbd7e - callchannel Branch_fbddd + rest 7 + sound_call Branch_fbd47 + sound_call Branch_fbd58 + sound_call Branch_fbd6b + sound_call Branch_fbd7e + sound_call Branch_fbddd octave 2 .Loop16 note A#, 6 - note __, 7 - loopchannel 2, .Loop16 + rest 7 + sound_loop 2, .Loop16 inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note A#, 6 - note __, 7 + rest 7 note A#, 6 inc_octave note F_, 7 @@ -2948,439 +3090,481 @@ Music_TCGCredits_Ch3: dec_octave dec_octave note A#, 6 - note __, 7 + rest 7 + ; notetype0 1 octave 2 .Loop5 note G#, 6 - note __, 7 + rest 7 note G#, 6 - note __, 7 + rest 7 inc_octave inc_octave + ;cutoff 4 note D#, 13 dec_octave dec_octave + ;cutoff 8 note G#, 6 - note __, 7 - loopchannel 2, .Loop5 + rest 7 + sound_loop 2, .Loop5 inc_octave .Loop6 note C#, 6 - note __, 7 + rest 7 note C#, 6 - note __, 7 + rest 7 inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note C#, 6 - note __, 7 - loopchannel 2, .Loop6 + rest 7 + sound_loop 2, .Loop6 note C_, 6 - note __, 7 + rest 7 note C_, 6 - note __, 7 + rest 7 inc_octave + ;cutoff 4 note C_, 13 dec_octave + ;cutoff 8 note C_, 6 - note __, 7 + rest 7 note C_, 6 - note __, 7 + rest 7 note C_, 6 - note __, 7 + rest 7 dec_octave note G_, 6 - note __, 7 + rest 7 note G_, 6 - note __, 7 + rest 7 notetype0 13 note C_, 8 + ;tie note C_, 1 - note __, 2 - endchannel + rest 2 + sound_ret Branch_fbd47: octave 3 .Loop12 rept 2 note C_, 6 - note __, 7 + rest 7 endr + ;cutoff 4 note G_, 13 + ;cutoff 8 note C_, 6 - note __, 7 - loopchannel 2, .Loop12 - endchannel + rest 7 + sound_loop 2, .Loop12 + sound_ret Branch_fbd58: octave 2 .Loop13 rept 2 note B_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note B_, 6 - note __, 7 - loopchannel 2, .Loop13 - endchannel + rest 7 + sound_loop 2, .Loop13 + sound_ret Branch_fbd6b: octave 2 .Loop14 rept 2 note A_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note A_, 6 - note __, 7 - loopchannel 2, .Loop14 - endchannel + rest 7 + sound_loop 2, .Loop14 + sound_ret Branch_fbd7e: octave 2 .Loop15 rept 2 note G_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note G_, 6 - note __, 7 - loopchannel 2, .Loop15 - endchannel + rest 7 + sound_loop 2, .Loop15 + sound_ret Branch_fbd91: octave 2 .Loop16 rept 2 note F_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note F_, 6 - note __, 7 - loopchannel 2, .Loop16 - endchannel + rest 7 + sound_loop 2, .Loop16 + sound_ret Branch_fbda4: octave 2 .Loop17 rept 2 note E_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note E_, 13 dec_octave + ;cutoff 8 note E_, 6 - note __, 7 - loopchannel 2, .Loop17 - endchannel + rest 7 + sound_loop 2, .Loop17 + sound_ret Branch_fbdb7: octave 2 .Loop18 rept 2 note D_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note D_, 6 - note __, 7 - loopchannel 2, .Loop18 - endchannel + rest 7 + sound_loop 2, .Loop18 + sound_ret Branch_fbdca: octave 2 .Loop19 rept 2 note G_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note G_, 6 - note __, 7 - loopchannel 2, .Loop19 - endchannel + rest 7 + sound_loop 2, .Loop19 + sound_ret Branch_fbddd: octave 2 .Loop20 rept 2 note F_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note G#, 13 dec_octave + ;cutoff 8 note F_, 6 - note __, 7 - loopchannel 2, .Loop20 - endchannel + rest 7 + sound_loop 2, .Loop20 + sound_ret Branch_fbdf0: octave 2 .Loop21 rept 2 note A#, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note A#, 6 - note __, 7 - loopchannel 2, .Loop21 - endchannel + rest 7 + sound_loop 2, .Loop21 + sound_ret Branch_fbe03: octave 3 note C_, 6 - note __, 7 + rest 7 dec_octave note C_, 13 - note __, 13 + rest 13 note D_, 13 - note __, 13 + rest 13 note E_, 13 - note __, 13 + rest 13 note C_, 6 - note __, 7 - endchannel + rest 7 + sound_ret Branch_fbe10: octave 2 .Loop22 rept 2 note E_, 6 - note __, 7 + rest 7 endr inc_octave + ;cutoff 4 note G_, 13 dec_octave + ;cutoff 8 note E_, 6 - note __, 7 - loopchannel 2, .Loop22 - endchannel + rest 7 + sound_loop 2, .Loop22 + sound_ret Branch_fbe23: octave 3 .Loop23 note C_, 6 - note __, 7 - loopchannel 2, .Loop23 + rest 7 + sound_loop 2, .Loop23 + ;cutoff 4 note A_, 13 + ;cutoff 8 note C_, 6 - note __, 7 + rest 7 .Loop24 note C_, 6 - note __, 7 - loopchannel 2, .Loop24 + rest 7 + sound_loop 2, .Loop24 + ;cutoff 4 note F_, 13 + ;cutoff 8 note C_, 6 - note __, 7 - endchannel + rest 7 + sound_ret Branch_fbe3d: octave 2 .Loop25 note G_, 6 - note __, 7 - loopchannel 2, .Loop25 + rest 7 + sound_loop 2, .Loop25 inc_octave + ;cutoff 4 note F_, 13 dec_octave + ;cutoff 8 note G_, 6 - note __, 7 + rest 7 note G_, 6 - note __, 7 + rest 7 note G_, 13 note A_, 13 - endchannel + sound_ret -Music_TCGCredits_Ch4: - togglenoise $06 - notetype 1 +Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) + toggle_noise 6 + drum_speed 1 octave 1 .Loop1 - note D_, 13 - loopchannel 8, .Loop1 + drum_note 3, 13 + sound_loop 8, .Loop1 .Loop2 - note C#, 13 - loopchannel 4, .Loop2 + drum_note 2, 13 + sound_loop 4, .Loop2 .Loop3 - note C#, 6 - note C#, 7 - loopchannel 4, .Loop3 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 4, .Loop3 + ; + ;sound_call Branch_fbe86 .Loop7 - callchannel Branch_fbed1 - loopchannel 6, .Loop7 - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D#, 7 - note C_, 13 - note D#, 13 - note C#, 13 - notetype 13 - note F_, 7 - note C#, 2 - notetype 1 + sound_call Branch_fbed1 + sound_loop 6, .Loop7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_speed 13 + drum_note 6, 7 + drum_note 2, 2 + drum_speed 1 .Loop8 - callchannel Branch_fbed1 - loopchannel 15, .Loop8 - callchannel Branch_fbedb + sound_call Branch_fbed1 + sound_loop 15, .Loop8 + sound_call Branch_fbedb .Loop9 - callchannel Branch_fbed1 - loopchannel 7, .Loop9 - callchannel Branch_fbedb + sound_call Branch_fbed1 + sound_loop 7, .Loop9 + sound_call Branch_fbedb .Loop10 - callchannel Branch_fbed1 - loopchannel 7, .Loop10 - callchannel Branch_fbeea + sound_call Branch_fbed1 + sound_loop 7, .Loop10 + sound_call Branch_fbeea .Loop11 - callchannel Branch_fbed1 - loopchannel 7, .Loop11 - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D#, 7 - note C_, 13 - note D#, 6 - note D_, 4 - note D_, 3 - note C#, 6 - note C#, 7 - note C#, 13 + sound_call Branch_fbed1 + sound_loop 7, .Loop11 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 13 .Loop12 - callchannel Branch_fbed1 - loopchannel 5, .Loop12 - callchannel Branch_fbeea + sound_call Branch_fbed1 + sound_loop 5, .Loop12 + sound_call Branch_fbeea + ; .Loop4 - callchannel Branch_fbed1 - loopchannel 7, .Loop4 - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D_, 4 - note D_, 3 + sound_call Branch_fbed1 + sound_loop 7, .Loop4 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 .Loop5 - note C#, 6 - note C#, 7 - loopchannel 4, .Loop5 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 4, .Loop5 + ; + ;sound_call Branch_fbe86 .Loop13 - callchannel Branch_fbed1 - loopchannel 6, .Loop13 - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D#, 7 - note C_, 13 - note D#, 13 - note C#, 13 - notetype 13 - note F_, 7 - note C#, 2 - notetype 1 + sound_call Branch_fbed1 + sound_loop 6, .Loop13 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_speed 13 + drum_note 6, 7 + drum_note 2, 2 + drum_speed 1 .Loop14 - callchannel Branch_fbed1 - loopchannel 15, .Loop14 - callchannel Branch_fbedb + sound_call Branch_fbed1 + sound_loop 15, .Loop14 + sound_call Branch_fbedb .Loop15 - callchannel Branch_fbed1 - loopchannel 7, .Loop15 - callchannel Branch_fbedb + sound_call Branch_fbed1 + sound_loop 7, .Loop15 + sound_call Branch_fbedb .Loop16 - callchannel Branch_fbed1 - loopchannel 7, .Loop16 - callchannel Branch_fbeea + sound_call Branch_fbed1 + sound_loop 7, .Loop16 + sound_call Branch_fbeea .Loop17 - callchannel Branch_fbed1 - loopchannel 7, .Loop17 - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D#, 7 - note C_, 13 - note D#, 6 - note D_, 4 - note D_, 3 - note C#, 6 - note C#, 7 - note C#, 13 + sound_call Branch_fbed1 + sound_loop 7, .Loop17 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 13 .Loop18 - callchannel Branch_fbed1 - loopchannel 5, .Loop18 - callchannel Branch_fbeea + sound_call Branch_fbed1 + sound_loop 5, .Loop18 + sound_call Branch_fbeea + ; .Loop6 - callchannel Branch_fbed1 - loopchannel 2, .Loop6 - callchannel Branch_fbeea - notetype 13 - note F_, 8 - note __, 3 - endchannel + sound_call Branch_fbed1 + sound_loop 2, .Loop6 + sound_call Branch_fbeea + drum_speed 13 + drum_note 6, 8 + rest 3 + sound_ret Branch_fbed1: - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D#, 7 - note C_, 13 - note D#, 13 - note C#, 13 - note E_, 13 - endchannel + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 + sound_ret Branch_fbedb: - note C_, 13 - note D#, 6 - note D_, 7 - note C#, 6 - note C#, 7 + drum_note 1, 13 + drum_note 4, 6 + drum_note 3, 7 + drum_note 2, 6 + drum_note 2, 7 .Loop13 - note C#, 6 - note D_, 4 - note D_, 3 - note C#, 6 - note C#, 7 - loopchannel 2, .Loop13 - note C#, 13 - endchannel + drum_note 2, 6 + drum_note 3, 4 + drum_note 3, 3 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 2, .Loop13 + drum_note 2, 13 + sound_ret Branch_fbeea: - note C_, 13 - note D#, 13 - note C#, 13 - note D#, 6 - note D_, 4 - note D_, 3 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 .Loop14 - note C#, 6 - note C#, 7 - loopchannel 3, .Loop14 - note C#, 13 - endchannel - + drum_note 2, 6 + drum_note 2, 7 + sound_loop 3, .Loop14 + drum_note 2, 13 + sound_ret +; 0xfbef7 diff --git a/crysaudio/music/TCG/darkdiddly.asm b/crysaudio/music/TCG/darkdiddly.asm deleted file mode 100644 index 3b912202..00000000 --- a/crysaudio/music/TCG/darkdiddly.asm +++ /dev/null @@ -1,110 +0,0 @@ -Music_TCGDarkDiddly: - db $80 - dw Music_TCGDarkDiddly_Ch1 - db $01 - dw Music_TCGDarkDiddly_Ch2 - db $02 - dw Music_TCGDarkDiddly_Ch3 - -Music_TCGDarkDiddly_Ch1: - notetype0 3 - notetype2 8 - octave 4 - dutycycle 1 - notetype1 11 - note C_, 4 - dec_octave - note B_, 2 - note A#, 2 - note A_, 2 - note G#, 2 - note G_, 2 - note F#, 2 - note F_, 4 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 - dec_octave - note B_, 2 - note A#, 4 - note B_, 2 - notetype1 2 - note B_, 2 - notetype1 11 - note F#, 4 - note G_, 2 - notetype1 2 - note G_, 2 - notetype1 11 - note C_, 2 - notetype1 2 - note C_, 4 - inc_octave - notetype1 11 - note E_, 1 - note G_, 1 - inc_octave - note C_, 2 - notetype1 2 - note C_, 2 - endchannel - - -Music_TCGDarkDiddly_Ch2: - notetype0 3 - notetype2 8 - octave 3 - dutycycle 1 - notetype1 11 - note __, 16 - note C_, 4 - dec_octave - note B_, 2 - note A#, 2 - note A_, 2 - note G#, 2 - note G_, 2 - note F#, 2 - note F_, 4 - note F#, 2 - notetype1 2 - note F#, 2 - notetype1 11 - note C#, 4 - note D_, 2 - notetype1 2 - note D_, 2 - dec_octave - notetype1 11 - note G_, 2 - notetype1 2 - note G_, 6 - inc_octave - inc_octave - notetype1 11 - note E_, 2 - notetype1 2 - note E_, 2 - endchannel - - -Music_TCGDarkDiddly_Ch3: - notetype0 6 - notetype2 11 - notetype1 1 - octave 2 - note __, 16 - note G_, 2 - note F#, 1 - note __, 1 - note D#, 2 - note C#, 1 - note __, 1 - note C_, 1 - note __, 3 - inc_octave - note C_, 1 - endchannel - diff --git a/crysaudio/music/TCG/deckmachine.asm b/crysaudio/music/TCG/deckmachine.asm index 2fbd63db..3c4f29f6 100644 --- a/crysaudio/music/TCG/deckmachine.asm +++ b/crysaudio/music/TCG/deckmachine.asm @@ -1,16 +1,14 @@ -Music_TCGDeckMachine: - db $C0 - dw Music_TCGDeckMachine_Ch1 - db $01 - dw Music_TCGDeckMachine_Ch2 - db $02 - dw Music_TCGDeckMachine_Ch3 - db $03 - dw Music_TCGDeckMachine_Ch4 +Music_DeckMachine: + channel_count 4 + channel 1, Music_DeckMachine_Ch1 + channel 2, Music_DeckMachine_Ch2 + channel 3, Music_DeckMachine_Ch3 + channel 4, Music_DeckMachine_Ch4 -Music_TCGDeckMachine_Ch1: +Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) + ;stereo_panning 1, 1 notetype2 8 - dutycycle 3 + duty_cycle 3 .MainLoop octave 5 notetype0 1 @@ -50,7 +48,7 @@ Music_TCGDeckMachine_Ch1: notetype2 5 notetype1 4 note G_, 8 - loopchannel 9, .Loop1 + sound_loop 9, .Loop1 notetype1 9 note C_, 7 notetype1 3 @@ -58,183 +56,211 @@ Music_TCGDeckMachine_Ch1: notetype1 4 note C_, 15 notetype0 10 - note __, 9 - loopchannel 0, .MainLoop + rest 9 + sound_loop 0, .MainLoop -Music_TCGDeckMachine_Ch2: +Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) + ;stereo_panning 1, 1 notetype2 8 - dutycycle 1 + duty_cycle 1 notetype2 7 .MainLoop octave 3 notetype0 1 .Loop1 - note __, 15 + rest 15 notetype1 11 - note __, 7 + rest 7 note C_, 8 notetype1 2 note C_, 8 - note __, 7 + rest 7 notetype1 11 note C_, 7 notetype1 2 note C_, 8 - note __, 7 + rest 7 notetype1 11 dec_octave note A_, 8 notetype1 2 note A_, 8 - note __, 7 + rest 7 inc_octave notetype1 11 note C_, 7 notetype1 2 note C_, 8 - note __, 15 - loopchannel 9, .Loop1 + rest 15 + sound_loop 9, .Loop1 notetype1 11 note E_, 7 notetype1 2 note E_, 8 - note __, 15 + rest 15 notetype0 10 - note __, 9 - loopchannel 0, .MainLoop + rest 9 + sound_loop 0, .MainLoop -Music_TCGDeckMachine_Ch3: +Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 96 + ;cutoff 8 .MainLoop octave 3 notetype0 1 .Loop1 note C_, 7 - note __, 8 + rest 8 note G_, 7 inc_octave + ;cutoff 5 note G_, 8 - note __, 7 + ;cutoff 8 + rest 7 dec_octave note C_, 8 inc_octave + ;cutoff 5 note E_, 7 dec_octave + ;cutoff 8 note C_, 8 note D_, 7 inc_octave + ;cutoff 5 note C_, 8 dec_octave - note __, 7 + rest 7 + ;cutoff 8 note A_, 8 inc_octave + ;cutoff 5 note G_, 7 dec_octave dec_octave + ;cutoff 8 note A_, 8 inc_octave note D_, 7 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 note G_, 7 inc_octave + ;cutoff 5 note G_, 8 - note __, 7 + rest 7 dec_octave + ;cutoff 8 note E_, 8 inc_octave + ;cutoff 5 note E_, 7 dec_octave + ;cutoff 8 note C_, 8 note F_, 7 inc_octave + ;cutoff 5 note C_, 8 - note __, 7 + rest 7 dec_octave + ;cutoff 8 note F_, 8 inc_octave + ;cutoff 5 note G_, 7 dec_octave + ;cutoff 8 note E_, 8 note D_, 7 - note __, 8 - loopchannel 4, .Loop1 + rest 8 + sound_loop 4, .Loop1 note C_, 7 - note __, 8 + rest 8 note G_, 7 inc_octave + ;cutoff 5 note G_, 8 - note __, 7 + rest 7 dec_octave + ;cutoff 8 note C_, 8 inc_octave + ;cutoff 5 note E_, 7 dec_octave dec_octave + ;cutoff 8 note G_, 8 inc_octave note C_, 7 inc_octave + ;cutoff 5 note C_, 8 - note __, 7 + rest 7 dec_octave + ;cutoff 8 note F_, 8 inc_octave + ;cutoff 5 note G_, 7 dec_octave + ;cutoff 8 note E_, 8 note D_, 7 - note __, 8 + rest 8 note C_, 15 - note __, 15 + rest 15 notetype0 10 - note __, 3 + rest 3 notetype0 1 - note __, 7 + rest 7 dec_octave note G_, 15 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 note B_, 7 - note __, 8 - loopchannel 0, .MainLoop + rest 8 + sound_loop 0, .MainLoop -Music_TCGDeckMachine_Ch4: - togglenoise $06 - notetype 1 +Music_DeckMachine_Ch4: ; f7018 (3d:7018) + toggle_noise 6 + drum_speed 1 octave 1 .MainLoop .Loop1 - callchannel Branch_f7031 - note E_, 15 - note C#, 7 - note D#, 8 - note E_, 15 - loopchannel 9, .Loop1 - callchannel Branch_f7031 - note E_, 7 - note D_, 4 - note D_, 4 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - loopchannel 0, .MainLoop + sound_call Branch_f7031 + drum_note 5, 15 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 15 + sound_loop 9, .Loop1 + sound_call Branch_f7031 + drum_note 5, 7 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + sound_loop 0, .MainLoop Branch_f7031: - note C_, 7 - note D#, 8 - note E_, 15 - note C#, 7 - note D#, 8 - note E_, 15 - note C_, 7 - note D#, 8 - endchannel - + drum_note 1, 7 + drum_note 4, 8 + drum_note 5, 15 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 15 + drum_note 1, 7 + drum_note 4, 8 + sound_ret +; 0xf703a diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 0eb4043f..10af9830 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -1,31 +1,31 @@ -Music_TCGDuelTheme1: - db $C0 - dw Music_TCGDuelTheme1_Ch1 - db $01 - dw Music_TCGDuelTheme1_Ch2 - db $02 - dw Music_TCGDuelTheme1_Ch3 - db $03 - dw Music_TCGDuelTheme1_Ch4 +Music_DuelTheme1: + channel_count 4 + channel 1, Music_DuelTheme1_Ch1 + channel 2, Music_DuelTheme1_Ch2 + channel 3, Music_DuelTheme1_Ch3 + channel 4, Music_DuelTheme1_Ch4 -Music_TCGDuelTheme1_Ch1: +Music_DuelTheme1_Ch1: ; f532a (3d:532a) notetype0 7 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 8 - dutycycle 2 + duty_cycle 2 .MainLoop octave 2 .Loop1 - note __, 16 - loopchannel 7, .Loop1 - note __, 9 + rest 16 + sound_loop 7, .Loop1 + rest 9 .Loop2 - note __, 3 - callchannel Branch_f54f9 + rest 3 + sound_call Branch_f54f9 notetype1 10 notetype0 1 note F_, 4 note F#, 3 + ;tie notetype0 7 note F#, 1 notetype1 3 @@ -33,13 +33,13 @@ Music_TCGDuelTheme1_Ch1: dec_octave notetype1 10 note A_, 1 - note __, 2 + rest 2 inc_octave notetype1 10 note D_, 10 notetype1 3 note D_, 12 - callchannel Branch_f54f9 + sound_call Branch_f54f9 notetype1 10 note F#, 2 notetype1 3 @@ -62,6 +62,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note A#, 4 note B_, 3 + ;tie notetype0 7 note B_, 15 notetype1 3 @@ -70,6 +71,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note A#, 4 note B_, 3 + ;tie notetype0 7 note B_, 3 note A_, 3 @@ -83,6 +85,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 15 notetype1 3 @@ -91,6 +94,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 3 note G_, 4 @@ -101,6 +105,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 15 notetype1 3 @@ -109,6 +114,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 3 note F#, 4 @@ -119,6 +125,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note D#, 4 note E_, 3 + ;tie notetype0 7 note E_, 1 notetype1 3 @@ -128,24 +135,26 @@ Music_TCGDuelTheme1_Ch1: notetype1 3 note D_, 9 dec_octave - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 inc_octave - dutycycle 1 + duty_cycle 1 notetype1 10 notetype0 1 note C#, 4 note D_, 3 + ;tie notetype0 7 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - callchannel Branch_f5538 + rest 1 + sound_call Branch_f5538 notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 1 notetype1 3 @@ -171,33 +180,37 @@ Music_TCGDuelTheme1_Ch1: notetype1 3 note A_, 3 notetype0 7 - note __, 3 + rest 3 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 10 notetype2 8 .Loop3 note A_, 1 - note __, 2 - loopchannel 3, .Loop3 + rest 2 + sound_loop 3, .Loop3 inc_octave notetype0 1 note C#, 4 note D_, 3 + ;tie notetype0 7 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - callchannel Branch_f5538 + rest 1 + sound_call Branch_f5538 notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 5 + ;tie note A_, 10 + ;tie note A_, 6 notetype1 3 note A_, 2 @@ -206,6 +219,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note C#, 4 note D_, 3 + ;tie notetype0 7 note D_, 2 note C#, 1 @@ -220,12 +234,14 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note A#, 4 note B_, 3 + ;tie notetype0 7 note B_, 1 notetype1 3 note B_, 1 notetype1 10 note A_, 13 + ;tie note A_, 6 notetype1 3 note A_, 2 @@ -249,13 +265,16 @@ Music_TCGDuelTheme1_Ch1: note E_, 5 note A_, 4 dec_octave - callchannel Branch_f5580 + sound_call Branch_f5580 notetype1 10 note A_, 2 + ;tie note A_, 8 + ;tie note A_, 8 + ;tie note A_, 6 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype0 1 dec_octave @@ -264,17 +283,18 @@ Music_TCGDuelTheme1_Ch1: note C_, 3 notetype0 7 note C#, 1 - note __, 1 + rest 1 note C#, 1 note D_, 2 note E_, 2 note G_, 2 - dutycycle 2 - callchannel Branch_f5580 + duty_cycle 2 + sound_call Branch_f5580 notetype1 10 notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 5 note G_, 2 @@ -289,6 +309,7 @@ Music_TCGDuelTheme1_Ch1: notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 5 note F#, 2 @@ -301,8 +322,10 @@ Music_TCGDuelTheme1_Ch1: note D_, 2 notetype1 10 note D_, 8 + ;tie note D_, 8 note D_, 8 + ;tie note D_, 8 notetype1 3 note D_, 2 @@ -312,9 +335,10 @@ Music_TCGDuelTheme1_Ch1: note D_, 2 notetype1 10 note D_, 6 + ;tie note D_, 8 - note __, 4 - loopchannel 0, .MainLoop + rest 4 + sound_loop 0, .MainLoop Branch_f54f9: octave 2 @@ -329,6 +353,7 @@ Branch_f54f9: notetype0 1 note F_, 4 note F#, 3 + ;tie notetype0 7 note F#, 10 notetype1 3 @@ -341,6 +366,7 @@ Branch_f54f9: notetype0 1 note D#, 4 note E_, 3 + ;tie notetype0 7 note E_, 5 notetype1 3 @@ -349,6 +375,7 @@ Branch_f54f9: notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 2 note F#, 1 @@ -358,17 +385,17 @@ Branch_f54f9: note E_, 1 notetype1 3 note E_, 1 - endchannel + sound_ret Branch_f5538: note C_, 1 - note __, 2 + rest 2 dec_octave note G_, 1 - note __, 2 + rest 2 note G_, 1 - note __, 2 - dutycycle 2 + rest 2 + duty_cycle 2 notetype1 10 note G_, 1 inc_octave @@ -385,21 +412,22 @@ Branch_f5538: notetype1 3 note G_, 3 notetype0 7 - note __, 3 - dutycycle 1 + rest 3 + duty_cycle 1 notetype1 10 notetype2 8 dec_octave .Loop4 note G_, 1 - note __, 2 - loopchannel 3, .Loop4 + rest 2 + sound_loop 3, .Loop4 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype0 1 note A#, 4 note B_, 3 + ;tie notetype0 7 note B_, 2 note A_, 1 @@ -410,13 +438,14 @@ Branch_f5538: notetype1 3 note G_, 1 notetype1 10 - endchannel + sound_ret Branch_f5580: notetype0 1 notetype1 10 note F_, 4 note F#, 3 + ;tie notetype0 7 note F#, 9 notetype1 3 @@ -438,6 +467,7 @@ Branch_f5580: notetype0 1 note F_, 4 note F#, 3 + ;tie notetype0 7 note F#, 7 note E_, 1 @@ -461,6 +491,7 @@ Branch_f5580: notetype0 1 note A#, 4 note B_, 3 + ;tie notetype0 7 note B_, 8 notetype1 3 @@ -482,308 +513,312 @@ Branch_f5580: note F#, 2 notetype1 3 note F#, 2 - endchannel + sound_ret -Music_TCGDuelTheme1_Ch2: +Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) notetype0 7 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 8 .MainLoop - dutycycle 1 + duty_cycle 1 notetype1 9 octave 2 .Loop1 rept 3 note D_, 1 - note __, 2 + rest 2 endr - note __, 1 + rest 1 dec_octave note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 + rest 2 inc_octave - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 .Loop2 octave 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 2 - callchannel Branch_f59f9 - loopchannel 4, .Loop2 + sound_call Branch_f59f9 + sound_loop 4, .Loop2 octave 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note D_, 2 - callchannel Branch_f59f9 + sound_call Branch_f59f9 octave 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note C_, 2 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note G_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note B_, 1 - note __, 2 + rest 2 inc_octave .Loop3 octave 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note D_, 2 - callchannel Branch_f59f9 - loopchannel 3, .Loop3 + sound_call Branch_f59f9 + sound_loop 3, .Loop3 octave 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note C_, 2 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note G_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note B_, 1 - note __, 2 + rest 2 inc_octave note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note D_, 2 - callchannel Branch_f59f9 + sound_call Branch_f59f9 octave 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note D_, 2 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note F#, 1 - note __, 1 + rest 1 .Loop4 note G_, 1 - note __, 2 + rest 2 note G_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note G_, 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note G_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype1 10 notetype2 6 note G_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note E_, 1 - note __, 2 - loopchannel 2, .Loop4 + rest 2 + sound_loop 2, .Loop4 note F#, 1 - note __, 2 + rest 2 note F#, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 inc_octave note C#, 2 - callchannel Branch_f5a17 + sound_call Branch_f5a17 octave 2 note F#, 1 - note __, 2 + rest 2 note F#, 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note E_, 2 - callchannel Branch_f5a17 + sound_call Branch_f5a17 note E_, 1 - note __, 2 + rest 2 note E_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note G_, 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype1 10 notetype2 6 note B_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note G_, 1 - note __, 2 + rest 2 note A_, 1 - note __, 2 + rest 2 note A_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note G_, 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note A_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note A_, 1 - note __, 2 + rest 2 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note B_, 1 - note __, 2 + rest 2 inc_octave note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 + ;frequency_offset 0 note E_, 1 note F#, 1 note A_, 1 - note __, 1 + rest 1 notetype1 7 - callchannel Branch_f594d + sound_call Branch_f594d notetype1 7 octave 3 notetype0 1 note C#, 4 note D_, 3 + ;tie notetype0 7 note D_, 1 - note __, 1 + rest 1 dec_octave note F#, 1 notetype1 10 @@ -792,235 +827,246 @@ Music_TCGDuelTheme1_Ch2: notetype1 7 notetype2 8 note A_, 10 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 inc_octave note D_, 2 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note E_, 1 note F#, 1 note A_, 1 - note __, 1 - callchannel Branch_f594d + rest 1 + sound_call Branch_f594d notetype1 7 octave 3 note D_, 2 - note __, 1 + rest 1 note F#, 13 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 2 + rest 2 note D_, 1 - dutycycle 2 + duty_cycle 2 inc_octave notetype1 10 notetype2 6 note D_, 2 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note D_, 1 - note __, 1 + rest 1 note D_, 1 note E_, 1 note F#, 1 - note __, 1 + rest 1 notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note G_, 1 - note __, 2 + rest 2 note G_, 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 2 - note __, 1 + rest 1 note F#, 3 - note __, 1 + rest 1 dec_octave notetype1 10 notetype2 6 note G_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note E_, 1 - note __, 2 + rest 2 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note E_, 4 note F#, 3 + ;tie notetype0 7 note F#, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note F#, 1 - note __, 2 + rest 2 note F#, 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note E_, 4 note F#, 3 + ;tie notetype0 7 note F#, 2 - note __, 1 + rest 1 note E_, 3 - note __, 1 + rest 1 dec_octave notetype1 10 notetype2 6 note A_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note E_, 1 - note __, 2 + rest 2 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note D#, 4 note E_, 3 + ;tie notetype0 7 note E_, 15 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note A_, 1 - note __, 2 + rest 2 note A_, 1 - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note A#, 4 note B_, 3 + ;tie notetype0 7 note B_, 2 - note __, 1 + rest 1 note A_, 3 - note __, 1 + rest 1 note G_, 3 - note __, 1 + rest 1 notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 1 - note __, 1 + rest 1 note F#, 13 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note D_, 2 dec_octave - dutycycle 1 + ;frequency_offset 0 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 2 - callchannel Branch_f59b4 + rest 2 + sound_call Branch_f59b4 octave 3 notetype0 1 notetype1 7 note F_, 4 note F#, 3 + ;tie notetype0 7 note F#, 1 - note __, 1 + rest 1 note D_, 5 - note __, 1 + rest 1 dec_octave note F#, 1 notetype0 1 note A_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 3 + rest 3 note F#, 4 - note __, 3 + rest 3 notetype0 7 - note __, 3 + rest 3 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 .Loop5 note D_, 1 - note __, 2 - loopchannel 3, .Loop5 - callchannel Branch_f59b4 + rest 2 + sound_loop 3, .Loop5 + sound_call Branch_f59b4 notetype1 8 octave 3 note D_, 16 + ;tie note D_, 6 - note __, 2 + rest 2 notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 2 note A_, 1 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 1 + rest 1 note D_, 13 note C#, 6 - note __, 2 + rest 2 dec_octave notetype1 8 notetype0 1 @@ -1044,82 +1090,87 @@ Music_TCGDuelTheme1_Ch2: note E_, 4 dec_octave notetype0 7 - callchannel Branch_f598c + sound_call Branch_f598c note D_, 8 + ;tie note D_, 8 note C#, 6 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 7 notetype0 1 note G_, 4 note G#, 3 notetype0 7 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 2 inc_octave note C#, 2 note E_, 2 - dutycycle 2 - callchannel Branch_f598c + duty_cycle 2 + sound_call Branch_f598c note D_, 4 note E_, 2 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note E_, 6 note D_, 2 note C#, 2 - note __, 2 + rest 2 dec_octave note A_, 2 - note __, 2 + rest 2 note G_, 8 + ;tie note G_, 8 note F#, 8 + ;tie note F#, 8 - note __, 2 + rest 2 note G_, 12 - note __, 2 + rest 2 note G_, 14 - note __, 4 - loopchannel 0, .MainLoop + rest 4 + sound_loop 0, .MainLoop Branch_f594d: octave 3 notetype0 1 note C#, 4 note D_, 3 + ;tie notetype0 7 note D_, 9 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 note A_, 3 - note __, 1 + rest 1 inc_octave note C_, 6 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note D#, 4 note E_, 3 + ;tie notetype0 7 note E_, 2 note D_, 1 @@ -1131,48 +1182,49 @@ Branch_f594d: notetype1 7 notetype2 8 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Branch_f598c: notetype1 8 note D_, 10 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 inc_octave note D_, 8 note C#, 1 - note __, 1 + rest 1 dec_octave note B_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 1 + rest 1 note F#, 9 note D_, 1 - note __, 1 + rest 1 note G_, 9 - note __, 1 + rest 1 note F#, 4 note E_, 4 note D_, 10 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 dec_octave note B_, 10 inc_octave note C#, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - endchannel + ;tie + sound_ret Branch_f59b4: octave 2 @@ -1180,738 +1232,813 @@ Branch_f59b4: notetype0 1 note G#, 4 note A_, 3 + ;tie notetype0 7 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 2 + rest 2 note C_, 1 - note __, 2 + rest 2 note C_, 1 - note __, 2 - dutycycle 2 + rest 2 + duty_cycle 2 notetype1 7 note E_, 1 notetype0 1 note G_, 4 - note __, 3 + rest 3 inc_octave note C_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 notetype0 7 - note __, 3 + rest 3 notetype2 8 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 8 .Loop6 note C_, 1 - note __, 2 - loopchannel 3, .Loop6 + rest 2 + sound_loop 3, .Loop6 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 7 notetype0 1 note F#, 4 note G_, 3 + ;tie notetype0 7 note G_, 2 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Branch_f59f9: octave 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 1 - note __, 3 + rest 3 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note B_, 1 - note __, 2 - endchannel + rest 2 + sound_ret Branch_f5a17: octave 2 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note F#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype1 10 notetype2 6 note A_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note E_, 1 - note __, 2 - endchannel + rest 2 + sound_ret -Music_TCGDuelTheme1_Ch3: +Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) notetype0 7 + ;stereo_panning 1, 1 notetype1 1 notetype2 14 + ;echo 96 + ;cutoff 8 octave 2 .MainLoop .Loop1 rept 3 note D_, 1 - note __, 2 + rest 2 endr - note __, 1 - callchannel Branch_f5c47 - loopchannel 4, .Loop1 + rest 1 + sound_call Branch_f5c47 + sound_loop 4, .Loop1 .Loop2 note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave inc_octave + ;cutoff 3 note D_, 2 dec_octave dec_octave + ;cutoff 8 note D_, 1 - note __, 3 - callchannel Branch_f5c47 - loopchannel 4, .Loop2 - callchannel Branch_f5b8d + rest 3 + sound_call Branch_f5c47 + sound_loop 4, .Loop2 + sound_call Branch_f5b8d note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note F#, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 - callchannel Branch_f5c47 + rest 3 + sound_call Branch_f5c47 note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave inc_octave + ;cutoff 3 note D_, 2 dec_octave dec_octave + ;cutoff 8 note D_, 1 - note __, 3 - callchannel Branch_f5c47 - callchannel Branch_f5b8d + rest 3 + sound_call Branch_f5c47 + sound_call Branch_f5b8d note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 - callchannel Branch_f5c47 + rest 3 + sound_call Branch_f5c47 note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 2 + rest 2 note D_, 2 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - callchannel Branch_f5c7e + rest 1 + sound_call Branch_f5c7e octave 3 note C_, 3 dec_octave note G_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave .Loop3 note D_, 1 - note __, 2 - loopchannel 3, .Loop3 + rest 2 + sound_loop 3, .Loop3 inc_octave note D_, 1 notetype0 1 note F#, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 3 + rest 3 notetype0 7 - note __, 3 + rest 3 dec_octave dec_octave .Loop4 note D_, 1 - note __, 2 - loopchannel 3, .Loop4 + rest 2 + sound_loop 3, .Loop4 note D_, 2 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - callchannel Branch_f5c7e + rest 1 + sound_call Branch_f5c7e octave 2 note C_, 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - callchannel Branch_f5c60 + rest 1 + sound_call Branch_f5c60 octave 2 + ;cutoff 8 note E_, 1 - note __, 1 + rest 1 note E_, 2 + ;cutoff 6 note B_, 2 - callchannel Branch_f5c60 + sound_call Branch_f5c60 octave 2 + ;cutoff 8 note F#, 2 note G_, 2 + ;cutoff 6 note G#, 2 - callchannel Branch_f5c6f + sound_call Branch_f5c6f octave 2 + ;cutoff 8 note A_, 1 - note __, 1 + rest 1 note A_, 2 + ;cutoff 6 note E_, 2 - callchannel Branch_f5c6f + sound_call Branch_f5c6f octave 2 + ;cutoff 8 note B_, 2 inc_octave note C_, 2 note C#, 2 dec_octave .Loop5 - callchannel Branch_f5c4d + sound_call Branch_f5c4d note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 + ;cutoff 7 note E_, 1 + ;cutoff 8 note E_, 1 - note __, 1 + rest 1 note E_, 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 + ;cutoff 7 note F#, 1 + ;cutoff 8 note F#, 1 - note __, 1 + rest 1 note F#, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 + ;cutoff 7 note G_, 1 + ;cutoff 8 note F#, 1 - note __, 1 + rest 1 note E_, 2 - callchannel Branch_f5c4d + sound_call Branch_f5c4d note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 + ;cutoff 7 note B_, 1 + ;cutoff 8 note F#, 1 - note __, 1 + rest 1 note F_, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 note F#, 2 note G_, 2 note G#, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 note A_, 2 note E_, 2 note C#, 2 - loopchannel 2, .Loop5 + sound_loop 2, .Loop5 .Loop6 - callchannel Branch_f5c4d - loopchannel 2, .Loop6 + sound_call Branch_f5c4d + sound_loop 2, .Loop6 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 + ;cutoff 7 note D_, 1 + ;cutoff 8 note D_, 1 - note __, 1 + rest 1 note A_, 14 - note __, 4 - loopchannel 0, .MainLoop + rest 4 + sound_loop 0, .MainLoop Branch_f5b8d: note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 + rest 3 + ; + ;sound_call Branch_f5c47 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 + rest 2 + ; note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note G_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 + rest 3 + ; + ;sound_call Branch_f5c47 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 + rest 2 + ; .Loop7 note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 + rest 3 + ; + ;sound_call Branch_f5c47 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 - loopchannel 3, .Loop7 + rest 2 + ; + sound_loop 3, .Loop7 note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note G_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 + rest 3 + ; + ;sound_call Branch_f5c47 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 + rest 2 + ; note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 + rest 3 + ; + ;sound_call Branch_f5c47 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 + rest 2 + ; note D_, 1 - note __, 2 + rest 2 note D_, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note E_, 2 note F#, 1 - note __, 1 + rest 1 .Loop8 note G_, 1 - note __, 2 + rest 2 note G_, 1 inc_octave + ;cutoff 3 note B_, 2 dec_octave + ;cutoff 8 note G_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 note E_, 1 - note __, 2 - loopchannel 2, .Loop8 + rest 2 + sound_loop 2, .Loop8 note F#, 1 - note __, 2 + rest 2 note F#, 1 inc_octave + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note F#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 note E_, 1 - note __, 2 + rest 2 note F#, 1 - note __, 2 + rest 2 note F#, 1 inc_octave inc_octave + ;cutoff 3 note C#, 2 dec_octave dec_octave + ;cutoff 8 note F#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 note E_, 1 - note __, 2 + rest 2 note E_, 1 - note __, 2 + rest 2 note E_, 1 inc_octave + ;cutoff 3 note B_, 2 dec_octave + ;cutoff 8 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 - note __, 2 + rest 2 note A_, 1 - note __, 2 + rest 2 note A_, 1 inc_octave + ;cutoff 3 note B_, 2 dec_octave + ;cutoff 8 note A_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note F#, 1 note A_, 1 - note __, 2 - endchannel + rest 2 + sound_ret Branch_f5c47: note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 - note __, 2 - endchannel + rest 2 + sound_ret Branch_f5c4d: note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 + ;cutoff 7 note D_, 1 + ;cutoff 8 note D_, 1 - note __, 1 + rest 1 note D_, 2 - endchannel + sound_ret Branch_f5c60: octave 2 + ;cutoff 8 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 + ;cutoff 6 note E_, 1 - endchannel + sound_ret Branch_f5c6f: octave 2 + ;cutoff 8 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 + ;cutoff 6 note A_, 1 - endchannel + sound_ret Branch_f5c7e: octave 2 .Loop9 note C_, 1 - note __, 2 - loopchannel 3, .Loop9 + rest 2 + sound_loop 3, .Loop9 inc_octave note C_, 1 notetype0 1 note E_, 4 - note __, 3 + rest 3 note G_, 4 - note __, 3 + rest 3 inc_octave note C_, 4 - note __, 3 + rest 3 notetype0 7 - note __, 3 + rest 3 dec_octave dec_octave .Loop10 note C_, 1 - note __, 2 - loopchannel 3, .Loop10 - endchannel + rest 2 + sound_loop 3, .Loop10 + sound_ret -Music_TCGDuelTheme1_Ch4: - togglenoise $06 - notetype 7 +Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a) + toggle_noise 6 + drum_speed 7 octave 1 .MainLoop .Loop1 - note C_, 2 - note D#, 1 - note E_, 1 - note D#, 1 - note C_, 1 - note D_, 2 - note D#, 1 - note C_, 1 - note E_, 2 - note C#, 1 - note E_, 1 - note __, 1 - note D#, 1 - loopchannel 3, .Loop1 - note C_, 2 - note D#, 1 - note E_, 1 - note D#, 1 - note C_, 1 - note D_, 2 - note D#, 1 - note C#, 1 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 - note C#, 1 - note C#, 1 - note C#, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 5, 1 + rest 1 + drum_note 4, 1 + sound_loop 3, .Loop1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 2 .Loop2 - callchannel Branch_f5d39 - loopchannel 3, .Loop2 - callchannel Branch_f5d46 + sound_call Branch_f5d39 + sound_loop 3, .Loop2 + sound_call Branch_f5d46 .Loop3 - callchannel Branch_f5d39 - loopchannel 15, .Loop3 - callchannel Branch_f5d46 + sound_call Branch_f5d39 + sound_loop 15, .Loop3 + sound_call Branch_f5d46 .Loop4 - callchannel Branch_f5d39 - loopchannel 15, .Loop4 - note C_, 2 - note D#, 1 - note E_, 1 - note C#, 2 - note E_, 2 - note D#, 1 - note C#, 1 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 + sound_call Branch_f5d39 + sound_loop 15, .Loop4 + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 2 + drum_note 5, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 .Loop5 - note C#, 1 - loopchannel 4, .Loop5 + drum_note 2, 1 + sound_loop 4, .Loop5 .Loop6 - note C_, 1 - note D#, 1 - note E_, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note E_, 2 - note D#, 1 - note C_, 1 - note D#, 2 - note C#, 2 - note E_, 2 - loopchannel 5, .Loop6 - note C_, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note E_, 2 - note D#, 1 - note C_, 1 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 2 + drum_note 2, 2 + drum_note 5, 2 + sound_loop 5, .Loop6 + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 .Loop7 - note C#, 1 - loopchannel 4, .Loop7 + drum_note 2, 1 + sound_loop 4, .Loop7 .Loop8 - callchannel Branch_f5d39 - loopchannel 3, .Loop8 - callchannel Branch_f5d58 + sound_call Branch_f5d39 + sound_loop 3, .Loop8 + sound_call Branch_f5d58 .Loop9 - callchannel Branch_f5d39 - loopchannel 7, .Loop9 - callchannel Branch_f5d46 + sound_call Branch_f5d39 + sound_loop 7, .Loop9 + sound_call Branch_f5d46 .Loop10 - callchannel Branch_f5d39 - loopchannel 7, .Loop10 - callchannel Branch_f5d58 + sound_call Branch_f5d39 + sound_loop 7, .Loop10 + sound_call Branch_f5d58 .Loop11 - callchannel Branch_f5d39 - loopchannel 2, .Loop11 - note C_, 2 - note D#, 1 - note E_, 1 - note C#, 2 - note E_, 2 - note C_, 1 - note D#, 1 - note E_, 2 - note C#, 2 - note F_, 14 - note C#, 4 - loopchannel 0, .MainLoop + sound_call Branch_f5d39 + sound_loop 2, .Loop11 + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 2 + drum_note 5, 2 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 2 + drum_note 6, 14 + drum_note 2, 4 + sound_loop 0, .MainLoop Branch_f5d39: - note C_, 2 - note D#, 1 - note E_, 1 - note C#, 2 - note E_, 2 - note C_, 1 - note D#, 1 - note E_, 2 - note C#, 1 - note E_, 1 - note __, 1 - note D#, 1 - endchannel + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 2 + drum_note 5, 2 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 5, 1 + rest 1 + drum_note 4, 1 + sound_ret Branch_f5d46: - note C_, 2 - note D#, 1 - note E_, 1 - note C#, 2 - note E_, 2 - note D#, 1 - note C#, 1 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 - note C#, 1 - note C#, 1 - note C#, 2 - endchannel + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 2 + drum_note 5, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 2 + sound_ret Branch_f5d58: - note C_, 2 - note D#, 1 - note E_, 1 - note C#, 2 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 + drum_note 1, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 2 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 .Loop12 - note C#, 1 - loopchannel 8, .Loop12 - endchannel - + drum_note 2, 1 + sound_loop 8, .Loop12 + sound_ret +; 0xf5d68 diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index 0c3a037a..442718a8 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -1,31 +1,30 @@ -Music_TCGDuelTheme2: - db $C0 - dw Music_TCGDuelTheme2_Ch1 - db $01 - dw Music_TCGDuelTheme2_Ch2 - db $02 - dw Music_TCGDuelTheme2_Ch3 - db $03 - dw Music_TCGDuelTheme2_Ch4 +Music_DuelTheme2: + channel_count 4 + channel 1, Music_DuelTheme2_Ch1 + channel 2, Music_DuelTheme2_Ch2 + channel 3, Music_DuelTheme2_Ch3 + channel 4, Music_DuelTheme2_Ch4 -Music_TCGDuelTheme2_Ch1: +Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) notetype0 9 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 8 octave 1 - dutycycle 1 + duty_cycle 1 notetype1 9 .Loop1 note D_, 2 note D_, 1 - loopchannel 8, .Loop1 + sound_loop 8, .Loop1 .MainLoop octave 1 .Loop2 note D_, 2 note D_, 1 - loopchannel 23, .Loop2 - dutycycle 1 + sound_loop 23, .Loop2 + duty_cycle 1 notetype1 10 inc_octave inc_octave @@ -40,8 +39,9 @@ Music_TCGDuelTheme2_Ch1: inc_octave note C_, 3 notetype0 9 - callchannel Branch_f5f3d + sound_call Branch_f5f3d note C_, 6 + ;tie notetype0 1 note C_, 12 notetype1 3 @@ -66,10 +66,11 @@ Music_TCGDuelTheme2_Ch1: note D_, 1 notetype2 8 note D_, 9 + ;tie note D_, 9 notetype1 4 note D_, 3 - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 3 note E_, 4 @@ -89,7 +90,7 @@ Music_TCGDuelTheme2_Ch1: notetype1 8 notetype2 8 note C_, 3 - dutycycle 1 + duty_cycle 1 notetype1 10 dec_octave notetype0 1 @@ -103,9 +104,10 @@ Music_TCGDuelTheme2_Ch1: inc_octave note C_, 3 notetype0 9 - callchannel Branch_f5f3d + sound_call Branch_f5f3d notetype2 8 note C_, 4 + ;tie notetype0 1 note C_, 4 note E_, 5 @@ -135,6 +137,7 @@ Music_TCGDuelTheme2_Ch1: inc_octave notetype2 8 note D_, 9 + ;tie note D_, 10 notetype1 3 note D_, 1 @@ -166,19 +169,19 @@ Music_TCGDuelTheme2_Ch1: note B_, 3 inc_octave note C_, 3 - callchannel Branch_f5f90 + sound_call Branch_f5f90 note D_, 1 notetype1 3 note D_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 octave 1 note D_, 1 .Loop3 note D_, 2 note D_, 1 - loopchannel 3, .Loop3 - dutycycle 2 + sound_loop 3, .Loop3 + duty_cycle 2 notetype1 7 inc_octave inc_octave @@ -193,9 +196,9 @@ Music_TCGDuelTheme2_Ch1: note B_, 1 note D_, 1 note B_, 1 - dutycycle 1 + duty_cycle 1 notetype1 10 - callchannel Branch_f5f62 + sound_call Branch_f5f62 octave 4 notetype1 4 note F#, 12 @@ -226,17 +229,17 @@ Music_TCGDuelTheme2_Ch1: note A_, 6 notetype1 4 note A_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 2 note D_, 2 - note __, 2 + rest 2 note C#, 2 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype2 8 - callchannel Branch_f5f62 + sound_call Branch_f5f62 octave 4 notetype1 4 note F#, 6 @@ -275,6 +278,7 @@ Music_TCGDuelTheme2_Ch1: note E_, 3 notetype0 1 note C_, 2 + ;tie note C_, 16 notetype1 4 note C_, 9 @@ -300,19 +304,19 @@ Music_TCGDuelTheme2_Ch1: note B_, 3 inc_octave note C_, 3 - callchannel Branch_f5f90 + sound_call Branch_f5f90 note D_, 1 notetype1 3 note D_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 octave 1 note D_, 1 .Loop4 note D_, 2 note D_, 1 - loopchannel 3, .Loop4 - dutycycle 1 + sound_loop 3, .Loop4 + duty_cycle 1 notetype1 10 notetype2 8 octave 5 @@ -332,34 +336,41 @@ Music_TCGDuelTheme2_Ch1: note F_, 1 note C_, 1 note D_, 12 + ;tie note D_, 12 - dutycycle 1 + duty_cycle 1 notetype1 9 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f5f3d: notetype2 8 note D_, 12 + ;tie note D_, 4 + ;tie notetype0 1 note D_, 7 notetype1 4 note D_, 2 + ;tie notetype0 9 note D_, 1 dec_octave notetype1 10 note A_, 4 + ;tie notetype0 1 note A_, 7 notetype1 4 note A_, 2 + ;tie notetype0 9 note A_, 1 inc_octave notetype1 10 note C_, 12 - endchannel + ;tie + sound_ret Branch_f5f62: octave 3 @@ -399,7 +410,7 @@ Branch_f5f62: note F#, 1 notetype2 8 note F#, 9 - endchannel + sound_ret Branch_f5f90: octave 5 @@ -408,7 +419,7 @@ Branch_f5f90: note D_, 1 notetype1 3 note D_, 1 - dutycycle 1 + duty_cycle 1 notetype1 9 octave 1 note D_, 1 @@ -417,86 +428,90 @@ Branch_f5f90: note D_, 1 endr note D_, 2 - dutycycle 1 + duty_cycle 1 notetype1 10 octave 5 note C_, 4 - loopchannel 3, .Loop5 - endchannel + sound_loop 3, .Loop5 + sound_ret -Music_TCGDuelTheme2_Ch2: +Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) notetype0 9 - vibrato 15, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 15, 3, 3 notetype2 8 octave 2 - dutycycle 1 + duty_cycle 1 notetype1 7 + ;frequency_offset 5 .Loop1 note D_, 2 note D_, 1 - loopchannel 8, .Loop1 + sound_loop 8, .Loop1 .MainLoop .Loop2 note D_, 2 note D_, 1 - loopchannel 24, .Loop2 - dutycycle 2 + sound_loop 24, .Loop2 + duty_cycle 2 notetype1 7 + ;frequency_offset 0 .Loop3 inc_octave note D_, 1 dec_octave note A_, 1 - loopchannel 12, .Loop3 + sound_loop 12, .Loop3 .Loop4 inc_octave note C_, 1 dec_octave note G_, 1 - loopchannel 10, .Loop4 + sound_loop 10, .Loop4 inc_octave note C_, 1 note G_, 1 inc_octave note C_, 1 note G_, 1 - dutycycle 1 + duty_cycle 1 notetype1 7 dec_octave note D_, 1 - note __, 1 + rest 1 dec_octave notetype2 6 note A_, 1 notetype2 8 note A_, 9 - dutycycle 2 + duty_cycle 2 notetype1 7 .Loop5 note A_, 1 note D_, 1 note A_, 1 - loopchannel 4, .Loop5 - dutycycle 2 + sound_loop 4, .Loop5 + duty_cycle 2 inc_octave notetype2 8 notetype1 3 note C_, 4 notetype1 6 note C_, 7 - note __, 1 + rest 1 notetype1 6 note E_, 4 notetype0 1 notetype1 8 note E_, 12 - note __, 6 + rest 6 notetype0 9 notetype1 8 note G_, 3 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 7 notetype0 1 note G_, 3 @@ -509,25 +524,25 @@ Music_TCGDuelTheme2_Ch2: note F_, 3 note G_, 3 notetype0 9 - dutycycle 2 + duty_cycle 2 notetype1 7 .Loop6 note A_, 1 note D_, 1 - loopchannel 9, .Loop6 + sound_loop 9, .Loop6 .Loop7 note D_, 1 dec_octave note A_, 1 inc_octave - loopchannel 3, .Loop7 + sound_loop 3, .Loop7 .Loop8 note G_, 1 note C_, 1 - loopchannel 8, .Loop8 + sound_loop 8, .Loop8 notetype0 1 note G_, 4 - dutycycle 1 + duty_cycle 1 notetype1 7 inc_octave note C_, 5 @@ -535,27 +550,27 @@ Music_TCGDuelTheme2_Ch2: note D#, 5 notetype0 1 note E_, 12 - note __, 6 + rest 6 note C_, 12 - note __, 6 + rest 6 notetype0 9 dec_octave note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 notetype2 6 note D_, 1 notetype2 8 note A_, 9 - dutycycle 2 + duty_cycle 2 notetype1 7 .Loop9 note A_, 1 note D_, 1 - loopchannel 5, .Loop9 + sound_loop 5, .Loop9 note A_, 1 - dutycycle 1 + duty_cycle 1 notetype1 7 notetype0 1 note A#, 4 @@ -563,9 +578,9 @@ Music_TCGDuelTheme2_Ch2: notetype0 9 inc_octave note C_, 11 - note __, 1 + rest 1 note E_, 5 - note __, 1 + rest 1 note G_, 3 dec_octave notetype0 1 @@ -578,29 +593,31 @@ Music_TCGDuelTheme2_Ch2: note E_, 4 note F_, 3 note G_, 3 - callchannel Branch_f618f + sound_call Branch_f618f note A_, 1 - note __, 1 - dutycycle 1 + rest 1 + duty_cycle 1 notetype1 7 + ;frequency_offset 5 dec_octave dec_octave note D_, 1 .Loop10 note D_, 2 note D_, 1 - loopchannel 3, .Loop10 - dutycycle 2 + sound_loop 3, .Loop10 + duty_cycle 2 notetype1 7 + ;frequency_offset 0 inc_octave note E_, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 inc_octave note C#, 1 @@ -608,9 +625,9 @@ Music_TCGDuelTheme2_Ch2: note E_, 1 inc_octave note C#, 1 - dutycycle 2 + duty_cycle 2 notetype1 7 - callchannel Branch_f6173 + sound_call Branch_f6173 octave 4 .Loop11 note D_, 1 @@ -623,7 +640,7 @@ Music_TCGDuelTheme2_Ch2: note B_, 1 inc_octave inc_octave - loopchannel 4, .Loop11 + sound_loop 4, .Loop11 .Loop12 note C#, 1 dec_octave @@ -635,24 +652,24 @@ Music_TCGDuelTheme2_Ch2: note A_, 1 inc_octave inc_octave - loopchannel 2, .Loop12 - dutycycle 1 + sound_loop 2, .Loop12 + duty_cycle 1 notetype1 9 octave 2 - note __, 1 + rest 1 notetype2 8 note B_, 2 note B_, 2 - note __, 2 + rest 2 note A_, 2 inc_octave notetype2 8 note C#, 1 note D_, 1 note E_, 1 - dutycycle 2 + duty_cycle 2 notetype1 7 - callchannel Branch_f6173 + sound_call Branch_f6173 octave 3 .Loop13 note B_, 1 @@ -665,7 +682,7 @@ Music_TCGDuelTheme2_Ch2: dec_octave note G_, 1 inc_octave - loopchannel 2, .Loop13 + sound_loop 2, .Loop13 .Loop14 inc_octave note C#, 1 @@ -677,7 +694,7 @@ Music_TCGDuelTheme2_Ch2: dec_octave note A_, 1 inc_octave - loopchannel 2, .Loop14 + sound_loop 2, .Loop14 .Loop15 inc_octave note D_, 1 @@ -689,7 +706,7 @@ Music_TCGDuelTheme2_Ch2: dec_octave note A_, 1 inc_octave - loopchannel 2, .Loop15 + sound_loop 2, .Loop15 .Loop16 inc_octave note E_, 1 @@ -701,7 +718,7 @@ Music_TCGDuelTheme2_Ch2: note E_, 1 note G_, 1 note C_, 1 - loopchannel 2, .Loop16 + sound_loop 2, .Loop16 inc_octave note D_, 1 dec_octave @@ -738,7 +755,7 @@ Music_TCGDuelTheme2_Ch2: note G_, 1 inc_octave note C_, 1 - dutycycle 1 + duty_cycle 1 notetype1 7 dec_octave notetype0 1 @@ -751,28 +768,32 @@ Music_TCGDuelTheme2_Ch2: note E_, 4 note F_, 3 note G_, 3 - callchannel Branch_f618f + sound_call Branch_f618f note A_, 1 - note __, 1 - dutycycle 1 + rest 1 + duty_cycle 1 notetype1 7 + ;frequency_offset 5 dec_octave dec_octave note D_, 1 .Loop17 note D_, 2 note D_, 1 - loopchannel 3, .Loop17 - note __, 12 - dutycycle 1 + sound_loop 3, .Loop17 + rest 12 + duty_cycle 1 notetype1 7 + ;frequency_offset 0 inc_octave note A_, 12 + ;tie note A_, 12 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 7 - loopchannel 0, .MainLoop + ;frequency_offset 5 + sound_loop 0, .MainLoop Branch_f6173: octave 4 @@ -787,7 +808,7 @@ Branch_f6173: note A_, 1 inc_octave inc_octave - loopchannel 4, .Loop18 + sound_loop 4, .Loop18 .Loop19 note D_, 1 dec_octave @@ -799,16 +820,17 @@ Branch_f6173: note B_, 1 inc_octave inc_octave - loopchannel 4, .Loop19 - endchannel + sound_loop 4, .Loop19 + sound_ret Branch_f618f: octave 4 notetype0 9 .Loop20 note A_, 1 - note __, 1 + rest 1 notetype1 7 + ;frequency_offset 5 dec_octave dec_octave note D_, 1 @@ -818,38 +840,45 @@ Branch_f618f: endr note D_, 2 notetype1 7 + ;frequency_offset 0 inc_octave inc_octave note G_, 4 - loopchannel 3, .Loop20 - endchannel + sound_loop 3, .Loop20 + sound_ret -Music_TCGDuelTheme2_Ch3: +Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) notetype0 9 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 64 + ;cutoff 7 octave 2 .Loop1 - callchannel Branch_f62e5 - loopchannel 4, .Loop1 + sound_call Branch_f62e5 + sound_loop 4, .Loop1 .MainLoop .Loop2 - callchannel Branch_f62e5 - loopchannel 44, .Loop2 + sound_call Branch_f62e5 + sound_loop 44, .Loop2 .Loop3 rept 3 - callchannel Branch_f62e5 + sound_call Branch_f62e5 endr octave 2 + ;cutoff 4 note D_, 2 + ;cutoff 7 note C_, 3 note E_, 1 - loopchannel 3, .Loop3 + sound_loop 3, .Loop3 .Loop4 - callchannel Branch_f62e5 - loopchannel 2, .Loop4 + sound_call Branch_f62e5 + sound_loop 2, .Loop4 octave 2 + ;cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -871,11 +900,13 @@ Music_TCGDuelTheme2_Ch3: dec_octave note A_, 1 .Loop5 - callchannel Branch_f62e5 - loopchannel 4, .Loop5 + sound_call Branch_f62e5 + sound_loop 4, .Loop5 octave 2 .Loop6 + ;cutoff 4 note E_, 2 + ;cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -884,9 +915,11 @@ Music_TCGDuelTheme2_Ch3: inc_octave note E_, 1 dec_octave - loopchannel 4, .Loop6 + sound_loop 4, .Loop6 .Loop7 + ;cutoff 4 note A_, 2 + ;cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -895,11 +928,12 @@ Music_TCGDuelTheme2_Ch3: inc_octave note A_, 1 dec_octave - loopchannel 4, .Loop7 + sound_loop 4, .Loop7 .Loop8 - callchannel Branch_f62e5 - loopchannel 2, .Loop8 + sound_call Branch_f62e5 + sound_loop 2, .Loop8 octave 2 + ;cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -924,11 +958,13 @@ Music_TCGDuelTheme2_Ch3: inc_octave note A_, 1 .Loop9 - callchannel Branch_f62e5 - loopchannel 4, .Loop9 + sound_call Branch_f62e5 + sound_loop 4, .Loop9 octave 2 .Loop10 + ;cutoff 4 note E_, 2 + ;cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -937,9 +973,11 @@ Music_TCGDuelTheme2_Ch3: inc_octave note E_, 1 dec_octave - loopchannel 4, .Loop10 + sound_loop 4, .Loop10 .Loop11 + ;cutoff 4 note G_, 2 + ;cutoff 7 note G_, 1 inc_octave note G_, 1 @@ -948,9 +986,11 @@ Music_TCGDuelTheme2_Ch3: inc_octave note G_, 1 dec_octave - loopchannel 2, .Loop11 + sound_loop 2, .Loop11 .Loop12 + ;cutoff 4 note A_, 2 + ;cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -959,9 +999,11 @@ Music_TCGDuelTheme2_Ch3: inc_octave note A_, 1 dec_octave - loopchannel 2, .Loop12 + sound_loop 2, .Loop12 .Loop13 + ;cutoff 4 note A#, 2 + ;cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -970,10 +1012,12 @@ Music_TCGDuelTheme2_Ch3: inc_octave note A#, 1 dec_octave - loopchannel 2, .Loop13 + sound_loop 2, .Loop13 inc_octave .Loop14 + ;cutoff 4 note C_, 2 + ;cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -982,10 +1026,12 @@ Music_TCGDuelTheme2_Ch3: inc_octave note C_, 1 dec_octave - loopchannel 2, .Loop14 + sound_loop 2, .Loop14 dec_octave .Loop15 + ;cutoff 4 note A#, 2 + ;cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -994,10 +1040,12 @@ Music_TCGDuelTheme2_Ch3: inc_octave note A#, 1 dec_octave - loopchannel 2, .Loop15 + sound_loop 2, .Loop15 inc_octave .Loop16 + ;cutoff 4 note C_, 2 + ;cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1006,20 +1054,23 @@ Music_TCGDuelTheme2_Ch3: inc_octave note C_, 1 dec_octave - loopchannel 2, .Loop16 + sound_loop 2, .Loop16 .Loop17 rept 3 - callchannel Branch_f62e5 + sound_call Branch_f62e5 endr octave 2 + ;cutoff 4 note D_, 2 + ;cutoff 7 note C_, 3 note E_, 1 - loopchannel 3, .Loop17 + sound_loop 3, .Loop17 .Loop18 - callchannel Branch_f62e5 - loopchannel 2, .Loop18 + sound_call Branch_f62e5 + sound_loop 2, .Loop18 octave 3 + ;cutoff 8 note D_, 1 note C_, 1 dec_octave @@ -1036,13 +1087,15 @@ Music_TCGDuelTheme2_Ch3: note F_, 1 note C_, 1 .Loop19 - callchannel Branch_f62e5 - loopchannel 4, .Loop19 - loopchannel 0, .MainLoop + sound_call Branch_f62e5 + sound_loop 4, .Loop19 + sound_loop 0, .MainLoop Branch_f62e5: octave 2 + ;cutoff 4 note D_, 2 + ;cutoff 7 note D_, 1 inc_octave note D_, 1 @@ -1050,144 +1103,144 @@ Branch_f62e5: note D_, 1 inc_octave note D_, 1 - endchannel + sound_ret -Music_TCGDuelTheme2_Ch4: - togglenoise $06 - notetype 9 +Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) + toggle_noise 6 + drum_speed 9 .Loop1 - note __, 12 - loopchannel 2, .Loop1 + rest 12 + sound_loop 2, .Loop1 .MainLoop - note __, 12 - note __, 6 + rest 12 + rest 6 .Loop2 - note C#, 1 - loopchannel 6, .Loop2 + drum_note 2, 1 + sound_loop 6, .Loop2 .Loop3 - callchannel Branch_f637c - loopchannel 3, .Loop3 - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 + sound_call Branch_f637c + sound_loop 3, .Loop3 + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 .Loop4 - note C#, 1 - loopchannel 6, .Loop4 + drum_note 2, 1 + sound_loop 6, .Loop4 .Loop5 - callchannel Branch_f637c - loopchannel 15, .Loop5 - callchannel Branch_f6396 + sound_call Branch_f637c + sound_loop 15, .Loop5 + sound_call Branch_f6396 .Loop6 - callchannel Branch_f637c + sound_call Branch_f637c rept 6 - note C#, 1 + drum_note 2, 1 endr - note C#, 2 - note F_, 3 - note C#, 1 - loopchannel 3, .Loop6 - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note D#, 1 - note C_, 1 - note D#, 1 - notetype 1 - note D#, 4 - note D_, 5 - notetype 9 - note C#, 3 + drum_note 2, 2 + drum_note 6, 3 + drum_note 2, 1 + sound_loop 3, .Loop6 + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_speed 1 + drum_note 4, 4 + drum_note 3, 5 + drum_speed 9 + drum_note 2, 3 .Loop7 - note C#, 1 - loopchannel 12, .Loop7 + drum_note 2, 1 + sound_loop 12, .Loop7 .Loop8 - callchannel Branch_f637c - callchannel Branch_f6389 - loopchannel 3, .Loop8 - callchannel Branch_f637c - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - note C#, 1 - notetype 1 - note D_, 4 - note D_, 5 - notetype 9 - note C#, 1 - note C#, 1 - note C#, 1 + sound_call Branch_f637c + sound_call Branch_f6389 + sound_loop 3, .Loop8 + sound_call Branch_f637c + drum_note 1, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 5 + drum_speed 9 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 .Loop9 - callchannel Branch_f637c - callchannel Branch_f6389 - loopchannel 4, .Loop9 - callchannel Branch_f637c - callchannel Branch_f6396 + sound_call Branch_f637c + sound_call Branch_f6389 + sound_loop 4, .Loop9 + sound_call Branch_f637c + sound_call Branch_f6396 .Loop10 - callchannel Branch_f637c + sound_call Branch_f637c rept 6 - note C#, 1 + drum_note 2, 1 endr - note C#, 2 - note F_, 3 - note C#, 1 - loopchannel 3, .Loop10 - callchannel Branch_f637c + drum_note 2, 2 + drum_note 6, 3 + drum_note 2, 1 + sound_loop 3, .Loop10 + sound_call Branch_f637c .Loop11 - note C#, 1 - loopchannel 12, .Loop11 - note F_, 12 - note __, 12 - loopchannel 0, .MainLoop + drum_note 2, 1 + sound_loop 12, .Loop11 + drum_note 6, 12 + rest 12 + sound_loop 0, .MainLoop Branch_f637c: - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note D#, 1 - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - endchannel + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + sound_ret Branch_f6389: - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note D#, 1 - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note C#, 1 - endchannel + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 + sound_ret Branch_f6396: - note C_, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note D#, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 .Loop12 - note C#, 1 - loopchannel 6, .Loop12 - endchannel - + drum_note 2, 1 + sound_loop 6, .Loop12 + sound_ret +; 0xf63a1 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index 058b7da5..049ac5d8 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -1,35 +1,34 @@ -Music_TCGDuelTheme3: - db $C0 - dw Music_TCGDuelTheme3_Ch1 - db $01 - dw Music_TCGDuelTheme3_Ch2 - db $02 - dw Music_TCGDuelTheme3_Ch3 - db $03 - dw Music_TCGDuelTheme3_Ch4 +Music_DuelTheme3: + channel_count 4 + channel 1, Music_DuelTheme3_Ch1 + channel 2, Music_DuelTheme3_Ch2 + channel 3, Music_DuelTheme3_Ch3 + channel 4, Music_DuelTheme3_Ch4 -Music_TCGDuelTheme3_Ch1: +Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) notetype0 11 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 8 .MainLoop octave 2 - dutycycle 0 + duty_cycle 0 .Loop1 rept 4 notetype1 9 note F#, 2 - note __, 1 + rest 1 endr notetype1 9 note E_, 2 notetype1 9 note F_, 2 - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 .Loop2 - callchannel Branch_f67b2 - loopchannel 4, .Loop2 - dutycycle 1 + sound_call Branch_f67b2 + sound_loop 4, .Loop2 + duty_cycle 1 notetype1 10 .Loop3 octave 3 @@ -39,7 +38,7 @@ Music_TCGDuelTheme3_Ch1: note G#, 5 notetype1 3 note G#, 6 - callchannel Branch_f65a7 + sound_call Branch_f65a7 octave 3 note D_, 1 note F#, 1 @@ -47,32 +46,32 @@ Music_TCGDuelTheme3_Ch1: note B_, 5 notetype1 3 note B_, 6 - callchannel Branch_f65a7 - loopchannel 2, .Loop3 - dutycycle 0 + sound_call Branch_f65a7 + sound_loop 2, .Loop3 + duty_cycle 0 notetype1 10 dec_octave - note __, 2 + rest 2 notetype0 1 note E_, 5 notetype1 2 note E_, 6 - callchannel Branch_f65cf + sound_call Branch_f65cf note F#, 5 notetype1 2 note F#, 6 notetype0 11 - note __, 1 + rest 1 dec_octave - dutycycle 0 + duty_cycle 0 notetype1 10 notetype0 1 note E_, 5 notetype1 2 note E_, 6 - callchannel Branch_f65cf + sound_call Branch_f65cf notetype0 11 - dutycycle 1 + duty_cycle 1 notetype1 10 .Loop4 octave 3 @@ -82,7 +81,7 @@ Music_TCGDuelTheme3_Ch1: note G#, 5 notetype1 3 note G#, 6 - callchannel Branch_f65a7 + sound_call Branch_f65a7 octave 3 note D_, 1 note F#, 1 @@ -91,18 +90,18 @@ Music_TCGDuelTheme3_Ch1: notetype1 3 note B_, 6 notetype1 10 - callchannel Branch_f65a7 - loopchannel 2, .Loop4 - vibrato 10, $33 - dutycycle 0 + sound_call Branch_f65a7 + sound_loop 2, .Loop4 + vibrato 10, 3, 3 + duty_cycle 0 .Loop5 octave 2 - note __, 4 + rest 4 notetype1 9 note F#, 2 notetype1 2 note F#, 2 - note __, 2 + rest 2 notetype1 9 note E_, 2 notetype1 2 @@ -114,13 +113,13 @@ Music_TCGDuelTheme3_Ch1: notetype1 9 note D_, 2 note C#, 2 - loopchannel 2, .Loop5 - vibrato 20, $33 - dutycycle 2 + sound_loop 2, .Loop5 + vibrato 20, 3, 3 + duty_cycle 2 notetype2 6 .Loop6 - callchannel Branch_f661d - loopchannel 4, .Loop6 + sound_call Branch_f661d + sound_loop 4, .Loop6 octave 4 notetype1 7 note C#, 5 @@ -131,8 +130,8 @@ Music_TCGDuelTheme3_Ch1: notetype1 2 note F#, 6 .Loop7 - callchannel Branch_f661d - loopchannel 3, .Loop7 + sound_call Branch_f661d + sound_loop 3, .Loop7 octave 4 notetype1 7 note C#, 5 @@ -154,7 +153,7 @@ Music_TCGDuelTheme3_Ch1: note F#, 6 dec_octave notetype0 11 - dutycycle 1 + duty_cycle 1 notetype1 9 notetype2 8 note D_, 2 @@ -179,7 +178,7 @@ Music_TCGDuelTheme3_Ch1: note G_, 3 notetype0 11 note G#, 4 - dutycycle 0 + duty_cycle 0 octave 2 .Loop8 rept 4 @@ -187,7 +186,7 @@ Music_TCGDuelTheme3_Ch1: note F#, 1 notetype1 3 note F#, 1 - note __, 1 + rest 1 endr notetype1 9 note F#, 1 @@ -202,7 +201,7 @@ Music_TCGDuelTheme3_Ch1: note G_, 1 notetype1 3 note G_, 1 - note __, 1 + rest 1 endr notetype1 9 note A_, 1 @@ -212,8 +211,8 @@ Music_TCGDuelTheme3_Ch1: note G_, 1 notetype1 3 note G_, 1 - loopchannel 2, .Loop8 - dutycycle 1 + sound_loop 2, .Loop8 + duty_cycle 1 notetype1 10 octave 3 note C#, 1 @@ -222,7 +221,7 @@ Music_TCGDuelTheme3_Ch1: note G#, 5 notetype1 3 note G#, 6 - callchannel Branch_f65a7 + sound_call Branch_f65a7 octave 3 note C#, 1 note F#, 1 @@ -268,6 +267,7 @@ Music_TCGDuelTheme3_Ch1: notetype1 10 note A_, 2 note B_, 1 + ;tie notetype0 1 note B_, 5 notetype1 3 @@ -319,14 +319,14 @@ Music_TCGDuelTheme3_Ch1: note E_, 3 notetype1 10 note E_, 2 - dutycycle 1 + duty_cycle 1 .Loop9 rept 4 notetype1 9 note G#, 1 notetype1 3 note G#, 1 - note __, 1 + rest 1 endr notetype1 9 note G#, 1 @@ -341,7 +341,7 @@ Music_TCGDuelTheme3_Ch1: note A_, 1 notetype1 3 note A_, 1 - note __, 1 + rest 1 endr notetype1 9 note A_, 1 @@ -351,14 +351,15 @@ Music_TCGDuelTheme3_Ch1: note A_, 1 notetype1 3 note A_, 1 - loopchannel 4, .Loop9 - loopchannel 0, .MainLoop + sound_loop 4, .Loop9 + sound_loop 0, .MainLoop Branch_f65a7: notetype0 11 octave 4 notetype1 10 note C#, 5 + ;tie note C#, 4 notetype1 3 note C#, 2 @@ -378,24 +379,25 @@ Branch_f65a7: notetype1 10 inc_octave note C#, 5 + ;tie note C#, 4 notetype1 3 note C#, 4 notetype1 10 - endchannel + sound_ret Branch_f65cf: octave 3 .Loop10 notetype0 11 - note __, 2 + rest 2 notetype0 1 notetype1 10 note E_, 5 notetype1 2 note E_, 6 - loopchannel 3, .Loop10 - dutycycle 2 + sound_loop 3, .Loop10 + duty_cycle 2 notetype1 8 note D_, 5 note G_, 6 @@ -411,10 +413,10 @@ Branch_f65cf: note F#, 5 notetype1 2 note F#, 6 - dutycycle 0 + duty_cycle 0 notetype1 10 notetype0 11 - note __, 1 + rest 1 dec_octave notetype0 1 note E_, 5 @@ -422,15 +424,15 @@ Branch_f65cf: note E_, 6 .Loop11 notetype0 11 - note __, 2 + rest 2 notetype0 1 notetype1 10 note E_, 5 notetype1 2 note E_, 6 - loopchannel 3, .Loop11 + sound_loop 3, .Loop11 dec_octave - dutycycle 2 + duty_cycle 2 notetype1 8 note B_, 5 inc_octave @@ -442,7 +444,7 @@ Branch_f65cf: note B_, 5 inc_octave note E_, 6 - endchannel + sound_ret Branch_f661d: octave 4 @@ -475,48 +477,52 @@ Branch_f661d: note F#, 5 notetype1 2 note F#, 6 - endchannel + sound_ret -Music_TCGDuelTheme3_Ch2: +Music_DuelTheme3_Ch2: ; f6649 (3d:6649) notetype0 11 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 20, 3, 3 notetype2 8 .MainLoop octave 2 - dutycycle 0 + duty_cycle 0 + ;frequency_offset 3 .Loop1 rept 4 notetype1 8 note F#, 2 - note __, 1 + rest 1 endr notetype1 8 note E_, 2 notetype1 8 note F_, 2 - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 + ;frequency_offset 0 octave 3 .Loop2 - note __, 6 + rest 6 notetype1 10 note E_, 1 notetype1 2 note E_, 1 - note __, 8 - loopchannel 4, .Loop2 + rest 8 + sound_loop 4, .Loop2 .Loop3 rept 2 - callchannel Branch_f67b2 + sound_call Branch_f67b2 endr rept 2 - callchannel Branch_f680a + sound_call Branch_f680a endr - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 octave 2 notetype1 10 notetype0 11 - note __, 1 + rest 1 notetype0 1 note C#, 5 notetype1 2 @@ -525,14 +531,14 @@ Music_TCGDuelTheme3_Ch2: note A_, 5 notetype1 2 note A_, 6 - callchannel Branch_f6866 + sound_call Branch_f6866 octave 4 note C#, 5 notetype1 2 note C#, 6 dec_octave dec_octave - dutycycle 0 + duty_cycle 0 notetype1 10 note C#, 5 notetype1 2 @@ -541,18 +547,18 @@ Music_TCGDuelTheme3_Ch2: note A_, 5 notetype1 2 note A_, 6 - callchannel Branch_f6866 - dutycycle 0 + sound_call Branch_f6866 + duty_cycle 0 notetype1 9 .Loop4 rept 2 - callchannel Branch_f67b2 + sound_call Branch_f67b2 endr rept 2 - callchannel Branch_f680a + sound_call Branch_f680a endr - loopchannel 2, .Loop4 - vibrato 10, $33 + sound_loop 2, .Loop4 + vibrato 10, 3, 3 .Loop5 notetype1 10 notetype2 6 @@ -621,8 +627,8 @@ Music_TCGDuelTheme3_Ch2: notetype1 9 note A_, 2 note G#, 2 - loopchannel 4, .Loop5 - vibrato 20, $33 + sound_loop 4, .Loop5 + vibrato 20, 3, 3 note D_, 3 notetype0 1 note A#, 3 @@ -649,7 +655,7 @@ Music_TCGDuelTheme3_Ch2: note C#, 1 notetype1 3 note C#, 1 - note __, 1 + rest 1 endr notetype1 9 note C#, 1 @@ -664,7 +670,7 @@ Music_TCGDuelTheme3_Ch2: note D_, 1 notetype1 3 note D_, 1 - note __, 1 + rest 1 endr notetype1 9 note E_, 1 @@ -674,8 +680,8 @@ Music_TCGDuelTheme3_Ch2: note D_, 1 notetype1 3 note D_, 1 - loopchannel 6, .Loop6 - dutycycle 1 + sound_loop 6, .Loop6 + duty_cycle 1 inc_octave .Loop7 rept 4 @@ -683,7 +689,7 @@ Music_TCGDuelTheme3_Ch2: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 endr notetype1 8 note E_, 1 @@ -698,7 +704,7 @@ Music_TCGDuelTheme3_Ch2: note D_, 1 notetype1 3 note D_, 1 - note __, 1 + rest 1 endr notetype1 8 note D_, 1 @@ -708,14 +714,14 @@ Music_TCGDuelTheme3_Ch2: note D_, 1 notetype1 3 note D_, 1 - loopchannel 4, .Loop7 - loopchannel 0, .MainLoop + sound_loop 4, .Loop7 + sound_loop 0, .MainLoop Branch_f67b2: octave 2 notetype1 10 notetype0 11 - note __, 1 + rest 1 notetype0 1 note F#, 5 notetype1 2 @@ -730,7 +736,7 @@ Branch_f67b2: note F#, 6 notetype1 10 notetype0 11 - note __, 1 + rest 1 notetype0 1 note F#, 5 notetype1 3 @@ -745,14 +751,14 @@ Branch_f67b2: notetype1 2 note B_, 6 notetype0 11 - note __, 1 + rest 1 notetype0 1 notetype1 10 note A_, 5 notetype1 2 note A_, 6 notetype0 11 - note __, 1 + rest 1 notetype0 1 notetype1 10 note B_, 5 @@ -770,13 +776,13 @@ Branch_f67b2: note E_, 1 notetype1 10 note F_, 1 - endchannel + sound_ret Branch_f680a: octave 2 notetype1 10 notetype0 11 - note __, 1 + rest 1 notetype0 1 note G_, 5 notetype1 2 @@ -790,7 +796,7 @@ Branch_f680a: notetype1 2 note G_, 6 notetype0 11 - note __, 1 + rest 1 notetype0 1 notetype1 10 note G_, 5 @@ -806,14 +812,14 @@ Branch_f680a: note C_, 6 notetype1 10 notetype0 11 - note __, 1 + rest 1 dec_octave notetype0 1 note B_, 5 notetype1 2 note B_, 6 notetype0 11 - note __, 1 + rest 1 inc_octave notetype0 1 notetype1 10 @@ -835,13 +841,13 @@ Branch_f680a: note B_, 1 notetype1 10 note G_, 1 - endchannel + sound_ret Branch_f6866: octave 2 .Loop8 notetype0 11 - note __, 1 + rest 1 notetype0 1 notetype1 10 note C#, 5 @@ -851,8 +857,8 @@ Branch_f6866: note A_, 5 notetype1 2 note A_, 6 - loopchannel 3, .Loop8 - dutycycle 2 + sound_loop 3, .Loop8 + duty_cycle 2 notetype1 7 note B_, 5 inc_octave @@ -869,7 +875,7 @@ Branch_f6866: note C#, 6 dec_octave dec_octave - dutycycle 0 + duty_cycle 0 notetype1 10 note C#, 5 notetype1 2 @@ -880,7 +886,7 @@ Branch_f6866: note A_, 6 .Loop9 notetype0 11 - note __, 1 + rest 1 notetype0 1 notetype1 10 note C#, 5 @@ -890,8 +896,8 @@ Branch_f6866: note A_, 5 notetype1 2 note A_, 6 - loopchannel 3, .Loop9 - dutycycle 2 + sound_loop 3, .Loop9 + duty_cycle 2 notetype1 7 note G_, 5 note B_, 6 @@ -905,66 +911,74 @@ Branch_f6866: note G_, 5 note B_, 6 inc_octave - endchannel + sound_ret -Music_TCGDuelTheme3_Ch3: +Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) notetype0 11 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 - vibrato 0, $33 + ;echo 96 + ;vibrato_type 8 + vibrato 0, 3, 3 + ;cutoff 8 .MainLoop octave 2 .Loop1 rept 4 + ;cutoff 4 note F#, 2 - note __, 1 + rest 1 endr + ;cutoff 8 note E_, 2 note F_, 2 - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 .Loop2 - callchannel Branch_f6973 - loopchannel 4, .Loop2 + sound_call Branch_f6973 + sound_loop 4, .Loop2 .Loop3 - callchannel Branch_f6973 - callchannel Branch_f6992 - loopchannel 2, .Loop3 + sound_call Branch_f6973 + sound_call Branch_f6992 + sound_loop 2, .Loop3 octave 2 .Loop4 rept 4 note F#, 1 - note __, 2 + rest 2 endr note G_, 2 note G_, 2 rept 4 note F#, 1 - note __, 2 + rest 2 endr note E_, 2 note F_, 2 - loopchannel 2, .Loop4 + sound_loop 2, .Loop4 .Loop5 - callchannel Branch_f6973 - callchannel Branch_f6992 - loopchannel 2, .Loop5 - vibrato 10, $33 + sound_call Branch_f6973 + sound_call Branch_f6992 + sound_loop 2, .Loop5 + vibrato 10, 3, 3 octave 2 .Loop6 - callchannel Branch_f69f0 + sound_call Branch_f69f0 notetype0 11 octave 4 + ;cutoff 8 note D_, 2 note C#, 2 dec_octave dec_octave - loopchannel 3, .Loop6 - callchannel Branch_f69f0 + sound_loop 3, .Loop6 + sound_call Branch_f69f0 octave 2 + ;cutoff 8 note F#, 2 note E_, 2 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 3 notetype0 1 note A#, 3 @@ -988,17 +1002,18 @@ Music_TCGDuelTheme3_Ch3: .Loop7 rept 4 note F#, 1 - note __, 2 + rest 2 endr note F#, 2 note F_, 2 rept 4 note E_, 1 - note __, 2 + rest 2 endr note E_, 2 note F_, 2 - loopchannel 6, .Loop7 + sound_loop 6, .Loop7 + ;cutoff 7 .Loop8 inc_octave rept 4 @@ -1030,461 +1045,494 @@ Music_TCGDuelTheme3_Ch3: note E_, 1 dec_octave note E_, 1 - loopchannel 4, .Loop8 - loopchannel 0, .MainLoop + sound_loop 4, .Loop8 + ;cutoff 8 + sound_loop 0, .MainLoop Branch_f6973: octave 2 note F#, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note E_, 1 dec_octave dec_octave + ;cutoff 8 note F#, 1 - note __, 2 + rest 2 note F#, 1 - note __, 1 - note __, 1 + rest 1 + rest 1 note F#, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note E_, 1 dec_octave dec_octave + ;cutoff 8 note E_, 2 note F_, 2 - endchannel + sound_ret Branch_f6992: octave 2 + ;sound_call Branch_f6973 note F#, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note E_, 1 dec_octave dec_octave + ;cutoff 8 note F#, 1 - note __, 2 + rest 2 note F#, 1 - note __, 1 - note __, 1 + rest 1 + rest 1 note F#, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note E_, 1 dec_octave dec_octave + ;cutoff 8 note F#, 1 - note __, 1 + rest 1 note F#, 2 note G_, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note F#, 1 dec_octave dec_octave + ;cutoff 8 note G_, 1 - note __, 2 + rest 2 note G_, 1 - note __, 1 - note __, 1 + rest 1 + rest 1 note G_, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note F#, 1 dec_octave dec_octave + ;cutoff 8 note F_, 2 note F#, 2 note G_, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note F#, 1 dec_octave dec_octave + ;cutoff 8 note G_, 1 - note __, 2 + rest 2 note G_, 1 - note __, 1 - note __, 1 + rest 1 + rest 1 note G_, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 4 note F#, 1 dec_octave dec_octave + ;cutoff 8 note G_, 1 - note __, 1 + rest 1 note F_, 2 - endchannel + sound_ret Branch_f69f0: octave 2 + ;cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave + ;cutoff 4 note C#, 1 dec_octave dec_octave + ;cutoff 6 note F#, 1 inc_octave inc_octave + ;cutoff 8 note F#, 2 dec_octave dec_octave + ;cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave + ;cutoff 4 note C#, 1 dec_octave dec_octave + ;cutoff 6 note F#, 1 inc_octave inc_octave + ;cutoff 8 note E_, 2 dec_octave dec_octave + ;cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave + ;cutoff 4 note C#, 1 dec_octave dec_octave + ;cutoff 6 note F#, 1 inc_octave inc_octave + ;cutoff 8 note D#, 2 dec_octave dec_octave + ;cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave + ;cutoff 4 note C#, 1 dec_octave dec_octave + ;cutoff 6 note F#, 1 - endchannel + sound_ret -Music_TCGDuelTheme3_Ch4: - togglenoise $06 - notetype 11 +Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) + toggle_noise 6 + drum_speed 11 .MainLoop .Loop1 rept 4 - note E_, 1 - note D#, 1 - note D#, 1 + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 endr - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - loopchannel 2, .Loop1 + drum_note 5, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 4, 1 + sound_loop 2, .Loop1 .Loop2 - note C#, 1 - note C_, 1 - note C_, 1 - loopchannel 4, .Loop2 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + sound_loop 4, .Loop2 + drum_note 2, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 1, 1 .Loop3 - note C#, 1 - note C_, 1 - note C_, 1 - loopchannel 4, .Loop3 - note C#, 1 - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 - note C#, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + sound_loop 4, .Loop3 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + drum_note 2, 1 .Loop4 - callchannel Branch_f6b40 - loopchannel 3, .Loop4 - note C_, 2 - note D#, 1 - note C_, 1 - note C#, 2 - note D#, 1 - note C_, 1 - note D#, 1 - note C_, 1 - note E_, 2 - note C#, 1 - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 - note C#, 1 + sound_call Branch_f6b40 + sound_loop 3, .Loop4 + drum_note 1, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + drum_note 2, 1 .Loop5 - callchannel Branch_f6b40 - loopchannel 7, .Loop5 - note C_, 2 - note D#, 1 - note C_, 1 - note C#, 2 - note D#, 1 - note C_, 1 - note D#, 1 - note C_, 1 - note E_, 2 - note C#, 1 - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 - note C#, 1 - callchannel Branch_f6b7e - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 - note C_, 1 - callchannel Branch_f6b7e - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 2 + sound_call Branch_f6b40 + sound_loop 7, .Loop5 + drum_note 1, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + drum_note 2, 1 + sound_call Branch_f6b7e + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + drum_note 1, 1 + sound_call Branch_f6b7e + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 2 .Loop6 - callchannel Branch_f6b40 - loopchannel 7, .Loop6 - note C_, 2 - note D#, 1 - note C_, 1 - note C#, 2 - note D#, 1 - note C_, 1 - note D#, 1 - note C_, 1 - note E_, 2 - note C#, 1 - notetype 1 - note D#, 5 - note D_, 6 - note C#, 5 - note C#, 6 - note C#, 5 - note C#, 6 - notetype 11 - callchannel Branch_f6b4d - note D#, 1 - note C#, 1 - note C_, 1 - callchannel Branch_f6b4d - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 - note C_, 1 - callchannel Branch_f6b4d - note D#, 1 - note C#, 1 - note C_, 1 - callchannel Branch_f6b4d - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 2 - note F_, 8 - note __, 4 - notetype 1 - note D_, 3 - note D_, 2 - note C#, 6 - note C#, 5 - note C#, 6 - note C#, 5 - note C#, 6 - notetype 11 - note C#, 1 + sound_call Branch_f6b40 + sound_loop 7, .Loop6 + drum_note 1, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_speed 11 + sound_call Branch_f6b4d + drum_note 4, 1 + drum_note 2, 1 + drum_note 1, 1 + sound_call Branch_f6b4d + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + drum_note 1, 1 + sound_call Branch_f6b4d + drum_note 4, 1 + drum_note 2, 1 + drum_note 1, 1 + sound_call Branch_f6b4d + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 2 + drum_note 6, 8 + rest 4 + drum_speed 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_speed 11 + drum_note 2, 1 .Loop7 - callchannel Branch_f6b65 - notetype 1 - note C_, 6 - loopchannel 7, .Loop7 - callchannel Branch_f6b65 - notetype 1 - note C#, 6 + sound_call Branch_f6b65 + drum_speed 1 + drum_note 1, 6 + sound_loop 7, .Loop7 + sound_call Branch_f6b65 + drum_speed 1 + drum_note 2, 6 .Loop8 - callchannel Branch_f6b65 - notetype 1 - note C_, 6 - loopchannel 15, .Loop8 - notetype 11 - note C_, 1 - notetype 1 - note D#, 5 - note C_, 6 - notetype 11 - note C#, 1 - notetype 1 - note D#, 5 - note E_, 6 - note D#, 5 - note D_, 6 - note D#, 5 - note C_, 6 - note C#, 5 - note C#, 6 - note C#, 5 - note C#, 6 - callchannel Branch_f6b9a - note C_, 1 - notetype 1 - note D#, 5 - note D_, 6 - note C#, 5 - note C#, 6 - note C#, 5 - note C#, 6 - callchannel Branch_f6b9a - notetype 1 - note C_, 5 - note D_, 6 - note C#, 5 - note C#, 6 - note C#, 5 - note C#, 6 - note C#, 5 - note C#, 6 - notetype 11 - loopchannel 0, .MainLoop + sound_call Branch_f6b65 + drum_speed 1 + drum_note 1, 6 + sound_loop 15, .Loop8 + drum_speed 11 + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 1, 6 + drum_speed 11 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 5, 6 + drum_note 4, 5 + drum_note 3, 6 + drum_note 4, 5 + drum_note 1, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + sound_call Branch_f6b9a + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + sound_call Branch_f6b9a + drum_speed 1 + drum_note 1, 5 + drum_note 3, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_note 2, 5 + drum_note 2, 6 + drum_speed 11 + sound_loop 0, .MainLoop Branch_f6b40: - note C_, 2 - note D#, 1 - note C_, 1 - note C#, 2 - note D#, 1 - note C_, 1 - note D#, 1 - note C_, 1 - note E_, 2 - note C#, 2 - note D#, 1 - note C#, 1 - endchannel + drum_note 1, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 2 + drum_note 4, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 5, 2 + drum_note 2, 2 + drum_note 4, 1 + drum_note 2, 1 + sound_ret Branch_f6b4d: - note C_, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note C#, 1 - note D#, 1 - note C_, 1 - note C#, 1 - endchannel + drum_note 1, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 1 + sound_ret Branch_f6b65: - notetype 11 - note C_, 1 - notetype 1 - note D#, 5 - note C_, 6 - notetype 11 - note C#, 1 - notetype 1 - note D#, 5 - note E_, 6 - note D#, 5 - note D_, 6 - note D#, 5 - note C_, 6 - notetype 11 - note C#, 1 - notetype 1 - note D#, 5 - endchannel + drum_speed 11 + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 1, 6 + drum_speed 11 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 5, 6 + drum_note 4, 5 + drum_note 3, 6 + drum_note 4, 5 + drum_note 1, 6 + drum_speed 11 + drum_note 2, 1 + drum_speed 1 + drum_note 4, 5 + sound_ret Branch_f6b7e: - note C_, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - note C_, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note C#, 1 - note C#, 1 - endchannel + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_note 1, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_ret Branch_f6b9a: - notetype 11 + drum_speed 11 .Loop9 rept 5 - note C_, 1 - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 endr - note C_, 1 - loopchannel 3, .Loop9 + drum_note 1, 1 + sound_loop 3, .Loop9 .Loop10 - note C_, 1 - notetype 1 - note D#, 5 - note D_, 6 - notetype 11 - note C#, 1 - loopchannel 4, .Loop10 - endchannel - + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + sound_loop 4, .Loop10 + sound_ret +; 0xf6bb7 diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index 6e322929..e8535181 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -1,36 +1,35 @@ -Music_TCGHallOfHonor: - db $80 - dw Music_TCGHallOfHonor_Ch1 - db $01 - dw Music_TCGHallOfHonor_Ch2 - db $02 - dw Music_TCGHallOfHonor_Ch3 +Music_HallOfHonor: + channel_count 3 + channel 1, Music_HallOfHonor_Ch1 + channel 2, Music_HallOfHonor_Ch2 + channel 3, Music_HallOfHonor_Ch3 -Music_TCGHallOfHonor_Ch1: +Music_HallOfHonor_Ch1: ; fafea (3e:6fea) notetype0 7 + ;stereo_panning 1, 1 notetype2 8 - dutycycle 2 + duty_cycle 2 .Loop1 - callchannel Branch_fb016 - loopchannel 4, .Loop1 + sound_call Branch_fb016 + sound_loop 4, .Loop1 .MainLoop .Loop2 - callchannel Branch_fb016 - loopchannel 8, .Loop2 + sound_call Branch_fb016 + sound_loop 8, .Loop2 octave 4 notetype1 5 note C_, 1 notetype1 2 note C_, 1 - callchannel Branch_fb044 + sound_call Branch_fb044 .Loop3 notetype1 5 note C_, 1 notetype1 2 note G_, 1 - callchannel Branch_fb044 - loopchannel 23, .Loop3 - loopchannel 0, .MainLoop + sound_call Branch_fb044 + sound_loop 23, .Loop3 + sound_loop 0, .MainLoop Branch_fb016: octave 4 @@ -64,7 +63,7 @@ Branch_fb016: note G_, 1 notetype1 2 note G_, 1 - endchannel + sound_ret Branch_fb044: octave 4 @@ -96,58 +95,63 @@ Branch_fb044: note G_, 1 notetype1 2 note F_, 1 - endchannel + sound_ret -Music_TCGHallOfHonor_Ch2: +Music_HallOfHonor_Ch2: ; fb06e (3e:706e) notetype0 7 + ;stereo_panning 1, 1 notetype2 8 - dutycycle 2 - note __, 2 + duty_cycle 2 + ;frequency_offset -1 + rest 2 notetype0 1 - note __, 4 + rest 4 notetype0 7 notetype1 1 .Loop1 - callchannel Branch_fb1ec - loopchannel 3, .Loop1 + sound_call Branch_fb1ec + sound_loop 3, .Loop1 octave 4 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave note F_, 1 notetype0 1 - note __, 3 + rest 3 notetype0 7 + ;frequency_offset 0 .MainLoop octave 1 - dutycycle 1 + duty_cycle 1 .Loop2 - callchannel Branch_fb0bb + sound_call Branch_fb0bb octave 1 notetype1 7 note E_, 5 notetype1 13 note E_, 11 + ;tie note E_, 12 - loopchannel 3, .Loop2 - callchannel Branch_fb0bb + sound_loop 3, .Loop2 + sound_call Branch_fb0bb octave 1 notetype1 7 note G_, 5 notetype1 13 note G_, 11 + ;tie note G_, 12 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_fb0bb: octave 1 @@ -155,175 +159,246 @@ Branch_fb0bb: note F_, 5 notetype1 13 note F_, 11 + ;tie note F_, 12 notetype1 7 note E_, 5 notetype1 13 note E_, 11 + ;tie note E_, 12 notetype1 7 note D_, 5 notetype1 13 note D_, 11 + ;tie note D_, 12 - endchannel + sound_ret -Music_TCGHallOfHonor_Ch3: +Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) notetype0 7 notetype1 2 + ;stereo_panning 1, 1 notetype2 12 - vibrato 35, $24 - note __, 3 + ;vibrato_type 4 + vibrato 35, 2, 4 + ;cutoff 6 + ;echo 64 + rest 3 notetype1 3 + ;cutoff 8 + ;frequency_offset -1 .Loop1 - note __, 14 - loopchannel 4, .Loop1 + rest 14 + sound_loop 4, .Loop1 .MainLoop octave 6 .Loop2 - callchannel Branch_fb1ec - loopchannel 7, .Loop2 + sound_call Branch_fb1ec + sound_loop 7, .Loop2 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave note F_, 1 notetype1 1 + ;frequency_offset 0 octave 5 notetype0 1 + ;cutoff 6 note B_, 3 inc_octave note C_, 4 + ;tie notetype0 7 note C_, 15 + ;tie note C_, 8 dec_octave + ;cutoff 8 note B_, 2 + ;cutoff 4 note A_, 2 + ;cutoff 6 note G_, 6 note C_, 10 + ;tie note C_, 12 notetype0 1 + ;cutoff 8 note B_, 3 inc_octave + ;cutoff 6 note C_, 4 + ;tie notetype0 7 note C_, 15 + ;tie note C_, 6 dec_octave + ;cutoff 8 note B_, 2 inc_octave note C_, 2 + ;cutoff 4 note D_, 2 dec_octave notetype0 1 + ;cutoff 8 note F#, 3 + ;cutoff 6 note G_, 4 + ;tie notetype0 7 note G_, 15 + ;tie note G_, 6 + ;cutoff 8 note G_, 2 note A_, 2 + ;cutoff 4 note B_, 2 notetype0 1 + ;cutoff 8 note B_, 3 inc_octave note C_, 4 + ;tie notetype0 7 note C_, 15 + ;tie note C_, 8 dec_octave note B_, 2 + ;cutoff 4 note A_, 2 + ;cutoff 6 note G_, 6 + ;cutoff 8 notetype0 1 note B_, 3 inc_octave + ;cutoff 6 note C_, 4 + ;tie notetype0 7 note C_, 9 + ;tie note C_, 6 dec_octave + ;cutoff 8 note G_, 2 inc_octave note C_, 2 + ;cutoff 4 note E_, 2 notetype0 1 + ;cutoff 8 note E_, 3 note F_, 4 + ;tie notetype0 7 note F_, 1 note E_, 2 + ;cutoff 4 note C_, 2 + ;cutoff 7 note C_, 10 + ;tie note C_, 10 + ;cutoff 4 note E_, 2 notetype0 1 + ;cutoff 8 note E_, 3 note F_, 4 + ;tie notetype0 7 note F_, 1 note E_, 2 + ;cutoff 4 note C_, 2 + ;cutoff 6 note C_, 10 + ;tie note C_, 12 notetype0 1 + ;cutoff 8 note F#, 3 + ;cutoff 7 note G_, 4 + ;tie notetype0 7 note G_, 15 + ;tie note G_, 8 + ;cutoff 8 note F_, 2 + ;cutoff 4 note E_, 2 + ;cutoff 8 note F_, 2 + ;cutoff 4 note E_, 2 note C_, 2 dec_octave + ;cutoff 7 note G_, 10 + ;tie note G_, 10 + ;cutoff 8 note E_, 2 note F_, 2 inc_octave + ;cutoff 4 note C_, 2 + ;cutoff 7 note C_, 12 + ;tie note C_, 10 dec_octave + ;cutoff 8 note E_, 2 note F_, 2 inc_octave + ;cutoff 4 note C_, 2 + ;cutoff 6 note C_, 12 + ;tie note C_, 12 - note __, 3 + rest 3 notetype1 3 - loopchannel 0, .MainLoop + ;frequency_offset -1 + ;cutoff 8 + sound_loop 0, .MainLoop Branch_fb1ec: octave 5 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - endchannel - + rest 1 + sound_ret +; 0xfb1fe diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index a318bffb..ee7e1406 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -1,44 +1,44 @@ -Music_TCGImakuni: - db $C0 - dw Music_TCGImakuni_Ch1 - db $01 - dw Music_TCGImakuni_Ch2 - db $02 - dw Music_TCGImakuni_Ch3 - db $03 - dw Music_TCGImakuni_Ch4 +Music_Imakuni: + channel_count 4 + channel 1, Music_Imakuni_Ch1 + channel 2, Music_Imakuni_Ch2 + channel 3, Music_Imakuni_Ch3 + channel 4, Music_Imakuni_Ch4 -Music_TCGImakuni_Ch1: +Music_Imakuni_Ch1: ; fad55 (3e:6d55) notetype0 3 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 5 + vibrato 20, 3, 3 notetype2 8 - dutycycle 2 + duty_cycle 2 notetype1 10 .MainLoop .Loop1 - note __, 10 - loopchannel 16, .Loop1 - callchannel Branch_fadf9 + rest 10 + sound_loop 16, .Loop1 + sound_call Branch_fadf9 octave 4 note D_, 15 dec_octave note B_, 7 - note __, 8 + rest 8 note G_, 7 - note __, 8 + rest 8 notetype0 9 note F_, 10 + ;tie notetype0 1 note F_, 7 - note __, 8 + rest 8 notetype0 9 - note __, 10 - callchannel Branch_fadf9 - callchannel Branch_fae1d + rest 10 + sound_call Branch_fadf9 + sound_call Branch_fae1d notetype0 1 octave 4 note E_, 7 - note __, 15 + rest 15 note E_, 3 note C_, 2 note E_, 3 @@ -46,42 +46,43 @@ Music_TCGImakuni_Ch1: dec_octave note G#, 15 note A_, 7 - note __, 8 + rest 8 notetype0 3 - note __, 15 + rest 15 notetype0 1 - note __, 15 - note __, 15 + rest 15 + rest 15 inc_octave note E_, 7 - note __, 8 + rest 8 note F#, 7 - note __, 8 + rest 8 note G_, 15 + ;tie note G_, 7 note F#, 3 note G_, 2 note F#, 3 note E_, 7 - note __, 8 + rest 8 note D#, 7 - note __, 8 + rest 8 note E_, 15 note C_, 7 - note __, 8 + rest 8 dec_octave note G#, 7 - note __, 8 + rest 8 notetype0 7 note F#, 15 notetype0 9 - note __, 10 - callchannel Branch_fadf9 - callchannel Branch_fae1d + rest 10 + sound_call Branch_fadf9 + sound_call Branch_fae1d dec_octave notetype0 1 note F_, 7 - note __, 8 + rest 8 note B_, 7 inc_octave note C_, 8 @@ -89,7 +90,7 @@ Music_TCGImakuni_Ch1: note G#, 7 note A_, 8 note F_, 7 - note __, 8 + rest 8 note B_, 7 inc_octave note C_, 8 @@ -100,13 +101,13 @@ Music_TCGImakuni_Ch1: note F_, 10 notetype0 1 note D#, 7 - note __, 8 + rest 8 note A_, 7 note A#, 8 note F#, 7 note G_, 8 note D#, 7 - note __, 8 + rest 8 note A_, 7 note A#, 8 note F#, 7 @@ -123,23 +124,23 @@ Music_TCGImakuni_Ch1: note D_, 7 note A_, 8 inc_octave - loopchannel 4, .Loop2 + sound_loop 4, .Loop2 note D_, 7 dec_octave note A_, 8 note D_, 7 note A_, 8 - vibrato 5, $33 + vibrato 5, 3, 3 notetype0 3 note D_, 10 - vibrato 20, $33 - loopchannel 0, .MainLoop + vibrato 20, 3, 3 + sound_loop 0, .MainLoop Branch_fadf9: notetype0 1 octave 4 note C#, 7 - note __, 15 + rest 15 note C#, 3 note D_, 2 note C#, 3 @@ -148,184 +149,196 @@ Branch_fadf9: note B_, 15 inc_octave note D_, 7 - note __, 8 + rest 8 notetype0 5 - note __, 9 + rest 9 notetype0 1 - note __, 15 - note __, 15 + rest 15 + rest 15 note D_, 7 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 note F_, 15 + ;tie note F_, 7 note E_, 3 note F_, 2 note E_, 3 note D_, 7 - note __, 8 + rest 8 note C#, 7 - note __, 8 - endchannel + rest 8 + sound_ret Branch_fae1d: octave 4 note D_, 7 - note __, 8 + rest 8 dec_octave note G_, 7 - note __, 8 + rest 8 inc_octave note G_, 7 - note __, 8 + rest 8 notetype0 9 note F_, 10 + ;tie notetype0 1 note F_, 7 - note __, 8 + rest 8 notetype0 9 - note __, 10 - endchannel + rest 10 + sound_ret -Music_TCGImakuni_Ch2: - vibrato 0, $33 +Music_Imakuni_Ch2: ; fae32 (3e:6e32) + ;stereo_panning 1, 1 + ;vibrato_type 0 + vibrato 0, 3, 3 notetype2 8 - dutycycle 1 + duty_cycle 1 notetype1 10 .Loop1 - callchannel Branch_faea5 - loopchannel 6, .Loop1 + sound_call Branch_faea5 + sound_loop 6, .Loop1 .Loop2 rept 2 notetype0 3 - note __, 10 + rest 10 notetype0 1 note C_, 7 - note __, 8 + rest 8 endr - note __, 15 + rest 15 note C_, 7 - note __, 8 + rest 8 notetype0 3 - note __, 10 + rest 10 notetype0 1 note C_, 7 - note __, 8 - note __, 15 + rest 8 + rest 15 notetype0 3 - note __, 10 - vibrato 8, $33 + rest 10 + vibrato 8, 3, 3 note C_, 10 - vibrato 0, $33 - loopchannel 2, .Loop2 + vibrato 0, 3, 3 + sound_loop 2, .Loop2 .Loop3 - callchannel Branch_faea5 - loopchannel 2, .Loop3 + sound_call Branch_faea5 + sound_loop 2, .Loop3 notetype0 1 octave 2 note F_, 15 + ;tie note F_, 7 inc_octave note F_, 8 note D#, 7 - note __, 8 - note __, 15 + rest 8 + rest 15 note G#, 7 note A_, 8 note F_, 7 note D#, 8 notetype0 3 - note __, 10 + rest 10 notetype0 1 dec_octave note D#, 15 + ;tie note D#, 7 inc_octave note D#, 8 note C#, 7 - note __, 8 - note __, 15 + rest 8 + rest 15 note F#, 7 note G_, 8 note D#, 7 note C#, 8 notetype0 3 - note __, 10 + rest 10 notetype0 1 .Loop4 note D_, 7 - note __, 8 + rest 8 rept 2 - note __, 15 + rest 15 endr - loopchannel 4, .Loop4 + sound_loop 4, .Loop4 note D_, 7 - note __, 8 - note __, 15 - vibrato 5, $33 + rest 8 + rest 15 + vibrato 5, 3, 3 note D_, 15 + ;tie note D_, 7 - note __, 8 - vibrato 0, $33 - loopchannel 0, Music_TCGImakuni_Ch2 + rest 8 + vibrato 0, 3, 3 + sound_loop 0, Music_Imakuni_Ch2 Branch_faea5: octave 3 notetype0 6 - note __, 10 + rest 10 notetype0 1 rept 2 - note __, 15 + rest 15 note C#, 7 - note __, 8 + rest 8 endr - vibrato 8, $33 + vibrato 8, 3, 3 notetype0 9 - note __, 10 + rest 10 notetype0 3 note C#, 10 - vibrato 0, $33 - endchannel + vibrato 0, 3, 3 + sound_ret -Music_TCGImakuni_Ch3: +Music_Imakuni_Ch3: ; faebc (3e:6ebc) + ;stereo_panning 1, 1 notetype1 1 notetype2 11 - vibrato 0, $33 + ;vibrato_type 6 + vibrato 0, 3, 3 + ;echo 0 + ;cutoff 8 .MainLoop - callchannel Branch_faf7d - vibrato 8, $33 + sound_call Branch_faf7d + vibrato 8, 3, 3 notetype0 1 note D_, 15 + ;tie note D_, 7 inc_octave - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 3 dec_octave note G_, 2 dec_octave note G_, 3 - callchannel Branch_faf7d - vibrato 8, $33 + sound_call Branch_faf7d + vibrato 8, 3, 3 note D_, 10 - vibrato 0, $33 + vibrato 0, 3, 3 .Loop1 - callchannel Branch_faf7d - vibrato 8, $33 + sound_call Branch_faf7d + vibrato 8, 3, 3 note D_, 10 - vibrato 0, $33 - loopchannel 4, .Loop1 + vibrato 0, 3, 3 + sound_loop 4, .Loop1 .Loop2 octave 3 notetype0 3 note C_, 5 - note __, 5 + rest 5 inc_octave notetype0 1 note E_, 7 - note __, 8 + rest 8 dec_octave notetype0 3 note G#, 5 @@ -333,200 +346,203 @@ Music_TCGImakuni_Ch3: inc_octave notetype0 1 note D#, 7 - note __, 8 - note __, 15 + rest 8 + rest 15 note D#, 7 - note __, 8 + rest 8 notetype0 3 - note __, 5 + rest 5 dec_octave note C_, 5 inc_octave notetype0 1 note E_, 7 - note __, 8 + rest 8 dec_octave notetype0 3 note G#, 5 note A_, 5 - note __, 5 + rest 5 inc_octave - vibrato 8, $33 + vibrato 8, 3, 3 note D#, 10 - vibrato 0, $33 - loopchannel 2, .Loop2 + vibrato 0, 3, 3 + sound_loop 2, .Loop2 .Loop3 - callchannel Branch_faf7d - vibrato 8, $33 + sound_call Branch_faf7d + vibrato 8, 3, 3 note D_, 10 - vibrato 0, $33 - loopchannel 2, .Loop3 + vibrato 0, 3, 3 + sound_loop 2, .Loop3 notetype0 1 octave 2 note F_, 15 + ;tie note F_, 7 inc_octave note F_, 8 note D#, 7 - note __, 8 + rest 8 note F_, 7 - note __, 8 + rest 8 note G#, 7 note A_, 8 note F_, 7 note D#, 8 - vibrato 5, $33 + vibrato 5, 3, 3 notetype0 3 note F_, 10 - vibrato 0, $33 + vibrato 0, 3, 3 notetype0 1 dec_octave note D#, 15 + ;tie note D#, 7 inc_octave note D#, 8 note C#, 7 - note __, 8 + rest 8 note D#, 7 - note __, 8 + rest 8 note F#, 7 note G_, 8 note D#, 7 note C#, 8 - vibrato 5, $33 + vibrato 5, 3, 3 notetype0 3 note D#, 10 - vibrato 0, $33 + vibrato 0, 3, 3 notetype0 1 .Loop4 octave 4 note C_, 7 - note __, 8 + rest 8 octave 2 note D_, 7 - note __, 8 + rest 8 note D_, 7 - note __, 8 - loopchannel 4, .Loop4 + rest 8 + sound_loop 4, .Loop4 octave 4 note C_, 7 - note __, 8 + rest 8 octave 2 note D_, 7 - note __, 8 + rest 8 octave 4 - vibrato 5, $33 + vibrato 5, 3, 3 note C_, 15 + ;tie note C_, 7 inc_octave - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 3 dec_octave note G_, 2 dec_octave note G_, 3 notetype0 8 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_faf7d: notetype0 3 octave 2 note G_, 5 - note __, 5 + rest 5 inc_octave notetype0 1 note G_, 7 - note __, 8 + rest 8 notetype0 3 note C#, 5 note D_, 5 inc_octave notetype0 1 note D_, 7 - note __, 8 - note __, 15 + rest 8 + rest 15 note D_, 7 - note __, 8 + rest 8 notetype0 3 - note __, 5 + rest 5 octave 2 note G_, 5 inc_octave notetype0 1 note G_, 7 - note __, 8 + rest 8 notetype0 3 note C#, 5 note D_, 5 - note __, 5 + rest 5 inc_octave - endchannel + sound_ret -Music_TCGImakuni_Ch4: - togglenoise $06 +Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) + toggle_noise 6 .MainLoop - notetype 1 + drum_speed 1 octave 1 .Loop1 - note C_, 15 - note D#, 7 - note C_, 8 - note C#, 15 - note C_, 15 - note D#, 7 - note D#, 8 - note E_, 15 - note D#, 7 - note D#, 8 - note E_, 15 - note D#, 15 - note C_, 15 - note C#, 15 - note E_, 15 - note C_, 7 - note D#, 8 - note C#, 15 - note C#, 15 - note D#, 7 - note C#, 8 - loopchannel 10, .Loop1 + drum_note 1, 15 + drum_note 4, 7 + drum_note 1, 8 + drum_note 2, 15 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 15 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 15 + drum_note 4, 15 + drum_note 1, 15 + drum_note 2, 15 + drum_note 5, 15 + drum_note 1, 7 + drum_note 4, 8 + drum_note 2, 15 + drum_note 2, 15 + drum_note 4, 7 + drum_note 2, 8 + sound_loop 10, .Loop1 .Loop2 - notetype 11 - note F_, 2 - notetype 1 - note C#, 8 - note C#, 15 - note C#, 15 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - notetype 3 - note F_, 10 - loopchannel 2, .Loop2 - notetype 1 - note C#, 15 - note D#, 7 - note C#, 8 - note E_, 15 - note C#, 15 - note D#, 7 - note C#, 8 - note E_, 15 - note C#, 15 - note D#, 7 - note C#, 8 - note E_, 15 - note C#, 15 - note D#, 7 - note C#, 8 - note E_, 15 - note C#, 15 - note D#, 4 - note D#, 4 - note C#, 7 - note C#, 15 - note C#, 15 - loopchannel 0, .MainLoop - + drum_speed 11 + drum_note 6, 2 + drum_speed 1 + drum_note 2, 8 + drum_note 2, 15 + drum_note 2, 15 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_speed 3 + drum_note 6, 10 + sound_loop 2, .Loop2 + drum_speed 1 + drum_note 2, 15 + drum_note 4, 7 + drum_note 2, 8 + drum_note 5, 15 + drum_note 2, 15 + drum_note 4, 7 + drum_note 2, 8 + drum_note 5, 15 + drum_note 2, 15 + drum_note 4, 7 + drum_note 2, 8 + drum_note 5, 15 + drum_note 2, 15 + drum_note 4, 7 + drum_note 2, 8 + drum_note 5, 15 + drum_note 2, 15 + drum_note 4, 4 + drum_note 4, 4 + drum_note 2, 7 + drum_note 2, 15 + drum_note 2, 15 + sound_loop 0, .MainLoop +; 0xfafea diff --git a/crysaudio/music/TCG/matchdraw.asm b/crysaudio/music/TCG/matchdraw.asm new file mode 100644 index 00000000..1c1222ad --- /dev/null +++ b/crysaudio/music/TCG/matchdraw.asm @@ -0,0 +1,113 @@ +Music_MatchDraw: + channel_count 3 + channel 1, Music_MatchDraw_Ch1 + channel 2, Music_MatchDraw_Ch2 + channel 3, Music_MatchDraw_Ch3 + +Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) + notetype0 3 + ;stereo_panning 1, 1 + notetype2 8 + octave 4 + duty_cycle 1 + notetype1 11 + note C_, 4 + dec_octave + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note F_, 4 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + dec_octave + note B_, 2 + note A#, 4 + note B_, 2 + notetype1 2 + note B_, 2 + notetype1 11 + note F#, 4 + note G_, 2 + notetype1 2 + note G_, 2 + notetype1 11 + note C_, 2 + notetype1 2 + note C_, 4 + inc_octave + notetype1 11 + note E_, 1 + note G_, 1 + inc_octave + note C_, 2 + notetype1 2 + note C_, 2 + sound_ret + + +Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) + notetype0 3 + ;stereo_panning 1, 1 + notetype2 8 + octave 3 + duty_cycle 1 + notetype1 11 + rest 16 + note C_, 4 + dec_octave + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note F_, 4 + note F#, 2 + notetype1 2 + note F#, 2 + notetype1 11 + note C#, 4 + note D_, 2 + notetype1 2 + note D_, 2 + dec_octave + notetype1 11 + note G_, 2 + notetype1 2 + note G_, 6 + inc_octave + inc_octave + notetype1 11 + note E_, 2 + notetype1 2 + note E_, 2 + sound_ret + + +Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) + notetype0 6 + ;stereo_panning 1, 1 + notetype2 11 + notetype1 1 + ;cutoff 8 + ;echo 0 + octave 2 + rest 16 + note G_, 2 + note F#, 1 + rest 1 + note D#, 2 + note C#, 1 + rest 1 + note C_, 1 + rest 3 + inc_octave + note C_, 1 + sound_ret +; 0xf7d60 diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm index c7f569da..cbce6207 100644 --- a/crysaudio/music/TCG/matchloss.asm +++ b/crysaudio/music/TCG/matchloss.asm @@ -1,20 +1,21 @@ -Music_TCGMatchLoss: - db $80 - dw Music_TCGMatchLoss_Ch1 - db $01 - dw Music_TCGMatchLoss_Ch2 - db $02 - dw Music_TCGMatchLoss_Ch3 +Music_MatchLoss: + channel_count 3 + channel 1, Music_MatchLoss_Ch1 + channel 2, Music_MatchLoss_Ch2 + channel 3, Music_MatchLoss_Ch3 -Music_TCGMatchLoss_Ch1: - vibrato 20, $33 +Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 4 - dutycycle 2 + duty_cycle 2 notetype1 11 notetype0 1 note E_, 3 note F_, 2 + ;tie notetype0 5 note F_, 3 note C_, 1 @@ -30,6 +31,7 @@ Music_TCGMatchLoss_Ch1: notetype1 10 note D_, 3 note D#, 2 + ;tie note D#, 16 dec_octave note A#, 6 @@ -43,6 +45,7 @@ Music_TCGMatchLoss_Ch1: notetype1 10 note C_, 3 note C#, 8 + ;tie note C#, 12 dec_octave notetype0 6 @@ -59,61 +62,75 @@ Music_TCGMatchLoss_Ch1: note B_, 5 inc_octave note C_, 4 + ;tie notetype0 9 note C_, 11 notetype1 3 note C_, 2 - endchannel + sound_ret -Music_TCGMatchLoss_Ch2: - vibrato 20, $33 +Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) + ;stereo_panning 1, 1 + ;vibrato_type 5 + vibrato 20, 3, 3 notetype2 8 octave 3 - dutycycle 2 + duty_cycle 2 notetype1 9 notetype0 9 - note __, 9 + rest 9 notetype0 11 - note __, 5 + rest 5 notetype0 1 - note __, 8 + rest 8 notetype0 9 - note __, 6 + rest 6 note G_, 6 + ;tie note G_, 6 notetype1 3 note G_, 2 - endchannel + sound_ret -Music_TCGMatchLoss_Ch3: +Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) + ;stereo_panning 1, 1 notetype2 11 notetype1 1 + ;cutoff 8 + ;echo 64 octave 2 notetype0 5 note A#, 4 inc_octave + ;cutoff 4 note F_, 4 note A#, 4 dec_octave + ;cutoff 8 notetype0 7 note G#, 3 inc_octave + ;cutoff 4 notetype0 2 note D#, 11 note G#, 11 dec_octave + ;cutoff 8 notetype0 1 note F#, 11 + ;tie note F#, 12 inc_octave + ;cutoff 4 notetype0 12 note C#, 2 notetype0 2 note F#, 13 dec_octave notetype0 9 + ;cutoff 8 note F_, 12 - endchannel - + sound_ret +; 0xf7cdf diff --git a/crysaudio/music/TCG/matchstart1.asm b/crysaudio/music/TCG/matchstart1.asm index ee2fcd4c..2be4cd86 100644 --- a/crysaudio/music/TCG/matchstart1.asm +++ b/crysaudio/music/TCG/matchstart1.asm @@ -1,12 +1,13 @@ -Music_TCGMatchStart1: - db $00 - dw Music_TCGMatchStart1_Ch1 +Music_MatchStart1: + channel_count 1 + channel 1, Music_MatchStart1_Ch1 -Music_TCGMatchStart1_Ch1: +Music_MatchStart1_Ch1: ; f7919 (3d:7919) notetype0 1 + ;stereo_panning 1, 1 notetype2 8 .Loop1 - dutycycle 2 + duty_cycle 2 notetype1 15 octave 3 note C_, 1 @@ -25,7 +26,7 @@ Music_TCGMatchStart1_Ch1: inc_octave note A_, 1 octave 4 - dutycycle 1 + duty_cycle 1 note C_, 1 inc_octave note C_, 1 @@ -41,7 +42,7 @@ Music_TCGMatchStart1_Ch1: note A_, 1 inc_octave note A_, 1 - loopchannel 3, .Loop1 + sound_loop 3, .Loop1 octave 4 notetype1 6 note E_, 1 @@ -53,5 +54,5 @@ Music_TCGMatchStart1_Ch1: note B_, 1 inc_octave note B_, 1 - endchannel - + sound_ret +; 0xf7956 diff --git a/crysaudio/music/TCG/matchstart2.asm b/crysaudio/music/TCG/matchstart2.asm index 79daf477..951b6ec4 100644 --- a/crysaudio/music/TCG/matchstart2.asm +++ b/crysaudio/music/TCG/matchstart2.asm @@ -1,15 +1,15 @@ -Music_TCGMatchStart2: - db $40 - dw Music_TCGMatchStart2_Ch1 - db $01 - dw Music_TCGMatchStart2_Ch2 +Music_MatchStart2: + channel_count 2 + channel 1, Music_MatchStart2_Ch1 + channel 2, Music_MatchStart2_Ch2 -Music_TCGMatchStart2_Ch1: +Music_MatchStart2_Ch1: ; f7956 (3d:7956) notetype0 1 + ;stereo_panning 1, 1 notetype2 8 octave 2 notetype1 15 - dutycycle 0 + duty_cycle 0 note C_, 1 note E_, 1 note A_, 1 @@ -90,16 +90,18 @@ Music_TCGMatchStart2_Ch1: note B_, 1 inc_octave note C_, 1 - endchannel + sound_ret -Music_TCGMatchStart2_Ch2: +Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) notetype0 1 + ;stereo_panning 1, 1 notetype2 8 - note __, 4 + ;frequency_offset 6 + rest 4 octave 2 notetype1 6 - dutycycle 0 + duty_cycle 0 note C_, 1 note E_, 1 note A_, 1 @@ -175,5 +177,5 @@ Music_TCGMatchStart2_Ch2: inc_octave note C_, 1 note E_, 1 - endchannel - + sound_ret +; 0xf7a0f diff --git a/crysaudio/music/TCG/matchstart3.asm b/crysaudio/music/TCG/matchstart3.asm index 1a4c9e34..03c535a7 100644 --- a/crysaudio/music/TCG/matchstart3.asm +++ b/crysaudio/music/TCG/matchstart3.asm @@ -1,15 +1,15 @@ -Music_TCGMatchStart3: - db $40 - dw Music_TCGMatchStart3_Ch1 - db $01 - dw Music_TCGMatchStart3_Ch2 +Music_MatchStart3: + channel_count 2 + channel 1, Music_MatchStart3_Ch1 + channel 2, Music_MatchStart3_Ch2 -Music_TCGMatchStart3_Ch1: +Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) notetype0 1 + ;stereo_panning 1, 1 notetype2 8 octave 2 notetype1 15 - dutycycle 1 + duty_cycle 1 note C_, 1 note E_, 1 note G_, 1 @@ -48,7 +48,7 @@ Music_TCGMatchStart3_Ch1: note G_, 1 note B_, 1 octave 2 - dutycycle 3 + duty_cycle 3 note D_, 1 note F_, 1 note A_, 1 @@ -97,7 +97,7 @@ Music_TCGMatchStart3_Ch1: inc_octave note C_, 1 octave 2 - dutycycle 1 + duty_cycle 1 note E_, 1 note G_, 1 note B_, 1 @@ -165,16 +165,18 @@ Music_TCGMatchStart3_Ch1: note B_, 1 inc_octave note D_, 1 - endchannel + sound_ret -Music_TCGMatchStart3_Ch2: +Music_MatchStart3_Ch2: ; f7aba (3d:7aba) notetype0 1 + ;stereo_panning 1, 1 notetype2 8 - note __, 4 + ;frequency_offset 6 + rest 4 octave 2 notetype1 6 - dutycycle 1 + duty_cycle 1 note C_, 1 note E_, 1 note G_, 1 @@ -213,7 +215,7 @@ Music_TCGMatchStart3_Ch2: note G_, 1 note B_, 1 octave 2 - dutycycle 3 + duty_cycle 3 note D_, 1 note F_, 1 note A_, 1 @@ -262,7 +264,7 @@ Music_TCGMatchStart3_Ch2: inc_octave note C_, 1 octave 2 - dutycycle 1 + duty_cycle 1 note E_, 1 note G_, 1 note B_, 1 @@ -324,5 +326,5 @@ Music_TCGMatchStart3_Ch2: inc_octave note C_, 1 dec_octave - endchannel - + sound_ret +; 0xf7b61 diff --git a/crysaudio/music/TCG/matchvictory.asm b/crysaudio/music/TCG/matchvictory.asm index 0dec839d..a57d6505 100644 --- a/crysaudio/music/TCG/matchvictory.asm +++ b/crysaudio/music/TCG/matchvictory.asm @@ -1,19 +1,20 @@ -Music_TCGMatchVictory: - db $80 - dw Music_TCGMatchVictory_Ch1 - db $01 - dw Music_TCGMatchVictory_Ch2 - db $02 - dw Music_TCGMatchVictory_Ch3 +Music_MatchVictory: + channel_count 3 + channel 1, Music_MatchVictory_Ch1 + channel 2, Music_MatchVictory_Ch2 + channel 3, Music_MatchVictory_Ch3 -Music_TCGMatchVictory_Ch1: - vibrato 20, $33 +Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 3 - dutycycle 0 + duty_cycle 0 notetype1 11 notetype0 1 note A_, 15 + ;tie note A_, 9 notetype1 2 note A_, 5 @@ -55,14 +56,16 @@ Music_TCGMatchVictory_Ch1: note E_, 12 notetype1 2 note E_, 4 - endchannel + sound_ret -Music_TCGMatchVictory_Ch2: - vibrato 20, $33 +Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 3 - dutycycle 0 + duty_cycle 0 notetype1 11 notetype0 1 note F_, 5 @@ -116,34 +119,38 @@ Music_TCGMatchVictory_Ch2: note C#, 12 notetype1 2 note C#, 4 - endchannel + sound_ret -Music_TCGMatchVictory_Ch3: +Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) + ;stereo_panning 1, 1 notetype2 11 notetype1 1 + ;cutoff 8 + ;echo 0 octave 2 notetype0 1 note F_, 15 + ;tie note F_, 9 - note __, 5 + rest 5 note F_, 7 - note __, 3 + rest 3 note F_, 7 - note __, 3 + rest 3 note F_, 7 - note __, 2 + rest 2 note G_, 11 - note __, 10 + rest 10 note G_, 11 - note __, 10 + rest 10 note G_, 10 - note __, 10 + rest 10 note A_, 8 - note __, 13 + rest 13 note E_, 5 - note __, 6 + rest 6 notetype0 8 note A_, 12 - endchannel - + sound_ret +; 0xf7c2e diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index 83153db6..2c6de78d 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -1,16 +1,16 @@ -Music_TCGMedal: - db $80 - dw Music_TCGMedal_Ch1 - db $01 - dw Music_TCGMedal_Ch2 - db $02 - dw Music_TCGMedal_Ch3 +Music_Medal: + channel_count 3 + channel 1, Music_Medal_Ch1 + channel 2, Music_Medal_Ch2 + channel 3, Music_Medal_Ch3 -Music_TCGMedal_Ch1: - vibrato 20, $33 +Music_Medal_Ch1: ; f7df8 (3d:7df8) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 2 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype0 1 note E_, 5 @@ -33,6 +33,7 @@ Music_TCGMedal_Ch1: note E_, 5 notetype0 15 note A_, 2 + ;tie notetype0 1 note A_, 10 notetype1 3 @@ -57,19 +58,23 @@ Music_TCGMedal_Ch1: notetype1 10 notetype0 9 note A_, 5 + ;tie note A_, 8 + ;tie notetype0 1 note A_, 2 notetype1 3 note A_, 16 - endchannel + sound_ret -Music_TCGMedal_Ch2: - vibrato 20, $33 +Music_Medal_Ch2: ; f7e4b (3d:7e4b) + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype2 8 octave 1 - dutycycle 0 + duty_cycle 0 notetype1 9 notetype0 1 note A_, 5 @@ -91,6 +96,7 @@ Music_TCGMedal_Ch2: inc_octave notetype0 15 note C_, 2 + ;tie notetype0 1 note C_, 10 notetype1 2 @@ -115,37 +121,46 @@ Music_TCGMedal_Ch2: notetype1 9 notetype0 9 note C#, 5 + ;tie note C#, 8 + ;tie notetype0 1 note C#, 2 notetype1 2 note C#, 16 - endchannel + sound_ret -Music_TCGMedal_Ch3: +Music_Medal_Ch3: ; f7e9d (3d:7e9d) + ;stereo_panning 1, 1 notetype2 11 notetype1 1 + ;cutoff 8 + ;echo 0 octave 2 notetype0 1 notetype0 15 - note __, 4 + rest 4 note F_, 2 + ;tie notetype0 1 note F_, 10 - note __, 5 + rest 5 + ;cutoff 7 note F_, 5 note F_, 5 note F_, 5 + ;cutoff 8 note A#, 15 - note __, 5 + rest 5 note A#, 16 - note __, 5 + rest 5 note A#, 16 - note __, 6 + rest 6 notetype0 9 note A_, 13 + ;tie notetype0 1 note A_, 2 - endchannel - + sound_ret +; 0xf7ec8 diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index dadd5187..1e912814 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -1,26 +1,25 @@ -Music_TCGOverworld: - db $C0 - dw Music_TCGOverworld_Ch1 - db $01 - dw Music_TCGOverworld_Ch2 - db $02 - dw Music_TCGOverworld_Ch3 - db $03 - dw Music_TCGOverworld_Ch4 +Music_Overworld: + channel_count 4 + channel 1, Music_Overworld_Ch1 + channel 2, Music_Overworld_Ch2 + channel 3, Music_Overworld_Ch3 + channel 4, Music_Overworld_Ch4 -Music_TCGOverworld_Ch1: +Music_Overworld_Ch1: ; f71a0 (3d:71a0) notetype0 7 - dutycycle 0 - vibrato 25, $33 + duty_cycle 0 + ;stereo_panning 1, 1 + ;vibrato_type 9 + vibrato 25, 3, 3 notetype1 10 notetype2 7 octave 3 - note __, 3 - callchannel Branch_f72ba - note __, 3 + rest 3 + sound_call Branch_f72ba + rest 3 .MainLoop - callchannel Branch_f72ba - dutycycle 1 + sound_call Branch_f72ba + duty_cycle 1 notetype2 8 octave 3 notetype1 10 @@ -50,17 +49,17 @@ Music_TCGOverworld_Ch1: note C_, 12 notetype1 3 note C_, 2 - dutycycle 0 + duty_cycle 0 notetype1 9 notetype2 7 octave 3 note E_, 4 note E_, 3 note E_, 3 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype2 8 - callchannel Branch_f72fb + sound_call Branch_f72fb note C_, 6 notetype1 3 note C_, 6 @@ -128,21 +127,26 @@ Music_TCGOverworld_Ch1: note C_, 12 notetype1 3 note C_, 6 - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 6 octave 4 note G_, 1 + ;tie note E_, 1 + ;tie note C_, 1 + ;tie dec_octave note G_, 1 + ;tie note E_, 1 + ;tie note C_, 1 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype2 8 - callchannel Branch_f72fb + sound_call Branch_f72fb note C_, 6 notetype1 3 note C_, 6 @@ -179,17 +183,22 @@ Music_TCGOverworld_Ch1: note G_, 1 notetype1 9 note F_, 8 + ;tie note F_, 8 + ;tie note F_, 8 + ;tie note F_, 8 + ;tie note F_, 8 + ;tie note F_, 8 notetype1 3 note F_, 3 - dutycycle 0 + duty_cycle 0 notetype1 10 notetype2 7 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f72ba: octave 3 @@ -200,7 +209,7 @@ Branch_f72ba: notetype1 10 notetype2 4 note C_, 1 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 7 @@ -210,13 +219,13 @@ Branch_f72ba: notetype1 10 notetype2 4 note D_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 note G_, 3 note A#, 3 - note __, 3 + rest 3 note A_, 3 note A_, 2 inc_octave @@ -224,7 +233,7 @@ Branch_f72ba: notetype1 10 notetype2 4 note C_, 1 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 7 @@ -234,13 +243,13 @@ Branch_f72ba: notetype1 10 notetype2 4 note D_, 1 - note __, 2 + rest 2 notetype1 9 notetype2 7 note C_, 3 dec_octave note A#, 3 - endchannel + sound_ret Branch_f72fb: octave 4 @@ -280,49 +289,51 @@ Branch_f72fb: note C#, 10 notetype1 10 notetype0 7 - endchannel + sound_ret -Music_TCGOverworld_Ch2: +Music_Overworld_Ch2: ; f7334 (3d:7334) notetype0 7 - dutycycle 0 - vibrato 30, $33 + duty_cycle 0 + ;stereo_panning 1, 1 + ;vibrato_type 9 + vibrato 30, 3, 3 notetype2 7 octave 3 - callchannel Branch_f7535 + sound_call Branch_f7535 .MainLoop - callchannel Branch_f7535 + sound_call Branch_f7535 notetype1 9 notetype2 7 - note __, 3 + rest 3 note C_, 5 note C_, 3 notetype1 9 notetype2 4 inc_octave note F_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 note C_, 4 note C_, 3 note C_, 3 - note __, 3 + rest 3 note C_, 5 note C_, 3 notetype1 9 notetype2 4 inc_octave note G_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 note D_, 4 note D_, 3 note C_, 3 - note __, 3 + rest 3 dec_octave note A#, 5 inc_octave @@ -331,7 +342,7 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note F_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 @@ -339,7 +350,7 @@ Music_TCGOverworld_Ch2: note C_, 3 dec_octave note A#, 3 - note __, 3 + rest 3 note A#, 5 inc_octave note C#, 3 @@ -347,7 +358,7 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note F_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 @@ -355,7 +366,7 @@ Music_TCGOverworld_Ch2: dec_octave note F_, 3 note A#, 3 - note __, 3 + rest 3 inc_octave note C_, 3 note E_, 2 @@ -391,14 +402,14 @@ Music_TCGOverworld_Ch2: notetype2 4 note F_, 1 dec_octave - note __, 2 + rest 2 notetype1 9 notetype2 7 note D_, 4 note D_, 3 dec_octave note A_, 3 - note __, 3 + rest 3 note A#, 3 inc_octave note D_, 2 @@ -409,7 +420,7 @@ Music_TCGOverworld_Ch2: inc_octave inc_octave note F_, 1 - note __, 2 + rest 2 dec_octave dec_octave notetype1 9 @@ -417,7 +428,7 @@ Music_TCGOverworld_Ch2: note A#, 4 note A#, 3 note A#, 3 - note __, 3 + rest 3 note A#, 3 inc_octave note D_, 2 @@ -427,7 +438,7 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note A_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 @@ -436,7 +447,7 @@ Music_TCGOverworld_Ch2: note D_, 1 dec_octave note A#, 3 - note __, 3 + rest 3 inc_octave note C_, 5 note C_, 3 @@ -444,42 +455,47 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note F_, 1 - note __, 2 + rest 2 notetype1 9 notetype2 7 dec_octave note C_, 4 note C_, 3 note C_, 3 - note __, 3 + rest 3 note C_, 5 note C_, 3 notetype1 9 notetype2 4 inc_octave note G_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 note D_, 4 - dutycycle 2 + duty_cycle 2 notetype1 6 notetype2 8 octave 4 note C_, 1 + ;tie dec_octave note G_, 1 + ;tie note E_, 1 + ;tie note C_, 1 + ;tie dec_octave note G_, 1 + ;tie note E_, 1 - dutycycle 0 + duty_cycle 0 notetype1 9 notetype2 7 octave 2 - note __, 3 + rest 3 note A#, 5 inc_octave note D_, 3 @@ -487,7 +503,7 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note F_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 @@ -495,7 +511,7 @@ Music_TCGOverworld_Ch2: note C_, 3 dec_octave note A#, 3 - note __, 3 + rest 3 note A#, 5 inc_octave note C#, 3 @@ -503,14 +519,14 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note F_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 note C#, 4 note C#, 3 note C#, 3 - note __, 3 + rest 3 note C_, 3 dec_octave note A_, 2 @@ -520,14 +536,14 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note G_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 note C_, 4 note E_, 3 note C_, 3 - note __, 3 + rest 3 note D_, 6 dec_octave note B_, 2 @@ -536,7 +552,7 @@ Music_TCGOverworld_Ch2: notetype1 9 notetype2 4 note F_, 1 - note __, 2 + rest 2 dec_octave notetype1 9 notetype2 7 @@ -557,7 +573,7 @@ Music_TCGOverworld_Ch2: notetype1 9 notetype2 4 note F_, 1 - note __, 2 + rest 2 dec_octave dec_octave notetype1 9 @@ -595,7 +611,7 @@ Music_TCGOverworld_Ch2: notetype1 9 notetype2 7 octave 3 - note __, 3 + rest 3 note F_, 3 note C_, 2 note F_, 1 @@ -603,7 +619,7 @@ Music_TCGOverworld_Ch2: notetype2 4 inc_octave note F_, 1 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 7 @@ -628,7 +644,7 @@ Music_TCGOverworld_Ch2: notetype1 9 notetype2 7 dec_octave - note __, 3 + rest 3 note A_, 3 note F_, 2 note A_, 1 @@ -636,7 +652,7 @@ Music_TCGOverworld_Ch2: notetype1 9 notetype2 4 note F_, 1 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 7 @@ -658,13 +674,13 @@ Music_TCGOverworld_Ch2: notetype1 9 notetype2 4 note F_, 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f7535: octave 3 notetype1 9 notetype2 7 - note __, 3 + rest 3 note C_, 3 note C_, 2 note F_, 1 @@ -672,7 +688,7 @@ Branch_f7535: notetype2 4 inc_octave note F_, 1 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 7 @@ -682,7 +698,7 @@ Branch_f7535: notetype2 4 inc_octave note F_, 1 - note __, 1 + rest 1 dec_octave notetype2 8 notetype0 1 @@ -700,7 +716,7 @@ Branch_f7535: inc_octave note F_, 1 dec_octave - note __, 3 + rest 3 notetype1 9 notetype2 8 note F_, 3 @@ -710,7 +726,7 @@ Branch_f7535: notetype2 4 inc_octave note F_, 1 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 7 @@ -720,7 +736,7 @@ Branch_f7535: notetype2 4 inc_octave note F_, 1 - note __, 1 + rest 1 dec_octave notetype2 8 notetype0 1 @@ -738,75 +754,96 @@ Branch_f7535: inc_octave note F_, 1 dec_octave - endchannel + sound_ret -Music_TCGOverworld_Ch3: +Music_Overworld_Ch3: ; f75a1 (3d:75a1) notetype0 7 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 64 + ;cutoff 7 octave 2 - callchannel Branch_f77f8 + sound_call Branch_f77f8 note F_, 2 inc_octave note C_, 1 .MainLoop - callchannel Branch_f77f8 + sound_call Branch_f77f8 note F_, 3 - callchannel Branch_f7826 + sound_call Branch_f7826 octave 2 + ;cutoff 8 note F_, 1 note A#, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note C#, 2 dec_octave + ;cutoff 8 note F_, 1 note A#, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note F_, 2 - note __, 1 + rest 1 inc_octave note C#, 1 octave 2 + ;cutoff 8 note A#, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 7 note G_, 1 octave 2 + ;cutoff 8 note A#, 1 - note __, 1 + rest 1 note F_, 1 inc_octave + ;cutoff 3 note A#, 2 dec_octave + ;cutoff 8 note A#, 1 octave 4 + ;cutoff 3 note C#, 2 octave 2 + ;cutoff 8 note F_, 1 note A_, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note E_, 2 octave 2 + ;cutoff 8 note A_, 1 octave 4 + ;cutoff 3 note G_, 2 + ;cutoff 7 note E_, 1 + ;cutoff 8 dec_octave note E_, 1 - note __, 1 + rest 1 inc_octave inc_octave + ;cutoff 3 note E_, 1 octave 2 + ;cutoff 8 note A_, 1 - note __, 1 + rest 1 inc_octave note A_, 1 - note __, 2 + rest 2 dec_octave note A_, 1 inc_octave @@ -815,235 +852,314 @@ Music_TCGOverworld_Ch3: note C_, 1 dec_octave note A_, 1 - note __, 1 + rest 1 inc_octave note A_, 1 dec_octave note D_, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note F_, 2 octave 2 + ;cutoff 8 note A_, 1 inc_octave note D_, 2 dec_octave note A_, 1 octave 4 + ;cutoff 3 note D_, 2 inc_octave note C_, 1 octave 2 + ;cutoff 8 note D_, 2 octave 4 + ;cutoff 3 note F_, 2 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note A_, 1 octave 4 + ;cutoff 3 note F_, 2 octave 2 + ;cutoff 8 note D_, 1 octave 4 + ;cutoff 3 note D_, 2 + ;cutoff 8 octave 2 note A_, 1 note G_, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note D_, 2 octave 2 + ;cutoff 8 note G_, 1 octave 4 + ;cutoff 3 note F_, 2 + ;cutoff 7 note D_, 1 dec_octave + ;cutoff 8 note D_, 1 - note __, 1 + rest 1 + ;cutoff 3 inc_octave note A#, 1 octave 2 + ;cutoff 8 note G_, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note D_, 2 - note __, 1 + rest 1 dec_octave + ;cutoff 8 note D_, 1 inc_octave + ;cutoff 3 note F_, 2 octave 2 + ;cutoff 8 note G_, 1 octave 4 + ;cutoff 3 note D_, 2 + ;cutoff 8 dec_octave note D_, 1 note C_, 2 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note D_, 2 octave 2 + ;cutoff 8 note G_, 1 octave 4 + ;cutoff 3 note F_, 2 + ;cutoff 7 note D_, 1 octave 2 + ;cutoff 8 note C_, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note F_, 1 dec_octave + ;cutoff 8 note C_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note D_, 2 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note E_, 1 inc_octave note C_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 7 note F_, 1 + ;cutoff 3 note E_, 2 + ;cutoff 8 octave 2 note E_, 1 - callchannel Branch_f7826 + sound_call Branch_f7826 + ;cutoff 8 octave 3 note C_, 1 note C#, 2 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note C#, 2 octave 2 + ;cutoff 8 note G#, 1 inc_octave note C#, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note F_, 2 - note __, 1 + rest 1 inc_octave note C#, 1 octave 3 + ;cutoff 8 note C#, 1 - note __, 1 + rest 1 inc_octave note G_, 1 dec_octave + ;cutoff 8 note C#, 1 - note __, 1 + rest 1 dec_octave note G#, 1 octave 4 + ;cutoff 3 note G_, 2 dec_octave + ;cutoff 8 note C#, 1 inc_octave + ;cutoff 3 note F_, 2 octave 2 + ;cutoff 8 note G#, 1 inc_octave note C_, 2 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note E_, 2 dec_octave + ;cutoff 8 note G_, 1 inc_octave + ;cutoff 3 note C_, 2 + ;cutoff 7 note E_, 1 dec_octave + ;cutoff 8 note E_, 1 - note __, 1 + rest 1 octave 5 + ;cutoff 3 note E_, 1 octave 3 + ;cutoff 8 note C_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note E_, 2 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note G_, 1 octave 4 + ;cutoff 3 note G_, 2 dec_octave + ;cutoff 8 note C_, 1 inc_octave + ;cutoff 3 note E_, 2 octave 2 + ;cutoff 8 note G_, 1 note B_, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note F_, 2 dec_octave + ;cutoff 8 note F_, 1 note B_, 2 note F_, 1 inc_octave + ;cutoff 3 note D_, 2 inc_octave note D_, 1 octave 2 + ;cutoff 8 note B_, 2 octave 4 + ;cutoff 3 note F_, 2 - note __, 1 + rest 1 dec_octave + ;cutoff 8 note F_, 1 note B_, 2 note F_, 1 dec_octave note B_, 2 - note __, 1 + rest 1 note A#, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note D_, 2 dec_octave + ;cutoff 8 note F_, 1 note A#, 2 note F_, 1 inc_octave + ;cutoff 3 note F_, 2 inc_octave note D_, 1 octave 2 + ;cutoff 8 note A#, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 7 note D_, 1 octave 2 + ;cutoff 8 note A#, 1 - note __, 2 + rest 2 note A#, 2 inc_octave note F_, 1 note A#, 1 - note __, 2 + rest 2 note C_, 2 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note D_, 2 octave 2 + ;cutoff 8 note G_, 1 octave 4 + ;cutoff 3 note F_, 2 + ;cutoff 7 note D_, 1 octave 2 + ;cutoff 8 note C_, 1 - note __, 1 + rest 1 octave 5 + ;cutoff 3 note D_, 1 octave 3 + ;cutoff 8 note C_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note D_, 2 - note __, 1 + rest 1 octave 2 + ;cutoff 8 note E_, 1 inc_octave note C_, 1 @@ -1051,76 +1167,90 @@ Music_TCGOverworld_Ch3: note G_, 1 note E_, 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 note F_, 3 octave 4 + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note C_, 1 inc_octave + ;cutoff 5 note F_, 2 note A_, 1 inc_octave note C_, 1 dec_octave - note __, 1 + rest 1 note A#, 2 - note __, 1 + rest 1 note A#, 1 inc_octave note D_, 1 dec_octave - note __, 2 + rest 2 note G_, 2 dec_octave + ;cutoff 8 note C_, 1 inc_octave + ;cutoff 5 note A#, 2 inc_octave note C_, 1 octave 2 + ;cutoff 8 note F_, 3 octave 5 + ;cutoff 3 note C_, 2 octave 3 + ;cutoff 8 note C_, 1 inc_octave + ;cutoff 5 note A_, 2 inc_octave note C_, 1 note C_, 1 - note __, 1 + rest 1 dec_octave note A#, 2 - note __, 1 + rest 1 note A#, 1 inc_octave note D_, 1 - note __, 2 + rest 2 note C_, 2 octave 3 + ;cutoff 8 note C_, 1 inc_octave + ;cutoff 5 note A#, 2 dec_octave + ;cutoff 8 note C_, 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f77f8: octave 2 note F_, 3 octave 4 + ;cutoff 3 note A_, 2 dec_octave + ;cutoff 8 note C_, 1 note F_, 2 note C_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 2 + rest 2 note C_, 1 note F_, 2 note C_, 1 @@ -1131,194 +1261,221 @@ Branch_f77f8: dec_octave note F_, 3 octave 5 + ;cutoff 3 note C_, 2 octave 3 + ;cutoff 8 note C_, 1 note F_, 2 note C_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 2 + rest 2 note C_, 1 note F_, 2 note C_, 1 dec_octave - endchannel + sound_ret Branch_f7826: octave 2 note F_, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note F_, 2 dec_octave + ;cutoff 8 note C_, 1 note F_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note F_, 2 - note __, 1 + rest 1 inc_octave note C_, 1 octave 2 + ;cutoff 8 note F_, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 7 note G_, 1 octave 2 + ;cutoff 8 note F_, 1 - note __, 1 + rest 1 note C_, 1 octave 4 + ;cutoff 3 note G_, 2 octave 2 + ;cutoff 8 note F_, 1 octave 4 + ;cutoff 7 note F_, 2 octave 2 + ;cutoff 8 note G_, 1 note A_, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note E_, 2 dec_octave + ;cutoff 8 note E_, 1 note A_, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note E_, 2 - note __, 1 + rest 1 inc_octave note C_, 1 octave 2 + ;cutoff 8 note A_, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 7 note E_, 1 octave 2 + ;cutoff 8 .Loop1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 note A_, 2 - note __, 1 + rest 1 note A#, 2 - note __, 1 + rest 1 octave 4 + ;cutoff 3 note D_, 2 dec_octave + ;cutoff 8 note F_, 1 note A#, 1 - note __, 1 + rest 1 inc_octave + ;cutoff 3 note F_, 2 - note __, 1 + rest 1 inc_octave note D_, 1 octave 2 + ;cutoff 8 note A#, 1 - note __, 1 + rest 1 octave 4 + ;cutoff 7 note D_, 1 octave 2 + ;cutoff 8 note A#, 1 - note __, 1 + rest 1 note F_, 1 octave 4 + ;cutoff 3 note D_, 2 octave 2 + ;cutoff 8 note A#, 1 octave 4 + ;cutoff 3 note D_, 2 - endchannel + sound_ret -Music_TCGOverworld_Ch4: - togglenoise $06 - notetype 7 +Music_Overworld_Ch4: ; f78af (3d:78af) + toggle_noise 6 + drum_speed 7 octave 1 - callchannel Branch_f78ee - callchannel Branch_f78fb + sound_call Branch_f78ee + sound_call Branch_f78fb .MainLoop - callchannel Branch_f78ee - note C_, 3 - note D#, 2 - note C_, 1 - note C#, 3 - note D#, 2 - note E_, 1 - note C_, 2 - note D#, 1 - note D#, 3 - note C#, 1 - note D#, 1 - note D#, 1 - note C#, 3 + sound_call Branch_f78ee + drum_note 1, 3 + drum_note 4, 2 + drum_note 1, 1 + drum_note 2, 3 + drum_note 4, 2 + drum_note 5, 1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 4, 3 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 3 .Loop1 - callchannel Branch_f78ee - callchannel Branch_f78fb - loopchannel 3, .Loop1 - callchannel Branch_f78ee - callchannel Branch_f790a + sound_call Branch_f78ee + sound_call Branch_f78fb + sound_loop 3, .Loop1 + sound_call Branch_f78ee + sound_call Branch_f790a .Loop2 - callchannel Branch_f78ee - callchannel Branch_f78fb - loopchannel 3, .Loop2 - callchannel Branch_f78ee - callchannel Branch_f790a - callchannel Branch_f78ee - callchannel Branch_f78fb - loopchannel 0, .MainLoop + sound_call Branch_f78ee + sound_call Branch_f78fb + sound_loop 3, .Loop2 + sound_call Branch_f78ee + sound_call Branch_f790a + sound_call Branch_f78ee + sound_call Branch_f78fb + sound_loop 0, .MainLoop Branch_f78ee: - note C_, 3 - note D#, 2 - note C_, 1 - note C#, 3 - note D#, 2 - note E_, 1 - note C_, 2 - note D#, 1 - note D#, 3 - note C#, 3 - note D#, 2 - note E_, 1 - endchannel + drum_note 1, 3 + drum_note 4, 2 + drum_note 1, 1 + drum_note 2, 3 + drum_note 4, 2 + drum_note 5, 1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 4, 3 + drum_note 2, 3 + drum_note 4, 2 + drum_note 5, 1 + sound_ret Branch_f78fb: - note C_, 3 - note D#, 2 - note C_, 1 - note C#, 3 - note D#, 2 - note E_, 1 - note C_, 2 - note D#, 1 - note D#, 3 - note C#, 1 - note D#, 1 - note D#, 1 - note D#, 2 - note E_, 1 - endchannel + drum_note 1, 3 + drum_note 4, 2 + drum_note 1, 1 + drum_note 2, 3 + drum_note 4, 2 + drum_note 5, 1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 4, 3 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 2 + drum_note 5, 1 + sound_ret Branch_f790a: - note C_, 3 - note D#, 2 - note C_, 1 - note C#, 3 - note D#, 2 - note E_, 1 - note C_, 2 - note D#, 1 - note D#, 3 - note C#, 1 - note D#, 1 - note D#, 1 - note C#, 2 - note C#, 1 - endchannel - + drum_note 1, 3 + drum_note 4, 2 + drum_note 1, 1 + drum_note 2, 3 + drum_note 4, 2 + drum_note 5, 1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 4, 3 + drum_note 2, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 2 + drum_note 2, 1 + sound_ret +; 0xf7919 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 6577e9fd..9149baae 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -1,27 +1,25 @@ -Music_TCGPauseMenu: - db $C0 - dw Music_TCGPauseMenu_Ch1 - db $01 - dw Music_TCGPauseMenu_Ch2 - db $02 - dw Music_TCGPauseMenu_Ch3 - db $03 - dw Music_TCGPauseMenu_Ch4 +Music_PauseMenu: + channel_count 4 + channel 1, Music_PauseMenu_Ch1 + channel 2, Music_PauseMenu_Ch2 + channel 3, Music_PauseMenu_Ch3 + channel 4, Music_PauseMenu_Ch4 -Music_TCGPauseMenu_Ch2: +Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) notetype0 7 + ;stereo_panning 1, 1 notetype2 8 - dutycycle 2 + duty_cycle 2 .MainLoop notetype1 7 .Loop1 - note __, 16 - loopchannel 4, .Loop1 + rest 16 + sound_loop 4, .Loop1 notetype0 1 octave 6 note C_, 4 dec_octave - note __, 3 + rest 3 note B_, 4 inc_octave notetype1 3 @@ -35,8 +33,8 @@ Music_TCGPauseMenu_Ch2: note D_, 4 notetype1 3 note G_, 3 - callchannel Branch_f6c24 - callchannel Branch_f6c60 + sound_call Branch_f6c24 + sound_call Branch_f6c60 notetype1 7 octave 6 note C_, 4 @@ -57,25 +55,25 @@ Music_TCGPauseMenu_Ch2: note D_, 4 notetype1 3 note G_, 3 - callchannel Branch_f6c24 - callchannel Branch_f6c60 + sound_call Branch_f6c24 + sound_call Branch_f6c60 octave 6 notetype1 6 note C_, 4 dec_octave notetype1 3 note E_, 3 - callchannel Branch_f6ce9 - callchannel Branch_f6c80 + sound_call Branch_f6ce9 + sound_call Branch_f6c80 .Loop2 octave 6 notetype2 4 note C_, 1 - callchannel Branch_f6ce9 - callchannel Branch_f6c80 - loopchannel 3, .Loop2 + sound_call Branch_f6ce9 + sound_call Branch_f6c80 + sound_loop 3, .Loop2 notetype2 8 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f6c24: .Loop3 @@ -99,7 +97,7 @@ Branch_f6c24: note D_, 4 notetype1 3 note G_, 3 - loopchannel 3, .Loop3 + sound_loop 3, .Loop3 inc_octave notetype1 7 note C_, 4 @@ -120,7 +118,7 @@ Branch_f6c24: note E_, 4 notetype1 3 note G_, 3 - endchannel + sound_ret Branch_f6c60: .Loop4 @@ -144,8 +142,8 @@ Branch_f6c60: note E_, 4 notetype1 3 note G_, 3 - loopchannel 3, .Loop4 - endchannel + sound_loop 3, .Loop4 + sound_ret Branch_f6c80: octave 6 @@ -216,7 +214,7 @@ Branch_f6c80: note B_, 1 note G_, 1 note E_, 1 - endchannel + sound_ret Branch_f6ce9: octave 2 @@ -284,20 +282,21 @@ Branch_f6ce9: note B_, 1 note G_, 1 note D_, 1 - endchannel + sound_ret -Music_TCGPauseMenu_Ch1: +Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) notetype0 7 + ;stereo_panning 1, 1 notetype2 8 - dutycycle 2 + duty_cycle 2 .MainLoop notetype1 8 .Loop1 - note __, 16 - loopchannel 7, .Loop1 + rest 16 + sound_loop 7, .Loop1 octave 5 - note __, 8 + rest 8 notetype0 1 .Loop2 note B_, 4 @@ -305,7 +304,7 @@ Music_TCGPauseMenu_Ch1: note E_, 4 note C_, 3 dec_octave - loopchannel 4, .Loop2 + sound_loop 4, .Loop2 notetype0 7 .Loop3 octave 1 @@ -436,16 +435,20 @@ Music_TCGPauseMenu_Ch1: note C#, 1 inc_octave note D_, 1 - loopchannel 4, .Loop3 - loopchannel 0, .MainLoop + sound_loop 4, .Loop3 + sound_loop 0, .MainLoop -Music_TCGPauseMenu_Ch3: +Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) notetype0 1 notetype2 13 + ;stereo_panning 1, 1 notetype1 2 + ;echo 96 + ;cutoff 4 octave 5 note G_, 7 + ;cutoff 8 note F#, 4 notetype1 3 note G_, 3 @@ -482,7 +485,7 @@ Music_TCGPauseMenu_Ch3: inc_octave notetype1 3 note D_, 3 - loopchannel 3, .Loop1 + sound_loop 3, .Loop1 notetype1 2 note G_, 4 dec_octave @@ -524,7 +527,7 @@ Music_TCGPauseMenu_Ch3: inc_octave notetype1 3 note C_, 3 - loopchannel 3, .Loop2 + sound_loop 3, .Loop2 notetype1 2 note G_, 4 dec_octave @@ -545,44 +548,44 @@ Music_TCGPauseMenu_Ch3: inc_octave notetype1 3 note D_, 3 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGPauseMenu_Ch4: - togglenoise $06 - notetype 7 +Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) + toggle_noise 6 + drum_speed 7 octave 1 .MainLoop .Loop1 rept 7 - note C_, 1 - note D#, 1 - note E_, 2 - note C#, 1 - note D#, 1 - note E_, 1 - note D_, 1 - note C_, 1 - note D#, 1 - note E_, 2 - note C#, 1 - note D#, 1 - note E_, 1 - note C#, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 endr - note C_, 1 - note D#, 1 - note E_, 2 - note C#, 1 - note D#, 1 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 rept 8 - note C#, 1 + drum_note 2, 1 endr - loopchannel 2, .Loop1 - loopchannel 0, .MainLoop - + sound_loop 2, .Loop1 + sound_loop 0, .MainLoop +; 0xf6ef1 diff --git a/crysaudio/music/TCG/pcmainmenu.asm b/crysaudio/music/TCG/pcmainmenu.asm index 35eb39ae..519977df 100644 --- a/crysaudio/music/TCG/pcmainmenu.asm +++ b/crysaudio/music/TCG/pcmainmenu.asm @@ -1,96 +1,94 @@ -Music_TCGPCMainMenu: - db $C0 - dw Music_TCGPCMainMenu_Ch1 - db $01 - dw Music_TCGPCMainMenu_Ch2 - db $02 - dw Music_TCGPCMainMenu_Ch3 - db $03 - dw Music_TCGPCMainMenu_Ch4 +Music_PCMainMenu: + channel_count 4 + channel 1, Music_PCMainMenu_Ch1 + channel 2, Music_PCMainMenu_Ch2 + channel 3, Music_PCMainMenu_Ch3 + channel 4, Music_PCMainMenu_Ch4 -Music_TCGPCMainMenu_Ch1: +Music_PCMainMenu_Ch1: ; f9052 (3e:5052) notetype0 7 + ;stereo_panning 1, 1 notetype2 8 octave 3 - dutycycle 2 + duty_cycle 2 .MainLoop - callchannel Branch_f90c2 - note __, 4 + sound_call Branch_f90c2 + rest 4 dec_octave - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 note F_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype2 8 notetype1 12 note A_, 1 notetype1 3 note A_, 1 - note __, 2 + rest 2 inc_octave notetype1 12 note C_, 1 notetype1 3 note C_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 note F_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype2 8 notetype1 12 note B_, 1 notetype1 3 note B_, 1 - callchannel Branch_f90c2 - note __, 4 + sound_call Branch_f90c2 + rest 4 dec_octave - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 note F_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 12 note E_, 1 notetype1 3 note E_, 1 - note __, 2 + rest 2 notetype1 12 note C_, 1 notetype1 3 note C_, 1 - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 dec_octave note F_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 12 note D_, 1 notetype1 3 note D_, 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f90c2: octave 3 - note __, 4 - dutycycle 1 + rest 4 + duty_cycle 1 notetype1 6 notetype2 5 note G_, 1 - note __, 3 + rest 3 notetype2 8 - dutycycle 2 + duty_cycle 2 notetype1 12 note B_, 2 inc_octave @@ -98,104 +96,105 @@ Branch_f90c2: notetype1 2 note D_, 1 dec_octave - dutycycle 1 + duty_cycle 1 notetype1 6 notetype2 5 note G_, 1 - note __, 1 + rest 1 inc_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 12 note C_, 1 notetype1 3 note C_, 1 - endchannel + sound_ret -Music_TCGPCMainMenu_Ch2: +Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) notetype0 7 + ;stereo_panning 1, 1 notetype2 8 octave 3 - dutycycle 2 + duty_cycle 2 .MainLoop - callchannel Branch_f915e - note __, 4 + sound_call Branch_f915e + rest 4 inc_octave - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 note C_, 1 - note __, 1 + rest 1 dec_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 8 note F_, 1 notetype1 2 note F_, 1 - note __, 2 + rest 2 notetype1 8 note A_, 1 notetype1 2 note A_, 1 - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 inc_octave note C_, 1 - note __, 1 + rest 1 dec_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 8 note G_, 1 notetype1 2 note G_, 1 - callchannel Branch_f915e - note __, 4 + sound_call Branch_f915e + rest 4 inc_octave - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 note C_, 1 - note __, 1 - dutycycle 2 + rest 1 + duty_cycle 2 notetype2 8 notetype1 8 note C_, 1 notetype1 2 note C_, 1 - note __, 2 + rest 2 dec_octave notetype1 8 note A_, 1 notetype1 2 note A_, 1 - dutycycle 1 + duty_cycle 1 inc_octave notetype1 6 notetype2 5 note C_, 1 - note __, 1 + rest 1 dec_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 8 note B_, 1 notetype1 2 note B_, 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f915e: octave 4 - note __, 4 - dutycycle 1 + rest 4 + duty_cycle 1 notetype2 5 notetype1 6 note D_, 1 - note __, 3 - dutycycle 2 + rest 3 + duty_cycle 2 notetype2 8 dec_octave notetype1 8 @@ -204,146 +203,183 @@ Branch_f915e: notetype1 2 note B_, 1 inc_octave - dutycycle 1 + duty_cycle 1 notetype2 5 notetype1 6 note D_, 1 - note __, 1 + rest 1 dec_octave - dutycycle 2 + duty_cycle 2 notetype2 8 notetype1 8 note A_, 1 notetype1 2 note A_, 1 - endchannel + sound_ret -Music_TCGPCMainMenu_Ch3: +Music_PCMainMenu_Ch3: ; f9189 (3e:5189) notetype0 7 notetype1 1 + ;stereo_panning 1, 1 notetype2 11 + ;cutoff 7 + ;echo 0 .MainLoop octave 2 + ;cutoff 7 note G_, 1 - note __, 1 + rest 1 + ;cutoff 8 note G_, 1 - note __, 1 + rest 1 notetype0 1 note A#, 4 + ;tie note B_, 3 + ;tie notetype0 7 note B_, 1 - note __, 1 + rest 1 + ;cutoff 4 inc_octave note C_, 1 - note __, 1 + rest 1 note C_, 1 + ;cutoff 8 note C#, 2 note D_, 2 dec_octave note G_, 1 + ;tie note F#, 1 + ;cutoff 7 note F_, 1 - note __, 1 + rest 1 + ;cutoff 8 note F_, 1 - note __, 1 + rest 1 notetype0 1 note G#, 4 + ;tie note A_, 3 + ;tie notetype0 7 note A_, 1 - note __, 1 + rest 1 + ;cutoff 4 note A#, 1 - note __, 1 + rest 1 note A#, 1 + ;cutoff 8 note B_, 2 inc_octave note C_, 2 dec_octave note F_, 1 + ;tie note F#, 1 + ;cutoff 7 note G_, 1 - note __, 1 + rest 1 + ;cutoff 8 note G_, 1 - note __, 1 + rest 1 notetype0 1 note A#, 4 + ;tie note B_, 3 + ;tie notetype0 7 note B_, 1 - note __, 1 + rest 1 + ;cutoff 4 inc_octave note C_, 1 - note __, 1 + rest 1 note C_, 1 + ;cutoff 8 note C#, 2 note D_, 2 dec_octave note G_, 1 + ;tie note F#, 1 + ;cutoff 7 note F_, 1 - note __, 1 + rest 1 + ;cutoff 8 note F_, 1 - note __, 1 + rest 1 notetype0 1 note B_, 4 + ;tie inc_octave note C_, 3 + ;tie notetype0 7 note C_, 1 - note __, 1 + rest 1 + ;cutoff 8 notetype0 1 note F#, 4 + ;tie note G_, 3 + ;tie notetype0 7 note G_, 1 + ;cutoff 4 note F_, 1 + ;cutoff 8 note C_, 2 note F_, 2 notetype0 1 note C_, 3 + ;tie dec_octave note B_, 3 + ;tie note A#, 3 + ;tie note A_, 3 + ;tie note G#, 2 notetype0 7 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGPCMainMenu_Ch4: - togglenoise $06 - notetype 7 +Music_PCMainMenu_Ch4: ; f922b (3e:522b) + toggle_noise 6 + drum_speed 7 octave 1 .MainLoop .Loop1 - callchannel Branch_f9248 - note D#, 1 - note C_, 1 - note C#, 2 - note D#, 1 - note E_, 1 - loopchannel 7, .Loop1 - callchannel Branch_f9248 - note E_, 1 - notetype 1 - note D_, 4 - note D_, 3 - notetype 7 - note C#, 2 - note C#, 1 - note C#, 1 - loopchannel 0, .MainLoop + sound_call Branch_f9248 + drum_note 4, 1 + drum_note 1, 1 + drum_note 2, 2 + drum_note 4, 1 + drum_note 5, 1 + sound_loop 7, .Loop1 + sound_call Branch_f9248 + drum_note 5, 1 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_speed 7 + drum_note 2, 2 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .MainLoop Branch_f9248: - note C_, 2 - note D#, 1 - note D#, 1 - note C#, 2 - note D#, 1 - note E_, 1 - note C_, 1 - note D_, 1 - endchannel - + drum_note 1, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 2 + drum_note 4, 1 + drum_note 5, 1 + drum_note 1, 1 + drum_note 3, 1 + sound_ret +; 0xf9251 diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm index 87f4c04d..9fdae5fb 100644 --- a/crysaudio/music/TCG/pokemondome.asm +++ b/crysaudio/music/TCG/pokemondome.asm @@ -1,19 +1,18 @@ -Music_TCGPokemonDome: - db $C0 - dw Music_TCGPokemonDome_Ch1 - db $01 - dw Music_TCGPokemonDome_Ch2 - db $02 - dw Music_TCGPokemonDome_Ch3 - db $03 - dw Music_TCGPokemonDome_Ch4 +Music_PokemonDome: + channel_count 4 + channel 1, Music_PokemonDome_Ch1 + channel 2, Music_PokemonDome_Ch2 + channel 3, Music_PokemonDome_Ch3 + channel 4, Music_PokemonDome_Ch4 -Music_TCGPokemonDome_Ch1: +Music_PokemonDome_Ch1: ; f9251 (3e:5251) notetype0 7 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 9 + vibrato 20, 3, 3 notetype2 8 octave 2 - dutycycle 0 + duty_cycle 0 notetype1 10 notetype0 1 note G_, 5 @@ -44,7 +43,7 @@ Music_TCGPokemonDome_Ch1: note E_, 5 note F_, 5 note G_, 4 - dutycycle 1 + duty_cycle 1 notetype1 8 dec_octave notetype0 1 @@ -55,7 +54,7 @@ Music_TCGPokemonDome_Ch1: note C_, 11 notetype1 3 note C_, 10 - note __, 7 + rest 7 notetype1 8 note C_, 4 notetype1 3 @@ -73,7 +72,7 @@ Music_TCGPokemonDome_Ch1: notetype1 3 note C_, 10 notetype0 7 - note __, 3 + rest 3 notetype1 8 notetype0 1 note D_, 11 @@ -83,7 +82,7 @@ Music_TCGPokemonDome_Ch1: note D_, 11 notetype1 3 note D_, 10 - note __, 7 + rest 7 notetype1 8 note D_, 4 notetype1 3 @@ -102,12 +101,12 @@ Music_TCGPokemonDome_Ch1: note D_, 3 .MainLoop notetype0 7 - dutycycle 1 + duty_cycle 1 notetype1 10 octave 2 note G_, 4 inc_octave - dutycycle 1 + duty_cycle 1 notetype1 8 notetype0 1 note E_, 11 @@ -118,7 +117,7 @@ Music_TCGPokemonDome_Ch1: note E_, 11 notetype1 3 note E_, 10 - note __, 7 + rest 7 notetype1 8 note E_, 4 notetype1 3 @@ -136,7 +135,7 @@ Music_TCGPokemonDome_Ch1: notetype1 3 note E_, 10 notetype0 7 - note __, 3 + rest 3 notetype1 8 notetype0 1 note D_, 11 @@ -146,7 +145,7 @@ Music_TCGPokemonDome_Ch1: note D_, 11 notetype1 3 note D_, 10 - note __, 7 + rest 7 notetype0 1 notetype1 8 note D_, 4 @@ -164,7 +163,7 @@ Music_TCGPokemonDome_Ch1: note D_, 11 notetype1 3 note D_, 3 - dutycycle 0 + duty_cycle 0 notetype1 10 dec_octave notetype0 1 @@ -184,7 +183,7 @@ Music_TCGPokemonDome_Ch1: note G_, 1 notetype1 3 note G_, 1 - note __, 1 + rest 1 inc_octave notetype1 10 note C_, 1 @@ -218,7 +217,7 @@ Music_TCGPokemonDome_Ch1: note G_, 1 notetype1 3 note G_, 1 - note __, 1 + rest 1 inc_octave notetype1 10 note C_, 1 @@ -251,7 +250,9 @@ Music_TCGPokemonDome_Ch1: note E_, 4 note F_, 4 note G_, 8 + ;tie note G_, 8 + ;tie note G_, 8 notetype1 3 note G_, 2 @@ -270,7 +271,7 @@ Music_TCGPokemonDome_Ch1: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 dec_octave notetype1 10 note A_, 1 @@ -284,7 +285,7 @@ Music_TCGPokemonDome_Ch1: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 dec_octave notetype1 10 note A_, 1 @@ -298,26 +299,31 @@ Music_TCGPokemonDome_Ch1: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 dec_octave notetype1 10 note G#, 1 inc_octave note C_, 12 + ;tie note C_, 8 note D_, 8 note C_, 8 + ;tie note C_, 8 + ;tie note C_, 12 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCGPokemonDome_Ch2: +Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) notetype0 7 - vibrato 20, $33 + ;stereo_panning 1, 1 + ;vibrato_type 9 + vibrato 20, 3, 3 notetype2 8 octave 1 - dutycycle 0 + duty_cycle 0 notetype1 8 notetype0 1 note B_, 5 @@ -349,7 +355,7 @@ Music_TCGPokemonDome_Ch2: note A_, 5 note B_, 4 .MainLoop - dutycycle 1 + duty_cycle 1 notetype1 7 octave 3 notetype0 1 @@ -360,7 +366,7 @@ Music_TCGPokemonDome_Ch2: note E_, 11 notetype1 3 note E_, 10 - note __, 7 + rest 7 notetype1 7 note E_, 4 notetype1 3 @@ -378,10 +384,10 @@ Music_TCGPokemonDome_Ch2: notetype1 3 note E_, 10 notetype0 7 - note __, 3 - callchannel Branch_f9554 + rest 3 + sound_call Branch_f9554 notetype0 7 - note __, 4 + rest 4 notetype1 7 notetype0 1 note G_, 11 @@ -391,7 +397,7 @@ Music_TCGPokemonDome_Ch2: note G_, 11 notetype1 3 note G_, 10 - note __, 7 + rest 7 notetype1 7 note G_, 4 notetype1 3 @@ -409,9 +415,9 @@ Music_TCGPokemonDome_Ch2: notetype1 3 note G_, 10 notetype0 7 - note __, 3 - callchannel Branch_f9554 - dutycycle 0 + rest 3 + sound_call Branch_f9554 + duty_cycle 0 notetype1 8 dec_octave notetype0 1 @@ -427,11 +433,11 @@ Music_TCGPokemonDome_Ch2: notetype0 7 note G_, 10 note F_, 1 - note __, 1 + rest 1 note E_, 1 notetype1 2 note E_, 1 - note __, 1 + rest 1 notetype1 7 note G_, 1 note G_, 10 @@ -440,15 +446,15 @@ Music_TCGPokemonDome_Ch2: note G_, 2 inc_octave note C_, 10 - note __, 2 + rest 2 dec_octave note A_, 3 - note __, 1 + rest 1 note G#, 10 note A#, 1 - note __, 1 + rest 1 note G#, 3 - note __, 1 + rest 1 note G_, 8 inc_octave note C_, 4 @@ -461,10 +467,10 @@ Music_TCGPokemonDome_Ch2: notetype2 8 notetype0 1 note F#, 5 - note __, 2 + rest 2 notetype0 7 note F_, 14 - note __, 2 + rest 2 dec_octave note G_, 1 note A_, 1 @@ -485,7 +491,7 @@ Music_TCGPokemonDome_Ch2: note F_, 1 note A_, 1 note B_, 1 - dutycycle 1 + duty_cycle 1 notetype1 8 notetype0 1 .Loop1 @@ -499,7 +505,7 @@ Music_TCGPokemonDome_Ch2: note A_, 5 note F_, 4 inc_octave - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 .Loop2 note G#, 5 note F_, 5 @@ -509,7 +515,7 @@ Music_TCGPokemonDome_Ch2: dec_octave note G#, 4 inc_octave - loopchannel 4, .Loop2 + sound_loop 4, .Loop2 .Loop3 inc_octave note D_, 5 @@ -519,7 +525,7 @@ Music_TCGPokemonDome_Ch2: note B_, 5 note G_, 5 note D_, 4 - loopchannel 4, .Loop3 + sound_loop 4, .Loop3 .Loop4 inc_octave note C#, 5 @@ -529,7 +535,7 @@ Music_TCGPokemonDome_Ch2: note A#, 5 note G_, 5 note E_, 4 - loopchannel 3, .Loop4 + sound_loop 3, .Loop4 inc_octave note C#, 5 dec_octave @@ -539,14 +545,14 @@ Music_TCGPokemonDome_Ch2: note A#, 5 inc_octave note C#, 4 - dutycycle 0 + duty_cycle 0 notetype1 8 notetype0 7 .Loop5 note C_, 1 notetype1 2 note C_, 1 - note __, 1 + rest 1 notetype1 7 dec_octave note F_, 1 @@ -555,14 +561,14 @@ Music_TCGPokemonDome_Ch2: note E_, 1 notetype1 2 note E_, 1 - note __, 1 + rest 1 notetype1 7 note D_, 1 - loopchannel 2, .Loop5 + sound_loop 2, .Loop5 note C_, 1 notetype1 2 note C_, 1 - note __, 1 + rest 1 dec_octave notetype1 7 note F_, 1 @@ -589,7 +595,7 @@ Music_TCGPokemonDome_Ch2: note F_, 1 note G#, 1 note B_, 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_f9554: notetype0 1 @@ -601,7 +607,7 @@ Branch_f9554: note F_, 11 notetype1 3 note F_, 10 - note __, 7 + rest 7 notetype1 7 note F_, 4 notetype1 3 @@ -615,178 +621,187 @@ Branch_f9554: note F_, 11 notetype1 3 note F_, 3 - loopchannel 2, .Loop6 - endchannel + sound_loop 2, .Loop6 + sound_ret -Music_TCGPokemonDome_Ch3: +Music_PokemonDome_Ch3: ; f9579 (3e:5579) notetype0 7 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 64 + ;cutoff 6 octave 2 + ;cutoff 4 notetype0 1 .Loop1 note G_, 5 note G_, 5 note G_, 4 - loopchannel 8, .Loop1 + sound_loop 8, .Loop1 + ;cutoff 6 notetype0 7 .MainLoop inc_octave note C_, 2 note C_, 2 - note __, 2 + rest 2 note C_, 1 note C_, 1 - callchannel Branch_f9613 + sound_call Branch_f9613 octave 2 + ;cutoff 4 note C_, 2 inc_octave + ;cutoff 6 note C_, 2 - note __, 2 + rest 2 note C_, 1 note C_, 1 - callchannel Branch_f9613 + sound_call Branch_f9613 octave 3 note C_, 2 note C_, 2 - note __, 2 + rest 2 note C_, 1 note C_, 1 note C_, 2 note C_, 2 - note __, 2 + rest 2 dec_octave note G_, 2 note B_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 1 note B_, 1 note B_, 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 note A_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 2 note A_, 2 - note __, 2 + rest 2 note F_, 2 note G#, 2 note G#, 2 - note __, 2 + rest 2 note G#, 1 note G#, 1 note G#, 2 note G#, 2 - note __, 2 + rest 2 note F_, 2 .Loop2 note G_, 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 .Loop3 note F#, 2 note F#, 2 - note __, 2 + rest 2 note F#, 1 note F#, 1 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 .Loop4 note G_, 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 - loopchannel 4, .Loop4 + sound_loop 4, .Loop4 .Loop5 note F_, 2 note F_, 2 - note __, 2 + rest 2 note F_, 1 note F_, 1 - loopchannel 4, .Loop5 + sound_loop 4, .Loop5 .Loop6 note E_, 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 note E_, 1 - loopchannel 2, .Loop6 + sound_loop 2, .Loop6 .Loop7 note A_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 - loopchannel 2, .Loop7 + sound_loop 2, .Loop7 .Loop8 note D_, 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 note D_, 1 - loopchannel 4, .Loop8 + sound_loop 4, .Loop8 .Loop9 note G_, 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 - loopchannel 4, .Loop9 - loopchannel 0, .MainLoop + sound_loop 4, .Loop9 + sound_loop 0, .MainLoop Branch_f9613: octave 3 note C_, 2 note C_, 2 - note __, 2 + rest 2 dec_octave note G_, 2 inc_octave note C_, 2 note C_, 2 - note __, 2 + rest 2 note C_, 1 note C_, 1 note C_, 2 note C_, 2 dec_octave + ;cutoff 4 note G_, 2 + ;cutoff 6 note G_, 2 - endchannel + sound_ret -Music_TCGPokemonDome_Ch4: - togglenoise $06 - notetype 7 +Music_PokemonDome_Ch4: ; f9629 (3e:5629) + toggle_noise 6 + drum_speed 7 octave 1 - note F_, 8 - notetype 1 - note C#, 4 - note D_, 3 + drum_note 6, 8 + drum_speed 1 + drum_note 2, 4 + drum_note 3, 3 .Loop1 - note D_, 4 - note D_, 3 - loopchannel 7, .Loop1 + drum_note 3, 4 + drum_note 3, 3 + sound_loop 7, .Loop1 .MainLoop .Loop2 - notetype 7 - note C#, 2 - note C#, 2 - note __, 2 - notetype 1 - note C#, 4 - note D_, 3 - note D_, 4 - note D_, 3 - loopchannel 2, .Loop2 - loopchannel 0, .MainLoop - + drum_speed 7 + drum_note 2, 2 + drum_note 2, 2 + rest 2 + drum_speed 1 + drum_note 2, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 3 + sound_loop 2, .Loop2 + sound_loop 0, .MainLoop +; 0xf9646 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index aad71d28..2f3f5c82 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -1,17 +1,16 @@ -Music_TCGRonald: - db $C0 - dw Music_TCGRonald_Ch1 - db $01 - dw Music_TCGRonald_Ch2 - db $02 - dw Music_TCGRonald_Ch3 - db $03 - dw Music_TCGRonald_Ch4 +Music_Ronald: + channel_count 4 + channel 1, Music_Ronald_Ch1 + channel 2, Music_Ronald_Ch2 + channel 3, Music_Ronald_Ch3 + channel 4, Music_Ronald_Ch4 -Music_TCGRonald_Ch1: - vibrato 12, $33 +Music_Ronald_Ch1: ; fa7a0 (3e:67a0) + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 12, 3, 3 notetype2 8 - dutycycle 0 + duty_cycle 0 .MainLoop octave 3 notetype0 13 @@ -22,19 +21,19 @@ Music_TCGRonald_Ch1: note D_, 1 notetype2 4 note F_, 1 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 notetype1 9 notetype2 8 note E_, 2 - note __, 1 + rest 1 dec_octave notetype1 9 notetype2 3 @@ -43,54 +42,56 @@ Music_TCGRonald_Ch1: note D_, 1 notetype2 4 note F_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 notetype2 8 notetype1 9 note G_, 2 - note __, 1 - loopchannel 2, .Loop1 + rest 1 + sound_loop 2, .Loop1 .Loop2 - vibrato 20, $33 - callchannel Branch_fa9aa + vibrato 20, 3, 3 + sound_call Branch_fa9aa notetype0 1 octave 4 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 2 - vibrato 12, $33 - callchannel Branch_fa9ec - loopchannel 2, .Loop2 + vibrato 12, 3, 3 + sound_call Branch_fa9ec + sound_loop 2, .Loop2 .Loop3 - vibrato 20, $33 - callchannel Branch_fa9cb + vibrato 20, 3, 3 + sound_call Branch_fa9cb notetype0 1 octave 4 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 2 - vibrato 12, $33 - callchannel Branch_fa9ec - loopchannel 2, .Loop3 - callchannel Branch_fa9aa - vibrato 20, $33 + vibrato 12, 3, 3 + sound_call Branch_fa9ec + sound_loop 2, .Loop3 + sound_call Branch_fa9aa + vibrato 20, 3, 3 notetype0 1 octave 4 note C#, 3 note D_, 3 - note __, 7 - dutycycle 2 + rest 7 + duty_cycle 2 notetype1 9 - note __, 6 + rest 6 dec_octave notetype2 4 note G_, 7 @@ -150,15 +151,15 @@ Music_TCGRonald_Ch1: note C_, 6 note D_, 7 notetype0 13 - callchannel Branch_fa9aa + sound_call Branch_fa9aa notetype0 1 octave 4 note C#, 3 note D_, 3 - note __, 7 - dutycycle 2 + rest 7 + duty_cycle 2 notetype1 9 - note __, 6 + rest 6 dec_octave notetype2 4 note G_, 7 @@ -221,25 +222,25 @@ Music_TCGRonald_Ch1: note A#, 6 note G_, 7 notetype2 8 - callchannel Branch_fa9cb + sound_call Branch_fa9cb notetype0 1 octave 4 note C#, 3 note D_, 3 - note __, 7 - dutycycle 2 + rest 7 + duty_cycle 2 notetype1 9 - note __, 13 + rest 13 notetype2 4 note F_, 6 - note __, 7 + rest 7 notetype2 8 note E_, 4 note F_, 4 note E_, 5 notetype2 4 note D_, 6 - note __, 7 + rest 7 notetype2 8 note E_, 6 notetype2 4 @@ -255,7 +256,7 @@ Music_TCGRonald_Ch1: note A#, 6 notetype2 4 note G_, 7 - note __, 6 + rest 6 note F_, 7 notetype2 8 note F#, 6 @@ -283,531 +284,534 @@ Music_TCGRonald_Ch1: note G_, 6 inc_octave note D_, 7 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype2 8 - callchannel Branch_fa9cb + sound_call Branch_fa9cb notetype0 1 octave 4 note C#, 3 note D_, 3 - note __, 7 - note __, 13 + rest 7 + rest 13 dec_octave note G_, 3 note G#, 10 note G_, 3 - note __, 10 + rest 10 notetype0 13 note F_, 4 - vibrato 12, $33 + vibrato 12, 3, 3 notetype0 1 notetype1 9 note C_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note F_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note A_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 notetype0 13 notetype1 9 note G_, 2 - note __, 1 - vibrato 20, $33 + rest 1 + vibrato 20, 3, 3 notetype0 1 notetype1 10 note F#, 3 note G_, 10 note A#, 3 - note __, 10 + rest 10 note G_, 3 - note __, 10 + rest 10 inc_octave note D_, 13 - note __, 13 + rest 13 dec_octave note A#, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note A#, 3 inc_octave note C_, 10 - note __, 13 + rest 13 dec_octave note A#, 3 - note __, 10 + rest 10 inc_octave note C_, 13 dec_octave note A#, 3 - note __, 10 + rest 10 inc_octave note C#, 4 note C_, 4 dec_octave note A#, 5 note G_, 3 - note __, 10 + rest 10 note B_, 3 inc_octave note C_, 10 dec_octave note A#, 3 - note __, 10 - note __, 13 + rest 10 + rest 13 inc_octave note G_, 3 - note __, 10 + rest 10 note C_, 4 note C#, 4 note C_, 5 dec_octave note A#, 3 - note __, 10 + rest 10 inc_octave note C_, 13 dec_octave note A#, 3 - note __, 10 + rest 10 note G_, 3 - note __, 10 + rest 10 inc_octave note E_, 3 note F_, 10 - note __, 13 + rest 13 note D#, 13 - note __, 13 + rest 13 note D_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note C_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note C#, 3 - note __, 10 + rest 10 note C#, 3 note D_, 10 dec_octave note A#, 3 - note __, 10 + rest 10 note G_, 3 - note __, 10 + rest 10 notetype0 13 note A#, 3 - note __, 4 + rest 4 notetype0 1 note B_, 3 inc_octave note C_, 16 - note __, 7 + rest 7 note E_, 3 note F_, 10 - note __, 6 + rest 6 note D_, 7 - note __, 13 + rest 13 note C_, 6 - note __, 7 + rest 7 note C#, 3 note D_, 10 + ;tie notetype0 13 note D_, 5 - note __, 1 + rest 1 dec_octave note D_, 8 - note __, 1 - dutycycle 0 - vibrato 12, $33 - loopchannel 0, .MainLoop + rest 1 + duty_cycle 0 + vibrato 12, 3, 3 + sound_loop 0, .MainLoop Branch_fa9aa: octave 4 - dutycycle 1 + duty_cycle 1 notetype1 10 - note __, 2 + rest 2 notetype0 1 note G#, 3 note A_, 3 - note __, 7 - note __, 13 + rest 7 + rest 13 note F_, 13 note D_, 3 - note __, 10 - note __, 13 + rest 10 + rest 13 note E_, 6 - note __, 7 + rest 7 notetype0 13 - note __, 1 + rest 1 note F_, 1 notetype0 1 note G_, 3 - note __, 10 + rest 10 note E_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note C_, 6 - note __, 7 - note __, 13 - endchannel + rest 7 + rest 13 + sound_ret Branch_fa9cb: octave 4 - dutycycle 1 + duty_cycle 1 notetype1 10 notetype0 1 note D#, 3 note E_, 10 note F_, 3 - note __, 10 + rest 10 note G_, 3 - note __, 10 + rest 10 note E_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note C_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note D_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note D#, 3 note E_, 10 note F_, 3 - note __, 10 + rest 10 note G_, 3 - note __, 10 + rest 10 note E_, 13 note C_, 6 - note __, 7 - note __, 13 - endchannel + rest 7 + rest 13 + sound_ret Branch_fa9ec: octave 3 - dutycycle 0 + duty_cycle 0 notetype1 9 notetype0 1 note F_, 6 - note __, 7 + rest 7 notetype0 13 - note __, 2 + rest 2 notetype0 1 note F_, 6 - note __, 7 + rest 7 notetype0 13 - note __, 3 + rest 3 notetype0 1 note F_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note A_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 notetype0 13 notetype1 9 note G_, 2 - note __, 1 - endchannel + rest 1 + sound_ret -Music_TCGRonald_Ch2: - vibrato 12, $33 +Music_Ronald_Ch2: ; faa0e (3e:6a0e) + ;stereo_panning 1, 1 + ;vibrato_type 8 + vibrato 12, 3, 3 notetype2 8 - dutycycle 0 + duty_cycle 0 .MainLoop octave 2 .Loop1 notetype0 1 notetype1 9 note G_, 3 - note __, 3 + rest 3 note G_, 3 - note __, 4 + rest 4 note A#, 3 - note __, 10 + rest 10 inc_octave note D_, 6 dec_octave note G_, 3 - note __, 4 + rest 4 note A#, 3 - note __, 3 - note __, 13 + rest 3 + rest 13 note G_, 3 note D_, 4 note A#, 6 - note __, 7 + rest 7 note D_, 3 - note __, 3 + rest 3 note G_, 3 - note __, 4 + rest 4 note G_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 note A#, 6 - note __, 13 + rest 13 note G_, 3 note A#, 4 inc_octave note D_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 notetype0 13 notetype1 9 note C_, 2 - note __, 1 + rest 1 dec_octave notetype0 1 notetype1 9 note D_, 3 - note __, 3 + rest 3 note G_, 3 - note __, 4 + rest 4 note A#, 3 - note __, 10 + rest 10 inc_octave note D_, 6 dec_octave note G_, 3 - note __, 4 + rest 4 note A#, 3 - note __, 3 - note __, 13 + rest 3 + rest 13 note G_, 3 note A#, 4 inc_octave note D_, 6 - note __, 7 + rest 7 dec_octave note D_, 3 - note __, 3 + rest 3 note G_, 3 - note __, 4 + rest 4 note G_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 inc_octave note D_, 6 - note __, 13 + rest 13 dec_octave note A#, 3 inc_octave note D_, 4 note F_, 6 - note __, 7 - note __, 13 + rest 7 + rest 13 notetype0 13 notetype1 9 note E_, 2 - note __, 1 + rest 1 dec_octave - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 .Loop2 - callchannel Branch_fab76 + sound_call Branch_fab76 notetype2 8 notetype1 8 note C_, 2 - note __, 1 - callchannel Branch_fab76 + rest 1 + sound_call Branch_fab76 notetype2 8 notetype1 8 note E_, 2 - note __, 1 - loopchannel 4, .Loop2 + rest 1 + sound_loop 4, .Loop2 .Loop3 - vibrato 20, $33 + vibrato 20, 3, 3 notetype1 8 notetype0 13 - dutycycle 1 + duty_cycle 1 octave 4 - note __, 2 + rest 2 notetype2 4 note F_, 1 - note __, 1 + rest 1 notetype2 8 note D_, 1 dec_octave dec_octave notetype2 4 - dutycycle 0 + duty_cycle 0 notetype1 9 note A#, 1 - note __, 1 + rest 1 inc_octave inc_octave - dutycycle 1 + duty_cycle 1 notetype1 8 note C_, 1 - note __, 1 + rest 1 notetype2 8 note D_, 1 notetype2 3 note E_, 1 notetype2 4 note C_, 1 - note __, 1 + rest 1 dec_octave note A_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 2 - vibrato 12, $33 - dutycycle 0 + rest 2 + vibrato 12, 3, 3 + duty_cycle 0 notetype1 9 note F_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 dec_octave note G_, 1 - note __, 1 + rest 1 inc_octave note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 notetype2 8 notetype1 9 note G_, 2 - note __, 1 - loopchannel 2, .Loop3 - vibrato 20, $33 - callchannel Branch_fab8a + rest 1 + sound_loop 2, .Loop3 + vibrato 20, 3, 3 + sound_call Branch_fab8a octave 3 - note __, 2 - vibrato 12, $33 - dutycycle 0 + rest 2 + vibrato 12, 3, 3 + duty_cycle 0 notetype1 9 notetype2 4 note F_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 dec_octave note G_, 1 - note __, 1 + rest 1 inc_octave note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 notetype2 8 notetype1 9 note G_, 2 - note __, 1 - vibrato 20, $33 - callchannel Branch_fab8a + rest 1 + vibrato 20, 3, 3 + sound_call Branch_fab8a octave 3 - note __, 1 + rest 1 notetype0 1 notetype2 8 note E_, 3 note F_, 10 note E_, 3 - note __, 10 + rest 10 notetype0 13 note D_, 4 dec_octave - vibrato 12, $33 - dutycycle 0 + vibrato 12, 3, 3 + duty_cycle 0 notetype1 9 notetype2 4 note G_, 1 - note __, 1 + rest 1 inc_octave note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 notetype2 8 notetype1 9 note E_, 2 - note __, 1 - callchannel Branch_fabb1 - note __, 1 + rest 1 + sound_call Branch_fabb1 + rest 1 notetype2 4 octave 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 inc_octave notetype2 8 notetype1 9 note C_, 2 - note __, 1 + rest 1 notetype1 9 - note __, 2 + rest 2 notetype2 4 note F_, 1 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 notetype2 8 notetype1 9 note F_, 2 - note __, 1 - callchannel Branch_fabb1 - note __, 1 + rest 1 + sound_call Branch_fabb1 + rest 1 octave 2 notetype2 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 inc_octave notetype2 8 notetype1 9 note C_, 2 - note __, 1 - note __, 2 + rest 1 + rest 2 dec_octave notetype1 9 notetype2 4 note G_, 1 - note __, 2 + rest 2 note G_, 1 - note __, 1 - vibrato 20, $33 + rest 1 + vibrato 20, 3, 3 notetype2 8 - dutycycle 1 + duty_cycle 1 notetype1 7 note F#, 8 - note __, 1 - dutycycle 0 - vibrato 12, $33 - loopchannel 0, .MainLoop + rest 1 + duty_cycle 0 + vibrato 12, 3, 3 + sound_loop 0, .MainLoop Branch_fab76: octave 2 notetype1 9 notetype0 13 - note __, 2 + rest 2 notetype2 4 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 inc_octave note D_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Branch_fab8a: octave 4 - dutycycle 1 + duty_cycle 1 notetype1 8 notetype0 13 note C_, 1 @@ -816,12 +820,12 @@ Branch_fab8a: note E_, 1 notetype2 4 note C_, 1 - note __, 1 + rest 1 dec_octave note A_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 inc_octave notetype2 8 note C_, 1 @@ -833,390 +837,396 @@ Branch_fab8a: dec_octave notetype2 4 note A_, 1 - note __, 1 + rest 1 note A#, 1 - endchannel + sound_ret Branch_fabb1: octave 2 notetype1 9 notetype0 13 - note __, 2 + rest 2 notetype2 4 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 inc_octave note C_, 1 - endchannel + sound_ret -Music_TCGRonald_Ch3: +Music_Ronald_Ch3: ; fabc0 (3e:6bc0) notetype0 1 + ;stereo_panning 1, 1 notetype1 1 notetype2 11 + ;echo 0 + ;cutoff 8 .MainLoop octave 2 .Loop1 note G_, 13 note G_, 2 - note __, 4 + rest 4 note G_, 5 - note __, 2 + rest 2 inc_octave note A#, 6 dec_octave note F_, 2 - note __, 5 + rest 5 note F_, 6 note F#, 3 - note __, 4 + rest 4 note G_, 2 - note __, 4 + rest 4 note G_, 3 - note __, 10 + rest 10 note F_, 7 note G_, 6 - note __, 7 + rest 7 inc_octave note C_, 13 - note __, 6 + rest 6 inc_octave note C_, 2 - note __, 11 + rest 11 dec_octave note C_, 2 - note __, 5 + rest 5 dec_octave note E_, 13 - note __, 6 + rest 6 note F_, 7 - note __, 6 + rest 6 note F_, 7 note F#, 13 note G_, 13 inc_octave note C_, 6 - note __, 7 + rest 7 dec_octave - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 .Loop2 - callchannel Branch_fac94 + sound_call Branch_fac94 octave 3 note A#, 6 - callchannel Branch_facbb - callchannel Branch_fac94 + sound_call Branch_facbb + sound_call Branch_fac94 octave 4 note F_, 6 - callchannel Branch_facbb - loopchannel 8, .Loop2 - callchannel Branch_facc5 + sound_call Branch_facbb + sound_loop 8, .Loop2 + sound_call Branch_facc5 octave 2 note D_, 13 - note __, 6 + rest 6 inc_octave note D_, 2 - note __, 5 + rest 5 inc_octave note D_, 6 octave 2 note D_, 2 - note __, 5 + rest 5 note D_, 13 octave 4 note D_, 6 octave 2 note A_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 note C_, 13 note C#, 13 note D_, 6 - note __, 7 + rest 7 dec_octave note C_, 13 note C_, 2 - note __, 4 + rest 4 note C_, 5 - note __, 2 + rest 2 octave 4 note D_, 6 octave 2 note G_, 2 - note __, 5 + rest 5 note G_, 6 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note C_, 2 - note __, 4 + rest 4 note C_, 3 - note __, 4 + rest 4 octave 4 note D_, 6 octave 2 note G_, 7 note C_, 6 - note __, 7 + rest 7 note D_, 13 - note __, 6 + rest 6 inc_octave note D_, 2 - note __, 5 + rest 5 inc_octave note D_, 6 octave 2 note D_, 2 - note __, 5 + rest 5 note D_, 13 octave 4 note F_, 6 octave 2 note A_, 7 - note __, 6 + rest 6 inc_octave note D_, 7 note D_, 13 dec_octave note A_, 13 note D_, 6 - note __, 7 - callchannel Branch_facc5 + rest 7 + sound_call Branch_facc5 octave 2 note G#, 13 - note __, 6 + rest 6 inc_octave note G#, 2 - note __, 5 + rest 5 inc_octave note D_, 6 octave 2 note G#, 2 - note __, 5 + rest 5 note G#, 13 octave 4 note D_, 6 dec_octave note D#, 7 - note __, 6 + rest 6 note G#, 7 note G#, 13 dec_octave note G#, 13 inc_octave note D#, 6 - note __, 7 + rest 7 dec_octave note A_, 13 note A_, 2 - note __, 4 + rest 4 note A_, 5 - note __, 2 + rest 2 octave 4 note D_, 6 dec_octave note E_, 2 - note __, 5 + rest 5 note E_, 6 note E_, 3 - note __, 4 + rest 4 dec_octave note A_, 2 - note __, 4 + rest 4 note A_, 3 - note __, 4 + rest 4 octave 4 note D_, 6 dec_octave note E_, 7 dec_octave note A_, 6 - note __, 7 + rest 7 notetype0 13 note G#, 8 - note __, 1 + rest 1 notetype0 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_fac94: octave 2 note G_, 13 note G_, 2 - note __, 4 + rest 4 note G_, 5 - note __, 2 + rest 2 octave 4 note D_, 6 dec_octave note D_, 2 - note __, 5 + rest 5 note D_, 6 note G_, 3 - note __, 4 + rest 4 dec_octave note G_, 2 - note __, 4 + rest 4 note G_, 3 - note __, 4 + rest 4 octave 4 note D_, 6 octave 2 note F_, 7 note G_, 6 - note __, 7 + rest 7 inc_octave note C_, 13 - note __, 6 + rest 6 inc_octave note C_, 2 - note __, 5 + rest 5 note D_, 6 dec_octave note C_, 2 - note __, 5 + rest 5 dec_octave note E_, 13 inc_octave - endchannel + sound_ret Branch_facbb: octave 2 note F_, 7 - note __, 6 + rest 6 note F_, 7 note F#, 13 note G_, 13 inc_octave note C_, 6 - note __, 7 - endchannel + rest 7 + sound_ret Branch_facc5: octave 2 note D#, 13 note D#, 2 - note __, 4 + rest 4 note D#, 5 - note __, 2 + rest 2 octave 4 note D_, 6 octave 2 note A#, 2 - note __, 5 + rest 5 note A#, 6 inc_octave note D#, 3 - note __, 4 + rest 4 dec_octave note D#, 2 - note __, 4 + rest 4 note D#, 3 - note __, 4 + rest 4 octave 4 note D_, 6 octave 2 note A#, 7 note D#, 6 - note __, 7 - endchannel + rest 7 + sound_ret -Music_TCGRonald_Ch4: - togglenoise $06 - notetype 1 +Music_Ronald_Ch4: ; face0 (3e:6ce0) + toggle_noise 6 + drum_speed 1 octave 1 .MainLoop .Loop1 - callchannel Branch_fad46 - note D#, 13 - callchannel Branch_fad4f - note D_, 7 - note C_, 6 - note D_, 7 - note E_, 6 - note C_, 7 - note C#, 13 - note D#, 6 - note D_, 7 - loopchannel 3, .Loop1 - callchannel Branch_fad46 - note D#, 13 - callchannel Branch_fad4f - note D_, 7 - note C_, 13 - note E_, 6 - note D_, 3 - note D_, 4 + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + sound_loop 3, .Loop1 + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 13 + drum_note 5, 6 + drum_note 3, 3 + drum_note 3, 4 .Loop2 - note C#, 6 - note C#, 7 - loopchannel 2, .Loop2 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 2, .Loop2 .Loop3 rept 7 - callchannel Branch_fad46 - note D#, 13 - callchannel Branch_fad4f - note D_, 7 - note C_, 6 - note D_, 7 - note E_, 6 - note C_, 7 - note C#, 13 - note D#, 6 - note D_, 7 + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 endr - callchannel Branch_fad46 - note D#, 13 - callchannel Branch_fad4f - note D_, 3 - note D_, 4 + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 3 + drum_note 3, 4 rept 4 - note C#, 6 - note C#, 7 + drum_note 2, 6 + drum_note 2, 7 endr - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 .Loop4 - callchannel Branch_fad46 - note D#, 13 - loopchannel 6, .Loop4 - callchannel Branch_fad46 - notetype 13 - note F_, 4 - notetype 1 - note __, 6 - note D_, 3 - note D_, 4 - note C#, 6 - note C#, 7 + sound_call Branch_fad46 + drum_note 4, 13 + sound_loop 6, .Loop4 + sound_call Branch_fad46 + drum_speed 13 + drum_note 6, 4 + drum_speed 1 + rest 6 + drum_note 3, 3 + drum_note 3, 4 + drum_note 2, 6 + drum_note 2, 7 .Loop5 - note D_, 6 - note C#, 7 - loopchannel 2, .Loop5 - note C#, 6 - note D_, 7 - loopchannel 0, .MainLoop + drum_note 3, 6 + drum_note 2, 7 + sound_loop 2, .Loop5 + drum_note 2, 6 + drum_note 3, 7 + sound_loop 0, .MainLoop Branch_fad46: - note C_, 13 - note E_, 6 - note C_, 7 - note C#, 13 - note C_, 6 - note D_, 7 - note C_, 13 - note E_, 6 - note C_, 7 - note C#, 13 - endchannel + ; + ;sound_call Branch_fad4f + drum_note 1, 13 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 1, 6 + ; + drum_note 3, 7 + drum_note 1, 13 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + sound_ret Branch_fad4f: - note C_, 13 - note E_, 6 - note C_, 7 - note C#, 13 - note C_, 6 - endchannel - + drum_note 1, 13 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 1, 6 + sound_ret +; 0xfad55 diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm index be992edc..58e89095 100644 --- a/crysaudio/music/TCG/titlescreen.asm +++ b/crysaudio/music/TCG/titlescreen.asm @@ -1,24 +1,23 @@ Music_TCGTitleScreen: - db $C0 - dw Music_TCGTitleScreen_Ch1 - db $01 - dw Music_TCGTitleScreen_Ch2 - db $02 - dw Music_TCGTitleScreen_Ch3 - db $03 - dw Music_TCGTitleScreen_Ch4 + channel_count 4 + channel 1, Music_TCGTitleScreen_Ch1 + channel 2, Music_TCGTitleScreen_Ch2 + channel 3, Music_TCGTitleScreen_Ch3 + channel 4, Music_TCGTitleScreen_Ch4 -Music_TCGTitleScreen_Ch1: +Music_TCGTitleScreen_Ch1: ; f5052 (3d:5052) notetype0 7 - dutycycle 0 - vibrato 20, $33 + duty_cycle 0 + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype1 10 notetype2 8 octave 3 note G_, 1 notetype1 3 note G_, 1 - note __, 1 + rest 1 notetype1 10 notetype2 6 note F_, 1 @@ -47,7 +46,7 @@ Music_TCGTitleScreen_Ch1: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 notetype1 10 notetype2 6 note G_, 1 @@ -62,7 +61,9 @@ Music_TCGTitleScreen_Ch1: note F_, 2 notetype0 1 note E_, 5 + ;tie note F_, 4 + ;tie note E_, 5 notetype0 7 note D_, 1 @@ -81,7 +82,7 @@ Music_TCGTitleScreen_Ch1: note G_, 1 notetype1 3 note G_, 1 - note __, 1 + rest 1 notetype1 10 notetype2 6 note F_, 1 @@ -141,12 +142,12 @@ Music_TCGTitleScreen_Ch1: note E_, 1 notetype1 3 note E_, 1 - note __, 1 + rest 1 notetype1 10 notetype2 6 note E_, 1 notetype2 8 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 note E_, 12 notetype1 3 note E_, 2 @@ -156,7 +157,7 @@ Music_TCGTitleScreen_Ch1: note D_, 1 notetype1 3 note D_, 1 - note __, 1 + rest 1 notetype1 10 notetype2 6 note G_, 1 @@ -186,7 +187,7 @@ Music_TCGTitleScreen_Ch1: note C_, 1 notetype1 3 note C_, 1 - note __, 1 + rest 1 notetype2 6 notetype1 10 note E_, 1 @@ -217,24 +218,28 @@ Music_TCGTitleScreen_Ch1: note C_, 1 notetype2 8 note C_, 8 + ;tie note C_, 8 + ;tie note C_, 8 notetype1 3 note C_, 8 - endchannel + sound_ret -Music_TCGTitleScreen_Ch2: +Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) notetype0 7 - dutycycle 0 - vibrato 20, $33 + duty_cycle 0 + ;stereo_panning 1, 1 + ;vibrato_type 1 + vibrato 20, 3, 3 notetype1 8 notetype2 8 octave 2 note B_, 1 notetype1 2 note B_, 1 - note __, 1 + rest 1 inc_octave notetype1 8 notetype2 6 @@ -245,21 +250,21 @@ Music_TCGTitleScreen_Ch2: note C_, 1 notetype1 8 note E_, 3 - note __, 1 + rest 1 note G_, 5 - note __, 1 + rest 1 notetype2 6 note G_, 2 notetype2 8 note E_, 10 - note __, 2 + rest 2 note C_, 1 - note __, 2 + rest 2 notetype2 6 note E_, 1 notetype2 8 note F_, 5 - note __, 1 + rest 1 notetype2 6 note C_, 2 notetype2 7 @@ -268,21 +273,21 @@ Music_TCGTitleScreen_Ch2: note C_, 2 dec_octave note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 4 note A_, 1 - note __, 2 + rest 2 inc_octave notetype2 6 note C_, 1 dec_octave notetype2 8 note B_, 3 - note __, 1 + rest 1 note B_, 1 - note __, 2 + rest 2 inc_octave notetype2 6 note D_, 1 @@ -292,39 +297,39 @@ Music_TCGTitleScreen_Ch2: note C_, 1 notetype1 8 note E_, 3 - note __, 1 + rest 1 note G_, 5 - note __, 1 + rest 1 notetype2 6 note G_, 2 notetype2 8 note E_, 8 - note __, 2 + rest 2 note C_, 2 note D_, 2 note E_, 2 note F_, 3 - note __, 1 + rest 1 note G#, 3 - note __, 1 + rest 1 note G#, 5 - note __, 1 + rest 1 notetype2 6 note F_, 2 notetype2 8 note G#, 9 - note __, 1 + rest 1 note G#, 2 note F_, 2 note G#, 2 inc_octave note C_, 10 - note __, 2 + rest 2 dec_octave note A_, 1 notetype1 2 note A_, 1 - note __, 1 + rest 1 notetype1 8 inc_octave notetype2 6 @@ -332,11 +337,11 @@ Music_TCGTitleScreen_Ch2: notetype2 8 dec_octave note B_, 10 - note __, 2 + rest 2 note G_, 1 notetype1 2 note G_, 1 - note __, 1 + rest 1 notetype1 8 notetype2 6 note B_, 1 @@ -350,14 +355,14 @@ Music_TCGTitleScreen_Ch2: note B_, 1 notetype1 2 note B_, 1 - note __, 1 + rest 1 notetype1 8 inc_octave notetype2 6 note D_, 1 notetype2 8 note D_, 8 - note __, 2 + rest 2 notetype0 1 notetype2 7 note D_, 5 @@ -366,7 +371,7 @@ Music_TCGTitleScreen_Ch2: notetype0 7 notetype2 8 note C_, 9 - note __, 1 + rest 1 note C_, 2 dec_octave notetype2 7 @@ -374,49 +379,52 @@ Music_TCGTitleScreen_Ch2: notetype2 8 note G#, 2 note G_, 10 - note __, 2 + rest 2 note G_, 1 - note __, 2 + rest 2 notetype2 6 note G_, 1 notetype2 8 note A_, 6 - note __, 2 + rest 2 note F#, 3 - note __, 1 + rest 1 note A_, 3 - note __, 1 + rest 1 note F_, 6 - note __, 2 + rest 2 note F_, 5 - note __, 2 + rest 2 notetype2 6 note F_, 1 notetype2 8 note F_, 7 - note __, 1 + rest 1 notetype0 1 notetype2 8 note F_, 14 - note __, 5 + rest 5 note D_, 13 - note __, 5 + rest 5 note F_, 14 - note __, 5 + rest 5 notetype0 7 note E_, 8 notetype1 2 note E_, 8 - endchannel + sound_ret -Music_TCGTitleScreen_Ch3: +Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) notetype0 7 notetype2 14 notetype1 1 + ;echo 0 + ;stereo_panning 1, 1 + ;cutoff 6 octave 3 - note __, 4 - callchannel Branch_f52f0 + rest 4 + sound_call Branch_f52f0 note F_, 4 note F_, 4 note E_, 4 @@ -426,67 +434,71 @@ Music_TCGTitleScreen_Ch3: note G_, 4 note G_, 4 inc_octave - callchannel Branch_f52f0 + sound_call Branch_f52f0 .Loop1 note F_, 4 - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 .Loop2 note A#, 4 - loopchannel 4, .Loop2 + sound_loop 4, .Loop2 .Loop3 note A_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 .Loop4 note G_, 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 - loopchannel 2, .Loop4 + sound_loop 2, .Loop4 .Loop5 note F_, 2 note F_, 2 - note __, 2 + rest 2 note F_, 1 note F_, 1 - loopchannel 2, .Loop5 + sound_loop 2, .Loop5 .Loop6 note E_, 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 note E_, 1 - loopchannel 2, .Loop6 + sound_loop 2, .Loop6 .Loop7 note G#, 4 - loopchannel 4, .Loop7 + sound_loop 4, .Loop7 .Loop8 note G_, 4 - loopchannel 4, .Loop8 + sound_loop 4, .Loop8 .Loop9 note F#, 4 - loopchannel 4, .Loop9 + sound_loop 4, .Loop9 .Loop10 note G_, 4 - loopchannel 4, .Loop10 + sound_loop 4, .Loop10 inc_octave note C_, 4 note C_, 4 notetype0 1 note C_, 9 + ;tie note C_, 10 dec_octave note G_, 9 + ;tie note G_, 9 note G_, 9 + ;tie note G_, 10 notetype0 7 + ;cutoff 8 note C_, 8 - endchannel + sound_ret Branch_f52f0: note C_, 4 @@ -498,47 +510,47 @@ Branch_f52f0: note A_, 4 note G_, 4 note G_, 4 - endchannel + sound_ret -Music_TCGTitleScreen_Ch4: - togglenoise $06 - notetype 7 +Music_TCGTitleScreen_Ch4: ; f52fa (3d:52fa) + toggle_noise 6 + drum_speed 7 octave 1 - note __, 4 + rest 4 .Loop1 - callchannel Branch_f5312 - loopchannel 16, .Loop1 + sound_call Branch_f5312 + sound_loop 16, .Loop1 .Loop2 - callchannel Branch_f531e - loopchannel 8, .Loop2 + sound_call Branch_f531e + sound_loop 8, .Loop2 .Loop3 - callchannel Branch_f5312 - loopchannel 10, .Loop3 - note C#, 8 - endchannel + sound_call Branch_f5312 + sound_loop 10, .Loop3 + drum_note 2, 8 + sound_ret Branch_f5312: - notetype 7 - note C#, 2 - note D_, 2 - note C#, 2 - notetype 1 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 3 - endchannel + drum_speed 7 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_speed 1 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 3 + sound_ret Branch_f531e: - notetype 7 - note C#, 2 - note C#, 2 - note __, 2 - notetype 1 - note C#, 4 - note D_, 3 - note D_, 4 - note D_, 3 - endchannel - + drum_speed 7 + drum_note 2, 2 + drum_note 2, 2 + rest 2 + drum_speed 1 + drum_note 2, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 3 + sound_ret +; 0xf532a diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index 931b92a4..fb710bae 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -1,562 +1,962 @@ Music_TCG2Credits: - db $C0 - dw Music_TCG2Credits_Ch1 - db $01 - dw Music_TCG2Credits_Ch2 - db $02 - dw Music_TCG2Credits_Ch3 - db $03 - dw Music_TCG2Credits_Ch4 + channel_count 4 + channel 1, Music_TCG2Credits_Ch1 + channel 2, Music_TCG2Credits_Ch2 + channel 3, Music_TCG2Credits_Ch3 + channel 4, Music_TCG2Credits_Ch4 -Music_TCG2Credits_Ch2: +Music_TCG2Credits_Ch2: ; 1de32a (77:632a) notetype1 10 - dutycycle 2 + duty_cycle 2 notetype1 15 notetype0 1 + ;musicdc 255 octave 1 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie + note G_, 4 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie note G_, 4 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie + note G_, 4 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie note G_, 4 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie + note G_, 4 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie note G_, 4 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 4 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 - note G_, 4 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 4 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 4 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 - note G_, 16 + ;tie note G_, 4 notetype1 13 - note __, 15 + rest 15 inc_octave note D_, 14 + ;tie note D_, 15 note D_, 14 + ;tie note D_, 15 inc_octave + ;musicef 252 note A_, 14 + ;tie note A_, 15 inc_octave note D_, 14 + ;tie note D_, 15 + ;musicef 4 dec_octave dec_octave dec_octave note A_, 14 + ;tie note A_, 15 inc_octave note E_, 14 + ;tie note E_, 15 + ;musicef 252 note B_, 14 + ;tie note B_, 15 inc_octave note G_, 14 + ;tie note G_, 15 + ;musicef 4 dec_octave note D_, 14 + ;tie note D_, 15 note A_, 14 + ;tie note A_, 15 inc_octave + ;musicef 252 note A_, 14 + ;tie note A_, 15 inc_octave note D_, 14 + ;tie note D_, 15 + ;musicef 4 dec_octave dec_octave dec_octave note A_, 14 + ;tie note A_, 15 inc_octave note E_, 14 + ;tie note E_, 15 + ;musicef 252 note B_, 14 + ;tie note B_, 15 inc_octave note G_, 14 + ;tie note G_, 15 + ;musicef 4 dec_octave note D_, 14 + ;tie note D_, 15 note D_, 14 + ;tie note D_, 15 inc_octave + ;musicef 252 note A_, 14 + ;tie note A_, 15 inc_octave note D_, 14 + ;tie note D_, 15 + ;musicef 4 dec_octave dec_octave dec_octave note A_, 14 + ;tie note A_, 15 inc_octave note E_, 14 + ;tie note E_, 15 + ;musicef 252 note B_, 14 + ;tie note B_, 15 inc_octave note G_, 14 + ;tie note G_, 15 + ;musicef 4 dec_octave note D_, 14 + ;tie note D_, 15 note A_, 14 + ;tie note A_, 15 inc_octave + ;musicef 252 note A_, 14 + ;tie note A_, 15 inc_octave note D_, 14 + ;tie note D_, 15 + ;musicef 4 dec_octave dec_octave note D_, 14 + ;tie note D_, 15 note A_, 14 + ;tie note A_, 15 inc_octave + ;musicef 252 note F_, 14 + ;tie note F_, 15 note D#, 14 + ;tie note D#, 15 + ;musicef 4 dec_octave note G_, 14 + ;tie note G_, 15 inc_octave note E_, 14 + ;tie note E_, 15 inc_octave + ;musicef 252 note D_, 14 + ;tie note D_, 15 dec_octave note G_, 14 + ;tie note G_, 15 + ;musicef 4 dec_octave dec_octave note G_, 14 + ;tie note G_, 15 inc_octave note D#, 14 + ;tie note D#, 15 inc_octave + ;musicef 252 note D_, 14 + ;tie note D_, 15 dec_octave note C_, 14 - note __, 15 + rest 15 + ;musicef 4 note F#, 14 + ;tie note F#, 15 inc_octave note C#, 14 + ;tie note C#, 15 + ;musicef 252 note A_, 14 + ;tie note A_, 15 inc_octave note F#, 14 + ;tie note F#, 15 + ;musicef 4 dec_octave dec_octave dec_octave note B_, 14 + ;tie note B_, 15 inc_octave note G_, 14 + ;tie note G_, 15 + ;musicef 252 note B_, 14 + ;tie note B_, 15 inc_octave note G_, 14 + ;tie note G_, 15 dec_octave + ;musicef 4 note E_, 14 + ;tie note E_, 15 inc_octave note C_, 14 + ;tie note C_, 15 + ;musicef 252 note E_, 14 + ;tie note E_, 15 note C_, 14 + ;tie note C_, 15 dec_octave + ;musicef 4 note E_, 14 + ;tie note E_, 15 inc_octave note C_, 14 + ;tie note C_, 15 + ;musicef 252 note E_, 14 + ;tie note E_, 15 note C_, 14 + ;tie note C_, 15 dec_octave + ;musicef 4 note G_, 14 + ;tie note G_, 15 inc_octave note G_, 14 + ;tie note G_, 15 inc_octave + ;musicef 252 note C_, 14 + ;tie note C_, 15 dec_octave note D#, 14 + ;tie note D#, 15 + ;musicef 4 dec_octave note A_, 14 + ;tie note A_, 15 inc_octave note G_, 14 - dutycycle 1 + duty_cycle 1 octave 2 notetype1 10 + ;musice4 203 note D_, 4 + ;tie + ;musice4 214 note D_, 4 + ;tie + ;musice4 229 note D_, 4 + ;tie + ;musice4 242 note D_, 3 + ;musice4 0 notetype1 14 note D_, 4 + ;tie note D_, 3 + ;tie note D_, 4 + ;tie note D_, 3 + ;tie note D_, 4 + ;tie note D_, 4 + ;tie note D_, 4 + ;tie note D_, 3 + ;tie note D_, 4 + ;tie + ;musice4 227 note D_, 3 + ;tie + ;musice4 203 note D_, 4 + ;tie + ;musice4 180 note D_, 2 + ;tie + ;musice4 147 note D_, 1 + ;musice4 0 octave 1 - vibrato 29, $33 + ;vibrato_type 5 + vibrato 29, 3, 3 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 4 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 4 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;musicf0 26 octave 3 + ;musicf1 87 + ;musicf3 note B_, 3 inc_octave note C_, 11 + ;tie note C_, 15 + ;tie note C_, 14 dec_octave note A_, 15 + ;musicf2 note F_, 14 note F_, 15 inc_octave note C_, 14 note C_, 15 dec_octave + ;musicf3 note B_, 14 - dutycycle 1 - vibrato 29, $33 + duty_cycle 1 + ;vibrato_type 5 + vibrato 29, 3, 3 octave 1 notetype1 10 note G_, 15 notetype1 14 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 4 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 inc_octave + ;musice4 204 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 7 notetype1 10 note G_, 15 notetype1 14 note G_, 14 + ;tie note G_, 15 + ;musice4 215 note G_, 4 + ;tie + ;musice4 236 note G_, 3 + ;tie + ;musice4 0 note G_, 7 + ;tie note G_, 15 note D_, 14 dec_octave note G_, 15 + ;tie + ;musice4 217 note G_, 4 + ;tie + ;musice4 0 note F#, 3 + ;tie + ;musice4 213 note F#, 4 + ;tie + ;musice4 0 note F_, 3 note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 note G_, 14 notetype1 10 inc_octave + ;musice4 196 note C_, 4 + ;tie + ;musice4 211 note C_, 4 + ;tie + ;musice4 226 note C_, 4 + ;tie + ;musice4 241 note C_, 3 + ;musice4 0 notetype1 14 note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 dec_octave note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie + ;musice4 224 note B_, 4 + ;tie + ;musice4 192 note B_, 3 + ;tie + ;musice4 222 note A#, 4 + ;tie + ;musice4 0 note A_, 3 notetype0 4 note E_, 15 + ;tie note E_, 14 note A_, 15 + ;tie note A_, 14 notetype0 1 inc_octave + ;musice4 203 note D_, 4 + ;tie + ;musice4 214 note D_, 4 + ;tie + ;musice4 229 note D_, 4 + ;tie + ;musice4 242 note D_, 3 + ;tie + ;musice4 0 note D_, 14 + ;tie note D_, 15 + ;tie + ;musice4 242 note D_, 4 + ;tie + ;musice4 229 note D_, 4 + ;tie + ;musice4 214 note D_, 4 + ;tie + ;musice4 203 note D_, 3 + ;musice4 0 dec_octave note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 note G_, 15 inc_octave note D_, 14 note G_, 15 note A_, 4 - dutycycle 2 + duty_cycle 2 notetype1 13 notetype0 1 - vibrato 0, $33 + ;musicdc 255 + vibrato 0, 3, 3 octave 2 note B_, 10 inc_octave notetype0 4 note G_, 15 + ;tie note G_, 14 notetype0 1 - dutycycle 1 - vibrato 29, $33 + duty_cycle 1 + ;vibrato_type 5 + vibrato 29, 3, 3 notetype1 14 octave 1 note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;musice4 178 note G_, 4 + ;tie + ;musice4 217 note G_, 3 + ;tie + ;musice4 0 note G_, 7 inc_octave notetype0 4 note C_, 15 + ;tie note C_, 14 notetype0 1 dec_octave note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie + ;musice4 224 note B_, 4 + ;tie + ;musice4 192 note B_, 3 + ;tie + ;musice4 222 note A#, 4 + ;tie + ;musice4 0 note A_, 3 notetype0 4 note E_, 15 + ;tie note E_, 14 notetype0 1 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 note B_, 14 inc_octave note C_, 15 note C#, 14 + ;musice4 203 note D_, 4 + ;tie + ;musice4 214 note D_, 4 + ;tie + ;musice4 229 note D_, 4 + ;tie + ;musice4 242 note D_, 3 + ;tie + ;musice4 0 note D_, 14 + ;tie note D_, 15 + ;tie + ;musice4 242 note D_, 4 + ;tie + ;musice4 229 note D_, 4 + ;tie + ;musice4 214 note D_, 4 + ;tie + ;musice4 203 note D_, 3 + ;musice4 0 dec_octave note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 note G_, 15 + ;tie note G_, 14 + ;tie + ;musice4 217 note G_, 4 + ;tie + ;musice4 0 note F#, 4 + ;tie + ;musice4 213 note F#, 4 + ;tie + ;musice4 0 note F_, 3 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note A_, 14 - note __, 15 + rest 15 note B_, 14 + ;tie note B_, 15 note G_, 14 inc_octave note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 dec_octave note F#, 4 + ;tie + ;musice4 217 note G_, 3 + ;tie + ;musice4 0 note G_, 7 notetype0 4 note C_, 15 + ;tie note C_, 14 note B_, 15 + ;tie note B_, 14 note A#, 15 + ;tie note A#, 14 notetype0 1 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 inc_octave note D#, 4 + ;tie + ;musice4 232 note E_, 3 + ;tie + ;musice4 0 note E_, 7 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 note E_, 14 + ;tie note E_, 15 dec_octave note A_, 14 @@ -564,201 +964,311 @@ Music_TCG2Credits_Ch2: note E_, 15 note D#, 14 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 dec_octave note A_, 14 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 note E_, 14 + ;tie note E_, 15 + ;tie note E_, 14 note F#, 15 + ;tie note F#, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 inc_octave + ;musice4 204 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 7 notetype1 10 note G_, 15 notetype1 14 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie + ;musice4 236 note G_, 4 + ;tie + ;musice4 215 note G_, 3 + ;tie + ;musice4 194 note G_, 4 + ;tie + ;musice4 174 note G_, 3 + ;musice4 0 dec_octave notetype0 4 note G_, 15 + ;tie note G_, 14 + ;tie notetype0 1 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 note A_, 15 note B_, 14 inc_octave notetype0 4 note C_, 15 + ;tie note C_, 14 dec_octave note B_, 15 + ;tie note B_, 14 notetype0 1 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 inc_octave note C_, 14 note C#, 15 + ;musice4 204 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 7 + ;tie note D_, 14 dec_octave note A_, 14 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 note E_, 15 note F#, 14 notetype0 4 note G_, 15 + ;tie note G_, 14 note F#, 15 + ;tie note F#, 14 note F_, 15 + ;tie note F_, 14 note E_, 15 + ;tie note E_, 14 notetype0 1 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 note B_, 14 inc_octave note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie + ;musice4 226 note C_, 4 + ;tie + ;musice4 196 note C_, 3 + ;tie + ;musice4 163 note C_, 4 + ;tie + ;musice4 133 note C_, 3 + ;musice4 0 dec_octave note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 notetype1 10 note D_, 15 notetype1 14 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 note A_, 14 inc_octave note D_, 15 note B_, 7 - note __, 7 + rest 7 note A_, 8 - note __, 7 + rest 7 note G_, 7 - note __, 7 + rest 7 note F#, 8 - note __, 7 + rest 7 note E_, 7 - note __, 7 + rest 7 note D_, 8 - note __, 7 + rest 7 note C_, 7 - note __, 7 - dutycycle 1 - vibrato 29, $33 + rest 7 + duty_cycle 1 + ;vibrato_type 5 + vibrato 29, 3, 3 notetype1 14 octave 1 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 - note __, 15 - dutycycle 2 + rest 15 + duty_cycle 2 notetype1 13 notetype0 1 - vibrato 0, $33 + vibrato 0, 3, 3 octave 3 - note __, 4 + rest 4 note C_, 3 + ;tie note C_, 7 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 - note __, 15 - dutycycle 1 - vibrato 29, $33 + rest 15 + duty_cycle 1 + ;vibrato_type 5 + vibrato 29, 3, 3 notetype1 14 octave 1 note D_, 14 octave 1 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 - note __, 15 - dutycycle 2 + rest 15 + duty_cycle 2 notetype1 13 notetype0 1 - vibrato 0, $33 + vibrato 0, 3, 3 octave 3 - note __, 4 + rest 4 note C_, 3 + ;tie note C_, 7 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 - dutycycle 1 - vibrato 29, $33 + duty_cycle 1 + ;vibrato_type 5 + vibrato 29, 3, 3 notetype1 14 octave 1 note A#, 4 + ;tie + ;musice4 224 note B_, 3 + ;tie + ;musice4 0 note B_, 7 + ;tie note B_, 15 inc_octave note C_, 14 @@ -766,82 +1276,119 @@ Music_TCG2Credits_Ch2: note D_, 14 octave 1 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 - note __, 15 - dutycycle 2 + rest 15 + duty_cycle 2 notetype1 13 notetype0 1 - vibrato 0, $33 + vibrato 0, 3, 3 octave 3 - note __, 4 + rest 4 note C_, 3 + ;tie note C_, 7 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 - note __, 15 - dutycycle 1 - vibrato 29, $33 + rest 15 + duty_cycle 1 + ;vibrato_type 5 + vibrato 29, 3, 3 notetype1 14 octave 1 note D_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 - note __, 15 + rest 15 note F_, 14 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 note A#, 4 + ;tie + ;musice4 193 note B_, 3 + ;tie + ;musice4 224 note B_, 4 + ;tie + ;musice4 240 note B_, 3 + ;tie + ;musice4 0 note B_, 15 inc_octave note C_, 7 - note __, 7 + rest 7 note C#, 15 note D_, 11 - note __, 3 + rest 3 dec_octave note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 - note __, 15 + rest 15 note C_, 14 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 inc_octave + ;musice4 147 note D_, 4 + ;tie + ;musice4 181 note D_, 3 + ;tie + ;musice4 203 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 15 dec_octave note A_, 14 note D_, 15 note A_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 inc_octave note G_, 14 - note __, 15 + rest 15 note D_, 14 dec_octave note G_, 15 @@ -850,47 +1397,72 @@ Music_TCG2Credits_Ch2: note A_, 14 inc_octave note C_, 15 + ;musice4 147 note D_, 4 + ;tie + ;musice4 181 note D_, 3 + ;tie + ;musice4 203 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 15 dec_octave note A_, 14 note D_, 15 note A_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 - note __, 15 + rest 15 note C_, 14 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 inc_octave + ;musice4 147 note D_, 4 + ;tie + ;musice4 181 note D_, 3 + ;tie + ;musice4 203 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 15 dec_octave note A_, 14 note D_, 15 note A_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 inc_octave note G_, 14 - note __, 15 + rest 15 note D_, 14 dec_octave note G_, 15 note D_, 14 note G_, 15 + ;tie note G_, 14 inc_octave inc_octave @@ -905,24 +1477,38 @@ Music_TCG2Credits_Ch2: inc_octave notetype1 7 note C_, 15 + ;tie note C_, 14 notetype1 14 note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 dec_octave note G_, 14 + ;tie note G_, 15 inc_octave + ;musice4 147 note D_, 4 + ;tie + ;musice4 180 note D_, 3 + ;tie + ;musice4 203 note D_, 4 + ;tie + ;musice4 229 note D_, 3 + ;tie + ;musice4 0 note D_, 15 note C_, 14 dec_octave note G_, 15 note C_, 14 + ;tie note C_, 15 inc_octave note C_, 14 @@ -930,13 +1516,23 @@ Music_TCG2Credits_Ch2: note A_, 15 note A#, 14 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 8 - note __, 7 + rest 7 note A#, 4 + ;tie + ;musice4 222 note A#, 3 + ;tie + ;musice4 0 note A#, 4 + ;tie + ;musice4 224 note B_, 3 + ;tie + ;musice4 0 note B_, 15 note F#, 14 note F_, 15 @@ -946,13 +1542,17 @@ Music_TCG2Credits_Ch2: inc_octave note D_, 15 note E_, 14 + ;tie note E_, 15 dec_octave note B_, 14 note E_, 15 + ;tie note E_, 14 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 note E_, 14 note A_, 15 @@ -964,414 +1564,564 @@ Music_TCG2Credits_Ch2: inc_octave note C_, 15 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 dec_octave note D_, 15 + ;tie note D_, 14 .Loop1 note G#, 11 - note __, 4 + rest 4 note G#, 11 - note __, 3 - loopchannel 8, .Loop1 + rest 3 + sound_loop 8, .Loop1 .Loop2 note C#, 11 - note __, 4 + rest 4 note C#, 11 - note __, 3 - loopchannel 8, .Loop2 + rest 3 + sound_loop 8, .Loop2 .Loop3 note G_, 11 - note __, 4 + rest 4 note G_, 11 - note __, 3 - loopchannel 8, .Loop3 + rest 3 + sound_loop 8, .Loop3 .Loop4 note C#, 11 - note __, 4 + rest 4 note C#, 11 - note __, 3 - loopchannel 4, .Loop4 + rest 3 + sound_loop 4, .Loop4 .Loop5 note C_, 11 - note __, 4 + rest 4 note C_, 11 - note __, 3 - loopchannel 4, .Loop5 + rest 3 + sound_loop 4, .Loop5 note B_, 8 inc_octave note B_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 note F#, 8 note D_, 4 - note __, 3 + rest 3 dec_octave note A_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 4 + rest 4 note F#, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 dec_octave note E_, 8 inc_octave note E_, 4 - note __, 3 + rest 3 note D_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 8 note G_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 inc_octave note E_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 inc_octave note E_, 4 - note __, 3 + rest 3 dec_octave dec_octave note A_, 11 - note __, 4 + rest 4 note A_, 11 - note __, 3 + rest 3 note A_, 11 - note __, 4 + rest 4 note A_, 11 - note __, 3 + rest 3 note A_, 11 - note __, 4 + rest 4 note A_, 11 - note __, 3 + rest 3 inc_octave note C_, 11 - note __, 4 + rest 4 note C#, 11 - note __, 3 + rest 3 notetype0 2 note D_, 15 + ;tie note D_, 14 dec_octave note D_, 15 + ;tie note D_, 14 notetype0 1 .Loop6 rept 4 note G_, 11 - note __, 4 + rest 4 note G_, 11 - note __, 3 + rest 3 endr rept 4 note D_, 11 - note __, 4 + rest 4 note D_, 11 - note __, 3 + rest 3 endr - loopchannel 3, .Loop6 + sound_loop 3, .Loop6 .Loop7 note G_, 11 - note __, 4 + rest 4 note D_, 11 - note __, 3 - loopchannel 4, .Loop7 + rest 3 + sound_loop 4, .Loop7 + ;musicf1 102 notetype0 4 note G_, 15 + ;tie note G_, 14 notetype0 2 note G_, 14 - endchannel + sound_ret -Music_TCG2Credits_Ch1: +Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) notetype1 10 - dutycycle 2 + duty_cycle 2 notetype1 13 notetype0 1 - note __, 15 + ;musicdc 255 + rest 15 octave 2 note D_, 14 note A_, 15 note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 4 - note __, 15 + rest 15 note E_, 14 note G_, 15 inc_octave note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 4 - note __, 15 + rest 15 dec_octave note D_, 14 note A_, 15 note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 4 - note __, 15 + rest 15 note E_, 14 note G_, 15 inc_octave note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 4 notetype1 13 dec_octave dec_octave note G_, 16 + ;tie note G_, 13 inc_octave note G_, 16 + ;tie note G_, 13 note G_, 16 + ;tie note G_, 13 inc_octave + ;musicef 252 note B_, 16 + ;tie note B_, 13 + ;musicef 4 dec_octave dec_octave note D_, 16 + ;tie note D_, 13 inc_octave note D_, 16 + ;tie note D_, 13 note F_, 16 + ;tie note F_, 13 inc_octave + ;musicef 252 note C_, 16 + ;tie note C_, 13 + ;musicef 4 dec_octave dec_octave note G_, 16 + ;tie note G_, 13 inc_octave note G_, 16 + ;tie note G_, 13 note B_, 16 + ;tie note B_, 13 inc_octave + ;musicef 252 note B_, 16 + ;tie note B_, 13 + ;musicef 4 dec_octave dec_octave note D_, 16 + ;tie note D_, 13 inc_octave note D_, 16 + ;tie note D_, 13 note F_, 16 + ;tie note F_, 13 inc_octave + ;musicef 252 note C_, 16 + ;tie note C_, 13 + ;musicef 4 dec_octave dec_octave note G_, 16 + ;tie note G_, 13 inc_octave note G_, 16 + ;tie note G_, 13 note G_, 16 + ;tie note G_, 13 inc_octave + ;musicef 252 note B_, 16 + ;tie note B_, 13 + ;musicef 4 dec_octave dec_octave note D_, 16 + ;tie note D_, 13 inc_octave note D_, 16 + ;tie note D_, 13 note F_, 16 + ;tie note F_, 13 inc_octave + ;musicef 252 note C_, 16 + ;tie note C_, 13 + ;musicef 4 dec_octave dec_octave note G_, 16 + ;tie note G_, 13 inc_octave note G_, 16 + ;tie note G_, 13 note B_, 16 + ;tie note B_, 13 inc_octave + ;musicef 252 note B_, 16 + ;tie note B_, 13 + ;musicef 4 dec_octave dec_octave note G_, 16 + ;tie note G_, 13 inc_octave note F_, 16 + ;tie note F_, 13 note B_, 16 + ;tie note B_, 13 inc_octave + ;musicef 252 note D_, 16 + ;tie note D_, 13 + ;musicef 4 dec_octave note C_, 16 + ;tie note C_, 13 inc_octave note D_, 16 + ;tie note D_, 13 + ;musicef 252 note G_, 16 + ;tie note G_, 13 inc_octave note C_, 16 + ;tie note C_, 13 + ;musicef 4 dec_octave dec_octave dec_octave note C_, 16 + ;tie note C_, 13 inc_octave note D_, 16 + ;tie note D_, 13 note G_, 16 + ;tie note G_, 13 inc_octave + ;musicef 252 note C_, 16 + ;tie note C_, 13 + ;musicef 4 dec_octave dec_octave note B_, 16 + ;tie note B_, 13 inc_octave note A_, 16 + ;tie note A_, 13 inc_octave note D_, 16 + ;tie note D_, 13 inc_octave + ;musicef 252 note D_, 16 + ;tie note D_, 13 + ;musicef 4 dec_octave dec_octave dec_octave note E_, 16 + ;tie note E_, 13 inc_octave note F#, 16 + ;tie note F#, 13 inc_octave note D_, 16 + ;tie note D_, 13 + ;musicef 252 note F#, 16 + ;tie note F#, 13 + ;musicef 4 dec_octave dec_octave note A_, 16 + ;tie note A_, 13 inc_octave note B_, 16 + ;tie note B_, 13 inc_octave + ;musicef 252 note G_, 16 + ;tie note G_, 13 dec_octave note B_, 16 + ;tie note B_, 13 + ;musicef 4 dec_octave note A_, 16 + ;tie note A_, 13 inc_octave note B_, 16 + ;tie note B_, 13 inc_octave + ;musicef 252 note G_, 16 + ;tie note G_, 13 dec_octave note B_, 16 + ;tie note B_, 13 + ;musicef 4 note C_, 16 + ;tie note C_, 13 inc_octave note D#, 16 + ;tie note D#, 13 inc_octave + ;musicef 252 note D_, 16 + ;tie note D_, 13 dec_octave note D_, 16 + ;tie note D_, 13 + ;musicef 4 dec_octave note D_, 16 + ;tie note D_, 13 inc_octave note E_, 16 + ;tie note E_, 13 note F#, 15 + ;musicef 252 note D_, 14 note C_, 15 dec_octave note A_, 14 + ;musicef 4 dec_octave note G_, 15 inc_octave @@ -1380,10 +2130,12 @@ Music_TCG2Credits_Ch1: note D_, 14 note G_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 inc_octave note D_, 14 + ;musicef 4 dec_octave dec_octave dec_octave @@ -1393,10 +2145,12 @@ Music_TCG2Credits_Ch1: note D_, 15 note E_, 14 note F_, 15 + ;musicef 252 note B_, 14 inc_octave note C_, 15 note G_, 14 + ;musicef 4 dec_octave dec_octave note G_, 15 @@ -1406,9 +2160,11 @@ Music_TCG2Credits_Ch1: note A_, 14 note B_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 - note __, 14 + rest 14 + ;musicef 4 dec_octave dec_octave note D_, 15 @@ -1417,10 +2173,12 @@ Music_TCG2Credits_Ch1: note D_, 15 note E_, 14 note F_, 15 + ;musicef 252 note B_, 14 inc_octave note C_, 15 - note __, 14 + rest 14 + ;musicef 4 dec_octave dec_octave note G_, 15 @@ -1430,10 +2188,12 @@ Music_TCG2Credits_Ch1: note D_, 14 note G_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 inc_octave note D_, 14 + ;musicef 4 dec_octave dec_octave dec_octave @@ -1443,10 +2203,12 @@ Music_TCG2Credits_Ch1: note D_, 15 note E_, 14 note F_, 15 + ;musicef 252 note B_, 14 inc_octave note C_, 15 note G_, 14 + ;musicef 4 dec_octave dec_octave note G_, 15 @@ -1456,11 +2218,13 @@ Music_TCG2Credits_Ch1: note A_, 14 note B_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 inc_octave note D_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave dec_octave note D_, 14 @@ -1468,22 +2232,26 @@ Music_TCG2Credits_Ch1: note A_, 14 note B_, 15 inc_octave + ;musicef 252 note F_, 14 note D_, 15 note D#, 14 + ;musicef 4 dec_octave note C_, 15 note G_, 14 inc_octave note D_, 15 note E_, 14 + ;musicef 252 note G_, 15 inc_octave note D_, 14 note C_, 15 dec_octave note G_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave note G_, 14 inc_octave @@ -1491,11 +2259,13 @@ Music_TCG2Credits_Ch1: note D#, 14 note G_, 15 inc_octave + ;musicef 252 note D_, 14 note C_, 15 + ;musicef 4 dec_octave note C_, 14 - note __, 15 + rest 15 dec_octave note F#, 14 note A_, 15 @@ -1506,7 +2276,7 @@ Music_TCG2Credits_Ch1: inc_octave note D_, 15 note F#, 14 - note __, 15 + rest 15 dec_octave dec_octave dec_octave @@ -1517,11 +2287,13 @@ Music_TCG2Credits_Ch1: inc_octave note D_, 15 dec_octave + ;musicef 252 note B_, 14 inc_octave note F#, 15 note G_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave note E_, 14 inc_octave @@ -1530,20 +2302,24 @@ Music_TCG2Credits_Ch1: note B_, 14 inc_octave note C_, 15 + ;musicef 252 note G_, 14 note C_, 15 dec_octave note B_, 14 - note __, 15 + ;musicef 4 + rest 15 note A_, 14 inc_octave note C_, 15 note G_, 14 note F#, 15 + ;musicef 252 note D_, 14 note C_, 15 note D_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave note A_, 14 inc_octave @@ -1559,11 +2335,16 @@ Music_TCG2Credits_Ch1: note C_, 10 notetype1 13 note D_, 4 + ;tie notetype0 4 note D_, 15 + ;tie note G_, 14 notetype0 1 + ;musicf0 5 + ;musicf1 71 octave 3 + ;musicf2 note C_, 8 note C_, 7 note E_, 7 @@ -1876,7 +2657,10 @@ Music_TCG2Credits_Ch1: note A_, 7 note D_, 7 note F#, 7 + ;musicf0 29 octave 2 + ;musicef 255 + ;musicf1 71 note D_, 4 note E_, 4 note F#, 4 @@ -1886,10 +2670,15 @@ Music_TCG2Credits_Ch1: inc_octave note C_, 4 note D_, 3 + ;tie + ;musicf2 note D_, 8 note D_, 7 + ;musicf0 5 + ;musicf1 71 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note D_, 7 note D_, 7 @@ -1902,10 +2691,14 @@ Music_TCG2Credits_Ch1: note D_, 7 note D_, 7 note B_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note D_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -1921,11 +2714,15 @@ Music_TCG2Credits_Ch1: note D_, 7 inc_octave note D_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note D_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F_, 8 note D_, 7 note D_, 7 @@ -1941,11 +2738,15 @@ Music_TCG2Credits_Ch1: note D_, 7 inc_octave note D_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note D_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F_, 8 note D_, 7 note D_, 7 @@ -1958,10 +2759,14 @@ Music_TCG2Credits_Ch1: note D_, 7 note D_, 7 note B_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note D_, 7 + ;musicef 3 note E_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -1974,10 +2779,14 @@ Music_TCG2Credits_Ch1: note E_, 7 note E_, 7 note B_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note E_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note D_, 7 note D_, 7 @@ -1990,10 +2799,14 @@ Music_TCG2Credits_Ch1: note D_, 7 note D_, 7 note B_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note D_, 7 + ;musicef 3 note E_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note E_, 7 inc_octave @@ -2009,8 +2822,11 @@ Music_TCG2Credits_Ch1: note E_, 8 inc_octave note G_, 7 + ;musicf3 note F_, 3 + ;musicf2 note F#, 11 + ;tie note F#, 8 note F#, 7 note E_, 7 @@ -2030,10 +2846,14 @@ Music_TCG2Credits_Ch1: note A_, 7 note A_, 7 note G_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note A_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note D_, 7 note D_, 7 @@ -2046,10 +2866,14 @@ Music_TCG2Credits_Ch1: note D_, 7 note D_, 7 note B_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note D_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -2065,11 +2889,15 @@ Music_TCG2Credits_Ch1: note D_, 7 inc_octave note D_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note D_, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F_, 8 note D_, 7 inc_octave @@ -2085,8 +2913,11 @@ Music_TCG2Credits_Ch1: note D_, 8 inc_octave note F_, 7 + ;musicf3 note D#, 3 + ;musicf2 note E_, 11 + ;tie note E_, 8 note E_, 7 note D_, 7 @@ -2106,10 +2937,14 @@ Music_TCG2Credits_Ch1: note G#, 7 note B_, 7 note A_, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note B_, 7 + ;musicef 3 note E_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -2127,11 +2962,15 @@ Music_TCG2Credits_Ch1: note E_, 7 inc_octave note E_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note E_, 7 + ;musicef 3 note D#, 7 - note __, 7 + rest 7 + ;musicf2 note A_, 8 note D#, 7 note D#, 7 @@ -2149,11 +2988,15 @@ Music_TCG2Credits_Ch1: note D#, 7 inc_octave note D#, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note D#, 7 + ;musicef 3 note A_, 7 - note __, 7 + rest 7 + ;musicf2 inc_octave note C_, 8 dec_octave @@ -2170,8 +3013,10 @@ Music_TCG2Credits_Ch1: note G_, 8 note C_, 7 note C_, 7 + ;musicf3 note F#, 4 note G_, 3 + ;musicf2 note F#, 8 note F#, 7 note E_, 7 @@ -2191,8 +3036,10 @@ Music_TCG2Credits_Ch1: note A_, 7 note F#, 7 note G_, 7 + ;musicf0 29 + ;musicf3 octave 3 - note __, 15 + rest 15 dec_octave note D_, 14 note G_, 15 @@ -2205,13 +3052,15 @@ Music_TCG2Credits_Ch1: note F_, 7 inc_octave note F_, 7 + ;tie notetype0 3 note F_, 15 + ;tie note F_, 14 notetype0 1 - note __, 15 - note __, 14 - note __, 15 + rest 15 + rest 14 + rest 15 dec_octave note D_, 14 note G_, 15 @@ -2224,13 +3073,15 @@ Music_TCG2Credits_Ch1: note F_, 7 inc_octave note F_, 7 + ;tie notetype0 3 note F_, 15 + ;tie note F_, 14 notetype0 1 - note __, 15 - note __, 14 - note __, 15 + rest 15 + rest 14 + rest 15 dec_octave note D_, 14 note G_, 15 @@ -2243,13 +3094,15 @@ Music_TCG2Credits_Ch1: note F_, 7 inc_octave note F_, 7 + ;tie notetype0 3 note F_, 15 + ;tie note F_, 14 notetype0 1 - note __, 15 - note __, 14 - note __, 15 + rest 15 + rest 14 + rest 15 dec_octave note D_, 14 note G_, 15 @@ -2262,12 +3115,14 @@ Music_TCG2Credits_Ch1: note F_, 7 inc_octave note F_, 7 + ;tie notetype0 3 note F_, 15 + ;tie note F_, 14 notetype0 1 - note __, 15 - note __, 14 + rest 15 + rest 14 octave 1 note G_, 15 inc_octave @@ -2276,10 +3131,12 @@ Music_TCG2Credits_Ch1: note D_, 14 note G_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 inc_octave note D_, 14 + ;musicef 4 dec_octave dec_octave dec_octave @@ -2289,10 +3146,12 @@ Music_TCG2Credits_Ch1: note D_, 15 note E_, 14 note F_, 15 + ;musicef 252 note B_, 14 inc_octave note C_, 15 note G_, 14 + ;musicef 4 dec_octave dec_octave note G_, 15 @@ -2302,24 +3161,32 @@ Music_TCG2Credits_Ch1: note A_, 14 note B_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 + ;musicf0 26 octave 3 + ;musicf1 87 + ;musicf3 note B_, 3 inc_octave note C_, 11 + ;tie note C_, 15 + ;tie note C_, 14 dec_octave note A_, 15 note F_, 14 - note __, 15 + rest 15 inc_octave note C_, 14 - note __, 15 + rest 15 dec_octave note B_, 14 - vibrato 0, $33 + ;musicf0 29 + ;musicf3 + vibrato 0, 3, 3 octave 1 note G_, 15 inc_octave @@ -2328,10 +3195,12 @@ Music_TCG2Credits_Ch1: note D_, 14 note G_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 inc_octave note D_, 14 + ;musicef 4 dec_octave dec_octave dec_octave @@ -2341,10 +3210,12 @@ Music_TCG2Credits_Ch1: note D_, 15 note E_, 14 note F_, 15 + ;musicef 252 note B_, 14 inc_octave note C_, 15 note G_, 14 + ;musicef 4 dec_octave dec_octave note G_, 15 @@ -2354,11 +3225,13 @@ Music_TCG2Credits_Ch1: note A_, 14 note B_, 15 inc_octave + ;musicef 252 note A_, 14 note B_, 15 inc_octave note D_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave dec_octave note D_, 14 @@ -2366,22 +3239,26 @@ Music_TCG2Credits_Ch1: note A_, 14 note B_, 15 inc_octave + ;musicef 252 note F_, 14 note D_, 15 note D#, 14 + ;musicef 4 dec_octave note C_, 15 note G_, 14 inc_octave note D_, 15 note E_, 14 + ;musicef 252 note G_, 15 inc_octave note D_, 14 note C_, 15 dec_octave note G_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave note G_, 14 inc_octave @@ -2389,25 +3266,34 @@ Music_TCG2Credits_Ch1: note D#, 14 note G_, 15 inc_octave + ;musicef 252 note D_, 14 note C_, 15 + ;musicef 4 dec_octave note C_, 14 - note __, 15 + rest 15 dec_octave note F#, 14 note A_, 15 + ;musicf0 26 octave 4 note F#, 14 + ;musicf0 29 octave 3 note D_, 15 + ;musicf0 26 octave 4 note E_, 14 + ;musicf0 29 octave 3 note D_, 15 + ;musicf0 26 octave 3 note B_, 14 + ;tie note B_, 15 + ;musicf0 29 octave 1 note B_, 14 inc_octave @@ -2416,11 +3302,13 @@ Music_TCG2Credits_Ch1: inc_octave note D_, 15 dec_octave + ;musicef 252 note B_, 14 inc_octave note F#, 15 note G_, 14 - note __, 15 + ;musicef 4 + rest 15 dec_octave note E_, 14 inc_octave @@ -2429,23 +3317,30 @@ Music_TCG2Credits_Ch1: note B_, 14 inc_octave note C_, 15 + ;musicef 252 note G_, 14 note C_, 15 dec_octave note B_, 14 - note __, 15 + ;musicef 4 + rest 15 note A_, 14 inc_octave note C_, 15 note G_, 14 note F#, 15 + ;musicef 252 note D_, 14 note C_, 15 note D_, 14 + ;musicef 4 + ;musicf0 5 + ;musicf1 71 octave 3 - note __, 15 + rest 15 note C_, 7 - note __, 7 + rest 7 + ;musicf2 note D#, 8 note C_, 7 note C_, 7 @@ -2458,10 +3353,14 @@ Music_TCG2Credits_Ch1: note D#, 7 note D#, 7 note A#, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note D#, 7 + ;musicef 3 note C_, 7 - note __, 7 + rest 7 + ;musicf2 note D#, 8 note C_, 7 note C_, 7 @@ -2474,10 +3373,14 @@ Music_TCG2Credits_Ch1: note D#, 7 note D#, 7 note A#, 7 - note __, 8 + ;musicf3 + rest 8 + ;musicef 253 note D#, 7 + ;musicef 3 note F_, 7 - note __, 7 + rest 7 + ;musicf2 note G#, 8 note F_, 7 note F_, 7 @@ -2495,11 +3398,15 @@ Music_TCG2Credits_Ch1: note G#, 7 inc_octave note D#, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note G#, 7 + ;musicef 3 note F_, 7 - note __, 7 + rest 7 + ;musicf2 note G#, 8 note F_, 7 note F_, 7 @@ -2517,11 +3424,15 @@ Music_TCG2Credits_Ch1: note G#, 7 inc_octave note D#, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note G#, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -2537,11 +3448,15 @@ Music_TCG2Credits_Ch1: note F#, 7 inc_octave note D_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note F#, 7 + ;musicef 3 note D_, 7 - note __, 7 + rest 7 + ;musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -2557,11 +3472,15 @@ Music_TCG2Credits_Ch1: note F#, 7 inc_octave note D_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note F#, 7 + ;musicef 3 note E_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -2577,11 +3496,15 @@ Music_TCG2Credits_Ch1: note G_, 7 inc_octave note E_, 7 - note __, 8 + ;musicf3 + rest 8 dec_octave + ;musicef 253 note G_, 7 + ;musicef 3 note E_, 7 - note __, 7 + rest 7 + ;musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -2597,9 +3520,15 @@ Music_TCG2Credits_Ch1: note G_, 7 inc_octave note E_, 7 + ;musicf3 + ;musicf0 26 octave 4 + ;musicf3 note F#, 15 + ;musicf0 5 + ;musicf1 71 octave 3 + ;musicf2 note F#, 4 note D_, 3 note D_, 4 @@ -2610,19 +3539,29 @@ Music_TCG2Credits_Ch1: note D_, 4 dec_octave note A_, 3 + ;musicf3 + ;musicf0 26 octave 4 note D_, 14 + ;musicf0 5 octave 5 + ;musicf1 71 + ;musicf2 note D_, 4 dec_octave note A_, 4 note A_, 4 inc_octave note D_, 3 + ;musicf3 + ;musicf0 26 octave 3 note B_, 14 note E_, 15 + ;musicf0 5 + ;musicf1 71 octave 3 + ;musicf2 note B_, 4 note E_, 3 note E_, 4 @@ -2633,25 +3572,38 @@ Music_TCG2Credits_Ch1: note E_, 4 dec_octave note B_, 3 + ;musicf3 + ;musicf0 26 octave 4 note D_, 14 + ;musicf0 5 octave 5 + ;musicf1 71 + ;musicf2 note E_, 4 dec_octave note B_, 4 note B_, 4 inc_octave note E_, 3 + ;musicf3 + ;musicf0 26 octave 3 note G_, 14 note A_, 4 + ;musicf0 5 + ;musicf1 71 + ;musicf3 + ;musicef 253 octave 4 note E_, 4 - note __, 7 + rest 7 + ;musicef 3 octave 3 note G_, 7 - note __, 7 + rest 7 inc_octave + ;musicf2 note C_, 8 dec_octave note G_, 7 @@ -2664,7 +3616,10 @@ Music_TCG2Credits_Ch1: note G_, 7 inc_octave note G_, 7 + ;musicf0 26 + ;musicf3 octave 3 + ;musicef 1 note C_, 4 note D_, 4 note E_, 4 @@ -2673,20 +3628,29 @@ Music_TCG2Credits_Ch1: note A_, 3 note A#, 4 note B_, 3 + ;musicef 1 + ;musicf1 70 inc_octave note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 note C_, 14 dec_octave note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 note A_, 14 - note __, 8 + ;musicef 4 + ;musicf1 80 + rest 8 octave 2 note B_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -2706,11 +3670,15 @@ Music_TCG2Credits_Ch1: inc_octave note G_, 4 note D_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note G_, 4 + ;musicef 4 dec_octave note B_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -2730,11 +3698,15 @@ Music_TCG2Credits_Ch1: inc_octave note G_, 4 note D_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note G_, 4 + ;musicef 4 dec_octave note A_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note C_, 4 dec_octave @@ -2754,11 +3726,15 @@ Music_TCG2Credits_Ch1: inc_octave note F_, 4 note C_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note F_, 4 + ;musicef 4 dec_octave note A_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note C_, 4 dec_octave @@ -2778,11 +3754,15 @@ Music_TCG2Credits_Ch1: inc_octave note F_, 4 note C_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note F_, 4 + ;musicef 4 dec_octave note B_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -2802,11 +3782,15 @@ Music_TCG2Credits_Ch1: inc_octave note G_, 4 note D_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note G_, 4 + ;musicef 4 dec_octave note B_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -2826,17 +3810,21 @@ Music_TCG2Credits_Ch1: inc_octave note G_, 4 note D_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note G_, 4 + ;musicef 4 dec_octave note A_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note C_, 4 dec_octave note A_, 3 note A_, 4 - note __, 3 + rest 3 inc_octave note F_, 4 dec_octave @@ -2850,11 +3838,15 @@ Music_TCG2Credits_Ch1: inc_octave note F_, 4 note C_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note F_, 4 + ;musicef 4 dec_octave note A_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note C_, 4 dec_octave @@ -2874,11 +3866,15 @@ Music_TCG2Credits_Ch1: inc_octave note F_, 4 note C_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note F_, 4 + ;musicef 4 dec_octave note B_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -2898,11 +3894,15 @@ Music_TCG2Credits_Ch1: inc_octave note G_, 4 note D_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note G_, 4 + ;musicef 4 dec_octave note B_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -2922,11 +3922,15 @@ Music_TCG2Credits_Ch1: inc_octave note G_, 4 note D_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note G_, 4 + ;musicef 4 dec_octave note A_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note C_, 4 dec_octave @@ -2946,11 +3950,15 @@ Music_TCG2Credits_Ch1: inc_octave note F_, 4 note C_, 3 - note __, 4 + ;musicf3 + rest 4 + ;musicef 252 note F_, 4 + ;musicef 4 dec_octave note A_, 4 - note __, 3 + rest 3 + ;musicf2 inc_octave note C_, 4 dec_octave @@ -3009,6 +4017,7 @@ Music_TCG2Credits_Ch1: note G_, 3 dec_octave dec_octave + ;musicf3 note A_, 4 note B_, 4 inc_octave @@ -3020,446 +4029,692 @@ Music_TCG2Credits_Ch1: note G_, 4 note A_, 3 inc_octave + ;musicf1 68 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 notetype0 2 note G_, 14 - endchannel + sound_ret -Music_TCG2Credits_Ch3: +Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) notetype1 10 + ;notetype2 16 load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 + ;musicdc 255 notetype0 1 notetype1 1 + ;musice9 96 octave 5 - vibrato 15, $33 + ;musice8 8 + ;vibrato_type 3 + vibrato 15, 3, 3 notetype1 2 + ;musice8 8 note G#, 3 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 15 + ;tie note D_, 14 note G#, 3 - vibrato 10, $33 + vibrato 10, 3, 3 + ;musice8 1 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - vibrato 0, $33 + ;musice8 8 + vibrato 0, 3, 3 note G_, 15 + ;tie note G_, 5 note A_, 9 + ;tie note A_, 15 + ;musice8 4 note B_, 14 + ;musice8 8 note B_, 3 inc_octave note C_, 5 + ;tie note C_, 14 dec_octave note B_, 7 + ;tie note B_, 15 - vibrato 16, $33 + vibrato 16, 3, 3 + ;musice8 1 note G_, 14 + ;tie notetype0 4 note G_, 15 + ;tie note G_, 14 + ;tie notetype0 2 note G_, 15 + ;tie note G_, 14 + ;musice8 8 notetype0 1 note G#, 3 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 15 + ;tie note D_, 14 note G#, 3 - vibrato 10, $33 + vibrato 10, 3, 3 + ;musice8 1 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note G_, 14 + ;tie note G_, 15 note A_, 14 note B_, 15 inc_octave + ;musice8 4 note C_, 14 + ;musice8 8 note C#, 3 note D_, 5 + ;tie note D_, 14 note C_, 7 + ;tie note C_, 15 dec_octave note B_, 14 + ;tie note B_, 15 - vibrato 16, $33 + vibrato 16, 3, 3 + ;musice8 1 note G_, 14 + ;tie notetype0 4 note G_, 15 + ;tie note G_, 14 + ;tie notetype0 1 note G_, 2 + ;tie notetype0 3 note G_, 9 notetype0 1 + ;musice8 8 notetype1 1 - note __, 15 - note __, 14 - note __, 15 - callchannel Branch_1dfa9d + rest 15 + rest 14 + rest 15 + sound_call Branch_1dfa9d note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 inc_octave note D_, 15 + ;musice8 1 note F#, 14 + ;tie note F#, 15 note G_, 14 + ;tie note G_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note C#, 3 note D_, 12 + ;tie note D_, 7 note C_, 15 + ;tie note C_, 7 dec_octave + ;musice8 4 note B_, 14 + ;musice8 8 note B_, 15 + ;tie note B_, 14 inc_octave note C_, 15 dec_octave - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note E_, 14 + ;tie note E_, 15 + ;tie note E_, 14 + ;tie note E_, 15 + ;tie note E_, 14 + ;tie note E_, 15 + ;tie note E_, 14 + ;tie note E_, 15 + ;tie note E_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 inc_octave note C#, 3 note D_, 12 + ;tie note D_, 7 note C_, 15 + ;tie note C_, 7 dec_octave + ;musice8 4 note B_, 14 + ;musice8 8 note B_, 15 + ;tie note B_, 14 inc_octave note C_, 15 dec_octave - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 - vibrato 0, $33 - vibrato 15, $33 + vibrato 0, 3, 3 + ;musice8 8 + vibrato 15, 3, 3 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;musice8 1 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 notetype1 2 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 dec_octave notetype1 1 - callchannel Branch_1dfa9d - callchannel Branch_1dfb57 + sound_call Branch_1dfa9d + sound_call Branch_1dfb57 notetype0 2 note G_, 14 notetype0 1 - note __, 1 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note __, 15 - note __, 14 + rest 1 + rest 15 + rest 14 + rest 15 + rest 14 + rest 15 + rest 14 note D#, 3 - vibrato 12, $33 + ;musice8 8 + vibrato 12, 3, 3 note E_, 12 + ;tie note E_, 14 + ;tie note E_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 4 note C_, 14 + ;musice8 8 note E_, 15 + ;tie note E_, 14 note A#, 3 note B_, 12 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 - vibrato 0, $33 + ;musice8 8 + vibrato 0, 3, 3 note F_, 3 note F#, 11 + ;tie note F#, 15 note E_, 14 + ;tie note E_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note D_, 14 + ;tie note D_, 14 + ;tie note D_, 14 + ;tie note D_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave + ;musice8 8 note B_, 14 inc_octave note D_, 15 note A_, 14 note F#, 15 + ;musice8 1 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 14 + ;tie note D_, 15 dec_octave note B_, 14 + ;tie note B_, 15 + ;musice8 8 note B_, 3 inc_octave - vibrato 14, $33 + vibrato 14, 3, 3 note C_, 11 + ;tie note C_, 15 + ;tie note C_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 3 note G_, 15 + ;musice8 1 note G_, 14 + ;tie note G_, 15 note C_, 14 + ;tie note C_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 8 dec_octave note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 15 + ;tie note A_, 14 note G_, 15 + ;tie + note G_, 14 + ;musice8 1 + note A_, 15 + ;tie note G_, 14 note A_, 15 - note G_, 14 - note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 inc_octave note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 dec_octave + ;musice8 8 note A#, 3 - vibrato 12, $33 + vibrato 12, 3, 3 + ;musice8 1 note B_, 12 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 7 + ;tie note B_, 7 - note __, 15 - note __, 14 - vibrato 0, $33 + ;musice8 8 + rest 15 + rest 14 + vibrato 0, 3, 3 + ;musice8 8 inc_octave note D#, 3 - vibrato 12, $33 + vibrato 12, 3, 3 note E_, 12 note E_, 14 + ;tie note E_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 4 note C_, 14 + ;musice8 8 note E_, 15 + ;tie note E_, 14 note A#, 3 note B_, 12 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note B_, 14 + ;tie note B_, 15 inc_octave note C_, 14 + ;tie note C_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note C#, 2 note D_, 12 + ;tie note D_, 15 note E_, 14 note F#, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note F#, 14 + ;tie note F#, 15 note E_, 14 + ;tie note E_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 note D_, 14 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 4 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 - vibrato 0, $33 + ;musice8 8 + vibrato 0, 3, 3 note F#, 3 note G_, 11 note F#, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note D_, 14 + ;tie notetype0 4 note D_, 15 + ;tie note D_, 14 + ;tie notetype0 2 note D_, 15 + ;tie note D_, 14 + ;tie notetype0 1 note D_, 1 + ;tie notetype0 2 note D_, 14 + ;musice8 8 notetype0 1 - vibrato 0, $33 + vibrato 0, 3, 3 note C#, 3 note D_, 12 note C_, 14 dec_octave - vibrato 15, $33 + vibrato 15, 3, 3 + ;musice8 1 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 inc_octave note D_, 14 + ;tie note D_, 15 + ;musice8 8 note G#, 3 - vibrato 11, $33 + vibrato 11, 3, 3 + ;musice8 1 note A_, 11 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 14 + ;tie note G_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 notetype0 1 note D_, 14 + ;tie notetype0 4 note D_, 15 + ;tie note D_, 14 + ;tie notetype0 1 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave + ;musice8 8 note B_, 15 inc_octave note C_, 14 + ;musice8 3 note D_, 15 - vibrato 14, $33 + ;musice8 1 + vibrato 14, 3, 3 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 14 + ;tie note C_, 15 dec_octave - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 8 note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 15 + ;tie note A_, 14 note G_, 15 + ;musice8 1 note B_, 14 + ;tie note B_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 8 note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 notetype1 2 inc_octave + ;musice8 1 note C_, 7 + ;tie notetype0 2 note C_, 11 notetype0 8 notetype0 1 note E_, 7 + ;tie notetype0 2 note E_, 11 notetype0 1 + ;musice8 8 note D_, 14 + ;tie note D_, 15 + ;musice8 4 note C_, 14 dec_octave note B_, 15 @@ -3467,54 +4722,80 @@ Music_TCG2Credits_Ch3: note G_, 15 note F#, 14 inc_octave + ;musice8 8 notetype1 1 note C#, 3 note D_, 12 note C_, 14 + ;musice8 1 dec_octave - vibrato 14, $33 + vibrato 14, 3, 3 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 inc_octave note D_, 14 + ;tie note D_, 15 + ;musice8 8 note G#, 3 - vibrato 11, $33 + vibrato 11, 3, 3 + ;musice8 1 note A_, 11 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note B_, 14 + ;tie note B_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 8 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave notetype1 2 note B_, 3 inc_octave note C_, 11 + ;tie note C_, 15 dec_octave + ;musice8 4 note B_, 14 note A_, 15 note G#, 14 note F_, 15 inc_octave + ;musice8 8 notetype1 1 note C_, 14 dec_octave @@ -3522,70 +4803,108 @@ Music_TCG2Credits_Ch3: inc_octave note C_, 14 note C_, 15 + ;tie note C_, 14 + ;musice8 4 note G_, 15 + ;musice8 1 note G_, 14 + ;tie note G_, 15 note C_, 14 + ;tie note C_, 15 dec_octave + ;musice8 8 note A#, 3 - vibrato 11, $33 + vibrato 11, 3, 3 note B_, 11 + ;tie note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 15 + ;tie note A_, 14 note G_, 15 + ;tie note G_, 14 note A_, 15 + ;tie note A_, 7 note G_, 4 note A_, 3 - vibrato 15, $33 + vibrato 15, 3, 3 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 dec_octave note G_, 7 notetype1 2 note G_, 7 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie notetype1 2 + ;musice8 1 note G_, 15 + ;tie note G_, 14 - note __, 15 - note __, 14 + rest 15 + rest 14 + ;musice8 8 .Loop1 - note __, 15 - note __, 14 - note __, 8 + rest 15 + rest 14 + rest 8 octave 3 notetype1 2 + ;musice4 253 note D_, 14 note G_, 15 note B_, 14 @@ -3593,25 +4912,35 @@ Music_TCG2Credits_Ch3: note D_, 15 dec_octave note G_, 7 + ;musice4 0 notetype1 1 note G_, 7 notetype1 2 note G_, 7 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie notetype1 2 + ;musice8 1 note G_, 15 + ;tie note G_, 14 - note __, 15 - note __, 14 - loopchannel 2, .Loop1 - note __, 15 - note __, 14 - note __, 8 + ;musice8 8 + rest 15 + rest 14 + sound_loop 2, .Loop1 + rest 15 + rest 14 + rest 8 octave 3 notetype1 2 + ;musice4 253 note D_, 14 note G_, 15 note B_, 14 @@ -3619,96 +4948,155 @@ Music_TCG2Credits_Ch3: note D_, 15 dec_octave note G_, 7 + ;musice4 0 inc_octave notetype1 1 note C_, 7 notetype1 2 note C_, 7 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 notetype1 3 note C_, 15 - vibrato 0, $33 - note __, 14 + vibrato 0, 3, 3 + rest 14 notetype1 1 - note __, 15 - note __, 14 - note __, 15 - callchannel Branch_1dfa9d - callchannel Branch_1dfb57 + rest 15 + rest 14 + rest 15 + sound_call Branch_1dfa9d + sound_call Branch_1dfb57 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 inc_octave note C_, 4 note D_, 3 note D#, 4 note F_, 3 note F#, 3 - vibrato 26, $33 + vibrato 26, 3, 3 note G_, 12 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 29, $33 + vibrato 29, 3, 3 + ;musice8 1 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 1 + ;tie notetype0 2 note F_, 14 notetype0 1 - vibrato 29, $33 + ;musice8 8 + vibrato 29, 3, 3 note F#, 15 + ;tie note F#, 14 + ;tie note F#, 15 + ;tie note F#, 14 + ;tie note F#, 15 + ;tie note F#, 14 + ;tie note F#, 15 + ;tie note F#, 14 + ;musice8 1 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;musice8 8 note F#, 4 note G_, 3 note A_, 4 note A#, 3 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;musice8 1 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 dec_octave note A_, 4 note B_, 4 @@ -3720,134 +5108,222 @@ Music_TCG2Credits_Ch3: note G_, 4 note G#, 3 note G#, 3 + ;musice8 1 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 note F#, 14 + ;tie note F#, 15 + ;musice8 8 note D_, 14 note F#, 3 - vibrato 12, $33 + vibrato 12, 3, 3 note G_, 12 + ;tie note G_, 14 + ;tie note G_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note F#, 14 note E_, 15 dec_octave note B_, 14 inc_octave note C_, 15 + ;musice8 4 note G_, 14 - vibrato 15, $33 + ;musice8 1 + vibrato 15, 3, 3 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 1 + ;tie notetype0 2 note G_, 14 notetype0 1 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note F#, 3 - vibrato 12, $33 + vibrato 12, 3, 3 + ;musice8 1 note G_, 12 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 15, $33 + vibrato 15, 3, 3 note F#, 15 + ;tie note F#, 14 + ;tie note F#, 15 + ;tie note F#, 14 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note G#, 3 - vibrato 12, $33 + ;musice8 1 + vibrato 12, 3, 3 + ;musice8 1 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - vibrato 0, $33 - vibrato 15, $33 + vibrato 0, 3, 3 + vibrato 15, 3, 3 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note G#, 3 - vibrato 12, $33 + vibrato 12, 3, 3 + ;musice8 1 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - vibrato 0, $33 - vibrato 15, $33 + vibrato 0, 3, 3 + vibrato 15, 3, 3 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note G#, 3 - vibrato 12, $33 + vibrato 12, 3, 3 + ;musice8 1 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note A#, 3 - vibrato 26, $33 + vibrato 26, 3, 3 note B_, 12 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 1 notetype0 1 notetype1 2 note B_, 14 notetype1 3 note B_, 7 - note __, 7 - endchannel + rest 7 + sound_ret Branch_1dfa9d: octave 3 @@ -3856,44 +5332,66 @@ Branch_1dfa9d: inc_octave note D_, 14 note G_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 14 + ;tie note A_, 15 inc_octave note C_, 14 + ;tie note C_, 15 dec_octave - vibrato 14, $33 + ;musice8 8 + vibrato 14, 3, 3 note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 15 + ;musice8 1 note D_, 14 + ;tie note D_, 15 note B_, 14 + ;tie note B_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 8 note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note F_, 15 + ;musice8 1 note C_, 14 + ;tie note C_, 15 note A_, 14 + ;tie note A_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 dec_octave note A_, 14 note B_, 15 @@ -3901,453 +5399,548 @@ Branch_1dfa9d: note D_, 14 note G_, 15 note F_, 14 + ;tie note F_, 15 + ;musice8 1 note A_, 14 + ;tie note A_, 15 inc_octave note C_, 14 + ;tie note C_, 15 note E_, 14 + ;tie note E_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 8 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave note B_, 15 + ;musice8 1 note G_, 14 + ;tie note G_, 15 note F#, 14 + ;tie note F#, 15 - vibrato 14, $33 + vibrato 14, 3, 3 note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note D#, 14 + ;musice8 1 note E_, 15 + ;tie note E_, 14 + ;tie note E_, 15 note B_, 14 + ;tie note B_, 15 note A_, 14 + ;tie note A_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note G#, 3 note A_, 11 + ;tie note A_, 15 note G_, 14 + ;musice8 4 note A_, 15 + ;musice8 8 note A#, 3 - vibrato 11, $33 + vibrato 11, 3, 3 note B_, 11 - endchannel + ;tie + sound_ret Branch_1dfb57: octave 4 + ;musice8 8 note B_, 15 + ;tie note B_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 inc_octave note D_, 15 + ;musice8 1 note A_, 14 + ;tie note A_, 15 note G_, 14 + ;tie note G_, 15 - vibrato 14, $33 + vibrato 14, 3, 3 note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musice8 8 note C#, 3 note D_, 12 + ;tie note D_, 7 note C_, 15 + ;tie note C_, 7 dec_octave + ;musice8 4 note B_, 14 + ;musice8 8 note B_, 15 + ;tie note B_, 14 inc_octave note C_, 15 dec_octave note E_, 14 + ;tie note E_, 15 note G#, 3 note A_, 11 + ;tie note A_, 15 + ;tie note A_, 4 note G_, 5 note A_, 5 note G_, 15 + ;tie note G_, 14 note F#, 15 + ;tie note F#, 14 note E_, 15 note F#, 14 + ;tie note F#, 15 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musice8 1 note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;tie note G_, 14 - endchannel + ;tie + sound_ret -Music_TCG2Credits_Ch4: - togglenoise $06 +Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) + toggle_noise 6 octave 1 - notetype 4 + ;musicdc 255 + drum_speed 4 .Loop1 - note __, 15 - note __, 14 - loopchannel 40, .Loop1 - notetype 1 + rest 15 + rest 14 + sound_loop 40, .Loop1 + drum_speed 1 .Loop2 - note D#, 15 - note D#, 14 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - loopchannel 15, .Loop2 - note D#, 15 - note D#, 14 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 3 - callchannel Branch_1dfd47 - callchannel Branch_1dfd54 - callchannel Branch_1dfd47 - callchannel Branch_1dfd54 - callchannel Branch_1dfd47 - callchannel Branch_1dfd54 - note C_, 15 - note C_, 14 - note D#, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C_, 14 - note D#, 15 - note E_, 14 - note D#, 15 - note C#, 14 - note E_, 15 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 15 - note C#, 14 - note D#, 15 - note C#, 14 - callchannel Branch_1dfd47 - callchannel Branch_1dfd54 - callchannel Branch_1dfd47 - callchannel Branch_1dfd54 - callchannel Branch_1dfd47 - callchannel Branch_1dfd54 - callchannel Branch_1dfd47 - note C_, 15 - note C#, 14 - note E_, 15 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 15 - note C#, 14 - note E_, 15 - note C#, 14 - callchannel Branch_1dfd61 - note D#, 15 - note C#, 14 - note D#, 15 - note C_, 14 - note C#, 15 - note C_, 14 - note D#, 15 - note C#, 4 - note C#, 5 - note C#, 5 - callchannel Branch_1dfd61 - note D#, 15 - note C#, 14 - note D#, 15 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 15 - note C#, 14 - note E_, 15 - note C_, 14 - callchannel Branch_1dfd61 - note D#, 15 - note C#, 14 - note D#, 15 - note C_, 14 - note C#, 15 - note C_, 14 - note D#, 15 - note C#, 4 - note C#, 5 - note C#, 5 - note C_, 15 - note C#, 14 - note E_, 15 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 15 - note C_, 14 - note C_, 15 - notetype 6 - note F_, 9 - notetype 1 - note __, 4 - note __, 14 - note __, 15 - note D#, 14 - notetype 4 - note E_, 7 - notetype 1 - note __, 1 - callchannel Branch_1dfd6e - callchannel Branch_1dfd7a - callchannel Branch_1dfd6e - note C_, 15 - note C#, 14 - note E_, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C#, 14 - note C_, 15 - note C#, 14 - callchannel Branch_1dfd6e - callchannel Branch_1dfd7a - callchannel Branch_1dfd6e - note C_, 15 - note C#, 14 - note E_, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C#, 14 - note C_, 15 - note C#, 14 - callchannel Branch_1dfd6e - callchannel Branch_1dfd7a - callchannel Branch_1dfd6e - note C_, 15 - note C#, 14 - note E_, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C#, 14 - note C_, 15 - note C#, 14 - callchannel Branch_1dfd6e - note C_, 15 - note C#, 14 - note E_, 15 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 15 - note C#, 14 - note C_, 15 - note C#, 14 - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - note C_, 15 - note D#, 14 - note C#, 15 - note D#, 14 - note C_, 15 - note D#, 14 - note C#, 15 - note C#, 7 - note C#, 7 - note C_, 15 - note C#, 7 - note C#, 7 - note C#, 15 - note E_, 14 - note C_, 15 - note C#, 14 - note C_, 15 - note C#, 7 - note C#, 7 - note C#, 15 - note E_, 4 - note C#, 5 - note C#, 5 - note C#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 14 - note C#, 15 - note D#, 14 - note C_, 15 - note D#, 7 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 14 - notetype 7 - note F_, 16 - notetype 1 - note __, 4 - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - callchannel Branch_1dfd8d - note C_, 15 - note D#, 14 - note C#, 15 - note D#, 14 - note C_, 8 - note C#, 7 - note D#, 7 - note C#, 4 - note C#, 3 - note C#, 8 - note C#, 7 - note C#, 14 - note C#, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C_, 14 - note C#, 8 - note C_, 14 - note C_, 7 - note C#, 15 - note C_, 14 - notetype 7 - note F_, 16 - notetype 1 - note __, 4 - endchannel + drum_note 4, 15 + drum_note 4, 14 + rest 15 + rest 14 + rest 15 + rest 14 + rest 15 + rest 14 + sound_loop 15, .Loop2 + drum_note 4, 15 + drum_note 4, 14 + rest 15 + rest 14 + rest 15 + rest 14 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 3 + ;musicef 0 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 3 + sound_call Branch_1dfd47 + sound_call Branch_1dfd54 + sound_call Branch_1dfd47 + sound_call Branch_1dfd54 + sound_call Branch_1dfd47 + sound_call Branch_1dfd54 + drum_note 1, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 5, 14 + drum_note 4, 15 + drum_note 2, 14 + drum_note 5, 15 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 2, 14 + sound_call Branch_1dfd47 + sound_call Branch_1dfd54 + sound_call Branch_1dfd47 + sound_call Branch_1dfd54 + sound_call Branch_1dfd47 + sound_call Branch_1dfd54 + sound_call Branch_1dfd47 + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 15 + drum_note 2, 14 + drum_note 5, 15 + drum_note 2, 14 + sound_call Branch_1dfd61 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 1, 14 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + sound_call Branch_1dfd61 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 15 + drum_note 2, 14 + drum_note 5, 15 + drum_note 1, 14 + sound_call Branch_1dfd61 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 1, 14 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 15 + drum_note 1, 14 + drum_note 1, 15 + drum_speed 6 + ;musicef 2 + drum_note 6, 9 + drum_speed 1 + rest 4 + rest 14 + rest 15 + ;musicef 0 + drum_note 4, 14 + drum_speed 4 + drum_note 5, 7 + drum_speed 1 + rest 1 + sound_call Branch_1dfd6e + sound_call Branch_1dfd7a + sound_call Branch_1dfd6e + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 2, 14 + drum_note 1, 15 + drum_note 2, 14 + sound_call Branch_1dfd6e + sound_call Branch_1dfd7a + sound_call Branch_1dfd6e + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 2, 14 + drum_note 1, 15 + drum_note 2, 14 + sound_call Branch_1dfd6e + sound_call Branch_1dfd7a + sound_call Branch_1dfd6e + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 2, 14 + drum_note 1, 15 + drum_note 2, 14 + sound_call Branch_1dfd6e + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 15 + drum_note 2, 14 + drum_note 1, 15 + drum_note 2, 14 + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 15 + drum_note 4, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 15 + drum_note 2, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 15 + drum_note 5, 14 + drum_note 1, 15 + drum_note 2, 14 + drum_note 1, 15 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 15 + drum_note 5, 4 + ;musicef 250 + drum_note 2, 5 + ;musicef 252 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 15 + drum_note 4, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 14 + drum_speed 7 + drum_note 6, 16 + drum_speed 1 + rest 4 + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + sound_call Branch_1dfd8d + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 15 + drum_note 4, 14 + drum_note 1, 8 + drum_note 2, 7 + drum_note 4, 7 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 14 + drum_note 2, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_note 2, 8 + drum_note 1, 14 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_speed 7 + drum_note 6, 16 + drum_speed 1 + rest 4 + sound_ret Branch_1dfd47: octave 1 - notetype 1 - note C_, 15 - note C_, 14 - note D#, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C_, 14 - note D#, 15 - note C_, 14 - endchannel + drum_speed 1 + drum_note 1, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 14 + sound_ret Branch_1dfd54: octave 1 - notetype 1 - note C_, 15 - note C_, 14 - note D#, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C_, 14 - note D#, 15 - note C#, 14 - endchannel + drum_speed 1 + drum_note 1, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 2, 14 + sound_ret Branch_1dfd61: octave 1 - notetype 1 - note C_, 15 - note C_, 14 - note D#, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C_, 14 - note D#, 15 - note E_, 14 - endchannel + drum_speed 1 + drum_note 1, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 5, 14 + sound_ret Branch_1dfd6e: octave 1 - notetype 1 - note C_, 15 - note C_, 14 - note D#, 15 - note C_, 14 - note C#, 15 - note C_, 14 - note D#, 15 - note C_, 14 - endchannel + drum_speed 1 + drum_note 1, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 14 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + drum_note 1, 14 + sound_ret Branch_1dfd7a: octave 1 - notetype 1 - note C_, 15 - note C#, 14 - note E_, 15 - note C_, 7 - note C_, 7 - note C#, 15 - note C_, 14 - note D#, 15 - note C#, 4 - note C#, 5 - note C#, 5 - endchannel + drum_speed 1 + drum_note 1, 15 + drum_note 2, 14 + drum_note 5, 15 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 15 + drum_note 1, 14 + drum_note 4, 15 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + sound_ret Branch_1dfd8d: octave 1 - notetype 1 - note C_, 15 - note D#, 14 - note C#, 15 - note D#, 14 - note C_, 15 - note D#, 14 - note C#, 15 - note E_, 14 - endchannel - + drum_speed 1 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 15 + drum_note 4, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 15 + drum_note 5, 14 + sound_ret +; 0x1dfd99 diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm index a30f026e..08150658 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/diddly1.asm @@ -1,25 +1,28 @@ -Music_TCG2Diddly1: - db $80 - dw Music_TCG2Diddly1_Ch1 - db $01 - dw Music_TCG2Diddly1_Ch2 - db $02 - dw Music_TCG2Diddly1_Ch3 +Music_Diddly1: + channel_count 3 + channel 1, Music_Diddly1_Ch1 + channel 2, Music_Diddly1_Ch2 + channel 3, Music_Diddly1_Ch3 -Music_TCG2Diddly1_Ch2: +Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) notetype1 10 + ;musicf0 2 notetype0 1 octave 2 note D#, 2 note E_, 3 note D#, 3 note E_, 3 + ;musicef 254 note D#, 2 note E_, 3 + ;musicef 255 note D#, 3 note E_, 3 + ;musicef 1 note D#, 2 note E_, 3 + ;musicef 1 note D#, 3 note E_, 3 note D#, 2 @@ -52,11 +55,13 @@ Music_TCG2Diddly1_Ch2: note D_, 3 dec_octave note G#, 2 + ;musicef 1 note B_, 3 inc_octave note D_, 3 note F_, 3 dec_octave + ;musicef 253 note G#, 2 note B_, 3 inc_octave @@ -64,39 +69,47 @@ Music_TCG2Diddly1_Ch2: note F_, 3 dec_octave note G#, 2 + ;musicef 255 note B_, 3 inc_octave note D_, 3 note F_, 3 dec_octave + ;musicef 254 note G#, 2 note B_, 3 inc_octave note D_, 3 note F_, 3 dec_octave + ;musicef 255 note G#, 2 note B_, 3 inc_octave note D_, 3 note F_, 3 - endchannel + sound_ret -Music_TCG2Diddly1_Ch1: +Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) notetype1 10 + ;musicf0 2 notetype0 1 octave 1 + ;musicef 1 note G_, 2 note G#, 3 note G_, 3 note G#, 3 + ;musicef 254 note G_, 2 note G#, 3 + ;musicef 255 note G_, 3 note G#, 3 note G_, 2 note G#, 3 + ;musicef 1 note G_, 3 note G#, 3 note G_, 2 @@ -139,42 +152,49 @@ Music_TCG2Diddly1_Ch1: dec_octave note G#, 3 note A#, 3 + ;musicef 253 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 + ;musicef 254 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 + ;musicef 254 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 + ;musicef 255 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 - endchannel + sound_ret -Music_TCG2Diddly1_Ch3: +Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) notetype1 10 + ;notetype2 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype0 1 + ;musicdc 255 octave 2 notetype1 1 note C_, 2 note C#, 3 notetype1 2 + ;musicef 252 note C_, 3 note C#, 3 note C_, 2 @@ -236,5 +256,5 @@ Music_TCG2Diddly1_Ch3: inc_octave note C_, 3 note E_, 3 - endchannel - + sound_ret +; 0x1ebd67 diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/diddly2.asm index 63edc713..c579bcfe 100644 --- a/crysaudio/music/TCG2/diddly2.asm +++ b/crysaudio/music/TCG2/diddly2.asm @@ -1,14 +1,14 @@ -Music_TCG2Diddly2: - db $80 - dw Music_TCG2Diddly2_Ch1 - db $01 - dw Music_TCG2Diddly2_Ch2 - db $02 - dw Music_TCG2Diddly2_Ch3 +Music_Diddly2: + channel_count 3 + channel 1, Music_Diddly2_Ch1 + channel 2, Music_Diddly2_Ch2 + channel 3, Music_Diddly2_Ch3 -Music_TCG2Diddly2_Ch2: +Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) notetype1 10 + ;musicf0 2 notetype0 1 + ;musicdc 255 octave 2 note B_, 5 note D_, 4 @@ -58,22 +58,27 @@ Music_TCG2Diddly2_Ch2: note G#, 3 note G_, 3 note G#, 3 + ;musicef 254 note G_, 4 note G#, 3 note G_, 3 note G#, 3 + ;musicef 254 note G_, 3 note G#, 3 note G_, 3 + ;musicef 255 note G#, 3 note G_, 4 note G#, 3 - endchannel + sound_ret -Music_TCG2Diddly2_Ch1: +Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) notetype1 10 + ;musicf0 2 notetype0 1 + ;musicdc 255 octave 2 note F_, 4 dec_octave @@ -142,11 +147,13 @@ Music_TCG2Diddly2_Ch1: inc_octave note C_, 3 dec_octave + ;musicef 254 note B_, 4 inc_octave note C_, 3 dec_octave note B_, 3 + ;musicef 254 inc_octave note C_, 3 dec_octave @@ -154,6 +161,7 @@ Music_TCG2Diddly2_Ch1: inc_octave note C_, 3 dec_octave + ;musicef 255 note B_, 3 inc_octave note C_, 3 @@ -161,13 +169,16 @@ Music_TCG2Diddly2_Ch1: note B_, 4 inc_octave note C_, 3 - endchannel + sound_ret -Music_TCG2Diddly2_Ch3: +Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) notetype1 10 notetype2 14 notetype0 1 + ;musice9 128 + ;musicdc 255 + ;musice8 7 notetype1 1 octave 2 note G_, 5 @@ -203,6 +214,7 @@ Music_TCG2Diddly2_Ch3: note G_, 5 note G_, 4 note G_, 4 + ;musicf1 64 note G_, 4 note G_, 4 note G_, 4 @@ -220,5 +232,5 @@ Music_TCG2Diddly2_Ch3: note G_, 4 note G_, 4 note G_, 4 - endchannel - + sound_ret +; 0x1ebe5d diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm index 447cb186..591ae08d 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/diddly3.asm @@ -1,54 +1,67 @@ -Music_TCG2Diddly3: - db $80 - dw Music_TCG2Diddly3_Ch1 - db $01 - dw Music_TCG2Diddly3_Ch2 - db $02 - dw Music_TCG2Diddly3_Ch3 +Music_Diddly3: + channel_count 3 + channel 1, Music_Diddly3_Ch1 + channel 2, Music_Diddly3_Ch2 + channel 3, Music_Diddly3_Ch3 -Music_TCG2Diddly3_Ch2: +Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d) notetype1 10 + ;musicf0 2 notetype0 1 + ;musicdc 255 octave 5 note C_, 3 dec_octave + ;musicf1 48 note C_, 2 note C_, 1 + ;musicf1 0 note G_, 3 inc_octave note C_, 3 note G_, 3 inc_octave + ;musicf1 48 note C_, 5 note C_, 6 - endchannel + sound_ret -Music_TCG2Diddly3_Ch1: +Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) notetype1 10 + ;musicf0 2 notetype0 1 - note __, 1 + ;musicdc 255 + ;musicef 253 + rest 1 octave 5 note C_, 3 dec_octave + ;musicf1 48 note C_, 2 note C_, 1 + ;musicf1 0 note G_, 3 inc_octave note C_, 3 note G_, 3 inc_octave + ;musicf1 48 note C_, 5 note C_, 6 - endchannel + sound_ret -Music_TCG2Diddly3_Ch3: +Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) notetype1 10 + ;notetype2 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype0 1 notetype1 2 + ;musice9 128 + ;musicdc 255 notetype0 1 + ;musice8 7 octave 5 note G_, 3 dec_octave @@ -61,5 +74,5 @@ Music_TCG2Diddly3_Ch3: note C_, 4 notetype1 128 note C_, 4 - endchannel - + sound_ret +; 0x1ebeae diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/diddly4.asm index 5a450cf5..27424bf2 100644 --- a/crysaudio/music/TCG2/diddly4.asm +++ b/crysaudio/music/TCG2/diddly4.asm @@ -1,15 +1,16 @@ -Music_TCG2Diddly4: - db $80 - dw Music_TCG2Diddly4_Ch1 - db $01 - dw Music_TCG2Diddly4_Ch2 - db $02 - dw Music_TCG2Diddly4_Ch3 +Music_Diddly4: + channel_count 3 + channel 1, Music_Diddly4_Ch1 + channel 2, Music_Diddly4_Ch2 + channel 3, Music_Diddly4_Ch3 -Music_TCG2Diddly4_Ch2: +Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) notetype1 10 + ;musicf0 0 notetype0 1 + ;musicdc 255 octave 3 + ;musicf1 87 note C_, 4 note C_, 2 note A_, 4 @@ -25,13 +26,16 @@ Music_TCG2Diddly4_Ch2: inc_octave note F_, 15 note F_, 11 - endchannel + sound_ret -Music_TCG2Diddly4_Ch1: +Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) notetype1 10 + ;musicf0 0 notetype0 1 + ;musicdc 255 octave 2 + ;musicf1 87 note A_, 4 note A_, 2 inc_octave @@ -47,22 +51,27 @@ Music_TCG2Diddly4_Ch1: note C_, 2 note A_, 15 note A_, 11 - endchannel + sound_ret -Music_TCG2Diddly4_Ch3: +Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0) notetype1 10 notetype2 14 notetype0 1 notetype1 2 + ;musice9 128 + ;musicdc 255 notetype0 1 - note __, 6 - note __, 5 - note __, 6 - note __, 5 - note __, 6 + ;musice8 1 + rest 6 + rest 5 + rest 6 + rest 5 + rest 6 + ;musicf1 128 octave 4 note F_, 16 + ;tie note F_, 6 - endchannel - + sound_ret +; 0x1ebefa diff --git a/crysaudio/music/TCG2/diddly5.asm b/crysaudio/music/TCG2/diddly5.asm index 5eb14580..1f230cb1 100644 --- a/crysaudio/music/TCG2/diddly5.asm +++ b/crysaudio/music/TCG2/diddly5.asm @@ -1,12 +1,13 @@ -Music_TCG2Diddly5: - db $40 - dw Music_TCG2Diddly5_Ch1 - db $01 - dw Music_TCG2Diddly5_Ch2 +Music_Diddly5: + channel_count 2 + channel 1, Music_Diddly5_Ch1 + channel 2, Music_Diddly5_Ch2 -Music_TCG2Diddly5_Ch2: +Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) notetype1 10 + ;musicf0 2 notetype0 1 + ;musicdc 255 octave 3 note G_, 2 note B_, 3 @@ -30,13 +31,17 @@ Music_TCG2Diddly5_Ch2: inc_octave note D_, 3 note G_, 3 + ;musicef 252 note G_, 3 - endchannel + sound_ret -Music_TCG2Diddly5_Ch1: +Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b) notetype1 10 + ;musicf0 2 notetype0 1 + ;musicdc 255 + ;musicef 254 octave 2 note B_, 2 inc_octave @@ -60,6 +65,7 @@ Music_TCG2Diddly5_Ch1: note D_, 3 note G_, 3 note B_, 3 + ;musicef 252 note B_, 3 - endchannel - + sound_ret +; 0x1ebf3e diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index 085478bd..df4019c1 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -1,72 +1,104 @@ -Music_TCG2Diddly6: - db $C0 - dw Music_TCG2Diddly6_Ch1 - db $01 - dw Music_TCG2Diddly6_Ch2 - db $02 - dw Music_TCG2Diddly6_Ch3 - db $03 - dw Music_TCG2Diddly6_Ch4 +Music_Diddly6: + channel_count 4 + channel 1, Music_Diddly6_Ch1 + channel 2, Music_Diddly6_Ch2 + channel 3, Music_Diddly6_Ch3 + channel 4, Music_Diddly6_Ch4 -Music_TCG2Diddly6_Ch2: +Music_Diddly6_Ch2: ; 1f76dc (7d:76dc) notetype1 10 + ;musicf0 34 notetype0 1 + ;musicdc 255 + ;musicef 252 octave 3 note F_, 2 + ;musicef 1 note G_, 3 + ;musicef 1 note A_, 2 + ;musicef 1 note B_, 3 inc_octave + ;musicef 1 note C_, 2 note D_, 3 note E_, 2 note F_, 3 + ;musicf1 87 note G_, 16 + ;tie note G_, 14 note G_, 11 note A#, 16 + ;tie note A#, 5 note A#, 10 note G_, 6 note A#, 4 note A_, 16 + ;tie note A_, 14 note A_, 11 inc_octave note C_, 16 + ;tie note C_, 14 note C_, 11 dec_octave note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 13 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 7 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 2 notetype0 2 note B_, 10 - endchannel + sound_ret -Music_TCG2Diddly6_Ch1: +Music_Diddly6_Ch1: ; 1f7731 (7d:7731) notetype1 10 + ;musicf0 23 notetype0 1 + ;musicdc 255 + ;musicef 252 octave 3 note C_, 2 + ;musicef 1 note D_, 3 + ;musicef 1 note E_, 2 + ;musicef 1 note F_, 3 + ;musicef 1 note G_, 2 note A_, 3 note B_, 2 @@ -129,8 +161,11 @@ Music_TCG2Diddly6_Ch1: note C_, 5 note A_, 5 octave 4 + ;musicf0 34 + ;musicef 253 note D_, 6 octave 4 + ;musicf0 23 note G_, 5 note D_, 5 note B_, 5 @@ -179,78 +214,111 @@ Music_TCG2Diddly6_Ch1: note B_, 5 inc_octave note D_, 5 + ;musicf0 26 + ;musicf1 87 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 2 notetype0 2 note G_, 10 - endchannel + sound_ret -Music_TCG2Diddly6_Ch3: +Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) notetype1 10 + ;notetype2 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype1 1 + ;musice9 96 notetype0 1 - note __, 10 - note __, 10 + ;musicdc 17 + rest 10 + rest 10 octave 2 + ;musice8 4 note D#, 16 + ;tie note D#, 16 + ;tie note D#, 16 + ;tie note D#, 16 + ;tie note D#, 16 + ;tie note D#, 2 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 2 .Loop1 + ;musice8 4 notetype0 7 note G_, 3 notetype0 10 note D_, 2 - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 notetype0 1 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 2 notetype0 2 + ;musice8 1 note G_, 10 - endchannel + sound_ret -Music_TCG2Diddly6_Ch4: - togglenoise $06 +Music_Diddly6_Ch4: ; 1f7812 (7d:7812) + toggle_noise 6 octave 1 - notetype 1 - note __, 10 - note __, 10 - note C#, 6 + drum_speed 1 + ;musicdc 255 + rest 10 + rest 10 + ;musicef 1 + drum_note 2, 6 + ;musicef 254 .Loop1 - note D_, 5 - loopchannel 7, .Loop1 + drum_note 3, 5 + sound_loop 7, .Loop1 .Loop2 - note D_, 6 + drum_note 3, 6 rept 7 - note D_, 5 + drum_note 3, 5 endr - loopchannel 3, .Loop2 + sound_loop 3, .Loop2 + ;musicef 0 .Loop3 - notetype 7 - note C#, 3 - notetype 10 - note C#, 2 - loopchannel 4, .Loop3 - notetype 7 - note F_, 12 - endchannel - + drum_speed 7 + drum_note 2, 3 + drum_speed 10 + drum_note 2, 2 + sound_loop 4, .Loop3 + ;musicef 2 + drum_speed 7 + drum_note 6, 12 + sound_ret +; 0x1f783b diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm index 19f5fcb8..9d165c69 100644 --- a/crysaudio/music/TCG2/fort1.asm +++ b/crysaudio/music/TCG2/fort1.asm @@ -1,409 +1,568 @@ -Music_TCG2Fort1: - db $C0 - dw Music_TCG2Fort1_Ch1 - db $01 - dw Music_TCG2Fort1_Ch2 - db $02 - dw Music_TCG2Fort1_Ch3 - db $03 - dw Music_TCG2Fort1_Ch4 +Music_Fort1: + channel_count 4 + channel 1, Music_Fort1_Ch1 + channel 2, Music_Fort1_Ch2 + channel 3, Music_Fort1_Ch3 + channel 4, Music_Fort1_Ch4 -Music_TCG2Fort1_Ch2: +Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) notetype1 10 notetype0 1 + ;musicdc 17 + ;musicf0 16 octave 2 note A#, 3 note B_, 3 inc_octave note C_, 3 + ;musicf1 69 note C#, 6 note C#, 2 + ;tie note C#, 16 - note __, 7 + rest 7 note E_, 6 note E_, 16 - note __, 2 - vibrato 16, $33 + rest 2 + ;musicf1 70 + ;musicf0 2 + ;musicf3 + vibrato 16, 3, 3 octave 4 note D#, 3 note E_, 4 .MainLoop - callchannel Branch_1ed865 + sound_call Branch_1ed865 + ;musicf3 note C#, 16 + ;tie note C#, 15 note E_, 2 + ;musicf2 note F#, 14 + ;tie note F#, 8 note F#, 7 - callchannel Branch_1ed865 + ;musicf3 + sound_call Branch_1ed865 + ;musicf3 note C#, 16 note D#, 15 note E_, 16 note F#, 15 - callchannel Branch_1ed8a8 + sound_call Branch_1ed8a8 note G_, 16 note F#, 15 note E_, 16 + ;musicf2 note D_, 8 note D_, 15 + ;tie note D_, 8 dec_octave note B_, 8 note B_, 15 + ;tie note B_, 8 inc_octave + ;musicf3 note D#, 3 + ;musicf2 note E_, 12 + ;tie + note E_, 16 + ;tie + note E_, 15 + ;tie note E_, 16 note E_, 15 - note E_, 16 - note E_, 15 + ;musicf3 note D#, 2 note E_, 14 + ;tie note E_, 15 note F#, 16 + ;tie note F#, 15 - callchannel Branch_1ed8a8 + sound_call Branch_1ed8a8 note G_, 16 note F#, 15 note E_, 16 + ;musicf2 note D_, 8 note D_, 15 + ;tie note D_, 8 dec_octave note B_, 8 note B_, 7 inc_octave + ;musicf3 note D#, 2 + ;musicf2 note E_, 14 + ;tie note E_, 15 + ;tie note E_, 16 + ;tie note E_, 15 + ;tie note E_, 16 + ;tie note E_, 15 + ;tie note E_, 16 + ;tie note E_, 15 + ;tie note E_, 16 + ;tie note E_, 15 + ;tie note E_, 16 + ;tie note E_, 13 note E_, 2 + ;musicf1 53 note D#, 6 note D#, 16 - note __, 9 + rest 9 note D#, 6 note D#, 16 - note __, 9 + rest 9 + ;musicf1 70 + ;musicf3 note F#, 16 + ;musicf2 note G#, 8 note G#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note D#, 8 note D#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 + ;musicf2 note F#, 8 note F#, 7 + ;tie note F#, 16 note E_, 8 note E_, 7 note E_, 16 + ;tie note E_, 8 note E_, 7 + ;musicf3 note E_, 16 note D#, 15 note E_, 16 + ;musicf2 note F#, 8 note F#, 7 + ;musicf3 note F#, 16 + ;musicf2 note G#, 8 note G#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note D#, 8 note D#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 note D#, 2 note E_, 13 + ;tie note E_, 16 + ;tie note E_, 15 - callchannel Branch_1edb5a + sound_call Branch_1edb5a octave 4 note E_, 15 + ;tie note E_, 16 note D#, 15 note E_, 16 + ;musicf2 note F#, 8 note F#, 7 + ;musicf3 note F#, 16 + ;musicf2 note G#, 8 note G#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note D#, 8 note D#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 + ;musicf2 note F#, 8 note F#, 7 + ;tie note F#, 16 note E_, 8 note E_, 7 note E_, 16 + ;tie note E_, 8 note E_, 7 + ;musicf3 note E_, 16 note D#, 15 note E_, 16 + ;musicf2 note F#, 8 note F#, 7 + ;musicf3 note F#, 16 + ;musicf2 note G#, 8 note G#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note D#, 8 note D#, 7 - callchannel Branch_1edb5a + ;musicec 255 + sound_call Branch_1edb5a octave 4 note D#, 2 note E_, 13 + ;tie note E_, 16 + ;tie note E_, 15 - callchannel Branch_1edb5a + sound_call Branch_1edb5a octave 4 note E_, 15 + ;tie note E_, 16 note D#, 15 note E_, 16 + ;musicf2 note F#, 8 note F#, 7 + ;musicf3 note F#, 16 + ;musicf2 note G_, 8 note G_, 7 - callchannel Branch_1edb5a + sound_call Branch_1edb5a octave 4 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note G_, 8 note G_, 7 - callchannel Branch_1edb5a + sound_call Branch_1edb5a octave 4 note G_, 2 note A_, 13 + ;tie note A_, 16 + ;tie note A_, 15 - callchannel Branch_1edb5a + ;musicec 2 + sound_call Branch_1edb5a octave 4 note F#, 15 + ;tie note F#, 16 + ;tie note F#, 15 - callchannel Branch_1edb5a + ;musicec 2 + sound_call Branch_1edb5a octave 4 + ;musicf2 note F#, 8 note F#, 7 + ;musicf3 note G_, 16 + ;musicf2 note F#, 8 note F#, 7 note E_, 8 note E_, 8 note D_, 8 note D_, 15 + ;tie note D_, 8 dec_octave note B_, 8 note B_, 15 + ;tie note B_, 8 + ;musicf3 inc_octave note D#, 2 + ;musicf2 note E_, 13 + ;tie + note E_, 16 + ;tie + note E_, 15 + ;tie + note E_, 16 + ;tie + note E_, 15 + ;tie + note E_, 16 + ;tie + note E_, 15 + ;tie + note E_, 16 + ;tie + note E_, 15 + ;tie + note E_, 16 + ;tie + note E_, 15 + ;tie note E_, 16 note E_, 15 - note E_, 16 - note E_, 15 - note E_, 16 - note E_, 15 - note E_, 16 - note E_, 15 - note E_, 16 - note E_, 15 - note E_, 16 - note E_, 15 + ;musicf1 53 .Loop1 note D#, 6 note D#, 16 - note __, 9 - loopchannel 2, .Loop1 - loopchannel 0, .MainLoop + rest 9 + sound_loop 2, .Loop1 + sound_loop 0, .MainLoop Branch_1ed865: + ;musicf0 2 octave 4 + ;musicf1 70 + ;musicf3 note D#, 16 note C#, 15 note D#, 16 + ;musicf2 note G#, 8 note G#, 15 + ;tie note G#, 8 dec_octave note B_, 8 note B_, 15 + ;tie note B_, 8 + ;musicf3 inc_octave note D_, 2 + ;musicf2 note D#, 6 note D#, 7 + ;tie note D#, 16 note C#, 8 note C#, 7 note C#, 16 + ;tie note C#, 8 note C#, 7 + ;musicf3 note C#, 16 note D#, 15 note E_, 16 + ;musicf2 note F#, 8 note F#, 7 + ;musicf3 note D#, 16 note C#, 15 note D#, 16 + ;musicf2 note G#, 8 note G#, 15 + ;tie note G#, 8 dec_octave note B_, 8 note B_, 15 + ;tie note B_, 8 inc_octave + ;musicf3 note C_, 2 + ;musicf2 note C#, 13 + ;tie + note C#, 16 + ;tie + note C#, 15 + ;tie note C#, 16 note C#, 15 - note C#, 16 - note C#, 15 - endchannel + sound_ret Branch_1ed8a8: + ;musicf0 2 octave 4 + ;musicf1 70 + ;musicf3 note G_, 16 note F#, 15 note G_, 16 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note G_, 8 note G_, 15 + ;tie note G_, 8 + ;musicf3 note G#, 3 + ;musicf2 note A_, 12 + ;tie note A_, 16 + ;tie note A_, 15 note A_, 16 note F#, 15 + ;tie note F#, 16 + ;tie note F#, 15 note F#, 16 note F#, 8 note F#, 7 - endchannel + ;musicf3 + sound_ret -Music_TCG2Fort1_Ch1: +Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) notetype1 10 notetype0 1 - dutycycle 0 + duty_cycle 0 notetype1 9 - vibrato 18, $33 + ;musicdc 17 + ;vibrato_type 10 + vibrato 18, 3, 3 + ;musicf0 16 octave 2 - note __, 9 + rest 9 + ;musicf1 69 note A_, 6 note A_, 16 - note __, 9 + rest 9 inc_octave note C#, 6 note C#, 10 - note __, 8 - note __, 7 + rest 8 + rest 7 + ;musicf1 70 .MainLoop + ;musicf0 16 octave 3 + ;musicf1 70 .Loop1 - note __, 16 - note __, 15 + rest 16 + rest 15 note D#, 6 note D#, 10 - note __, 15 - loopchannel 2, .Loop1 + rest 15 + sound_loop 2, .Loop1 .Loop2 - note __, 16 - note __, 15 + rest 16 + rest 15 note C#, 6 note C#, 10 - note __, 15 - loopchannel 2, .Loop2 + rest 15 + sound_loop 2, .Loop2 .Loop3 - note __, 16 - note __, 15 + rest 16 + rest 15 note D#, 6 note D#, 10 - note __, 15 - loopchannel 2, .Loop3 - note __, 16 - note __, 15 + rest 15 + sound_loop 2, .Loop3 + rest 16 + rest 15 note C#, 6 note C#, 10 - note __, 15 + rest 15 + ;musicf3 notetype1 8 note D#, 3 note E_, 13 + ;tie note E_, 15 note D#, 16 + ;tie note D#, 15 dec_octave note B_, 16 + ;tie note B_, 15 + ;musicf0 16 + ;musicf1 70 octave 3 note D#, 6 note D#, 10 - note __, 15 - note __, 16 - note __, 15 + rest 15 + rest 16 + rest 15 note D#, 6 note D#, 10 - note __, 15 + rest 15 .Loop4 - note __, 16 - note __, 15 + rest 16 + rest 15 note C#, 6 note C#, 10 - note __, 15 - loopchannel 2, .Loop4 + rest 15 + sound_loop 2, .Loop4 .Loop5 - note __, 16 - note __, 15 + rest 16 + rest 15 note D#, 6 note D#, 10 - note __, 15 - loopchannel 2, .Loop5 - note __, 16 - note __, 15 + rest 15 + sound_loop 2, .Loop5 + rest 16 + rest 15 + ;musicf3 note C#, 6 note C#, 10 - note __, 8 + rest 8 + ;musicf0 30 octave 4 + ;musicf3 note D_, 3 note D#, 4 note E_, 16 @@ -414,96 +573,138 @@ Music_TCG2Fort1_Ch1: note D#, 15 note E_, 16 note D_, 15 - callchannel Branch_1edb4e + sound_call Branch_1edb4e octave 4 + ;musicf2 note G_, 8 note G_, 15 + ;tie note G_, 8 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + sound_call Branch_1edb4e octave 4 note F#, 15 + ;tie note F#, 16 + ;tie note F#, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e inc_octave note D_, 15 + ;tie note D_, 16 + ;tie note D_, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D_, 8 note D_, 7 note E_, 16 note D_, 15 - callchannel Branch_1edb4e + ;musicec 252 + sound_call Branch_1edb4e + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note G_, 8 note G_, 7 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 note C_, 15 + ;tie note C_, 16 + ;tie note C_, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 - note __, 15 + rest 15 note C_, 16 + ;tie note C_, 15 note D_, 16 + ;tie note D_, 15 note E_, 16 note D_, 15 - callchannel Branch_1edb4e + sound_call Branch_1edb4e octave 4 + ;musicf2 note G_, 8 note G_, 15 + ;tie note G_, 8 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + sound_call Branch_1edb4e octave 4 note F#, 15 + ;tie note F#, 16 + ;tie note F#, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 note D_, 15 + ;tie note D_, 16 + ;tie note D_, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D_, 8 note D_, 7 + ;musicf3 note E_, 16 note D_, 15 note C_, 16 dec_octave + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 + ;musicf0 16 octave 3 + ;musicf2 note D_, 6 note D_, 9 + ;musicf0 30 + ;musicf3 + ;musicef 2 + ;musicf2 inc_octave note C_, 16 + ;tie note C_, 15 note C_, 16 dec_octave + ;musicf1 69 note G_, 8 note G_, 7 note A_, 16 + ;tie note A_, 15 note A_, 16 note B_, 8 note B_, 7 + ;musicf3 inc_octave note C_, 16 + ;tie note C_, 15 dec_octave + ;musicef 2 note D_, 4 note E_, 4 note F_, 4 @@ -514,173 +715,250 @@ Music_TCG2Fort1_Ch1: note C_, 4 note D_, 3 dec_octave + ;musicef 254 + ;musicf1 53 note A_, 6 note A_, 16 - note __, 9 + rest 9 note A_, 6 note A_, 16 - note __, 9 + rest 9 + ;musicf3 + ;musicef 254 + ;musicf1 70 inc_octave note D#, 16 + ;musicf2 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note G#, 8 note G#, 15 + ;tie note G#, 8 dec_octave note B_, 8 note B_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D#, 8 note D#, 7 + ;tie note D#, 16 note C#, 8 note C#, 7 - callchannel Branch_1edb4e - note __, 8 - note __, 7 + ;musicec 253 + sound_call Branch_1edb4e + rest 8 + rest 7 octave 4 note C#, 16 dec_octave note B_, 15 - callchannel Branch_1edb4e + ;musicec 253 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D#, 8 note D#, 7 + ;musicf3 note D#, 16 + ;musicf2 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note G#, 8 note G#, 15 + ;tie note G#, 8 dec_octave note B_, 8 note B_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 note C#, 15 + ;tie note C#, 16 + ;tie note C#, 15 - callchannel Branch_1edb4e + ;musicec 253 + sound_call Branch_1edb4e octave 3 + ;musicf2 note A_, 15 + ;tie note A_, 8 note A_, 8 note A_, 15 - callchannel Branch_1edb4e + ;musicec 253 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D#, 8 note D#, 7 + ;musicf3 note D#, 16 + ;musicf2 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note G#, 8 note G#, 15 + ;tie note G#, 8 dec_octave note B_, 8 note B_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D#, 8 note D#, 7 + ;tie note D#, 16 note C#, 8 note C#, 7 - callchannel Branch_1edb4e - note __, 8 - note __, 7 + ;musicec 253 + sound_call Branch_1edb4e + rest 8 + rest 7 octave 4 note C#, 16 dec_octave note B_, 15 - callchannel Branch_1edb4e + ;musicec 253 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D#, 8 note D#, 7 + ;musicf3 note D#, 16 + ;musicf2 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note G#, 8 note G#, 15 + ;tie note G#, 8 dec_octave note B_, 8 note B_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 note C#, 15 + ;tie note C#, 16 + ;tie note C#, 15 - callchannel Branch_1edb4e + ;musicec 253 + sound_call Branch_1edb4e octave 3 + ;musicf2 note A_, 15 + ;tie note A_, 8 note A_, 8 note A_, 15 - callchannel Branch_1edb4e + ;musicec 253 + sound_call Branch_1edb4e octave 3 note A_, 15 inc_octave note D_, 16 + ;musicf2 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 + ;musicf2 note G_, 8 note G_, 15 + ;tie note G_, 8 note E_, 8 note E_, 7 - callchannel Branch_1edb4e + ;musicec 251 + sound_call Branch_1edb4e octave 4 note F#, 15 + ;tie note F#, 16 + ;tie note F#, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 note D_, 15 + ;tie note D_, 16 + ;tie note D_, 15 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 + ;musicf2 note D_, 8 note D_, 7 + ;musicf3 note E_, 16 + ;musicf2 note D_, 8 note D_, 7 - callchannel Branch_1edb4e + ;musicec 252 + sound_call Branch_1edb4e octave 3 + ;musicf2 note B_, 8 note B_, 15 + ;tie note B_, 8 note G_, 8 note G_, 7 - callchannel Branch_1edb4e + ;musicec 254 + sound_call Branch_1edb4e octave 4 + ;musicf2 note C_, 15 + ;tie note C_, 16 + ;tie note C_, 15 note C_, 16 dec_octave + ;musicef 2 + ;musicf1 69 note G_, 8 note G_, 7 note A_, 16 + ;tie note A_, 15 note A_, 16 note B_, 8 note B_, 7 + ;musicf3 inc_octave note C_, 16 + ;tie note C_, 15 dec_octave note D_, 4 @@ -692,46 +970,67 @@ Music_TCG2Fort1_Ch1: inc_octave note C_, 4 note D_, 3 + ;musicf1 53 dec_octave .Loop6 note A_, 6 note A_, 16 - note __, 9 - loopchannel 2, .Loop6 - loopchannel 0, .MainLoop + rest 9 + sound_loop 2, .Loop6 + ;musicef 254 + sound_loop 0, .MainLoop Branch_1edb4e: + ;musicf0 16 octave 3 + ;musicf2 note E_, 6 note E_, 10 - endchannel + ;musicf0 30 + ;musicf3 + ;musicec 0 + sound_ret Branch_1edb5a: + ;musicf0 16 octave 3 + ;musicf2 note E_, 6 note E_, 10 - endchannel + ;musicf0 2 + ;musicf3 + ;musicec 0 + sound_ret -Music_TCG2Fort1_Ch3: +Music_Fort1_Ch3: ; 1edb66 (7b:5b66) notetype1 10 notetype0 1 notetype2 14 notetype1 1 + ;musice9 96 + ;musicdc 17 octave 2 - note __, 9 + ;musice8 1 + rest 9 note F#, 6 + ;tie note F#, 16 - note __, 9 + rest 9 note B_, 6 + ;tie note B_, 16 - note __, 9 + rest 9 .MainLoop octave 2 + ;musice8 7 note E_, 16 + ;tie note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note B_, 15 inc_octave @@ -739,23 +1038,32 @@ Music_TCG2Fort1_Ch3: dec_octave note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note A_, 15 - note __, 16 + rest 16 note E_, 15 + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note A_, 15 note E_, 16 + ;tie note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note B_, 15 inc_octave @@ -763,23 +1071,32 @@ Music_TCG2Fort1_Ch3: dec_octave note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note A_, 15 dec_octave note A_, 16 + ;tie note A_, 15 note B_, 16 + ;tie note B_, 15 note E_, 16 + ;tie note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note B_, 15 inc_octave @@ -787,23 +1104,32 @@ Music_TCG2Fort1_Ch3: dec_octave note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note A_, 15 - note __, 16 + rest 16 note E_, 15 + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note A_, 15 note E_, 16 + ;tie note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note B_, 15 inc_octave @@ -811,76 +1137,105 @@ Music_TCG2Fort1_Ch3: dec_octave note E_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note A_, 15 dec_octave note A_, 16 + ;tie note A_, 15 note B_, 16 + ;tie note B_, 15 inc_octave note C_, 16 + ;tie note C_, 15 + ;musice8 3 note B_, 16 + ;musice8 7 dec_octave note G_, 15 inc_octave note C_, 16 dec_octave note G_, 15 + ;musice8 3 inc_octave note B_, 16 + ;musice8 7 dec_octave note B_, 15 + ;tie note B_, 8 - note __, 8 + rest 8 note B_, 15 inc_octave + ;musice8 3 note A_, 16 + ;musice8 7 note B_, 15 - note __, 16 + rest 16 note F#, 15 + ;musice8 3 note A_, 16 + ;musice8 7 dec_octave note B_, 15 note A_, 8 - note __, 8 + rest 8 note A_, 15 inc_octave + ;musice8 3 note G_, 16 + ;musice8 7 dec_octave note A_, 15 note B_, 8 - note __, 8 + rest 8 note B_, 15 inc_octave + ;musice8 3 note A_, 16 + ;musice8 7 dec_octave note B_, 4 + ;tie inc_octave note C_, 11 + ;tie note C_, 16 note C_, 15 + ;musice8 3 note B_, 16 + ;musice8 7 dec_octave note G_, 15 inc_octave note C_, 16 + ;tie note C_, 15 dec_octave note B_, 16 + ;tie note B_, 15 note A_, 16 + ;tie note A_, 15 inc_octave inc_octave + ;musice8 3 note C_, 16 + ;musice8 7 dec_octave dec_octave note E_, 15 @@ -888,463 +1243,537 @@ Music_TCG2Fort1_Ch3: note E_, 15 inc_octave inc_octave + ;musice8 3 note C_, 16 + ;musice8 7 dec_octave dec_octave note B_, 15 + ;tie note B_, 8 - note __, 8 + rest 8 note B_, 15 inc_octave + ;musice8 3 note A_, 16 + ;musice8 7 note B_, 15 - note __, 16 + rest 16 note F#, 15 + ;musice8 3 note A_, 16 + ;musice8 7 dec_octave note B_, 15 inc_octave note C_, 8 - note __, 8 + rest 8 note G_, 8 - note __, 7 + rest 7 inc_octave + ;musice8 3 note G_, 16 + ;musice8 7 dec_octave dec_octave note B_, 8 - note __, 7 + rest 7 inc_octave note F#, 8 - note __, 8 + rest 8 + ;musice8 6 note F#, 8 - note __, 7 + rest 7 + ;musice8 7 dec_octave note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 inc_octave + ;musice8 3 note C_, 16 + ;musice8 7 dec_octave note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 inc_octave + ;musice8 3 note C_, 16 + ;musice8 7 dec_octave note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 inc_octave + ;musice8 3 note C_, 16 + ;musice8 8 note F_, 8 - note __, 7 + rest 7 dec_octave note B_, 10 - note __, 16 - note __, 5 + rest 16 + rest 5 note B_, 10 - note __, 16 - note __, 5 + rest 16 + rest 5 note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note B_, 8 - note __, 8 + rest 8 note B_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note A_, 16 + ;musice8 7 note F#, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note E_, 8 - note __, 8 + rest 8 note E_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 note A_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note G#, 16 + ;musice8 7 note E_, 8 - note __, 7 + rest 7 dec_octave note B_, 8 - note __, 8 + rest 8 note B_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note A_, 16 + ;musice8 7 note F#, 8 - note __, 7 + rest 7 note C_, 8 - note __, 8 + rest 8 note C_, 7 - note __, 8 + rest 8 + ;musice8 3 note G_, 16 + ;musice8 7 note G_, 8 - note __, 7 + rest 7 note C_, 8 - note __, 8 + rest 8 note C_, 7 - note __, 8 + rest 8 + ;musice8 3 note G_, 16 + ;musice8 7 note G_, 8 - note __, 7 + rest 7 dec_octave note G_, 8 - note __, 8 + rest 8 note G_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note B_, 16 + ;musice8 7 note D_, 8 - note __, 7 + rest 7 dec_octave note G_, 8 - note __, 8 + rest 8 note G_, 7 - note __, 8 + rest 8 inc_octave + ;musice8 3 note B_, 16 + ;musice8 7 note D_, 8 - note __, 7 + rest 7 dec_octave note A_, 8 - note __, 8 + rest 8 inc_octave note E_, 8 - note __, 7 + rest 7 + ;musice8 3 note G_, 16 + ;musice8 7 dec_octave + ;musice8 2 note B_, 15 + ;tie note B_, 16 + ;musice8 3 inc_octave note A_, 15 + ;musice8 7 note F#, 8 - note __, 8 + rest 8 dec_octave note B_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 note F_, 8 - note __, 8 + rest 8 note F_, 8 - note __, 7 + rest 7 .Loop1 + ;musice8 1 note B_, 7 + ;tie note B_, 16 - note __, 8 - loopchannel 2, .Loop1 - loopchannel 0, .MainLoop + rest 8 + sound_loop 2, .Loop1 + sound_loop 0, .MainLoop -Music_TCG2Fort1_Ch4: - togglenoise $06 - notetype 1 - note __, 1 +Music_Fort1_Ch4: ; 1ede26 (7b:5e26) + toggle_noise 6 + drum_speed 1 + rest 1 octave 1 - note __, 9 - note F#, 16 - note __, 15 - note F#, 16 - note __, 15 + rest 9 + drum_note 7, 16 + rest 15 + drum_note 7, 16 + rest 15 .MainLoop .Loop1 - callchannel Branch_1edebb - callchannel Branch_1edec8 - loopchannel 3, .Loop1 - callchannel Branch_1edebb - callchannel Branch_1eded5 - callchannel Branch_1edebb - callchannel Branch_1edec8 - callchannel Branch_1edebb - callchannel Branch_1eded5 - callchannel Branch_1edebb - callchannel Branch_1edec8 - note C_, 16 - note D#, 15 - note F#, 16 - note C_, 15 - note D#, 16 - note F#, 15 - note C_, 16 - note D#, 15 - note C_, 16 - note D#, 8 - note D#, 7 - note C_, 16 - note D#, 15 - note C_, 16 - note D#, 15 - note C_, 16 - note D#, 15 - note C_, 16 - note D_, 5 - note D_, 5 - note D_, 5 - note D_, 16 - note D#, 5 - note D#, 5 - note D#, 5 - note D_, 16 - note __, 15 + sound_call Branch_1edebb + sound_call Branch_1edec8 + sound_loop 3, .Loop1 + sound_call Branch_1edebb + sound_call Branch_1eded5 + sound_call Branch_1edebb + sound_call Branch_1edec8 + sound_call Branch_1edebb + sound_call Branch_1eded5 + sound_call Branch_1edebb + sound_call Branch_1edec8 + drum_note 1, 16 + drum_note 4, 15 + drum_note 7, 16 + drum_note 1, 15 + drum_note 4, 16 + drum_note 7, 15 + drum_note 1, 16 + drum_note 4, 15 + drum_note 1, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 16 + drum_note 4, 15 + drum_note 1, 16 + drum_note 4, 15 + drum_note 1, 16 + drum_note 4, 15 + drum_note 1, 16 + drum_note 3, 5 + drum_note 3, 5 + drum_note 3, 5 + drum_note 3, 16 + ;musicef 254 + drum_note 4, 5 + ;musicef 255 + drum_note 4, 5 + ;musicef 0 + drum_note 4, 5 + drum_note 3, 16 + rest 15 .Loop2 - callchannel Branch_1edee2 - callchannel Branch_1edeef - loopchannel 3, .Loop2 - callchannel Branch_1edee2 - note C_, 16 - note D#, 15 - note D_, 16 - note D#, 8 - note D#, 7 - note C_, 16 - note D#, 8 - note D_, 7 - note D_, 8 - note D_, 8 - note D_, 15 - callchannel Branch_1edee2 - callchannel Branch_1edee2 - note C_, 16 - note E_, 15 - note D_, 16 - note D_, 15 - note C_, 16 - note D_, 5 - note D_, 5 - note D_, 5 - note D_, 16 - note D#, 15 - note D_, 16 - note D#, 15 - note D_, 16 - note D#, 8 - note D#, 7 - note D_, 16 - note D#, 15 - note D_, 16 - note D#, 15 - note D_, 16 - note D#, 15 - note D_, 16 - note D_, 5 - note D_, 5 - note D_, 5 - note D_, 16 - note D#, 5 - note D#, 5 - note D#, 5 - note D_, 16 - note __, 15 - loopchannel 0, .MainLoop + sound_call Branch_1edee2 + sound_call Branch_1edeef + sound_loop 3, .Loop2 + sound_call Branch_1edee2 + drum_note 1, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 16 + drum_note 4, 8 + drum_note 3, 7 + drum_note 3, 8 + drum_note 3, 8 + drum_note 3, 15 + sound_call Branch_1edee2 + sound_call Branch_1edee2 + drum_note 1, 16 + drum_note 5, 15 + drum_note 3, 16 + drum_note 3, 15 + drum_note 1, 16 + ;musicef 254 + drum_note 3, 5 + ;musicef 255 + drum_note 3, 5 + ;musicef 0 + drum_note 3, 5 + drum_note 3, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 3, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 3, 5 + drum_note 3, 5 + drum_note 3, 5 + drum_note 3, 16 + ;musicef 254 + drum_note 4, 5 + ;musicef 255 + drum_note 4, 5 + ;musicef 0 + drum_note 4, 5 + drum_note 3, 16 + rest 15 + sound_loop 0, .MainLoop Branch_1edebb: octave 1 - notetype 1 - note C_, 16 - note D#, 15 - note F#, 16 - note D#, 8 - note D#, 7 - note C_, 16 - note D#, 15 - note F#, 16 - note D#, 15 - endchannel + drum_speed 1 + drum_note 1, 16 + drum_note 4, 15 + drum_note 7, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 16 + drum_note 4, 15 + drum_note 7, 16 + drum_note 4, 15 + sound_ret Branch_1edec8: octave 1 - notetype 1 - note C_, 16 - note D#, 15 - note F#, 16 - note D#, 8 - note D#, 7 - note C_, 16 - note D#, 15 - note F#, 16 - note E_, 15 - endchannel + drum_speed 1 + drum_note 1, 16 + drum_note 4, 15 + drum_note 7, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 16 + drum_note 4, 15 + drum_note 7, 16 + drum_note 5, 15 + sound_ret Branch_1eded5: octave 1 - notetype 1 - note C_, 16 - note D#, 15 - note F#, 16 - note D#, 8 - note D#, 7 - note F#, 16 - note C_, 15 - note F#, 16 - note C_, 15 - endchannel + drum_speed 1 + drum_note 1, 16 + drum_note 4, 15 + drum_note 7, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 7, 16 + drum_note 1, 15 + drum_note 7, 16 + drum_note 1, 15 + sound_ret Branch_1edee2: octave 1 - notetype 1 - note C_, 16 - note D#, 15 - note D_, 16 - note D#, 8 - note D#, 7 - note C_, 16 - note D#, 15 - note D_, 16 - note D#, 15 - endchannel + drum_speed 1 + drum_note 1, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 15 + sound_ret Branch_1edeef: octave 1 - notetype 1 - note C_, 16 - note D#, 15 - note D_, 16 - note D#, 8 - note D#, 7 - note C_, 16 - note D#, 15 - note D_, 16 - note E_, 15 - endchannel - + drum_speed 1 + drum_note 1, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 16 + drum_note 4, 15 + drum_note 3, 16 + drum_note 5, 15 + sound_ret +; 0x1edefc diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index 5091a0ee..a638e27a 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -1,229 +1,353 @@ -Music_TCG2Fort2: - db $C0 - dw Music_TCG2Fort2_Ch1 - db $01 - dw Music_TCG2Fort2_Ch2 - db $02 - dw Music_TCG2Fort2_Ch3 - db $03 - dw Music_TCG2Fort2_Ch4 +Music_Fort2: + channel_count 4 + channel 1, Music_Fort2_Ch1 + channel 2, Music_Fort2_Ch2 + channel 3, Music_Fort2_Ch3 + channel 4, Music_Fort2_Ch4 -Music_TCG2Fort2_Ch2: +Music_Fort2_Ch2: ; 1edefc (7b:5efc) notetype1 10 notetype0 1 + ;musicdc 17 .MainLoop octave 3 + ;musicf0 16 + ;musicf3 .Loop1 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 - callchannel Branch_1ee109 + rest 4 + rest 8 + sound_call Branch_1ee109 note G_, 4 note F#, 3 note G_, 4 - loopchannel 4, .Loop1 - vibrato 30, $33 + sound_loop 4, .Loop1 + ;musicf0 0 + vibrato 30, 3, 3 octave 2 + ;musicef 2 + ;musicf1 64 + ;musicf3 note B_, 15 inc_octave + ;musicf2 note D_, 8 note D_, 7 + ;musicf3 note F#, 15 + ;musicf2 note E_, 8 note E_, 7 + ;musicf3 note G#, 2 note A_, 15 + ;tie note A_, 6 + ;musicf2 note G_, 7 note G_, 15 note C#, 15 + ;tie note C#, 10 + ;tie note C#, 15 + ;tie note C#, 15 + ;tie note C#, 5 note C#, 15 note C#, 4 note C#, 11 note D_, 4 note D_, 11 + ;musicf3 note C#, 5 note D_, 5 note C#, 5 dec_octave + ;musicf2 note A_, 8 note A_, 7 + ;musicf3 note A#, 3 + ;musicf2 note B_, 5 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 10 note B_, 15 - note __, 8 + rest 8 + ;musicf3 note A_, 3 note A#, 4 note B_, 15 inc_octave + ;musicf2 note D_, 8 note D_, 7 + ;musicf3 note F#, 15 + ;musicf2 note E_, 8 note E_, 7 + ;musicf3 note G#, 2 note A_, 15 + ;tie note A_, 6 + ;musicf2 note G_, 7 note G_, 15 note C_, 15 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 note C_, 10 + ;musicf3 dec_octave note B_, 5 inc_octave note C_, 5 dec_octave note B_, 5 + ;musicf2 note G_, 8 note G_, 7 + ;musicf3 note G#, 2 note A_, 16 + ;tie note A_, 5 inc_octave + ;musicf2 note D_, 1 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 10 note D_, 8 + ;musicf0 9 + ;musicf3 octave 3 note D#, 15 - vibrato 30, $33 + ;musicf0 0 + vibrato 30, 3, 3 octave 2 note A_, 3 note A#, 4 + ;musicef 2 + ;musicf1 64 + ;musicf3 note B_, 15 inc_octave + ;musicf2 note D_, 8 note D_, 7 + ;musicf3 note F#, 15 + ;musicf2 note E_, 8 note E_, 7 + ;musicf3 note G#, 2 note A_, 15 + ;tie note A_, 6 + ;musicf2 note G_, 7 note G_, 15 note C#, 15 + ;tie note C#, 8 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 5 note C#, 15 note C#, 4 note C#, 11 note D_, 4 note D_, 11 + ;musicf3 note C#, 5 note D_, 5 note C#, 5 dec_octave + ;musicf2 note A_, 8 note A_, 7 + ;musicf3 note A#, 3 + ;musicf2 note B_, 5 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 15 + ;tie note B_, 15 + ;tie note B_, 15 note B_, 8 inc_octave + ;musicf3 note E_, 3 note F_, 4 note F#, 15 + ;musicf2 note G_, 8 note G_, 7 + ;musicf3 note A_, 15 + ;musicf2 note B_, 8 note B_, 7 + ;musicf3 note F_, 2 note F#, 16 + ;tie note F#, 5 + ;musicf2 note E_, 16 + ;tie note E_, 16 + ;tie note E_, 5 + ;tie note E_, 15 note E_, 15 + ;musicf3 note G#, 2 note A_, 16 + ;tie note A_, 5 note G#, 3 note G_, 4 + ;musicf2 note F#, 15 + ;tie note F#, 15 + ;tie note F#, 15 note F#, 15 note F#, 4 note F#, 11 note G_, 4 note G_, 11 + ;musicf3 note F#, 5 note G_, 5 note F#, 5 + ;musicf2 note D_, 8 note D_, 7 + ;musicf3 note F_, 3 note F#, 16 + ;tie note F#, 16 + ;tie note F#, 16 + ;tie note F#, 16 + ;tie note F#, 16 + ;tie note F#, 16 + ;tie note F#, 16 + ;tie note F#, 5 + ;musicf2 note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 10 note E_, 15 + ;tie note E_, 15 .Loop2 + ;musicf3 octave 2 note A#, 8 inc_octave note C_, 7 note F_, 8 + ;musicf2 note A#, 5 note A#, 10 note A_, 5 @@ -234,16 +358,20 @@ Music_TCG2Fort2_Ch2: note G_, 10 note C_, 3 note C_, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note C_, 8 + ;tie note C_, 15 + ;tie note C_, 7 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave note A#, 8 inc_octave note C_, 7 note F_, 8 + ;musicf2 note A#, 5 note A#, 10 note A_, 5 @@ -255,17 +383,21 @@ Music_TCG2Fort2_Ch2: inc_octave note C_, 3 note C_, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note C_, 8 + ;tie note C_, 15 + ;tie note C_, 7 - vibrato 0, $33 - loopchannel 2, .Loop2 + vibrato 0, 3, 3 + sound_loop 2, .Loop2 octave 3 note C#, 8 note D#, 7 note G#, 8 inc_octave + ;musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -277,15 +409,19 @@ Music_TCG2Fort2_Ch2: note A#, 10 note D#, 3 note D#, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note D#, 8 + ;tie note D#, 15 + ;tie note D#, 7 - vibrato 0, $33 + vibrato 0, 3, 3 note C#, 8 note D#, 7 note G#, 8 inc_octave + ;musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -298,16 +434,20 @@ Music_TCG2Fort2_Ch2: inc_octave note D#, 3 note D#, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note D#, 8 + ;tie note D#, 15 + ;tie note D#, 7 - vibrato 0, $33 + vibrato 0, 3, 3 octave 3 note C#, 8 note D#, 7 note G#, 8 inc_octave + ;musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -319,15 +459,19 @@ Music_TCG2Fort2_Ch2: note A#, 10 note D#, 3 note D#, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note D#, 8 + ;tie note D#, 15 + ;tie note D#, 7 - vibrato 0, $33 + vibrato 0, 3, 3 note C#, 8 note D#, 7 note G#, 8 inc_octave + ;musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -335,69 +479,80 @@ Music_TCG2Fort2_Ch2: dec_octave note G#, 3 note G#, 4 + ;musicf3 note G_, 2 + ;musicf2 note G#, 13 note G#, 8 note A#, 15 note A#, 7 - vibrato 15, $33 - note B_, 15 - note B_, 15 + vibrato 15, 3, 3 + note B_, 15 + ;tie + note B_, 15 + ;tie note B_, 15 note B_, 15 + ;musicf3 note A#, 2 - vibrato 2, $33 + vibrato 2, 3, 3 note B_, 13 + ;tie note B_, 15 + ;tie note B_, 15 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1ee109: octave 2 note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note F#, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 note A_, 3 - note __, 12 + rest 12 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note G_, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note F#, 4 - endchannel + sound_ret -Music_TCG2Fort2_Ch1: +Music_Fort2_Ch1: ; 1ee12f (7b:612f) notetype1 10 notetype0 1 + ;musicdc 17 .MainLoop + ;musicf0 23 + ;musicf1 71 octave 3 + ;musicef 254 note E_, 4 note E_, 4 inc_octave @@ -510,179 +665,186 @@ Music_TCG2Fort2_Ch1: note E_, 3 dec_octave note E_, 4 - loopchannel 14, .Loop1 + sound_loop 14, .Loop1 + ;musicf0 16 + ;musicf3 .Loop2 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 - callchannel Branch_1ee109 + rest 4 + rest 8 + sound_call Branch_1ee109 note G_, 4 note F#, 3 note G_, 4 - loopchannel 2, .Loop2 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + sound_loop 2, .Loop2 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 + rest 4 + rest 8 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 - note __, 4 + rest 4 note E_, 3 - note __, 12 + rest 12 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 note E_, 4 note D#, 3 note E_, 4 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 + rest 4 + rest 8 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 note G_, 3 - note __, 12 + rest 12 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 + ;musicf0 9 octave 3 note F#, 4 note G_, 7 + ;tie note G_, 8 note G_, 3 - note __, 4 + rest 4 + ;musicf0 16 + ;musicf3 .Loop3 octave 2 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 - callchannel Branch_1ee109 + rest 4 + rest 8 + sound_call Branch_1ee109 note G_, 4 note F#, 3 note G_, 4 - loopchannel 2, .Loop3 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + sound_loop 2, .Loop3 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 + rest 4 + rest 8 octave 2 note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note F#, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 note A_, 3 - note __, 12 + rest 12 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note G_, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note F#, 4 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 - note __, 8 - callchannel Branch_1ee109 - note __, 4 + rest 4 + rest 8 + sound_call Branch_1ee109 + rest 4 note G_, 3 - note __, 4 - note __, 8 - callchannel Branch_1ee109 + rest 4 + rest 8 + sound_call Branch_1ee109 note G_, 4 note F#, 3 note G_, 4 .Loop4 + ;musicf1 32 note F_, 4 note F_, 4 note F_, 3 @@ -715,11 +877,15 @@ Music_TCG2Fort2_Ch1: note F_, 12 note F_, 3 note F_, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note G_, 14 + ;tie note G_, 16 - vibrato 0, $33 - loopchannel 2, .Loop4 + vibrato 0, 3, 3 + sound_loop 2, .Loop4 + ;musicec 1 + ;musicf1 32 note F_, 4 note F_, 4 note F_, 3 @@ -752,10 +918,13 @@ Music_TCG2Fort2_Ch1: note F_, 12 note F_, 3 note F_, 4 - vibrato 8, $33 + ;musicf3 + vibrato 8, 3, 3 note G_, 14 + ;tie note G_, 16 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musicf1 32 note F_, 4 note F_, 4 note F_, 3 @@ -784,13 +953,20 @@ Music_TCG2Fort2_Ch1: note F_, 12 note C_, 3 note C_, 4 + ;musicec 0 + ;musicf0 9 + ;musicef 1 note C_, 2 + ;musicf1 64 note C#, 13 note C#, 8 note D#, 15 note D#, 7 + ;musicf3 note E_, 15 + ;tie note E_, 8 + ;musicf1 80 note A_, 5 note A_, 2 note D_, 4 @@ -816,77 +992,84 @@ Music_TCG2Fort2_Ch1: inc_octave note G_, 5 note G_, 2 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCG2Fort2_Ch3: +Music_Fort2_Ch3: ; 1ee319 (7b:6319) notetype1 10 + ;notetype2 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype1 2 + ;musice9 0 + ;musicdc 17 octave 4 + ;musicf3 octave 3 notetype0 1 - note __, 15 - note __, 15 + rest 15 + rest 15 octave 4 note D_, 4 - note __, 4 - note __, 15 + rest 4 + rest 15 note F#, 3 - note __, 4 - note __, 15 - note __, 15 + rest 4 + rest 15 + rest 15 note D_, 4 - note __, 4 - note __, 7 + rest 4 + rest 7 note D_, 4 - note __, 4 - note __, 7 + rest 4 + rest 7 .MainLoop .Loop1 - note __, 15 - note __, 15 + rest 15 + rest 15 octave 4 note D_, 4 - note __, 4 - note __, 15 + rest 4 + rest 15 note F#, 3 - note __, 4 - note __, 15 - note __, 15 + rest 4 + rest 15 + rest 15 note D_, 4 - note __, 4 - note __, 7 + rest 4 + rest 7 note D_, 4 - note __, 4 - note __, 7 - loopchannel 2, .Loop1 - note __, 15 - note __, 15 + rest 4 + rest 7 + sound_loop 2, .Loop1 + rest 15 + rest 15 octave 4 note D_, 4 - note __, 4 - note __, 15 + rest 4 + rest 15 note F#, 3 - note __, 4 - note __, 15 - note __, 15 + rest 4 + rest 15 + rest 15 note D_, 4 - note __, 4 - note __, 7 + rest 4 + rest 7 notetype1 1 + ;musice8 8 octave 2 note A_, 2 + ;tie note A#, 2 + ;tie note B_, 11 .Loop2 octave 2 note E_, 15 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -894,33 +1077,33 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 2 note E_, 4 - note __, 4 + rest 4 note E_, 7 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -928,32 +1111,32 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 - loopchannel 3, .Loop2 + sound_loop 3, .Loop2 octave 2 note E_, 15 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -961,33 +1144,33 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 2 note E_, 4 - note __, 4 + rest 4 note E_, 7 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -995,31 +1178,31 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note D_, 7 octave 2 note C_, 15 - note __, 8 + rest 8 note C_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note C_, 7 @@ -1027,33 +1210,33 @@ Music_TCG2Fort2_Ch3: inc_octave inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note C_, 8 dec_octave note C_, 7 note C_, 1 - note __, 7 + rest 7 note C_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note C_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note C_, 7 octave 2 note F_, 4 - note __, 4 + rest 4 note F_, 7 - note __, 8 + rest 8 note F_, 7 octave 4 note C_, 4 - note __, 4 + rest 4 dec_octave dec_octave note F_, 7 @@ -1061,31 +1244,31 @@ Music_TCG2Fort2_Ch3: note E_, 8 inc_octave note C_, 3 - note __, 4 + rest 4 octave 3 note F_, 8 dec_octave note F_, 7 note F_, 1 - note __, 7 + rest 7 note F_, 7 octave 4 note C_, 4 - note __, 4 + rest 4 octave 3 note F_, 7 octave 4 note C_, 4 - note __, 4 + rest 4 octave 3 note F_, 7 octave 2 note F#, 15 - note __, 8 + rest 8 note F#, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note F#, 7 @@ -1093,32 +1276,32 @@ Music_TCG2Fort2_Ch3: note E_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note F#, 8 dec_octave note F#, 7 note F#, 1 - note __, 7 + rest 7 note F#, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note F#, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 2 note A#, 7 note B_, 4 - note __, 4 + rest 4 note B_, 7 - note __, 8 + rest 8 note B_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note B_, 7 @@ -1126,27 +1309,30 @@ Music_TCG2Fort2_Ch3: note A_, 8 inc_octave note D_, 3 - note __, 4 + rest 4 octave 3 note B_, 8 dec_octave note B_, 7 note B_, 1 - note __, 7 + rest 7 note B_, 7 - note __, 8 + rest 8 octave 2 + ;musice8 7 note E_, 2 + ;tie note F_, 13 + ;musice8 8 note F#, 4 - note __, 3 + rest 3 octave 2 note E_, 15 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -1154,33 +1340,33 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 2 note E_, 4 - note __, 4 + rest 4 note E_, 7 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -1188,31 +1374,31 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 2 note E_, 15 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -1220,33 +1406,33 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 2 note E_, 4 - note __, 4 + rest 4 note E_, 7 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -1254,31 +1440,31 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note D_, 7 octave 2 note C_, 15 - note __, 8 + rest 8 note C_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note C_, 7 @@ -1286,31 +1472,31 @@ Music_TCG2Fort2_Ch3: inc_octave inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note C_, 8 dec_octave note C_, 7 note C_, 1 - note __, 7 + rest 7 note C_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note C_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note C_, 7 octave 2 note D_, 15 - note __, 8 + rest 8 note D_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note D_, 7 @@ -1318,30 +1504,30 @@ Music_TCG2Fort2_Ch3: inc_octave inc_octave note F#, 3 - note __, 4 + rest 4 octave 2 note B_, 8 note B_, 7 note B_, 1 - note __, 7 + rest 7 note B_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note B_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note B_, 7 octave 2 note E_, 15 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -1349,33 +1535,33 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 2 note E_, 4 - note __, 4 + rest 4 note E_, 7 - note __, 8 + rest 8 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 dec_octave dec_octave note E_, 7 @@ -1383,144 +1569,160 @@ Music_TCG2Fort2_Ch3: note D_, 8 inc_octave note F#, 3 - note __, 4 + rest 4 octave 3 note E_, 8 dec_octave note E_, 7 note E_, 1 - note __, 7 + rest 7 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 octave 4 note D_, 4 - note __, 4 + rest 4 octave 3 note E_, 7 + ;musice8 8 octave 2 .Loop3 note C_, 15 - note __, 8 + rest 8 note C_, 4 - note __, 3 + rest 3 inc_octave note C_, 8 dec_octave note C_, 4 - note __, 11 + rest 11 note C_, 4 - note __, 11 + rest 11 inc_octave note C_, 4 - note __, 3 + rest 3 dec_octave note C_, 8 note C_, 4 - note __, 3 + rest 3 + ;musice8 7 note D_, 15 note D_, 15 + ;musice8 8 note C_, 15 - note __, 8 + rest 8 note C_, 4 - note __, 3 + rest 3 inc_octave note C_, 8 dec_octave note C_, 4 - note __, 11 + rest 11 note C_, 4 - note __, 11 + rest 11 inc_octave note C_, 4 - note __, 3 + rest 3 dec_octave note C_, 8 note C_, 4 - note __, 3 + rest 3 + ;musice8 7 note D_, 15 + ;tie note D_, 15 - loopchannel 2, .Loop3 + ;musice8 8 + sound_loop 2, .Loop3 octave 2 note D#, 15 - note __, 8 + rest 8 note D#, 4 - note __, 3 + rest 3 inc_octave note D#, 8 dec_octave note D#, 4 - note __, 11 + rest 11 note D#, 4 - note __, 11 + rest 11 inc_octave note D#, 4 - note __, 3 + rest 3 dec_octave note D#, 8 note D#, 4 - note __, 3 + rest 3 + ;musice8 7 note F_, 15 note F_, 15 + ;musice8 8 note D#, 15 - note __, 8 + rest 8 note D#, 4 - note __, 3 + rest 3 inc_octave note D#, 8 dec_octave note D#, 4 - note __, 11 + rest 11 note D#, 4 - note __, 11 + rest 11 inc_octave note D#, 4 - note __, 3 + rest 3 dec_octave note D#, 8 note D#, 4 - note __, 3 + rest 3 + ;musice8 7 note F_, 15 + ;tie note F_, 15 + ;musice8 8 note D#, 15 - note __, 8 + rest 8 note D#, 4 - note __, 3 + rest 3 inc_octave note D#, 8 dec_octave note D#, 4 - note __, 11 + rest 11 note D#, 4 - note __, 11 + rest 11 inc_octave note D#, 4 - note __, 3 + rest 3 dec_octave note D#, 8 note D#, 4 - note __, 3 + rest 3 + ;musice8 7 note F_, 15 note F_, 15 + ;musice8 8 + ;musicec 0 note D#, 15 - note __, 8 + rest 8 note D#, 4 - note __, 3 + rest 3 inc_octave note D#, 8 dec_octave note D#, 4 - note __, 11 + rest 11 note D#, 4 - note __, 3 + rest 3 note D#, 15 - note __, 8 + rest 8 note F_, 15 + ;tie note F_, 7 note F#, 15 + ;tie note F#, 8 octave 4 notetype1 2 @@ -1547,291 +1749,326 @@ Music_TCG2Fort2_Ch3: notetype1 1 octave 2 note E_, 8 - note __, 7 - note __, 15 + rest 7 + rest 15 octave 4 note D_, 4 - note __, 4 - note __, 15 + rest 4 + rest 15 note F#, 3 - note __, 4 - note __, 15 - note __, 15 + rest 4 + rest 15 + rest 15 note D_, 4 - note __, 4 - note __, 7 + rest 4 + rest 7 note D_, 4 - note __, 4 - note __, 7 - loopchannel 0, .MainLoop + rest 4 + rest 7 + sound_loop 0, .MainLoop -Music_TCG2Fort2_Ch4: - togglenoise $06 - notetype 1 +Music_Fort2_Ch4: ; 1ee637 (7b:6637) + toggle_noise 6 + drum_speed 1 octave 1 .MainLoop .Loop1 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note E_, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - loopchannel 3, .Loop1 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note E_, 7 - note C_, 8 - note D#, 7 - note E_, 8 - note C#, 3 - note C#, 4 - note C#, 8 - note C#, 7 - note C_, 8 - note C#, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note E_, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 7 - callchannel Branch_1ee771 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note E_, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 3 - note C#, 4 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + sound_loop 3, .Loop1 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 5, 8 + ;musicef 253 + drum_note 2, 3 + ;musicef 2 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 1, 8 + drum_note 2, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + sound_call Branch_1ee771 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 8 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 8 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 8 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 .Loop2 - callchannel Branch_1ee771 - loopchannel 7, .Loop2 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 3 - note C#, 4 - note C#, 8 - note C#, 7 - note C_, 8 - note C#, 7 - note C#, 8 - note E_, 15 - note C#, 7 + sound_call Branch_1ee771 + sound_loop 7, .Loop2 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 3 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 7 + drum_note 1, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_note 5, 15 + drum_note 2, 7 .Loop3 - callchannel Branch_1ee771 - loopchannel 6, .Loop3 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note E_, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 3 - note C#, 4 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - callchannel Branch_1ee785 - note C_, 8 - note D#, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note E_, 7 - note D#, 8 - note C_, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note C_, 7 - note C#, 15 - note D#, 4 - note D#, 4 - note D#, 3 - note D#, 4 - callchannel Branch_1ee785 - note C_, 8 - note D#, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note E_, 7 - note D#, 8 - note C_, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 3 - note C#, 4 - note C#, 8 - note C#, 7 - callchannel Branch_1ee785 - note C_, 8 - note D#, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note E_, 7 - note D#, 8 - note C_, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note C_, 7 - note C#, 15 - note D#, 4 - note D#, 4 - note D#, 3 - note D#, 4 - callchannel Branch_1ee785 - note C_, 8 - note D#, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note E_, 7 - note D#, 8 - note C_, 7 - note E_, 15 - note C#, 8 - note E_, 15 - note C#, 7 - note E_, 15 - note D#, 8 - note C#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note C#, 7 - note D#, 8 - note C#, 7 - note E_, 8 - note C#, 4 - note C#, 3 - note C#, 8 - note C#, 3 - note __, 4 - loopchannel 0, .MainLoop + sound_call Branch_1ee771 + sound_loop 6, .Loop3 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 8 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 8 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 8 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 8 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + sound_call Branch_1ee785 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 15 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 3 + drum_note 4, 4 + sound_call Branch_1ee785 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 3 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 7 + sound_call Branch_1ee785 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 15 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 3 + drum_note 4, 4 + sound_call Branch_1ee785 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 5, 15 + drum_note 2, 8 + drum_note 5, 15 + drum_note 2, 7 + drum_note 5, 15 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 8 + drum_note 2, 4 + drum_note 2, 3 + drum_note 2, 8 + drum_note 2, 3 + rest 4 + sound_loop 0, .MainLoop Branch_1ee771: octave 1 - notetype 1 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note E_, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 7 - endchannel + drum_speed 1 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + sound_ret Branch_1ee785: octave 1 - notetype 1 - note C_, 8 - note D#, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note E_, 7 - note D#, 8 - note C_, 7 - note D#, 8 - note C#, 7 - note D#, 8 - note C_, 7 - note C#, 15 - note C#, 15 - endchannel - + drum_speed 1 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 15 + drum_note 2, 15 + sound_ret +; 0x1ee797 diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm index 2fad55a0..8c3826b1 100644 --- a/crysaudio/music/TCG2/fort3.asm +++ b/crysaudio/music/TCG2/fort3.asm @@ -1,96 +1,155 @@ -Music_TCG2Fort3: - db $C0 - dw Music_TCG2Fort3_Ch1 - db $01 - dw Music_TCG2Fort3_Ch2 - db $02 - dw Music_TCG2Fort3_Ch3 - db $03 - dw Music_TCG2Fort3_Ch4 +Music_Fort3: + channel_count 4 + channel 1, Music_Fort3_Ch1 + channel 2, Music_Fort3_Ch2 + channel 3, Music_Fort3_Ch3 + channel 4, Music_Fort3_Ch4 -Music_TCG2Fort3_Ch2: +Music_Fort3_Ch2: ; 1ee797 (7b:6797) notetype1 10 notetype0 1 - note __, 14 + rest 14 .MainLoop + ;musicf0 9 octave 3 - vibrato 60, $33 - note __, 15 - note __, 14 + ;musicdc 255 + ;musicf1 87 + ;musicf3 + ;vibrato_type 5 + vibrato 60, 3, 3 + rest 15 + rest 14 note C_, 4 + ;tie note C#, 4 + ;tie note D_, 14 + ;musicf2 note C_, 7 + ;tie note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie note C_, 14 note C_, 15 + ;tie note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note __, 15 - note __, 14 + ;musicf3 + rest 15 + rest 14 dec_octave note A#, 4 + ;tie inc_octave note C_, 4 + ;tie note C_, 14 dec_octave + ;musicf2 note A#, 7 + ;tie note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie note A#, 14 note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 + ;tie note A#, 14 inc_octave - note __, 15 - note __, 14 + ;musicf3 + rest 15 + rest 14 note C_, 4 + ;tie note C#, 4 + ;tie note D_, 14 + ;musicf2 note C_, 7 + ;tie note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie note C_, 14 note C_, 15 + ;tie note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note __, 15 - note __, 14 + ;musicf3 + rest 15 + rest 14 dec_octave note A#, 4 + ;tie inc_octave note C_, 4 + ;tie note C_, 14 dec_octave + ;musicf2 note A#, 7 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 note A#, 8 + ;musicf3 inc_octave note C_, 4 note C#, 3 @@ -103,207 +162,391 @@ Music_TCG2Fort3_Ch2: note A#, 7 note G_, 7 note F_, 7 + ;musicf0 33 + ;musicef 1 + ;musicf1 87 + ;musicf3 octave 3 note G_, 4 + ;tie + ;musice4 9 note G_, 4 + ;tie + ;musice4 0 note G#, 4 + ;tie + ;musice4 9 note G#, 3 + ;tie + ;musice4 0 note A_, 14 inc_octave note C_, 15 dec_octave + ;musicf2 + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie note F_, 14 note F_, 15 + ;tie note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 + ;musicf3 note E_, 8 note F_, 7 note E_, 7 note C_, 7 + ;musicf2 note D_, 15 + ;tie note D_, 14 note D_, 15 note F_, 4 + ;tie + ;musice4 4 note F_, 3 + ;tie + ;musice4 9 note F_, 4 + ;tie + ;musice4 13 note F_, 3 + ;tie + ;musice4 0 note F#, 4 + ;tie + ;musice4 4 note F#, 4 + ;tie + ;musice4 9 note F#, 4 + ;tie + ;musice4 13 note F#, 3 + ;tie + ;musice4 0 + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie note G_, 14 note G_, 15 + ;tie note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 + ;musicf3 + ;musicf0 33 octave 3 note G_, 4 + ;tie + ;musice4 9 note G_, 4 + ;tie + ;musice4 0 note G#, 4 + ;tie + ;musice4 9 note G#, 3 + ;tie + ;musice4 0 note A_, 14 inc_octave note C_, 15 dec_octave + ;musicf2 + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie note F_, 14 note F_, 15 + ;tie note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 + ;musicf3 note E_, 8 note F_, 7 note E_, 7 note C_, 7 + ;musicf2 note D_, 15 + ;tie note D_, 14 note D_, 15 dec_octave note F_, 4 + ;tie + ;musice4 14 note F_, 3 + ;tie + ;musice4 28 note F_, 4 + ;tie + ;musice4 43 note F_, 3 + ;tie + ;musice4 0 note F#, 4 + ;tie + ;musice4 14 note F#, 4 + ;tie + ;musice4 28 note F#, 4 + ;tie + ;musice4 43 note F#, 3 + ;tie + ;musice4 0 + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie note G_, 14 note G_, 15 + ;tie note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 + ;musicf3 note G_, 8 note A_, 7 note A#, 7 inc_octave note C_, 7 - vibrato 11, $33 + vibrato 11, 3, 3 note C_, 4 + ;tie + ;musice4 9 note C_, 4 + ;tie + ;musice4 0 note C#, 4 + ;tie + ;musice4 9 note C#, 3 + ;tie + ;musice4 0 note D_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 15 - vibrato 29, $33 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 + vibrato 29, 3, 3 + ;musicf2 + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie note F_, 14 note F_, 15 + ;musicf3 note D#, 14 note D_, 15 + ;musicf2 note C_, 7 note C_, 7 - vibrato 11, $33 + vibrato 11, 3, 3 note C_, 4 + ;tie + ;musice4 9 note C_, 4 + ;tie note C#, 4 + ;tie + ;musice4 9 note C#, 3 + ;tie + ;musice4 0 note D_, 14 note D_, 15 dec_octave - vibrato 29, $33 - note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 - note G_, 14 - note G_, 15 + vibrato 29, 3, 3 + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie + note G_, 14 + ;tie + note G_, 15 + ;tie note G_, 14 note G_, 15 + ;tie note G_, 14 + ;musicf3 note G_, 8 note A_, 7 note A#, 7 inc_octave note C_, 7 - vibrato 11, $33 + vibrato 11, 3, 3 note C_, 4 + ;tie + ;musice4 9 note C_, 4 + ;tie + ;musice4 0 note C#, 4 + ;tie + ;musice4 9 note C#, 3 + ;tie + ;musice4 0 note D_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 15 - vibrato 29, $33 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 - note F_, 14 - note F_, 15 + vibrato 29, 3, 3 + ;musicf2 + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie + note F_, 14 + ;tie + note F_, 15 + ;tie note F_, 14 note F_, 15 + ;musicf3 note D#, 14 note D_, 15 + ;musicf2 note C_, 7 note C_, 7 - vibrato 11, $33 + vibrato 11, 3, 3 note C_, 4 + ;tie + ;musice4 9 note C_, 4 + ;tie + ;musice4 19 note C_, 4 + ;tie + ;musice4 28 note C_, 3 + ;tie + ;musice4 0 note C#, 4 + ;tie + ;musice4 9 note C#, 3 + ;tie + ;musice4 19 note C#, 4 + ;tie + ;musice4 28 note C#, 3 - vibrato 30, $33 - note D_, 15 - note D_, 14 - note D_, 15 - note D_, 14 - note D_, 15 - note D_, 14 - note D_, 15 - note D_, 14 - note D_, 15 - note D_, 14 + ;tie + ;musice4 0 + vibrato 30, 3, 3 note D_, 15 + ;tie + note D_, 14 + ;tie + note D_, 15 + ;tie + note D_, 14 + ;tie + note D_, 15 + ;tie + note D_, 14 + ;tie + note D_, 15 + ;tie + note D_, 14 + ;tie + note D_, 15 + ;tie + note D_, 14 + ;tie + note D_, 15 + ;tie note D_, 14 note D_, 15 + ;tie note D_, 14 + ;musicf0 9 + ;musicf1 64 + ;musicf3 .Loop1 octave 1 note G_, 15 - note __, 7 + rest 7 note G_, 4 - note __, 11 + rest 11 note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musicf2 note G_, 4 note F_, 3 dec_octave @@ -312,14 +555,17 @@ Music_TCG2Fort3_Ch2: note G_, 6 inc_octave note F_, 4 - note __, 3 + rest 3 note F_, 4 - note __, 3 - note __, 4 - note __, 3 + rest 3 + rest 4 + rest 3 + ;musicf1 32 note F_, 4 note F_, 11 + ;musicf3 note F_, 7 + ;musicf1 64 note G_, 4 note F_, 3 dec_octave @@ -344,7 +590,9 @@ Music_TCG2Fort3_Ch2: inc_octave inc_octave note G_, 3 + ;musicf3 note F_, 7 + ;musicf2 note G_, 4 note F_, 3 dec_octave @@ -353,29 +601,38 @@ Music_TCG2Fort3_Ch2: inc_octave inc_octave note G_, 4 + ;musicf1 96 note G_, 4 - note __, 3 - note __, 4 - note __, 3 + rest 3 + rest 4 + rest 3 note G_, 4 - note __, 3 + rest 3 + ;musicf3 note B_, 4 + ;tie + ;musice4 7 note B_, 4 + ;tie inc_octave + ;musice4 0 note C_, 7 dec_octave note A#, 14 + ;musicf1 64 dec_octave dec_octave note G_, 15 - note __, 7 + rest 7 + ;musicf3 note G_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musicf2 note G_, 4 note F_, 3 dec_octave @@ -384,14 +641,17 @@ Music_TCG2Fort3_Ch2: note G_, 6 inc_octave note F_, 4 - note __, 3 + rest 3 note F_, 4 - note __, 10 + rest 10 + ;musicf1 32 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 3 + rest 3 + ;musicf3 note F_, 7 + ;musicf1 64 note G_, 4 note F_, 3 dec_octave @@ -401,27 +661,33 @@ Music_TCG2Fort3_Ch2: inc_octave note G_, 4 dec_octave + ;musicf3 note G_, 4 - note __, 3 + rest 3 dec_octave + ;musicf2 note G_, 1 - note __, 2 + rest 2 inc_octave note G_, 4 dec_octave note G_, 4 - note __, 3 + rest 3 + ;musicf3 inc_octave inc_octave note G_, 4 - note __, 4 + rest 4 dec_octave dec_octave + ;musicf2 note G_, 4 inc_octave inc_octave note G_, 3 + ;musicf3 note F_, 7 + ;musicf2 note G_, 4 note F_, 3 dec_octave @@ -430,6 +696,7 @@ Music_TCG2Fort3_Ch2: inc_octave inc_octave note G_, 4 + ;musicf3 note C_, 4 note C#, 3 note C_, 7 @@ -441,156 +708,233 @@ Music_TCG2Fort3_Ch2: note A#, 7 note G_, 7 note F_, 7 - loopchannel 2, .Loop1 - loopchannel 0, .MainLoop + sound_loop 2, .Loop1 + sound_loop 0, .MainLoop -Music_TCG2Fort3_Ch1: +Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) notetype1 10 notetype0 1 - note __, 14 + rest 14 .MainLoop + ;musicf0 9 octave 3 - vibrato 60, $33 - note __, 15 - note __, 14 + ;musicdc 255 + ;vibrato_type 5 + vibrato 60, 3, 3 + ;musicec 251 + ;musicf1 87 + ;musicf3 + rest 15 + rest 14 note C_, 4 + ;tie note C#, 4 + ;tie note D_, 14 + ;musicf2 note C_, 7 + ;tie note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie note C_, 14 note C_, 15 + ;tie note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note __, 15 - note __, 14 - dec_octave - note A#, 4 - inc_octave - note C_, 4 - note C_, 14 - dec_octave - note A#, 7 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - note A#, 15 - note A#, 14 - inc_octave - note __, 15 - note __, 14 - note C_, 4 - note C#, 4 - note D_, 14 - note C_, 7 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note C_, 15 - note C_, 14 - note __, 15 - note __, 14 + ;musicf3 + rest 15 + rest 14 dec_octave note A#, 4 + ;tie inc_octave note C_, 4 + ;tie + note C_, 14 + dec_octave + ;musicf2 + note A#, 7 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + ;tie + note A#, 15 + ;tie + note A#, 14 + note A#, 15 + ;tie + note A#, 14 + inc_octave + ;musicf3 + rest 15 + rest 14 + note C_, 4 + ;tie + note C#, 4 + ;tie + note D_, 14 + ;musicf2 + note C_, 7 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + ;tie + note C_, 15 + ;tie + note C_, 14 + note C_, 15 + ;tie + note C_, 14 + ;musicf3 + rest 15 + rest 14 + dec_octave + note A#, 4 + ;tie + inc_octave + note C_, 4 + ;tie note C_, 14 dec_octave note A#, 7 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;musicef 252 + ;musicec 0 octave 2 note A#, 8 - note __, 7 + rest 7 note A#, 7 - note __, 7 - note __, 8 + rest 7 + rest 8 note A#, 7 - note __, 7 + rest 7 inc_octave note C_, 7 - vibrato 12, $33 + ;musicef 4 + ;vibrato_type 5 + vibrato 12, 3, 3 octave 2 .Loop1 - note __, 15 - note __, 14 + rest 15 + rest 14 note G#, 4 + ;tie note A_, 4 + ;tie note A#, 7 note A_, 14 + ;tie note A_, 8 note A_, 4 - note __, 3 + rest 3 note C_, 7 - note __, 7 + rest 7 note F_, 15 note G_, 7 - note __, 7 - note __, 15 - note __, 4 + rest 7 + rest 15 + rest 4 note F_, 5 note A_, 5 inc_octave note E_, 4 note F_, 4 + ;tie note F_, 14 + ;tie note F_, 7 - note __, 8 + rest 8 dec_octave note A_, 7 - note __, 14 + rest 14 note A_, 4 + ;tie + ;musice4 17 note A_, 4 + ;tie + ;musice4 0 note A#, 7 note A_, 7 - note __, 7 - note __, 15 - note __, 14 + rest 7 + rest 15 + rest 14 note A#, 4 + ;tie note B_, 4 + ;tie inc_octave note C_, 7 dec_octave note A#, 14 + ;tie note A#, 8 inc_octave note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 dec_octave note F_, 15 note G_, 7 - note __, 7 - note __, 15 - note __, 4 + rest 7 + rest 15 + rest 4 dec_octave note A#, 5 inc_octave @@ -598,76 +942,94 @@ Music_TCG2Fort3_Ch1: inc_octave note C#, 4 note D_, 4 + ;tie note D_, 14 + ;tie note D_, 7 - note __, 8 + rest 8 dec_octave note A_, 7 - note __, 14 + rest 14 note B_, 4 + ;tie + ;musice4 15 note B_, 4 + ;tie inc_octave + ;musice4 0 note C_, 7 dec_octave note A#, 7 - note __, 7 - loopchannel 2, .Loop1 - note __, 15 - note __, 14 + rest 7 + sound_loop 2, .Loop1 + rest 15 + rest 14 note A#, 4 + ;tie note B_, 4 + ;tie inc_octave note C_, 7 dec_octave note G#, 14 + ;tie note G#, 8 inc_octave note G_, 4 - note __, 3 + rest 3 dec_octave note C_, 7 - note __, 7 + rest 7 note G_, 15 note G#, 7 - note __, 7 - note __, 15 - note __, 4 + rest 7 + rest 15 + rest 4 inc_octave note C_, 5 note D#, 5 note A_, 4 note A#, 4 + ;tie note A#, 14 + ;tie note A#, 7 - note __, 8 + rest 8 note F_, 7 - note __, 14 + rest 14 dec_octave note A_, 4 + ;tie + ;musice4 17 note A_, 4 + ;tie + ;musice4 0 note A#, 7 note F_, 7 - note __, 7 - note __, 15 - note __, 14 + rest 7 + rest 15 + rest 14 note A#, 4 + ;tie note B_, 4 + ;tie inc_octave note C_, 7 dec_octave note A#, 14 + ;tie note A#, 8 inc_octave note D_, 4 - note __, 3 + rest 3 dec_octave note C_, 7 - note __, 7 + rest 7 note F_, 15 note G_, 7 - note __, 7 - note __, 15 - note __, 4 + rest 7 + rest 15 + rest 4 dec_octave note A#, 5 inc_octave @@ -675,256 +1037,305 @@ Music_TCG2Fort3_Ch1: inc_octave note C#, 4 note D_, 4 + ;tie note D_, 14 + ;tie note D_, 7 - note __, 8 + rest 8 dec_octave note A_, 7 - note __, 14 + rest 14 note B_, 4 + ;tie + ;musice4 15 note B_, 4 + ;tie inc_octave + ;musice4 0 note C_, 7 dec_octave note A#, 7 - note __, 7 - note __, 15 - note __, 14 + rest 7 + rest 15 + rest 14 note A#, 4 + ;tie note B_, 4 + ;tie inc_octave note C_, 7 dec_octave note G#, 14 + ;tie note G#, 8 inc_octave note G_, 4 - note __, 3 + rest 3 dec_octave note C_, 7 - note __, 7 + rest 7 note G_, 15 note G#, 7 - note __, 7 - note __, 15 - note __, 4 + rest 7 + rest 15 + rest 4 inc_octave note C_, 5 note D#, 5 note A_, 4 note A#, 4 + ;tie note A#, 14 + ;tie note A#, 7 - note __, 8 + rest 8 note F_, 7 - note __, 14 + rest 14 dec_octave note A_, 4 + ;tie + ;musice4 17 note A_, 4 + ;tie + ;musice4 0 note A#, 7 note F_, 7 - note __, 7 - note __, 15 - note __, 14 + rest 7 + rest 15 + rest 14 inc_octave note C_, 4 + ;tie note C#, 4 + ;tie note D_, 7 note C_, 14 + ;tie note C_, 8 dec_octave note G_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 inc_octave note D_, 15 note G_, 3 - note __, 11 - note __, 8 + rest 11 + rest 8 note G_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note G_, 4 note G_, 4 + ;tie note G_, 7 - note __, 7 + rest 7 note G_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note A#, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note A_, 4 + ;tie + ;musice4 9 note A_, 4 + ;tie + ;musice4 0 note A#, 7 note F_, 7 - note __, 7 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note __, 8 + rest 7 + rest 15 + rest 14 + rest 15 + rest 14 + rest 8 note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note C_, 4 - note __, 4 - note __, 7 + rest 4 + rest 7 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 dec_octave dec_octave note G_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 inc_octave inc_octave note D_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note F#, 4 + ;tie + ;musice4 10 note F#, 4 + ;tie + ;musice4 0 note G_, 7 note F_, 14 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note __, 8 + rest 15 + rest 14 + rest 15 + rest 14 + rest 8 note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note C_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 dec_octave dec_octave note G_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 inc_octave inc_octave note D_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note F_, 14 - note __, 7 + rest 7 note F_, 8 - note __, 7 + rest 7 note C_, 7 - note __, 7 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note __, 8 + rest 7 + rest 15 + rest 14 + rest 15 + rest 14 + rest 8 note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note C_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 dec_octave dec_octave note G_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 inc_octave inc_octave note D_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note F#, 4 + ;tie + ;musice4 10 note F#, 4 + ;tie + ;musice4 0 note G_, 7 note F_, 14 - note __, 15 - note __, 14 - note __, 15 - note __, 14 - note __, 8 + rest 15 + rest 14 + rest 15 + rest 14 + rest 8 note C_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 note C_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 dec_octave dec_octave note G_, 4 - note __, 3 - note __, 14 + rest 3 + rest 14 inc_octave inc_octave note D_, 4 - note __, 11 + rest 11 note C_, 7 note D_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note F_, 14 - note __, 7 + rest 7 note F_, 8 - note __, 7 + rest 7 note C_, 7 - note __, 7 - loopchannel 0, .MainLoop + rest 7 + sound_loop 0, .MainLoop -Music_TCG2Fort3_Ch3: +Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) notetype1 10 notetype0 1 notetype2 11 + ;musicdc 255 notetype1 1 + ;musice9 96 + ;musicec 244 octave 3 note F_, 7 note F#, 7 .MainLoop - vibrato 60, $33 + ;vibrato_type 5 + vibrato 60, 3, 3 octave 3 note G_, 15 inc_octave + ;musice8 4 note D_, 14 + ;musice8 8 notetype1 2 note F_, 4 + ;tie note F#, 4 + ;tie note G_, 14 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 7 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 notetype1 3 note F_, 15 @@ -934,21 +1345,35 @@ Music_TCG2Fort3_Ch3: note F#, 7 note G_, 15 inc_octave + ;musice8 4 note D_, 14 + ;musice8 8 notetype1 2 note D#, 4 + ;tie note E_, 4 + ;tie note F_, 14 note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 7 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 notetype1 3 note D#, 15 @@ -958,21 +1383,35 @@ Music_TCG2Fort3_Ch3: note F#, 7 note G_, 15 inc_octave + ;musice8 4 note D_, 14 + ;musice8 8 notetype1 2 note F_, 4 + ;tie note F#, 4 + ;tie note G_, 14 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 7 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 notetype1 3 note F_, 15 @@ -982,23 +1421,36 @@ Music_TCG2Fort3_Ch3: note F#, 7 note G_, 15 inc_octave + ;musice8 4 note D_, 14 + ;musice8 8 notetype1 2 note D#, 4 + ;tie note E_, 4 + ;tie note F_, 14 note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 7 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 dec_octave notetype1 1 note F_, 7 + ;musice8 3 note G_, 15 + ;musice8 8 inc_octave note C#, 7 note C_, 7 @@ -1014,437 +1466,486 @@ Music_TCG2Fort3_Ch3: note G_, 15 inc_octave note D_, 7 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a note F_, 4 + ;tie note F#, 4 + ;tie note G_, 7 note F_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note G_, 1 - note __, 7 + rest 7 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note F_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave note D_, 14 note F_, 15 note G_, 7 - note __, 7 + rest 7 inc_octave note D_, 1 - note __, 7 + rest 7 dec_octave note G_, 1 - note __, 6 + rest 6 note G_, 3 - note __, 11 + rest 11 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note C_, 15 + ;tie note C_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave dec_octave note G_, 4 - note __, 4 + rest 4 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note F_, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note D_, 14 note F_, 15 note F#, 7 - note __, 7 + rest 7 note G_, 15 inc_octave note D_, 7 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a note F_, 4 + ;tie note F#, 4 + ;tie note G_, 7 note F_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note G_, 1 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a inc_octave note A_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave note D_, 14 note F_, 15 note G_, 7 - note __, 7 + rest 7 inc_octave note D_, 1 - note __, 7 + rest 7 dec_octave note G_, 1 - note __, 6 + rest 6 note G_, 3 - note __, 11 + rest 11 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note A_, 15 + ;tie note A_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note G_, 4 - note __, 4 + rest 4 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note F_, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f note D_, 7 dec_octave note D_, 4 - note __, 3 + rest 3 note F_, 15 note G_, 3 - note __, 11 - loopchannel 2, .Loop1 + rest 11 + sound_loop 2, .Loop1 note G#, 15 inc_octave note D#, 7 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a note F#, 4 + ;tie note G_, 4 + ;tie note G#, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f inc_octave note C_, 14 dec_octave dec_octave note G#, 1 - note __, 7 + rest 7 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note D#, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave dec_octave note D#, 14 note A#, 15 note G#, 7 - note __, 7 + rest 7 note G#, 1 - note __, 7 + rest 7 note D#, 1 - note __, 6 + rest 6 inc_octave note D#, 3 - note __, 11 + rest 11 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note G_, 15 + ;tie note G_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave dec_octave note G#, 4 - note __, 4 + rest 4 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note D_, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note D#, 14 dec_octave note A#, 15 note F_, 7 - note __, 7 + rest 7 note G_, 15 inc_octave note D_, 7 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a note F_, 4 + ;tie note F#, 4 + ;tie note G_, 7 note F_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note G_, 1 - note __, 7 + rest 7 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note A_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave note D_, 14 note F_, 15 note G_, 7 - note __, 7 + rest 7 inc_octave note D_, 1 - note __, 7 + rest 7 dec_octave note G_, 1 - note __, 6 + rest 6 note G_, 3 - note __, 11 + rest 11 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note A_, 15 + ;tie note A_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note G_, 4 - note __, 4 + rest 4 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note F_, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f note D_, 7 dec_octave note D_, 4 - note __, 3 + rest 3 note F_, 15 note G_, 3 - note __, 11 + rest 11 note G#, 15 inc_octave note D#, 7 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a note F#, 4 + ;tie note G_, 4 + ;tie note G#, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f inc_octave note C_, 14 dec_octave dec_octave note G#, 1 - note __, 7 + rest 7 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note D#, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave dec_octave note D#, 14 note A#, 15 note G#, 7 - note __, 7 + rest 7 note G#, 1 - note __, 7 + rest 7 note D#, 1 - note __, 6 + rest 6 inc_octave note D#, 3 - note __, 11 + rest 11 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note G_, 15 + ;tie note G_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave dec_octave note G#, 4 - note __, 4 + rest 4 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note D_, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note D#, 14 dec_octave note A#, 15 note F_, 7 - note __, 7 + rest 7 note A_, 15 inc_octave note E_, 7 - note __, 7 - callchannel Branch_1ef06a + rest 7 + sound_call Branch_1ef06a note A#, 4 + ;tie note B_, 4 + ;tie inc_octave note C_, 7 dec_octave note G_, 14 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave note A_, 1 - note __, 7 + rest 7 inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note D_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave note E_, 7 - note __, 7 + rest 7 note A_, 15 note G_, 7 note C#, 4 - note __, 3 + rest 3 note D_, 8 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note C_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave note D_, 4 - note __, 3 + rest 3 dec_octave note C_, 4 - note __, 3 + rest 3 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note C_, 15 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave dec_octave note D_, 1 - note __, 6 + rest 6 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note C_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave dec_octave note D_, 4 - note __, 4 + rest 4 inc_octave inc_octave - callchannel Branch_1ef06a + sound_call Branch_1ef06a note F_, 4 - note __, 3 - callchannel Branch_1ef06f + rest 3 + sound_call Branch_1ef06f dec_octave note C_, 4 - note __, 3 + rest 3 note C#, 4 - note __, 3 + rest 3 inc_octave note E_, 4 + ;tie + ;musice4 12 note E_, 4 + ;tie + ;musice4 0 note F_, 7 - callchannel Branch_1ef06f + sound_call Branch_1ef06f dec_octave dec_octave note D_, 14 - callchannel Branch_1ef040 + sound_call Branch_1ef040 octave 2 note G_, 3 - note __, 12 + rest 12 inc_octave + ;musice8 2 note G_, 7 + ;musice8 8 dec_octave note G_, 3 - note __, 12 + rest 12 note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 3 - note __, 12 + rest 12 inc_octave inc_octave + ;musice8 3 note D_, 7 + ;musice8 8 dec_octave note D_, 4 - note __, 3 + rest 3 inc_octave + ;musice8 4 note F_, 8 note F#, 7 + ;musice8 2 note G_, 14 - callchannel Branch_1ef040 + ;musice8 8 + sound_call Branch_1ef040 octave 2 note G_, 3 - note __, 16 - note __, 3 + rest 16 + rest 3 note G_, 4 - note __, 3 - note __, 8 + rest 3 + rest 8 note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 3 - note __, 12 + rest 12 inc_octave inc_octave + ;musice8 4 note D_, 7 + ;musice8 8 dec_octave note D_, 4 - note __, 3 + rest 3 inc_octave + ;musice8 4 note F_, 8 note F#, 7 + ;musice8 2 note G_, 14 - callchannel Branch_1ef040 + ;musice8 8 + sound_call Branch_1ef040 octave 2 note G_, 3 - note __, 12 + rest 12 inc_octave + ;musice8 2 note G_, 7 + ;musice8 8 dec_octave note G_, 3 - note __, 12 + rest 12 note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 3 - note __, 12 + rest 12 inc_octave inc_octave + ;musice8 4 note D_, 7 + ;musice8 8 dec_octave note D_, 4 - note __, 3 + rest 3 inc_octave + ;musice8 4 note F_, 8 note F#, 7 + ;musice8 2 note G_, 14 - callchannel Branch_1ef040 + sound_call Branch_1ef040 octave 2 note G_, 3 - note __, 12 + rest 12 inc_octave + ;musice8 2 note G_, 7 + ;musice8 8 dec_octave note G_, 3 - note __, 12 + rest 12 note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 4 - note __, 4 + rest 4 inc_octave note C_, 7 note C#, 7 @@ -1453,403 +1954,413 @@ Music_TCG2Fort3_Ch3: note D_, 7 note F_, 7 note F#, 7 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1ef040: octave 2 note G_, 15 - note __, 7 + rest 7 note G_, 4 - note __, 3 + rest 3 inc_octave + ;musice8 2 note G_, 8 + ;musice8 8 dec_octave note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 7 + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 2 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 4 note A#, 7 note D_, 7 + ;musice8 8 dec_octave note D_, 4 - note __, 3 + rest 3 note F_, 4 - note __, 4 + rest 4 note F#, 4 - note __, 3 + rest 3 note G_, 3 - note __, 11 - endchannel + rest 11 + sound_ret Branch_1ef06a: notetype1 1 - vibrato 12, $33 - endchannel + vibrato 12, 3, 3 + sound_ret Branch_1ef06f: notetype1 1 - vibrato 0, $33 - endchannel + vibrato 0, 3, 3 + sound_ret -Music_TCG2Fort3_Ch4: - togglenoise $06 - notetype 1 +Music_Fort3_Ch4: ; 1ef074 (7b:7074) + toggle_noise 6 + drum_speed 1 octave 1 - note __, 14 + ;musicdc 255 + rest 14 .MainLoop - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note E_, 14 - note D#, 8 - note F#, 7 - note C_, 7 - note D#, 7 - note E_, 15 - note A_, 7 - note D#, 4 - note D#, 3 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note E_, 14 - note D#, 8 - note F#, 7 - note C_, 7 - note D#, 7 - note E_, 15 - note A_, 7 - note D#, 4 - note D#, 3 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note A_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note E_, 14 - note D#, 8 - note F#, 7 - note C_, 7 - note D#, 7 - note E_, 15 - note A_, 7 - note D#, 4 - note D#, 3 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note E_, 14 - note D#, 8 - note F#, 7 - note C_, 7 - note D#, 7 - note E_, 15 - note A_, 7 - note D#, 4 - note D#, 3 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 7 - note D_, 4 - note D_, 3 - note D_, 8 - note D_, 14 - note D_, 7 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note D#, 4 - note D#, 5 - note D#, 5 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note A_, 15 - note D_, 14 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note D#, 4 - note D#, 5 - note D#, 5 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - callchannel Branch_1ef1de - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 8 - note D_, 14 - note D_, 7 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note C#, 14 - note D#, 15 - note C_, 7 - note D#, 7 - note D#, 15 - note A_, 14 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note C#, 14 - note D#, 15 - note C_, 7 - note D#, 7 - note D#, 15 - note A_, 14 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 7 - note C_, 8 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note D_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note C#, 14 - note D#, 15 - note C_, 7 - note D#, 7 - note D#, 15 - note A_, 14 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note C#, 7 - note D#, 8 - note C_, 7 - note D#, 4 - note D#, 5 - note D#, 5 - note D_, 15 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note C#, 14 - note D#, 15 - note C_, 7 - note D#, 7 - note D#, 15 - note A_, 14 - note C_, 8 - note C#, 7 - note E_, 14 - note A_, 8 - note D#, 7 - note D#, 7 - note D_, 7 - note D#, 8 - note C#, 4 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 7 - note C#, 7 - loopchannel 0, .MainLoop + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 5, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 10, 7 + drum_note 4, 4 + drum_note 4, 3 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 5, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 10, 7 + drum_note 4, 4 + drum_note 4, 3 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 10, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 5, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 10, 7 + drum_note 4, 4 + drum_note 4, 3 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 5, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 10, 7 + drum_note 4, 4 + drum_note 4, 3 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 7 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 8 + drum_note 3, 14 + drum_note 3, 7 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 10, 15 + drum_note 3, 14 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + sound_call Branch_1ef1de + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 8 + drum_note 3, 14 + drum_note 3, 7 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 10, 14 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 10, 14 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 8 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 3, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 10, 14 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 3, 15 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 2, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 10, 14 + drum_note 1, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 10, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 3, 7 + drum_note 4, 8 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + sound_loop 0, .MainLoop Branch_1ef1de: octave 1 - notetype 1 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 15 - note E_, 14 - note D#, 15 - note C_, 7 - note D#, 7 - note D#, 15 - note A_, 14 - endchannel - + drum_speed 1 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 5, 14 + drum_note 4, 15 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 15 + drum_note 10, 14 + sound_ret +; 0x1ef1ec diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm index fc763fc1..912374d6 100644 --- a/crysaudio/music/TCG2/fort4.asm +++ b/crysaudio/music/TCG2/fort4.asm @@ -1,117 +1,150 @@ -Music_TCG2Fort4: - db $C0 - dw Music_TCG2Fort4_Ch1 - db $01 - dw Music_TCG2Fort4_Ch2 - db $02 - dw Music_TCG2Fort4_Ch3 - db $03 - dw Music_TCG2Fort4_Ch4 +Music_Fort4: + channel_count 4 + channel 1, Music_Fort4_Ch1 + channel 2, Music_Fort4_Ch2 + channel 3, Music_Fort4_Ch3 + channel 4, Music_Fort4_Ch4 -Music_TCG2Fort4_Ch2: +Music_Fort4_Ch2: ; 1f16cc (7c:56cc) notetype1 10 + ;musicf0 22 notetype0 1 + ;musicdc 255 octave 2 note C_, 16 .MainLoop + ;musicf0 9 notetype0 1 + ;musicdc 255 + ;musicef 255 + ;musicf1 71 octave 2 notetype0 4 notetype2 7 + ;musicf2 .Loop1 note D_, 1 note D_, 3 - note __, 4 + rest 4 inc_octave note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 dec_octave note D_, 1 note D_, 3 - note __, 4 + rest 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note C_, 1 note C_, 3 - loopchannel 4, .Loop1 - dutycycle 1 + sound_loop 4, .Loop1 + duty_cycle 1 octave 3 notetype2 8 notetype0 8 + ;musicf1 103 + ;musicf3 notetype1 2 note E_, 14 notetype1 11 - vibrato 1, $33 + ;vibrato_type 5 + vibrato 1, 3, 3 + ;musicf2 note E_, 2 + ;tie note E_, 6 note E_, 2 + ;musicf3 note D_, 2 note E_, 2 note F_, 2 note G_, 2 + ;musicf2 note E_, 4 note E_, 2 + ;musicf3 notetype1 1 note D_, 10 notetype1 11 + ;musicf2 note D_, 14 note D_, 2 + ;musicf3 notetype1 11 note D_, 4 note D_, 2 + ;musicf3 notetype1 2 note G_, 10 notetype1 11 + ;musicf2 note G_, 6 note G_, 2 + ;musicf3 note F_, 3 note C_, 3 note F_, 2 - vibrato 40, $33 + vibrato 40, 3, 3 notetype0 1 note E_, 4 notetype0 8 notetype0 1 note F_, 4 notetype0 8 + ;musicf2 note E_, 5 + ;tie note E_, 10 + ;tie note E_, 12 note E_, 4 + ;musicf3 notetype1 2 note E_, 14 notetype1 11 - vibrato 1, $33 + ;vibrato_type 5 + vibrato 1, 3, 3 + ;musicf2 note E_, 2 + ;tie note E_, 6 note E_, 2 + ;musicf3 note D_, 2 note E_, 2 note F_, 2 note G_, 2 + ;musicf2 note A_, 4 note A_, 2 + ;musicf3 notetype1 1 note G_, 10 notetype1 11 + ;musicf2 note G_, 14 note G_, 2 - vibrato 0, $33 + ;musicf3 + vibrato 0, 3, 3 notetype1 1 + ;musicf2 note A_, 4 note A_, 2 notetype1 11 + ;musicf3 note G_, 6 + ;musicf2 note D_, 2 note D_, 2 notetype1 1 note G_, 6 note G_, 2 + ;musicf3 note F_, 4 notetype1 11 note G_, 3 @@ -119,18 +152,18 @@ Music_TCG2Fort4_Ch2: note F_, 1 note G_, 1 notetype0 8 - vibrato 0, $33 + vibrato 0, 3, 3 notetype1 1 note F_, 7 notetype1 11 - vibrato 1, $33 + vibrato 1, 3, 3 note F_, 8 - vibrato 0, $33 + vibrato 0, 3, 3 notetype0 4 note E_, 1 note F_, 1 notetype0 8 - vibrato 48, $33 + vibrato 48, 3, 3 note E_, 8 notetype1 1 note F_, 4 @@ -155,54 +188,62 @@ Music_TCG2Fort4_Ch2: notetype1 11 note G_, 2 notetype1 12 + ;musicf2 note A_, 1 note A_, 1 - note __, 2 + rest 2 + ;musicf3 + ;musicf0 9 notetype0 1 + ;musicdc 255 octave 3 + ;musicf1 96 notetype0 4 notetype2 7 + ;musicf2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 dec_octave note D_, 1 note D_, 3 - note __, 4 + rest 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note C_, 1 note C_, 3 .Loop2 note D_, 1 note D_, 3 - note __, 4 + rest 4 inc_octave note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 dec_octave note D_, 1 note D_, 3 - note __, 4 + rest 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note C_, 1 note C_, 3 - loopchannel 3, .Loop2 - dutycycle 1 + sound_loop 3, .Loop2 + duty_cycle 1 octave 3 notetype2 8 - vibrato 0, $33 + vibrato 0, 3, 3 notetype0 8 + ;musicf1 103 + ;musicf3 .Loop3 notetype1 1 note A_, 6 @@ -222,7 +263,7 @@ Music_TCG2Fort4_Ch2: note G_, 6 notetype1 11 note G_, 2 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 notetype1 8 notetype0 1 note A_, 4 @@ -231,18 +272,23 @@ Music_TCG2Fort4_Ch2: notetype1 9 note A#, 4 notetype0 8 - vibrato 40, $33 + vibrato 40, 3, 3 notetype1 8 note A_, 15 note A_, 16 + ;tie note A_, 16 + ;tie note A_, 8 note A_, 1 dec_octave notetype0 1 notetype1 12 + ;musicf1 102 + ;musicf3 note A#, 8 inc_octave + ;musicf2 note C#, 5 note C#, 3 note E_, 5 @@ -256,33 +302,73 @@ Music_TCG2Fort4_Ch2: note C#, 3 note E_, 5 note E_, 3 - loopchannel 0, .MainLoop + ;musicf3 + sound_loop 0, .MainLoop -Music_TCG2Fort4_Ch1: +Music_Fort4_Ch1: ; 1f1852 (7c:5852) notetype1 10 notetype1 15 - dutycycle 2 - vibrato 0, $33 + duty_cycle 2 + ;musicee 28 + ;musicdc 255 + vibrato 0, 3, 3 notetype0 1 octave 3 + ;musicef 250 note G_, 5 + ;musicef 2 note G_, 5 + ;musicef 4 note G_, 6 notetype0 8 note G_, 4 - note __, 12 + ;musicee 0 + rest 12 .MainLoop + ;musicee 0 notetype0 8 - note __, 16 - note __, 16 - note __, 16 + rest 16 + rest 16 + rest 16 + ;musicf0 23 + ;musicf1 23 notetype0 4 octave 4 - note __, 1 - note __, 1 + ;musicf3 + rest 1 + rest 1 note A_, 1 - note __, 1 + rest 1 + ;musicf2 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + ;musicf3 + ;musicf0 24 + inc_octave + note A_, 1 + rest 1 + dec_octave + note A_, 1 + ;musicf0 23 + note A_, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -301,12 +387,44 @@ Music_TCG2Fort4_Ch1: note A_, 1 note A_, 1 inc_octave + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 + rest 1 + dec_octave + note A_, 1 + ;musicf0 23 + note A_, 1 + rest 1 + ;musicf2 + inc_octave + note D_, 1 dec_octave note A_, 1 note A_, 1 - note __, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + ;musicf3 + ;musicf0 24 + inc_octave + note A_, 1 + rest 1 + dec_octave + note A_, 1 + ;musicf0 23 + note A_, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -325,60 +443,16 @@ Music_TCG2Fort4_Ch1: note A_, 1 note A_, 1 inc_octave + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 - dec_octave - note A_, 1 - note A_, 1 - note __, 1 - inc_octave - note D_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note D_, 1 - note E_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note E_, 1 - note A_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note A_, 1 - note __, 1 - dec_octave - note A_, 1 - note A_, 1 - note __, 1 - inc_octave - note D_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note D_, 1 - note E_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note E_, 1 - note A_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note A_, 1 - note __, 1 + rest 1 dec_octave note A_, 1 + ;musicf0 23 note G#, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -395,12 +469,16 @@ Music_TCG2Fort4_Ch1: note G#, 1 note D_, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note G#, 1 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note G#, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -417,12 +495,16 @@ Music_TCG2Fort4_Ch1: note G#, 1 note D_, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note G#, 1 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note G#, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -439,12 +521,16 @@ Music_TCG2Fort4_Ch1: note G#, 1 note D_, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note G#, 1 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note G#, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -461,13 +547,17 @@ Music_TCG2Fort4_Ch1: note G#, 1 note D_, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note G#, 1 .Loop1 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note G_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D#, 1 dec_octave @@ -484,12 +574,16 @@ Music_TCG2Fort4_Ch1: note A#, 1 note D#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A#, 1 - note __, 1 + rest 1 note F_, 1 + ;musicf0 23 dec_octave note G_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D#, 1 dec_octave @@ -506,37 +600,45 @@ Music_TCG2Fort4_Ch1: note A#, 1 note D#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A#, 1 - loopchannel 2, .Loop1 - note __, 1 + sound_loop 2, .Loop1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 + note A_, 1 + rest 1 + ;musicf2 + inc_octave + note D_, 1 + dec_octave note A_, 1 - note __, 1 - inc_octave - note D_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note D_, 1 - note E_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note E_, 1 - note A_, 1 - dec_octave - note A_, 1 - note A_, 1 - inc_octave - note A_, 1 - note __, 1 - dec_octave - note A_, 1 - note A_, 1 - note __, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + ;musicf3 + ;musicf0 24 + inc_octave + note A_, 1 + rest 1 + dec_octave + note A_, 1 + ;musicf0 23 + note A_, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -555,13 +657,17 @@ Music_TCG2Fort4_Ch1: note A_, 1 note A_, 1 inc_octave + ;musicf3 + ;musicf0 24 note A_, 1 .Loop2 - note __, 1 + rest 1 dec_octave note A_, 1 + ;musicf0 23 note A_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -580,12 +686,16 @@ Music_TCG2Fort4_Ch1: note A_, 1 note A_, 1 inc_octave + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 + rest 1 dec_octave note A_, 1 + ;musicf0 23 note A_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -604,13 +714,17 @@ Music_TCG2Fort4_Ch1: note A_, 1 note A_, 1 inc_octave + ;musicf3 + ;musicf0 24 note A_, 1 - loopchannel 3, .Loop2 - note __, 1 + sound_loop 3, .Loop2 + rest 1 dec_octave note A_, 1 + ;musicf0 23 note G_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D#, 1 dec_octave @@ -627,12 +741,16 @@ Music_TCG2Fort4_Ch1: note A#, 1 note D#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A#, 1 - note __, 1 + rest 1 note F_, 1 + ;musicf0 23 dec_octave note G_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D#, 1 dec_octave @@ -649,12 +767,16 @@ Music_TCG2Fort4_Ch1: note A#, 1 note D#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A#, 1 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note G_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D#, 1 dec_octave @@ -671,12 +793,16 @@ Music_TCG2Fort4_Ch1: note A#, 1 note D#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A#, 1 - note __, 1 + rest 1 note F_, 1 + ;musicf0 23 dec_octave note G_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D#, 1 dec_octave @@ -693,13 +819,17 @@ Music_TCG2Fort4_Ch1: note A#, 1 note D#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A#, 1 .Loop3 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note B_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -716,12 +846,16 @@ Music_TCG2Fort4_Ch1: note A_, 1 note D_, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 + rest 1 note F_, 1 + ;musicf0 23 dec_octave note B_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note D_, 1 dec_octave @@ -738,13 +872,17 @@ Music_TCG2Fort4_Ch1: note A_, 1 note D_, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A_, 1 - loopchannel 2, .Loop3 - note __, 1 + sound_loop 2, .Loop3 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note A#, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note C#, 1 dec_octave @@ -761,12 +899,16 @@ Music_TCG2Fort4_Ch1: note A_, 1 note C#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 + rest 1 note F_, 1 + ;musicf0 23 dec_octave note A#, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note C#, 1 dec_octave @@ -783,12 +925,16 @@ Music_TCG2Fort4_Ch1: note A_, 1 note C#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 + rest 1 note F_, 1 dec_octave + ;musicf0 23 note A_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note C#, 1 dec_octave @@ -805,12 +951,16 @@ Music_TCG2Fort4_Ch1: note A_, 1 note C#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A_, 1 - note __, 1 + rest 1 note F_, 1 + ;musicf0 23 dec_octave note A_, 1 - note __, 1 + rest 1 + ;musicf2 inc_octave note C#, 1 dec_octave @@ -827,11 +977,15 @@ Music_TCG2Fort4_Ch1: note A_, 1 note C#, 1 note F_, 1 + ;musicf3 + ;musicf0 24 note A_, 1 - dutycycle 1 + duty_cycle 1 octave 3 notetype2 8 notetype0 8 + ;musicf1 103 + ;musicf3 octave 3 notetype1 1 note F_, 6 @@ -850,40 +1004,53 @@ Music_TCG2Fort4_Ch1: notetype1 11 note D_, 2 notetype1 12 + ;musicf2 note E_, 1 note E_, 1 - note __, 1 + rest 1 + ;musicf3 notetype1 15 - dutycycle 2 - vibrato 0, $33 + duty_cycle 2 + ;musicee 28 + ;musicdc 255 + vibrato 0, 3, 3 notetype0 1 octave 3 + ;musicef 250 note G_, 4 + ;musicef 2 note G_, 4 + ;musicef 4 notetype0 8 note G_, 4 - note __, 4 + rest 4 inc_octave note C_, 4 dec_octave .Loop4 notetype0 8 - note __, 3 + rest 3 notetype0 1 octave 3 + ;musicef 250 note G_, 4 + ;musicef 2 note G_, 4 + ;musicef 4 notetype0 8 note G_, 4 inc_octave - note __, 4 + rest 4 note C_, 4 dec_octave - loopchannel 3, .Loop4 - dutycycle 1 + sound_loop 3, .Loop4 + ;musicee 0 + duty_cycle 1 octave 3 notetype2 8 notetype0 8 + ;musicf1 103 + ;musicf3 octave 3 notetype1 1 note D#, 6 @@ -899,11 +1066,13 @@ Music_TCG2Fort4_Ch1: note G_, 2 notetype1 1 note C#, 6 - callchannel Branch_1f1c7c - dutycycle 1 + sound_call Branch_1f1c7c + duty_cycle 1 octave 3 notetype2 8 notetype0 8 + ;musicf1 103 + ;musicf3 octave 3 notetype1 1 note E_, 6 @@ -921,55 +1090,90 @@ Music_TCG2Fort4_Ch1: note D_, 6 notetype1 11 note D_, 2 + ;musicee 0 + ;musicf0 4 octave 3 + ;musicf1 80 + ;musicf3 notetype0 1 note E_, 4 note F_, 4 notetype0 8 note E_, 5 - callchannel Branch_1f1c69 + sound_call Branch_1f1c69 + ;musicf0 4 octave 3 + ;musicf1 80 + ;musicf3 + ;musicef 252 note E_, 2 + ;musicef 4 + ;musicf2 note D_, 1 note D_, 1 - callchannel Branch_1f1c97 + ;musicf3 + sound_call Branch_1f1c97 + ;musicf0 4 octave 3 + ;musicf1 80 note E_, 1 note E_, 2 + ;musicf3 note F_, 6 - callchannel Branch_1f1c69 + sound_call Branch_1f1c69 + ;musicf0 4 octave 3 + ;musicf1 87 + ;musicf3 + ;musicef 252 note F_, 2 + ;musicef 4 + ;musicf2 note G_, 1 note G_, 1 - callchannel Branch_1f1c97 + sound_call Branch_1f1c97 + ;musicf0 4 octave 3 + ;musicf1 87 note F_, 1 note F_, 2 + ;musicf3 notetype0 1 note E_, 4 note F_, 4 notetype0 8 note E_, 5 - callchannel Branch_1f1c69 + sound_call Branch_1f1c69 + ;musicf0 4 octave 3 + ;musicf1 80 + ;musicf3 + ;musicef 252 note E_, 2 + ;musicef 4 dec_octave + ;musicf2 note B_, 1 note B_, 1 - callchannel Branch_1f1c97 + sound_call Branch_1f1c97 + ;musicf0 4 octave 3 + ;musicf1 80 note D_, 1 note D_, 2 + ;musicf3 notetype0 1 note C#, 4 note D_, 4 notetype0 8 + ;musicf2 note C#, 7 note C#, 1 + ;musicf3 notetype0 1 octave 2 note G_, 8 + ;musicf2 note A#, 5 note A#, 3 inc_octave @@ -984,261 +1188,312 @@ Music_TCG2Fort4_Ch1: inc_octave note C#, 5 note C#, 3 + ;musicf3 notetype0 8 - note __, 16 - loopchannel 0, .MainLoop + rest 16 + sound_loop 0, .MainLoop Branch_1f1c69: notetype1 15 - dutycycle 2 - vibrato 0, $33 + duty_cycle 2 + ;musicee 28 + ;musicdc 255 + vibrato 0, 3, 3 notetype0 1 octave 3 note G_, 16 + ;musicee 0 notetype0 8 - endchannel + sound_ret Branch_1f1c7c: notetype1 15 - dutycycle 2 - vibrato 0, $33 + duty_cycle 2 + ;musicee 28 + ;musicdc 255 + vibrato 0, 3, 3 notetype0 1 octave 3 + ;musicef 250 note G_, 5 + ;musicef 4 note G_, 5 + ;musicef 2 note G_, 6 + ;musicee 0 notetype0 8 - endchannel + sound_ret Branch_1f1c97: notetype1 15 - dutycycle 2 - vibrato 0, $33 + duty_cycle 2 + ;musicee 28 + ;musicdc 255 + vibrato 0, 3, 3 notetype0 1 octave 4 note G_, 8 + ;musicee 0 notetype0 8 - endchannel + sound_ret -Music_TCG2Fort4_Ch3: +Music_Fort4_Ch3: ; 1f1caa (7c:5caa) notetype1 10 notetype2 11 notetype1 1 + ;musice9 96 + ;musicdc 255 notetype0 1 octave 2 note C_, 16 .MainLoop - callchannel Branch_1f1ff8 + sound_call Branch_1f1ff8 .Loop1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 .Loop2 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G#, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note G#, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G#, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note G#, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note G#, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 .Loop3 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 inc_octave note D#, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 inc_octave note D#, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note G#, 4 + ;tie note A_, 4 inc_octave note C_, 8 @@ -1249,599 +1504,704 @@ Music_TCG2Fort4_Ch3: note G_, 8 note C_, 8 .Loop4 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 - loopchannel 2, .Loop4 + sound_loop 2, .Loop4 .Loop5 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 inc_octave note D#, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 inc_octave note D#, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 - loopchannel 2, .Loop5 + sound_loop 2, .Loop5 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note C_, 16 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note D_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note G_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 inc_octave note D_, 4 - note __, 4 + rest 4 dec_octave note G_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note G_, 16 + ;musice8 6 note A_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note F_, 4 - note __, 4 + rest 4 note C#, 4 - note __, 4 + rest 4 inc_octave note C#, 4 - note __, 4 + rest 4 dec_octave note F_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note A_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note F_, 4 - note __, 4 + rest 4 note C#, 4 - note __, 4 + rest 4 inc_octave note C#, 4 - note __, 4 + rest 4 dec_octave note F_, 4 - note __, 4 + rest 4 note C#, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note G_, 16 + ;musice8 6 note A_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note E_, 4 - note __, 4 + rest 4 note C#, 4 - note __, 4 + rest 4 inc_octave note C#, 4 - note __, 4 + rest 4 dec_octave note E_, 4 - note __, 4 + rest 4 dec_octave dec_octave dec_octave notetype1 1 + ;musice8 6 note A_, 16 + ;musice8 8 inc_octave inc_octave inc_octave notetype1 2 + ;musice8 7 note E_, 4 - note __, 4 + rest 4 note C#, 4 - note __, 4 + rest 4 inc_octave note C#, 4 - note __, 4 + rest 4 dec_octave note E_, 4 - note __, 4 + rest 4 note C#, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 + ;musice8 8 dec_octave dec_octave dec_octave notetype1 1 note G_, 8 note A_, 8 - vibrato 48, $33 + ;vibrato_type 5 + vibrato 48, 3, 3 note A_, 4 + ;tie + ;musice4 17 note A_, 4 + ;tie + ;musice4 34 note A_, 4 + ;tie + ;musice4 51 note A_, 4 + ;tie + ;musice4 0 note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 16 - callchannel Branch_1f1ff8 - vibrato 48, $33 + sound_call Branch_1f1ff8 + ;vibrato_type 5 + vibrato 48, 3, 3 notetype0 8 note D#, 16 + ;tie note D#, 16 note E_, 16 + ;tie note E_, 16 notetype0 1 + ;musice8 6 note A_, 16 - note __, 16 + rest 16 inc_octave + ;musice8 4 note A_, 16 + ;musice8 6 dec_octave note A_, 16 - note __, 16 - note __, 16 - note __, 16 + rest 16 + rest 16 + rest 16 + ;musice8 8 note E_, 16 + ;musice8 6 note A#, 16 - note __, 16 + rest 16 inc_octave inc_octave + ;musice8 4 note D_, 16 + ;musice8 6 dec_octave dec_octave note A#, 16 - note __, 16 - note __, 16 - note __, 16 + rest 16 + rest 16 + rest 16 + ;musice8 8 note G_, 16 + ;musice8 6 note A_, 16 - note __, 16 + rest 16 inc_octave + ;musice8 4 note A_, 16 + ;musice8 6 dec_octave note A_, 16 - note __, 16 - note __, 16 - note __, 16 + rest 16 + rest 16 + rest 16 + ;musice8 8 note G_, 16 note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 - note __, 8 + rest 8 note A_, 8 inc_octave note E_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 - loopchannel 0, .MainLoop + rest 4 + sound_loop 0, .MainLoop Branch_1f1ff8: octave 2 .Loop6 + ;musice8 6 note D_, 8 - note __, 8 - note __, 16 + rest 8 + rest 16 inc_octave inc_octave + ;musice8 7 note F_, 5 - note __, 3 + rest 3 notetype1 2 note F_, 5 - note __, 3 + rest 3 notetype1 1 + ;musice8 6 dec_octave dec_octave note D_, 16 - note __, 16 + rest 16 inc_octave + ;musice8 7 note A_, 5 - note __, 3 + rest 3 notetype1 2 note A_, 5 - note __, 3 + rest 3 notetype1 1 + ;musice8 6 dec_octave - note __, 16 + rest 16 + ;musice8 8 note C_, 16 - loopchannel 3, .Loop6 + sound_loop 3, .Loop6 + ;musice8 6 note D_, 16 - note __, 16 + rest 16 inc_octave inc_octave + ;musice8 7 note F_, 5 - note __, 3 + rest 3 notetype1 2 note F_, 5 - note __, 3 + rest 3 notetype1 1 + ;musice8 6 dec_octave dec_octave note D_, 16 - note __, 16 + rest 16 inc_octave + ;musice8 7 note A_, 5 - note __, 3 + rest 3 notetype1 2 note A_, 5 - note __, 3 + rest 3 notetype1 1 + ;musice8 6 dec_octave - note __, 16 + rest 16 + ;musice8 8 note C_, 8 note C#, 8 - endchannel + sound_ret -Music_TCG2Fort4_Ch4: - togglenoise $06 - notetype 8 - note __, 2 +Music_Fort4_Ch4: ; 1f204f (7c:604f) + toggle_noise 6 + drum_speed 8 + rest 2 .MainLoop - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note C#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 1 - note C#, 1 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note C#, 1 - note D#, 2 - note C#, 2 - note C#, 1 - note C#, 1 - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - callchannel Branch_1f2131 - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note G_, 16 - note __, 16 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note C#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 1 - note C#, 1 - note G_, 16 - note __, 16 - note G_, 16 - note __, 16 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note C#, 2 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note C#, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note C#, 2 - note G_, 9 - notetype 1 - note C#, 4 - note C#, 4 - notetype 8 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 0, .MainLoop + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 1 + drum_note 2, 1 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + sound_call Branch_1f2131 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + ;musicef 2 + drum_note 8, 16 + ;tie + rest 16 + ;musicef 0 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 1 + drum_note 2, 1 + ;musicef 1 + drum_note 8, 16 + ;tie + rest 16 + ;musicef 1 + drum_note 8, 16 + ;tie + rest 16 + ;musicef 0 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 2, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 2, 2 + ;musicef 1 + drum_note 8, 9 + ;musicef 0 + drum_speed 1 + drum_note 2, 4 + drum_note 2, 4 + drum_speed 8 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .MainLoop Branch_1f2131: - note C_, 2 - note D#, 1 - note F#, 1 - note A_, 2 - note C_, 2 - note D#, 1 - note F#, 1 - note D#, 2 - note F#, 2 - note E_, 2 - endchannel - + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 10, 2 + drum_note 1, 2 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 5, 2 + sound_ret +; 0x1f213c diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm index 841011cc..fb425859 100644 --- a/crysaudio/music/TCG2/gamecorner.asm +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -1,56 +1,73 @@ Music_TCG2GameCorner: - db $C0 - dw Music_TCG2GameCorner_Ch1 - db $01 - dw Music_TCG2GameCorner_Ch2 - db $02 - dw Music_TCG2GameCorner_Ch3 - db $03 - dw Music_TCG2GameCorner_Ch4 + channel_count 4 + channel 1, Music_TCG2GameCorner_Ch1 + channel 2, Music_TCG2GameCorner_Ch2 + channel 3, Music_TCG2GameCorner_Ch3 + channel 4, Music_TCG2GameCorner_Ch4 -Music_TCG2GameCorner_Ch2: +Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) notetype1 10 .MainLoop + ;musicf0 17 octave 1 - vibrato 1, $33 + ;musicf3 + vibrato 1, 3, 3 notetype0 1 .Loop1 note A_, 1 + ;tie note G#, 1 + ;tie note G_, 1 + ;tie note F#, 1 + ;tie note F_, 1 + ;tie note E_, 1 + ;tie note D#, 1 + ;tie note D_, 1 + ;tie note D#, 1 + ;tie note D_, 1 + ;tie note C#, 1 + ;tie note C_, 1 - note __, 12 - note __, 3 - loopchannel 14, .Loop1 - note __, 16 - note __, 11 - callchannel Branch_1e75c7 + rest 12 + rest 3 + sound_loop 14, .Loop1 + rest 16 + rest 11 + sound_call Branch_1e75c7 + ;musicf0 20 octave 4 note A_, 7 - note __, 6 + rest 6 + ;musicf1 33 .Loop2 - note __, 14 + rest 14 octave 2 note A_, 7 note A_, 6 - loopchannel 14, .Loop2 + sound_loop 14, .Loop2 note A_, 7 note A_, 7 - note __, 13 - callchannel Branch_1e75c7 + rest 13 + sound_call Branch_1e75c7 + ;musicf0 20 octave 4 note A_, 7 + ;musicf0 18 octave 4 - vibrato 1, $33 + ;vibrato_type 18 + vibrato 1, 3, 3 + ;musicef 1 note C_, 6 + ;musicf1 39 note C#, 7 note C#, 7 note C#, 7 @@ -67,7 +84,9 @@ Music_TCG2GameCorner_Ch2: note D_, 6 note C#, 14 note C#, 7 + ;musicf3 note C_, 6 + ;musicf2 note C#, 7 note C#, 7 dec_octave @@ -78,12 +97,16 @@ Music_TCG2GameCorner_Ch2: note A_, 7 note A_, 6 note E_, 14 + ;tie note E_, 13 note E_, 7 + ;musicf3 note A_, 7 + ;tie note B_, 7 inc_octave note C_, 6 + ;musicf2 note C#, 7 note C#, 7 note C#, 7 @@ -100,17 +123,32 @@ Music_TCG2GameCorner_Ch2: note D_, 6 note C#, 14 note C#, 7 + ;musicf3 note C_, 6 + ;musicf2 + ;musicef 255 + ;musicf1 146 note C#, 14 + ;tie note C#, 13 + ;tie note C#, 14 + ;tie note C#, 13 + ;tie note C#, 14 + ;tie note C#, 7 note C#, 13 + ;musicef 1 + ;musicf3 + ;musicef 1 note C#, 7 + ;tie note D_, 7 + ;musicef 255 note D#, 6 + ;musicf1 39 note E_, 7 note E_, 7 note E_, 7 @@ -135,8 +173,11 @@ Music_TCG2GameCorner_Ch2: note C#, 7 note D_, 7 note D_, 6 + ;musicf3 note F_, 14 + ;tie note F_, 13 + ;musicf2 note E_, 7 note E_, 7 note D_, 7 @@ -148,9 +189,11 @@ Music_TCG2GameCorner_Ch2: note A_, 6 note E_, 14 note E_, 7 + ;musicf3 inc_octave note C#, 6 dec_octave + ;musicf2 note B_, 7 note B_, 7 note G#, 7 @@ -159,103 +202,140 @@ Music_TCG2GameCorner_Ch2: note E_, 7 note B_, 7 note B_, 6 + ;musicef 1 note A_, 12 note A_, 2 + ;musicf0 20 + ;musicf3 octave 3 note A_, 7 note C_, 6 note C#, 7 note E_, 7 note F#, 7 - note __, 6 + rest 6 note A_, 6 - note __, 8 + rest 8 dec_octave note A_, 7 inc_octave note E_, 6 inc_octave note A_, 7 - note __, 7 - note __, 13 - loopchannel 0, .MainLoop + rest 7 + rest 13 + sound_loop 0, .MainLoop Branch_1e75c7: - vibrato 1, $33 + ;musicf0 18 + ;musicf1 39 + ;musicf3 + ;vibrato_type 18 + vibrato 1, 3, 3 octave 4 - note __, 7 + rest 7 note C#, 7 note D_, 7 note D#, 6 .Loop3 + ;musicf2 note E_, 7 note E_, 7 note E_, 7 note E_, 6 + ;musicf3 note F#, 7 + ;tie note E_, 7 note D#, 7 + ;tie note F#, 6 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 + ;musicf2 note E_, 7 note E_, 7 note A_, 7 note A_, 6 note G#, 14 note G#, 7 + ;musicf3 note F#, 6 + ;musicf2 note D_, 14 + ;tie note D_, 13 note D_, 14 + ;musicf3 dec_octave note B_, 7 inc_octave note C#, 6 .Loop4 + ;musicf2 note D_, 7 note D_, 7 note D_, 7 note D_, 6 + ;musicf3 note E_, 7 + ;tie note D_, 7 note C#, 7 + ;tie note E_, 6 - loopchannel 2, .Loop4 + sound_loop 2, .Loop4 + ;musicf2 note D_, 7 note D_, 7 note G#, 7 note G#, 6 note F#, 14 note F#, 7 + ;musicf3 note E_, 6 + ;musicf2 note C#, 14 + ;tie note C#, 13 note C#, 7 + ;musicf3 note C#, 7 + ;tie note D_, 7 note D#, 6 .Loop5 + ;musicf2 note E_, 7 note E_, 7 note E_, 7 note E_, 6 + ;musicf3 note F#, 7 + ;tie note E_, 7 note D#, 7 + ;tie note F#, 6 - loopchannel 2, .Loop5 + sound_loop 2, .Loop5 + ;musicf2 note E_, 7 note E_, 7 note A_, 7 note A_, 6 note B_, 14 note B_, 7 + ;musicf3 note A_, 6 + ;musicf2 note F#, 14 + ;tie note F#, 13 note F#, 14 + ;musicf3 note F#, 7 + ;tie note G#, 6 + ;musicf2 note A_, 7 note A_, 7 note A_, 7 @@ -284,28 +364,34 @@ Branch_1e75c7: note G#, 7 note G#, 6 note A_, 14 + ;tie note A_, 13 note A_, 14 - endchannel + ;musicf3 + sound_ret -Music_TCG2GameCorner_Ch1: +Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) notetype1 10 .MainLoop notetype1 12 - dutycycle 2 - vibrato 0, $33 + duty_cycle 2 + ;musicee 30 + ;musicdc 255 + vibrato 0, 3, 3 notetype0 1 .Loop1 octave 4 - note __, 16 - note __, 11 - note __, 7 - note __, 7 - note __, 7 + rest 16 + rest 11 + rest 7 + rest 7 + rest 7 note D_, 6 + ;tie note D_, 7 note D_, 7 + ;tie note D_, 7 dec_octave note G_, 6 @@ -313,16 +399,19 @@ Music_TCG2GameCorner_Ch1: note C_, 14 dec_octave note D_, 13 - loopchannel 3, .Loop1 - note __, 16 - note __, 11 - note __, 16 - note __, 11 - note __, 16 - note __, 11 - note __, 16 - note __, 11 - callchannel Branch_1e778f + sound_loop 3, .Loop1 + rest 16 + rest 11 + rest 16 + rest 11 + rest 16 + rest 11 + rest 16 + rest 11 + ;musicee 0 + ;musicf0 20 + ;musicf3 + sound_call Branch_1e778f octave 3 note D#, 7 dec_octave @@ -342,26 +431,31 @@ Music_TCG2GameCorner_Ch1: note E_, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave inc_octave note E_, 7 - note __, 6 + rest 6 .Loop2 - note __, 14 + rest 14 octave 2 note E_, 7 - note __, 6 - loopchannel 14, .Loop2 + rest 6 + sound_loop 14, .Loop2 + ;musicf3 note E_, 7 note E_, 7 + ;tie note E_, 7 + ;tie note E_, 6 + ;musicf1 33 note F#, 7 note F#, 7 note G#, 7 note G#, 6 - callchannel Branch_1e778f + ;musicf3 + sound_call Branch_1e778f octave 3 note D#, 7 octave 2 @@ -385,11 +479,11 @@ Music_TCG2GameCorner_Ch1: note C#, 3 note E_, 4 note E_, 7 - note __, 6 + rest 6 dec_octave dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note F#, 6 @@ -401,7 +495,7 @@ Music_TCG2GameCorner_Ch1: note C#, 6 dec_octave note G#, 6 - note __, 8 + rest 8 note B_, 7 inc_octave note E_, 6 @@ -413,7 +507,7 @@ Music_TCG2GameCorner_Ch1: dec_octave note B_, 6 note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -425,7 +519,7 @@ Music_TCG2GameCorner_Ch1: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -437,7 +531,7 @@ Music_TCG2GameCorner_Ch1: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note D#, 7 note F#, 6 @@ -449,7 +543,7 @@ Music_TCG2GameCorner_Ch1: note D#, 6 dec_octave note G#, 6 - note __, 8 + rest 8 note B_, 7 inc_octave note E_, 6 @@ -461,7 +555,7 @@ Music_TCG2GameCorner_Ch1: dec_octave note B_, 6 note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -483,7 +577,7 @@ Music_TCG2GameCorner_Ch1: note G_, 7 note A_, 6 note A#, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -507,7 +601,7 @@ Music_TCG2GameCorner_Ch1: note C#, 6 dec_octave note B_, 6 - note __, 8 + rest 8 inc_octave note D_, 7 note F#, 6 @@ -520,7 +614,7 @@ Music_TCG2GameCorner_Ch1: note B_, 6 inc_octave note D_, 6 - note __, 8 + rest 8 note F_, 7 note A_, 6 note D_, 7 @@ -529,7 +623,7 @@ Music_TCG2GameCorner_Ch1: note F_, 6 dec_octave note E_, 6 - note __, 8 + rest 8 note E_, 7 inc_octave note C_, 6 @@ -538,44 +632,46 @@ Music_TCG2GameCorner_Ch1: inc_octave note E_, 7 note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 6 - note __, 8 + rest 8 note E_, 7 note G_, 6 note E_, 7 note B_, 7 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note E_, 7 - note __, 6 - note __, 7 - note __, 7 - note __, 7 - note __, 6 + rest 6 + rest 7 + rest 7 + rest 7 + rest 6 note E_, 6 - note __, 8 - note __, 3 + rest 8 + rest 3 octave 3 note C#, 7 note A_, 3 octave 4 note E_, 7 - note __, 7 - note __, 7 - note __, 6 - loopchannel 0, .MainLoop + rest 7 + rest 7 + rest 6 + sound_loop 0, .MainLoop Branch_1e778f: + ;musicf0 20 + ;musicf3 octave 2 note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -587,7 +683,7 @@ Branch_1e778f: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -599,7 +695,7 @@ Branch_1e778f: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -611,7 +707,7 @@ Branch_1e778f: note C#, 6 dec_octave note B_, 6 - note __, 8 + rest 8 inc_octave note F#, 7 note D_, 6 @@ -623,7 +719,7 @@ Branch_1e778f: note D_, 6 dec_octave note E_, 6 - note __, 8 + rest 8 note G#, 7 note B_, 6 note E_, 7 @@ -633,7 +729,7 @@ Branch_1e778f: note B_, 7 note G#, 6 note E_, 6 - note __, 8 + rest 8 note G#, 7 note B_, 6 note E_, 7 @@ -643,7 +739,7 @@ Branch_1e778f: note B_, 7 note G#, 6 note E_, 6 - note __, 8 + rest 8 note G#, 7 note B_, 6 note E_, 7 @@ -663,7 +759,7 @@ Branch_1e778f: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -675,7 +771,7 @@ Branch_1e778f: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -687,7 +783,7 @@ Branch_1e778f: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note C#, 7 note E_, 6 @@ -699,7 +795,7 @@ Branch_1e778f: note C#, 6 dec_octave note A_, 6 - note __, 8 + rest 8 inc_octave note D_, 7 note F#, 6 @@ -729,785 +825,880 @@ Branch_1e778f: note C#, 7 note F#, 7 note A_, 6 - endchannel + sound_ret -Music_TCG2GameCorner_Ch3: +Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) notetype1 10 notetype2 11 notetype1 1 + ;musice9 64 notetype0 1 + ;musicdc 255 .MainLoop octave 2 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 4 - note __, 3 + rest 3 note E_, 16 + ;tie note E_, 4 note F#, 7 - note __, 7 + rest 7 note G#, 7 - note __, 6 + rest 6 note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note B_, 7 - note __, 6 + rest 6 dec_octave note F#, 11 - note __, 3 + rest 3 inc_octave note B_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note G#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note G#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 note C#, 11 - note __, 3 + rest 3 note A_, 7 - note __, 6 + rest 6 note D_, 11 - note __, 3 + rest 3 note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note D_, 11 - note __, 3 + rest 3 note D_, 11 - note __, 2 + rest 2 note D#, 11 - note __, 3 + rest 3 note D#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 note B_, 11 - note __, 3 + rest 3 note B_, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 5 - note __, 8 + rest 8 dec_octave note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 14 note E_, 13 note F#, 14 note G#, 13 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 11 - note __, 16 + rest 16 note E_, 11 - note __, 16 + rest 16 note A_, 4 - note __, 3 + rest 3 note E_, 16 + ;tie note E_, 4 note F#, 7 - note __, 7 + rest 7 note G#, 7 - note __, 6 + rest 6 note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note B_, 7 - note __, 6 + rest 6 dec_octave note F#, 11 - note __, 3 + rest 3 inc_octave note B_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note E_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note G#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note G#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note E_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 note C#, 11 - note __, 3 + rest 3 note A_, 7 - note __, 6 + rest 6 note D_, 11 - note __, 3 + rest 3 note A_, 7 - note __, 6 + rest 6 dec_octave note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 dec_octave note D_, 11 - note __, 3 + rest 3 note D_, 11 - note __, 2 + rest 2 note D#, 11 - note __, 3 + rest 3 note D#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 note B_, 11 - note __, 3 + rest 3 note B_, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 inc_octave note A_, 7 - note __, 6 + rest 6 note D_, 11 - note __, 3 + rest 3 dec_octave note A_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note D_, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note G#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 inc_octave note C#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note C#, 11 - note __, 2 + rest 2 dec_octave note B_, 11 - note __, 3 + rest 3 inc_octave note C#, 11 - note __, 2 + rest 2 note D_, 11 - note __, 3 + rest 3 note D#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 dec_octave note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note G#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 inc_octave note C#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 note A_, 11 - note __, 3 + rest 3 dec_octave note A_, 11 - note __, 2 + rest 2 note G_, 11 - note __, 3 + rest 3 note F_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 note A#, 11 - note __, 2 + rest 2 inc_octave note C#, 11 - note __, 3 + rest 3 note E_, 11 - note __, 2 + rest 2 note F#, 11 - note __, 3 + rest 3 dec_octave note F#, 11 - note __, 2 + rest 2 note G#, 11 - note __, 3 + rest 3 note A#, 11 - note __, 2 + rest 2 note B_, 11 - note __, 3 + rest 3 inc_octave note F#, 11 - note __, 2 + rest 2 note B_, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 dec_octave note B_, 11 - note __, 3 + rest 3 note A_, 11 - note __, 2 + rest 2 note G#, 11 - note __, 3 + rest 3 note F#, 11 - note __, 2 + rest 2 note E_, 11 - note __, 3 + rest 3 note E_, 11 - note __, 16 - note __, 14 + rest 16 + rest 14 note E_, 11 - note __, 2 + rest 2 note E_, 11 - note __, 16 - note __, 13 + rest 16 + rest 13 note A_, 14 - note __, 7 + rest 7 inc_octave note C_, 6 note C#, 7 note E_, 7 note F#, 7 - note __, 6 + rest 6 note A_, 7 - note __, 7 + rest 7 dec_octave note E_, 7 - note __, 6 + rest 6 note A_, 7 - note __, 7 - note __, 7 - note __, 6 - loopchannel 0, .MainLoop + rest 7 + rest 7 + rest 6 + sound_loop 0, .MainLoop -Music_TCG2GameCorner_Ch4: - togglenoise $06 +Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) + toggle_noise 6 .MainLoop octave 1 - notetype 1 + drum_speed 1 .Loop1 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 13, .Loop1 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 14 - note __, 13 - note __, 14 - note __, 13 + ;musicef 251 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 6 + sound_loop 13, .Loop1 + ;musicef 251 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 6 + ;musicef 1 + drum_note 2, 14 + rest 13 + rest 14 + rest 13 + ;musicef 0 .Loop2 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 14 - note C#, 13 - note C_, 14 - note C#, 7 - note C#, 6 - loopchannel 3, .Loop2 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C#, 14 - note C#, 7 - note C#, 6 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 14 - note C#, 13 - note C_, 14 - note C#, 7 - note C#, 6 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 7 + drum_note 2, 6 + sound_loop 3, .Loop2 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 2, 14 + drum_note 2, 7 + ;musicef 255 + drum_note 2, 6 + ;musicef 0 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + drum_note 2, 7 + drum_note 2, 13 .Loop3 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 5, .Loop3 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 3 - note C#, 3 - note C#, 14 - note C#, 13 - note C#, 14 - note F_, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 6 + ;musicef 0 + sound_loop 5, .Loop3 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 14 + drum_note 2, 13 + drum_note 2, 14 + ;musicef 1 + drum_note 6, 13 + ;musicef 0 .Loop4 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 14, .Loop4 - note C_, 7 - note C#, 3 - note C#, 4 - note C#, 7 - note C#, 6 - note C#, 14 - note C#, 7 - note C#, 6 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 6 + ;musicef 0 + sound_loop 14, .Loop4 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 14 + drum_note 2, 7 + drum_note 2, 6 .Loop5 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 14 - note C#, 13 - note C_, 14 - note C#, 7 - note C#, 6 - loopchannel 3, .Loop5 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C#, 14 - note C#, 7 - note C#, 6 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 14 - note C#, 13 - note C_, 14 - note C#, 7 - note C#, 6 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 7 + drum_note 2, 6 + sound_loop 3, .Loop5 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + drum_note 2, 7 + drum_note 2, 13 + drum_note 2, 14 + ;musicef 255 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 6 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + drum_note 2, 7 + drum_note 2, 13 .Loop6 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 5, .Loop6 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 3 - note C#, 3 - note C#, 14 - note C#, 13 - note C#, 14 - note A_, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 6 + ;musicef 0 + sound_loop 5, .Loop6 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 14 + drum_note 2, 13 + drum_note 2, 14 + ;musicef 1 + drum_note 10, 13 + ;musicef 0 .Loop7 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 3, .Loop7 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 4 - note C#, 4 - note C#, 5 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 14 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 13 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 14 - note C#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note A#, 7 - note C_, 6 - note C#, 14 - note C#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note E_, 13 - note C#, 14 - note C#, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 3 - note C#, 4 - note C#, 13 - note C#, 14 - note A_, 13 - loopchannel 0, .MainLoop - + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 6 + sound_loop 3, .Loop7 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 4 + drum_note 2, 5 + drum_note 2, 5 + drum_note 2, 4 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 5 + ;musicef 0 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 255 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 6 + drum_note 1, 14 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 13 + drum_note 1, 7 + ;musicef 255 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 6 + drum_note 2, 14 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 11, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 5, 13 + drum_note 2, 14 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 13 + drum_note 2, 14 + ;musicef 1 + drum_note 10, 13 + ;musicef 0 + sound_loop 0, .MainLoop +; 0x1e7bfa diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index 3153229f..8ce64198 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -1,33 +1,39 @@ -Music_TCG2GRBlimp: - db $C0 - dw Music_TCG2GRBlimp_Ch1 - db $01 - dw Music_TCG2GRBlimp_Ch2 - db $02 - dw Music_TCG2GRBlimp_Ch3 - db $03 - dw Music_TCG2GRBlimp_Ch4 +Music_GRBlimp: + channel_count 4 + channel 1, Music_GRBlimp_Ch1 + channel 2, Music_GRBlimp_Ch2 + channel 3, Music_GRBlimp_Ch3 + channel 4, Music_GRBlimp_Ch4 -Music_TCG2GRBlimp_Ch2: +Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) notetype1 10 - vibrato 28, $33 + ;musicdc 17 + ;vibrato_type 1 + vibrato 28, 3, 3 notetype2 8 octave 4 - dutycycle 2 + duty_cycle 2 notetype1 7 - vibrato 28, $33 - callchannel Branch_1e7cf5 + vibrato 28, 3, 3 + ;musicf0 0 + ;musicdc 255 + ;musicf1 48 + sound_call Branch_1e7cf5 note G#, 16 + ;tie note G#, 5 note G#, 7 inc_octave note C_, 16 + ;tie note C_, 5 dec_octave + ;musicf3 note A#, 4 inc_octave note C_, 3 dec_octave + ;musicf1 69 note A#, 14 note A#, 5 note G_, 14 @@ -38,18 +44,22 @@ Music_TCG2GRBlimp_Ch2: note F_, 14 notetype0 1 note F_, 14 - callchannel Branch_1e7cf5 + sound_call Branch_1e7cf5 note G#, 16 + ;tie note G#, 5 note G#, 7 inc_octave note C_, 16 + ;tie note C_, 5 dec_octave + ;musicf3 note A#, 4 inc_octave note C_, 3 dec_octave + ;musicf1 69 note A#, 14 note A#, 5 note F_, 14 @@ -61,84 +71,122 @@ Music_TCG2GRBlimp_Ch2: note C_, 14 notetype0 1 note C_, 14 + ;musicf0 2 + ;musicf3 notetype0 1 note C_, 5 note C#, 5 note D#, 4 + ;musicf1 68 note F_, 16 + ;tie note F_, 12 + ;tie note F_, 16 + ;tie note F_, 12 note F_, 14 + ;musicf3 note F_, 14 + ;musicf1 64 note D#, 14 note D#, 7 + ;musicf3 note C#, 7 + ;musicf1 64 note C_, 7 note C#, 7 - note __, 7 + rest 7 dec_octave note G#, 5 inc_octave note C#, 2 dec_octave - vibrato 14, $33 + vibrato 14, 3, 3 note A#, 14 + ;tie note A#, 16 + ;tie note A#, 16 + ;tie note A#, 10 note A#, 14 + ;musicf3 note A#, 5 inc_octave note C_, 5 note C#, 4 - vibrato 28, $33 + vibrato 28, 3, 3 + ;musicf1 64 note D#, 16 + ;tie note D#, 12 + ;tie note D#, 16 + ;tie note D#, 12 note D#, 14 + ;musicf3 note D#, 14 + ;musicf1 64 note C#, 14 note D#, 7 dec_octave + ;musicf3 note B_, 7 + ;musicf1 64 note A#, 7 note B_, 7 - note __, 7 + rest 7 note F#, 4 note B_, 3 - vibrato 14, $33 + vibrato 14, 3, 3 note G#, 14 + ;tie note G#, 16 + ;tie note G#, 16 + ;tie note G#, 10 note G#, 14 + ;musicf3 note G#, 5 note A#, 5 note B_, 4 inc_octave - vibrato 28, $33 + vibrato 28, 3, 3 note C#, 16 + ;tie note C#, 12 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 10 dec_octave + ;musicf1 64 note B_, 7 inc_octave note C#, 7 dec_octave + ;musicf3 note F#, 14 + ;musicf1 64 note B_, 7 note F#, 7 inc_octave note C#, 16 + ;tie note C#, 12 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 10 note C#, 14 + ;musicf1 64 note C#, 5 note C#, 5 note D#, 4 @@ -146,11 +194,15 @@ Music_TCG2GRBlimp_Ch2: note E_, 5 note D#, 4 note D#, 16 + ;tie note D#, 12 + ;tie note D#, 14 + ;musicf3 note C#, 5 note D#, 5 note C#, 4 + ;musicf1 64 note C_, 14 note C_, 5 dec_octave @@ -161,22 +213,26 @@ Music_TCG2GRBlimp_Ch2: dec_octave note G#, 4 inc_octave - vibrato 28, $33 + vibrato 28, 3, 3 + ;musicf1 70 notetype0 7 note D_, 16 note D_, 2 - endchannel + sound_ret Branch_1e7cf5: octave 4 notetype0 1 + ;musicf2 note C_, 4 note C_, 3 note D_, 4 note C_, 3 + ;musicf1 69 notetype0 7 note D#, 10 note D#, 2 + ;musicf1 48 notetype0 1 note D_, 4 note D_, 3 @@ -200,9 +256,11 @@ Branch_1e7cf5: note A_, 4 note A_, 3 note A#, 16 + ;tie note A#, 5 note A#, 7 note G_, 16 + ;tie note G_, 5 note G_, 7 note D#, 14 @@ -222,8 +280,11 @@ Branch_1e7cf5: note C_, 3 dec_octave note F_, 16 + ;tie note F_, 12 + ;tie note F_, 16 + ;tie note F_, 12 note F_, 14 inc_octave @@ -234,6 +295,7 @@ Branch_1e7cf5: notetype0 7 note D#, 10 note D#, 2 + ;musicf1 64 notetype0 1 note D_, 4 note D_, 3 @@ -250,34 +312,43 @@ Branch_1e7cf5: note C_, 7 note D_, 7 dec_octave - note __, 7 + rest 7 note F_, 4 inc_octave note C_, 3 dec_octave note F_, 16 + ;tie note F_, 12 + ;tie note F_, 16 + ;tie note F_, 12 note F_, 14 note F_, 4 note F_, 3 note G_, 4 note F_, 3 - endchannel + sound_ret -Music_TCG2GRBlimp_Ch1: +Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) notetype1 10 - vibrato 28, $33 + ;musicdc 17 + ;vibrato_type 1 + vibrato 28, 3, 3 notetype2 8 notetype0 7 octave 3 - callchannel Branch_1e7e8a + ;musicf0 1 + ;musicf1 64 + sound_call Branch_1e7e8a note C#, 14 + ;tie note C#, 7 note C#, 7 note F_, 14 + ;tie note F_, 7 note F_, 7 note G_, 14 @@ -290,20 +361,27 @@ Music_TCG2GRBlimp_Ch1: note D#, 4 dec_octave note A#, 14 + ;tie note A#, 14 + ;tie note A#, 14 + ;musicf3 note A_, 4 note A#, 3 note G_, 4 note A_, 3 + ;musicf2 + note A_, 14 + ;tie note A_, 14 note A_, 14 - note A_, 14 - callchannel Branch_1e7e8a + sound_call Branch_1e7e8a note D#, 16 + ;tie note D#, 5 note D#, 7 note G#, 16 + ;tie note G#, 5 note G#, 7 note F_, 14 @@ -313,13 +391,17 @@ Music_TCG2GRBlimp_Ch1: note F_, 14 note F_, 4 note F_, 16 + ;tie note F_, 12 + ;tie note F_, 16 + ;musicf3 note E_, 4 note F_, 3 note E_, 4 note D_, 3 note E_, 16 + ;tie note E_, 12 dec_octave note D_, 4 @@ -332,9 +414,10 @@ Music_TCG2GRBlimp_Ch1: note G_, 4 inc_octave note C_, 3 - vibrato 28, $33 + vibrato 28, 3, 3 note C#, 14 dec_octave + ;musicf1 65 note C#, 3 inc_octave note C#, 4 @@ -347,15 +430,16 @@ Music_TCG2GRBlimp_Ch1: note F_, 5 note F_, 5 note C#, 4 - vibrato 7, $33 + vibrato 7, 3, 3 note G#, 7 + ;tie note G#, 14 note G#, 7 inc_octave note C_, 7 dec_octave note G#, 7 - note __, 7 + rest 7 note A#, 4 note A#, 3 note G#, 7 @@ -379,14 +463,17 @@ Music_TCG2GRBlimp_Ch1: note A#, 4 inc_octave note F#, 7 + ;tie note F#, 16 + ;tie note F#, 5 note F#, 14 note F#, 7 note F#, 7 - vibrato 28, $33 + vibrato 28, 3, 3 note B_, 14 dec_octave + ;musicf1 65 note B_, 3 inc_octave note B_, 4 @@ -404,13 +491,14 @@ Music_TCG2GRBlimp_Ch1: dec_octave note B_, 4 inc_octave - vibrato 7, $33 + vibrato 7, 3, 3 note F#, 7 + ;tie note F#, 14 note F#, 7 note A#, 7 note F#, 7 - note __, 7 + rest 7 note G#, 4 note G#, 3 note F#, 7 @@ -430,15 +518,18 @@ Music_TCG2GRBlimp_Ch1: note G#, 4 inc_octave note E_, 7 + ;tie note E_, 16 + ;tie note E_, 4 note E_, 14 dec_octave note B_, 7 note B_, 7 - vibrato 28, $33 + vibrato 28, 3, 3 inc_octave note E_, 14 + ;musicf1 65 note C#, 3 note E_, 4 note C#, 3 @@ -450,12 +541,16 @@ Music_TCG2GRBlimp_Ch1: note E_, 5 note C#, 4 note A_, 14 + ;musicf1 65 note G#, 7 note A_, 7 + ;musicf3 note D#, 14 + ;musicf1 65 note G#, 7 note D#, 7 note A_, 14 + ;musicf1 65 note C#, 3 note A_, 4 note C#, 3 @@ -467,6 +562,7 @@ Music_TCG2GRBlimp_Ch1: note E_, 5 note C#, 4 note A_, 7 + ;tie note A_, 14 note A_, 7 note A_, 5 @@ -477,9 +573,11 @@ Music_TCG2GRBlimp_Ch1: note C#, 5 dec_octave note A_, 4 - vibrato 14, $33 + vibrato 14, 3, 3 note A#, 14 + ;tie note A#, 16 + ;tie note A#, 5 note A#, 7 note A#, 7 @@ -490,14 +588,16 @@ Music_TCG2GRBlimp_Ch1: note G#, 5 note G#, 14 note D#, 4 - vibrato 28, $33 + vibrato 28, 3, 3 + ;musicf1 70 notetype0 7 note A#, 16 note A#, 2 - endchannel + sound_ret Branch_1e7e8a: octave 3 + ;musicf2 notetype0 1 note A_, 4 note A_, 3 @@ -507,6 +607,7 @@ Branch_1e7e8a: note A#, 10 note A#, 2 notetype0 1 + ;musicf1 64 note A#, 4 note A#, 3 note A#, 4 @@ -524,9 +625,11 @@ Branch_1e7e8a: note F_, 4 note F_, 3 note G_, 16 + ;tie note G_, 5 note G_, 7 note D#, 16 + ;tie note D#, 5 note D#, 7 dec_octave @@ -542,8 +645,11 @@ Branch_1e7e8a: note C_, 4 note F_, 3 note C_, 16 + ;tie note C_, 12 + ;tie note C_, 16 + ;tie note C_, 12 note C_, 14 note A_, 4 @@ -554,6 +660,7 @@ Branch_1e7e8a: note A#, 10 note A#, 2 notetype0 1 + ;musicf1 64 note A#, 4 note A#, 3 note A#, 4 @@ -567,29 +674,35 @@ Branch_1e7e8a: note C_, 4 note F_, 3 note C_, 16 + ;tie note C_, 12 + ;tie note C_, 16 + ;tie note C_, 12 note C_, 14 note C_, 4 note C_, 3 note D_, 4 note C_, 3 - endchannel + sound_ret -Music_TCG2GRBlimp_Ch3: +Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) notetype1 10 + ;musicdc 17 notetype2 11 notetype1 1 + ;musice8 3 + ;musice9 96 octave 2 notetype0 1 - note __, 14 + rest 14 notetype0 7 .Loop1 note F_, 4 note C_, 4 - loopchannel 11, .Loop1 + sound_loop 11, .Loop1 note F_, 4 note D#, 4 note C#, 4 @@ -599,7 +712,7 @@ Music_TCG2GRBlimp_Ch3: .Loop2 note F_, 4 note C_, 4 - loopchannel 13, .Loop2 + sound_loop 13, .Loop2 note F_, 4 note G_, 4 note G#, 4 @@ -640,90 +753,129 @@ Music_TCG2GRBlimp_Ch3: note E_, 4 note D#, 4 note A#, 4 + ;musice8 2 notetype0 1 note G#, 10 + ;tie note G#, 9 note D#, 10 + ;tie note D#, 9 note G#, 10 + ;tie note G#, 8 + ;musice8 1 note G#, 4 + ;tie note A_, 4 + ;tie note A#, 6 + ;tie notetype0 7 note A#, 14 + ;tie note A#, 2 - endchannel + sound_ret -Music_TCG2GRBlimp_Ch4: - togglenoise $06 - notetype 9 +Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50) + toggle_noise 6 + drum_speed 9 octave 1 - notetype 1 - note __, 14 + drum_speed 1 + rest 14 .Loop1 - note C#, 14 - note C#, 14 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - note C#, 7 - note C#, 7 - note C#, 14 - note C#, 14 - note D_, 3 - note D_, 4 + drum_note 2, 14 + ;musicef 253 + drum_note 2, 14 + ;musicef 0 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 14 + ;musicef 253 + drum_note 2, 14 + ;musicef 0 + drum_note 3, 3 + ;musicef 253 + drum_note 3, 4 rept 3 - note D_, 3 - note D_, 4 + drum_note 3, 3 + drum_note 3, 4 endr - note C#, 14 - note C#, 14 - note C#, 7 - note C#, 14 - note C#, 7 - note C#, 14 - note C#, 14 - note D_, 3 - note D_, 4 + ;musicef 0 + drum_note 2, 14 + drum_note 2, 14 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 14 + ;musicef 253 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 14 + ;musicef 253 + drum_note 2, 14 + ;musicef 0 + drum_note 3, 3 + ;musicef 253 + drum_note 3, 4 rept 3 - note D_, 3 - note D_, 4 + drum_note 3, 3 + drum_note 3, 4 endr - loopchannel 11, .Loop1 - note C#, 14 - note C#, 14 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - note C#, 7 - note C#, 7 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - note C#, 5 - note C#, 16 - note __, 3 - note C#, 16 - note __, 2 - note D_, 3 - note D_, 4 + ;musicef 0 + sound_loop 11, .Loop1 + drum_note 2, 14 + ;musicef 253 + drum_note 2, 14 + ;musicef 0 + drum_note 3, 3 + ;musicef 253 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + drum_note 3, 3 + ;musicef 253 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + ;musicef 255 + drum_note 2, 5 + ;musicef 1 + drum_note 2, 16 + ;tie + rest 3 + drum_note 2, 16 + ;tie + rest 2 + drum_note 3, 3 + ;musicef 251 + drum_note 3, 4 .Loop2 - note D_, 3 - note D_, 4 - loopchannel 5, .Loop2 + drum_note 3, 3 + drum_note 3, 4 + sound_loop 5, .Loop2 + ;musicef 252 .Loop3 - note D_, 3 - note D_, 4 - loopchannel 5, .Loop3 + drum_note 3, 3 + drum_note 3, 4 + sound_loop 5, .Loop3 + ;musicef 253 .Loop4 - note D_, 3 - note D_, 4 - loopchannel 5, .Loop4 - note D_, 14 - endchannel - + drum_note 3, 3 + drum_note 3, 4 + sound_loop 5, .Loop4 + ;musicef 2 + drum_note 3, 14 + sound_ret +; 0x1e7fd6 diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm index 7955855c..3edd1cf4 100644 --- a/crysaudio/music/TCG2/grcastle.asm +++ b/crysaudio/music/TCG2/grcastle.asm @@ -1,462 +1,815 @@ -Music_TCG2GRCastle: - db $C0 - dw Music_TCG2GRCastle_Ch1 - db $01 - dw Music_TCG2GRCastle_Ch2 - db $02 - dw Music_TCG2GRCastle_Ch3 - db $03 - dw Music_TCG2GRCastle_Ch4 +Music_GRCastle: + channel_count 4 + channel 1, Music_GRCastle_Ch1 + channel 2, Music_GRCastle_Ch2 + channel 3, Music_GRCastle_Ch3 + channel 4, Music_GRCastle_Ch4 -Music_TCG2GRCastle_Ch2: +Music_GRCastle_Ch2: ; 1f213c (7c:613c) notetype1 10 notetype0 1 - note __, 12 + rest 12 + ;musicf0 8 octave 1 - vibrato 1, $33 + ;vibrato_type 5 + vibrato 1, 3, 3 + ;musicf1 80 + ;musicf3 + ;musice4 0 note B_, 9 - note __, 4 + rest 4 note B_, 9 - note __, 3 - note __, 13 + rest 3 + rest 13 inc_octave note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 13 note E_, 12 note E_, 1 - note __, 4 + rest 4 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 inc_octave + ;musicf2 note E_, 12 note E_, 13 + ;musicf3 dec_octave note E_, 2 - note __, 4 - note __, 1 - note __, 5 + rest 4 + rest 1 + rest 5 note G_, 7 note A_, 6 note G_, 12 note E_, 13 note D_, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 + rest 3 + rest 13 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 13 note E_, 12 note E_, 1 - note __, 4 + rest 4 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note A_, 3 + ;tie + ;musice4 17 note A_, 3 + ;tie + ;musice4 0 note A#, 6 note A_, 13 note G_, 12 .MainLoop + ;musicf0 0 + ;musicf3 octave 2 notetype1 7 note E_, 16 + ;tie note E_, 9 notetype1 11 note E_, 16 + ;tie note E_, 9 + ;musicf0 0 + ;musicef 2 + ;musicf1 119 octave 2 - vibrato 37, $33 + ;vibrato_type 5 + vibrato 37, 3, 3 note A_, 4 + ;tie + ;musice4 8 note A_, 3 + ;tie + ;musice4 16 note A_, 3 + ;tie + ;musice4 24 note A_, 3 + ;tie + ;musice4 0 note A#, 3 + ;tie + ;musice4 8 note A#, 3 + ;tie + ;musice4 16 note A#, 3 + ;tie + ;musice4 24 note A#, 3 + ;tie + ;musice4 0 note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 9 note B_, 16 + ;musicf3 note A_, 13 note B_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 inc_octave + ;musicf2 + note C_, 13 + ;tie + note C_, 12 + ;tie + note C_, 13 + ;tie + note C_, 12 + ;tie + note C_, 13 + ;tie + note C_, 12 + ;tie note C_, 13 note C_, 12 - note C_, 13 - note C_, 12 - note C_, 13 - note C_, 12 - note C_, 13 - note C_, 12 - vibrato 29, $33 + vibrato 29, 3, 3 + ;musicf3 note C_, 4 + ;tie + ;musice4 7 note C_, 3 + ;tie + ;musice4 14 note C_, 3 + ;tie + ;musice4 22 note C_, 3 + ;tie + ;musice4 0 note C#, 3 + ;tie + ;musice4 8 note C#, 3 + ;tie + ;musice4 16 note C#, 3 + ;tie + ;musice4 24 note C#, 3 + ;tie + ;musice4 0 note D_, 13 + ;tie note D_, 12 - vibrato 13, $33 + vibrato 13, 3, 3 + ;musicf2 + note C_, 13 + ;tie + note C_, 12 + ;tie note C_, 13 note C_, 12 - note C_, 13 - note C_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 dec_octave + ;musicf3 note A_, 4 + ;tie + ;musice4 8 note A_, 3 + ;tie + ;musice4 16 note A_, 3 + ;tie + ;musice4 24 note A_, 3 + ;tie + ;musice4 0 note A#, 3 + ;tie + ;musice4 8 note A#, 3 + ;tie + ;musice4 16 note A#, 3 + ;tie + ;musice4 24 note A#, 3 + ;tie + ;musice4 0 note B_, 13 inc_octave note C_, 12 dec_octave + ;musicf2 note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie note B_, 12 note B_, 13 + ;tie note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 - vibrato 37, $33 - note A_, 13 - note A_, 12 - note A_, 13 - note A_, 12 - note A_, 13 - note A_, 12 + vibrato 37, 3, 3 + note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie + note A_, 12 + ;tie note A_, 13 note A_, 12 + ;musicf3 inc_octave note C_, 4 + ;tie + ;musice4 7 note C_, 3 + ;tie + ;musice4 14 note C_, 3 + ;tie + ;musice4 22 note C_, 3 + ;tie + ;musice4 0 note C#, 3 + ;tie + ;musice4 8 note C#, 3 + ;tie + ;musice4 16 note C#, 3 + ;tie + ;musice4 24 note C#, 3 + ;tie + ;musice4 0 note D_, 13 dec_octave note A_, 12 + ;tie note A_, 13 + ;tie note A_, 12 inc_octave + ;musicf2 note D_, 13 note D_, 12 dec_octave note A_, 4 + ;tie + ;musice4 8 note A_, 3 + ;tie + ;musice4 16 note A_, 3 + ;tie + ;musice4 24 note A_, 3 + ;tie + ;musice4 0 note A#, 3 + ;tie + ;musice4 8 note A#, 3 + ;tie + ;musice4 16 note A#, 3 + ;tie + ;musice4 24 note A#, 3 + ;tie + ;musice4 0 note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 9 note B_, 16 + ;musicf3 note A_, 13 note B_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 inc_octave + ;musicf2 note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 note C_, 12 note C_, 4 + ;tie + ;musice4 7 note C_, 3 + ;tie + ;musice4 14 note C_, 3 + ;tie + ;musice4 22 note C_, 3 + ;tie + ;musice4 0 note C#, 3 + ;tie + ;musice4 8 note C#, 3 + ;tie + ;musice4 16 note C#, 3 + ;tie + ;musice4 24 note C#, 3 + ;tie + ;musice4 0 note D_, 13 + ;tie note D_, 12 - vibrato 13, $33 + vibrato 13, 3, 3 + ;musicf2 + note E_, 13 + ;tie + note E_, 12 + ;tie note E_, 13 note E_, 12 - note E_, 13 - note E_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 + ;musicf3 note E_, 4 + ;tie + ;musice4 8 note E_, 3 + ;tie + ;musice4 16 note E_, 3 + ;tie + ;musice4 24 note E_, 3 + ;tie + ;musice4 0 note F_, 3 + ;tie + ;musice4 8 note F_, 3 + ;tie + ;musice4 16 note F_, 3 + ;tie + ;musice4 24 note F_, 3 + ;tie + ;musice4 0 note F#, 13 note G_, 12 + ;musicf2 note F#, 13 + ;tie note F#, 12 + ;tie note F#, 13 + ;tie note F#, 12 + ;tie note F#, 13 + ;tie note F#, 12 + ;tie note F#, 13 + ;musicf3 note F_, 4 note E_, 4 note D#, 4 note D_, 16 + ;tie note D_, 9 + ;musicf2 note F#, 13 note F#, 12 + ;musicf3 note F_, 4 + ;musicf2 note F#, 9 + ;tie note F#, 12 note F#, 13 + ;musicf3 note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 + ;tie note E_, 16 + ;tie note E_, 9 + ;tie note E_, 4 + ;tie + ;musice4 249 note E_, 3 + ;tie + ;musice4 242 note E_, 3 + ;tie + ;musice4 235 note E_, 3 + ;tie + ;musice4 0 note D#, 3 + ;tie + ;musice4 250 note D#, 3 + ;tie + ;musice4 244 note D#, 3 + ;tie + ;musice4 240 note D#, 2 + ;tie + ;musice4 0 note D_, 1 + ;musicf0 14 + ;musicf1 71 + ;musicf3 octave 2 notetype1 8 note B_, 16 + ;tie note B_, 9 + ;musicf0 14 note B_, 3 inc_octave + ;musicef 1 note D_, 16 + ;tie note D_, 6 note D#, 4 + ;musicef 1 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 9 note A#, 3 - vibrato 25, $33 + vibrato 25, 3, 3 + ;musicf2 note B_, 9 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie note B_, 13 note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 + ;musicf3 note A_, 16 + ;tie note A_, 9 note G_, 16 + ;tie note G_, 9 note F#, 13 note G_, 12 note F#, 13 note D_, 12 + ;tie note D_, 13 note C_, 4 dec_octave note B_, 4 note A#, 4 + ;musicf2 + note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie + note A_, 12 + ;tie note A_, 13 note A_, 12 - note A_, 13 - note A_, 12 - note A_, 13 - note A_, 12 - note A_, 13 - note A_, 12 + ;musicf3 note F#, 13 + ;tie note F#, 12 note G_, 13 + ;tie note G_, 12 + ;tie note G_, 13 inc_octave note D#, 3 + ;musicf2 note E_, 9 + ;tie + note E_, 13 + ;tie + note E_, 12 + ;tie + note E_, 13 + ;tie + note E_, 12 + ;tie + note E_, 13 + ;tie + note E_, 12 + ;tie note E_, 13 note E_, 12 - note E_, 13 - note E_, 12 - note E_, 13 - note E_, 12 - note E_, 13 - note E_, 12 + ;musicf3 note D#, 4 note E_, 15 note F#, 6 + ;tie note F#, 13 note G_, 12 note F#, 4 note G_, 3 note F#, 6 + ;tie note F#, 12 note D_, 13 dec_octave note A#, 6 + ;musicf2 note B_, 6 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie note B_, 13 note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 + ;musicf3 inc_octave note C_, 16 + ;tie note C_, 9 note D_, 16 + ;tie note D_, 9 note D#, 4 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 9 note A#, 3 - vibrato 25, $33 + vibrato 25, 3, 3 + ;musicf2 note B_, 9 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie + note B_, 13 + ;tie + note B_, 12 + ;tie note B_, 13 note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 - note B_, 13 - note B_, 12 + ;musicf3 note A_, 16 + ;tie note A_, 9 note G_, 16 + ;tie note G_, 9 note F#, 13 note G_, 12 note F#, 13 note G#, 3 note A_, 9 + ;tie note A_, 13 note G_, 4 note F#, 4 note E_, 4 + ;musicf2 + note D_, 13 + ;tie + note D_, 12 + ;tie + note D_, 13 + ;tie + note D_, 12 + ;tie note D_, 13 note D_, 12 - note D_, 13 - note D_, 12 - note D_, 13 - note D_, 12 + ;musicf3 dec_octave note A#, 4 note B_, 9 + ;tie note B_, 12 inc_octave note D_, 13 + ;tie note D_, 12 note D#, 4 note E_, 9 + ;tie note E_, 12 note D_, 13 + ;musicf2 note E_, 12 + ;tie + note E_, 13 + ;tie + note E_, 12 + ;tie + note E_, 13 + ;tie + note E_, 12 + ;tie + note E_, 13 + ;tie + note E_, 12 + ;tie note E_, 13 note E_, 12 + ;musicf3 note E_, 13 - note E_, 12 - note E_, 13 - note E_, 12 - note E_, 13 - note E_, 12 - note E_, 13 + ;tie note E_, 6 note A_, 6 + ;tie note A_, 13 note G_, 12 note F#, 4 note G_, 3 + ;musicf2 note F#, 6 + ;tie note F#, 12 + ;tie + note F#, 13 + ;tie + note F#, 12 + ;tie + note F#, 13 + ;tie + note F#, 12 + ;tie + note F#, 13 + ;tie + note F#, 12 + ;tie + note F#, 13 + ;tie + note F#, 12 + ;tie + note F#, 13 + ;tie + note F#, 12 + ;tie + note F#, 13 + ;tie + note F#, 12 + ;tie note F#, 13 note F#, 12 - note F#, 13 - note F#, 12 - note F#, 13 - note F#, 12 - note F#, 13 - note F#, 12 - note F#, 13 - note F#, 12 - note F#, 13 - note F#, 12 - note F#, 13 - note F#, 12 + ;musicf3 octave 1 - vibrato 50, $33 + ;musicf0 8 + ;vibrato_type 5 + vibrato 50, 3, 3 + ;musice4 247 .Loop1 note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 - loopchannel 4, .Loop1 + ;tie + sound_loop 4, .Loop1 note E_, 16 + ;musice4 0 + ;musicf0 23 octave 3 + ;musicf1 32 + ;musicf2 note E_, 7 note B_, 6 note A_, 6 @@ -545,67 +898,81 @@ Music_TCG2GRCastle_Ch2: note G_, 6 note D_, 6 dec_octave - loopchannel 0, .MainLoop + ;musicf3 + sound_loop 0, .MainLoop -Music_TCG2GRCastle_Ch1: +Music_GRCastle_Ch1: ; 1f2525 (7c:6525) notetype1 10 notetype0 1 - note __, 12 + rest 12 + ;musicf0 8 octave 1 - vibrato 1, $33 - note __, 13 - note __, 12 - note __, 13 + ;vibrato_type 5 + vibrato 1, 3, 3 + ;musicf1 80 + ;musicf3 + ;musice4 0 + rest 13 + rest 12 + rest 13 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note B_, 13 + ;tie note B_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 13 note B_, 12 - note __, 13 + rest 13 inc_octave + ;musicf2 note B_, 12 note B_, 13 - note __, 12 + ;musicf3 + rest 12 note D_, 7 - note __, 6 - note __, 12 + rest 6 + rest 12 dec_octave note B_, 13 - note __, 12 + rest 12 note B_, 9 - note __, 4 + rest 4 note B_, 9 - note __, 3 - note __, 13 + rest 3 + rest 13 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note B_, 13 + ;tie note B_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 13 note B_, 12 note B_, 1 - note __, 4 + rest 4 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 inc_octave note E_, 3 + ;tie + ;musice4 22 note E_, 3 + ;tie + ;musice4 0 note F_, 6 note E_, 13 note D_, 12 @@ -615,290 +982,322 @@ Music_TCG2GRCastle_Ch1: note A_, 13 note A#, 12 .MainLoop + ;musicf0 8 octave 2 - vibrato 0, $33 + ;vibrato_type 5 + vibrato 0, 3, 3 + ;musicf1 80 note E_, 9 - note __, 4 + rest 4 + ;musicf2 note E_, 9 - note __, 3 + rest 3 note E_, 9 - note __, 4 + rest 4 + ;musicf3 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 13 note E_, 12 note E_, 2 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note G_, 12 + ;tie note G_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 5 + rest 5 note G_, 7 note A_, 6 note G_, 12 note E_, 13 note D_, 12 note F_, 9 - note __, 4 + rest 4 + ;musicf2 note F_, 9 - note __, 3 + rest 3 note F_, 9 - note __, 4 + rest 4 + ;musicf3 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note F_, 13 + ;tie note F_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note E_, 13 note F_, 12 note F_, 2 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note A_, 12 + ;tie note A_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note F_, 2 - note __, 4 + rest 4 note F_, 1 - note __, 5 + rest 5 note E_, 7 note F_, 6 note E_, 12 note C_, 13 note F_, 12 note E_, 9 - note __, 4 + rest 4 + ;musicf2 note E_, 9 - note __, 3 + rest 3 note E_, 9 - note __, 4 + rest 4 + ;musicf3 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 13 note E_, 12 note E_, 2 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note G_, 12 + ;tie note G_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 5 + rest 5 note G_, 7 note A_, 6 note G_, 12 note E_, 13 note D_, 12 note F_, 9 - note __, 4 + rest 4 + ;musicf2 note F_, 9 - note __, 3 + rest 3 note F_, 9 - note __, 4 + rest 4 + ;musicf3 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 inc_octave note C_, 13 + ;tie note C_, 12 dec_octave - vibrato 0, $33 + vibrato 0, 3, 3 note E_, 13 note F_, 12 note F_, 2 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note A_, 12 + ;tie note A_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note A_, 2 - note __, 4 + rest 4 note A_, 1 - note __, 5 + rest 5 note A_, 7 note B_, 6 note A_, 12 note F_, 13 note A_, 12 note E_, 9 - note __, 4 + rest 4 + ;musicf2 note E_, 9 - note __, 3 + rest 3 note E_, 9 - note __, 4 + rest 4 + ;musicf3 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 13 note E_, 12 note E_, 2 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note G_, 12 + ;tie note G_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 5 + rest 5 note G_, 7 note A_, 6 note G_, 12 note E_, 13 note D_, 12 note F_, 9 - note __, 4 + rest 4 + ;musicf2 note F_, 9 - note __, 3 + rest 3 note F_, 9 - note __, 4 + rest 4 + ;musicf3 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note F_, 13 + ;tie note F_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note E_, 13 note F_, 12 note F_, 2 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note A_, 12 + ;tie note A_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note F_, 2 - note __, 4 + rest 4 note F_, 1 - note __, 5 + rest 5 note E_, 7 note F_, 6 note E_, 12 note C_, 13 note F_, 12 note E_, 9 - note __, 4 + rest 4 + ;musicf2 note E_, 9 - note __, 3 + rest 3 note E_, 9 - note __, 4 + rest 4 + ;musicf3 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note D_, 13 note E_, 12 note E_, 2 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note G_, 12 + ;tie note G_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 5 + rest 5 note G_, 7 note A_, 6 note G_, 12 note E_, 13 note D_, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 + rest 3 note E_, 13 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note B_, 13 + ;tie note B_, 12 note A_, 13 note B_, 12 note E_, 2 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 inc_octave note E_, 12 dec_octave @@ -911,68 +1310,113 @@ Music_TCG2GRCastle_Ch1: dec_octave note A_, 12 octave 2 + ;musicef 254 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 note A#, 3 note B_, 9 note B_, 13 + ;tie note B_, 12 inc_octave note D_, 4 + ;tie + ;musice4 6 note D_, 3 + ;tie + ;musice4 12 note D_, 3 + ;tie + ;musice4 15 note D_, 3 + ;tie + ;musice4 254 note D#, 3 + ;tie + ;musice4 5 note D#, 3 + ;tie + ;musice4 10 note D#, 3 + ;tie + ;musice4 16 note D#, 3 + ;tie + ;musice4 255 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 note F#, 16 + ;tie note F#, 9 note E_, 13 + ;tie note E_, 12 note D_, 13 + ;tie note D_, 12 + ;tie note D_, 13 note G#, 3 note A_, 9 + ;tie note A_, 13 + ;tie note A_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave note B_, 13 + ;tie note B_, 12 inc_octave note E_, 13 + ;tie note E_, 12 note C#, 4 note D_, 9 + ;tie note D_, 12 + ;tie note D_, 13 dec_octave note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 inc_octave note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave note B_, 13 inc_octave @@ -980,115 +1424,201 @@ Music_TCG2GRCastle_Ch1: note A_, 13 note F#, 12 note D_, 13 + ;tie note D_, 12 + ;tie note D_, 13 note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 + ;musicf2 + note D_, 13 + ;tie + note D_, 12 + ;tie + note D_, 13 + ;tie + note D_, 12 + ;tie note D_, 13 note D_, 12 - note D_, 13 - note D_, 12 - note D_, 13 - note D_, 12 - vibrato 0, $33 + ;musicf3 + vibrato 0, 3, 3 dec_octave dec_octave + ;musicef 3 note B_, 13 + ;tie note B_, 12 note A_, 13 + ;tie note A_, 12 + ;musicef 253 inc_octave note G_, 13 + ;tie note G_, 12 + ;tie note G_, 13 note A#, 3 note B_, 9 + ;tie note B_, 13 + ;tie note B_, 12 inc_octave note D_, 4 + ;tie + ;musice4 6 note D_, 3 + ;tie + ;musice4 12 note D_, 3 + ;tie + ;musice4 15 note D_, 3 + ;tie + ;musice4 254 note D#, 3 + ;tie + ;musice4 5 note D#, 3 + ;tie + ;musice4 10 note D#, 3 + ;tie + ;musice4 16 note D#, 3 + ;tie + ;musice4 255 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 note F#, 16 + ;tie note F#, 9 note E_, 13 + ;tie note E_, 12 note D_, 13 + ;tie note D_, 12 + ;tie note D_, 13 note F_, 3 note F#, 9 + ;tie note F#, 13 + ;tie note F#, 12 dec_octave - vibrato 25, $33 + vibrato 25, 3, 3 + ;musicf2 + note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie + note A_, 12 + ;tie note A_, 13 note A_, 12 + ;musicf3 + vibrato 0, 3, 3 note A_, 13 - note A_, 12 - note A_, 13 - note A_, 12 - vibrato 0, $33 - note A_, 13 + ;tie note A_, 12 note B_, 13 + ;tie note B_, 12 inc_octave note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 note F#, 3 note G_, 9 + ;tie note G_, 13 + ;tie note G_, 12 dec_octave - vibrato 25, $33 - note A_, 13 - note A_, 12 - note A_, 13 - note A_, 12 + vibrato 25, 3, 3 note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie + note A_, 12 + ;tie + note A_, 13 + ;tie note A_, 12 note A_, 13 + ;tie note A_, 12 inc_octave note C_, 13 + ;tie note C_, 12 dec_octave note A_, 13 + ;tie note A_, 12 + ;tie note A_, 13 inc_octave note D_, 3 + ;tie + ;musice4 6 note D_, 3 + ;tie + ;musice4 253 note D#, 3 + ;tie + ;musice4 13 note D#, 3 + ;tie + ;musice4 254 note E_, 13 + ;tie note E_, 12 note C#, 13 + ;tie note C#, 12 + ;musicf2 note D#, 13 + ;tie + note D#, 12 + ;tie + note D#, 13 + ;tie + note D#, 12 + ;tie + note D#, 13 + ;tie note D#, 12 note D#, 13 + ;tie note D#, 12 - note D#, 13 - note D#, 12 - note D#, 13 - note D#, 12 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf3 octave 3 note E_, 7 - note __, 6 + rest 6 + ;musicf2 note A_, 6 note E_, 6 inc_octave @@ -1188,8 +1718,10 @@ Music_TCG2GRCastle_Ch1: note B_, 6 note F#, 6 octave 3 + ;musicf3 note A_, 7 - note __, 6 + rest 6 + ;musicf2 inc_octave note D_, 6 dec_octave @@ -1268,6 +1800,7 @@ Music_TCG2GRCastle_Ch1: dec_octave note G_, 6 dec_octave + ;musicef 2 note G_, 7 inc_octave note G_, 6 @@ -1280,33 +1813,37 @@ Music_TCG2GRCastle_Ch1: dec_octave note B_, 6 note F#, 6 - loopchannel 0, .MainLoop + ;musicf3 + sound_loop 0, .MainLoop -Music_TCG2GRCastle_Ch3: +Music_GRCastle_Ch3: ; 1f2903 (7c:6903) notetype1 10 notetype2 11 notetype1 1 + ;musice9 96 + ;musicdc 255 notetype0 1 - note __, 12 - vibrato 0, $33 + rest 12 + ;vibrato_type 5 + vibrato 0, 3, 3 octave 2 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - note __, 12 - note __, 13 - note __, 12 + rest 3 + rest 13 + rest 12 + rest 13 + rest 12 note D_, 13 note E_, 9 - note __, 3 - note __, 13 + rest 3 + rest 13 note A_, 12 note A#, 13 note B_, 9 - note __, 3 + rest 3 inc_octave note D_, 13 dec_octave @@ -1314,17 +1851,18 @@ Music_TCG2GRCastle_Ch3: note A_, 13 note G_, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - note __, 12 + rest 3 + rest 13 + rest 12 note E_, 16 + ;tie note E_, 9 note D_, 13 note E_, 9 - note __, 3 - note __, 13 + rest 3 + rest 13 note A#, 12 note A_, 13 note G_, 12 @@ -1335,66 +1873,68 @@ Music_TCG2GRCastle_Ch3: .MainLoop octave 2 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b72 + rest 3 + rest 13 + sound_call Branch_1f2b72 note D_, 13 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b9e + rest 3 + rest 13 + sound_call Branch_1f2b9e note B_, 9 - note __, 3 + rest 3 note A_, 13 note B_, 12 note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b72 + rest 3 + rest 13 + ;musicec 1 + sound_call Branch_1f2b72 note D_, 13 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b9e + rest 3 + rest 13 + ;musicec 3 + sound_call Branch_1f2b9e note B_, 9 - note __, 3 + rest 3 note A_, 13 note B_, 12 note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b72 + rest 3 + rest 13 + sound_call Branch_1f2b72 note D_, 13 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b9e + rest 3 + rest 13 + sound_call Branch_1f2b9e note B_, 9 - note __, 3 + rest 3 note A_, 13 note B_, 12 note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b88 + rest 3 + rest 13 + sound_call Branch_1f2b88 note D_, 13 note E_, 9 - note __, 3 - note __, 13 + rest 3 + rest 13 inc_octave note D_, 6 note E_, 6 @@ -1406,66 +1946,68 @@ Music_TCG2GRCastle_Ch3: note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b72 + rest 3 + rest 13 + sound_call Branch_1f2b72 note D_, 13 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b9e + rest 3 + rest 13 + sound_call Branch_1f2b9e note B_, 9 - note __, 3 + rest 3 note A_, 13 note B_, 12 note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b72 + rest 3 + rest 13 + ;musicec 1 + sound_call Branch_1f2b72 note D_, 13 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b9e + rest 3 + rest 13 + ;musicec 3 + sound_call Branch_1f2b9e note B_, 9 - note __, 3 + rest 3 note A_, 13 note B_, 12 note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - note __, 13 - note __, 1 - callchannel Branch_1f2b72 + rest 3 + rest 13 + rest 1 + sound_call Branch_1f2b72 note D_, 13 note E_, 9 - note __, 3 - note __, 13 - callchannel Branch_1f2b9e + rest 3 + rest 13 + sound_call Branch_1f2b9e note B_, 9 - note __, 3 + rest 3 note A_, 13 note B_, 12 note D_, 13 note D#, 12 note E_, 9 - note __, 4 + rest 4 note E_, 9 - note __, 3 - callchannel Branch_1f2baa + rest 3 + sound_call Branch_1f2baa note D_, 13 note E_, 9 - note __, 3 - callchannel Branch_1f2bbf + rest 3 + sound_call Branch_1f2bbf note B_, 12 inc_octave note D_, 13 @@ -1475,202 +2017,344 @@ Music_TCG2GRCastle_Ch3: note A_, 12 note G_, 13 note D_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 note G_, 12 + ;tie note G_, 13 + ;tie note G_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 note B_, 7 + ;tie inc_octave note C_, 16 + ;tie note C_, 2 + ;tie note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 note D_, 16 + ;tie note D_, 9 note C_, 16 + ;tie note C_, 9 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 note F#, 12 + ;tie note F#, 13 + ;tie note F#, 12 - vibrato 25, $33 + vibrato 25, 3, 3 note A_, 3 + ;tie note A#, 3 + ;tie + ;musice4 22 note A#, 3 + ;tie + ;musice4 0 note B_, 3 + ;tie note B_, 13 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 note F#, 16 + ;tie note F#, 9 note B_, 16 + ;tie note B_, 9 note A_, 13 + ;tie note A_, 12 + ;tie note A_, 13 note E_, 12 + ;tie note E_, 13 + ;tie note E_, 12 note G_, 4 + ;tie note G#, 3 + ;tie note A_, 16 + ;tie note A_, 2 note A_, 13 note G_, 12 + ;tie note G_, 13 + ;tie note G_, 12 note F#, 16 + ;tie note F#, 9 note G_, 16 + ;tie note G_, 9 note E_, 13 + ;tie note E_, 12 + ;tie note E_, 13 note A_, 3 + ;tie note A#, 3 + ;tie note B_, 16 + ;tie note B_, 15 inc_octave note D_, 4 + ;tie note D#, 3 + ;tie note E_, 16 + ;tie note E_, 2 + ;tie note E_, 13 dec_octave note A#, 3 + ;tie note B_, 9 inc_octave note E_, 13 dec_octave note B_, 12 note E_, 16 + ;tie note E_, 9 note D_, 16 + ;tie note D_, 9 note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 note G_, 12 + ;tie note G_, 13 + ;tie note G_, 12 - vibrato 25, $33 + vibrato 25, 3, 3 note B_, 7 + ;tie inc_octave note C_, 16 + ;tie note C_, 2 + ;tie note C_, 13 + ;tie note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 note D_, 16 + ;tie note D_, 9 note C_, 16 + ;tie note C_, 9 - vibrato 0, $33 + vibrato 0, 3, 3 dec_octave note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 note F#, 12 + ;tie note F#, 13 + ;tie note F#, 12 - vibrato 25, $33 + vibrato 25, 3, 3 note A_, 3 + ;tie note A#, 3 + ;tie + ;musice4 22 note A#, 3 + ;tie + ;musice4 0 note B_, 3 + ;tie note B_, 13 + ;tie note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 + ;tie note B_, 12 note F#, 16 + ;tie note F#, 9 note B_, 16 + ;tie note B_, 9 note F_, 13 + ;tie note F_, 12 + ;tie note F_, 13 inc_octave note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 note D#, 4 + ;tie + ;musice4 24 note D#, 3 + ;tie + ;musice4 0 note E_, 3 + ;tie + ;musice4 22 note E_, 3 + ;tie + ;musice4 0 note F_, 12 + ;tie note F_, 13 note C_, 12 + ;tie note C_, 13 + ;tie note C_, 12 dec_octave note F_, 16 + ;tie note F_, 9 inc_octave note C_, 16 + ;tie note C_, 9 dec_octave note B_, 13 + ;tie note B_, 12 + ;tie note B_, 13 inc_octave note F#, 12 + ;tie note F#, 13 + ;tie note F#, 12 - vibrato 40, $33 + vibrato 40, 3, 3 note A_, 4 + ;tie + ;musice4 17 note A_, 3 + ;tie + ;musice4 0 note A#, 3 + ;tie + ;musice4 16 note A#, 3 + ;tie + ;musice4 0 note B_, 12 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 16 + ;tie note B_, 2 + ;tie + ;musice4 250 note B_, 3 + ;tie + ;musice4 244 note B_, 2 + ;tie + ;musice4 238 note B_, 2 + ;tie + ;musice4 232 note B_, 2 + ;tie + ;musice4 0 note A#, 2 + ;tie + ;musice4 248 note A#, 2 + ;tie + ;musice4 240 note A#, 2 + ;tie + ;musice4 232 note A#, 2 + ;tie + ;musice4 0 note A_, 1 - vibrato 50, $33 + vibrato 50, 3, 3 + ;musicec 244 octave 2 notetype0 10 note E_, 10 + ;tie note E_, 10 + ;tie note E_, 10 + ;tie note E_, 10 + ;tie note E_, 10 + ;tie note E_, 10 + ;tie notetype0 5 notetype1 3 note E_, 15 notetype1 1 + ;musicec 0 notetype0 1 note D_, 13 note E_, 12 - note __, 13 + rest 13 inc_octave note D_, 3 + ;tie note D#, 3 + ;tie note E_, 6 note D_, 13 dec_octave @@ -1679,352 +2363,384 @@ Music_TCG2GRCastle_Ch3: note A_, 12 note D_, 13 note D#, 12 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f2b72: notetype1 2 octave 2 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note B_, 13 + ;tie note B_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 notetype1 1 octave 2 - endchannel + ;musicec 0 + sound_ret Branch_1f2b88: notetype1 2 octave 3 note C_, 2 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note F_, 13 + ;tie note F_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 notetype1 1 octave 2 - endchannel + ;musicec 0 + sound_ret Branch_1f2b9e: notetype1 2 octave 3 note D_, 12 + ;tie note D_, 13 notetype1 1 octave 2 - endchannel + ;musicec 0 + sound_ret Branch_1f2baa: notetype1 2 octave 2 note B_, 13 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 - vibrato 7, $33 + rest 3 + vibrato 7, 3, 3 note B_, 13 + ;tie note B_, 12 - vibrato 0, $33 + vibrato 0, 3, 3 notetype1 1 octave 2 - endchannel + sound_ret Branch_1f2bbf: notetype1 2 octave 2 note B_, 2 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 notetype1 1 - endchannel + sound_ret -Music_TCG2GRCastle_Ch4: - togglenoise $06 - notetype 1 +Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) + toggle_noise 6 + drum_speed 1 octave 1 - note C#, 4 - note C#, 4 - note C#, 4 - note C_, 16 - note __, 9 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note D#, 13 - note C#, 12 - note D#, 13 - note C_, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note C#, 4 - note C#, 4 - note C#, 4 - note C_, 13 - note C_, 12 - note C#, 13 - note C_, 12 - note C#, 13 - note D#, 6 - note C#, 6 - note C#, 13 - note C#, 12 - note D#, 13 - note C#, 12 - note C#, 13 - note C_, 12 - note C#, 13 - note C_, 6 - note C#, 6 - note C#, 13 - note C#, 4 - note C#, 4 - note C#, 4 + ;musicdc 255 + ;musicef 251 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 1, 16 + rest 9 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 4, 13 + drum_note 2, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 1, 13 + drum_note 1, 12 + drum_note 2, 13 + drum_note 1, 12 + drum_note 2, 13 + drum_note 4, 6 + drum_note 2, 6 + drum_note 2, 13 + drum_note 2, 12 + drum_note 4, 13 + drum_note 2, 12 + drum_note 2, 13 + drum_note 1, 12 + drum_note 2, 13 + drum_note 1, 6 + drum_note 2, 6 + drum_note 2, 13 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 .MainLoop .Loop1 - note C_, 13 - note C_, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note D#, 12 - note D#, 13 - note C#, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note C#, 4 - note C#, 4 - note C#, 4 - loopchannel 3, .Loop1 - note C_, 13 - note C_, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note D#, 12 - note D#, 13 - note C#, 12 - note C#, 13 - note C_, 12 - note C#, 13 - note C#, 12 - note C_, 13 - note C#, 4 - note C#, 4 - note C#, 4 + drum_note 1, 13 + drum_note 1, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 4, 12 + drum_note 4, 13 + drum_note 2, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + sound_loop 3, .Loop1 + drum_note 1, 13 + drum_note 1, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 4, 12 + drum_note 4, 13 + drum_note 2, 12 + drum_note 2, 13 + drum_note 1, 12 + drum_note 2, 13 + drum_note 2, 12 + drum_note 1, 13 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 .Loop2 - note C_, 13 - note C_, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note D#, 12 - note D#, 13 - note C#, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note C#, 4 - note C#, 4 - note C#, 4 - loopchannel 3, .Loop2 - note C_, 13 - note C_, 12 - note D#, 13 - note C_, 12 - note C#, 13 - note D#, 6 - note C#, 6 - note C#, 13 - note E_, 12 - note D#, 13 - note C#, 12 - note C#, 13 - note D#, 4 - note D#, 4 - note D#, 4 - note C#, 13 - note D#, 6 - note C#, 6 - note C#, 13 - note C#, 4 - note C#, 4 - note C#, 4 - callchannel Branch_1f2d0c - callchannel Branch_1f2d18 - callchannel Branch_1f2d0c - note D#, 13 - note C_, 12 - note E_, 13 - note D#, 6 - note D#, 6 - note D#, 13 - note D#, 12 - note C#, 13 - note D#, 4 - note D#, 4 - note D#, 4 - callchannel Branch_1f2d0c - callchannel Branch_1f2d18 - callchannel Branch_1f2d0c - note D#, 13 - note C_, 12 - note E_, 13 - note D#, 6 - note D#, 6 - note C#, 13 - note D#, 4 - note D#, 4 - note D#, 4 - note C#, 13 - note C#, 12 - callchannel Branch_1f2d0c - callchannel Branch_1f2d18 - callchannel Branch_1f2d0c - note D#, 13 - note C_, 12 - note E_, 13 - note D#, 6 - note D#, 6 - note D#, 13 - note D#, 12 - note C#, 13 - note D#, 4 - note D#, 4 - note D#, 4 - callchannel Branch_1f2d0c - callchannel Branch_1f2d18 - callchannel Branch_1f2d0c - note D#, 13 - note C_, 12 - note E_, 13 - note D#, 6 - note D#, 6 - note C#, 13 - note C_, 12 - note E_, 13 - note C#, 4 - note C#, 4 - note C#, 4 - notetype 6 - note G_, 16 - notetype 1 - note __, 4 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 4 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 4 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 8 - note C#, 4 - note C#, 4 - note C#, 4 - note C_, 16 - note __, 9 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note D#, 12 - note D#, 13 - note C#, 12 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note C#, 4 - note C#, 4 - note C#, 4 - note C_, 16 - note __, 9 - note D#, 13 - note C_, 12 - note C#, 16 - note __, 9 - note C_, 13 - note C#, 12 - note C_, 13 - note C#, 12 - note C#, 13 - note C#, 12 - note C#, 13 - note C#, 12 - note C#, 13 - note C_, 12 - loopchannel 0, .MainLoop + drum_note 1, 13 + drum_note 1, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 4, 12 + drum_note 4, 13 + drum_note 2, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + sound_loop 3, .Loop2 + drum_note 1, 13 + drum_note 1, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 13 + drum_note 4, 6 + drum_note 2, 6 + drum_note 2, 13 + drum_note 5, 12 + drum_note 4, 13 + drum_note 2, 12 + drum_note 2, 13 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 4 + drum_note 2, 13 + drum_note 4, 6 + drum_note 2, 6 + drum_note 2, 13 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + ;musicef 0 + sound_call Branch_1f2d0c + sound_call Branch_1f2d18 + sound_call Branch_1f2d0c + drum_note 4, 13 + drum_note 1, 12 + drum_note 5, 13 + drum_note 4, 6 + drum_note 4, 6 + drum_note 4, 13 + drum_note 4, 12 + drum_note 2, 13 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 4 + sound_call Branch_1f2d0c + sound_call Branch_1f2d18 + sound_call Branch_1f2d0c + drum_note 4, 13 + drum_note 1, 12 + drum_note 5, 13 + drum_note 4, 6 + drum_note 4, 6 + drum_note 2, 13 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 4 + drum_note 2, 13 + drum_note 2, 12 + sound_call Branch_1f2d0c + sound_call Branch_1f2d18 + sound_call Branch_1f2d0c + drum_note 4, 13 + drum_note 1, 12 + drum_note 5, 13 + drum_note 4, 6 + drum_note 4, 6 + drum_note 4, 13 + drum_note 4, 12 + drum_note 2, 13 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 4 + sound_call Branch_1f2d0c + sound_call Branch_1f2d18 + sound_call Branch_1f2d0c + drum_note 4, 13 + drum_note 1, 12 + drum_note 5, 13 + drum_note 4, 6 + drum_note 4, 6 + drum_note 2, 13 + drum_note 1, 12 + drum_note 5, 13 + ;musicef 253 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + ;musicef 1 + drum_speed 6 + drum_note 8, 16 + drum_speed 1 + rest 4 + ;musicef 0 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 4 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 4 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 8 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 1, 16 + rest 9 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 4, 12 + drum_note 4, 13 + drum_note 2, 12 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 1, 16 + rest 9 + drum_note 4, 13 + drum_note 1, 12 + drum_note 2, 16 + rest 9 + drum_note 1, 13 + drum_note 2, 12 + drum_note 1, 13 + drum_note 2, 12 + drum_note 2, 13 + drum_note 2, 12 + drum_note 2, 13 + drum_note 2, 12 + drum_note 2, 13 + drum_note 1, 12 + sound_loop 0, .MainLoop Branch_1f2d0c: - note C_, 13 - note D#, 12 - note E_, 13 - note C_, 6 - note D#, 6 - note D#, 13 - note D#, 12 - note E_, 13 - note D#, 4 - note D#, 4 - note D#, 4 - endchannel + drum_note 1, 13 + drum_note 4, 12 + drum_note 5, 13 + drum_note 1, 6 + drum_note 4, 6 + drum_note 4, 13 + drum_note 4, 12 + drum_note 5, 13 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 4 + sound_ret Branch_1f2d18: - note D#, 13 - note C_, 12 - note E_, 13 - note D#, 6 - note D#, 6 - note D#, 13 - note D#, 12 - note E_, 13 - note D#, 4 - note D#, 4 - note D#, 4 - endchannel - + drum_note 4, 13 + drum_note 1, 12 + drum_note 5, 13 + drum_note 4, 6 + drum_note 4, 6 + drum_note 4, 13 + drum_note 4, 12 + drum_note 5, 13 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 4 + sound_ret +; 0x1f2d24 diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm index 4440ace3..732b99d0 100644 --- a/crysaudio/music/TCG2/grchallengecup.asm +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -1,24 +1,28 @@ -Music_TCG2GRChallengeCup: - db $C0 - dw Music_TCG2GRChallengeCup_Ch1 - db $01 - dw Music_TCG2GRChallengeCup_Ch2 - db $02 - dw Music_TCG2GRChallengeCup_Ch3 - db $03 - dw Music_TCG2GRChallengeCup_Ch4 +Music_GRChallengeCup: + channel_count 4 + channel 1, Music_GRChallengeCup_Ch1 + channel 2, Music_GRChallengeCup_Ch2 + channel 3, Music_GRChallengeCup_Ch3 + channel 4, Music_GRChallengeCup_Ch4 -Music_TCG2GRChallengeCup_Ch2: +Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) +;.MainLoop notetype1 10 notetype0 1 + ;musicdc 17 + ;musicf0 0 octave 4 - vibrato 24, $33 + vibrato 24, 3, 3 + ;musicef 255 note C_, 4 note C#, 4 note D_, 4 note D#, 4 + ;musicf1 69 note E_, 15 + ;tie note E_, 15 + ;tie note E_, 8 note E_, 7 note E_, 5 @@ -32,7 +36,9 @@ Music_TCG2GRChallengeCup_Ch2: note D_, 15 note D_, 5 note E_, 15 + ;tie note E_, 15 + ;tie note E_, 8 note E_, 7 note E_, 5 @@ -48,6 +54,7 @@ Music_TCG2GRChallengeCup_Ch2: note D_, 15 note D_, 5 note E_, 15 + ;tie note E_, 8 note E_, 7 note A_, 5 @@ -62,18 +69,28 @@ Music_TCG2GRChallengeCup_Ch2: note G_, 5 note B_, 15 note B_, 5 + ;musicef 250 notetype1 2 + ;musicf3 notetype0 6 note A_, 10 + ;tie notetype0 1 note A_, 15 + ;tie note A_, 10 notetype1 10 + ;musicf1 54 note A_, 5 note A_, 15 + ;tie note A_, 15 + ;musicf0 8 + ;musicef 255 + ;musicf1 67 .Loop1 octave 2 + ;musicf2 notetype2 8 note E_, 5 note E_, 10 @@ -81,15 +98,21 @@ Music_TCG2GRChallengeCup_Ch2: note E_, 3 note E_, 5 note E_, 2 + ;musicf3 note E_, 15 + ;musicf2 note E_, 5 note E_, 3 note E_, 5 note E_, 2 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 .MainLoop + ;musicf0 8 + ;musicef 255 + ;musicf1 67 .Loop2 octave 2 + ;musicf2 notetype2 8 note F_, 5 note F_, 10 @@ -97,14 +120,17 @@ Music_TCG2GRChallengeCup_Ch2: note F_, 3 note F_, 5 note F_, 2 + ;musicf3 note F_, 15 + ;musicf2 note F_, 5 note F_, 3 note F_, 5 note F_, 2 - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 .Loop3 octave 2 + ;musicf2 notetype2 8 note F#, 5 note F#, 10 @@ -112,13 +138,16 @@ Music_TCG2GRChallengeCup_Ch2: note F#, 3 note F#, 5 note F#, 2 + ;musicf3 note F#, 15 + ;musicf2 note F#, 5 note F#, 3 note F#, 5 note F#, 2 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 octave 2 + ;musicf2 notetype2 8 note F_, 5 note F_, 10 @@ -126,12 +155,15 @@ Music_TCG2GRChallengeCup_Ch2: note F_, 3 note F_, 5 note F_, 2 + ;musicf3 note F_, 15 + ;musicf2 note F_, 5 note F_, 3 note F_, 5 note F_, 2 octave 2 + ;musicf2 notetype2 8 note F_, 5 note F_, 10 @@ -139,57 +171,80 @@ Music_TCG2GRChallengeCup_Ch2: note F_, 3 note F_, 5 note F_, 2 - vibrato 15, $33 + ;musicf3 + ;musicf0 0 + ;musicef 1 + ;vibrato_type 1 + vibrato 15, 3, 3 octave 3 + ;musice4 0 + ;musicf1 70 note E_, 15 note E_, 8 note E_, 5 note E_, 2 inc_octave - vibrato 30, $33 + vibrato 30, 3, 3 note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 8 note E_, 7 dec_octave + ;musicf3 note A_, 15 note B_, 15 inc_octave note C_, 15 - vibrato 15, $33 + ;musicf1 70 + vibrato 15, 3, 3 note D_, 15 + ;tie note D_, 15 note D_, 15 note C_, 8 note D_, 7 note C_, 15 + ;tie note C_, 15 note C_, 15 dec_octave + ;musicf3 note A_, 8 note B_, 7 + ;musicf1 70 inc_octave note C_, 15 + ;tie note C_, 15 note C_, 15 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 8 note C_, 7 dec_octave + ;musicf3 note B_, 15 + ;musicf1 70 note A_, 8 note B_, 7 note G_, 8 note A_, 7 note B_, 8 note G_, 7 - vibrato 30, $33 + vibrato 30, 3, 3 note A_, 15 + ;tie note A_, 15 + ;tie note A_, 15 + ;tie note A_, 15 + ;tie note A_, 15 note A_, 15 note E_, 15 @@ -198,34 +253,46 @@ Music_TCG2GRChallengeCup_Ch2: note E_, 2 inc_octave note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 8 note E_, 7 + ;musicf3 dec_octave note A_, 15 note B_, 15 inc_octave note C_, 15 - vibrato 15, $33 + ;musicf1 70 + vibrato 15, 3, 3 note D_, 15 + ;tie note D_, 15 note D_, 15 note C_, 8 note D_, 7 note C_, 15 + ;tie note C_, 15 note C_, 15 dec_octave + ;musicf3 note A_, 8 note B_, 7 - vibrato 0, $33 + ;musicf1 70 + vibrato 0, 3, 3 inc_octave note C_, 15 + ;tie note C_, 8 note C_, 7 note E_, 15 + ;tie note E_, 8 note E_, 7 note D_, 15 @@ -234,23 +301,33 @@ Music_TCG2GRChallengeCup_Ch2: note G_, 5 note D_, 15 note D_, 5 - vibrato 15, $33 + vibrato 15, 3, 3 + ;musicf3 note F_, 15 + ;tie note F_, 15 + ;tie note F_, 15 + ;musicf1 70 note E_, 8 note F_, 7 note E_, 15 + ;tie note E_, 15 note E_, 15 + ;musicf3 note F_, 8 note G_, 7 + ;musicf1 70 note A_, 15 + ;tie note A_, 15 note A_, 15 note A_, 8 note A_, 7 + ;musicf3 note A_, 15 + ;musicf1 70 note G_, 8 note A_, 7 note F_, 8 @@ -261,21 +338,29 @@ Music_TCG2GRChallengeCup_Ch2: note G_, 8 note C_, 5 note G_, 2 - vibrato 0, $33 - note C_, 15 - note C_, 15 - note C_, 15 + vibrato 0, 3, 3 + note C_, 15 + ;tie + note C_, 15 + ;tie + note C_, 15 + ;tie note C_, 15 note C_, 15 + ;musicf3 note D_, 8 note E_, 7 - vibrato 15, $33 + ;musicf1 70 + vibrato 15, 3, 3 note F_, 15 + ;tie note F_, 15 note F_, 15 note F_, 8 note F_, 7 + ;musicf3 note F_, 15 + ;musicf1 70 note E_, 8 note F_, 7 note D_, 8 @@ -283,22 +368,32 @@ Music_TCG2GRChallengeCup_Ch2: note F_, 8 note D_, 7 note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 note E_, 15 dec_octave + ;musicf3 note A_, 8 note B_, 7 + ;musicf1 70 inc_octave note C_, 15 + ;tie note C_, 15 note C_, 15 note C_, 8 note C_, 7 + ;musicf1 70 note D_, 15 + ;musicf1 70 note C_, 8 note D_, 7 dec_octave @@ -311,18 +406,26 @@ Music_TCG2GRChallengeCup_Ch2: note G_, 15 note G_, 15 inc_octave + ;musicf3 note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicf1 70 note F_, 15 note F_, 8 note E_, 5 note F_, 2 note E_, 15 + ;tie note E_, 15 note E_, 8 + ;musicf3 note F_, 7 + ;musicf1 70 note E_, 5 note F_, 3 note C_, 5 @@ -335,8 +438,11 @@ Music_TCG2GRChallengeCup_Ch2: note D_, 5 note D_, 15 note D_, 5 + ;musicf3 note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 dec_octave note B_, 4 @@ -345,36 +451,54 @@ Music_TCG2GRChallengeCup_Ch2: dec_octave note B_, 4 note A_, 3 + ;musicf1 70 note B_, 15 + ;tie note B_, 15 note B_, 15 inc_octave + ;musicf3 note C_, 8 note D_, 7 - vibrato 30, $33 + vibrato 30, 3, 3 + ;musicef 255 note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 + ;tie note E_, 15 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop -Music_TCG2GRChallengeCup_Ch1: +Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) +;.MainLoop notetype1 10 notetype0 1 + ;musicdc 17 + ;musicf0 1 + ;musicef 255 octave 3 - vibrato 24, $33 + vibrato 24, 3, 3 note G_, 4 note G#, 4 note A_, 4 note A#, 4 inc_octave + ;musicf1 53 note C#, 15 + ;tie note C#, 15 + ;tie note C#, 8 note C#, 7 note C#, 5 @@ -390,7 +514,9 @@ Music_TCG2GRChallengeCup_Ch1: note A#, 5 inc_octave note C#, 15 + ;tie note C#, 15 + ;tie note C#, 8 note C#, 7 note C#, 5 @@ -406,6 +532,7 @@ Music_TCG2GRChallengeCup_Ch1: note B_, 5 inc_octave note C_, 15 + ;tie note C_, 8 note C_, 7 note C_, 5 @@ -422,18 +549,27 @@ Music_TCG2GRChallengeCup_Ch1: inc_octave note D_, 15 note D_, 5 + ;musicef 250 notetype1 2 + ;musicf3 notetype0 6 note C#, 10 + ;tie notetype0 1 note C#, 15 + ;tie note C#, 10 notetype1 9 + ;musicf1 54 note C#, 5 note C#, 15 + ;tie note C#, 15 + ;musicf0 8 + ;musicf1 67 .Loop1 octave 1 + ;musicf2 notetype2 8 note A_, 5 note A_, 10 @@ -441,17 +577,21 @@ Music_TCG2GRChallengeCup_Ch1: note A_, 3 note A_, 5 note A_, 2 + ;musicf3 inc_octave note B_, 15 dec_octave + ;musicf2 note A_, 5 note A_, 3 note A_, 5 note A_, 2 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 .MainLoop + ;musicf1 67 .Loop2 octave 1 + ;musicf2 notetype2 8 note A_, 5 note A_, 10 @@ -459,15 +599,18 @@ Music_TCG2GRChallengeCup_Ch1: note A_, 3 note A_, 5 note A_, 2 + ;musicf3 inc_octave note B_, 15 dec_octave + ;musicf2 note A_, 5 note A_, 3 note A_, 5 note A_, 2 - loopchannel 5, .Loop2 + sound_loop 5, .Loop2 octave 1 + ;musicf2 notetype2 8 note A_, 5 note A_, 10 @@ -475,204 +618,260 @@ Music_TCG2GRChallengeCup_Ch1: note A_, 3 note A_, 5 note A_, 2 + ;musicf3 inc_octave note B_, 15 + ;tie note B_, 8 dec_octave + ;musicf0 21 notetype1 8 octave 2 note A_, 5 - note __, 2 + rest 2 inc_octave note A_, 15 + ;tie note A_, 15 - callchannel Branch_1f3140 - note __, 15 - note __, 15 + sound_call Branch_1f3140 + rest 15 + rest 15 note E_, 15 - callchannel Branch_1f3140 + ;musicec 3 + sound_call Branch_1f3140 note G_, 15 note F#, 15 + ;tie note F#, 15 - callchannel Branch_1f3140 + ;musicec 2 + sound_call Branch_1f3140 note F#, 8 - note __, 7 + rest 7 note F#, 15 + ;tie note F#, 15 - callchannel Branch_1f3140 + ;musicec 2 + sound_call Branch_1f3140 note F#, 5 - note __, 3 + rest 3 note F#, 5 - note __, 2 + rest 2 note F_, 15 + ;tie note F_, 15 - callchannel Branch_1f3140 + ;musicec 1 + sound_call Branch_1f3140 note F_, 8 - note __, 7 + rest 7 note D_, 15 note C_, 8 - note __, 7 - callchannel Branch_1f3140 + rest 7 + ;musicec 3 + sound_call Branch_1f3140 note D_, 8 - note __, 7 + rest 7 note E_, 15 + ;tie note E_, 15 - callchannel Branch_1f3140 - note __, 15 - note __, 8 - callchannel Branch_1f3150 - note __, 15 + sound_call Branch_1f3140 + rest 15 + rest 8 + sound_call Branch_1f3150 + rest 15 dec_octave note A_, 15 - note __, 8 + rest 8 note A_, 7 inc_octave note A_, 15 + ;tie note A_, 15 - callchannel Branch_1f3140 - note __, 15 - note __, 15 + sound_call Branch_1f3140 + rest 15 + rest 15 note E_, 15 - callchannel Branch_1f3140 + ;musicec 3 + sound_call Branch_1f3140 note G_, 15 note F#, 15 + ;tie note F#, 15 - callchannel Branch_1f3140 + ;musicec 2 + sound_call Branch_1f3140 note F#, 8 - note __, 7 + rest 7 note F#, 15 + ;tie note F#, 15 - callchannel Branch_1f3140 + ;musicec 2 + sound_call Branch_1f3140 note F#, 5 - note __, 3 + rest 3 note F#, 5 - note __, 2 + rest 2 note F_, 15 + ;tie note F_, 8 - note __, 7 - callchannel Branch_1f3140 - note __, 8 - note __, 7 + rest 7 + ;musicec 1 + sound_call Branch_1f3140 + rest 8 + rest 7 note B_, 15 - note __, 5 + rest 5 note B_, 10 - callchannel Branch_1f3140 - note __, 15 + ;musicec 3 + sound_call Branch_1f3140 + rest 15 inc_octave note C_, 15 + ;tie note C_, 15 - callchannel Branch_1f3140 + ;musicec 8 + sound_call Branch_1f3140 octave 3 note G_, 8 note F_, 7 note G_, 15 + ;tie note G_, 15 - callchannel Branch_1f3140 + ;musicec 6 + sound_call Branch_1f3140 note A_, 8 note A#, 7 inc_octave note C_, 15 + ;tie note C_, 15 - callchannel Branch_1f3140 + ;musicec 1 + sound_call Branch_1f3140 octave 4 note C_, 8 - note __, 7 + rest 7 dec_octave note B_, 15 note B_, 8 - note __, 7 - callchannel Branch_1f3140 + rest 7 + ;musicec 1 + sound_call Branch_1f3140 octave 4 note D_, 8 - note __, 7 + rest 7 note C_, 15 - note __, 8 + rest 8 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 15 + ;tie note G_, 15 + ;tie note G_, 8 - callchannel Branch_1f3150 - note __, 8 - note __, 7 - callchannel Branch_1f3140 + sound_call Branch_1f3150 + rest 8 + rest 7 + ;musicec 3 + sound_call Branch_1f3140 octave 3 note F_, 8 note G_, 7 note A_, 15 + ;tie note A_, 15 - callchannel Branch_1f3140 + ;musicec 5 + sound_call Branch_1f3140 note A_, 8 - note __, 7 + rest 7 note G#, 13 - note __, 2 + rest 2 note G#, 8 - note __, 7 - callchannel Branch_1f3140 + rest 7 + ;musicec 4 + sound_call Branch_1f3140 note G#, 8 - note __, 7 + rest 7 note A_, 15 + ;tie note A_, 15 - callchannel Branch_1f3140 - note __, 15 - note __, 8 - callchannel Branch_1f3150 - note __, 15 - callchannel Branch_1f3140 + sound_call Branch_1f3140 + rest 15 + rest 8 + sound_call Branch_1f3150 + rest 15 + ;musicec 3 + sound_call Branch_1f3140 note E_, 8 note G_, 7 note A_, 15 + ;tie note A_, 15 - callchannel Branch_1f3140 + ;musicec 1 + sound_call Branch_1f3140 note A_, 8 - note __, 7 + rest 7 note B_, 15 note A_, 5 - note __, 10 - callchannel Branch_1f3140 + rest 10 + ;musicec 3 + sound_call Branch_1f3140 note F_, 8 - note __, 7 + rest 7 note E_, 15 + ;tie note E_, 15 inc_octave notetype1 6 note D_, 15 + ;tie note D_, 15 notetype1 6 note C#, 15 + ;tie note C#, 15 - callchannel Branch_1f3140 - note __, 8 + ;musicec 3 + sound_call Branch_1f3140 + rest 8 dec_octave note G_, 5 - note __, 2 + rest 2 note A_, 15 + ;tie note A_, 15 - callchannel Branch_1f3140 + ;musicec 1 + sound_call Branch_1f3140 note A_, 8 note F_, 7 note D_, 15 - note __, 5 + rest 5 note F_, 10 - callchannel Branch_1f3140 - note __, 15 + ;musicec 4 + sound_call Branch_1f3140 + rest 15 note G_, 15 + ;tie note G_, 15 - callchannel Branch_1f3140 + ;musicec 1 + sound_call Branch_1f3140 note G_, 4 note D_, 4 note C_, 4 note D_, 3 note D_, 15 + ;tie note D_, 15 - note __, 15 + rest 15 note G#, 8 note B_, 7 note A_, 15 + ;tie note A_, 15 + ;musicf0 8 + ;musicef 255 octave 2 + ;musicf1 67 + ;musicf3 note B_, 15 + ;musicf2 notetype2 8 note E_, 5 note E_, 3 @@ -684,209 +883,246 @@ Music_TCG2GRChallengeCup_Ch1: note E_, 3 note E_, 5 note E_, 2 + ;musicf3 note B_, 15 note E_, 5 note E_, 3 note E_, 5 note E_, 2 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f3140: + ;musicf0 8 octave 2 + ;musicef 255 note E_, 15 + ;musicef 1 + ;musicf0 21 + ;musicf1 128 octave 3 - endchannel + ;musicec 0 + sound_ret Branch_1f3150: + ;musicf0 8 octave 2 + ;musicf2 note G_, 4 note G_, 3 + ;musicf0 21 notetype1 8 octave 3 - endchannel + ;musicf3 + sound_ret -Music_TCG2GRChallengeCup_Ch3: +Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) notetype1 10 notetype0 1 notetype2 11 notetype1 1 + ;musice9 96 + ;musicdc 17 octave 5 - note __, 16 + rest 16 octave 2 note A_, 15 + ;tie note A_, 15 + ;tie note A_, 8 - note __, 7 + rest 7 note A_, 5 - note __, 3 + rest 3 note A_, 5 - note __, 2 + rest 2 note A#, 15 - note __, 5 + rest 5 note A#, 15 - note __, 5 + rest 5 note A#, 15 - note __, 5 + rest 5 note A_, 15 + ;tie note A_, 15 + ;tie note A_, 8 - note __, 7 + rest 7 note A_, 5 - note __, 3 + rest 3 note A_, 5 - note __, 2 + rest 2 note G_, 15 - note __, 5 + rest 5 note G_, 15 - note __, 5 + rest 5 note G_, 15 - note __, 5 + rest 5 note F_, 15 + ;tie note F_, 15 + ;tie note F_, 8 - note __, 7 + rest 7 note F_, 5 - note __, 3 + rest 3 note F_, 5 - note __, 2 + rest 2 note G_, 15 - note __, 5 + rest 5 note G_, 15 - note __, 5 + rest 5 note G_, 15 - note __, 5 + rest 5 note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 + ;tie note A_, 10 - note __, 16 - note __, 14 + rest 16 + rest 14 + ;musice8 4 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b octave 2 note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b octave 2 note A_, 8 note A_, 7 .MainLoop + ;musice8 4 octave 2 .Loop1 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b octave 2 note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b octave 2 note A_, 8 note A_, 7 - loopchannel 3, .Loop1 + sound_loop 3, .Loop1 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + ;musicec 5 + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 8 octave 4 + ;musice8 4 note C_, 4 - note __, 3 + rest 3 + ;musice8 8 octave 2 + ;musice8 8 note F#, 15 note G_, 15 note G#, 15 + ;musice8 4 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note A_, 8 note A_, 7 note B_, 15 note B_, 8 note B_, 7 - callchannel Branch_1f333b + ;musicec 5 + sound_call Branch_1f333b note B_, 8 note B_, 7 inc_octave note C_, 15 note C_, 8 note C_, 7 - callchannel Branch_1f333b + ;musicec 8 + sound_call Branch_1f333b octave 3 note C_, 8 dec_octave @@ -894,304 +1130,337 @@ Music_TCG2GRChallengeCup_Ch3: note C_, 8 inc_octave inc_octave + ;musice8 4 note E_, 4 - note __, 3 + rest 3 + ;musice8 4 dec_octave dec_octave note C_, 8 note C_, 7 + ;musice8 8 note D_, 15 note E_, 15 + ;musice8 4 note F_, 15 note F_, 8 note F_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note F_, 8 note F_, 7 note F_, 15 note F_, 8 note F_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note F_, 8 note F_, 7 note E_, 15 note E_, 8 note E_, 7 - callchannel Branch_1f333b + ;musicec 254 + sound_call Branch_1f333b note E_, 8 note E_, 7 note E_, 8 inc_octave inc_octave + ;musice8 4 note C_, 4 - note __, 3 + rest 3 dec_octave dec_octave note E_, 8 note E_, 7 - callchannel Branch_1f333b + ;musicec 5 + sound_call Branch_1f333b note E_, 8 note E_, 7 note D_, 15 note D_, 8 note D_, 7 - callchannel Branch_1f333b + ;musicec 5 + sound_call Branch_1f333b note D_, 8 note D_, 7 note E_, 15 note E_, 8 note E_, 7 - callchannel Branch_1f333b + ;musicec 7 + sound_call Branch_1f333b note E_, 8 note E_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note G_, 8 inc_octave inc_octave note C_, 4 - note __, 3 + rest 3 dec_octave dec_octave note G_, 8 note G_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note G_, 8 note G_, 7 note F_, 15 note F_, 8 note F_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note F_, 8 note F_, 7 note F_, 15 note F_, 8 note F_, 7 - callchannel Branch_1f333b + ;musicec 5 + sound_call Branch_1f333b note F_, 8 note F_, 7 note E_, 15 note E_, 8 note E_, 7 - callchannel Branch_1f333b + ;musicec 254 + sound_call Branch_1f333b note E_, 8 note E_, 7 note D#, 8 inc_octave inc_octave note C#, 4 - note __, 3 + rest 3 dec_octave dec_octave note D#, 8 note D#, 7 - callchannel Branch_1f333b + ;musicec 4 + sound_call Branch_1f333b note D#, 8 note D#, 7 note D_, 15 note D_, 8 note D_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note D_, 8 note D_, 7 note D_, 15 note D_, 8 note D_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b note D_, 8 note D_, 7 note G_, 15 note G_, 8 note G_, 7 - callchannel Branch_1f333b + ;musicec 3 + sound_call Branch_1f333b inc_octave note D_, 8 note D_, 7 + ;musice8 8 note G_, 15 dec_octave note G_, 15 note G#, 15 inc_octave note G#, 15 + ;musice8 4 dec_octave note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - callchannel Branch_1f333b + sound_call Branch_1f333b note A_, 8 note A_, 7 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f333b: octave 3 notetype1 2 + ;musice8 8 note A_, 15 notetype1 1 + ;musice8 4 + ;musicec 0 octave 2 - endchannel + sound_ret -Music_TCG2GRChallengeCup_Ch4: - togglenoise $06 - notetype 1 +Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349) + toggle_noise 6 + drum_speed 1 octave 1 - note __, 16 + rest 16 .Loop1 - note C#, 16 - note __, 16 - note __, 13 - note C#, 5 - note C#, 5 - note C#, 5 - note C#, 16 - note __, 4 - note C#, 16 - note __, 4 - note C#, 16 - note __, 4 - loopchannel 3, .Loop1 - notetype 5 - note F_, 16 - notetype 1 - note __, 10 - note C#, 8 - note C_, 15 - note C#, 7 - callchannel Branch_1f33e9 + drum_note 2, 16 + rest 16 + rest 13 + drum_note 2, 5 + ;musicef 254 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 16 + rest 4 + drum_note 2, 16 + rest 4 + drum_note 2, 16 + rest 4 + sound_loop 3, .Loop1 + drum_speed 5 + drum_note 6, 16 + drum_speed 1 + rest 10 + drum_note 2, 8 + drum_note 1, 15 + drum_note 2, 7 + sound_call Branch_1f33e9 .MainLoop - callchannel Branch_1f33fd - callchannel Branch_1f33e9 - note C_, 8 - note C#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 4 - note C#, 3 - note C#, 8 - note C#, 7 - note D#, 8 - note C#, 4 - note C#, 3 - note C#, 8 - note C#, 7 - note C#, 8 - note E_, 7 - callchannel Branch_1f33e9 - callchannel Branch_1f33fd - callchannel Branch_1f33e9 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note C#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note C_, 7 - note E_, 8 - note C#, 7 - callchannel Branch_1f33e9 - callchannel Branch_1f33fd - callchannel Branch_1f33e9 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note C#, 7 - note D#, 8 - note C#, 4 - note C#, 3 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 + sound_call Branch_1f33fd + sound_call Branch_1f33e9 + drum_note 1, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 4, 8 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_note 5, 7 + sound_call Branch_1f33e9 + sound_call Branch_1f33fd + sound_call Branch_1f33e9 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 1, 7 + drum_note 5, 8 + drum_note 2, 7 + sound_call Branch_1f33e9 + sound_call Branch_1f33fd + sound_call Branch_1f33e9 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 2, 7 + drum_note 4, 8 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 .Loop2 - callchannel Branch_1f33e9 - callchannel Branch_1f33fd - loopchannel 3, .Loop2 - callchannel Branch_1f33e9 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note C#, 4 - note C#, 3 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - note C#, 8 - note C#, 7 - callchannel Branch_1f33e9 - loopchannel 0, .MainLoop + sound_call Branch_1f33e9 + sound_call Branch_1f33fd + sound_loop 3, .Loop2 + sound_call Branch_1f33e9 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + sound_call Branch_1f33e9 + sound_loop 0, .MainLoop Branch_1f33e9: octave 1 - notetype 1 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note D#, 7 - note D#, 8 - note C_, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note E_, 7 - endchannel + drum_speed 1 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 1, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + sound_ret Branch_1f33fd: octave 1 - notetype 1 - note C_, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note D#, 7 - note D#, 8 - note D#, 7 - note C_, 8 - note C#, 7 - note D#, 8 - note D#, 7 - note C#, 8 - note D#, 7 - note E_, 8 - note C#, 7 - endchannel - + drum_speed 1 + drum_note 1, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 1, 8 + drum_note 2, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 8 + drum_note 2, 7 + sound_ret +; 0x1f3411 diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm index 9eee7f4b..49dd84b0 100644 --- a/crysaudio/music/TCG2/grdueltheme1.asm +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -1,194 +1,236 @@ -Music_TCG2GRDuelTheme1: - db $C0 - dw Music_TCG2GRDuelTheme1_Ch1 - db $01 - dw Music_TCG2GRDuelTheme1_Ch2 - db $02 - dw Music_TCG2GRDuelTheme1_Ch3 - db $03 - dw Music_TCG2GRDuelTheme1_Ch4 +Music_GRDuelTheme1: + channel_count 4 + channel 1, Music_GRDuelTheme1_Ch1 + channel 2, Music_GRDuelTheme1_Ch2 + channel 3, Music_GRDuelTheme1_Ch3 + channel 4, Music_GRDuelTheme1_Ch4 -Music_TCG2GRDuelTheme1_Ch2: +Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) notetype1 10 + ;musicdc 255 notetype0 1 + ;musicf0 16 octave 3 - note __, 15 + ;musicf1 54 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 + rest 14 .MainLoop .Loop1 - note __, 15 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - loopchannel 2, .Loop1 - note __, 15 + rest 14 + sound_loop 2, .Loop1 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 7 - callchannel Branch_1f5ae8 + rest 7 + sound_call Branch_1f5ae8 + ;musicf0 16 + ;musicf1 54 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 7 - callchannel Branch_1f5ae8 + rest 7 + sound_call Branch_1f5ae8 + ;musicf0 16 + ;musicf1 54 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 + ;musicf0 4 + ;musicf3 octave 2 note A_, 7 note A#, 7 inc_octave note C#, 4 - note __, 3 + rest 3 note F_, 8 note F#, 7 note A_, 7 note A#, 3 - note __, 4 + rest 4 + ;musicf1 71 inc_octave note C_, 15 note C_, 7 @@ -199,30 +241,41 @@ Music_TCG2GRDuelTheme1_Ch2: note A_, 9 note F_, 4 note F_, 3 + ;musicf3 note C#, 15 + ;tie note C#, 14 note G_, 15 + ;tie note G_, 7 note F#, 4 note F_, 3 note E_, 9 + ;musicf1 71 note F_, 5 note F_, 5 note G_, 5 note G_, 5 + ;musicf3 note E_, 9 + ;musicf1 71 note C_, 5 note C_, 5 dec_octave note G_, 5 note G_, 5 + ;musicf3 note A_, 15 + ;tie note A_, 14 inc_octave + ;musicf1 71 note D_, 15 + ;tie note D_, 7 note D_, 7 note G_, 3 + ;musicf1 71 note A_, 12 note A_, 7 note G_, 7 @@ -230,25 +283,36 @@ Music_TCG2GRDuelTheme1_Ch2: note D_, 7 note D_, 7 dec_octave + ;musicf3 note A#, 7 inc_octave + ;musicf3 note F_, 15 + ;tie note F_, 14 note G_, 15 + ;tie note G_, 7 note F#, 4 note F_, 3 + ;musicf1 71 note E_, 15 + ;tie note E_, 14 note E_, 8 + ;musicf3 note F_, 7 + ;musicf1 71 note E_, 7 note E_, 7 note D_, 15 + ;tie note D_, 7 note D_, 7 + ;musicf3 note C#, 3 note D_, 12 + ;musicf1 71 note F_, 7 note F_, 7 inc_octave @@ -261,53 +325,75 @@ Music_TCG2GRDuelTheme1_Ch2: note A_, 9 note F_, 3 note F_, 4 + ;musicf3 note C#, 15 + ;tie note C#, 14 note G_, 15 + ;tie note G_, 8 note F#, 3 note F_, 3 note E_, 9 + ;musicf1 71 note F_, 5 note F_, 5 note G_, 5 note G_, 5 + ;musicf3 note E_, 9 + ;musicf1 71 note C_, 5 note C_, 5 dec_octave note G_, 5 note G_, 5 + ;musicf3 note A_, 15 + ;tie note A_, 14 inc_octave + ;musicf1 71 note D_, 15 + ;tie note D_, 7 note D_, 7 note A_, 15 + ;tie note A_, 14 note A_, 8 note G_, 7 note G_, 14 + ;musicf3 note B_, 3 inc_octave + ;musicf1 71 note C_, 12 note C_, 7 dec_octave + ;musicf3 note A_, 15 note A#, 7 + ;musicf1 71 note A_, 3 note A_, 4 note G_, 3 note G_, 4 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 7 note A_, 7 .Loop2 + ;musicf0 0 + ;musicf3 octave 2 note A_, 5 note A#, 5 @@ -318,6 +404,7 @@ Music_TCG2GRDuelTheme1_Ch2: note G_, 4 inc_octave note D#, 3 + ;musicf1 70 note E_, 12 note E_, 7 note C_, 7 @@ -328,29 +415,43 @@ Music_TCG2GRDuelTheme1_Ch2: note F_, 4 note F_, 3 note G_, 15 + ;tie note G_, 4 note G_, 7 note B_, 3 + ;musicf3 inc_octave note C_, 15 dec_octave + ;musicf1 70 note A#, 7 note A#, 7 + ;musicf1 70 note A_, 15 note A_, 7 + ;musicf3 note F_, 7 + ;tie note F_, 15 + ;musicf1 70 note G_, 7 note G_, 7 + ;musicf3 note G#, 3 note A_, 12 + ;tie note A_, 7 + ;musicf1 70 note G_, 7 + ;tie note G_, 15 + ;tie note G_, 7 note G_, 7 inc_octave + ;musicf3 note D#, 3 + ;musicf1 70 note E_, 12 note E_, 7 note C_, 7 @@ -361,21 +462,30 @@ Music_TCG2GRDuelTheme1_Ch2: note F_, 4 note F_, 3 note G_, 15 + ;tie note G_, 4 note G_, 7 + ;musicf3 note B_, 3 inc_octave note C_, 15 dec_octave + ;musicf1 70 note A#, 7 note A#, 7 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 + ;musicf3 octave 2 note A_, 5 note A#, 5 @@ -384,32 +494,47 @@ Music_TCG2GRDuelTheme1_Ch2: note E_, 5 note F_, 5 note G_, 4 + ;musicf0 4 + ;musicf3 note G#, 3 note A_, 12 + ;tie note A_, 7 note G_, 15 + ;tie note G_, 7 + ;musicf1 70 note D_, 5 note D_, 9 + ;musicf3 note C#, 15 + ;tie note C#, 14 note G_, 15 + ;tie note G_, 8 note F#, 3 note F_, 3 note E_, 9 + ;musicf1 71 note F_, 5 note F_, 5 note G_, 5 note G_, 5 + ;musicf3 note E_, 9 + ;musicf1 71 note C_, 5 note C_, 5 dec_octave note G_, 5 note G_, 5 + ;musicf3 note A_, 15 + ;tie note A_, 14 + ;musicf0 0 + ;musicf3 octave 2 note G_, 5 note A_, 5 @@ -419,153 +544,242 @@ Music_TCG2GRDuelTheme1_Ch2: note D_, 5 note E_, 4 note A_, 15 + ;tie note A_, 7 + ;musicf1 70 note G_, 7 note G_, 8 note D_, 5 note D_, 9 dec_octave + ;musicf3 note A#, 7 inc_octave note E_, 3 + ;musicf1 70 note F_, 12 + ;tie note F_, 7 note F_, 7 + ;musicf3 note G_, 15 + ;tie note G_, 8 note F#, 3 note F_, 3 + ;musicf1 87 note E_, 15 + ;tie + note E_, 14 + ;tie + note E_, 15 + ;tie + note E_, 14 + ;tie + note E_, 15 + ;tie + note E_, 14 + ;tie + note E_, 15 + ;tie note E_, 14 note E_, 15 - note E_, 14 - note E_, 15 - note E_, 14 - note E_, 15 - note E_, 14 - note E_, 15 + ;musicf0 16 octave 3 + ;musicf1 54 octave 3 note G_, 7 note G_, 7 + ;tie note G_, 8 note G_, 7 note G_, 7 + ;tie note G_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - loopchannel 0, .MainLoop + rest 14 + sound_loop 0, .MainLoop Branch_1f5ae8: + ;musicf3 + ;musicf0 0 + ;musicef 1 octave 2 note A#, 3 note B_, 4 - vibrato 19, $33 + vibrato 19, 3, 3 + ;musicf1 55 inc_octave note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 note C_, 8 + ;musicf3 note E_, 7 + ;musicf2 note G_, 7 note G_, 7 + ;musicf3 note A#, 3 note B_, 12 + ;tie note B_, 14 + ;tie note B_, 15 + ;musicf2 note A_, 7 note A_, 7 + ;musicf3 inc_octave note D_, 15 note C_, 14 dec_octave + ;musicf2 note B_, 5 note B_, 5 + ;musicf3 note G_, 9 note A_, 10 + ;musicf2 note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 note A#, 8 + ;musicf3 note B_, 3 inc_octave note C_, 4 + ;tie note C_, 14 dec_octave + ;musicf2 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 note A_, 8 + ;musicf0 16 octave 3 + ;musicef 1 + ;musicf1 54 note F_, 7 note F_, 14 + ;musicf0 0 octave 3 + ;musicef 1 + ;musicf1 55 note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;tie note C_, 14 note C_, 8 note E_, 7 + ;musicf2 note G_, 7 note G_, 7 + ;musicf3 note A#, 3 note B_, 12 + ;tie note B_, 14 + ;tie note B_, 15 + ;musicf2 note A_, 7 note A_, 7 + ;musicf3 inc_octave note D_, 15 note C_, 14 dec_octave + ;musicf2 note B_, 5 note B_, 5 + ;musicf3 note G_, 9 note A_, 10 + ;musicf2 note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 + ;tie note A#, 14 note A#, 8 + ;musicf3 inc_octave note C_, 14 + ;tie note C_, 7 note C#, 3 note D_, 12 + ;tie note D_, 14 + ;tie note D_, 15 note C_, 7 dec_octave note A#, 7 + ;musicf2 note A_, 15 note A_, 7 + ;musicf3 note B_, 4 inc_octave note C_, 15 + ;tie note C_, 3 dec_octave + ;musicf2 note A#, 7 note A#, 7 + ;musicf2 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;musicf2 note A#, 7 note A#, 7 note A_, 15 @@ -574,42 +788,63 @@ Branch_1f5ae8: note F_, 7 note G_, 7 note G_, 7 + ;musicf3 note G#, 3 + ;musicf2 note A_, 12 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 7 note A_, 7 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 note G_, 14 + ;musicf3 note G_, 15 + ;tie note G_, 14 + ;tie note G_, 15 + ;musicf2 note F_, 7 note F_, 7 + ;musicf3 note B_, 2 inc_octave note C_, 13 dec_octave + ;musicf2 note G_, 14 note G_, 8 note F_, 7 note F_, 7 note C_, 4 note C_, 3 + ;musicf3 note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 note F_, 15 + ;tie note F_, 8 note E_, 3 note D#, 3 note D_, 15 + ;musicf2 note D#, 7 note D#, 7 note G_, 8 @@ -617,105 +852,142 @@ Branch_1f5ae8: note A#, 5 note A#, 9 inc_octave + ;musicf3 note D_, 15 + ;tie note D_, 7 + ;musicf2 note C_, 7 note C_, 15 + ;musicf3 note E_, 3 + ;musicf2 note F_, 7 note F_, 4 + ;musicf3 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;musicf2 note D#, 7 note D#, 7 + ;musicf3 note D_, 15 + ;musicf2 note C_, 7 note C_, 7 + ;musicf3 dec_octave note F#, 15 inc_octave + ;musicf2 note C_, 7 note C_, 7 dec_octave note A_, 15 + ;tie + note A_, 14 + ;tie + note A_, 15 + ;tie + note A_, 14 + ;tie + note A_, 15 + ;tie + note A_, 14 + ;tie + note A_, 15 + ;tie note A_, 14 note A_, 15 - note A_, 14 - note A_, 15 - note A_, 14 - note A_, 15 - note A_, 14 - note A_, 15 - endchannel + sound_ret -Music_TCG2GRDuelTheme1_Ch1: +Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) notetype1 10 + ;musicdc 255 notetype0 1 + ;musicf0 16 + ;musicef 255 octave 3 - note __, 15 + ;musicf1 54 + rest 15 octave 3 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 + rest 14 .MainLoop .Loop1 - note __, 15 + rest 15 octave 3 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - loopchannel 3, .Loop1 + rest 14 + sound_loop 3, .Loop1 octave 3 + ;musicef 1 .Loop2 - note __, 15 + rest 15 note E_, 7 note E_, 15 note E_, 7 @@ -726,8 +998,8 @@ Music_TCG2GRDuelTheme1_Ch1: note E_, 15 note E_, 7 note E_, 7 - loopchannel 2, .Loop2 - note __, 15 + sound_loop 2, .Loop2 + rest 15 note F_, 7 note F_, 15 note F_, 7 @@ -738,7 +1010,7 @@ Music_TCG2GRDuelTheme1_Ch1: note F_, 15 note F_, 7 note F_, 7 - note __, 15 + rest 15 note F_, 7 note F_, 15 note F_, 7 @@ -750,7 +1022,7 @@ Music_TCG2GRDuelTheme1_Ch1: note C#, 7 note C#, 14 .Loop3 - note __, 15 + rest 15 note E_, 7 note E_, 15 note E_, 7 @@ -761,8 +1033,8 @@ Music_TCG2GRDuelTheme1_Ch1: note E_, 15 note E_, 7 note E_, 7 - loopchannel 2, .Loop3 - note __, 15 + sound_loop 2, .Loop3 + rest 15 note D#, 7 note D#, 15 note D#, 7 @@ -773,7 +1045,7 @@ Music_TCG2GRDuelTheme1_Ch1: note D#, 15 note D#, 7 note D#, 7 - note __, 15 + rest 15 note G_, 7 note G_, 15 note G_, 7 @@ -784,7 +1056,7 @@ Music_TCG2GRDuelTheme1_Ch1: note G_, 15 note G_, 7 note G_, 7 - note __, 15 + rest 15 note D_, 7 note D_, 15 note D_, 7 @@ -795,7 +1067,7 @@ Music_TCG2GRDuelTheme1_Ch1: note D_, 15 note D_, 7 note D_, 7 - note __, 15 + rest 15 note C#, 7 note C#, 15 note C#, 7 @@ -806,7 +1078,7 @@ Music_TCG2GRDuelTheme1_Ch1: note C#, 15 note C#, 7 note C#, 7 - note __, 15 + rest 15 note C_, 7 note C_, 15 note C_, 7 @@ -818,7 +1090,7 @@ Music_TCG2GRDuelTheme1_Ch1: note C_, 7 note C_, 7 dec_octave - note __, 15 + rest 15 note B_, 7 note B_, 15 note B_, 7 @@ -830,7 +1102,7 @@ Music_TCG2GRDuelTheme1_Ch1: note B_, 7 note B_, 7 .Loop4 - note __, 15 + rest 15 note A#, 7 note A#, 15 note A#, 7 @@ -841,158 +1113,242 @@ Music_TCG2GRDuelTheme1_Ch1: note A#, 15 note A#, 7 note A#, 7 - loopchannel 2, .Loop4 - note __, 15 + sound_loop 2, .Loop4 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note F_, 8 note F_, 7 + ;tie note F_, 7 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + ;musicef 255 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 7 + rest 7 + ;musicf0 1 + ;musicef 255 + ;musicf1 55 + ;musicf3 octave 2 note G_, 3 note G#, 4 - vibrato 19, $33 + vibrato 19, 3, 3 + ;musicf2 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 note A_, 8 + ;musicf3 inc_octave note C_, 7 + ;musicf2 note E_, 7 note E_, 7 + ;musicf3 note F#, 3 note G_, 12 + ;tie note G_, 14 + ;tie note G_, 15 + ;musicf2 note E_, 7 note E_, 7 + ;musicf3 note B_, 15 note A_, 14 + ;musicf3 note G_, 10 + ;musicf2 note E_, 5 note E_, 5 note C_, 5 note C_, 4 + ;musicf3 + ;musicf2 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 7 note F_, 15 + ;musicf3 note G_, 7 + ;tie note G_, 14 + ;musicf2 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;tie note F_, 14 note F_, 8 + ;musicf0 16 octave 3 + ;musicf1 54 note C#, 7 note C#, 14 + ;musicf0 1 octave 2 + ;musicef 255 + ;musicf1 55 note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 + ;tie note A_, 15 + ;tie note A_, 14 note A_, 8 inc_octave + ;musicf3 note C_, 7 + ;musicf2 note E_, 7 note E_, 7 + ;musicf3 note F#, 3 note G_, 12 + ;tie note G_, 14 + ;tie note G_, 15 + ;musicf2 note E_, 7 note E_, 7 + ;musicf3 note B_, 15 note A_, 14 + ;musicf3 note G_, 10 + ;musicf2 note E_, 5 note E_, 5 note C_, 5 note C_, 4 + ;musicf2 note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 + ;tie note D#, 15 + ;tie note D#, 14 note D#, 8 + ;musicf3 note G_, 14 + ;tie note G_, 7 note A#, 15 + ;tie note A#, 14 + ;tie note A#, 15 note A_, 7 note G_, 7 + ;musicf2 note F_, 15 note F_, 7 + ;musicf3 note A_, 15 + ;tie note A_, 7 + ;musicf2 note G_, 7 note G_, 7 + ;musicf2 note F_, 15 + ;tie note F_, 14 + ;tie note F_, 15 + ;musicf2 note F_, 7 note F_, 7 note F_, 15 @@ -1001,22 +1357,35 @@ Music_TCG2GRDuelTheme1_Ch1: note D_, 7 note D_, 7 note D_, 7 + ;musicf1 38 note C#, 15 + ;tie note C#, 14 + ;tie note C#, 15 + ;tie note C#, 7 note C#, 7 note C#, 15 + ;tie note C#, 14 + ;tie note C#, 15 + ;tie note C#, 7 note C#, 7 + ;musicf3 note C_, 15 + ;tie note C_, 14 + ;tie note C_, 15 + ;musicf2 note C_, 7 note C_, 7 + ;musicf3 note A_, 15 + ;musicf2 note D_, 14 note D_, 8 note C_, 7 @@ -1024,16 +1393,25 @@ Music_TCG2GRDuelTheme1_Ch1: dec_octave note G_, 4 note G_, 3 + ;musicf2 note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 14 + ;tie note B_, 15 + ;tie note B_, 7 note B_, 7 + ;musicf3 note B_, 15 + ;tie note B_, 14 note A#, 15 + ;musicf2 note A#, 7 note A#, 7 inc_octave @@ -1041,27 +1419,43 @@ Music_TCG2GRDuelTheme1_Ch1: note D#, 7 note G_, 5 note G_, 9 + ;musicf3 note A#, 15 + ;tie note A#, 7 + ;musicf2 note A_, 7 note A_, 15 + ;musicf3 + ;musicf2 inc_octave note D_, 10 note D_, 4 dec_octave + ;musicf3 note F#, 15 + ;tie note F#, 14 + ;tie note F#, 15 + ;musicf2 note F#, 7 note F#, 7 + ;musicf3 note F#, 15 + ;musicf2 note F#, 7 note F#, 7 + ;musicf3 note C_, 15 + ;musicf2 note F#, 7 note F#, 7 note E_, 15 + ;musicf0 16 octave 3 + ;musicef 255 + ;musicf1 54 octave 3 note E_, 7 note E_, 15 @@ -1071,163 +1465,209 @@ Music_TCG2GRDuelTheme1_Ch1: note F_, 14 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 - note __, 7 + ;musicf0 4 + ;musicef 251 + ;musice4 254 + rest 7 + ;musicf3 octave 2 note A_, 7 note A#, 7 inc_octave note C#, 4 - note __, 4 + rest 4 note F_, 7 note F#, 7 note A_, 7 note A#, 4 - note __, 4 - note __, 7 + rest 4 + ;musicf0 16 + ;musicef 1 + ;musice4 0 + ;musicf1 70 + rest 7 note D_, 7 note D_, 7 + ;tie note D_, 8 note D_, 7 note D_, 7 + ;tie note D_, 7 - note __, 15 + rest 15 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 - note __, 15 + rest 15 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 - note __, 15 + rest 15 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 dec_octave - note __, 15 + rest 15 note A_, 7 note A_, 7 + ;tie note A_, 8 note A_, 7 note A_, 7 + ;tie note A_, 7 - note __, 15 + rest 15 note A#, 7 note A#, 7 + ;tie note A#, 8 note A#, 7 note A#, 7 + ;tie note A#, 7 inc_octave - note __, 15 + rest 15 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 - note __, 15 + rest 15 dec_octave note A#, 7 note A#, 7 + ;tie note A#, 8 note A#, 7 note A#, 7 + ;tie note A#, 7 inc_octave - note __, 15 + rest 15 note D_, 7 note D_, 7 + ;tie note D_, 8 note D_, 7 note D_, 7 + ;tie note D_, 7 - note __, 15 + rest 15 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 - note __, 15 + rest 15 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 - note __, 15 + rest 15 note C_, 7 note C_, 7 + ;tie note C_, 8 note C_, 7 note C_, 7 + ;tie note C_, 7 .Loop5 - note __, 15 + rest 15 note C#, 7 note C#, 7 + ;tie note C#, 8 note C#, 7 note C#, 7 + ;tie note C#, 7 - loopchannel 2, .Loop5 - note __, 15 + sound_loop 2, .Loop5 + rest 15 note D_, 7 note D_, 7 + ;tie note D_, 8 note D_, 7 note D_, 7 + ;tie note D_, 7 - note __, 15 + rest 15 note C#, 7 note C#, 7 + ;musicf0 1 + ;musicf3 octave 2 note F_, 5 note G_, 5 @@ -1237,6 +1677,7 @@ Music_TCG2GRDuelTheme1_Ch1: note C#, 5 note E_, 4 inc_octave + ;musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1250,21 +1691,31 @@ Music_TCG2GRDuelTheme1_Ch1: note C#, 7 note G_, 15 note G_, 7 + ;musicf1 70 note G_, 7 note G_, 7 note E_, 15 note E_, 7 + ;musicf3 note C_, 15 + ;tie + note C_, 7 + ;musicf1 70 note C_, 7 note C_, 7 - note C_, 7 + ;musicf3 note C#, 15 + ;tie note C#, 7 + ;musicf2 note C#, 7 + ;tie note C#, 15 + ;tie note C#, 7 note C#, 7 inc_octave + ;musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1280,18 +1731,25 @@ Music_TCG2GRDuelTheme1_Ch1: inc_octave note G_, 15 note G_, 7 + ;musicf1 70 note G_, 7 note G_, 7 note E_, 15 + ;tie note E_, 14 + ;tie note E_, 15 + ;tie note E_, 7 note E_, 7 note F_, 15 + ;tie note F_, 14 note A_, 15 + ;tie note A_, 14 inc_octave + ;musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1305,21 +1763,31 @@ Music_TCG2GRDuelTheme1_Ch1: note C#, 7 note G_, 15 note G_, 7 + ;musicf1 70 note G_, 7 note G_, 7 note E_, 15 note E_, 7 + ;musicf3 note C_, 15 + ;tie + note C_, 7 + ;musicf1 70 note C_, 7 note C_, 7 - note C_, 7 + ;musicf3 note C#, 15 + ;tie note C#, 7 + ;musicf2 note C#, 7 + ;tie note C#, 15 + ;tie note C#, 7 note C#, 7 inc_octave + ;musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1335,14 +1803,20 @@ Music_TCG2GRDuelTheme1_Ch1: inc_octave note G_, 15 note G_, 7 + ;musicf1 70 note G_, 7 note G_, 7 note D_, 15 + ;tie note D_, 14 + ;tie note D_, 15 + ;tie note D_, 7 note D_, 7 + ;musicf3 note C#, 15 + ;tie note C#, 14 octave 2 note F_, 5 @@ -1352,8 +1826,10 @@ Music_TCG2GRDuelTheme1_Ch1: inc_octave note C#, 5 note E_, 4 + ;musicf0 16 octave 3 - note __, 15 + ;musicf1 54 + rest 15 note F_, 7 note F_, 15 note F_, 7 @@ -1364,7 +1840,7 @@ Music_TCG2GRDuelTheme1_Ch1: note F_, 15 note F_, 7 note F_, 7 - note __, 15 + rest 15 note C_, 7 note C_, 15 note C_, 7 @@ -1372,27 +1848,41 @@ Music_TCG2GRDuelTheme1_Ch1: note F_, 8 note F_, 14 note F_, 7 + ;musicf0 4 + ;musicf3 + ;musicef 254 octave 3 + ;musicf1 71 note D_, 15 + ;tie note D_, 7 note D_, 7 note F_, 15 + ;tie note F_, 7 + ;musicf1 70 note E_, 7 note E_, 8 dec_octave note A#, 5 note A#, 9 + ;musicf3 note G_, 7 + ;musicf0 16 octave 3 + ;musicf1 53 notetype1 7 .Loop6 note C#, 15 + ;tie note C#, 7 note C#, 7 - loopchannel 2, .Loop6 + sound_loop 2, .Loop6 + ;musicf0 16 + ;musicef 255 octave 3 - note __, 15 + ;musicf1 54 + rest 15 octave 3 note E_, 7 note E_, 15 @@ -1402,38 +1892,45 @@ Music_TCG2GRDuelTheme1_Ch1: note F_, 14 note F_, 7 note F_, 15 - note __, 14 - note __, 15 + rest 14 + rest 15 octave 3 note E_, 7 note E_, 7 + ;tie note E_, 8 note E_, 7 note E_, 7 + ;tie note E_, 7 note C#, 8 note C#, 7 + ;tie note C#, 7 note C#, 7 note C#, 15 - note __, 14 - loopchannel 0, .MainLoop + rest 14 + sound_loop 0, .MainLoop -Music_TCG2GRDuelTheme1_Ch3: +Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) notetype1 10 notetype0 1 notetype2 11 notetype1 1 + ;musice9 64 + ;musicdc 17 octave 3 + ;musice8 7 + ;musicec 244 .Loop1 - callchannel Branch_1f6313 - loopchannel 2, .Loop1 + sound_call Branch_1f6313 + sound_loop 2, .Loop1 .MainLoop octave 3 .Loop2 - callchannel Branch_1f6313 - loopchannel 6, .Loop2 + sound_call Branch_1f6313 + sound_loop 6, .Loop2 notetype0 11 note D_, 2 note A_, 2 @@ -1616,10 +2113,10 @@ Music_TCG2GRDuelTheme1_Ch3: dec_octave notetype0 1 note G#, 14 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 notetype0 11 note D_, 2 note A_, 2 @@ -1802,18 +2299,19 @@ Music_TCG2GRDuelTheme1_Ch3: dec_octave notetype0 1 note G#, 14 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 notetype0 11 note D_, 2 note A_, 2 notetype0 1 note D_, 14 note D#, 16 + ;tie note D#, 13 - note __, 16 - note __, 13 + rest 16 + rest 13 notetype0 1 note G_, 15 note A_, 14 @@ -1897,12 +2395,12 @@ Music_TCG2GRDuelTheme1_Ch3: note C_, 15 note C#, 14 dec_octave - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - callchannel Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_call Branch_1f6313 notetype0 11 note D_, 2 note A_, 2 @@ -1950,17 +2448,23 @@ Music_TCG2GRDuelTheme1_Ch3: note D_, 2 notetype0 1 note G_, 14 + ;musice8 7 notetype0 1 note D#, 16 + ;tie note D#, 13 note D#, 16 + ;tie note D#, 13 - callchannel Branch_1f6313 - callchannel Branch_1f6313 - loopchannel 0, .MainLoop + ;musice8 7 + sound_call Branch_1f6313 + sound_call Branch_1f6313 + sound_loop 0, .MainLoop Branch_1f6313: octave 3 + ;musicec 244 + ;musice8 7 notetype0 11 note D_, 2 note A_, 2 @@ -1971,474 +2475,482 @@ Branch_1f6313: note A#, 2 notetype0 1 note D#, 14 - endchannel + sound_ret -Music_TCG2GRDuelTheme1_Ch4: - togglenoise $06 - notetype 1 +Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327) + toggle_noise 6 + drum_speed 1 octave 1 - callchannel Branch_1f6503 - callchannel Branch_1f6503 - callchannel Branch_1f6503 + sound_call Branch_1f6503 + sound_call Branch_1f6503 + sound_call Branch_1f6503 .MainLoop - note D#, 8 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 8 - note E_, 7 - note D#, 7 - note D#, 7 - note E_, 8 - note D#, 7 - note D#, 7 - note E_, 7 - note D#, 8 - note C#, 7 - note C#, 14 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note E_, 7 - note D#, 8 - note C#, 7 - note C#, 14 + drum_note 4, 8 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 2, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 2, 14 .Loop1 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - loopchannel 6, .Loop1 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note C#, 7 - note C#, 7 - note E_, 7 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note E_, 7 - note D#, 8 - note C#, 7 - note C#, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + sound_loop 6, .Loop1 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 2, 14 .Loop2 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - loopchannel 6, .Loop2 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note C#, 7 - note C#, 7 - note E_, 7 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note D#, 14 - note C#, 8 - note D#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note D#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note D#, 7 - note C#, 7 - note C#, 8 - note C#, 7 - note C_, 7 - note E_, 7 - note C#, 15 - note __, 14 - note __, 15 - note __, 14 - note C_, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note D#, 14 - note F#, 15 - note D#, 7 - note F#, 7 - note D#, 8 - note F#, 7 - note E_, 14 - note C_, 15 - note F#, 14 - note D#, 8 - note F#, 7 - note D#, 14 - note D#, 8 - note F#, 7 - note D#, 7 - note F#, 7 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 5 - note C#, 5 - note C#, 5 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + sound_loop 6, .Loop2 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 4, 14 + drum_note 2, 8 + drum_note 4, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 2, 7 + drum_note 2, 8 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 7 + drum_note 2, 15 + rest 14 + rest 15 + rest 14 + drum_note 1, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 7, 15 + drum_note 4, 7 + drum_note 7, 7 + drum_note 4, 8 + drum_note 7, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 7, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 14 + drum_note 4, 8 + drum_note 7, 7 + drum_note 4, 7 + drum_note 7, 7 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + ;musicef 253 + drum_note 2, 5 + ;musicef 254 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 5 + drum_note 2, 5 .Loop3 - note C_, 15 - note C#, 14 - note D#, 8 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 15 - note C_, 7 - note C#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - loopchannel 3, .Loop3 - note C_, 15 - note C#, 14 - note D#, 8 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 15 - note C_, 7 - note C#, 7 - note D#, 8 - note C#, 7 - note E_, 7 - note C#, 7 + drum_note 1, 15 + drum_note 2, 14 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + sound_loop 3, .Loop3 + drum_note 1, 15 + drum_note 2, 14 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 7 .Loop4 - note C_, 15 - note C#, 14 - note D#, 8 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 15 - note C_, 7 - note C#, 7 - note D#, 8 - note C#, 7 - note E_, 14 - loopchannel 3, .Loop4 - note C_, 15 - note C#, 14 - note D#, 8 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 15 - note C_, 7 - note C#, 7 - note D#, 8 - note C#, 7 - note C#, 4 - note C#, 5 - note C#, 5 - note C_, 15 - note C#, 14 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note C#, 7 - note __, 7 - note D#, 8 - note C#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note C#, 7 - note __, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C_, 15 - note C#, 7 - note __, 7 - note D#, 8 - note C#, 7 - note E_, 7 - note C#, 7 - note C_, 15 - note C#, 7 - note __, 7 - note D#, 8 - note C#, 7 - note E_, 14 - note C#, 16 - note __, 13 - note C#, 16 - note __, 13 + drum_note 1, 15 + drum_note 2, 14 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + sound_loop 3, .Loop4 + drum_note 1, 15 + drum_note 2, 14 + drum_note 4, 8 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 15 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 8 + drum_note 2, 7 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 5 + ;musicef 255 + drum_note 2, 5 + ;musicef 0 + drum_note 1, 15 + drum_note 2, 14 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 2, 7 + rest 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 2, 7 + rest 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 1, 15 + drum_note 2, 7 + rest 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 15 + drum_note 2, 7 + rest 7 + drum_note 4, 8 + drum_note 2, 7 + drum_note 5, 14 + drum_note 2, 16 + rest 13 + drum_note 2, 16 + rest 13 .Loop5 - callchannel Branch_1f6503 - loopchannel 2, .Loop5 - callchannel Branch_1f6503 - loopchannel 0, .MainLoop + sound_call Branch_1f6503 + sound_loop 2, .Loop5 + sound_call Branch_1f6503 + sound_loop 0, .MainLoop Branch_1f6503: octave 1 - notetype 1 - note D#, 8 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 8 - note E_, 7 - note D#, 7 - note D#, 7 - note E_, 8 - note D#, 7 - note D#, 7 - note E_, 7 - note D#, 8 - note D#, 7 - note E_, 7 - note D#, 7 - endchannel - + drum_speed 1 + drum_note 4, 8 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 8 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 8 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 8 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + sound_ret +; 0x1f6517 diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index 9c4eb47b..a725bebe 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -1,18 +1,20 @@ -Music_TCG2GRDuelTheme2: - db $C0 - dw Music_TCG2GRDuelTheme2_Ch1 - db $01 - dw Music_TCG2GRDuelTheme2_Ch2 - db $02 - dw Music_TCG2GRDuelTheme2_Ch3 - db $03 - dw Music_TCG2GRDuelTheme2_Ch4 +Music_GRDuelTheme2: + channel_count 4 + channel 1, Music_GRDuelTheme2_Ch1 + channel 2, Music_GRDuelTheme2_Ch2 + channel 3, Music_GRDuelTheme2_Ch3 + channel 4, Music_GRDuelTheme2_Ch4 -Music_TCG2GRDuelTheme2_Ch2: +Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) notetype1 10 + ;musicf0 0 octave 3 notetype0 1 + ;musicdc 255 + ;musicf1 71 + ;musicf3 note G#, 3 + ;musicf2 note A_, 11 note A_, 7 note G_, 13 @@ -21,35 +23,52 @@ Music_TCG2GRDuelTheme2_Ch2: note E_, 7 note D_, 4 note E_, 3 + ;musicf3 note D#, 7 note E_, 6 note C_, 7 dec_octave note A_, 7 + ;musicf2 note G_, 4 note A_, 3 note G#, 3 note G_, 3 note A_, 7 note A_, 7 - vibrato 27, $33 + ;musicf3 + ;musicf0 1 + ;vibrato_type 5 + vibrato 27, 3, 3 octave 3 note C_, 7 note G_, 6 + ;musicf0 0 octave 4 note D#, 4 + ;musicf2 note E_, 3 + ;tie note E_, 7 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 note E_, 13 .MainLoop + ;musicf0 0 + ;musicf1 71 octave 3 note A_, 7 note A_, 7 - callchannel Branch_1ef490 + sound_call Branch_1ef490 + ;musicf0 0 + ;musicf1 71 + ;musicf3 octave 3 note C_, 5 note D_, 5 @@ -58,9 +77,15 @@ Music_TCG2GRDuelTheme2_Ch2: note G_, 4 note G#, 4 octave 3 + ;musicf2 note A_, 7 note A_, 7 - callchannel Branch_1ef490 + sound_call Branch_1ef490 + ; + ;sound_call Branch_1ef4d1 + ;musicf0 34 + ;musicf1 71 + ;musicf3 octave 2 note G_, 5 note G#, 5 @@ -70,18 +95,27 @@ Music_TCG2GRDuelTheme2_Ch2: note D_, 4 note D#, 4 note E_, 14 + ;tie note E_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note E_, 7 note F#, 6 @@ -89,38 +123,59 @@ Music_TCG2GRDuelTheme2_Ch2: note F#, 7 note E_, 6 note D_, 4 - note __, 3 + rest 3 note F#, 14 + ;tie note F#, 6 note E_, 14 + ;tie note E_, 7 note C_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 - note __, 7 - callchannel Branch_1ef602 + rest 7 + sound_call Branch_1ef602 + ;musicf0 34 note E_, 14 + ;tie note E_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note E_, 7 note F#, 6 @@ -128,64 +183,104 @@ Music_TCG2GRDuelTheme2_Ch2: note F#, 7 note E_, 6 note D_, 4 - note __, 3 + rest 3 note F#, 14 + ;tie note F#, 6 note B_, 14 + ;tie note B_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 + ;musicf1 71 + ;musicf2 note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie + ; note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 - note __, 7 - callchannel Branch_1ef615 + rest 7 + sound_call Branch_1ef615 + ;musicf0 35 + ;musicf1 71 + ;musicf3 octave 3 note G_, 3 note G#, 3 note A_, 14 + ;tie note A_, 7 note G_, 6 - callchannel Branch_1ef5f5 + ;musicec 254 + sound_call Branch_1ef5f5 + ;musicec 0 + ;musicf0 35 note D_, 13 note F_, 14 + ;tie note F_, 7 note G_, 13 + ;tie note G_, 7 + ;musicf2 + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie note E_, 13 note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 + ;musicf3 note F_, 13 note G_, 14 note A_, 13 note E_, 14 + ;tie note E_, 7 note C_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 note D_, 13 dec_octave note A_, 14 + ;tie note A_, 7 inc_octave note D#, 3 note E_, 3 + ;tie note E_, 14 + ;musicf2 note C_, 13 + ;tie + note C_, 14 + ;tie + note C_, 13 + ;tie + note C_, 14 + ;tie + note C_, 13 + ;tie note C_, 14 note C_, 13 - note C_, 14 - note C_, 13 - note C_, 14 - note C_, 13 + ;musicf3 note D_, 5 note E_, 5 note F_, 5 @@ -193,47 +288,71 @@ Music_TCG2GRDuelTheme2_Ch2: note G_, 4 note G#, 4 note A_, 14 + ;tie note A_, 7 note G_, 6 - callchannel Branch_1ef5f5 + ;musicec 254 + sound_call Branch_1ef5f5 + ;musicec 0 + ;musicf0 35 note D_, 13 note F_, 14 + ;tie note F_, 7 note G_, 13 + ;tie note G_, 7 + ;musicf2 note F_, 7 note F_, 6 + ;musicf3 note A#, 3 inc_octave note C_, 4 + ;tie note C_, 14 dec_octave note A#, 6 - callchannel Branch_1ef5f5 + ;musicec 8 + sound_call Branch_1ef5f5 + ;musicec 0 + ;musicf0 35 note F_, 13 note G#, 14 + ;tie note G#, 13 note A#, 14 + ;tie note A#, 7 note A_, 3 note G#, 3 + ;musicf2 note G_, 14 + ;tie note G_, 13 note G_, 14 note A_, 13 + ;tie note A_, 14 note A_, 13 inc_octave note C_, 14 + ;tie note C_, 13 note C_, 14 dec_octave note B_, 13 + ;tie note B_, 14 note B_, 13 note G_, 7 note G_, 7 - note __, 13 + rest 13 + ; + ;sound_call Branch_1ef4d1 + ;musicf0 34 + ;musicf1 71 + ;musicf3 octave 2 note G_, 5 note G#, 5 @@ -243,18 +362,27 @@ Music_TCG2GRDuelTheme2_Ch2: note D_, 4 note D#, 4 note E_, 14 + ;tie note E_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note E_, 7 note F#, 6 @@ -262,38 +390,59 @@ Music_TCG2GRDuelTheme2_Ch2: note F#, 7 note E_, 6 note D_, 4 - note __, 3 + rest 3 note F#, 14 + ;tie note F#, 6 note E_, 14 + ;tie note E_, 7 note C_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 - note __, 7 - callchannel Branch_1ef602 + rest 7 + sound_call Branch_1ef602 + ;musicf0 34 note E_, 14 + ;tie note E_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 octave 3 note E_, 7 note F#, 6 @@ -301,24 +450,44 @@ Music_TCG2GRDuelTheme2_Ch2: note F#, 7 note E_, 6 note D_, 4 - note __, 3 + rest 3 note F#, 14 + ;tie note F#, 6 note B_, 14 + ;tie note B_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 34 + ;musicf1 71 + ;musicf2 note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie + ; note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 note A_, 7 - callchannel Branch_1ef628 + ;musicf3 + sound_call Branch_1ef628 + ; + ;sound_call Branch_1ef564 + ;musicf0 35 + ;musicf1 71 + ;musicf3 octave 2 note G_, 5 note G#, 5 @@ -328,18 +497,27 @@ Music_TCG2GRDuelTheme2_Ch2: note D_, 4 note D#, 4 note E_, 14 + ;tie note E_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 octave 3 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 octave 3 note E_, 7 note F#, 6 @@ -347,38 +525,59 @@ Music_TCG2GRDuelTheme2_Ch2: note F#, 7 note E_, 6 note D_, 4 - note __, 3 + rest 3 note F#, 14 + ;tie note F#, 6 note E_, 14 + ;tie note E_, 7 note C_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 octave 3 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 - note __, 7 - callchannel Branch_1ef602 + rest 7 + sound_call Branch_1ef602 + ;musicf0 35 note E_, 14 + ;tie note E_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 octave 3 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 octave 3 note E_, 7 note F#, 6 @@ -386,77 +585,124 @@ Music_TCG2GRDuelTheme2_Ch2: note F#, 7 note E_, 6 note D_, 4 - note __, 3 + rest 3 note F#, 14 + ;tie note F#, 6 note B_, 14 + ;tie note B_, 7 note G_, 6 - callchannel Branch_1ef5f5 + sound_call Branch_1ef5f5 + ;musicf0 35 + ;musicf2 note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie + ; note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;musicf3 + ;musicf0 34 + ;musicf1 71 + ;musicf3 octave 2 note G_, 4 inc_octave note C_, 5 note F_, 5 + ;musicf2 note G_, 13 note G_, 7 note A_, 14 note A_, 6 + ;musicf3 note A_, 4 + ;musicf2 note A#, 16 + ;tie note A#, 7 + ;tie note A#, 14 + ;tie note A#, 13 + ;tie note A#, 14 + ;tie note A#, 13 + ;tie note A#, 14 + ;tie note A#, 13 + ;tie note A#, 14 + ;tie note A#, 13 note A#, 14 note G_, 7 note A#, 6 + ;musicf3 inc_octave note C#, 3 note D_, 4 + ;tie note D_, 14 note C_, 6 + ;tie note C_, 14 dec_octave + ;musicf2 note A#, 7 inc_octave note C_, 6 dec_octave + ;musicf3 note A_, 14 + ;tie note A_, 7 + ;musicf2 note A#, 6 note A_, 7 + ;tie note A#, 7 inc_octave note C_, 7 note C_, 6 dec_octave + ;musicf3 note A_, 14 + ;tie note A_, 7 note F_, 6 + ;tie note F_, 14 + ;musicf2 note D_, 7 note F_, 6 + ;musicf3 note G#, 3 note A_, 11 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;musicf0 9 octave 2 note A#, 13 inc_octave @@ -464,93 +710,148 @@ Music_TCG2GRDuelTheme2_Ch2: note D_, 10 dec_octave note A#, 13 + ;musicf0 34 octave 3 + ;musicf2 note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 note G_, 14 note D#, 13 note D#, 7 + ;musicf0 9 octave 2 + ;musicf1 48 + ;musicf2 note A#, 5 note A#, 2 + ;musicf3 + ;musicf0 34 octave 3 + ;musicf1 71 + ;musicf2 note A#, 7 note A#, 13 inc_octave note C_, 14 note C_, 6 + ;musicf3 dec_octave note A_, 14 + ;tie note A_, 7 + ;musicf2 note A#, 6 note A_, 7 + ;tie note A#, 7 note A_, 7 note A_, 6 + ;musicf3 note F_, 14 + ;tie note F_, 7 + ;musicf2 note D_, 6 note F_, 7 + ;tie note D_, 7 + ;musicf3 note G#, 3 note A_, 10 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 + ;musicf0 9 octave 2 note G_, 14 note A_, 13 + ;musicf0 35 octave 3 + ;musicf1 87 note G_, 14 + ;tie note G_, 7 + ;musicf2 note A_, 6 note G_, 7 + ;tie note A_, 7 note A#, 7 note G_, 6 + ;musicf3 note B_, 4 - vibrato 14, $33 + vibrato 14, 3, 3 + ;musicf2 inc_octave note C_, 10 + ;tie note C_, 13 + ;tie note C_, 14 + ;tie note C_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 14 + ;tie note C_, 7 dec_octave note A#, 6 inc_octave note C_, 7 + ;tie dec_octave note A#, 7 note F#, 7 note A#, 6 + ;musicf3 note D_, 14 + ;tie note D_, 7 note A_, 3 note A#, 3 + ;tie note A#, 14 + ;musicf2 note F#, 7 note F#, 6 + ;musicf3 note G#, 4 - vibrato 10, $33 + vibrato 10, 3, 3 note A_, 10 + ;tie note A_, 13 + ;tie note A_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musicf2 note G_, 13 + ;tie note G_, 7 note G_, 7 note D_, 13 @@ -558,54 +859,90 @@ Music_TCG2GRDuelTheme2_Ch2: note E_, 14 note E_, 6 note F_, 14 + ;tie note F_, 8 note F_, 5 + ;musicf3 + ;musicf0 9 octave 3 + ;musicf1 48 + ;musicf2 note C#, 5 note C#, 9 + ;musicf3 + ;musicf0 35 + ;musicf1 71 + ;musicf3 note G_, 13 + ;tie note G_, 14 + ;musicf2 note A_, 13 note A_, 7 note A#, 14 note A#, 6 inc_octave note C_, 14 + ;tie note C_, 13 note C_, 14 - vibrato 27, $33 - note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 + vibrato 27, 3, 3 + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie note D_, 13 note D_, 14 + ;tie note D_, 13 note C_, 14 + ;tie note C_, 13 note C_, 14 note D_, 13 + ;tie note D_, 14 note D_, 13 note D_, 14 + ;tie note D_, 13 note D_, 14 + ;musicf3 note D#, 3 + ;musicf2 note E_, 10 + ;tie note E_, 14 + ;tie note E_, 8 note E_, 5 + ;musicf3 + ;musicf0 1 + ;musicef 2 + ;musicf1 71 octave 3 note E_, 4 note E_, 3 + ;musicf3 inc_octave note D_, 7 + ;musicf2 dec_octave note B_, 4 inc_octave @@ -613,7 +950,9 @@ Music_TCG2GRDuelTheme2_Ch2: dec_octave note G_, 3 note B_, 3 + ;musicf3 note B_, 7 + ;musicf2 note G_, 4 note B_, 3 note D_, 4 @@ -622,13 +961,16 @@ Music_TCG2GRDuelTheme2_Ch2: note D_, 3 note E_, 7 note E_, 7 - callchannel Branch_1ef490 + sound_call Branch_1ef490 octave 2 note B_, 14 inc_octave note C_, 13 - note __, 14 - callchannel Branch_1ef490 + rest 14 + sound_call Branch_1ef490 + ;musicf0 0 + ;musicf1 71 + ;musicf3 octave 3 note C_, 5 note D_, 5 @@ -636,72 +978,90 @@ Music_TCG2GRDuelTheme2_Ch2: note E_, 4 note G_, 4 note G#, 4 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1ef490: + ;musicf0 9 octave 3 + ;musicf1 48 + ;musicf2 note C_, 5 note C_, 8 - note __, 7 + rest 7 note C_, 5 note C_, 9 - note __, 6 - note __, 7 + rest 6 + rest 7 note C_, 5 note C_, 9 - note __, 6 + rest 6 + ;musicf3 note D_, 14 note C_, 13 - note __, 14 + rest 14 + ;musicf2 note C_, 5 note C_, 8 - note __, 7 + rest 7 note C_, 5 note C_, 9 - note __, 6 - note __, 7 + rest 6 + rest 7 note C_, 5 note C_, 9 - note __, 6 + rest 6 + ;musicf3 dec_octave note B_, 14 inc_octave note C_, 13 - note __, 14 + rest 14 + ;musicf2 note C_, 5 note C_, 8 - note __, 7 + rest 7 note C_, 5 note C_, 9 - note __, 6 - note __, 7 + rest 6 + rest 7 note C_, 5 note C_, 9 - note __, 6 + rest 6 + ;musicf3 note D_, 14 note C_, 13 - note __, 14 + rest 14 + ;musicf2 note C_, 5 note C_, 8 - note __, 7 + rest 7 note C_, 5 note C_, 9 - note __, 6 - note __, 7 + rest 6 + rest 7 note C_, 5 note C_, 9 - note __, 6 - endchannel + rest 6 + ;musicf3 + sound_ret Branch_1ef5f5: + ;musicf0 9 octave 2 + ;musicf1 48 octave 3 + ;musicf2 note C_, 5 note C_, 9 - endchannel + ;musicf1 71 + ;musicf3 + sound_ret Branch_1ef602: + ;musicf0 9 octave 3 + ;musicf1 48 + ;musicf3 note E_, 7 dec_octave note G_, 4 @@ -711,10 +1071,15 @@ Branch_1ef602: note D_, 14 note C_, 13 octave 3 - endchannel + ;musicf1 71 + ;musicf3 + sound_ret Branch_1ef615: + ;musicf0 9 octave 3 + ;musicf1 48 + ;musicf3 note E_, 7 dec_octave note G_, 4 @@ -724,76 +1089,105 @@ Branch_1ef615: note D_, 14 note C_, 7 octave 3 - endchannel + ;musicf1 71 + ;musicf3 + sound_ret Branch_1ef628: + ;musicf0 9 octave 3 + ;musicf1 48 + ;musicf3 note E_, 7 dec_octave note G_, 4 note A_, 4 note G_, 5 - endchannel + sound_ret -Music_TCG2GRDuelTheme2_Ch1: +Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) notetype1 10 + ;musicf0 9 octave 2 notetype0 1 + ;musicdc 255 octave 3 note E_, 14 - note __, 7 + rest 7 note D_, 13 - note __, 7 + rest 7 note C_, 13 - note __, 7 + rest 7 dec_octave note G_, 4 - note __, 3 + rest 3 note A_, 7 inc_octave note C_, 4 - note __, 2 + rest 2 dec_octave note A_, 7 note E_, 7 note D_, 4 - note __, 3 + rest 3 note D#, 4 - note __, 2 + rest 2 note E_, 7 - note __, 7 + rest 7 + ;musicf0 1 octave 3 - note __, 3 + rest 3 note E_, 7 note B_, 3 + ;musicf1 71 + ;musicf2 note G#, 14 + ;tie note G#, 13 + ;tie note G#, 14 + ;tie note G#, 13 + ;tie note G#, 14 note G#, 13 .MainLoop .Loop1 + ;musicf0 0 + ;musicf1 71 octave 3 + ;musicf2 note E_, 7 note E_, 7 - callchannel Branch_1ef8d6 - note __, 14 - callchannel Branch_1ef8f0 - loopchannel 2, .Loop1 + sound_call Branch_1ef8d6 + rest 14 + sound_call Branch_1ef8f0 + sound_loop 2, .Loop1 + ; + ;sound_call Branch_1ef90b + ;musicf0 7 + ;musicf3 octave 3 note C_, 14 + ;tie note C_, 7 note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 7 - callchannel Branch_1efa41 + sound_call Branch_1efa41 + ;musicf0 7 + ;musicef 253 note D_, 14 + ;tie note D_, 13 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note C_, 7 note D_, 6 note E_, 14 @@ -801,39 +1195,57 @@ Music_TCG2GRDuelTheme2_Ch1: note C_, 6 dec_octave note B_, 4 - note __, 3 + rest 3 inc_octave note D_, 14 + ;tie note D_, 6 note C_, 14 + ;tie note C_, 7 dec_octave note A_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 octave 2 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1efa4a + sound_call Branch_1efa4a + ;musicf0 7 octave 2 + ;musicef 253 note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - note __, 7 - callchannel Branch_1efa51 + rest 7 + sound_call Branch_1efa51 + ;musicf0 7 octave 3 note C_, 14 + ;tie note C_, 7 note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 7 - callchannel Branch_1efa41 + sound_call Branch_1efa41 + ;musicf0 7 + ;musicef 253 note D_, 14 + ;tie note D_, 13 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note C_, 7 note D_, 6 note E_, 14 @@ -841,59 +1253,78 @@ Music_TCG2GRDuelTheme2_Ch1: note C_, 6 dec_octave note B_, 4 - note __, 3 + rest 3 inc_octave note D_, 14 + ;tie note D_, 6 note G_, 14 + ;tie note G_, 7 note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1efa4a + sound_call Branch_1efa4a + ; + ;musicf0 7 + ;musicef 253 octave 3 note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - note __, 7 - callchannel Branch_1efa51 + rest 7 + sound_call Branch_1efa51 + ;musicf0 9 octave 3 - note __, 14 - note __, 13 + ;musicf1 48 + rest 14 + rest 13 + ;musicf2 note D_, 5 note D_, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note D_, 5 note D_, 2 + ;musicf3 note D_, 13 note F_, 14 dec_octave note A#, 13 - note __, 14 - note __, 13 + rest 14 + rest 13 + ;musicf2 note A#, 5 note A#, 9 - note __, 13 + rest 13 inc_octave - note __, 7 + rest 7 note D_, 5 note D_, 2 + ;musicf3 note D_, 13 note E_, 14 note F_, 13 .Loop2 - note __, 14 - note __, 13 + rest 14 + rest 13 + ;musicf2 note E_, 5 note E_, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note E_, 5 note E_, 2 + ;musicf3 dec_octave note A_, 13 inc_octave @@ -901,28 +1332,32 @@ Music_TCG2GRDuelTheme2_Ch1: dec_octave note A_, 13 inc_octave - loopchannel 2, .Loop2 - note __, 14 - note __, 13 + sound_loop 2, .Loop2 + rest 14 + rest 13 + ;musicf2 note D_, 5 note D_, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note D_, 5 note D_, 2 + ;musicf3 note D_, 13 note F_, 14 dec_octave note A#, 13 inc_octave - note __, 14 - note __, 13 + rest 14 + rest 13 + ;musicf2 note C#, 5 note C#, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note G#, 5 note G#, 2 + ;musicf3 note F_, 13 dec_octave note A_, 5 @@ -932,37 +1367,62 @@ Music_TCG2GRDuelTheme2_Ch1: note D_, 4 note E_, 4 note F_, 4 + ;musicf0 1 octave 3 + ;musicf1 71 note C_, 14 + ;tie note C_, 13 note C_, 14 note D_, 13 + ;tie note D_, 14 note D_, 13 note F_, 14 + ;tie note F_, 13 note F_, 14 note E_, 13 + ;tie note E_, 14 note E_, 13 note C_, 7 note C_, 14 + ;tie note C_, 6 + ;musicf3 + ;musicf0 0 + ;musicf0 4 + ;musicf1 71 + ;musicf2 note G#, 7 note G#, 14 - note __, 6 + rest 6 + ;musicf3 + ; + ;sound_call Branch_1ef90b + ;musicf0 7 + ;musicf3 octave 3 note C_, 14 + ;tie note C_, 7 note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 7 - callchannel Branch_1efa41 + sound_call Branch_1efa41 + ;musicf0 7 + ;musicef 253 note D_, 14 + ;tie note D_, 13 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note C_, 7 note D_, 6 note E_, 14 @@ -970,39 +1430,57 @@ Music_TCG2GRDuelTheme2_Ch1: note C_, 6 dec_octave note B_, 4 - note __, 3 + rest 3 inc_octave note D_, 14 + ;tie note D_, 6 note C_, 14 + ;tie note C_, 7 dec_octave note A_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 octave 2 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1efa4a + sound_call Branch_1efa4a + ;musicf0 7 octave 2 + ;musicef 253 note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - note __, 7 - callchannel Branch_1efa51 + rest 7 + sound_call Branch_1efa51 + ;musicf0 7 octave 3 note C_, 14 + ;tie note C_, 7 note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 7 - callchannel Branch_1efa41 + sound_call Branch_1efa41 + ;musicf0 7 + ;musicef 253 note D_, 14 + ;tie note D_, 13 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note C_, 7 note D_, 6 note E_, 14 @@ -1010,38 +1488,62 @@ Music_TCG2GRDuelTheme2_Ch1: note C_, 6 dec_octave note B_, 4 - note __, 3 + rest 3 inc_octave note D_, 14 + ;tie note D_, 6 note G_, 14 + ;tie note G_, 7 note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 7 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1efa4a + sound_call Branch_1efa4a + ; + ;musicf0 7 + ;musicef 253 octave 3 note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - note __, 7 - callchannel Branch_1efa62 + rest 7 + sound_call Branch_1efa62 + ; + ;sound_call Branch_1ef997 + ;musicf0 1 + ;musicf1 71 + ;musicf3 octave 2 note A_, 14 + ;tie note A_, 7 inc_octave note C_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 1 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 7 - callchannel Branch_1efa41 + sound_call Branch_1efa41 + ;musicf0 1 + ;musicef 253 note D_, 14 + ;tie note D_, 13 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 1 octave 2 note A_, 7 note B_, 6 @@ -1050,41 +1552,63 @@ Music_TCG2GRDuelTheme2_Ch1: dec_octave note B_, 7 note A_, 6 + ;musicf2 note G_, 4 note G_, 3 + ;musicf3 note B_, 14 + ;tie note B_, 6 note A_, 14 + ;tie note A_, 7 dec_octave note E_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 1 octave 2 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1efa4a + sound_call Branch_1efa4a + ;musicf0 1 + ;musicef 253 octave 2 + ;musicf1 71 note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 note F#, 7 - callchannel Branch_1efa51 + sound_call Branch_1efa51 + ;musicf0 1 octave 2 note A_, 14 + ;tie note A_, 7 inc_octave note C_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 1 note D_, 13 + ;tie note D_, 14 + ;tie note D_, 7 - callchannel Branch_1efa41 + sound_call Branch_1efa41 + ;musicf0 1 + ;musicef 253 note D_, 14 + ;tie note D_, 13 - callchannel Branch_1efa34 + sound_call Branch_1efa34 octave 2 + ;musicf0 1 note A_, 7 note B_, 6 inc_octave @@ -1092,207 +1616,294 @@ Music_TCG2GRDuelTheme2_Ch1: dec_octave note B_, 7 note A_, 6 + ;musicf2 note G_, 4 note G_, 3 + ;musicf3 note B_, 14 + ;tie note B_, 6 inc_octave note D_, 14 + ;tie note D_, 7 dec_octave note A_, 6 - callchannel Branch_1efa34 + sound_call Branch_1efa34 + ;musicf0 1 octave 2 note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - callchannel Branch_1efa4a + sound_call Branch_1efa4a + ; + ;musicf0 9 octave 3 - note __, 7 + ;musicf1 48 + ;musicf2 + rest 7 note E_, 5 note E_, 9 - note __, 6 + rest 6 note C_, 5 note C_, 9 - note __, 13 + rest 13 note C_, 5 note C_, 9 + ;musicf3 + ;musicf0 0 + ;musicf1 71 octave 3 note E_, 13 note E_, 7 note F_, 14 note E_, 6 + ;musicf0 7 octave 3 + ;musicf1 48 + ;musicf3 note D#, 14 + ;tie note D#, 13 + ;musicf0 9 octave 2 + ;musicf2 note A#, 5 note A#, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 octave 3 note D#, 5 note D#, 9 + ;musicf3 dec_octave note G_, 6 note A#, 14 note G_, 13 + ;musicf0 7 octave 3 note D#, 14 + ;tie note D#, 13 + ;musicf0 9 octave 2 + ;musicf2 note A#, 5 note A#, 9 + ;musicf3 + ;musicf0 7 octave 3 note D_, 7 - note __, 6 + rest 6 note A#, 14 + ;tie note A#, 7 note A_, 13 + ;tie note A_, 7 note G_, 7 - note __, 6 + rest 6 note F_, 14 + ;tie note F_, 7 note G_, 6 + ;musicf0 9 octave 3 + ;musicf2 note D_, 5 note D_, 9 + ;musicf3 + ;musicf0 7 octave 3 note A_, 7 - note __, 6 + rest 6 note F_, 14 + ;tie note F_, 7 + ;musicf0 9 octave 2 note A#, 6 inc_octave note D_, 14 dec_octave note A#, 13 + ;musicf0 7 octave 3 note F_, 14 + ;tie note F_, 13 + ;tie note F_, 14 + ;tie note F_, 13 + ;tie note F_, 7 + ;musicf0 9 octave 3 + ;musicf2 note F_, 5 note F_, 2 + ;musicf3 dec_octave note G_, 13 note A#, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 note G_, 13 + ;musicf0 7 octave 3 note D#, 14 + ;tie note D#, 13 + ;musicf0 9 octave 2 + ;musicf2 note A#, 5 note A#, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 octave 3 note D#, 5 note D#, 9 + ;musicf3 dec_octave note G_, 6 note A#, 14 note G_, 13 + ;musicf0 7 octave 3 note D#, 14 + ;tie note D#, 13 + ;musicf0 9 octave 2 + ;musicf2 note A#, 5 note A#, 9 + ;musicf3 + ;musicf0 7 octave 3 note C_, 13 + ;musicf0 9 octave 3 + ;musicf2 note D#, 5 note D#, 9 + ;musicf3 + ;musicf0 7 octave 3 note G_, 7 - note __, 13 + rest 13 note A_, 14 - note __, 6 + rest 6 note F_, 14 + ;tie note F_, 7 note G_, 6 + ;musicf0 9 octave 3 + ;musicf2 note D_, 5 note D_, 9 + ;musicf3 + ;musicf0 7 octave 3 note F_, 7 - note __, 6 + rest 6 note D_, 14 + ;tie note D_, 7 + ;musicf0 9 octave 2 note F_, 6 note A_, 14 note F_, 13 + ;musicf0 7 octave 3 note F_, 14 + ;tie note F_, 13 + ;tie note F_, 14 + ;tie note F_, 13 + ;tie note F_, 7 + ;musicf0 9 octave 3 + ;musicf2 note D_, 5 note D_, 2 + ;musicf3 dec_octave note F_, 4 note G_, 3 + ;tie note G_, 6 note D#, 14 note F_, 13 + ;musicf0 9 octave 3 - note __, 14 - note __, 13 + ;musicf1 48 + rest 14 + rest 13 + ;musicf2 note C_, 5 note C_, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note F_, 5 note F_, 9 + ;musicf3 dec_octave note G_, 6 note A#, 14 note G_, 13 inc_octave - note __, 14 - note __, 13 + rest 14 + rest 13 + ;musicf2 note F_, 5 note F_, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note A#, 5 note A#, 2 + ;musicf3 note C_, 13 note D#, 14 note F_, 13 - note __, 14 - note __, 13 + rest 14 + rest 13 + ;musicf2 octave 2 note A#, 5 note A#, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note A#, 5 note A#, 9 + ;musicf3 note F_, 6 note A#, 14 note F_, 13 inc_octave - note __, 14 - note __, 13 + rest 14 + rest 13 + ;musicf2 note F_, 5 note F_, 9 - note __, 13 - note __, 7 + rest 13 + rest 7 note F_, 5 note F_, 9 + ;musicf3 dec_octave note A#, 6 + ;musicf0 0 + ;musicf3 octave 2 note A_, 5 note A#, 5 @@ -1301,23 +1912,40 @@ Music_TCG2GRDuelTheme2_Ch1: note D_, 4 note E_, 4 note F_, 4 + ;musicf1 71 note F_, 14 + ;tie note F_, 7 + ;musicf0 9 octave 3 + ;musicf1 48 note F_, 6 note F_, 14 + ;musicf0 0 + ;musicf1 71 note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 7 note G_, 6 + ;musicf3 note D_, 5 note E_, 5 note F_, 5 @@ -1325,37 +1953,60 @@ Music_TCG2GRDuelTheme2_Ch1: note A_, 4 note B_, 4 note F_, 14 + ;tie note F_, 7 + ;musicf0 9 octave 3 + ;musicf1 48 + ;musicf2 note F_, 6 note F_, 14 + ;musicf0 0 + ;musicf3 octave 3 note G_, 13 + ;tie note G_, 7 + ;musicf0 9 octave 3 + ;musicf1 48 note G_, 5 note G_, 9 - note __, 6 + rest 6 + ;musicf0 0 octave 3 + ;musicf1 71 note G#, 14 + ;tie note G#, 7 note G#, 6 + ;tie note G#, 14 note A_, 13 + ;tie note A_, 14 note A_, 7 + ;musicf0 1 + ;musicef 2 + ;musicf1 71 + ;musicf3 note D_, 3 note D#, 3 dec_octave + ;musicf2 note B_, 4 note B_, 3 + ;musicf3 inc_octave note B_, 7 + ;musicf2 note G_, 4 note B_, 3 note D_, 3 note G_, 3 + ;musicf3 note G_, 7 + ;musicf2 note D_, 4 note G_, 3 dec_octave @@ -1368,124 +2019,154 @@ Music_TCG2GRDuelTheme2_Ch1: dec_octave note B_, 7 note B_, 7 - callchannel Branch_1ef8d6 - note __, 14 - callchannel Branch_1ef8d6 - note __, 14 - callchannel Branch_1ef8d6 - note __, 14 - callchannel Branch_1ef8f0 - loopchannel 0, .MainLoop + sound_call Branch_1ef8d6 + rest 14 + sound_call Branch_1ef8d6 + rest 14 + sound_call Branch_1ef8d6 + rest 14 + sound_call Branch_1ef8f0 + sound_loop 0, .MainLoop Branch_1ef8d6: + ;musicf0 9 octave 2 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 + ;musicf3 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 note A_, 14 note G_, 13 - note __, 14 - note __, 13 - note __, 7 + rest 14 + rest 13 + rest 7 + ;musicf2 note G_, 5 note G_, 9 - note __, 6 - note __, 7 + rest 6 + rest 7 note G_, 5 note G_, 9 - note __, 6 + rest 6 + ;musicf3 note F#, 14 note G_, 13 - endchannel + sound_ret Branch_1ef8f0: + ;musicf0 9 octave 2 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 + ;musicf3 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 note A_, 14 note G_, 13 - note __, 14 - note __, 13 - note __, 7 + rest 14 + rest 13 + ;musicf2 + rest 7 note G_, 5 note G_, 9 - note __, 6 - note __, 7 + rest 6 + rest 7 note G_, 5 note G_, 9 - note __, 6 + rest 6 + ;musicf3 note B_, 14 inc_octave note C_, 13 - endchannel + sound_ret Branch_1efa34: + ;musicf0 9 octave 2 + ;musicf1 48 octave 3 + ;musicf2 note E_, 5 note E_, 9 - endchannel + ;musicf3 + ;musicf1 71 + sound_ret Branch_1efa41: + ;musicf0 9 octave 2 octave 3 + ;musicf3 note C_, 6 note D_, 14 note C_, 13 - endchannel + sound_ret Branch_1efa4a: + ;musicf0 9 octave 2 + ;musicf3 note A_, 14 note G_, 13 - endchannel + sound_ret Branch_1efa51: + ;musicf0 9 + ;musicf1 48 + ;musicf2 octave 2 note G_, 5 inc_octave note C_, 9 dec_octave - note __, 6 + rest 6 + ;musicf3 note A_, 14 note G_, 13 - endchannel + ;musicf1 71 + sound_ret Branch_1efa62: + ;musicf0 9 + ;musicf1 48 + ;musicf2 octave 2 note G_, 5 inc_octave note C_, 9 dec_octave - note __, 6 + rest 6 + ;musicf3 inc_octave note D_, 14 note C_, 13 - endchannel + ;musicf1 71 + sound_ret -Music_TCG2GRDuelTheme2_Ch3: +Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) notetype1 10 + ;notetype2 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype0 1 notetype1 1 + ;musice9 96 + ;musicdc 255 octave 2 note A_, 14 note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 13 note C_, 4 - note __, 3 + rest 3 note D_, 13 inc_octave note D_, 4 - note __, 3 + rest 3 dec_octave note D_, 7 note D#, 7 @@ -1496,55 +2177,56 @@ Music_TCG2GRDuelTheme2_Ch3: note G_, 7 note G#, 6 note A_, 7 - note __, 16 - note __, 4 + rest 16 + rest 4 note A#, 14 + ;tie note A#, 7 note A#, 3 - note __, 3 + rest 3 note A#, 7 inc_octave note F_, 4 - note __, 3 + rest 3 note A#, 13 note F_, 14 dec_octave note A#, 13 .MainLoop - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efda8 - callchannel Branch_1efdc0 - callchannel Branch_1efda8 - callchannel Branch_1efdd9 - callchannel Branch_1efda8 - callchannel Branch_1efdc0 - callchannel Branch_1efda8 - callchannel Branch_1efdd9 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efda8 + sound_call Branch_1efdc0 + sound_call Branch_1efda8 + sound_call Branch_1efdd9 + sound_call Branch_1efda8 + sound_call Branch_1efdc0 + sound_call Branch_1efda8 + sound_call Branch_1efdd9 octave 2 note G_, 14 note G_, 4 - note __, 3 + rest 3 note G_, 6 inc_octave note F_, 5 - note __, 2 + rest 2 dec_octave note D_, 4 - note __, 3 + rest 3 note F_, 7 note F#, 6 note G_, 4 - note __, 3 + rest 3 inc_octave note A#, 5 - note __, 2 + rest 2 dec_octave note A#, 13 inc_octave @@ -1553,21 +2235,21 @@ Music_TCG2GRDuelTheme2_Ch3: note A#, 13 note G_, 14 note G_, 4 - note __, 3 + rest 3 note G_, 6 inc_octave note F_, 5 - note __, 2 + rest 2 dec_octave note D_, 4 - note __, 3 + rest 3 note F_, 7 note F#, 6 note G_, 4 - note __, 3 + rest 3 inc_octave note A#, 5 - note __, 2 + rest 2 dec_octave note E_, 13 note F_, 14 @@ -1576,24 +2258,24 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note F_, 14 note F_, 4 - note __, 3 + rest 3 note F_, 6 inc_octave note A_, 5 - note __, 2 + rest 2 dec_octave inc_octave note C_, 4 - note __, 3 + rest 3 note E_, 7 note F_, 6 dec_octave note F_, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave dec_octave inc_octave @@ -1602,47 +2284,47 @@ Music_TCG2GRDuelTheme2_Ch3: note A#, 14 inc_octave note C_, 13 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 octave 2 note G_, 14 note G_, 4 - note __, 3 + rest 3 note G_, 6 inc_octave note F_, 5 - note __, 2 + rest 2 dec_octave note D_, 4 - note __, 3 + rest 3 note F_, 7 note F#, 6 note G_, 4 - note __, 3 + rest 3 inc_octave note A#, 5 - note __, 2 + rest 2 dec_octave note F_, 13 note G_, 14 note F_, 13 note D#, 14 note D#, 4 - note __, 3 + rest 3 note D#, 6 inc_octave note A#, 5 - note __, 2 + rest 2 dec_octave note A#, 4 - note __, 3 + rest 3 inc_octave note C#, 7 note D_, 6 note D#, 4 - note __, 3 + rest 3 inc_octave note C#, 5 - note __, 2 + rest 2 dec_octave dec_octave note D#, 13 @@ -1654,155 +2336,155 @@ Music_TCG2GRDuelTheme2_Ch3: note D_, 7 dec_octave note A_, 4 - note __, 3 + rest 3 note D_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 2 + rest 2 note D_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 inc_octave note E_, 7 dec_octave note B_, 4 - note __, 2 + rest 2 note E_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note B_, 4 - note __, 2 + rest 2 inc_octave note G_, 7 note D_, 4 - note __, 3 + rest 3 dec_octave note G_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 2 + rest 2 dec_octave note G_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 3 + rest 3 note A_, 7 note E_, 4 - note __, 2 + rest 2 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note E_, 4 - note __, 3 + rest 3 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note E_, 4 - note __, 2 + rest 2 note D_, 7 dec_octave note A_, 4 - note __, 3 + rest 3 note D_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 2 + rest 2 note A#, 7 inc_octave note F_, 4 - note __, 3 + rest 3 note A#, 7 note G#, 4 - note __, 2 - callchannel Branch_1efda8 - callchannel Branch_1efdc0 - callchannel Branch_1efda8 - callchannel Branch_1efdd9 - callchannel Branch_1efda8 - callchannel Branch_1efdc0 - callchannel Branch_1efda8 - callchannel Branch_1efdd9 - callchannel Branch_1efda8 - callchannel Branch_1efdc0 - callchannel Branch_1efda8 - callchannel Branch_1efdd9 - callchannel Branch_1efda8 - callchannel Branch_1efdc0 - callchannel Branch_1efda8 + rest 2 + sound_call Branch_1efda8 + sound_call Branch_1efdc0 + sound_call Branch_1efda8 + sound_call Branch_1efdd9 + sound_call Branch_1efda8 + sound_call Branch_1efdc0 + sound_call Branch_1efda8 + sound_call Branch_1efdd9 + sound_call Branch_1efda8 + sound_call Branch_1efdc0 + sound_call Branch_1efda8 + sound_call Branch_1efdd9 + sound_call Branch_1efda8 + sound_call Branch_1efdc0 + sound_call Branch_1efda8 octave 2 note A_, 4 - note __, 3 + rest 3 inc_octave note A_, 5 - note __, 2 + rest 2 note G_, 7 note A_, 4 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 dec_octave note E_, 4 - note __, 3 + rest 3 note G_, 7 note G#, 6 note A_, 7 - note __, 7 + rest 7 note A_, 13 note A_, 4 - note __, 3 + rest 3 note G_, 14 note G_, 3 - note __, 3 + rest 3 .Loop2 octave 2 note F_, 14 note F_, 4 - note __, 3 + rest 3 note F_, 6 inc_octave note G_, 5 - note __, 2 + rest 2 note C_, 4 - note __, 3 + rest 3 note D#, 7 note F_, 6 dec_octave note F_, 4 - note __, 3 + rest 3 inc_octave note A#, 5 - note __, 2 + rest 2 note F_, 13 note C_, 14 note D#, 13 - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 octave 2 note F_, 14 note F_, 4 - note __, 3 + rest 3 note F_, 6 inc_octave note A#, 5 - note __, 2 + rest 2 note C_, 4 - note __, 3 + rest 3 note D#, 7 note F_, 6 dec_octave note F_, 4 - note __, 3 + rest 3 inc_octave inc_octave note F_, 5 - note __, 2 + rest 2 dec_octave note F_, 13 note C_, 14 @@ -1810,24 +2492,24 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note F_, 14 note F_, 4 - note __, 3 + rest 3 note F_, 6 inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave note C_, 4 - note __, 3 + rest 3 note D#, 7 note F_, 6 dec_octave note F_, 4 - note __, 3 + rest 3 inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave note F_, 13 note C_, 14 @@ -1835,42 +2517,42 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note F_, 14 note F_, 4 - note __, 3 + rest 3 note F_, 6 inc_octave note G_, 5 - note __, 2 + rest 2 note C_, 4 - note __, 3 + rest 3 note D#, 7 note F_, 6 dec_octave note F_, 4 - note __, 3 + rest 3 inc_octave note A#, 5 - note __, 2 + rest 2 note F_, 13 note C_, 14 note D#, 13 octave 2 note F_, 14 note F_, 4 - note __, 3 + rest 3 note F_, 6 inc_octave note G_, 5 - note __, 2 + rest 2 note C_, 4 - note __, 3 + rest 3 note D#, 7 note F_, 6 dec_octave note F_, 4 - note __, 3 + rest 3 inc_octave note G_, 5 - note __, 2 + rest 2 note F_, 13 note C_, 14 note D#, 13 @@ -1878,22 +2560,22 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note A#, 14 note A#, 4 - note __, 3 + rest 3 note A#, 6 inc_octave note A_, 5 - note __, 2 + rest 2 dec_octave note F_, 4 - note __, 3 + rest 3 note A_, 7 note A#, 6 note A#, 4 - note __, 3 + rest 3 inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave note F_, 13 note A_, 14 @@ -1901,23 +2583,23 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note A#, 14 note A#, 4 - note __, 3 + rest 3 note A#, 6 inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave dec_octave note F_, 4 - note __, 3 + rest 3 note A_, 7 note A#, 6 note A#, 4 - note __, 3 + rest 3 inc_octave note A_, 5 - note __, 2 + rest 2 dec_octave note F_, 13 note A_, 14 @@ -1925,22 +2607,22 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note G#, 14 note G#, 4 - note __, 3 + rest 3 note G#, 6 inc_octave note G_, 5 - note __, 2 + rest 2 note D#, 4 - note __, 3 + rest 3 note G_, 7 note G#, 6 dec_octave note G#, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave note D#, 13 note G_, 14 @@ -1948,26 +2630,26 @@ Music_TCG2GRDuelTheme2_Ch3: octave 2 note D_, 14 note D_, 4 - note __, 3 + rest 3 note D_, 6 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 note D_, 6 dec_octave note D_, 4 - note __, 3 + rest 3 inc_octave inc_octave note F_, 5 - note __, 2 + rest 2 dec_octave dec_octave note A_, 13 @@ -1977,21 +2659,21 @@ Music_TCG2GRDuelTheme2_Ch3: note A_, 13 note G_, 14 note G_, 4 - note __, 3 + rest 3 note G_, 6 inc_octave note F_, 5 - note __, 2 + rest 2 note D_, 4 - note __, 3 + rest 3 note F_, 7 note G_, 6 dec_octave note G_, 4 - note __, 3 + rest 3 inc_octave note F_, 5 - note __, 2 + rest 2 dec_octave note G_, 13 inc_octave @@ -2000,24 +2682,24 @@ Music_TCG2GRDuelTheme2_Ch3: dec_octave note D#, 14 note D#, 4 - note __, 3 + rest 3 note D#, 6 inc_octave note A#, 5 - note __, 2 + rest 2 dec_octave note A#, 4 - note __, 3 + rest 3 inc_octave note C#, 7 note D#, 6 dec_octave note D#, 4 - note __, 3 + rest 3 inc_octave inc_octave note C#, 5 - note __, 2 + rest 2 dec_octave note D#, 13 dec_octave @@ -2027,26 +2709,26 @@ Music_TCG2GRDuelTheme2_Ch3: note D_, 7 dec_octave note A_, 4 - note __, 3 + rest 3 note D_, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 1 + rest 1 dec_octave dec_octave note D_, 4 - note __, 3 + rest 3 note D_, 2 - note __, 5 + rest 5 note E_, 13 note E_, 4 - note __, 3 + rest 3 inc_octave inc_octave note G_, 5 - note __, 2 + rest 2 dec_octave note E_, 13 dec_octave @@ -2056,28 +2738,28 @@ Music_TCG2GRDuelTheme2_Ch3: note E_, 7 dec_octave note E_, 4 - note __, 3 + rest 3 note E_, 2 - note __, 5 + rest 5 inc_octave inc_octave note D_, 5 - note __, 1 + rest 1 dec_octave dec_octave note E_, 4 - note __, 3 + rest 3 inc_octave note E_, 7 note D_, 7 note E_, 6 dec_octave note E_, 4 - note __, 3 + rest 3 inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave dec_octave note B_, 13 @@ -2089,26 +2771,26 @@ Music_TCG2GRDuelTheme2_Ch3: note D_, 7 dec_octave note A_, 4 - note __, 3 + rest 3 note D_, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 1 + rest 1 dec_octave dec_octave note D_, 4 - note __, 3 + rest 3 note D_, 2 - note __, 5 + rest 5 note E_, 13 note E_, 4 - note __, 3 + rest 3 inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave note E_, 13 dec_octave @@ -2116,542 +2798,578 @@ Music_TCG2GRDuelTheme2_Ch3: inc_octave inc_octave note D_, 5 - note __, 2 + rest 2 dec_octave dec_octave note A#, 3 - note __, 3 + rest 3 note A#, 7 inc_octave note A#, 4 - note __, 3 + rest 3 dec_octave note E_, 13 note E_, 14 note E_, 4 - note __, 3 + rest 3 inc_octave note D_, 6 note E_, 7 dec_octave note D_, 4 - note __, 3 + rest 3 note D#, 4 - note __, 3 + rest 3 note E_, 4 - note __, 2 + rest 2 note G_, 7 note E_, 4 - note __, 3 + rest 3 note G_, 4 - note __, 3 + rest 3 note G#, 4 - note __, 2 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - callchannel Branch_1efd79 - callchannel Branch_1efd91 - loopchannel 0, .MainLoop + rest 2 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_call Branch_1efd79 + sound_call Branch_1efd91 + sound_loop 0, .MainLoop Branch_1efd79: octave 2 note A_, 14 inc_octave note G_, 5 - note __, 2 + rest 2 dec_octave note A_, 6 note A_, 4 - note __, 3 + rest 3 inc_octave note G_, 5 - note __, 2 + rest 2 dec_octave inc_octave note G_, 7 note G#, 6 note A_, 4 - note __, 3 + rest 3 note G_, 5 - note __, 2 + rest 2 note C_, 13 note D_, 14 note E_, 13 - endchannel + sound_ret Branch_1efd91: octave 2 note A_, 14 inc_octave note G_, 5 - note __, 2 + rest 2 dec_octave note A_, 6 note A_, 4 - note __, 3 + rest 3 note A_, 1 - note __, 6 + rest 6 inc_octave note G_, 7 note G#, 6 note A_, 4 - note __, 3 + rest 3 dec_octave note A_, 2 - note __, 5 + rest 5 note F#, 13 note G_, 14 note G#, 13 - endchannel + sound_ret Branch_1efda8: octave 2 note A_, 14 note A_, 4 - note __, 3 + rest 3 note A_, 6 inc_octave note G_, 5 - note __, 2 + rest 2 dec_octave note E_, 4 - note __, 3 + rest 3 note G_, 7 note G#, 6 note A_, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave note C_, 13 note D_, 14 note C_, 13 - endchannel + sound_ret Branch_1efdc0: octave 2 note A_, 14 note A_, 4 - note __, 3 + rest 3 note A_, 6 inc_octave note G_, 5 - note __, 2 + rest 2 dec_octave note E_, 4 - note __, 3 + rest 3 note G_, 7 note G#, 6 note A_, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave dec_octave note F#, 13 note G_, 14 note G#, 13 - endchannel + sound_ret Branch_1efdd9: octave 2 note A_, 14 note A_, 4 - note __, 3 + rest 3 note A_, 6 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave dec_octave note E_, 4 - note __, 3 + rest 3 note G_, 7 note G#, 6 note A_, 4 - note __, 3 + rest 3 inc_octave inc_octave note C_, 5 - note __, 2 + rest 2 dec_octave dec_octave note F#, 13 note G_, 14 note G#, 13 - endchannel + sound_ret -Music_TCG2GRDuelTheme2_Ch4: - togglenoise $06 +Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) + toggle_noise 6 octave 1 - notetype 1 - note E_, 14 - note C#, 7 - note E_, 13 - note C#, 7 - note E_, 13 - note D#, 7 - note C#, 3 - note C#, 4 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C_, 7 - note C_, 6 - note C#, 14 - note C_, 4 - note C_, 4 - note C_, 5 - note C#, 14 - note C_, 7 - note C#, 6 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 7 - note C#, 7 - note C_, 13 + drum_speed 1 + drum_note 5, 14 + drum_note 2, 7 + drum_note 5, 13 + drum_note 2, 7 + drum_note 5, 13 + drum_note 4, 7 + drum_note 2, 3 + drum_note 2, 4 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 5 + drum_note 2, 14 + drum_note 1, 7 + drum_note 2, 6 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 1, 13 .MainLoop - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 13 - note C#, 7 - note C_, 7 - note E_, 13 - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C_, 7 - note C#, 6 - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note E_, 13 - note C#, 14 - note C#, 7 - note C#, 6 - note C#, 14 - note E_, 7 - note C_, 6 - note C#, 14 - note C#, 13 - note E_, 7 - note C_, 7 - note C#, 13 - note C#, 14 - note E_, 7 - note C_, 6 - note C#, 14 - note C#, 13 - note E_, 7 - note C_, 7 - note C#, 13 - note C#, 3 - note C#, 4 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note C#, 3 - note C#, 3 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 7 - note C#, 7 - note D#, 6 - note C#, 6 - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C_, 7 - note C#, 7 - note E_, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 7 - note C_, 6 - note C#, 14 - note C_, 13 - note C#, 7 - note C_, 14 - note C#, 6 - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - callchannel Branch_1effeb - callchannel Branch_1effdc - callchannel Branch_1effeb - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 15 - note D#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 14 - note E_, 7 - note C_, 6 - note C#, 14 - note C#, 13 - note D#, 7 - note C_, 7 - note E_, 13 - note C#, 14 - note E_, 13 - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note E_, 13 - note C#, 7 - note D#, 7 - note C#, 7 - note C#, 6 - note C#, 14 - note E_, 7 - note C_, 6 - note C#, 14 - note C#, 13 - note D#, 7 - note C#, 7 - note E_, 13 - note C#, 14 - note D#, 7 - note C#, 6 - note C_, 14 - note C#, 13 - note D#, 7 - note E_, 7 - note C#, 7 - note C_, 6 - note C#, 4 - note C#, 5 - note C#, 5 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - notetype 6 - note F_, 16 - notetype 1 - note __, 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 12 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 1 - note D#, 4 - note D#, 5 - note D#, 5 - note E_, 13 + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 13 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 13 + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + ;musicef 0 + drum_note 2, 7 + ;musicef 250 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 250 + drum_note 2, 6 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + ;musicef 250 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 6 + ;musicef 250 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 7 + ;musicef 250 + drum_note 2, 7 + ;musicef 252 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + ;musicef 250 + drum_note 2, 7 + ;musicef 0 + drum_note 2, 6 + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 1, 7 + drum_note 2, 6 + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 13 + drum_note 2, 14 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 14 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 2, 13 + drum_note 5, 7 + drum_note 1, 7 + drum_note 2, 13 + drum_note 2, 14 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 2, 13 + drum_note 5, 7 + drum_note 1, 7 + drum_note 2, 13 + drum_note 2, 3 + drum_note 2, 4 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 4 + ;musicef 253 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 4 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 4, 6 + drum_note 2, 6 + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 1, 13 + drum_note 2, 7 + drum_note 1, 14 + drum_note 2, 6 + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + sound_call Branch_1effeb + sound_call Branch_1effdc + sound_call Branch_1effeb + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 15 + drum_note 4, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 14 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 2, 13 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 13 + drum_note 2, 14 + drum_note 5, 13 + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 13 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 14 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 2, 13 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 13 + drum_note 2, 14 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 14 + drum_note 2, 13 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 7 + drum_note 1, 6 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 4 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_speed 6 + drum_note 6, 16 + drum_speed 1 + rest 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 1 + drum_note 4, 4 + drum_note 4, 5 + drum_note 4, 5 + drum_note 5, 13 .Loop1 - note D#, 7 - note D#, 7 - note E_, 13 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 13 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 6 - loopchannel 3, .Loop1 - note D#, 7 - note D#, 7 - note E_, 13 - note D#, 7 - note E_, 7 - note D#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 0, .MainLoop + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 13 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 13 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + sound_loop 3, .Loop1 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 13 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + ;musicef 253 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + sound_loop 0, .MainLoop Branch_1effdc: octave 1 - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note E_, 13 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - endchannel + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 13 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + sound_ret Branch_1effeb: octave 1 - note C_, 14 - note D#, 7 - note C_, 6 - note C#, 14 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 13 - note C#, 7 - note C_, 7 - note E_, 13 - endchannel - + drum_note 1, 14 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 14 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 13 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 13 + sound_ret +; 0x1efff9 diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm index 2da1d4db..1edac673 100644 --- a/crysaudio/music/TCG2/grdueltheme3.asm +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -1,357 +1,455 @@ -Music_TCG2GRDuelTheme3: - db $C0 - dw Music_TCG2GRDuelTheme3_Ch1 - db $01 - dw Music_TCG2GRDuelTheme3_Ch2 - db $02 - dw Music_TCG2GRDuelTheme3_Ch3 - db $03 - dw Music_TCG2GRDuelTheme3_Ch4 +Music_GRDuelTheme3: + channel_count 4 + channel 1, Music_GRDuelTheme3_Ch1 + channel 2, Music_GRDuelTheme3_Ch2 + channel 3, Music_GRDuelTheme3_Ch3 + channel 4, Music_GRDuelTheme3_Ch4 -Music_TCG2GRDuelTheme3_Ch2: +Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) notetype1 10 .MainLoop + ;musicf0 27 + ;musicdc 255 + ;musicf3 notetype0 1 + ;musicef 1 .Loop1 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 - loopchannel 7, .Loop1 + rest 3 + sound_loop 7, .Loop1 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave - callchannel Branch_1f672f + sound_call Branch_1f672f note B_, 13 + ;musicf0 27 + ;musicef 1 + ;musicf1 87 + ;musicf3 .Loop2 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave + ;musicf0 9 + ;musicef 254 + ;musicf1 64 octave 4 + ;musicf2 note D_, 3 note D_, 4 + ;musicf3 dec_octave - note __, 7 + rest 7 + ;musicf0 27 octave 1 note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 - loopchannel 7, .Loop2 + rest 3 + sound_loop 7, .Loop2 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave + ;musicf0 9 + ;musicef 254 + ;musicf1 64 octave 4 + ;musicf2 note D_, 3 note D_, 4 + ;musicf3 dec_octave - note __, 7 + rest 7 + ;musicf0 27 octave 1 note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave - callchannel Branch_1f672f + sound_call Branch_1f672f + ;musicf3 + ;musicf0 0 octave 3 - vibrato 58, $33 + ;musicef 2 + vibrato 58, 3, 3 note E_, 4 note F#, 3 note G_, 3 note A_, 3 note A#, 3 note B_, 4 + ;tie note B_, 14 inc_octave + ;musicf1 87 note C_, 6 note C_, 14 dec_octave note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie note E_, 14 note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 + ;musicf3 note D#, 3 note E_, 4 + ;tie note E_, 14 note F#, 6 + ;tie note F#, 14 + ;musicf2 note G_, 7 note G_, 6 + ;musicf3 note G#, 3 note A_, 4 + ;tie note A_, 14 note G_, 6 + ;tie note G_, 14 - vibrato 27, $33 + ;musicf2 + vibrato 27, 3, 3 note F#, 7 note F#, 6 note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie + note D_, 13 + ;tie + note D_, 14 + ;tie note D_, 13 note D_, 14 + ;tie note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 - note D_, 13 - note D_, 14 - note D_, 13 + ;musicf3 dec_octave note B_, 14 + ;tie note B_, 7 inc_octave + ;musicf2 note C_, 6 note C_, 14 - vibrato 52, $33 + ;musicf3 + vibrato 52, 3, 3 note F#, 3 + ;musicf2 note G_, 10 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 + ;tie note G_, 14 + ;tie note G_, 13 note G_, 14 note E_, 7 note E_, 6 + ;musicf3 note A#, 3 note B_, 11 + ;tie note B_, 7 note A_, 6 + ;tie note A_, 14 + ;musicf2 note G_, 7 note G_, 6 + ;musicf3 note G#, 3 note A_, 4 + ;tie note A_, 14 inc_octave + ;musicf2 note D_, 6 note D_, 14 dec_octave note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie note F#, 14 note F#, 13 + ;tie note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 + ;musicf3 note G_, 7 note F#, 6 note E_, 14 + ;tie note E_, 7 + ;musicf2 note C_, 6 note C_, 14 + ;musicf3 note F#, 3 note G_, 10 note E_, 14 + ;tie note E_, 7 note A#, 3 note B_, 3 + ;tie note B_, 14 + ;musicf2 note G_, 13 + ;tie + note G_, 14 + ;tie + note G_, 13 + ;tie + note G_, 14 + ;tie + note G_, 13 + ;tie note G_, 14 note G_, 13 + ;tie note G_, 14 - note G_, 13 - note G_, 14 - note G_, 13 - note G_, 14 + ;musicf3 note G_, 7 note A_, 6 note A#, 3 note B_, 4 + ;tie note B_, 14 inc_octave note D_, 6 + ;tie note D_, 14 note C_, 13 dec_octave note B_, 14 + ;tie note B_, 7 note E_, 6 + ;tie note E_, 14 note G#, 3 + ;musicf2 note A_, 10 + ;tie note A_, 14 + ;tie note A_, 13 + ;tie note A_, 14 + ;tie note A_, 13 note A_, 14 note G_, 7 @@ -359,19 +457,29 @@ Music_TCG2GRDuelTheme3_Ch2: note A_, 7 note A_, 13 note F#, 14 + ;tie note F#, 13 note F#, 14 note F#, 13 + ;tie note F#, 14 note F#, 13 + ;musicf3 note F#, 3 + ;musicf2 note G_, 11 + ;tie note G_, 13 + ;tie + note G_, 14 + ;tie + note G_, 13 + ;tie note G_, 14 note G_, 13 - note G_, 14 - note G_, 13 + ;musicf3 note F#, 14 + ;musicf2 note G_, 7 note G_, 6 note A_, 7 @@ -379,1239 +487,1555 @@ Music_TCG2GRDuelTheme3_Ch2: note B_, 7 note B_, 6 note F#, 14 + ;tie note F#, 13 note F#, 14 note F#, 13 + ;tie note F#, 14 note F#, 13 + ;musicf3 note F#, 3 + ;musicf2 note G_, 11 + ;tie + note G_, 13 + ;tie + note G_, 14 + ;tie + note G_, 13 + ;tie + note G_, 14 + ;tie + note G_, 13 + ;tie + note G_, 14 + ;tie note G_, 13 note G_, 14 + ;tie note G_, 13 - note G_, 14 - note G_, 13 - note G_, 14 - note G_, 13 - note G_, 14 - note G_, 13 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f672f: + ;musicf0 0 + ;musicef 2 + ;musicf1 87 + ;musicf3 octave 3 note E_, 3 note F_, 3 - vibrato 40, $33 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 + vibrato 40, 3, 3 + ;musicf2 + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie note F#, 14 note F#, 13 + ;musicf3 note F_, 3 note F#, 11 + ;tie note F#, 7 + ;musicf2 note D_, 6 note D_, 14 dec_octave + ;musicf3 note B_, 13 inc_octave note D#, 3 + ;musicf2 note E_, 11 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie note E_, 13 note E_, 14 + ;tie note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 + ;musicf3 note F_, 3 + ;musicf2 note F#, 11 + ;tie note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie + note F#, 14 + ;tie + note F#, 13 + ;tie note F#, 14 note F#, 13 + ;musicf3 note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 - note F#, 13 - note F#, 14 + ;tie note F#, 7 note G_, 13 + ;tie note G_, 7 + ;musicf2 note A_, 7 note A_, 6 + ;musicf3 note F_, 3 + ;musicf2 note F#, 11 + ;tie note F#, 13 note F#, 14 - vibrato 28, $33 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 + vibrato 28, 3, 3 + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie note E_, 13 note E_, 14 + ;tie note E_, 13 + ;musicf3 note D#, 3 + ;musicf2 note E_, 11 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie note E_, 13 note E_, 14 - note E_, 13 - note E_, 14 + ;musicf3 note F#, 13 note F#, 7 note G_, 14 note G_, 6 + ;musicf3 note G#, 3 + ;musicf2 note A_, 11 note A_, 7 + ;musicf3 note G_, 6 + ;tie note G_, 14 + ;musicf2 note F#, 7 note F#, 6 note E_, 14 note E_, 7 + ;musicf3 note F#, 6 + ;tie note F#, 14 dec_octave + ;musicf2 note B_, 7 note B_, 6 inc_octave note D_, 14 + ;tie note D_, 13 note D_, 14 + ;musicf3 note F_, 3 + ;musicf2 note F#, 10 + ;tie note F#, 14 note F#, 13 dec_octave note B_, 14 + ;tie + note B_, 13 + ;tie + note B_, 14 + ;tie + note B_, 13 + ;tie + note B_, 14 + ;tie + note B_, 13 + ;tie + note B_, 14 + ;tie note B_, 13 note B_, 14 + ;tie note B_, 13 - note B_, 14 - note B_, 13 - note B_, 14 - note B_, 13 - note B_, 14 - note B_, 13 + ;musicf3 inc_octave note D#, 3 - vibrato 11, $33 + vibrato 11, 3, 3 + ;musicf2 note E_, 11 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 note E_, 14 note F#, 13 note F#, 7 note G_, 14 note G_, 6 + ;musicf3 note G#, 3 + ;musicf2 note A_, 11 + ;tie note A_, 13 note A_, 14 + ;musicf3 note A#, 3 note B_, 10 + ;tie note B_, 14 + ;tie note B_, 13 + ;musicf2 note G_, 14 note G_, 13 + ;musicf3 note G#, 3 + ;musicf2 note A_, 11 + ;tie note A_, 13 note A_, 14 + ;musicf3 note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;musicf2 note G_, 14 note G_, 13 + ;musicf3 note G#, 3 + ;musicf2 note A_, 11 + ;tie note A_, 13 + ;tie note A_, 14 note A_, 13 note B_, 14 + ;tie note B_, 13 + ;tie note B_, 14 - endchannel + sound_ret -Music_TCG2GRDuelTheme3_Ch1: +Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) notetype1 10 .MainLoop + ;musicf0 27 + ;musicef 255 + ;musicdc 255 notetype0 1 + ;musicf1 80 .Loop1 octave 2 note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 - note __, 3 - note __, 3 + rest 4 + rest 3 + rest 3 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave - note __, 3 - note __, 3 - loopchannel 7, .Loop1 + rest 3 + rest 3 + sound_loop 7, .Loop1 octave 2 note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 - note __, 3 - note __, 3 + rest 4 + rest 3 + rest 3 dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave + ;musicf3 octave 1 + ;musicef 1 note G_, 3 - note __, 3 + rest 3 .Loop2 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 - loopchannel 2, .Loop2 + rest 3 + sound_loop 2, .Loop2 .Loop3 octave 3 note C#, 3 - note __, 4 + rest 4 dec_octave note C#, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C#, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note C#, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C#, 3 - note __, 3 - loopchannel 2, .Loop3 + rest 3 + sound_loop 2, .Loop3 .Loop4 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 - loopchannel 2, .Loop4 + rest 3 + sound_loop 2, .Loop4 .Loop5 octave 3 note C#, 3 - note __, 4 + rest 4 dec_octave note C#, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C#, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note C#, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C#, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C#, 3 - note __, 3 - loopchannel 2, .Loop5 + rest 3 + sound_loop 2, .Loop5 .Loop6 octave 3 note C_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 - loopchannel 2, .Loop6 + rest 3 + sound_loop 2, .Loop6 .Loop7 octave 3 note D_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 + rest 3 inc_octave inc_octave note E_, 3 - note __, 4 + rest 4 dec_octave dec_octave note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 dec_octave note B_, 3 - note __, 3 - loopchannel 2, .Loop7 + rest 3 + sound_loop 2, .Loop7 octave 3 note C_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note D#, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note D#, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note D#, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note D#, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note D#, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note D#, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note D#, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note C_, 3 - note __, 4 + rest 4 note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 3 + rest 3 dec_octave note E_, 3 - note __, 4 + rest 4 inc_octave note C_, 3 - note __, 4 + rest 4 dec_octave note E_, 3 - note __, 4 + rest 4 note C_, 3 - note __, 3 + rest 3 note B_, 3 - note __, 4 + rest 4 note B_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 note B_, 3 - note __, 4 + rest 4 note G_, 3 - note __, 4 + rest 4 note A_, 3 - note __, 4 + rest 4 note F#, 3 - note __, 3 + rest 3 .Loop8 + ;musicf0 27 + ;musicf1 96 octave 2 note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave + ;musicf0 9 + ;musicef 254 + ;musicf1 64 + ;musicf2 octave 3 note B_, 3 note B_, 4 - note __, 13 + ;musicf0 27 + rest 13 octave 2 + ;musicf2 note B_, 3 - note __, 4 + rest 4 inc_octave note E_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave - note __, 3 - note __, 3 - loopchannel 7, .Loop8 + rest 3 + rest 3 + sound_loop 7, .Loop8 + ;musicf0 27 + ;musicf1 96 octave 2 note A_, 3 - note __, 4 + rest 4 inc_octave note D_, 3 - note __, 4 - note __, 3 - note __, 4 + rest 4 + rest 3 + rest 4 dec_octave note A_, 3 - note __, 3 + rest 3 inc_octave note D_, 3 - note __, 4 + rest 4 dec_octave + ;musicf0 9 + ;musicef 254 + ;musicf1 64 + ;musicf2 octave 3 note B_, 3 note B_, 4 - note __, 13 + ;musicf0 27 + rest 13 octave 2 + ;musicf2 note B_, 3 - note __, 4 + rest 4 + ;musicf0 9 + ;musicf3 octave 2 note A_, 7 + ;musicf2 note A#, 4 note A#, 3 note B_, 4 note B_, 2 + ;musicf3 inc_octave note D_, 7 dec_octave + ;musicf2 note B_, 4 note B_, 3 note A_, 4 note A_, 3 + ;musicf3 + ;musicf0 27 octave 1 note B_, 3 - note __, 3 + rest 3 octave 3 - vibrato 0, $33 + ;musicf0 26 + ;musicef 1 + ;musicf3 + vibrato 0, 3, 3 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 12 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 - note __, 13 + rest 13 note D_, 14 + ;tie note D_, 4 - note __, 3 + rest 3 dec_octave note B_, 6 - note __, 14 + rest 14 note G_, 13 inc_octave note C#, 16 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 16 + ;tie note C#, 12 + ;tie note C#, 14 + ;tie note C#, 13 + ;tie note C#, 14 + ;tie note C#, 13 - note __, 7 - callchannel Branch_1f6dd9 + rest 7 + sound_call Branch_1f6dd9 octave 3 - vibrato 0, $33 + ;musicf3 + vibrato 0, 3, 3 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 12 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 - note __, 13 + rest 13 note D_, 14 + ;tie note D_, 4 - note __, 3 + rest 3 note D_, 6 + ;tie note D_, 11 - note __, 3 + rest 3 note D_, 13 note C#, 14 + ;tie note C#, 13 - note __, 14 + rest 14 note C#, 13 + ;tie note C#, 14 + ;tie note C#, 13 + ;tie note C#, 14 + ;tie note C#, 13 + ;tie note C#, 14 + ;tie note C#, 13 + ;tie note C#, 14 + ;tie note C#, 13 - note __, 7 - callchannel Branch_1f6dd9 + rest 7 + sound_call Branch_1f6dd9 octave 3 note C_, 14 + ;tie note C_, 13 + ;tie note C_, 14 + ;tie note C_, 14 - note __, 14 + rest 14 note C_, 13 - note __, 7 + rest 7 note C_, 14 - note __, 6 + rest 6 note C_, 14 - note __, 7 + rest 7 note C_, 6 + ;tie note C_, 11 - note __, 3 + rest 3 note C_, 7 - note __, 6 + rest 6 note C_, 14 - note __, 7 + rest 7 note C_, 16 - note __, 4 + rest 4 dec_octave note G_, 7 - note __, 6 + rest 6 note B_, 14 + ;tie note B_, 13 - note __, 14 + rest 14 inc_octave note D_, 13 + ;tie note D_, 14 - note __, 13 + rest 13 dec_octave note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 - note __, 7 - callchannel Branch_1f6df4 + rest 7 + sound_call Branch_1f6df4 octave 3 note C_, 14 + ;tie note C_, 13 + ;tie note C_, 14 + ;tie note C_, 13 - note __, 14 + rest 14 note D_, 13 - note __, 7 + rest 7 note E_, 13 - note __, 6 + rest 6 note D#, 14 + ;tie note D#, 13 - note __, 14 + rest 14 note G_, 13 + ;tie note G_, 14 + ;tie note G_, 12 - note __, 1 + rest 1 note D#, 14 - note __, 13 + rest 13 note E_, 14 + ;tie note E_, 13 - note __, 14 + rest 14 dec_octave note B_, 13 + ;tie note B_, 14 + ;tie note B_, 13 inc_octave note E_, 14 - note __, 13 + rest 13 note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 - note __, 13 + rest 13 note D#, 7 + ;musicf0 9 + ;musicef 255 octave 2 note A_, 3 - note __, 4 + rest 4 inc_octave note C_, 4 - note __, 3 + rest 3 note D#, 3 - note __, 3 + rest 3 note F#, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 4 - note __, 3 + rest 3 note D#, 3 - note __, 3 + rest 3 + ;musicf0 26 octave 3 note G_, 14 + ;tie note G_, 7 note A_, 6 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - callchannel Branch_1f6dbf + rest 3 + ;musicec 0 + sound_call Branch_1f6dbf + ;musicf0 26 octave 3 note C_, 7 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 3 note C#, 3 note D_, 11 dec_octave note B_, 13 + ;musicf0 26 octave 3 note C_, 14 + ;tie note C_, 13 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - callchannel Branch_1f6dbf + rest 3 + ;musicec 0 + sound_call Branch_1f6dbf + ;musicf0 26 octave 3 note C_, 7 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 + ;musicf0 26 octave 3 note D_, 6 + ;musicf0 28 octave 2 note A_, 14 note B_, 13 + ;musicf0 26 octave 3 note F#, 14 + ;tie note F#, 7 note E_, 6 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - callchannel Branch_1f6dbf + rest 3 + ;musicec 2 + sound_call Branch_1f6dbf + ;musicf0 26 octave 3 dec_octave note A_, 7 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 3 note F#, 3 note G_, 11 note F#, 13 + ;musicf0 26 octave 3 dec_octave note A_, 14 + ;tie note A_, 13 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - callchannel Branch_1f6dbf - note __, 7 + rest 3 + ;musicec 2 + sound_call Branch_1f6dbf + rest 7 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 3 note F#, 4 note G_, 5 note F#, 5 note D_, 13 + ;musicf0 26 octave 3 dec_octave note G_, 14 + ;tie note G_, 7 note A_, 6 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - callchannel Branch_1f6dbf + rest 3 + ;musicec 0 + sound_call Branch_1f6dbf + ;musicf0 26 octave 3 note E_, 7 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 3 note C#, 3 note D_, 11 dec_octave note B_, 13 + ;musicf0 26 octave 3 note E_, 14 + ;tie note E_, 13 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - callchannel Branch_1f6dbf + rest 3 + ;musicec 0 + sound_call Branch_1f6dbf + ;musicf0 26 octave 3 note G_, 7 + ;musicf0 28 octave 2 note B_, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 + ;musicf0 26 octave 3 note F#, 6 + ;musicf0 28 octave 2 note A_, 14 note B_, 13 + ;tie + ;musicf0 26 octave 3 note D_, 14 + ;tie note D_, 7 note C_, 6 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - callchannel Branch_1f6dbf + rest 3 + ;musicec 2 + sound_call Branch_1f6dbf + ;musicf0 26 octave 3 note C_, 7 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 3 note F#, 3 note G_, 11 note F#, 13 + ;musicf0 26 octave 3 note D_, 14 + ;tie note D_, 13 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - callchannel Branch_1f6dbf - note __, 7 + rest 3 + ;musicec 2 + sound_call Branch_1f6dbf + rest 7 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 3 note F#, 4 note G_, 5 note F#, 5 + ;musicf0 26 octave 3 note E_, 7 note D#, 6 + ;musicf0 26 octave 3 note C_, 14 + ;tie note C_, 7 dec_octave note A_, 6 + ;musicf0 28 octave 3 note C_, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 + ;musicf0 26 octave 3 note E_, 13 note C_, 7 + ;musicf0 28 octave 3 note C_, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 + ;musicf0 26 octave 3 note G_, 6 + ;musicf0 28 octave 2 note B_, 3 inc_octave note C_, 11 dec_octave note A_, 13 + ;musicf0 26 octave 3 note E_, 14 + ;tie note E_, 13 + ;musicf0 28 octave 3 note E_, 4 - note __, 10 - note __, 13 - note __, 7 + rest 10 + rest 13 + rest 7 + ;musicf0 28 octave 3 note E_, 4 - note __, 3 - note __, 13 + rest 3 + rest 13 + ;musicf0 28 octave 2 note B_, 3 inc_octave note C_, 11 dec_octave note A_, 13 + ;musicf0 26 octave 3 note G_, 14 + ;tie note G_, 7 note A_, 6 + ;musicf0 28 octave 3 note G_, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 + ;musicf0 26 octave 3 note A_, 13 note G_, 7 + ;musicf0 28 octave 3 note G_, 4 - note __, 3 - note __, 7 + rest 3 + rest 7 + ;musicf0 26 octave 3 note C_, 6 + ;musicf0 28 octave 2 note B_, 3 inc_octave note C_, 11 dec_octave note A_, 13 + ;musicf0 26 octave 3 note F#, 14 + ;tie note F#, 13 + ;musicf0 28 octave 2 note F#, 4 - note __, 10 - note __, 13 - note __, 7 + rest 10 + rest 13 + rest 7 + ;musicf0 28 octave 3 note F#, 4 - note __, 3 + rest 3 + ;musicf0 26 octave 3 note E_, 7 - note __, 6 - note __, 7 + rest 6 + rest 7 note F#, 7 - note __, 13 + rest 13 + ;musicef 2 + ;musicf1 54 note D_, 14 + ;tie note D_, 13 note D_, 14 note D_, 13 + ;tie note D_, 14 note D_, 13 note E_, 14 + ;tie note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie note E_, 14 note E_, 13 - note E_, 14 - note E_, 13 + ;musicf3 note D_, 14 + ;musicf2 note E_, 7 note E_, 6 note F#, 7 @@ -1619,124 +2043,182 @@ Music_TCG2GRDuelTheme3_Ch1: note G_, 7 note G_, 6 note D_, 14 + ;tie note D_, 13 note D_, 14 note D_, 13 + ;tie note D_, 14 note D_, 13 note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie + note E_, 13 + ;tie + note E_, 14 + ;tie note E_, 13 note E_, 14 + ;tie note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - note E_, 14 - note E_, 13 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f6dbf: octave 3 + ;musicf0 12 note G_, 4 + ;musicef 251 note G_, 3 + ;musicef 5 inc_octave note G_, 4 + ;musicef 251 note G_, 3 + ;musicef 5 dec_octave note G_, 3 + ;musicef 251 note G_, 3 - endchannel + ;musicef 5 + ;musicec 0 + sound_ret Branch_1f6dd9: + ;musicf0 9 octave 2 note C#, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 inc_octave note C#, 4 - note __, 2 + rest 2 dec_octave note E_, 4 - note __, 3 + rest 3 inc_octave note C#, 4 - note __, 3 + rest 3 dec_octave note E_, 4 - note __, 3 + rest 3 note C#, 3 - note __, 3 - endchannel + rest 3 + ;musicf0 26 + ;musicf3 + ;musicef 2 + sound_ret Branch_1f6df4: + ;musicf0 9 octave 1 note B_, 4 - note __, 3 + rest 3 inc_octave note E_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 2 + rest 2 dec_octave note E_, 4 - note __, 3 + rest 3 inc_octave note D_, 4 - note __, 3 + rest 3 dec_octave note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 3 - note __, 3 - endchannel + rest 3 + ;musicf0 26 + ;musicf3 + ;musicef 2 + sound_ret -Music_TCG2GRDuelTheme3_Ch3: +Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) notetype1 10 notetype2 11 + ;musicdc 255 notetype0 1 notetype1 1 + ;musice9 96 .MainLoop octave 3 - vibrato 48, $33 + ;musicec 244 + ;vibrato_type 16 + vibrato 48, 3, 3 .Loop1 note D_, 14 + ;tie note D_, 7 + ;tie note E_, 6 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 7 notetype1 3 note E_, 6 notetype1 1 - loopchannel 3, .Loop1 + sound_loop 3, .Loop1 note D_, 14 + ;tie note D_, 7 + ;tie note E_, 6 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 notetype1 3 note E_, 7 @@ -1754,37 +2236,65 @@ Music_TCG2GRDuelTheme3_Ch3: note G_, 6 .Loop2 note D_, 14 + ;tie note D_, 7 + ;tie note E_, 6 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 7 notetype1 3 note E_, 6 notetype1 1 note D_, 14 + ;tie note D_, 7 + ;tie note E_, 6 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 notetype1 3 note E_, 7 @@ -1798,41 +2308,66 @@ Music_TCG2GRDuelTheme3_Ch3: note G_, 7 note A_, 7 note F#, 3 - note __, 3 - loopchannel 3, .Loop2 + rest 3 + sound_loop 3, .Loop2 note D_, 14 + ;tie note D_, 7 + ;tie note E_, 6 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 + ;tie note E_, 14 + ;tie note E_, 13 - vibrato 0, $33 + vibrato 0, 3, 3 note F_, 14 + ;tie note F_, 13 + ;tie note F_, 14 + ;tie note F_, 13 + ;tie note F_, 14 + ;tie note F_, 13 + ;tie note F_, 14 + ;tie note F_, 7 notetype1 3 note F_, 6 notetype1 1 - vibrato 48, $33 + vibrato 48, 3, 3 note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 + ;tie note F#, 14 + ;tie note F#, 13 note B_, 14 + ;tie note B_, 13 + ;tie note B_, 14 + ;tie note B_, 13 notetype1 3 note B_, 7 @@ -1846,109 +2381,125 @@ Music_TCG2GRDuelTheme3_Ch3: note G_, 7 note A_, 7 note F#, 3 - note __, 3 + rest 3 .Loop3 note D_, 14 + ;tie note D_, 7 + ;musice8 4 note E_, 6 + ;musice8 8 note E_, 3 - note __, 4 + rest 4 inc_octave inc_octave inc_octave + ;musice9 64 + ;musice8 4 note E_, 7 + ;musice8 8 + ;musice9 96 dec_octave dec_octave note D_, 5 - note __, 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note E_, 4 - note __, 3 + rest 3 note E_, 2 - note __, 5 + rest 5 dec_octave note B_, 4 - note __, 3 + rest 3 note B_, 1 - note __, 5 + rest 5 inc_octave note D_, 7 note E_, 7 dec_octave note D_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note D_, 14 + ;tie note D_, 7 + ;musice8 4 note E_, 6 + ;musice8 8 note E_, 3 - note __, 4 + rest 4 inc_octave inc_octave inc_octave + ;musice9 64 + ;musice8 4 note E_, 7 + ;musice8 8 + ;musice9 96 dec_octave dec_octave note D_, 5 - note __, 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note E_, 4 - note __, 3 + rest 3 note E_, 2 - note __, 5 + rest 5 dec_octave note B_, 4 - note __, 3 + rest 3 note B_, 1 - note __, 5 + rest 5 inc_octave note D_, 7 dec_octave note B_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 note G_, 3 - note __, 3 - loopchannel 4, .Loop3 + rest 3 + sound_loop 4, .Loop3 note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note D#, 13 note E_, 14 + ;tie note E_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave @@ -1957,87 +2508,91 @@ Music_TCG2GRDuelTheme3_Ch3: note B_, 13 inc_octave note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note D#, 13 note E_, 14 + ;tie note E_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note B_, 7 inc_octave note D_, 4 - note __, 3 + rest 3 dec_octave note A_, 4 - note __, 2 + rest 2 note B_, 7 note G_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 note F#, 4 - note __, 2 + rest 2 note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note D#, 13 note E_, 14 + ;tie note E_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave @@ -2046,34 +2601,35 @@ Music_TCG2GRDuelTheme3_Ch3: note B_, 13 inc_octave note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note D#, 13 note E_, 14 - note __, 7 + rest 7 note E_, 6 - note __, 7 + rest 7 note B_, 7 inc_octave note D_, 7 note E_, 6 - note __, 7 + rest 7 dec_octave note B_, 7 inc_octave @@ -2084,42 +2640,44 @@ Music_TCG2GRDuelTheme3_Ch3: note G_, 7 note A_, 7 note F#, 3 - note __, 3 + rest 3 note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note D#, 13 note E_, 14 + ;tie note E_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave @@ -2128,122 +2686,129 @@ Music_TCG2GRDuelTheme3_Ch3: note B_, 13 inc_octave note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note D#, 13 note E_, 14 + ;tie note E_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 4 + rest 4 note B_, 7 inc_octave note D_, 4 - note __, 3 + rest 3 dec_octave note A_, 4 - note __, 2 + rest 2 note B_, 7 note G_, 4 - note __, 3 + rest 3 note A_, 4 - note __, 3 + rest 3 note F#, 4 - note __, 2 + rest 2 note D_, 14 + ;tie note D_, 7 note E_, 6 inc_octave note E_, 2 - note __, 12 + rest 12 dec_octave note B_, 4 - note __, 3 + rest 3 note E_, 3 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 note E_, 4 - note __, 3 + rest 3 dec_octave note B_, 13 inc_octave note D_, 14 note E_, 13 note F_, 14 + ;tie note F_, 7 note F_, 6 inc_octave note F_, 2 - note __, 12 + rest 12 note C_, 4 - note __, 3 + rest 3 dec_octave note F_, 3 - note __, 3 + rest 3 note F_, 4 - note __, 3 + rest 3 note F_, 4 - note __, 3 + rest 3 note C_, 13 note D#, 14 note F_, 13 note F#, 14 + ;tie note F#, 7 note F#, 6 inc_octave note F#, 2 - note __, 12 + rest 12 note C#, 4 - note __, 3 + rest 3 dec_octave note F#, 3 - note __, 3 + rest 3 note F#, 4 - note __, 3 + rest 3 note F#, 4 - note __, 3 + rest 3 note C#, 13 note E_, 14 note C#, 13 note B_, 14 + ;tie note B_, 7 note B_, 6 inc_octave note B_, 1 - note __, 13 + rest 13 note F#, 4 - note __, 3 + rest 3 dec_octave note B_, 3 - note __, 3 + rest 3 note B_, 4 - note __, 3 + rest 3 inc_octave + ;musice8 4 note F#, 7 note A_, 7 inc_octave @@ -2253,1402 +2818,1478 @@ Music_TCG2GRDuelTheme3_Ch3: note A_, 7 inc_octave note C_, 6 + ;musice8 8 octave 3 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 4 - note __, 3 + rest 3 note B_, 7 note G_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 7 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 14 dec_octave note G_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 4 - note __, 3 + rest 3 note B_, 7 note G_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 7 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 14 dec_octave note G_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note C_, 3 - note __, 3 + rest 3 note B_, 14 note A_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note C_, 3 - note __, 3 + rest 3 note G_, 14 note A_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 4 - note __, 3 + rest 3 note B_, 7 note G_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 7 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 14 dec_octave note G_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 4 - note __, 3 + rest 3 note B_, 6 note G_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 note G_, 7 + ;musice8 8 dec_octave note G_, 7 note C_, 3 - note __, 3 + rest 3 inc_octave note C_, 14 dec_octave note G_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note C_, 3 - note __, 3 + rest 3 note B_, 14 note A_, 13 note C_, 14 note C_, 2 - note __, 5 + rest 5 note C_, 6 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note C_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note C_, 3 - note __, 3 + rest 3 note G_, 14 note A_, 13 note D_, 14 note D_, 2 - note __, 5 + rest 5 note D_, 6 inc_octave + ;musice8 4 note A_, 7 + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note D_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 note A_, 7 + ;musice8 8 dec_octave note A_, 7 note F_, 3 - note __, 3 + rest 3 note C_, 14 note C#, 13 note D_, 14 note D_, 2 - note __, 5 + rest 5 note D_, 6 inc_octave + ;musice8 4 inc_octave note C_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note D_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note C_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note F_, 3 - note __, 3 + rest 3 note D_, 14 note D_, 13 note D_, 14 note D_, 2 - note __, 5 + rest 5 note D_, 6 inc_octave + ;musice8 4 inc_octave note C_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note D_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note C_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note F_, 3 - note __, 3 + rest 3 note C_, 14 note C#, 13 note D_, 14 note D_, 2 - note __, 5 + rest 5 note D_, 6 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 4 - note __, 3 + rest 3 inc_octave note C_, 7 dec_octave note A_, 4 - note __, 2 + rest 2 note D_, 3 - note __, 4 + rest 4 inc_octave + ;musice8 4 inc_octave note D_, 7 dec_octave + ;musice8 8 dec_octave note A_, 7 note F_, 3 - note __, 3 + rest 3 note D_, 14 note D_, 13 - callchannel Branch_1f72b7 + sound_call Branch_1f72b7 + ;musice8 8 note D_, 14 + ;musice8 5 note D_, 7 + ;musice8 6 note D_, 6 + ;musice8 8 note D_, 7 inc_octave + ;musice8 6 note D_, 7 note C_, 7 + ;musice8 6 note D_, 6 dec_octave + ;musice8 8 note A_, 7 + ;musice8 6 note E_, 7 note C_, 7 + ;musice8 7 note C#, 6 + ;musice8 8 note D_, 14 + ;musice8 5 note A_, 13 inc_octave note C_, 14 note D_, 13 - callchannel Branch_1f72b7 + sound_call Branch_1f72b7 note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 + ;tie note D_, 14 + ;tie note D_, 13 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f72b7: octave 3 + ;musice8 8 note E_, 7 inc_octave + ;musice8 5 note E_, 7 note D_, 7 note E_, 6 dec_octave note B_, 7 note D_, 7 + ;musice8 8 note E_, 7 + ;musice8 6 inc_octave note E_, 6 + ;musice8 5 note D_, 7 note E_, 7 dec_octave note B_, 7 + ;musice8 6 note E_, 6 - endchannel + sound_ret -Music_TCG2GRDuelTheme3_Ch4: - togglenoise $06 +Music_GRDuelTheme3_Ch4: ; 1f72d5 (7d:72d5) + toggle_noise 6 .MainLoop - notetype 1 + drum_speed 1 octave 1 - note D#, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note D#, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note C_, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note C_, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note D#, 6 - note C_, 7 - note E_, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note D#, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note D#, 7 - note C#, 7 - note E_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note C_, 7 - note C_, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 3 - note C#, 3 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note D#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 3 - note C#, 3 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 3 - note C#, 3 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C_, 7 - note D#, 7 - note D#, 6 - note D#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note E_, 6 - note D#, 7 - note C#, 4 - note C#, 3 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note E_, 7 - note C#, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note C_, 7 - note D#, 6 - note C#, 7 - note C_, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note D#, 7 - note C#, 3 - note C#, 3 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note C#, 6 - note E_, 7 - note C_, 7 - note C#, 7 - note D#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C_, 6 - note C_, 7 - note D#, 7 - note D#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note D#, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C#, 7 - note C#, 6 - note C_, 7 - note C#, 7 - note E_, 7 - note C_, 6 - note C#, 7 - note D#, 7 - note C_, 7 - note C#, 6 - note E_, 7 - note C_, 7 - note C#, 7 - note D#, 6 - notetype 9 - note F_, 9 - notetype 1 - note C_, 7 - note C#, 7 - note C#, 7 - note C#, 6 - note C#, 7 - note C#, 7 - note C#, 7 - note C#, 6 - loopchannel 0, .MainLoop - + ;musicdc 255 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 5, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 6 + drum_note 4, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 6 + drum_note 4, 7 + drum_note 2, 4 + drum_note 2, 3 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 2, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 5, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 4, 6 + drum_note 2, 7 + drum_note 1, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 3 + drum_note 2, 3 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 2, 6 + drum_note 5, 7 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 6 + drum_note 1, 7 + drum_note 4, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 1, 7 + drum_note 2, 7 + drum_note 5, 7 + drum_note 1, 6 + drum_note 2, 7 + drum_note 4, 7 + drum_note 1, 7 + drum_note 2, 6 + drum_note 5, 7 + drum_note 1, 7 + drum_note 2, 7 + drum_note 4, 6 + drum_speed 9 + drum_note 6, 9 + drum_speed 1 + drum_note 1, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 6 + sound_loop 0, .MainLoop +; 0x1f76dc diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index 4974cd3e..46954b4d 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -1,22 +1,21 @@ -Music_TCG2GROverworld: - db $C0 - dw Music_TCG2GROverworld_Ch1 - db $01 - dw Music_TCG2GROverworld_Ch2 - db $02 - dw Music_TCG2GROverworld_Ch3 - db $03 - dw Music_TCG2GROverworld_Ch4 +Music_GROverworld: + channel_count 4 + channel 1, Music_GROverworld_Ch1 + channel 2, Music_GROverworld_Ch2 + channel 3, Music_GROverworld_Ch3 + channel 4, Music_GROverworld_Ch4 -Music_TCG2GROverworld_Ch2: +Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) notetype1 10 .MainLoop - callchannel Branch_1eae1e + sound_call Branch_1eae1e note A#, 16 + ;tie note A#, 9 note A#, 8 inc_octave note D_, 16 + ;tie note D_, 9 note D_, 8 note C_, 16 @@ -28,13 +27,17 @@ Music_TCG2GROverworld_Ch2: note F_, 6 notetype0 11 note G_, 12 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 2 + ;musicf1 70 + ;musicf2 note B_, 9 note B_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note B_, 6 note B_, 2 note B_, 6 @@ -43,14 +46,16 @@ Music_TCG2GROverworld_Ch2: note B_, 11 note B_, 10 note B_, 6 - note __, 16 - note __, 1 - callchannel Branch_1eae1e + rest 16 + rest 1 + sound_call Branch_1eae1e note A#, 16 + ;tie note A#, 9 note A#, 8 inc_octave note D_, 16 + ;tie note D_, 9 note D_, 8 note C_, 16 @@ -61,30 +66,48 @@ Music_TCG2GROverworld_Ch2: inc_octave note C_, 16 note C_, 6 + ;musicf1 103 + ;musicf2 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 12 + ;tie note D_, 8 note D_, 16 + ;musicf0 14 + ;musicf1 70 + ;musicef 2 + ;musicf2 octave 3 note D_, 4 note D_, 4 note F_, 5 note F_, 3 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 3 note G_, 16 note A_, 7 note G_, 8 + ;tie note A_, 8 - note __, 2 + rest 2 note A#, 5 note A#, 3 note A_, 8 @@ -96,14 +119,18 @@ Music_TCG2GROverworld_Ch2: note F_, 5 note A_, 3 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 3 note D_, 16 note C_, 7 note D_, 8 + ;tie note C_, 8 - note __, 2 + rest 2 dec_octave note A#, 5 note A#, 3 @@ -111,14 +138,19 @@ Music_TCG2GROverworld_Ch2: note C_, 7 dec_octave note A#, 8 + ;tie inc_octave note C_, 8 - note __, 2 + rest 2 note F_, 5 note F_, 3 note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;musicf1 54 + ;musicf2 note D#, 8 note D#, 8 dec_octave @@ -127,6 +159,8 @@ Music_TCG2GROverworld_Ch2: inc_octave note D#, 8 note D#, 8 + ;musicf1 86 + ;musicf2 note D_, 8 note D_, 1 note D#, 7 @@ -136,39 +170,59 @@ Music_TCG2GROverworld_Ch2: note C_, 5 note D_, 3 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 3 note D_, 16 + ;musicf1 160 + ;musicf2 note D#, 16 note D#, 1 note F_, 15 note F_, 1 + ;musicf1 86 + ;musicf2 note G_, 7 note F_, 8 + ;tie note G_, 8 inc_octave - note __, 2 + rest 2 note D_, 5 note D_, 3 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 3 note D_, 16 note C_, 9 note D_, 8 note D_, 8 note C_, 8 + ;musicf1 86 + ;musicf2 note F_, 6 note D_, 5 + ;musicf3 note C_, 11 note D_, 11 dec_octave + ;musicf1 86 + ;musicf2 note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 + ;tie note A_, 16 + ;tie note A_, 2 note A_, 16 note G_, 5 @@ -176,7 +230,9 @@ Music_TCG2GROverworld_Ch2: note F_, 5 note G_, 3 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 2 note G_, 16 note D_, 8 @@ -187,6 +243,7 @@ Music_TCG2GROverworld_Ch2: note A_, 6 note A#, 16 note A#, 6 + ;musicf3 notetype0 11 note A#, 6 note A_, 6 @@ -194,25 +251,37 @@ Music_TCG2GROverworld_Ch2: notetype0 1 notetype0 11 note F_, 3 + ;tie notetype0 1 note F_, 1 + ;tie note F_, 16 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1eae1e: + ;musicf0 13 octave 3 notetype0 1 - vibrato 33, $33 + ;musicdc 17 + vibrato 33, 3, 3 + ;musicef 1 + ;musicf1 48 + ;musicf2 octave 3 note D_, 5 note D_, 3 note E_, 5 note E_, 3 note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;tie note F_, 3 note F_, 16 note E_, 5 @@ -225,15 +294,20 @@ Branch_1eae1e: note D_, 3 note D_, 7 note E_, 8 + ;tie note D_, 8 - note __, 2 + rest 2 dec_octave note G_, 5 note G_, 3 note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 3 note G_, 16 note G_, 5 @@ -241,31 +315,39 @@ Branch_1eae1e: note G_, 5 note G_, 3 note F_, 16 + ;tie note F_, 9 note F_, 8 note A_, 16 + ;tie note A_, 9 note A_, 8 inc_octave note C_, 16 + ;tie note C_, 9 note C_, 8 note E_, 16 + ;tie note E_, 9 note E_, 8 note D_, 7 note D_, 8 - note __, 8 - note __, 2 + rest 8 + rest 2 dec_octave note G_, 5 inc_octave note D_, 3 dec_octave note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 16 + ;tie note G_, 3 note G_, 16 inc_octave @@ -274,10 +356,15 @@ Branch_1eae1e: note E_, 5 note D_, 3 note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;tie note F_, 16 + ;tie note F_, 3 note F_, 16 note E_, 5 @@ -290,36 +377,45 @@ Branch_1eae1e: note D_, 3 note D_, 7 note E_, 8 + ;tie note D_, 8 - note __, 2 + rest 2 dec_octave note G_, 5 note G_, 3 note G_, 16 + ;tie + note G_, 16 + ;tie + note G_, 16 + ;tie note G_, 16 note G_, 16 - note G_, 16 - note G_, 16 + ;tie note G_, 3 note G_, 5 note G_, 3 note A_, 5 note G_, 3 - endchannel + sound_ret -Music_TCG2GROverworld_Ch1: +Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) notetype1 10 notetype0 1 - note __, 16 + rest 16 .MainLoop + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 + ;musicf2 note C_, 9 note C_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note C_, 6 note C_, 2 note C_, 6 @@ -328,15 +424,15 @@ Music_TCG2GROverworld_Ch1: note C_, 11 note C_, 10 note C_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 dec_octave note B_, 9 note B_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note B_, 6 note B_, 2 note B_, 6 @@ -345,14 +441,14 @@ Music_TCG2GROverworld_Ch1: note B_, 11 note B_, 10 note B_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 note A_, 9 note A_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note F_, 6 note F_, 2 note F_, 6 @@ -361,14 +457,14 @@ Music_TCG2GROverworld_Ch1: note A_, 11 note A_, 10 note A_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 note B_, 9 note B_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note B_, 6 note B_, 2 note B_, 6 @@ -377,15 +473,15 @@ Music_TCG2GROverworld_Ch1: note B_, 11 note B_, 10 note B_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 inc_octave note C_, 9 note C_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note C_, 6 note C_, 2 note C_, 6 @@ -394,15 +490,15 @@ Music_TCG2GROverworld_Ch1: note C_, 11 note C_, 10 note C_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 dec_octave note B_, 9 note B_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note B_, 6 note B_, 2 note B_, 6 @@ -411,14 +507,14 @@ Music_TCG2GROverworld_Ch1: note B_, 11 note B_, 10 note B_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 note G_, 9 note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note G_, 6 note G_, 2 note G_, 6 @@ -427,15 +523,15 @@ Music_TCG2GROverworld_Ch1: note A_, 11 note F_, 10 note F_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 inc_octave note C_, 9 note C_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note C_, 6 note C_, 2 note C_, 6 @@ -444,15 +540,15 @@ Music_TCG2GROverworld_Ch1: note C_, 11 note C_, 10 note C_, 6 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 dec_octave note G_, 9 note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note G_, 6 note G_, 2 note G_, 6 @@ -461,19 +557,29 @@ Music_TCG2GROverworld_Ch1: note G_, 11 note G_, 10 note G_, 6 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musicf0 15 octave 2 notetype2 8 + ;musicf1 48 + ;musicf2 note B_, 5 note B_, 3 inc_octave note C_, 5 note C_, 3 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 + ;musicf2 note C_, 8 note C_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 @@ -488,6 +594,9 @@ Music_TCG2GROverworld_Ch1: note C_, 4 inc_octave note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note C_, 6 note C_, 2 @@ -495,12 +604,22 @@ Music_TCG2GROverworld_Ch1: note C_, 2 note C_, 8 note C_, 1 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note C_, 7 note C_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 @@ -511,17 +630,27 @@ Music_TCG2GROverworld_Ch1: note C_, 4 inc_octave note C_, 4 + ;musicf0 15 octave 2 notetype2 8 + ;musicf1 48 + ;musicf2 note A_, 5 note A_, 3 inc_octave note C_, 5 note C_, 3 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 2 + ;musicf1 70 + ;musicf2 note B_, 8 note B_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 @@ -533,6 +662,9 @@ Music_TCG2GROverworld_Ch1: note D_, 4 note D_, 4 note B_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note B_, 6 note B_, 2 @@ -540,12 +672,22 @@ Music_TCG2GROverworld_Ch1: note B_, 2 note B_, 8 note B_, 1 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note B_, 7 note B_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 @@ -553,17 +695,27 @@ Music_TCG2GROverworld_Ch1: note D_, 5 note D_, 4 note B_, 4 + ;musicf0 15 octave 2 notetype2 8 + ;musicf1 48 + ;musicf2 note B_, 5 note B_, 3 inc_octave note D_, 5 note D_, 3 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 + ;musicf2 note C_, 8 note C_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 @@ -578,6 +730,9 @@ Music_TCG2GROverworld_Ch1: note C_, 4 inc_octave note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note F_, 6 note F_, 2 @@ -585,12 +740,22 @@ Music_TCG2GROverworld_Ch1: note F_, 2 note A_, 8 note A_, 1 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note A_, 7 note A_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 @@ -601,14 +766,24 @@ Music_TCG2GROverworld_Ch1: note C_, 4 inc_octave note C_, 4 + ;musicf0 15 octave 3 notetype2 8 + ;musicf1 48 + ;musicf2 note C_, 8 note C_, 8 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 2 + ;musicf1 70 + ;musicf2 note B_, 8 note B_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 @@ -620,6 +795,9 @@ Music_TCG2GROverworld_Ch1: note D_, 4 note D_, 4 note D_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note B_, 6 note B_, 2 @@ -627,12 +805,22 @@ Music_TCG2GROverworld_Ch1: note B_, 2 note B_, 8 note B_, 1 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note B_, 7 note B_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 @@ -640,17 +828,27 @@ Music_TCG2GROverworld_Ch1: note D_, 5 note D_, 4 note B_, 4 + ;musicf0 15 octave 2 notetype2 8 + ;musicf1 48 + ;musicf2 note B_, 5 note B_, 3 inc_octave note C_, 5 note C_, 3 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 + ;musicf2 note C_, 8 note C_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 @@ -665,6 +863,9 @@ Music_TCG2GROverworld_Ch1: note C_, 4 inc_octave note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note C_, 6 note C_, 2 @@ -672,12 +873,22 @@ Music_TCG2GROverworld_Ch1: note C_, 2 note C_, 8 note C_, 1 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note C_, 7 note C_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note C_, 4 note C_, 4 @@ -688,17 +899,27 @@ Music_TCG2GROverworld_Ch1: note C_, 4 inc_octave note C_, 4 + ;musicf0 15 octave 2 notetype2 8 + ;musicf1 48 + ;musicf2 note A_, 5 note A_, 3 inc_octave note C_, 5 note C_, 3 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 2 + ;musicf1 70 + ;musicf2 note B_, 8 note B_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 @@ -710,6 +931,9 @@ Music_TCG2GROverworld_Ch1: note D_, 4 note D_, 4 note B_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note B_, 6 note B_, 2 @@ -717,12 +941,22 @@ Music_TCG2GROverworld_Ch1: note B_, 2 note B_, 8 note B_, 1 + ;musicf3 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note B_, 7 note B_, 1 + ;musicf0 23 + ;musicf1 32 + ;musicf2 octave 5 note D_, 4 note D_, 4 @@ -730,17 +964,23 @@ Music_TCG2GROverworld_Ch1: note D_, 5 note D_, 4 note B_, 4 + ;musicf0 15 octave 2 notetype2 8 + ;musicf1 48 + ;musicf2 note B_, 5 note B_, 3 inc_octave note C_, 5 note C_, 3 + ;musicef 254 note D_, 16 + ;tie note D_, 9 note D_, 8 note F_, 16 + ;tie note F_, 9 note F_, 8 note E_, 16 @@ -749,10 +989,14 @@ Music_TCG2GROverworld_Ch1: note C_, 6 note E_, 16 note E_, 6 + ;musicf3 notetype0 11 note G_, 6 note F#, 3 + ;musicef 2 notetype0 1 + ;musicf0 14 + ;musicef 254 octave 2 note D_, 6 note D#, 6 @@ -760,13 +1004,22 @@ Music_TCG2GROverworld_Ch1: note G_, 6 note A_, 5 note A#, 5 + ;musicef 2 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 + ;musicf2 note D_, 8 note D_, 1 + ;musicf0 12 + ;musicf1 71 octave 2 + ;musicf3 note G_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -780,12 +1033,19 @@ Music_TCG2GROverworld_Ch1: inc_octave note D_, 4 note G_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note D_, 6 note D_, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note G_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 5 dec_octave @@ -793,12 +1053,19 @@ Music_TCG2GROverworld_Ch1: note G_, 4 inc_octave note D_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note D_, 7 note D_, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note D_, 4 - note __, 4 + rest 4 + ;musicf2 note G_, 5 note D_, 4 dec_octave @@ -811,13 +1078,21 @@ Music_TCG2GROverworld_Ch1: note G_, 4 inc_octave note D_, 4 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 + ;musicf2 note F_, 8 note F_, 1 + ;musicf0 12 + ;musicf1 71 octave 3 + ;musicf3 note D_, 4 - note __, 4 + rest 4 + ;musicf2 note A_, 4 note D_, 4 note D_, 4 @@ -829,22 +1104,36 @@ Music_TCG2GROverworld_Ch1: note A_, 4 inc_octave note D_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note D_, 6 note D_, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 4 note D_, 4 - note __, 4 + rest 4 + ;musicf2 note A_, 5 note D_, 4 note D_, 4 note A_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 2 note A_, 7 note A_, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note A_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 5 dec_octave @@ -857,13 +1146,21 @@ Music_TCG2GROverworld_Ch1: note F_, 4 note D_, 4 note A_, 4 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 2 + ;musicf1 70 + ;musicf2 note G#, 8 note G#, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 2 note F_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note C_, 4 dec_octave @@ -877,12 +1174,19 @@ Music_TCG2GROverworld_Ch1: inc_octave note C_, 4 note F_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note C_, 6 note C_, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note F_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note C_, 5 dec_octave @@ -890,12 +1194,18 @@ Music_TCG2GROverworld_Ch1: note F_, 4 inc_octave note C_, 4 + ;musicf0 11 + ;musicf1 70 + ;musicf2 octave 3 note F_, 7 note F_, 1 + ;musicf0 12 + ;musicf1 71 octave 3 note C_, 4 - note __, 4 + rest 4 + ;musicf2 note F_, 5 note C_, 4 dec_octave @@ -908,13 +1218,21 @@ Music_TCG2GROverworld_Ch1: note F_, 4 inc_octave note C_, 4 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 2 + ;musicf1 70 + ;musicf2 note A#, 8 note A#, 1 + ;musicf0 12 + ;musicf1 71 octave 2 + ;musicf3 note A#, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -928,12 +1246,18 @@ Music_TCG2GROverworld_Ch1: inc_octave note D_, 4 note F_, 4 + ;musicf0 11 + ;musicf1 70 octave 2 note A#, 6 note A#, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note F_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 5 dec_octave @@ -941,12 +1265,18 @@ Music_TCG2GROverworld_Ch1: note F_, 4 inc_octave note D_, 4 + ;musicf0 11 + ;musicf1 70 octave 2 note A#, 7 note A#, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note D_, 4 - note __, 4 + rest 4 + ;musicf2 note F_, 5 note D_, 4 dec_octave @@ -959,13 +1289,20 @@ Music_TCG2GROverworld_Ch1: note F_, 4 inc_octave note D_, 4 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 note C_, 8 note C_, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note C_, 4 - note __, 4 + rest 4 + ;musicf2 note G_, 4 note C_, 4 note C_, 4 @@ -977,22 +1314,34 @@ Music_TCG2GROverworld_Ch1: note G_, 4 inc_octave note C_, 4 + ;musicf0 11 + ;musicf1 70 octave 3 note G_, 6 note G_, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 4 note C_, 4 - note __, 4 + rest 4 + ;musicf2 note G_, 5 note C_, 4 note C_, 4 note G_, 4 + ;musicf0 11 + ;musicf1 70 octave 3 note G_, 7 note G_, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note G_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note C_, 5 dec_octave @@ -1005,13 +1354,20 @@ Music_TCG2GROverworld_Ch1: note D#, 4 note C_, 4 note G_, 4 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 4 + ;musicf1 70 note C_, 8 note C_, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note C_, 4 - note __, 4 + rest 4 + ;musicf2 note F_, 4 note C_, 4 note C_, 4 @@ -1020,12 +1376,18 @@ Music_TCG2GROverworld_Ch1: note C_, 4 note F_, 4 note A_, 4 + ;musicf0 11 + ;musicf1 70 octave 3 note F_, 6 note F_, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note A_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note F_, 5 dec_octave @@ -1033,12 +1395,18 @@ Music_TCG2GROverworld_Ch1: note A_, 4 inc_octave note F_, 4 + ;musicf0 11 + ;musicf1 70 octave 3 note C_, 7 note C_, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note F_, 4 - note __, 4 + rest 4 + ;musicf2 note A_, 5 note F_, 4 note C_, 4 @@ -1049,13 +1417,20 @@ Music_TCG2GROverworld_Ch1: note A_, 4 inc_octave note F_, 4 + ;musicf0 11 notetype0 1 + ;musicdc 17 octave 3 + ;musicf1 70 note D#, 8 note D#, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 2 note G_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 4 dec_octave @@ -1069,12 +1444,18 @@ Music_TCG2GROverworld_Ch1: inc_octave note D_, 4 note G_, 4 + ;musicf0 11 + ;musicf1 70 octave 2 note A#, 6 note A#, 2 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note G_, 4 - note __, 4 + rest 4 + ;musicf2 inc_octave note D_, 5 dec_octave @@ -1082,12 +1463,18 @@ Music_TCG2GROverworld_Ch1: note G_, 4 inc_octave note D_, 4 + ;musicf0 11 + ;musicf1 70 octave 3 note D#, 7 note D#, 1 + ;musicf0 12 + ;musicf1 71 + ;musicf3 octave 3 note D_, 4 - note __, 4 + rest 4 + ;musicf2 note G_, 5 note D_, 4 dec_octave @@ -1100,253 +1487,362 @@ Music_TCG2GROverworld_Ch1: note G_, 4 inc_octave note D_, 4 + ;musicf0 14 octave 3 + ;musicf3 notetype0 11 note F_, 12 note D#, 6 notetype0 11 note C_, 3 + ;tie notetype0 1 note C_, 1 + ;tie note C_, 16 - note __, 16 - loopchannel 0, .MainLoop + rest 16 + sound_loop 0, .MainLoop -Music_TCG2GROverworld_Ch3: +Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) notetype1 10 + ;musicdc 17 notetype2 11 notetype1 1 + ;musice8 1 + ;musice9 96 notetype0 1 - note __, 16 + rest 16 .MainLoop + ;musice8 1 .Loop1 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 4 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 + ;musice8 4 note G_, 16 - note __, 16 - note __, 1 - note __, 16 - loopchannel 3, .Loop1 + ;musice8 1 + rest 16 + rest 1 + rest 16 + sound_loop 3, .Loop1 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 5 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 + ;musice8 4 note G_, 16 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 1 note D_, 8 + ;tie note D_, 8 .Loop2 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 5 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 + ;musice8 4 note G_, 16 - note __, 16 - note __, 1 - note __, 16 - loopchannel 2, .Loop2 + ;musice8 1 + rest 16 + rest 1 + rest 16 + sound_loop 2, .Loop2 octave 2 note D#, 9 + ;tie note D#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 5 note D#, 8 note D#, 8 + ;musice8 1 note F_, 6 + ;tie note F_, 11 + ;musice8 4 note F_, 16 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 1 note F_, 8 + ;tie note F_, 8 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 4 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 note G_, 8 + ;tie note G_, 8 - note __, 16 - note __, 1 - note __, 16 + rest 16 + rest 1 + rest 16 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 4 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 note G_, 8 + ;tie note G_, 8 - note __, 16 - note __, 1 + rest 16 + rest 1 note D_, 8 + ;tie note D_, 8 .Loop3 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 4 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 + ;musice8 4 note G_, 16 - note __, 16 - note __, 1 - note __, 16 - loopchannel 3, .Loop3 + ;musice8 1 + rest 16 + rest 1 + rest 16 + sound_loop 3, .Loop3 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 5 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 + ;musice8 4 note G_, 16 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 1 note D_, 8 + ;tie note D_, 8 .Loop4 octave 2 note G_, 9 + ;tie note G_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 5 note G_, 8 note G_, 8 + ;musice8 1 note G_, 6 + ;tie note G_, 11 + ;musice8 4 note G_, 16 - note __, 16 - note __, 1 - note __, 16 - loopchannel 2, .Loop4 + ;musice8 1 + rest 16 + rest 1 + rest 16 + sound_loop 2, .Loop4 octave 2 note A#, 9 + ;tie note A#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 + ;musice8 5 note A#, 8 note A#, 8 inc_octave + ;musice8 1 note C_, 6 + ;tie note C_, 11 + ;musice8 4 note C_, 16 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 1 note C_, 8 + ;tie note C_, 8 + ;musice8 1 notetype0 1 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 9 + ;tie note D_, 8 + ;musice8 4 note D_, 9 dec_octave note A_, 8 + ;musice8 7 note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 2 octave 2 + ;musice8 1 note D#, 9 + ;tie note D#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note D#, 5 + ;tie note D#, 11 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 8 note D#, 5 + ;tie note D#, 11 + ;tie note D#, 16 + ;tie note D#, 1 + ;musice8 1 note A_, 8 + ;tie note A_, 8 octave 2 note A#, 9 + ;tie note A#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note A#, 5 + ;tie note A#, 11 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 8 note A#, 5 + ;tie note A#, 11 + ;tie note A#, 16 + ;tie note A#, 1 + ;musice8 1 note A#, 8 + ;tie note A#, 8 octave 2 note C#, 9 + ;tie note C#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note C#, 5 + ;tie note C#, 11 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 8 note C#, 5 + ;tie note C#, 11 + ;tie note C#, 16 + ;tie note C#, 1 + ;musice8 1 note C#, 8 + ;tie note C#, 8 octave 2 note C_, 9 + ;tie note C_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note C_, 5 + ;tie note C_, 11 - note __, 9 + rest 9 inc_octave + ;musice8 5 note G_, 8 inc_octave note C_, 8 @@ -1359,160 +1855,192 @@ Music_TCG2GROverworld_Ch3: note A#, 8 note F_, 8 octave 2 + ;musice8 1 note G#, 9 + ;tie note G#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note G#, 5 + ;tie note G#, 11 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 8 note G#, 5 + ;tie note G#, 11 + ;tie note G#, 16 + ;tie note G#, 1 + ;musice8 1 note G#, 8 + ;tie note G#, 8 octave 2 note D_, 9 + ;tie note D_, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note D_, 5 + ;tie note D_, 11 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 8 note D_, 5 + ;tie note D_, 11 + ;tie note D_, 16 + ;tie note D_, 1 + ;musice8 1 note D_, 8 + ;tie note D_, 8 octave 2 note D#, 9 + ;tie note D#, 16 - note __, 8 - note __, 9 - note __, 8 + rest 8 + rest 9 + rest 8 note D#, 5 + ;tie note D#, 11 - note __, 16 - note __, 1 + rest 16 + rest 1 + ;musice8 8 note D#, 5 + ;tie note D#, 11 + ;tie note D#, 16 + ;tie note D#, 1 + ;musice8 1 note D#, 8 + ;tie note D#, 8 - vibrato 32, $33 + ;musice8 8 + ;vibrato_type 5 + vibrato 32, 3, 3 notetype0 11 note F_, 3 + ;tie note F_, 3 + ;tie note F_, 3 + ;tie notetype0 1 note F_, 16 + ;tie note A#, 4 + ;tie note B_, 4 + ;tie inc_octave note C_, 9 notetype0 11 note F_, 3 + ;tie note F_, 3 + ;tie note F_, 3 + ;tie notetype0 1 note F_, 16 - note __, 16 - note __, 1 - loopchannel 0, .MainLoop - endchannel + rest 16 + rest 1 + sound_loop 0, .MainLoop + sound_ret -Music_TCG2GROverworld_Ch4: - togglenoise $06 - notetype 1 - note __, 16 +Music_GROverworld_Ch4: ; 1eb5e4 (7a:75e4) + toggle_noise 6 + drum_speed 1 + rest 16 .MainLoop octave 1 - notetype 1 + drum_speed 1 .Loop1 - note C#, 9 - note C#, 8 - note D_, 6 - note D_, 5 - note D_, 5 - note C#, 16 - note __, 1 - note C#, 16 - note D_, 6 - note D_, 6 - note D_, 5 - note C#, 16 - note C#, 16 - note __, 1 - note C#, 16 - loopchannel 16, .Loop1 - note C#, 9 - note C#, 8 - note D_, 6 - note D_, 5 - note D_, 5 - note C#, 16 - note __, 1 - note C#, 16 - note C#, 9 - note C#, 8 - note C#, 16 - note D_, 6 - note D_, 6 - note D_, 5 - note D_, 6 - note D_, 5 - note D_, 5 + drum_note 2, 9 + ;musicef 250 + drum_note 2, 8 + ;musicef 253 + drum_note 3, 6 + drum_note 3, 5 + drum_note 3, 5 + ;musicef 0 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + ;musicef 253 + drum_note 3, 6 + drum_note 3, 6 + drum_note 3, 5 + ;musicef 0 + drum_note 2, 16 + ;musicef 253 + drum_note 2, 16 + rest 1 + ;musicef 0 + drum_note 2, 16 + sound_loop 16, .Loop1 + drum_note 2, 9 + ;musicef 250 + drum_note 2, 8 + ;musicef 253 + drum_note 3, 6 + drum_note 3, 5 + drum_note 3, 5 + ;musicef 0 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + ;musicef 253 + drum_note 2, 9 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 16 + drum_note 3, 6 + ;musicef 253 + drum_note 3, 6 + drum_note 3, 5 + drum_note 3, 6 + drum_note 3, 5 + drum_note 3, 5 .Loop2 - note C#, 9 - note C#, 8 - note D_, 6 - note D_, 5 - note D_, 5 + ;musicef 0 + drum_note 2, 9 + ;musicef 250 + drum_note 2, 8 + ;musicef 253 + drum_note 3, 6 + drum_note 3, 5 + drum_note 3, 5 rept 2 - note C#, 16 - note __, 1 - note C#, 16 + ;musicef 254 + drum_note 2, 16 + rest 1 + ;musicef 2 + drum_note 2, 16 endr - note C#, 16 - note __, 1 - note D_, 6 - note D_, 5 - note D_, 5 - loopchannel 7, .Loop2 - notetype 11 - note F_, 12 - note __, 12 - loopchannel 0, .MainLoop - notetype 4 - notetype2 8 - dutycycle 2 - notetype1 11 - octave 4 - note C_, 4 - endchannel - notetype 4 - notetype2 8 - dutycycle 2 - notetype1 11 - octave 3 - note D_, 4 - endchannel - notetype 4 - notetype2 11 - notetype1 2 - notetype2 8 - octave 1 - note C_, 4 - endchannel - notetype 4 - note F_, 4 - endchannel - + ;musicef 0 + drum_note 2, 16 + rest 1 + ;musicef 253 + drum_note 3, 6 + drum_note 3, 5 + drum_note 3, 5 + sound_loop 7, .Loop2 + drum_speed 11 + drum_note 6, 12 + rest 12 + sound_loop 0, .MainLoop +; 0x1eb64e diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm index c2c88b75..e69920e9 100644 --- a/crysaudio/music/TCG2/herecomesgr.asm +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -1,65 +1,79 @@ -Music_TCG2HereComesGR: - db $C0 - dw Music_TCG2HereComesGR_Ch1 - db $01 - dw Music_TCG2HereComesGR_Ch2 - db $02 - dw Music_TCG2HereComesGR_Ch3 - db $03 - dw Music_TCG2HereComesGR_Ch4 +Music_HereComesGR: + channel_count 4 + channel 1, Music_HereComesGR_Ch1 + channel 2, Music_HereComesGR_Ch2 + channel 3, Music_HereComesGR_Ch3 + channel 4, Music_HereComesGR_Ch4 -Music_TCG2HereComesGR_Ch2: +Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) notetype1 10 .MainLoop notetype0 1 + ;musicdc 17 + ;musicf0 8 + ;musicf1 55 octave 2 - callchannel Branch_1ea5ed - note __, 10 - note __, 11 - note __, 10 - note __, 16 - note __, 16 - note __, 10 + sound_call Branch_1ea5ed + rest 10 + rest 11 + rest 10 + rest 16 + rest 16 + rest 10 note C_, 6 + ;tie note C#, 5 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 - callchannel Branch_1ea5ed - note __, 10 - note __, 11 - note __, 10 + sound_call Branch_1ea5ed + rest 10 + rest 11 + rest 10 note B_, 6 + ;tie inc_octave note C_, 5 + ;tie note C#, 16 + ;tie note C#, 15 note C_, 16 + ;tie note C_, 16 + ;tie dec_octave note B_, 5 + ;tie note A#, 5 octave 2 - callchannel Branch_1ea5ed - note __, 10 - note __, 11 - note __, 10 - note __, 16 - note __, 16 - note __, 10 + sound_call Branch_1ea5ed + rest 10 + rest 11 + rest 10 + rest 16 + rest 16 + rest 10 note C_, 6 + ;tie note C#, 5 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 - callchannel Branch_1ea5ed - note __, 10 - note __, 11 - note __, 10 + sound_call Branch_1ea5ed + rest 10 + rest 11 + rest 10 note G_, 11 inc_octave + ;musicf2 note G_, 5 note G_, 5 + ;musicf3 note C#, 11 note C_, 5 note C#, 5 @@ -68,114 +82,172 @@ Music_TCG2HereComesGR_Ch2: note A#, 10 note F_, 11 note G#, 10 + ;musicf0 8 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 octave 4 notetype2 4 + ;musicf2 note D_, 10 note D_, 11 - note __, 10 - note __, 11 + ;musicf3 + rest 10 + rest 11 + ;musicef 252 note C_, 10 + ;musicef 4 + ;musicf1 55 + ;musicf3 + ;musicf0 8 octave 1 notetype2 8 + ;musicef 254 .Loop1 note G_, 3 - note __, 1 + rest 1 note G_, 2 - note __, 1 - loopchannel 3, .Loop1 + rest 1 + sound_loop 3, .Loop1 + ;musicef 2 inc_octave note C#, 6 + ;tie note D_, 5 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 + ;musicf0 8 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 octave 4 notetype2 4 + ;musicf1 55 + ;musicf2 note D_, 10 note D_, 11 - note __, 10 + ;musicf3 + rest 10 + ;musicf0 8 octave 2 notetype2 8 note B_, 6 + ;tie inc_octave note C_, 5 + ;tie note C#, 16 + ;tie note C#, 15 note C_, 16 + ;tie note C_, 16 + ;tie dec_octave note B_, 5 + ;tie note A#, 5 + ;musicf0 8 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 octave 4 notetype2 4 + ;musicf2 note D_, 10 note D_, 11 - note __, 10 - note __, 11 + ;musicf3 + rest 10 + rest 11 + ;musicef 252 note C_, 10 + ;musicef 4 + ;musicf1 55 + ;musicf3 + ;musicf0 8 octave 1 notetype2 8 + ;musicef 254 .Loop2 note G_, 3 - note __, 1 + rest 1 note G_, 2 - note __, 1 - loopchannel 3, .Loop2 + rest 1 + sound_loop 3, .Loop2 + ;musicef 2 inc_octave note C#, 6 + ;tie note D_, 5 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 octave 2 - callchannel Branch_1ea5ed + ;musicf1 55 + sound_call Branch_1ea5ed + ;musicf0 9 notetype2 4 notetype2 4 octave 4 + ;musicf2 note G_, 10 note G_, 11 + ;musicf0 8 notetype2 8 octave 3 + ;musicf2 note G_, 10 note G_, 11 + ;musicf3 note C_, 5 note C#, 5 + ;musicf2 note D_, 6 note D_, 5 note F_, 5 note F_, 5 + ;musicf3 note C_, 6 note C#, 5 note C_, 10 - callchannel Branch_1ea90c - callchannel Branch_1ea66f + sound_call Branch_1ea90c + sound_call Branch_1ea66f + ;musicf0 8 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 octave 4 + ;musicf2 note D_, 4 note D_, 6 + ;musicf3 + ;musicf0 8 octave 2 notetype2 8 note D_, 11 + ;musicf0 9 octave 3 notetype2 8 note C#, 10 + ;musicf2 note D_, 6 note D_, 5 note F_, 5 note F_, 5 + ;musicf3 note C_, 4 note C#, 3 note C_, 4 dec_octave + ;musicf2 note A#, 5 note A#, 5 + ;musicf3 inc_octave note C_, 11 dec_octave @@ -184,52 +256,73 @@ Music_TCG2HereComesGR_Ch2: note C_, 3 dec_octave note A#, 4 - callchannel Branch_1ea90c - callchannel Branch_1ea66f + sound_call Branch_1ea90c + sound_call Branch_1ea66f + ;musicf0 8 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 + ;musicf1 16 octave 4 notetype2 6 + ;musicf3 note F_, 10 - note __, 11 + rest 11 note G_, 10 - note __, 11 + rest 11 + ;musicef 1 + ;musicf1 55 notetype2 8 + ;musicf3 octave 3 note C#, 10 + ;musicf2 note D_, 6 note D_, 5 note F_, 5 note F_, 5 + ;musicf3 note C_, 3 note C#, 4 note C_, 4 dec_octave + ;musicf2 note A#, 5 note A#, 5 - callchannel Branch_1ea90c - callchannel Branch_1ea66f + ;musicf3 + sound_call Branch_1ea90c + sound_call Branch_1ea66f + ;musicf0 8 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 octave 4 + ;musicf2 note D_, 4 note D_, 6 + ;musicf3 + ;musicf0 8 octave 2 notetype2 8 note D_, 11 + ;musicf0 9 octave 3 notetype2 8 note C#, 10 + ;musicf2 note D_, 6 note D_, 5 note F_, 5 note D_, 5 + ;musicf3 note C_, 4 note C#, 3 note C_, 4 dec_octave + ;musicf2 note A#, 5 note A#, 5 + ;musicf3 inc_octave note C_, 11 dec_octave @@ -238,22 +331,42 @@ Music_TCG2HereComesGR_Ch2: note C_, 3 dec_octave note A#, 4 - callchannel Branch_1ea90c + sound_call Branch_1ea90c note C_, 11 + ;tie dec_octave + ;musice4 15 note B_, 2 + ;tie + ;musice4 0 note B_, 2 + ;tie + ;musice4 13 note A#, 1 + ;tie + ;musice4 0 note A#, 1 + ;tie + ;musice4 14 note A_, 1 + ;tie + ;musice4 0 note A_, 1 + ;tie + ;musice4 17 note G#, 1 + ;tie + ;musice4 0 note G#, 1 + ;musicf0 8 notetype2 8 octave 2 note A#, 16 + ;tie note A#, 5 + ;musicf0 9 notetype2 8 + ;musicef 2 octave 1 note A_, 3 note B_, 3 @@ -265,241 +378,338 @@ Music_TCG2HereComesGR_Ch2: note C_, 2 note F_, 2 note A_, 2 - callchannel Branch_1ea603 + sound_call Branch_1ea603 octave 3 + ;musicf2 note C_, 8 note C_, 3 + ;musicf3 note C_, 10 dec_octave note A#, 11 inc_octave + ;musicf2 note C_, 10 note C_, 11 + ;musicf3 + ;musicf0 9 octave 4 + ;musicf2 note C_, 4 note C_, 6 + ;musicf3 + ;musicf0 8 octave 1 notetype2 8 + ;musicf1 103 note G_, 5 - note __, 6 + rest 6 note G_, 5 - note __, 5 + rest 5 + ;musicf3 + ;musicf0 9 + ;musicef 252 + ;musicf1 39 octave 3 notetype2 4 - note __, 11 + rest 11 + ;musicf2 note F_, 10 note F_, 11 + ;musicf3 notetype2 8 + ;musicef 4 + ;musicf1 55 + ;musicf3 note C_, 2 - note __, 1 + rest 1 note C_, 1 - note __, 2 + rest 2 note C_, 2 - note __, 1 + rest 1 note C_, 1 + ;musicf0 8 notetype2 8 octave 2 note B_, 6 + ;tie inc_octave note C_, 5 + ;tie note C#, 16 + ;tie note C#, 5 + ;tie note C#, 10 - callchannel Branch_1ea603 + sound_call Branch_1ea603 + ;musicf1 55 + ;musicf3 + ;musicf0 8 octave 3 note C_, 11 + ;musicf0 9 notetype2 8 inc_octave + ;musicf2 note F_, 4 note F_, 6 dec_octave + ;musicf0 8 note C_, 5 note C_, 6 dec_octave + ;musicf3 note B_, 10 inc_octave inc_octave + ;musicf0 9 notetype2 8 + ;musicf2 note E_, 4 note E_, 7 dec_octave dec_octave + ;musicf0 8 notetype2 8 note B_, 5 note B_, 5 + ;musicf3 note A#, 11 + ;musicf0 9 inc_octave inc_octave notetype2 8 + ;musicf2 note D#, 4 note D#, 6 dec_octave dec_octave + ;musicf0 8 octave 2 notetype2 8 note A#, 5 note A#, 6 + ;musicf3 note G#, 10 + ;musicf0 9 inc_octave inc_octave notetype2 8 + ;musicf2 note C#, 4 note C#, 7 dec_octave dec_octave + ;musicf0 8 notetype2 8 note G#, 5 note G#, 5 + ;musicf3 note F_, 16 + ;tie note F_, 5 note F#, 16 + ;tie note F#, 5 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1ea5ed: + ;musicf2 note G_, 8 note G_, 3 + ;musicf3 note G_, 10 note F_, 11 + ;musicf2 note G_, 10 note G_, 11 - endchannel + ;musicf3 + sound_ret Branch_1ea5f8: + ;musicf2 note D_, 8 note D_, 3 + ;musicf3 note D_, 10 note C_, 11 + ;musicf2 note D_, 10 note D_, 11 - endchannel + ;musicf3 + sound_ret Branch_1ea603: + ;musicf0 8 + ;musicf3 octave 3 + ;musicf2 note C_, 8 note C_, 3 + ;musicf3 note C_, 10 dec_octave note A#, 11 + ;musicf2 inc_octave note C_, 10 note C_, 11 + ;musicf3 + ;musicf0 9 octave 4 notetype2 8 + ;musicf2 note C_, 4 note C_, 6 + ;musicf3 + ;musicf0 8 octave 1 notetype2 8 + ;musicf1 55 note G_, 5 - note __, 6 + rest 6 note G_, 5 - note __, 5 + rest 5 + ;musicf3 + ;musicf0 9 + ;musicef 252 + ;musicf1 39 octave 3 notetype2 4 - note __, 11 + rest 11 + ;musicf2 note F_, 10 note F_, 11 notetype2 8 + ;musicf3 + ;musicef 4 + ;musicf1 55 + ;musicf3 note C_, 2 - note __, 1 + rest 1 note C_, 1 - note __, 2 + rest 2 note C_, 2 - note __, 1 + rest 1 note C_, 1 + ;musicf0 8 octave 2 note A#, 16 + ;tie note A#, 5 note B_, 16 + ;tie note B_, 5 - endchannel + sound_ret Branch_1ea64e: + ;musicf0 8 notetype2 8 octave 3 + ;musicef 255 note G#, 16 + ;tie note G#, 16 + ;tie note G#, 10 + ;musicef 1 note G#, 2 - note __, 4 + rest 4 note G#, 1 - note __, 4 + rest 4 note G#, 2 - note __, 4 + rest 4 note G#, 1 - note __, 3 + rest 3 note G_, 16 + ;tie note G_, 5 + ;tie note G_, 11 + ;tie note F#, 5 + ;tie note F_, 5 dec_octave - endchannel + sound_ret Branch_1ea66f: + ;musicf0 8 notetype2 8 octave 2 note E_, 16 + ;tie note E_, 5 note F_, 16 + ;tie note F_, 5 note F#, 16 + ;tie note F#, 5 - endchannel - endchannel + sound_ret + sound_ret -Music_TCG2HereComesGR_Ch1: +Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) notetype1 10 .MainLoop notetype0 1 + ;musicdc 17 octave 2 + ;musicf0 8 + ;musicf1 55 octave 2 - callchannel Branch_1ea5f8 - note __, 10 - note __, 11 - note __, 10 - note __, 16 - note __, 16 - note __, 10 - note __, 6 - note __, 5 - note __, 10 - note __, 16 - note __, 5 - callchannel Branch_1ea5f8 - note __, 10 - note __, 11 - note __, 10 + sound_call Branch_1ea5f8 + rest 10 + rest 11 + rest 10 + rest 16 + rest 16 + rest 10 + rest 6 + rest 5 + rest 10 + rest 16 + rest 5 + sound_call Branch_1ea5f8 + rest 10 + rest 11 + rest 10 note F#, 6 + ;tie note G_, 5 + ;tie note G#, 16 + ;tie note G#, 15 note G_, 16 + ;tie note G_, 16 + ;tie note F#, 5 + ;tie note F_, 5 octave 2 - callchannel Branch_1ea5f8 - note __, 10 - note __, 11 - note __, 10 - note __, 16 - note __, 16 - note __, 10 - note __, 6 - note __, 5 - note __, 10 - note __, 16 - note __, 5 - callchannel Branch_1ea5f8 - note __, 10 - note __, 11 - note __, 10 + sound_call Branch_1ea5f8 + rest 10 + rest 11 + rest 10 + rest 16 + rest 16 + rest 10 + rest 6 + rest 5 + rest 10 + rest 16 + rest 5 + sound_call Branch_1ea5f8 + rest 10 + rest 11 + rest 10 note G_, 11 inc_octave note C_, 5 - note __, 5 + rest 5 dec_octave note A#, 11 note A_, 5 @@ -508,201 +718,274 @@ Music_TCG2HereComesGR_Ch1: note F_, 10 note C_, 11 note C#, 10 + ;musicf0 8 octave 2 - callchannel Branch_1ea5f8 + sound_call Branch_1ea5f8 + ;musicf0 9 octave 4 notetype2 4 + ;musicf2 note C_, 10 note C_, 11 - note __, 10 - note __, 11 + ;musicf3 + rest 10 + rest 11 dec_octave + ;musicef 252 notetype2 4 note A#, 10 + ;musicef 4 + ;musicf1 55 + ;musicf3 + ;musicf0 9 octave 1 notetype2 8 + ;musicef 254 .Loop1 note D_, 2 - note __, 1 + rest 1 note D_, 2 - note __, 2 - loopchannel 3, .Loop1 - note __, 11 - note __, 10 - note __, 11 - note __, 10 + rest 2 + sound_loop 3, .Loop1 + ;musicef 2 + rest 11 + rest 10 + rest 11 + rest 10 + ;musicf0 8 octave 2 - callchannel Branch_1ea5f8 + sound_call Branch_1ea5f8 + ;musicf0 9 octave 4 notetype2 4 + ;musicf2 note C_, 10 note C_, 11 - note __, 10 + rest 10 + ;musicf3 + ;musicf0 8 octave 2 notetype2 8 note F#, 6 + ;tie note G_, 5 + ;tie note G#, 16 + ;tie note G#, 15 note G_, 16 + ;tie note G_, 16 + ;tie note F#, 5 + ;tie note F_, 5 + ;musicf0 8 octave 2 - callchannel Branch_1ea5f8 + sound_call Branch_1ea5f8 + ;musicf0 9 octave 4 notetype2 4 + ;musicf2 note C_, 10 note C_, 11 - note __, 10 - note __, 11 + ;musicf3 + rest 10 + rest 11 dec_octave + ;musicef 252 note A#, 10 + ;musicef 4 + ;musicf1 55 + ;musicf3 + ;musicf0 8 octave 1 notetype2 8 + ;musicef 254 .Loop2 note D_, 2 - note __, 1 + rest 1 note D_, 2 - note __, 2 - loopchannel 3, .Loop2 - note __, 11 - note __, 10 - note __, 11 - note __, 10 + rest 2 + sound_loop 3, .Loop2 + ;musicef 2 + rest 11 + rest 10 + rest 11 + rest 10 octave 2 - callchannel Branch_1ea5f8 + sound_call Branch_1ea5f8 + ;musicf0 9 octave 4 notetype2 4 + ;musicf2 note C_, 10 note C_, 11 + ;musicf3 + ;musicf0 8 octave 3 notetype2 8 note C_, 10 dec_octave - note __, 11 + rest 11 note G_, 5 note G#, 5 + ;musicf2 note A_, 6 note A_, 5 inc_octave note C_, 5 note C_, 5 + ;musicf3 dec_octave note G_, 6 note G#, 5 note G_, 10 + ;musicf0 8 notetype2 8 octave 2 note A#, 11 note G_, 10 - callchannel Branch_1ea64e - note __, 11 - note __, 10 - note __, 11 - note __, 10 - note __, 11 - note __, 10 - note __, 16 - note __, 5 - note __, 16 - note __, 5 + sound_call Branch_1ea64e + rest 11 + rest 10 + rest 11 + rest 10 + rest 11 + rest 10 + rest 16 + rest 5 + rest 16 + rest 5 octave 4 - note __, 11 + rest 11 notetype2 4 note C_, 10 - note __, 11 + rest 11 dec_octave + ;musicf0 8 octave 2 notetype2 8 note F_, 10 - callchannel Branch_1ea5ed - note __, 10 + sound_call Branch_1ea5ed + rest 10 + ;musicf0 8 octave 2 notetype2 8 note G_, 16 + ;tie note G_, 5 - callchannel Branch_1ea64e - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 11 + sound_call Branch_1ea64e + rest 16 + rest 5 + rest 16 + rest 5 + rest 16 + rest 5 + rest 16 + rest 5 + rest 16 + rest 5 + rest 11 + ;musicf0 9 notetype2 6 + ;musicf1 16 octave 3 + ;musicf3 note A#, 10 - note __, 11 + rest 11 inc_octave note C_, 10 - note __, 11 + rest 11 + ;musicf3 + ;musicf0 8 + ;musicf1 55 notetype2 8 octave 2 note G_, 10 note F_, 11 + ;musicf2 note G_, 10 note G_, 11 + ;musicf3 note D_, 10 + ;musicf0 8 octave 2 notetype2 8 note G_, 11 + ;tie note G_, 10 - callchannel Branch_1ea64e - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 16 - note __, 5 - note __, 16 - note __, 5 + sound_call Branch_1ea64e + rest 16 + rest 5 + rest 16 + rest 5 + rest 16 + rest 5 + rest 16 + rest 5 + rest 16 + rest 5 octave 4 - note __, 11 + rest 11 notetype2 4 note C_, 10 - note __, 11 + rest 11 dec_octave + ;musicf0 8 octave 2 notetype2 8 note F_, 10 + ;musicf2 note G_, 8 note G_, 3 + ;musicf3 note G_, 10 note F_, 11 + ;musicf2 note G_, 10 note G_, 11 - note __, 10 + rest 10 + ;musicf3 + ;musicf0 8 octave 2 notetype2 8 note G_, 16 + ;tie note G_, 5 + ;musicef 255 octave 3 note G#, 16 + ;tie note G#, 16 + ;tie note G#, 10 + ;musicef 1 note G#, 2 - note __, 4 + rest 4 note G#, 1 - note __, 4 + rest 4 note G#, 2 - note __, 4 + rest 4 note G#, 1 - note __, 3 + rest 3 note G_, 16 + ;tie note G_, 5 + ;tie note G_, 16 + ;tie note G_, 5 dec_octave note F_, 6 + ;tie note F#, 5 + ;tie note G_, 10 + ;musicf0 10 + ;musicf1 144 + ;musicef 253 + ;musicf2 octave 3 note G_, 3 note G_, 3 @@ -730,117 +1013,171 @@ Music_TCG2HereComesGR_Ch1: inc_octave note F#, 3 note C#, 2 - callchannel Branch_1ea8d3 + ;musicf1 55 + sound_call Branch_1ea8d3 octave 2 - callchannel Branch_1ea5ed + sound_call Branch_1ea5ed + ;musicf0 9 notetype2 4 octave 3 + ;musicf2 note A#, 10 note A#, 11 + ;musicf3 + ;musicf0 8 octave 1 notetype2 8 - note __, 10 + rest 10 + ;musicf0 9 + ;musicef 252 + ;musicf1 55 octave 2 notetype2 4 - note __, 11 + rest 11 note A#, 10 note A#, 11 + ;musicf3 notetype2 8 + ;musicef 4 + ;musicf1 55 + ;musicf3 note C_, 2 - note __, 1 + rest 1 note C_, 2 - note __, 1 + rest 1 note C_, 2 - note __, 1 + rest 1 note C_, 1 + ;musicf0 8 notetype2 8 octave 2 note F#, 6 + ;tie note G_, 5 + ;tie note G#, 16 + ;tie note G#, 5 + ;tie note G#, 10 - callchannel Branch_1ea8d3 + sound_call Branch_1ea8d3 + ;musicf1 55 + ;musicf3 + ;musicf0 8 octave 2 note G_, 11 + ;musicf0 9 notetype2 8 inc_octave inc_octave + ;musicf2 note C_, 4 note C_, 6 dec_octave dec_octave + ;musicf0 8 note G_, 5 note G_, 6 + ;musicf3 note F#, 10 inc_octave + ;musicf0 9 notetype2 8 + ;musicf2 note B_, 4 note B_, 7 dec_octave + ;musicf0 8 notetype2 8 note F#, 5 note F#, 5 + ;musicf3 note F_, 11 + ;musicf0 9 inc_octave notetype2 8 + ;musicf2 note A#, 4 note A#, 6 dec_octave + ;musicf0 8 octave 2 notetype2 8 note F_, 5 note F_, 6 + ;musicf3 note D#, 10 + ;musicf0 9 inc_octave notetype2 8 + ;musicf2 note G#, 4 note G#, 7 dec_octave + ;musicf0 8 notetype2 8 note D#, 5 note D#, 5 + ;musicf3 note C_, 16 + ;tie note C_, 5 note C#, 16 + ;tie note C#, 5 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1ea8d3: + ;musicf0 8 + ;musicdc 17 octave 2 + ;musicf1 55 + ;musicf2 note G_, 8 note G_, 3 + ;musicf3 note G_, 10 note F_, 11 + ;musicf2 note G_, 10 note G_, 11 + ;musicf0 9 octave 3 notetype2 4 note A#, 10 note A#, 11 - note __, 10 + ;musicf3 + rest 10 + ;musicef 252 octave 2 notetype2 4 - note __, 11 + rest 11 note A#, 10 - note __, 11 + rest 11 notetype2 8 + ;musicef 4 + ;musicf1 55 + ;musicf3 note G_, 2 - note __, 1 + rest 1 note G_, 2 - note __, 1 + rest 1 note G_, 2 - note __, 1 + rest 1 note G_, 1 + ;musicf0 8 octave 2 note F_, 16 + ;tie note F_, 5 note F#, 16 + ;tie note F#, 5 - endchannel + sound_ret Branch_1ea90c: - vibrato 11, $33 + ;musicf0 9 + vibrato 11, 3, 3 octave 1 note A_, 4 note B_, 3 @@ -853,7 +1190,9 @@ Branch_1ea90c: note F_, 2 note G_, 2 note A#, 10 + ;tie note A#, 16 + ;tie note A#, 16 dec_octave note C_, 4 @@ -868,80 +1207,98 @@ Branch_1ea90c: note B_, 2 inc_octave note C_, 11 + ;tie note C_, 10 + ;tie note C_, 11 + ;tie note C_, 10 - endchannel + sound_ret -Music_TCG2HereComesGR_Ch3: +Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) notetype1 10 notetype0 1 notetype2 11 notetype1 1 + ;musice9 128 + ;musicdc 17 .MainLoop octave 5 octave 2 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 16 - note __, 16 - note __, 10 - note __, 16 - note __, 16 - note __, 10 + rest 16 + rest 16 + rest 10 + rest 16 + rest 16 + rest 10 note C_, 5 + ;tie note C#, 6 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 16 - note __, 16 - note __, 10 + rest 16 + rest 16 + rest 10 note G#, 6 + ;tie note A_, 5 + ;tie note A#, 16 + ;tie note A#, 15 note A_, 16 + ;tie note A_, 16 + ;tie note A_, 10 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 16 - note __, 16 - note __, 10 - note __, 16 - note __, 16 - note __, 10 + rest 16 + rest 16 + rest 10 + rest 16 + rest 16 + rest 10 note C_, 5 + ;tie note C#, 6 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 16 - note __, 15 + rest 16 + rest 15 inc_octave note C#, 10 note D_, 11 inc_octave notetype1 2 + ;musice8 8 note C_, 10 + ;musice8 8 notetype1 1 dec_octave note C#, 11 @@ -956,93 +1313,114 @@ Music_TCG2HereComesGR_Ch3: notetype1 1 octave 2 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 11 + rest 11 octave 5 + ;musice8 4 note G_, 10 notetype1 3 note G_, 11 + ;musice8 8 octave 2 notetype1 2 note F_, 10 note G_, 11 octave 5 + ;musice8 4 note F_, 10 + ;musice8 8 octave 2 notetype1 1 - note __, 10 - note __, 11 + rest 10 + rest 11 note C_, 5 + ;tie note C#, 6 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 notetype1 1 octave 2 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 11 + rest 11 octave 5 + ;musice8 4 note G_, 10 notetype1 3 note G_, 11 + ;musice8 8 notetype1 1 octave 2 - note __, 10 + rest 10 note G#, 6 + ;tie note A_, 5 + ;tie note A#, 16 + ;tie note A#, 15 note A_, 16 + ;tie note A_, 16 + ;tie note A_, 10 notetype1 1 octave 2 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 11 + rest 11 octave 5 + ;musice8 4 note G_, 10 notetype1 3 note G_, 11 + ;musice8 8 octave 2 notetype1 2 note F_, 10 note G_, 11 octave 5 + ;musice8 4 note F_, 10 + ;musice8 8 notetype1 1 octave 2 - note __, 10 - note __, 11 + rest 10 + rest 11 note C_, 5 + ;tie note C#, 6 + ;tie note D_, 10 note F_, 16 + ;tie note F_, 5 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 8 - note __, 2 + rest 2 note G_, 5 - note __, 6 + rest 6 inc_octave note F_, 10 - note __, 11 + rest 11 note G_, 10 octave 3 - note __, 11 + rest 11 note C#, 10 note D_, 11 note F_, 10 @@ -1051,582 +1429,677 @@ Music_TCG2HereComesGR_Ch3: note F_, 10 note G_, 11 note A_, 10 - callchannel Branch_1eaaf6 - note __, 11 + sound_call Branch_1eaaf6 + rest 11 octave 2 note G_, 5 - note __, 5 + rest 5 note E_, 16 + ;tie note E_, 5 note F_, 16 + ;tie note F_, 5 note F#, 16 + ;tie note F#, 5 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 8 - note __, 13 + rest 13 inc_octave note F_, 8 - note __, 13 + rest 13 note G_, 8 - note __, 2 - note __, 16 - note __, 16 - note __, 16 - note __, 5 + rest 2 + rest 16 + rest 16 + rest 16 + rest 5 dec_octave note D_, 10 note F_, 11 note G_, 10 - callchannel Branch_1eaaf6 - note __, 11 + sound_call Branch_1eaaf6 + rest 11 octave 2 note G#, 5 + ;tie note A_, 5 inc_octave note C_, 11 note D_, 5 - note __, 5 + rest 5 note F#, 6 + ;tie note G_, 5 note A#, 10 inc_octave note C_, 6 + ;tie note C_, 5 + ;tie dec_octave note B_, 5 + ;tie note A#, 5 octave 2 note D_, 16 + ;tie note D_, 16 inc_octave note D_, 8 - note __, 2 - note __, 11 + rest 2 + rest 11 inc_octave inc_octave + ;musice8 4 note F_, 10 notetype1 3 note F_, 11 + ;musice8 8 dec_octave dec_octave notetype1 2 dec_octave note C_, 10 note D_, 8 - note __, 13 + rest 13 inc_octave note G_, 3 - note __, 8 + rest 8 dec_octave note G_, 3 - note __, 7 + rest 7 notetype1 1 note C_, 16 + ;tie note C_, 5 note C#, 16 + ;tie note C#, 5 octave 2 note D_, 16 + ;tie note D_, 16 inc_octave note D_, 8 - note __, 2 - note __, 11 + rest 2 + rest 11 inc_octave inc_octave + ;musice8 4 note F_, 10 notetype1 3 note F_, 11 + ;musice8 8 dec_octave dec_octave notetype1 2 dec_octave note C_, 10 note D_, 8 - note __, 13 + rest 13 inc_octave note G_, 3 - note __, 8 + rest 8 dec_octave note G_, 3 - note __, 7 + rest 7 notetype1 1 note C#, 6 + ;tie note D_, 5 + ;tie note D#, 16 + ;tie note D#, 15 octave 2 note D_, 16 + ;tie note D_, 16 inc_octave note D_, 8 - note __, 2 - note __, 11 + rest 2 + rest 11 inc_octave inc_octave + ;musice8 4 note F_, 10 notetype1 3 note F_, 11 + ;musice8 8 dec_octave dec_octave notetype1 2 dec_octave note C_, 10 note D_, 8 - note __, 13 + rest 13 inc_octave note G_, 3 - note __, 8 + rest 8 dec_octave note G_, 3 - note __, 7 + rest 7 notetype1 1 note C_, 16 + ;tie note C_, 5 note C#, 16 + ;tie note C#, 5 note D_, 16 + ;tie note D_, 5 note D_, 2 - note __, 9 + rest 9 note C#, 16 + ;tie note C#, 5 note C#, 2 - note __, 8 + rest 8 note C_, 16 + ;tie note C_, 5 - note __, 11 + rest 11 note G#, 2 + ;tie note A_, 3 + ;tie note A#, 16 + ;tie note A#, 10 note F_, 16 + ;tie note F_, 5 note F#, 16 + ;tie note F#, 5 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1eaaf6: - vibrato 11, $33 + ;vibrato_type 1 + vibrato 11, 3, 3 octave 2 note A#, 11 + ;tie note A#, 7 - note __, 3 + rest 3 note A#, 2 - note __, 9 + rest 9 inc_octave note A#, 5 - note __, 5 + rest 5 dec_octave note A#, 5 - note __, 6 + rest 6 note G#, 5 - note __, 5 + rest 5 note G#, 6 + ;tie note A_, 5 + ;tie note A_, 10 - note __, 11 + rest 11 inc_octave note A_, 5 - note __, 5 + rest 5 dec_octave note A_, 11 note E_, 10 note F_, 16 + ;tie note F_, 5 note F#, 16 + ;tie note F#, 5 notetype1 1 octave 2 note G_, 8 - note __, 3 + rest 3 note G_, 10 note F_, 11 note G_, 10 - note __, 11 + rest 11 octave 5 + ;musice8 4 note G_, 10 notetype1 3 note G_, 11 + ;musice8 8 octave 2 notetype1 1 - note __, 10 - note __, 16 - note __, 16 - note __, 16 - note __, 5 + rest 10 + rest 16 + rest 16 + rest 16 + rest 5 note D_, 10 note F_, 11 note G_, 10 note A#, 11 + ;tie note A#, 7 - note __, 3 + rest 3 note A#, 2 - note __, 9 + rest 9 inc_octave note A#, 5 - note __, 5 + rest 5 dec_octave note A#, 5 - note __, 6 + rest 6 note B_, 5 - note __, 5 + rest 5 note A#, 6 + ;tie note B_, 5 + ;tie inc_octave note C_, 10 - endchannel + sound_ret -Music_TCG2HereComesGR_Ch4: - togglenoise $06 +Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) + toggle_noise 6 .MainLoop - notetype 1 + drum_speed 1 octave 1 - callchannel Branch_1eacf7 - callchannel Branch_1ead02 - callchannel Branch_1eacf7 - note D#, 11 - note C#, 10 - note E_, 11 - note C_, 10 - note C#, 11 - note C#, 10 - note D#, 11 - note C#, 3 - note C#, 3 - note C#, 4 - callchannel Branch_1eacf7 - note D#, 11 - note C_, 10 - note E_, 7 - note C_, 7 - note C_, 7 - note C#, 16 - note __, 5 - note D#, 11 - note C#, 10 - callchannel Branch_1eacf7 - note C_, 11 - note C#, 10 - note E_, 11 - note C#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note C#, 10 - callchannel Branch_1eacf7 - note D#, 11 - note C_, 10 - note E_, 7 - note C_, 4 - note C_, 4 - note C_, 3 - note C_, 3 - note C#, 11 - note C_, 10 - note D#, 11 - note C_, 4 - note C#, 3 - note C#, 3 - note C_, 16 - note __, 5 - note D#, 11 - note C_, 10 - note C#, 16 - note __, 5 - note D#, 11 - note C_, 5 - note C_, 5 - note D#, 11 - note C#, 10 - note E_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C#, 11 - note C#, 10 - note D#, 11 - note C#, 5 - note C#, 5 - callchannel Branch_1eacf7 - note D#, 11 - note C_, 10 - note E_, 7 - note C_, 4 - note C_, 4 - note C_, 3 - note C_, 3 - note C#, 11 - note C_, 10 - note D#, 11 - note C_, 4 - note C#, 3 - note C#, 3 - note C_, 11 - note C_, 10 - note D#, 11 - note C_, 5 - note C_, 5 - note C#, 11 - note C_, 10 - note D#, 11 - note C_, 10 - note D#, 11 - note C#, 10 - note E_, 11 - note C#, 5 - note C#, 5 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C#, 11 - note C_, 10 - note E_, 16 - note __, 5 - note D#, 11 - note C#, 10 - note E_, 11 - note C#, 10 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note C_, 10 - note D#, 11 - note C_, 10 - note C#, 11 - note E_, 10 - note C_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C_, 11 - note C#, 10 - note E_, 11 - note C#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C_, 11 - note D#, 10 - note E_, 11 - note C_, 5 - note C#, 5 - note C#, 11 - note C_, 10 - note C#, 16 - note __, 5 - note D#, 11 - note C#, 10 - note E_, 11 - note C_, 10 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 16 - note __, 5 - note D#, 11 - note C_, 10 - note C#, 11 - note C_, 10 - note __, 11 - note C_, 10 - note __, 11 - note C#, 10 - note E_, 11 - note C_, 10 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C#, 11 - note C_, 10 - note E_, 16 - note __, 5 - note D#, 11 - note C#, 10 - note E_, 11 - note C#, 10 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note C_, 10 - note D#, 11 - note C_, 10 - note C#, 11 - note E_, 10 - note C_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C_, 11 - note C#, 10 - note E_, 11 - note C#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C_, 11 - note D#, 10 - note E_, 11 - note C_, 5 - note C#, 5 - note C#, 11 - note C_, 10 - note C#, 16 - note __, 5 - note D#, 11 - note C#, 10 - note C#, 11 - note C#, 5 - note C#, 5 - note C#, 11 - note C#, 5 - note C#, 5 - note C#, 11 - note C#, 5 - note C#, 5 - note C_, 16 - note __, 5 - note D#, 11 - note C_, 4 - note D#, 3 - note D#, 3 - note E_, 11 - note C#, 10 - note D#, 11 - note C_, 10 - note D#, 11 - note C_, 10 - note E_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C#, 11 - note C#, 10 - note D#, 11 - note C#, 5 - note C#, 5 - note C_, 16 - note __, 5 - note D#, 11 - note C_, 4 - note D#, 3 - note D#, 3 - note E_, 11 - note C#, 10 - note D#, 11 - note C_, 10 - note D#, 11 - note C#, 10 - note E_, 11 - note C_, 5 - note C_, 5 - notetype 2 - note G_, 15 - notetype 1 - note __, 1 - note C#, 4 - note C#, 3 - note C#, 3 - note C_, 16 - note __, 5 - note D#, 11 - note C_, 4 - note D#, 3 - note D#, 3 - note E_, 11 - note C#, 10 - note D#, 11 - note C_, 10 - note D#, 11 - note C_, 10 - note E_, 11 - note C#, 4 - note C#, 3 - note C#, 3 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 11 - note C#, 10 - note C_, 11 - note D#, 10 - note C#, 11 - note C_, 10 - note D#, 11 - note C#, 10 - note C_, 11 - note D#, 10 - note C#, 11 - note C_, 10 - note D#, 11 - note C#, 10 - note C#, 11 - note D#, 5 - note C#, 5 - note C#, 4 - note C#, 4 - note C#, 3 - note C#, 4 - note C#, 3 - note C#, 3 - loopchannel 0, .MainLoop + sound_call Branch_1eacf7 + sound_call Branch_1ead02 + sound_call Branch_1eacf7 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 1, 10 + drum_note 2, 11 + drum_note 2, 10 + drum_note 4, 11 + ;musicef 253 + drum_note 2, 3 + ;musicef 255 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 4 + sound_call Branch_1eacf7 + drum_note 4, 11 + drum_note 1, 10 + drum_note 5, 7 + drum_note 1, 7 + drum_note 1, 7 + drum_note 2, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 2, 10 + sound_call Branch_1eacf7 + drum_note 1, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 2, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 2, 10 + sound_call Branch_1eacf7 + drum_note 4, 11 + drum_note 1, 10 + drum_note 5, 7 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 3 + drum_note 1, 3 + drum_note 2, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 4 + drum_note 2, 3 + drum_note 2, 3 + drum_note 1, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 10 + drum_note 2, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 5 + drum_note 1, 5 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 2, 4 + drum_note 2, 3 + drum_note 2, 3 + drum_note 2, 11 + drum_note 2, 10 + drum_note 4, 11 + drum_note 2, 5 + drum_note 2, 5 + sound_call Branch_1eacf7 + drum_note 4, 11 + drum_note 1, 10 + drum_note 5, 7 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 3 + drum_note 1, 3 + drum_note 2, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 4 + ;musicef 254 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + drum_note 1, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 5 + drum_note 1, 5 + drum_note 2, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 2, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 2, 11 + drum_note 1, 10 + drum_note 5, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 2, 10 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 2, 11 + drum_note 5, 10 + drum_note 1, 11 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 1, 11 + drum_note 2, 10 + drum_note 5, 11 + ;musicef 253 + drum_note 2, 5 + ;musicef 254 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + drum_note 1, 11 + drum_note 4, 10 + drum_note 5, 11 + drum_note 1, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 1, 10 + drum_note 2, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 1, 10 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 10 + drum_note 2, 11 + drum_note 1, 10 + rest 11 + drum_note 1, 10 + rest 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 1, 10 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 2, 11 + drum_note 1, 10 + drum_note 5, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 2, 10 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 2, 11 + drum_note 5, 10 + drum_note 1, 11 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + drum_note 2, 3 + ;musicef 0 + drum_note 1, 11 + drum_note 2, 10 + drum_note 5, 11 + ;musicef 253 + drum_note 2, 5 + ;musicef 254 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + drum_note 1, 11 + drum_note 4, 10 + drum_note 5, 11 + drum_note 1, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 1, 10 + drum_note 2, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 2, 10 + drum_note 2, 11 + drum_note 2, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 5 + drum_note 2, 5 + drum_note 2, 11 + ;musicef 253 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 5 + drum_note 1, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 4 + drum_note 4, 3 + drum_note 4, 3 + drum_note 5, 11 + drum_note 2, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 5, 11 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + drum_note 2, 11 + drum_note 2, 10 + drum_note 4, 11 + drum_note 2, 5 + drum_note 2, 5 + drum_note 1, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 4 + drum_note 4, 3 + drum_note 4, 3 + drum_note 5, 11 + drum_note 2, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 2, 10 + drum_note 5, 11 + drum_note 1, 5 + drum_note 1, 5 + ;musicef 1 + drum_speed 2 + drum_note 8, 15 + drum_speed 1 + rest 1 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + drum_note 1, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 4 + drum_note 4, 3 + drum_note 4, 3 + drum_note 5, 11 + drum_note 2, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 1, 10 + drum_note 5, 11 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + drum_note 2, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 4, 10 + drum_note 2, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 2, 10 + drum_note 1, 11 + drum_note 4, 10 + drum_note 2, 11 + drum_note 1, 10 + drum_note 4, 11 + drum_note 2, 10 + drum_note 2, 11 + drum_note 4, 5 + drum_note 2, 5 + ;musicef 254 + drum_note 2, 4 + ;musicef 253 + drum_note 2, 4 + drum_note 2, 3 + ;musicef 254 + drum_note 2, 4 + ;musicef 255 + drum_note 2, 3 + ;musicef 0 + drum_note 2, 3 + sound_loop 0, .MainLoop Branch_1eacf7: - note C_, 16 - note __, 5 - note D#, 11 - note C_, 10 - note C#, 16 - note __, 5 - note D#, 11 - note C_, 10 - endchannel + drum_note 1, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 10 + drum_note 2, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 1, 10 + sound_ret Branch_1ead02: - note D#, 11 - note C_, 10 - note E_, 11 - note C_, 5 - note C_, 5 - note C#, 16 - note __, 5 - note D#, 11 - note C#, 10 - endchannel - + drum_note 4, 11 + drum_note 1, 10 + drum_note 5, 11 + drum_note 1, 5 + drum_note 1, 5 + drum_note 2, 16 + ;tie + rest 5 + drum_note 4, 11 + drum_note 2, 10 + sound_ret +; 0x1ead0d diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm index f2900804..c43a54db 100644 --- a/crysaudio/music/TCG2/imakuni2.asm +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -1,444 +1,606 @@ -Music_TCG2Imakuni2: - db $C0 - dw Music_TCG2Imakuni2_Ch1 - db $01 - dw Music_TCG2Imakuni2_Ch2 - db $02 - dw Music_TCG2Imakuni2_Ch3 - db $03 - dw Music_TCG2Imakuni2_Ch4 +Music_Imakuni2: + channel_count 4 + channel 1, Music_Imakuni2_Ch1 + channel 2, Music_Imakuni2_Ch2 + channel 3, Music_Imakuni2_Ch3 + channel 4, Music_Imakuni2_Ch4 -Music_TCG2Imakuni2_Ch2: +Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) notetype1 10 .MainLoop + ;musicf0 31 + ;musicf3 + ;musicdc 255 notetype0 1 octave 2 + ;musicf0 31 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 inc_octave note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 - note __, 5 - note __, 12 + rest 11 + rest 5 + rest 12 dec_octave + ;musicef 254 note E_, 5 - note __, 11 + rest 11 inc_octave - note __, 9 - note __, 8 + rest 9 + rest 8 + ;musicef 254 note C_, 16 note C#, 5 - note __, 12 + rest 12 note D#, 16 note E_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 note G#, 8 - note __, 8 + rest 8 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 inc_octave note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 - note __, 5 - note __, 12 + rest 11 + rest 5 + rest 12 dec_octave + ;musicef 254 note E_, 5 - note __, 11 - note __, 9 - callchannel Branch_1f3762 - note __, 8 + rest 11 + rest 9 + sound_call Branch_1f3762 + rest 8 + ;musicf0 31 octave 2 note E_, 16 note G_, 16 + ;tie note G_, 5 + ;tie + ;musice4 19 note G_, 4 + ;tie + ;musice4 3 note G#, 4 + ;tie + ;musice4 27 note G#, 2 + ;tie + ;musice4 0 note A_, 2 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 inc_octave note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 - note __, 5 - note __, 12 + rest 11 + rest 5 + rest 12 dec_octave + ;musicef 254 note E_, 5 - note __, 11 + rest 11 inc_octave - note __, 9 - note __, 8 + rest 9 + rest 8 + ;musicef 254 note C_, 16 note C#, 5 - note __, 12 + rest 12 note D#, 16 note E_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 note G#, 8 - note __, 8 + rest 8 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 inc_octave note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 - note __, 5 - note __, 12 + rest 11 + rest 5 + rest 12 dec_octave + ;musicf0 31 note G_, 16 note A_, 9 inc_octave inc_octave - callchannel Branch_1f3762 - note __, 8 + sound_call Branch_1f3762 + rest 8 octave 3 - note __, 16 + rest 16 + ;musicf0 9 note D#, 9 + ;tie note E_, 8 + ;tie note E_, 16 - vibrato 1, $33 + ;musicf0 18 + ;vibrato_type 17 + vibrato 1, 3, 3 octave 4 note D#, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note D_, 3 note E_, 3 note D#, 2 note C_, 9 + ;tie note C_, 8 note C#, 16 note E_, 5 - note __, 4 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 + rest 4 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 note E_, 5 - note __, 12 + rest 12 note F#, 5 - note __, 11 + rest 11 note G_, 9 + ;tie note G_, 16 note F#, 3 note G_, 3 note F#, 2 note E_, 5 - note __, 12 + rest 12 note D#, 5 - note __, 11 + rest 11 note E_, 9 + ;tie note E_, 8 note C#, 5 - note __, 11 + rest 11 dec_octave note A_, 5 - note __, 12 + rest 12 notetype1 9 note G_, 16 + ;tie note G_, 9 + ;tie note G_, 8 + ;tie note G_, 16 + ;tie note G_, 4 + ;tie + ;musice4 254 note G_, 5 + ;tie + ;musice4 252 note G_, 4 + ;tie + ;musice4 250 note G_, 4 + ;tie + ;musice4 248 note G_, 4 + ;tie + ;musice4 255 note F#, 4 + ;tie + ;musice4 250 note F#, 4 + ;tie + ;musice4 247 note F#, 3 + ;tie + ;musice4 0 note F_, 1 - note __, 9 - callchannel Branch_1f3762 + rest 9 + sound_call Branch_1f3762 + ;musicf0 9 octave 2 - note __, 8 + rest 8 octave 2 note E_, 16 note G_, 9 + ;tie note G_, 8 + ;tie note G_, 5 + ;tie + ;musice4 19 note G_, 4 + ;tie + ;musice4 3 note G#, 4 + ;tie + ;musice4 27 note G#, 2 + ;tie + ;musice4 0 note A_, 1 - vibrato 1, $33 + ;musicf0 18 + ;vibrato_type 17 + vibrato 1, 3, 3 octave 4 note D#, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note D_, 3 note E_, 3 note D#, 2 note C_, 9 + ;tie note C_, 8 note C#, 16 note E_, 5 - note __, 4 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 + rest 4 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 note E_, 5 - note __, 12 + rest 12 note F#, 5 - note __, 11 + rest 11 note G_, 9 + ;tie note G_, 16 note F#, 3 note G_, 3 note F#, 2 note E_, 5 - note __, 12 + rest 12 note D#, 5 - note __, 11 + rest 11 note E_, 9 + ;tie note E_, 8 dec_octave note A_, 5 - note __, 11 + rest 11 inc_octave note A_, 5 - note __, 12 + rest 12 notetype1 8 note G_, 16 + ;tie note G_, 9 + ;tie note G_, 8 + ;tie note G_, 16 + ;tie note G_, 4 + ;tie + ;musice4 254 note G_, 5 + ;tie + ;musice4 252 note G_, 4 + ;tie + ;musice4 250 note G_, 4 + ;tie + ;musice4 248 note G_, 4 + ;tie + ;musice4 255 note F#, 4 + ;tie + ;musice4 250 note F#, 4 + ;tie + ;musice4 247 note F#, 3 + ;tie + ;musice4 0 note F_, 1 + ;musicf0 9 octave 2 note A_, 9 inc_octave note C#, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 inc_octave note E_, 5 - note __, 12 + rest 12 dec_octave note C#, 5 - note __, 3 + rest 3 note C#, 4 note E_, 4 note A_, 5 - note __, 4 - note __, 8 + rest 4 + rest 8 + ;musicf0 4 octave 3 - note __, 8 + rest 8 + ;musicef 251 note A_, 8 + ;musicef 2 note G#, 9 + ;musicef 2 note A_, 8 + ;musicef 2 inc_octave note E_, 8 note F_, 8 - vibrato 1, $33 + ;musicef 0 + ;musicf0 18 + ;vibrato_type 17 + vibrato 1, 3, 3 octave 4 note F#, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note F#, 3 note D_, 3 note F#, 2 note D_, 9 + ;tie note D_, 8 dec_octave note A#, 16 note B_, 5 - note __, 4 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 + rest 4 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 octave 4 note F#, 5 - note __, 12 + rest 12 note G#, 5 - note __, 11 + rest 11 note A_, 9 + ;tie note A_, 16 note G#, 3 note A_, 3 note G#, 2 note F#, 5 - note __, 12 + rest 12 note F_, 5 - note __, 11 + rest 11 note F#, 9 + ;tie note F#, 8 note D_, 5 - note __, 11 + rest 11 dec_octave note A#, 5 - note __, 12 + rest 12 notetype1 9 note G#, 16 + ;tie note G#, 9 + ;tie note G#, 8 + ;tie note G#, 16 + ;tie note G#, 5 + ;tie + ;musice4 254 note G#, 4 + ;tie + ;musice4 252 note G#, 4 + ;tie + ;musice4 250 note G#, 4 + ;tie + ;musice4 248 note G#, 4 + ;tie + ;musice4 255 note G_, 4 + ;tie + ;musice4 250 note G_, 4 + ;tie + ;musice4 247 note G_, 3 + ;tie + ;musice4 0 note F#, 1 - note __, 9 - callchannel Branch_1f3762 - note __, 8 - note __, 16 + rest 9 + ;musicec 5 + sound_call Branch_1f3762 + ;musicec 0 + rest 8 + rest 16 + ;musicf0 9 octave 3 note D#, 9 + ;tie note E_, 8 + ;tie note E_, 16 - vibrato 1, $33 + ;musicf0 18 + ;vibrato_type 17 + vibrato 1, 3, 3 octave 4 note D#, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note D_, 3 note E_, 3 note D#, 2 note C_, 9 + ;tie note C_, 8 note C#, 16 note E_, 5 - note __, 4 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 + rest 4 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 note E_, 5 - note __, 12 + rest 12 note F#, 5 - note __, 11 + rest 11 note G_, 9 + ;tie note G_, 16 note F#, 3 note G_, 3 note F#, 2 note E_, 5 - note __, 12 + rest 12 note D#, 5 - note __, 11 + rest 11 note E_, 9 + ;tie note E_, 8 dec_octave note A_, 5 - note __, 11 + rest 11 inc_octave note A_, 5 - note __, 12 + rest 12 notetype1 8 note G_, 16 + ;tie note G_, 9 + ;tie note G_, 8 + ;tie note G_, 16 + ;tie note G_, 4 + ;tie + ;musice4 254 note G_, 5 + ;tie + ;musice4 252 note G_, 4 + ;tie + ;musice4 250 note G_, 4 + ;tie + ;musice4 248 note G_, 4 + ;tie + ;musice4 255 note F#, 4 + ;tie + ;musice4 250 note F#, 4 + ;tie + ;musice4 247 note F#, 3 + ;tie + ;musice4 0 note F_, 1 octave 2 + ;musicf0 31 note A_, 9 inc_octave + ;musicf0 9 note C#, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 inc_octave note E_, 5 - note __, 12 + rest 12 dec_octave note C#, 5 - note __, 3 + rest 3 inc_octave note C#, 4 note E_, 4 note A_, 5 - note __, 4 - note __, 8 - note __, 16 + rest 4 + rest 8 + rest 16 + ;musicf0 8 + ;musice4 0 + ;musicef 2 octave 3 note B_, 5 note A_, 4 @@ -452,11 +614,13 @@ Music_TCG2Imakuni2_Ch2: note B_, 4 inc_octave note D#, 5 + ;tie note E_, 4 note G#, 8 note B_, 8 inc_octave note D_, 8 + ;tie note D_, 9 note C#, 8 dec_octave @@ -465,7 +629,7 @@ Music_TCG2Imakuni2_Ch2: note E_, 9 note G#, 8 note B_, 8 - note __, 8 + rest 8 inc_octave note C#, 5 note D_, 4 @@ -477,11 +641,13 @@ Music_TCG2Imakuni2_Ch2: note D_, 4 dec_octave note C#, 5 + ;tie note D_, 4 note F#, 8 note A_, 8 inc_octave note C_, 8 + ;tie note C_, 9 dec_octave note B_, 8 @@ -490,7 +656,7 @@ Music_TCG2Imakuni2_Ch2: note D_, 9 note F#, 8 note A_, 8 - note __, 8 + rest 8 note B_, 5 inc_octave note C_, 4 @@ -508,11 +674,13 @@ Music_TCG2Imakuni2_Ch2: note C_, 4 dec_octave note D#, 5 + ;tie note E_, 4 note G#, 8 note B_, 8 inc_octave note D_, 8 + ;tie note D_, 9 note C#, 8 dec_octave @@ -523,6 +691,7 @@ Music_TCG2Imakuni2_Ch2: inc_octave note C_, 8 note D#, 8 + ;tie note D#, 9 note D_, 8 note C_, 8 @@ -553,480 +722,586 @@ Music_TCG2Imakuni2_Ch2: inc_octave .Loop1 note E_, 5 - note __, 6 - loopchannel 3, .Loop1 + rest 6 + ;musicef 253 + sound_loop 3, .Loop1 + ;musicf0 9 octave 2 note G_, 16 + ;tie note G_, 5 + ;tie + ;musice4 19 note G_, 4 + ;tie + ;musice4 3 note G#, 4 + ;tie + ;musice4 27 note G#, 2 + ;tie + ;musice4 0 note A_, 2 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f3762: + ;musicf0 9 + ;musicf1 101 + ;musicf3 + ;musicdc 255 notetype0 1 + ;musicef 255 octave 4 note C#, 5 - note __, 3 + rest 3 note C#, 5 - note __, 11 + rest 11 note C#, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note C#, 5 - note __, 3 + rest 3 note C#, 5 - note __, 4 - endchannel + rest 4 + sound_ret -Music_TCG2Imakuni2_Ch1: +Music_Imakuni2_Ch1: ; 1f377a (7c:777a) notetype1 10 .MainLoop + ;musicf0 9 + ;musicf1 103 + ;musicf3 + ;musicdc 255 notetype0 1 + ;musicef 255 octave 4 - note __, 9 - note __, 8 - note __, 8 - note __, 8 + rest 9 + rest 8 + rest 8 + rest 8 note E_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave note D#, 5 - note __, 11 + rest 11 dec_octave - note __, 9 - note __, 8 + rest 9 + rest 8 + ;musicef 254 note D#, 5 - note __, 11 - note __, 9 - note __, 8 + rest 11 + rest 9 + rest 8 + ;musicef 254 note G#, 16 note A_, 5 - note __, 12 + rest 12 inc_octave note C_, 16 note C#, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 - note __, 8 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 + rest 8 + rest 8 + ;musicef 4 inc_octave - note __, 9 - note __, 8 - note __, 8 - note __, 8 + rest 9 + rest 8 + rest 8 + rest 8 note E_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave note D#, 5 - note __, 11 + rest 11 dec_octave - note __, 9 - note __, 8 + rest 9 + rest 8 + ;musicef 254 note D#, 5 - note __, 11 + rest 11 + ;musicef 2 inc_octave inc_octave - note __, 9 + rest 9 note C_, 5 - note __, 3 + rest 3 note C_, 5 - note __, 11 + rest 11 note C_, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note C_, 5 - note __, 3 + rest 3 note C_, 5 - note __, 12 + rest 12 dec_octave dec_octave - note __, 16 - note __, 9 - note __, 8 - note __, 16 + rest 16 + rest 9 + rest 8 + rest 16 octave 4 - note __, 9 - note __, 8 - note __, 8 - note __, 8 + rest 9 + rest 8 + rest 8 + rest 8 note E_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave note D#, 5 - note __, 11 + rest 11 dec_octave - note __, 9 - note __, 8 + rest 9 + rest 8 + ;musicef 254 note D#, 5 - note __, 11 - note __, 9 - note __, 8 + rest 11 + rest 9 + rest 8 + ;musicef 254 note G#, 16 note A_, 5 - note __, 12 + rest 12 inc_octave note C_, 16 note C#, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 - note __, 8 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 + rest 8 + rest 8 + ;musicef 4 inc_octave - note __, 9 - note __, 8 - note __, 8 - note __, 8 + rest 9 + rest 8 + rest 8 + rest 8 note E_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave note D#, 5 - note __, 11 + rest 11 dec_octave - note __, 9 - note __, 8 + rest 9 + rest 8 + ;musicef 254 note E_, 5 - note __, 11 + rest 11 + ;musicef 2 inc_octave inc_octave - note __, 9 + rest 9 note C_, 5 - note __, 3 + rest 3 note C_, 5 - note __, 11 + rest 11 note C_, 5 - note __, 4 - note __, 16 + rest 4 + rest 16 note C_, 5 - note __, 3 + rest 3 note C_, 5 - note __, 12 + rest 12 dec_octave dec_octave - note __, 16 + rest 16 note G_, 9 + ;tie note G#, 8 + ;tie note G#, 16 + ;musicf0 31 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note C#, 2 - note __, 15 + rest 15 + ;musicef 2 dec_octave note E_, 5 - note __, 11 + rest 11 note A_, 9 inc_octave + ;musicf0 9 note C#, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 dec_octave note A_, 5 - note __, 4 - note __, 8 + rest 4 + rest 8 inc_octave inc_octave note G#, 5 - note __, 3 + rest 3 dec_octave note C#, 4 note E_, 4 note A_, 5 - note __, 4 - note __, 8 - callchannel Branch_1f3a58 + rest 4 + rest 8 + sound_call Branch_1f3a58 + ;musicf0 31 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note C#, 2 - note __, 15 + rest 15 + ;musicef 2 dec_octave note E_, 5 - note __, 11 - note __, 9 - callchannel Branch_1f3762 - note __, 8 - note __, 16 - note __, 9 - note __, 8 - note __, 16 + rest 11 + rest 9 + ;musicec 255 + sound_call Branch_1f3762 + ;musicec 0 + rest 8 + rest 16 + rest 9 + rest 8 + rest 16 + ;musicf0 31 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note C#, 2 - note __, 15 + rest 15 + ;musicef 2 dec_octave note E_, 5 - note __, 11 + rest 11 note A_, 9 inc_octave + ;musicf0 9 note C#, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 dec_octave note A_, 5 - note __, 4 - note __, 8 + rest 4 + rest 8 inc_octave inc_octave note G#, 5 - note __, 3 + rest 3 dec_octave note C#, 4 note E_, 4 note A_, 5 - note __, 4 - note __, 8 - callchannel Branch_1f3a58 + rest 4 + rest 8 + sound_call Branch_1f3a58 + ;musicf0 31 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note C#, 2 - note __, 15 + rest 15 + ;musicef 2 dec_octave note E_, 5 - note __, 11 - note __, 9 + rest 11 + ;musicf0 9 + ;musicef 255 + rest 9 inc_octave - note __, 5 - note __, 3 - note __, 16 + rest 5 + rest 3 + rest 16 inc_octave note C#, 5 - note __, 12 + rest 12 dec_octave note C_, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 note E_, 5 - note __, 4 + rest 4 dec_octave note A_, 8 - callchannel Branch_1f3a58 + sound_call Branch_1f3a58 + ;musicf0 31 octave 3 note D_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note D_, 3 note F#, 3 note A_, 2 inc_octave note D_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note A#, 16 note B_, 9 - note __, 8 + rest 8 + ;musicf0 9 note A_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note F#, 2 - note __, 15 + rest 15 + ;musicef 2 note C#, 5 - note __, 11 + rest 11 note D_, 9 + ;musicf0 9 note F#, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 note D_, 5 - note __, 4 - note __, 8 + rest 4 + rest 8 inc_octave inc_octave note C#, 5 - note __, 3 + rest 3 dec_octave dec_octave note F#, 4 note A_, 4 inc_octave note D_, 5 - note __, 4 - note __, 8 - callchannel Branch_1f3a58 + rest 4 + rest 8 + ;musicec 253 + sound_call Branch_1f3a58 + ;musicec 0 + ;musicf0 9 octave 3 - note __, 9 - note __, 8 - note __, 8 + rest 9 + rest 8 + rest 8 note D_, 3 note F#, 3 note A_, 2 inc_octave note D_, 5 - note __, 12 + rest 12 dec_octave + ;musicf0 31 note A#, 16 note B_, 9 - note __, 8 + rest 8 + ;musicf0 9 note A_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note F#, 2 - note __, 15 + rest 15 + ;musicef 2 note C#, 5 - note __, 11 - note __, 9 - callchannel Branch_1f3762 - note __, 8 - note __, 16 + rest 11 + rest 9 + ;musicec 6 + sound_call Branch_1f3762 + ;musicec 0 + rest 8 + rest 16 + ;musicf0 9 octave 2 note G_, 9 + ;tie note G#, 8 + ;tie note G#, 16 + ;musicf0 31 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note C#, 2 - note __, 15 + rest 15 + ;musicef 2 dec_octave note E_, 5 - note __, 11 + rest 11 note A_, 9 + ;musicf0 9 inc_octave note C#, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 dec_octave note A_, 5 - note __, 4 - note __, 8 + rest 4 + rest 8 inc_octave inc_octave note G#, 5 - note __, 3 + rest 3 dec_octave note C#, 4 note E_, 4 note A_, 5 - note __, 4 - note __, 8 - callchannel Branch_1f3a58 + rest 4 + rest 8 + sound_call Branch_1f3a58 + ;musicf0 31 octave 2 note A_, 9 - note __, 8 - note __, 8 + rest 8 + rest 8 + ;musicf0 9 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 - note __, 12 + rest 12 + ;musicf0 31 note F#, 16 note G_, 9 - note __, 8 + rest 8 + ;musicf0 9 note E_, 5 - note __, 11 + rest 11 + ;musicf0 31 + ;musicef 254 note C#, 2 - note __, 15 + rest 15 + ;musicef 2 dec_octave note E_, 5 - note __, 11 - note __, 9 + rest 11 + ;musicf0 9 + rest 9 inc_octave note C_, 5 - note __, 3 - note __, 16 + rest 3 + rest 16 inc_octave note C#, 5 - note __, 12 + rest 12 dec_octave note C_, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 inc_octave note E_, 5 - note __, 4 - note __, 8 + rest 4 + rest 8 octave 2 note G_, 8 - note __, 8 + rest 8 inc_octave note C_, 9 + ;tie note C_, 8 note D_, 8 - note __, 8 - vibrato 1, $33 + rest 8 + ;vibrato_type 5 + vibrato 1, 3, 3 octave 3 note E_, 9 note G#, 8 note B_, 4 - note __, 4 + rest 4 inc_octave note C#, 4 note D_, 13 @@ -1037,7 +1312,7 @@ Music_TCG2Imakuni2_Ch1: note E_, 9 note G#, 8 note B_, 8 - note __, 8 + rest 8 inc_octave note G_, 5 note G#, 4 @@ -1051,7 +1326,7 @@ Music_TCG2Imakuni2_Ch1: note D_, 9 note F#, 8 note A_, 4 - note __, 4 + rest 4 note B_, 4 inc_octave note C_, 13 @@ -1062,7 +1337,7 @@ Music_TCG2Imakuni2_Ch1: note D_, 9 note F#, 8 note A_, 8 - note __, 8 + rest 8 inc_octave note F_, 5 note F#, 4 @@ -1076,7 +1351,7 @@ Music_TCG2Imakuni2_Ch1: note E_, 9 note G#, 8 note B_, 4 - note __, 4 + rest 4 inc_octave note C#, 4 note D_, 13 @@ -1084,12 +1359,12 @@ Music_TCG2Imakuni2_Ch1: dec_octave note B_, 8 note E_, 4 - note __, 4 + rest 4 note F_, 9 note A_, 8 inc_octave note C_, 4 - note __, 4 + rest 4 note D_, 4 note D#, 13 note D_, 8 @@ -1098,604 +1373,675 @@ Music_TCG2Imakuni2_Ch1: note F_, 8 notetype1 4 note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 2 + ;musicf0 8 + ;musicef 2 + ;musice4 0 .Loop1 note B_, 5 - note __, 6 - loopchannel 3, .Loop1 + rest 6 + ;musicef 253 + sound_loop 3, .Loop1 note B_, 5 - note __, 6 + rest 6 note B_, 5 - note __, 6 + rest 6 note B_, 5 - note __, 6 - loopchannel 0, .MainLoop + rest 6 + sound_loop 0, .MainLoop Branch_1f3a58: + ;musicf0 4 octave 4 + ;musicef 251 note C_, 8 + ;musicef 2 note C#, 8 + ;musicef 2 note C_, 9 + ;musicef 2 note C#, 8 note C_, 8 note C#, 8 - endchannel + ;musicef 0 + sound_ret -Music_TCG2Imakuni2_Ch3: +Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) notetype1 10 notetype0 1 notetype2 11 + ;musicdc 255 notetype1 1 + ;musice9 96 .MainLoop + ;musice8 8 octave 2 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave note A_, 9 - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 16 - note __, 16 - note __, 9 + rest 16 + rest 16 + rest 9 dec_octave notetype1 2 note G_, 16 note A_, 9 notetype1 1 - note __, 16 - note __, 8 - note __, 9 - note __, 16 - note __, 8 - note __, 9 - note __, 8 + rest 16 + rest 8 + rest 9 + rest 16 + rest 8 + rest 9 + rest 8 note F#, 16 note G_, 9 - note __, 8 + rest 8 note G#, 8 - note __, 8 + rest 8 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave note A_, 9 - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 16 - note __, 8 - note __, 9 - note __, 8 + rest 16 + rest 8 + rest 9 + rest 8 dec_octave notetype1 2 note G_, 16 note A_, 9 notetype1 1 - callchannel Branch_1f3d18 + sound_call Branch_1f3d18 octave 2 notetype1 1 - note __, 8 + rest 8 note E_, 8 - note __, 8 + rest 8 note G_, 16 + ;tie note G_, 5 + ;tie + ;musice4 38 note G_, 4 + ;tie + ;musice4 6 note G#, 4 + ;tie + ;musice4 52 note G#, 2 + ;tie + ;musice4 0 note A_, 2 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave note A_, 9 - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 16 - note __, 8 - note __, 9 - note __, 8 + rest 16 + rest 8 + rest 9 + rest 8 dec_octave notetype1 2 note G_, 16 note A_, 9 notetype1 1 - note __, 16 - note __, 8 - note __, 9 - note __, 16 - note __, 8 - note __, 9 - note __, 8 + rest 16 + rest 8 + rest 9 + rest 16 + rest 8 + rest 9 + rest 8 note F#, 16 note G_, 9 - note __, 8 + rest 8 note G#, 8 - note __, 8 + rest 8 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave note A_, 9 - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 16 - note __, 8 - note __, 9 - note __, 8 + rest 16 + rest 8 + rest 9 + rest 8 dec_octave note G_, 16 note A_, 9 - callchannel Branch_1f3d18 - note __, 8 - note __, 16 + sound_call Branch_1f3d18 + rest 8 + rest 16 octave 2 notetype1 1 note A_, 9 + ;tie note A#, 16 + ;tie note A#, 8 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave inc_octave note E_, 5 - note __, 4 + rest 4 dec_octave - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note C#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave dec_octave note E_, 16 note A_, 5 - note __, 4 + rest 4 inc_octave inc_octave note C_, 5 - note __, 3 + rest 3 dec_octave note E_, 2 - note __, 6 + rest 6 inc_octave note D#, 2 - note __, 6 + rest 6 note A_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave dec_octave note E_, 5 - note __, 11 + rest 11 note G_, 9 + ;tie note G_, 8 note G#, 16 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave inc_octave note E_, 5 - note __, 4 + rest 4 dec_octave dec_octave - note __, 8 + rest 8 inc_octave note F#, 16 note G_, 9 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note C#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave dec_octave note E_, 16 note A_, 9 - callchannel Branch_1f3d18 + sound_call Branch_1f3d18 octave 2 notetype1 1 - note __, 8 + rest 8 note E_, 8 - note __, 8 + rest 8 note G_, 9 + ;tie note G_, 8 + ;tie note G_, 4 + ;tie + ;musice4 38 note G_, 4 + ;tie + ;musice4 6 note G#, 4 + ;tie + ;musice4 52 note G#, 3 + ;tie + ;musice4 0 note A_, 1 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave inc_octave note E_, 5 - note __, 4 + rest 4 dec_octave - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note C#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave dec_octave note E_, 16 note A_, 5 - note __, 4 + rest 4 inc_octave inc_octave note C_, 5 - note __, 3 + rest 3 dec_octave note E_, 2 - note __, 6 + rest 6 inc_octave note D#, 2 - note __, 6 + rest 6 note A_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave dec_octave note E_, 5 - note __, 11 + rest 11 note G_, 9 + ;tie note G_, 8 note G#, 16 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave inc_octave note E_, 5 - note __, 4 + rest 4 dec_octave - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note C#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave dec_octave note E_, 16 note A_, 5 - note __, 4 + rest 4 inc_octave inc_octave note C_, 5 - note __, 3 + rest 3 dec_octave note E_, 2 - note __, 6 + rest 6 inc_octave note D#, 2 - note __, 6 + rest 6 note A_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave dec_octave note A_, 5 - note __, 11 + rest 11 inc_octave note C_, 9 + ;tie note C_, 8 + ;tie note C_, 4 + ;tie + ;musice4 28 note C_, 4 + ;tie + ;musice4 8 note C#, 4 + ;tie + ;musice4 37 note C#, 3 + ;tie + ;musice4 0 note D_, 1 note D_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave note A_, 5 - note __, 4 + rest 4 dec_octave - note __, 8 + rest 8 note A#, 16 note B_, 9 - note __, 8 + rest 8 inc_octave note G#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note F#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave note C#, 16 note D_, 5 - note __, 4 + rest 4 inc_octave note F_, 5 - note __, 3 + rest 3 dec_octave note A_, 2 - note __, 6 + rest 6 inc_octave note D_, 2 - note __, 6 + rest 6 inc_octave note D_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave dec_octave dec_octave note A_, 5 - note __, 11 + rest 11 inc_octave note C_, 9 + ;tie note C_, 8 note C#, 16 note D_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave note A_, 5 - note __, 4 + rest 4 dec_octave - note __, 8 + rest 8 note A#, 16 note B_, 9 - note __, 8 + rest 8 inc_octave note G#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note F#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave note C#, 16 note D_, 9 - callchannel Branch_1f3d18 + ;musicec 7 + sound_call Branch_1f3d18 + ;musicec 0 octave 2 notetype1 1 - note __, 16 - note __, 8 + rest 16 + rest 8 note A_, 9 + ;tie note A#, 16 + ;tie note A#, 8 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave inc_octave note E_, 5 - note __, 4 + rest 4 dec_octave - note __, 8 + rest 8 note F#, 16 note G_, 9 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note C#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave dec_octave note E_, 16 note A_, 5 - note __, 4 + rest 4 inc_octave inc_octave note C_, 5 - note __, 3 + rest 3 dec_octave note E_, 2 - note __, 6 + rest 6 inc_octave note D#, 2 - note __, 6 + rest 6 note A_, 5 - note __, 12 - note __, 16 - note __, 9 - note __, 8 + rest 12 + rest 16 + rest 9 + rest 8 dec_octave dec_octave note E_, 5 - note __, 11 + rest 11 note G_, 9 + ;tie note G_, 8 note G#, 16 note A_, 9 - note __, 16 - note __, 8 + rest 16 + rest 8 inc_octave inc_octave note E_, 5 - note __, 4 + rest 4 dec_octave dec_octave - note __, 8 + rest 8 inc_octave note F#, 16 note G_, 9 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 3 - note __, 8 + rest 3 + rest 8 notetype1 2 note C#, 2 notetype1 1 - note __, 15 + rest 15 dec_octave dec_octave note E_, 16 note A_, 5 - note __, 12 + rest 12 inc_octave note E_, 2 - note __, 6 + rest 6 note D#, 2 - note __, 6 + rest 6 note A_, 5 - note __, 12 + rest 12 dec_octave note G_, 5 - note __, 11 + rest 11 note A_, 5 - note __, 12 + rest 12 note G_, 8 - note __, 8 + rest 8 inc_octave note C_, 9 + ;tie note C_, 8 note D_, 8 - note __, 8 + rest 8 dec_octave note E_, 9 + ;tie note E_, 8 - note __, 8 + rest 8 inc_octave note E_, 8 - note __, 9 + rest 9 note E_, 8 note D_, 8 note E_, 8 - note __, 9 + rest 9 dec_octave note E_, 8 inc_octave note E_, 8 - note __, 8 + rest 8 dec_octave note E_, 9 + ;tie note E_, 8 note D#, 16 note D_, 9 + ;tie note D_, 8 - note __, 8 + rest 8 inc_octave note D_, 8 - note __, 9 + rest 9 note D_, 8 note C_, 8 note D_, 8 - note __, 9 + rest 9 dec_octave note D_, 8 inc_octave note D_, 8 - note __, 8 + rest 8 dec_octave note D_, 9 + ;tie note D_, 8 note D#, 16 note E_, 9 - note __, 8 + rest 8 note E_, 8 inc_octave note E_, 8 - note __, 9 + rest 9 note E_, 8 dec_octave note E_, 8 - note __, 8 + rest 8 note F_, 9 - note __, 8 + rest 8 note F_, 8 inc_octave note F_, 8 - note __, 9 + rest 9 note F_, 8 dec_octave note F_, 8 note D#, 8 note E_, 3 - note __, 2 + rest 2 note E_, 4 note D_, 4 note D#, 4 note E_, 3 - note __, 1 + rest 1 note E_, 4 note D_, 4 note D#, 4 note E_, 3 - note __, 2 + rest 2 note E_, 4 note D_, 4 note D#, 4 note E_, 3 - note __, 1 + rest 1 note G#, 4 note B_, 4 inc_octave note D_, 4 note E_, 9 - note __, 2 + rest 2 notetype1 2 note E_, 4 - note __, 6 + rest 6 notetype1 3 note E_, 4 - note __, 6 - note __, 2 + rest 6 + rest 2 notetype1 1 dec_octave note G_, 16 + ;tie note G_, 5 + ;tie + ;musice4 38 note G_, 4 + ;tie + ;musice4 6 note G#, 4 + ;tie + ;musice4 52 note G#, 2 + ;tie + ;musice4 0 note A_, 2 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1f3d18: + ;musice8 1 notetype1 1 .Loop1 notetype1 1 @@ -1704,16 +2050,16 @@ Branch_1f3d18: notetype1 3 dec_octave note C#, 7 - loopchannel 2, .Loop1 - note __, 8 + sound_loop 2, .Loop1 + rest 8 octave 7 notetype1 1 note C#, 1 notetype1 3 dec_octave note C#, 7 - note __, 1 - note __, 16 + rest 1 + rest 16 .Loop2 notetype1 1 octave 7 @@ -1721,427 +2067,472 @@ Branch_1f3d18: notetype1 3 dec_octave note C#, 7 - loopchannel 2, .Loop2 - note __, 1 - endchannel + sound_loop 2, .Loop2 + rest 1 + ;musice8 8 + sound_ret -Music_TCG2Imakuni2_Ch4: - togglenoise $06 +Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) + toggle_noise 6 .MainLoop - notetype 1 + drum_speed 1 octave 1 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note A#, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 16 - note D#, 16 - note __, 1 - note C_, 16 - note C#, 16 - note __, 1 - note C#, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 8 - note C#, 4 - note C#, 4 - note C#, 9 - note G#, 8 - note G#, 16 - note G#, 16 - note __, 1 - note D#, 8 - note G#, 8 - note G#, 16 - note __, 1 - note C#, 16 - note C#, 16 - note __, 1 - note C#, 6 - note C#, 5 - note C#, 5 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 16 - note D#, 16 - note __, 1 - note C_, 16 - note C#, 16 - note __, 1 - note C#, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note C#, 16 - note __, 1 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 9 - note G#, 8 - note G#, 16 - note G#, 16 - note __, 1 - note D#, 8 - note G#, 8 - note G#, 16 - note __, 1 - note __, 16 - notetype 2 - note E_, 16 - notetype 1 - note __, 1 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 16 - note C#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C#, 8 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 9 - note G#, 8 - note G#, 16 - note G#, 16 - note __, 1 - note D#, 8 - note G#, 8 - note G#, 16 - note __, 1 - note C#, 16 - note C#, 16 - note __, 1 - note C#, 6 - note C#, 5 - note C#, 5 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 16 - note C#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C#, 8 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C_, 16 - note __, 1 - note D#, 16 - note C#, 16 - note __, 1 - note D#, 8 - note C#, 8 - note C#, 16 - note __, 1 - note C#, 16 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 16 - note C#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C#, 8 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 9 - note G#, 8 - note G#, 16 - note G#, 16 - note __, 1 - note D#, 8 - note G#, 8 - note G#, 16 - note __, 1 - note __, 16 - notetype 2 - note E_, 16 - notetype 1 - note __, 1 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 16 - note C#, 16 - note __, 1 - note E_, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C#, 8 - note C#, 16 - note __, 1 - note C#, 16 - note C_, 16 - note __, 1 - note D#, 8 - note C_, 8 - note C#, 16 - note __, 1 - note E_, 16 - note D#, 9 - note D#, 8 - note E_, 16 - note D#, 16 - note __, 1 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C_, 16 - note __, 1 - note D#, 16 - note C#, 16 - note __, 1 - note D#, 8 - note C#, 8 - note C#, 16 - note __, 1 - note E_, 16 - note C#, 9 - note C#, 4 - note C#, 4 - note C#, 8 - note C#, 4 - note C#, 4 - note C_, 16 - note __, 1 - note C#, 8 - note E_, 16 - note __, 1 - note C#, 8 - note D#, 8 - note D#, 8 - note C_, 9 - note C#, 8 - note E_, 8 - note C#, 4 - note C#, 4 - note C#, 9 - note C#, 8 - note D#, 8 - note C#, 8 - note C_, 9 - note C#, 4 - note C#, 4 - note C#, 8 - note C_, 16 - note __, 1 - note C_, 8 - note C#, 8 - note C#, 4 - note C#, 4 - note C_, 9 - note C#, 8 - note E_, 8 - note C#, 4 - note C#, 4 - note C#, 9 - note D#, 4 - note C#, 4 - note C#, 8 - note C#, 8 - note C_, 9 - note C#, 8 - note C#, 8 - note C#, 8 - note D#, 9 - note C#, 4 - note C#, 4 - note C#, 8 - note C#, 8 - note C_, 9 - note D#, 4 - note C#, 4 - note C#, 8 - note E_, 8 - note D#, 9 - note C#, 4 - note C#, 4 - note C#, 8 - note C#, 8 - note C#, 9 - note C#, 4 - note C#, 4 - note C#, 8 - note C#, 4 - note C#, 4 - note C#, 9 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 16 - note __, 1 - note __, 16 - notetype 2 - note E_, 16 - notetype 1 - note __, 1 - loopchannel 0, .MainLoop - + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 11, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 1, 16 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 8 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 9 + drum_note 9, 8 + drum_note 9, 16 + drum_note 9, 16 + rest 1 + drum_note 4, 8 + drum_note 9, 8 + drum_note 9, 16 + rest 1 + drum_note 2, 16 + drum_note 2, 16 + rest 1 + ;musicef 250 + drum_note 2, 6 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 1, 16 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 2, 16 + rest 1 + ;musicef 250 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 9 + drum_note 9, 8 + drum_note 9, 16 + drum_note 9, 16 + rest 1 + drum_note 4, 8 + drum_note 9, 8 + drum_note 9, 16 + rest 1 + rest 16 + drum_speed 2 + drum_note 5, 16 + drum_speed 1 + rest 1 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 16 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 2, 8 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + ;musicef 250 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 9 + drum_note 9, 8 + drum_note 9, 16 + drum_note 9, 16 + rest 1 + drum_note 4, 8 + drum_note 9, 8 + drum_note 9, 16 + rest 1 + drum_note 2, 16 + drum_note 2, 16 + rest 1 + ;musicef 250 + drum_note 2, 6 + ;musicef 252 + drum_note 2, 5 + drum_note 2, 5 + ;musicef 0 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 16 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 2, 8 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + ;musicef 250 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 1, 16 + rest 1 + drum_note 4, 16 + drum_note 2, 16 + rest 1 + drum_note 4, 8 + drum_note 2, 8 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 16 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 2, 8 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + ;musicef 250 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 9 + drum_note 9, 8 + drum_note 9, 16 + drum_note 9, 16 + rest 1 + drum_note 4, 8 + drum_note 9, 8 + drum_note 9, 16 + rest 1 + rest 16 + drum_speed 2 + drum_note 5, 16 + drum_speed 1 + rest 1 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 16 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 2, 8 + drum_note 2, 16 + rest 1 + drum_note 2, 16 + drum_note 1, 16 + rest 1 + drum_note 4, 8 + drum_note 1, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 4, 9 + drum_note 4, 8 + drum_note 5, 16 + drum_note 4, 16 + rest 1 + ;musicef 250 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 0 + drum_note 1, 16 + rest 1 + drum_note 4, 16 + drum_note 2, 16 + rest 1 + drum_note 4, 8 + drum_note 2, 8 + drum_note 2, 16 + rest 1 + drum_note 5, 16 + drum_note 2, 9 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 2, 8 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 1, 16 + rest 1 + drum_note 2, 8 + drum_note 5, 16 + rest 1 + drum_note 2, 8 + drum_note 4, 8 + drum_note 4, 8 + drum_note 1, 9 + drum_note 2, 8 + drum_note 5, 8 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 2, 9 + drum_note 2, 8 + drum_note 4, 8 + drum_note 2, 8 + drum_note 1, 9 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 1, 16 + rest 1 + drum_note 1, 8 + drum_note 2, 8 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 1, 9 + drum_note 2, 8 + drum_note 5, 8 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 9 + drum_note 4, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 8 + drum_note 1, 9 + drum_note 2, 8 + drum_note 2, 8 + drum_note 2, 8 + drum_note 4, 9 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 2, 8 + drum_note 1, 9 + drum_note 4, 4 + drum_note 2, 4 + drum_note 2, 8 + drum_note 5, 8 + drum_note 4, 9 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 8 + drum_note 2, 8 + drum_note 2, 9 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 2, 8 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 2, 9 + ;musicef 250 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 250 + drum_note 2, 4 + ;musicef 252 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 4 + drum_note 2, 16 + rest 1 + rest 16 + drum_speed 2 + drum_note 5, 16 + drum_speed 1 + rest 1 + sound_loop 0, .MainLoop +; 0x1f3f40 diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm index cb45d0d8..5a6c5e26 100644 --- a/crysaudio/music/TCG2/ishihara.asm +++ b/crysaudio/music/TCG2/ishihara.asm @@ -1,156 +1,179 @@ -Music_TCG2Ishihara: - db $C0 - dw Music_TCG2Ishihara_Ch1 - db $01 - dw Music_TCG2Ishihara_Ch2 - db $02 - dw Music_TCG2Ishihara_Ch3 - db $03 - dw Music_TCG2Ishihara_Ch4 +Music_Ishihara: + channel_count 4 + channel 1, Music_Ishihara_Ch1 + channel 2, Music_Ishihara_Ch2 + channel 3, Music_Ishihara_Ch3 + channel 4, Music_Ishihara_Ch4 -Music_TCG2Ishihara_Ch2: +Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) notetype1 10 notetype0 1 - note __, 13 - note __, 14 - note __, 13 + ;musicdc 255 + rest 13 + rest 14 + rest 13 .MainLoop + ;musicf0 27 octave 2 + ;musicf1 87 + ;musicf3 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 note A_, 5 - note __, 9 + rest 9 note A_, 5 - note __, 8 + rest 8 note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note G_, 5 - note __, 9 + rest 9 note G_, 5 - note __, 8 + rest 8 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 note A_, 5 - note __, 9 + rest 9 note A_, 5 - note __, 8 + rest 8 note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note G_, 16 + ;tie note G_, 11 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 note A_, 5 - note __, 9 + rest 9 note A_, 5 - note __, 8 + rest 8 note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note G_, 5 - note __, 9 + rest 9 note G_, 5 - note __, 8 + rest 8 + ;musicf2 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 2 + rest 2 + ;musicf3 + ;musicf0 3 + ;musicef 254 + ;musicf1 69 octave 4 + ;musicf3 note G#, 13 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 7 + ;musicf3 dec_octave note B_, 13 inc_octave + ;musicf2 note C_, 5 - note __, 2 + rest 2 note C_, 7 + ;musicf3 dec_octave note G#, 13 + ;musicf2 note A_, 2 - note __, 5 + rest 5 note A_, 7 + ;musicf3 note E_, 13 + ;musicf2 note F_, 5 - note __, 2 + rest 2 note F_, 7 + ;musicf3 + ;musicf0 27 octave 2 + ;musicf3 note C_, 5 - note __, 8 + rest 8 note A_, 5 - note __, 9 + rest 9 note A_, 5 - note __, 8 + rest 8 note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note G_, 5 - note __, 9 + rest 9 note G_, 5 - note __, 8 + rest 8 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 note A_, 5 - note __, 9 + rest 9 note A_, 5 - note __, 8 + rest 8 note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note G_, 16 + ;tie note G_, 11 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 note A_, 5 - note __, 9 + rest 9 note A_, 5 - note __, 8 + rest 8 note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note G_, 5 - note __, 9 + rest 9 note G_, 5 - note __, 8 + rest 8 + ;musicf2 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 2 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - callchannel Branch_1dd880 + rest 2 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + sound_call Branch_1dd880 note C#, 14 + ;musicf2 note F_, 7 note C#, 6 note G#, 7 note F_, 7 + ;musicf3 note B_, 4 inc_octave note C_, 9 + ;tie note C_, 14 dec_octave note A#, 4 @@ -158,19 +181,24 @@ Music_TCG2Ishihara_Ch2: note C_, 4 dec_octave note A#, 5 + ;musicf2 note A_, 7 note G#, 7 note G_, 7 note A_, 6 - callchannel Branch_1dd880 + ;musicf3 + sound_call Branch_1dd880 note C#, 14 + ;musicf2 note F_, 7 note C#, 6 note G#, 7 note F_, 7 + ;musicf3 note B_, 4 inc_octave note C_, 9 + ;tie note C_, 14 dec_octave note A#, 4 @@ -178,35 +206,63 @@ Music_TCG2Ishihara_Ch2: note C_, 4 dec_octave note A#, 5 + ;musicf2 note G#, 7 note A#, 7 note G_, 7 note G#, 6 - callchannel Branch_1dd809 + ;musicf0 32 + ;musicf1 55 + sound_call Branch_1dd809 + ;musicf0 27 + octave 2 + ;musicf3 + note A_, 13 + ;musicec 254 + sound_call Branch_1ddc41 + ;musicf0 32 + ;musicf1 55 + sound_call Branch_1dd849 + note F_, 13 + ;tie + note F_, 14 + ;tie + note F_, 13 + ;tie + note F_, 14 + ;tie + note F_, 13 + ;tie + note F_, 14 + ;musicf0 27 + octave 2 + ;musicf3 + note A_, 13 + ;musicec 254 + sound_call Branch_1ddc41 + sound_call Branch_1ddc4e + ;musicf0 2 + ;musicf1 55 + sound_call Branch_1dd809 + ;musicf0 27 octave 2 note A_, 13 - callchannel Branch_1ddc41 - callchannel Branch_1dd849 - note F_, 13 - note F_, 14 - note F_, 13 - note F_, 14 - note F_, 13 - note F_, 14 - octave 2 - note A_, 13 - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e - callchannel Branch_1dd809 - octave 2 - note A_, 13 - callchannel Branch_1ddc41 - callchannel Branch_1dd849 + ;musicec 254 + sound_call Branch_1ddc41 + ;musicf0 2 + ;musicf1 55 + sound_call Branch_1dd849 note E_, 3 + ;tie note F_, 10 + ;tie note F_, 14 + ;musicf0 27 + ;musicf1 32 octave 3 + ;musicf3 note F_, 13 + ;musicf2 note A_, 5 note A_, 9 inc_octave @@ -214,134 +270,179 @@ Music_TCG2Ishihara_Ch2: note C_, 8 note F_, 5 note F_, 9 + ;musicf3 note F_, 4 note A_, 4 inc_octave note C_, 5 + ;musicf2 note F_, 5 note F_, 9 - note __, 13 - loopchannel 0, .MainLoop + rest 13 + sound_loop 0, .MainLoop Branch_1dd809: octave 4 + ;musicf2 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 + ;musicf3 note F_, 14 + ;musicf2 note G_, 7 note F_, 6 note G#, 7 note G_, 7 + ;musicf3 note A_, 3 note A#, 10 + ;tie note A#, 14 + ;musicf2 note G_, 7 note A_, 6 note F_, 7 note G_, 7 note D#, 13 + ;tie note D#, 14 + ;tie note D#, 13 note D#, 14 note C_, 7 note C_, 6 note C#, 7 note C_, 7 + ;tie note C#, 7 - note __, 6 + rest 6 + ;musicf3 note F_, 14 + ;musicf2 note D#, 7 note F_, 6 + ;tie note D#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C_, 13 + ;tie note C_, 14 + ;tie note C_, 13 + ;tie note C_, 14 + ;tie note C_, 13 + ;tie note C_, 14 - endchannel + sound_ret Branch_1dd849: octave 4 note C_, 7 note C_, 6 + ;musicf3 note C_, 14 + ;musicf2 note C#, 7 note C_, 6 note F_, 7 note C#, 7 + ;musicf3 note G_, 3 note G#, 10 + ;tie note G#, 14 + ;musicf2 note G_, 7 note G#, 6 note F_, 7 note G_, 7 + ;musicf3 note F#, 3 note G_, 10 + ;tie note G_, 14 + ;musicf2 note A#, 7 note G_, 6 note F_, 7 note A#, 7 note D#, 13 + ;tie note D#, 14 + ;tie note D#, 13 note D#, 14 note D#, 7 note D#, 6 + ;musicf3 note F_, 14 + ;musicf2 note G_, 7 note F_, 6 note G#, 7 note G_, 7 note G_, 13 + ;tie note G_, 7 note G_, 7 + ;musicf3 note D#, 13 + ;musicf2 note G_, 7 note D#, 7 - endchannel + sound_ret Branch_1dd880: + ;musicf0 32 + ;musicf1 39 octave 4 note E_, 4 + ;tie note F_, 3 - note __, 7 + rest 7 note E_, 4 + ;tie note F_, 3 - note __, 6 + rest 6 note A_, 7 - note __, 7 + rest 7 note A_, 7 - note __, 6 + rest 6 + ;musicf3 note D#, 14 + ;musicf2 note F_, 7 note D#, 6 note G_, 7 note F_, 7 note F_, 7 note G_, 6 + ;tie note F_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 + ;musicf3 note D_, 3 + ;tie note D#, 10 + ;tie note D#, 14 + ;musicf2 note D_, 7 note D#, 6 dec_octave @@ -354,79 +455,96 @@ Branch_1dd880: inc_octave note C_, 7 note D_, 7 + ;tie note C_, 7 - note __, 6 + rest 6 dec_octave note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 + ;musicf3 note D#, 14 + ;musicf2 note F_, 7 note D#, 6 note G_, 7 note F_, 7 note F_, 7 note G_, 6 + ;musicf0 27 + ;musicf1 32 octave 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 + rest 1 dec_octave note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 + ;musicf3 note A#, 13 + ;tie note A#, 14 + ;musicf2 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 1 + rest 1 dec_octave note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 1 + rest 1 + ;musicf0 32 + ;musicf1 39 octave 4 note A_, 7 - note __, 7 + rest 7 note A_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave + ;musicf3 note G_, 14 + ;musicf2 note A_, 7 note G_, 6 note A#, 7 note A_, 7 note A_, 7 note A#, 6 + ;tie note A_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 + ;musicf3 note F#, 3 + ;tie note G_, 10 + ;tie note G_, 14 + ;musicf2 note F_, 7 note G_, 6 note D_, 7 @@ -435,14 +553,17 @@ Branch_1dd880: note D_, 6 note D#, 7 note F_, 7 + ;tie note D#, 7 - note __, 6 + rest 6 dec_octave note A_, 7 - note __, 7 + rest 7 note A_, 7 - note __, 6 + rest 6 + ;musicf3 note A#, 14 + ;musicf2 inc_octave note C_, 7 dec_octave @@ -452,69 +573,95 @@ Branch_1dd880: note C_, 7 note F_, 7 note D_, 6 + ;musicf0 27 + ;musicf1 32 octave 2 + ;musicf2 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 2 + rest 2 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 + rest 1 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 note A#, 6 + ;tie note A#, 14 + ;musicf3 inc_octave note C_, 13 + ;tie note C_, 14 + ;musicf2 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 + ;musicf0 2 octave 4 + ;musicef 255 + ;musicf1 39 + ;musicf3 note D_, 14 + ;musicf2 note E_, 7 note D_, 6 note F_, 7 note E_, 7 + ;musicf3 note F#, 4 note G_, 9 + ;tie note G_, 14 + ;musicf2 note E_, 7 note G_, 6 note D_, 7 note E_, 7 note E_, 7 note D_, 6 + ;musicf3 note C_, 14 dec_octave + ;musicf2 note A_, 7 inc_octave note C_, 6 + ;musicf3 note F#, 3 note G_, 11 + ;musicf2 note F_, 13 + ;tie note F_, 14 + ;tie note F_, 13 note F_, 14 note C_, 7 note F_, 6 + ;musicf3 note D_, 14 + ;musicf2 note E_, 7 note D_, 6 note F_, 7 note E_, 7 + ;musicf3 note G#, 4 note A_, 9 + ;tie note A_, 14 + ;musicf2 note G_, 7 note A_, 6 note E_, 7 @@ -522,172 +669,217 @@ Branch_1dd880: note D_, 7 note E_, 6 note C_, 14 + ;tie + note C_, 13 + ;tie + note C_, 14 + ;tie + note C_, 13 + ;tie + note C_, 14 + ;tie note C_, 13 note C_, 14 - note C_, 13 - note C_, 14 - note C_, 13 - note C_, 14 - note __, 13 + ;musicf3 + rest 13 note D_, 14 + ;musicf2 note E_, 7 note D_, 6 note F_, 7 note E_, 7 + ;musicf3 note F#, 4 note G_, 9 + ;tie note G_, 14 + ;musicf2 note E_, 7 note G_, 6 note D_, 7 note E_, 7 note E_, 7 note D_, 6 + ;musicf3 note C_, 14 + ;musicf2 note D_, 7 note C_, 6 note E_, 7 note D_, 7 + ;musicf3 note F_, 13 + ;tie note F_, 14 + ;musicf2 note C_, 7 note F_, 6 dec_octave note A_, 7 inc_octave note C_, 7 + ;musicf3 dec_octave note A#, 13 + ;tie note A#, 14 inc_octave + ;musicf2 note D_, 7 dec_octave note A#, 6 inc_octave note F_, 7 note D_, 7 + ;musicf3 note C_, 13 + ;tie note C_, 14 + ;musicf2 note E_, 7 note C_, 6 note G_, 7 note E_, 7 + ;musicf3 note C#, 13 - endchannel + ;tie + sound_ret -Music_TCG2Ishihara_Ch1: +Music_Ishihara_Ch1: ; 1dd9de (77:59de) notetype1 10 notetype0 1 - note __, 13 - note __, 14 - note __, 13 + ;musicdc 255 + ;musicf1 86 + rest 13 + rest 14 + rest 13 .MainLoop .Loop1 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - loopchannel 3, .Loop1 - note __, 14 + rest 14 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + sound_loop 3, .Loop1 + rest 14 + ;musicf0 3 + ;musicef 254 + ;musicf1 69 octave 4 + ;musicf3 note E_, 13 + ;musicf2 note F_, 5 - note __, 2 + rest 2 note F_, 7 + ;musicf3 dec_octave note G#, 13 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 7 + ;musicf3 note E_, 13 + ;musicf2 note F_, 5 - note __, 2 + rest 2 note F_, 7 + ;musicf3 dec_octave note A#, 13 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 + ;musicf3 + ;musicf0 27 octave 2 + ;musicf3 note C_, 5 - note __, 8 + rest 8 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 dec_octave note A#, 5 - note __, 9 + rest 9 note A#, 5 - note __, 8 + rest 8 inc_octave note E_, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 note C_, 5 - note __, 9 + rest 9 note C_, 5 - note __, 8 + rest 8 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 dec_octave note A#, 5 - note __, 9 + rest 9 note A#, 5 - note __, 8 + rest 8 inc_octave note D#, 16 + ;tie note D#, 11 note C_, 5 - note __, 9 + rest 9 note C_, 5 - note __, 8 + rest 8 note F_, 5 - note __, 9 + rest 9 note F_, 5 - note __, 8 + rest 8 dec_octave note A#, 5 - note __, 9 + rest 9 note A#, 5 - note __, 8 + rest 8 inc_octave note D#, 5 - note __, 9 + rest 9 note D#, 5 - note __, 8 + rest 8 + ;musicf2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - callchannel Branch_1ddc75 + rest 2 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + sound_call Branch_1ddc75 note F_, 14 + ;musicf2 note C#, 7 note C#, 6 note F_, 7 note F_, 7 + ;musicf3 note G_, 3 note G#, 10 + ;tie note G#, 14 note G_, 4 note G#, 4 note G_, 5 + ;musicf0 27 octave 2 note F_, 4 note G_, 3 @@ -698,133 +890,174 @@ Music_TCG2Ishihara_Ch1: note D_, 3 note D#, 3 note E_, 3 - callchannel Branch_1ddc75 + sound_call Branch_1ddc75 note F_, 14 + ;musicf2 note C#, 7 note C#, 6 note F_, 7 note F_, 7 + ;musicf3 note G_, 3 note G#, 10 + ;tie note G#, 14 note G_, 4 note G#, 4 note G_, 5 note F_, 14 + ;musicf0 36 octave 2 + ;musicf3 note G#, 4 note A#, 3 note B_, 3 inc_octave note C_, 3 + ;musicf0 1 octave 3 + ;musicf2 note G#, 7 note G#, 7 - note __, 13 + ;musicf3 + rest 13 + ;musicf0 27 octave 3 - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e - note __, 14 + ;musicf1 32 + ;musicec 1 + sound_call Branch_1ddc41 + ;musicec 249 + sound_call Branch_1ddc4e + rest 14 + ;musicf0 36 + ;musicf1 69 + ;musicf3 octave 3 note D#, 13 note F_, 7 - note __, 7 + rest 7 note F#, 3 - vibrato 3, $33 + vibrato 3, 3, 3 note G_, 10 + ;tie note G_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note D#, 7 - note __, 6 - callchannel Branch_1ddc41 - vibrato 7, $33 + rest 6 + ;musicec 3 + sound_call Branch_1ddc41 + vibrato 7, 3, 3 note C_, 7 + ;tie note C_, 6 + ;tie note C_, 14 - vibrato 0, $33 - callchannel Branch_1ddc4e - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e - note __, 14 + vibrato 0, 3, 3 + ;musicec 252 + sound_call Branch_1ddc4e + ;musicec 3 + sound_call Branch_1ddc41 + ;musicec 253 + sound_call Branch_1ddc4e + rest 14 note C#, 13 - callchannel Branch_1ddc41 + ;musicec 1 + sound_call Branch_1ddc41 note F_, 7 - note __, 6 + rest 6 note G_, 14 note G#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 - vibrato 7, $33 + rest 7 + vibrato 7, 3, 3 note A_, 13 + ;tie note A_, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note F_, 7 - note __, 6 - callchannel Branch_1ddc41 + rest 6 + sound_call Branch_1ddc41 dec_octave note A#, 7 - note __, 6 + rest 6 note A_, 14 + ;musicf0 27 octave 2 + ;musicf3 note F_, 13 - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e + ;musicec 251 + sound_call Branch_1ddc41 + sound_call Branch_1ddc4e note C_, 3 - vibrato 3, $33 + vibrato 3, 3, 3 note C#, 11 + ;tie note C#, 13 - vibrato 0, $33 - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e - note __, 14 + vibrato 0, 3, 3 + ;musicec 1 + sound_call Branch_1ddc41 + ;musicec 249 + sound_call Branch_1ddc4e + rest 14 note F_, 7 - note __, 6 + rest 6 note G#, 7 - note __, 7 + rest 7 note A_, 3 - vibrato 7, $33 + vibrato 7, 3, 3 note A#, 10 + ;tie note A#, 14 - vibrato 0, $33 + vibrato 0, 3, 3 note G_, 7 - note __, 6 - callchannel Branch_1ddc41 + rest 6 + ;musicec 254 + sound_call Branch_1ddc41 dec_octave - vibrato 7, $33 + vibrato 7, 3, 3 note A#, 13 + ;tie note A#, 14 - vibrato 0, $33 - callchannel Branch_1ddc4e - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e + vibrato 0, 3, 3 + ;musicec 251 + sound_call Branch_1ddc4e + ;musicec 3 + sound_call Branch_1ddc41 + ;musicec 251 + sound_call Branch_1ddc4e octave 3 note C#, 14 note D#, 7 - note __, 6 - callchannel Branch_1ddc41 + rest 6 + ;musicec 252 + sound_call Branch_1ddc41 note D#, 13 + ;tie note D#, 7 - note __, 7 + rest 7 dec_octave note A#, 7 - note __, 6 - callchannel Branch_1ddc41 + rest 6 + ;musicec 3 + sound_call Branch_1ddc41 octave 2 note A_, 3 - vibrato 7, $33 + vibrato 7, 3, 3 note A#, 10 + ;tie note A#, 14 - vibrato 0, $33 + vibrato 0, 3, 3 inc_octave note F_, 7 - note __, 6 - callchannel Branch_1ddc41 + rest 6 + sound_call Branch_1ddc41 dec_octave note A#, 7 - note __, 6 + rest 6 note A_, 14 - callchannel Branch_1ddc4e + ;musicec 249 + sound_call Branch_1ddc4e octave 2 note C#, 4 note D#, 3 @@ -835,110 +1068,145 @@ Music_TCG2Ishihara_Ch1: note B_, 3 inc_octave note C_, 3 - vibrato 7, $33 + vibrato 7, 3, 3 note C#, 14 + ;tie note C#, 13 + ;musicf0 26 octave 3 + ;musicf3 note G#, 7 - note __, 7 - callchannel Branch_1ddc68 + rest 7 + ;musicec 249 + sound_call Branch_1ddc68 octave 4 note C#, 14 - callchannel Branch_1ddc68 + ;musicec 249 + sound_call Branch_1ddc68 octave 4 note F_, 7 - note __, 7 + rest 7 note F#, 3 note G_, 10 + ;tie note G_, 14 - callchannel Branch_1ddc68 + ;musicec 251 + sound_call Branch_1ddc68 octave 3 note G#, 7 - note __, 7 + rest 7 note G_, 13 + ;tie note G_, 14 - callchannel Branch_1ddc68 - callchannel Branch_1ddc5b + ;musicec 252 + sound_call Branch_1ddc68 + ;musicec 3 + sound_call Branch_1ddc5b octave 3 note A_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 - note __, 13 + rest 7 + rest 13 inc_octave note C#, 14 note C_, 7 - note __, 6 - note __, 14 + rest 6 + rest 14 dec_octave note A#, 7 - note __, 6 - note __, 14 + rest 6 + rest 14 note A#, 13 note A#, 14 note A_, 7 - note __, 6 + rest 6 note G_, 7 - note __, 7 + rest 7 note A_, 13 + ;tie note A_, 14 + ;musicf0 27 octave 2 note F_, 13 - callchannel Branch_1ddc5b + ;musicec 251 + sound_call Branch_1ddc5b octave 3 note A_, 7 - note __, 6 + rest 6 note G#, 12 - note __, 2 + rest 2 note G#, 7 - note __, 6 - callchannel Branch_1ddc5b + rest 6 + ;musicec 1 + sound_call Branch_1ddc5b octave 4 note E_, 3 note F_, 10 + ;tie note F_, 14 note D#, 7 - note __, 6 - callchannel Branch_1ddc5b + rest 6 + ;musicec 1 + sound_call Branch_1ddc5b octave 4 note D_, 3 note D#, 10 note D#, 14 note G_, 7 - note __, 6 - callchannel Branch_1ddc5b + rest 6 + ;musicec 3 + sound_call Branch_1ddc5b octave 3 note G_, 13 + ;tie note G_, 14 - callchannel Branch_1ddc4e - callchannel Branch_1ddc41 - callchannel Branch_1ddc4e + ;musicec 251 + sound_call Branch_1ddc4e + ;musicec 3 + sound_call Branch_1ddc41 + ;musicec 251 + sound_call Branch_1ddc4e inc_octave note C#, 14 + ;musicf0 27 octave 2 note C#, 4 note G#, 4 inc_octave note C#, 5 inc_octave + ;musicf2 note C#, 5 note C#, 9 + ;musicf0 26 + ;musicf3 octave 4 note D#, 13 - note __, 14 + rest 14 + ;musicf0 27 octave 2 note D#, 4 note A#, 4 inc_octave note D#, 5 inc_octave + ;musicf2 note D#, 5 note D#, 9 + ;musicf3 + ;musicf0 26 octave 3 note A_, 13 + ;tie note A_, 14 + ;musicf0 27 + ;musicf1 32 octave 3 + ;musicef 254 + ;musicf3 note C_, 13 + ;musicf2 note F_, 5 note F_, 9 note A_, 5 @@ -946,239 +1214,305 @@ Music_TCG2Ishihara_Ch1: inc_octave note C_, 5 note C_, 9 - note __, 13 + ;musicf3 + rest 13 + ;musicf2 inc_octave note C_, 5 note C_, 9 - note __, 13 - loopchannel 0, .MainLoop + rest 13 + sound_loop 0, .MainLoop Branch_1ddc41: + ;musicf0 27 octave 3 + ;musicf1 32 note C_, 5 note C_, 9 - endchannel + ;musicec 0 + ;musicf0 36 + ;musicf3 + sound_ret Branch_1ddc4e: + ;musicf0 27 octave 3 + ;musicf1 32 note C_, 5 note C_, 8 - endchannel + ;musicec 0 + ;musicf0 36 + ;musicf3 + sound_ret Branch_1ddc5b: + ;musicf0 27 octave 3 + ;musicf1 32 note C_, 5 note C_, 9 - endchannel + ;musicec 0 + ;musicf0 26 + ;musicf3 + sound_ret Branch_1ddc68: + ;musicf0 27 octave 3 + ;musicf1 32 note C_, 5 note C_, 8 - endchannel + ;musicec 0 + ;musicf0 26 + ;musicf3 + sound_ret Branch_1ddc75: + ;musicf0 27 + ;musicf1 32 octave 2 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 1 + rest 1 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 + rest 1 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 + rest 1 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 1 + rest 1 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 1 + rest 1 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 + rest 1 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 + rest 1 note A#, 14 + ;tie note A#, 5 note A#, 8 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 1 + rest 1 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 + rest 1 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 + rest 1 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 1 - note __, 14 - note __, 13 - note __, 14 + rest 1 + rest 14 + rest 13 + rest 14 + ;musicf3 note G_, 13 + ;tie note G_, 14 + ;musicf2 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 1 + rest 1 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 note A#, 5 - note __, 2 + rest 2 note A#, 5 - note __, 1 + rest 1 + ;musicf0 26 + ;musicf3 octave 4 note E_, 4 note F_, 3 - note __, 7 + rest 7 + ;musicf0 27 octave 2 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 1 + rest 1 + ;musicf3 + ;musicf0 26 octave 4 note A_, 7 - note __, 16 - note __, 4 + rest 16 + rest 4 note D#, 14 note F_, 7 - note __, 6 + rest 6 + ;musicf0 27 octave 2 + ;musicf2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 + ;musicf3 + ;musicf0 26 octave 4 note F_, 7 - note __, 6 + rest 6 + ;musicf0 27 octave 2 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 2 + rest 2 + ;musicf3 + ;musicf0 26 octave 4 note C_, 7 - note __, 6 + rest 6 + ;musicf0 27 octave 3 + ;musicf2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 + ;musicf0 26 octave 4 + ;musicf3 note D_, 3 note D#, 10 + ;tie note D#, 14 note D_, 7 - note __, 6 + rest 6 + ;musicf0 27 octave 2 + ;musicf2 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 2 + rest 2 + ;musicf3 + ;musicf0 26 octave 4 note D_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 + ;musicf0 2 octave 2 + ;musicf2 note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 1 + rest 1 + ;musicf3 + ;musicf0 26 octave 3 note F_, 7 - note __, 7 - note __, 7 - note __, 6 + rest 7 + rest 7 + rest 6 note G_, 14 note A_, 7 - note __, 6 + rest 6 + ;musicf0 27 octave 2 + ;musicf2 note G_, 5 - note __, 2 - note __, 5 - note __, 2 + rest 2 + rest 5 + rest 2 + ;musicf3 + ;musicf0 26 octave 4 note C_, 7 - note __, 6 + rest 6 + ;musicf0 27 + ;musicf1 32 octave 2 - note __, 14 - note __, 13 - note __, 14 + ;musicf2 + rest 14 + rest 13 + rest 14 note F_, 5 - note __, 2 + rest 2 note F_, 6 + ;tie note F_, 14 note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 + rest 1 + ;musicf0 0 + ;musicf3 octave 2 note C_, 4 note D_, 3 @@ -1189,1146 +1523,1289 @@ Branch_1ddc75: note A#, 3 inc_octave note C_, 3 + ;musicf0 27 octave 2 - note __, 14 + ;musicf2 + rest 14 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 1 - note __, 9 - note __, 5 + rest 1 + rest 9 + rest 5 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 - note __, 14 + rest 1 + rest 14 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 - note __, 9 - note __, 5 + rest 1 + rest 9 + rest 5 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note E_, 5 - note __, 2 + rest 2 note E_, 5 - note __, 2 + rest 2 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 - note __, 14 + rest 1 + rest 14 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 1 - note __, 9 - note __, 5 + rest 1 + rest 9 + rest 5 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 + rest 1 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 - note __, 14 + rest 1 + rest 14 note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 - note __, 9 - note __, 5 + rest 1 + rest 9 + rest 5 dec_octave + ;musicf3 note A_, 13 note A#, 14 + ;musicf2 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 1 - note __, 14 + rest 1 + rest 14 dec_octave note F_, 5 - note __, 2 + rest 2 note F_, 5 - note __, 1 + rest 1 inc_octave note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 2 + rest 2 note D_, 5 - note __, 1 - note __, 9 - note __, 5 + rest 1 + rest 9 + rest 5 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 + rest 1 inc_octave note E_, 5 - note __, 2 + rest 2 note E_, 5 - note __, 2 + rest 2 dec_octave note G_, 5 - note __, 2 + rest 2 note G_, 5 - note __, 1 - note __, 14 + rest 1 + rest 14 + ;musicf3 note B_, 13 + ;musicf2 inc_octave note C#, 5 - note __, 2 + rest 2 note C#, 5 - note __, 2 + rest 2 + ;musicf3 note D_, 13 + ;tie note D_, 14 + ;musicf2 dec_octave note A_, 5 - note __, 2 + rest 2 note A_, 5 - note __, 1 + rest 1 inc_octave note C_, 5 - note __, 2 + rest 2 note C_, 5 - note __, 2 + rest 2 + ;musicf3 note D_, 13 + ;musicf2 + ;musicf3 note D_, 14 dec_octave + ;musicf2 note A#, 7 note A#, 6 inc_octave note D_, 7 note D_, 7 + ;musicf3 note E_, 13 + ;tie note E_, 14 + ;musicf2 note C_, 7 note C_, 6 note E_, 7 note E_, 7 + ;musicf3 note F_, 13 - endchannel + ;tie + sound_ret -Music_TCG2Ishihara_Ch3: +Music_Ishihara_Ch3: ; 1dde54 (77:5e54) notetype1 10 notetype2 11 notetype1 1 + ;musice9 96 + ;musicdc 255 notetype0 1 - note __, 13 + rest 13 octave 2 note C_, 14 + ;tie note C#, 4 + ;tie note D_, 3 + ;tie note D#, 3 + ;tie note E_, 3 .MainLoop octave 2 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave note D#, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note E_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 note F_, 14 inc_octave inc_octave note E_, 13 note F_, 4 - note __, 10 + rest 10 dec_octave note B_, 13 inc_octave note C_, 4 - note __, 10 + rest 10 dec_octave note E_, 13 note F_, 4 - note __, 10 + rest 10 note C_, 13 dec_octave note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave note D#, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note E_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 dec_octave note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 note F_, 14 note A#, 13 note B_, 7 - note __, 7 + rest 7 inc_octave note C_, 7 - note __, 6 - vibrato 7, $33 + rest 6 + ;vibrato_type 5 + vibrato 7, 3, 3 note D#, 7 + ;tie note D#, 7 - vibrato 0, $33 + vibrato 0, 3, 3 note C_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note E_, 7 - note __, 6 - callchannel Branch_1de0c5 + rest 6 + sound_call Branch_1de0c5 octave 2 note A#, 14 inc_octave note F_, 13 note A#, 7 - note __, 7 + rest 7 note D#, 13 + ;tie note D#, 14 dec_octave note A#, 13 note D#, 14 note E_, 7 - note __, 6 - callchannel Branch_1de0c5 + rest 6 + sound_call Branch_1de0c5 octave 2 note A#, 14 inc_octave note F_, 13 note A#, 7 - note __, 7 + rest 7 note D#, 13 + ;tie note D#, 14 dec_octave note A#, 13 note D#, 14 note D_, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note G#, 14 + ;musice8 8 dec_octave note G#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C#, 14 + ;musice8 8 dec_octave dec_octave note G_, 7 - note __, 6 + rest 6 note G#, 7 - note __, 7 + rest 7 note G#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C_, 14 + ;musice8 8 dec_octave dec_octave note D#, 7 - note __, 6 + rest 6 note G#, 7 - note __, 7 + rest 7 note G#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note A_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note B_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note D#, 14 + ;musice8 8 dec_octave note C_, 7 - note __, 6 + rest 6 dec_octave note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note F_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 13 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note G#, 14 + ;musice8 8 dec_octave note G#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C#, 14 + ;musice8 8 dec_octave dec_octave note C#, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note D#, 14 + ;musice8 8 dec_octave dec_octave note G_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note G_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C#, 14 + ;musice8 8 dec_octave dec_octave note F_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note F_, 13 + ;tie note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note C_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C#, 14 + ;musice8 8 dec_octave dec_octave note G#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C#, 14 + ;musice8 8 dec_octave dec_octave note G_, 7 - note __, 6 + rest 6 note G#, 7 - note __, 7 + rest 7 note G#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note D#, 14 + ;musice8 8 dec_octave dec_octave note D#, 7 - note __, 6 + rest 6 note G#, 7 - note __, 7 + rest 7 note G#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note A_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note C#, 14 + ;musice8 8 dec_octave dec_octave note B_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note D#, 14 dec_octave + ;musice8 8 note C_, 7 - note __, 6 + rest 6 dec_octave note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note F_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 13 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note G#, 14 + ;musice8 8 dec_octave note G#, 7 - note __, 6 + rest 6 note C#, 7 - note __, 7 + rest 7 note C#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note G#, 14 + ;musice8 8 dec_octave note G#, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note G_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note G_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 2 note G#, 14 + ;musice8 8 dec_octave dec_octave note C_, 13 + ;tie note C_, 7 - note __, 7 + rest 7 inc_octave note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave dec_octave note F_, 13 + ;tie note F_, 7 - note __, 7 + rest 7 note F_, 13 note A_, 7 - note __, 7 + rest 7 inc_octave note C_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 - note __, 7 - note __, 6 + rest 7 + rest 7 + rest 6 inc_octave inc_octave note F_, 7 notetype1 3 note F_, 7 - note __, 13 + rest 13 notetype1 1 - loopchannel 0, .MainLoop + sound_loop 0, .MainLoop Branch_1de0c5: octave 2 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 dec_octave note F_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 dec_octave note F_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave note G_, 14 dec_octave note C_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 dec_octave note F_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 dec_octave note C_, 13 + ;tie note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 note D#, 14 note E_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note F_, 14 + ;musice8 8 dec_octave note F_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note D#, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A_, 14 + ;musice8 8 dec_octave note F_, 7 - note __, 6 + rest 6 note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note C_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A_, 14 + ;musice8 8 dec_octave note F_, 7 - note __, 6 + rest 6 note D#, 7 - note __, 7 + rest 7 note D#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 2 note A#, 14 + ;musice8 8 dec_octave note D#, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave note C_, 7 - note __, 7 + rest 7 dec_octave note G_, 13 - note __, 14 + rest 14 note A_, 13 + ;tie note A_, 14 note F_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A_, 14 note A_, 13 + ;musice8 8 dec_octave note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A_, 14 + ;musice8 8 dec_octave note A#, 7 - note __, 6 + rest 6 note A_, 7 - note __, 7 + rest 7 note A_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A_, 14 note A_, 13 + ;musice8 8 dec_octave note A_, 7 - note __, 7 + rest 7 note A_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A_, 14 + ;musice8 8 dec_octave note A_, 7 - note __, 6 + rest 6 note G_, 7 - note __, 7 + rest 7 note G_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A#, 14 note A#, 13 + ;musice8 8 dec_octave note C_, 7 - note __, 7 + rest 7 note C_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 8 note A#, 14 + ;musice8 8 dec_octave note C_, 7 - note __, 6 + rest 6 note F_, 7 - note __, 7 + rest 7 note F_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A_, 14 note A_, 13 + ;musice8 8 dec_octave note F_, 7 - note __, 7 + rest 7 note F_, 13 note G_, 14 note A_, 7 - note __, 6 + rest 6 note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 note A_, 14 note A_, 13 + ;musice8 8 dec_octave note A#, 7 - note __, 7 + rest 7 note A#, 7 - note __, 6 + rest 6 inc_octave inc_octave + ;musice8 4 note C_, 14 + ;musice8 8 dec_octave dec_octave note A#, 7 - note __, 6 + rest 6 note A_, 7 - note __, 7 + rest 7 note B_, 7 - note __, 6 + rest 6 inc_octave note C#, 7 - note __, 7 + rest 7 note D_, 13 + ;tie note D_, 14 dec_octave note D_, 7 - note __, 6 + rest 6 inc_octave + ;musice8 4 inc_octave note C_, 14 dec_octave + ;musice8 8 dec_octave note G_, 13 + ;tie note G_, 14 inc_octave note D_, 13 note G_, 7 - note __, 7 + rest 7 dec_octave note A_, 13 + ;tie note A_, 14 inc_octave note E_, 13 note A_, 7 - note __, 7 + rest 7 dec_octave note A#, 13 - endchannel + ;tie + sound_ret -Music_TCG2Ishihara_Ch4: - togglenoise $06 - notetype 1 +Music_Ishihara_Ch4: ; 1de20c (77:620c) + toggle_noise 6 + drum_speed 1 + ;musicdc 255 octave 1 - note D#, 13 - notetype 9 - note E_, 3 - notetype 1 + drum_note 4, 13 + drum_speed 9 + drum_note 5, 3 + drum_speed 1 .MainLoop - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note D#, 13 - note C#, 14 - note D#, 7 - note C#, 6 - note C#, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 12 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note D#, 13 - note C#, 14 - note D#, 7 - note C#, 6 - note C#, 14 - note __, 13 - note __, 14 - note __, 13 - note __, 14 - note __, 13 - note D#, 7 - note D#, 7 - note E_, 13 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 4, 13 + drum_note 2, 14 + drum_note 4, 7 + drum_note 2, 6 + drum_note 2, 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 12 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 4, 13 + drum_note 2, 14 + drum_note 4, 7 + drum_note 2, 6 + drum_note 2, 14 + rest 13 + rest 14 + rest 13 + rest 14 + rest 13 + drum_note 4, 7 + drum_note 4, 7 + drum_note 5, 13 .Loop1 - callchannel Branch_1de321 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note E_, 13 - note C_, 14 - note D#, 4 - note D#, 4 - note D#, 5 - note C#, 14 - note C#, 13 - callchannel Branch_1de321 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note E_, 13 - note C#, 7 - note C#, 7 - note C#, 13 - callchannel Branch_1de321 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 14 - note C#, 13 - callchannel Branch_1de321 - note C_, 14 - note C#, 13 - note C#, 14 - note C_, 16 - note __, 11 - note C#, 13 - note C#, 14 - note E_, 13 - note __, 14 - note C#, 13 - note C#, 14 - note C_, 16 - note __, 11 - note C#, 13 - note C#, 14 - note C_, 13 - note __, 14 - note C#, 13 - note C#, 14 - note C_, 13 - note __, 14 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 14 - note C#, 13 - loopchannel 2, .Loop1 - callchannel Branch_1de321 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note C#, 13 - note C#, 14 - note C#, 13 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note C#, 13 - note C#, 14 - note E_, 13 - note __, 14 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 14 - note C#, 13 - note C#, 14 - note D#, 7 - note C#, 6 - note C#, 14 - note C#, 13 - callchannel Branch_1de321 - callchannel Branch_1de321 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note C#, 4 - note C#, 4 - note C#, 5 - note C#, 14 - note C#, 13 - callchannel Branch_1de321 - note C_, 14 - note C_, 13 - note C#, 14 - note E_, 13 - note C#, 14 - note D#, 7 - note C#, 6 - note C#, 14 - note C#, 13 - note C_, 14 - note C#, 5 - note C#, 4 - note C#, 4 - note C#, 14 - note C_, 13 - note D#, 14 - note C#, 13 - note C#, 14 - note C_, 13 - note __, 14 - note C#, 13 - note C#, 14 - note C#, 13 - note C#, 14 - note D#, 5 - note D#, 4 - note D#, 4 - notetype 9 - note F_, 3 - notetype 1 - loopchannel 0, .MainLoop + sound_call Branch_1de321 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 5, 13 + drum_note 1, 14 + drum_note 4, 4 + drum_note 4, 4 + drum_note 4, 5 + drum_note 2, 14 + drum_note 2, 13 + sound_call Branch_1de321 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 5, 13 + drum_note 2, 7 + drum_note 2, 7 + drum_note 2, 13 + sound_call Branch_1de321 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 5 + drum_note 2, 14 + drum_note 2, 13 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 1, 16 + rest 11 + drum_note 2, 13 + drum_note 2, 14 + drum_note 5, 13 + ;tie + rest 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 1, 16 + rest 11 + drum_note 2, 13 + drum_note 2, 14 + drum_note 1, 13 + ;tie + rest 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 1, 13 + rest 14 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 4 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 14 + drum_note 2, 13 + sound_loop 2, .Loop1 + sound_call Branch_1de321 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 2, 13 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 5, 13 + ;tie + rest 14 + ;musicef 252 + drum_note 2, 4 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 4, 7 + drum_note 2, 6 + drum_note 2, 14 + drum_note 2, 13 + sound_call Branch_1de321 + sound_call Branch_1de321 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + ;musicef 253 + drum_note 2, 4 + ;musicef 254 + drum_note 2, 4 + ;musicef 255 + drum_note 2, 5 + ;musicef 0 + drum_note 2, 14 + drum_note 2, 13 + sound_call Branch_1de321 + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 5, 13 + drum_note 2, 14 + drum_note 4, 7 + drum_note 2, 6 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + ;musicef 253 + drum_note 2, 5 + ;musicef 254 + drum_note 2, 4 + ;musicef 255 + drum_note 2, 4 + ;musicef 0 + drum_note 2, 14 + drum_note 1, 13 + drum_note 4, 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 1, 13 + ;tie + rest 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 2, 14 + drum_note 4, 5 + drum_note 4, 4 + drum_note 4, 4 + drum_speed 9 + drum_note 6, 3 + drum_speed 1 + sound_loop 0, .MainLoop Branch_1de321: - note C_, 14 - note C_, 13 - note C#, 14 - note C#, 13 - note C_, 14 - note D#, 13 - note C#, 14 - note E_, 13 - endchannel - + drum_note 1, 14 + drum_note 1, 13 + drum_note 2, 14 + drum_note 2, 13 + drum_note 1, 14 + drum_note 4, 13 + drum_note 2, 14 + drum_note 5, 13 + sound_ret +; 0x1de32a diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index c916b5fe..c5b59274 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -1,17 +1,16 @@ Music_TCG2TitleScreen: - db $C0 - dw Music_TCG2TitleScreen_Ch1 - db $01 - dw Music_TCG2TitleScreen_Ch2 - db $02 - dw Music_TCG2TitleScreen_Ch3 - db $03 - dw Music_TCG2TitleScreen_Ch4 + channel_count 4 + channel 1, Music_TCG2TitleScreen_Ch1 + channel 2, Music_TCG2TitleScreen_Ch2 + channel 3, Music_TCG2TitleScreen_Ch3 + channel 4, Music_TCG2TitleScreen_Ch4 -Music_TCG2TitleScreen_Ch2: +Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) notetype1 10 + ;musicf0 0 octave 3 notetype0 1 + ;musicdc 17 note G_, 3 note A_, 4 note B_, 3 @@ -21,372 +20,688 @@ Music_TCG2TitleScreen_Ch2: note E_, 4 note F_, 3 note F#, 4 - vibrato 0, $33 + ;musicf1 101 + ;musicf2 + vibrato 0, 3, 3 .Loop1 note G_, 16 + ;tie note G_, 14 + ;musicdc 1 note G_, 15 + ;musicdc 17 rept 3 note G_, 4 + ;musicdc 1 note G_, 1 + ;musicdc 17 endr - loopchannel 4, .Loop1 + sound_loop 4, .Loop1 + ;musicf3 + ;musicdc 17 .Loop2 note G_, 3 note A_, 4 note G_, 4 note A_, 4 - loopchannel 8, .Loop2 + sound_loop 8, .Loop2 notetype0 10 note G_, 3 octave 2 notetype2 4 - dutycycle 2 + duty_cycle 2 + ;musicef 252 note F_, 3 note E_, 3 + ;musicf0 0 octave 3 notetype2 8 notetype0 1 + ;musicf1 101 + ;musicf2 note G_, 8 + ;musicdc 1 note G_, 7 - note __, 8 + ;musicdc 0 + rest 8 + ;musicdc 17 note F_, 5 note F_, 2 notetype0 5 note E_, 3 + ;musicdc 1 note E_, 3 + ;musicdc 17 note G_, 3 + ;musicdc 1 note G_, 3 inc_octave - vibrato 15, $33 + ;musicdc 17 + vibrato 15, 3, 3 note D_, 6 + ;musicdc 1 note D_, 3 notetype0 1 + ;musicdc 17 note C_, 7 + ;musicdc 1 note C_, 8 dec_octave - vibrato 30, $33 + vibrato 30, 3, 3 notetype0 10 + ;musicdc 17 note G_, 6 + ;musicdc 1 note G_, 3 + ;musicdc 17 notetype0 1 note E_, 8 + ;musicdc 1 note E_, 15 + ;musicdc 17 note G_, 5 note G_, 2 + ;musicf2 note G_, 15 + ;tie note G_, 15 + ;musicdc 1 note G_, 15 + ;musicdc 17 note F_, 8 + ;musicdc 1 note F_, 7 + ;musicdc 17 + ;musicf3 note F_, 15 note E_, 5 note F_, 5 note E_, 5 + ;musicf1 101 + ;musicf2 note D_, 7 + ;musicdc 1 note F_, 8 + ;musicdc 17 note C_, 7 + ;musicdc 1 note D_, 8 + ;musicdc 17 note D_, 15 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 16 + ;tie note D_, 12 + ;musicdc 1 note D_, 15 + ;musicdc 17 note G_, 8 + ;musicdc 1 note G_, 7 - note __, 8 + ;musicdc 0 + rest 8 + ;musicdc 17 note F_, 5 + ;musicdc 1 note F_, 2 + ;musicdc 17 notetype0 5 note E_, 3 + ;musicdc 1 note E_, 3 + ;musicdc 17 note G_, 3 + ;musicdc 1 note G_, 3 inc_octave - vibrato 15, $33 + ;musicdc 17 + vibrato 15, 3, 3 note D_, 6 + ;musicdc 1 note D_, 3 notetype0 1 + ;musicdc 17 note E_, 8 + ;musicdc 1 note E_, 7 dec_octave - vibrato 30, $33 + vibrato 30, 3, 3 notetype0 10 + ;musicdc 17 note G_, 6 + ;musicdc 1 notetype0 5 note G_, 3 + ;musicdc 17 + ;musicf3 note E_, 3 note F_, 3 notetype0 1 + ;musicf1 101 + ;musicf2 note G_, 8 + ;musicdc 1 note G_, 7 + ;musicdc 17 note G#, 15 + ;tie note G#, 8 + ;musicdc 1 note G#, 7 + ;musicdc 17 inc_octave note C_, 15 + ;tie note C_, 8 + ;musicdc 1 note C_, 7 - vibrato 15, $33 + ;musicdc 17 + vibrato 15, 3, 3 note D_, 15 + ;tie note D_, 15 + ;musicdc 1 note D_, 15 + ;musicdc 17 note C_, 8 + ;musicdc 1 note C_, 7 + ;musicdc 17 + ;musicf3 note F#, 4 - vibrato 25, $33 + vibrato 25, 3, 3 note G_, 11 + ;tie note G_, 15 note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicf1 101 + ;musicf2 note F_, 8 + ;musicdc 1 note G_, 7 + ;musicdc 17 + ;musicf3 note C_, 15 + ;musicf2 note D_, 8 + ;musicdc 1 note D_, 7 - vibrato 26, $33 + ;musicf0 4 + vibrato 26, 3, 3 + ;musicdc 17 + ;musicf1 87 octave 4 note D_, 4 + ;musicf2 note D#, 11 + ;tie note D#, 15 + ;tie note D#, 15 + ;tie note D#, 15 + ;tie note D#, 15 + ;musicdc 1 note D#, 15 + ;musicf2 + ;musicdc 17 note F_, 8 + ;musicdc 1 note F_, 15 + ;musicdc 17 note D#, 5 + ;musicdc 1 note D#, 2 + ;musicdc 17 note D_, 8 + ;musicf2 note D#, 3 + ;musicdc 1 note D_, 4 + ;musicdc 17 note D_, 4 + ;musicdc 1 note D#, 4 dec_octave + ;musicdc 17 note A#, 4 inc_octave + ;musicdc 1 note D_, 3 dec_octave - vibrato 15, $33 + ;musicdc 17 + vibrato 15, 3, 3 note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicdc 1 note G_, 15 + ;musicdc 17 note G#, 8 + ;musicdc 1 note G#, 15 + ;musicdc 17 note A#, 5 + ;musicdc 1 note G#, 2 + ;musicdc 17 inc_octave note C_, 8 + ;musicdc 1 dec_octave note A#, 7 + ;tie inc_octave note C_, 8 + ;musicdc 17 note G_, 5 + ;musicdc 1 note C_, 2 + ;musicdc 17 note G_, 15 + ;tie note G_, 15 + ;musicdc 1 note G_, 15 + ;musicdc 17 + ;musicf3 note F_, 8 note G_, 7 + ;musicf2 note A#, 7 + ;musicdc 1 note G_, 3 + ;musicdc 17 note D#, 7 + ;musicdc 1 note A#, 3 + ;musicdc 17 note C_, 7 + ;musicdc 1 note D#, 3 + ;musicdc 17 + ;musicf3 note D_, 8 + ;musicf2 note D#, 4 + ;musicdc 1 note D_, 3 + ;musicdc 17 note D_, 4 + ;musicdc 1 note D#, 4 + ;musicdc 17 dec_octave note A#, 4 inc_octave + ;musicdc 1 note D_, 3 + ;musicdc 17 dec_octave note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicdc 1 note G_, 15 + ;musicdc 17 note G#, 5 + ;musicdc 1 note G_, 3 + ;musicdc 17 note A#, 5 + ;musicdc 1 note G#, 2 inc_octave + ;musicdc 17 note C_, 15 + ;tie note C_, 15 + ;musicdc 1 note C_, 8 + ;musicdc 17 note G_, 4 + ;musicdc 1 note G_, 3 + ;musicdc 17 note D#, 4 + ;musicdc 1 note G_, 4 + ;musicdc 17 note C_, 4 + ;musicdc 1 note D#, 3 dec_octave + ;musicdc 17 note B_, 15 inc_octave + ;musicdc 1 note C_, 8 + ;musicdc 17 + ;musicf3 note F#, 4 note G_, 15 + ;tie note G_, 3 + ;musicf2 note F_, 8 + ;musicdc 1 note G_, 7 + ;musicf1 64 + ;musicf2 + ;musicdc 17 note D_, 7 + ;musicdc 1 note D_, 3 + ;musicdc 17 note D#, 7 + ;musicdc 1 note D_, 3 + ;musicdc 17 note F_, 7 + ;musicdc 1 note D#, 3 + ;musicdc 17 note D_, 7 + ;musicdc 1 note F_, 3 + ;musicdc 17 note A#, 7 + ;musicdc 1 note D_, 3 + ;musicdc 17 note F_, 7 + ;musicdc 1 note A#, 3 + ;musicdc 17 + ;musicf1 71 + ;musicf2 note D#, 15 + ;musicdc 1 note D#, 8 + ;musicdc 17 + ;musicf3 note C_, 15 + ;musicf2 note D_, 3 + ;musicdc 1 note C_, 4 + ;musicdc 17 note D#, 4 + ;musicdc 1 note D_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 1 note D#, 4 + ;musicdc 17 + ;musicf3 note G_, 15 + ;tie note G_, 16 + ;tie note G_, 14 + ;musicf2 note F_, 8 + ;musicdc 1 note G_, 7 + ;musicdc 17 note G_, 15 + ;musicdc 1 note F_, 8 + ;musicdc 17 + ;musicf3 note A_, 3 note A#, 12 + ;musicf2 note G#, 3 + ;musicdc 1 note A#, 4 + ;musicdc 17 note D#, 4 + ;musicdc 1 note A#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 1 note D#, 4 + ;musicdc 17 notetype0 5 note G_, 12 + ;tie note G_, 6 + ;musicdc 1 note G_, 3 + ;musicdc 17 + ;musicf0 0 + ;musicf3 octave 4 note G_, 1 note A_, 1 note B_, 1 notetype0 1 - vibrato 20, $33 + vibrato 20, 3, 3 inc_octave note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 dec_octave + ;musicf1 101 + ;musicf2 note B_, 8 inc_octave + ;musicdc 1 note C_, 15 dec_octave + ;musicdc 17 note A_, 5 + ;musicdc 1 note B_, 2 + ;musicdc 17 note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicdc 1 note G_, 15 + ;musicdc 17 note E_, 5 + ;musicdc 1 note G_, 3 + ;musicdc 17 note G_, 5 + ;musicdc 1 note E_, 2 + ;musicdc 17 note A_, 15 + ;tie note A_, 15 + ;tie note A_, 15 + ;tie note A_, 15 + ;tie note A_, 15 + ;musicf1 80 + ;musicf2 note G_, 8 + ;musicdc 1 note A_, 7 + ;musicdc 17 note F_, 8 + ;musicdc 1 note G_, 7 + ;musicdc 17 note A_, 8 + ;musicdc 1 note F_, 7 + ;musicdc 17 + ;musicf3 note G_, 8 + ;musicf1 71 + ;musicf2 note A_, 3 + ;musicdc 1 note G_, 4 + ;musicdc 17 note G_, 4 + ;musicdc 1 note A_, 4 + ;musicdc 17 note E_, 3 + ;musicdc 1 note G_, 4 + ;musicdc 17 note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;musicf0 7 + ;musicf1 80 + ;musicf2 notetype2 8 octave 3 note D_, 8 + ;musicdc 1 note D_, 7 + ;musicf0 0 + ;musicf1 101 + ;musicf2 octave 4 + ;musicdc 17 note D_, 5 + ;musicdc 1 note C_, 3 + ;musicdc 17 note E_, 5 + ;musicdc 1 note D_, 2 + ;musicf2 + ;musicdc 17 note F_, 15 + ;tie note F_, 15 + ;tie note F_, 15 + ;tie note F_, 15 + ;tie note F_, 8 + ;musicdc 1 note F_, 7 + ;musicdc 17 note E_, 8 + ;musicdc 1 note F_, 7 + ;musicdc 17 note D_, 8 + ;musicdc 1 note E_, 7 + ;musicdc 17 note F_, 8 + ;musicdc 1 note D_, 7 + ;musicdc 17 note E_, 8 + ;musicdc 1 note F_, 15 + ;musicdc 17 dec_octave note G_, 5 + ;musicdc 1 inc_octave note E_, 2 + ;musicdc 17 note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;musicdc 1 note C_, 15 dec_octave + ;musicdc 17 note A_, 5 inc_octave + ;musicdc 1 note C_, 3 + ;musicdc 17 note C_, 5 dec_octave + ;musicdc 1 note A_, 2 inc_octave - vibrato 0, $33 + vibrato 0, 3, 3 + ;musicdc 17 + ;musicdc 17 note D_, 16 + ;tie note D_, 14 + ;musicdc 1 note D_, 15 + ;musicf3 + ;musicdc 17 note D_, 8 note E_, 7 + ;musicf2 note D_, 15 + ;musicdc 1 note D_, 8 + ;musicdc 17 + ;musicf3 dec_octave note A_, 16 + ;tie note A_, 7 inc_octave + ;musicf2 note C_, 8 dec_octave + ;musicdc 1 note A_, 7 inc_octave + ;musicdc 17 note C_, 16 + ;tie note C_, 14 + ;musicdc 1 note C_, 15 + ;musicdc 17 + ;musicf3 dec_octave note B_, 4 inc_octave @@ -394,224 +709,390 @@ Music_TCG2TitleScreen_Ch2: dec_octave note B_, 3 note A_, 4 + ;musicf2 note B_, 16 + ;tie note B_, 14 + ;musicdc 1 note B_, 15 + ;musicdc 17 inc_octave note C_, 8 dec_octave + ;musicdc 1 note B_, 7 inc_octave - vibrato 30, $33 + ;musicf1 101 + ;musicf2 + vibrato 30, 3, 3 + ;musicdc 17 note C_, 16 + ;tie note C_, 14 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 10 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 16 + ;tie note C_, 12 + ;musicdc 1 note C_, 12 - endchannel + sound_ret -Music_TCG2TitleScreen_Ch1: +Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) notetype1 10 + ;musicf0 1 octave 3 notetype0 1 - note __, 2 + ;musice4 255 + ;musicef 252 + rest 2 + ;musicdc 16 note G_, 3 note A_, 4 note B_, 3 inc_octave + ;musicdc 17 note C_, 4 note D_, 3 note E_, 4 + ;musicdc 1 note F_, 3 note F#, 2 - vibrato 0, $33 + ;musice4 0 + ;musicef 4 + vibrato 0, 3, 3 + ;musicdc 17 + ;musicf1 85 + ;musicf2 note D_, 16 + ;tie note D_, 14 + ;musicdc 16 note D_, 15 + ;musicdc 17 .Loop1 note D_, 4 + ;musicdc 16 note D_, 1 - loopchannel 3, .Loop1 + ;musicdc 17 + sound_loop 3, .Loop1 note C_, 16 + ;tie note C_, 14 + ;musicdc 16 note C_, 15 + ;musicdc 17 .Loop2 note C_, 4 + ;musicdc 16 note C_, 1 - loopchannel 3, .Loop2 + ;musicdc 17 + sound_loop 3, .Loop2 dec_octave note B_, 16 + ;tie note B_, 14 + ;musicdc 16 note B_, 15 + ;musicdc 17 .Loop3 note B_, 4 + ;musicdc 16 note B_, 1 - loopchannel 3, .Loop3 + ;musicdc 17 + sound_loop 3, .Loop3 note A_, 16 + ;tie note A_, 14 + ;musicdc 16 note A_, 15 + ;musicdc 17 .Loop4 note A_, 4 + ;musicdc 16 note A_, 1 - loopchannel 3, .Loop4 - vibrato 28, $33 + ;musicdc 17 + sound_loop 3, .Loop4 + vibrato 28, 3, 3 notetype0 10 note G_, 12 + ;tie note G_, 3 - note __, 3 - note __, 3 + rest 3 + rest 3 notetype0 1 octave 2 octave 2 notetype2 8 notetype0 1 + ;musicf2 note B_, 8 + ;musicdc 16 note B_, 7 - note __, 8 + rest 8 + ;musicdc 17 inc_octave note D_, 5 + ;musicdc 16 note D_, 2 notetype0 5 + ;musicdc 17 note C_, 3 + ;musicdc 16 note C_, 3 + ;musicdc 17 note E_, 3 + ;musicdc 16 note E_, 3 - vibrato 15, $33 + ;musicdc 17 + vibrato 15, 3, 3 note G_, 6 + ;musicdc 16 note G_, 3 notetype0 1 + ;musicdc 17 note G_, 8 + ;musicdc 16 note G_, 7 + ;musicdc 17 note E_, 15 + ;musicf0 3 + ;musicf3 octave 3 + ;musicdc 17 note E_, 8 inc_octave note C_, 7 + ;musicf2 note D_, 8 + ;musicdc 16 note C_, 7 + ;musicdc 17 + ;musicf3 note C_, 8 note D_, 7 + ;musicef 255 .Loop5 note G_, 4 note A_, 4 note G_, 3 note A_, 4 - loopchannel 2, .Loop5 + sound_loop 2, .Loop5 + ;musicf0 1 notetype0 1 + ;musicf1 85 + ;musicf2 octave 3 note C_, 8 + ;musicdc 16 note C_, 7 - note __, 8 + rest 8 + ;musicdc 17 note D_, 5 + ;musicdc 16 note C_, 2 - vibrato 0, $33 + vibrato 0, 3, 3 + ;musicdc 17 note F_, 15 + ;tie note F_, 15 + ;musicdc 16 note F_, 15 + ;musicdc 17 note C_, 8 + ;musicdc 16 note C_, 7 + ;musicdc 17 note C_, 15 dec_octave + ;musicf2 note A_, 8 inc_octave + ;musicdc 16 note C_, 7 dec_octave + ;musicdc 17 note F_, 8 + ;musicdc 16 note A_, 7 + ;musicdc 17 note E_, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 note F_, 8 + ;musicf0 3 + ;musicf3 octave 2 note A_, 7 + ;musicf2 note B_, 4 + ;musicdc 16 note A_, 4 + ;musicdc 17 inc_octave note C_, 4 dec_octave + ;musicdc 16 note B_, 3 inc_octave + ;musicf3 + ;musicdc 17 note D_, 8 + ;musicf2 note F_, 4 + ;musicdc 16 note D_, 3 + ;musicdc 17 note A_, 4 + ;musicdc 16 note F_, 4 inc_octave + ;musicdc 17 note C_, 4 dec_octave + ;musicdc 16 note A_, 3 + ;musicf3 + ;musicdc 17 note B_, 15 note A_, 5 note B_, 5 note A_, 5 + ;musicf2 note E_, 8 + ;musicdc 16 note A_, 7 + ;musicdc 17 note D_, 8 + ;musicdc 16 note E_, 7 + ;musicf0 1 + ;musicf3 octave 3 notetype0 5 + ;musicdc 17 + ;musicf2 note C_, 3 + ;musicdc 16 note C_, 3 + ;musicdc 17 note E_, 3 + ;musicdc 16 note E_, 3 - vibrato 15, $33 + ;musicdc 17 + vibrato 15, 3, 3 note G_, 6 + ;musicdc 16 note G_, 3 notetype0 1 + ;musicdc 17 note G_, 8 + ;musicdc 16 note G_, 7 + ;musicdc 17 note E_, 15 + ;musicf0 3 + ;musicf3 octave 3 + ;musicdc 17 note E_, 8 inc_octave note C_, 7 + ;musicf2 + ;musicf1 87 note D_, 8 + ;musicdc 16 note C_, 7 + ;musicdc 17 + ;musicf3 note C_, 8 note D_, 7 + ;musicef 255 note G_, 4 note A_, 4 note G_, 3 + ;musicef 255 note A_, 4 + ;musicf0 1 notetype0 1 + ;musicf3 + ;musicdc 17 octave 3 note C_, 15 note D_, 15 + ;musicdc 17 + ;musicf2 note E_, 8 + ;musicdc 16 note E_, 7 + ;musicdc 17 note F_, 15 + ;musicf0 3 + ;musicf3 octave 3 note C_, 8 note F_, 7 + ;musicf2 note G#, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 + ;musicf3 note F_, 8 note G#, 7 + ;musicf0 1 + ;musicf1 87 + ;musicf2 octave 3 notetype0 1 + ;musicdc 17 note G#, 16 + ;tie note G#, 14 + ;musicdc 16 note G#, 15 + ;musicdc 17 note F_, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 inc_octave note D#, 15 + ;musicf0 3 + ;musicdc 17 + ;musicf3 octave 3 note F_, 8 note G#, 7 inc_octave + ;musicf1 87 + ;musicf2 note C_, 8 + ;musicdc 16 note C_, 7 + ;musicdc 17 + ;musicf3 dec_octave note G#, 8 inc_octave @@ -620,285 +1101,516 @@ Music_TCG2TitleScreen_Ch1: note D#, 4 dec_octave note F_, 7 + ;musicf1 70 + ;musicf2 note G#, 4 + ;musicdc 16 note F_, 4 + ;musicdc 17 inc_octave note C_, 4 dec_octave + ;musicdc 16 note F_, 3 + ;musicdc 17 inc_octave note F_, 3 + ;musicdc 16 note C_, 2 dec_octave + ;musicdc 17 note G#, 3 inc_octave + ;musicdc 16 note C_, 2 + ;musicdc 17 note C_, 3 dec_octave + ;musicdc 16 note G#, 2 inc_octave + ;musicdc 17 note F_, 3 + ;musicdc 16 note C_, 2 + ;musicdc 17 note G#, 3 + ;musicdc 16 note F_, 2 + ;musicdc 17 inc_octave note C_, 3 dec_octave + ;musicdc 16 note G#, 2 + ;musicf3 notetype1 3 + ;musicdc 16 note C_, 3 + ;musicf1 39 + ;musicf2 dec_octave note G#, 3 - note __, 2 + rest 2 + ;musicf0 12 + ;musicf3 + ;musicdc 17 notetype0 1 octave 3 + ;musicf1 55 + ;musicf2 note G#, 3 + ;musicdc 16 note G#, 4 + ;musicdc 17 inc_octave note C_, 4 dec_octave + ;musicdc 16 note G#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 16 inc_octave note C_, 4 + ;musicdc 17 note D#, 4 + ;musicdc 16 dec_octave note G#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 16 inc_octave note D#, 4 + ;musicdc 17 note G_, 4 + ;musicdc 16 dec_octave note G#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 16 inc_octave + ;musicf0 6 + ;musicf3 + ;musicdc 16 note G_, 8 dec_octave note G#, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note G#, 4 + ;musicdc 16 note G#, 3 + ;musicdc 17 inc_octave note C_, 4 + ;musicdc 16 dec_octave note G#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 16 inc_octave note C_, 4 + ;musicdc 17 note D#, 4 + ;musicdc 16 dec_octave note G#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 16 inc_octave note D#, 4 + ;musicdc 17 note G_, 4 + ;musicdc 16 dec_octave note G#, 4 + ;musicdc 17 note G#, 3 + ;musicdc 16 inc_octave note G_, 4 + ;musicf0 6 + ;musicf3 + ;musicdc 16 note G_, 4 dec_octave note G#, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note D_, 4 + ;musicdc 16 note D_, 3 + ;musicdc 17 note G_, 4 + ;musicdc 16 note D_, 4 + ;musicdc 17 note D_, 3 + ;musicdc 16 note G_, 4 + ;musicdc 17 note A#, 4 + ;musicdc 16 note D_, 4 + ;musicdc 17 note D_, 3 + ;musicdc 16 note A#, 4 + ;musicdc 17 inc_octave note D_, 4 + ;musicdc 16 dec_octave note D_, 4 + ;musicdc 17 note D_, 3 + ;musicdc 16 inc_octave + ;musicf0 6 + ;musicf3 + ;musicdc 16 note D_, 8 dec_octave note D_, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note D_, 4 + ;musicdc 16 note D_, 3 + ;musicdc 17 note G_, 4 + ;musicdc 16 note D_, 4 + ;musicdc 17 note D_, 3 + ;musicdc 16 note G_, 4 + ;musicdc 17 note A#, 4 + ;musicdc 16 note D_, 4 + ;musicdc 17 note D_, 3 + ;musicdc 16 note A#, 4 + ;musicdc 17 inc_octave note D_, 4 + ;musicdc 16 + dec_octave + note D_, 4 + ;musicdc 17 + note D_, 3 + ;musicdc 16 + inc_octave + note D_, 4 + ;musicf0 6 + ;musicf3 + ;musicdc 16 + note D_, 4 dec_octave note D_, 4 - note D_, 3 - inc_octave - note D_, 4 - note D_, 4 - dec_octave - note D_, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note F_, 3 + ;musicdc 16 note F_, 4 + ;musicdc 17 note G#, 4 + ;musicdc 16 note F_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 16 note G#, 4 + ;musicdc 17 inc_octave note C_, 4 + ;musicdc 16 dec_octave note F_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 16 inc_octave note C_, 4 + ;musicdc 17 note D#, 4 + ;musicdc 16 dec_octave note F_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 16 inc_octave + ;musicf0 6 + ;musicf3 + ;musicdc 16 note D#, 8 dec_octave note F_, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note F_, 4 + ;musicdc 16 note F_, 3 + ;musicdc 17 note G#, 4 + ;musicdc 16 note F_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 16 note G#, 4 + ;musicdc 17 inc_octave note C_, 4 + ;musicdc 16 dec_octave note F_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 16 inc_octave note C_, 4 + ;musicdc 17 note D#, 4 + ;musicdc 16 dec_octave note F_, 4 + ;musicdc 17 note F_, 3 + ;musicdc 16 inc_octave note D#, 4 + ;musicf0 6 + ;musicf3 + ;musicdc 16 note D#, 4 dec_octave note F_, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note D#, 4 + ;musicdc 16 note D#, 3 + ;musicdc 17 note G_, 4 + ;musicdc 16 note D#, 4 + ;musicdc 17 note D#, 3 + ;musicdc 16 note G_, 4 + ;musicdc 17 note A#, 4 + ;musicdc 16 note D#, 4 + ;musicdc 17 note D#, 3 + ;musicdc 16 note A#, 4 + ;musicdc 17 inc_octave note D_, 4 + ;musicdc 16 dec_octave note D#, 4 + ;musicdc 17 note D#, 3 + ;musicdc 16 inc_octave + ;musicf0 6 + ;musicf3 + ;musicdc 16 note D_, 8 dec_octave note D#, 4 + ;musicf0 12 + ;musicdc 17 + ;musicf2 note D#, 4 + ;musicdc 16 note D#, 3 + ;musicdc 17 note G_, 4 + ;musicdc 16 note D#, 4 + ;musicdc 17 note D#, 3 + ;musicdc 16 note G_, 4 + ;musicdc 17 note A#, 4 + ;musicdc 16 note D#, 4 + ;musicdc 17 note E_, 3 + ;musicdc 16 note A#, 4 + ;musicdc 17 inc_octave note C_, 4 + ;musicdc 16 dec_octave note E_, 4 + ;musicdc 17 note E_, 3 + ;musicdc 16 inc_octave note C_, 4 + ;musicf0 1 + ;musicf1 80 + ;musicf2 + ;musicdc 17 octave 3 note D#, 8 + ;musicdc 16 note D#, 7 + ;musicf3 + ;musicdc 17 note C_, 5 note D#, 5 note G#, 5 + ;musicf2 inc_octave note C_, 8 dec_octave + ;musicdc 16 note G#, 7 + ;musicdc 17 + ;musicf3 note G#, 5 inc_octave note C_, 5 note D#, 5 note F#, 15 + ;musicf2 note D#, 8 + ;musicdc 16 note F#, 7 dec_octave + ;musicdc 17 note B_, 8 inc_octave + ;musicdc 16 note D#, 7 dec_octave + ;musicdc 17 note G#, 8 + ;musicdc 16 note B_, 7 + ;musicdc 17 note A#, 15 + ;musicdc 16 note A#, 8 + ;musicdc 17 note F_, 7 + ;musicdc 16 note A#, 8 + ;musicdc 17 note F_, 5 + ;musicdc 16 note F#, 2 + ;musicdc 17 + ;musicf3 note A#, 8 + ;musicf2 note F_, 5 + ;musicdc 16 note A#, 2 - vibrato 8, $33 + vibrato 8, 3, 3 + ;musicdc 17 note G_, 8 + ;tie note G_, 15 + ;musicdc 16 note G_, 7 + ;musicdc 17 note C_, 8 + ;tie note C_, 15 + ;musicdc 16 note C_, 7 + ;musicdc 17 note F_, 8 + ;musicdc 16 note C_, 7 + ;musicdc 17 + ;musicf3 note C_, 5 note F_, 5 note A_, 5 + ;musicf2 inc_octave note C_, 8 dec_octave + ;musicdc 16 note A_, 7 + ;musicdc 17 + ;musicf3 note F_, 5 note A_, 5 inc_octave note C_, 5 note F_, 15 + ;musicf2 note C_, 8 + ;musicdc 16 note C_, 7 + ;musicdc 17 dec_octave note A_, 8 inc_octave + ;musicdc 16 note C_, 7 dec_octave + ;musicdc 17 note F_, 8 + ;musicdc 16 note A_, 7 + ;musicdc 17 note G_, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 + ;musicf3 note D_, 5 note G_, 5 note B_, 5 inc_octave + ;musicf2 note D_, 8 dec_octave + ;musicdc 16 note B_, 7 + ;musicdc 17 + ;musicf3 note B_, 5 inc_octave note D_, 5 note G_, 5 note B_, 8 + ;tie note B_, 15 + ;tie note B_, 7 dec_octave dec_octave dec_octave + ;musicf3 + ;musicdc 17 note B_, 3 inc_octave note D_, 4 @@ -911,76 +1623,141 @@ Music_TCG2TitleScreen_Ch1: note D_, 4 note E_, 4 .Loop6 + ;musicf0 0 + ;musicf3 octave 4 notetype2 8 + ;musicdc 17 note E_, 16 + ;tie note E_, 14 + ;musicf0 7 + ;musicf1 80 + ;musicf2 notetype2 8 octave 3 note C_, 8 + ;musicdc 1 note C_, 7 dec_octave + ;musicf1 39 + ;musicf2 notetype2 8 + ;musicdc 17 note E_, 5 + ;musicdc 16 note E_, 3 + ;musicdc 17 note E_, 5 + ;musicdc 16 note E_, 2 rept 2 + ;musicdc 17 note E_, 8 + ;musicdc 16 note E_, 7 endr inc_octave + ;musicf1 64 + ;musicf2 notetype2 8 + ;musicdc 17 note C_, 8 + ;musicdc 1 note C_, 7 - note __, 8 + rest 8 + ;musicf0 0 + ;musicf1 101 + ;musicdc 17 octave 4 + ;musicf2 notetype2 8 note E_, 5 note E_, 2 - loopchannel 2, .Loop6 + sound_loop 2, .Loop6 + ;musicf0 0 + ;musicf3 octave 4 notetype2 8 + ;musicdc 17 note E_, 16 + ;tie note E_, 14 + ;musicf0 7 + ;musicf1 80 + ;musicf2 notetype2 8 octave 3 note C_, 8 + ;musicdc 1 note C_, 7 dec_octave + ;musicf1 55 + ;musicf2 notetype2 8 + ;musicdc 17 note F_, 5 + ;musicdc 16 note F_, 3 + ;musicdc 17 note F_, 5 + ;musicdc 16 note F_, 2 + ;musicdc 17 note F_, 8 + ;musicdc 16 note F_, 7 + ;musicf0 0 + ;musicf1 85 octave 4 notetype2 8 + ;musicdc 17 note E_, 8 + ;musicdc 16 note E_, 7 + ;musicf0 7 + ;musicf1 80 + ;musicf2 octave 3 notetype2 8 + ;musicdc 17 note C_, 8 + ;musicdc 1 note C_, 7 + ;musicf0 0 + ;musicf1 85 + ;musicf2 + ;musicdc 17 octave 4 notetype2 8 note D_, 5 + ;musicdc 16 note D_, 3 + ;musicdc 17 note C_, 5 + ;musicdc 16 note D_, 2 + ;musicdc 17 note D_, 8 + ;musicdc 16 note C_, 4 - note __, 11 + rest 11 dec_octave + ;musicdc 17 note G_, 4 inc_octave + ;musicdc 1 note D_, 3 dec_octave + ;musicdc 17 note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicf3 dec_octave note B_, 3 inc_octave @@ -991,115 +1768,197 @@ Music_TCG2TitleScreen_Ch1: note G_, 4 note A_, 4 note B_, 4 - vibrato 30, $33 + vibrato 30, 3, 3 inc_octave note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;tie note C_, 15 + ;musicf2 dec_octave note G#, 8 + ;musicdc 16 inc_octave note C_, 7 dec_octave + ;musicdc 17 note F_, 8 + ;musicdc 16 note A#, 7 + ;musicdc 17 inc_octave note C_, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 note C_, 8 + ;musicdc 16 note C_, 15 dec_octave + ;musicdc 17 note E_, 5 inc_octave + ;musicdc 16 note C_, 2 + ;musicdc 17 dec_octave note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;tie note G_, 15 + ;musicdc 16 note G_, 15 + ;musicdc 17 note E_, 5 + ;musicdc 16 note G_, 3 + ;musicdc 17 note G_, 5 + ;musicdc 16 note E_, 2 + ;musicdc 17 note F#, 16 + ;tie note F#, 14 + ;musicdc 16 note F#, 15 + ;musicdc 17 note F#, 5 + ;musicdc 16 note F#, 3 + ;musicdc 17 note F#, 5 + ;musicdc 16 note F#, 2 + ;musicdc 17 note F#, 15 + ;musicdc 16 note F#, 8 + ;musicdc 17 note F#, 16 + ;tie note F#, 4 + ;musicdc 16 note F#, 3 + ;musicdc 17 note F#, 8 + ;musicdc 16 note F#, 7 + ;musicdc 17 note F_, 16 + ;tie note F_, 14 + ;musicdc 16 note F_, 15 + ;musicdc 17 note F_, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 note F_, 16 + ;tie note F_, 14 + ;musicdc 16 note F_, 15 + ;musicdc 17 note F_, 8 + ;musicdc 16 note F_, 7 + ;musicdc 17 note F_, 16 + ;tie note F_, 14 + ;musicdc 16 note F_, 15 + ;musicdc 17 note F_, 5 + ;musicdc 16 note F_, 3 + ;musicdc 17 note F_, 5 + ;musicdc 16 note F_, 2 + ;musicdc 17 note F_, 15 + ;musicdc 16 note F_, 5 + ;musicdc 17 note D_, 15 + ;musicdc 16 note F_, 5 + ;musicdc 17 note F_, 15 + ;musicdc 16 note D_, 5 + ;musicdc 17 + ;musicf1 55 note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 16 + ;tie note E_, 10 + ;musicdc 16 note E_, 12 - endchannel + sound_ret -Music_TCG2TitleScreen_Ch3: +Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) notetype1 10 + ;musicdc 17 notetype2 11 notetype1 1 + ;musice8 3 + ;musice9 96 notetype0 1 - note __, 14 - note __, 14 + rest 14 + rest 14 notetype0 5 octave 3 + ;musice8 6 note D_, 9 + ;musice8 7 note D_, 1 note D_, 1 note D_, 1 + ;musice8 6 note C_, 9 + ;musice8 7 note C_, 1 note C_, 1 note C_, 1 + ;musice8 6 dec_octave note B_, 9 + ;musice8 7 note B_, 1 note B_, 1 note B_, 1 + ;musice8 6 note A_, 9 + ;musice8 7 note A_, 1 note A_, 1 note A_, 1 notetype0 10 + ;musice8 1 note G_, 12 + ;tie note G_, 3 + ;musice8 4 note F_, 3 note E_, 3 note D_, 3 @@ -1121,8 +1980,10 @@ Music_TCG2TitleScreen_Ch3: note D_, 6 note D_, 6 note G_, 6 + ;musice8 8 note A_, 3 note B_, 3 + ;musice8 4 inc_octave note C_, 6 note C_, 6 @@ -1142,42 +2003,66 @@ Music_TCG2TitleScreen_Ch3: note A#, 6 note A_, 6 notetype0 5 + ;musice8 6 note G#, 3 + ;musice8 4 note G#, 6 notetype0 1 + ;musice8 4 note G#, 7 note G#, 8 notetype0 5 + ;musice8 6 note G#, 3 + ;musice8 4 note G#, 6 + ;musice8 8 note G#, 3 + ;musice8 6 note G_, 3 + ;musice8 4 note G_, 6 notetype0 1 + ;musice8 4 note G_, 7 note G_, 8 notetype0 5 + ;musice8 6 note G_, 3 + ;musice8 4 note G_, 6 + ;musice8 8 note G_, 3 + ;musice8 6 note F_, 3 + ;musice8 4 note F_, 6 notetype0 1 + ;musice8 4 note F_, 7 note F_, 8 notetype0 5 + ;musice8 6 note A#, 3 + ;musice8 4 note A#, 6 + ;musice8 8 note E_, 3 + ;musice8 6 note D#, 3 + ;musice8 4 note D#, 6 notetype0 1 + ;musice8 4 note D#, 7 note D#, 8 notetype0 5 + ;musice8 6 note D#, 3 + ;musice8 8 note D#, 3 note E_, 6 + ;musice8 4 note F_, 6 note F_, 6 note G#, 6 @@ -1195,48 +2080,60 @@ Music_TCG2TitleScreen_Ch3: note G_, 6 note G_, 6 notetype0 5 + ;musice8 7 octave 2 .Loop1 notetype0 5 + ;musice8 7 note A_, 3 note A_, 3 - callchannel Branch_1ea254 + sound_call Branch_1ea254 notetype0 1 + ;musice8 4 note A_, 7 note A_, 8 - loopchannel 2, .Loop1 + sound_loop 2, .Loop1 .Loop2 notetype0 5 + ;musice8 7 note G_, 3 note G_, 3 - callchannel Branch_1ea254 + sound_call Branch_1ea254 notetype0 1 + ;musice8 4 note G_, 7 note G_, 8 - loopchannel 2, .Loop2 + sound_loop 2, .Loop2 .Loop3 notetype0 5 + ;musice8 7 note F_, 3 note F_, 3 - callchannel Branch_1ea254 + sound_call Branch_1ea254 notetype0 1 + ;musice8 4 note F_, 7 note F_, 8 - loopchannel 2, .Loop3 + sound_loop 2, .Loop3 notetype0 5 + ;musice8 7 note E_, 3 note E_, 3 - callchannel Branch_1ea254 + sound_call Branch_1ea254 notetype0 1 + ;musice8 4 note E_, 7 note E_, 8 notetype0 5 + ;musice8 7 note E_, 3 note E_, 3 - callchannel Branch_1ea26d + sound_call Branch_1ea26d notetype0 1 + ;musice8 4 note E_, 7 note E_, 8 + ;musice8 4 notetype0 5 octave 2 note G#, 6 @@ -1255,6 +2152,7 @@ Music_TCG2TitleScreen_Ch3: note G_, 6 note G_, 6 note G_, 6 + ;musice8 3 inc_octave note C_, 3 dec_octave @@ -1264,157 +2162,218 @@ Music_TCG2TitleScreen_Ch3: dec_octave note G_, 3 inc_octave + ;musice8 5 note C_, 4 dec_octave note G_, 4 note G_, 4 + ;musice8 6 notetype0 10 note C_, 12 - endchannel + sound_ret Branch_1ea254: notetype0 1 octave 4 + ;musice8 4 + ;musicdc 17 + ;musice8 6 notetype1 1 note E_, 8 + ;musicdc 16 notetype1 3 note E_, 7 + ;musicdc 17 notetype1 1 octave 2 - endchannel + ;musice8 7 + sound_ret Branch_1ea26d: notetype0 1 octave 4 + ;musice8 4 + ;musicdc 17 + ;musice8 6 notetype1 1 note G_, 8 + ;musicdc 16 notetype1 3 note G_, 7 + ;musicdc 17 notetype1 1 octave 2 - endchannel + ;musice8 7 + sound_ret -Music_TCG2TitleScreen_Ch4: - togglenoise $06 +Music_TCG2TitleScreen_Ch4: ; 1ea286 (7a:6286) + toggle_noise 6 octave 1 - notetype 1 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 3 - note D_, 4 - notetype 5 + drum_speed 1 + ;musicef 252 + drum_note 3, 3 + drum_note 3, 4 + ;musicef 254 + drum_note 3, 3 + drum_note 3, 4 + ;musicef 0 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_speed 5 .Loop1 - note F_, 9 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 4, .Loop1 - notetype 1 - note D_, 5 + drum_note 6, 9 + drum_note 2, 1 + ;musicef 252 + drum_note 2, 1 + drum_note 2, 1 + ;musicef 0 + sound_loop 4, .Loop1 + drum_speed 1 + drum_note 3, 5 + ;musicef 252 .Loop2 - note D_, 5 - loopchannel 23, .Loop2 - notetype 10 - note F_, 12 - notetype 1 + drum_note 3, 5 + sound_loop 23, .Loop2 + drum_speed 10 + ;musicef 2 + drum_note 6, 12 + ;musicef 0 + drum_speed 1 .Loop3 - note C#, 15 - note C#, 15 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - loopchannel 15, .Loop3 - note C#, 15 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 + drum_note 2, 15 + ;musicef 252 + drum_note 2, 15 + ;musicef 0 + drum_note 2, 15 + ;musicef 254 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + sound_loop 15, .Loop3 + drum_note 2, 15 + ;musicef 252 + drum_note 2, 15 + ;musicef 0 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 .Loop4 - note C#, 15 - note C#, 15 - note E_, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - loopchannel 7, .Loop4 - note C#, 15 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 + drum_note 2, 15 + drum_note 2, 15 + ;musicef 2 + drum_note 5, 15 + ;musicef 0 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + sound_loop 7, .Loop4 + drum_note 2, 15 + drum_note 2, 15 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 .Loop5 - note C#, 15 - note C#, 15 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - loopchannel 7, .Loop5 - note C#, 15 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 + drum_note 2, 15 + ;musicef 252 + drum_note 2, 15 + ;musicef 0 + drum_note 2, 15 + ;musicef 254 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + sound_loop 7, .Loop5 + drum_note 2, 15 + ;musicef 252 + drum_note 2, 15 + ;musicef 0 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 .Loop6 - note C#, 15 - note C#, 16 - note C#, 14 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - loopchannel 8, .Loop6 + drum_note 2, 15 + drum_note 2, 16 + ;tie + drum_note 2, 14 + ;musicef 252 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + sound_loop 8, .Loop6 .Loop7 - note C#, 15 - note C#, 15 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - loopchannel 8, .Loop7 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - note C#, 15 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 3 - note D_, 4 - note D_, 4 - note D_, 4 - note C#, 5 - notetype 5 - note C#, 4 - note C#, 4 - note F_, 12 - endchannel - + drum_note 2, 15 + ;musicef 252 + drum_note 2, 15 + ;musicef 0 + drum_note 2, 15 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + sound_loop 8, .Loop7 + ;musicef 1 + drum_note 2, 15 + drum_note 3, 3 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + drum_note 2, 15 + ;musicef 250 + drum_note 3, 3 + drum_note 3, 4 + ;musicef 252 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 254 + drum_note 3, 3 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + ;musicef 0 + drum_note 2, 5 + drum_speed 5 + drum_note 2, 4 + drum_note 2, 4 + ;musicef 2 + drum_note 6, 12 + sound_ret +; 0x1ea368 diff --git a/crysaudio/music/aftertherivalfight.asm b/crysaudio/music/aftertherivalfight.asm index 114a6fd5..6ca23b0d 100644 --- a/crysaudio/music/aftertherivalfight.asm +++ b/crysaudio/music/aftertherivalfight.asm @@ -1,64 +1,65 @@ Music_AfterTheRivalFight: - musicheader 4, 1, Music_AfterTheRivalFight_Ch1 - musicheader 1, 2, Music_AfterTheRivalFight_Ch2 - musicheader 1, 3, Music_AfterTheRivalFight_Ch3 - musicheader 1, 4, Music_AfterTheRivalFight_Ch4 + channel_count 4 + channel 1, Music_AfterTheRivalFight_Ch1 + channel 2, Music_AfterTheRivalFight_Ch2 + channel 3, Music_AfterTheRivalFight_Ch3 + channel 4, Music_AfterTheRivalFight_Ch4 Music_AfterTheRivalFight_Ch1: tempo 112 - volume $77 - dutycycle $0 - tone $0001 - vibrato $8, $14 - stereopanning $f0 - notetype $c, $b2 + volume 7, 7 + duty_cycle 0 + pitch_offset 1 + vibrato 8, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 11, 2 octave 2 note G#, 4 note G#, 4 - intensity $82 + volume_envelope 8, 2 octave 3 note G#, 2 note G#, 2 note G#, 2 note G#, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1 + sound_loop 0, Music_LookRival_Ch1.mainloop Music_AfterTheRivalFight_Ch2: - dutycycle $1 - vibrato $6, $35 - stereopanning $f - notetype $c, $c2 + duty_cycle 1 + vibrato 6, 3, 5 + stereo_panning FALSE, TRUE + note_type 12, 12, 2 octave 4 note G#, 4 note G#, 4 - intensity $a2 + volume_envelope 10, 2 note G#, 2 note G#, 2 note G#, 2 note G#, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f502e + sound_loop 0, Music_LookRival_Ch2.mainloop Music_AfterTheRivalFight_Ch3: - notetype $c, $28 + note_type 12, 2, 8 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note G#, 2 note F#, 2 note F_, 2 note D#, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f509d + sound_loop 0, Music_LookRival_Ch3.mainloop Music_AfterTheRivalFight_Ch4: - togglenoise $3 - stereopanning $f - notetype $c - note D_, 4 - note D_, 4 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f5118 + toggle_noise 3 + stereo_panning FALSE, TRUE + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_loop 0, Music_LookRival_Ch4.mainloop diff --git a/crysaudio/music/azaleatown.asm b/crysaudio/music/azaleatown.asm index 0b230447..d895469d 100644 --- a/crysaudio/music/azaleatown.asm +++ b/crysaudio/music/azaleatown.asm @@ -1,88 +1,89 @@ Music_AzaleaTown: - musicheader 4, 1, Music_AzaleaTown_Ch1 - musicheader 1, 2, Music_AzaleaTown_Ch2 - musicheader 1, 3, Music_AzaleaTown_Ch3 - musicheader 1, 4, Music_AzaleaTown_Ch4 + channel_count 4 + channel 1, Music_AzaleaTown_Ch1 + channel 2, Music_AzaleaTown_Ch2 + channel 3, Music_AzaleaTown_Ch3 + channel 4, Music_AzaleaTown_Ch4 Music_AzaleaTown_Ch1: tempo 160 - volume $77 - dutycycle $2 - stereopanning $f - notetype $c, $a1 - note __, 2 -Music_AzaleaTown_branch_f5801: - intensity $a1 + volume 7, 7 + duty_cycle 2 + stereo_panning FALSE, TRUE + note_type 12, 10, 1 + rest 2 +.introloop: + volume_envelope 10, 1 octave 3 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 note F_, 2 note F_, 2 - loopchannel 2, Music_AzaleaTown_branch_f5801 -Music_AzaleaTown_branch_f5816: - callchannel Music_AzaleaTown_branch_f588c - stereopanning $f0 - intensity $a4 + sound_loop 2, .introloop +.mainloop: + sound_call .sub1 + stereo_panning TRUE, FALSE + volume_envelope 10, 4 note G#, 2 note A#, 1 - note __, 3 + rest 3 octave 4 note C_, 4 - notetype $6, $a4 + note_type 6, 10, 4 note G_, 1 note G#, 3 note F#, 4 note D#, 2 - note __, 2 - stereopanning $f - callchannel Music_AzaleaTown_branch_f588c - stereopanning $f0 - notetype $6, $a4 + rest 2 + stereo_panning FALSE, TRUE + sound_call .sub1 + stereo_panning TRUE, FALSE + note_type 6, 10, 4 note D#, 4 note C_, 4 - note __, 3 + rest 3 note B_, 1 octave 4 note C_, 12 octave 3 note A#, 4 note F#, 4 - stereopanning $f - callchannel Music_AzaleaTown_branch_f5912 - intensity $a3 + stereo_panning FALSE, TRUE + sound_call .sub2 + volume_envelope 10, 3 note A#, 4 octave 4 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 - intensity $a1 + rest 2 + volume_envelope 10, 1 octave 3 note C#, 4 note A_, 2 - note __, 14 - callchannel Music_AzaleaTown_branch_f5912 - intensity $a3 + rest 14 + sound_call .sub2 + volume_envelope 10, 3 octave 4 note C_, 1 note C#, 3 note F_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - intensity $a1 + rest 2 + volume_envelope 10, 1 octave 3 note G_, 4 note A#, 4 note G_, 8 - intensity $a2 + volume_envelope 10, 2 note A#, 4 octave 4 note C#, 4 @@ -91,7 +92,7 @@ Music_AzaleaTown_branch_f5816: note F#, 4 note C#, 8 note F#, 4 - note __, 4 + rest 4 note A#, 4 octave 4 note C#, 4 @@ -99,9 +100,9 @@ Music_AzaleaTown_branch_f5816: note A#, 4 note G_, 4 note C#, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 octave 4 note C#, 4 note D#, 4 @@ -112,210 +113,210 @@ Music_AzaleaTown_branch_f5816: note C#, 4 octave 2 note G#, 4 - note __, 8 - notetype $c, $2f + rest 8 + note_type 12, 2, -7 octave 3 note G#, 14 - note __, 2 - loopchannel 0, Music_AzaleaTown_branch_f5816 + rest 2 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f588c: - notetype $c, $a1 +.sub1: + note_type 12, 10, 1 octave 4 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D#, 2 note D#, 2 - intensity $a1 + volume_envelope 10, 1 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note A#, 2 - intensity $61 + volume_envelope 6, 1 note A#, 2 note A#, 2 - intensity $a1 + volume_envelope 10, 1 note G#, 2 - intensity $61 + volume_envelope 6, 1 note G#, 2 note G#, 2 - intensity $a1 + volume_envelope 10, 1 note A_, 2 - intensity $61 + volume_envelope 6, 1 note A_, 2 - intensity $a1 + volume_envelope 10, 1 note C_, 2 - intensity $61 + volume_envelope 6, 1 note C_, 2 note C_, 2 - intensity $a1 + volume_envelope 10, 1 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 note C#, 2 note C#, 2 note C#, 2 - intensity $a1 + volume_envelope 10, 1 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D#, 2 note D#, 2 - intensity $a1 + volume_envelope 10, 1 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 note C#, 2 note C#, 2 - note __, 2 - intensity $a1 + rest 2 + volume_envelope 10, 1 octave 3 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note F#, 2 - intensity $61 + volume_envelope 6, 1 note F#, 2 note F#, 2 note F#, 2 note F#, 2 - intensity $a1 + volume_envelope 10, 1 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D#, 2 note D#, 2 - intensity $a1 + volume_envelope 10, 1 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 - intensity $a1 + volume_envelope 10, 1 note C_, 2 - intensity $61 + volume_envelope 6, 1 note C_, 2 note C_, 2 - intensity $a1 + volume_envelope 10, 1 octave 2 note A#, 2 - intensity $61 + volume_envelope 6, 1 note A#, 2 note A#, 2 - intensity $a1 + volume_envelope 10, 1 octave 3 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 - endchannel + sound_ret -Music_AzaleaTown_branch_f5912: - intensity $61 +.sub2: + volume_envelope 6, 1 note G#, 8 note G#, 8 - intensity $81 + volume_envelope 8, 1 note A_, 8 - intensity $a1 + volume_envelope 10, 1 note A_, 8 - endchannel + sound_ret Music_AzaleaTown_Ch2: - vibrato $12, $23 - dutycycle $2 - stereopanning $f0 - notetype $c, $62 - note __, 1 + vibrato 18, 2, 3 + duty_cycle 2 + stereo_panning TRUE, FALSE + note_type 12, 6, 2 + rest 1 octave 4 note D_, 1 - intensity $b1 + volume_envelope 11, 1 note D#, 2 - intensity $71 + volume_envelope 7, 1 note D#, 2 note D#, 2 - intensity $b1 + volume_envelope 11, 1 note C#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 2 note C#, 2 - intensity $51 + volume_envelope 5, 1 note C#, 2 note C#, 2 - intensity $b1 + volume_envelope 11, 1 note C_, 2 - intensity $71 + volume_envelope 7, 1 note C_, 2 note C_, 2 - intensity $b1 + volume_envelope 11, 1 note C#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 2 note C#, 2 - notetype $6, $b4 + note_type 6, 11, 4 note F_, 7 - dutycycle $1 + duty_cycle 1 octave 5 note C_, 1 -Music_AzaleaTown_branch_f5952: - callchannel Music_AzaleaTown_branch_f59c7 +.mainloop: + sound_call .sub1 note C#, 4 note C_, 2 note C#, 1 - note __, 3 - notetype $6, $b4 + rest 3 + note_type 6, 11, 4 note D#, 11 - note __, 8 - dutycycle $1 + rest 8 + duty_cycle 1 octave 5 note C_, 1 - callchannel Music_AzaleaTown_branch_f59c7 - note __, 2 + sound_call .sub1 + rest 2 note C#, 2 note C_, 2 octave 3 note G#, 2 - notetype $6, $b4 - note __, 3 + note_type 6, 11, 4 + rest 3 octave 4 note G_, 1 note G#, 12 note F#, 4 note F_, 4 - dutycycle $0 + duty_cycle 0 note D_, 1 note D#, 3 note C#, 4 note C_, 2 - note __, 2 + rest 2 note G#, 4 - note __, 4 + rest 4 note F#, 4 - note __, 4 + rest 4 note F_, 4 note D#, 4 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C#, 8 - note __, 12 + rest 12 note D_, 1 note D#, 3 note C#, 4 note C_, 2 - note __, 2 + rest 2 note G#, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 octave 5 note C_, 4 octave 4 @@ -323,331 +324,331 @@ Music_AzaleaTown_branch_f5952: octave 5 note C_, 3 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note F_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note C#, 4 - dutycycle $2 + duty_cycle 2 note F_, 4 note D#, 4 note C#, 4 note F_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note C#, 4 note F_, 4 note D#, 4 note C#, 4 note F_, 4 - note __, 4 + rest 4 note A#, 4 - note __, 4 + rest 4 octave 5 note C_, 4 - notetype $c, $b7 + note_type 12, 11, 7 octave 4 note G#, 12 note D#, 4 - intensity $1f + volume_envelope 1, -7 note C_, 14 - notetype $6, $b4 - dutycycle $1 + note_type 6, 11, 4 + duty_cycle 1 note G#, 2 octave 5 note C_, 2 - loopchannel 0, Music_AzaleaTown_branch_f5952 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f59c7: +.sub1: note C#, 4 octave 4 note G#, 2 - note __, 2 + rest 2 octave 5 note C_, 2 - note __, 2 + rest 2 note C#, 8 note D#, 8 note F_, 2 - note __, 1 + rest 1 note G_, 1 note G#, 12 note F_, 2 - note __, 6 + rest 6 note D#, 8 note F_, 2 - note __, 1 + rest 1 note C_, 1 - notetype $c, $a8 - vibrato $0, $0 + note_type 12, 10, 8 + vibrato 0, 0, 0 note C#, 8 - intensity $a7 - vibrato $12, $23 + volume_envelope 10, 7 + vibrato 18, 2, 3 note C#, 16 - note __, 4 - intensity $b4 - dutycycle $2 + rest 4 + volume_envelope 11, 4 + duty_cycle 2 octave 3 note A#, 2 octave 4 note C#, 1 - note __, 1 + rest 1 note F#, 8 - note __, 2 + rest 2 note F#, 2 note F_, 2 note D#, 1 - note __, 1 + rest 1 note C#, 6 note C_, 2 - note __, 2 + rest 2 note C_, 4 note C#, 1 - notetype $6, $b4 - note __, 1 + note_type 6, 11, 4 + rest 1 note D_, 1 - notetype $c, $b7 + note_type 12, 11, 7 note D#, 12 - intensity $b4 - endchannel + volume_envelope 11, 4 + sound_ret Music_AzaleaTown_Ch3: - stereopanning $ff - vibrato $6, $26 - notetype $c, $25 + stereo_panning TRUE, TRUE + vibrato 6, 2, 6 + note_type 12, 2, 5 octave 2 note G#, 1 octave 3 note C_, 1 note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 octave 2 note G#, 4 octave 3 note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 note G#, 4 -Music_AzaleaTown_branch_f5a24: - callchannel Music_AzaleaTown_branch_f5a86 +.mainloop: + sound_call .sub1 note G#, 4 note D#, 2 - callchannel Music_AzaleaTown_branch_f5a86 + sound_call .sub1 note G#, 2 - note __, 2 + rest 2 note F#, 2 - callchannel Music_AzaleaTown_branch_f5acf + sound_call .sub2 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 2 octave 3 note A_, 4 octave 4 note C#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 - callchannel Music_AzaleaTown_branch_f5acf + rest 1 + sound_call .sub2 octave 2 note A#, 2 octave 3 note F_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 2 octave 2 note A#, 2 octave 3 note D#, 1 - note __, 3 + rest 3 note G_, 2 octave 2 note F#, 1 - note __, 5 + rest 5 note F#, 1 note F#, 1 note F#, 1 - note __, 1 + rest 1 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note F_, 1 note F#, 1 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 note G_, 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 note G_, 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 octave 3 note C_, 1 - loopchannel 0, Music_AzaleaTown_branch_f5a24 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f5a86: +.sub1: note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 octave 2 note G#, 4 octave 3 note F_, 1 - note __, 5 + rest 5 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 4 note A_, 2 - intensity $15 + volume_envelope 1, 5 note A#, 1 - note __, 1 - intensity $25 + rest 1 + volume_envelope 2, 5 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 4 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note G#, 4 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 6 - note __, 4 + rest 4 note F#, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note C#, 4 note G_, 1 - note __, 5 + rest 5 note G_, 1 - note __, 3 + rest 3 note C#, 4 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_AzaleaTown_branch_f5acf: - intensity $35 +.sub2: + volume_envelope 3, 5 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 - intensity $25 + rest 1 + volume_envelope 2, 5 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_AzaleaTown_Ch4: - togglenoise $3 - notetype $c - note F_, 2 -Music_AzaleaTown_branch_f5aea: - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D#, 2 - note D_, 2 - note G_, 1 - note G_, 1 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D#, 2 - note D_, 2 - note F#, 2 - loopchannel 0, Music_AzaleaTown_branch_f5aea + toggle_noise 3 + drum_speed 12 + drum_note 6, 2 +.mainloop: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 4, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/battletowerlobby.asm b/crysaudio/music/battletowerlobby.asm index 2bf38a83..50e127fd 100644 --- a/crysaudio/music/battletowerlobby.asm +++ b/crysaudio/music/battletowerlobby.asm @@ -1,22 +1,23 @@ Music_BattleTowerLobby: - musicheader 4, 1, Music_BattleTowerLobby_Ch1 - musicheader 1, 2, Music_BattleTowerLobby_Ch2 - musicheader 1, 3, Music_BattleTowerLobby_Ch3 - musicheader 1, 4, Music_BattleTowerLobby_Ch4 + channel_count 4 + channel 1, Music_BattleTowerLobby_Ch1 + channel 2, Music_BattleTowerLobby_Ch2 + channel 3, Music_BattleTowerLobby_Ch3 + channel 4, Music_BattleTowerLobby_Ch4 Music_BattleTowerLobby_Ch1: tempo 152 - volume $77 - dutycycle $3 - tone $0001 - vibrato $8, $22 - stereopanning $f0 - notetype $c, $72 -Music_BattleTowerLobby_branch_1794a9: - notetype $c, $72 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 8, 2, 2 + stereo_panning TRUE, FALSE + note_type 12, 7, 2 +.mainloop: + note_type 12, 7, 2 octave 3 note G#, 2 - notetype $c, $73 + note_type 12, 7, 3 octave 2 note B_, 2 octave 3 @@ -28,9 +29,9 @@ Music_BattleTowerLobby_branch_1794a9: octave 3 note E_, 2 note G#, 2 - notetype $c, $72 + note_type 12, 7, 2 note F#, 2 - notetype $c, $73 + note_type 12, 7, 3 octave 2 note B_, 2 octave 3 @@ -42,9 +43,9 @@ Music_BattleTowerLobby_branch_1794a9: octave 3 note D#, 2 note F#, 2 - notetype $c, $72 + note_type 12, 7, 2 note G#, 2 - notetype $c, $73 + note_type 12, 7, 3 octave 2 note B_, 2 octave 3 @@ -57,9 +58,9 @@ Music_BattleTowerLobby_branch_1794a9: note B_, 2 octave 4 note E_, 2 - notetype $c, $72 + note_type 12, 7, 2 note F#, 3 - notetype $c, $73 + note_type 12, 7, 3 note D_, 1 note E_, 2 octave 3 @@ -68,32 +69,32 @@ Music_BattleTowerLobby_branch_1794a9: note E_, 2 note G#, 2 note B_, 2 - notetype $c, $72 + note_type 12, 7, 2 note C#, 2 - notetype $c, $73 + note_type 12, 7, 3 note D#, 2 note E_, 2 note C#, 1 octave 2 note B_, 1 note A_, 4 - notetype $c, $62 + note_type 12, 6, 2 note A_, 4 - notetype $c, $72 + note_type 12, 7, 2 note B_, 2 - notetype $c, $73 + note_type 12, 7, 3 octave 3 note C#, 2 note D#, 2 note E_, 1 note F#, 1 note G#, 4 - notetype $c, $62 + note_type 12, 6, 2 octave 2 note G#, 4 - notetype $c, $72 + note_type 12, 7, 2 note A_, 2 - notetype $c, $73 + note_type 12, 7, 3 note B_, 2 octave 3 note C#, 2 @@ -103,26 +104,26 @@ Music_BattleTowerLobby_branch_1794a9: note E_, 2 note F#, 2 note A_, 2 - notetype $c, $72 + note_type 12, 7, 2 note B_, 2 - notetype $c, $73 + note_type 12, 7, 3 note B_, 4 note A_, 1 note G#, 1 - notetype $c, $72 + note_type 12, 7, 2 note F#, 4 - notetype $c, $75 + note_type 12, 7, 5 octave 2 note B_, 4 - loopchannel 0, Music_BattleTowerLobby_branch_1794a9 + sound_loop 0, .mainloop Music_BattleTowerLobby_Ch2: - dutycycle $2 - vibrato $10, $34 - stereopanning $f - notetype $c, $82 -Music_BattleTowerLobby_branch_179544: - notetype $c, $82 + duty_cycle 2 + vibrato 16, 3, 4 + stereo_panning FALSE, TRUE + note_type 12, 8, 2 +.mainloop: + note_type 12, 8, 2 octave 4 note E_, 2 note E_, 4 @@ -137,11 +138,11 @@ Music_BattleTowerLobby_branch_179544: note E_, 1 octave 3 note B_, 4 - notetype $c, $65 + note_type 12, 6, 5 note F#, 4 octave 2 note B_, 4 - notetype $c, $82 + note_type 12, 8, 2 octave 4 note E_, 2 note E_, 4 @@ -154,96 +155,96 @@ Music_BattleTowerLobby_branch_179544: note G#, 2 note A_, 3 note F#, 1 - notetype $c, $87 + note_type 12, 8, 7 note G#, 12 - notetype $c, $82 + note_type 12, 8, 2 octave 3 note A_, 2 - notetype $c, $84 + note_type 12, 8, 4 note A_, 4 note F#, 1 note G#, 1 note A_, 4 - notetype $c, $82 + note_type 12, 8, 2 note C#, 4 octave 4 note G#, 2 - notetype $c, $84 + note_type 12, 8, 4 note G#, 4 note F#, 1 note G#, 1 note E_, 4 - notetype $c, $82 + note_type 12, 8, 2 octave 3 note E_, 4 octave 4 note F#, 2 - notetype $c, $84 + note_type 12, 8, 4 note F#, 4 note A_, 1 note G#, 1 note A_, 4 note D_, 4 - notetype $c, $82 + note_type 12, 8, 2 note E_, 2 - notetype $c, $84 + note_type 12, 8, 4 note E_, 4 note F#, 1 note E_, 1 note D#, 4 - notetype $c, $73 + note_type 12, 7, 3 octave 3 note D#, 1 note F#, 1 note B_, 1 octave 4 note D#, 1 - loopchannel 0, Music_BattleTowerLobby_branch_179544 + sound_loop 0, .mainloop Music_BattleTowerLobby_Ch3: - notetype $c, $11 -Music_BattleTowerLobby_branch_1795b1: + note_type 12, 1, 1 +.mainloop: octave 2 note B_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 2 note B_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 2 octave 2 note B_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 2 note A_, 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 note B_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 2 note A_, 2 @@ -258,7 +259,7 @@ Music_BattleTowerLobby_branch_1795b1: octave 3 note C#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 @@ -272,7 +273,7 @@ Music_BattleTowerLobby_branch_1795b1: note B_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note D_, 2 octave 2 note F#, 2 @@ -294,15 +295,15 @@ Music_BattleTowerLobby_branch_1795b1: note E_, 2 note D#, 2 note F#, 2 - loopchannel 0, Music_BattleTowerLobby_branch_1795b1 + sound_loop 0, .mainloop Music_BattleTowerLobby_Ch4: - togglenoise $0 -Music_BattleTowerLobby_branch_179612: - notetype $c - note __, 2 - note F_, 4 - note F_, 4 - note F_, 2 - note F_, 4 - loopchannel 0, Music_BattleTowerLobby_branch_179612 + toggle_noise 0 +.mainloop: + drum_speed 12 + rest 2 + drum_note 6, 4 + drum_note 6, 4 + drum_note 6, 2 + drum_note 6, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/battletowertheme.asm b/crysaudio/music/battletowertheme.asm index 18af9586..4aa26204 100644 --- a/crysaudio/music/battletowertheme.asm +++ b/crysaudio/music/battletowertheme.asm @@ -1,32 +1,33 @@ Music_BattleTowerTheme: - musicheader 4, 1, Music_BattleTowerTheme_Ch1 - musicheader 1, 2, Music_BattleTowerTheme_Ch2 - musicheader 1, 3, Music_BattleTowerTheme_Ch3 - musicheader 1, 4, Music_BattleTowerTheme_Ch4 + channel_count 4 + channel 1, Music_BattleTowerTheme_Ch1 + channel 2, Music_BattleTowerTheme_Ch2 + channel 3, Music_BattleTowerTheme_Ch3 + channel 4, Music_BattleTowerTheme_Ch4 Music_BattleTowerTheme_Ch1: tempo 141 - volume $77 - tone $0001 - vibrato $12, $34 - stereopanning $f - notetype $6, $94 -Music_BattleTowerTheme_branch_1788a5: - note __, 16 - note __, 16 - note __, 12 - note __, 12 - dutycycle $2 + volume 7, 7 + pitch_offset 1 + vibrato 18, 3, 4 + stereo_panning FALSE, TRUE + note_type 6, 9, 4 +.mainloop: + rest 16 + rest 16 + rest 12 + rest 12 + duty_cycle 2 octave 3 note C_, 2 note E_, 2 note G_, 4 - callchannel Music_BattleTowerTheme_branch_17895e + sound_call .sub1 note G_, 2 - note __, 2 + rest 2 note C_, 4 - note __, 4 - intensity $92 + rest 4 + volume_envelope 9, 2 note G_, 2 note F_, 2 note C_, 2 @@ -39,13 +40,13 @@ Music_BattleTowerTheme_branch_1788a5: octave 3 note G_, 2 note E_, 2 - callchannel Music_BattleTowerTheme_branch_17895e + sound_call .sub1 note G_, 2 - note __, 2 + rest 2 octave 2 note A#, 4 - note __, 4 - intensity $92 + rest 4 + volume_envelope 9, 2 octave 3 note G_, 2 note D#, 2 @@ -59,9 +60,9 @@ Music_BattleTowerTheme_branch_1788a5: octave 3 note A_, 2 note F_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - note __, 2 + rest 2 note E_, 4 note F_, 4 note G_, 2 @@ -71,7 +72,7 @@ Music_BattleTowerTheme_branch_1788a5: note A#, 8 octave 3 note C_, 2 - note __, 2 + rest 2 note D_, 4 note E_, 4 note F_, 2 @@ -80,7 +81,7 @@ Music_BattleTowerTheme_branch_1788a5: octave 2 note A_, 8 note A#, 2 - note __, 2 + rest 2 octave 3 note C_, 4 note D_, 4 @@ -92,17 +93,17 @@ Music_BattleTowerTheme_branch_1788a5: note A#, 4 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note F_, 4 - note __, 4 + rest 4 octave 2 note A_, 2 octave 3 note C_, 2 note E_, 4 - note __, 4 - dutycycle $3 + rest 4 + duty_cycle 3 note C_, 2 note E_, 2 note G_, 4 @@ -171,121 +172,121 @@ Music_BattleTowerTheme_branch_1788a5: note D#, 4 note C#, 4 note F_, 4 - intensity $94 + volume_envelope 9, 4 octave 4 note C_, 4 octave 3 note E_, 6 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 12 - loopchannel 0, Music_BattleTowerTheme_branch_1788a5 + rest 12 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_17895e: - intensity $94 +.sub1: + volume_envelope 9, 4 note A_, 2 - note __, 2 + rest 2 note C_, 4 - note __, 4 + rest 4 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C_, 4 note F_, 4 - note __, 4 + rest 4 note A_, 4 - endchannel + sound_ret Music_BattleTowerTheme_Ch2: - vibrato $12, $34 -Music_BattleTowerTheme_branch_178970: - dutycycle $3 - notetype $6, $b8 + vibrato 18, 3, 4 +.mainloop: + duty_cycle 3 + note_type 6, 11, 8 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note A_, 4 - note __, 4 + rest 4 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 note F_, 4 - note __, 4 + rest 4 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note A_, 4 - note __, 4 - tone $0001 + rest 4 + pitch_offset 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 4 - tone 0 - intensity $b7 + rest 4 + pitch_offset 0 + volume_envelope 11, 7 note G_, 2 octave 4 note C_, 2 note E_, 4 - callchannel Music_BattleTowerTheme_branch_178a15 + sound_call .sub1 note A#, 4 - note __, 2 + rest 2 note F_, 2 - notetype $c, $b7 + note_type 12, 11, 7 note C_, 12 - notetype $6, $b7 - callchannel Music_BattleTowerTheme_branch_178a15 - notetype $c, $b7 + note_type 6, 11, 7 + sound_call .sub1 + note_type 12, 11, 7 note A#, 2 - note __, 1 + rest 1 note G_, 1 note A_, 12 note A#, 1 - note __, 1 + rest 1 note A#, 4 note G_, 1 note A_, 1 note A#, 4 note D_, 4 note A_, 1 - note __, 1 + rest 1 note A_, 4 note G_, 1 note A_, 1 note F_, 8 note G_, 1 - note __, 1 + rest 1 note G_, 4 note A#, 1 note A_, 1 note A#, 4 note D#, 4 note F_, 1 - note __, 1 + rest 1 note F_, 4 note G_, 1 note F_, 1 note E_, 8 - stereopanning $f0 - dutycycle $2 + stereo_panning TRUE, FALSE + duty_cycle 2 note F_, 6 note A_, 1 note A#, 1 @@ -327,25 +328,25 @@ Music_BattleTowerTheme_branch_178970: note F_, 2 note G#, 2 note G_, 5 - note __, 1 - notetype $6, $b7 + rest 1 + note_type 6, 11, 7 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 4 - stereopanning $ff - dutycycle $3 + rest 4 + stereo_panning TRUE, TRUE + duty_cycle 3 octave 3 note C_, 2 note D_, 2 note E_, 4 - loopchannel 0, Music_BattleTowerTheme_branch_178970 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_178a15: +.sub1: note F_, 2 - note __, 2 + rest 2 note F_, 8 note C_, 2 note F_, 2 @@ -354,121 +355,121 @@ Music_BattleTowerTheme_branch_178a15: octave 4 note A#, 4 note A_, 4 - endchannel + sound_ret Music_BattleTowerTheme_Ch3: - vibrato $12, $34 - notetype $6, $16 -Music_BattleTowerTheme_branch_178a26: - stereopanning $ff - callchannel Music_BattleTowerTheme_branch_178afe + vibrato 18, 3, 4 + note_type 6, 1, 6 +.mainloop: + stereo_panning TRUE, TRUE + sound_call .sub1 note C_, 2 - note __, 2 + rest 2 note F_, 4 - note __, 4 + rest 4 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 4 - stereopanning $f0 + rest 4 + stereo_panning TRUE, FALSE note C_, 8 - callchannel Music_BattleTowerTheme_branch_178afe + sound_call .sub1 note C_, 2 - note __, 2 + rest 2 note F_, 4 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 4 note C_, 4 - note __, 4 + rest 4 note C_, 2 - note __, 2 - callchannel Music_BattleTowerTheme_branch_178afe + rest 2 + sound_call .sub1 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note D#, 4 - note __, 4 + rest 4 octave 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note C_, 4 note F_, 4 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 2 note A#, 2 - note __, 2 + rest 2 note A#, 4 note F_, 4 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 2 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 note F_, 8 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 2 note F_, 4 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 note F_, 8 note D#, 2 - note __, 2 + rest 2 note D#, 4 octave 2 note G_, 4 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 octave 3 note D#, 8 note F_, 2 - note __, 2 + rest 2 note C_, 4 - note __, 4 + rest 4 note C_, 2 octave 2 note F_, 2 note G_, 4 - note __, 4 - stereopanning $ff + rest 4 + stereo_panning TRUE, TRUE note G_, 2 octave 3 note C_, 2 @@ -476,22 +477,22 @@ Music_BattleTowerTheme_branch_178a26: note F_, 4 note C_, 8 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 4 note C_, 6 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 4 note D_, 8 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 4 note A_, 4 note F_, 4 @@ -499,21 +500,21 @@ Music_BattleTowerTheme_branch_178a26: note F_, 4 note C#, 8 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 4 note F_, 8 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 4 note F_, 8 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 4 note C_, 4 note D_, 4 @@ -521,21 +522,21 @@ Music_BattleTowerTheme_branch_178a26: note F_, 4 note C_, 8 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 4 note C_, 8 note F_, 2 - note __, 2 + rest 2 note F_, 4 octave 2 note A#, 8 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A#, 4 octave 2 note A#, 4 @@ -547,9 +548,9 @@ Music_BattleTowerTheme_branch_178a26: note G#, 8 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note G#, 4 octave 2 note G#, 8 @@ -558,128 +559,128 @@ Music_BattleTowerTheme_branch_178a26: note C_, 4 note G_, 8 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 12 - loopchannel 0, Music_BattleTowerTheme_branch_178a26 + rest 12 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_178afe: +.sub1: octave 3 note C_, 2 - note __, 2 + rest 2 note F_, 4 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 4 note C_, 4 - note __, 4 + rest 4 note C_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_BattleTowerTheme_Ch4: - togglenoise $3 - notetype $c -Music_BattleTowerTheme_branch_178b11: - callchannel Music_BattleTowerTheme_branch_178b58 - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 4 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 -Music_BattleTowerTheme_branch_178b1d: - callchannel Music_BattleTowerTheme_branch_178b58 - callchannel Music_BattleTowerTheme_branch_178b61 - loopchannel 2, Music_BattleTowerTheme_branch_178b1d - callchannel Music_BattleTowerTheme_branch_178b6c - callchannel Music_BattleTowerTheme_branch_178b61 - callchannel Music_BattleTowerTheme_branch_178b6c - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 8 -Music_BattleTowerTheme_branch_178b35: - callchannel Music_BattleTowerTheme_branch_178b76 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - loopchannel 3, Music_BattleTowerTheme_branch_178b35 - callchannel Music_BattleTowerTheme_branch_178b76 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note D_, 4 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - loopchannel 0, Music_BattleTowerTheme_branch_178b11 + toggle_noise 3 + drum_speed 12 +.mainloop: + sound_call .sub1 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_loop 2, .loop1 + sound_call .sub3 + sound_call .sub2 + sound_call .sub3 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 8 +.loop2: + sound_call .sub4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + sound_loop 3, .loop2 + sound_call .sub4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + sound_loop 0, .mainloop -Music_BattleTowerTheme_branch_178b58: - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - endchannel +.sub1: + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_BattleTowerTheme_branch_178b61: - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - endchannel +.sub2: + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + sound_ret -Music_BattleTowerTheme_branch_178b6c: - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - endchannel +.sub3: + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_BattleTowerTheme_branch_178b76: - note D_, 2 - note C#, 2 - note D_, 2 - note D_, 1 - note C#, 1 - note D_, 2 - note C#, 2 - note D_, 2 - note D_, 1 - note C#, 1 - endchannel +.sub4: + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 2, 1 + sound_ret diff --git a/crysaudio/music/bicycle.asm b/crysaudio/music/bicycle.asm index 92a19e81..0cf69d06 100644 --- a/crysaudio/music/bicycle.asm +++ b/crysaudio/music/bicycle.asm @@ -1,30 +1,31 @@ Music_Bicycle: - musicheader 4, 1, Music_Bicycle_Ch1 - musicheader 1, 2, Music_Bicycle_Ch2 - musicheader 1, 3, Music_Bicycle_Ch3 - musicheader 1, 4, Music_Bicycle_Ch4 + channel_count 4 + channel 1, Music_Bicycle_Ch1 + channel 2, Music_Bicycle_Ch2 + channel 3, Music_Bicycle_Ch3 + channel 4, Music_Bicycle_Ch4 Music_Bicycle_Ch1: tempo 140 - volume $77 - dutycycle $3 - tone $0001 - stereopanning $f - vibrato $8, $15 - notetype $c, $b4 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + stereo_panning FALSE, TRUE + vibrato 8, 1, 5 + note_type 12, 11, 4 octave 3 note B_, 6 note A_, 6 note G_, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 6 - intensity $b6 + volume_envelope 11, 6 note A_, 8 - intensity $b2 + volume_envelope 11, 2 note F#, 2 -Music_Bicycle_branch_ee144: - stereopanning $f - intensity $b2 +.mainloop: + stereo_panning FALSE, TRUE + volume_envelope 11, 2 note G_, 2 note G_, 2 note E_, 2 @@ -90,17 +91,17 @@ Music_Bicycle_branch_ee144: note F#, 2 note G_, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 note F#, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 2 note G_, 2 note F#, 2 note G_, 2 note G#, 2 note A_, 2 - stereopanning $f0 - intensity $b6 + stereo_panning TRUE, FALSE + volume_envelope 11, 6 note B_, 4 note G_, 4 octave 4 @@ -167,19 +168,19 @@ Music_Bicycle_branch_ee144: note G_, 2 note G#, 2 note A_, 2 - loopchannel 0, Music_Bicycle_branch_ee144 + sound_loop 0, .mainloop Music_Bicycle_Ch2: - dutycycle $2 - vibrato $10, $24 - stereopanning $f0 - notetype $c, $c6 + duty_cycle 2 + vibrato 16, 2, 4 + stereo_panning TRUE, FALSE + note_type 12, 12, 6 octave 4 note D_, 6 note C_, 6 octave 3 note B_, 4 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 2 note D_, 1 @@ -188,31 +189,31 @@ Music_Bicycle_Ch2: note D_, 1 note E_, 1 note D_, 2 - intensity $c3 + volume_envelope 12, 3 note C_, 2 octave 3 note B_, 2 note A_, 2 -Music_Bicycle_branch_ee1fd: - stereopanning $ff - dutycycle $2 - intensity $c3 +.mainloop: + stereo_panning TRUE, TRUE + duty_cycle 2 + volume_envelope 12, 3 octave 3 note B_, 4 note G_, 4 note A_, 4 note F#, 4 - intensity $c2 + volume_envelope 12, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - intensity $c5 + volume_envelope 12, 5 note D_, 8 - intensity $c4 + volume_envelope 12, 4 note E_, 4 note G_, 4 - intensity $c2 + volume_envelope 12, 2 note E_, 2 note B_, 2 note A_, 2 @@ -221,24 +222,24 @@ Music_Bicycle_branch_ee1fd: note G_, 2 note A_, 2 note G_, 2 - intensity $c5 + volume_envelope 12, 5 note F#, 8 - intensity $c3 + volume_envelope 12, 3 note B_, 4 note G_, 4 note A_, 4 note F#, 4 - intensity $c2 + volume_envelope 12, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - intensity $c5 + volume_envelope 12, 5 note D_, 8 - intensity $c4 + volume_envelope 12, 4 note E_, 4 note G_, 4 - intensity $c2 + volume_envelope 12, 2 note E_, 2 octave 4 note E_, 2 @@ -250,29 +251,29 @@ Music_Bicycle_branch_ee1fd: note C_, 2 note D_, 2 note E_, 2 - intensity $c7 + volume_envelope 12, 7 note F#, 8 - stereopanning $f - callchannel Music_Bicycle_branch_ee263 + stereo_panning FALSE, TRUE + sound_call .sub1 note F#, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note D_, 2 note E_, 2 note F_, 2 note F#, 4 - intensity $c7 - callchannel Music_Bicycle_branch_ee263 + volume_envelope 12, 7 + sound_call .sub1 note F#, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note B_, 2 note A_, 2 note G_, 2 note F#, 4 - loopchannel 0, Music_Bicycle_branch_ee1fd + sound_loop 0, .mainloop -Music_Bicycle_branch_ee263: +.sub1: note G_, 6 note B_, 6 note G_, 4 @@ -282,11 +283,11 @@ Music_Bicycle_branch_ee263: note E_, 6 note G_, 6 note E_, 4 - endchannel + sound_ret Music_Bicycle_Ch3: - notetype $c, $14 - note __, 16 + note_type 12, 1, 4 + rest 16 octave 3 note A_, 2 octave 4 @@ -300,215 +301,215 @@ Music_Bicycle_Ch3: note D_, 2 octave 3 note A_, 1 - note __, 1 -Music_Bicycle_branch_ee27f: - callchannel Music_Bicycle_branch_ee333 + rest 1 +.mainloop: + sound_call .sub1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_Bicycle_branch_ee333 + rest 1 + sound_call .sub1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 -Music_Bicycle_branch_ee2e9: + rest 1 +.loop1: note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - loopchannel 2, Music_Bicycle_branch_ee2e9 - loopchannel 0, Music_Bicycle_branch_ee27f + rest 1 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Bicycle_branch_ee333: +.sub1: octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_Bicycle_Ch4: - togglenoise $0 - notetype $c - note __, 16 - note __, 16 -Music_Bicycle_branch_ee34b: - note __, 2 -Music_Bicycle_branch_ee34c: - stereopanning $f0 - note F_, 4 - loopchannel 12, Music_Bicycle_branch_ee34c - note F_, 4 - note F_, 4 - stereopanning $ff - note F_, 2 - note F_, 2 - note F_, 2 - loopchannel 0, Music_Bicycle_branch_ee34b + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 +.mainloop: + rest 2 +.loop1: + stereo_panning TRUE, FALSE + drum_note 6, 4 + sound_loop 12, .loop1 + drum_note 6, 4 + drum_note 6, 4 + stereo_panning TRUE, TRUE + drum_note 6, 2 + drum_note 6, 2 + drum_note 6, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/buenaspassword.asm b/crysaudio/music/buenaspassword.asm index 316ec9a0..b5bc7de3 100644 --- a/crysaudio/music/buenaspassword.asm +++ b/crysaudio/music/buenaspassword.asm @@ -1,71 +1,72 @@ Music_BuenasPassword: - musicheader 4, 1, Music_BuenasPassword_Ch1 - musicheader 1, 2, Music_BuenasPassword_Ch2 - musicheader 1, 3, Music_BuenasPassword_Ch3 - musicheader 1, 4, Music_BuenasPassword_Ch4 + channel_count 4 + channel 1, Music_BuenasPassword_Ch1 + channel 2, Music_BuenasPassword_Ch2 + channel 3, Music_BuenasPassword_Ch3 + channel 4, Music_BuenasPassword_Ch4 Music_BuenasPassword_Ch1: tempo 136 - volume $77 - tone $0001 - notetype $c, $b3 - note __, 8 -Music_BuenasPassword_branch_17816b: - stereopanning $ff - note __, 16 - note __, 16 - dutycycle $3 - notetype $6, $97 - stereopanning $f + volume 7, 7 + pitch_offset 1 + note_type 12, 11, 3 + rest 8 +.mainloop: + stereo_panning TRUE, TRUE + rest 16 + rest 16 + duty_cycle 3 + note_type 6, 9, 7 + stereo_panning FALSE, TRUE octave 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 2 note G#, 2 - note __, 10 - note __, 10 - stereopanning $f0 + rest 10 + rest 10 + stereo_panning TRUE, FALSE note C#, 2 note F_, 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 2 note G#, 2 - note __, 12 - dutycycle $2 - callchannel Music_BuenasPassword_branch_178204 - stereopanning $ff - callchannel Music_BuenasPassword_branch_1782df - callchannel Music_BuenasPassword_branch_178222 - callchannel Music_BuenasPassword_branch_178204 - stereopanning $ff - callchannel Music_BuenasPassword_branch_1782df - callchannel Music_BuenasPassword_branch_178222 - callchannel Music_BuenasPassword_branch_178204 - dutycycle $1 + rest 12 + duty_cycle 2 + sound_call .sub1 + stereo_panning TRUE, TRUE + sound_call Music_BuenasPassword_Ch2.sub3 + sound_call .sub2 + sound_call .sub1 + stereo_panning TRUE, TRUE + sound_call Music_BuenasPassword_Ch2.sub3 + sound_call .sub2 + sound_call .sub1 + duty_cycle 1 note C#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 1 + rest 1 note G#, 2 - note __, 1 + rest 1 note A#, 2 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 2 note G#, 2 note B_, 2 @@ -88,140 +89,140 @@ Music_BuenasPassword_branch_17816b: note D#, 1 note G_, 3 note B_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 1 + rest 1 note F#, 2 - note __, 1 + rest 1 note D#, 2 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note G#, 2 octave 4 note C#, 2 note F_, 2 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 note F#, 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 note G#, 3 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 note D#, 2 note F#, 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_BuenasPassword_branch_17816b + rest 1 + sound_loop 0, .mainloop -Music_BuenasPassword_branch_178204: - stereopanning $f - notetype $6, $84 +.sub1: + stereo_panning FALSE, TRUE + note_type 6, 8, 4 octave 4 note D#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 1 note C_, 1 - intensity $51 + volume_envelope 5, 1 octave 3 note A#, 1 note G#, 1 - intensity $31 + volume_envelope 3, 1 note G_, 1 note F_, 1 - intensity $11 + volume_envelope 1, 1 note D#, 1 note C#, 1 note C_, 1 - note __, 1 - notetype $c, $84 - endchannel + rest 1 + note_type 12, 8, 4 + sound_ret -Music_BuenasPassword_branch_178222: +.sub2: octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 2 - endchannel + rest 2 + sound_ret Music_BuenasPassword_Ch2: - vibrato $12, $34 - dutycycle $2 - notetype $c, $a5 - note __, 7 + vibrato 18, 3, 4 + duty_cycle 2 + note_type 12, 10, 5 + rest 7 octave 3 note F#, 1 -Music_BuenasPassword_branch_17823c: - stereopanning $ff - callchannel Music_BuenasPassword_branch_1782df - callchannel Music_BuenasPassword_branch_1782a4 - stereopanning $ff - callchannel Music_BuenasPassword_branch_1782cc +.mainloop: + stereo_panning TRUE, TRUE + sound_call .sub3 + sound_call .sub1 + stereo_panning TRUE, TRUE + sound_call .sub2 octave 3 note B_, 2 note A#, 2 note B_, 2 note G#, 16 - callchannel Music_BuenasPassword_branch_1782a4 - stereopanning $ff - callchannel Music_BuenasPassword_branch_1782cc + sound_call .sub1 + stereo_panning TRUE, TRUE + sound_call .sub2 note B_, 2 note A#, 2 note B_, 2 note G#, 16 - callchannel Music_BuenasPassword_branch_1782a4 + sound_call .sub1 note F#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 1 + rest 1 note B_, 2 - note __, 1 + rest 1 octave 4 note C#, 2 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note G#, 2 note F#, 2 note G#, 2 @@ -235,23 +236,23 @@ Music_BuenasPassword_branch_17823c: note C#, 1 note D#, 8 note F#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 1 + rest 1 note C#, 2 - note __, 1 + rest 1 octave 3 note B_, 2 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 octave 4 note C#, 2 note F_, 2 @@ -260,265 +261,266 @@ Music_BuenasPassword_branch_17823c: note A#, 1 note B_, 1 note G#, 10 - intensity $84 + volume_envelope 8, 4 octave 2 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $a5 - loopchannel 0, Music_BuenasPassword_branch_17823c + rest 1 + volume_envelope 10, 5 + sound_loop 0, .mainloop -Music_BuenasPassword_branch_1782a4: +.sub1: octave 3 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 2 - stereopanning $f0 + rest 2 + stereo_panning TRUE, FALSE octave 4 note G#, 1 - notetype $6, $81 + note_type 6, 8, 1 note G_, 1 note F_, 1 - intensity $71 + volume_envelope 7, 1 note D#, 1 note C#, 1 - intensity $61 + volume_envelope 6, 1 note C_, 1 octave 3 note A#, 1 - intensity $41 + volume_envelope 4, 1 note G#, 1 - intensity $21 + volume_envelope 2, 1 note G_, 1 note F_, 1 - note __, 1 - notetype $c, $a5 - endchannel + rest 1 + note_type 12, 10, 5 + sound_ret -Music_BuenasPassword_branch_1782cc: +.sub2: octave 4 note G#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 1 + rest 1 note D#, 2 - note __, 1 + rest 1 note C#, 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_BuenasPassword_branch_1782df: +.sub3: octave 3 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 note G#, 3 octave 3 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 note G#, 2 octave 3 note F#, 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 note G#, 3 - endchannel + sound_ret Music_BuenasPassword_Ch3: - notetype $c, $14 - note __, 8 -Music_BuenasPassword_branch_178315: - callchannel Music_BuenasPassword_branch_1783a7 - callchannel Music_BuenasPassword_branch_1783a7 - callchannel Music_BuenasPassword_branch_1783a7 + note_type 12, 1, 4 + rest 8 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 octave 3 note D#, 2 octave 2 note G#, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note G#, 4 - loopchannel 3, Music_BuenasPassword_branch_178315 + sound_loop 3, .loop1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 octave 2 note F#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 octave 2 note F#, 1 - note __, 1 + rest 1 note A#, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note F#, 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 octave 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 note D#, 1 - note __, 1 + rest 1 note G#, 2 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 octave 2 note D#, 1 - note __, 1 + rest 1 note G_, 2 - callchannel Music_BuenasPassword_branch_1783bc + sound_call .sub2 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F_, 1 note C#, 1 - note __, 1 + rest 1 note G#, 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note C#, 2 - callchannel Music_BuenasPassword_branch_1783bc + sound_call .sub2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 note G#, 2 octave 3 note D#, 1 octave 2 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_BuenasPassword_branch_178315 + rest 1 + sound_loop 0, .mainloop -Music_BuenasPassword_branch_1783a7: +.sub1: octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 octave 3 @@ -527,105 +529,106 @@ Music_BuenasPassword_branch_1783a7: note G#, 1 octave 3 note C#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note C#, 1 note F_, 2 note C#, 1 - endchannel + sound_ret -Music_BuenasPassword_branch_1783bc: +.sub2: octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 octave 2 note G#, 1 - note __, 1 + rest 1 note B_, 2 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 2 - endchannel + sound_ret Music_BuenasPassword_Ch4: - togglenoise $3 - notetype $c - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 -Music_BuenasPassword_branch_1783d9: - callchannel Music_BuenasPassword_branch_17840c - callchannel Music_BuenasPassword_branch_17840c - callchannel Music_BuenasPassword_branch_17840c - callchannel Music_BuenasPassword_branch_178424 - loopchannel 4, Music_BuenasPassword_branch_1783d9 - callchannel Music_BuenasPassword_branch_17840c - callchannel Music_BuenasPassword_branch_17840c - callchannel Music_BuenasPassword_branch_17840c - stereopanning $ff - note D#, 2 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D_, 2 - stereopanning $f - note G_, 1 - note G_, 1 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - loopchannel 0, Music_BuenasPassword_branch_1783d9 + toggle_noise 3 + drum_speed 12 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_loop 4, .loop1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + stereo_panning TRUE, TRUE + drum_note 4, 2 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 3, 2 + stereo_panning FALSE, TRUE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop -Music_BuenasPassword_branch_17840c: - stereopanning $ff - note D#, 2 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D_, 2 - stereopanning $f - note G_, 1 - note G_, 1 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D#, 2 - note D_, 2 - stereopanning $f - note G_, 2 - endchannel +.sub1: + stereo_panning TRUE, TRUE + drum_note 4, 2 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 3, 2 + stereo_panning FALSE, TRUE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 4, 2 + drum_note 3, 2 + stereo_panning FALSE, TRUE + drum_note 8, 2 + sound_ret -Music_BuenasPassword_branch_178424: - stereopanning $ff - note D#, 2 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D_, 2 - stereopanning $f - note G_, 1 - note G_, 1 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D#, 2 - note D_, 2 - note D_, 1 - note D_, 1 - endchannel +.sub2: + stereo_panning TRUE, TRUE + drum_note 4, 2 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 3, 2 + stereo_panning FALSE, TRUE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_ret diff --git a/crysaudio/music/bugcatchingcontest.asm b/crysaudio/music/bugcatchingcontest.asm index e77bf550..cdc1dbd2 100644 --- a/crysaudio/music/bugcatchingcontest.asm +++ b/crysaudio/music/bugcatchingcontest.asm @@ -1,55 +1,56 @@ Music_BugCatchingContest: - musicheader 4, 1, Music_BugCatchingContest_Ch1 - musicheader 1, 2, Music_BugCatchingContest_Ch2 - musicheader 1, 3, Music_BugCatchingContest_Ch3 - musicheader 1, 4, Music_BugCatchingContest_Ch4 + channel_count 4 + channel 1, Music_BugCatchingContest_Ch1 + channel 2, Music_BugCatchingContest_Ch2 + channel 3, Music_BugCatchingContest_Ch3 + channel 4, Music_BugCatchingContest_Ch4 Music_BugCatchingContest_Ch1: tempo 144 - volume $77 - stereopanning $f - vibrato $8, $24 - dutycycle $2 - notetype $c, $b7 - note __, 8 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 8, 2, 4 + duty_cycle 2 + note_type 12, 11, 7 + rest 8 octave 4 note C#, 1 - note __, 1 + rest 1 note C#, 3 - note __, 1 + rest 1 note C#, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note D_, 3 - note __, 1 + rest 1 note D_, 1 note D_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 3 - note __, 1 + rest 1 note D#, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 note E_, 3 - note __, 1 + rest 1 note E_, 1 note E_, 1 -Music_BugCatchingContest_branch_f7c4b: - notetype $c, $b1 -Music_BugCatchingContest_branch_f7c4e: - note __, 2 +.mainloop: + note_type 12, 11, 1 +.loop1: + rest 2 octave 2 note A_, 2 - loopchannel 4, Music_BugCatchingContest_branch_f7c4e -Music_BugCatchingContest_branch_f7c55: - note __, 2 + sound_loop 4, .loop1 +.loop2: + rest 2 note B_, 2 - loopchannel 8, Music_BugCatchingContest_branch_f7c55 - intensity $b4 - dutycycle $1 + sound_loop 8, .loop2 + volume_envelope 11, 4 + duty_cycle 1 octave 3 note B_, 6 note A_, 1 @@ -58,21 +59,21 @@ Music_BugCatchingContest_branch_f7c55: octave 4 note D_, 1 note E_, 1 - intensity $b1 - dutycycle $2 -Music_BugCatchingContest_branch_f7c6b: - note __, 2 + volume_envelope 11, 1 + duty_cycle 2 +.loop3: + rest 2 octave 2 note A_, 2 - loopchannel 4, Music_BugCatchingContest_branch_f7c6b - note __, 2 + sound_loop 4, .loop3 + rest 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 - notetype $6, $b7 + note_type 6, 11, 7 octave 4 note E_, 4 - note __, 1 + rest 1 octave 3 note B_, 1 octave 4 @@ -81,31 +82,31 @@ Music_BugCatchingContest_branch_f7c6b: note B_, 8 octave 5 note E_, 8 - intensity $b1 - note __, 4 + volume_envelope 11, 1 + rest 4 octave 2 note B_, 4 - note __, 4 + rest 4 octave 3 note E_, 4 - note __, 4 + rest 4 note E_, 4 -Music_BugCatchingContest_branch_f7c8e: - note __, 4 +.loop4: + rest 4 octave 2 note A_, 4 - loopchannel 3, Music_BugCatchingContest_branch_f7c8e - intensity $a7 + sound_loop 3, .loop4 + volume_envelope 10, 7 octave 4 note F#, 4 note A_, 4 - note __, 4 + rest 4 octave 3 note G_, 2 note B_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 note G_, 2 @@ -119,13 +120,13 @@ Music_BugCatchingContest_branch_f7c8e: note G_, 1 note A_, 1 note G_, 8 - note __, 4 + rest 4 octave 3 note F#, 2 note A_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 note F#, 2 @@ -140,19 +141,19 @@ Music_BugCatchingContest_branch_f7c8e: note G_, 1 note F#, 8 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 note G_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 note D_, 2 octave 3 note B_, 2 octave 4 note B_, 2 - note __, 2 + rest 2 note G#, 2 note D_, 2 octave 3 @@ -162,263 +163,263 @@ Music_BugCatchingContest_branch_f7c8e: note G#, 2 note B_, 2 note C#, 2 - note __, 2 + rest 2 note C#, 6 - note __, 2 + rest 2 note C#, 2 note C#, 2 note D_, 2 - note __, 2 + rest 2 note D_, 6 - note __, 2 + rest 2 note D_, 2 note D_, 2 note D#, 2 - note __, 2 + rest 2 note D#, 6 - note __, 2 + rest 2 note D#, 2 note D#, 2 note E_, 2 - note __, 2 + rest 2 note E_, 6 - note __, 2 + rest 2 note E_, 2 note E_, 2 - loopchannel 0, Music_BugCatchingContest_branch_f7c4b + sound_loop 0, .mainloop Music_BugCatchingContest_Ch2: - stereopanning $f0 - vibrato $8, $23 - dutycycle $1 - notetype $c, $c7 - note __, 8 -Music_BugCatchingContest_branch_f7cff: + stereo_panning TRUE, FALSE + vibrato 8, 2, 3 + duty_cycle 1 + note_type 12, 12, 7 + rest 8 +.loop5: octave 4 note A_, 1 - note __, 1 + rest 1 note A_, 3 - note __, 1 + rest 1 note A_, 1 note A_, 1 - loopchannel 4, Music_BugCatchingContest_branch_f7cff -Music_BugCatchingContest_branch_f7d0a: - dutycycle $0 - callchannel Music_BugCatchingContest_branch_f7d8e + sound_loop 4, .loop5 +.mainloop: + duty_cycle 0 + sound_call .sub1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note G#, 2 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note E_, 1 - note __, 1 - callchannel Music_BugCatchingContest_branch_f7d8e + rest 1 + sound_call .sub1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note D#, 2 octave 3 note A_, 1 - note __, 1 - dutycycle $0 - note __, 2 + rest 1 + duty_cycle 0 + rest 2 octave 5 note D_, 1 - note __, 1 + rest 1 note C#, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note B_, 8 - note __, 2 + rest 2 octave 5 note D_, 1 - note __, 1 + rest 1 note C#, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 8 - note __, 2 + rest 2 octave 5 note D_, 4 note F#, 2 note E_, 2 note D_, 1 - note __, 1 + rest 1 note C#, 2 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 10 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 10 - loopchannel 0, Music_BugCatchingContest_branch_f7d0a + sound_loop 0, .mainloop -Music_BugCatchingContest_branch_f7d8e: +.sub1: octave 2 note D_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note D#, 2 octave 3 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_BugCatchingContest_Ch3: - stereopanning $ff - vibrato $10, $23 - notetype $c, $14 - note __, 8 + stereo_panning TRUE, TRUE + vibrato 16, 2, 3 + note_type 12, 1, 4 + rest 8 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 3 - note __, 1 + rest 1 note A_, 1 note A_, 1 note B_, 1 - note __, 1 + rest 1 note B_, 3 - note __, 1 + rest 1 note B_, 1 note B_, 1 octave 4 note C_, 1 - note __, 1 + rest 1 note C_, 3 - note __, 1 + rest 1 note C_, 1 note C_, 1 note C#, 1 - note __, 1 + rest 1 note C#, 3 - note __, 1 + rest 1 note C#, 1 note C#, 1 -Music_BugCatchingContest_branch_f7dda: - notetype $c, $14 +.mainloop: + note_type 12, 1, 4 note F#, 5 - note __, 1 + rest 1 note F#, 1 note G_, 1 note A_, 4 octave 5 note D_, 4 note C#, 2 - intensity $10 + volume_envelope 1, 0 note E_, 1 note G_, 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 note E_, 1 - notetype $6, $20 + note_type 6, 2, 0 octave 6 note E_, 1 note F#, 1 @@ -429,21 +430,21 @@ Music_BugCatchingContest_branch_f7dda: note E_, 1 note F#, 1 note E_, 8 - intensity $14 + volume_envelope 1, 4 octave 4 note E_, 10 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G_, 8 octave 5 note C#, 8 - note __, 4 - intensity $10 + rest 4 + volume_envelope 1, 0 note E_, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note E_, 2 note C_, 2 octave 6 @@ -456,17 +457,17 @@ Music_BugCatchingContest_branch_f7dda: note C#, 1 note D_, 1 note C#, 8 - intensity $15 + volume_envelope 1, 5 octave 5 note F#, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 octave 6 note D_, 4 - note __, 4 + rest 4 note C#, 12 octave 5 note B_, 2 @@ -474,11 +475,11 @@ Music_BugCatchingContest_branch_f7dda: note C#, 2 octave 5 note B_, 4 - note __, 4 + rest 4 octave 6 note G_, 4 note F#, 4 - note __, 4 + rest 4 octave 5 note G_, 4 note A_, 4 @@ -492,11 +493,11 @@ Music_BugCatchingContest_branch_f7dda: octave 6 note C#, 2 note D_, 4 - note __, 8 + rest 8 octave 5 note B_, 4 note A_, 4 - note __, 1 + rest 1 note D#, 1 note F#, 1 note A_, 1 @@ -504,164 +505,165 @@ Music_BugCatchingContest_branch_f7dda: note C_, 8 octave 3 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note F#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note A_, 6 - note __, 2 + rest 2 note A_, 2 note A_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 6 - note __, 2 + rest 2 note B_, 2 note B_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note C_, 6 - note __, 2 + rest 2 note C_, 2 note C_, 2 note C#, 2 - note __, 2 + rest 2 note C#, 6 - note __, 2 + rest 2 note C#, 2 note C#, 2 - loopchannel 0, Music_BugCatchingContest_branch_f7dda + sound_loop 0, .mainloop Music_BugCatchingContest_Ch4: - togglenoise $4 - notetype $6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 2 - note E_, 2 - callchannel Music_BugCatchingContest_branch_f7ee2 -Music_BugCatchingContest_branch_f7eaf: - note D_, 4 - note D_, 4 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 4 - note D_, 4 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 4 - note D_, 4 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 4 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 5, Music_BugCatchingContest_branch_f7eaf - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - callchannel Music_BugCatchingContest_branch_f7ee2 - loopchannel 0, Music_BugCatchingContest_branch_f7eaf + toggle_noise 4 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 2 + drum_note 5, 2 + sound_call Music_BugCatchingContest_Ch4.sub1 +.mainloop: +.loop1: + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 5, .loop1 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_BugCatchingContest_branch_f7ee2: - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - endchannel +.sub1: + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + sound_ret diff --git a/crysaudio/music/burnedtower.asm b/crysaudio/music/burnedtower.asm index 723e7814..742a769b 100644 --- a/crysaudio/music/burnedtower.asm +++ b/crysaudio/music/burnedtower.asm @@ -1,152 +1,153 @@ Music_BurnedTower: - musicheader 4, 1, Music_BurnedTower_Ch1 - musicheader 1, 2, Music_BurnedTower_Ch2 - musicheader 1, 3, Music_BurnedTower_Ch3 - musicheader 1, 4, Music_BurnedTower_Ch4 + channel_count 4 + channel 1, Music_BurnedTower_Ch1 + channel 2, Music_BurnedTower_Ch2 + channel 3, Music_BurnedTower_Ch3 + channel 4, Music_BurnedTower_Ch4 Music_BurnedTower_Ch1: tempo 168 - volume $77 - dutycycle $1 - tone $0004 - vibrato $8, $45 - stereopanning $f0 - notetype $c, $91 - note __, 2 + volume 7, 7 + duty_cycle 1 + pitch_offset 4 + vibrato 8, 4, 5 + stereo_panning TRUE, FALSE + note_type 12, 9, 1 + rest 2 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $80 + volume_envelope 8, 0 octave 3 note D#, 6 - intensity $91 + volume_envelope 9, 1 note D_, 4 note D_, 4 note D_, 2 - intensity $80 + volume_envelope 8, 0 note C#, 6 -Music_BurnedTower_branch_f6ac8: - intensity $91 +.loop1: + volume_envelope 9, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $80 + volume_envelope 8, 0 note A#, 6 - loopchannel 2, Music_BurnedTower_branch_f6ac8 + sound_loop 2, .loop1 tempo 150 -Music_BurnedTower_branch_f6ad8: - intensity $b1 +.mainloop: + volume_envelope 11, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note D#, 6 - intensity $b1 + volume_envelope 11, 1 note D_, 4 note D_, 4 note D_, 2 - intensity $a0 + volume_envelope 10, 0 note C#, 6 - intensity $b1 + volume_envelope 11, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $a0 + volume_envelope 10, 0 note A#, 6 - intensity $b1 + volume_envelope 11, 1 note A_, 4 note A_, 4 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note A#, 16 note A#, 16 note A#, 16 note G#, 6 - intensity $b1 + volume_envelope 11, 1 note A_, 4 note A_, 4 note A_, 2 - intensity $a0 + volume_envelope 10, 0 note A#, 6 - intensity $b1 + volume_envelope 11, 1 note B_, 4 note B_, 4 note B_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note F_, 6 - intensity $b1 + volume_envelope 11, 1 note E_, 4 note E_, 4 note E_, 2 - intensity $a0 + volume_envelope 10, 0 note D#, 6 -Music_BurnedTower_branch_f6b17: - intensity $b1 +.loop2: + volume_envelope 11, 1 octave 2 note B_, 4 note B_, 4 note B_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note C_, 6 - loopchannel 2, Music_BurnedTower_branch_f6b17 - loopchannel 0, Music_BurnedTower_branch_f6ad8 + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_BurnedTower_Ch2: - dutycycle $2 - vibrato $20, $82 - tone $0002 - notetype $c, $70 - callchannel Music_BurnedTower_branch_f6b8e - intensity $c5 -Music_BurnedTower_branch_f6b39: - callchannel Music_BurnedTower_branch_f6b8e - intensity $c1 - dutycycle $3 - note __, 2 + duty_cycle 2 + vibrato 32, 8, 2 + pitch_offset 2 + note_type 12, 7, 0 + sound_call .sub1 + volume_envelope 12, 5 +.mainloop: + sound_call .sub1 + volume_envelope 12, 1 + duty_cycle 3 + rest 2 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $b0 + volume_envelope 11, 0 octave 3 note D#, 6 - intensity $c1 + volume_envelope 12, 1 note D_, 4 note D_, 4 note D_, 2 - intensity $b0 + volume_envelope 11, 0 note C#, 6 - intensity $c1 + volume_envelope 12, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $b0 + volume_envelope 11, 0 note A#, 4 - intensity $c1 - intensity $c2 + volume_envelope 12, 1 + volume_envelope 12, 2 octave 3 note A_, 1 note G_, 1 note A_, 1 octave 4 note C_, 1 - vibrato $0, $0 - intensity $3d + vibrato 0, 0, 0 + volume_envelope 3, -5 note E_, 8 - vibrato $20, $83 - intensity $b0 + vibrato 32, 8, 3 + volume_envelope 11, 0 octave 2 note G_, 4 - dutycycle $2 - intensity $b0 + duty_cycle 2 + volume_envelope 11, 0 octave 3 note F#, 4 note E_, 2 @@ -165,11 +166,11 @@ Music_BurnedTower_branch_f6b39: note F#, 2 note G_, 4 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note F#, 16 - loopchannel 0, Music_BurnedTower_branch_f6b39 + sound_loop 0, .mainloop -Music_BurnedTower_branch_f6b8e: +.sub1: octave 3 note E_, 4 note D_, 2 @@ -189,71 +190,72 @@ Music_BurnedTower_branch_f6b8e: note F_, 4 note D_, 4 note E_, 16 - endchannel + sound_ret Music_BurnedTower_Ch3: - stereopanning $f - notetype $c, $14 - note __, 16 - note __, 16 - note __, 16 - note __, 12 + stereo_panning FALSE, TRUE + note_type 12, 1, 4 + rest 16 + rest 16 + rest 16 + rest 12 octave 3 note D#, 4 -Music_BurnedTower_branch_f6bad: +.mainloop: +.loop1: octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note F_, 4 octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note D#, 4 - loopchannel 4, Music_BurnedTower_branch_f6bad -Music_BurnedTower_branch_f6bc3: + sound_loop 4, .loop1 +.loop2: octave 2 note B_, 2 octave 3 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note G_, 4 octave 2 note B_, 2 octave 3 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 4 - loopchannel 2, Music_BurnedTower_branch_f6bc3 - loopchannel 0, Music_BurnedTower_branch_f6bad + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_BurnedTower_Ch4: - togglenoise $0 - notetype $c -Music_BurnedTower_branch_f6be1: - note __, 16 - loopchannel 4, Music_BurnedTower_branch_f6be1 - note __, 2 -Music_BurnedTower_branch_f6be7: - stereopanning $f0 - note G_, 2 - note G#, 2 - note G_, 4 - note G#, 2 - note G_, 4 - loopchannel 0, Music_BurnedTower_branch_f6be7 + toggle_noise 0 + drum_speed 12 +.loop1: + rest 16 + sound_loop 4, .loop1 + rest 2 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 4 + drum_note 9, 2 + drum_note 8, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/celadoncity.asm b/crysaudio/music/celadoncity.asm index de815cc9..21d565b9 100644 --- a/crysaudio/music/celadoncity.asm +++ b/crysaudio/music/celadoncity.asm @@ -1,25 +1,26 @@ Music_CeladonCity: - musicheader 3, 1, Music_CeladonCity_Ch1 - musicheader 1, 2, Music_CeladonCity_Ch2 - musicheader 1, 3, Music_CeladonCity_Ch3 + channel_count 3 + channel 1, Music_CeladonCity_Ch1 + channel 2, Music_CeladonCity_Ch2 + channel 3, Music_CeladonCity_Ch3 Music_CeladonCity_Ch1: tempo 146 - volume $77 - tone $0001 -Music_CeladonCity_branch_f436c: - stereopanning $f - notetype $c, $a6 + volume 7, 7 + pitch_offset 1 +.mainloop: + stereo_panning FALSE, TRUE + note_type 12, 10, 6 octave 3 note A_, 7 - intensity $a1 + volume_envelope 10, 1 note G#, 1 note A_, 1 note D_, 3 note E_, 2 note F#, 2 - callchannel Music_CeladonCity_branch_f43cc -Music_CeladonCity_branch_f437d: + sound_call .sub1 +.loop1: note D_, 2 note F#, 1 note A_, 1 @@ -27,7 +28,7 @@ Music_CeladonCity_branch_f437d: note F#, 1 note A_, 1 note F#, 1 - loopchannel 3, Music_CeladonCity_branch_f437d + sound_loop 3, .loop1 note D_, 2 note G_, 1 note B_, 1 @@ -37,7 +38,7 @@ Music_CeladonCity_branch_f437d: octave 3 note B_, 1 note G_, 1 - callchannel Music_CeladonCity_branch_f43cc + sound_call .sub1 note D_, 1 note C#, 1 note D_, 1 @@ -51,8 +52,8 @@ Music_CeladonCity_branch_f437d: note F#, 2 note E_, 2 note F#, 16 - callchannel Music_CeladonCity_branch_f43e1 - callchannel Music_CeladonCity_branch_f43fe + sound_call .sub2 + sound_call .sub3 octave 2 note B_, 2 note A#, 1 @@ -72,8 +73,8 @@ Music_CeladonCity_branch_f437d: octave 3 note B_, 1 note A_, 1 - callchannel Music_CeladonCity_branch_f43e1 - callchannel Music_CeladonCity_branch_f43fe + sound_call .sub2 + sound_call .sub3 note D_, 2 note C#, 1 note D_, 1 @@ -82,9 +83,10 @@ Music_CeladonCity_branch_f437d: note A_, 1 note G_, 1 note A_, 8 - loopchannel 0, Music_CeladonCity_branch_f436c + sound_loop 0, .mainloop -Music_CeladonCity_branch_f43cc: +.sub1: +.sub1loop1: note D_, 2 note G_, 1 note B_, 1 @@ -92,7 +94,7 @@ Music_CeladonCity_branch_f43cc: note G_, 1 note B_, 1 note G_, 1 - loopchannel 3, Music_CeladonCity_branch_f43cc + sound_loop 3, .sub1loop1 note D_, 2 note F#, 1 note A_, 1 @@ -102,15 +104,16 @@ Music_CeladonCity_branch_f43cc: note D_, 1 octave 3 note A_, 1 - endchannel + sound_ret -Music_CeladonCity_branch_f43e1: +.sub2: +.sub2loop1 octave 2 note G_, 2 note B_, 1 octave 3 note D_, 1 - loopchannel 4, Music_CeladonCity_branch_f43e1 + sound_loop 4, .sub2loop1 note C_, 2 octave 2 note B_, 1 @@ -130,20 +133,21 @@ Music_CeladonCity_branch_f43e1: note D_, 1 octave 3 note B_, 1 - endchannel + sound_ret -Music_CeladonCity_branch_f43fe: +.sub3: +.sub3loop1: note D_, 2 note F#, 1 note A_, 1 - loopchannel 4, Music_CeladonCity_branch_f43fe - endchannel + sound_loop 4, .sub3loop1 + sound_ret Music_CeladonCity_Ch2: - vibrato $12, $34 - dutycycle $2 - stereopanning $f0 - notetype $c, $b7 + vibrato 18, 3, 4 + duty_cycle 2 + stereo_panning TRUE, FALSE + note_type 12, 11, 7 octave 4 note D_, 1 note C#, 1 @@ -154,8 +158,8 @@ Music_CeladonCity_Ch2: note F#, 1 note G_, 1 note A_, 8 -Music_CeladonCity_branch_f441a: - callchannel Music_CeladonCity_branch_f4463 +.mainloop: + sound_call .sub1 note A_, 4 note F#, 4 note A_, 2 @@ -168,8 +172,8 @@ Music_CeladonCity_branch_f441a: note B_, 2 note G_, 4 note B_, 4 - callchannel Music_CeladonCity_branch_f4463 - intensity $c1 + sound_call .sub1 + volume_envelope 12, 1 note A_, 2 note G_, 2 note F#, 2 @@ -183,13 +187,13 @@ Music_CeladonCity_branch_f441a: note E_, 1 note F#, 1 note A_, 1 - intensity $b3 + volume_envelope 11, 3 octave 5 note D_, 6 - intensity $a2 + volume_envelope 10, 2 octave 1 note F#, 2 - callchannel Music_CeladonCity_branch_f4474 + sound_call .sub2 octave 1 note G_, 3 note B_, 1 @@ -199,23 +203,23 @@ Music_CeladonCity_branch_f441a: octave 1 note A_, 6 note F#, 2 - callchannel Music_CeladonCity_branch_f4474 + sound_call .sub2 octave 1 note A_, 3 octave 2 note D_, 1 note A_, 4 note D_, 6 - intensity $97 + volume_envelope 9, 7 octave 4 note F#, 1 note A_, 1 octave 5 note D_, 16 - loopchannel 0, Music_CeladonCity_branch_f441a + sound_loop 0, .mainloop -Music_CeladonCity_branch_f4463: - intensity $b2 +.sub1: + volume_envelope 11, 2 octave 4 note B_, 4 note G_, 4 @@ -230,9 +234,9 @@ Music_CeladonCity_branch_f4463: octave 4 note B_, 2 note A_, 8 - endchannel + sound_ret -Music_CeladonCity_branch_f4474: +.sub2: note G_, 3 note B_, 1 octave 2 @@ -262,66 +266,66 @@ Music_CeladonCity_branch_f4474: octave 2 note D_, 2 note F#, 4 - endchannel + sound_ret Music_CeladonCity_Ch3: - vibrato $12, $24 -Music_CeladonCity_branch_f4495: - notetype $c, $25 + vibrato 18, 2, 4 +.mainloop: + note_type 12, 2, 5 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D_, 8 - callchannel Music_CeladonCity_branch_f44fd -Music_CeladonCity_branch_f44a1: + sound_call .sub1 +.loop1: octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 4 - loopchannel 3, Music_CeladonCity_branch_f44a1 + sound_loop 3, .loop1 octave 2 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 3 octave 2 note F#, 1 - callchannel Music_CeladonCity_branch_f44fd + sound_call .sub1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 3 note F#, 3 octave 2 note G#, 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 note E_, 2 note C#, 2 note D_, 2 - note __, 6 + rest 6 octave 2 note A_, 2 - note __, 6 - intensity $10 - callchannel Music_CeladonCity_branch_f4510 + rest 6 + volume_envelope 1, 0 + sound_call .sub2 octave 5 note E_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D_, 4 - note __, 4 + rest 4 note C_, 8 octave 4 note A_, 2 @@ -330,19 +334,19 @@ Music_CeladonCity_branch_f44a1: note C_, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 note E_, 2 note D_, 4 - note __, 4 - callchannel Music_CeladonCity_branch_f4510 + rest 4 + sound_call .sub2 octave 5 note E_, 2 - note __, 2 + rest 2 note D_, 2 note E_, 2 note D_, 4 - note __, 4 + rest 4 note C_, 8 note A_, 2 note G_, 2 @@ -353,28 +357,29 @@ Music_CeladonCity_branch_f44a1: note D_, 2 note E_, 2 note D_, 2 - note __, 6 - loopchannel 0, Music_CeladonCity_branch_f4495 + rest 6 + sound_loop 0, .mainloop -Music_CeladonCity_branch_f44fd: +.sub1: +.sub1loop1: octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note D_, 4 - loopchannel 3, Music_CeladonCity_branch_f44fd + sound_loop 3, .sub1loop1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note F#, 3 octave 2 note G#, 1 - endchannel + sound_ret -Music_CeladonCity_branch_f4510: +.sub2: octave 5 note D_, 8 note C_, 2 @@ -382,4 +387,4 @@ Music_CeladonCity_branch_f4510: note B_, 2 note A_, 2 note B_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/championbattle.asm b/crysaudio/music/championbattle.asm index e732d39c..218a71e2 100644 --- a/crysaudio/music/championbattle.asm +++ b/crysaudio/music/championbattle.asm @@ -1,124 +1,125 @@ Music_ChampionBattle: - musicheader 3, 1, Music_ChampionBattle_Ch1 - musicheader 1, 2, Music_ChampionBattle_Ch2 - musicheader 1, 3, Music_ChampionBattle_Ch3 + channel_count 3 + channel 1, Music_ChampionBattle_Ch1 + channel 2, Music_ChampionBattle_Ch2 + channel 3, Music_ChampionBattle_Ch3 Music_ChampionBattle_Ch1: tempo 98 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 2 octave 2 note A#, 8 note A#, 8 note A#, 8 note A#, 4 - intensity $b7 + volume_envelope 11, 7 note B_, 4 -Music_ChampionBattle_branch_ea9e2: - callchannel Music_ChampionBattle_branch_eaaee +.loop1: + sound_call .sub1 octave 3 note D#, 4 - loopchannel 2, Music_ChampionBattle_branch_ea9e2 - callchannel Music_ChampionBattle_branch_eaaee + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note E_, 4 -Music_ChampionBattle_branch_ea9f0: - callchannel Music_ChampionBattle_branch_eaafc - loopchannel 3, Music_ChampionBattle_branch_ea9f0 - callchannel Music_ChampionBattle_branch_eab06 -Music_ChampionBattle_branch_ea9fa: - callchannel Music_ChampionBattle_branch_eaafc - loopchannel 7, Music_ChampionBattle_branch_ea9fa - callchannel Music_ChampionBattle_branch_eab06 - intensity $b2 +.loop2: + sound_call .sub2 + sound_loop 3, .loop2 + sound_call .sub3 +.loop3: + sound_call .sub2 + sound_loop 7, .loop3 + sound_call .sub3 + volume_envelope 11, 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 4 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note E_, 4 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note F#, 4 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note G#, 4 - intensity $a0 + volume_envelope 10, 0 note A#, 8 octave 2 note A#, 8 octave 3 note B_, 12 - intensity $b2 + volume_envelope 11, 2 note A#, 1 note B_, 1 octave 4 note C_, 1 note C#, 1 -Music_ChampionBattle_branch_eaa35: - callchannel Music_ChampionBattle_branch_eab0f +.mainloop: + sound_call .sub4 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 4 -Music_ChampionBattle_branch_eaa3d: - intensity $b2 +.loop4: + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - loopchannel 2, Music_ChampionBattle_branch_eaa3d - intensity $b2 + sound_loop 2, .loop4 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - callchannel Music_ChampionBattle_branch_eab0f + sound_call .sub4 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note E_, 4 - callchannel Music_ChampionBattle_branch_eab24 + sound_call .sub5 note B_, 4 note G#, 4 - callchannel Music_ChampionBattle_branch_eab24 + sound_call .sub5 octave 4 note D_, 4 note D_, 4 - intensity $a0 + volume_envelope 10, 0 octave 3 note A#, 8 octave 2 @@ -127,16 +128,16 @@ Music_ChampionBattle_branch_eaa3d: note F#, 8 octave 2 note F#, 8 - intensity $60 + volume_envelope 6, 0 note B_, 16 - intensity $70 + volume_envelope 7, 0 note B_, 16 - intensity $80 + volume_envelope 8, 0 octave 3 note C#, 16 - intensity $a0 + volume_envelope 10, 0 note D#, 16 - intensity $b4 + volume_envelope 11, 4 octave 4 note F#, 4 note F_, 4 @@ -156,59 +157,59 @@ Music_ChampionBattle_branch_eaa3d: note E_, 2 note F#, 4 note F#, 4 - note __, 16 - intensity $90 + rest 16 + volume_envelope 9, 0 octave 3 note F#, 8 - intensity $b4 + volume_envelope 11, 4 note E_, 4 note E_, 4 - intensity $90 + volume_envelope 9, 0 note D#, 16 note C#, 16 -Music_ChampionBattle_branch_eaab1: - intensity $b2 +.loop5: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 4 - loopchannel 4, Music_ChampionBattle_branch_eaab1 -Music_ChampionBattle_branch_eaabe: - intensity $b2 + sound_loop 4, .loop5 +.loop6: + volume_envelope 11, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - loopchannel 2, Music_ChampionBattle_branch_eaabe - intensity $b2 + sound_loop 2, .loop6 + volume_envelope 11, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 4 - intensity $b2 + volume_envelope 11, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - callchannel Music_ChampionBattle_branch_eab31 + sound_call .sub6 octave 3 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - callchannel Music_ChampionBattle_branch_eab31 + sound_call .sub6 octave 3 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - loopchannel 0, Music_ChampionBattle_branch_eaa35 + sound_loop 0, .mainloop -Music_ChampionBattle_branch_eaaee: - intensity $b2 +.sub1: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 6 @@ -218,30 +219,30 @@ Music_ChampionBattle_branch_eaaee: note A#, 6 note A#, 2 note A#, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret -Music_ChampionBattle_branch_eaafc: - intensity $b2 +.sub2: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 4 - endchannel + sound_ret -Music_ChampionBattle_branch_eab06: - intensity $b2 +.sub3: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - endchannel + sound_ret -Music_ChampionBattle_branch_eab0f: - intensity $b5 +.sub4: + volume_envelope 11, 5 octave 3 note D#, 2 note A#, 2 @@ -258,11 +259,11 @@ Music_ChampionBattle_branch_eab0f: note G#, 2 note D#, 2 note G_, 2 - intensity $b2 - endchannel + volume_envelope 11, 2 + sound_ret -Music_ChampionBattle_branch_eab24: - intensity $b2 +.sub5: + volume_envelope 11, 2 octave 3 note A#, 2 note A#, 4 @@ -271,75 +272,75 @@ Music_ChampionBattle_branch_eab24: note A#, 4 note A#, 4 note A#, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret -Music_ChampionBattle_branch_eab31: - intensity $b2 +.sub6: + volume_envelope 11, 2 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note A#, 4 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note C#, 4 - intensity $b2 - endchannel + volume_envelope 11, 2 + sound_ret Music_ChampionBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 octave 3 note D#, 8 note D#, 8 note D#, 8 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note D_, 4 - callchannel Music_ChampionBattle_branch_eac4f + sound_call .sub1 note A#, 4 - callchannel Music_ChampionBattle_branch_eac4f + sound_call .sub1 note B_, 4 - callchannel Music_ChampionBattle_branch_eac4f + sound_call .sub1 octave 4 note C#, 4 - callchannel Music_ChampionBattle_branch_eac5c + sound_call .sub2 note D_, 4 - callchannel Music_ChampionBattle_branch_eac5c + sound_call .sub2 note F_, 4 - callchannel Music_ChampionBattle_branch_eac5c + sound_call .sub2 note D_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 4 note D#, 8 @@ -347,10 +348,10 @@ Music_ChampionBattle_Ch2: note D#, 8 octave 4 note E_, 8 - intensity $3c + volume_envelope 3, -4 note E_, 8 -Music_ChampionBattle_branch_eab9d: - intensity $c5 +.mainloop: + volume_envelope 12, 5 note D#, 6 octave 3 note A#, 6 @@ -362,23 +363,23 @@ Music_ChampionBattle_branch_eab9d: octave 3 note B_, 4 note A#, 4 - intensity $c7 + volume_envelope 12, 7 note B_, 8 octave 4 note E_, 8 - intensity $c2 + volume_envelope 12, 2 octave 3 note G#, 2 note G#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note G#, 2 note G#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 4 - intensity $c5 + volume_envelope 12, 5 note D#, 6 octave 3 note A#, 6 @@ -391,19 +392,19 @@ Music_ChampionBattle_branch_eab9d: note B_, 4 note A#, 2 note B_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note E_, 8 note G#, 8 note E_, 8 note B_, 8 - callchannel Music_ChampionBattle_branch_eac79 + sound_call .sub3 note E_, 4 note E_, 4 - callchannel Music_ChampionBattle_branch_eac79 + sound_call .sub3 note F#, 4 note F#, 4 - intensity $c7 + volume_envelope 12, 7 note D#, 8 octave 3 note D#, 8 @@ -411,13 +412,13 @@ Music_ChampionBattle_branch_eab9d: note C#, 8 octave 3 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note D#, 16 note D#, 16 note F_, 16 note F#, 16 - intensity $c4 -Music_ChampionBattle_branch_eabef: + volume_envelope 12, 4 +.loop1: octave 5 note D#, 4 note D_, 4 @@ -430,57 +431,57 @@ Music_ChampionBattle_branch_eabef: octave 4 note B_, 4 note B_, 4 - loopchannel 2, Music_ChampionBattle_branch_eabef - intensity $b0 + sound_loop 2, .loop1 + volume_envelope 11, 0 octave 3 note D#, 16 note B_, 16 note A#, 16 note G#, 16 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 8 note E_, 8 note F#, 8 @@ -489,10 +490,10 @@ Music_ChampionBattle_branch_eabef: note E_, 8 note F#, 8 note G#, 8 - loopchannel 0, Music_ChampionBattle_branch_eab9d + sound_loop 0, .mainloop -Music_ChampionBattle_branch_eac4f: - intensity $c2 +.sub1: + volume_envelope 12, 2 note D#, 2 note D#, 6 note D#, 2 @@ -501,34 +502,34 @@ Music_ChampionBattle_branch_eac4f: note D#, 6 note D#, 2 note D#, 2 - intensity $c7 - endchannel + volume_envelope 12, 7 + sound_ret -Music_ChampionBattle_branch_eac5c: - intensity $c2 +.sub2: + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 - endchannel + volume_envelope 12, 7 + sound_ret -Music_ChampionBattle_branch_eac79: - intensity $c1 +.sub3: + volume_envelope 12, 1 note D#, 2 note D#, 4 note D#, 4 @@ -536,47 +537,47 @@ Music_ChampionBattle_branch_eac79: note D#, 4 note D#, 4 note D#, 2 - intensity $c5 - endchannel + volume_envelope 12, 5 + sound_ret Music_ChampionBattle_Ch3: - notetype $c, $14 -Music_ChampionBattle_branch_eac88: + note_type 12, 1, 4 +.loop1: octave 3 note D#, 1 - note __, 7 - loopchannel 3, Music_ChampionBattle_branch_eac88 + rest 7 + sound_loop 3, .loop1 note D#, 1 - note __, 3 + rest 3 note E_, 4 - callchannel Music_ChampionBattle_branch_ead61 - callchannel Music_ChampionBattle_branch_ead61 - callchannel Music_ChampionBattle_branch_ead61 - callchannel Music_ChampionBattle_branch_ead6f + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note D_, 4 - callchannel Music_ChampionBattle_branch_ead6f + sound_call .sub2 note A_, 4 - callchannel Music_ChampionBattle_branch_ead6f + sound_call .sub2 note D_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 4 note C#, 4 note D#, 8 @@ -589,14 +590,15 @@ Music_ChampionBattle_branch_eac88: note A#, 2 note F_, 2 note A_, 2 -Music_ChampionBattle_branch_eacc6: +.mainloop: +.loop2: note D#, 2 note A#, 2 - loopchannel 8, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_eaccc: + sound_loop 8, .loop2 +.loop3: note E_, 2 note B_, 2 - loopchannel 5, Music_ChampionBattle_branch_eaccc + sound_loop 5, .loop3 note E_, 2 octave 4 note C_, 2 @@ -605,15 +607,15 @@ Music_ChampionBattle_branch_eaccc: note B_, 2 note G_, 2 note A_, 2 -Music_ChampionBattle_branch_eacda: +.loop4: note D#, 2 note A#, 2 - loopchannel 8, Music_ChampionBattle_branch_eacda -Music_ChampionBattle_branch_eace0: + sound_loop 8, .loop4 +.loop5: note E_, 2 note B_, 2 - loopchannel 8, Music_ChampionBattle_branch_eace0 - callchannel Music_ChampionBattle_branch_ead83 + sound_loop 8, .loop5 + sound_call .sub3 octave 3 note D#, 2 note E_, 2 @@ -624,7 +626,7 @@ Music_ChampionBattle_branch_eace0: note D_, 2 note C#, 2 note C_, 2 - callchannel Music_ChampionBattle_branch_ead83 + sound_call .sub3 octave 3 note D#, 2 note A#, 2 @@ -640,11 +642,11 @@ Music_ChampionBattle_branch_eace0: note D#, 8 note B_, 8 note D#, 8 -Music_ChampionBattle_branch_ead05: +.loop6: note D#, 2 note F#, 2 - loopchannel 16, Music_ChampionBattle_branch_ead05 - callchannel Music_ChampionBattle_branch_ead8e + sound_loop 16, .loop6 + sound_call .sub4 octave 3 note E_, 2 note B_, 2 @@ -657,97 +659,98 @@ Music_ChampionBattle_branch_ead05: octave 4 note D#, 2 note E_, 2 - callchannel Music_ChampionBattle_branch_ead8e -Music_ChampionBattle_branch_ead1d: + sound_call .sub4 +.loop7: octave 3 note E_, 2 note B_, 2 - loopchannel 4, Music_ChampionBattle_branch_ead1d -Music_ChampionBattle_branch_ead24: + sound_loop 4, .loop7 +.loop8: note D#, 2 note A#, 2 - loopchannel 5, Music_ChampionBattle_branch_ead24 + sound_loop 5, .loop8 note B_, 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 -Music_ChampionBattle_branch_ead32: + rest 2 +.loop9: note E_, 2 note B_, 2 - loopchannel 5, Music_ChampionBattle_branch_ead32 + sound_loop 5, .loop9 octave 4 note C#, 2 note E_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 -Music_ChampionBattle_branch_ead40: + rest 2 +.loop10: note D#, 2 note G#, 2 - loopchannel 8, Music_ChampionBattle_branch_ead40 -Music_ChampionBattle_branch_ead46: + sound_loop 8, .loop10 +.loop11: note D#, 2 note A#, 2 - loopchannel 7, Music_ChampionBattle_branch_ead46 + sound_loop 7, .loop11 note B_, 2 note A#, 2 -Music_ChampionBattle_branch_ead4e: +.loop12: octave 3 note D#, 2 note A#, 2 octave 4 note D_, 2 note D#, 2 - loopchannel 7, Music_ChampionBattle_branch_ead4e + sound_loop 7, .loop12 note C#, 2 octave 3 note B_, 2 note A#, 2 note G#, 2 - loopchannel 0, Music_ChampionBattle_branch_eacc6 + sound_loop 0, .mainloop -Music_ChampionBattle_branch_ead61: +.sub1: +.sub1loop1: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 5 - loopchannel 3, Music_ChampionBattle_branch_ead61 + rest 5 + sound_loop 3, .sub1loop1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 - endchannel + sound_ret -Music_ChampionBattle_branch_ead6f: +.sub2: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_ChampionBattle_branch_ead83: +.sub3: octave 3 note D#, 2 note F#, 2 @@ -758,9 +761,9 @@ Music_ChampionBattle_branch_ead83: note D_, 2 note C#, 2 note C_, 2 - endchannel + sound_ret -Music_ChampionBattle_branch_ead8e: +.sub4: octave 3 note E_, 2 note B_, 2 @@ -771,4 +774,4 @@ Music_ChampionBattle_branch_ead8e: octave 4 note D#, 2 note E_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/cherrygrovecity.asm b/crysaudio/music/cherrygrovecity.asm index 9a7e0980..f0d4bda8 100644 --- a/crysaudio/music/cherrygrovecity.asm +++ b/crysaudio/music/cherrygrovecity.asm @@ -1,23 +1,24 @@ Music_CherrygroveCity: - musicheader 4, 1, Music_CherrygroveCity_Ch1 - musicheader 1, 2, Music_CherrygroveCity_Ch2 - musicheader 1, 3, Music_CherrygroveCity_Ch3 - musicheader 1, 4, Music_CherrygroveCity_Ch4 + channel_count 4 + channel 1, Music_CherrygroveCity_Ch1 + channel 2, Music_CherrygroveCity_Ch2 + channel 3, Music_CherrygroveCity_Ch3 + channel 4, Music_CherrygroveCity_Ch4 Music_CherrygroveCity_Ch1: tempo 152 - volume $77 - dutycycle $3 - tone $0001 - vibrato $8, $15 - stereopanning $f0 - notetype $c, $b5 - note __, 10 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 8, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 11, 5 + rest 10 octave 3 note C_, 2 note D_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5b26: +.mainloop: note A_, 4 note G#, 2 note A_, 2 @@ -48,7 +49,7 @@ Music_CherrygroveCity_branch_f5b26: note A_, 2 octave 3 note C_, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note A#, 6 octave 3 @@ -61,7 +62,7 @@ Music_CherrygroveCity_branch_f5b26: note A#, 6 octave 3 note D_, 6 - intensity $b5 + volume_envelope 11, 5 note A_, 4 note G_, 4 note E_, 4 @@ -90,13 +91,13 @@ Music_CherrygroveCity_branch_f5b26: note A_, 4 octave 3 note C_, 4 - loopchannel 0, Music_CherrygroveCity_branch_f5b26 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch2: - dutycycle $3 - vibrato $10, $36 - stereopanning $f - notetype $c, $c3 + duty_cycle 3 + vibrato 16, 3, 6 + stereo_panning FALSE, TRUE + note_type 12, 12, 3 octave 3 note C_, 2 note D_, 2 @@ -106,54 +107,54 @@ Music_CherrygroveCity_Ch2: note G_, 2 note A_, 2 note A#, 2 -Music_CherrygroveCity_branch_f5b87: - intensity $c6 +.mainloop: + volume_envelope 12, 6 octave 4 note C_, 6 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note D_, 2 note C_, 2 octave 3 note A#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 6 octave 3 note A_, 2 note F_, 8 - intensity $c6 + volume_envelope 12, 6 note A#, 6 octave 4 note C_, 4 - intensity $b3 + volume_envelope 11, 3 note C_, 2 octave 3 note A#, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 6 note G_, 2 note E_, 8 - intensity $a0 + volume_envelope 10, 0 note D_, 6 note F_, 6 octave 4 note D_, 4 note C_, 6 - intensity $a5 + volume_envelope 10, 5 octave 3 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - intensity $a0 + volume_envelope 10, 0 note D_, 6 note F_, 6 octave 4 note D_, 4 - intensity $c7 + volume_envelope 12, 7 note C_, 16 - intensity $b5 + volume_envelope 11, 5 octave 3 note D_, 6 note F_, 6 @@ -166,15 +167,15 @@ Music_CherrygroveCity_branch_f5b87: note C#, 6 note F_, 6 note G_, 4 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - loopchannel 0, Music_CherrygroveCity_branch_f5b87 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch3: - notetype $c, $16 - note __, 4 + note_type 12, 1, 6 + rest 4 octave 4 note C_, 2 octave 3 @@ -183,7 +184,7 @@ Music_CherrygroveCity_Ch3: note G_, 2 note F_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5be4: +.mainloop: note A_, 2 note F_, 2 note A_, 2 @@ -280,26 +281,26 @@ Music_CherrygroveCity_branch_f5be4: note A_, 2 note F_, 2 note A_, 2 - loopchannel 0, Music_CherrygroveCity_branch_f5be4 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch4: - togglenoise $3 - notetype $c - note __, 16 -Music_CherrygroveCity_branch_f5c4d: - note C#, 2 - note __, 2 - note G_, 2 - note C#, 2 - note C#, 2 - note F#, 2 - note C#, 4 - note C#, 2 - note __, 2 - note G_, 2 - note C#, 1 - note C#, 1 - note F#, 4 - note C#, 2 - note G_, 2 - loopchannel 0, Music_CherrygroveCity_branch_f5c4d + toggle_noise 3 + drum_speed 12 + rest 16 +.mainloop: + drum_note 2, 2 + rest 2 + drum_note 8, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 7, 2 + drum_note 2, 4 + drum_note 2, 2 + rest 2 + drum_note 8, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 7, 4 + drum_note 2, 2 + drum_note 8, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/clair.asm b/crysaudio/music/clair.asm index 90d676cf..502bcdd6 100644 --- a/crysaudio/music/clair.asm +++ b/crysaudio/music/clair.asm @@ -1,44 +1,45 @@ Music_Clair: - musicheader 4, 1, Music_Clair_Ch1 - musicheader 1, 2, Music_Clair_Ch2 - musicheader 1, 3, Music_Clair_Ch3 - musicheader 1, 4, Music_Clair_Ch4 + channel_count 4 + channel 1, Music_Clair_Ch1 + channel 2, Music_Clair_Ch2 + channel 3, Music_Clair_Ch3 + channel 4, Music_Clair_Ch4 Music_Clair_Ch1: tempo 136 - volume $77 - tone $0001 - vibrato $12, $34 - stereopanning $f - notetype $c, $93 - dutycycle $3 -Music_Clair_branch_1faab: + volume 7, 7 + pitch_offset 1 + vibrato 18, 3, 4 + stereo_panning FALSE, TRUE + note_type 12, 9, 3 + duty_cycle 3 +.loop1: octave 4 note F_, 1 note F#, 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - loopchannel 2, Music_Clair_branch_1faab + rest 1 + sound_loop 2, .loop1 octave 3 note B_, 1 - note __, 1 + rest 1 note G#, 1 - dutycycle $2 - intensity $92 + duty_cycle 2 + volume_envelope 9, 2 octave 5 note F_, 1 note G_, 4 - intensity $a7 - dutycycle $3 + volume_envelope 10, 7 + duty_cycle 3 octave 3 note D#, 4 note F_, 4 note G_, 4 -Music_Clair_branch_1fac9: - intensity $93 - callchannel Music_Clair_branch_1fb12 +.mainloop: + volume_envelope 9, 3 + sound_call .sub1 octave 2 note B_, 1 octave 3 @@ -52,7 +53,7 @@ Music_Clair_branch_1fac9: octave 2 note A#, 1 note G_, 1 - callchannel Music_Clair_branch_1fb12 + sound_call .sub1 note D#, 1 note C#, 1 note D#, 2 @@ -64,13 +65,13 @@ Music_Clair_branch_1fac9: note A#, 1 octave 5 note D#, 1 - callchannel Music_Clair_branch_1fb2e - dutycycle $3 + sound_call .sub2 + duty_cycle 3 note G#, 3 note F_, 2 - note __, 1 + rest 1 note A#, 4 - dutycycle $2 + duty_cycle 2 note D#, 1 note C#, 1 note D#, 1 @@ -78,14 +79,14 @@ Music_Clair_branch_1fac9: note A#, 1 octave 5 note D#, 1 - callchannel Music_Clair_branch_1fb2e - dutycycle $3 + sound_call .sub2 + duty_cycle 3 note D#, 3 note C#, 2 - note __, 1 + rest 1 octave 3 note B_, 4 - dutycycle $2 + duty_cycle 2 note G#, 1 note C#, 1 note D#, 1 @@ -93,42 +94,42 @@ Music_Clair_branch_1fac9: note B_, 1 octave 4 note D#, 1 - loopchannel 0, Music_Clair_branch_1fac9 + sound_loop 0, .mainloop -Music_Clair_branch_1fb12: - dutycycle $3 - stereopanning $ff +.sub1: + duty_cycle 3 + stereo_panning TRUE, TRUE octave 3 note B_, 1 - note __, 2 + rest 2 note G#, 5 - dutycycle $2 - stereopanning $f + duty_cycle 2 + stereo_panning FALSE, TRUE octave 2 note B_, 2 note G#, 1 note B_, 1 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 note F#, 1 note F_, 1 note C#, 1 - note __, 1 + rest 1 note F_, 1 note C#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_Clair_branch_1fb2e: +.sub2: octave 4 note F#, 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 note G#, 1 @@ -137,60 +138,60 @@ Music_Clair_branch_1fb2e: note B_, 1 octave 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 note F#, 1 - endchannel + sound_ret Music_Clair_Ch2: - dutycycle $3 - vibrato $12, $34 - notetype $6, $b7 -Music_Clair_branch_1fb49: + duty_cycle 3 + vibrato 18, 3, 4 + note_type 6, 11, 7 +.loop1: octave 3 note A#, 2 note B_, 2 note A#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 - loopchannel 2, Music_Clair_branch_1fb49 + rest 2 + sound_loop 2, .loop1 note F_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - intensity $82 + rest 2 + volume_envelope 8, 2 note D#, 2 note A#, 2 octave 4 note C#, 2 octave 3 note A#, 2 - intensity $92 + volume_envelope 9, 2 note G_, 2 octave 4 note C#, 2 note D#, 2 octave 3 note A#, 2 - intensity $b2 + volume_envelope 11, 2 octave 4 note C#, 2 note D#, 2 note G_, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 note C#, 2 note D#, 2 note G_, 2 note A#, 2 - intensity $b7 -Music_Clair_branch_1fb77: - callchannel Music_Clair_branch_1fba6 + volume_envelope 11, 7 +.mainloop: + sound_call .sub1 note F#, 2 - note __, 4 + rest 4 note D#, 12 - note __, 2 + rest 2 note D#, 4 note C#, 4 octave 3 @@ -199,18 +200,18 @@ Music_Clair_branch_1fb77: note B_, 6 octave 4 note C#, 4 - note __, 2 + rest 2 octave 3 note A#, 16 - note __, 4 - pitchoffset 0, CC - callchannel Music_Clair_branch_1fba6 - pitchoffset 0, C_ + rest 4 + transpose 0, 12 + sound_call .sub1 + transpose 0, 0 octave 5 note F#, 2 - note __, 4 + rest 4 note D#, 12 - note __, 2 + rest 2 octave 4 note G#, 4 note A#, 4 @@ -220,17 +221,17 @@ Music_Clair_branch_1fb77: note C#, 6 octave 4 note A#, 4 - note __, 2 + rest 2 note G#, 16 - note __, 4 - loopchannel 0, Music_Clair_branch_1fb77 + rest 4 + sound_loop 0, .mainloop -Music_Clair_branch_1fba6: +.sub1: octave 4 note F#, 2 - note __, 4 + rest 4 note D#, 12 - note __, 2 + rest 2 octave 3 note G#, 4 note A#, 4 @@ -240,54 +241,54 @@ Music_Clair_branch_1fba6: note C#, 6 octave 3 note B_, 4 - note __, 2 + rest 2 octave 4 note D#, 16 - note __, 4 - endchannel + rest 4 + sound_ret Music_Clair_Ch3: - notetype $c, $14 - pitchoffset 0, CC + note_type 12, 1, 4 + transpose 0, 12 octave 3 note C#, 2 - note __, 4 + rest 4 octave 2 note G#, 1 note B_, 1 octave 3 note C#, 2 - note __, 4 + rest 4 octave 2 note G#, 1 note B_, 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 4 note G#, 4 note G_, 4 -Music_Clair_branch_1fbd1: - callchannel Music_Clair_branch_1fc3c +.mainloop: + sound_call .sub1 octave 2 note C#, 2 - note __, 1 + rest 1 note G#, 2 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note D#, 2 note A#, 2 note D#, 2 - callchannel Music_Clair_branch_1fc3c + sound_call .sub1 octave 2 note G#, 2 - note __, 1 + rest 1 note C#, 2 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 1 note C#, 1 note D#, 1 @@ -296,15 +297,15 @@ Music_Clair_branch_1fbd1: note A#, 1 octave 1 note G#, 2 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 1 + rest 1 octave 1 note G#, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 octave 3 @@ -315,13 +316,13 @@ Music_Clair_branch_1fbd1: note G#, 2 octave 2 note C#, 2 - note __, 1 + rest 1 note G#, 2 - note __, 1 + rest 1 note C#, 2 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note D#, 1 octave 3 @@ -334,15 +335,15 @@ Music_Clair_branch_1fbd1: note D#, 1 octave 1 note G#, 2 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 1 + rest 1 octave 1 note G#, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 octave 3 @@ -353,13 +354,13 @@ Music_Clair_branch_1fbd1: note G#, 2 octave 2 note D#, 2 - note __, 1 + rest 1 note G_, 2 - note __, 1 + rest 1 note G#, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 1 note G#, 1 octave 2 @@ -368,66 +369,66 @@ Music_Clair_branch_1fbd1: note G#, 1 octave 1 note G#, 1 - loopchannel 0, Music_Clair_branch_1fbd1 + sound_loop 0, .mainloop -Music_Clair_branch_1fc3c: +.sub1: octave 1 note G#, 2 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 1 + rest 1 octave 1 note G#, 2 - note __, 2 + rest 2 note G#, 2 octave 2 note D#, 2 octave 1 note G#, 2 - endchannel + sound_ret Music_Clair_Ch4: - togglenoise $3 - notetype $c - stereopanning $f0 - note B_, 8 - note B_, 8 - note B_, 6 - stereopanning $ff - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D_, 1 - note D_, 1 -Music_Clair_branch_1fc5e: - stereopanning $ff - callchannel Music_Clair_branch_1fc6e - note G_, 1 - stereopanning $ff - callchannel Music_Clair_branch_1fc6e - note F#, 1 - loopchannel 0, Music_Clair_branch_1fc5e + toggle_noise 3 + drum_speed 12 + stereo_panning TRUE, FALSE + drum_note 12, 8 + drum_note 12, 8 + drum_note 12, 6 + stereo_panning TRUE, TRUE + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: + stereo_panning TRUE, TRUE + sound_call .sub1 + drum_note 8, 1 + stereo_panning TRUE, TRUE + sound_call .sub1 + drum_note 7, 1 + sound_loop 0, .mainloop -Music_Clair_branch_1fc6e: - note D#, 2 - stereopanning $f0 - note G_, 2 - stereopanning $ff - note D_, 2 - stereopanning $f0 - note G_, 1 - note G_, 1 - note G_, 2 - stereopanning $ff - note D#, 1 - stereopanning $f0 - note G_, 1 - stereopanning $ff - note D_, 2 - stereopanning $f0 - note G_, 1 - endchannel +.sub1: + drum_note 4, 2 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 3, 2 + stereo_panning TRUE, FALSE + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 2 + stereo_panning TRUE, TRUE + drum_note 4, 1 + stereo_panning TRUE, FALSE + drum_note 8, 1 + stereo_panning TRUE, TRUE + drum_note 3, 2 + stereo_panning TRUE, FALSE + drum_note 8, 1 + sound_ret diff --git a/crysaudio/music/contestresults.asm b/crysaudio/music/contestresults.asm index 85d8291e..28575eeb 100644 --- a/crysaudio/music/contestresults.asm +++ b/crysaudio/music/contestresults.asm @@ -1,137 +1,138 @@ Music_ContestResults: - musicheader 4, 1, Music_ContestResults_Ch1 - musicheader 1, 2, Music_ContestResults_Ch2 - musicheader 1, 3, Music_ContestResults_Ch3 - musicheader 1, 4, Music_ContestResults_Ch4 + channel_count 4 + channel 1, Music_ContestResults_Ch1 + channel 2, Music_ContestResults_Ch2 + channel 3, Music_ContestResults_Ch3 + channel 4, Music_ContestResults_Ch4 Music_ContestResults_Ch1: tempo 144 - volume $77 - notetype $c, $51 -Music_ContestResults_branch_efb52: - note __, 2 + volume 7, 7 + note_type 12, 5, 1 +.mainloop: + rest 2 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note B_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 - loopchannel 0, Music_ContestResults_branch_efb52 + rest 1 + sound_loop 0, .mainloop Music_ContestResults_Ch2: - notetype $c, $61 -Music_ContestResults_branch_efb7e: + note_type 12, 6, 1 +.mainloop: octave 2 note C_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note G_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 3 note F_, 1 - note __, 1 -Music_ContestResults_branch_efba6: + rest 1 +.loop1: octave 2 note D_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F_, 1 - note __, 1 - loopchannel 2, Music_ContestResults_branch_efba6 + rest 1 + sound_loop 2, .loop1 octave 2 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note D_, 1 - note __, 1 - loopchannel 0, Music_ContestResults_branch_efb7e + rest 1 + sound_loop 0, .mainloop Music_ContestResults_Ch3: - vibrato $8, $24 - notetype $c, $23 -Music_ContestResults_branch_efbd2: + vibrato 8, 2, 4 + note_type 12, 2, 3 +.mainloop: octave 4 note E_, 5 - note __, 1 + rest 1 note E_, 1 note F_, 1 note G_, 4 @@ -141,33 +142,33 @@ Music_ContestResults_branch_efbd2: note B_, 8 note A_, 8 note D_, 5 - note __, 1 + rest 1 note D_, 1 note E_, 1 note F_, 4 note B_, 4 note A_, 8 note G_, 8 - loopchannel 0, Music_ContestResults_branch_efbd2 + sound_loop 0, .mainloop Music_ContestResults_Ch4: - togglenoise $4 - notetype $6 -Music_ContestResults_branch_efbed: - note C#, 4 - note C#, 4 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note C#, 4 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - loopchannel 0, Music_ContestResults_branch_efbed + toggle_noise 4 + drum_speed 6 +.mainloop: + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 4 + drum_note 2, 4 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/credits.asm b/crysaudio/music/credits.asm index 8d862240..ee2cff02 100644 --- a/crysaudio/music/credits.asm +++ b/crysaudio/music/credits.asm @@ -1,18 +1,19 @@ Music_Credits: - musicheader 4, 1, Music_Credits_Ch1 - musicheader 1, 2, Music_Credits_Ch2 - musicheader 1, 3, Music_Credits_Ch3 - musicheader 1, 4, Music_Credits_Ch4 + channel_count 4 + channel 1, Music_Credits_Ch1 + channel 2, Music_Credits_Ch2 + channel 3, Music_Credits_Ch3 + channel 4, Music_Credits_Ch4 Music_Credits_Ch1: tempo 139 - volume $77 - stereopanning $f - dutycycle $3 - notetype $c, $2f + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 2, -7 octave 2 note G_, 16 - notetype $6, $a7 + note_type 6, 10, 7 octave 3 note B_, 12 note A#, 2 @@ -21,17 +22,17 @@ Music_Credits_Ch1: octave 4 note C_, 7 note D_, 8 - callchannel Music_Credits_branch_1f483 - note __, 4 + sound_call .sub1 + rest 4 octave 3 note B_, 2 - note __, 2 + rest 2 note A_, 2 note B_, 2 - note __, 2 + rest 2 note A_, 2 note B_, 2 - intensity $96 + volume_envelope 9, 6 note A_, 1 note G_, 1 octave 3 @@ -40,7 +41,7 @@ Music_Credits_Ch1: octave 2 note B_, 1 note A_, 1 - intensity $94 + volume_envelope 9, 4 note G_, 1 note F_, 1 note E_, 1 @@ -50,12 +51,12 @@ Music_Credits_Ch1: note B_, 1 note A_, 1 octave 3 - note __, 1 - intensity $a7 - callchannel Music_Credits_branch_1f483 - callchannel Music_Credits_branch_1f4ed - intensity $97 - callchannel Music_Credits_branch_1f4f8 + rest 1 + volume_envelope 10, 7 + sound_call .sub1 + sound_call .sub2 + volume_envelope 9, 7 + sound_call .sub3 octave 3 note B_, 2 octave 4 @@ -117,13 +118,13 @@ Music_Credits_Ch1: note C_, 2 octave 3 note B_, 2 - callchannel Music_Credits_branch_1f4f8 - callchannel Music_Credits_branch_1f559 + sound_call .sub3 + sound_call .sub4 note B_, 1 octave 4 note C_, 7 note D_, 8 - intensity $a7 + volume_envelope 10, 7 octave 5 note E_, 2 note C#, 2 @@ -140,20 +141,20 @@ Music_Credits_Ch1: note D_, 7 note E_, 7 octave 3 - note __, 1 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f483 - callchannel Music_Credits_branch_1f4ed - callchannel Music_Credits_branch_1f4f8 - callchannel Music_Credits_branch_1f559 - pitchoffset 0, C_ + rest 1 + transpose 0, 2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + transpose 0, 0 octave 3 note A_, 12 - notetype $8, $a7 + note_type 8, 10, 7 note D_, 1 note D_, 1 note D_, 1 - callchannel Music_Credits_branch_1f582 + sound_call .sub5 octave 3 note B_, 6 note A_, 6 @@ -164,7 +165,7 @@ Music_Credits_Ch1: note A_, 6 octave 4 note C#, 6 - callchannel Music_Credits_branch_1f582 + sound_call .sub5 tempo 143 octave 4 note D_, 6 @@ -179,22 +180,22 @@ Music_Credits_Ch1: note A_, 6 octave 5 note C#, 6 - notetype $c, $a7 -Music_Credits_branch_1f407: + note_type 12, 10, 7 +.loop1: octave 3 note A_, 1 octave 4 note D_, 1 - loopchannel 6, Music_Credits_branch_1f407 - notetype $8, $a7 + sound_loop 6, .loop1 + note_type 8, 10, 7 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 tempo 153 - notetype $c, $a7 + note_type 12, 10, 7 octave 3 note C_, 1 note E_, 1 @@ -213,14 +214,14 @@ Music_Credits_branch_1f407: note C_, 1 note E_, 1 note G_, 1 - notetype $8, $a7 + note_type 8, 10, 7 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - notetype $c, $a7 + rest 1 + note_type 12, 10, 7 octave 3 note D_, 1 note F#, 1 @@ -234,53 +235,53 @@ Music_Credits_branch_1f407: note D_, 1 note E_, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $8, $a7 + rest 1 + note_type 8, 10, 7 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 tempo 160 - notetype $c, $a7 + note_type 12, 10, 7 octave 2 note G_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - notetype $8, $a7 + rest 3 + note_type 8, 10, 7 octave 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - notetype $c, $a7 + rest 1 + note_type 12, 10, 7 octave 2 note D_, 1 - note __, 7 - intensity $c7 + rest 7 + volume_envelope 12, 7 octave 2 note D_, 16 - intensity $b8 - intensity $b7 - note __, 16 - note __, 16 - note __, 16 - endchannel + volume_envelope 11, 8 + volume_envelope 11, 7 + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1f483: +.sub1: note C_, 16 note F#, 1 note G_, 3 @@ -290,17 +291,17 @@ Music_Credits_branch_1f483: note D_, 4 octave 3 note B_, 2 - note __, 2 + rest 2 note A#, 2 note B_, 2 - note __, 2 + rest 2 note A#, 2 note B_, 4 note G_, 4 - note __, 4 + rest 4 octave 4 note D_, 4 - note __, 4 + rest 4 note E_, 4 octave 3 note A#, 4 @@ -312,19 +313,19 @@ Music_Credits_branch_1f483: note C_, 4 note D_, 4 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note C_, 4 octave 3 note A_, 4 - note __, 4 + rest 4 octave 4 note C_, 4 octave 3 @@ -335,7 +336,7 @@ Music_Credits_branch_1f483: note A_, 1 note A#, 7 note G#, 4 - note __, 4 + rest 4 octave 4 note C_, 4 octave 3 @@ -348,47 +349,47 @@ Music_Credits_branch_1f483: note C_, 4 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 6 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_Credits_branch_1f4ed: +.sub2: octave 4 note C_, 4 octave 3 @@ -399,9 +400,9 @@ Music_Credits_branch_1f4ed: note D_, 4 note C_, 4 note D#, 4 - endchannel + sound_ret -Music_Credits_branch_1f4f8: +.sub3: octave 3 note A_, 2 octave 4 @@ -498,9 +499,9 @@ Music_Credits_branch_1f4f8: note F_, 2 note C_, 2 note F_, 2 - endchannel + sound_ret -Music_Credits_branch_1f559: +.sub4: octave 3 note A_, 2 octave 4 @@ -541,10 +542,10 @@ Music_Credits_branch_1f559: note B_, 12 note A#, 2 note A_, 2 - endchannel + sound_ret -Music_Credits_branch_1f582: - note __, 6 +.sub5: + rest 6 octave 3 note D_, 6 note E_, 6 @@ -554,51 +555,51 @@ Music_Credits_branch_1f582: octave 4 note F#, 6 note C#, 6 - endchannel + sound_ret Music_Credits_Ch2: - dutycycle $1 - vibrato $14, $23 - notetype $c, $2f - stereopanning $f0 + duty_cycle 1 + vibrato 20, 2, 3 + note_type 12, 2, -7 + stereo_panning TRUE, FALSE octave 4 note G_, 16 - intensity $c7 + volume_envelope 12, 7 octave 5 note G_, 8 octave 3 note G_, 4 note F_, 4 - notetype $6, $c7 - callchannel Music_Credits_branch_1f6cb + note_type 6, 12, 7 + sound_call .sub1 octave 1 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 octave 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 - intensity $97 + volume_envelope 9, 7 note F#, 1 note F_, 1 note E_, 1 note D#, 1 note D_, 1 note C#, 1 - intensity $c7 - callchannel Music_Credits_branch_1f6cb - callchannel Music_Credits_branch_1f73f - callchannel Music_Credits_branch_1f748 + volume_envelope 12, 7 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 octave 4 note B_, 1 octave 5 @@ -609,10 +610,10 @@ Music_Credits_Ch2: note B_, 4 note F#, 1 note G_, 15 - notetype $c, $c7 + note_type 12, 12, 7 octave 5 note E_, 15 - notetype $6, $c7 + note_type 6, 12, 7 note G_, 1 note G#, 1 note A_, 2 @@ -626,7 +627,7 @@ Music_Credits_Ch2: octave 4 note A_, 2 note E_, 2 - callchannel Music_Credits_branch_1f748 + sound_call .sub3 octave 4 note B_, 1 octave 5 @@ -635,7 +636,7 @@ Music_Credits_Ch2: note B_, 8 octave 5 note C_, 12 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 16 note G_, 8 octave 3 @@ -656,21 +657,21 @@ Music_Credits_Ch2: octave 3 note A_, 4 note G_, 4 - notetype $6, $c7 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f6cb - callchannel Music_Credits_branch_1f73f - callchannel Music_Credits_branch_1f748 - pitchoffset 0, C_ + note_type 6, 12, 7 + transpose 0, 2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + transpose 0, 0 octave 5 note C#, 1 note D_, 11 note C#, 8 note D_, 12 - notetype $c, $c7 + note_type 12, 12, 7 note E_, 16 note A_, 14 - notetype $8, $c7 + note_type 8, 12, 7 octave 2 note D_, 1 note D_, 1 @@ -695,34 +696,34 @@ Music_Credits_Ch2: note E_, 6 octave 1 note D_, 3 - note __, 3 + rest 3 note D_, 3 - note __, 3 + rest 3 note D_, 3 - note __, 3 + rest 3 note D_, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note F#, 3 - notetype $c, $c7 + note_type 12, 12, 7 octave 2 note F#, 1 - note __, 1 + rest 1 octave 1 note F#, 2 octave 2 note F#, 1 - note __, 1 -Music_Credits_branch_1f657: + rest 1 +.loop1: octave 1 note G_, 2 octave 2 note G_, 1 - note __, 1 - loopchannel 4, Music_Credits_branch_1f657 + rest 1 + sound_loop 4, .loop1 octave 1 note A_, 1 octave 2 @@ -748,164 +749,164 @@ Music_Credits_branch_1f657: note C#, 1 octave 5 note D_, 12 - notetype $8, $c7 + note_type 8, 12, 7 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 note D_, 12 - notetype $8, $c7 + note_type 8, 12, 7 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 9 - notetype $c, $c7 + note_type 12, 12, 7 octave 4 note F#, 1 note A_, 1 octave 5 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - notetype $8, $c7 + rest 1 + note_type 8, 12, 7 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 - notetype $8, $c7 + rest 3 + note_type 8, 12, 7 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 note D_, 1 - note __, 7 - intensity $c8 - intensity $c7 + rest 7 + volume_envelope 12, 8 + volume_envelope 12, 7 octave 1 note D_, 16 - intensity $c7 - note __, 16 - note __, 16 - note __, 16 - endchannel + volume_envelope 12, 7 + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1f6cb: +.sub1: octave 2 note C_, 4 - intensity $b1 + volume_envelope 11, 1 octave 5 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 - intensity $c7 + rest 2 + volume_envelope 12, 7 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 4 - note __, 12 + rest 12 octave 1 note B_, 4 - note __, 10 + rest 10 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 octave 1 note B_, 6 note A#, 4 - intensity $b1 + volume_envelope 11, 1 octave 5 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 - intensity $c7 + rest 2 + volume_envelope 12, 7 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 4 - note __, 12 + rest 12 note A_, 4 - note __, 10 + rest 10 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 2 note F_, 2 octave 1 note A_, 6 note G#, 4 - intensity $b1 + volume_envelope 11, 1 octave 5 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 - note __, 2 - intensity $c7 + rest 2 + volume_envelope 12, 7 octave 1 note G#, 1 - note __, 1 + rest 1 note G#, 4 - note __, 12 + rest 12 note G_, 4 - note __, 10 + rest 10 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 2 note E_, 2 octave 1 note G_, 6 note F#, 4 - note __, 2 + rest 2 note F#, 2 note F#, 2 octave 2 @@ -922,27 +923,27 @@ Music_Credits_branch_1f6cb: note A_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_Credits_branch_1f73f: +.sub2: octave 1 note G_, 4 - note __, 4 + rest 4 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 12 note F#, 8 - endchannel + sound_ret -Music_Credits_branch_1f748: +.sub3: octave 4 note A_, 8 note B_, 8 octave 5 note C_, 8 note E_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 16 octave 4 note G_, 4 @@ -951,7 +952,7 @@ Music_Credits_branch_1f748: octave 5 note D_, 4 note C_, 10 - notetype $6, $c7 + note_type 6, 12, 7 octave 4 note B_, 1 octave 5 @@ -960,21 +961,21 @@ Music_Credits_branch_1f748: note B_, 4 octave 5 note C_, 4 - notetype $c, $c7 + note_type 12, 12, 7 octave 4 note A_, 10 - notetype $6, $c7 + note_type 6, 12, 7 note G#, 1 note A_, 3 note B_, 4 octave 5 note C_, 4 - endchannel + sound_ret Music_Credits_Ch3: - vibrato $16, $23 - notetype $c, $34 - stereopanning $ff + vibrato 22, 2, 3 + note_type 12, 3, 4 + stereo_panning TRUE, TRUE octave 6 note G_, 1 note D_, 1 @@ -987,14 +988,14 @@ Music_Credits_Ch3: note C_, 1 octave 5 note G_, 1 - intensity $24 + volume_envelope 2, 4 octave 6 note G_, 1 note D_, 1 note C_, 1 octave 5 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 6 note G_, 1 note D_, 1 @@ -1013,46 +1014,46 @@ Music_Credits_Ch3: note B_, 1 note G_, 1 note D_, 1 - notetype $6, $14 + note_type 6, 1, 4 note D#, 1 note E_, 7 note F_, 8 - callchannel Music_Credits_branch_1f8aa + sound_call .sub1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 - notetype $6, $14 - intensity $24 + note_type 6, 1, 4 + volume_envelope 2, 4 note F_, 1 note E_, 1 - intensity $14 + volume_envelope 1, 4 note E_, 4 - note __, 4 + rest 4 note F_, 4 - callchannel Music_Credits_branch_1f8aa - callchannel Music_Credits_branch_1f8db - callchannel Music_Credits_branch_1f8e7 - callchannel Music_Credits_branch_1f934 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 octave 2 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 2 octave 3 note G_, 2 @@ -1065,16 +1066,16 @@ Music_Credits_Ch3: note G_, 2 octave 2 note E_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 octave 3 note E_, 2 @@ -1089,54 +1090,54 @@ Music_Credits_Ch3: note A_, 4 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note G#, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note G#, 2 note G_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 note F#, 4 octave 3 note E_, 4 - callchannel Music_Credits_branch_1f8e7 - callchannel Music_Credits_branch_1f934 - callchannel Music_Credits_branch_1f94b + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 octave 5 note D#, 1 note E_, 7 note F_, 8 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 - note __, 2 + rest 2 octave 5 note F_, 1 note F#, 7 note G_, 8 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f8aa - callchannel Music_Credits_branch_1f8db - pitchoffset 1, D_ - callchannel Music_Credits_branch_1f8e7 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f934 - callchannel Music_Credits_branch_1f94b - pitchoffset 0, C_ + transpose 0, 2 + sound_call .sub1 + sound_call .sub2 + transpose 1, 2 + sound_call .sub3 + transpose 0, 2 + sound_call .sub4 + sound_call .sub5 + transpose 0, 0 octave 6 note C#, 2 octave 5 @@ -1145,18 +1146,18 @@ Music_Credits_Ch3: note C#, 2 note A_, 2 note E_, 2 - notetype $8, $14 + note_type 8, 1, 4 octave 2 note D_, 1 note D_, 1 note D_, 1 - notetype $c, $14 + note_type 12, 1, 4 note D_, 16 note F#, 16 note G_, 16 note G_, 8 note A_, 8 - note __, 4 + rest 4 octave 4 note F#, 4 note G_, 4 @@ -1175,7 +1176,7 @@ Music_Credits_Ch3: octave 6 note C#, 4 note E_, 4 - intensity $15 + volume_envelope 1, 5 octave 4 note D_, 6 note F#, 2 @@ -1188,47 +1189,47 @@ Music_Credits_Ch3: note B_, 1 note A#, 1 note A_, 8 - intensity $14 + volume_envelope 1, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype $8, $14 + rest 1 + note_type 8, 1, 4 octave 3 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 octave 5 note G_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - notetype $8, $14 + rest 3 + note_type 8, 1, 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 note A_, 1 - note __, 16 - note __, 16 - note __, 16 - endchannel + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1f8aa: +.sub1: note G_, 16 octave 6 note C#, 1 @@ -1238,25 +1239,25 @@ Music_Credits_branch_1f8aa: note B_, 4 octave 6 note C_, 4 - notetype $c, $14 + note_type 12, 1, 4 octave 5 note G_, 10 note E_, 2 - note __, 2 + rest 2 note F_, 2 note G_, 10 - notetype $6, $14 + note_type 6, 1, 4 note G#, 1 note A_, 7 note E_, 4 note G_, 12 note F_, 8 note D_, 4 - note __, 4 + rest 4 note E_, 4 - notetype $c, $14 + note_type 12, 1, 4 note F_, 10 - notetype $6, $14 + note_type 6, 1, 4 note F#, 1 note G_, 7 note F_, 4 @@ -1265,12 +1266,12 @@ Music_Credits_branch_1f8aa: note E_, 4 note B_, 12 note A_, 8 - notetype $c, $14 + note_type 12, 1, 4 note D_, 16 - endchannel + sound_ret -Music_Credits_branch_1f8db: - notetype $6, $14 +.sub2: + note_type 6, 1, 4 note F#, 1 note G_, 3 octave 4 @@ -1279,14 +1280,14 @@ Music_Credits_branch_1f8db: note D_, 4 note G_, 12 note G#, 8 - endchannel + sound_ret -Music_Credits_branch_1f8e7: +.sub3: octave 3 note F_, 4 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 octave 3 @@ -1294,9 +1295,9 @@ Music_Credits_branch_1f8e7: note F_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 octave 4 @@ -1304,9 +1305,9 @@ Music_Credits_branch_1f8e7: octave 3 note F_, 4 note G_, 4 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 octave 3 @@ -1314,9 +1315,9 @@ Music_Credits_branch_1f8e7: note G_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 @@ -1324,23 +1325,23 @@ Music_Credits_branch_1f8e7: octave 3 note G_, 4 note E_, 4 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note B_, 2 note G_, 2 note E_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 note B_, 2 note E_, 4 note A_, 4 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 note C_, 2 @@ -1350,7 +1351,7 @@ Music_Credits_branch_1f8e7: note C_, 2 octave 3 note G#, 2 - note __, 2 + rest 2 note G#, 2 octave 4 note C_, 2 @@ -1358,21 +1359,21 @@ Music_Credits_branch_1f8e7: note C_, 2 octave 3 note G#, 2 - endchannel + sound_ret -Music_Credits_branch_1f934: +.sub4: octave 2 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 2 octave 3 note F_, 2 @@ -1383,21 +1384,21 @@ Music_Credits_branch_1f934: note C_, 2 note E_, 2 note F_, 2 - endchannel + sound_ret -Music_Credits_branch_1f94b: +.sub5: octave 2 note F#, 4 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F#, 2 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 2 octave 3 note F#, 2 @@ -1425,250 +1426,250 @@ Music_Credits_branch_1f94b: note B_, 2 note G_, 2 note D_, 2 - endchannel + sound_ret Music_Credits_Ch4: - togglenoise $3 - notetype $c - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note B_, 2 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note A#, 4 - note A#, 4 - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa6d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9a8: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - loopchannel 7, Music_Credits_branch_1f9a8 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note F#, 2 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 -Music_Credits_branch_1f9c6: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - loopchannel 7, Music_Credits_branch_1f9c6 - note G#, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note A#, 4 - note C#, 4 - note G#, 1 - note G_, 1 - note B_, 2 - note G#, 1 - note G_, 1 - note B_, 2 - note A#, 4 - note A#, 4 - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9f2: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - loopchannel 7, Music_Credits_branch_1f9f2 - note G#, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 7 - notetype $8 - note A#, 1 - note A#, 1 - note A#, 1 - notetype $c - note B_, 16 - note __, 16 - note B_, 15 - note __, 1 - note B_, 8 - note B_, 8 - note B_, 16 - note __, 16 - note B_, 16 - note B_, 8 - note B_, 6 - note D_, 1 - note D_, 1 - note B_, 12 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c - note B_, 12 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - note B_, 12 - notetype $c - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - notetype $8 - note C#, 2 - note C#, 2 - note D_, 2 - notetype $c - note D_, 1 - note __, 3 - note D_, 1 - note __, 3 - notetype $8 - note C#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c - note D_, 1 - note __, 7 - note A#, 8 - note __, 16 - note __, 16 - note __, 16 - endchannel + toggle_noise 3 + drum_speed 12 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 12, 2 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 11, 4 + drum_note 11, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop1: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 7, .loop1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 7, 2 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 +.loop2: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 7, .loop2 + drum_note 9, 1 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 4 + drum_note 2, 4 + drum_note 9, 1 + drum_note 8, 1 + drum_note 12, 2 + drum_note 9, 1 + drum_note 8, 1 + drum_note 12, 2 + drum_note 11, 4 + drum_note 11, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop3: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 7, .loop3 + drum_note 9, 1 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 7 + drum_speed 8 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_speed 12 + drum_note 12, 16 + rest 16 + drum_note 12, 15 + rest 1 + drum_note 12, 8 + drum_note 12, 8 + drum_note 12, 16 + rest 16 + drum_note 12, 16 + drum_note 12, 8 + drum_note 12, 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 12, 12 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 12, 12 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 12, 12 + drum_speed 12 + drum_note 3, 1 + rest 1 + drum_note 3, 1 + rest 1 + drum_speed 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 1 + rest 3 + drum_note 3, 1 + rest 3 + drum_speed 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 1 + rest 7 + drum_note 11, 8 + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1fa4d: - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note F#, 2 - endchannel +.sub1: + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 7, 2 + sound_ret -Music_Credits_branch_1fa6d: - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note D_, 1 - note F#, 2 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - note A#, 1 - note D_, 1 - endchannel +.sub2: + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 3, 1 + drum_note 7, 2 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 11, 1 + drum_note 3, 1 + sound_ret diff --git a/crysaudio/music/crystalopening.asm b/crysaudio/music/crystalopening.asm index ca2e525d..386c7e10 100644 --- a/crysaudio/music/crystalopening.asm +++ b/crysaudio/music/crystalopening.asm @@ -1,17 +1,18 @@ Music_CrystalOpening: - musicheader 4, 1, Music_CrystalOpening_Ch1 - musicheader 1, 2, Music_CrystalOpening_Ch2 - musicheader 1, 3, Music_CrystalOpening_Ch3 - musicheader 1, 4, Music_CrystalOpening_Ch4 + channel_count 4 + channel 1, Music_CrystalOpening_Ch1 + channel 2, Music_CrystalOpening_Ch2 + channel 3, Music_CrystalOpening_Ch3 + channel 4, Music_CrystalOpening_Ch4 Music_CrystalOpening_Ch1: tempo 136 - volume $77 - tone $0002 - vibrato $10, $34 - dutycycle $3 - stereopanning $f0 - notetype $c, $92 + volume 7, 7 + pitch_offset 2 + vibrato 16, 3, 4 + duty_cycle 3 + stereo_panning TRUE, FALSE + note_type 12, 9, 2 octave 2 note F#, 2 note F#, 4 @@ -24,7 +25,7 @@ Music_CrystalOpening_Ch1: note F#, 2 note F#, 2 note F#, 6 - notetype $c, $b4 + note_type 12, 11, 4 octave 2 note B_, 2 note F#, 2 @@ -111,20 +112,20 @@ Music_CrystalOpening_Ch1: note F#, 2 octave 4 note C_, 2 - notetype $c, $a0 + note_type 12, 10, 0 note D_, 8 note D_, 8 - notetype $c, $a7 + note_type 12, 10, 7 note D_, 8 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note D_, 16 - endchannel + sound_ret Music_CrystalOpening_Ch2: - notetype $c, $a2 - dutycycle $3 - vibrato $8, $44 + note_type 12, 10, 2 + duty_cycle 3 + vibrato 8, 4, 4 octave 2 note B_, 2 note B_, 4 @@ -137,50 +138,50 @@ Music_CrystalOpening_Ch2: note B_, 2 note B_, 2 note B_, 2 - notetype $c, $a2 + note_type 12, 10, 2 octave 2 note E_, 1 note B_, 1 octave 3 note E_, 1 note F#, 1 - notetype $c, $c7 + note_type 12, 12, 7 note E_, 8 note F#, 8 octave 2 note B_, 8 - notetype $c, $b0 + note_type 12, 11, 0 octave 3 note B_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note B_, 16 - note __, 16 + rest 16 note G_, 8 note A_, 8 note D_, 8 - notetype $c, $c7 + note_type 12, 12, 7 octave 4 note D_, 8 - notetype $c, $7c + note_type 12, 7, -4 note D_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 8 note G_, 8 - notetype $c, $b0 + note_type 12, 11, 0 note F#, 8 note F#, 8 - notetype $c, $c7 + note_type 12, 12, 7 note F#, 8 - notetype $c, $c2 + note_type 12, 12, 2 octave 3 note D_, 16 - endchannel + sound_ret Music_CrystalOpening_Ch3: - notetype $c, $16 + note_type 12, 1, 6 octave 1 note B_, 4 - notetype $6, $16 + note_type 6, 1, 6 note B_, 1 note A#, 1 note A_, 1 @@ -189,11 +190,11 @@ Music_CrystalOpening_Ch3: note F#, 1 note F_, 1 note E_, 1 - notetype $c, $16 + note_type 12, 1, 6 note B_, 4 note B_, 4 note B_, 4 - notetype $6, $16 + note_type 6, 1, 6 note B_, 1 note A#, 1 note A_, 1 @@ -202,7 +203,7 @@ Music_CrystalOpening_Ch3: note F#, 1 note F_, 1 note E_, 1 - notetype $c, $16 + note_type 12, 1, 6 note B_, 4 note B_, 4 octave 2 @@ -237,123 +238,123 @@ Music_CrystalOpening_Ch3: note D_, 16 octave 2 note D_, 1 - note __, 15 - endchannel + rest 15 + sound_ret Music_CrystalOpening_Ch4: - stereopanning $f - togglenoise $3 - notetype $c - note __, 16 - note __, 12 + stereo_panning FALSE, TRUE + toggle_noise 3 + drum_speed 12 + rest 16 + rest 12 octave 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 4 - notetype $8 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 3 - notetype $c - note C#, 1 - note C#, 1 - note G_, 1 - note G_, 1 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 1 - note C#, 1 - note G_, 2 - note D_, 1 - note C#, 1 - note A_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - note G_, 1 - note __, 1 - note C#, 1 - note C#, 1 - note A_, 1 - note G_, 1 - note C#, 1 - note D_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - note A_, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note A_, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note G_, 1 - note G_, 1 - note C#, 1 - note C#, 1 - note A_, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note A_, 1 - note G_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note A_, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note C#, 2 - note D_, 2 - note __, 2 - note D_, 2 - note D_, 2 - note __, 6 - note __, 16 - note __, 16 - endchannel + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_speed 8 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 3 + drum_speed 12 + drum_note 2, 1 + drum_note 2, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 8, 2 + drum_note 3, 1 + drum_note 2, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 8, 1 + rest 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 10, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 10, 2 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 2 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + drum_note 3, 2 + rest 6 + rest 16 + rest 16 + sound_ret diff --git a/crysaudio/music/dancinghall.asm b/crysaudio/music/dancinghall.asm index 6884000b..3b477cc6 100644 --- a/crysaudio/music/dancinghall.asm +++ b/crysaudio/music/dancinghall.asm @@ -1,26 +1,27 @@ Music_DancingHall: - musicheader 3, 1, Music_DancingHall_Ch1 - musicheader 1, 2, Music_DancingHall_Ch2 - musicheader 1, 3, Music_DancingHall_Ch3 + channel_count 3 + channel 1, Music_DancingHall_Ch1 + channel 2, Music_DancingHall_Ch2 + channel 3, Music_DancingHall_Ch3 - db $3 + db $3 ; unused Music_DancingHall_Ch1: tempo 208 - volume $77 - stereopanning $f - notetype $6, $b7 - note __, 3 - dutycycle $0 -Music_DancingHall_branch_ef9d3: - notetype $c, $b7 - callchannel Music_DancingHall_branch_efa17 - note __, 16 - callchannel Music_DancingHall_branch_efa17 - note __, 16 - note __, 16 - note __, 16 - intensity $b1 + volume 7, 7 + stereo_panning FALSE, TRUE + note_type 6, 11, 7 + rest 3 + duty_cycle 0 +.mainloop: + note_type 12, 11, 7 + sound_call .sub1 + rest 16 + sound_call .sub1 + rest 16 + rest 16 + rest 16 + volume_envelope 11, 1 octave 2 note B_, 1 octave 3 @@ -33,75 +34,75 @@ Music_DancingHall_branch_ef9d3: octave 4 note D_, 1 note F_, 2 - notetype $8, $b1 + note_type 8, 11, 1 note D_, 1 note E_, 1 note D_, 1 octave 3 note B_, 3 note A_, 3 - notetype $c, $b1 + note_type 12, 11, 1 note B_, 1 note A_, 1 note D_, 1 note E_, 1 octave 4 note F_, 2 - notetype $8, $b1 + note_type 8, 11, 1 octave 3 note B_, 1 octave 4 note D_, 1 octave 3 note B_, 1 - notetype $c, $b5 + note_type 12, 11, 5 note A_, 1 - note __, 1 + rest 1 note B_, 1 note B_, 1 note A_, 1 - note __, 1 + rest 1 note F_, 2 - loopchannel 0, Music_DancingHall_branch_ef9d3 + sound_loop 0, .mainloop -Music_DancingHall_branch_efa17: +.sub1: octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_DancingHall_Ch2: - stereopanning $f0 - notetype $6, $a1 - dutycycle $0 - vibrato $10, $24 - note __, 3 -Music_DancingHall_branch_efa37: - notetype $6, $a2 - callchannel Music_DancingHall_branch_efa7a - callchannel Music_DancingHall_branch_efa7a - intensity $a7 + stereo_panning TRUE, FALSE + note_type 6, 10, 1 + duty_cycle 0 + vibrato 16, 2, 4 + rest 3 +.mainloop: + note_type 6, 10, 2 + sound_call .sub1 + sound_call .sub1 + volume_envelope 10, 7 octave 2 note D_, 16 note F_, 16 - notetype $c, $a7 + note_type 12, 10, 7 note E_, 16 octave 3 note F_, 1 @@ -114,13 +115,13 @@ Music_DancingHall_branch_efa37: note E_, 1 note A_, 1 note B_, 2 - notetype $8, $a7 + note_type 8, 10, 7 note A_, 1 note B_, 1 note A_, 1 note F_, 3 note D_, 3 - notetype $c, $a7 + note_type 12, 10, 7 note E_, 1 note D_, 1 octave 3 @@ -128,22 +129,22 @@ Music_DancingHall_branch_efa37: note B_, 1 octave 4 note A_, 2 - notetype $8, $a7 + note_type 8, 10, 7 note F_, 1 note A_, 1 note F_, 1 - notetype $c, $a7 + note_type 12, 10, 7 note E_, 1 - note __, 1 + rest 1 note F_, 1 note F_, 1 note E_, 1 - note __, 1 + rest 1 note D_, 2 - loopchannel 0, Music_DancingHall_branch_efa37 + sound_loop 0, .mainloop -Music_DancingHall_branch_efa7a: - intensity $a1 +.sub1: + volume_envelope 10, 1 octave 4 note E_, 4 octave 2 @@ -157,88 +158,88 @@ Music_DancingHall_branch_efa7a: note A_, 4 note F_, 4 note A_, 4 - intensity $33 + volume_envelope 3, 3 note D_, 1 note F_, 1 - intensity $63 + volume_envelope 6, 3 note D_, 1 note F_, 1 - intensity $93 + volume_envelope 9, 3 note D_, 1 note F_, 1 - intensity $c3 + volume_envelope 12, 3 note D_, 1 note F_, 1 - intensity $e3 + volume_envelope 14, 3 note D_, 1 note F_, 1 - intensity $a3 + volume_envelope 10, 3 note D_, 1 note F_, 1 - intensity $83 + volume_envelope 8, 3 note D_, 1 note F_, 1 - intensity $53 + volume_envelope 5, 3 note D_, 1 note F_, 1 - intensity $73 + volume_envelope 7, 3 octave 3 note B_, 1 octave 4 note E_, 1 - intensity $a3 + volume_envelope 10, 3 octave 3 note B_, 1 octave 4 note E_, 1 - intensity $b3 + volume_envelope 11, 3 octave 3 note A_, 1 octave 4 note D_, 1 - intensity $c3 + volume_envelope 12, 3 octave 3 note A_, 1 octave 4 note D_, 1 - intensity $d3 + volume_envelope 13, 3 octave 3 note E_, 1 note B_, 1 - intensity $e3 + volume_envelope 14, 3 note E_, 1 note B_, 1 - intensity $f3 + volume_envelope 15, 3 note A_, 1 octave 4 note D_, 1 - intensity $f3 + volume_envelope 15, 3 octave 3 note A_, 1 octave 4 note D_, 1 - endchannel + sound_ret Music_DancingHall_Ch3: - stereopanning $ff - vibrato $16, $24 - notetype $6, $10 + stereo_panning TRUE, TRUE + vibrato 22, 2, 4 + note_type 6, 1, 0 octave 5 note A_, 1 note B_, 1 octave 6 note D_, 1 -Music_DancingHall_branch_efae3: +.mainloop: note E_, 13 note D_, 1 note E_, 1 note A_, 1 note B_, 16 - intensity $14 + volume_envelope 1, 4 octave 3 note F_, 16 note E_, 14 - intensity $10 + volume_envelope 1, 0 octave 6 note E_, 1 note F_, 1 @@ -247,11 +248,11 @@ Music_DancingHall_branch_efae3: note E_, 1 note A_, 1 note B_, 16 - intensity $14 + volume_envelope 1, 4 octave 3 note F_, 16 note E_, 16 - intensity $13 + volume_envelope 1, 3 octave 4 note F_, 2 note A_, 2 @@ -264,13 +265,13 @@ Music_DancingHall_branch_efae3: note A_, 2 note A#, 1 note B_, 3 - notetype $8, $13 + note_type 8, 1, 3 note A_, 1 note B_, 1 note A_, 1 note F_, 3 note D_, 3 - notetype $c, $13 + note_type 12, 1, 3 note E_, 1 note D_, 1 octave 4 @@ -278,11 +279,11 @@ Music_DancingHall_branch_efae3: note B_, 1 octave 5 note A_, 2 - notetype $8, $13 + note_type 8, 1, 3 note F_, 1 note A_, 1 note F_, 1 - notetype $6, $13 + note_type 6, 1, 3 note D#, 1 note E_, 3 note D_, 4 @@ -290,16 +291,16 @@ Music_DancingHall_branch_efae3: note B_, 4 octave 5 note D_, 4 - intensity $14 + volume_envelope 1, 4 octave 3 note D_, 16 note F_, 16 note E_, 16 note E_, 13 - intensity $10 + volume_envelope 1, 0 octave 5 note A_, 1 note B_, 1 octave 6 note D_, 1 - loopchannel 0, Music_DancingHall_branch_efae3 + sound_loop 0, .mainloop diff --git a/crysaudio/music/darkcave.asm b/crysaudio/music/darkcave.asm index 8d2877d0..08206b24 100644 --- a/crysaudio/music/darkcave.asm +++ b/crysaudio/music/darkcave.asm @@ -1,30 +1,32 @@ Music_DarkCave: - musicheader 4, 1, Music_DarkCave_Ch1 - musicheader 1, 2, Music_DarkCave_Ch2 - musicheader 1, 3, Music_DarkCave_Ch3 - musicheader 1, 4, Music_DarkCave_Ch4 + channel_count 4 + channel 1, Music_DarkCave_Ch1 + channel 2, Music_DarkCave_Ch2 + channel 3, Music_DarkCave_Ch3 + channel 4, Music_DarkCave_Ch4 Music_DarkCave_Ch1: tempo 128 - volume $77 - dutycycle $3 - tone $0001 - vibrato $11, $15 - stereopanning $f0 - notetype $c, $a7 -Music_DarkCave_branch_ea2dc: - note __, 16 - loopchannel 4, Music_DarkCave_branch_ea2dc + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 17, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 10, 7 +.loop1: + rest 16 + sound_loop 4, .loop1 octave 3 note D#, 16 note D_, 16 note C#, 16 note C_, 16 - intensity $a3 -Music_DarkCave_branch_ea2e8: - callchannel Music_DarkCave_branch_ea333 - loopchannel 3, Music_DarkCave_branch_ea2e8 - intensity $b7 + volume_envelope 10, 3 +.mainloop: +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 + volume_envelope 11, 7 note G#, 8 note D#, 8 note G_, 8 @@ -41,20 +43,20 @@ Music_DarkCave_branch_ea2e8: note C#, 8 note D#, 8 note C_, 8 - intensity $a3 -Music_DarkCave_branch_ea303: - callchannel Music_DarkCave_branch_ea333 - loopchannel 2, Music_DarkCave_branch_ea303 - note __, 16 - note __, 8 - intensity $b7 + volume_envelope 10, 3 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + rest 16 + rest 8 + volume_envelope 11, 7 octave 2 note F_, 2 note G_, 2 note G#, 4 octave 3 note D#, 16 - note __, 8 + rest 8 octave 2 note G#, 2 note G_, 2 @@ -62,23 +64,23 @@ Music_DarkCave_branch_ea303: octave 3 note D#, 16 note G_, 2 - note __, 6 + rest 6 note F_, 2 note G_, 2 note G#, 4 note G_, 16 note F_, 2 - note __, 6 + rest 6 note G#, 2 note G_, 2 note G#, 4 - intensity $a3 -Music_DarkCave_branch_ea328: - callchannel Music_DarkCave_branch_ea333 - loopchannel 2, Music_DarkCave_branch_ea328 - loopchannel 0, Music_DarkCave_branch_ea2e8 + volume_envelope 10, 3 +.loop4: + sound_call .sub1 + sound_loop 2, .loop4 + sound_loop 0, .mainloop -Music_DarkCave_branch_ea333: +.sub1: octave 4 note D#, 2 octave 3 @@ -133,30 +135,31 @@ Music_DarkCave_branch_ea333: note C_, 2 octave 3 note A#, 2 - endchannel + sound_ret Music_DarkCave_Ch2: - dutycycle $1 - vibrato $12, $36 - stereopanning $f - notetype $c, $a7 -Music_DarkCave_branch_ea374: - note __, 16 - loopchannel 4, Music_DarkCave_branch_ea374 + duty_cycle 1 + vibrato 18, 3, 6 + stereo_panning FALSE, TRUE + note_type 12, 10, 7 +.loop1: + rest 16 + sound_loop 4, .loop1 octave 3 note G_, 16 note A#, 16 note F_, 16 note G_, 16 -Music_DarkCave_branch_ea37e: - note __, 16 - loopchannel 4, Music_DarkCave_branch_ea37e - note __, 8 - stereopanning $ff - intensity $c7 +.mainloop: +.loop2: + rest 16 + sound_loop 4, .loop2 + rest 8 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 5 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -165,18 +168,18 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 12 - intensity $59 + volume_envelope 5, -1 note C_, 8 - intensity $c7 + volume_envelope 12, 7 note C_, 8 - note __, 8 - intensity $c7 + rest 8 + volume_envelope 12, 7 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -186,17 +189,17 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $c7 + volume_envelope 12, 7 note C#, 12 - intensity $c3 + volume_envelope 12, 3 note C_, 2 note C#, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - stereopanning $f - intensity $c4 + stereo_panning FALSE, TRUE + volume_envelope 12, 4 octave 4 note F_, 4 note D#, 2 @@ -218,7 +221,7 @@ Music_DarkCave_branch_ea37e: note C#, 8 octave 3 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 2 note D_, 2 @@ -253,16 +256,16 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 4 note C#, 2 - intensity $b0 + volume_envelope 11, 0 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $c7 - stereopanning $ff - note __, 8 + volume_envelope 12, 7 + stereo_panning TRUE, TRUE + rest 8 octave 5 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -271,18 +274,18 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $49 + volume_envelope 4, -1 note C#, 8 - intensity $c7 + volume_envelope 12, 7 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - note __, 8 - intensity $c7 + rest 8 + volume_envelope 12, 7 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -292,68 +295,69 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $c7 - note __, 16 - stereopanning $f - note __, 8 + volume_envelope 12, 7 + rest 16 + stereo_panning FALSE, TRUE + rest 8 octave 3 note A#, 2 octave 4 note C_, 2 note C#, 4 note C_, 16 - note __, 8 + rest 8 note C#, 2 note C_, 2 note C#, 4 note C_, 16 - intensity $c2 + volume_envelope 12, 2 note D#, 8 - intensity $c7 + volume_envelope 12, 7 octave 3 note A#, 2 octave 4 note C_, 2 note C#, 4 note C_, 16 - intensity $c2 + volume_envelope 12, 2 octave 3 note A#, 8 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 2 note C_, 2 - intensity $c4 + volume_envelope 12, 4 note C#, 16 - note __, 4 - note __, 16 - note __, 16 - note __, 16 - intensity $b7 + rest 4 + rest 16 + rest 16 + rest 16 + volume_envelope 11, 7 octave 5 note D#, 16 note D_, 16 note F_, 16 note D#, 16 - loopchannel 0, Music_DarkCave_branch_ea37e + sound_loop 0, .mainloop Music_DarkCave_Ch3: - notetype $c, $27 -Music_DarkCave_branch_ea471: - callchannel Music_DarkCave_branch_ea4ce - loopchannel 2, Music_DarkCave_branch_ea471 -Music_DarkCave_branch_ea478: - callchannel Music_DarkCave_branch_ea4ce - loopchannel 7, Music_DarkCave_branch_ea478 - callchannel Music_DarkCave_branch_ea4c3 + note_type 12, 2, 7 +.loop1: + sound_call .sub3 + sound_loop 2, .loop1 +.mainloop: +.loop2: + sound_call .sub3 + sound_loop 7, .loop2 + sound_call .sub2 octave 3 note C_, 4 note G_, 2 @@ -361,10 +365,10 @@ Music_DarkCave_branch_ea478: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 2 note A#, 12 - callchannel Music_DarkCave_branch_ea4c3 + sound_call .sub2 octave 3 note C_, 4 note G_, 2 @@ -372,18 +376,18 @@ Music_DarkCave_branch_ea478: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 2 note A#, 4 octave 3 note C#, 2 note C_, 2 note C#, 4 - callchannel Music_DarkCave_branch_ea4a7 - callchannel Music_DarkCave_branch_ea4a7 - loopchannel 0, Music_DarkCave_branch_ea478 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_DarkCave_branch_ea4a7: +.sub1: octave 3 note C_, 4 note G_, 2 @@ -391,7 +395,7 @@ Music_DarkCave_branch_ea4a7: note G_, 2 note F_, 4 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 4 note A#, 2 @@ -404,16 +408,16 @@ Music_DarkCave_branch_ea4a7: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 2 note A#, 4 octave 3 note C#, 2 note C_, 2 note C#, 4 - endchannel + sound_ret -Music_DarkCave_branch_ea4c3: +.sub2: octave 3 note C_, 4 note G_, 2 @@ -421,12 +425,12 @@ Music_DarkCave_branch_ea4c3: note G_, 2 note F_, 4 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 12 - endchannel + sound_ret -Music_DarkCave_branch_ea4ce: +.sub3: octave 2 note C_, 4 note G_, 2 @@ -434,7 +438,7 @@ Music_DarkCave_branch_ea4ce: note G_, 2 note F_, 4 note D#, 2 - note __, 2 + rest 2 octave 1 note A#, 4 note A#, 2 @@ -447,37 +451,37 @@ Music_DarkCave_branch_ea4ce: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 1 note A#, 4 octave 2 note C#, 2 note C_, 2 note C#, 4 - endchannel + sound_ret Music_DarkCave_Ch4: - togglenoise $3 - notetype $c -Music_DarkCave_branch_ea4ee: - stereopanning $ff - note D#, 8 - note D#, 8 - note D#, 4 - stereopanning $f0 - note C#, 4 - stereopanning $f - note C#, 2 - note C#, 2 - stereopanning $f0 - note C#, 4 - stereopanning $ff - note D#, 8 - note D#, 8 - note D#, 4 - stereopanning $f - note C#, 8 - stereopanning $f0 - note C#, 2 - note C#, 2 - loopchannel 0, Music_DarkCave_branch_ea4ee + toggle_noise 3 + drum_speed 12 +.mainloop: + stereo_panning TRUE, TRUE + drum_note 4, 8 + drum_note 4, 8 + drum_note 4, 4 + stereo_panning TRUE, FALSE + drum_note 2, 4 + stereo_panning FALSE, TRUE + drum_note 2, 2 + drum_note 2, 2 + stereo_panning TRUE, FALSE + drum_note 2, 4 + stereo_panning TRUE, TRUE + drum_note 4, 8 + drum_note 4, 8 + drum_note 4, 4 + stereo_panning FALSE, TRUE + drum_note 2, 8 + stereo_panning TRUE, FALSE + drum_note 2, 2 + drum_note 2, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/dragonsden.asm b/crysaudio/music/dragonsden.asm index 2dc0ae09..ccde8f98 100644 --- a/crysaudio/music/dragonsden.asm +++ b/crysaudio/music/dragonsden.asm @@ -1,31 +1,32 @@ Music_DragonsDen: - musicheader 4, 1, Music_DragonsDen_Ch1 - musicheader 1, 2, Music_DragonsDen_Ch2 - musicheader 1, 3, Music_DragonsDen_Ch3 - musicheader 1, 4, Music_DragonsDen_Ch4 + channel_count 4 + channel 1, Music_DragonsDen_Ch1 + channel 2, Music_DragonsDen_Ch2 + channel 3, Music_DragonsDen_Ch3 + channel 4, Music_DragonsDen_Ch4 Music_DragonsDen_Ch1: tempo 144 - volume $77 - dutycycle $0 - tone $0004 - stereopanning $f0 - notetype $c, $80 -Music_DragonsDen_branch_eed03: - callchannel Music_DragonsDen_branch_eed1e - note __, 16 - callchannel Music_DragonsDen_branch_eed2d - note __, 2 - callchannel Music_DragonsDen_branch_eed2d - note __, 2 - callchannel Music_DragonsDen_branch_eed2d - note __, 2 - callchannel Music_DragonsDen_branch_eed2d - note __, 10 - notetype $c, $b7 - loopchannel 0, Music_DragonsDen_branch_eed03 + volume 7, 7 + duty_cycle 0 + pitch_offset 4 + stereo_panning TRUE, FALSE + note_type 12, 8, 0 +.mainloop: + sound_call .sub1 + rest 16 + sound_call .sub2 + rest 2 + sound_call .sub2 + rest 2 + sound_call .sub2 + rest 2 + sound_call .sub2 + rest 10 + note_type 12, 11, 7 + sound_loop 0, .mainloop -Music_DragonsDen_branch_eed1e: +.sub1: octave 3 note A#, 12 note A_, 4 @@ -40,11 +41,11 @@ Music_DragonsDen_branch_eed1e: note D_, 4 octave 3 note G#, 16 - endchannel + sound_ret -Music_DragonsDen_branch_eed2d: - intensity $b1 - note __, 2 +.sub2: + volume_envelope 11, 1 + rest 2 octave 4 note C#, 3 note C#, 3 @@ -56,25 +57,25 @@ Music_DragonsDen_branch_eed2d: note C#, 4 note C#, 2 note C#, 2 - endchannel + sound_ret Music_DragonsDen_Ch2: - dutycycle $0 - tone $0004 - stereopanning $f - notetype $c, $90 -Music_DragonsDen_branch_eed46: - callchannel Music_DragonsDen_branch_eed5e - note __, 16 - callchannel Music_DragonsDen_branch_eed6b - callchannel Music_DragonsDen_branch_eed6b - callchannel Music_DragonsDen_branch_eed6b - callchannel Music_DragonsDen_branch_eed6b - note __, 16 - notetype $c, $c7 - loopchannel 0, Music_DragonsDen_branch_eed46 + duty_cycle 0 + pitch_offset 4 + stereo_panning FALSE, TRUE + note_type 12, 9, 0 +.mainloop: + sound_call .sub1 + rest 16 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + rest 16 + note_type 12, 12, 7 + sound_loop 0, .mainloop -Music_DragonsDen_branch_eed5e: +.sub1: octave 4 note D#, 12 note D_, 4 @@ -87,23 +88,24 @@ Music_DragonsDen_branch_eed5e: note G#, 12 note G_, 4 note C#, 16 - endchannel + sound_ret -Music_DragonsDen_branch_eed6b: - intensity $c1 -Music_DragonsDen_branch_eed6d: +.sub2: + volume_envelope 12, 1 +.sub2loop1: octave 5 note C#, 4 octave 4 note G#, 4 note G#, 4 note G#, 4 - loopchannel 2, Music_DragonsDen_branch_eed6d - endchannel + sound_loop 2, .sub2loop1 + sound_ret Music_DragonsDen_Ch3: -Music_DragonsDen_branch_eed78: - notetype $c, $14 +.mainloop: +.loop1: + note_type 12, 1, 4 octave 4 note C#, 2 octave 3 @@ -126,10 +128,10 @@ Music_DragonsDen_branch_eed78: note G#, 1 octave 4 note C#, 1 - loopchannel 15, Music_DragonsDen_branch_eed78 - note __, 16 - notetype $6, $27 -Music_DragonsDen_branch_eed99: + sound_loop 15, .loop1 + rest 16 + note_type 6, 2, 7 +.loop2: octave 3 note C#, 4 octave 2 @@ -152,20 +154,20 @@ Music_DragonsDen_branch_eed99: note G#, 2 octave 3 note C#, 2 - loopchannel 16, Music_DragonsDen_branch_eed99 - loopchannel 0, Music_DragonsDen_branch_eed78 + sound_loop 16, .loop2 + sound_loop 0, .mainloop Music_DragonsDen_Ch4: - togglenoise $0 - notetype $c - note __, 16 - note __, 16 -Music_DragonsDen_branch_eedbd: - stereopanning $f0 - note F_, 4 - stereopanning $f - note F#, 4 - note F#, 4 - stereopanning $f0 - note F#, 4 - loopchannel 0, Music_DragonsDen_branch_eedbd + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 6, 4 + stereo_panning FALSE, TRUE + drum_note 7, 4 + drum_note 7, 4 + stereo_panning TRUE, FALSE + drum_note 7, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/ecruteakcity.asm b/crysaudio/music/ecruteakcity.asm index df60e9eb..96d8ee93 100644 --- a/crysaudio/music/ecruteakcity.asm +++ b/crysaudio/music/ecruteakcity.asm @@ -1,48 +1,49 @@ Music_EcruteakCity: - musicheader 3, 1, Music_EcruteakCity_Ch1 - musicheader 1, 2, Music_EcruteakCity_Ch2 - musicheader 1, 3, Music_EcruteakCity_Ch3 + channel_count 3 + channel 1, Music_EcruteakCity_Ch1 + channel 2, Music_EcruteakCity_Ch2 + channel 3, Music_EcruteakCity_Ch3 Music_EcruteakCity_Ch1: tempo 197 - volume $77 - stereopanning $f - vibrato $12, $25 - dutycycle $2 -Music_EcruteakCity_branch_ef2e5: - notetype $c, $57 - note __, 10 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 18, 2, 5 + duty_cycle 2 +.mainloop: + note_type 12, 5, 7 + rest 10 octave 4 note C_, 6 - note __, 10 + rest 10 note C_, 6 - note __, 16 + rest 16 octave 3 note B_, 4 octave 4 note C_, 4 note D_, 4 - intensity $60 - note __, 4 - note __, 16 - note __, 10 + volume_envelope 6, 0 + rest 4 + rest 16 + rest 10 note G_, 2 note A_, 2 note A#, 2 - note __, 8 + rest 8 note G#, 2 note G_, 2 note F_, 2 octave 5 note C_, 6 - notetype $6, $67 + note_type 6, 6, 7 note C#, 4 note D_, 10 - note __, 2 - stereopanning $ff + rest 2 + stereo_panning TRUE, TRUE octave 4 note B_, 8 - stereopanning $f + stereo_panning FALSE, TRUE octave 3 note A#, 1 note B_, 11 @@ -52,27 +53,27 @@ Music_EcruteakCity_branch_ef2e5: note G_, 12 note A#, 12 note G_, 4 - note __, 4 + rest 4 note A#, 4 octave 5 note C#, 4 note E_, 2 - note __, 2 + rest 2 octave 3 note A_, 8 octave 4 note C_, 8 note F_, 4 - note __, 12 + rest 12 note E_, 1 note F_, 11 note G_, 2 - note __, 2 + rest 2 note A_, 4 note G_, 4 - note __, 8 - intensity $52 - callchannel Music_EcruteakCity_branch_ef37f + rest 8 + volume_envelope 5, 2 + sound_call .sub1 note D_, 2 octave 4 note B_, 2 @@ -94,8 +95,8 @@ Music_EcruteakCity_branch_ef2e5: note B_, 2 note A_, 2 note B_, 2 - callchannel Music_EcruteakCity_branch_ef391 - intensity $52 + sound_call .sub2 + volume_envelope 5, 2 note A#, 2 note G_, 2 note E_, 2 @@ -115,7 +116,7 @@ Music_EcruteakCity_branch_ef2e5: note G_, 2 note E_, 2 note C#, 2 - callchannel Music_EcruteakCity_branch_ef37f + sound_call .sub1 note D_, 2 note C_, 2 octave 4 @@ -142,10 +143,10 @@ Music_EcruteakCity_branch_ef2e5: note G#, 2 octave 5 note C_, 2 - callchannel Music_EcruteakCity_branch_ef391 - loopchannel 0, Music_EcruteakCity_branch_ef2e5 + sound_call .sub2 + sound_loop 0, .mainloop -Music_EcruteakCity_branch_ef37f: +.sub1: octave 5 note E_, 2 note C_, 2 @@ -159,10 +160,10 @@ Music_EcruteakCity_branch_ef37f: note C_, 2 note E_, 2 note C_, 2 - loopchannel 2, Music_EcruteakCity_branch_ef37f - endchannel + sound_loop 2, .sub1 + sound_ret -Music_EcruteakCity_branch_ef391: +.sub2: octave 5 note D_, 2 octave 4 @@ -208,7 +209,7 @@ Music_EcruteakCity_branch_ef391: note C_, 2 octave 3 note A_, 2 -Music_EcruteakCity_branch_ef3be: +.sub2loop1: octave 4 note F_, 2 note A_, 2 @@ -223,8 +224,8 @@ Music_EcruteakCity_branch_ef3be: octave 5 note C_, 2 note F_, 2 - loopchannel 2, Music_EcruteakCity_branch_ef3be -Music_EcruteakCity_branch_ef3d0: + sound_loop 2, .sub2loop1 +.sub2loop2: octave 4 note G_, 2 note B_, 2 @@ -239,36 +240,36 @@ Music_EcruteakCity_branch_ef3d0: octave 5 note D_, 2 note G_, 2 - loopchannel 2, Music_EcruteakCity_branch_ef3d0 - intensity $50 - dutycycle $0 + sound_loop 2, .sub2loop2 + volume_envelope 5, 0 + duty_cycle 0 note E_, 16 note G_, 16 - dutycycle $2 - endchannel + duty_cycle 2 + sound_ret Music_EcruteakCity_Ch2: - vibrato $12, $25 - dutycycle $3 - stereopanning $f0 -Music_EcruteakCity_branch_ef3f2: - notetype $6, $67 - note __, 16 - note __, 5 + vibrato 18, 2, 5 + duty_cycle 3 + stereo_panning TRUE, FALSE +.mainloop: + note_type 6, 6, 7 + rest 16 + rest 5 octave 4 note G_, 1 octave 5 note D_, 1 note E_, 9 - note __, 16 - note __, 5 + rest 16 + rest 5 octave 4 note A_, 1 octave 5 note E_, 1 note F_, 9 - notetype $c, $77 - note __, 10 + note_type 12, 7, 7 + rest 10 note D_, 2 note C_, 2 octave 4 @@ -276,28 +277,28 @@ Music_EcruteakCity_branch_ef3f2: note G_, 4 note A_, 4 note B_, 4 - notetype $6, $93 - intensity $97 - dutycycle $2 + note_type 6, 9, 3 + volume_envelope 9, 7 + duty_cycle 2 octave 3 note G_, 7 octave 4 note C#, 1 note D_, 11 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 16 note F_, 8 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 4 note E_, 4 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 3 note A_, 2 @@ -307,23 +308,23 @@ Music_EcruteakCity_branch_ef3f2: note C_, 16 note E_, 4 note G_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 10 - note __, 1 - stereopanning $ff + rest 1 + stereo_panning TRUE, TRUE note D#, 9 - stereopanning $f0 - dutycycle $0 + stereo_panning TRUE, FALSE + duty_cycle 0 octave 5 note C#, 1 note D_, 11 note C_, 2 - note __, 2 + rest 2 note C_, 16 note F_, 12 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 2 @@ -334,14 +335,14 @@ Music_EcruteakCity_branch_ef3f2: note E_, 1 note A_, 3 note E_, 2 - note __, 2 + rest 2 note E_, 4 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 4 note A_, 2 - note __, 2 + rest 2 note B_, 4 octave 5 note C_, 2 @@ -352,9 +353,9 @@ Music_EcruteakCity_branch_ef3f2: note D#, 1 note E_, 11 note D_, 2 - note __, 2 + rest 2 note D_, 8 - dutycycle $1 + duty_cycle 1 octave 4 note E_, 4 note G_, 3 @@ -364,36 +365,36 @@ Music_EcruteakCity_branch_ef3f2: note A_, 4 octave 4 note C_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 12 note C_, 4 - note __, 4 + rest 4 octave 3 note B_, 4 - note __, 4 + rest 4 octave 4 note F_, 8 note G_, 12 note F_, 8 - note __, 4 + rest 4 note E_, 8 note D_, 4 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 4 octave 4 note C_, 2 - note __, 6 + rest 6 octave 3 note B_, 4 - note __, 4 + rest 4 octave 4 note C_, 4 octave 3 note A_, 16 - note __, 4 + rest 4 octave 4 note F_, 4 note E_, 4 @@ -401,34 +402,34 @@ Music_EcruteakCity_branch_ef3f2: note C_, 12 octave 3 note B_, 4 - note __, 4 + rest 4 octave 4 note C_, 4 note D_, 4 note D#, 4 - notetype $c, $83 + note_type 12, 8, 3 note E_, 16 - intensity $80 + volume_envelope 8, 0 note D_, 4 note C#, 4 note F_, 4 - notetype $6, $80 + note_type 6, 8, 0 note G_, 7 note G#, 1 - intensity $87 + volume_envelope 8, 7 note A_, 12 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 3 note G#, 1 note A_, 4 note E_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 2 - note __, 2 + rest 2 note C#, 4 note D_, 12 octave 3 @@ -437,13 +438,13 @@ Music_EcruteakCity_branch_ef3f2: note F_, 4 note G_, 12 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 4 note G_, 4 note D_, 2 - note __, 1 + rest 1 note A#, 1 note B_, 12 octave 5 @@ -454,26 +455,26 @@ Music_EcruteakCity_branch_ef3f2: note A_, 4 octave 4 note C_, 4 - notetype $c, $87 + note_type 12, 8, 7 note F_, 10 note G_, 2 note F_, 2 note E_, 2 note D_, 8 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note C_, 2 note D_, 2 note E_, 16 - loopchannel 0, Music_EcruteakCity_branch_ef3f2 + sound_loop 0, .mainloop Music_EcruteakCity_Ch3: - stereopanning $ff -Music_EcruteakCity_branch_ef4e3: - vibrato $12, $25 - notetype $c, $25 + stereo_panning TRUE, TRUE +.mainloop: + vibrato 18, 2, 5 + note_type 12, 2, 5 octave 3 note C_, 2 note G_, 2 @@ -509,18 +510,18 @@ Music_EcruteakCity_branch_ef4e3: note A#, 2 octave 4 note D_, 2 - note __, 2 + rest 2 note C#, 2 note D_, 2 note E_, 2 octave 3 note D_, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 2 note F_, 1 - note __, 1 + rest 1 note G#, 8 octave 3 note G_, 2 @@ -552,17 +553,17 @@ Music_EcruteakCity_branch_ef4e3: note D_, 2 note F_, 2 note G_, 1 - note __, 1 + rest 1 octave 3 note F_, 8 octave 4 note A_, 2 octave 5 note C_, 1 - note __, 1 + rest 1 note D_, 2 note E_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 @@ -574,7 +575,7 @@ Music_EcruteakCity_branch_ef4e3: note B_, 2 octave 4 note D_, 2 - callchannel Music_EcruteakCity_branch_ef569 + sound_call .sub1 octave 4 note C_, 8 note E_, 8 @@ -584,84 +585,84 @@ Music_EcruteakCity_branch_ef4e3: note G_, 8 note E_, 8 note C#, 8 - notetype $c, $25 - callchannel Music_EcruteakCity_branch_ef569 + note_type 12, 2, 5 + sound_call .sub1 octave 4 note C_, 8 octave 3 note G_, 8 note E_, 8 note D_, 8 - loopchannel 0, Music_EcruteakCity_branch_ef4e3 + sound_loop 0, .mainloop -Music_EcruteakCity_branch_ef569: +.sub1: octave 3 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A#, 1 - notetype $6, $25 - note __, 1 + note_type 6, 2, 5 + rest 1 note B_, 1 - endchannel + sound_ret diff --git a/crysaudio/music/elmslab.asm b/crysaudio/music/elmslab.asm index 38b04b59..5980237d 100644 --- a/crysaudio/music/elmslab.asm +++ b/crysaudio/music/elmslab.asm @@ -1,26 +1,27 @@ Music_ElmsLab: - musicheader 4, 1, Music_ElmsLab_Ch1 - musicheader 1, 2, Music_ElmsLab_Ch2 - musicheader 1, 3, Music_ElmsLab_Ch3 - musicheader 1, 4, Music_ElmsLab_Ch4 + channel_count 4 + channel 1, Music_ElmsLab_Ch1 + channel 2, Music_ElmsLab_Ch2 + channel 3, Music_ElmsLab_Ch3 + channel 4, Music_ElmsLab_Ch4 Music_ElmsLab_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f0 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 11, 2 octave 2 note F_, 2 note G_, 2 note A_, 2 note B_, 2 - intensity $b6 + volume_envelope 11, 6 octave 3 note C_, 8 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A_, 2 @@ -33,75 +34,75 @@ Music_ElmsLab_Ch1: note A_, 4 note A_, 4 note A_, 2 -Music_ElmsLab_branch_ea075: - note __, 2 +.mainloop: + rest 2 note A_, 2 note G#, 2 note A_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note C_, 4 - intensity $b5 + volume_envelope 11, 5 octave 3 note B_, 2 octave 4 note C_, 2 - intensity $b4 + volume_envelope 11, 4 note F_, 8 - intensity $b5 + volume_envelope 11, 5 octave 3 note A_, 2 note G#, 2 note A_, 2 note F_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note A_, 2 note G_, 2 note F_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 4 - intensity $b5 + volume_envelope 11, 5 note A_, 2 note G#, 2 note A_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b5 + volume_envelope 11, 5 note C_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $b4 + volume_envelope 11, 4 note F_, 2 note E_, 2 note D_, 2 note F_, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note F_, 2 note E_, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note A_, 2 note A#, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 4 - intensity $b4 + volume_envelope 11, 4 note F_, 2 note A_, 2 note G_, 2 note F_, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 4 octave 4 note C_, 2 @@ -110,17 +111,17 @@ Music_ElmsLab_branch_ea075: note D_, 2 note A#, 4 note A_, 4 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note F_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 6 - intensity $b7 + volume_envelope 11, 7 note E_, 4 note A#, 2 note E_, 6 - intensity $b3 + volume_envelope 11, 3 note F_, 2 note E_, 2 note F_, 2 @@ -128,9 +129,9 @@ Music_ElmsLab_branch_ea075: note A_, 2 note A_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 6 - intensity $b4 + volume_envelope 11, 4 note F_, 4 octave 4 note C_, 4 @@ -143,7 +144,7 @@ Music_ElmsLab_branch_ea075: octave 3 note A#, 2 note A_, 2 - intensity $b7 + volume_envelope 11, 7 note A#, 8 octave 4 note E_, 4 @@ -156,7 +157,7 @@ Music_ElmsLab_branch_ea075: note D_, 4 note D#, 4 note E_, 4 - intensity $b4 + volume_envelope 11, 4 octave 3 note A_, 2 note F_, 2 @@ -177,32 +178,32 @@ Music_ElmsLab_branch_ea075: octave 3 note F_, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note F_, 2 note F_, 4 - loopchannel 0, Music_ElmsLab_branch_ea075 + sound_loop 0, .mainloop Music_ElmsLab_Ch2: - dutycycle $3 - vibrato $10, $26 - stereopanning $f - notetype $c, $c3 + duty_cycle 3 + vibrato 16, 2, 6 + stereo_panning FALSE, TRUE + note_type 12, 12, 3 octave 4 note F_, 2 note E_, 2 note D_, 2 octave 3 note B_, 2 - intensity $c5 + volume_envelope 12, 5 octave 4 note C_, 8 - intensity $c3 + volume_envelope 12, 3 octave 3 note A#, 2 note A_, 2 note G_, 2 note E_, 2 - intensity $c2 + volume_envelope 12, 2 note F_, 6 octave 4 note C_, 4 @@ -211,56 +212,56 @@ Music_ElmsLab_Ch2: note C_, 4 note C_, 4 note C_, 2 - stereopanning $ff -Music_ElmsLab_branch_ea14f: - intensity $c6 + stereo_panning TRUE, TRUE +.mainloop: + volume_envelope 12, 6 octave 4 note F_, 6 - intensity $c2 + volume_envelope 12, 2 note E_, 2 note F_, 2 note E_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note C_, 8 - intensity $c7 + volume_envelope 12, 7 note D_, 6 - intensity $c3 + volume_envelope 12, 3 note C#, 2 note D_, 2 note C#, 2 note D_, 2 note E_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 6 - intensity $c3 + volume_envelope 12, 3 note C_, 2 - intensity $c7 + volume_envelope 12, 7 octave 3 note A_, 10 - intensity $c3 + volume_envelope 12, 3 note A#, 2 note A#, 2 octave 4 note D_, 2 - intensity $c5 + volume_envelope 12, 5 note C_, 4 octave 3 note A#, 6 - intensity $c3 + volume_envelope 12, 3 octave 4 note C_, 2 note C_, 2 note E_, 2 - intensity $c4 + volume_envelope 12, 4 note D_, 4 note C_, 6 - intensity $c2 + volume_envelope 12, 2 note D_, 2 note D_, 2 note F_, 2 @@ -268,50 +269,50 @@ Music_ElmsLab_branch_ea14f: note F_, 2 note E_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 note G_, 4 - intensity $c6 + volume_envelope 12, 6 note C_, 4 note D_, 4 - intensity $c4 + volume_envelope 12, 4 note E_, 6 - intensity $c3 + volume_envelope 12, 3 note F_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 4 - intensity $c3 + volume_envelope 12, 3 note G_, 2 note F#, 2 note G_, 2 note F#, 2 note G_, 1 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note D_, 11 - intensity $c3 + volume_envelope 12, 3 note E_, 2 note E_, 2 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 4 - intensity $c3 + volume_envelope 12, 3 note F_, 2 note E_, 2 note F_, 2 note G_, 2 note F_, 1 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note C_, 11 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 4 - intensity $c4 + volume_envelope 12, 4 note G_, 2 note F_, 2 note A#, 2 @@ -320,10 +321,10 @@ Music_ElmsLab_branch_ea14f: octave 5 note C_, 2 note D_, 5 - intensity $c3 + volume_envelope 12, 3 note E_, 2 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note C_, 4 octave 4 note A#, 4 @@ -335,25 +336,25 @@ Music_ElmsLab_branch_ea14f: note A#, 4 note A_, 4 note G_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 10 - intensity $c2 + volume_envelope 12, 2 note C_, 2 note F_, 2 - intensity $c4 + volume_envelope 12, 4 octave 3 note E_, 2 - loopchannel 0, Music_ElmsLab_branch_ea14f + sound_loop 0, .mainloop Music_ElmsLab_Ch3: - stereopanning $f - notetype $c, $25 - note __, 8 - note __, 14 + stereo_panning FALSE, TRUE + note_type 12, 2, 5 + rest 8 + rest 14 octave 3 note C_, 2 note F_, 2 @@ -372,7 +373,7 @@ Music_ElmsLab_Ch3: note C_, 2 note D_, 2 note E_, 2 -Music_ElmsLab_branch_ea216: +.mainloop: note F_, 2 note A_, 2 note C_, 2 @@ -447,7 +448,7 @@ Music_ElmsLab_branch_ea216: note B_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 3 note A#, 4 @@ -524,14 +525,14 @@ Music_ElmsLab_branch_ea216: note C_, 2 note F_, 2 note A_, 2 - loopchannel 0, Music_ElmsLab_branch_ea216 + sound_loop 0, .mainloop Music_ElmsLab_Ch4: - stereopanning $f0 - togglenoise $0 - notetype $c - note __, 16 - note __, 2 -Music_ElmsLab_branch_ea2b9: - note G_, 4 - loopchannel 0, Music_ElmsLab_branch_ea2b9 + stereo_panning TRUE, FALSE + toggle_noise 0 + drum_speed 12 + rest 16 + rest 2 +.mainloop: + drum_note 8, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/evolution.asm b/crysaudio/music/evolution.asm index 47e11543..4fc58501 100644 --- a/crysaudio/music/evolution.asm +++ b/crysaudio/music/evolution.asm @@ -1,46 +1,48 @@ Music_Evolution: - musicheader 4, 1, Music_Evolution_Ch1 - musicheader 1, 2, Music_Evolution_Ch2 - musicheader 1, 3, Music_Evolution_Ch3 - musicheader 1, 4, Music_Evolution_Ch4 + channel_count 4 + channel 1, Music_Evolution_Ch1 + channel 2, Music_Evolution_Ch2 + channel 3, Music_Evolution_Ch3 + channel 4, Music_Evolution_Ch4 Music_Evolution_Ch1: tempo 132 - volume $77 - vibrato $6, $34 - tone $0001 - dutycycle $2 - notetype $c, $92 + volume 7, 7 + vibrato 6, 3, 4 + pitch_offset 1 + duty_cycle 2 + note_type 12, 9, 2 octave 3 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note C_, 1 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note G_, 1 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note C_, 1 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note G_, 1 - note __, 4 - dutycycle $3 - stereopanning $f -Music_Evolution_branch_f0713: - callchannel Music_Evolution_branch_f0737 - notetype $c, $a4 + rest 4 + duty_cycle 3 + stereo_panning FALSE, TRUE +.mainloop: +.loop1: + sound_call .sub1 + note_type 12, 10, 4 note F#, 4 - callchannel Music_Evolution_branch_f0737 - notetype $c, $a4 + sound_call .sub1 + note_type 12, 10, 4 note F#, 4 - loopchannel 2, Music_Evolution_branch_f0713 - callchannel Music_Evolution_branch_f0743 - notetype $c, $a4 + sound_loop 2, .loop1 + sound_call .sub2 + note_type 12, 10, 4 note G#, 4 - callchannel Music_Evolution_branch_f0743 - notetype $c, $a4 + sound_call .sub2 + note_type 12, 10, 4 note G#, 4 - loopchannel 0, Music_Evolution_branch_f0713 + sound_loop 0, .mainloop -Music_Evolution_branch_f0737: - notetype $c, $a2 +.sub1: + note_type 12, 10, 2 octave 3 note C_, 4 note G_, 4 @@ -49,10 +51,10 @@ Music_Evolution_branch_f0737: note C_, 4 note G_, 4 note C_, 4 - endchannel + sound_ret -Music_Evolution_branch_f0743: - notetype $c, $a2 +.sub2: + note_type 12, 10, 2 octave 3 note D_, 4 note A_, 4 @@ -61,40 +63,41 @@ Music_Evolution_branch_f0743: note D_, 4 note A_, 4 note D_, 4 - endchannel + sound_ret Music_Evolution_Ch2: - dutycycle $2 - vibrato $8, $25 - notetype $c, $a2 + duty_cycle 2 + vibrato 8, 2, 5 + note_type 12, 10, 2 octave 4 note G_, 1 note D_, 1 note G_, 1 note D_, 1 - note __, 4 - dutycycle $3 - stereopanning $f0 -Music_Evolution_branch_f0761: - callchannel Music_Evolution_branch_f0787 - notetype $c, $b5 + rest 4 + duty_cycle 3 + stereo_panning TRUE, FALSE +.mainloop: +.loop1: + sound_call .sub1 + note_type 12, 11, 5 note A_, 4 - callchannel Music_Evolution_branch_f0787 - notetype $c, $b5 + sound_call .sub1 + note_type 12, 11, 5 note B_, 4 - loopchannel 2, Music_Evolution_branch_f0761 - callchannel Music_Evolution_branch_f0793 - notetype $c, $b5 + sound_loop 2, .loop1 + sound_call .sub2 + note_type 12, 11, 5 note B_, 4 - callchannel Music_Evolution_branch_f0793 - notetype $c, $b5 + sound_call .sub2 + note_type 12, 11, 5 octave 4 note C#, 4 octave 3 - loopchannel 0, Music_Evolution_branch_f0761 + sound_loop 0, .mainloop -Music_Evolution_branch_f0787: - notetype $c, $b2 +.sub1: + note_type 12, 11, 2 octave 3 note G_, 4 note D_, 4 @@ -103,10 +106,10 @@ Music_Evolution_branch_f0787: note G_, 4 note D_, 4 note G_, 4 - endchannel + sound_ret -Music_Evolution_branch_f0793: - notetype $c, $b2 +.sub2: + note_type 12, 11, 2 octave 3 note A_, 4 note E_, 4 @@ -115,85 +118,86 @@ Music_Evolution_branch_f0793: note A_, 4 note E_, 4 note A_, 4 - endchannel + sound_ret Music_Evolution_Ch3: - notetype $c, $16 - note __, 8 -Music_Evolution_branch_f07a3: - callchannel Music_Evolution_branch_f07bf + note_type 12, 1, 6 + rest 8 +.mainloop: +.loop1: + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_Evolution_branch_f07bf + sound_call .sub1 octave 3 note B_, 4 - loopchannel 2, Music_Evolution_branch_f07a3 - callchannel Music_Evolution_branch_f07d5 + sound_loop 2, .loop1 + sound_call .sub2 octave 3 note B_, 4 - callchannel Music_Evolution_branch_f07d5 + sound_call .sub2 octave 4 note C#, 4 - loopchannel 0, Music_Evolution_branch_f07a3 + sound_loop 0, .mainloop -Music_Evolution_branch_f07bf: +.sub1: octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_Evolution_branch_f07d5: +.sub2: octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_Evolution_Ch4: - togglenoise $5 - notetype $c - note __, 8 -Music_Evolution_branch_f07f0: - stereopanning $f0 - note A#, 6 - note A#, 4 - stereopanning $f - note E_, 2 - note E_, 2 - note E_, 2 - loopchannel 0, Music_Evolution_branch_f07f0 + toggle_noise 5 + drum_speed 12 + rest 8 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 11, 6 + drum_note 11, 4 + stereo_panning FALSE, TRUE + drum_note 5, 2 + drum_note 5, 2 + drum_note 5, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/gamecorner.asm b/crysaudio/music/gamecorner.asm index d275bc9a..3f580e3f 100644 --- a/crysaudio/music/gamecorner.asm +++ b/crysaudio/music/gamecorner.asm @@ -1,60 +1,61 @@ Music_GameCorner: - musicheader 4, 1, Music_GameCorner_Ch1 - musicheader 1, 2, Music_GameCorner_Ch2 - musicheader 1, 3, Music_GameCorner_Ch3 - musicheader 1, 4, Music_GameCorner_Ch4 + channel_count 4 + channel 1, Music_GameCorner_Ch1 + channel 2, Music_GameCorner_Ch2 + channel 3, Music_GameCorner_Ch3 + channel 4, Music_GameCorner_Ch4 Music_GameCorner_Ch1: tempo 147 - volume $77 - stereopanning $f - notetype $c, $91 - note __, 8 -Music_GameCorner_branch_edd84: - intensity $91 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede13 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede13 + volume 7, 7 + stereo_panning FALSE, TRUE + note_type 12, 9, 1 + rest 8 +.mainloop: + volume_envelope 9, 1 + rest 16 + rest 16 + rest 16 + rest 16 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 octave 3 - note __, 2 + rest 2 note G#, 3 note G#, 3 note A#, 2 note A#, 2 note G#, 2 note G_, 2 - intensity $71 -Music_GameCorner_branch_eddb1: + volume_envelope 7, 1 +.loop1: octave 4 note G#, 1 octave 5 note C_, 1 note F_, 1 note C_, 1 - loopchannel 4, Music_GameCorner_branch_eddb1 -Music_GameCorner_branch_eddbb: + sound_loop 4, .loop1 +.loop2: octave 4 note A#, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - loopchannel 4, Music_GameCorner_branch_eddbb -Music_GameCorner_branch_eddc5: + sound_loop 4, .loop2 +.loop3: octave 4 note D#, 1 note G_, 1 @@ -62,8 +63,8 @@ Music_GameCorner_branch_eddc5: note C_, 1 octave 4 note G_, 1 - loopchannel 4, Music_GameCorner_branch_eddc5 -Music_GameCorner_branch_eddd0: + sound_loop 4, .loop3 +.loop4: octave 4 note F_, 1 note A_, 1 @@ -71,41 +72,41 @@ Music_GameCorner_branch_eddd0: note C_, 1 octave 4 note A_, 1 - loopchannel 4, Music_GameCorner_branch_eddd0 -Music_GameCorner_branch_edddb: + sound_loop 4, .loop4 +.loop5: octave 4 note G#, 1 octave 5 note C_, 1 note F_, 1 note C_, 1 - loopchannel 4, Music_GameCorner_branch_edddb -Music_GameCorner_branch_edde5: + sound_loop 4, .loop5 +.loop6: octave 4 note A#, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - loopchannel 4, Music_GameCorner_branch_edde5 -Music_GameCorner_branch_eddef: + sound_loop 4, .loop6 +.loop7: octave 4 note B_, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - loopchannel 4, Music_GameCorner_branch_eddef + sound_loop 4, .loop7 octave 3 note D_, 1 note D_, 1 note D_, 3 note F_, 2 note F_, 9 - loopchannel 0, Music_GameCorner_branch_edd84 + sound_loop 0, .mainloop -Music_GameCorner_branch_ede03: - note __, 2 +.sub1: + rest 2 octave 4 note A#, 3 note G_, 3 @@ -113,17 +114,17 @@ Music_GameCorner_branch_ede03: octave 3 note F_, 3 note F_, 2 - note __, 2 + rest 2 note G#, 3 note G#, 3 note A#, 2 note A#, 2 note G#, 1 note A#, 3 - endchannel + sound_ret -Music_GameCorner_branch_ede13: - note __, 2 +.sub2: + rest 2 octave 4 note A#, 3 note G_, 3 @@ -131,17 +132,17 @@ Music_GameCorner_branch_ede13: octave 3 note F_, 3 note F_, 2 - endchannel + sound_ret Music_GameCorner_Ch2: - stereopanning $ff - vibrato $8, $24 - notetype $c, $a1 - note __, 8 -Music_GameCorner_branch_ede25: - intensity $92 - dutycycle $1 - callchannel Music_GameCorner_branch_ede75 + stereo_panning TRUE, TRUE + vibrato 8, 2, 4 + note_type 12, 10, 1 + rest 8 +.mainloop: + volume_envelope 9, 2 + duty_cycle 1 + sound_call .sub1 octave 1 note F_, 2 octave 3 @@ -150,24 +151,24 @@ Music_GameCorner_branch_ede25: note F_, 1 octave 3 note G#, 2 - intensity $a4 + volume_envelope 10, 4 note G#, 3 - intensity $92 + volume_envelope 9, 2 note G_, 2 note A#, 1 octave 4 note C_, 3 - callchannel Music_GameCorner_branch_ede75 + sound_call .sub1 octave 4 note F_, 2 note D#, 2 note F_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note G_, 3 note F_, 4 - dutycycle $2 - intensity $c7 + duty_cycle 2 + volume_envelope 12, 7 octave 3 note D#, 1 note F_, 1 @@ -182,7 +183,7 @@ Music_GameCorner_branch_ede25: octave 2 note A#, 4 note A_, 4 - note __, 10 + rest 10 octave 3 note D#, 1 note F_, 1 @@ -195,16 +196,16 @@ Music_GameCorner_branch_ede25: note D#, 1 note F_, 1 note G_, 16 - intensity $92 + volume_envelope 9, 2 note G_, 1 note G_, 1 note G_, 3 note A#, 2 note A#, 9 - intensity $a4 - loopchannel 0, Music_GameCorner_branch_ede25 + volume_envelope 10, 4 + sound_loop 0, .mainloop -Music_GameCorner_branch_ede75: +.sub1: octave 1 note C_, 2 octave 3 @@ -253,10 +254,10 @@ Music_GameCorner_branch_ede75: note D#, 2 note F_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note F_, 3 note G_, 4 - intensity $92 + volume_envelope 9, 2 note F#, 1 note F_, 1 octave 1 @@ -276,10 +277,10 @@ Music_GameCorner_branch_ede75: note D#, 2 note G_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note A#, 3 note A_, 2 - intensity $92 + volume_envelope 9, 2 note A#, 1 octave 5 note C_, 3 @@ -297,10 +298,10 @@ Music_GameCorner_branch_ede75: note D#, 2 note F_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note F_, 3 note G_, 4 - intensity $92 + volume_envelope 9, 2 note F#, 1 note F_, 1 octave 1 @@ -313,35 +314,35 @@ Music_GameCorner_branch_ede75: note C_, 2 note D_, 2 note D#, 2 - endchannel + sound_ret Music_GameCorner_Ch3: - vibrato $8, $22 - notetype $c, $14 - note __, 8 -Music_GameCorner_branch_edeef: - stereopanning $ff - notetype $c, $14 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + vibrato 8, 2, 2 + note_type 12, 1, 4 + rest 8 +.mainloop: + stereo_panning TRUE, TRUE + note_type 12, 1, 4 + sound_call .sub1 + sound_call .sub2 octave 4 note G_, 1 note A_, 3 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note A#, 1 octave 5 note C_, 3 - stereopanning $f0 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee024 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd - stereopanning $ff + stereo_panning TRUE, FALSE + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub4 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + stereo_panning TRUE, TRUE octave 2 note F_, 1 octave 3 @@ -359,29 +360,29 @@ Music_GameCorner_branch_edeef: octave 5 note D#, 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 note F_, 1 - note __, 2 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + rest 2 + sound_call .sub1 + sound_call .sub2 octave 4 note G_, 1 note A_, 3 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note A#, 1 octave 5 note C_, 3 - stereopanning $f0 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee024 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd + stereo_panning TRUE, FALSE + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub4 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 octave 2 note F_, 1 octave 3 @@ -400,25 +401,25 @@ Music_GameCorner_branch_edeef: note F_, 1 octave 5 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 - intensity $15 - callchannel Music_GameCorner_branch_ee03f + rest 1 + volume_envelope 1, 5 + sound_call .sub5 octave 2 note C_, 2 - note __, 1 + rest 1 note C_, 1 octave 3 note C_, 1 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 note C_, 1 octave 3 @@ -429,18 +430,18 @@ Music_GameCorner_branch_edeef: note C_, 1 octave 2 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 octave 2 note F_, 2 - note __, 1 + rest 1 note F_, 1 octave 3 note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 note F_, 1 octave 3 @@ -451,19 +452,19 @@ Music_GameCorner_branch_edeef: note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - callchannel Music_GameCorner_branch_ee03f + sound_call .sub5 octave 2 note G_, 2 - note __, 1 + rest 1 note G_, 1 octave 3 note G_, 1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 note G_, 1 octave 3 @@ -474,19 +475,19 @@ Music_GameCorner_branch_edeef: note G_, 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 octave 2 note B_, 1 note B_, 1 note B_, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 4 - notetype $6, $15 + rest 4 + note_type 6, 1, 5 octave 3 note D_, 1 note C_, 1 @@ -497,9 +498,9 @@ Music_GameCorner_branch_edeef: note F_, 1 note E_, 1 note D_, 1 - loopchannel 0, Music_GameCorner_branch_edeef + sound_loop 0, .mainloop -Music_GameCorner_branch_edfdd: +.sub1: octave 2 note C_, 1 octave 3 @@ -526,9 +527,9 @@ Music_GameCorner_branch_edfdd: note C_, 1 octave 4 note A_, 2 - endchannel + sound_ret -Music_GameCorner_branch_edff8: +.sub2: octave 2 note C_, 1 octave 3 @@ -545,12 +546,12 @@ Music_GameCorner_branch_edff8: note C_, 1 octave 4 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_GameCorner_branch_ee00c: +.sub3: octave 2 note F_, 1 octave 3 @@ -569,14 +570,14 @@ Music_GameCorner_branch_ee00c: note F_, 1 octave 5 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 3 - endchannel + sound_ret -Music_GameCorner_branch_ee024: +.sub4: octave 2 note F_, 1 octave 3 @@ -595,26 +596,26 @@ Music_GameCorner_branch_ee024: note F_, 1 octave 5 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 1 octave 3 note F_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_GameCorner_branch_ee03f: +.sub5: octave 2 note F_, 2 - note __, 1 + rest 1 note F_, 1 octave 3 note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 note F_, 1 octave 3 @@ -625,18 +626,18 @@ Music_GameCorner_branch_ee03f: note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 octave 2 note G_, 2 - note __, 1 + rest 1 note G_, 1 octave 3 note G_, 1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 note G_, 1 octave 3 @@ -653,154 +654,154 @@ Music_GameCorner_branch_ee03f: note D_, 1 octave 3 note D_, 1 - endchannel + sound_ret Music_GameCorner_Ch4: - togglenoise $3 - notetype $c - notetype $8 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 1 - note D_, 1 -Music_GameCorner_branch_ee07f: - callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee082: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 6, Music_GameCorner_branch_ee082 - callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee091: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee091 - note __, 12 - note D_, 1 - note D_, 1 - note F#, 2 - callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee0a4: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 6, Music_GameCorner_branch_ee0a4 - callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee0b3: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee0b3 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 -Music_GameCorner_branch_ee0c9: - note A#, 2 - note F#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note F#, 1 - note D#, 1 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee0c9 - note A#, 2 - note F#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note F#, 1 - note D#, 1 - note D_, 2 - note D_, 1 - note D_, 1 -Music_GameCorner_branch_ee0e8: - note A#, 2 - note F#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note F#, 1 - note D#, 1 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee0e8 - note D_, 1 - note D_, 1 - note D_, 2 - note A#, 1 - note F#, 2 - note F#, 5 - note D_, 1 - note D_, 1 - note D#, 2 - loopchannel 0, Music_GameCorner_branch_ee07f + toggle_noise 3 + drum_speed 12 + drum_speed 8 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: + sound_call .sub1 +.loop1: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 6, .loop1 + sound_call .sub2 +.loop2: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop2 + rest 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_call .sub1 +.loop3: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 6, .loop3 + sound_call .sub2 +.loop4: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop4 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 +.loop5: + drum_note 11, 2 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop5 + drum_note 11, 2 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.loop6: + drum_note 11, 2 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 11, 1 + drum_note 7, 2 + drum_note 7, 5 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 2 + sound_loop 0, .mainloop -Music_GameCorner_branch_ee106: - note C_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - endchannel +.sub1: + drum_note 1, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret -Music_GameCorner_branch_ee10f: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note F#, 2 - endchannel +.sub2: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_ret diff --git a/crysaudio/music/goldenrodcity.asm b/crysaudio/music/goldenrodcity.asm index 42f861e3..bb2bf631 100644 --- a/crysaudio/music/goldenrodcity.asm +++ b/crysaudio/music/goldenrodcity.asm @@ -1,21 +1,22 @@ Music_GoldenrodCity: - musicheader 4, 1, Music_GoldenrodCity_Ch1 - musicheader 1, 2, Music_GoldenrodCity_Ch2 - musicheader 1, 3, Music_GoldenrodCity_Ch3 - musicheader 1, 4, Music_GoldenrodCity_Ch4 + channel_count 4 + channel 1, Music_GoldenrodCity_Ch1 + channel 2, Music_GoldenrodCity_Ch2 + channel 3, Music_GoldenrodCity_Ch3 + channel 4, Music_GoldenrodCity_Ch4 Music_GoldenrodCity_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 176 - volume $77 - notetype $c, $97 - note __, 16 - note __, 16 - note __, 16 - note __, 16 -Music_GoldenrodCity_branch_eb46d: - dutycycle $0 - callchannel Music_GoldenrodCity_branch_eb4a9 + volume 7, 7 + note_type 12, 9, 7 + rest 16 + rest 16 + rest 16 + rest 16 +.mainloop: + duty_cycle 0 + sound_call .sub1 octave 3 note G#, 1 octave 4 @@ -27,68 +28,68 @@ Music_GoldenrodCity_branch_eb46d: note G#, 1 octave 5 note C_, 1 - intensity $71 - dutycycle $0 - callchannel Music_GoldenrodCity_branch_eb4d1 - intensity $77 + volume_envelope 7, 1 + duty_cycle 0 + sound_call .sub2 + volume_envelope 7, 7 note D#, 2 note F_, 2 note F#, 2 note G#, 4 - intensity $71 - callchannel Music_GoldenrodCity_branch_eb4d1 + volume_envelope 7, 1 + sound_call .sub2 note D#, 1 note F#, 1 - intensity $77 + volume_envelope 7, 7 octave 5 note C_, 2 octave 4 note G#, 2 note F#, 2 note D#, 2 - dutycycle $2 - intensity $97 - callchannel Music_GoldenrodCity_branch_eb4a9 + duty_cycle 2 + volume_envelope 9, 7 + sound_call .sub1 note C_, 4 octave 3 note G#, 2 octave 4 note C_, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb46d + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb4a9: +.sub1: octave 4 note C#, 2 octave 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note A#, 2 note F_, 1 - note __, 1 + rest 1 note C#, 2 note F_, 1 - note __, 1 + rest 1 note D#, 2 note C_, 2 note C#, 2 note D#, 2 note F#, 2 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 note F#, 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 note A#, 2 note C#, 2 @@ -96,9 +97,9 @@ Music_GoldenrodCity_branch_eb4a9: note G#, 2 octave 4 note C#, 2 - endchannel + sound_ret -Music_GoldenrodCity_branch_eb4d1: +.sub2: octave 4 note F_, 1 note C#, 1 @@ -170,50 +171,50 @@ Music_GoldenrodCity_branch_eb4d1: note C_, 1 note D#, 1 note F#, 1 - endchannel + sound_ret Music_GoldenrodCity_Ch2: - stereopanning $f0 - vibrato $12, $23 - dutycycle $2 - notetype $c, $97 -Music_GoldenrodCity_branch_eb523: - intensity $97 - callchannel Music_GoldenrodCity_branch_eb555 + stereo_panning TRUE, FALSE + vibrato 18, 2, 3 + duty_cycle 2 + note_type 12, 9, 7 +.mainloop: + volume_envelope 9, 7 + sound_call .sub1 octave 4 note F_, 2 note F#, 2 note G#, 2 note F_, 2 note D#, 8 - callchannel Music_GoldenrodCity_branch_eb555 + sound_call .sub1 note G#, 2 note A#, 2 octave 5 note C_, 2 note C#, 2 note D#, 8 - dutycycle $2 - intensity $77 - callchannel Music_GoldenrodCity_branch_eb572 + duty_cycle 2 + volume_envelope 7, 7 + sound_call .sub2 octave 4 note G#, 2 note A#, 2 note B_, 2 octave 5 note C_, 4 - dutycycle $3 - intensity $77 - callchannel Music_GoldenrodCity_branch_eb572 + duty_cycle 3 + volume_envelope 7, 7 + sound_call .sub2 note F_, 2 note D#, 2 note C#, 2 note C_, 2 octave 4 note G#, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb523 + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb555: +.sub1: octave 4 note F_, 4 note C#, 4 @@ -240,10 +241,10 @@ Music_GoldenrodCity_branch_eb555: note A#, 2 note G#, 2 note F#, 2 - dutycycle $1 - endchannel + duty_cycle 1 + sound_ret -Music_GoldenrodCity_branch_eb572: +.sub2: note C#, 6 note F_, 6 note C#, 4 @@ -261,99 +262,99 @@ Music_GoldenrodCity_branch_eb572: octave 5 note C_, 4 note D#, 2 - endchannel + sound_ret Music_GoldenrodCity_Ch3: - stereopanning $ff - vibrato $8, $23 - notetype $c, $25 -Music_GoldenrodCity_branch_eb58c: - callchannel Music_GoldenrodCity_branch_eb5aa - callchannel Music_GoldenrodCity_branch_eb5aa - callchannel Music_GoldenrodCity_branch_eb5d2 - note __, 3 + stereo_panning TRUE, TRUE + vibrato 8, 2, 3 + note_type 12, 2, 5 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + rest 3 octave 3 note C_, 1 note D#, 1 note G_, 1 note G#, 1 note D#, 2 - callchannel Music_GoldenrodCity_branch_eb5d2 - note __, 1 + sound_call .sub2 + rest 1 octave 3 note G#, 2 note F#, 2 note D#, 2 octave 2 note G#, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb58c + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb5aa: +.sub1: octave 3 note C#, 4 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note C_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 octave 2 note A#, 4 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note G#, 4 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note F#, 4 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 octave 3 note D#, 4 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note G#, 4 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 3 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_GoldenrodCity_branch_eb5d2: +.sub2: note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 octave 3 note C#, 1 - note __, 2 + rest 2 note C#, 1 - note __, 5 + rest 5 octave 4 note C_, 1 note C#, 1 octave 3 note G#, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 octave 3 note C_, 1 - note __, 2 + rest 2 note C_, 1 - note __, 5 + rest 5 note B_, 1 octave 4 note C_, 1 @@ -361,114 +362,115 @@ Music_GoldenrodCity_branch_eb5d2: note G#, 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 octave 2 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 5 + rest 5 octave 3 note A_, 1 note A#, 1 note F#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 octave 2 note G#, 1 - note __, 2 + rest 2 note G#, 1 - endchannel + sound_ret Music_GoldenrodCity_Ch4: - togglenoise $3 - notetype $c - note __, 16 - note __, 16 - note __, 16 - note __, 8 - note D_, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note F#, 2 -Music_GoldenrodCity_branch_eb613: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GoldenrodCity_branch_eb613 - callchannel Music_GoldenrodCity_branch_eb663 - callchannel Music_GoldenrodCity_branch_eb66d - note G_, 1 - note G_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 1 - note D_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note D_, 1 - note D_, 1 - callchannel Music_GoldenrodCity_branch_eb66d - note G_, 1 - note G_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 1 - note D_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note D_, 1 - note D_, 1 -Music_GoldenrodCity_branch_eb650: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GoldenrodCity_branch_eb650 - callchannel Music_GoldenrodCity_branch_eb663 - loopchannel 0, Music_GoldenrodCity_branch_eb613 + toggle_noise 3 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 8 + drum_note 3, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 +.mainloop: +.loop1: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop1 + sound_call .sub1 + sound_call .sub2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_call .sub2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.loop2: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb663: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note F#, 2 - endchannel +.sub1: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_ret -Music_GoldenrodCity_branch_eb66d: - note D#, 2 - note D_, 1 - note D#, 3 - note D#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - endchannel +.sub2: + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 3 + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_ret diff --git a/crysaudio/music/goldsilveropening.asm b/crysaudio/music/goldsilveropening.asm index a9359f00..8eac605e 100644 --- a/crysaudio/music/goldsilveropening.asm +++ b/crysaudio/music/goldsilveropening.asm @@ -1,21 +1,22 @@ Music_GoldSilverOpening: - musicheader 3, 1, Music_GoldSilverOpening_Ch1 - musicheader 1, 2, Music_GoldSilverOpening_Ch2 - musicheader 1, 3, Music_GoldSilverOpening_Ch3 + channel_count 3 + channel 1, Music_GoldSilverOpening_Ch1 + channel 2, Music_GoldSilverOpening_Ch2 + channel 3, Music_GoldSilverOpening_Ch3 Music_GoldSilverOpening_Ch1: tempo 256 - volume $77 - tone $0001 - dutycycle $2 - stereopanning $f0 - notetype $c, $b7 + volume 7, 7 + pitch_offset 1 + duty_cycle 2 + stereo_panning TRUE, FALSE + note_type 12, 11, 7 octave 1 note G#, 16 note G#, 16 tempo 168 - dutycycle $3 - notetype $6, $c7 + duty_cycle 3 + note_type 6, 12, 7 octave 3 note F_, 12 note A_, 4 @@ -30,7 +31,7 @@ Music_GoldSilverOpening_Ch1: note D#, 12 note D_, 2 note C#, 2 - notetype $6, $b5 + note_type 6, 11, 5 note C_, 8 octave 3 note F_, 8 @@ -38,7 +39,7 @@ Music_GoldSilverOpening_Ch1: note B_, 4 octave 4 note C_, 4 - notetype $6, $b3 + note_type 6, 11, 3 octave 3 note A#, 8 note C#, 8 @@ -46,8 +47,8 @@ Music_GoldSilverOpening_Ch1: note F#, 8 octave 1 note B_, 8 - notetype $6, $b2 - note __, 4 + note_type 6, 11, 2 + rest 4 octave 3 note A#, 4 note A#, 8 @@ -73,7 +74,7 @@ Music_GoldSilverOpening_Ch1: note F#, 4 note G_, 4 note F_, 4 - notetype $8, $b3 + note_type 8, 11, 3 octave 4 note F_, 1 note G_, 1 @@ -82,8 +83,8 @@ Music_GoldSilverOpening_Ch1: note B_, 1 octave 5 note C_, 1 - dutycycle $2 - notetype $c, $b3 + duty_cycle 2 + note_type 12, 11, 3 note D_, 1 note C#, 1 note D_, 4 @@ -101,8 +102,8 @@ Music_GoldSilverOpening_Ch1: note C_, 2 note D#, 4 note F#, 2 - dutycycle $3 - notetype $8, $92 + duty_cycle 3 + note_type 8, 9, 2 note A_, 1 note F_, 1 note D#, 1 @@ -115,31 +116,31 @@ Music_GoldSilverOpening_Ch1: note C_, 1 octave 3 note A_, 3 - notetype $c, $b2 + note_type 12, 11, 2 note A#, 2 note B_, 2 octave 4 note C_, 2 note D_, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 note F_, 2 note G_, 2 note A_, 16 - endchannel + sound_ret Music_GoldSilverOpening_Ch2: - tone $0001 - stereopanning $f - notetype $c, $b7 - dutycycle $2 + pitch_offset 1 + stereo_panning FALSE, TRUE + note_type 12, 11, 7 + duty_cycle 2 octave 2 note C_, 16 note C_, 16 - dutycycle $3 - notetype $c, $b2 - note __, 2 - notetype $6, $62 + duty_cycle 3 + note_type 12, 11, 2 + rest 2 + note_type 6, 6, 2 octave 1 note F_, 2 note A_, 2 @@ -179,33 +180,33 @@ Music_GoldSilverOpening_Ch2: note D_, 2 note D#, 2 note G_, 2 - notetype $c, $b7 + note_type 12, 11, 7 octave 1 note F_, 16 - intensity $83 + volume_envelope 8, 3 octave 4 note F_, 2 - intensity $81 + volume_envelope 8, 1 note D_, 2 - intensity $93 + volume_envelope 9, 3 note G#, 2 - intensity $91 + volume_envelope 9, 1 note F_, 2 - intensity $a3 + volume_envelope 10, 3 octave 5 note C#, 2 - intensity $a1 + volume_envelope 10, 1 octave 4 note A#, 2 - intensity $b3 + volume_envelope 11, 3 octave 5 note F#, 2 - intensity $c1 + volume_envelope 12, 1 note D#, 2 - intensity $b3 + volume_envelope 11, 3 octave 1 note A#, 2 - notetype $6, $b2 + note_type 6, 11, 2 octave 4 note D_, 4 note D_, 4 @@ -291,146 +292,146 @@ Music_GoldSilverOpening_Ch2: octave 3 note D#, 4 note D#, 16 - notetype $6, $a2 + note_type 6, 10, 2 note F_, 4 note G_, 4 note G#, 4 - notetype $6, $c2 + note_type 6, 12, 2 note A_, 4 note A#, 4 octave 4 note C_, 4 - notetype $6, $d2 + note_type 6, 13, 2 octave 3 note A_, 4 octave 4 note C_, 4 note D#, 16 - endchannel + sound_ret Music_GoldSilverOpening_Ch3: - notetype $6, $10 + note_type 6, 1, 0 octave 2 note D_, 4 - notetype $6, $20 + note_type 6, 2, 0 note D_, 4 - notetype $6, $30 + note_type 6, 3, 0 note D_, 4 - note __, 12 - note __, 8 - notetype $6, $10 + rest 12 + rest 8 + note_type 6, 1, 0 octave 2 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 6 note D_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 6 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 2 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 6 note D_, 1 - note __, 1 - notetype $8, $10 + rest 1 + note_type 8, 1, 0 note F_, 1 octave 5 note B_, 1 @@ -464,29 +465,29 @@ Music_GoldSilverOpening_Ch3: note F_, 1 octave 5 note A_, 3 - notetype $c, $10 + note_type 12, 1, 0 note G_, 1 - note __, 1 + rest 1 octave 6 note C_, 2 octave 5 note A#, 1 - note __, 1 + rest 1 octave 6 note F_, 2 note D#, 1 - note __, 1 + rest 1 note A#, 2 note G#, 1 - note __, 1 - note __, 16 - note __, 4 - notetype $6, $10 + rest 1 + rest 16 + rest 4 + note_type 6, 1, 0 octave 2 note G_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 2 + rest 2 octave 5 note F_, 12 note D_, 4 @@ -494,122 +495,122 @@ Music_GoldSilverOpening_Ch3: note F_, 2 note D#, 12 note G#, 2 - note __, 2 + rest 2 note F#, 6 note D#, 2 note F_, 12 note D_, 2 - note __, 2 + rest 2 note D#, 6 note F_, 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 4 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 9 - notetype $c, $10 - note __, 14 + rest 9 + note_type 12, 1, 0 + rest 14 octave 3 note F_, 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 13 - endchannel + rest 13 + sound_ret diff --git a/crysaudio/music/goldsilveropening2.asm b/crysaudio/music/goldsilveropening2.asm index 2dc43e3b..13714b39 100644 --- a/crysaudio/music/goldsilveropening2.asm +++ b/crysaudio/music/goldsilveropening2.asm @@ -1,127 +1,128 @@ Music_GoldSilverOpening2: - musicheader 4, 1, Music_GoldSilverOpening2_Ch1 - musicheader 1, 2, Music_GoldSilverOpening2_Ch2 - musicheader 1, 3, Music_GoldSilverOpening2_Ch3 - musicheader 1, 4, Music_GoldSilverOpening2_Ch4 + channel_count 4 + channel 1, Music_GoldSilverOpening2_Ch1 + channel 2, Music_GoldSilverOpening2_Ch2 + channel 3, Music_GoldSilverOpening2_Ch3 + channel 4, Music_GoldSilverOpening2_Ch4 Music_GoldSilverOpening2_Ch1: tempo 92 - volume $77 - dutycycle $3 - tone $0002 - stereopanning $f - notetype $c, $3d + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + stereo_panning FALSE, TRUE + note_type 12, 3, -5 octave 3 note D#, 8 -Music_GoldSilverOpening2_branch_f7325: - notetype $c, $c1 +.loop1: + note_type 12, 12, 1 octave 3 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 - intensity $c1 + volume_envelope 12, 1 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 note D#, 4 note C_, 2 - loopchannel 2, Music_GoldSilverOpening2_branch_f7325 - intensity $c1 + sound_loop 2, .loop1 + volume_envelope 12, 1 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 - intensity $c1 + volume_envelope 12, 1 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 note G_, 4 note A#, 2 - intensity $b0 + volume_envelope 11, 0 note A_, 16 note A_, 16 - intensity $b2 + volume_envelope 11, 2 octave 4 note D_, 16 - endchannel + sound_ret Music_GoldSilverOpening2_Ch2: - dutycycle $3 - vibrato $14, $14 - stereopanning $f0 - notetype $c, $3f + duty_cycle 3 + vibrato 20, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 3, -7 octave 3 note A#, 8 - notetype $c, $d1 + note_type 12, 13, 1 octave 3 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 10 - intensity $d1 + volume_envelope 13, 1 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 octave 3 note A#, 4 note G_, 2 - intensity $d1 + volume_envelope 13, 1 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 10 - intensity $d1 + volume_envelope 13, 1 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 note C#, 4 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note D_, 8 note D#, 8 note F_, 8 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 5 note D_, 16 note D_, 16 - intensity $c2 + volume_envelope 12, 2 note D_, 16 - endchannel + sound_ret Music_GoldSilverOpening2_Ch3: - notetype $c, $17 - note __, 8 + note_type 12, 1, 7 + rest 8 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A#, 8 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 4 note F_, 4 note A_, 2 @@ -179,39 +180,39 @@ Music_GoldSilverOpening2_Ch3: octave 3 note C#, 2 note D_, 2 - note __, 14 - endchannel + rest 14 + sound_ret Music_GoldSilverOpening2_Ch4: - togglenoise $0 - notetype $6 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c -Music_GoldSilverOpening2_branch_f73f8: - note D_, 2 - note D_, 2 - note D_, 2 - note C#, 4 - note D#, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note C#, 6 - notetype $6 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - notetype $c - loopchannel 4, Music_GoldSilverOpening2_branch_f73f8 - note C_, 16 - endchannel + toggle_noise 0 + drum_speed 6 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 +.loop1: + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 6 + drum_speed 6 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_speed 12 + sound_loop 4, .loop1 + drum_note 1, 16 + sound_ret diff --git a/crysaudio/music/gym.asm b/crysaudio/music/gym.asm index acb944ad..774e471a 100644 --- a/crysaudio/music/gym.asm +++ b/crysaudio/music/gym.asm @@ -1,38 +1,39 @@ Music_Gym: - musicheader 4, 1, Music_Gym_Ch1 - musicheader 1, 2, Music_Gym_Ch2 - musicheader 1, 3, Music_Gym_Ch3 - musicheader 1, 4, Music_Gym_Ch4 + channel_count 4 + channel 1, Music_Gym_Ch1 + channel 2, Music_Gym_Ch2 + channel 3, Music_Gym_Ch3 + channel 4, Music_Gym_Ch4 Music_Gym_Ch1: tempo 156 - volume $77 - stereopanning $f - vibrato $12, $24 - dutycycle $1 - notetype $c, $b7 -Music_Gym_branch_f48c9: + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 18, 2, 4 + duty_cycle 1 + note_type 12, 11, 7 +.mainloop: octave 4 note F#, 2 octave 2 note A_, 1 note A_, 1 note A_, 1 - note __, 3 + rest 3 octave 4 note E_, 2 octave 2 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 octave 4 note D_, 2 octave 2 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 note D_, 1 @@ -52,7 +53,7 @@ Music_Gym_branch_f48c9: note F#, 2 note A_, 2 note G_, 1 - note __, 2 + rest 2 note E_, 1 note E_, 2 note C_, 2 @@ -67,7 +68,7 @@ Music_Gym_branch_f48c9: note F#, 2 note A_, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 note G_, 4 @@ -86,12 +87,12 @@ Music_Gym_branch_f48c9: note G_, 2 note A_, 2 note B_, 1 - note __, 2 + rest 2 note G_, 1 note G_, 4 octave 4 note E_, 1 - note __, 2 + rest 2 note C_, 1 note C_, 2 octave 3 @@ -115,9 +116,9 @@ Music_Gym_branch_f48c9: note D_, 6 octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 octave 4 note F#, 3 @@ -126,10 +127,10 @@ Music_Gym_branch_f48c9: note E_, 4 note C_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 note E_, 1 - note __, 2 + rest 2 octave 3 note B_, 4 note F#, 2 @@ -151,9 +152,9 @@ Music_Gym_branch_f48c9: note F#, 6 octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 octave 4 note F#, 3 @@ -187,13 +188,13 @@ Music_Gym_branch_f48c9: note G_, 1 note F#, 1 note E_, 1 - loopchannel 0, Music_Gym_branch_f48c9 + sound_loop 0, .mainloop Music_Gym_Ch2: - dutycycle $1 - stereopanning $f0 -Music_Gym_branch_f4980: - notetype $c, $c3 + duty_cycle 1 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 12, 3 octave 2 note D_, 2 octave 1 @@ -226,20 +227,20 @@ Music_Gym_branch_f4980: octave 3 note C_, 1 note C#, 1 - callchannel Music_Gym_branch_f49e9 + sound_call .sub1 octave 3 note E_, 2 note C_, 1 note C#, 1 - callchannel Music_Gym_branch_f49e9 + sound_call .sub1 octave 3 note C_, 1 note E_, 1 note G_, 1 octave 4 note C_, 1 - intensity $d2 - callchannel Music_Gym_branch_f4a15 + volume_envelope 13, 2 + sound_call .sub2 octave 1 note F#, 1 note B_, 1 @@ -260,7 +261,7 @@ Music_Gym_branch_f4980: octave 2 note G_, 2 note E_, 2 - callchannel Music_Gym_branch_f4a15 + sound_call .sub2 octave 1 note G_, 1 octave 2 @@ -283,9 +284,9 @@ Music_Gym_branch_f4980: octave 2 note F#, 2 note D_, 2 - loopchannel 0, Music_Gym_branch_f4980 + sound_loop 0, .mainloop -Music_Gym_branch_f49e9: +.sub1: octave 3 note D_, 3 octave 2 @@ -329,9 +330,9 @@ Music_Gym_branch_f49e9: note C_, 1 note C_, 1 note C_, 2 - endchannel + sound_ret -Music_Gym_branch_f4a15: +.sub2: octave 2 note D_, 4 note D_, 2 @@ -361,24 +362,24 @@ Music_Gym_branch_f4a15: note C_, 2 octave 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 note F#, 1 note F#, 1 - endchannel + sound_ret Music_Gym_Ch3: - vibrato $14, $23 - stereopanning $ff -Music_Gym_branch_f4a3c: - notetype $c, $14 + vibrato 20, 2, 3 + stereo_panning TRUE, TRUE +.mainloop: + note_type 12, 1, 4 octave 6 note D_, 2 octave 4 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 octave 5 note A_, 1 octave 6 @@ -388,7 +389,7 @@ Music_Gym_branch_f4a3c: note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 octave 5 note A_, 1 octave 6 @@ -399,7 +400,7 @@ Music_Gym_branch_f4a3c: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 note B_, 1 @@ -413,7 +414,7 @@ Music_Gym_branch_f4a3c: octave 5 note D_, 2 note E_, 1 - note __, 2 + rest 2 note C_, 1 note C_, 4 note G_, 4 @@ -424,21 +425,21 @@ Music_Gym_branch_f4a3c: octave 5 note D_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 1 note E_, 8 - note __, 4 + rest 4 note F#, 12 note E_, 2 note F#, 2 note G_, 1 - note __, 2 + rest 2 note E_, 1 note E_, 4 octave 6 note C_, 1 - note __, 2 + rest 2 octave 5 note G_, 1 note G_, 4 @@ -452,9 +453,9 @@ Music_Gym_branch_f4a3c: note C_, 8 octave 5 note B_, 4 - intensity $13 - callchannel Music_Gym_branch_f4ab3 - note __, 2 + volume_envelope 1, 3 + sound_call .sub1 + rest 2 note A_, 2 octave 6 note D_, 2 @@ -466,22 +467,22 @@ Music_Gym_branch_f4a3c: note A#, 4 note A_, 4 note G_, 4 - callchannel Music_Gym_branch_f4ab3 + sound_call .sub1 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 octave 6 note C_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 note E_, 1 note F#, 8 note E_, 4 - loopchannel 0, Music_Gym_branch_f4a3c + sound_loop 0, .mainloop -Music_Gym_branch_f4ab3: +.sub1: octave 5 note A_, 6 octave 6 @@ -495,72 +496,72 @@ Music_Gym_branch_f4ab3: note A_, 4 note G_, 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 note A_, 4 - endchannel + sound_ret Music_Gym_Ch4: - togglenoise $4 -Music_Gym_branch_f4ac7: - notetype $c - note D_, 2 - note C#, 1 - note C#, 1 - note B_, 4 - note D_, 2 - note C#, 1 - note C#, 1 - note B_, 4 - note D_, 2 - note C#, 1 - note C#, 1 - note D_, 2 - note C#, 1 - note C#, 1 - note A#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - notetype $6 -Music_Gym_branch_f4ae1: - note D_, 6 - note D_, 6 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 6 - note D_, 6 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - loopchannel 4, Music_Gym_branch_f4ae1 -Music_Gym_branch_f4afa: - note D#, 4 - note F#, 4 - note D_, 4 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 4 - note D_, 4 - note F#, 4 - loopchannel 8, Music_Gym_branch_f4afa - loopchannel 0, Music_Gym_branch_f4ac7 + toggle_noise 4 +.mainloop: + drum_speed 12 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 12, 4 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 12, 4 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 11, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 6 +.loop1: + drum_note 3, 6 + drum_note 3, 6 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 6 + drum_note 3, 6 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + sound_loop 4, .loop1 +.loop2: + drum_note 4, 4 + drum_note 7, 4 + drum_note 3, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 4 + drum_note 3, 4 + drum_note 7, 4 + sound_loop 8, .loop2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/gymleadervictory.asm b/crysaudio/music/gymleadervictory.asm index d6a1a36e..4f53ea85 100644 --- a/crysaudio/music/gymleadervictory.asm +++ b/crysaudio/music/gymleadervictory.asm @@ -1,16 +1,17 @@ Music_GymLeaderVictory: - musicheader 4, 1, Music_GymLeaderVictory_Ch1 - musicheader 1, 2, Music_GymLeaderVictory_Ch2 - musicheader 1, 3, Music_GymLeaderVictory_Ch3 - musicheader 1, 4, Music_GymLeaderVictory_Ch4 + channel_count 4 + channel 1, Music_GymLeaderVictory_Ch1 + channel 2, Music_GymLeaderVictory_Ch2 + channel 3, Music_GymLeaderVictory_Ch3 + channel 4, Music_GymLeaderVictory_Ch4 Music_GymLeaderVictory_Ch1: tempo 116 - volume $77 - vibrato $12, $34 - dutycycle $3 - tone $0001 - notetype $c, $b7 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + pitch_offset 1 + note_type 12, 11, 7 octave 4 note D_, 6 octave 3 @@ -25,18 +26,19 @@ Music_GymLeaderVictory_Ch1: note A_, 1 octave 5 note D_, 8 - stereopanning $f -Music_GymLeaderVictory_branch_f4658: - dutycycle $1 - callchannel Music_GymLeaderVictory_branch_f4689 + stereo_panning FALSE, TRUE +.mainloop: +.loop1: + duty_cycle 1 + sound_call .sub1 octave 4 note C#, 4 note E_, 4 - callchannel Music_GymLeaderVictory_branch_f4689 + sound_call .sub1 note F#, 8 - loopchannel 2, Music_GymLeaderVictory_branch_f4658 - dutycycle $2 - callchannel Music_GymLeaderVictory_branch_f46a0 + sound_loop 2, .loop1 + duty_cycle 2 + sound_call .sub2 note A_, 4 note G_, 4 note F#, 6 @@ -46,8 +48,8 @@ Music_GymLeaderVictory_branch_f4658: note E_, 2 note D_, 8 note C#, 8 - dutycycle $3 - callchannel Music_GymLeaderVictory_branch_f46a0 + duty_cycle 3 + sound_call .sub2 note C#, 4 note E_, 4 note G_, 6 @@ -55,12 +57,12 @@ Music_GymLeaderVictory_branch_f4658: note G_, 1 note A_, 6 note G_, 2 - intensity $87 + volume_envelope 8, 7 note F#, 16 - loopchannel 0, Music_GymLeaderVictory_branch_f4658 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f4689: - intensity $91 +.sub1: + volume_envelope 9, 1 octave 3 note F#, 2 note A_, 2 @@ -81,10 +83,10 @@ Music_GymLeaderVictory_branch_f4689: note B_, 2 note G_, 1 note D_, 1 - endchannel + sound_ret -Music_GymLeaderVictory_branch_f46a0: - intensity $87 +.sub2: + volume_envelope 8, 7 octave 3 note F#, 14 note D_, 1 @@ -111,12 +113,12 @@ Music_GymLeaderVictory_branch_f46a0: octave 4 note C#, 1 note E_, 8 - endchannel + sound_ret Music_GymLeaderVictory_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $c, $d7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 12, 13, 7 octave 4 note A_, 6 note F#, 1 @@ -128,51 +130,51 @@ Music_GymLeaderVictory_Ch2: octave 5 note D_, 1 note F#, 16 -Music_GymLeaderVictory_branch_f46d0: - dutycycle $3 - intensity $a1 - callchannel Music_GymLeaderVictory_branch_f4711 +.mainloop: + duty_cycle 3 + volume_envelope 10, 1 + sound_call .sub1 note A_, 4 note A_, 4 - callchannel Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note D_, 6 - dutycycle $2 + duty_cycle 2 note B_, 1 octave 5 note C#, 1 - callchannel Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note A_, 4 note A_, 4 - callchannel Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note D_, 8 - dutycycle $3 - callchannel Music_GymLeaderVictory_branch_f4720 + duty_cycle 3 + sound_call .sub2 note F#, 4 note E_, 4 note D_, 14 octave 4 note B_, 2 - intensity $a7 + volume_envelope 10, 7 note A_, 16 - dutycycle $2 - callchannel Music_GymLeaderVictory_branch_f4720 + duty_cycle 2 + sound_call .sub2 octave 4 note A_, 4 octave 5 note C#, 4 note D_, 14 note E_, 2 - intensity $a6 + volume_envelope 10, 6 note D_, 12 - note __, 2 - dutycycle $3 + rest 2 + duty_cycle 3 octave 4 note B_, 1 octave 5 note C#, 1 - loopchannel 0, Music_GymLeaderVictory_branch_f46d0 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f4711: +.sub1: octave 5 note D_, 2 note C#, 2 @@ -187,10 +189,10 @@ Music_GymLeaderVictory_branch_f4711: note A_, 2 note G_, 2 note F#, 2 - endchannel + sound_ret -Music_GymLeaderVictory_branch_f4720: - intensity $98 +.sub2: + volume_envelope 9, 8 note A_, 6 note F#, 1 note A_, 1 @@ -211,10 +213,10 @@ Music_GymLeaderVictory_branch_f4720: octave 5 note C#, 8 note C#, 8 - endchannel + sound_ret Music_GymLeaderVictory_Ch3: - notetype $c, $25 + note_type 12, 2, 5 octave 3 note F#, 16 note D_, 10 @@ -223,106 +225,107 @@ Music_GymLeaderVictory_Ch3: note B_, 2 octave 3 note C#, 2 - stereopanning $f0 -Music_GymLeaderVictory_branch_f4744: + stereo_panning TRUE, FALSE +.mainloop: +.loop1: note D_, 2 - note __, 4 + rest 4 octave 2 note A_, 2 octave 3 note C#, 2 - note __, 4 + rest 4 octave 2 note A_, 2 note B_, 2 - note __, 4 + rest 4 note G_, 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C#, 4 note D_, 2 - note __, 4 + rest 4 octave 2 note A_, 2 octave 3 note C#, 2 - note __, 4 + rest 4 octave 2 note A_, 2 note B_, 2 - note __, 4 + rest 4 note G_, 2 octave 3 note D_, 2 - note __, 6 - loopchannel 2, Music_GymLeaderVictory_branch_f4744 - callchannel Music_GymLeaderVictory_branch_f479e + rest 6 + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note F#, 2 note D_, 2 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note C#, 2 octave 2 note A_, 2 - callchannel Music_GymLeaderVictory_branch_f479e + sound_call .sub1 octave 3 note D_, 2 - note __, 2 + rest 2 note G_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note G_, 2 note E_, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 note B_, 2 octave 3 note C#, 2 - loopchannel 0, Music_GymLeaderVictory_branch_f4744 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f479e: +.sub1: octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note F#, 2 note D_, 2 note A_, 2 - note __, 2 + rest 2 note D_, 2 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 @@ -331,20 +334,20 @@ Music_GymLeaderVictory_branch_f479e: note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 4 note E_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 note G#, 2 note E_, 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 @@ -352,11 +355,11 @@ Music_GymLeaderVictory_branch_f479e: octave 2 note B_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 @@ -365,55 +368,56 @@ Music_GymLeaderVictory_branch_f479e: note A_, 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note C#, 2 octave 2 note A_, 2 - endchannel + sound_ret Music_GymLeaderVictory_Ch4: - togglenoise $4 - notetype $c - note B_, 16 - note B_, 16 -Music_GymLeaderVictory_branch_f47eb: - callchannel Music_GymLeaderVictory_branch_f480b - note D#, 6 - note D#, 2 - note D#, 8 - callchannel Music_GymLeaderVictory_branch_f480b - note D#, 6 - note D#, 2 - note D#, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 -Music_GymLeaderVictory_branch_f47fb: - note D#, 2 - note G_, 2 - note D_, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note D_, 2 - note G_, 2 - loopchannel 16, Music_GymLeaderVictory_branch_f47fb - loopchannel 0, Music_GymLeaderVictory_branch_f47eb + toggle_noise 4 + drum_speed 12 + drum_note 12, 16 + drum_note 12, 16 +.mainloop: + sound_call .sub1 + drum_note 4, 6 + drum_note 4, 2 + drum_note 4, 8 + sound_call .sub1 + drum_note 4, 6 + drum_note 4, 2 + drum_note 4, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 +.loop1: + drum_note 4, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 2 + sound_loop 16, .loop1 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f480b: - note D#, 6 - note D#, 2 - note D#, 4 - note D_, 2 - note D#, 2 - loopchannel 3, Music_GymLeaderVictory_branch_f480b - endchannel +.sub1: +.sub1loop1: + drum_note 4, 6 + drum_note 4, 2 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + sound_loop 3, .sub1loop1 + sound_ret diff --git a/crysaudio/music/halloffame.asm b/crysaudio/music/halloffame.asm index 2f4c444d..1786773d 100644 --- a/crysaudio/music/halloffame.asm +++ b/crysaudio/music/halloffame.asm @@ -1,56 +1,58 @@ Music_HallOfFame: - musicheader 4, 1, Music_HallOfFame_Ch1 - musicheader 1, 2, Music_HallOfFame_Ch2 - musicheader 1, 3, Music_HallOfFame_Ch3 - musicheader 1, 4, Music_HallOfFame_Ch4 + channel_count 4 + channel 1, Music_HallOfFame_Ch1 + channel 2, Music_HallOfFame_Ch2 + channel 3, Music_HallOfFame_Ch3 + channel 4, Music_HallOfFame_Ch4 Music_HallOfFame_Ch1: tempo 112 - volume $77 - dutycycle $2 - vibrato $c, $22 - tone $0001 - stereopanning $f0 - notetype $c, $93 - note __, 16 - note __, 16 - note __, 16 - note __, 12 + volume 7, 7 + duty_cycle 2 + vibrato 12, 2, 2 + pitch_offset 1 + stereo_panning TRUE, FALSE + note_type 12, 9, 3 + rest 16 + rest 16 + rest 16 + rest 12 octave 3 note D_, 1 note E_, 1 note F_, 1 note F#, 1 -Music_HallOfFame_branch_f05e6: - intensity $97 +.mainloop: +.loop1: + volume_envelope 9, 7 octave 4 note C_, 8 - intensity $77 + volume_envelope 7, 7 note C_, 8 - intensity $97 + volume_envelope 9, 7 note E_, 8 - intensity $77 + volume_envelope 7, 7 note E_, 8 - intensity $97 + volume_envelope 9, 7 note F#, 8 - intensity $77 + volume_envelope 7, 7 note F#, 8 - intensity $77 + volume_envelope 7, 7 note F_, 8 - intensity $57 + volume_envelope 5, 7 note F_, 8 - loopchannel 3, Music_HallOfFame_branch_f05e6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_HallOfFame_branch_f05e6 + sound_loop 3, .loop1 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, .mainloop Music_HallOfFame_Ch2: - vibrato $8, $25 - dutycycle $3 -Music_HallOfFame_branch_f0610: - notetype $c, $c4 + vibrato 8, 2, 5 + duty_cycle 3 +.mainloop: + note_type 12, 12, 4 octave 3 note G_, 2 note D_, 2 @@ -74,12 +76,12 @@ Music_HallOfFame_branch_f0610: note A#, 4 note A_, 4 note F_, 2 - loopchannel 0, Music_HallOfFame_branch_f0610 + sound_loop 0, .mainloop Music_HallOfFame_Ch3: -Music_HallOfFame_branch_f062e: - notetype $c, $28 -Music_HallOfFame_branch_f0631: +.mainloop: + note_type 12, 2, 8 +.loop1: octave 3 note D_, 2 note G_, 2 @@ -116,7 +118,7 @@ Music_HallOfFame_branch_f0631: note F_, 2 note C_, 2 note F_, 2 - loopchannel 3, Music_HallOfFame_branch_f0631 + sound_loop 3, .loop1 note D_, 4 note G_, 4 note D_, 4 @@ -133,40 +135,40 @@ Music_HallOfFame_branch_f0631: note G_, 4 note E_, 4 note G_, 4 - loopchannel 0, Music_HallOfFame_branch_f062e + sound_loop 0, .mainloop Music_HallOfFame_Ch4: - togglenoise $5 - notetype $c - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype $6 -Music_HallOfFame_branch_f0677: - stereopanning $f - note A#, 4 - note A#, 8 - note A#, 4 - note A#, 4 - note A#, 4 - stereopanning $f0 - note A_, 2 - note A_, 2 - note A#, 2 - note A#, 2 - note A#, 4 - note A#, 4 - note A#, 8 - note A#, 4 - note A#, 4 - stereopanning $f - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - loopchannel 0, Music_HallOfFame_branch_f0677 + toggle_noise 5 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 16 + drum_speed 6 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 11, 4 + drum_note 11, 8 + drum_note 11, 4 + drum_note 11, 4 + drum_note 11, 4 + stereo_panning TRUE, FALSE + drum_note 10, 2 + drum_note 10, 2 + drum_note 11, 2 + drum_note 11, 2 + drum_note 11, 4 + drum_note 11, 4 + drum_note 11, 8 + drum_note 11, 4 + drum_note 11, 4 + stereo_panning FALSE, TRUE + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/healpokemon.asm b/crysaudio/music/healpokemon.asm index 6de58bc5..0a5130bd 100644 --- a/crysaudio/music/healpokemon.asm +++ b/crysaudio/music/healpokemon.asm @@ -1,50 +1,51 @@ Music_HealPokemon: - musicheader 3, 1, Music_HealPokemon_Ch1 - musicheader 1, 2, Music_HealPokemon_Ch2 - musicheader 1, 3, Music_HealPokemon_Ch3 + channel_count 3 + channel 1, Music_HealPokemon_Ch1 + channel 2, Music_HealPokemon_Ch2 + channel 3, Music_HealPokemon_Ch3 Music_HealPokemon_Ch1: tempo 144 - volume $77 - dutycycle $2 - tone $0001 - notetype $c, $81 - note __, 2 - slidepitchto 1, 4, __ + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + note_type 12, 8, 1 + rest 2 + pitch_slide 1, 4, B_ note B_, 2 - slidepitchto 1, 5, E_ + pitch_slide 1, 3, E_ note B_, 2 - slidepitchto 1, 4, E_ + pitch_slide 1, 4, E_ note E_, 2 - note __, 4 - slidepitchto 1, 3, __ + rest 4 + pitch_slide 1, 5, B_ note E_, 4 - slidepitchto 1, 4, __ + pitch_slide 1, 4, B_ note B_, 4 - endchannel + sound_ret Music_HealPokemon_Ch2: - dutycycle $2 - notetype $c, $c3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 note B_, 4 note B_, 4 note B_, 2 note G#, 2 - notetype $c, $c4 + note_type 12, 12, 4 octave 5 note E_, 8 - endchannel + sound_ret Music_HealPokemon_Ch3: - notetype $c, $10 + note_type 12, 1, 0 octave 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 note E_, 6 - note __, 2 - endchannel + rest 2 + sound_ret diff --git a/crysaudio/music/indigoplateau.asm b/crysaudio/music/indigoplateau.asm index b56f1b38..371b970d 100644 --- a/crysaudio/music/indigoplateau.asm +++ b/crysaudio/music/indigoplateau.asm @@ -1,34 +1,35 @@ Music_IndigoPlateau: - musicheader 4, 1, Music_IndigoPlateau_Ch1 - musicheader 1, 2, Music_IndigoPlateau_Ch2 - musicheader 1, 3, Music_IndigoPlateau_Ch3 - musicheader 1, 4, Music_IndigoPlateau_Ch4 + channel_count 4 + channel 1, Music_IndigoPlateau_Ch1 + channel 2, Music_IndigoPlateau_Ch2 + channel 3, Music_IndigoPlateau_Ch3 + channel 4, Music_IndigoPlateau_Ch4 Music_IndigoPlateau_Ch1: tempo 128 - volume $77 - dutycycle $3 - tone $0002 - stereopanning $f -Music_IndigoPlateau_branch_ee86a: - callchannel Music_IndigoPlateau_branch_ee881 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + stereo_panning FALSE, TRUE +.mainloop: + sound_call .sub1 octave 3 note D_, 4 - callchannel Music_IndigoPlateau_branch_ee881 + sound_call .sub1 octave 3 note D#, 4 - callchannel Music_IndigoPlateau_branch_ee881 + sound_call .sub1 octave 3 note D#, 4 - callchannel Music_IndigoPlateau_branch_ee881 + sound_call .sub1 note A#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee86a + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee881: - notetype $c, $b6 +.sub1: + note_type 12, 11, 6 octave 2 note A_, 4 - intensity $b2 + volume_envelope 11, 2 note A_, 2 note A_, 2 note A_, 2 @@ -36,44 +37,44 @@ Music_IndigoPlateau_branch_ee881: note A_, 4 note A_, 2 note A_, 2 - intensity $a0 - endchannel + volume_envelope 10, 0 + sound_ret Music_IndigoPlateau_Ch2: - dutycycle $3 - vibrato $10, $22 - stereopanning $f0 -Music_IndigoPlateau_branch_ee899: - callchannel Music_IndigoPlateau_branch_ee8e9 + duty_cycle 3 + vibrato 16, 2, 2 + stereo_panning TRUE, FALSE +.mainloop: + sound_call .sub1 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - intensity $c7 + volume_envelope 12, 7 note A_, 6 note D_, 2 note G_, 2 note A#, 2 note A_, 8 - intensity $b0 + volume_envelope 11, 0 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 6 note D#, 2 note C_, 4 note D_, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 6 octave 3 @@ -81,28 +82,28 @@ Music_IndigoPlateau_branch_ee899: note A_, 2 note G_, 2 note F#, 8 - intensity $b0 + volume_envelope 11, 0 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 6 note D#, 2 note F_, 4 note F#, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee899 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee8e9: - notetype $c, $c6 +.sub1: + note_type 12, 12, 6 octave 3 note D_, 4 - intensity $c2 + volume_envelope 12, 2 note D_, 2 note D_, 2 note D_, 2 @@ -110,73 +111,73 @@ Music_IndigoPlateau_branch_ee8e9: note D_, 4 note D_, 2 note D_, 2 - intensity $b0 - endchannel + volume_envelope 11, 0 + sound_ret Music_IndigoPlateau_Ch3: - notetype $c, $19 -Music_IndigoPlateau_branch_ee8fd: - callchannel Music_IndigoPlateau_branch_ee915 + note_type 12, 1, -1 +.mainloop: + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note F#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee8fd + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee915: +.sub1: octave 3 note D_, 1 - note __, 3 + rest 3 octave 2 note A_, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 octave 2 note A_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_IndigoPlateau_Ch4: - stereopanning $f0 - togglenoise $0 - notetype $c -Music_IndigoPlateau_branch_ee92a: - note D#, 4 - note D_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D_, 4 - note D_, 2 - note D_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - notetype $c - note D#, 4 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note C#, 4 - note D_, 2 - note D_, 2 - note C#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee92a + stereo_panning TRUE, FALSE + toggle_noise 0 + drum_speed 12 +.mainloop: + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 2, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/johtogymbattle.asm b/crysaudio/music/johtogymbattle.asm index 2b6e82f0..fadf4d83 100644 --- a/crysaudio/music/johtogymbattle.asm +++ b/crysaudio/music/johtogymbattle.asm @@ -1,33 +1,34 @@ Music_JohtoGymBattle: - musicheader 3, 1, Music_JohtoGymBattle_Ch1 - musicheader 1, 2, Music_JohtoGymBattle_Ch2 - musicheader 1, 3, Music_JohtoGymBattle_Ch3 + channel_count 3 + channel 1, Music_JohtoGymBattle_Ch1 + channel 2, Music_JohtoGymBattle_Ch2 + channel 3, Music_JohtoGymBattle_Ch3 Music_JohtoGymBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 -Music_JohtoGymBattle_branch_ea526: + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 2 +.loop1: octave 3 note A#, 1 note A_, 1 note G#, 1 note A_, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea526 -Music_JohtoGymBattle_branch_ea52f: + sound_loop 4, .loop1 +.loop2: note C#, 1 note C_, 1 octave 2 note A#, 1 octave 3 note C_, 1 - loopchannel 3, Music_JohtoGymBattle_branch_ea52f - intensity $4b + sound_loop 3, .loop2 + volume_envelope 4, -3 note C#, 4 - intensity $b2 + volume_envelope 11, 2 note D_, 6 note D#, 6 note C_, 4 @@ -39,9 +40,9 @@ Music_JohtoGymBattle_branch_ea52f: note C_, 4 note F_, 6 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $b2 + volume_envelope 11, 2 note G_, 6 note G#, 6 note F_, 4 @@ -57,8 +58,8 @@ Music_JohtoGymBattle_branch_ea52f: octave 3 note G#, 2 note F_, 2 -Music_JohtoGymBattle_branch_ea55d: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note D_, 6 note G_, 6 note F_, 2 @@ -67,16 +68,16 @@ Music_JohtoGymBattle_branch_ea55d: note G_, 4 note F_, 4 note G_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 12 - intensity $b2 + volume_envelope 11, 2 note G_, 4 - intensity $b7 + volume_envelope 11, 7 octave 4 note C#, 12 - intensity $b2 + volume_envelope 11, 2 note C_, 4 - intensity $b5 + volume_envelope 11, 5 octave 3 note D_, 6 note G_, 6 @@ -86,42 +87,42 @@ Music_JohtoGymBattle_branch_ea55d: note G_, 4 note F_, 4 note G_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 8 note G_, 8 note F_, 8 note D#, 8 - intensity $70 + volume_envelope 7, 0 note C_, 8 - intensity $77 + volume_envelope 7, 7 note C_, 8 - intensity $b4 + volume_envelope 11, 4 note D#, 2 note E_, 2 note F_, 6 note G_, 2 note D#, 4 - intensity $77 + volume_envelope 7, 7 octave 2 note A#, 8 note A#, 8 - intensity $c5 + volume_envelope 12, 5 octave 3 note G_, 2 note G#, 2 note A#, 6 note A#, 2 note G#, 4 - intensity $c7 + volume_envelope 12, 7 note G_, 8 note F_, 4 note E_, 2 note C#, 2 - intensity $a0 + volume_envelope 10, 0 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $b2 + volume_envelope 11, 2 note F_, 6 note F_, 4 note E_, 2 @@ -174,24 +175,24 @@ Music_JohtoGymBattle_branch_ea55d: note D#, 6 note D#, 6 note D#, 4 - intensity $80 + volume_envelope 8, 0 note G_, 16 - intensity $90 + volume_envelope 9, 0 note G#, 16 - intensity $a0 + volume_envelope 10, 0 note A_, 8 note A#, 2 note A_, 2 note G#, 2 note A_, 2 - intensity $b0 + volume_envelope 11, 0 note A#, 8 note B_, 2 note A#, 2 note A_, 2 octave 4 note C#, 2 - intensity $b7 + volume_envelope 11, 7 note C_, 8 note C#, 4 note C_, 4 @@ -251,7 +252,7 @@ Music_JohtoGymBattle_branch_ea55d: note A_, 8 note G#, 8 note F#, 8 - intensity $b4 + volume_envelope 11, 4 note A_, 4 octave 4 note C#, 4 @@ -259,51 +260,51 @@ Music_JohtoGymBattle_branch_ea55d: note B_, 4 octave 4 note E_, 4 - intensity $92 + volume_envelope 9, 2 note D#, 2 note D#, 2 note D#, 2 note D#, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 note D#, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 note D#, 16 - intensity $50 + volume_envelope 5, 0 octave 3 note C_, 16 note F_, 16 note E_, 16 - intensity $97 + volume_envelope 9, 7 note D#, 10 - intensity $b4 + volume_envelope 11, 4 octave 2 note A#, 2 octave 3 note D#, 2 note F#, 2 - loopchannel 0, Music_JohtoGymBattle_branch_ea55d + sound_loop 0, .mainloop Music_JohtoGymBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 -Music_JohtoGymBattle_branch_ea66a: + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 +.loop1: octave 4 note F#, 1 note F_, 1 note E_, 1 note A#, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea66a -Music_JohtoGymBattle_branch_ea673: + sound_loop 4, .loop1 +.loop2: note F#, 1 note F_, 1 note F#, 1 note A#, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea673 + sound_loop 4, .loop2 note A_, 6 octave 3 note A#, 6 @@ -319,86 +320,86 @@ Music_JohtoGymBattle_branch_ea673: octave 4 note D_, 6 note D#, 6 - intensity $b0 + volume_envelope 11, 0 octave 3 note D#, 4 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 4 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note C_, 4 note G_, 2 - notetype $c, $92 + note_type 12, 9, 2 octave 3 note D_, 2 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 4 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D#, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 4 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note C_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D#, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note G_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note F_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note G#, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note F_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note F#, 2 - intensity $b2 + volume_envelope 11, 2 octave 3 note G#, 1 note A_, 1 -Music_JohtoGymBattle_branch_ea6ee: - intensity $c7 +.mainloop: + volume_envelope 12, 7 note A#, 8 - intensity $c4 + volume_envelope 12, 4 octave 4 note D_, 2 note C_, 2 @@ -406,29 +407,29 @@ Music_JohtoGymBattle_branch_ea6ee: note A#, 2 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 note C#, 8 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note D#, 2 note C#, 2 note D#, 2 - intensity $b0 + volume_envelope 11, 0 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 6 - intensity $c2 + volume_envelope 12, 2 note D#, 4 - intensity $b0 + volume_envelope 11, 0 note G#, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 4 - intensity $c7 + volume_envelope 12, 7 octave 3 note A#, 8 - intensity $c4 + volume_envelope 12, 4 octave 4 note D_, 2 note C_, 2 @@ -436,48 +437,48 @@ Music_JohtoGymBattle_branch_ea6ee: note A#, 2 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 note C#, 8 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note D#, 2 note C#, 2 note D#, 2 - intensity $b0 + volume_envelope 11, 0 note C#, 16 - intensity $b7 + volume_envelope 11, 7 note C#, 16 - intensity $a4 + volume_envelope 10, 4 octave 3 note F_, 6 note D#, 6 note F_, 4 - intensity $c6 + volume_envelope 12, 6 octave 4 note C_, 6 octave 3 note A#, 6 octave 4 note C_, 4 - intensity $a4 + volume_envelope 10, 4 octave 3 note C#, 6 note C_, 6 note C#, 4 - intensity $c6 + volume_envelope 12, 6 octave 4 note C#, 6 note C_, 6 note C#, 4 - intensity $3c + volume_envelope 3, -4 note C_, 10 - intensity $b7 + volume_envelope 11, 7 note C_, 6 - intensity $b0 + volume_envelope 11, 0 note E_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note C#, 16 octave 2 @@ -487,27 +488,27 @@ Music_JohtoGymBattle_branch_ea6ee: note D#, 2 note C_, 16 note E_, 16 - intensity $a0 + volume_envelope 10, 0 octave 5 note C#, 4 - intensity $a7 + volume_envelope 10, 7 octave 5 note C#, 12 - intensity $b7 + volume_envelope 11, 7 octave 4 note A#, 8 octave 5 note C#, 6 note D#, 2 - intensity $a0 + volume_envelope 10, 0 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $3e + volume_envelope 3, -6 note E_, 6 - intensity $a6 + volume_envelope 10, 6 note E_, 10 - intensity $c2 + volume_envelope 12, 2 octave 3 note F_, 6 note F_, 6 @@ -521,21 +522,21 @@ Music_JohtoGymBattle_branch_ea6ee: note G#, 6 note G#, 6 note G#, 4 - intensity $90 + volume_envelope 9, 0 octave 4 note C_, 16 - intensity $a0 + volume_envelope 10, 0 note C#, 16 - intensity $b0 + volume_envelope 11, 0 note D_, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $4c + volume_envelope 4, -4 note D#, 6 - intensity $c2 + volume_envelope 12, 2 note F#, 1 note G_, 1 - intensity $c7 + volume_envelope 12, 7 note G#, 8 note A_, 2 note G#, 2 @@ -596,13 +597,13 @@ Music_JohtoGymBattle_branch_ea6ee: note G#, 4 note E_, 4 note A_, 4 - intensity $c0 + volume_envelope 12, 0 note G#, 8 - intensity $c7 + volume_envelope 12, 7 note G#, 8 - intensity $c2 + volume_envelope 12, 2 note G#, 16 - intensity $80 + volume_envelope 8, 0 octave 3 note F_, 16 octave 4 @@ -610,44 +611,44 @@ Music_JohtoGymBattle_branch_ea6ee: octave 3 note B_, 16 note G_, 16 - loopchannel 0, Music_JohtoGymBattle_branch_ea6ee + sound_loop 0, .mainloop Music_JohtoGymBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 4 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 2 octave 4 note G#, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note F_, 2 note G_, 2 note G#, 4 - callchannel Music_JohtoGymBattle_branch_ea952 + sound_call .sub1 note G_, 2 note D_, 2 note F_, 2 @@ -663,7 +664,7 @@ Music_JohtoGymBattle_Ch3: note G#, 2 note D#, 2 note F#, 4 - callchannel Music_JohtoGymBattle_branch_ea952 + sound_call .sub1 note G_, 2 note D_, 2 note F_, 2 @@ -682,10 +683,10 @@ Music_JohtoGymBattle_Ch3: octave 3 note A#, 2 note G#, 2 -Music_JohtoGymBattle_branch_ea83f: - callchannel Music_JohtoGymBattle_branch_ea963 - callchannel Music_JohtoGymBattle_branch_ea963 - callchannel Music_JohtoGymBattle_branch_ea96a +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 note C#, 2 note G#, 2 note C#, 2 @@ -694,7 +695,7 @@ Music_JohtoGymBattle_branch_ea83f: note A#, 2 note A_, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea963 + sound_call .sub2 note D_, 2 note G_, 2 note D_, 2 @@ -703,8 +704,8 @@ Music_JohtoGymBattle_branch_ea83f: note G_, 2 note G#, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea96a + sound_call .sub3 + sound_call .sub3 note C_, 2 note G_, 2 note A#, 2 @@ -713,14 +714,14 @@ Music_JohtoGymBattle_branch_ea83f: note F_, 2 note G_, 2 note A#, 2 - callchannel Music_JohtoGymBattle_branch_ea971 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea978 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 octave 3 note G_, 2 note G#, 2 note F_, 2 - callchannel Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -729,13 +730,13 @@ Music_JohtoGymBattle_branch_ea83f: note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea978 + sound_call .sub3 + sound_call .sub5 octave 3 note C_, 2 note C#, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -744,15 +745,15 @@ Music_JohtoGymBattle_branch_ea83f: note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea978 + sound_call .sub3 + sound_call .sub5 octave 3 note F_, 2 octave 2 note A#, 2 octave 3 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -763,13 +764,13 @@ Music_JohtoGymBattle_branch_ea83f: note G_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea983 - note __, 2 - callchannel Music_JohtoGymBattle_branch_ea990 + sound_call .sub6 + rest 2 + sound_call .sub7 octave 4 note C#, 2 - callchannel Music_JohtoGymBattle_branch_ea99c - note __, 2 + sound_call .sub8 + rest 2 note D#, 2 note A#, 2 octave 4 @@ -783,11 +784,11 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 octave 4 note D#, 2 - callchannel Music_JohtoGymBattle_branch_ea983 + sound_call .sub6 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea990 + sound_call .sub7 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea99c + sound_call .sub8 note A_, 2 octave 4 note D#, 2 @@ -801,7 +802,7 @@ Music_JohtoGymBattle_branch_ea83f: octave 4 note D#, 2 note D_, 4 - callchannel Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -812,7 +813,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note D#, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -821,7 +822,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note G#, 2 note F#, 2 - callchannel Music_JohtoGymBattle_branch_ea9b1 + sound_call .sub10 note C#, 2 note F#, 2 note C#, 2 @@ -832,7 +833,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note C#, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea9b1 + sound_call .sub10 note C#, 2 note F#, 2 note C#, 2 @@ -841,7 +842,7 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 note E_, 2 note A_, 2 - callchannel Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -878,7 +879,7 @@ Music_JohtoGymBattle_branch_ea83f: note F#, 2 note E_, 2 note F#, 2 - callchannel Music_JohtoGymBattle_branch_ea9b8 + sound_call .sub11 note F_, 2 note C_, 2 note D#, 2 @@ -887,7 +888,7 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 note C#, 2 note D#, 2 - callchannel Music_JohtoGymBattle_branch_ea9b8 + sound_call .sub11 note F_, 2 note C_, 2 note D#, 2 @@ -896,9 +897,9 @@ Music_JohtoGymBattle_branch_ea83f: note F#, 2 note F_, 2 note D#, 2 - loopchannel 0, Music_JohtoGymBattle_branch_ea83f + sound_loop 0, .mainloop -Music_JohtoGymBattle_branch_ea952: +.sub1: note G_, 2 note D_, 2 note F_, 2 @@ -915,27 +916,30 @@ Music_JohtoGymBattle_branch_ea952: note F_, 2 note D#, 2 note F_, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea963: +.sub2: +.sub2loop1: note D_, 2 note G_, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea963 - endchannel + sound_loop 4, .sub2loop1 + sound_ret -Music_JohtoGymBattle_branch_ea96a: +.sub3: +.sub3loop1: note C#, 2 note G#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea96a - endchannel + sound_loop 4, .sub3loop1 + sound_ret -Music_JohtoGymBattle_branch_ea971: +.sub4: +.sub4loop1: note C_, 2 note G_, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea971 - endchannel + sound_loop 4, .sub4loop1 + sound_ret -Music_JohtoGymBattle_branch_ea978: +.sub5: octave 2 note A#, 2 octave 3 @@ -946,9 +950,9 @@ Music_JohtoGymBattle_branch_ea978: note F_, 2 octave 2 note A#, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea983: +.sub6: octave 3 note C_, 2 note G_, 2 @@ -961,9 +965,9 @@ Music_JohtoGymBattle_branch_ea983: note C_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea990: +.sub7: note C#, 2 note G#, 2 octave 4 @@ -975,9 +979,9 @@ Music_JohtoGymBattle_branch_ea990: note C#, 2 octave 3 note C#, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea99c: +.sub8: octave 3 note D_, 2 note A_, 2 @@ -990,22 +994,24 @@ Music_JohtoGymBattle_branch_ea99c: note D_, 2 octave 3 note D_, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea9a9: +.sub9: +.sub9loop1: octave 3 note D#, 2 note G#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea9a9 - endchannel + sound_loop 4, .sub9loop1 + sound_ret -Music_JohtoGymBattle_branch_ea9b1: +.sub10: +.sub10loop1: note C#, 2 note F#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea9b1 - endchannel + sound_loop 4, .sub10loop1 + sound_ret -Music_JohtoGymBattle_branch_ea9b8: +.sub11: note F_, 2 note C_, 2 note D#, 2 @@ -1014,4 +1020,4 @@ Music_JohtoGymBattle_branch_ea9b8: note F#, 2 note F_, 2 note D#, 2 - endchannel + sound_ret diff --git a/crysaudio/music/johtotrainerbattle.asm b/crysaudio/music/johtotrainerbattle.asm index c235410a..cb512bcb 100644 --- a/crysaudio/music/johtotrainerbattle.asm +++ b/crysaudio/music/johtotrainerbattle.asm @@ -1,22 +1,23 @@ Music_JohtoTrainerBattle: - musicheader 3, 1, Music_JohtoTrainerBattle_Ch1 - musicheader 1, 2, Music_JohtoTrainerBattle_Ch2 - musicheader 1, 3, Music_JohtoTrainerBattle_Ch3 + channel_count 3 + channel 1, Music_JohtoTrainerBattle_Ch1 + channel 2, Music_JohtoTrainerBattle_Ch2 + channel 3, Music_JohtoTrainerBattle_Ch3 Music_JohtoTrainerBattle_Ch1: tempo 102 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $92 - note __, 8 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 9, 2 + rest 8 octave 3 note A_, 1 note G#, 1 note G_, 1 note G#, 1 - intensity $b2 + volume_envelope 11, 2 note C_, 1 octave 2 note B_, 1 @@ -48,9 +49,9 @@ Music_JohtoTrainerBattle_Ch1: note D_, 2 note E_, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note D_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 6 note D_, 6 note E_, 4 @@ -58,9 +59,9 @@ Music_JohtoTrainerBattle_Ch1: note D_, 2 note E_, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b2 + volume_envelope 11, 2 octave 4 note E_, 6 note E_, 6 @@ -72,9 +73,9 @@ Music_JohtoTrainerBattle_Ch1: octave 3 note A_, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - intensity $b2 + volume_envelope 11, 2 octave 4 note E_, 6 note E_, 6 @@ -83,44 +84,44 @@ Music_JohtoTrainerBattle_Ch1: note D_, 2 note E_, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note G_, 4 -Music_JohtoTrainerBattle_branch_f6102: - intensity $b4 - callchannel Music_JohtoTrainerBattle_branch_f629f - intensity $b7 +.mainloop: + volume_envelope 11, 4 + sound_call .sub1 + volume_envelope 11, 7 note A#, 4 - intensity $b3 + volume_envelope 11, 3 note G_, 1 note F_, 1 note E_, 1 note G_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note C_, 4 - intensity $b3 + volume_envelope 11, 3 octave 3 note A_, 1 note G_, 1 note F_, 1 note A_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note C_, 1 octave 3 note A#, 1 note A_, 1 octave 4 note C_, 1 - intensity $b5 + volume_envelope 11, 5 note F_, 2 note E_, 2 note D_, 2 note C_, 2 - callchannel Music_JohtoTrainerBattle_branch_f629f - intensity $b7 + sound_call .sub1 + volume_envelope 11, 7 note F_, 4 note E_, 2 note F_, 2 @@ -130,12 +131,12 @@ Music_JohtoTrainerBattle_branch_f6102: note A#, 2 octave 4 note C_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note A_, 6 note E_, 6 note A#, 4 @@ -154,11 +155,11 @@ Music_JohtoTrainerBattle_branch_f6102: note A#, 2 note A_, 2 note A#, 2 - intensity $a0 + volume_envelope 10, 0 note A_, 8 - intensity $a7 + volume_envelope 10, 7 note A_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 note D_, 8 note E_, 8 @@ -179,7 +180,7 @@ Music_JohtoTrainerBattle_branch_f6102: note D#, 8 note E_, 8 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 2 octave 4 note C_, 2 @@ -200,34 +201,34 @@ Music_JohtoTrainerBattle_branch_f6102: note C_, 2 octave 3 note A#, 2 - intensity $b5 + volume_envelope 11, 5 note D#, 2 note D_, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 4 - intensity $b7 + volume_envelope 11, 7 note C_, 8 note D#, 4 note C#, 4 note C_, 4 note D#, 4 - intensity $b5 + volume_envelope 11, 5 note E_, 2 note D#, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 8 note F_, 4 note D#, 4 note C#, 4 note F_, 4 - intensity $b5 + volume_envelope 11, 5 note F#, 2 note F_, 2 - intensity $b2 + volume_envelope 11, 2 note F#, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 note F#, 4 note E_, 4 @@ -237,15 +238,15 @@ Music_JohtoTrainerBattle_branch_f6102: note D#, 8 note A#, 8 note G_, 8 - intensity $a0 + volume_envelope 10, 0 note D#, 4 - intensity $a7 + volume_envelope 10, 7 note D#, 12 - note __, 16 -Music_JohtoTrainerBattle_branch_f61bd: - intensity $b7 + rest 16 +.loop1: + volume_envelope 11, 7 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 4 note D#, 4 note F_, 4 @@ -254,10 +255,10 @@ Music_JohtoTrainerBattle_branch_f61bd: note F_, 4 octave 2 note A#, 4 - intensity $b7 + volume_envelope 11, 7 octave 3 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 4 note D#, 4 note F_, 4 @@ -265,60 +266,60 @@ Music_JohtoTrainerBattle_branch_f61bd: note D#, 2 note F_, 4 note F_, 4 - loopchannel 2, Music_JohtoTrainerBattle_branch_f61bd - intensity $b7 + sound_loop 2, .loop1 + volume_envelope 11, 7 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 4 note D#, 4 note F_, 4 note G#, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note G_, 4 note D#, 4 note F_, 4 note G_, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note G_, 4 note D#, 4 note F_, 4 note G_, 2 note D#, 2 - intensity $3f + volume_envelope 3, -7 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - intensity $a0 + volume_envelope 10, 0 octave 4 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $b2 + volume_envelope 11, 2 octave 3 note D#, 6 note D#, 6 note D#, 4 note D#, 6 note D#, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note D#, 6 note D#, 6 note D#, 4 note D#, 6 note D#, 6 - intensity $4c + volume_envelope 4, -4 note F_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 6 note G_, 6 note F_, 4 @@ -365,7 +366,7 @@ Music_JohtoTrainerBattle_branch_f61bd: note G#, 4 note G_, 4 note F_, 4 - intensity $90 + volume_envelope 9, 0 octave 2 note A#, 8 octave 3 @@ -374,44 +375,44 @@ Music_JohtoTrainerBattle_branch_f61bd: note A#, 8 octave 3 note G_, 8 - intensity $a0 + volume_envelope 10, 0 note D#, 8 note A#, 8 note G_, 8 octave 4 note D#, 8 - intensity $a0 + volume_envelope 10, 0 octave 3 note A#, 8 - intensity $a7 + volume_envelope 10, 7 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note G_, 6 note A#, 6 note G#, 2 note G_, 2 - intensity $a0 + volume_envelope 10, 0 note D#, 8 - intensity $a7 + volume_envelope 10, 7 note D#, 8 - intensity $b4 + volume_envelope 11, 4 note A#, 6 note G_, 4 note G_, 2 note A#, 12 - note __, 16 - note __, 8 - intensity $a0 + rest 16 + rest 8 + volume_envelope 10, 0 octave 4 note D_, 4 - intensity $a7 + volume_envelope 10, 7 note D_, 12 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - intensity $b3 - callchannel Music_JohtoTrainerBattle_branch_f629f + volume_envelope 11, 3 + sound_call .sub1 note F_, 4 note E_, 2 note F_, 2 @@ -421,14 +422,14 @@ Music_JohtoTrainerBattle_branch_f61bd: note A#, 2 octave 4 note C_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note F_, 10 - intensity $a7 + volume_envelope 10, 7 note F_, 6 - loopchannel 0, Music_JohtoTrainerBattle_branch_f6102 + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f629f: +.sub1: octave 3 note E_, 2 note D_, 2 @@ -448,13 +449,13 @@ Music_JohtoTrainerBattle_branch_f629f: note E_, 2 note F_, 2 note D_, 2 - endchannel + sound_ret Music_JohtoTrainerBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 octave 4 note G#, 1 note G_, 1 @@ -493,65 +494,65 @@ Music_JohtoTrainerBattle_Ch2: note A#, 1 note A_, 1 note A#, 1 - intensity $c2 + volume_envelope 12, 2 octave 4 note A_, 6 - callchannel Music_JohtoTrainerBattle_branch_f649a - intensity $c2 + sound_call .sub1 + volume_envelope 12, 2 note A_, 6 - callchannel Music_JohtoTrainerBattle_branch_f649a - intensity $c2 + sound_call .sub1 + volume_envelope 12, 2 octave 5 note C_, 6 note C_, 6 note C_, 4 note C_, 6 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note C#, 4 - intensity $c2 + volume_envelope 12, 2 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 note A_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 note A_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 note B_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 4 note C_, 2 note E_, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 -Music_JohtoTrainerBattle_branch_f632a: - callchannel Music_JohtoTrainerBattle_branch_f64a3 - intensity $3e +.mainloop: + sound_call .sub2 + volume_envelope 3, -6 note A#, 8 - intensity $c7 + volume_envelope 12, 7 note A#, 8 - callchannel Music_JohtoTrainerBattle_branch_f64a3 - intensity $c4 + sound_call .sub2 + volume_envelope 12, 4 note D_, 4 octave 3 note A#, 2 @@ -570,30 +571,30 @@ Music_JohtoTrainerBattle_branch_f632a: note A#, 2 octave 5 note D_, 2 - intensity $b0 + volume_envelope 11, 0 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note A#, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 16 - intensity $b7 + volume_envelope 11, 7 note A_, 16 -Music_JohtoTrainerBattle_branch_f635a: - intensity $c3 +.loop1: + volume_envelope 12, 3 octave 3 note A_, 2 note G_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note G_, 2 note A#, 2 - loopchannel 3, Music_JohtoTrainerBattle_branch_f635a + sound_loop 3, .loop1 note A_, 2 octave 4 note D_, 2 @@ -604,17 +605,17 @@ Music_JohtoTrainerBattle_branch_f635a: note G_, 2 note A_, 2 note A#, 2 -Music_JohtoTrainerBattle_branch_f6376: +.loop2: note G_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note G#, 4 - intensity $c3 + volume_envelope 12, 3 note G_, 2 note F_, 2 note G#, 2 - loopchannel 3, Music_JohtoTrainerBattle_branch_f6376 + sound_loop 3, .loop2 note F_, 2 octave 4 note C_, 2 @@ -625,7 +626,7 @@ Music_JohtoTrainerBattle_branch_f6376: note F_, 2 note G_, 2 note G#, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 6 octave 4 note D_, 6 @@ -635,15 +636,15 @@ Music_JohtoTrainerBattle_branch_f6376: note E_, 4 note D_, 4 note C_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - intensity $90 + volume_envelope 9, 0 note G_, 8 - intensity $97 + volume_envelope 9, 7 note G_, 8 - intensity $c7 + volume_envelope 12, 7 octave 3 note F_, 8 note D#, 4 @@ -666,23 +667,23 @@ Music_JohtoTrainerBattle_branch_f6376: note G#, 4 note F#, 4 note A_, 4 - intensity $b0 + volume_envelope 11, 0 note A#, 8 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $62 - callchannel Music_JohtoTrainerBattle_branch_f64b6 - intensity $82 - callchannel Music_JohtoTrainerBattle_branch_f64b6 - intensity $92 - callchannel Music_JohtoTrainerBattle_branch_f64b6 - intensity $a2 - callchannel Music_JohtoTrainerBattle_branch_f64b6 -Music_JohtoTrainerBattle_branch_f63dd: + volume_envelope 6, 2 + sound_call .sub3 + volume_envelope 8, 2 + sound_call .sub3 + volume_envelope 9, 2 + sound_call .sub3 + volume_envelope 10, 2 + sound_call .sub3 +.loop3: octave 4 note D#, 2 octave 3 @@ -699,30 +700,30 @@ Music_JohtoTrainerBattle_branch_f63dd: note G_, 2 octave 3 note A#, 2 - loopchannel 8, Music_JohtoTrainerBattle_branch_f63dd - callchannel Music_JohtoTrainerBattle_branch_f64be + sound_loop 8, .loop3 + sound_call .sub4 octave 3 note A#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 8 - callchannel Music_JohtoTrainerBattle_branch_f64be + sound_call .sub4 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - callchannel Music_JohtoTrainerBattle_branch_f64be + sound_call .sub4 octave 3 note A#, 2 - intensity $b0 + volume_envelope 11, 0 octave 4 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $1f + volume_envelope 1, -7 note D#, 12 - intensity $c7 + volume_envelope 12, 7 note D#, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note G_, 4 note D#, 2 @@ -732,32 +733,32 @@ Music_JohtoTrainerBattle_branch_f63dd: note F_, 2 note D#, 2 note G_, 6 - intensity $c7 + volume_envelope 12, 7 note G#, 4 - intensity $c2 + volume_envelope 12, 2 note G_, 4 note D#, 2 note G_, 6 note G_, 4 note G_, 6 note G_, 6 - intensity $4c + volume_envelope 4, -4 note G#, 4 - callchannel Music_JohtoTrainerBattle_branch_f64d2 - intensity $b0 + sound_call .sub5 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - callchannel Music_JohtoTrainerBattle_branch_f64d2 - intensity $b0 + sound_call .sub5 + volume_envelope 11, 0 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 8 - intensity $c7 + volume_envelope 12, 7 note C#, 4 note C_, 4 octave 3 @@ -782,20 +783,20 @@ Music_JohtoTrainerBattle_branch_f63dd: note A#, 6 note G#, 2 note G_, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c7 + volume_envelope 12, 7 note D#, 6 note A#, 6 note G#, 2 note G_, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c7 + volume_envelope 12, 7 octave 3 note A_, 6 octave 4 @@ -806,16 +807,16 @@ Music_JohtoTrainerBattle_branch_f63dd: note F#, 4 note E_, 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - callchannel Music_JohtoTrainerBattle_branch_f64a3 - intensity $c7 + sound_call .sub2 + volume_envelope 12, 7 note D_, 4 octave 3 note A#, 2 @@ -825,20 +826,20 @@ Music_JohtoTrainerBattle_branch_f63dd: note E_, 2 note D_, 2 note F_, 2 - loopchannel 0, Music_JohtoTrainerBattle_branch_f632a + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f649a: +.sub1: octave 3 note A_, 6 note A_, 4 note A_, 6 note A_, 6 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64a3: - intensity $c7 +.sub2: + volume_envelope 12, 7 octave 3 note A_, 6 octave 4 @@ -849,13 +850,13 @@ Music_JohtoTrainerBattle_branch_f64a3: note F#, 4 note E_, 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64b6: +.sub3: octave 3 note A#, 2 note D#, 2 @@ -863,13 +864,13 @@ Music_JohtoTrainerBattle_branch_f64b6: note D#, 2 octave 3 note D#, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64be: - intensity $c7 +.sub4: + volume_envelope 12, 7 octave 4 note F_, 4 - intensity $c4 + volume_envelope 12, 4 octave 3 note A#, 2 octave 4 @@ -883,10 +884,10 @@ Music_JohtoTrainerBattle_branch_f64be: note D_, 1 note D#, 1 note F_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64d2: - intensity $c7 +.sub5: + volume_envelope 12, 7 octave 4 note D#, 6 note A#, 6 @@ -896,10 +897,10 @@ Music_JohtoTrainerBattle_branch_f64d2: note G_, 4 note F_, 4 note D#, 4 - endchannel + sound_ret Music_JohtoTrainerBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 4 note E_, 1 note D#, 1 @@ -932,7 +933,7 @@ Music_JohtoTrainerBattle_Ch3: note A#, 2 note A_, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6501: +.loop1: note A_, 2 note E_, 2 note F#, 2 @@ -941,7 +942,7 @@ Music_JohtoTrainerBattle_branch_f6501: note F#, 2 note G_, 2 note E_, 2 - loopchannel 3, Music_JohtoTrainerBattle_branch_f6501 + sound_loop 3, .loop1 note A_, 2 note E_, 2 note F#, 2 @@ -950,7 +951,7 @@ Music_JohtoTrainerBattle_branch_f6501: note F#, 2 note G_, 2 note G#, 2 - callchannel Music_JohtoTrainerBattle_branch_f6676 + sound_call .sub1 octave 4 note C_, 2 octave 3 @@ -963,7 +964,7 @@ Music_JohtoTrainerBattle_branch_f6501: note C_, 2 octave 3 note A#, 2 - callchannel Music_JohtoTrainerBattle_branch_f6676 + sound_call .sub1 octave 4 note C_, 2 octave 3 @@ -974,16 +975,16 @@ Music_JohtoTrainerBattle_branch_f6501: note A_, 2 note A#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f6531: - callchannel Music_JohtoTrainerBattle_branch_f6681 +.mainloop: + sound_call .sub2 note E_, 2 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f6681 + sound_call .sub3 + sound_call .sub3 + sound_call .sub2 note A_, 2 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f669d + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 note E_, 2 note A_, 2 note E_, 2 @@ -992,7 +993,7 @@ Music_JohtoTrainerBattle_branch_f6531: note D_, 2 note E_, 2 note F_, 2 - callchannel Music_JohtoTrainerBattle_branch_f669d + sound_call .sub4 note E_, 2 octave 4 note F_, 2 @@ -1003,7 +1004,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G#, 2 note A_, 2 note A#, 2 - callchannel Music_JohtoTrainerBattle_branch_f66a5 + sound_call .sub5 note D_, 2 note A_, 2 note D_, 2 @@ -1012,7 +1013,7 @@ Music_JohtoTrainerBattle_branch_f6531: note A_, 2 note G_, 2 note A_, 2 - callchannel Music_JohtoTrainerBattle_branch_f66a5 + sound_call .sub5 note D_, 2 octave 4 note D_, 2 @@ -1023,7 +1024,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G_, 2 note A_, 2 note A#, 2 - callchannel Music_JohtoTrainerBattle_branch_f66ac + sound_call .sub6 note C_, 2 note G_, 2 note C_, 2 @@ -1032,7 +1033,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoTrainerBattle_branch_f66ac + sound_call .sub6 note C_, 2 octave 4 note C_, 2 @@ -1047,7 +1048,7 @@ Music_JohtoTrainerBattle_branch_f6531: note F_, 8 note E_, 8 note D#, 8 -Music_JohtoTrainerBattle_branch_f6591: +.loop2: octave 3 note D#, 2 note A#, 2 @@ -1058,8 +1059,8 @@ Music_JohtoTrainerBattle_branch_f6591: note A_, 2 octave 4 note C_, 2 - loopchannel 2, Music_JohtoTrainerBattle_branch_f6591 - callchannel Music_JohtoTrainerBattle_branch_f66ac + sound_loop 2, .loop2 + sound_call .sub6 note C_, 2 octave 4 note C_, 2 @@ -1070,42 +1071,42 @@ Music_JohtoTrainerBattle_branch_f6591: note F_, 2 note D#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f65ac: +.loop3: note C#, 2 note G#, 2 - loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac + sound_loop 7, .loop3 note B_, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65b4: +.loop4: note D_, 2 note A_, 2 - loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4 + sound_loop 5, .loop4 note B_, 2 note A_, 2 note G#, 2 note F#, 2 note G#, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65c0: +.loop5: note A#, 4 note D#, 4 - loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0 -Music_JohtoTrainerBattle_branch_f65c6: + sound_loop 4, .loop5 +.loop6: octave 4 note G_, 4 octave 3 note A#, 4 - loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6 -Music_JohtoTrainerBattle_branch_f65ce: - callchannel Music_JohtoTrainerBattle_branch_f66b4 + sound_loop 4, .loop6 +.loop7: + sound_call .sub7 note D#, 2 note F_, 8 - callchannel Music_JohtoTrainerBattle_branch_f66b4 + sound_call .sub7 octave 4 note C_, 2 octave 3 note A#, 8 - loopchannel 2, Music_JohtoTrainerBattle_branch_f65ce + sound_loop 2, .loop7 octave 4 note C#, 8 note C_, 8 @@ -1170,28 +1171,28 @@ Music_JohtoTrainerBattle_branch_f65ce: note C_, 2 octave 3 note A#, 2 -Music_JohtoTrainerBattle_branch_f661e: +.loop8: note D#, 2 note A#, 2 - loopchannel 8, Music_JohtoTrainerBattle_branch_f661e -Music_JohtoTrainerBattle_branch_f6624: + sound_loop 8, .loop8 +.loop9: note C#, 2 note G#, 2 - loopchannel 6, Music_JohtoTrainerBattle_branch_f6624 + sound_loop 6, .loop9 note C#, 2 octave 4 note C_, 2 octave 3 note A#, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6630: +.loop10: note D#, 2 note A#, 2 - loopchannel 8, Music_JohtoTrainerBattle_branch_f6630 -Music_JohtoTrainerBattle_branch_f6636: + sound_loop 8, .loop10 +.loop11: note C#, 2 note G#, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f6636 + sound_loop 4, .loop11 note C#, 2 octave 4 note C#, 2 @@ -1240,15 +1241,15 @@ Music_JohtoTrainerBattle_branch_f6636: note A#, 16 octave 4 note D_, 8 - note __, 2 + rest 2 octave 3 note A_, 2 note A#, 2 octave 4 note D_, 2 - loopchannel 0, Music_JohtoTrainerBattle_branch_f6531 + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f6676: +.sub1: octave 4 note C_, 2 octave 3 @@ -1259,9 +1260,9 @@ Music_JohtoTrainerBattle_branch_f6676: note A_, 2 note A#, 2 note G_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f6681: +.sub2: octave 3 note E_, 2 note A_, 2 @@ -1278,9 +1279,9 @@ Music_JohtoTrainerBattle_branch_f6681: note E_, 2 note F#, 2 note G_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f6692: +.sub3: octave 3 note F_, 2 note A#, 2 @@ -1291,29 +1292,32 @@ Music_JohtoTrainerBattle_branch_f6692: note A#, 2 octave 4 note D_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f669d: +.sub4: +.sub4loop1: octave 3 note E_, 2 note A_, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f669d - endchannel + sound_loop 4, .sub4loop1 + sound_ret -Music_JohtoTrainerBattle_branch_f66a5: +.sub5: +.sub5loop1: note D_, 2 note A_, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5 - endchannel + sound_loop 4, .sub5loop1 + sound_ret -Music_JohtoTrainerBattle_branch_f66ac: +.sub6: +.sub6loop1: octave 3 note C_, 2 note G_, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac - endchannel + sound_loop 4, .sub6loop1 + sound_ret -Music_JohtoTrainerBattle_branch_f66b4: +.sub7: note A#, 4 note D#, 2 note A#, 2 @@ -1328,4 +1332,4 @@ Music_JohtoTrainerBattle_branch_f66b4: note G_, 1 note G#, 1 note A#, 2 - endchannel + sound_ret diff --git a/crysaudio/music/johtowildbattle.asm b/crysaudio/music/johtowildbattle.asm index 3c104e11..7377810e 100644 --- a/crysaudio/music/johtowildbattle.asm +++ b/crysaudio/music/johtowildbattle.asm @@ -1,16 +1,17 @@ Music_JohtoWildBattle: - musicheader 3, 1, Music_JohtoWildBattle_Ch1 - musicheader 1, 2, Music_JohtoWildBattle_Ch2 - musicheader 1, 3, Music_JohtoWildBattle_Ch3 + channel_count 3 + channel 1, Music_JohtoWildBattle_Ch1 + channel 2, Music_JohtoWildBattle_Ch2 + channel 3, Music_JohtoWildBattle_Ch3 Music_JohtoWildBattle_Ch1: tempo 104 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 -Music_JohtoWildBattleNight_branch_f5ddb: - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 +.body: + note_type 12, 11, 2 octave 4 note C_, 1 octave 3 @@ -49,7 +50,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: octave 3 note C_, 1 note C#, 1 - intensity $b2 + volume_envelope 11, 2 note G_, 6 octave 2 note A#, 6 @@ -65,9 +66,9 @@ Music_JohtoWildBattleNight_branch_f5ddb: note D#, 4 note C_, 4 note D_, 4 - intensity $b5 + volume_envelope 11, 5 note D#, 8 - intensity $b2 + volume_envelope 11, 2 octave 4 note D_, 6 octave 3 @@ -84,10 +85,10 @@ Music_JohtoWildBattleNight_branch_f5ddb: note D#, 4 note C_, 4 note D_, 4 - intensity $6f + volume_envelope 6, -7 note D#, 8 -Music_JohtoWildBattle_branch_f5e2d: - intensity $b6 +.mainloop: + volume_envelope 11, 6 octave 3 note D_, 6 octave 2 @@ -167,7 +168,7 @@ Music_JohtoWildBattle_branch_f5e2d: note D#, 8 note C#, 8 note F#, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 6 note D_, 6 note E_, 4 @@ -198,17 +199,17 @@ Music_JohtoWildBattle_branch_f5e2d: note D_, 4 note F#, 4 note G_, 16 - loopchannel 0, Music_JohtoWildBattle_branch_f5e2d + sound_loop 0, .mainloop Music_JohtoWildBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - callchannel Music_JohtoWildBattle_branch_f5f5d - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + sound_call .sub1 + note_type 12, 12, 2 octave 4 note G_, 6 -Music_JohtoWildBattleNight_branch_f5eb2: +.body: octave 3 note D_, 6 note G_, 4 @@ -220,9 +221,9 @@ Music_JohtoWildBattleNight_branch_f5eb2: note G#, 4 note F_, 4 note G_, 4 - intensity $c7 + volume_envelope 12, 7 note G#, 8 - intensity $c2 + volume_envelope 12, 2 octave 4 note G_, 6 note D_, 6 @@ -235,10 +236,10 @@ Music_JohtoWildBattleNight_branch_f5eb2: note G#, 4 note F_, 4 note G_, 4 - intensity $6f + volume_envelope 6, -7 note G#, 8 -Music_JohtoWildBattle_branch_f5ed1: - intensity $c4 +.mainloop: + volume_envelope 12, 4 octave 3 note G_, 6 note D_, 6 @@ -255,11 +256,11 @@ Music_JohtoWildBattle_branch_f5ed1: note A_, 2 octave 4 note C#, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 16 - intensity $c4 + volume_envelope 12, 4 octave 3 note G_, 6 note D_, 6 @@ -271,11 +272,11 @@ Music_JohtoWildBattle_branch_f5ed1: note B_, 4 note A_, 4 note B_, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 16 - intensity $b6 + volume_envelope 11, 6 note A_, 16 - intensity $c4 + volume_envelope 12, 4 note G#, 6 note D#, 6 note D#, 2 @@ -291,11 +292,11 @@ Music_JohtoWildBattle_branch_f5ed1: note A#, 2 octave 4 note D_, 2 - intensity $b0 + volume_envelope 11, 0 note E_, 16 - intensity $b7 + volume_envelope 11, 7 note E_, 16 - intensity $c4 + volume_envelope 12, 4 octave 3 note G#, 6 note D#, 6 @@ -307,11 +308,11 @@ Music_JohtoWildBattle_branch_f5ed1: octave 3 note A#, 4 note G#, 4 - intensity $b0 + volume_envelope 11, 0 note A#, 16 - intensity $b5 + volume_envelope 11, 5 note A#, 16 - intensity $c6 + volume_envelope 12, 6 octave 4 note B_, 12 note G_, 2 @@ -341,7 +342,7 @@ Music_JohtoWildBattle_branch_f5ed1: note A_, 2 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 note D_, 16 note G_, 8 octave 5 @@ -360,11 +361,10 @@ Music_JohtoWildBattle_branch_f5ed1: note G_, 4 note A#, 4 note B_, 16 - loopchannel 0, Music_JohtoWildBattle_branch_f5ed1 + sound_loop 0, .mainloop -Music_JohtoWildBattleNight_branch_f5f5d: -Music_JohtoWildBattle_branch_f5f5d: - notetype $c, $c2 +.sub1: + note_type 12, 12, 2 octave 4 note F_, 1 note F#, 1 @@ -413,11 +413,11 @@ Music_JohtoWildBattle_branch_f5f5d: note G_, 1 octave 5 note G_, 1 - endchannel + sound_ret Music_JohtoWildBattle_Ch3: - notetype $c, $14 -Music_JohtoWildBattleNight_branch_f5f94: + note_type 12, 1, 4 +.body: octave 4 note G_, 2 octave 5 @@ -457,7 +457,7 @@ Music_JohtoWildBattleNight_branch_f5f94: note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -466,15 +466,15 @@ Music_JohtoWildBattleNight_branch_f5f94: note D#, 2 note G_, 2 note F_, 2 -Music_JohtoWildBattle_branch_f5fc6: +.loop1: note D_, 2 note G_, 2 - loopchannel 6, Music_JohtoWildBattle_branch_f5fc6 + sound_loop 6, .loop1 note D_, 2 note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note F_, 2 note F_, 2 note G_, 2 @@ -483,30 +483,31 @@ Music_JohtoWildBattle_branch_f5fc6: note G_, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f5fdb: +.mainloop: +.loop2: note D_, 2 note G_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f5fdb + sound_loop 7, .loop2 note F#, 4 - callchannel Music_JohtoWildBattle_branch_f6055 - callchannel Music_JohtoWildBattle_branch_f6055 -Music_JohtoWildBattle_branch_f5fe8: + sound_call .sub1 + sound_call .sub1 +.loop3: note D_, 2 note G_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f5fe8 + sound_loop 7, .loop3 note D_, 2 note A_, 2 -Music_JohtoWildBattle_branch_f5ff0: +.loop4: note C_, 2 note F_, 2 - loopchannel 5, Music_JohtoWildBattle_branch_f5ff0 + sound_loop 5, .loop4 note E_, 2 note D_, 2 note C_, 2 note D_, 2 note E_, 2 note F_, 2 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -514,11 +515,11 @@ Music_JohtoWildBattle_branch_f5ff0: note D#, 2 note G#, 2 note G_, 4 -Music_JohtoWildBattle_branch_f6006: +.loop5: note E_, 2 note A_, 2 - loopchannel 8, Music_JohtoWildBattle_branch_f6006 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_loop 8, .loop5 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -543,42 +544,43 @@ Music_JohtoWildBattle_branch_f6006: note F#, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f6027: +.loop6: note D_, 2 note G_, 2 - loopchannel 8, Music_JohtoWildBattle_branch_f6027 -Music_JohtoWildBattle_branch_f602d: + sound_loop 8, .loop6 +.loop7: note C_, 2 note F_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f602d + sound_loop 7, .loop7 note E_, 2 note C_, 2 note D_, 4 note G_, 4 note D_, 4 note G_, 4 -Music_JohtoWildBattle_branch_f6039: +.loop8: note D_, 2 note G_, 2 - loopchannel 12, Music_JohtoWildBattle_branch_f6039 -Music_JohtoWildBattle_branch_f603f: + sound_loop 12, .loop8 +.loop9: note C_, 2 note E_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f603f + sound_loop 7, .loop9 note F_, 2 note F#, 2 -Music_JohtoWildBattle_branch_f6047: +.loop10: note D_, 2 note G_, 2 - loopchannel 6, Music_JohtoWildBattle_branch_f6047 + sound_loop 6, .loop10 note A_, 2 note G_, 2 note F#, 2 note E_, 2 - loopchannel 0, Music_JohtoWildBattle_branch_f5fdb + sound_loop 0, .mainloop -Music_JohtoWildBattle_branch_f6055: +.sub1: +.sub1loop1: note D#, 2 note G#, 2 - loopchannel 4, Music_JohtoWildBattle_branch_f6055 - endchannel + sound_loop 4, .sub1loop1 + sound_ret diff --git a/crysaudio/music/johtowildbattlenight.asm b/crysaudio/music/johtowildbattlenight.asm index b4b1651b..efba350d 100644 --- a/crysaudio/music/johtowildbattlenight.asm +++ b/crysaudio/music/johtowildbattlenight.asm @@ -1,28 +1,29 @@ Music_JohtoWildBattleNight: - musicheader 3, 1, Music_JohtoWildBattleNight_Ch1 - musicheader 1, 2, Music_JohtoWildBattleNight_Ch2 - musicheader 1, 3, Music_JohtoWildBattleNight_Ch3 + channel_count 3 + channel 1, Music_JohtoWildBattleNight_Ch1 + channel 2, Music_JohtoWildBattleNight_Ch2 + channel 3, Music_JohtoWildBattleNight_Ch3 Music_JohtoWildBattleNight_Ch1: tempo 107 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $25 - loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 2, 5 + sound_loop 0, Music_JohtoWildBattle_Ch1.body Music_JohtoWildBattleNight_Ch2: - dutycycle $3 - vibrato $20, $36 - tone $0001 - callchannel Music_JohtoWildBattleNight_branch_f5f5d - notetype $c, $c2 + duty_cycle 3 + vibrato 32, 3, 6 + pitch_offset 1 + sound_call Music_JohtoWildBattle_Ch2.sub1 + note_type 12, 12, 2 octave 4 note G_, 6 - tone $0001 - dutycycle $2 - loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2 + pitch_offset 1 + duty_cycle 2 + sound_loop 0, Music_JohtoWildBattle_Ch2.body Music_JohtoWildBattleNight_Ch3: - notetype $c, $11 - loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 + note_type 12, 1, 1 + sound_loop 0, Music_JohtoWildBattle_Ch3.body diff --git a/crysaudio/music/kantogymbattle.asm b/crysaudio/music/kantogymbattle.asm index 7ba65a42..b70f4344 100644 --- a/crysaudio/music/kantogymbattle.asm +++ b/crysaudio/music/kantogymbattle.asm @@ -1,15 +1,16 @@ Music_KantoGymBattle: - musicheader 3, 1, Music_KantoGymBattle_Ch1 - musicheader 1, 2, Music_KantoGymBattle_Ch2 - musicheader 1, 3, Music_KantoGymBattle_Ch3 + channel_count 3 + channel 1, Music_KantoGymBattle_Ch1 + channel 2, Music_KantoGymBattle_Ch2 + channel 3, Music_KantoGymBattle_Ch3 Music_KantoGymBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 2 octave 3 note A#, 1 note A_, 1 @@ -52,19 +53,19 @@ Music_KantoGymBattle_Ch1: note A#, 6 note A#, 2 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note B_, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note A#, 6 note A#, 2 note A#, 6 note A#, 2 note A#, 8 - intensity $b7 + volume_envelope 11, 7 octave 3 note E_, 2 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 6 @@ -72,39 +73,39 @@ Music_KantoGymBattle_Ch1: note A#, 6 note A#, 2 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note B_, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note A#, 6 note A#, 2 note A#, 6 note A#, 2 - intensity $b4 + volume_envelope 11, 4 octave 3 note E_, 4 note E_, 4 note E_, 2 -Music_KantoGymBattle_branch_ec78b: - callchannel Music_KantoGymBattle_branch_ec832 +.mainloop: + sound_call .sub1 octave 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 8 note B_, 8 octave 3 note D#, 10 note E_, 6 - callchannel Music_KantoGymBattle_branch_ec832 + sound_call .sub1 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note C#, 8 octave 2 note B_, 8 note G#, 10 octave 3 note E_, 6 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 note G_, 1 @@ -124,9 +125,9 @@ Music_KantoGymBattle_branch_ec78b: note G#, 1 note B_, 1 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 note G_, 1 @@ -146,7 +147,7 @@ Music_KantoGymBattle_branch_ec78b: note G#, 1 note B_, 1 note G#, 2 - intensity $b5 + volume_envelope 11, 5 note B_, 2 note D#, 2 note C#, 2 @@ -166,13 +167,13 @@ Music_KantoGymBattle_branch_ec78b: note A#, 2 octave 3 note C#, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note B_, 8 note A#, 8 note G#, 10 note B_, 6 - intensity $b5 + volume_envelope 11, 5 octave 3 note D#, 2 note C#, 2 @@ -192,45 +193,45 @@ Music_KantoGymBattle_branch_ec78b: note A#, 2 octave 3 note C#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 8 note F#, 8 note G_, 16 - intensity $b2 + volume_envelope 11, 2 octave 2 note G#, 2 note G#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note C#, 12 - intensity $b2 + volume_envelope 11, 2 note G#, 2 note F_, 4 - intensity $b5 + volume_envelope 11, 5 octave 2 note F_, 4 note G_, 2 note G#, 2 note A#, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 12 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note G_, 4 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 6 - intensity $4c + volume_envelope 4, -4 octave 3 note D_, 4 - loopchannel 0, Music_KantoGymBattle_branch_ec78b + sound_loop 0, .mainloop -Music_KantoGymBattle_branch_ec832: - intensity $b5 +.sub1: + volume_envelope 11, 5 note D#, 2 octave 2 note A#, 2 @@ -249,24 +250,24 @@ Music_KantoGymBattle_branch_ec832: note E_, 2 note D#, 2 note C#, 2 - endchannel + sound_ret Music_KantoGymBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 -Music_KantoGymBattle_branch_ec852: + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 +.loop1: octave 4 note A#, 1 note G#, 1 note A#, 1 octave 5 note D#, 1 - loopchannel 8, Music_KantoGymBattle_branch_ec852 + sound_loop 8, .loop1 octave 3 -Music_KantoGymBattle_branch_ec85d: - intensity $c2 +.loop2: + volume_envelope 12, 2 note D#, 2 note D#, 2 note F#, 1 @@ -286,9 +287,9 @@ Music_KantoGymBattle_branch_ec85d: note G#, 1 note B_, 1 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note E_, 2 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 note F#, 1 @@ -308,38 +309,38 @@ Music_KantoGymBattle_branch_ec85d: note G#, 1 note B_, 1 note G#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 - loopchannel 2, Music_KantoGymBattle_branch_ec85d -Music_KantoGymBattle_branch_ec894: - callchannel Music_KantoGymBattle_branch_ec907 + sound_loop 2, .loop2 +.mainloop: + sound_call .sub1 note E_, 8 note G#, 8 note B_, 10 note G#, 6 - callchannel Music_KantoGymBattle_branch_ec907 + sound_call .sub1 note E_, 8 note G#, 8 note B_, 10 octave 4 note E_, 6 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $a2 - note __, 6 + volume_envelope 10, 2 + rest 6 octave 5 note E_, 4 note E_, 4 note E_, 2 - intensity $a0 + volume_envelope 10, 0 note D#, 8 - intensity $a7 + volume_envelope 10, 7 note D#, 8 - note __, 12 - intensity $c5 + rest 12 + volume_envelope 12, 5 octave 3 note A#, 4 note B_, 4 @@ -348,12 +349,12 @@ Music_KantoGymBattle_branch_ec894: note B_, 4 note G#, 4 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 8 note D#, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 12 - intensity $c5 + volume_envelope 12, 5 note A#, 4 note B_, 4 note G#, 4 @@ -361,64 +362,64 @@ Music_KantoGymBattle_branch_ec894: note B_, 4 note G#, 4 note B_, 4 - intensity $b0 + volume_envelope 11, 0 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c2 + volume_envelope 12, 2 octave 3 note C#, 2 note C#, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - intensity $c2 + volume_envelope 12, 2 octave 4 note C#, 4 note F_, 2 note C#, 4 - intensity $c7 + volume_envelope 12, 7 note G#, 4 note G_, 2 note F_, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 8 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 4 note G_, 2 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note A#, 6 octave 3 note A_, 4 - loopchannel 0, Music_KantoGymBattle_branch_ec894 + sound_loop 0, .mainloop -Music_KantoGymBattle_branch_ec907: - dutycycle $2 - intensity $d1 +.sub1: + duty_cycle 2 + volume_envelope 13, 1 octave 3 note A#, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 2 - intensity $d1 + volume_envelope 13, 1 note G#, 2 - intensity $a2 + volume_envelope 10, 2 note G#, 2 - intensity $d1 + volume_envelope 13, 1 note A#, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 2 - intensity $c5 + volume_envelope 12, 5 note B_, 2 octave 4 note C#, 2 @@ -430,69 +431,70 @@ Music_KantoGymBattle_branch_ec907: note F#, 2 note G#, 2 note A#, 2 - dutycycle $3 - intensity $b0 - endchannel + duty_cycle 3 + volume_envelope 11, 0 + sound_ret Music_KantoGymBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 2 note E_, 1 - note __, 1 -Music_KantoGymBattle_branch_ec934: + rest 1 +.loop1: note B_, 3 - note __, 1 - loopchannel 6, Music_KantoGymBattle_branch_ec934 + rest 1 + sound_loop 6, .loop1 note B_, 2 note G#, 2 note B_, 2 -Music_KantoGymBattle_branch_ec93d: +.loop2: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D_, 1 - note __, 1 + rest 1 note F_, 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note E_, 2 - loopchannel 2, Music_KantoGymBattle_branch_ec93d -Music_KantoGymBattle_branch_ec965: + sound_loop 2, .loop2 +.mainloop: +.loop3: octave 2 note D#, 2 note A#, 2 - loopchannel 8, Music_KantoGymBattle_branch_ec965 -Music_KantoGymBattle_branch_ec96c: + sound_loop 8, .loop3 +.loop4: note E_, 2 note B_, 2 - loopchannel 4, Music_KantoGymBattle_branch_ec96c + sound_loop 4, .loop4 octave 1 note B_, 2 octave 2 @@ -506,45 +508,45 @@ Music_KantoGymBattle_branch_ec96c: note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec97f: +.loop5: octave 2 note F#, 2 octave 3 note C#, 2 - loopchannel 8, Music_KantoGymBattle_branch_ec97f -Music_KantoGymBattle_branch_ec987: + sound_loop 8, .loop5 +.loop6: octave 2 note E_, 2 note B_, 2 - loopchannel 7, Music_KantoGymBattle_branch_ec987 + sound_loop 7, .loop6 octave 3 note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec992: +.loop7: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note E_, 2 - loopchannel 2, Music_KantoGymBattle_branch_ec992 -Music_KantoGymBattle_branch_ec9a8: + sound_loop 2, .loop7 +.loop8: note D#, 2 note A#, 2 - loopchannel 7, Music_KantoGymBattle_branch_ec9a8 + sound_loop 7, .loop8 octave 3 note C#, 2 octave 2 @@ -558,17 +560,17 @@ Music_KantoGymBattle_branch_ec9a8: note B_, 2 octave 3 note E_, 2 -Music_KantoGymBattle_branch_ec9bb: +.loop9: octave 2 note E_, 2 note B_, 2 - loopchannel 5, Music_KantoGymBattle_branch_ec9bb -Music_KantoGymBattle_branch_ec9c2: + sound_loop 5, .loop9 +.loop10: octave 2 note F#, 2 octave 3 note C#, 2 - loopchannel 7, Music_KantoGymBattle_branch_ec9c2 + sound_loop 7, .loop10 octave 2 note A#, 2 octave 3 @@ -583,19 +585,19 @@ Music_KantoGymBattle_branch_ec9c2: note F#, 2 note E_, 2 note C#, 2 -Music_KantoGymBattle_branch_ec9d8: +.loop11: octave 2 note D#, 2 note A#, 2 - loopchannel 4, Music_KantoGymBattle_branch_ec9d8 -Music_KantoGymBattle_branch_ec9df: + sound_loop 4, .loop11 +.loop12: note C#, 2 note G#, 2 - loopchannel 8, Music_KantoGymBattle_branch_ec9df -Music_KantoGymBattle_branch_ec9e5: + sound_loop 8, .loop12 +.loop13: note D#, 2 note A#, 2 - loopchannel 4, Music_KantoGymBattle_branch_ec9e5 + sound_loop 4, .loop13 octave 3 note D#, 2 octave 2 @@ -607,4 +609,4 @@ Music_KantoGymBattle_branch_ec9e5: octave 3 note D#, 2 note F_, 2 - loopchannel 0, Music_KantoGymBattle_branch_ec965 + sound_loop 0, .mainloop diff --git a/crysaudio/music/kantotrainerbattle.asm b/crysaudio/music/kantotrainerbattle.asm index 511763c9..d40ab0f3 100644 --- a/crysaudio/music/kantotrainerbattle.asm +++ b/crysaudio/music/kantotrainerbattle.asm @@ -1,18 +1,19 @@ Music_KantoTrainerBattle: - musicheader 3, 1, Music_KantoTrainerBattle_Ch1 - musicheader 1, 2, Music_KantoTrainerBattle_Ch2 - musicheader 1, 3, Music_KantoTrainerBattle_Ch3 + channel_count 3 + channel 1, Music_KantoTrainerBattle_Ch1 + channel 2, Music_KantoTrainerBattle_Ch2 + channel 3, Music_KantoTrainerBattle_Ch3 - db $3 + db $3 ; unused Music_KantoTrainerBattle_Ch1: tempo 114 - volume $77 - pitchoffset 1, B_ - notetype $c, $b3 - vibrato $12, $24 - dutycycle $1 - note __, 1 + volume 7, 7 + transpose 1, 11 + note_type 12, 11, 3 + vibrato 18, 2, 4 + duty_cycle 1 + rest 1 octave 4 note A_, 1 note G#, 1 @@ -48,90 +49,90 @@ Music_KantoTrainerBattle_Ch1: note G_, 1 note F#, 1 note G_, 1 - dutycycle $2 - intensity $b1 + duty_cycle 2 + volume_envelope 11, 1 octave 4 note D#, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note D#, 2 - note __, 2 + rest 2 octave 3 note A#, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 3 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note D#, 2 - note __, 2 + rest 2 octave 3 note A#, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $b3 + rest 1 + volume_envelope 11, 3 note D#, 2 - note __, 4 + rest 4 note F_, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note F_, 2 note F#, 2 -Music_KantoTrainerBattle_branch_eca88: - notetype $c, $b7 +.mainloop: + note_type 12, 11, 7 note D#, 4 - note __, 2 + rest 2 note C_, 10 - note __, 4 + rest 4 note D#, 2 note C_, 2 octave 3 @@ -139,11 +140,11 @@ Music_KantoTrainerBattle_branch_eca88: octave 4 note C_, 1 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 8 note F_, 8 note G#, 8 @@ -155,9 +156,9 @@ Music_KantoTrainerBattle_branch_eca88: note F_, 1 note C#, 1 note D#, 4 - note __, 2 + rest 2 note C_, 10 - note __, 4 + rest 4 note D#, 2 note C_, 2 octave 3 @@ -165,20 +166,20 @@ Music_KantoTrainerBattle_branch_eca88: octave 4 note C_, 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 6 note D_, 6 note C_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note F_, 2 - note __, 2 + rest 2 note G#, 2 note G_, 1 note F#, 1 @@ -189,14 +190,14 @@ Music_KantoTrainerBattle_branch_eca88: note G#, 1 octave 4 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 octave 3 note G#, 1 note F_, 1 - note __, 5 + rest 5 octave 4 note D#, 8 note D_, 4 @@ -213,9 +214,9 @@ Music_KantoTrainerBattle_branch_eca88: note F_, 4 octave 3 note D_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note D_, 4 note G#, 1 note F_, 1 @@ -223,14 +224,14 @@ Music_KantoTrainerBattle_branch_eca88: note G#, 1 octave 4 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 octave 3 note G#, 1 note F_, 1 - note __, 5 + rest 5 octave 4 note D#, 8 note D_, 4 @@ -243,13 +244,13 @@ Music_KantoTrainerBattle_branch_eca88: note D_, 4 octave 3 note D_, 4 - note __, 4 + rest 4 note D_, 4 note A#, 1 octave 4 note D_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 4 @@ -260,7 +261,7 @@ Music_KantoTrainerBattle_branch_eca88: note D_, 2 octave 4 note D_, 2 - intensity $67 + volume_envelope 6, 7 note C_, 1 note C#, 1 note D_, 1 @@ -270,27 +271,27 @@ Music_KantoTrainerBattle_branch_eca88: note D_, 1 note C#, 1 note C_, 1 - note __, 3 + rest 3 note D#, 4 - notetype $6, $67 + note_type 6, 6, 7 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 7 + rest 7 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 octave 4 note C_, 8 - intensity $77 + volume_envelope 7, 7 note C#, 2 note D_, 2 note D#, 2 @@ -300,26 +301,26 @@ Music_KantoTrainerBattle_branch_eca88: note D#, 2 note D_, 2 note C#, 2 - note __, 6 + rest 6 note E_, 8 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 octave 4 note C#, 8 - intensity $87 + volume_envelope 8, 7 note D_, 2 note D#, 2 note E_, 2 @@ -329,26 +330,26 @@ Music_KantoTrainerBattle_branch_eca88: note E_, 2 note D#, 2 note D_, 2 - note __, 6 + rest 6 note F_, 8 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 7 + rest 7 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 octave 4 note D_, 8 - intensity $97 + volume_envelope 9, 7 note D#, 2 note E_, 2 note F_, 2 @@ -358,16 +359,16 @@ Music_KantoTrainerBattle_branch_eca88: note F_, 2 note E_, 2 note D#, 2 - note __, 6 + rest 6 note F#, 8 - intensity $a7 + volume_envelope 10, 7 note G#, 8 note A#, 8 - intensity $b7 + volume_envelope 11, 7 octave 5 note D_, 8 note D_, 2 - note __, 6 + rest 6 octave 4 note A#, 2 note F#, 2 @@ -382,9 +383,9 @@ Music_KantoTrainerBattle_branch_eca88: note F#, 2 octave 4 note G#, 2 - note __, 2 + rest 2 note D#, 12 - intensity $b1 + volume_envelope 11, 1 octave 6 note C_, 2 note C_, 2 @@ -395,7 +396,7 @@ Music_KantoTrainerBattle_branch_eca88: note C_, 4 note C_, 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 octave 4 note A#, 2 note F#, 2 @@ -410,7 +411,7 @@ Music_KantoTrainerBattle_branch_eca88: note F#, 2 octave 4 note F#, 2 - note __, 2 + rest 2 note B_, 4 note A#, 4 note G#, 4 @@ -426,21 +427,21 @@ Music_KantoTrainerBattle_branch_eca88: octave 4 note C#, 16 note C#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 note F#, 2 note F_, 2 note D#, 2 note F_, 2 - intensity $67 + volume_envelope 6, 7 note E_, 1 note D_, 1 note C_, 1 @@ -448,7 +449,7 @@ Music_KantoTrainerBattle_branch_eca88: note B_, 1 note A_, 1 note G_, 1 - intensity $a1 + volume_envelope 10, 1 octave 4 note C#, 2 octave 2 @@ -459,16 +460,16 @@ Music_KantoTrainerBattle_branch_eca88: octave 2 note G_, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - loopchannel 0, Music_KantoTrainerBattle_branch_eca88 + sound_loop 0, .mainloop Music_KantoTrainerBattle_Ch2: - pitchoffset 1, B_ - vibrato $6, $36 - dutycycle $1 - notetype $c, $d1 + transpose 1, 11 + vibrato 6, 3, 6 + duty_cycle 1 + note_type 12, 13, 1 octave 4 note A#, 4 note A#, 4 @@ -481,15 +482,15 @@ Music_KantoTrainerBattle_Ch2: note G#, 1 note G_, 1 note F#, 1 - dutycycle $3 - intensity $62 -Music_KantoTrainerBattle_branch_ecc04: + duty_cycle 3 + volume_envelope 6, 2 +.loop1: octave 3 note G_, 1 note G#, 1 note G_, 1 note F#, 1 - loopchannel 14, Music_KantoTrainerBattle_branch_ecc04 + sound_loop 14, .loop1 note G_, 1 note G#, 1 note G_, 1 @@ -499,37 +500,37 @@ Music_KantoTrainerBattle_branch_ecc04: note C_, 1 octave 2 note B_, 1 - intensity $d7 - dutycycle $2 + volume_envelope 13, 7 + duty_cycle 2 note C_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 octave 1 note A#, 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 1 note A#, 1 - note __, 1 + rest 1 note A_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 1 note A_, 1 - note __, 1 + rest 1 note G#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 note B_, 1 octave 2 @@ -540,277 +541,277 @@ Music_KantoTrainerBattle_branch_ecc04: octave 3 note D_, 1 note F_, 1 -Music_KantoTrainerBattle_branch_ecc41: - notetype $c, $d7 +.mainloop: + note_type 12, 13, 7 octave 2 note C_, 1 note C_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note C_, 2 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note C_, 2 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C#, 1 note C#, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note C#, 2 octave 2 note C#, 2 note G#, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note C#, 2 note G#, 1 - note __, 1 + rest 1 note A#, 2 note C#, 1 note C#, 1 note F_, 1 - note __, 1 + rest 1 note G#, 2 octave 3 note C#, 1 - note __, 1 + rest 1 note F_, 2 note G#, 1 - note __, 1 + rest 1 note A#, 2 octave 2 note C_, 1 note C_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note C_, 2 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note C_, 2 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 1 note A#, 1 note A#, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note A#, 2 octave 1 note A#, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note A_, 2 octave 1 note A#, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note G#, 2 octave 1 note A#, 1 note A#, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note G_, 2 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 2 note F_, 1 - note __, 1 + rest 1 note A#, 2 octave 1 note F_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D_, 1 - note __, 1 + rest 1 note D#, 1 note C_, 1 octave 1 note A#, 1 note A_, 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G#, 4 octave 1 note F_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D_, 1 - note __, 1 + rest 1 note D#, 1 note C_, 1 octave 1 note A#, 1 note A_, 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G#, 4 - vibrato $12, $24 - notetype $c, $78 + vibrato 18, 2, 4 + note_type 12, 7, 8 octave 4 note G_, 16 - intensity $77 + volume_envelope 7, 7 note G_, 16 - notetype $6, $88 + note_type 6, 8, 8 note G#, 16 - intensity $87 + volume_envelope 8, 7 note G#, 15 note G_, 1 note G#, 7 @@ -820,49 +821,49 @@ Music_KantoTrainerBattle_branch_ecc41: note G#, 8 note G_, 4 note F_, 6 - note __, 2 - notetype $c, $98 + rest 2 + note_type 12, 9, 8 note A_, 16 - intensity $97 + volume_envelope 9, 7 note A_, 16 - intensity $a7 + volume_envelope 10, 7 note A#, 16 - intensity $d7 + volume_envelope 13, 7 octave 5 note D_, 8 note F_, 8 - vibrato $4, $36 + vibrato 4, 3, 6 octave 2 note A#, 4 note D#, 4 note C_, 1 - note __, 1 - intensity $d8 + rest 1 + volume_envelope 13, 8 note G#, 6 - intensity $d7 + volume_envelope 13, 7 note G#, 16 note A#, 4 note D#, 4 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 14 octave 2 note C_, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 - notetype $6, $d7 + rest 2 + note_type 6, 13, 7 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G#, 8 octave 4 @@ -871,24 +872,24 @@ Music_KantoTrainerBattle_branch_ecc41: note F_, 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 3 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note G#, 2 note A#, 2 note G#, 2 note F#, 2 note G#, 2 - intensity $72 + volume_envelope 7, 2 note G_, 1 note F_, 1 note E_, 1 @@ -896,30 +897,30 @@ Music_KantoTrainerBattle_branch_ecc41: note C_, 1 octave 2 note B_, 1 - intensity $c1 + volume_envelope 12, 1 octave 3 note B_, 2 octave 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - intensity $d7 + rest 1 + volume_envelope 13, 7 octave 3 note B_, 4 - loopchannel 0, Music_KantoTrainerBattle_branch_ecc41 + sound_loop 0, .mainloop Music_KantoTrainerBattle_Ch3: - pitchoffset 1, B_ - vibrato $12, $23 - notetype $c, $15 + transpose 1, 11 + vibrato 18, 2, 3 + note_type 12, 1, 5 octave 2 note A#, 1 octave 4 @@ -967,21 +968,21 @@ Music_KantoTrainerBattle_Ch3: note B_, 1 octave 4 note D_, 1 - intensity $18 + volume_envelope 1, 8 octave 6 note C_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F#, 2 octave 4 @@ -990,30 +991,30 @@ Music_KantoTrainerBattle_Ch3: octave 5 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note D#, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F#, 2 octave 4 @@ -1022,45 +1023,45 @@ Music_KantoTrainerBattle_Ch3: octave 5 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 6 note C_, 2 - note __, 4 + rest 4 note D_, 2 - note __, 4 + rest 4 note D#, 2 - note __, 2 + rest 2 note C_, 2 note D_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 5 note G_, 2 note A#, 2 note B_, 2 -Music_KantoTrainerBattle_branch_ece5a: - notetype $c, $14 +.mainloop: + note_type 12, 1, 4 octave 6 note C_, 4 - notetype $6, $14 + note_type 6, 1, 4 octave 5 note B_, 1 note A#, 1 note A_, 1 note G#, 1 - notetype $c, $14 + note_type 12, 1, 4 note G_, 10 - note __, 2 - notetype $6, $14 + rest 2 + note_type 6, 1, 4 note G_, 1 note G#, 1 note A_, 1 @@ -1075,7 +1076,7 @@ Music_KantoTrainerBattle_branch_ece5a: note C_, 7 octave 5 note B_, 1 - notetype $c, $14 + note_type 12, 1, 4 octave 6 note C#, 16 note C#, 8 @@ -1087,16 +1088,16 @@ Music_KantoTrainerBattle_branch_ece5a: note G#, 1 octave 6 note C_, 4 - notetype $6, $14 + note_type 6, 1, 4 octave 5 note B_, 1 note A#, 1 note A_, 1 note G#, 1 - notetype $c, $14 + note_type 12, 1, 4 note G_, 10 - note __, 2 - notetype $6, $14 + rest 2 + note_type 6, 1, 4 note G_, 1 note G#, 1 note A_, 1 @@ -1124,27 +1125,27 @@ Music_KantoTrainerBattle_branch_ece5a: octave 5 note A#, 2 note A_, 2 - notetype $c, $10 + note_type 12, 1, 0 note G#, 11 - intensity $14 + volume_envelope 1, 4 note C_, 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $10 + rest 1 + volume_envelope 1, 0 octave 6 note C_, 6 - notetype $6, $10 + note_type 6, 1, 0 octave 5 note B_, 1 note A#, 1 note A_, 1 note G#, 1 note G#, 16 - notetype $c, $10 + note_type 12, 1, 0 note A#, 16 - intensity $25 + volume_envelope 2, 5 note D_, 1 octave 4 note A#, 1 @@ -1165,42 +1166,42 @@ Music_KantoTrainerBattle_branch_ece5a: note D_, 2 note C#, 1 note C_, 1 - intensity $10 + volume_envelope 1, 0 octave 5 note G#, 11 - intensity $14 + volume_envelope 1, 4 note C_, 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $10 + rest 1 + volume_envelope 1, 0 octave 6 note C_, 7 - notetype $6, $10 + note_type 6, 1, 0 note C#, 1 note D_, 1 - notetype $c, $10 + note_type 12, 1, 0 note D#, 8 note D_, 12 note G#, 1 note F_, 1 - intensity $25 + volume_envelope 2, 5 octave 5 note A#, 1 note F_, 1 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 2 note G_, 2 note F_, 2 note D#, 2 note F_, 2 - intensity $24 + volume_envelope 2, 4 octave 3 note G_, 1 octave 4 @@ -1329,7 +1330,7 @@ Music_KantoTrainerBattle_branch_ece5a: note E_, 1 octave 4 note C#, 1 - intensity $14 + volume_envelope 1, 4 octave 3 note A_, 1 octave 4 @@ -1362,7 +1363,7 @@ Music_KantoTrainerBattle_branch_ece5a: note F_, 1 octave 4 note D_, 1 - intensity $15 + volume_envelope 1, 5 octave 3 note A_, 1 octave 4 @@ -1395,7 +1396,7 @@ Music_KantoTrainerBattle_branch_ece5a: note F_, 1 octave 4 note D_, 1 - intensity $15 + volume_envelope 1, 5 octave 3 note A#, 1 octave 4 @@ -1428,7 +1429,7 @@ Music_KantoTrainerBattle_branch_ece5a: note F#, 1 octave 4 note D#, 1 - intensity $14 + volume_envelope 1, 4 octave 3 note F_, 1 note G#, 1 @@ -1458,7 +1459,7 @@ Music_KantoTrainerBattle_branch_ece5a: note A#, 4 octave 6 note C#, 1 - note __, 1 + rest 1 note C_, 6 octave 4 note C_, 1 @@ -1486,7 +1487,7 @@ Music_KantoTrainerBattle_branch_ece5a: octave 5 note A#, 4 note B_, 1 - note __, 1 + rest 1 octave 6 note F#, 12 note F_, 1 @@ -1494,21 +1495,21 @@ Music_KantoTrainerBattle_branch_ece5a: note G#, 16 note F_, 8 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 5 note G#, 1 - note __, 1 + rest 1 octave 6 note F_, 1 note F#, 1 note F_, 1 note D#, 1 note F_, 1 - notetype $6, $24 + note_type 6, 2, 4 note E_, 1 note D_, 1 note C_, 1 @@ -1516,21 +1517,21 @@ Music_KantoTrainerBattle_branch_ece5a: note B_, 1 note A_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 octave 5 note G_, 4 - loopchannel 0, Music_KantoTrainerBattle_branch_ece5a + sound_loop 0, .mainloop diff --git a/crysaudio/music/kantowildbattle.asm b/crysaudio/music/kantowildbattle.asm index c19da00d..481fcc38 100644 --- a/crysaudio/music/kantowildbattle.asm +++ b/crysaudio/music/kantowildbattle.asm @@ -1,17 +1,18 @@ Music_KantoWildBattle: - musicheader 3, 1, Music_KantoWildBattle_Ch1 - musicheader 1, 2, Music_KantoWildBattle_Ch2 - musicheader 1, 3, Music_KantoWildBattle_Ch3 + channel_count 3 + channel 1, Music_KantoWildBattle_Ch1 + channel 2, Music_KantoWildBattle_Ch2 + channel 3, Music_KantoWildBattle_Ch3 - db $3 + db $3 ; unused Music_KantoWildBattle_Ch1: tempo 112 - volume $77 - vibrato $12, $23 - dutycycle $2 - notetype $c, $b7 - note __, 16 + volume 7, 7 + vibrato 18, 2, 3 + duty_cycle 2 + note_type 12, 11, 7 + rest 16 octave 4 note A#, 6 note A_, 1 @@ -24,16 +25,16 @@ Music_KantoWildBattle_Ch1: note G_, 1 note F#, 1 note F_, 1 -Music_KantoWildBattle_branch_ed091: - notetype $c, $b7 - callchannel Music_KantoWildBattle_branch_ed18a +.mainloop: + note_type 12, 11, 7 + sound_call .sub1 octave 4 note F_, 4 note C#, 4 octave 3 note B_, 8 - callchannel Music_KantoWildBattle_branch_ed18a - note __, 8 + sound_call .sub1 + rest 8 note G_, 1 note B_, 1 octave 4 @@ -45,7 +46,7 @@ Music_KantoWildBattle_branch_ed091: octave 4 note D_, 1 note D#, 1 - intensity $b1 + volume_envelope 11, 1 note E_, 6 note C_, 6 octave 3 @@ -54,7 +55,7 @@ Music_KantoWildBattle_branch_ed091: note E_, 6 note C_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note F_, 1 note C#, 1 octave 3 @@ -82,7 +83,7 @@ Music_KantoWildBattle_branch_ed091: note F_, 3 note G_, 1 note G#, 4 - intensity $b1 + volume_envelope 11, 1 octave 3 note G_, 6 note F_, 6 @@ -95,7 +96,7 @@ Music_KantoWildBattle_branch_ed091: octave 3 note A#, 6 note G_, 4 - notetype $8, $b7 + note_type 8, 11, 7 octave 2 note G_, 2 octave 3 @@ -129,31 +130,31 @@ Music_KantoWildBattle_branch_ed091: note C#, 2 octave 2 note G#, 2 - notetype $c, $b7 + note_type 12, 11, 7 octave 3 note G#, 4 octave 4 note C#, 4 - intensity $71 + volume_envelope 7, 1 note F_, 1 note F_, 1 - intensity $91 + volume_envelope 9, 1 note F_, 1 note F_, 1 - intensity $b1 + volume_envelope 11, 1 note G#, 1 note G#, 1 - intensity $d1 + volume_envelope 13, 1 note G#, 1 note G#, 1 - intensity $c7 + volume_envelope 12, 7 note E_, 1 note D_, 1 note C#, 1 note D_, 1 note E_, 12 note E_, 8 - intensity $b1 + volume_envelope 11, 1 note E_, 1 note D_, 1 note C_, 1 @@ -163,7 +164,7 @@ Music_KantoWildBattle_branch_ed091: note G_, 1 note F_, 1 note E_, 1 - intensity $b7 + volume_envelope 11, 7 note D_, 8 note F_, 8 note A#, 8 @@ -175,7 +176,7 @@ Music_KantoWildBattle_branch_ed091: note C_, 8 note E_, 8 note G_, 8 - note __, 8 + rest 8 octave 3 note D#, 8 note G#, 8 @@ -183,7 +184,7 @@ Music_KantoWildBattle_branch_ed091: note C_, 8 octave 3 note A#, 8 - note __, 8 + rest 8 octave 4 note D_, 8 octave 3 @@ -193,81 +194,81 @@ Music_KantoWildBattle_branch_ed091: note F_, 2 octave 4 note C_, 4 - note __, 6 + rest 6 note C_, 1 - note __, 5 + rest 5 note C#, 2 note C_, 1 - note __, 13 + rest 13 note C#, 4 - note __, 6 + rest 6 note C#, 1 - note __, 5 + rest 5 note F_, 2 note D#, 1 - note __, 5 + rest 5 note C#, 8 -Music_KantoWildBattle_branch_ed15b: - intensity $b1 +.loop1: + volume_envelope 11, 1 octave 3 note C_, 1 note D#, 1 note D_, 1 note C#, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed15b -Music_KantoWildBattle_branch_ed166: + sound_loop 8, .loop1 +.loop2: note C#, 1 note F_, 1 note E_, 1 note D#, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed166 -Music_KantoWildBattle_branch_ed16e: + sound_loop 8, .loop2 +.loop3: note C_, 1 note D#, 1 note D_, 1 note C#, 1 - loopchannel 16, Music_KantoWildBattle_branch_ed16e -Music_KantoWildBattle_branch_ed176: + sound_loop 16, .loop3 +.loop4: note C#, 1 note E_, 1 note D#, 1 note D_, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed176 -Music_KantoWildBattle_branch_ed17e: + sound_loop 8, .loop4 +.loop5: note C_, 1 note D#, 1 note D_, 1 note C#, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed17e - loopchannel 0, Music_KantoWildBattle_branch_ed091 + sound_loop 8, .loop5 + sound_loop 0, .mainloop -Music_KantoWildBattle_branch_ed18a: +.sub1: octave 4 note C_, 1 - note __, 5 + rest 5 octave 3 note B_, 1 - note __, 5 + rest 5 note A#, 1 - note __, 3 - note __, 10 + rest 3 + rest 10 octave 4 note C_, 2 - note __, 2 + rest 2 note D#, 2 note C#, 1 - note __, 5 + rest 5 note C_, 1 - note __, 5 + rest 5 octave 3 note B_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_KantoWildBattle_Ch2: - dutycycle $1 - vibrato $12, $23 - notetype $c, $b1 + duty_cycle 1 + vibrato 18, 2, 3 + note_type 12, 11, 1 octave 4 note G_, 1 note F#, 1 @@ -301,54 +302,55 @@ Music_KantoWildBattle_Ch2: note D#, 1 note D_, 1 note C#, 1 -Music_KantoWildBattle_branch_ed1c8: - notetype $c, $b7 - callchannel Music_KantoWildBattle_branch_ed2c6 +.mainloop: + note_type 12, 11, 7 + sound_call .sub1 octave 2 note F_, 2 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 - callchannel Music_KantoWildBattle_branch_ed2c6 + sound_call .sub1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 note F#, 1 - notetype $6, $b7 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - pitchoffset 0, C_ -rept 4 - callchannel Music_KantoWildBattle_branch_ed307 -endr - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - pitchoffset 0, C_ - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - note __, 16 + note_type 6, 11, 7 + sound_call .sub2 + sound_call .sub2 + transpose 0, 1 + sound_call .sub2 + sound_call .sub2 + transpose 0, 0 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + transpose 0, 1 + sound_call .sub2 + sound_call .sub2 + transpose 0, 0 + sound_call .sub2 + sound_call .sub2 + rest 16 octave 3 note A#, 16 octave 4 note D_, 16 note F_, 16 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 16 note G_, 8 octave 5 note C_, 8 - note __, 8 + rest 8 octave 3 note G#, 8 octave 4 @@ -379,137 +381,137 @@ endr octave 3 note B_, 1 note G#, 1 - notetype $6, $b7 - callchannel Music_KantoWildBattle_branch_ed31b - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed31b - pitchoffset 0, C_ - callchannel Music_KantoWildBattle_branch_ed340 + note_type 6, 11, 7 + sound_call .sub3 + transpose 0, 1 + sound_call .sub3 + transpose 0, 0 + sound_call .sub4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note C_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 4 note D#, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 octave 4 note F_, 4 octave 2 note C#, 2 - note __, 2 - callchannel Music_KantoWildBattle_branch_ed340 - callchannel Music_KantoWildBattle_branch_ed354 - callchannel Music_KantoWildBattle_branch_ed340 - callchannel Music_KantoWildBattle_branch_ed354 - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed340 - pitchoffset 0, C_ + rest 2 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub5 + transpose 0, 1 + sound_call .sub4 + transpose 0, 0 note C#, 2 - note __, 2 + rest 2 octave 3 note G#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 octave 3 note A#, 4 octave 2 note C#, 2 - note __, 2 - callchannel Music_KantoWildBattle_branch_ed340 + rest 2 + sound_call .sub4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note C_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note A#, 4 octave 2 note C_, 2 - note __, 2 - loopchannel 0, Music_KantoWildBattle_branch_ed1c8 + rest 2 + sound_loop 0, .mainloop -Music_KantoWildBattle_branch_ed2c6: +.sub1: octave 2 note C_, 1 - note __, 2 + rest 2 note C_, 1 octave 1 note G_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 octave 1 note G_, 1 - note __, 2 + rest 2 note G_, 1 octave 2 note C_, 3 @@ -527,79 +529,79 @@ Music_KantoWildBattle_branch_ed2c6: octave 2 note G_, 2 note C#, 1 - note __, 2 + rest 2 note C#, 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 1 note G#, 1 - note __, 2 + rest 2 note G#, 1 octave 2 note C#, 1 - note __, 2 + rest 2 note C#, 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 1 note G_, 2 - endchannel + sound_ret -Music_KantoWildBattle_branch_ed307: +.sub2: octave 2 note C_, 2 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 3 note C_, 2 octave 2 note C_, 4 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note C_, 4 - endchannel + sound_ret -Music_KantoWildBattle_branch_ed31b: +.sub3: octave 2 note C_, 2 - note __, 4 + rest 4 note C_, 2 - note __, 4 + rest 4 octave 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note C_, 6 note C_, 2 - note __, 4 + rest 4 note C_, 2 octave 1 note G_, 2 @@ -610,127 +612,127 @@ Music_KantoWildBattle_branch_ed31b: note G_, 2 octave 2 note C_, 2 - note __, 4 + rest 4 note C_, 2 note E_, 2 note G_, 2 note B_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_KantoWildBattle_branch_ed340: +.sub4: octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_KantoWildBattle_branch_ed354: +.sub5: note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_KantoWildBattle_Ch3: - vibrato $14, $23 - notetype $c, $14 + vibrato 20, 2, 3 + note_type 12, 1, 4 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 octave 4 note C_, 1 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 octave 4 note C#, 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 octave 4 note D_, 1 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 octave 4 note D#, 1 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 octave 4 note E_, 1 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 octave 4 note F_, 1 octave 3 note F#, 1 - note __, 1 + rest 1 note F#, 1 octave 4 note F#, 1 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 octave 4 note G_, 1 -Music_KantoWildBattle_branch_ed39e: - notetype $c, $14 +.mainloop: + note_type 12, 1, 4 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 2 + rest 2 octave 5 note G_, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 octave 3 @@ -742,22 +744,22 @@ Music_KantoWildBattle_branch_ed39e: note D#, 6 octave 5 note D#, 2 - note __, 2 + rest 2 note G_, 2 note G#, 1 - note __, 2 + rest 2 octave 4 note G#, 1 - note __, 2 + rest 2 octave 5 note G#, 1 - note __, 3 + rest 3 octave 4 note G#, 1 - note __, 1 + rest 1 octave 5 note G#, 1 - note __, 2 + rest 2 octave 4 note G#, 1 octave 6 @@ -776,19 +778,19 @@ Music_KantoWildBattle_branch_ed39e: note B_, 1 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 2 + rest 2 octave 5 note G_, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 note C_, 1 @@ -798,22 +800,22 @@ Music_KantoWildBattle_branch_ed39e: note G_, 6 octave 5 note D#, 2 - note __, 2 + rest 2 note G_, 2 note G#, 1 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 2 + rest 2 octave 5 note G#, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G#, 1 - note __, 2 + rest 2 octave 4 note G_, 1 note C#, 4 @@ -822,7 +824,7 @@ Music_KantoWildBattle_branch_ed39e: note F_, 7 note F#, 1 note G_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -830,10 +832,10 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note F#, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -841,17 +843,17 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note E_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note G_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -859,10 +861,10 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note A_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -870,14 +872,14 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note G_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G#, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note G#, 12 note G_, 2 @@ -892,51 +894,51 @@ Music_KantoWildBattle_branch_ed39e: note C#, 8 octave 5 note C_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note A#, 2 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note G#, 2 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note C#, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note C_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note A#, 2 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note F_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note G_, 1 octave 5 @@ -945,9 +947,9 @@ Music_KantoWildBattle_branch_ed39e: note G_, 1 octave 5 note C_, 1 - intensity $14 + volume_envelope 1, 4 note E_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note G_, 1 octave 5 @@ -956,14 +958,14 @@ Music_KantoWildBattle_branch_ed39e: note G_, 1 octave 5 note C_, 1 - intensity $14 + volume_envelope 1, 4 note D_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note G_, 1 octave 5 note C_, 1 - intensity $14 + volume_envelope 1, 4 octave 4 note A#, 4 octave 5 @@ -971,157 +973,157 @@ Music_KantoWildBattle_branch_ed39e: note D_, 4 note F_, 4 note G#, 16 - notetype $6, $14 + note_type 6, 1, 4 note G#, 1 - note __, 1 - intensity $24 + rest 1 + volume_envelope 2, 4 note G#, 1 - note __, 1 - intensity $34 + rest 1 + volume_envelope 3, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $24 + rest 1 + volume_envelope 2, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 5 note G_, 2 note F_, 2 note E_, 2 note F_, 2 - notetype $c, $15 + note_type 12, 1, 5 note G_, 12 note G_, 8 - notetype $6, $15 + note_type 6, 1, 5 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $24 + rest 1 + volume_envelope 2, 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 octave 2 note A#, 16 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 2 - notetype $6, $15 + rest 2 + note_type 6, 1, 5 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 4 note C_, 2 octave 3 note C_, 4 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note C_, 4 note C_, 2 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 4 note C_, 2 octave 3 note C_, 4 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 octave 2 note A#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 - notetype $c, $14 + rest 2 + note_type 12, 1, 4 note G#, 16 note G#, 16 note A#, 2 - note __, 2 + rest 2 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 5 note E_, 4 octave 4 @@ -1131,12 +1133,12 @@ Music_KantoWildBattle_branch_ed39e: note B_, 1 octave 5 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note F_, 2 note E_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 octave 3 @@ -1161,28 +1163,28 @@ Music_KantoWildBattle_branch_ed39e: octave 5 note C_, 1 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 5 + rest 5 note G#, 2 note G_, 1 - note __, 5 + rest 5 note F_, 8 - intensity $13 + volume_envelope 1, 3 note G_, 6 note F#, 6 note E_, 2 - note __, 2 + rest 2 note G_, 6 note A_, 6 note G_, 2 - note __, 2 + rest 2 note G#, 12 note G_, 2 note F_, 2 note G#, 2 note G_, 2 - note __, 4 + rest 4 octave 6 note C#, 8 octave 5 @@ -1190,18 +1192,18 @@ Music_KantoWildBattle_branch_ed39e: octave 4 note A#, 6 note G#, 2 - note __, 2 + rest 2 octave 5 note C#, 6 note C_, 6 octave 4 note A#, 2 - note __, 2 + rest 2 octave 5 note F_, 6 note E_, 6 note D_, 2 - note __, 2 + rest 2 octave 4 note A#, 4 octave 5 @@ -1212,4 +1214,4 @@ Music_KantoWildBattle_branch_ed39e: note G#, 16 note G_, 16 note G_, 16 - loopchannel 0, Music_KantoWildBattle_branch_ed39e + sound_loop 0, .mainloop diff --git a/crysaudio/music/lakeofrage.asm b/crysaudio/music/lakeofrage.asm index 4f7154fd..dbc121c3 100644 --- a/crysaudio/music/lakeofrage.asm +++ b/crysaudio/music/lakeofrage.asm @@ -1,25 +1,26 @@ Music_LakeOfRage: - musicheader 4, 1, Music_LakeOfRage_Ch1 - musicheader 1, 2, Music_LakeOfRage_Ch2 - musicheader 1, 3, Music_LakeOfRage_Ch3 - musicheader 1, 4, Music_LakeOfRage_Ch4 + channel_count 4 + channel 1, Music_LakeOfRage_Ch1 + channel 2, Music_LakeOfRage_Ch2 + channel 3, Music_LakeOfRage_Ch3 + channel 4, Music_LakeOfRage_Ch4 Music_LakeOfRage_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0002 - vibrato $8, $22 - stereopanning $f0 - notetype $c, $b4 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 8, 2, 2 + stereo_panning TRUE, FALSE + note_type 12, 11, 4 octave 3 note D_, 6 note D_, 10 note D_, 6 note D_, 6 note E_, 4 -Music_LakeOfRage_branch_ee6e9: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note F#, 6 note E_, 6 note D_, 4 @@ -31,43 +32,43 @@ Music_LakeOfRage_branch_ee6e9: octave 3 note B_, 6 note G_, 2 - notetype $8, $b5 + note_type 8, 11, 5 note D_, 4 note G_, 4 note B_, 4 - notetype $c, $b4 + note_type 12, 11, 4 note D_, 3 note F#, 1 - intensity $b7 + volume_envelope 11, 7 note A_, 8 note F#, 4 note A_, 3 octave 4 note C#, 1 note D_, 12 - notetype $8, $b4 + note_type 8, 11, 4 octave 3 note C_, 4 octave 2 note B_, 4 note A_, 4 - notetype $8, $b7 + note_type 8, 11, 7 note A_, 12 - notetype $c, $b7 + note_type 12, 11, 7 octave 3 note C_, 12 - intensity $b4 + volume_envelope 11, 4 note E_, 4 note D_, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note A_, 10 - intensity $b4 + volume_envelope 11, 4 octave 3 note E_, 4 note D_, 3 note E_, 1 - intensity $b7 + volume_envelope 11, 7 note F#, 8 note D_, 6 note C_, 1 @@ -80,34 +81,34 @@ Music_LakeOfRage_branch_ee6e9: note G_, 6 note F#, 1 note G_, 1 - intensity $a0 + volume_envelope 10, 0 note A_, 7 - intensity $a7 + volume_envelope 10, 7 note A_, 7 note A_, 1 octave 4 note C_, 1 - intensity $a0 + volume_envelope 10, 0 note D_, 6 - intensity $a7 + volume_envelope 10, 7 note D_, 6 - loopchannel 0, Music_LakeOfRage_branch_ee6e9 + sound_loop 0, .mainloop Music_LakeOfRage_Ch2: - dutycycle $3 - vibrato $20, $44 - stereopanning $ff - notetype $c, $90 + duty_cycle 3 + vibrato 32, 4, 4 + stereo_panning TRUE, TRUE + note_type 12, 9, 0 octave 3 note G_, 8 - intensity $97 + volume_envelope 9, 7 note G_, 8 - intensity $a0 + volume_envelope 10, 0 note A_, 8 - intensity $a7 + volume_envelope 10, 7 note A_, 8 -Music_LakeOfRage_branch_ee75e: - notetype $8, $c7 +.mainloop: + note_type 8, 12, 7 octave 4 note D_, 16 octave 3 @@ -119,45 +120,45 @@ Music_LakeOfRage_branch_ee75e: note C_, 4 octave 4 note B_, 4 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 12 note B_, 4 note A_, 3 note G_, 1 - intensity $b0 + volume_envelope 11, 0 note F#, 12 - intensity $b7 + volume_envelope 11, 7 note F#, 16 - notetype $8, $c3 + note_type 8, 12, 3 octave 3 note G_, 4 note F#, 4 note E_, 4 note C_, 15 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note C_, 1 note E_, 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 note G_, 1 - intensity $c5 + volume_envelope 12, 5 octave 5 note C_, 10 - intensity $c3 + volume_envelope 12, 3 octave 4 note A_, 4 note G_, 4 note F#, 4 note E_, 2 - notetype $8, $c3 + note_type 8, 12, 3 note D_, 4 note E_, 4 note F#, 4 - notetype $8, $c7 + note_type 8, 12, 7 note A_, 12 - notetype $8, $c3 + note_type 8, 12, 3 octave 3 note G_, 4 note F#, 4 @@ -174,28 +175,28 @@ Music_LakeOfRage_branch_ee75e: note G_, 4 note F#, 4 note E_, 4 - notetype $8, $c7 + note_type 8, 12, 7 note F#, 16 note D_, 4 note F#, 4 - notetype $c, $c7 + note_type 12, 12, 7 note A_, 16 - loopchannel 0, Music_LakeOfRage_branch_ee75e + sound_loop 0, .mainloop Music_LakeOfRage_Ch3: - stereopanning $f - notetype $c, $16 + stereo_panning FALSE, TRUE + note_type 12, 1, 6 octave 3 note G_, 4 - note __, 2 + rest 2 note G_, 4 - note __, 6 + rest 6 note F#, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note E_, 4 -Music_LakeOfRage_branch_ee7d0: +.mainloop: octave 3 note D_, 4 octave 2 @@ -293,30 +294,30 @@ Music_LakeOfRage_branch_ee7d0: note D_, 2 octave 2 note A_, 2 - loopchannel 0, Music_LakeOfRage_branch_ee7d0 + sound_loop 0, .mainloop Music_LakeOfRage_Ch4: - stereopanning $f0 - togglenoise $3 - notetype $c -Music_LakeOfRage_branch_ee83b: - note D_, 2 - note D_, 1 - note D_, 1 - note G_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note F#, 6 - note D_, 2 - note D_, 1 - note D_, 1 - note G_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note F#, 3 - note D_, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_LakeOfRage_branch_ee83b + stereo_panning TRUE, FALSE + toggle_noise 3 + drum_speed 12 +.mainloop: + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 8, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 6 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 8, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lakeofragerocketradio.asm b/crysaudio/music/lakeofragerocketradio.asm index 512db764..7e34e367 100644 --- a/crysaudio/music/lakeofragerocketradio.asm +++ b/crysaudio/music/lakeofragerocketradio.asm @@ -1,35 +1,36 @@ Music_LakeOfRageRocketRadio: - musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1 - musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2 - musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3 + channel_count 3 + channel 1, Music_LakeOfRageRocketRadio_Ch1 + channel 2, Music_LakeOfRageRocketRadio_Ch2 + channel 3, Music_LakeOfRageRocketRadio_Ch3 Music_LakeOfRageRocketRadio_Ch1: tempo 160 - volume $77 - dutycycle $1 - tone $1118 - vibrato $0, $f0 - stereopanning $f0 -Music_LakeOfRageRocketRadio_branch_ef5c9: - notetype $c, $a7 + volume 7, 7 + duty_cycle 1 + pitch_offset 4376 + vibrato 0, 15, 0 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 10, 7 octave 7 note G_, 4 note F#, 4 note G_, 4 note F#, 4 - note __, 16 - loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + rest 16 + sound_loop 0, .mainloop Music_LakeOfRageRocketRadio_Ch2: - dutycycle $1 - vibrato $13, $e8 - notetype $c, $a7 - note __, 2 - stereopanning $f - loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + duty_cycle 1 + vibrato 19, 14, 8 + note_type 12, 10, 7 + rest 2 + stereo_panning FALSE, TRUE + sound_loop 0, Music_LakeOfRageRocketRadio_Ch1.mainloop Music_LakeOfRageRocketRadio_Ch3: - notetype $c, $26 - vibrato $10, $44 - note __, 4 - loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + note_type 12, 2, 6 + vibrato 16, 4, 4 + rest 4 + sound_loop 0, Music_LakeOfRageRocketRadio_Ch1.mainloop diff --git a/crysaudio/music/lavendertown.asm b/crysaudio/music/lavendertown.asm index 6384b701..bd904e61 100644 --- a/crysaudio/music/lavendertown.asm +++ b/crysaudio/music/lavendertown.asm @@ -1,95 +1,96 @@ Music_LavenderTown: - musicheader 3, 1, Music_LavenderTown_Ch1 - musicheader 1, 2, Music_LavenderTown_Ch2 - musicheader 1, 3, Music_LavenderTown_Ch3 + channel_count 3 + channel 1, Music_LavenderTown_Ch1 + channel 2, Music_LavenderTown_Ch2 + channel 3, Music_LavenderTown_Ch3 - db $3 + db $3 ; unused Music_LavenderTown_Ch1: tempo 160 - volume $77 - stereopanning $f - vibrato $6, $24 - dutycycle $0 - notetype $c, $b3 - note __, 16 - note __, 16 - note __, 16 - note __, 16 -Music_LavenderTown_branch_ef74c: - callchannel Music_LavenderTown_branch_ef7fd - intensity $93 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 6, 2, 4 + duty_cycle 0 + note_type 12, 11, 3 + rest 16 + rest 16 + rest 16 + rest 16 +.mainloop: + sound_call .sub1 + volume_envelope 9, 3 octave 5 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note F#, 2 - intensity $43 + volume_envelope 4, 3 note F#, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - callchannel Music_LavenderTown_branch_ef87f - intensity $93 - intensity $93 + sound_call .sub2 + volume_envelope 9, 3 + volume_envelope 9, 3 note F_, 2 - intensity $83 + volume_envelope 8, 3 note F_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 octave 4 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - callchannel Music_LavenderTown_branch_ef7fd - intensity $93 + sound_call .sub1 + volume_envelope 9, 3 octave 5 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - callchannel Music_LavenderTown_branch_ef87f - intensity $93 + sound_call .sub2 + volume_envelope 9, 3 octave 6 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 5 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 octave 3 note F_, 2 @@ -102,7 +103,7 @@ Music_LavenderTown_branch_ef74c: octave 3 note A_, 2 note F_, 2 -Music_LavenderTown_branch_ef7ca: +.loop1: octave 3 note C_, 2 note E_, 2 @@ -124,7 +125,7 @@ Music_LavenderTown_branch_ef7ca: octave 3 note A_, 2 note F_, 2 - loopchannel 2, Music_LavenderTown_branch_ef7ca + sound_loop 2, .loop1 note F#, 2 note A_, 2 octave 4 @@ -147,163 +148,163 @@ Music_LavenderTown_branch_ef7ca: octave 3 note B_, 8 note B_, 8 - loopchannel 0, Music_LavenderTown_branch_ef74c + sound_loop 0, .mainloop -Music_LavenderTown_branch_ef7fd: - intensity $83 +.sub1: + volume_envelope 8, 3 octave 5 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $83 + volume_envelope 8, 3 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - intensity $83 + volume_envelope 8, 3 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $83 + volume_envelope 8, 3 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $83 + volume_envelope 8, 3 note C#, 2 - intensity $43 + volume_envelope 4, 3 note C#, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note A#, 2 - intensity $43 + volume_envelope 4, 3 note A#, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - endchannel + sound_ret -Music_LavenderTown_branch_ef87f: - intensity $93 +.sub2: + volume_envelope 9, 3 octave 5 note G_, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - intensity $83 + volume_envelope 8, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - endchannel + sound_ret Music_LavenderTown_Ch2: - dutycycle $1 - vibrato $8, $24 - stereopanning $ff -Music_LavenderTown_branch_ef8a0: - notetype $c, $a3 + duty_cycle 1 + vibrato 8, 2, 4 + stereo_panning TRUE, TRUE +.loop1: + note_type 12, 10, 3 octave 5 note C_, 2 - intensity $63 + volume_envelope 6, 3 note C_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $63 + volume_envelope 6, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note B_, 2 - intensity $63 + volume_envelope 6, 3 note B_, 2 - intensity $a3 + volume_envelope 10, 3 note F#, 2 - intensity $63 + volume_envelope 6, 3 note F#, 2 - loopchannel 3, Music_LavenderTown_branch_ef8a0 - intensity $a3 + sound_loop 3, .loop1 + volume_envelope 10, 3 note C_, 2 - intensity $63 + volume_envelope 6, 3 note C_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $63 + volume_envelope 6, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note B_, 2 - intensity $63 + volume_envelope 6, 3 note B_, 2 - intensity $a3 + volume_envelope 10, 3 octave 6 note D_, 2 - intensity $63 + volume_envelope 6, 3 note D_, 2 -Music_LavenderTown_branch_ef8d7: - intensity $b5 - callchannel Music_LavenderTown_branch_ef915 +.mainloop: + volume_envelope 11, 5 + sound_call .sub1 octave 2 note F#, 4 octave 3 @@ -321,7 +322,7 @@ Music_LavenderTown_branch_ef8d7: octave 2 note B_, 4 note G_, 4 - callchannel Music_LavenderTown_branch_ef915 + sound_call .sub1 octave 2 note G_, 4 octave 3 @@ -337,7 +338,7 @@ Music_LavenderTown_branch_ef8d7: note G_, 4 octave 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 octave 2 note F_, 16 note C_, 16 @@ -348,14 +349,14 @@ Music_LavenderTown_branch_ef8d7: note G_, 16 octave 1 note G_, 8 - intensity $57 + volume_envelope 5, 7 octave 5 note D_, 1 note F_, 1 note G_, 6 - loopchannel 0, Music_LavenderTown_branch_ef8d7 + sound_loop 0, .mainloop -Music_LavenderTown_branch_ef915: +.sub1: octave 2 note C_, 4 note G_, 4 @@ -384,28 +385,28 @@ Music_LavenderTown_branch_ef915: note C_, 4 note A_, 4 note C_, 4 - endchannel + sound_ret Music_LavenderTown_Ch3: - vibrato $12, $24 - notetype $c, $13 - stereopanning $f0 - note __, 16 - note __, 16 - note __, 16 - note __, 8 + vibrato 18, 2, 4 + note_type 12, 1, 3 + stereo_panning TRUE, FALSE + rest 16 + rest 16 + rest 16 + rest 8 octave 5 note E_, 4 note F_, 4 -Music_LavenderTown_branch_ef941: - intensity $12 +.mainloop: + volume_envelope 1, 2 octave 5 note G_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 4 @@ -413,7 +414,7 @@ Music_LavenderTown_branch_ef941: note E_, 4 note B_, 4 note C#, 8 - note __, 2 + rest 2 note C#, 2 note D_, 2 note E_, 2 @@ -433,11 +434,11 @@ Music_LavenderTown_branch_ef941: note E_, 2 note F_, 2 note G_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 4 @@ -445,7 +446,7 @@ Music_LavenderTown_branch_ef941: note E_, 4 note B_, 4 note C#, 8 - note __, 2 + rest 2 note C#, 2 note D_, 2 note E_, 2 @@ -458,8 +459,8 @@ Music_LavenderTown_branch_ef941: note D_, 2 note C_, 16 note C_, 12 - note __, 4 - intensity $24 + rest 4 + volume_envelope 2, 4 note A_, 2 note G_, 2 note A_, 2 @@ -482,11 +483,11 @@ Music_LavenderTown_branch_ef941: note G_, 4 octave 6 note F_, 4 - notetype $8, $24 + note_type 8, 2, 4 note E_, 2 note F_, 2 note E_, 2 - notetype $c, $24 + note_type 12, 2, 4 note D_, 4 note C_, 4 octave 5 @@ -511,4 +512,4 @@ Music_LavenderTown_branch_ef941: note B_, 12 note E_, 2 note F_, 2 - loopchannel 0, Music_LavenderTown_branch_ef941 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lighthouse.asm b/crysaudio/music/lighthouse.asm index 9846e7ec..2cc3b451 100644 --- a/crysaudio/music/lighthouse.asm +++ b/crysaudio/music/lighthouse.asm @@ -1,18 +1,19 @@ Music_Lighthouse: - musicheader 4, 1, Music_Lighthouse_Ch1 - musicheader 1, 2, Music_Lighthouse_Ch2 - musicheader 1, 3, Music_Lighthouse_Ch3 - musicheader 1, 4, Music_Lighthouse_Ch4 + channel_count 4 + channel 1, Music_Lighthouse_Ch1 + channel 2, Music_Lighthouse_Ch2 + channel 3, Music_Lighthouse_Ch3 + channel 4, Music_Lighthouse_Ch4 Music_Lighthouse_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0004 - vibrato $8, $45 - stereopanning $f -Music_Lighthouse_branch_ee584: - notetype $c, $b3 + volume 7, 7 + duty_cycle 3 + pitch_offset 4 + vibrato 8, 4, 5 + stereo_panning FALSE, TRUE +.mainloop: + note_type 12, 11, 3 octave 3 note C#, 8 octave 2 @@ -27,29 +28,29 @@ Music_Lighthouse_branch_ee584: note A_, 4 note B_, 4 note G#, 1 - note __, 7 + rest 7 octave 3 note C_, 4 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note C_, 2 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 8 octave 2 @@ -68,19 +69,19 @@ Music_Lighthouse_branch_ee584: note F#, 2 note A_, 2 note G#, 1 - note __, 7 + rest 7 octave 3 note C_, 12 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 3 + rest 3 octave 2 note A_, 4 octave 3 @@ -126,14 +127,14 @@ Music_Lighthouse_branch_ee584: note B_, 2 note A_, 2 note G#, 8 - loopchannel 0, Music_Lighthouse_branch_ee584 + sound_loop 0, .mainloop Music_Lighthouse_Ch2: - dutycycle $3 - tone $0002 - vibrato $10, $45 -Music_Lighthouse_branch_ee604: - notetype $c, $c5 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 4, 5 +.mainloop: + note_type 12, 12, 5 octave 3 note G#, 12 note F#, 2 @@ -142,18 +143,18 @@ Music_Lighthouse_branch_ee604: octave 4 note C#, 8 note C_, 1 - note __, 7 + rest 7 octave 3 note G#, 16 - intensity $c5 + volume_envelope 12, 5 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note G#, 12 note F#, 2 note G#, 2 @@ -161,17 +162,17 @@ Music_Lighthouse_branch_ee604: octave 4 note C#, 8 note C_, 1 - note __, 7 + rest 7 note D#, 12 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 + rest 3 octave 4 note E_, 12 note D#, 2 @@ -208,102 +209,102 @@ Music_Lighthouse_branch_ee604: note D#, 2 note C#, 2 note C_, 8 - loopchannel 0, Music_Lighthouse_branch_ee604 + sound_loop 0, .mainloop Music_Lighthouse_Ch3: - notetype $c, $19 - stereopanning $f0 -Music_Lighthouse_branch_ee65b: + note_type 12, 1, -1 + stereo_panning TRUE, FALSE +.mainloop: octave 2 note G#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 -Music_Lighthouse_branch_ee664: + rest 2 +.loop1: note G#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 - loopchannel 2, Music_Lighthouse_branch_ee664 + rest 2 + sound_loop 2, .loop1 note G#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note C_, 2 note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 -Music_Lighthouse_branch_ee683: + rest 2 +.loop2: note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 - loopchannel 2, Music_Lighthouse_branch_ee683 + rest 2 + sound_loop 2, .loop2 note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D#, 2 note F#, 2 -Music_Lighthouse_branch_ee69b: +.loop3: note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 - loopchannel 8, Music_Lighthouse_branch_ee69b - loopchannel 0, Music_Lighthouse_branch_ee65b + rest 2 + sound_loop 8, .loop3 + sound_loop 0, .mainloop Music_Lighthouse_Ch4: - togglenoise $0 - notetype $c -Music_Lighthouse_branch_ee6b1: - stereopanning $f - note G#, 4 - note F_, 2 - note G#, 4 - note F_, 2 - note A_, 2 - note A#, 2 - stereopanning $ff - note G#, 2 - note F_, 4 - note G#, 2 - note F_, 4 - note G#, 2 - note A_, 2 - loopchannel 0, Music_Lighthouse_branch_ee6b1 + toggle_noise 0 + drum_speed 12 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 9, 4 + drum_note 6, 2 + drum_note 9, 4 + drum_note 6, 2 + drum_note 10, 2 + drum_note 11, 2 + stereo_panning TRUE, TRUE + drum_note 9, 2 + drum_note 6, 4 + drum_note 9, 2 + drum_note 6, 4 + drum_note 9, 2 + drum_note 10, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lookbeauty.asm b/crysaudio/music/lookbeauty.asm index 313f2366..c710d7c8 100644 --- a/crysaudio/music/lookbeauty.asm +++ b/crysaudio/music/lookbeauty.asm @@ -1,68 +1,69 @@ Music_LookBeauty: - musicheader 4, 1, Music_LookBeauty_Ch1 - musicheader 1, 2, Music_LookBeauty_Ch2 - musicheader 1, 3, Music_LookBeauty_Ch3 - musicheader 1, 4, Music_LookBeauty_Ch4 + channel_count 4 + channel 1, Music_LookBeauty_Ch1 + channel 2, Music_LookBeauty_Ch2 + channel 3, Music_LookBeauty_Ch3 + channel 4, Music_LookBeauty_Ch4 Music_LookBeauty_Ch1: - stereopanning $f - vibrato $12, $25 - dutycycle $2 + stereo_panning FALSE, TRUE + vibrato 18, 2, 5 + duty_cycle 2 tempo 128 - volume $77 - notetype $c, $a3 - note __, 16 - note __, 8 + volume 7, 7 + note_type 12, 10, 3 + rest 16 + rest 8 octave 4 note C_, 8 - dutycycle $3 -Music_LookBeauty_branch_eee5f: - note __, 4 + duty_cycle 3 +.mainloop: + rest 4 octave 3 note D_, 1 - note __, 5 + rest 5 note D_, 1 - note __, 5 - note __, 2 + rest 5 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 5 + rest 5 note D_, 4 - note __, 4 + rest 4 note D_, 1 - note __, 5 + rest 5 note D_, 1 - note __, 5 - note __, 2 + rest 5 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note E_, 1 - note __, 5 + rest 5 note E_, 1 - note __, 5 - note __, 2 + rest 5 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 4 - note __, 4 + rest 4 note F#, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note D_, 2 note D_, 1 - note __, 7 + rest 7 octave 2 note A_, 1 octave 3 @@ -74,252 +75,252 @@ Music_LookBeauty_branch_eee5f: note A_, 1 octave 4 note C_, 1 - loopchannel 0, Music_LookBeauty_branch_eee5f + sound_loop 0, .mainloop Music_LookBeauty_Ch2: - stereopanning $f0 - vibrato $10, $23 - dutycycle $2 - notetype $c, $c7 + stereo_panning TRUE, FALSE + vibrato 16, 2, 3 + duty_cycle 2 + note_type 12, 12, 7 octave 3 note D_, 1 - note __, 1 + rest 1 octave 5 note D_, 6 note C_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 2 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - dutycycle $3 -Music_LookBeauty_branch_eeec5: - notetype $c, $c7 + rest 1 + duty_cycle 3 +.mainloop: + note_type 12, 12, 7 note G_, 16 note A_, 8 note B_, 8 note A_, 10 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 2 note G#, 8 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note E_, 2 - intensity $b7 - vibrato $10, $24 + volume_envelope 11, 7 + vibrato 16, 2, 4 octave 5 note C_, 15 - notetype $6, $c7 - intensity $c5 - vibrato $10, $23 - note __, 1 + note_type 6, 12, 7 + volume_envelope 12, 5 + vibrato 16, 2, 3 + rest 1 note C#, 1 note D_, 16 note C_, 16 octave 4 note B_, 16 - note __, 4 + rest 4 octave 5 note D_, 2 - note __, 2 + rest 2 octave 4 note B_, 2 - note __, 2 + rest 2 note A_, 6 - note __, 14 + rest 14 note F#, 8 note A_, 8 - loopchannel 0, Music_LookBeauty_branch_eeec5 + sound_loop 0, .mainloop Music_LookBeauty_Ch3: - stereopanning $ff - vibrato $8, $12 - notetype $c, $15 - note __, 16 + stereo_panning TRUE, TRUE + vibrato 8, 1, 2 + note_type 12, 1, 5 + rest 16 octave 5 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 3 note D_, 7 note F#, 1 -Music_LookBeauty_branch_eef0f: +.mainloop: note G_, 4 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note G_, 2 note G_, 1 octave 4 note A#, 1 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 3 + rest 3 octave 4 note B_, 4 octave 3 note E_, 4 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note E_, 1 octave 4 note G_, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 note G#, 2 - note __, 2 + rest 2 note B_, 2 octave 3 note A_, 4 octave 5 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 note A_, 2 note A_, 1 octave 4 note B_, 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note C_, 4 octave 3 note D_, 4 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 4 note A_, 2 note A_, 1 - note __, 7 + rest 7 octave 3 note D_, 8 - loopchannel 0, Music_LookBeauty_branch_eef0f + sound_loop 0, .mainloop Music_LookBeauty_Ch4: - togglenoise $3 - notetype $c - note __, 16 - note __, 16 -Music_LookBeauty_branch_eef91: - callchannel Music_LookBeauty_branch_eefa1 - callchannel Music_LookBeauty_branch_eefa1 - callchannel Music_LookBeauty_branch_eefa1 - callchannel Music_LookBeauty_branch_eefa1 - loopchannel 0, Music_LookBeauty_branch_eef91 + toggle_noise 3 + drum_speed 12 + rest 16 + rest 16 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookBeauty_branch_eefa1: - note F#, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note F#, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - endchannel +.sub1: + drum_note 7, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + sound_ret diff --git a/crysaudio/music/lookhiker.asm b/crysaudio/music/lookhiker.asm index 9a394eb7..913aecea 100644 --- a/crysaudio/music/lookhiker.asm +++ b/crysaudio/music/lookhiker.asm @@ -1,40 +1,41 @@ Music_LookHiker: - musicheader 4, 1, Music_LookHiker_Ch1 - musicheader 1, 2, Music_LookHiker_Ch2 - musicheader 1, 3, Music_LookHiker_Ch3 - musicheader 1, 4, Music_LookHiker_Ch4 + channel_count 4 + channel 1, Music_LookHiker_Ch1 + channel 2, Music_LookHiker_Ch2 + channel 3, Music_LookHiker_Ch3 + channel 4, Music_LookHiker_Ch4 Music_LookHiker_Ch1: tempo 132 - volume $77 - tone $0001 - vibrato $12, $24 - dutycycle $2 - stereopanning $f - notetype $c, $68 + volume 7, 7 + pitch_offset 1 + vibrato 18, 2, 4 + duty_cycle 2 + stereo_panning FALSE, TRUE + note_type 12, 6, 8 octave 3 note F#, 2 note F_, 2 note F#, 8 -Music_LookHiker_branch_f7433: +.mainloop: note D_, 2 note D#, 2 note E_, 2 note F_, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 6 - loopchannel 0, Music_LookHiker_branch_f7433 + rest 6 + sound_loop 0, .mainloop Music_LookHiker_Ch2: - dutycycle $0 - notetype $c, $a1 - note __, 4 + duty_cycle 0 + note_type 12, 10, 1 + rest 4 octave 1 note B_, 1 note B_, 5 @@ -47,8 +48,8 @@ Music_LookHiker_Ch2: note D_, 1 note F#, 1 note D_, 1 - intensity $a1 -Music_LookHiker_branch_f7457: + volume_envelope 10, 1 +.mainloop: octave 1 note B_, 1 note B_, 2 @@ -65,50 +66,50 @@ Music_LookHiker_branch_f7457: note D_, 1 note F#, 1 note D_, 1 - loopchannel 0, Music_LookHiker_branch_f7457 + sound_loop 0, .mainloop Music_LookHiker_Ch3: - vibrato $12, $24 - stereopanning $f0 - notetype $c, $14 + vibrato 18, 2, 4 + stereo_panning TRUE, FALSE + note_type 12, 1, 4 octave 4 note B_, 2 note A#, 2 note B_, 8 -Music_LookHiker_branch_f7477: +.mainloop: octave 5 note D#, 2 note D_, 2 note C#, 2 note C_, 2 - callchannel Music_LookHiker_branch_f748a + sound_call .sub1 note G_, 2 note G#, 2 note A_, 2 note A#, 2 - callchannel Music_LookHiker_branch_f748a - loopchannel 0, Music_LookHiker_branch_f7477 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookHiker_branch_f748a: +.sub1: octave 4 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_LookHiker_Ch4: - togglenoise $3 - notetype $c - note F_, 4 - note __, 16 -Music_LookHiker_branch_f749a: - note D#, 2 - note G_, 2 - note D_, 2 - note G_, 2 - loopchannel 0, Music_LookHiker_branch_f749a + toggle_noise 3 + drum_speed 12 + drum_note 6, 4 + rest 16 +.mainloop: + drum_note 4, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lookkimonogirl.asm b/crysaudio/music/lookkimonogirl.asm index dc1dbee8..fd125b9f 100644 --- a/crysaudio/music/lookkimonogirl.asm +++ b/crysaudio/music/lookkimonogirl.asm @@ -1,116 +1,117 @@ Music_LookKimonoGirl: - musicheader 3, 1, Music_LookKimonoGirl_Ch1 - musicheader 1, 2, Music_LookKimonoGirl_Ch2 - musicheader 1, 3, Music_LookKimonoGirl_Ch3 + channel_count 3 + channel 1, Music_LookKimonoGirl_Ch1 + channel 2, Music_LookKimonoGirl_Ch2 + channel 3, Music_LookKimonoGirl_Ch3 - db $3 + db $3 ; unused Music_LookKimonoGirl_Ch1: tempo 160 - volume $77 - stereopanning $f - dutycycle $1 - notetype $6, $87 - tone $0001 - callchannel Music_LookKimonoGirl_branch_f7aa8 - tone 0 -Music_LookKimonoGirl_branch_f79d7: - notetype $c, $b2 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a34 - callchannel Music_LookKimonoGirl_branch_f7a34 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a34 - intensity $b4 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 1 + note_type 6, 8, 7 + pitch_offset 1 + sound_call Music_LookKimonoGirl_Ch2.sub2 + pitch_offset 0 +.mainloop: + note_type 12, 11, 2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + volume_envelope 11, 4 octave 3 note E_, 1 - intensity $54 + volume_envelope 5, 4 octave 4 note E_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note D_, 1 - intensity $54 + volume_envelope 5, 4 octave 4 note D_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 1 - intensity $54 + volume_envelope 5, 4 octave 3 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note A_, 1 - intensity $54 + volume_envelope 5, 4 octave 3 note A_, 1 - loopchannel 0, Music_LookKimonoGirl_branch_f79d7 + sound_loop 0, .mainloop -Music_LookKimonoGirl_branch_f7a13: - intensity $b4 +.sub1: + volume_envelope 11, 4 octave 2 note F_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note F_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note A_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note A_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note D_, 1 - intensity $74 + volume_envelope 7, 4 octave 4 note D_, 1 - endchannel + sound_ret -Music_LookKimonoGirl_branch_f7a34: - intensity $b4 +.sub2: + volume_envelope 11, 4 octave 2 note E_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note E_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note A_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note A_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note D_, 1 - intensity $74 + volume_envelope 7, 4 octave 4 note D_, 1 - endchannel + sound_ret Music_LookKimonoGirl_Ch2: - dutycycle $0 - notetype $6, $a7 - stereopanning $f0 - callchannel Music_LookKimonoGirl_branch_f7aa8 -Music_LookKimonoGirl_branch_f7a5f: - dutycycle $3 - notetype $c, $91 + duty_cycle 0 + note_type 6, 10, 7 + stereo_panning TRUE, FALSE + sound_call .sub2 +.mainloop: + duty_cycle 3 + note_type 12, 9, 1 octave 5 note E_, 1 note D_, 1 @@ -130,7 +131,7 @@ Music_LookKimonoGirl_branch_f7a5f: note A_, 1 note E_, 1 note D_, 1 - callchannel Music_LookKimonoGirl_branch_f7a94 + sound_call .sub1 octave 5 note F_, 1 note D_, 1 @@ -150,10 +151,10 @@ Music_LookKimonoGirl_branch_f7a5f: note A_, 1 note E_, 1 note D_, 1 - callchannel Music_LookKimonoGirl_branch_f7a94 - loopchannel 0, Music_LookKimonoGirl_branch_f7a5f + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookKimonoGirl_branch_f7a94: +.sub1: octave 5 note B_, 1 note A_, 1 @@ -173,60 +174,60 @@ Music_LookKimonoGirl_branch_f7a94: octave 3 note B_, 1 note E_, 1 - endchannel + sound_ret -Music_LookKimonoGirl_branch_f7aa8: +.sub2: octave 4 note E_, 1 octave 5 note E_, 16 - note __, 1 + rest 1 note E_, 2 - note __, 3 - intensity $b7 + rest 3 + volume_envelope 11, 7 note E_, 2 - note __, 2 - intensity $b7 + rest 2 + volume_envelope 11, 7 note E_, 2 - note __, 1 - intensity $a7 + rest 1 + volume_envelope 10, 7 note E_, 2 - note __, 1 - notetype $6, $65 + rest 1 + note_type 6, 6, 5 note E_, 2 - note __, 1 - intensity $54 + rest 1 + volume_envelope 5, 4 note E_, 2 - note __, 1 - intensity $63 + rest 1 + volume_envelope 6, 3 note E_, 2 note E_, 2 - intensity $91 + volume_envelope 9, 1 note E_, 2 - intensity $a1 + volume_envelope 10, 1 note E_, 1 - notetype $8, $b1 + note_type 8, 11, 1 note E_, 1 note E_, 1 - endchannel + sound_ret Music_LookKimonoGirl_Ch3: - stereopanning $ff - vibrato $12, $24 - notetype $6, $13 - note __, 1 - note __, 16 + stereo_panning TRUE, TRUE + vibrato 18, 2, 4 + note_type 6, 1, 3 + rest 1 + rest 16 octave 5 note E_, 1 note F_, 1 note E_, 2 - notetype $c, $13 + note_type 12, 1, 3 note E_, 12 - notetype $6, $13 + note_type 6, 1, 3 octave 5 note D_, 2 note E_, 2 -Music_LookKimonoGirl_branch_f7aec: +.mainloop: octave 5 note D_, 4 note E_, 4 @@ -262,4 +263,4 @@ Music_LookKimonoGirl_branch_f7aec: note E_, 2 note D_, 8 note E_, 8 - loopchannel 0, Music_LookKimonoGirl_branch_f7aec + sound_loop 0, .mainloop diff --git a/crysaudio/music/looklass.asm b/crysaudio/music/looklass.asm index 802716c1..05c487a7 100644 --- a/crysaudio/music/looklass.asm +++ b/crysaudio/music/looklass.asm @@ -1,71 +1,72 @@ Music_LookLass: - musicheader 4, 1, Music_LookLass_Ch1 - musicheader 1, 2, Music_LookLass_Ch2 - musicheader 1, 3, Music_LookLass_Ch3 - musicheader 1, 4, Music_LookLass_Ch4 + channel_count 4 + channel 1, Music_LookLass_Ch1 + channel 2, Music_LookLass_Ch2 + channel 3, Music_LookLass_Ch3 + channel 4, Music_LookLass_Ch4 Music_LookLass_Ch1: tempo 132 - volume $77 - tone $0001 - dutycycle $2 - notetype $c, $c7 + volume 7, 7 + pitch_offset 1 + duty_cycle 2 + note_type 12, 12, 7 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note B_, 14 - stereopanning $f - dutycycle $0 -Music_LookLass_branch_ed7bd: - intensity $a2 + stereo_panning FALSE, TRUE + duty_cycle 0 +.mainloop: + volume_envelope 10, 2 octave 3 note E_, 4 - intensity $a1 + volume_envelope 10, 1 note E_, 4 note E_, 4 note E_, 2 - intensity $a3 + volume_envelope 10, 3 note B_, 2 - loopchannel 0, Music_LookLass_branch_ed7bd + sound_loop 0, .mainloop Music_LookLass_Ch2: - stereopanning $f0 - dutycycle $0 - notetype $c, $83 - note __, 16 -Music_LookLass_branch_ed7d5: - intensity $92 + stereo_panning TRUE, FALSE + duty_cycle 0 + note_type 12, 8, 3 + rest 16 +.mainloop: + volume_envelope 9, 2 octave 2 note B_, 4 - intensity $91 + volume_envelope 9, 1 note B_, 4 note B_, 4 note B_, 2 - intensity $93 + volume_envelope 9, 3 octave 3 note G#, 2 - loopchannel 0, Music_LookLass_branch_ed7d5 + sound_loop 0, .mainloop Music_LookLass_Ch3: - notetype $c, $10 - note __, 8 + note_type 12, 1, 0 + rest 8 octave 6 note E_, 2 note D#, 2 note C#, 2 note C_, 2 -Music_LookLass_branch_ed7ef: +.mainloop: octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note D#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C#, 2 note C_, 2 octave 5 @@ -78,15 +79,15 @@ Music_LookLass_branch_ed7ef: note C#, 2 octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note C#, 2 - note __, 2 + rest 2 octave 5 note B_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note G#, 2 note F#, 2 note E_, 2 @@ -95,20 +96,20 @@ Music_LookLass_branch_ed7ef: note F#, 2 note G#, 2 note A_, 2 - loopchannel 0, Music_LookLass_branch_ed7ef + sound_loop 0, .mainloop Music_LookLass_Ch4: - togglenoise $4 - notetype $c - note C_, 16 -Music_LookLass_branch_ed81f: - notetype $6 - note D_, 8 - note C#, 8 - note C#, 8 - note C#, 4 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 0, Music_LookLass_branch_ed81f + toggle_noise 4 + drum_speed 12 + drum_note 1, 16 +.mainloop: + drum_speed 6 + drum_note 3, 8 + drum_note 2, 8 + drum_note 2, 8 + drum_note 2, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lookmysticalman.asm b/crysaudio/music/lookmysticalman.asm index 675c937e..c75fba02 100644 --- a/crysaudio/music/lookmysticalman.asm +++ b/crysaudio/music/lookmysticalman.asm @@ -1,106 +1,107 @@ Music_LookMysticalMan: - musicheader 4, 1, Music_LookMysticalMan_Ch1 - musicheader 1, 2, Music_LookMysticalMan_Ch2 - musicheader 1, 3, Music_LookMysticalMan_Ch3 - musicheader 1, 4, Music_LookMysticalMan_Ch4 + channel_count 4 + channel 1, Music_LookMysticalMan_Ch1 + channel 2, Music_LookMysticalMan_Ch2 + channel 3, Music_LookMysticalMan_Ch3 + channel 4, Music_LookMysticalMan_Ch4 Music_LookMysticalMan_Ch1: tempo 136 - volume $77 - vibrato $a, $34 - tone $0001 - stereopanning $f - notetype $c, $b3 - note __, 8 -Music_LookMysticalMan_branch_178458: - dutycycle $3 - notetype $6, $96 + volume 7, 7 + vibrato 10, 3, 4 + pitch_offset 1 + stereo_panning FALSE, TRUE + note_type 12, 11, 3 + rest 8 +.mainloop: + duty_cycle 3 + note_type 6, 9, 6 octave 3 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 9 - note __, 9 + rest 9 + rest 9 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 9 - note __, 9 + rest 9 + rest 9 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C#, 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 9 - note __, 9 + rest 9 + rest 9 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C#, 2 note E_, 2 - note __, 3 + rest 3 note F_, 1 note F#, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note C#, 4 - dutycycle $2 - callchannel Music_LookMysticalMan_branch_1784f9 + duty_cycle 2 + sound_call .sub1 octave 4 note C#, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note A#, 2 octave 4 note C#, 6 - note __, 4 + rest 4 octave 3 note F#, 4 - note __, 4 + rest 4 note E_, 4 - callchannel Music_LookMysticalMan_branch_1784f9 + sound_call .sub1 octave 4 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 3 note A#, 2 note B_, 6 note A#, 4 note F#, 4 - intensity $a5 - dutycycle $0 + volume_envelope 10, 5 + duty_cycle 0 octave 4 note F#, 2 note A#, 6 - dutycycle $2 - intensity $72 -Music_LookMysticalMan_branch_1784b4: + duty_cycle 2 + volume_envelope 7, 2 +.loop1: octave 5 note D_, 2 octave 4 note B_, 2 note F#, 2 note D_, 2 - loopchannel 4, Music_LookMysticalMan_branch_1784b4 + sound_loop 4, .loop1 octave 5 note D_, 2 octave 4 @@ -123,7 +124,7 @@ Music_LookMysticalMan_branch_1784b4: note D_, 2 note F#, 2 note B_, 2 -Music_LookMysticalMan_branch_1784d4: +.loop2: octave 5 note D_, 2 octave 4 @@ -131,7 +132,7 @@ Music_LookMysticalMan_branch_1784d4: note E_, 2 octave 3 note B_, 2 - loopchannel 4, Music_LookMysticalMan_branch_1784d4 + sound_loop 4, .loop2 octave 5 note C#, 2 octave 4 @@ -154,222 +155,222 @@ Music_LookMysticalMan_branch_1784d4: note E_, 2 note F#, 2 note A#, 2 - loopchannel 0, Music_LookMysticalMan_branch_178458 + sound_loop 0, .mainloop -Music_LookMysticalMan_branch_1784f9: +.sub1: note D_, 16 octave 4 note D_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F#, 2 note D_, 6 octave 3 note E_, 16 note B_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 - note __, 2 + rest 2 note D_, 2 octave 3 note B_, 6 octave 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 note C#, 6 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 3 note B_, 2 note A_, 6 - endchannel + sound_ret Music_LookMysticalMan_Ch2: - dutycycle $3 - vibrato $a, $34 - notetype $c, $b3 - note __, 8 -Music_LookMysticalMan_branch_178523: - stereopanning $f0 - notetype $6, $b8 + duty_cycle 3 + vibrato 10, 3, 4 + note_type 12, 11, 3 + rest 8 +.mainloop: + stereo_panning TRUE, FALSE + note_type 6, 11, 8 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 2 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 6 - stereopanning $ff + rest 6 + stereo_panning TRUE, TRUE note B_, 8 note A_, 4 - stereopanning $f0 + stereo_panning TRUE, FALSE note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 2 note G#, 2 - note __, 4 + rest 4 note G#, 2 - note __, 6 - stereopanning $ff + rest 6 + stereo_panning TRUE, TRUE note F#, 8 note G#, 4 - stereopanning $f0 + stereo_panning TRUE, FALSE note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G_, 2 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 6 - stereopanning $ff + rest 6 + stereo_panning TRUE, TRUE note A_, 8 note G_, 4 - stereopanning $f0 + stereo_panning TRUE, FALSE note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 2 note F#, 2 - note __, 3 + rest 3 note A_, 1 note A#, 4 - note __, 4 + rest 4 note F#, 4 - note __, 4 + rest 4 note E_, 4 - callchannel Music_LookMysticalMan_branch_17859a + sound_call .sub1 note F#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 note E_, 6 - callchannel Music_LookMysticalMan_branch_1785c8 - callchannel Music_LookMysticalMan_branch_17859a + sound_call .sub2 + sound_call .sub1 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note E_, 2 note D_, 6 - callchannel Music_LookMysticalMan_branch_1785c8 - notetype $c, $b7 + sound_call .sub2 + note_type 12, 11, 7 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 1 + rest 1 note C#, 2 - note __, 1 + rest 1 octave 3 note B_, 16 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 1 + rest 1 octave 3 note B_, 2 - note __, 1 + rest 1 note A#, 16 - note __, 2 - loopchannel 0, Music_LookMysticalMan_branch_178523 + rest 2 + sound_loop 0, .mainloop -Music_LookMysticalMan_branch_17859a: +.sub1: note B_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 note F#, 2 note A_, 6 note B_, 8 - note __, 2 + rest 2 note A_, 2 note B_, 2 octave 5 note C#, 2 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note D_, 2 note C#, 6 octave 4 note B_, 12 - intensity $88 + volume_envelope 8, 8 note A#, 1 note A_, 1 - intensity $68 + volume_envelope 6, 8 note G#, 1 note F#, 1 - intensity $b8 + volume_envelope 11, 8 octave 5 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note B_, 2 note A_, 6 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 note E_, 6 - endchannel + sound_ret -Music_LookMysticalMan_branch_1785c8: +.sub2: note C#, 8 - intensity $88 + volume_envelope 8, 8 note C_, 1 octave 3 note B_, 1 note A#, 1 - intensity $68 + volume_envelope 6, 8 note G#, 1 note F#, 1 - intensity $48 + volume_envelope 4, 8 note E_, 1 note C#, 1 - note __, 1 - intensity $b8 - endchannel + rest 1 + volume_envelope 11, 8 + sound_ret Music_LookMysticalMan_Ch3: - notetype $6, $16 - note __, 16 -Music_LookMysticalMan_branch_1785df: + note_type 6, 1, 6 + rest 16 +.mainloop: octave 2 note B_, 4 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 4 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 4 note A_, 2 note B_, 2 @@ -385,10 +386,10 @@ Music_LookMysticalMan_branch_1785df: note F#, 2 note E_, 4 note G#, 2 - note __, 2 + rest 2 note B_, 4 note E_, 1 - note __, 1 + rest 1 note E_, 6 octave 2 note A#, 2 @@ -397,11 +398,11 @@ Music_LookMysticalMan_branch_1785df: note A_, 4 octave 3 note G_, 2 - note __, 2 + rest 2 note E_, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 note G_, 2 note A_, 2 @@ -415,70 +416,70 @@ Music_LookMysticalMan_branch_1785df: note A_, 2 octave 3 note E_, 2 -Music_LookMysticalMan_branch_178615: +.loop1: octave 2 note F#, 4 note A#, 2 - note __, 2 + rest 2 octave 3 note C#, 4 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 6 note G#, 4 - note __, 4 + rest 4 note A#, 4 note B_, 4 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 4 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 6 octave 3 note D_, 2 - note __, 2 + rest 2 note F#, 2 note D_, 6 note E_, 4 note G#, 2 - note __, 2 + rest 2 note B_, 4 note E_, 1 - note __, 1 + rest 1 note E_, 6 note D_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 note G#, 6 note A_, 4 octave 3 note C#, 2 - note __, 2 + rest 2 note E_, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 6 octave 3 note E_, 4 note C#, 2 octave 2 note E_, 6 - loopchannel 2, Music_LookMysticalMan_branch_178615 + sound_loop 2, .loop1 note F#, 4 note A#, 2 - note __, 2 + rest 2 octave 3 note C#, 2 note F#, 6 octave 2 note F#, 2 - note __, 2 + rest 2 octave 3 note C#, 4 octave 2 @@ -501,11 +502,11 @@ Music_LookMysticalMan_branch_178615: octave 2 note B_, 4 note A_, 4 - note __, 2 + rest 2 note A#, 4 - note __, 2 + rest 2 note B_, 6 - note __, 2 + rest 2 note B_, 4 note A_, 4 note F#, 4 @@ -523,86 +524,87 @@ Music_LookMysticalMan_branch_178615: octave 3 note E_, 4 note F#, 4 - note __, 2 + rest 2 note E_, 4 - note __, 2 + rest 2 note C#, 8 octave 2 note B_, 8 note A#, 4 - loopchannel 0, Music_LookMysticalMan_branch_1785df + sound_loop 0, .mainloop Music_LookMysticalMan_Ch4: - togglenoise $3 - notetype $c - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 1 - note D_, 1 -Music_LookMysticalMan_branch_178697: - callchannel Music_LookMysticalMan_branch_1786d3 - callchannel Music_LookMysticalMan_branch_1786d9 - callchannel Music_LookMysticalMan_branch_1786d3 - callchannel Music_LookMysticalMan_branch_1786df - loopchannel 2, Music_LookMysticalMan_branch_178697 - callchannel Music_LookMysticalMan_branch_1786d3 - callchannel Music_LookMysticalMan_branch_1786d9 - callchannel Music_LookMysticalMan_branch_1786d3 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 1 - note D_, 1 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 1 - note D_, 1 -Music_LookMysticalMan_branch_1786ba: - note D_, 2 - note D#, 2 - note D_, 3 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 3 - note D#, 1 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - loopchannel 2, Music_LookMysticalMan_branch_1786ba - loopchannel 0, Music_LookMysticalMan_branch_178697 + toggle_noise 3 + drum_speed 12 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_loop 2, .loop1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.loop2: + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 2, .loop2 + sound_loop 0, .mainloop -Music_LookMysticalMan_branch_1786d3: - note D#, 4 - note D_, 3 - note D#, 3 - note D#, 2 - note D_, 4 - endchannel +.sub1: + drum_note 4, 4 + drum_note 3, 3 + drum_note 4, 3 + drum_note 4, 2 + drum_note 3, 4 + sound_ret -Music_LookMysticalMan_branch_1786d9: - note D#, 4 - note D_, 3 - note D_, 3 - note D#, 2 - note D_, 4 - endchannel +.sub2: + drum_note 4, 4 + drum_note 3, 3 + drum_note 3, 3 + drum_note 4, 2 + drum_note 3, 4 + sound_ret -Music_LookMysticalMan_branch_1786df: - note D#, 4 - note D_, 2 - note D#, 1 - note D_, 3 - note D_, 2 - note D#, 2 - note D_, 1 - note D_, 1 - endchannel +.sub3: + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_ret diff --git a/crysaudio/music/lookofficer.asm b/crysaudio/music/lookofficer.asm index 75e527b7..e069badc 100644 --- a/crysaudio/music/lookofficer.asm +++ b/crysaudio/music/lookofficer.asm @@ -1,43 +1,44 @@ Music_LookOfficer: - musicheader 3, 1, Music_LookOfficer_Ch1 - musicheader 1, 2, Music_LookOfficer_Ch2 - musicheader 1, 3, Music_LookOfficer_Ch3 + channel_count 3 + channel 1, Music_LookOfficer_Ch1 + channel 2, Music_LookOfficer_Ch2 + channel 3, Music_LookOfficer_Ch3 Music_LookOfficer_Ch1: tempo 116 - volume $77 - tone $0001 - vibrato $12, $34 - stereopanning $f - dutycycle $3 - notetype $c, $a7 + volume 7, 7 + pitch_offset 1 + vibrato 18, 3, 4 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 10, 7 octave 4 note C#, 1 note D_, 1 note D#, 1 note E_, 1 note F_, 12 - intensity $2f + volume_envelope 2, -7 octave 3 note B_, 16 -Music_LookOfficer_branch_ed852: - intensity $82 - note __, 4 +.mainloop: + volume_envelope 8, 2 + rest 4 note B_, 6 note G#, 4 note B_, 6 note B_, 6 note G#, 4 note B_, 2 - intensity $2f + volume_envelope 2, -7 note A#, 16 note A_, 16 - loopchannel 0, Music_LookOfficer_branch_ed852 + sound_loop 0, .mainloop Music_LookOfficer_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $c, $b7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 12, 11, 7 octave 5 note D#, 1 note D_, 1 @@ -45,8 +46,8 @@ Music_LookOfficer_Ch2: note C_, 1 octave 4 note B_, 12 - dutycycle $3 - intensity $a2 + duty_cycle 3 + volume_envelope 10, 2 octave 1 note B_, 4 octave 2 @@ -59,7 +60,8 @@ Music_LookOfficer_Ch2: note B_, 2 octave 2 note D#, 2 -Music_LookOfficer_branch_ed882: +.mainloop: +.loop1: note E_, 2 note G#, 2 octave 3 @@ -70,14 +72,14 @@ Music_LookOfficer_branch_ed882: note B_, 2 note E_, 2 note G#, 2 - loopchannel 2, Music_LookOfficer_branch_ed882 - pitchoffset 0, C# - callchannel Music_LookOfficer_branch_ed89e - pitchoffset 0, C_ - callchannel Music_LookOfficer_branch_ed89e - loopchannel 0, Music_LookOfficer_branch_ed882 + sound_loop 2, .loop1 + transpose 0, 1 + sound_call .sub1 + transpose 0, 0 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookOfficer_branch_ed89e: +.sub1: octave 1 note A_, 2 octave 2 @@ -92,31 +94,31 @@ Music_LookOfficer_branch_ed89e: note A_, 2 octave 2 note C#, 2 - endchannel + sound_ret Music_LookOfficer_Ch3: - vibrato $14, $14 - stereopanning $f0 - notetype $c, $14 - note __, 10 + vibrato 20, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 1, 4 + rest 10 octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 2 - intensity $12 + volume_envelope 1, 2 octave 5 note D#, 2 - note __, 1 + rest 1 note F_, 2 - note __, 1 + rest 1 note A_, 2 note B_, 2 - note __, 1 + rest 1 octave 6 note C#, 2 - note __, 1 + rest 1 note D#, 2 -Music_LookOfficer_branch_ed8c8: +.mainloop: note E_, 6 note D#, 6 note C#, 4 @@ -134,4 +136,4 @@ Music_LookOfficer_branch_ed8c8: note D_, 8 note E_, 8 note C#, 8 - loopchannel 0, Music_LookOfficer_branch_ed8c8 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lookpokemaniac.asm b/crysaudio/music/lookpokemaniac.asm index 4c4f8506..4fb44fd7 100644 --- a/crysaudio/music/lookpokemaniac.asm +++ b/crysaudio/music/lookpokemaniac.asm @@ -1,37 +1,39 @@ Music_LookPokemaniac: - musicheader 3, 1, Music_LookPokemaniac_Ch1 - musicheader 1, 2, Music_LookPokemaniac_Ch2 - musicheader 1, 3, Music_LookPokemaniac_Ch3 + channel_count 3 + channel 1, Music_LookPokemaniac_Ch1 + channel 2, Music_LookPokemaniac_Ch2 + channel 3, Music_LookPokemaniac_Ch3 Music_LookPokemaniac_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 144 - volume $77 - vibrato $2, $33 - tone $0002 - notetype $c, $b3 - note __, 8 -Music_LookPokemaniac_branch_ebdfb: - note __, 4 + volume 7, 7 + vibrato 2, 3, 3 + pitch_offset 2 + note_type 12, 11, 3 + rest 8 +.mainloop: +.loop1: + rest 4 octave 3 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 - loopchannel 4, Music_LookPokemaniac_branch_ebdfb - note __, 4 + rest 3 + sound_loop 4, .loop1 + rest 4 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - loopchannel 4, Music_LookPokemaniac_branch_ebdfb - loopchannel 0, Music_LookPokemaniac_branch_ebdfb + rest 3 + sound_loop 4, .loop1 + sound_loop 0, .mainloop Music_LookPokemaniac_Ch2: - stereopanning $ff - vibrato $2, $33 - tone $0001 - notetype $c, $b3 + stereo_panning TRUE, TRUE + vibrato 2, 3, 3 + pitch_offset 1 + note_type 12, 11, 3 octave 2 note A_, 1 note F#, 1 @@ -39,49 +41,50 @@ Music_LookPokemaniac_Ch2: note C_, 1 octave 1 note A_, 4 -Music_LookPokemaniac_branch_ebe24: +.mainloop: +.loop1: octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note F#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 octave 1 note G_, 2 - note __, 2 + rest 2 octave 3 note C_, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 - loopchannel 2, Music_LookPokemaniac_branch_ebe24 -Music_LookPokemaniac_branch_ebe38: + rest 3 + sound_loop 2, .loop1 +.loop2: octave 1 note A_, 2 - note __, 2 + rest 2 octave 3 note D#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 octave 1 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 3 - loopchannel 2, Music_LookPokemaniac_branch_ebe38 - loopchannel 0, Music_LookPokemaniac_branch_ebe24 + rest 3 + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_LookPokemaniac_Ch3: - stereopanning $f0 - vibrato $6, $33 - notetype $c, $15 + stereo_panning TRUE, FALSE + vibrato 6, 3, 3 + note_type 12, 1, 5 octave 4 note C_, 1 note D#, 1 @@ -89,15 +92,15 @@ Music_LookPokemaniac_Ch3: note A_, 1 octave 5 note C_, 4 - intensity $10 -Music_LookPokemaniac_branch_ebe62: - callchannel Music_LookPokemaniac_branch_ebe70 - intensity $14 - callchannel Music_LookPokemaniac_branch_ebe70 - intensity $10 - loopchannel 0, Music_LookPokemaniac_branch_ebe62 + volume_envelope 1, 0 +.mainloop: + sound_call .sub1 + volume_envelope 1, 4 + sound_call .sub1 + volume_envelope 1, 0 + sound_loop 0, .mainloop -Music_LookPokemaniac_branch_ebe70: +.sub1: note A#, 6 note A_, 2 note G#, 2 @@ -109,23 +112,23 @@ Music_LookPokemaniac_branch_ebe70: octave 4 note D#, 4 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 5 note F#, 4 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 6 note F#, 2 note F_, 2 @@ -137,23 +140,23 @@ Music_LookPokemaniac_branch_ebe70: note C_, 4 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 4 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret diff --git a/crysaudio/music/lookrival.asm b/crysaudio/music/lookrival.asm index 5eff9991..d4b98ebe 100644 --- a/crysaudio/music/lookrival.asm +++ b/crysaudio/music/lookrival.asm @@ -1,17 +1,18 @@ Music_LookRival: - musicheader 4, 1, Music_LookRival_Ch1 - musicheader 1, 2, Music_LookRival_Ch2 - musicheader 1, 3, Music_LookRival_Ch3 - musicheader 1, 4, Music_LookRival_Ch4 + channel_count 4 + channel 1, Music_LookRival_Ch1 + channel 2, Music_LookRival_Ch2 + channel 3, Music_LookRival_Ch3 + channel 4, Music_LookRival_Ch4 Music_LookRival_Ch1: tempo 112 - volume $77 - dutycycle $1 - tone $0001 - vibrato $12, $15 - stereopanning $f - notetype $c, $b2 + volume 7, 7 + duty_cycle 1 + pitch_offset 1 + vibrato 18, 1, 5 + stereo_panning FALSE, TRUE + note_type 12, 11, 2 octave 4 note C_, 1 octave 3 @@ -21,21 +22,20 @@ Music_LookRival_Ch1: note G#, 1 note F#, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $b2 + volume_envelope 11, 2 note A#, 4 note F_, 2 note G#, 4 - intensity $a0 + volume_envelope 10, 0 note G#, 10 - intensity $a5 + volume_envelope 10, 5 note G#, 8 - intensity $a6 + volume_envelope 10, 6 note F#, 8 -Music_AfterTheRivalFight_branch_f4fb1: -Music_LookRival_branch_f4fb1: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note F_, 4 note D#, 2 note F_, 6 @@ -45,15 +45,15 @@ Music_LookRival_branch_f4fb1: note A#, 4 note G#, 2 note G_, 4 - intensity $a0 + volume_envelope 10, 0 note F_, 2 - intensity $a7 + volume_envelope 10, 7 note F_, 16 - intensity $66 - note __, 2 + volume_envelope 6, 6 + rest 2 note F_, 2 note G_, 4 - intensity $b6 + volume_envelope 11, 6 note G#, 4 octave 4 note C_, 4 @@ -61,7 +61,7 @@ Music_LookRival_branch_f4fb1: note A#, 4 note G#, 2 note A#, 6 - intensity $b4 + volume_envelope 11, 4 note A#, 2 octave 4 note C_, 2 @@ -71,7 +71,7 @@ Music_LookRival_branch_f4fb1: note D#, 2 note C#, 2 note C_, 6 - intensity $b7 + volume_envelope 11, 7 octave 3 note A#, 12 note G#, 2 @@ -98,71 +98,70 @@ Music_LookRival_branch_f4fb1: note G#, 8 note F_, 6 note C_, 2 -Music_LookRival_branch_f4ff7: - intensity $b2 +.loop1: + volume_envelope 11, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 4 note F#, 2 note F_, 2 note D#, 2 - loopchannel 3, Music_LookRival_branch_f4ff7 - intensity $b2 + sound_loop 3, .loop1 + volume_envelope 11, 2 note F_, 2 note G#, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 6 note F#, 4 - loopchannel 0, Music_LookRival_branch_f4fb1 + sound_loop 0, .mainloop Music_LookRival_Ch2: - dutycycle $3 - vibrato $8, $36 - stereopanning $f0 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + stereo_panning TRUE, FALSE + note_type 12, 12, 2 octave 4 note F#, 2 note F_, 2 note D#, 2 note C#, 2 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note D#, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 4 note C_, 2 note D#, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 16 -Music_AfterTheRivalFight_branch_f502e: -Music_LookRival_branch_f502e: - intensity $c7 +.mainloop: + volume_envelope 12, 7 note C_, 12 - intensity $c4 + volume_envelope 12, 4 note C_, 2 note D_, 2 note D#, 4 note D_, 4 note C_, 2 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note C_, 6 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $b4 + volume_envelope 11, 4 octave 3 note A_, 2 note G_, 2 note A_, 2 - intensity $c6 + volume_envelope 12, 6 octave 4 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note D#, 8 note F_, 12 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note G_, 2 note G#, 2 @@ -170,43 +169,43 @@ Music_LookRival_branch_f502e: note G_, 2 note G_, 2 note F_, 2 - intensity $c4 + volume_envelope 12, 4 note G_, 6 - intensity $b0 + volume_envelope 11, 0 note F_, 16 - intensity $b7 + volume_envelope 11, 7 note F_, 16 - intensity $b0 + volume_envelope 11, 0 note G_, 12 note F_, 4 note E_, 16 note F_, 12 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note D_, 8 - intensity $c4 + volume_envelope 12, 4 note C_, 2 note D_, 2 note D#, 1 note D_, 1 note D#, 2 -Music_LookRival_branch_f5070: - intensity $c2 +.loop1: + volume_envelope 12, 2 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note D#, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 4 - loopchannel 3, Music_LookRival_branch_f5070 + sound_loop 3, .loop1 note C_, 2 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note D#, 10 - loopchannel 0, Music_LookRival_branch_f502e + sound_loop 0, .mainloop Music_LookRival_Ch3: - notetype $c, $28 - note __, 2 + note_type 12, 2, 8 + rest 2 octave 4 note C_, 2 octave 3 @@ -226,17 +225,17 @@ Music_LookRival_Ch3: note C_, 2 note D#, 2 note F#, 2 -Music_AfterTheRivalFight_branch_f509d: -Music_LookRival_branch_f509d: - callchannel Music_LookRival_branch_f50ef - loopchannel 3, Music_LookRival_branch_f509d +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 note F_, 4 note C_, 2 note D#, 4 note G#, 2 note G_, 2 note F#, 2 - callchannel Music_LookRival_branch_f50f7 + sound_call .sub2 note A#, 2 note F_, 2 note G_, 2 @@ -245,7 +244,7 @@ Music_LookRival_branch_f509d: note G_, 2 note G#, 1 note A_, 1 - callchannel Music_LookRival_branch_f50ff + sound_call .sub3 note A#, 2 note F_, 2 note G_, 2 @@ -270,10 +269,10 @@ Music_LookRival_branch_f509d: note A_, 2 note A#, 1 note A_, 1 - callchannel Music_LookRival_branch_f50f7 - callchannel Music_LookRival_branch_f50ff - callchannel Music_LookRival_branch_f50ef - callchannel Music_LookRival_branch_f50ef + sound_call .sub2 + sound_call .sub3 + sound_call .sub1 + sound_call .sub1 note F_, 2 note C_, 2 note D_, 2 @@ -289,9 +288,9 @@ Music_LookRival_branch_f509d: note C_, 2 note F#, 2 note E_, 2 - loopchannel 0, Music_LookRival_branch_f509d + sound_loop 0, .mainloop -Music_LookRival_branch_f50ef: +.sub1: note F_, 2 note C_, 2 note D_, 2 @@ -299,9 +298,9 @@ Music_LookRival_branch_f50ef: note C_, 2 note D_, 2 note D#, 2 - endchannel + sound_ret -Music_LookRival_branch_f50f7: +.sub2: note A#, 2 note F_, 2 note G_, 2 @@ -309,44 +308,43 @@ Music_LookRival_branch_f50f7: note F_, 2 note G_, 2 note G#, 2 - endchannel + sound_ret -Music_LookRival_branch_f50ff: +.sub3: note A#, 4 note F_, 2 note G#, 4 note F_, 2 note G_, 2 note G#, 2 - endchannel + sound_ret Music_LookRival_Ch4: - stereopanning $f0 - togglenoise $3 - notetype $c - note __, 8 - note __, 16 - note D#, 2 - note D_, 4 - note D_, 6 - note D_, 4 - note D#, 4 - note D#, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 -Music_AfterTheRivalFight_branch_f5118: -Music_LookRival_branch_f5118: - note D#, 4 - note D_, 2 - note D#, 4 - note D#, 2 - note D_, 4 - note D#, 4 - note D_, 2 - note D#, 4 - note D#, 2 - note D_, 2 - note D_, 2 - loopchannel 0, Music_LookRival_branch_f5118 + stereo_panning TRUE, FALSE + toggle_noise 3 + drum_speed 12 + rest 8 + rest 16 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 6 + drum_note 3, 4 + drum_note 4, 4 + drum_note 4, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 +.mainloop: + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lookrocket.asm b/crysaudio/music/lookrocket.asm index bd0c0e43..db1c6011 100644 --- a/crysaudio/music/lookrocket.asm +++ b/crysaudio/music/lookrocket.asm @@ -1,48 +1,48 @@ Music_LookRocket: - musicheader 4, 1, Music_LookRocket_Ch1 - musicheader 1, 2, Music_LookRocket_Ch2 - musicheader 1, 3, Music_LookRocket_Ch3 - musicheader 1, 4, Music_LookRocket_Ch4 + channel_count 4 + channel 1, Music_LookRocket_Ch1 + channel 2, Music_LookRocket_Ch2 + channel 3, Music_LookRocket_Ch3 + channel 4, Music_LookRocket_Ch4 Music_LookRocket_Ch1: tempo 123 - volume $77 - pitchoffset 0, D_ - stereopanning $f - dutycycle $3 - vibrato $5, $64 - notetype $c, $a8 + volume 7, 7 + transpose 0, 2 + stereo_panning FALSE, TRUE + duty_cycle 3 + vibrato 5, 6, 4 + note_type 12, 10, 8 octave 4 note C_, 1 note D_, 1 - callchannel Music_LookRocket_branch_f74e6 - dutycycle $1 -Music_LookRocket_branch_f74c7: - intensity $a8 - callchannel Music_LookRocket_branch_f74f7 - callchannel Music_LookRocket_branch_f758a + sound_call .sub1 + duty_cycle 1 +.mainloop: + volume_envelope 10, 8 + sound_call .sub2 + sound_call Music_LookRocket_Ch2.sub5 octave 4 note F#, 1 - note __, 1 - intensity $53 - callchannel Music_LookRocket_branch_f750c - intensity $c3 - callchannel Music_LookRocket_branch_f750c - intensity $e3 - callchannel Music_LookRocket_branch_f750c - note __, 16 - loopchannel 0, Music_LookRocket_branch_f74c7 + rest 1 + volume_envelope 5, 3 + sound_call .sub3 + volume_envelope 12, 3 + sound_call .sub3 + volume_envelope 14, 3 + sound_call .sub3 + rest 16 + sound_loop 0, .mainloop -Music_LookRocket_branch_f74e6: -Music_RocketTheme_branch_f74e6: +.sub1: note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 octave 2 note F_, 1 note G#, 1 @@ -51,14 +51,13 @@ Music_RocketTheme_branch_f74e6: note D_, 1 note F_, 1 note G#, 1 - endchannel + sound_ret -Music_LookRocket_branch_f74f7: -Music_RocketTheme_branch_f74f7: - note __, 2 +.sub2: + rest 2 octave 3 note D#, 1 - note __, 5 + rest 5 note D#, 4 octave 2 note A_, 2 @@ -67,74 +66,71 @@ Music_RocketTheme_branch_f74f7: note F_, 1 note F#, 6 note D#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f750c: -Music_RocketTheme_branch_f750c: - note __, 2 +.sub3: + rest 2 octave 2 note B_, 1 - note __, 7 + rest 7 octave 3 note C_, 1 - note __, 5 - endchannel + rest 5 + sound_ret Music_LookRocket_Ch2: - pitchoffset 0, D_ - vibrato $4, $64 - dutycycle $3 - notetype $c, $b7 - stereopanning $ff + transpose 0, 2 + vibrato 4, 6, 4 + duty_cycle 3 + note_type 12, 11, 7 + stereo_panning TRUE, TRUE octave 5 note C_, 1 note D_, 1 - callchannel Music_LookRocket_branch_f7547 -Music_LookRocket_branch_f7526: - intensity $b7 - callchannel Music_LookRocket_branch_f758a + sound_call .sub1 +.mainloop: + volume_envelope 11, 7 + sound_call .sub5 octave 5 note C_, 1 - note __, 1 - callchannel Music_LookRocket_branch_f7554 - intensity $53 - callchannel Music_LookRocket_branch_f7568 - intensity $c3 - callchannel Music_LookRocket_branch_f7568 - intensity $e3 - callchannel Music_LookRocket_branch_f7568 - callchannel Music_LookRocket_branch_f756f - loopchannel 0, Music_LookRocket_branch_f7526 + rest 1 + sound_call .sub2 + volume_envelope 5, 3 + sound_call .sub3 + volume_envelope 12, 3 + sound_call .sub3 + volume_envelope 14, 3 + sound_call .sub3 + sound_call .sub4 + sound_loop 0, .mainloop -Music_LookRocket_branch_f7547: -Music_RocketTheme_branch_f7547: +.sub1: note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 octave 3 note B_, 6 - dutycycle $0 - endchannel + duty_cycle 0 + sound_ret -Music_LookRocket_branch_f7554: -Music_RocketTheme_branch_f7554: - note __, 2 +.sub2: + rest 2 octave 4 note D#, 1 - note __, 5 + rest 5 note F_, 4 note C_, 1 note D_, 1 @@ -142,255 +138,245 @@ Music_RocketTheme_branch_f7554: note F_, 1 note F#, 6 note D#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 5 note D#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f7568: -Music_RocketTheme_branch_f7568: - note __, 2 +.sub3: + rest 2 octave 3 note F_, 1 - note __, 7 + rest 7 note F#, 1 - note __, 5 - endchannel + rest 5 + sound_ret -Music_LookRocket_branch_f756f: -Music_RocketTheme_branch_f756f: - intensity $63 +.sub4: + volume_envelope 6, 3 note G#, 1 note F_, 1 note D_, 1 octave 2 note B_, 1 - intensity $a3 + volume_envelope 10, 3 octave 3 note A_, 1 note F#, 1 note D#, 1 note C_, 1 - intensity $c3 + volume_envelope 12, 3 note A#, 1 note G_, 1 note E_, 1 note C#, 1 - intensity $f3 + volume_envelope 15, 3 note B_, 1 note G#, 1 note F_, 1 note D_, 1 - endchannel + sound_ret -Music_LookRocket_branch_f758a: -Music_RocketTheme_branch_f758a: +.sub5: octave 3 - note __, 2 + rest 2 note G_, 1 - note __, 5 + rest 5 note A_, 8 note A#, 6 note A_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_LookRocket_Ch3: - pitchoffset 0, D_ - vibrato $4, $22 - notetype $c, $14 - stereopanning $f0 - note __, 2 - callchannel Music_LookRocket_branch_f75bf -Music_LookRocket_branch_f75a5: - callchannel Music_LookRocket_branch_f75fe - callchannel Music_LookRocket_branch_f75fe - intensity $24 - callchannel Music_LookRocket_branch_f7623 - intensity $14 - callchannel Music_LookRocket_branch_f75cc - callchannel Music_LookRocket_branch_f7623 - callchannel Music_LookRocket_branch_f75e1 - loopchannel 0, Music_LookRocket_branch_f75a5 + transpose 0, 2 + vibrato 4, 2, 2 + note_type 12, 1, 4 + stereo_panning TRUE, FALSE + rest 2 + sound_call .sub1 +.mainloop: + sound_call .sub4 + sound_call .sub4 + volume_envelope 2, 4 + sound_call .sub5 + volume_envelope 1, 4 + sound_call .sub2 + sound_call .sub5 + sound_call .sub3 + sound_loop 0, .mainloop -Music_LookRocket_branch_f75bf: -Music_RocketTheme_branch_f75bf: +.sub1: octave 3 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 octave 3 note D_, 6 - endchannel + sound_ret -Music_LookRocket_branch_f75cc: -Music_RocketTheme_branch_f75cc: +.sub2: octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f75e1: -Music_RocketTheme_branch_f75e1: - intensity $24 +.sub3: + volume_envelope 2, 4 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note F#, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f75fe: -Music_RocketTheme_branch_f75fe: +.sub4: note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f7623: -Music_RocketTheme_branch_f7623: +.sub5: octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note G#, 1 note F#, 1 note D#, 1 note C_, 1 - endchannel + sound_ret Music_LookRocket_Ch4: - togglenoise $3 - notetype $c - note __, 2 - callchannel Music_LookRocket_branch_f765c -Music_LookRocket_branch_f7640: - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f765c - loopchannel 0, Music_LookRocket_branch_f7640 + toggle_noise 3 + drum_speed 12 + rest 2 + sound_call .sub1 +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookRocket_branch_f765c: -Music_RocketTheme_branch_f765c: - note C_, 8 - note D_, 2 - note D#, 2 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - endchannel +.sub1: + drum_note 1, 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_LookRocket_branch_f7664: -Music_RocketTheme_branch_f7664: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - endchannel +.sub2: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret diff --git a/crysaudio/music/looksage.asm b/crysaudio/music/looksage.asm index e1b51c39..1fa147ef 100644 --- a/crysaudio/music/looksage.asm +++ b/crysaudio/music/looksage.asm @@ -1,139 +1,140 @@ Music_LookSage: - musicheader 2, 1, Music_LookSage_Ch1 - musicheader 1, 3, Music_LookSage_Ch3 + channel_count 2 + channel 1, Music_LookSage_Ch1 + channel 3, Music_LookSage_Ch3 Music_LookSage_Ch1: tempo 144 - stereopanning $f - volume $77 - dutycycle $3 - notetype $c, $b3 - note __, 2 - note __, 16 - callchannel Music_LookSage_branch_ee3fa - intensity $b3 + stereo_panning FALSE, TRUE + volume 7, 7 + duty_cycle 3 + note_type 12, 11, 3 + rest 2 + rest 16 + sound_call .sub1 + volume_envelope 11, 3 octave 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 2 - intensity $93 + volume_envelope 9, 3 note F_, 2 -Music_LookSage_branch_ee38e: - intensity $b3 +.mainloop: + volume_envelope 11, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 octave 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 octave 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 2 - intensity $93 + volume_envelope 9, 3 note F_, 2 - intensity $b3 + volume_envelope 11, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - callchannel Music_LookSage_branch_ee3fa - loopchannel 0, Music_LookSage_branch_ee38e + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookSage_branch_ee3fa: - intensity $b3 +.sub1: + volume_envelope 11, 3 octave 2 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - endchannel + sound_ret Music_LookSage_Ch3: - stereopanning $f0 - vibrato $16, $23 - notetype $c, $10 + stereo_panning TRUE, FALSE + vibrato 22, 2, 3 + note_type 12, 1, 0 octave 5 note B_, 1 octave 6 note C_, 1 octave 5 note B_, 16 - vibrato $7, $23 + vibrato 7, 2, 3 note B_, 8 - vibrato $14, $23 + vibrato 20, 2, 3 octave 6 note D_, 6 note E_, 1 @@ -141,23 +142,23 @@ Music_LookSage_Ch3: note E_, 14 note G_, 1 note G#, 1 -Music_LookSage_branch_ee430: +.mainloop: note A_, 12 note B_, 4 note D_, 9 note E_, 1 note F_, 1 note D_, 1 - vibrato $0, $0 + vibrato 0, 0, 0 note E_, 4 - vibrato $7, $23 + vibrato 7, 2, 3 note E_, 8 - vibrato $14, $23 + vibrato 20, 2, 3 octave 5 note B_, 8 octave 6 note F_, 8 - notetype $6, $10 + note_type 6, 1, 0 note E_, 1 note D#, 1 note D_, 1 @@ -167,12 +168,12 @@ Music_LookSage_branch_ee430: note B_, 1 note A#, 1 note A_, 1 - note __, 4 + rest 4 octave 6 note E_, 2 note F_, 2 - notetype $c, $10 + note_type 12, 1, 0 note E_, 14 note G_, 1 note G#, 1 - loopchannel 0, Music_LookSage_branch_ee430 + sound_loop 0, .mainloop diff --git a/crysaudio/music/lookyoungster.asm b/crysaudio/music/lookyoungster.asm index e835d5fe..e840facc 100644 --- a/crysaudio/music/lookyoungster.asm +++ b/crysaudio/music/lookyoungster.asm @@ -1,295 +1,296 @@ Music_LookYoungster: - musicheader 3, 1, Music_LookYoungster_Ch1 - musicheader 1, 2, Music_LookYoungster_Ch2 - musicheader 1, 3, Music_LookYoungster_Ch3 + channel_count 3 + channel 1, Music_LookYoungster_Ch1 + channel 2, Music_LookYoungster_Ch2 + channel 3, Music_LookYoungster_Ch3 Music_LookYoungster_Ch1: tempo 118 - volume $77 - stereopanning $f - dutycycle $3 - notetype $c, $a3 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 10, 3 octave 3 note G_, 1 note G#, 1 note A_, 1 note A#, 1 - intensity $3e + volume_envelope 3, -6 note B_, 16 - intensity $c3 + volume_envelope 12, 3 octave 4 note C_, 1 - note __, 3 + rest 3 note C_, 4 - note __, 2 + rest 2 note C_, 6 - intensity $b3 -Music_LookYoungster_branch_f66ea: - note __, 2 + volume_envelope 11, 3 +.mainloop: + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 - note __, 16 - note __, 2 + rest 1 + rest 16 + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 - note __, 16 - loopchannel 0, Music_LookYoungster_branch_f66ea + rest 1 + rest 16 + sound_loop 0, .mainloop - db $ff + sound_ret ; unused Music_LookYoungster_Ch2: - stereopanning $f0 - vibrato $12, $26 - dutycycle $1 - notetype $c, $a3 + stereo_panning TRUE, FALSE + vibrato 18, 2, 6 + duty_cycle 1 + note_type 12, 10, 3 octave 3 note B_, 1 octave 4 note C_, 1 note C#, 1 note D_, 1 - intensity $3e - notetype $c, $2e + volume_envelope 3, -6 + note_type 12, 2, -6 note G_, 16 - notetype $c, $b3 - intensity $c3 + note_type 12, 11, 3 + volume_envelope 12, 3 note F_, 1 - note __, 3 + rest 3 note F_, 4 - note __, 2 + rest 2 note F#, 6 -Music_LookYoungster_branch_f672f: - dutycycle $3 - intensity $b3 - note __, 2 +.mainloop: + duty_cycle 3 + volume_envelope 11, 3 + rest 2 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 - intensity $97 - dutycycle $2 + rest 1 + volume_envelope 9, 7 + duty_cycle 2 note D#, 1 note F_, 1 note D#, 1 note D_, 1 note C_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - dutycycle $3 - intensity $b3 - note __, 2 + rest 1 + duty_cycle 3 + volume_envelope 11, 3 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 - dutycycle $2 - intensity $97 + rest 1 + duty_cycle 2 + volume_envelope 9, 7 note G#, 1 note A#, 1 note G#, 1 note G_, 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 octave 3 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 - loopchannel 0, Music_LookYoungster_branch_f672f + rest 1 + sound_loop 0, .mainloop - db $ff + sound_ret ; unused Music_LookYoungster_Ch3: - stereopanning $ff - vibrato $2, $24 - notetype $c, $25 - note __, 4 + stereo_panning TRUE, TRUE + vibrato 2, 2, 4 + note_type 12, 2, 5 + rest 4 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 - intensity $15 + rest 1 + volume_envelope 1, 5 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 4 - note __, 2 + rest 2 note G#, 6 - intensity $25 -Music_LookYoungster_branch_f67ae: + volume_envelope 2, 5 +.mainloop: octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - loopchannel 0, Music_LookYoungster_branch_f67ae + rest 1 + sound_loop 0, .mainloop - db $ff + sound_ret ; unused diff --git a/crysaudio/music/magnettrain.asm b/crysaudio/music/magnettrain.asm index fd4229cb..428acc4b 100644 --- a/crysaudio/music/magnettrain.asm +++ b/crysaudio/music/magnettrain.asm @@ -1,19 +1,20 @@ Music_MagnetTrain: - musicheader 4, 1, Music_MagnetTrain_Ch1 - musicheader 1, 2, Music_MagnetTrain_Ch2 - musicheader 1, 3, Music_MagnetTrain_Ch3 - musicheader 1, 4, Music_MagnetTrain_Ch4 + channel_count 4 + channel 1, Music_MagnetTrain_Ch1 + channel 2, Music_MagnetTrain_Ch2 + channel 3, Music_MagnetTrain_Ch3 + channel 4, Music_MagnetTrain_Ch4 Music_MagnetTrain_Ch1: tempo 110 - volume $77 - stereopanning $f - vibrato $14, $23 - dutycycle $2 - notetype $c, $b2 - note __, 16 - note __, 16 - intensity $b7 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 20, 2, 3 + duty_cycle 2 + note_type 12, 11, 2 + rest 16 + rest 16 + volume_envelope 11, 7 octave 4 note D_, 1 note C_, 1 @@ -59,57 +60,57 @@ Music_MagnetTrain_Ch1: note C_, 1 note E_, 1 note C_, 1 - notetype $6, $b7 + note_type 6, 11, 7 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $c, $b7 + rest 1 + note_type 12, 11, 7 note D_, 16 - endchannel + sound_ret Music_MagnetTrain_Ch2: - vibrato $14, $23 - dutycycle $1 - notetype $c, $d2 - stereopanning $f0 - notetype $c, $d8 + vibrato 20, 2, 3 + duty_cycle 1 + note_type 12, 13, 2 + stereo_panning TRUE, FALSE + note_type 12, 13, 8 octave 1 note F_, 12 - note __, 2 - notetype $6, $d7 + rest 2 + note_type 6, 13, 7 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 2 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 - dutycycle $3 - notetype $c, $d7 + rest 4 + duty_cycle 3 + note_type 12, 13, 7 octave 4 note G_, 16 note A_, 13 - note __, 1 - notetype $6, $d7 + rest 1 + note_type 6, 13, 7 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype $c, $d7 + rest 1 + note_type 12, 13, 7 note A_, 16 - endchannel + sound_ret Music_MagnetTrain_Ch3: - stereopanning $ff - vibrato $10, $23 - notetype $c, $15 + stereo_panning TRUE, TRUE + vibrato 16, 2, 3 + note_type 12, 1, 5 octave 6 note C_, 1 octave 5 @@ -220,62 +221,61 @@ Music_MagnetTrain_Ch3: note D_, 1 octave 2 note D_, 16 - endchannel + sound_ret Music_MagnetTrain_Ch4: - togglenoise $3 - notetype $c - note B_, 12 - note D_, 2 - note A#, 1 - note A#, 1 - notetype $6 - note D#, 4 - note F#, 4 - note D#, 4 - note F#, 4 - note A#, 4 - note F#, 4 - note A#, 4 - note D_, 2 - note D_, 2 - callchannel Music_MagnetTrain_branch_ef71e - callchannel Music_MagnetTrain_branch_ef71e - notetype $c - note B_, 16 - endchannel + toggle_noise 3 + drum_speed 12 + drum_note 12, 12 + drum_note 3, 2 + drum_note 11, 1 + drum_note 11, 1 + drum_speed 6 + drum_note 4, 4 + drum_note 7, 4 + drum_note 4, 4 + drum_note 7, 4 + drum_note 11, 4 + drum_note 7, 4 + drum_note 11, 4 + drum_note 3, 2 + drum_note 3, 2 + sound_call .sub2 + sound_call .sub2 + drum_speed 12 + drum_note 12, 16 + sound_ret -; unused -Music_MagnetTrain_branch_ef711: - note G#, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - endchannel +.sub1: ; unreferenced + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_ret -Music_MagnetTrain_branch_ef71e: - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - endchannel +.sub2: + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + sound_ret diff --git a/crysaudio/music/mainmenu.asm b/crysaudio/music/mainmenu.asm index b787a5ea..71f9c7ae 100644 --- a/crysaudio/music/mainmenu.asm +++ b/crysaudio/music/mainmenu.asm @@ -1,21 +1,23 @@ Music_MainMenu: - musicheader 4, 1, Music_MainMenu_Ch1 - musicheader 1, 2, Music_MainMenu_Ch2 - musicheader 1, 3, Music_MainMenu_Ch3 - musicheader 1, 4, Music_MainMenu_Ch4 + channel_count 4 + channel 1, Music_MainMenu_Ch1 + channel 2, Music_MainMenu_Ch2 + channel 3, Music_MainMenu_Ch3 + channel 4, Music_MainMenu_Ch4 Music_MainMenu_Ch1: tempo 160 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f0 - notetype $c, $f + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 0, -7 octave 3 note D_, 8 -Music_MainMenu_branch_f791d: - notetype $c, $92 +.mainloop: +.loop1: + note_type 12, 9, 2 octave 3 note C#, 6 note C#, 1 @@ -23,7 +25,7 @@ Music_MainMenu_branch_f791d: note C#, 2 note C#, 2 note C#, 4 - loopchannel 2, Music_MainMenu_branch_f791d + sound_loop 2, .loop1 note D#, 6 note D#, 1 note D#, 1 @@ -36,26 +38,27 @@ Music_MainMenu_branch_f791d: note B_, 1 note B_, 2 note B_, 2 - notetype $c, $94 + note_type 12, 9, 4 octave 3 note C_, 4 - loopchannel 0, Music_MainMenu_branch_f791d + sound_loop 0, .mainloop Music_MainMenu_Ch2: - dutycycle $3 - stereopanning $f - notetype $c, $f + duty_cycle 3 + stereo_panning FALSE, TRUE + note_type 12, 0, -7 octave 3 note G_, 8 -Music_MainMenu_branch_f7949: - notetype $c, $a2 +.mainloop: +.loop1: + note_type 12, 10, 2 note F#, 6 note F#, 1 note F#, 1 note F#, 2 note F#, 2 note F#, 4 - loopchannel 2, Music_MainMenu_branch_f7949 + sound_loop 2, .loop1 note G#, 6 note G#, 1 note G#, 1 @@ -67,76 +70,77 @@ Music_MainMenu_branch_f7949: note E_, 1 note E_, 2 note E_, 2 - notetype $c, $a4 + note_type 12, 10, 4 note F_, 4 - loopchannel 0, Music_MainMenu_branch_f7949 + sound_loop 0, .mainloop Music_MainMenu_Ch3: - stereopanning $f0 - notetype $c, $25 - note __, 8 -Music_MainMenu_branch_f796f: + stereo_panning TRUE, FALSE + note_type 12, 2, 5 + rest 8 +.mainloop: +.loop1: octave 2 note F#, 1 - note __, 5 + rest 5 note F#, 1 note F#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 - loopchannel 2, Music_MainMenu_branch_f796f + rest 3 + sound_loop 2, .loop1 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 5 + rest 5 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 - loopchannel 0, Music_MainMenu_branch_f796f + rest 3 + sound_loop 0, .mainloop Music_MainMenu_Ch4: - stereopanning $f - togglenoise $3 - notetype $c - note __, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 12 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 -Music_MainMenu_branch_f79a5: - note D_, 6 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 6 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_MainMenu_branch_f79a5 + stereo_panning FALSE, TRUE + toggle_noise 3 + drum_speed 12 + rest 8 + rest 16 + rest 16 + rest 16 + rest 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: + drum_note 3, 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/mobileadapter.asm b/crysaudio/music/mobileadapter.asm index 26c64cff..0c36649a 100644 --- a/crysaudio/music/mobileadapter.asm +++ b/crysaudio/music/mobileadapter.asm @@ -1,29 +1,30 @@ Music_MobileAdapter: - musicheader 4, 1, Music_MobileAdapter_Ch1 - musicheader 1, 2, Music_MobileAdapter_Ch2 - musicheader 1, 3, Music_MobileAdapter_Ch3 - musicheader 1, 4, Music_MobileAdapter_Ch4 + channel_count 4 + channel 1, Music_MobileAdapter_Ch1 + channel 2, Music_MobileAdapter_Ch2 + channel 3, Music_MobileAdapter_Ch3 + channel 4, Music_MobileAdapter_Ch4 Music_MobileAdapter_Ch1: tempo 132 - volume $77 - tone $0001 - stereopanning $f - dutycycle $2 - notetype $c, $84 - note __, 2 - note __, 6 + volume 7, 7 + pitch_offset 1 + stereo_panning FALSE, TRUE + duty_cycle 2 + note_type 12, 8, 4 + rest 2 + rest 6 octave 3 note G_, 1 octave 4 note D_, 1 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 4 -Music_MobileAdapter_branch_1fcad: - callchannel Music_MobileAdapter_branch_1fd39 +.mainloop: + sound_call .sub1 note D_, 1 note C#, 1 note D_, 2 @@ -37,7 +38,7 @@ Music_MobileAdapter_branch_1fcad: note D_, 1 note C#, 1 note D_, 2 - callchannel Music_MobileAdapter_branch_1fd39 + sound_call .sub1 note D_, 1 note C#, 1 octave 3 @@ -48,7 +49,7 @@ Music_MobileAdapter_branch_1fcad: note E_, 1 note D_, 1 note C#, 1 - intensity $94 + volume_envelope 9, 4 note D_, 2 octave 3 note A_, 2 @@ -56,34 +57,34 @@ Music_MobileAdapter_branch_1fcad: note D_, 4 octave 5 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 8 - intensity $92 + volume_envelope 9, 2 note F#, 1 note G_, 1 note A_, 2 note G#, 2 note A_, 2 - intensity $94 + volume_envelope 9, 4 note E_, 3 octave 3 note A_, 3 note E_, 4 octave 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note B_, 8 - intensity $92 + volume_envelope 9, 2 octave 4 note B_, 1 octave 5 @@ -94,32 +95,32 @@ Music_MobileAdapter_branch_1fcad: note A_, 2 octave 5 note C#, 3 - intensity $94 + volume_envelope 9, 4 octave 4 note C#, 3 octave 3 note A_, 4 octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note F#, 10 octave 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 10 octave 4 note A_, 8 - intensity $a1 + volume_envelope 10, 1 octave 3 note C#, 1 note D_, 1 @@ -137,35 +138,35 @@ Music_MobileAdapter_branch_1fcad: note A_, 1 note G_, 1 note A_, 2 - intensity $94 + volume_envelope 9, 4 note F#, 2 octave 2 note A_, 2 octave 3 note D_, 4 - intensity $77 - callchannel Music_MobileAdapter_branch_1ff09 - loopchannel 0, Music_MobileAdapter_branch_1fcad + volume_envelope 7, 7 + sound_call Music_MobileAdapter_Ch3.sub5 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1fd39: - intensity $94 +.sub1: + volume_envelope 9, 4 octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 2 octave 3 note F#, 10 octave 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 octave 3 note G_, 8 - intensity $a1 + volume_envelope 10, 1 note B_, 1 octave 4 note D_, 1 @@ -187,12 +188,12 @@ Music_MobileAdapter_branch_1fd39: note B_, 1 octave 4 note C#, 1 - endchannel + sound_ret Music_MobileAdapter_Ch2: - notetype $c, $c1 - vibrato $10, $23 - dutycycle $2 + note_type 12, 12, 1 + vibrato 16, 2, 3 + duty_cycle 2 octave 3 note G_, 1 note B_, 1 @@ -209,21 +210,21 @@ Music_MobileAdapter_Ch2: octave 3 note B_, 2 note A_, 2 - intensity $b4 + volume_envelope 11, 4 octave 4 note D_, 1 note F#, 1 -Music_MobileAdapter_branch_1fd80: - callchannel Music_MobileAdapter_branch_1fdfe +.mainloop: + sound_call .sub1 note A_, 4 note G_, 4 note A_, 4 note E_, 4 note F#, 12 - note __, 2 + rest 2 note D_, 1 note F#, 1 - callchannel Music_MobileAdapter_branch_1fdfe + sound_call .sub1 octave 5 note C#, 4 octave 4 @@ -232,55 +233,55 @@ Music_MobileAdapter_branch_1fd80: note F#, 4 note E_, 4 note D_, 12 - note __, 2 + rest 2 note C#, 1 note D_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 4 note F#, 2 note E_, 2 note D_, 2 note C#, 9 - intensity $a2 + volume_envelope 10, 2 octave 3 note E_, 3 note C#, 2 - intensity $b4 + volume_envelope 11, 4 octave 5 note D_, 1 note C#, 1 octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note C#, 4 note D_, 2 note E_, 2 note F#, 2 note E_, 9 - intensity $a2 + volume_envelope 10, 2 octave 3 note A_, 3 note E_, 2 - intensity $b4 + volume_envelope 11, 4 octave 5 note F#, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G_, 4 note F#, 2 note E_, 2 @@ -288,11 +289,11 @@ Music_MobileAdapter_branch_1fd80: note C#, 1 octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note G_, 4 note F#, 2 @@ -304,29 +305,29 @@ Music_MobileAdapter_branch_1fd80: note C#, 12 note E_, 4 note D_, 16 - dutycycle $1 - intensity $71 - callchannel Music_MobileAdapter_branch_1fe16 + duty_cycle 1 + volume_envelope 7, 1 + sound_call .sub2 octave 4 note E_, 1 note A_, 1 octave 5 note C#, 1 note E_, 1 - callchannel Music_MobileAdapter_branch_1fe16 - note __, 2 - dutycycle $2 - intensity $b4 + sound_call .sub2 + rest 2 + duty_cycle 2 + volume_envelope 11, 4 octave 4 note D_, 1 note F#, 1 - loopchannel 0, Music_MobileAdapter_branch_1fd80 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1fdfe: +.sub1: note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 octave 5 note D_, 4 @@ -336,9 +337,9 @@ Music_MobileAdapter_branch_1fdfe: note G_, 1 note A_, 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 2 octave 5 note E_, 4 @@ -346,9 +347,9 @@ Music_MobileAdapter_branch_1fdfe: note C#, 2 octave 4 note B_, 2 - endchannel + sound_ret -Music_MobileAdapter_branch_1fe16: +.sub2: octave 5 note F#, 1 note D_, 1 @@ -387,192 +388,195 @@ Music_MobileAdapter_branch_1fe16: note G_, 1 octave 5 note C#, 4 - endchannel + sound_ret Music_MobileAdapter_Ch3: - notetype $c, $14 - note __, 2 + note_type 12, 1, 4 + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 note G_, 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note A_, 4 -Music_MobileAdapter_branch_1fe4f: - callchannel Music_MobileAdapter_branch_1fecf - callchannel Music_MobileAdapter_branch_1fee3 - callchannel Music_MobileAdapter_branch_1feee +.mainloop: + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 - callchannel Music_MobileAdapter_branch_1fecf - callchannel Music_MobileAdapter_branch_1fee3 - callchannel Music_MobileAdapter_branch_1feee + rest 1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 note D_, 2 octave 2 note A_, 2 octave 3 note D_, 4 - callchannel Music_MobileAdapter_branch_1fee3 - callchannel Music_MobileAdapter_branch_1fef7 + sound_call .sub2 + sound_call .sub4 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - callchannel Music_MobileAdapter_branch_1fef7 + rest 1 + sound_call .sub4 octave 3 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 - callchannel Music_MobileAdapter_branch_1fee3 + rest 1 + sound_call .sub2 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 2 octave 2 note A_, 2 octave 3 note D_, 4 - callchannel Music_MobileAdapter_branch_1ff09 - loopchannel 0, Music_MobileAdapter_branch_1fe4f + sound_call .sub5 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1fecf: +.sub1: +.sub1loop1: octave 3 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - loopchannel 4, Music_MobileAdapter_branch_1fecf -Music_MobileAdapter_branch_1fed8: + rest 1 + sound_loop 4, .sub1loop1 +.sub1loop2: octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 - loopchannel 4, Music_MobileAdapter_branch_1fed8 - endchannel + rest 1 + sound_loop 4, .sub1loop2 + sound_ret -Music_MobileAdapter_branch_1fee3: +.sub2: +.sub2loop1: octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 - loopchannel 4, Music_MobileAdapter_branch_1fee3 - endchannel + rest 1 + sound_loop 4, .sub2loop1 + sound_ret -Music_MobileAdapter_branch_1feee: +.sub3: note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_MobileAdapter_branch_1fef7: +.sub4: octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 octave 3 note E_, 2 - note __, 1 + rest 1 octave 2 note A_, 4 - endchannel + sound_ret -Music_MobileAdapter_branch_1ff09: +.sub5: +.sub5loop1: octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 @@ -581,7 +585,7 @@ Music_MobileAdapter_branch_1ff09: note D_, 3 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 @@ -590,7 +594,7 @@ Music_MobileAdapter_branch_1ff09: note D_, 3 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 @@ -599,58 +603,59 @@ Music_MobileAdapter_branch_1ff09: note D_, 3 octave 2 note A_, 2 - note __, 6 - loopchannel 2, Music_MobileAdapter_branch_1ff09 - endchannel + rest 6 + sound_loop 2, .sub5loop1 + sound_ret Music_MobileAdapter_Ch4: - togglenoise $3 - stereopanning $f0 - notetype $c - note __, 2 - note __, 10 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 -Music_MobileAdapter_branch_1ff38: - callchannel Music_MobileAdapter_branch_1ff60 - callchannel Music_MobileAdapter_branch_1ff60 -Music_MobileAdapter_branch_1ff3e: - note __, 4 - note D_, 8 - note D_, 8 - note D_, 4 - note D_, 1 - note D_, 3 - note D_, 4 - loopchannel 2, Music_MobileAdapter_branch_1ff3e -Music_MobileAdapter_branch_1ff49: - note __, 4 - note D_, 4 - loopchannel 11, Music_MobileAdapter_branch_1ff49 - note __, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note __, 4 - note D_, 8 - note D_, 8 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - loopchannel 0, Music_MobileAdapter_branch_1ff38 + toggle_noise 3 + stereo_panning TRUE, FALSE + drum_speed 12 + rest 2 + rest 10 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: + sound_call .sub1 + sound_call .sub1 +.loop1: + rest 4 + drum_note 3, 8 + drum_note 3, 8 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 3 + drum_note 3, 4 + sound_loop 2, .loop1 +.loop2: + rest 4 + drum_note 3, 4 + sound_loop 11, .loop2 + rest 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + rest 4 + drum_note 3, 8 + drum_note 3, 8 + drum_note 3, 6 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop -Music_MobileAdapter_branch_1ff60: - note __, 4 - note D_, 4 - loopchannel 7, Music_MobileAdapter_branch_1ff60 - note __, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - endchannel +.sub1: +.sub1loop1: + rest 4 + drum_note 3, 4 + sound_loop 7, .sub1loop1 + rest 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_ret diff --git a/crysaudio/music/mobileadaptermenu.asm b/crysaudio/music/mobileadaptermenu.asm index 1573076f..4312422f 100644 --- a/crysaudio/music/mobileadaptermenu.asm +++ b/crysaudio/music/mobileadaptermenu.asm @@ -1,27 +1,28 @@ Music_MobileAdapterMenu: - musicheader 3, 1, Music_MobileAdapterMenu_Ch1 - musicheader 1, 2, Music_MobileAdapterMenu_Ch2 - musicheader 1, 3, Music_MobileAdapterMenu_Ch3 + channel_count 3 + channel 1, Music_MobileAdapterMenu_Ch1 + channel 2, Music_MobileAdapterMenu_Ch2 + channel 3, Music_MobileAdapterMenu_Ch3 Music_MobileAdapterMenu_Ch1: tempo 168 - volume $77 - tone $0001 - stereopanning $f - dutycycle $2 - notetype $c, $66 - note __, 2 -Music_MobileAdapterMenu_branch_178038: - callchannel Music_MobileAdapterMenu_branch_178057 - callchannel Music_MobileAdapterMenu_branch_178076 + volume 7, 7 + pitch_offset 1 + stereo_panning FALSE, TRUE + duty_cycle 2 + note_type 12, 6, 6 + rest 2 +.mainloop: + sound_call .sub1 + sound_call .sub2 octave 3 note F#, 4 note B_, 4 note F#, 2 note B_, 1 - note __, 1 + rest 1 note D#, 4 - callchannel Music_MobileAdapterMenu_branch_178076 + sound_call .sub2 octave 3 note F#, 2 octave 2 @@ -30,47 +31,47 @@ Music_MobileAdapterMenu_branch_178038: note D#, 3 note E_, 1 note D#, 8 - callchannel Music_MobileAdapterMenu_branch_178057 - loopchannel 0, Music_MobileAdapterMenu_branch_178038 + sound_call .sub1 + sound_loop 0, .mainloop -Music_MobileAdapterMenu_branch_178057: +.sub1: octave 3 note G#, 7 octave 4 note E_, 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note F#, 4 note E_, 8 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D#, 4 note G#, 7 octave 4 note E_, 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note F#, 4 note A_, 2 note E_, 2 note A_, 3 note A_, 1 note G#, 8 - endchannel + sound_ret -Music_MobileAdapterMenu_branch_178076: +.sub2: note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 3 octave 3 @@ -78,27 +79,27 @@ Music_MobileAdapterMenu_branch_178076: note A_, 2 octave 4 note E_, 1 - note __, 1 + rest 1 note C#, 4 - endchannel + sound_ret Music_MobileAdapterMenu_Ch2: - stereopanning $f0 - notetype $c, $84 - dutycycle $2 + stereo_panning TRUE, FALSE + note_type 12, 8, 4 + duty_cycle 2 octave 4 note E_, 1 note G#, 1 -Music_MobileAdapterMenu_branch_17808e: - callchannel Music_MobileAdapterMenu_branch_1780ae +.mainloop: + sound_call .sub1 note E_, 8 - callchannel Music_MobileAdapterMenu_branch_1780d7 + sound_call .sub2 note D#, 2 note C#, 2 note D#, 3 note E_, 1 note F#, 8 - callchannel Music_MobileAdapterMenu_branch_1780d7 + sound_call .sub2 note D#, 2 note E_, 2 note F#, 3 @@ -106,24 +107,24 @@ Music_MobileAdapterMenu_branch_17808e: note F#, 6 note E_, 1 note G#, 1 - callchannel Music_MobileAdapterMenu_branch_1780ae + sound_call .sub1 note E_, 6 note E_, 1 note G#, 1 - loopchannel 0, Music_MobileAdapterMenu_branch_17808e + sound_loop 0, .mainloop -Music_MobileAdapterMenu_branch_1780ae: +.sub1: octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 3 note G#, 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 4 octave 4 @@ -135,15 +136,15 @@ Music_MobileAdapterMenu_branch_1780ae: note E_, 1 note G#, 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 3 note G#, 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note B_, 4 octave 4 @@ -153,120 +154,120 @@ Music_MobileAdapterMenu_branch_1780ae: octave 4 note C#, 3 note D#, 1 - endchannel + sound_ret -Music_MobileAdapterMenu_branch_1780d7: +.sub2: note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 3 note F#, 1 note E_, 2 note A_, 1 - note __, 1 + rest 1 note E_, 4 - endchannel + sound_ret Music_MobileAdapterMenu_Ch3: - vibrato $8, $34 - notetype $c, $25 - note __, 2 -Music_MobileAdapterMenu_branch_1780e9: - callchannel Music_MobileAdapterMenu_branch_178119 + vibrato 8, 3, 4 + note_type 12, 2, 5 + rest 2 +.mainloop: + sound_call .sub1 octave 2 note B_, 1 note G#, 1 - callchannel Music_MobileAdapterMenu_branch_178146 + sound_call .sub2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note F#, 2 - note __, 1 + rest 1 note D#, 1 note F#, 2 note D#, 1 - note __, 1 + rest 1 octave 2 note B_, 2 note F#, 1 note G#, 1 - callchannel Music_MobileAdapterMenu_branch_178146 + sound_call .sub2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note F#, 2 - note __, 1 + rest 1 note D#, 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note F#, 4 - callchannel Music_MobileAdapterMenu_branch_178119 - note __, 2 - loopchannel 0, Music_MobileAdapterMenu_branch_1780e9 + sound_call .sub1 + rest 2 + sound_loop 0, .mainloop -Music_MobileAdapterMenu_branch_178119: +.sub1: octave 3 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 1 + rest 1 note G#, 1 note D#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D#, 4 note C#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 1 + rest 1 note F#, 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note F#, 4 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 1 + rest 1 note G#, 1 note D#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D#, 4 note C#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 1 + rest 1 note C#, 1 note E_, 3 - intensity $35 + volume_envelope 3, 5 note E_, 3 - intensity $25 - endchannel + volume_envelope 2, 5 + sound_ret -Music_MobileAdapterMenu_branch_178146: +.sub2: note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 1 + rest 1 note C#, 1 note A_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A_, 4 - endchannel + sound_ret diff --git a/crysaudio/music/mobilecenter.asm b/crysaudio/music/mobilecenter.asm index 0f9d3b9a..71c51699 100644 --- a/crysaudio/music/mobilecenter.asm +++ b/crysaudio/music/mobilecenter.asm @@ -1,17 +1,18 @@ Music_MobileCenter: - musicheader 4, 1, Music_MobileCenter_Ch1 - musicheader 1, 2, Music_MobileCenter_Ch2 - musicheader 1, 3, Music_MobileCenter_Ch3 - musicheader 1, 4, Music_MobileCenter_Ch4 + channel_count 4 + channel 1, Music_MobileCenter_Ch1 + channel 2, Music_MobileCenter_Ch2 + channel 3, Music_MobileCenter_Ch3 + channel 4, Music_MobileCenter_Ch4 Music_MobileCenter_Ch1: tempo 160 - volume $77 - dutycycle $1 - tone $0002 - vibrato $8, $22 - stereopanning $f0 - notetype $c, $a2 + volume 7, 7 + duty_cycle 1 + pitch_offset 2 + vibrato 8, 2, 2 + stereo_panning TRUE, FALSE + note_type 12, 10, 2 octave 3 note E_, 2 note F_, 2 @@ -19,7 +20,7 @@ Music_MobileCenter_Ch1: note G_, 2 note A_, 2 note B_, 4 -Music_MobileCenter_branch_179642: +.mainloop: octave 3 note E_, 2 note C_, 2 @@ -154,17 +155,17 @@ Music_MobileCenter_branch_179642: note D_, 2 note E_, 2 note F_, 2 - loopchannel 0, Music_MobileCenter_branch_179642 + sound_loop 0, .mainloop Music_MobileCenter_Ch2: - notetype $c, $c2 - dutycycle $3 - note __, 10 + note_type 12, 12, 2 + duty_cycle 3 + rest 10 octave 1 note G_, 2 note A_, 2 note B_, 2 -Music_MobileCenter_branch_1796d6: +.mainloop: octave 2 note C_, 2 note E_, 2 @@ -322,11 +323,11 @@ Music_MobileCenter_branch_1796d6: note F_, 2 note E_, 2 note D_, 2 - loopchannel 0, Music_MobileCenter_branch_1796d6 + sound_loop 0, .mainloop Music_MobileCenter_Ch3: - notetype $c, $24 - vibrato $10, $34 + note_type 12, 2, 4 + vibrato 16, 3, 4 octave 4 note G_, 2 note A_, 2 @@ -335,8 +336,8 @@ Music_MobileCenter_Ch3: octave 5 note C_, 2 note D_, 4 - notetype $c, $25 -Music_MobileCenter_branch_179788: + note_type 12, 2, 5 +.mainloop: note C_, 2 octave 4 note G_, 2 @@ -348,16 +349,16 @@ Music_MobileCenter_branch_179788: note D_, 2 octave 4 note B_, 6 - notetype $c, $10 + note_type 12, 1, 0 octave 6 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 7 note D_, 1 - note __, 3 - notetype $c, $25 + rest 3 + note_type 12, 2, 5 octave 4 note B_, 2 note G_, 2 @@ -387,16 +388,16 @@ Music_MobileCenter_branch_179788: note D_, 2 octave 4 note B_, 6 - notetype $c, $10 + note_type 12, 1, 0 octave 6 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 7 note D_, 1 - note __, 3 - notetype $c, $25 + rest 3 + note_type 12, 2, 5 octave 4 note B_, 2 note G_, 2 @@ -414,7 +415,7 @@ Music_MobileCenter_branch_179788: note B_, 2 octave 5 note D_, 2 - vibrato $18, $44 + vibrato 24, 4, 4 note E_, 8 note G_, 8 note F_, 2 @@ -447,37 +448,38 @@ Music_MobileCenter_branch_179788: note E_, 2 note D_, 2 note C_, 8 - vibrato $10, $34 - loopchannel 0, Music_MobileCenter_branch_179788 + vibrato 16, 3, 4 + sound_loop 0, .mainloop Music_MobileCenter_Ch4: - togglenoise $3 - stereopanning $f - notetype $c - note A_, 8 - note A_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 -Music_MobileCenter_branch_179813: - note A_, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - loopchannel 3, Music_MobileCenter_branch_179813 - note A_, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 0, Music_MobileCenter_branch_179813 + toggle_noise 3 + stereo_panning FALSE, TRUE + drum_speed 12 + drum_note 10, 8 + drum_note 10, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 +.mainloop: +.loop1: + drum_note 10, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 10, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + sound_loop 3, .loop1 + drum_note 10, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 10, 2 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/mom.asm b/crysaudio/music/mom.asm index a9bdef9c..9828c5d8 100644 --- a/crysaudio/music/mom.asm +++ b/crysaudio/music/mom.asm @@ -1,14 +1,15 @@ Music_Mom: - musicheader 3, 2, Music_Mom_Ch2 - musicheader 1, 3, Music_Mom_Ch3 - musicheader 1, 4, Music_Mom_Ch4 + channel_count 3 + channel 2, Music_Mom_Ch2 + channel 3, Music_Mom_Ch3 + channel 4, Music_Mom_Ch4 Music_Mom_Ch2: tempo 144 - volume $77 - stereopanning $f - dutycycle $2 - notetype $6, $b3 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 2 + note_type 6, 11, 3 octave 3 note B_, 1 octave 4 @@ -16,24 +17,24 @@ Music_Mom_Ch2: note G#, 1 note A_, 1 note B_, 8 -Music_Mom_branch_f6c0e: - notetype $c, $b1 - note __, 4 +.mainloop: + note_type 12, 11, 1 + rest 4 octave 3 note C#, 6 note D_, 4 note C_, 2 - note __, 2 + rest 2 note C#, 6 octave 2 note E_, 4 note A#, 2 note B_, 2 - loopchannel 0, Music_Mom_branch_f6c0e + sound_loop 0, .mainloop Music_Mom_Ch3: - stereopanning $f0 - notetype $6, $25 + stereo_panning TRUE, FALSE + note_type 6, 2, 5 octave 3 note E_, 1 note D_, 1 @@ -41,68 +42,68 @@ Music_Mom_Ch3: note B_, 1 note G#, 1 note E_, 8 - intensity $23 -Music_Mom_branch_f6c2e: + volume_envelope 2, 3 +.mainloop: octave 2 note A_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 8 note D#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 - note __, 6 + rest 6 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 6 + rest 6 note C#, 4 note D_, 2 - note __, 2 - loopchannel 0, Music_Mom_branch_f6c2e + rest 2 + sound_loop 0, .mainloop Music_Mom_Ch4: - togglenoise $3 - notetype $c - note __, 6 -Music_Mom_branch_f6c56: - note D#, 1 - note __, 1 - note F#, 2 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F#, 4 - note D_, 1 - note __, 1 - note D#, 1 - note __, 1 - note F#, 4 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note D_, 2 - note D#, 1 - note __, 1 - loopchannel 0, Music_Mom_branch_f6c56 + toggle_noise 3 + drum_speed 12 + rest 6 +.mainloop: + drum_note 4, 1 + rest 1 + drum_note 7, 2 + drum_note 3, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 7, 4 + drum_note 3, 1 + rest 1 + drum_note 4, 1 + rest 1 + drum_note 7, 4 + drum_note 3, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 3, 2 + drum_note 4, 1 + rest 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/mtmoon.asm b/crysaudio/music/mtmoon.asm index 474335f4..4fedde56 100644 --- a/crysaudio/music/mtmoon.asm +++ b/crysaudio/music/mtmoon.asm @@ -1,26 +1,27 @@ Music_MtMoon: - musicheader 4, 1, Music_MtMoon_Ch1 - musicheader 1, 2, Music_MtMoon_Ch2 - musicheader 1, 3, Music_MtMoon_Ch3 - musicheader 1, 4, Music_MtMoon_Ch4 + channel_count 4 + channel 1, Music_MtMoon_Ch1 + channel 2, Music_MtMoon_Ch2 + channel 3, Music_MtMoon_Ch3 + channel 4, Music_MtMoon_Ch4 Music_MtMoon_Ch1: tempo 208 - volume $77 - dutycycle $2 - tone $0001 - vibrato $8, $14 - stereopanning $f0 - notetype $c, $45 - note __, 2 - loopchannel 0, Music_MtMoon_branch_edb56 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + vibrato 8, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 4, 5 + rest 2 + sound_loop 0, Music_MtMoon_Ch2.mainloop Music_MtMoon_Ch2: - vibrato $b, $15 - dutycycle $2 - notetype $c, $84 - stereopanning $f -Music_MtMoon_branch_edb56: + vibrato 11, 1, 5 + duty_cycle 2 + note_type 12, 8, 4 + stereo_panning FALSE, TRUE +.mainloop: octave 4 note D#, 6 note C#, 6 @@ -69,12 +70,12 @@ Music_MtMoon_branch_edb56: note E_, 6 note F#, 6 note E_, 4 - loopchannel 0, Music_MtMoon_branch_edb56 + sound_loop 0, .mainloop Music_MtMoon_Ch3: -Music_MtMoon_branch_edb8a: - notetype $c, $28 -Music_MtMoon_branch_edb8d: +.mainloop: + note_type 12, 2, 8 +.loop1: octave 2 note B_, 2 octave 3 @@ -89,7 +90,7 @@ Music_MtMoon_branch_edb8d: note B_, 2 octave 3 note D#, 2 - loopchannel 3, Music_MtMoon_branch_edb8d + sound_loop 3, .loop1 octave 2 note B_, 2 octave 3 @@ -102,7 +103,7 @@ Music_MtMoon_branch_edb8d: note G_, 2 note D#, 2 note E_, 2 -Music_MtMoon_branch_edbab: +.loop2: note E_, 2 note G#, 2 octave 4 @@ -115,24 +116,24 @@ Music_MtMoon_branch_edbab: octave 3 note E_, 2 note G#, 2 - loopchannel 4, Music_MtMoon_branch_edbab - loopchannel 0, Music_MtMoon_branch_edb8a + sound_loop 4, .loop2 + sound_loop 0, .mainloop Music_MtMoon_Ch4: - togglenoise $5 - notetype $c -Music_MtMoon_branch_edbc3: - stereopanning $f - note A#, 4 - note A#, 8 - note A#, 4 - stereopanning $f0 - note A#, 4 - note A#, 4 - note A#, 4 - stereopanning $f - note A#, 4 - note A#, 4 - stereopanning $f0 - note A#, 8 - loopchannel 0, Music_MtMoon_branch_edbc3 + toggle_noise 5 + drum_speed 12 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 11, 4 + drum_note 11, 8 + drum_note 11, 4 + stereo_panning TRUE, FALSE + drum_note 11, 4 + drum_note 11, 4 + drum_note 11, 4 + stereo_panning FALSE, TRUE + drum_note 11, 4 + drum_note 11, 4 + stereo_panning TRUE, FALSE + drum_note 11, 8 + sound_loop 0, .mainloop diff --git a/crysaudio/music/mtmoonsquare.asm b/crysaudio/music/mtmoonsquare.asm index 57d1b0dd..0b0dc03c 100644 --- a/crysaudio/music/mtmoonsquare.asm +++ b/crysaudio/music/mtmoonsquare.asm @@ -1,16 +1,17 @@ Music_MtMoonSquare: - musicheader 2, 1, Music_MtMoonSquare_Ch1 - musicheader 1, 2, Music_MtMoonSquare_Ch2 + channel_count 2 + channel 1, Music_MtMoonSquare_Ch1 + channel 2, Music_MtMoonSquare_Ch2 Music_MtMoonSquare_Ch1: tempo 112 - volume $77 - dutycycle $2 - tone $0001 - note __, 1 -Music_MtMoonSquare_branch_f4826: - notetype $c, $44 -Music_MtMoonSquare_branch_f4829: + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + rest 1 +.mainloop: + note_type 12, 4, 4 +.loop1: octave 4 note D_, 2 note E_, 2 @@ -19,8 +20,8 @@ Music_MtMoonSquare_branch_f4829: note A_, 2 octave 5 note D_, 4 - loopchannel 2, Music_MtMoonSquare_branch_f4829 -Music_MtMoonSquare_branch_f4835: + sound_loop 2, .loop1 +.loop2: octave 4 note E_, 2 note F#, 2 @@ -29,8 +30,8 @@ Music_MtMoonSquare_branch_f4835: note B_, 2 octave 5 note E_, 4 - loopchannel 2, Music_MtMoonSquare_branch_f4835 -Music_MtMoonSquare_branch_f4841: + sound_loop 2, .loop2 +.loop3: octave 4 note C#, 2 note D_, 2 @@ -39,8 +40,8 @@ Music_MtMoonSquare_branch_f4841: note G_, 2 octave 5 note C#, 4 - loopchannel 2, Music_MtMoonSquare_branch_f4841 -Music_MtMoonSquare_branch_f484d: + sound_loop 2, .loop3 +.loop4: octave 4 note D_, 2 note E_, 2 @@ -49,15 +50,15 @@ Music_MtMoonSquare_branch_f484d: note A_, 2 octave 5 note D_, 4 - loopchannel 2, Music_MtMoonSquare_branch_f484d - loopchannel 0, Music_MtMoonSquare_branch_f4826 + sound_loop 2, .loop4 + sound_loop 0, .mainloop Music_MtMoonSquare_Ch2: - dutycycle $2 - vibrato $18, $24 -Music_MtMoonSquare_branch_f4862: - notetype $c, $82 -Music_MtMoonSquare_branch_f4865: + duty_cycle 2 + vibrato 24, 2, 4 +.mainloop: + note_type 12, 8, 2 +.loop1: octave 4 note D_, 2 note E_, 2 @@ -66,10 +67,10 @@ Music_MtMoonSquare_branch_f4865: note A_, 2 octave 5 note D_, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f4865 - notetype $c, $82 -Music_MtMoonSquare_branch_f4877: + note_type 12, 6, 2 + sound_loop 2, .loop1 + note_type 12, 8, 2 +.loop2: octave 4 note E_, 2 note F#, 2 @@ -78,10 +79,10 @@ Music_MtMoonSquare_branch_f4877: note B_, 2 octave 5 note E_, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f4877 - notetype $c, $82 -Music_MtMoonSquare_branch_f4889: + note_type 12, 6, 2 + sound_loop 2, .loop2 + note_type 12, 8, 2 +.loop3: octave 4 note C#, 2 note D_, 2 @@ -90,10 +91,10 @@ Music_MtMoonSquare_branch_f4889: note G_, 2 octave 5 note C#, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f4889 - notetype $c, $82 -Music_MtMoonSquare_branch_f489b: + note_type 12, 6, 2 + sound_loop 2, .loop3 + note_type 12, 8, 2 +.loop4: octave 4 note D_, 2 note E_, 2 @@ -102,6 +103,6 @@ Music_MtMoonSquare_branch_f489b: note A_, 2 octave 5 note D_, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f489b - loopchannel 0, Music_MtMoonSquare_branch_f4862 + note_type 12, 6, 2 + sound_loop 2, .loop4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/nationalpark.asm b/crysaudio/music/nationalpark.asm index 10908638..254efa83 100644 --- a/crysaudio/music/nationalpark.asm +++ b/crysaudio/music/nationalpark.asm @@ -1,24 +1,25 @@ Music_NationalPark: - musicheader 4, 1, Music_NationalPark_Ch1 - musicheader 1, 2, Music_NationalPark_Ch2 - musicheader 1, 3, Music_NationalPark_Ch3 - musicheader 1, 4, Music_NationalPark_Ch4 + channel_count 4 + channel 1, Music_NationalPark_Ch1 + channel 2, Music_NationalPark_Ch2 + channel 3, Music_NationalPark_Ch3 + channel 4, Music_NationalPark_Ch4 Music_NationalPark_Ch1: tempo 192 - volume $77 - stereopanning $f - vibrato $18, $24 - dutycycle $1 - notetype $c, $77 - note __, 2 -Music_NationalPark_branch_f5504: - callchannel Music_NationalPark_branch_f554a - callchannel Music_NationalPark_branch_f554a - notetype $6, $67 - callchannel Music_NationalPark_branch_f563a - notetype $c, $77 - note __, 16 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 24, 2, 4 + duty_cycle 1 + note_type 12, 7, 7 + rest 2 +.mainloop: + sound_call .sub1 + sound_call .sub1 + note_type 6, 6, 7 + sound_call .sub2 + note_type 12, 7, 7 + rest 16 octave 2 note A#, 1 octave 3 @@ -28,111 +29,111 @@ Music_NationalPark_branch_f5504: note D_, 1 note F_, 1 note A#, 1 - notetype $6, $67 + note_type 6, 6, 7 octave 4 note D_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - callchannel Music_NationalPark_branch_f563a - intensity $77 + rest 1 + sound_call .sub2 + volume_envelope 7, 7 octave 3 note E_, 1 note F_, 5 note D#, 4 - note __, 2 + rest 2 note C_, 12 note F_, 8 note C#, 1 - intensity $98 + volume_envelope 9, 8 note D_, 16 - intensity $77 + volume_envelope 7, 7 note D_, 7 - notetype $c, $77 - note __, 4 - loopchannel 0, Music_NationalPark_branch_f5504 + note_type 12, 7, 7 + rest 4 + sound_loop 0, .mainloop -Music_NationalPark_branch_f554a: +.sub1: octave 2 note G#, 6 octave 3 note F_, 2 - intensity $47 + volume_envelope 4, 7 note F_, 1 note G#, 1 - intensity $57 + volume_envelope 5, 7 note F_, 1 note G#, 1 - intensity $77 + volume_envelope 7, 7 note F_, 1 note G#, 1 - intensity $97 + volume_envelope 9, 7 note F_, 1 note G#, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note A_, 6 octave 3 note F#, 2 - intensity $47 + volume_envelope 4, 7 note F#, 1 note A_, 1 - intensity $57 + volume_envelope 5, 7 note F#, 1 note A_, 1 - intensity $77 + volume_envelope 7, 7 note F#, 1 note A_, 1 - intensity $97 + volume_envelope 9, 7 note F#, 1 note A_, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note G#, 6 octave 3 note F_, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C_, 1 note C#, 1 - intensity $57 + volume_envelope 5, 7 note C_, 1 note C#, 1 - intensity $77 + volume_envelope 7, 7 note C_, 1 note C#, 1 - intensity $97 + volume_envelope 9, 7 note C_, 1 note C#, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note A_, 6 octave 3 note C#, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C#, 1 note D#, 1 - intensity $57 + volume_envelope 5, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 1 note D#, 1 - intensity $97 + volume_envelope 9, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 2 octave 3 note A#, 2 @@ -156,20 +157,20 @@ Music_NationalPark_branch_f554a: note C#, 2 octave 3 note A_, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C#, 1 note D#, 1 - intensity $57 + volume_envelope 5, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 1 note D#, 1 - intensity $97 + volume_envelope 9, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C_, 2 octave 3 note G#, 2 @@ -189,20 +190,20 @@ Music_NationalPark_branch_f554a: note D_, 2 octave 3 note A#, 2 - intensity $57 + volume_envelope 5, 7 octave 4 note F_, 1 note D#, 1 - intensity $67 + volume_envelope 6, 7 note D_, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note F_, 1 note F#, 1 - intensity $97 + volume_envelope 9, 7 note G#, 1 note A#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 2 octave 3 note A#, 2 @@ -226,20 +227,20 @@ Music_NationalPark_branch_f554a: note C#, 2 octave 3 note A_, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C#, 1 note D#, 1 - intensity $57 + volume_envelope 5, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 1 note D#, 1 - intensity $97 + volume_envelope 9, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C_, 2 octave 3 note G#, 2 @@ -267,110 +268,110 @@ Music_NationalPark_branch_f554a: note D_, 2 octave 3 note A#, 2 - endchannel + sound_ret -Music_NationalPark_branch_f563a: - note __, 16 - note __, 3 +.sub2: + rest 16 + rest 3 octave 4 note A#, 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 4 - note __, 16 - note __, 3 + rest 4 + rest 16 + rest 3 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 4 - endchannel + rest 4 + sound_ret Music_NationalPark_Ch2: - vibrato $14, $24 - dutycycle $1 - notetype $c, $a7 - note __, 2 - stereopanning $f0 -Music_NationalPark_branch_f565d: - notetype $c, $a7 - callchannel Music_NationalPark_branch_f56b8 + vibrato 20, 2, 4 + duty_cycle 1 + note_type 12, 10, 7 + rest 2 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 10, 7 + sound_call .sub1 octave 3 note D_, 8 - callchannel Music_NationalPark_branch_f56b8 - note __, 2 - intensity $a7 + sound_call .sub1 + rest 2 + volume_envelope 10, 7 octave 4 note G#, 2 note F#, 2 note F_, 2 - notetype $6, $a7 - callchannel Music_NationalPark_branch_f56f5 + note_type 6, 10, 7 + sound_call .sub2 octave 3 note B_, 1 octave 4 note C_, 5 octave 3 note G#, 4 - note __, 2 + rest 2 octave 4 note A#, 8 note G#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G#, 4 note E_, 1 note F_, 14 - intensity $87 + volume_envelope 8, 7 note G_, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 - intensity $a7 - callchannel Music_NationalPark_branch_f56f5 + rest 1 + volume_envelope 10, 7 + sound_call .sub2 octave 3 note B_, 1 octave 4 note C_, 5 octave 3 note G#, 4 - note __, 2 + rest 2 note A#, 12 octave 4 note C_, 8 octave 3 note A_, 1 - vibrato $0, $0 - intensity $b8 + vibrato 0, 0, 0 + volume_envelope 11, 8 note A#, 16 - vibrato $14, $24 - intensity $b7 + vibrato 20, 2, 4 + volume_envelope 11, 7 note A#, 11 octave 2 note D#, 2 note D_, 2 - loopchannel 0, Music_NationalPark_branch_f565d + sound_loop 0, .mainloop -Music_NationalPark_branch_f56b8: +.sub1: octave 2 note C#, 6 note G#, 2 @@ -431,26 +432,26 @@ Music_NationalPark_branch_f56b8: note A#, 6 octave 2 note F_, 2 - endchannel + sound_ret -Music_NationalPark_branch_f56f5: +.sub2: octave 4 note E_, 1 note F_, 5 note F#, 4 - note __, 2 + rest 2 note C#, 7 - intensity $87 + volume_envelope 8, 7 octave 5 note E_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 2 - intensity $a7 + volume_envelope 10, 7 octave 3 note A#, 2 octave 4 @@ -459,61 +460,61 @@ Music_NationalPark_branch_f56f5: note E_, 1 note F_, 5 note F#, 4 - note __, 2 + rest 2 note D#, 7 - intensity $87 + volume_envelope 8, 7 octave 5 note D_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 2 - intensity $a7 + volume_envelope 10, 7 octave 4 note D_, 2 note C#, 2 - endchannel + sound_ret Music_NationalPark_Ch3: - vibrato $16, $24 - notetype $c, $11 + vibrato 22, 2, 4 + note_type 12, 1, 1 octave 4 note G#, 1 note A#, 1 - stereopanning $ff -Music_NationalPark_branch_f572e: - callchannel Music_NationalPark_branch_f5756 + stereo_panning TRUE, TRUE +.mainloop: + sound_call .sub1 octave 5 note A#, 14 octave 4 note G#, 1 note A#, 1 - callchannel Music_NationalPark_branch_f5756 + sound_call .sub1 octave 5 note A#, 8 octave 4 note D_, 8 - intensity $15 - callchannel Music_NationalPark_branch_f578f + volume_envelope 1, 5 + sound_call .sub2 octave 4 note D_, 1 octave 3 note F_, 3 - callchannel Music_NationalPark_branch_f578f + sound_call .sub2 octave 4 note D_, 1 octave 3 note F_, 1 - intensity $11 + volume_envelope 1, 1 octave 4 note G#, 1 note A#, 1 - loopchannel 0, Music_NationalPark_branch_f572e + sound_loop 0, .mainloop -Music_NationalPark_branch_f5756: +.sub1: octave 5 note C_, 16 note C#, 14 @@ -570,88 +571,89 @@ Music_NationalPark_branch_f5756: note A#, 4 octave 6 note C_, 2 - endchannel + sound_ret -Music_NationalPark_branch_f578f: +.sub2: octave 2 note F#, 3 octave 3 note C#, 2 - note __, 1 + rest 1 note A#, 4 note C#, 1 - note __, 1 + rest 1 note A#, 1 note C#, 3 octave 2 note F#, 3 octave 3 note C#, 2 - note __, 1 + rest 1 note A_, 4 note C#, 1 - note __, 1 + rest 1 note A_, 1 note C#, 3 octave 2 note F_, 3 octave 3 note C_, 2 - note __, 1 + rest 1 note G#, 4 note C_, 1 - note __, 1 + rest 1 note G#, 1 note C_, 3 octave 2 note A#, 3 octave 3 note F_, 2 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note F_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_NationalPark_Ch4: - togglenoise $3 - notetype $c - note __, 2 -Music_NationalPark_branch_f57bd: - note __, 16 - loopchannel 23, Music_NationalPark_branch_f57bd - note __, 8 - note A#, 2 - note D_, 2 - note A#, 1 - note D_, 1 - note B_, 2 -Music_NationalPark_branch_f57c8: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note B_, 2 - loopchannel 7, Music_NationalPark_branch_f57c8 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note A#, 1 - note D#, 1 - loopchannel 0, Music_NationalPark_branch_f57bd + toggle_noise 3 + drum_speed 12 + rest 2 +.mainloop: +.loop1: + rest 16 + sound_loop 23, .loop1 + rest 8 + drum_note 11, 2 + drum_note 3, 2 + drum_note 11, 1 + drum_note 3, 1 + drum_note 12, 2 +.loop2: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 12, 2 + sound_loop 7, .loop2 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 11, 1 + drum_note 4, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/newbarktown.asm b/crysaudio/music/newbarktown.asm index 0e3b92d3..261f141f 100644 --- a/crysaudio/music/newbarktown.asm +++ b/crysaudio/music/newbarktown.asm @@ -1,31 +1,32 @@ Music_NewBarkTown: - musicheader 3, 1, Music_NewBarkTown_Ch1 - musicheader 1, 2, Music_NewBarkTown_Ch2 - musicheader 1, 3, Music_NewBarkTown_Ch3 + channel_count 3 + channel 1, Music_NewBarkTown_Ch1 + channel 2, Music_NewBarkTown_Ch2 + channel 3, Music_NewBarkTown_Ch3 - db $3 + db $3 ; unused Music_NewBarkTown_Ch1: tempo 187 - volume $77 - stereopanning $f - vibrato $12, $23 - notetype $c, $87 - note __, 4 -Music_NewBarkTown_branch_eb2eb: - dutycycle $0 - callchannel Music_NewBarkTown_branch_eb349 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 18, 2, 3 + note_type 12, 8, 7 + rest 4 +.mainloop: + duty_cycle 0 + sound_call .sub1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 note F#, 2 - dutycycle $2 - intensity $82 + duty_cycle 2 + volume_envelope 8, 2 note E_, 1 note F#, 1 note E_, 1 @@ -35,21 +36,21 @@ Music_NewBarkTown_branch_eb2eb: note B_, 1 note A_, 1 note G_, 1 - dutycycle $0 - intensity $87 - callchannel Music_NewBarkTown_branch_eb349 + duty_cycle 0 + volume_envelope 8, 7 + sound_call .sub1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 - dutycycle $2 - intensity $82 + duty_cycle 2 + volume_envelope 8, 2 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 octave 3 @@ -61,11 +62,11 @@ Music_NewBarkTown_branch_eb2eb: note C#, 1 note E_, 1 note A_, 1 - dutycycle $1 - intensity $5e - callchannel Music_NewBarkTown_branch_eb37c - callchannel Music_NewBarkTown_branch_eb37c - callchannel Music_NewBarkTown_branch_eb37c + duty_cycle 1 + volume_envelope 5, -6 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 octave 2 note G_, 2 note B_, 2 @@ -82,63 +83,63 @@ Music_NewBarkTown_branch_eb2eb: note G_, 4 note A_, 4 note B_, 2 - intensity $87 - loopchannel 0, Music_NewBarkTown_branch_eb2eb + volume_envelope 8, 7 + sound_loop 0, .mainloop -Music_NewBarkTown_branch_eb349: +.sub1: octave 3 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 2 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A#, 2 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note E_, 2 octave 2 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_NewBarkTown_branch_eb37c: +.sub2: octave 2 note G_, 2 note B_, 2 @@ -155,110 +156,110 @@ Music_NewBarkTown_branch_eb37c: note G_, 4 note A_, 4 note E_, 2 - endchannel + sound_ret Music_NewBarkTown_Ch2: - stereopanning $ff - vibrato $12, $23 - notetype $6, $a7 - note __, 8 -Music_NewBarkTown_branch_eb396: - dutycycle $2 - notetype $6, $a7 - callchannel Music_NewBarkTown_branch_eb3bf - callchannel Music_NewBarkTown_branch_eb3bf - callchannel Music_NewBarkTown_branch_eb3f2 - intensity $87 + stereo_panning TRUE, TRUE + vibrato 18, 2, 3 + note_type 6, 10, 7 + rest 8 +.mainloop: + duty_cycle 2 + note_type 6, 10, 7 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + volume_envelope 8, 7 octave 5 note B_, 6 note A_, 6 - intensity $77 + volume_envelope 7, 7 octave 6 note D_, 4 note C#, 16 - callchannel Music_NewBarkTown_branch_eb3f2 - intensity $87 + sound_call .sub2 + volume_envelope 8, 7 octave 5 note B_, 6 note A_, 6 - intensity $77 + volume_envelope 7, 7 octave 6 note D_, 4 note E_, 16 - loopchannel 0, Music_NewBarkTown_branch_eb396 + sound_loop 0, .mainloop -Music_NewBarkTown_branch_eb3bf: +.sub1: octave 2 note D_, 4 - note __, 8 + rest 8 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 8 note A#, 2 - note __, 2 + rest 2 note D_, 4 - note __, 8 + rest 8 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 8 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note G_, 4 - note __, 8 + rest 8 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 1 note G#, 2 - note __, 2 + rest 2 note G#, 8 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 4 - note __, 8 + rest 8 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 - note __, 2 + rest 2 note A_, 8 octave 2 note C#, 4 - endchannel + sound_ret -Music_NewBarkTown_branch_eb3f2: - notetype $6, $97 - dutycycle $2 +.sub2: + note_type 6, 9, 7 + duty_cycle 2 octave 4 note B_, 12 note A_, 12 note G_, 8 - notetype $c, $97 + note_type 12, 9, 7 note E_, 16 - endchannel + sound_ret Music_NewBarkTown_Ch3: - stereopanning $f0 - notetype $c, $10 + stereo_panning TRUE, FALSE + note_type 12, 1, 0 octave 5 note D_, 2 note E_, 2 -Music_NewBarkTown_branch_eb408: - vibrato $16, $23 +.mainloop: + vibrato 22, 2, 3 note F#, 4 note A_, 4 note G_, 2 @@ -281,7 +282,7 @@ Music_NewBarkTown_branch_eb408: note E_, 6 note F#, 2 note E_, 4 - note __, 2 + rest 2 note D_, 1 note E_, 1 note F#, 4 @@ -304,9 +305,9 @@ Music_NewBarkTown_branch_eb408: note G_, 1 note F#, 1 note E_, 4 - note __, 4 - intensity $25 - vibrato $12, $53 + rest 4 + volume_envelope 2, 5 + vibrato 18, 5, 3 octave 2 note G_, 16 note A_, 16 @@ -316,9 +317,9 @@ Music_NewBarkTown_branch_eb408: note A_, 16 note G_, 16 note A_, 14 - intensity $10 - vibrato $16, $23 + volume_envelope 1, 0 + vibrato 22, 2, 3 octave 5 note D_, 1 note E_, 1 - loopchannel 0, Music_NewBarkTown_branch_eb408 + sound_loop 0, .mainloop diff --git a/crysaudio/music/nothing.asm b/crysaudio/music/nothing.asm index 59641387..957a4355 100644 --- a/crysaudio/music/nothing.asm +++ b/crysaudio/music/nothing.asm @@ -1,11 +1,12 @@ Music_Nothing: - musicheader 4, 1, Music_Nothing_Ch1 - musicheader 1, 2, Music_Nothing_Ch2 - musicheader 1, 3, Music_Nothing_Ch3 - musicheader 1, 4, Music_Nothing_Ch4 + channel_count 4 + channel 1, Music_Nothing_Ch1 + channel 2, Music_Nothing_Ch2 + channel 3, Music_Nothing_Ch3 + channel 4, Music_Nothing_Ch4 Music_Nothing_Ch1: Music_Nothing_Ch2: Music_Nothing_Ch3: Music_Nothing_Ch4: - endchannel + sound_ret diff --git a/crysaudio/music/pallettown.asm b/crysaudio/music/pallettown.asm index 68585e47..3196bc27 100644 --- a/crysaudio/music/pallettown.asm +++ b/crysaudio/music/pallettown.asm @@ -1,17 +1,18 @@ Music_PalletTown: - musicheader 3, 1, Music_PalletTown_Ch1 - musicheader 1, 2, Music_PalletTown_Ch2 - musicheader 1, 3, Music_PalletTown_Ch3 + channel_count 3 + channel 1, Music_PalletTown_Ch1 + channel 2, Music_PalletTown_Ch2 + channel 3, Music_PalletTown_Ch3 Music_PalletTown_Ch1: tempo 188 - volume $77 - vibrato $12, $24 - tone $0001 - stereopanning $f -Music_PalletTown_branch_f4b22: - dutycycle $2 - notetype $c, $78 + volume 7, 7 + vibrato 18, 2, 4 + pitch_offset 1 + stereo_panning FALSE, TRUE +.mainloop: + duty_cycle 2 + note_type 12, 7, 8 octave 3 note B_, 12 note A_, 1 @@ -29,9 +30,9 @@ Music_PalletTown_branch_f4b22: note C_, 4 octave 3 note A_, 4 - intensity $77 + volume_envelope 7, 7 note G_, 8 - intensity $78 + volume_envelope 7, 8 note F#, 4 note A_, 4 note B_, 12 @@ -57,11 +58,11 @@ Music_PalletTown_branch_f4b22: note C_, 2 octave 3 note B_, 8 - intensity $77 + volume_envelope 7, 7 note B_, 8 -Music_PalletTown_branch_f4b59: - dutycycle $3 - intensity $92 +.loop1: + duty_cycle 3 + volume_envelope 9, 2 note G_, 2 note E_, 2 note G_, 2 @@ -70,7 +71,7 @@ Music_PalletTown_branch_f4b59: note D#, 2 note G_, 2 note D#, 2 - intensity $5f + volume_envelope 5, -7 note G_, 1 note A_, 1 note B_, 1 @@ -82,8 +83,8 @@ Music_PalletTown_branch_f4b59: note C_, 2 octave 3 note B_, 2 - loopchannel 2, Music_PalletTown_branch_f4b59 - intensity $3f + sound_loop 2, .loop1 + volume_envelope 3, -7 octave 4 note C_, 4 octave 3 @@ -93,7 +94,7 @@ Music_PalletTown_branch_f4b59: note F#, 4 note D_, 4 note E_, 4 - intensity $72 + volume_envelope 7, 2 note C_, 1 note E_, 1 note G_, 1 @@ -103,27 +104,27 @@ Music_PalletTown_branch_f4b59: note A_, 1 octave 5 note D_, 2 - intensity $62 + volume_envelope 6, 2 note D_, 2 - intensity $22 + volume_envelope 2, 2 note D_, 2 - intensity $2f + volume_envelope 2, -7 octave 3 note D_, 4 note E_, 4 note G_, 6 note A_, 1 note G_, 1 - intensity $1f + volume_envelope 1, -7 note F#, 8 - loopchannel 0, Music_PalletTown_branch_f4b22 + sound_loop 0, .mainloop Music_PalletTown_Ch2: - vibrato $12, $44 - dutycycle $2 - stereopanning $f0 -Music_PalletTown_branch_f4ba8: - notetype $c, $88 + vibrato 18, 4, 4 + duty_cycle 2 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 8, 8 octave 1 note G_, 2 note B_, 2 @@ -151,7 +152,7 @@ Music_PalletTown_branch_f4ba8: note F#, 2 note G_, 2 note D_, 2 - note __, 4 + rest 4 note D_, 4 note F#, 4 octave 1 @@ -182,8 +183,8 @@ Music_PalletTown_branch_f4ba8: octave 3 note C_, 2 note D_, 2 -Music_PalletTown_branch_f4be5: - intensity $a2 +.loop1: + volume_envelope 10, 2 octave 3 note E_, 2 octave 2 @@ -200,13 +201,13 @@ Music_PalletTown_branch_f4be5: note D#, 2 octave 2 note C_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 6 note G_, 1 note G_, 3 note D_, 2 note G_, 4 - loopchannel 2, Music_PalletTown_branch_f4be5 + sound_loop 2, .loop1 note C_, 2 octave 3 note E_, 4 @@ -227,9 +228,9 @@ Music_PalletTown_branch_f4be5: note E_, 2 note G_, 2 note E_, 2 - intensity $1f + volume_envelope 1, -7 note F#, 4 - intensity $88 + volume_envelope 8, 8 note F#, 4 note B_, 4 note G_, 4 @@ -241,12 +242,12 @@ Music_PalletTown_branch_f4be5: octave 1 note B_, 2 note A_, 2 - loopchannel 0, Music_PalletTown_branch_f4ba8 + sound_loop 0, .mainloop Music_PalletTown_Ch3: - vibrato $14, $24 -Music_PalletTown_branch_f4c2d: - notetype $c, $10 + vibrato 20, 2, 4 +.mainloop: + note_type 12, 1, 0 octave 6 note D_, 2 note C_, 2 @@ -262,16 +263,16 @@ Music_PalletTown_branch_f4c2d: octave 5 note B_, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 6 note C_, 8 - note __, 2 + rest 2 octave 5 note F#, 2 note G_, 2 @@ -290,16 +291,16 @@ Music_PalletTown_branch_f4c2d: octave 6 note D_, 2 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 6 note D_, 1 - note __, 1 + rest 1 note D_, 8 note C_, 2 octave 5 @@ -313,7 +314,7 @@ Music_PalletTown_branch_f4c2d: note B_, 2 note A_, 2 note G_, 8 - note __, 2 + rest 2 note G_, 2 note A_, 2 note B_, 2 @@ -323,20 +324,20 @@ Music_PalletTown_branch_f4c2d: note C_, 2 octave 5 note B_, 8 - note __, 2 + rest 2 note G_, 2 note A_, 2 note B_, 2 octave 6 note C_, 2 - note __, 2 + rest 2 note C_, 4 note D_, 6 note C_, 1 note D_, 1 octave 5 note B_, 8 - note __, 2 + rest 2 note B_, 2 note A_, 2 note G_, 2 @@ -347,11 +348,11 @@ Music_PalletTown_branch_f4c2d: note G_, 4 note E_, 4 note F#, 7 - note __, 1 + rest 1 note G_, 3 - note __, 1 + rest 1 note B_, 3 - note __, 1 + rest 1 note B_, 8 note A_, 8 - loopchannel 0, Music_PalletTown_branch_f4c2d + sound_loop 0, .mainloop diff --git a/crysaudio/music/pinball/bluefield.asm b/crysaudio/music/pinball/bluefield.asm index cd83d5eb..aab43bc8 100644 --- a/crysaudio/music/pinball/bluefield.asm +++ b/crysaudio/music/pinball/bluefield.asm @@ -1,249 +1,249 @@ -Music_Pinballbluefield: ; 40cbb - dbw $c0, Music_Pinballbluefield_Ch1 - dbw $01, Music_Pinballbluefield_Ch2 - dbw $02, Music_Pinballbluefield_Ch3 - dbw $03, Music_Pinballbluefield_Ch4 -; 40cc7 +Music_BlueField: + channel_count 4 + channel 1, Music_BlueField_Ch1 + channel 2, Music_BlueField_Ch2 + channel 3, Music_BlueField_Ch3 + channel 4, Music_BlueField_Ch4 -Music_Pinballbluefield_Ch1: ; 40cc7 +Music_BlueField_Ch1: tempo 144 - volume $77 - vibrato $9, $34 - tone $0001 - notetype $8, $a2 - dutycycle $3 + volume 7, 7 + vibrato 9, 3, 4 + pitch_offset 1 + note_type 8, 10, 2 + duty_cycle 3 octave 3 note A_, 4 - intensity $a1 + volume_envelope 10, 1 note C_, 2 note F_, 2 note A_, 2 - intensity $a3 + volume_envelope 10, 3 note A_, 7 - note __, 1 - intensity $a1 + rest 1 + volume_envelope 10, 1 note C_, 2 note F#, 2 note A_, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 4 - intensity $a1 + volume_envelope 10, 1 note A#, 2 note A_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 12 -Music_Pinballbluefield_branch_40cf1: ; 40cf1 - notetype $8, $61 - dutycycle $2 - note __, 12 - note __, 12 - note __, 10 + rest 12 +Music_BlueField_branch_40cf1: + note_type 8, 6, 1 + duty_cycle 2 + rest 12 + rest 12 + rest 10 note A#, 2 - note __, 4 - intensity $91 + rest 4 + volume_envelope 9, 1 note G_, 2 - intensity $a1 + volume_envelope 10, 1 note A#, 2 - note __, 2 - intensity $c1 + rest 2 + volume_envelope 12, 1 note A#, 2 - notetype $c, $b3 - note __, 16 - notetype $8, $a2 - dutycycle $3 + note_type 12, 11, 3 + rest 16 + note_type 8, 10, 2 + duty_cycle 3 note B_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 octave 3 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 6 + rest 6 note D_, 2 note F_, 2 note G_, 2 note F#, 1 note G_, 5 - note __, 4 + rest 4 note E_, 6 - note __, 8 + rest 8 note A_, 1 note A#, 5 - note __, 4 + rest 4 note A#, 2 - note __, 4 - intensity $91 - dutycycle $2 + rest 4 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note G_, 2 note A_, 2 - note __, 2 + rest 2 note A#, 2 - intensity $a2 - dutycycle $3 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note G#, 1 note A_, 2 - note __, 1 + rest 1 note A_, 2 note A_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 4 + rest 4 note F_, 2 - note __, 4 + rest 4 note A_, 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 12 - intensity $91 - dutycycle $2 - note __, 12 - note __, 4 + rest 12 + volume_envelope 9, 1 + duty_cycle 2 + rest 12 + rest 4 octave 5 note C_, 2 - note __, 6 - note __, 12 - note __, 4 + rest 6 + rest 12 + rest 4 octave 4 note B_, 2 - note __, 6 - note __, 12 - note __, 4 + rest 6 + rest 12 + rest 4 note B_, 2 - note __, 6 - note __, 4 + rest 6 + rest 4 note G_, 1 - note __, 11 + rest 11 note G_, 2 - note __, 6 - note __, 12 - note __, 4 + rest 6 + rest 12 + rest 4 note F_, 2 - note __, 6 - note __, 12 - note __, 4 + rest 6 + rest 12 + rest 4 note F_, 2 - note __, 6 - intensity $41 + rest 6 + volume_envelope 4, 1 octave 3 note G_, 2 note B_, 2 note G_, 2 note B_, 2 - intensity $51 + volume_envelope 5, 1 note G_, 2 - intensity $61 + volume_envelope 6, 1 note B_, 2 - note __, 4 - intensity $91 + rest 4 + volume_envelope 9, 1 octave 4 note G_, 2 - note __, 6 - intensity $a2 - dutycycle $3 + rest 6 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note F#, 1 note G_, 4 - note __, 1 + rest 1 note E_, 4 - note __, 2 + rest 2 note A#, 4 - note __, 2 + rest 2 octave 4 note C#, 2 - note __, 2 + rest 2 note D#, 1 note E_, 5 - intensity $91 - dutycycle $2 - note __, 2 + volume_envelope 9, 1 + duty_cycle 2 + rest 2 octave 5 note C_, 2 - note __, 2 - intensity $a2 - dutycycle $3 + rest 2 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note A_, 2 - note __, 4 + rest 4 octave 4 note E_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note C_, 2 - note __, 2 - intensity $a2 - dutycycle $3 + rest 2 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note A_, 2 note G_, 1 note G#, 2 - note __, 1 + rest 1 note F_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note D_, 2 - note __, 2 - intensity $a2 - dutycycle $3 + rest 2 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note F_, 2 - note __, 4 + rest 4 note G#, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note D_, 2 - note __, 2 - intensity $a2 - dutycycle $3 + rest 2 + volume_envelope 10, 2 + duty_cycle 3 octave 4 note C_, 2 octave 3 note A#, 1 note B_, 3 - note __, 2 - intensity $91 - dutycycle $2 + rest 2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note D_, 2 - note __, 2 - intensity $a2 - dutycycle $3 + rest 2 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note G_, 2 - note __, 4 + rest 4 note B_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note D_, 2 - note __, 2 - intensity $a2 - dutycycle $3 + rest 2 + volume_envelope 10, 2 + duty_cycle 3 octave 3 note G_, 2 octave 4 note F#, 1 note G_, 3 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 6 - intensity $91 - dutycycle $2 + rest 6 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note E_, 2 - note __, 4 + rest 4 note F_, 2 note C_, 2 octave 4 @@ -270,173 +270,172 @@ Music_Pinballbluefield_branch_40cf1: ; 40cf1 note B_, 2 note D_, 2 note B_, 2 - intensity $41 + volume_envelope 4, 1 note G_, 2 note B_, 2 note G_, 2 note B_, 2 - intensity $51 + volume_envelope 5, 1 note G_, 2 - intensity $61 + volume_envelope 6, 1 note B_, 2 - intensity $71 + volume_envelope 7, 1 note G_, 2 - intensity $81 + volume_envelope 8, 1 note B_, 2 - intensity $91 + volume_envelope 9, 1 note G_, 2 - intensity $a1 + volume_envelope 10, 1 note B_, 2 - intensity $b1 + volume_envelope 11, 1 note G_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 2 - intensity $a2 - dutycycle $3 + volume_envelope 10, 2 + duty_cycle 3 note G#, 1 - intensity $a4 + volume_envelope 10, 4 note A_, 9 - intensity $a2 + volume_envelope 10, 2 note F_, 2 - note __, 4 + rest 4 note F_, 2 - note __, 4 + rest 4 note D_, 2 - intensity $a7 + volume_envelope 10, 7 note F#, 1 note G_, 11 note B_, 12 - notetype $c, $b3 - note __, 16 - loopchannel 0, Music_Pinballbluefield_branch_40cf1 -; 40e48 + note_type 12, 11, 3 + rest 16 + sound_loop 0, Music_BlueField_branch_40cf1 -Music_Pinballbluefield_Ch2: ; 40e48 - vibrato $9, $34 - notetype $8, $b2 - dutycycle $3 +Music_BlueField_Ch2: + vibrato 9, 3, 4 + note_type 8, 11, 2 + duty_cycle 3 octave 4 note E_, 4 - intensity $b1 + volume_envelope 11, 1 octave 3 note F_, 2 note A_, 2 octave 4 note C_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 7 - note __, 1 - intensity $b1 + rest 1 + volume_envelope 11, 1 octave 3 note F_, 2 note A_, 2 octave 4 note C_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 4 - intensity $b1 + volume_envelope 11, 1 note D#, 2 note D_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 4 - intensity $b2 + rest 4 + volume_envelope 11, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note B_, 2 -Music_Pinballbluefield_branch_40e75: ; 40e75 - notetype $8, $b2 +Music_BlueField_branch_40e75: + note_type 8, 11, 2 octave 4 note C#, 1 note D_, 5 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note G_, 2 note A_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 6 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note G_, 2 note A_, 2 - note __, 2 + rest 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D#, 1 note E_, 5 - intensity $41 - dutycycle $2 + volume_envelope 4, 1 + duty_cycle 2 octave 3 note A#, 2 - intensity $51 + volume_envelope 5, 1 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note F_, 2 - intensity $71 - dutycycle $2 + volume_envelope 7, 1 + duty_cycle 2 octave 3 note G_, 2 - intensity $81 + volume_envelope 8, 1 note A#, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note E_, 2 note F_, 2 - intensity $b1 - dutycycle $2 + volume_envelope 11, 1 + duty_cycle 2 octave 3 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note G_, 2 note D#, 1 note E_, 2 - note __, 1 + rest 1 note D#, 2 note D_, 2 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note A_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 2 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note F_, 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note A_, 2 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 note A#, 2 note B_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 2 note E_, 2 - note __, 2 + rest 2 note G_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 6 + rest 6 octave 3 note G_, 2 note A_, 2 @@ -444,85 +443,85 @@ Music_Pinballbluefield_branch_40e75: ; 40e75 octave 4 note C#, 1 note D_, 5 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note G_, 2 note A_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 6 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note G_, 2 note F#, 2 - note __, 2 + rest 2 note F_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D#, 1 note E_, 5 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note G_, 2 note A#, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note F_, 2 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note A#, 2 octave 4 note C#, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note E_, 2 note F_, 2 - note __, 2 + rest 2 note G_, 2 note D#, 1 note E_, 2 - note __, 1 + rest 1 note D#, 2 note D_, 2 - note __, 2 + rest 2 note C_, 2 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 octave 3 note F_, 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note A_, 2 - intensity $81 - dutycycle $2 + volume_envelope 8, 1 + duty_cycle 2 note A#, 2 note B_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 2 note E_, 2 - note __, 2 + rest 2 note G_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 6 + rest 6 note E_, 2 note F_, 2 note G_, 2 note G#, 1 note A_, 3 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note C_, 2 octave 3 @@ -531,312 +530,312 @@ Music_Pinballbluefield_branch_40e75: ; 40e75 note A_, 2 octave 4 note C_, 2 - note __, 2 - intensity $b2 - dutycycle $3 + rest 2 + volume_envelope 11, 2 + duty_cycle 3 note E_, 2 - note __, 4 + rest 4 note D_, 6 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note B_, 2 octave 3 note D_, 2 note E_, 2 note A_, 2 note B_, 2 - note __, 2 - intensity $b2 - dutycycle $3 + rest 2 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 note E_, 2 - note __, 2 + rest 2 note F_, 2 note G_, 4 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note B_, 2 octave 3 note E_, 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note B_, 2 octave 4 note D_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note G_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note G_, 2 note B_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 note C#, 1 note D_, 2 - note __, 1 + rest 1 note C_, 2 octave 3 note B_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note C_, 2 note E_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note B_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note E_, 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 2 octave 3 note A_, 4 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 4 note F_, 2 octave 3 note A_, 2 octave 4 note C_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note F_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note F_, 2 note A_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note E_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note D_, 2 note F_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 note C_, 4 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note F_, 2 octave 3 note D_, 2 note F_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note B_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note F_, 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note G_, 2 note B_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 - intensity $b4 + volume_envelope 11, 4 note E_, 12 - intensity $71 - dutycycle $2 + volume_envelope 7, 1 + duty_cycle 2 octave 3 note G_, 2 - intensity $81 + volume_envelope 8, 1 note B_, 2 - intensity $91 + volume_envelope 9, 1 note G_, 2 - intensity $a1 + volume_envelope 10, 1 note B_, 2 - intensity $b1 + volume_envelope 11, 1 note G_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note C#, 1 note D_, 4 - note __, 1 + rest 1 note C#, 4 - note __, 2 + rest 2 note F_, 4 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G#, 1 note A_, 5 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 5 note C_, 2 octave 3 note E_, 2 note F_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note E_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 4 + rest 4 note E_, 2 note D#, 1 note E_, 2 - note __, 1 + rest 1 note D_, 2 note C#, 2 - note __, 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note C#, 2 - note __, 4 + rest 4 note D_, 2 note F#, 1 note G_, 3 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note B_, 2 octave 3 note D_, 2 note E_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note E_, 2 note G_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note G_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 octave 3 note G_, 2 note B_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 4 note D_, 2 note A#, 1 note B_, 3 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note A_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 5 note C_, 2 - note __, 2 + rest 2 octave 4 note A_, 2 - note __, 4 - intensity $91 - dutycycle $2 + rest 4 + volume_envelope 9, 1 + duty_cycle 2 note A_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 note E_, 1 note F_, 3 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note A_, 2 note A_, 2 - note __, 2 - intensity $b2 - dutycycle $3 + rest 2 + volume_envelope 11, 2 + duty_cycle 3 note C_, 2 - intensity $b1 - notetype $8, $91 - dutycycle $2 + volume_envelope 11, 1 + note_type 8, 9, 1 + duty_cycle 2 octave 3 note A_, 2 octave 4 note C_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note F_, 2 - intensity $91 - dutycycle $2 + volume_envelope 9, 1 + duty_cycle 2 note A_, 2 note F_, 2 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note C_, 2 octave 3 note B_, 1 octave 4 note C_, 2 - note __, 1 + rest 1 octave 3 note B_, 2 note A_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note G_, 6 octave 4 note D#, 1 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 14 - notetype $8, $b2 - note __, 2 + note_type 8, 11, 2 + rest 2 note C#, 1 - intensity $b4 + volume_envelope 11, 4 note D_, 9 - intensity $b2 + volume_envelope 11, 2 note C_, 2 - note __, 4 + rest 4 note C_, 2 - note __, 4 + rest 4 octave 3 note A_, 2 octave 4 note D#, 1 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 14 - notetype $8, $b2 - note __, 2 - intensity $93 - dutycycle $2 + note_type 8, 11, 2 + rest 2 + volume_envelope 9, 3 + duty_cycle 2 octave 3 note B_, 1 octave 4 @@ -844,623 +843,616 @@ Music_Pinballbluefield_branch_40e75: ; 40e75 octave 3 note A_, 6 note B_, 4 - intensity $b2 - dutycycle $3 + volume_envelope 11, 2 + duty_cycle 3 note G_, 2 note A_, 2 - note __, 2 + rest 2 note B_, 2 - loopchannel 0, Music_Pinballbluefield_branch_40e75 -; 4111e + sound_loop 0, Music_BlueField_branch_40e75 -Music_Pinballbluefield_Ch3: ; 4111e - pitchoffset 1, C_ - notetype $8, $22 +Music_BlueField_Ch3: + transpose 1, 0 + note_type 8, 2, 2 octave 3 note F_, 4 - note __, 6 + rest 6 note F#, 7 - note __, 7 + rest 7 note G_, 4 - note __, 6 + rest 6 octave 2 note G_, 2 - note __, 12 -Music_Pinballbluefield_branch_4112d: ; 4112d - callchannel Music_Pinballbluefield_branch_412dd + rest 12 +Music_BlueField_branch_4112d: + sound_call Music_BlueField_branch_412dd note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note D_, 2 octave 2 note B_, 2 note G_, 2 - callchannel Music_Pinballbluefield_branch_412dd + sound_call Music_BlueField_branch_412dd note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 - note __, 12 + rest 12 note F_, 2 - note __, 2 + rest 2 octave 6 note E_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 2 + rest 2 octave 6 note E_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 octave 6 note D_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 octave 6 note D_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 octave 6 note D_, 1 - note __, 1 + rest 1 octave 2 note E_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 octave 6 note D_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 octave 6 note C_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 octave 6 note C_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 octave 6 note C_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 6 note C_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 5 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 5 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 octave 5 note B_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 octave 5 note B_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note C_, 2 note C#, 2 - note __, 2 + rest 2 note G_, 2 note F_, 2 - note __, 2 + rest 2 octave 6 note D#, 2 note E_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 4 + rest 4 octave 6 note E_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 6 note E_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 2 + rest 2 octave 6 note E_, 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 4 + rest 4 octave 6 note F_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 6 note F_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 octave 6 note F#, 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 4 + rest 4 octave 6 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 octave 6 note G#, 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 4 + rest 4 octave 6 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 6 note A_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 octave 6 note C#, 2 note D_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 4 + rest 4 octave 6 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 octave 5 note A#, 2 note B_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - loopchannel 0, Music_Pinballbluefield_branch_4112d -; 412dd + rest 1 + sound_loop 0, Music_BlueField_branch_4112d -Music_Pinballbluefield_branch_412dd: ; 412dd +Music_BlueField_branch_412dd: octave 3 note C_, 3 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note B_, 3 - note __, 3 + rest 3 note A#, 3 - note __, 3 + rest 3 note A_, 3 - note __, 3 + rest 3 note G_, 2 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 6 octave 3 note A#, 6 note A_, 2 - note __, 2 + rest 2 note E_, 2 note D_, 2 - note __, 4 + rest 4 octave 4 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 - note __, 2 + rest 2 note F_, 2 note D_, 2 - note __, 2 + rest 2 note A_, 2 - endchannel -; 41306 - -Music_Pinballbluefield_Ch4: ; 41306 - togglenoise $0 - notetype $8 - note F#, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note F#, 8 - note G_, 2 - note G_, 2 - note G_, 2 - note F#, 4 - note G_, 2 - note G_, 4 - note F#, 2 - note D#, 4 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 2 -Music_Pinballbluefield_branch_4131b: ; 4131b - note F#, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D#, 4 - note F#, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D#, 4 - note F#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note C_, 4 - note G_, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 4 - note D#, 2 - note F#, 6 - note G_, 2 - note G_, 2 - note G_, 2 -Music_Pinballbluefield_branch_4133e: ; 4133e - note D#, 4 - note G_, 2 - note F#, 4 - note G_, 2 - note D#, 4 - note G_, 2 - note G_, 4 - note D#, 2 - loopchannel 3, Music_Pinballbluefield_branch_4133e - note D#, 4 - note G_, 2 - note F#, 4 - note G_, 2 - note __, 6 - note C#, 2 - note C#, 2 - note D_, 2 - callchannel Music_Pinballbluefield_branch_41386 - callchannel Music_Pinballbluefield_branch_41386 - note D#, 4 - note F#, 2 - note D_, 4 - note G_, 2 - note D#, 4 - note D_, 2 - note F#, 2 - note D#, 2 - note D_, 2 - note D#, 4 - note F#, 2 - note D_, 4 - note D_, 2 - note D#, 4 - note F#, 2 - note D_, 4 - note D_, 2 -Music_Pinballbluefield_branch_41369: ; 41369 - callchannel Music_Pinballbluefield_branch_41386 - loopchannel 3, Music_Pinballbluefield_branch_41369 - note F#, 4 - note D#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note F#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 -Music_Pinballbluefield_branch_4137b: ; 4137b - callchannel Music_Pinballbluefield_branch_41386 - loopchannel 10, Music_Pinballbluefield_branch_4137b - loopchannel 0, Music_Pinballbluefield_branch_4131b -; 41386 - -Music_Pinballbluefield_branch_41386: ; 41386 - note D#, 4 - note F#, 2 - note D_, 4 - note G_, 2 - note D#, 4 - note F#, 2 - note D_, 4 - note D#, 2 - endchannel -; 4138f + sound_ret +Music_BlueField_Ch4: + toggle_noise 0 + drum_speed 8 + drum_note 7, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 8 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 7, 2 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 +Music_BlueField_branch_4131b: + drum_note 7, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 4, 4 + drum_note 7, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 4, 4 + drum_note 7, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 1, 4 + drum_note 8, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 7, 6 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 +Music_BlueField_branch_4133e: + drum_note 4, 4 + drum_note 8, 2 + drum_note 7, 4 + drum_note 8, 2 + drum_note 4, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 4, 2 + sound_loop 3, Music_BlueField_branch_4133e + drum_note 4, 4 + drum_note 8, 2 + drum_note 7, 4 + drum_note 8, 2 + rest 6 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + sound_call Music_BlueField_branch_41386 + sound_call Music_BlueField_branch_41386 + drum_note 4, 4 + drum_note 7, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 4, 4 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 4 + drum_note 7, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 4, 4 + drum_note 7, 2 + drum_note 3, 4 + drum_note 3, 2 +Music_BlueField_branch_41369: + sound_call Music_BlueField_branch_41386 + sound_loop 3, Music_BlueField_branch_41369 + drum_note 7, 4 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 +Music_BlueField_branch_4137b: + sound_call Music_BlueField_branch_41386 + sound_loop 10, Music_BlueField_branch_4137b + sound_loop 0, Music_BlueField_branch_4131b +Music_BlueField_branch_41386: + drum_note 4, 4 + drum_note 7, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 4, 4 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + sound_ret diff --git a/crysaudio/music/pinball/catchem_blue.asm b/crysaudio/music/pinball/catchem_blue.asm deleted file mode 100644 index fbef2250..00000000 --- a/crysaudio/music/pinball/catchem_blue.asm +++ /dev/null @@ -1,2149 +0,0 @@ -Music_Pinballcatchem_blue: ; 4138f - dbw $c0, Music_Pinballcatchem_blue_Ch1 - dbw $01, Music_Pinballcatchem_blue_Ch2 - dbw $02, Music_Pinballcatchem_blue_Ch3 - dbw $03, Music_Pinballcatchem_blue_Ch4 -; 4139b - -Music_Pinballcatchem_blue_Ch1: ; 4139b - tempo 160 - volume $77 - vibrato $9, $34 - tone $0001 - notetype $c, $b3 - note __, 16 -Music_Pinballcatchem_blue_branch_413aa: ; 413aa - notetype $8, $a2 - dutycycle $3 - octave 4 - note C#, 2 - note __, 12 - note __, 10 - octave 3 - note A#, 2 - note __, 12 - note A#, 3 - note __, 7 - octave 4 - note C#, 2 - note __, 1 - intensity $81 - octave 2 - note A#, 2 - octave 3 - note C#, 1 - note A#, 2 - octave 4 - note C#, 1 - octave 3 - note C#, 2 - intensity $a2 - note A#, 2 - note __, 2 - octave 4 - note F_, 3 - note __, 6 - note C#, 2 - note __, 12 - note D#, 3 - note __, 7 - intensity $81 - dutycycle $2 - octave 3 - note A#, 2 - octave 4 - note F_, 1 - note A#, 2 - note F_, 3 - note A_, 1 - note A#, 2 - note F_, 1 - note __, 3 - note G#, 5 - note G_, 1 - note G#, 2 - note D#, 1 - note __, 3 - note F#, 5 - note F_, 1 - note F#, 2 - note F_, 4 - note G#, 3 - dutycycle $3 - octave 3 - note A#, 2 - octave 4 - note C_, 3 - dutycycle $2 - note D#, 1 - note A#, 2 - note F_, 1 - note A#, 3 - note F_, 2 - note A_, 1 - note A#, 2 - note F_, 4 - note G#, 5 - note G_, 1 - note G#, 2 - note F_, 1 - intensity $a1 - dutycycle $3 - note C#, 3 - note C#, 3 - note C_, 2 - octave 3 - note A#, 4 - note G#, 2 - note G_, 1 - note F#, 2 - note A_, 1 - note __, 2 - intensity $a3 - note A_, 3 - intensity $81 - dutycycle $2 - octave 5 - note E_, 1 - note F_, 2 - octave 4 - note A#, 3 - note F_, 3 - note A_, 1 - note A#, 2 - note F_, 4 - note G#, 3 - note G_, 2 - intensity $83 - note G#, 3 - intensity $81 - octave 5 - note C_, 1 - note C#, 2 - octave 4 - note A#, 3 - note F_, 3 - note F_, 1 - note F#, 2 - note F_, 1 - note __, 3 - octave 5 - note C_, 2 - octave 4 - note F_, 1 - note B_, 2 - intensity $83 - octave 5 - note C_, 3 - intensity $81 - octave 4 - note F_, 1 - note __, 6 - intensity $a1 - dutycycle $3 - note C#, 3 - note C_, 3 - octave 3 - note A#, 2 - intensity $a2 - note F_, 2 - note __, 5 - intensity $a1 - note F#, 2 - note F#, 1 - note A#, 3 - intensity $a3 - note F#, 3 - note __, 12 - note __, 6 - intensity $81 - dutycycle $2 - octave 4 - note D_, 2 - note A#, 3 - octave 5 - note C_, 1 - note D_, 3 - note F_, 1 - note D_, 1 - note F_, 1 - intensity $73 - note A#, 3 - note __, 9 - note __, 12 - intensity $72 - note D_, 2 - note __, 4 - intensity $71 - note D_, 2 - note D_, 1 - note D_, 2 - note D_, 1 - note __, 12 - note __, 2 - intensity $81 - note C_, 1 - intensity $91 - note C_, 3 - intensity $81 - note C_, 2 - intensity $91 - note C_, 4 - note __, 12 - note __, 6 - intensity $71 - note D_, 2 - note D_, 1 - note D_, 2 - note D_, 1 - notetype $c, $b3 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype $8, $a2 - dutycycle $3 - note __, 12 - octave 4 - note F_, 2 - note __, 10 - callchannel Music_Pinballcatchem_blue_branch_4158d - note G#, 2 - note F_, 1 - octave 4 - note D_, 2 - octave 3 - note F_, 1 - note G#, 2 - note F_, 1 - note G#, 2 - note F_, 1 - note G_, 2 - octave 5 - note F#, 1 - note G_, 2 - octave 3 - note F_, 1 - note G_, 2 - octave 5 - note G_, 1 - octave 3 - note G_, 2 - octave 5 - note G_, 1 - octave 3 - note D#, 2 - note G_, 1 - note A#, 2 - note G_, 1 - note D#, 2 - note A#, 1 - note D#, 2 - note A#, 1 - note E_, 2 - note G_, 1 - note A#, 2 - note G_, 1 - note E_, 2 - note A#, 1 - note G_, 2 - note A#, 1 - note __, 12 - note __, 2 - intensity $a4 - dutycycle $3 - note A#, 3 - note __, 3 - note A_, 4 - dutycycle $2 - callchannel Music_Pinballcatchem_blue_branch_4158d - note G#, 2 - note D_, 1 - note F_, 2 - note D_, 1 - note F_, 2 - note D_, 1 - note F_, 2 - intensity $a2 - dutycycle $3 - note D#, 3 - note __, 4 - intensity $a1 - note D#, 2 - note C_, 2 - note D#, 2 - intensity $a2 - note D#, 2 - note __, 4 - note G_, 2 - note __, 4 - intensity $a1 - note F_, 2 - note C_, 3 - octave 2 - note B_, 1 - octave 3 - note C_, 2 - note C_, 1 - octave 4 - note C_, 2 - intensity $97 - note D#, 12 - note __, 1 - intensity $94 - note D_, 6 - note __, 6 - note C#, 6 - note __, 6 - intensity $a1 - note C_, 6 - note C_, 2 - note C_, 1 - note C#, 2 - octave 3 - note B_, 1 - intensity $a4 - octave 4 - note C_, 6 - note __, 12 - note __, 3 - intensity $a1 - octave 3 - note B_, 2 - octave 4 - note C_, 1 - intensity $a2 - note C#, 2 - note __, 1 - intensity $a1 - note C#, 3 - note C#, 3 - note C#, 5 - intensity $a3 - octave 3 - note D#, 3 - note __, 3 - note F#, 3 - octave 4 - note D_, 1 - intensity $97 - note D#, 12 - note __, 6 - intensity $81 - octave 2 - note G#, 2 - note G#, 2 - note G#, 2 - intensity $a1 - octave 3 - note F#, 3 - note C#, 3 - note F#, 2 - note E_, 1 - intensity $82 - note F_, 3 - note __, 12 - intensity $a1 - note D#, 3 - note D#, 3 - note G#, 2 - note D_, 1 - intensity $a3 - note D#, 3 - note __, 9 - intensity $81 - dutycycle $2 - note C#, 3 - note F#, 3 - note C#, 3 - note F#, 3 - note C#, 1 - note F#, 1 - note C#, 1 - note G#, 6 - note G#, 3 - octave 4 - note C_, 1 - octave 3 - note G#, 1 - octave 4 - note C_, 1 - note C_, 1 - note D#, 1 - note C_, 1 - note D#, 1 - intensity $41 - note C_, 1 - note D#, 1 - intensity $a1 - note C_, 1 - intensity $51 - note D#, 1 - intensity $a1 - note C_, 1 - note D#, 1 - intensity $61 - note C_, 1 - note D#, 1 - intensity $a1 - octave 3 - note G#, 1 - intensity $71 - octave 4 - note D#, 1 - octave 3 - note G#, 1 - octave 4 - note D#, 1 - intensity $a1 - octave 3 - note G#, 1 - intensity $81 - octave 4 - note D#, 1 - octave 3 - note G#, 1 - intensity $91 - octave 4 - note G#, 1 - octave 3 - note G#, 1 - intensity $a1 - octave 4 - note G#, 1 - octave 3 - note G#, 1 - octave 4 - note G#, 1 - loopchannel 0, Music_Pinballcatchem_blue_branch_413aa -; 4158d - -Music_Pinballcatchem_blue_branch_4158d: ; 4158d - intensity $71 - dutycycle $2 - octave 2 - note A#, 2 - octave 3 - note F_, 1 - note A#, 2 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 1 - note A#, 2 - note F_, 1 - octave 2 - note A_, 2 - octave 3 - note F_, 1 - note A_, 2 - note F_, 1 - octave 2 - note A_, 2 - octave 3 - note F_, 1 - note A_, 2 - note F_, 1 - endchannel -; 415aa - -Music_Pinballcatchem_blue_Ch2: ; 415aa - vibrato $9, $34 - notetype $c, $b3 - note __, 16 -Music_Pinballcatchem_blue_branch_415b1: ; 415b1 - notetype $8, $b2 - dutycycle $3 - callchannel Music_Pinballcatchem_blue_branch_418d2 - intensity $b2 - note G_, 2 - note __, 1 - intensity $b1 - octave 3 - note G_, 2 - note A#, 1 - octave 4 - note C#, 2 - note D#, 3 - intensity $b2 - note F_, 2 - note __, 1 - note F#, 3 - note __, 1 - intensity $b1 - note F_, 1 - note F#, 1 - note F_, 1 - note D#, 2 - note C_, 1 - callchannel Music_Pinballcatchem_blue_branch_418d2 - intensity $b2 - note A#, 2 - note __, 1 - intensity $b1 - octave 3 - note G_, 2 - note A#, 1 - octave 4 - note C#, 2 - note D#, 1 - note F_, 2 - note G_, 3 - intensity $b2 - note G#, 3 - note __, 3 - intensity $b1 - octave 3 - note A#, 1 - note A#, 2 - note A#, 1 - callchannel Music_Pinballcatchem_blue_branch_41900 - note A#, 3 - octave 4 - note C#, 3 - note C#, 2 - note C#, 3 - intensity $b4 - note C_, 7 - intensity $b1 - note F#, 2 - note G#, 3 - note C_, 1 - callchannel Music_Pinballcatchem_blue_branch_41900 - octave 4 - note F_, 3 - note F_, 3 - note D#, 2 - note C#, 4 - note C_, 2 - octave 3 - note B_, 1 - note A#, 2 - octave 4 - note F#, 3 - intensity $b3 - note G#, 4 - callchannel Music_Pinballcatchem_blue_branch_41900 - note A#, 3 - octave 4 - note C#, 3 - note C#, 2 - note C#, 3 - intensity $b4 - note C_, 7 - note __, 3 - intensity $b1 - octave 3 - note A#, 2 - note A#, 1 - intensity $b1 - octave 4 - note C#, 2 - octave 3 - note A#, 4 - octave 4 - note F_, 2 - intensity $91 - octave 3 - note A#, 1 - intensity $b2 - octave 4 - note D#, 2 - intensity $81 - octave 3 - note F_, 1 - intensity $b1 - octave 4 - note C#, 2 - intensity $b2 - octave 3 - note A#, 2 - note __, 5 - intensity $b1 - note A#, 2 - note A#, 1 - octave 4 - note C#, 3 - intensity $b3 - octave 3 - note A#, 3 - note __, 6 - intensity $b1 - octave 4 - note A#, 2 - octave 3 - note A#, 3 - note A#, 1 - octave 4 - note F_, 2 - intensity $b2 - note D#, 3 - note __, 1 - intensity $b1 - note F_, 2 - note G_, 1 - note F_, 2 - note G_, 1 - note F_, 2 - note G_, 1 - note F_, 2 - note G_, 1 - note F_, 3 - note __, 6 - intensity $91 - dutycycle $2 - octave 6 - note D_, 1 - octave 5 - note A#, 1 - note G_, 1 - intensity $b2 - dutycycle $3 - octave 4 - note D_, 2 - intensity $91 - octave 3 - note G_, 1 - note A#, 2 - octave 4 - note D_, 1 - intensity $b1 - note D_, 2 - note D_, 1 - note D_, 2 - intensity $b2 - note D_, 2 - note __, 1 - intensity $91 - dutycycle $2 - note G_, 1 - note A#, 2 - octave 5 - note D_, 1 - intensity $b1 - dutycycle $3 - octave 3 - note A#, 2 - note A#, 1 - note A#, 2 - octave 4 - note D_, 1 - note C_, 3 - intensity $b2 - note F_, 3 - note __, 8 - intensity $91 - dutycycle $2 - octave 5 - note E_, 1 - note F_, 2 - octave 4 - note F_, 1 - octave 5 - note E_, 2 - note F_, 3 - octave 4 - note F_, 1 - intensity $b1 - dutycycle $3 - note D_, 2 - note D_, 1 - intensity $b2 - note D_, 3 - intensity $b1 - note D_, 2 - note D_, 1 - note D_, 2 - note D_, 1 - intensity $91 - dutycycle $2 - octave 5 - note D_, 2 - note D_, 1 - note D_, 3 - intensity $b1 - dutycycle $3 - octave 3 - note A#, 2 - note A#, 1 - note A#, 2 - octave 4 - note D_, 1 - intensity $b2 - note C_, 3 - intensity $91 - dutycycle $2 - octave 3 - note A_, 3 - note F_, 2 - note A_, 1 - octave 4 - note C_, 2 - note F_, 1 - octave 6 - note C_, 1 - octave 5 - note A_, 1 - note F_, 1 - note D#, 1 - note C_, 1 - octave 4 - note A_, 1 - note F_, 1 - note D#, 1 - intensity $b2 - dutycycle $3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note __, 1 - octave 3 - note A#, 2 - note __, 1 - note G_, 2 - note __, 1 - note A#, 2 - intensity $b1 - octave 4 - note C_, 3 - note D_, 4 - intensity $b2 - octave 3 - note A#, 2 - note __, 1 - intensity $91 - dutycycle $2 - octave 4 - note A#, 2 - note A_, 2 - note G#, 1 - octave 3 - note A_, 1 - intensity $b2 - dutycycle $3 - note A#, 2 - note __, 1 - note A#, 2 - note __, 1 - note A#, 2 - intensity $b1 - octave 4 - note F_, 3 - intensity $b2 - note C#, 1 - note D_, 2 - intensity $91 - dutycycle $2 - octave 3 - note A#, 1 - octave 4 - note F_, 1 - note A#, 1 - octave 5 - note F_, 1 - note A#, 1 - note F_, 1 - octave 4 - note A#, 1 - intensity $b2 - dutycycle $3 - octave 3 - note A#, 2 - octave 4 - note D_, 1 - note D#, 2 - note D_, 2 - note __, 1 - note C#, 1 - note C_, 2 - note __, 1 - octave 3 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note A#, 2 - note __, 1 - octave 4 - note C_, 2 - note __, 1 - octave 3 - note A_, 2 - note A#, 1 - octave 4 - note C_, 2 - octave 3 - note B_, 1 - note A#, 2 - note __, 1 - note A_, 2 - note A#, 2 - note B_, 2 - octave 4 - note C_, 2 - note __, 4 - note D_, 2 - note __, 1 - note D#, 2 - note __, 1 - note F_, 2 - note A_, 1 - note A#, 2 - note __, 1 - intensity $b1 - note A#, 2 - octave 5 - note C_, 3 - octave 4 - note A#, 1 - octave 5 - note C_, 1 - octave 4 - note A#, 2 - note A_, 3 - note G_, 3 - intensity $b2 - note F_, 2 - note __, 1 - intensity $b1 - note G_, 3 - note F_, 3 - note F_, 2 - note D_, 3 - intensity $b2 - octave 3 - note A#, 3 - intensity $91 - dutycycle $2 - octave 5 - note A_, 1 - note A#, 2 - octave 4 - note A#, 1 - intensity $b1 - dutycycle $3 - octave 3 - note A#, 2 - intensity $91 - dutycycle $2 - octave 5 - note A#, 1 - intensity $b1 - dutycycle $3 - octave 4 - note C_, 2 - intensity $91 - dutycycle $2 - octave 5 - note A#, 1 - intensity $b1 - dutycycle $3 - octave 4 - note D_, 3 - note D_, 3 - note D_, 2 - note D#, 3 - note F_, 2 - note __, 2 - note F_, 3 - note D#, 3 - note D_, 3 - intensity $b2 - note D_, 1 - intensity $91 - note D#, 1 - intensity $b1 - note C_, 2 - note __, 2 - intensity $91 - dutycycle $2 - note F_, 1 - note A_, 1 - octave 5 - note C_, 1 - note D#, 1 - note F_, 1 - note C_, 1 - note __, 2 - intensity $b3 - dutycycle $3 - octave 4 - note A#, 3 - intensity $91 - dutycycle $2 - octave 3 - note E_, 1 - intensity $b1 - note F_, 2 - intensity $b3 - dutycycle $3 - octave 5 - note C_, 4 - intensity $b2 - dutycycle $3 - note __, 2 - intensity $b2 - octave 4 - note A_, 1 - note A#, 2 - note __, 1 - intensity $b1 - note A#, 2 - octave 5 - note C_, 3 - octave 4 - note A#, 1 - octave 5 - note C_, 1 - octave 4 - note A#, 2 - note A_, 2 - note A#, 1 - note G_, 3 - note F_, 3 - note G_, 2 - intensity $91 - note D_, 1 - intensity $b1 - note F_, 2 - intensity $91 - octave 3 - note A#, 1 - intensity $b1 - octave 4 - note F_, 2 - note D_, 3 - intensity $b2 - octave 3 - note A#, 3 - note __, 3 - intensity $91 - note A_, 1 - intensity $b1 - note A#, 2 - octave 4 - note D_, 2 - note C_, 2 - intensity $b2 - octave 3 - note A#, 2 - note __, 4 - octave 4 - note D_, 2 - note __, 4 - intensity $b1 - note C_, 2 - octave 3 - note F_, 3 - note F_, 1 - note F_, 2 - note F_, 1 - octave 4 - note F_, 2 - notetype $c, $a8 - note A#, 9 - intensity $a3 - note A#, 3 - notetype $8, $b3 - note __, 1 - note __, 5 - note A_, 1 - intensity $b3 - note A#, 6 - note __, 6 - intensity $b1 - note G#, 2 - octave 3 - note G#, 3 - note G#, 1 - octave 4 - note G#, 2 - note G#, 1 - note A#, 2 - note G_, 1 - intensity $b3 - note G#, 6 - intensity $91 - dutycycle $2 - note C_, 2 - note D#, 2 - note C_, 2 - octave 5 - note C_, 1 - octave 4 - note G#, 1 - note D#, 1 - note C_, 1 - octave 3 - note G#, 1 - note D#, 1 - note C_, 1 - octave 2 - note G#, 1 - note D#, 1 - intensity $b1 - dutycycle $3 - octave 4 - note G#, 1 - note __, 1 - note A_, 1 - intensity $b2 - note A#, 2 - note __, 1 - intensity $b1 - note A#, 3 - note A#, 3 - note A#, 3 - note C_, 2 - intensity $b4 - note G#, 3 - intensity $b1 - note C_, 1 - note C_, 2 - intensity $b4 - note A#, 3 - intensity $b1 - note G_, 1 - intensity $b6 - note G#, 12 - intensity $91 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - octave 3 - note C_, 4 - intensity $b1 - octave 4 - note G_, 1 - note G#, 3 - note A#, 3 - note G#, 3 - note A#, 2 - intensity $b2 - note G_, 1 - note G#, 3 - intensity $91 - dutycycle $2 - octave 5 - note G#, 1 - note D#, 1 - note C_, 1 - octave 4 - note G#, 1 - note D#, 1 - note C_, 1 - note D#, 1 - note F_, 1 - intensity $b1 - dutycycle $3 - note F#, 1 - note G_, 3 - note G#, 3 - note G#, 3 - note F_, 2 - note G_, 1 - intensity $b2 - note G#, 3 - intensity $91 - dutycycle $2 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - intensity $b1 - dutycycle $3 - note G#, 3 - intensity $b1 - dutycycle $3 - note A#, 3 - note G#, 3 - note A#, 3 - note G#, 1 - note A#, 1 - note G#, 1 - intensity $91 - dutycycle $2 - note D#, 1 - note C_, 1 - note D#, 1 - note G#, 1 - note D#, 1 - intensity $92 - dutycycle $3 - octave 5 - note C_, 1 - intensity $b2 - note C#, 2 - note __, 1 - notetype $c, $b8 - note C_, 2 - intensity $b8 - note C_, 12 - intensity $b4 - note C_, 4 - loopchannel 0, Music_Pinballcatchem_blue_branch_415b1 -; 418d2 - -Music_Pinballcatchem_blue_branch_418d2: ; 418d2 - intensity $b2 - octave 4 - note A#, 2 - note __, 1 - octave 3 - note A#, 2 - notetype $8, $91 - note F_, 1 - notetype $8, $b1 - octave 4 - note C#, 2 - note D#, 1 - notetype $8, $91 - octave 3 - note F_, 2 - notetype $8, $b2 - octave 4 - note F_, 2 - note __, 1 - notetype $8, $91 - note D#, 1 - notetype $8, $b2 - note G#, 3 - notetype $8, $91 - octave 3 - note A#, 2 - octave 4 - note C#, 1 - note F_, 2 - note G#, 1 - endchannel -; 41900 - -Music_Pinballcatchem_blue_branch_41900: ; 41900 - intensity $b1 - octave 4 - note C#, 2 - octave 3 - note A#, 1 - octave 4 - note C#, 2 - octave 3 - note A#, 1 - notetype $8, $a1 - octave 4 - note C#, 2 - octave 3 - note A#, 1 - octave 4 - note C#, 2 - octave 3 - note A#, 1 - notetype $8, $91 - octave 4 - note C#, 2 - octave 3 - note A#, 1 - octave 4 - note C#, 2 - octave 3 - note A#, 1 - notetype $8, $81 - octave 4 - note C#, 2 - notetype $8, $91 - octave 3 - note A#, 1 - notetype $8, $a1 - note A#, 2 - notetype $8, $b1 - note A#, 1 - endchannel -; 41933 - -Music_Pinballcatchem_blue_Ch3: ; 41933 - notetype $c, $b3 - note __, 16 -Music_Pinballcatchem_blue_branch_41937: ; 41937 - notetype $8, $22 - octave 1 - note A#, 2 - note __, 6 - note A#, 1 - note __, 2 - note G#, 2 - note __, 4 - note G#, 1 - note __, 2 - note G#, 1 - note __, 2 - note F#, 1 - note G_, 2 - note __, 12 - note F#, 3 - note __, 1 - note G#, 2 - note __, 3 - note A_, 1 - note A#, 2 - note __, 3 - note A#, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 2 - note G#, 2 - note __, 4 - note G#, 1 - octave 2 - note G#, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 2 - note F#, 1 - note G_, 2 - note __, 3 - note G_, 1 - octave 2 - note G_, 1 - note __, 1 - octave 1 - note G_, 1 - note __, 2 - note G_, 1 - note __, 2 - note F_, 3 - note __, 6 - note A_, 1 - callchannel Music_Pinballcatchem_blue_branch_41b46 - note F#, 2 - octave 2 - note F#, 1 - note __, 2 - octave 1 - note F#, 1 - note F#, 1 - note __, 1 - note F#, 1 - note __, 2 - note __, 1 - octave 2 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F#, 2 - note __, 1 - note F_, 2 - note A_, 1 - callchannel Music_Pinballcatchem_blue_branch_41b5b - callchannel Music_Pinballcatchem_blue_branch_41b46 - octave 2 - note F#, 1 - note C#, 1 - octave 1 - note A#, 1 - note F#, 1 - note __, 2 - note F#, 1 - note __, 1 - octave 2 - note F#, 1 - note __, 2 - octave 1 - note F#, 1 - note F_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 2 - octave 1 - note F_, 1 - note F_, 1 - note __, 1 - octave 2 - note F_, 3 - note A_, 1 - callchannel Music_Pinballcatchem_blue_branch_41b5b - octave 1 - note A#, 2 - note __, 3 - note A#, 1 - octave 2 - note F_, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 2 - note A#, 1 - octave 2 - note A#, 3 - note __, 8 - intensity $32 - octave 1 - note D_, 1 -Music_Pinballcatchem_blue_branch_419ba: ; 419ba - intensity $22 - note D#, 2 - note __, 3 - note D#, 1 - note G_, 1 - note __, 1 - note F#, 1 - note G_, 1 - note __, 2 - note A#, 1 - note __, 1 - note A_, 1 - note A#, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 2 - octave 1 - note A#, 1 - note __, 2 - note G_, 1 - note F_, 2 - note __, 3 - note F_, 1 - note A_, 1 - note __, 1 - note G#, 1 - note A_, 1 - note __, 2 - octave 2 - note C_, 1 - note __, 1 - octave 1 - note B_, 1 - octave 2 - note C_, 1 - note __, 1 - note F_, 1 - note __, 2 - note C_, 1 - note __, 2 - octave 1 - note A_, 1 - loopchannel 2, Music_Pinballcatchem_blue_branch_419ba - note G_, 2 - octave 2 - note D_, 1 - note G_, 1 - note __, 2 - octave 1 - note G_, 1 - note __, 1 - octave 2 - note G_, 1 - note __, 2 - octave 1 - note F_, 1 - note F#, 2 - note F#, 1 - octave 2 - note F#, 1 - note __, 2 - note A#, 1 - note __, 1 - note A_, 1 - note __, 1 - note G#, 1 - note __, 1 - octave 1 - note F_, 2 - octave 2 - note D_, 1 - note F_, 1 - note __, 2 - octave 1 - note F_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 2 - octave 1 - note A#, 1 - note E_, 2 - note A#, 1 - octave 2 - note D_, 1 - note __, 1 - note G_, 1 - note D_, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 2 - note B_, 1 - octave 2 - note C_, 2 - note __, 1 - note C_, 2 - note __, 1 - note D_, 2 - note __, 1 - note D_, 2 - note __, 1 - note D#, 2 - note __, 1 - note D#, 2 - note __, 1 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - note F_, 2 - octave 3 - note D#, 1 - note __, 2 - octave 2 - note F_, 1 - note F_, 1 - note __, 1 - octave 3 - note D#, 2 - note C_, 2 - octave 2 - note A_, 2 - note __, 9 - octave 1 - note A_, 1 - callchannel Music_Pinballcatchem_blue_branch_41b7e - note G#, 2 - note __, 1 - note F_, 2 - note __, 1 - note D_, 2 - note __, 1 - octave 1 - note A#, 2 - note F#, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - note A#, 1 - octave 2 - note D#, 2 - note __, 1 - note G_, 2 - note __, 1 - octave 3 - note D#, 1 - note D_, 1 - octave 2 - note A#, 1 - note G_, 2 - note __, 1 - note D#, 2 - note A#, 1 - note __, 2 - note D#, 1 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - note G_, 2 - note __, 1 - note A#, 2 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F_, 1 - note __, 2 - note A#, 1 - note F_, 1 - note __, 1 - note F_, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 2 - note E_, 3 - note __, 3 - note F_, 3 - octave 1 - note A_, 1 - callchannel Music_Pinballcatchem_blue_branch_41b7e - note G#, 2 - note __, 1 - note F_, 2 - note __, 1 - note D_, 2 - note __, 1 - octave 1 - note A#, 2 - note G_, 1 - note G#, 1 - note __, 1 - note G#, 1 - note __, 2 - octave 2 - note C_, 1 - note D#, 1 - note __, 1 - note G_, 1 - note __, 1 - note G#, 1 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F#, 2 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note F_, 2 - octave 1 - note F_, 1 - note __, 2 - note F_, 1 - note F_, 1 - note __, 1 - octave 2 - note C_, 1 - note D#, 1 - note __, 1 - note D_, 1 - intensity $32 - octave 3 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - octave 2 - note A#, 1 - octave 3 - note C_, 1 - octave 2 - note A#, 1 - octave 3 - note C_, 1 - octave 2 - note A#, 1 - octave 3 - note C_, 1 - intensity $22 - note D_, 1 - note F_, 1 - note A#, 1 - octave 4 - note D_, 1 - note F_, 1 - note __, 1 - octave 1 - note F#, 1 - note __, 1 - note F#, 1 - note A#, 2 - note __, 1 - octave 2 - note C#, 2 - note __, 1 - note F_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F#, 2 - note __, 1 - note F_, 2 - note __, 1 - note D#, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 2 - note G#, 1 - note G#, 1 - note __, 1 - note G#, 1 - note A#, 1 - note __, 1 - note G#, 1 - note G#, 2 - note __, 1 - note A#, 1 - note __, 1 - note G#, 1 - note __, 6 - note F#, 1 - note __, 1 - note F#, 1 - note A#, 2 - note __, 1 - octave 2 - note C#, 2 - note __, 1 - note F_, 2 - note __, 3 - intensity $32 - octave 3 - note C_, 3 - note __, 3 - note C#, 3 - note __, 1 - intensity $22 - octave 2 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 2 - note __, 1 - note E_, 2 - note __, 1 - note D#, 2 - note __, 1 - note D_, 2 - note __, 1 - note C#, 2 - note __, 1 - note C_, 2 - note __, 1 - note D#, 2 - note __, 1 - octave 1 - note F#, 1 - note __, 2 - note F#, 1 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note C_, 1 - note C#, 3 - note __, 12 - octave 1 - note G#, 1 - note __, 2 - note G#, 1 - note __, 2 - octave 2 - note C_, 1 - note __, 1 - note D_, 1 - note D#, 3 - note __, 9 - octave 1 - note G_, 3 - note F#, 2 - octave 2 - note F#, 1 - note F_, 2 - note __, 1 - note E_, 2 - note __, 1 - note D#, 2 - note __, 1 - note D_, 2 - note __, 1 - note C#, 2 - note __, 1 - note G#, 2 - note __, 1 - notetype $c, $22 - octave 3 - note D#, 2 - note D#, 16 - loopchannel 0, Music_Pinballcatchem_blue_branch_41937 -; 41b46 - -Music_Pinballcatchem_blue_branch_41b46: ; 41b46 - note A#, 2 - note __, 1 - octave 2 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - octave 1 - note A#, 2 - note __, 1 - note G#, 2 - note __, 1 - octave 2 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - octave 1 - note G#, 2 - note __, 1 - endchannel -; 41b5b - -Music_Pinballcatchem_blue_branch_41b5b: ; 41b5b - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F#, 2 - note __, 1 - note F_, 2 - note __, 1 - note E_, 2 - note __, 1 - note F_, 2 - note __, 1 - octave 1 - note F#, 2 - note __, 1 - note F#, 2 - note __, 1 - note G_, 2 - note __, 1 - note G_, 2 - note __, 1 - octave 2 - note G#, 2 - note __, 1 - note G_, 2 - octave 3 - note D#, 1 - note __, 2 - octave 2 - note F_, 4 - endchannel -; 41b7e - -Music_Pinballcatchem_blue_branch_41b7e: ; 41b7e - note A#, 2 - note __, 3 - note A#, 1 - octave 2 - note F_, 1 - note __, 1 - note D_, 1 - note __, 2 - octave 1 - note A#, 1 - note A_, 1 - note __, 1 - note A_, 1 - octave 2 - note D_, 2 - note __, 1 - note F_, 1 - note __, 2 - note A_, 2 - note G_, 1 - endchannel -; 41b93 - -Music_Pinballcatchem_blue_Ch4: ; 41b93 - togglenoise $0 - notetype $8 - note D#, 3 - note D_, 3 - note D#, 2 - note D_, 1 - note F#, 2 - note G_, 1 - note D_, 3 - note D_, 3 - note C#, 2 - note C#, 1 - note D_, 2 - note D_, 1 -Music_Pinballcatchem_blue_branch_41ba3: ; 41ba3 - note D_, 3 - note D#, 2 - note D#, 1 - note D#, 2 - note D#, 3 - note C#, 1 - note D_, 3 - note D_, 3 - note D#, 2 - note D_, 1 - note D#, 2 - note D_, 1 - note D#, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 2 - note G_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 1 - note D_, 3 - note G_, 2 - note D#, 1 - note D_, 5 - note D_, 3 - note G_, 1 - note F#, 3 - note D_, 2 - note G_, 1 - note F#, 2 - note D_, 1 - note G_, 2 - note G_, 1 - note F#, 2 - note D#, 1 - note D_, 2 - note G_, 1 - note F#, 2 - note G_, 1 - note D#, 2 - note D_, 1 - note C_, 5 - note D_, 1 - note D_, 2 - note D#, 1 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note F#, 3 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D_, 1 - note D#, 2 - note D#, 1 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note D_, 1 - note C#, 1 - note C#, 1 - note D_, 3 - note D_, 2 - note D#, 1 - note F#, 3 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note D_, 2 - note D_, 1 - note D_, 2 - note D_, 1 - note D#, 2 - note C_, 1 - note D_, 2 - note D_, 1 - note D_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note F#, 3 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note D_, 1 - note D_, 2 - note D#, 1 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note D_, 1 - note C#, 1 - note C#, 1 - note D_, 3 - note D_, 2 - note D#, 1 - note F#, 3 - callchannel Music_Pinballcatchem_blue_branch_41cfe - note D_, 2 - note D#, 3 - note D#, 1 - note D#, 2 - note B_, 1 - note D_, 2 - note D_, 1 - note D_, 2 - note D#, 3 - note D_, 1 - note D_, 2 - note D_, 3 - note D_, 1 - note B_, 12 - callchannel Music_Pinballcatchem_blue_branch_41d05 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note D_, 2 - note D_, 1 - note D_, 3 - note D_, 2 - note D_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d05 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 2 - note D_, 1 - note G_, 2 - note G_, 1 - note D#, 3 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 3 - note D_, 2 - note D_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d12 - note D_, 2 - note D_, 2 - note D_, 2 - callchannel Music_Pinballcatchem_blue_branch_41d12 - note G_, 2 - note G_, 1 - note F#, 3 -Music_Pinballcatchem_blue_branch_41c5e: ; 41c5e - note G_, 2 - note G_, 1 - note F#, 3 - loopchannel 4, Music_Pinballcatchem_blue_branch_41c5e - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note C_, 6 - callchannel Music_Pinballcatchem_blue_branch_41d1c - note D#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note D#, 1 - callchannel Music_Pinballcatchem_blue_branch_41d1c - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 2 - note D_, 3 - note D#, 1 - note D#, 3 - note D#, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note D#, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note D_, 2 - note D_, 1 - note D#, 2 - note D_, 3 - note D#, 1 - note D#, 2 - note D_, 2 - note D_, 2 - callchannel Music_Pinballcatchem_blue_branch_41d23 - note D_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d23 - note D_, 2 - note G_, 1 - note D_, 2 - note D_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d23 - note D_, 2 - note G_, 1 - note F#, 3 - note F#, 3 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note D#, 3 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 3 - note D_, 2 - note D_, 1 -Music_Pinballcatchem_blue_branch_41cba: ; 41cba - callchannel Music_Pinballcatchem_blue_branch_41d30 - loopchannel 4, Music_Pinballcatchem_blue_branch_41cba - callchannel Music_Pinballcatchem_blue_branch_41d30 - note D#, 2 - note D_, 3 - note D_, 1 - note D#, 2 - note D_, 3 - note D_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d30 - callchannel Music_Pinballcatchem_blue_branch_41d30 - callchannel Music_Pinballcatchem_blue_branch_41d30 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 3 - note D_, 3 - note D#, 2 - note D_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d30 - note D#, 2 - note D_, 1 - note D#, 2 - note D_, 1 - note D_, 2 - note D_, 1 - note D#, 2 - note D_, 1 - callchannel Music_Pinballcatchem_blue_branch_41d30 - callchannel Music_Pinballcatchem_blue_branch_41d30 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 3 - note D_, 2 - note D_, 1 - note D#, 2 - note C#, 1 - note D_, 3 - note D_, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 2 - note D_, 1 - loopchannel 0, Music_Pinballcatchem_blue_branch_41ba3 -; 41cfe - -Music_Pinballcatchem_blue_branch_41cfe: ; 41cfe - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - endchannel -; 41d05 - -Music_Pinballcatchem_blue_branch_41d05: ; 41d05 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note D#, 1 - endchannel -; 41d12 - -Music_Pinballcatchem_blue_branch_41d12: ; 41d12 - note D#, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note D_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - endchannel -; 41d1c - -Music_Pinballcatchem_blue_branch_41d1c: ; 41d1c - note D#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - endchannel -; 41d23 - -Music_Pinballcatchem_blue_branch_41d23: ; 41d23 - note D#, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note D#, 2 - note G_, 1 - note D#, 2 - note G_, 1 - endchannel -; 41d30 - -Music_Pinballcatchem_blue_branch_41d30: ; 41d30 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - endchannel -; 41d37 - - diff --git a/crysaudio/music/pinball/catchem_red.asm b/crysaudio/music/pinball/catchem_red.asm deleted file mode 100644 index 12768339..00000000 --- a/crysaudio/music/pinball/catchem_red.asm +++ /dev/null @@ -1,1516 +0,0 @@ -Music_Pinballcatchem_red: ; 3d2ed - dbw $c0, Music_Pinballcatchem_red_Ch1 - dbw $01, Music_Pinballcatchem_red_Ch2 - dbw $02, Music_Pinballcatchem_red_Ch3 - dbw $03, Music_Pinballcatchem_red_Ch4 -; 3d2f9 - -Music_Pinballcatchem_red_Ch1: ; 3d2f9 - tempo 160 - volume $77 - dutycycle $3 - vibrato $12, $34 - tone $0001 - notetype $8, $a2 - note __, 12 - note __, 12 -Music_Pinballcatchem_red_branch_3d30b: ; 3d30b - octave 3 - note D#, 8 - note F#, 4 - note D#, 8 - note D#, 4 - note D#, 8 - note F#, 4 - note D#, 8 - note D#, 4 - note __, 12 - note __, 12 - note __, 12 - note __, 12 - callchannel Music_Pinballcatchem_red_branch_3d360 - intensity $92 - octave 4 - note A_, 2 - note A_, 3 - note A_, 16 - note __, 3 - callchannel Music_Pinballcatchem_red_branch_3d360 - intensity $92 - octave 4 - note A_, 2 - note A_, 3 - note A_, 16 - note __, 3 - intensity $a2 - note __, 12 - note __, 12 - note __, 12 - octave 4 - note G_, 2 - note F_, 3 - note D#, 3 - note D_, 12 - note __, 6 - note D#, 6 - octave 5 - note C_, 16 - note __, 12 - intensity $72 - octave 6 - note D_, 2 - note C_, 1 - octave 5 - note A#, 6 - octave 6 - note D_, 3 - note C_, 6 - octave 5 - note A#, 16 - intensity $a2 - note __, 2 - note D_, 2 - note D_, 3 - note C_, 3 - note D_, 4 - note __, 12 - note __, 12 - note __, 12 - note __, 12 - octave 4 - note A#, 2 - note A#, 3 - note A#, 16 - note __, 3 - octave 5 - note C_, 2 - note C_, 3 - note C_, 16 - note __, 3 - loopchannel 0, Music_Pinballcatchem_red_branch_3d30b -; 3d360 - -Music_Pinballcatchem_red_branch_3d360: ; 3d360 - intensity $52 - note __, 3 - octave 3 - note F_, 5 - note F_, 3 - note F_, 13 - note __, 3 - note G_, 5 - note G_, 4 - note G_, 5 - note A_, 7 - intensity $a2 - note __, 12 - note __, 12 - note __, 12 - note __, 12 - note __, 12 - octave 5 - note D#, 2 - note D_, 3 - note C_, 7 - note __, 12 - note __, 5 - octave 4 - note C_, 7 - note __, 12 - note __, 12 - note __, 12 - note __, 8 - note D_, 16 - note __, 12 - note A#, 2 - note A#, 3 - note A#, 16 - note __, 3 - endchannel -; 3d386 - -Music_Pinballcatchem_red_Ch2: ; 3d386 - dutycycle $1 - vibrato $12, $34 - notetype $8, $c1 - note __, 12 - note __, 6 - octave 4 - note G#, 2 - note F#, 1 - note F_, 2 - note D#, 1 -Music_Pinballcatchem_red_branch_3d395: ; 3d395 - dutycycle $1 - intensity $c1 - note D_, 2 - octave 3 - note A#, 1 - note G_, 2 - note D#, 1 - note G_, 2 - octave 4 - note F_, 4 - note D_, 2 - octave 2 - note A#, 1 - octave 3 - note D#, 2 - note F_, 1 - note G_, 2 - octave 4 - note C_, 4 - note D_, 2 - octave 3 - note D#, 1 - note G_, 2 - note A#, 1 - octave 4 - note D_, 2 - note F_, 4 - note D_, 2 - octave 3 - note C_, 1 - note D#, 2 - note F_, 1 - note A_, 2 - octave 4 - note C_, 4 - note __, 12 - note __, 12 - note __, 12 - note __, 12 - callchannel Music_Pinballcatchem_red_branch_3d4fe - intensity $92 - octave 5 - note F_, 2 - note F_, 3 - intensity $94 - note F_, 12 - note __, 7 - callchannel Music_Pinballcatchem_red_branch_3d4fe - intensity $92 - octave 5 - note F_, 2 - note F_, 3 - intensity $94 - note F_, 13 - dutycycle $2 - intensity $82 - octave 5 - note C_, 3 - note D_, 3 - intensity $a2 - note D#, 2 - intensity $81 - octave 3 - note A#, 1 - octave 4 - note D#, 2 - note G_, 1 - note A#, 2 - octave 5 - note D_, 1 - intensity $a2 - note D#, 3 - note F_, 2 - note D#, 1 - intensity $81 - octave 4 - note G_, 2 - intensity $a2 - octave 5 - note D_, 1 - intensity $82 - octave 4 - note A#, 2 - intensity $a2 - octave 5 - note C_, 3 - intensity $83 - note C#, 1 - intensity $a2 - note D_, 2 - intensity $81 - octave 3 - note A#, 1 - octave 4 - note D_, 2 - note F_, 1 - note A_, 2 - octave 5 - note C#, 1 - intensity $a2 - note D_, 3 - intensity $93 - note D#, 2 - note D_, 3 - note C_, 3 - octave 4 - note A#, 4 - intensity $a2 - octave 5 - note D#, 3 - note D_, 3 - note C_, 3 - note D#, 5 - intensity $a4 - note G_, 4 - intensity $82 - octave 4 - note F_, 2 - intensity $a4 - octave 5 - note F_, 4 - intensity $81 - octave 4 - note A_, 2 - note A#, 1 - intensity $a2 - octave 5 - note D_, 2 - note F_, 4 - note D#, 3 - note D_, 3 - intensity $62 - octave 4 - note F_, 2 - note G#, 1 - intensity $82 - note B_, 2 - octave 5 - note D_, 1 - intensity $a2 - note F_, 2 - note G#, 1 - intensity $a3 - note A#, 2 - intensity $82 - note A_, 1 - intensity $a3 - note G_, 3 - intensity $82 - note D#, 2 - octave 4 - note A#, 1 - intensity $a3 - octave 5 - note A#, 2 - intensity $82 - note D#, 1 - intensity $a3 - note A_, 3 - intensity $82 - note G_, 2 - note D#, 1 - intensity $a3 - note G_, 3 - intensity $82 - note D#, 2 - note C_, 1 - intensity $a3 - note F_, 3 - note G#, 6 - intensity $a2 - note G_, 3 - note F_, 2 - note F_, 3 - note D#, 3 - intensity $a3 - note F_, 4 - note G_, 2 - intensity $52 - octave 4 - note C_, 1 - intensity $a3 - octave 5 - note F_, 2 - intensity $52 - octave 4 - note D#, 1 - note G_, 2 - note A#, 1 - intensity $a3 - octave 5 - note D#, 2 - intensity $52 - note C_, 1 - intensity $a3 - note A_, 2 - intensity $62 - octave 4 - note D_, 1 - intensity $a3 - octave 5 - note G_, 2 - intensity $62 - octave 4 - note F_, 1 - note A_, 2 - octave 5 - note C_, 1 - intensity $a3 - note F_, 2 - intensity $62 - note D_, 1 - intensity $a3 - note A#, 2 - intensity $72 - octave 4 - note D#, 1 - intensity $a3 - octave 5 - note A_, 2 - intensity $72 - octave 4 - note G_, 1 - note A#, 2 - octave 5 - note D_, 1 - intensity $a3 - note G_, 2 - intensity $72 - note F_, 1 - intensity $a3 - octave 6 - note C_, 2 - intensity $82 - octave 4 - note E_, 1 - intensity $a3 - octave 6 - note D_, 2 - intensity $82 - octave 4 - note G_, 1 - note A#, 2 - octave 5 - note C_, 1 - intensity $a3 - note A#, 2 - intensity $82 - note E_, 1 - intensity $a2 - octave 6 - note C_, 2 - note C_, 3 - intensity $a4 - note C_, 7 - intensity $82 - octave 5 - note C_, 2 - octave 4 - note F_, 1 - note A#, 2 - octave 5 - note C_, 1 - note A_, 2 - note F_, 1 - octave 6 - note C_, 2 - octave 5 - note A#, 1 - intensity $a2 - note A_, 2 - note A_, 3 - intensity $a4 - note A_, 13 - dutycycle $1 - intensity $82 - octave 4 - note G#, 2 - note F#, 1 - note F_, 2 - note D#, 1 - loopchannel 0, Music_Pinballcatchem_red_branch_3d395 -; 3d4fe - -Music_Pinballcatchem_red_branch_3d4fe: ; 3d4fe - intensity $72 - octave 4 - note __, 3 - note D_, 5 - note D_, 3 - note D_, 13 - note __, 3 - note D#, 5 - note D#, 3 - note D#, 1 - note D#, 5 - note F_, 4 - octave 3 - note F_, 3 - intensity $c3 - octave 4 - note D_, 2 - intensity $62 - octave 3 - note A#, 1 - note F_, 2 - note A#, 1 - intensity $c3 - octave 4 - note D#, 2 - intensity $62 - octave 3 - note A#, 1 - note F_, 2 - note A#, 1 - intensity $c3 - octave 4 - note F_, 2 - intensity $62 - note D_, 1 - octave 3 - note A#, 2 - octave 4 - note D_, 1 - intensity $c3 - note A#, 2 - intensity $62 - note D_, 1 - octave 3 - note A#, 2 - octave 4 - note F_, 1 - intensity $c3 - note A_, 2 - intensity $62 - note D#, 1 - note C_, 2 - octave 3 - note A_, 1 - octave 4 - note C_, 2 - note D#, 1 - intensity $c3 - note G_, 2 - note A_, 1 - note G_, 2 - intensity $62 - note D#, 1 - note C_, 2 - octave 3 - note G_, 1 - octave 4 - note C_, 2 - note D#, 1 - note C_, 2 - note D#, 1 - note C_, 2 - octave 3 - note G_, 1 - intensity $c3 - octave 4 - note D#, 2 - intensity $62 - octave 3 - note G_, 1 - intensity $c3 - octave 4 - note F_, 2 - intensity $62 - octave 3 - note G_, 1 - intensity $c3 - octave 4 - note G_, 2 - intensity $62 - note C_, 1 - intensity $c3 - octave 5 - note C_, 2 - octave 4 - note A#, 3 - note A_, 4 - intensity $a3 - note G_, 2 - note A_, 1 - intensity $c3 - note A#, 2 - intensity $73 - note F_, 1 - note D_, 2 - octave 3 - note A#, 1 - octave 4 - note D_, 2 - note F_, 1 - intensity $c3 - note G_, 3 - note F_, 2 - intensity $73 - note D_, 1 - octave 3 - note G#, 2 - intensity $b4 - octave 4 - note G#, 7 - intensity $73 - note D#, 2 - note G_, 1 - intensity $c3 - note A#, 2 - intensity $73 - note D#, 1 - octave 3 - note A#, 2 - intensity $c3 - octave 4 - note A_, 1 - note A#, 2 - intensity $73 - note D#, 1 - intensity $c3 - note G_, 3 - intensity $73 - octave 3 - note G_, 2 - note D#, 1 - note G_, 2 - note A#, 1 - octave 4 - note D#, 2 - note G_, 1 - note D_, 2 - note F_, 1 - intensity $c3 - note A#, 3 - intensity $73 - note D_, 2 - intensity $c3 - note A_, 1 - note A#, 2 - intensity $73 - octave 3 - note A#, 1 - intensity $c3 - octave 4 - note F_, 2 - intensity $73 - note D_, 1 - note F_, 2 - octave 3 - note A#, 1 - note F_, 2 - intensity $b4 - octave 4 - note G#, 4 - intensity $73 - note D#, 2 - note G_, 1 - intensity $c3 - note A#, 2 - intensity $73 - note G_, 1 - note D#, 2 - octave 3 - note A#, 1 - intensity $c3 - octave 5 - note D_, 2 - intensity $73 - octave 4 - note D#, 1 - intensity $c3 - octave 5 - note C_, 2 - octave 4 - note A#, 1 - intensity $73 - note E_, 2 - intensity $c3 - note A_, 1 - note A#, 2 - intensity $73 - note E_, 1 - intensity $c3 - note B_, 3 - intensity $a3 - octave 5 - note C_, 2 - note C_, 3 - note C_, 7 - intensity $72 - octave 4 - note C_, 2 - octave 3 - note F_, 1 - note A#, 2 - octave 4 - note C_, 1 - note A_, 2 - note F_, 1 - octave 5 - note C_, 2 - octave 4 - note A#, 1 - endchannel -; 3d60e - -Music_Pinballcatchem_red_Ch3: ; 3d60e - notetype $8, $23 - note __, 12 - note __, 6 - octave 2 - note D#, 6 -Music_Pinballcatchem_red_branch_3d615: ; 3d615 - note F_, 1 - note __, 7 - note G#, 4 - note F_, 1 - note __, 7 - note F#, 4 - note F_, 1 - note __, 7 - note G#, 4 - note F_, 1 - note __, 7 - note A_, 4 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F_, 2 - note __, 1 - note D_, 2 - note __, 1 - octave 1 - note A#, 2 - note __, 1 - octave 2 - note D_, 2 - note __, 1 - note D#, 2 - note __, 1 - octave 3 - note C_, 2 - note __, 1 - octave 2 - note B_, 2 - note __, 1 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G_, 2 - note __, 1 - note F_, 2 - note __, 1 - note A_, 2 - note __, 1 -Music_Pinballcatchem_red_branch_3d645: ; 3d645 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F_, 2 - note __, 1 - note D_, 2 - note __, 1 - octave 1 - note A#, 2 - note __, 1 - octave 2 - note D_, 2 - note __, 1 - note D#, 2 - note __, 1 - octave 3 - note C_, 2 - note __, 1 - octave 2 - note B_, 2 - note __, 1 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G_, 2 - note __, 1 - note D#, 2 - note __, 1 - note C_, 2 - note __, 1 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F_, 2 - note __, 1 - note D_, 2 - note __, 1 - octave 1 - note A#, 2 - note __, 1 - octave 2 - note D_, 2 - note __, 1 - note C_, 2 - note __, 1 - note D#, 2 - note __, 1 - note G_, 2 - note __, 1 - octave 3 - note C_, 2 - note __, 1 - octave 2 - note B_, 2 - note __, 1 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note G_, 2 - note __, 1 - octave 3 - note C_, 2 - note __, 1 - octave 2 - note B_, 2 - note __, 1 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note A_, 1 - note __, 2 - note F_, 4 - note C_, 2 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note F#, 2 - note __, 1 - note F_, 2 - octave 3 - note F_, 6 - note __, 1 - octave 2 - note D#, 2 - note __, 1 - octave 3 - note D#, 2 - note __, 1 - note D_, 2 - note __, 1 - note C#, 2 - note __, 1 - note C_, 2 - note __, 1 - octave 2 - note B_, 2 - note __, 1 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note A#, 1 - note F_, 1 - note D#, 1 - note D_, 2 - note __, 1 - note D#, 2 - note __, 1 - note F_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note G#, 1 - note __, 1 - octave 3 - note F_, 4 - octave 2 - note G_, 2 - note __, 1 - note D#, 2 - note __, 1 - note C_, 2 - note __, 1 - note F#, 2 - note __, 1 - note G_, 2 - note __, 1 - note E_, 2 - note __, 1 - note C_, 2 - note __, 1 - octave 1 - note A#, 2 - note __, 1 - octave 3 - note F_, 1 - note __, 1 - note F_, 1 - note __, 2 - note F_, 7 - note C_, 2 - note __, 1 - octave 2 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note F_, 2 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - note C_, 1 - note __, 2 - note C_, 7 - octave 2 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note A_, 2 - note __, 1 - loopchannel 2, Music_Pinballcatchem_red_branch_3d645 - note C_, 2 - note __, 10 - note C_, 1 - note __, 1 - note F_, 1 - note C_, 2 - note __, 1 - note C_, 2 - note __, 1 - octave 1 - note B_, 3 - note A#, 2 - note __, 7 - note A#, 1 - note __, 2 - octave 2 - note A#, 1 - note __, 1 - note F_, 1 - note __, 2 - note D_, 1 - note __, 2 - note F_, 3 - octave 1 - note B_, 1 - octave 2 - note C_, 2 - note __, 7 - note C_, 2 - note __, 1 - note F_, 1 - note __, 1 - octave 3 - note C_, 4 - octave 2 - note D#, 1 - note __, 1 - note A_, 4 - octave 1 - note A#, 2 - note __, 7 - note A#, 2 - note __, 1 - octave 2 - note G#, 1 - note F_, 1 - note D_, 1 - octave 1 - note B_, 2 - note __, 1 - note G#, 2 - note __, 1 - note B_, 2 - octave 2 - note D_, 1 - note D#, 3 - note D_, 1 - note __, 1 - note D#, 3 - note __, 1 - note G_, 2 - note __, 1 - note A_, 3 - note D#, 1 - note __, 1 - note C_, 1 - octave 3 - note C_, 3 - octave 2 - note A_, 1 - note __, 1 - note D#, 1 - octave 3 - note D_, 2 - note __, 1 - note C_, 2 - note __, 1 - octave 2 - note F_, 2 - note __, 1 - note G#, 2 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 2 - octave 3 - note F_, 1 - note __, 2 - octave 2 - note G#, 3 - note C#, 1 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note A#, 2 - note __, 1 - note G_, 2 - note __, 1 - note D#, 2 - note __, 1 - note D_, 2 - octave 3 - note D_, 1 - note C_, 2 - note __, 1 - octave 2 - note A_, 2 - note __, 1 - note F_, 3 - note D#, 2 - octave 3 - note D#, 1 - note D_, 2 - note __, 1 - octave 2 - note A#, 2 - note __, 1 - note G_, 2 - note __, 1 - octave 3 - note E_, 1 - note __, 1 - octave 2 - note G_, 1 - note __, 2 - note G_, 1 - octave 3 - note E_, 1 - note __, 1 - note E_, 1 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note E_, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 2 - note F_, 7 - note C_, 2 - note __, 1 - octave 2 - note A#, 2 - note __, 1 - note A_, 2 - note __, 1 - note F_, 2 - note __, 1 - octave 3 - note F_, 1 - note __, 1 - note F_, 1 - note __, 2 - note F_, 7 - octave 2 - note A_, 2 - note __, 1 - note G#, 2 - note __, 1 - note G_, 2 - note __, 1 - note A_, 2 - note __, 1 - loopchannel 0, Music_Pinballcatchem_red_branch_3d615 -; 3d7b3 - -Music_Pinballcatchem_red_Ch4: ; 3d7b3 - togglenoise $0 - notetype $8 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 -Music_Pinballcatchem_red_branch_3d7c3: ; 3d7c3 - note D#, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note F#, 4 - note D#, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note F#, 4 - note D#, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note F#, 4 - note D#, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note F#, 4 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 3 - note D_, 2 - note C_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 3 - note F#, 1 - note G_, 2 - note G_, 1 - note C_, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 3 - note F#, 1 - note __, 6 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D#, 2 - note F#, 3 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 1 - note G_, 2 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 1 - note D_, 2 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note F#, 3 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 3 - note F#, 1 - note G_, 2 - note G_, 1 - note C_, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 3 - note F#, 7 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D#, 2 - note F#, 3 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 1 - note G_, 2 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 1 - note D_, 2 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 3 - note D#, 2 - note D#, 1 - note C_, 3 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 3 - note G_, 4 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D_, 2 - note D_, 1 - note F#, 3 - note C_, 2 - note D_, 3 - note D_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D_, 2 - note D_, 4 - note D_, 2 - note F#, 4 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 3 - note G_, 4 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D_, 2 - note D_, 1 - note F#, 3 - note C_, 2 - note D_, 3 - note D_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D#, 3 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note G_, 2 - note G_, 1 - note D_, 3 - note G_, 2 - note G_, 1 - note D_, 2 - note D#, 1 - note G_, 2 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 2 - note D#, 1 - note D_, 2 - note F#, 1 - note G_, 2 - note G_, 1 - note F#, 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 3 - note D#, 2 - note D#, 1 - note C_, 3 - loopchannel 0, Music_Pinballcatchem_red_branch_3d7c3 -; 3d973 - - diff --git a/crysaudio/music/pinball/catchemblue.asm b/crysaudio/music/pinball/catchemblue.asm new file mode 100644 index 00000000..e5fbaaed --- /dev/null +++ b/crysaudio/music/pinball/catchemblue.asm @@ -0,0 +1,2131 @@ +Music_CatchEmBlue: + channel_count 4 + channel 1, Music_CatchEmBlue_Ch1 + channel 2, Music_CatchEmBlue_Ch2 + channel 3, Music_CatchEmBlue_Ch3 + channel 4, Music_CatchEmBlue_Ch4 + +Music_CatchEmBlue_Ch1: + tempo 160 + volume 7, 7 + vibrato 9, 3, 4 + pitch_offset 1 + note_type 12, 11, 3 + rest 16 +Music_CatchEmBlue_branch_413aa: + note_type 8, 10, 2 + duty_cycle 3 + octave 4 + note C#, 2 + rest 12 + rest 10 + octave 3 + note A#, 2 + rest 12 + note A#, 3 + rest 7 + octave 4 + note C#, 2 + rest 1 + volume_envelope 8, 1 + octave 2 + note A#, 2 + octave 3 + note C#, 1 + note A#, 2 + octave 4 + note C#, 1 + octave 3 + note C#, 2 + volume_envelope 10, 2 + note A#, 2 + rest 2 + octave 4 + note F_, 3 + rest 6 + note C#, 2 + rest 12 + note D#, 3 + rest 7 + volume_envelope 8, 1 + duty_cycle 2 + octave 3 + note A#, 2 + octave 4 + note F_, 1 + note A#, 2 + note F_, 3 + note A_, 1 + note A#, 2 + note F_, 1 + rest 3 + note G#, 5 + note G_, 1 + note G#, 2 + note D#, 1 + rest 3 + note F#, 5 + note F_, 1 + note F#, 2 + note F_, 4 + note G#, 3 + duty_cycle 3 + octave 3 + note A#, 2 + octave 4 + note C_, 3 + duty_cycle 2 + note D#, 1 + note A#, 2 + note F_, 1 + note A#, 3 + note F_, 2 + note A_, 1 + note A#, 2 + note F_, 4 + note G#, 5 + note G_, 1 + note G#, 2 + note F_, 1 + volume_envelope 10, 1 + duty_cycle 3 + note C#, 3 + note C#, 3 + note C_, 2 + octave 3 + note A#, 4 + note G#, 2 + note G_, 1 + note F#, 2 + note A_, 1 + rest 2 + volume_envelope 10, 3 + note A_, 3 + volume_envelope 8, 1 + duty_cycle 2 + octave 5 + note E_, 1 + note F_, 2 + octave 4 + note A#, 3 + note F_, 3 + note A_, 1 + note A#, 2 + note F_, 4 + note G#, 3 + note G_, 2 + volume_envelope 8, 3 + note G#, 3 + volume_envelope 8, 1 + octave 5 + note C_, 1 + note C#, 2 + octave 4 + note A#, 3 + note F_, 3 + note F_, 1 + note F#, 2 + note F_, 1 + rest 3 + octave 5 + note C_, 2 + octave 4 + note F_, 1 + note B_, 2 + volume_envelope 8, 3 + octave 5 + note C_, 3 + volume_envelope 8, 1 + octave 4 + note F_, 1 + rest 6 + volume_envelope 10, 1 + duty_cycle 3 + note C#, 3 + note C_, 3 + octave 3 + note A#, 2 + volume_envelope 10, 2 + note F_, 2 + rest 5 + volume_envelope 10, 1 + note F#, 2 + note F#, 1 + note A#, 3 + volume_envelope 10, 3 + note F#, 3 + rest 12 + rest 6 + volume_envelope 8, 1 + duty_cycle 2 + octave 4 + note D_, 2 + note A#, 3 + octave 5 + note C_, 1 + note D_, 3 + note F_, 1 + note D_, 1 + note F_, 1 + volume_envelope 7, 3 + note A#, 3 + rest 9 + rest 12 + volume_envelope 7, 2 + note D_, 2 + rest 4 + volume_envelope 7, 1 + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + rest 12 + rest 2 + volume_envelope 8, 1 + note C_, 1 + volume_envelope 9, 1 + note C_, 3 + volume_envelope 8, 1 + note C_, 2 + volume_envelope 9, 1 + note C_, 4 + rest 12 + rest 6 + volume_envelope 7, 1 + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + note_type 12, 11, 3 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 8, 10, 2 + duty_cycle 3 + rest 12 + octave 4 + note F_, 2 + rest 10 + sound_call Music_CatchEmBlue_branch_4158d + note G#, 2 + note F_, 1 + octave 4 + note D_, 2 + octave 3 + note F_, 1 + note G#, 2 + note F_, 1 + note G#, 2 + note F_, 1 + note G_, 2 + octave 5 + note F#, 1 + note G_, 2 + octave 3 + note F_, 1 + note G_, 2 + octave 5 + note G_, 1 + octave 3 + note G_, 2 + octave 5 + note G_, 1 + octave 3 + note D#, 2 + note G_, 1 + note A#, 2 + note G_, 1 + note D#, 2 + note A#, 1 + note D#, 2 + note A#, 1 + note E_, 2 + note G_, 1 + note A#, 2 + note G_, 1 + note E_, 2 + note A#, 1 + note G_, 2 + note A#, 1 + rest 12 + rest 2 + volume_envelope 10, 4 + duty_cycle 3 + note A#, 3 + rest 3 + note A_, 4 + duty_cycle 2 + sound_call Music_CatchEmBlue_branch_4158d + note G#, 2 + note D_, 1 + note F_, 2 + note D_, 1 + note F_, 2 + note D_, 1 + note F_, 2 + volume_envelope 10, 2 + duty_cycle 3 + note D#, 3 + rest 4 + volume_envelope 10, 1 + note D#, 2 + note C_, 2 + note D#, 2 + volume_envelope 10, 2 + note D#, 2 + rest 4 + note G_, 2 + rest 4 + volume_envelope 10, 1 + note F_, 2 + note C_, 3 + octave 2 + note B_, 1 + octave 3 + note C_, 2 + note C_, 1 + octave 4 + note C_, 2 + volume_envelope 9, 7 + note D#, 12 + rest 1 + volume_envelope 9, 4 + note D_, 6 + rest 6 + note C#, 6 + rest 6 + volume_envelope 10, 1 + note C_, 6 + note C_, 2 + note C_, 1 + note C#, 2 + octave 3 + note B_, 1 + volume_envelope 10, 4 + octave 4 + note C_, 6 + rest 12 + rest 3 + volume_envelope 10, 1 + octave 3 + note B_, 2 + octave 4 + note C_, 1 + volume_envelope 10, 2 + note C#, 2 + rest 1 + volume_envelope 10, 1 + note C#, 3 + note C#, 3 + note C#, 5 + volume_envelope 10, 3 + octave 3 + note D#, 3 + rest 3 + note F#, 3 + octave 4 + note D_, 1 + volume_envelope 9, 7 + note D#, 12 + rest 6 + volume_envelope 8, 1 + octave 2 + note G#, 2 + note G#, 2 + note G#, 2 + volume_envelope 10, 1 + octave 3 + note F#, 3 + note C#, 3 + note F#, 2 + note E_, 1 + volume_envelope 8, 2 + note F_, 3 + rest 12 + volume_envelope 10, 1 + note D#, 3 + note D#, 3 + note G#, 2 + note D_, 1 + volume_envelope 10, 3 + note D#, 3 + rest 9 + volume_envelope 8, 1 + duty_cycle 2 + note C#, 3 + note F#, 3 + note C#, 3 + note F#, 3 + note C#, 1 + note F#, 1 + note C#, 1 + note G#, 6 + note G#, 3 + octave 4 + note C_, 1 + octave 3 + note G#, 1 + octave 4 + note C_, 1 + note C_, 1 + note D#, 1 + note C_, 1 + note D#, 1 + volume_envelope 4, 1 + note C_, 1 + note D#, 1 + volume_envelope 10, 1 + note C_, 1 + volume_envelope 5, 1 + note D#, 1 + volume_envelope 10, 1 + note C_, 1 + note D#, 1 + volume_envelope 6, 1 + note C_, 1 + note D#, 1 + volume_envelope 10, 1 + octave 3 + note G#, 1 + volume_envelope 7, 1 + octave 4 + note D#, 1 + octave 3 + note G#, 1 + octave 4 + note D#, 1 + volume_envelope 10, 1 + octave 3 + note G#, 1 + volume_envelope 8, 1 + octave 4 + note D#, 1 + octave 3 + note G#, 1 + volume_envelope 9, 1 + octave 4 + note G#, 1 + octave 3 + note G#, 1 + volume_envelope 10, 1 + octave 4 + note G#, 1 + octave 3 + note G#, 1 + octave 4 + note G#, 1 + sound_loop 0, Music_CatchEmBlue_branch_413aa + +Music_CatchEmBlue_branch_4158d: + volume_envelope 7, 1 + duty_cycle 2 + octave 2 + note A#, 2 + octave 3 + note F_, 1 + note A#, 2 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 1 + note A#, 2 + note F_, 1 + octave 2 + note A_, 2 + octave 3 + note F_, 1 + note A_, 2 + note F_, 1 + octave 2 + note A_, 2 + octave 3 + note F_, 1 + note A_, 2 + note F_, 1 + sound_ret + +Music_CatchEmBlue_Ch2: + vibrato 9, 3, 4 + note_type 12, 11, 3 + rest 16 +Music_CatchEmBlue_branch_415b1: + note_type 8, 11, 2 + duty_cycle 3 + sound_call Music_CatchEmBlue_branch_418d2 + volume_envelope 11, 2 + note G_, 2 + rest 1 + volume_envelope 11, 1 + octave 3 + note G_, 2 + note A#, 1 + octave 4 + note C#, 2 + note D#, 3 + volume_envelope 11, 2 + note F_, 2 + rest 1 + note F#, 3 + rest 1 + volume_envelope 11, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note D#, 2 + note C_, 1 + sound_call Music_CatchEmBlue_branch_418d2 + volume_envelope 11, 2 + note A#, 2 + rest 1 + volume_envelope 11, 1 + octave 3 + note G_, 2 + note A#, 1 + octave 4 + note C#, 2 + note D#, 1 + note F_, 2 + note G_, 3 + volume_envelope 11, 2 + note G#, 3 + rest 3 + volume_envelope 11, 1 + octave 3 + note A#, 1 + note A#, 2 + note A#, 1 + sound_call Music_CatchEmBlue_branch_41900 + note A#, 3 + octave 4 + note C#, 3 + note C#, 2 + note C#, 3 + volume_envelope 11, 4 + note C_, 7 + volume_envelope 11, 1 + note F#, 2 + note G#, 3 + note C_, 1 + sound_call Music_CatchEmBlue_branch_41900 + octave 4 + note F_, 3 + note F_, 3 + note D#, 2 + note C#, 4 + note C_, 2 + octave 3 + note B_, 1 + note A#, 2 + octave 4 + note F#, 3 + volume_envelope 11, 3 + note G#, 4 + sound_call Music_CatchEmBlue_branch_41900 + note A#, 3 + octave 4 + note C#, 3 + note C#, 2 + note C#, 3 + volume_envelope 11, 4 + note C_, 7 + rest 3 + volume_envelope 11, 1 + octave 3 + note A#, 2 + note A#, 1 + volume_envelope 11, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 4 + octave 4 + note F_, 2 + volume_envelope 9, 1 + octave 3 + note A#, 1 + volume_envelope 11, 2 + octave 4 + note D#, 2 + volume_envelope 8, 1 + octave 3 + note F_, 1 + volume_envelope 11, 1 + octave 4 + note C#, 2 + volume_envelope 11, 2 + octave 3 + note A#, 2 + rest 5 + volume_envelope 11, 1 + note A#, 2 + note A#, 1 + octave 4 + note C#, 3 + volume_envelope 11, 3 + octave 3 + note A#, 3 + rest 6 + volume_envelope 11, 1 + octave 4 + note A#, 2 + octave 3 + note A#, 3 + note A#, 1 + octave 4 + note F_, 2 + volume_envelope 11, 2 + note D#, 3 + rest 1 + volume_envelope 11, 1 + note F_, 2 + note G_, 1 + note F_, 2 + note G_, 1 + note F_, 2 + note G_, 1 + note F_, 2 + note G_, 1 + note F_, 3 + rest 6 + volume_envelope 9, 1 + duty_cycle 2 + octave 6 + note D_, 1 + octave 5 + note A#, 1 + note G_, 1 + volume_envelope 11, 2 + duty_cycle 3 + octave 4 + note D_, 2 + volume_envelope 9, 1 + octave 3 + note G_, 1 + note A#, 2 + octave 4 + note D_, 1 + volume_envelope 11, 1 + note D_, 2 + note D_, 1 + note D_, 2 + volume_envelope 11, 2 + note D_, 2 + rest 1 + volume_envelope 9, 1 + duty_cycle 2 + note G_, 1 + note A#, 2 + octave 5 + note D_, 1 + volume_envelope 11, 1 + duty_cycle 3 + octave 3 + note A#, 2 + note A#, 1 + note A#, 2 + octave 4 + note D_, 1 + note C_, 3 + volume_envelope 11, 2 + note F_, 3 + rest 8 + volume_envelope 9, 1 + duty_cycle 2 + octave 5 + note E_, 1 + note F_, 2 + octave 4 + note F_, 1 + octave 5 + note E_, 2 + note F_, 3 + octave 4 + note F_, 1 + volume_envelope 11, 1 + duty_cycle 3 + note D_, 2 + note D_, 1 + volume_envelope 11, 2 + note D_, 3 + volume_envelope 11, 1 + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + volume_envelope 9, 1 + duty_cycle 2 + octave 5 + note D_, 2 + note D_, 1 + note D_, 3 + volume_envelope 11, 1 + duty_cycle 3 + octave 3 + note A#, 2 + note A#, 1 + note A#, 2 + octave 4 + note D_, 1 + volume_envelope 11, 2 + note C_, 3 + volume_envelope 9, 1 + duty_cycle 2 + octave 3 + note A_, 3 + note F_, 2 + note A_, 1 + octave 4 + note C_, 2 + note F_, 1 + octave 6 + note C_, 1 + octave 5 + note A_, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 4 + note A_, 1 + note F_, 1 + note D#, 1 + volume_envelope 11, 2 + duty_cycle 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + rest 1 + octave 3 + note A#, 2 + rest 1 + note G_, 2 + rest 1 + note A#, 2 + volume_envelope 11, 1 + octave 4 + note C_, 3 + note D_, 4 + volume_envelope 11, 2 + octave 3 + note A#, 2 + rest 1 + volume_envelope 9, 1 + duty_cycle 2 + octave 4 + note A#, 2 + note A_, 2 + note G#, 1 + octave 3 + note A_, 1 + volume_envelope 11, 2 + duty_cycle 3 + note A#, 2 + rest 1 + note A#, 2 + rest 1 + note A#, 2 + volume_envelope 11, 1 + octave 4 + note F_, 3 + volume_envelope 11, 2 + note C#, 1 + note D_, 2 + volume_envelope 9, 1 + duty_cycle 2 + octave 3 + note A#, 1 + octave 4 + note F_, 1 + note A#, 1 + octave 5 + note F_, 1 + note A#, 1 + note F_, 1 + octave 4 + note A#, 1 + volume_envelope 11, 2 + duty_cycle 3 + octave 3 + note A#, 2 + octave 4 + note D_, 1 + note D#, 2 + note D_, 2 + rest 1 + note C#, 1 + note C_, 2 + rest 1 + octave 3 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note A#, 2 + rest 1 + octave 4 + note C_, 2 + rest 1 + octave 3 + note A_, 2 + note A#, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 1 + note A#, 2 + rest 1 + note A_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 2 + rest 4 + note D_, 2 + rest 1 + note D#, 2 + rest 1 + note F_, 2 + note A_, 1 + note A#, 2 + rest 1 + volume_envelope 11, 1 + note A#, 2 + octave 5 + note C_, 3 + octave 4 + note A#, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 2 + note A_, 3 + note G_, 3 + volume_envelope 11, 2 + note F_, 2 + rest 1 + volume_envelope 11, 1 + note G_, 3 + note F_, 3 + note F_, 2 + note D_, 3 + volume_envelope 11, 2 + octave 3 + note A#, 3 + volume_envelope 9, 1 + duty_cycle 2 + octave 5 + note A_, 1 + note A#, 2 + octave 4 + note A#, 1 + volume_envelope 11, 1 + duty_cycle 3 + octave 3 + note A#, 2 + volume_envelope 9, 1 + duty_cycle 2 + octave 5 + note A#, 1 + volume_envelope 11, 1 + duty_cycle 3 + octave 4 + note C_, 2 + volume_envelope 9, 1 + duty_cycle 2 + octave 5 + note A#, 1 + volume_envelope 11, 1 + duty_cycle 3 + octave 4 + note D_, 3 + note D_, 3 + note D_, 2 + note D#, 3 + note F_, 2 + rest 2 + note F_, 3 + note D#, 3 + note D_, 3 + volume_envelope 11, 2 + note D_, 1 + volume_envelope 9, 1 + note D#, 1 + volume_envelope 11, 1 + note C_, 2 + rest 2 + volume_envelope 9, 1 + duty_cycle 2 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + note D#, 1 + note F_, 1 + note C_, 1 + rest 2 + volume_envelope 11, 3 + duty_cycle 3 + octave 4 + note A#, 3 + volume_envelope 9, 1 + duty_cycle 2 + octave 3 + note E_, 1 + volume_envelope 11, 1 + note F_, 2 + volume_envelope 11, 3 + duty_cycle 3 + octave 5 + note C_, 4 + volume_envelope 11, 2 + duty_cycle 3 + rest 2 + volume_envelope 11, 2 + octave 4 + note A_, 1 + note A#, 2 + rest 1 + volume_envelope 11, 1 + note A#, 2 + octave 5 + note C_, 3 + octave 4 + note A#, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 2 + note A_, 2 + note A#, 1 + note G_, 3 + note F_, 3 + note G_, 2 + volume_envelope 9, 1 + note D_, 1 + volume_envelope 11, 1 + note F_, 2 + volume_envelope 9, 1 + octave 3 + note A#, 1 + volume_envelope 11, 1 + octave 4 + note F_, 2 + note D_, 3 + volume_envelope 11, 2 + octave 3 + note A#, 3 + rest 3 + volume_envelope 9, 1 + note A_, 1 + volume_envelope 11, 1 + note A#, 2 + octave 4 + note D_, 2 + note C_, 2 + volume_envelope 11, 2 + octave 3 + note A#, 2 + rest 4 + octave 4 + note D_, 2 + rest 4 + volume_envelope 11, 1 + note C_, 2 + octave 3 + note F_, 3 + note F_, 1 + note F_, 2 + note F_, 1 + octave 4 + note F_, 2 + note_type 12, 10, 8 + note A#, 9 + volume_envelope 10, 3 + note A#, 3 + note_type 8, 11, 3 + rest 1 + rest 5 + note A_, 1 + volume_envelope 11, 3 + note A#, 6 + rest 6 + volume_envelope 11, 1 + note G#, 2 + octave 3 + note G#, 3 + note G#, 1 + octave 4 + note G#, 2 + note G#, 1 + note A#, 2 + note G_, 1 + volume_envelope 11, 3 + note G#, 6 + volume_envelope 9, 1 + duty_cycle 2 + note C_, 2 + note D#, 2 + note C_, 2 + octave 5 + note C_, 1 + octave 4 + note G#, 1 + note D#, 1 + note C_, 1 + octave 3 + note G#, 1 + note D#, 1 + note C_, 1 + octave 2 + note G#, 1 + note D#, 1 + volume_envelope 11, 1 + duty_cycle 3 + octave 4 + note G#, 1 + rest 1 + note A_, 1 + volume_envelope 11, 2 + note A#, 2 + rest 1 + volume_envelope 11, 1 + note A#, 3 + note A#, 3 + note A#, 3 + note C_, 2 + volume_envelope 11, 4 + note G#, 3 + volume_envelope 11, 1 + note C_, 1 + note C_, 2 + volume_envelope 11, 4 + note A#, 3 + volume_envelope 11, 1 + note G_, 1 + volume_envelope 11, 6 + note G#, 12 + volume_envelope 9, 1 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 4 + volume_envelope 11, 1 + octave 4 + note G_, 1 + note G#, 3 + note A#, 3 + note G#, 3 + note A#, 2 + volume_envelope 11, 2 + note G_, 1 + note G#, 3 + volume_envelope 9, 1 + duty_cycle 2 + octave 5 + note G#, 1 + note D#, 1 + note C_, 1 + octave 4 + note G#, 1 + note D#, 1 + note C_, 1 + note D#, 1 + note F_, 1 + volume_envelope 11, 1 + duty_cycle 3 + note F#, 1 + note G_, 3 + note G#, 3 + note G#, 3 + note F_, 2 + note G_, 1 + volume_envelope 11, 2 + note G#, 3 + volume_envelope 9, 1 + duty_cycle 2 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + volume_envelope 11, 1 + duty_cycle 3 + note G#, 3 + volume_envelope 11, 1 + duty_cycle 3 + note A#, 3 + note G#, 3 + note A#, 3 + note G#, 1 + note A#, 1 + note G#, 1 + volume_envelope 9, 1 + duty_cycle 2 + note D#, 1 + note C_, 1 + note D#, 1 + note G#, 1 + note D#, 1 + volume_envelope 9, 2 + duty_cycle 3 + octave 5 + note C_, 1 + volume_envelope 11, 2 + note C#, 2 + rest 1 + note_type 12, 11, 8 + note C_, 2 + volume_envelope 11, 8 + note C_, 12 + volume_envelope 11, 4 + note C_, 4 + sound_loop 0, Music_CatchEmBlue_branch_415b1 + +Music_CatchEmBlue_branch_418d2: + volume_envelope 11, 2 + octave 4 + note A#, 2 + rest 1 + octave 3 + note A#, 2 + note_type 8, 9, 1 + note F_, 1 + note_type 8, 11, 1 + octave 4 + note C#, 2 + note D#, 1 + note_type 8, 9, 1 + octave 3 + note F_, 2 + note_type 8, 11, 2 + octave 4 + note F_, 2 + rest 1 + note_type 8, 9, 1 + note D#, 1 + note_type 8, 11, 2 + note G#, 3 + note_type 8, 9, 1 + octave 3 + note A#, 2 + octave 4 + note C#, 1 + note F_, 2 + note G#, 1 + sound_ret + +Music_CatchEmBlue_branch_41900: + volume_envelope 11, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + note_type 8, 10, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + note_type 8, 9, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + note_type 8, 8, 1 + octave 4 + note C#, 2 + note_type 8, 9, 1 + octave 3 + note A#, 1 + note_type 8, 10, 1 + note A#, 2 + note_type 8, 11, 1 + note A#, 1 + sound_ret + +Music_CatchEmBlue_Ch3: + note_type 12, 11, 3 + rest 16 +Music_CatchEmBlue_branch_41937: + note_type 8, 2, 2 + octave 1 + note A#, 2 + rest 6 + note A#, 1 + rest 2 + note G#, 2 + rest 4 + note G#, 1 + rest 2 + note G#, 1 + rest 2 + note F#, 1 + note G_, 2 + rest 12 + note F#, 3 + rest 1 + note G#, 2 + rest 3 + note A_, 1 + note A#, 2 + rest 3 + note A#, 1 + octave 2 + note A#, 1 + rest 1 + octave 1 + note A#, 1 + rest 2 + note G#, 2 + rest 4 + note G#, 1 + octave 2 + note G#, 1 + rest 1 + octave 1 + note G#, 1 + rest 2 + note F#, 1 + note G_, 2 + rest 3 + note G_, 1 + octave 2 + note G_, 1 + rest 1 + octave 1 + note G_, 1 + rest 2 + note G_, 1 + rest 2 + note F_, 3 + rest 6 + note A_, 1 + sound_call Music_CatchEmBlue_branch_41b46 + note F#, 2 + octave 2 + note F#, 1 + rest 2 + octave 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 2 + rest 1 + octave 2 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F#, 2 + rest 1 + note F_, 2 + note A_, 1 + sound_call Music_CatchEmBlue_branch_41b5b + sound_call Music_CatchEmBlue_branch_41b46 + octave 2 + note F#, 1 + note C#, 1 + octave 1 + note A#, 1 + note F#, 1 + rest 2 + note F#, 1 + rest 1 + octave 2 + note F#, 1 + rest 2 + octave 1 + note F#, 1 + note F_, 1 + rest 1 + octave 2 + note F_, 1 + rest 2 + octave 1 + note F_, 1 + note F_, 1 + rest 1 + octave 2 + note F_, 3 + note A_, 1 + sound_call Music_CatchEmBlue_branch_41b5b + octave 1 + note A#, 2 + rest 3 + note A#, 1 + octave 2 + note F_, 1 + rest 1 + octave 1 + note A#, 1 + rest 2 + note A#, 1 + octave 2 + note A#, 3 + rest 8 + volume_envelope 3, 2 + octave 1 + note D_, 1 +Music_CatchEmBlue_branch_419ba: + volume_envelope 2, 2 + note D#, 2 + rest 3 + note D#, 1 + note G_, 1 + rest 1 + note F#, 1 + note G_, 1 + rest 2 + note A#, 1 + rest 1 + note A_, 1 + note A#, 1 + rest 1 + octave 2 + note D#, 1 + rest 2 + octave 1 + note A#, 1 + rest 2 + note G_, 1 + note F_, 2 + rest 3 + note F_, 1 + note A_, 1 + rest 1 + note G#, 1 + note A_, 1 + rest 2 + octave 2 + note C_, 1 + rest 1 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + rest 1 + note F_, 1 + rest 2 + note C_, 1 + rest 2 + octave 1 + note A_, 1 + sound_loop 2, Music_CatchEmBlue_branch_419ba + note G_, 2 + octave 2 + note D_, 1 + note G_, 1 + rest 2 + octave 1 + note G_, 1 + rest 1 + octave 2 + note G_, 1 + rest 2 + octave 1 + note F_, 1 + note F#, 2 + note F#, 1 + octave 2 + note F#, 1 + rest 2 + note A#, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + octave 1 + note F_, 2 + octave 2 + note D_, 1 + note F_, 1 + rest 2 + octave 1 + note F_, 1 + rest 1 + octave 2 + note F_, 1 + rest 2 + octave 1 + note A#, 1 + note E_, 2 + note A#, 1 + octave 2 + note D_, 1 + rest 1 + note G_, 1 + note D_, 1 + rest 1 + octave 1 + note A#, 1 + rest 2 + note B_, 1 + octave 2 + note C_, 2 + rest 1 + note C_, 2 + rest 1 + note D_, 2 + rest 1 + note D_, 2 + rest 1 + note D#, 2 + rest 1 + note D#, 2 + rest 1 + note E_, 2 + rest 1 + note E_, 2 + rest 1 + note F_, 2 + octave 3 + note D#, 1 + rest 2 + octave 2 + note F_, 1 + note F_, 1 + rest 1 + octave 3 + note D#, 2 + note C_, 2 + octave 2 + note A_, 2 + rest 9 + octave 1 + note A_, 1 + sound_call Music_CatchEmBlue_branch_41b7e + note G#, 2 + rest 1 + note F_, 2 + rest 1 + note D_, 2 + rest 1 + octave 1 + note A#, 2 + note F#, 1 + note G_, 1 + rest 1 + note G_, 1 + rest 2 + note A#, 1 + octave 2 + note D#, 2 + rest 1 + note G_, 2 + rest 1 + octave 3 + note D#, 1 + note D_, 1 + octave 2 + note A#, 1 + note G_, 2 + rest 1 + note D#, 2 + note A#, 1 + rest 2 + note D#, 1 + note E_, 2 + rest 1 + note E_, 2 + rest 1 + note G_, 2 + rest 1 + note A#, 2 + rest 1 + octave 3 + note C_, 2 + octave 2 + note F_, 1 + rest 2 + note A#, 1 + note F_, 1 + rest 1 + note F_, 1 + octave 3 + note C_, 1 + rest 1 + octave 2 + note F_, 1 + rest 2 + note E_, 3 + rest 3 + note F_, 3 + octave 1 + note A_, 1 + sound_call Music_CatchEmBlue_branch_41b7e + note G#, 2 + rest 1 + note F_, 2 + rest 1 + note D_, 2 + rest 1 + octave 1 + note A#, 2 + note G_, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 2 + octave 2 + note C_, 1 + note D#, 1 + rest 1 + note G_, 1 + rest 1 + note G#, 1 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F#, 2 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + note F_, 2 + octave 1 + note F_, 1 + rest 2 + note F_, 1 + note F_, 1 + rest 1 + octave 2 + note C_, 1 + note D#, 1 + rest 1 + note D_, 1 + volume_envelope 3, 2 + octave 3 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + volume_envelope 2, 2 + note D_, 1 + note F_, 1 + note A#, 1 + octave 4 + note D_, 1 + note F_, 1 + rest 1 + octave 1 + note F#, 1 + rest 1 + note F#, 1 + note A#, 2 + rest 1 + octave 2 + note C#, 2 + rest 1 + note F_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F#, 2 + rest 1 + note F_, 2 + rest 1 + note D#, 1 + rest 1 + octave 1 + note G#, 1 + rest 2 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + note A#, 1 + rest 1 + note G#, 1 + note G#, 2 + rest 1 + note A#, 1 + rest 1 + note G#, 1 + rest 6 + note F#, 1 + rest 1 + note F#, 1 + note A#, 2 + rest 1 + octave 2 + note C#, 2 + rest 1 + note F_, 2 + rest 3 + volume_envelope 3, 2 + octave 3 + note C_, 3 + rest 3 + note C#, 3 + rest 1 + volume_envelope 2, 2 + octave 2 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 2 + rest 1 + note E_, 2 + rest 1 + note D#, 2 + rest 1 + note D_, 2 + rest 1 + note C#, 2 + rest 1 + note C_, 2 + rest 1 + note D#, 2 + rest 1 + octave 1 + note F#, 1 + rest 2 + note F#, 1 + rest 2 + note A#, 1 + rest 1 + octave 2 + note C_, 1 + note C#, 3 + rest 12 + octave 1 + note G#, 1 + rest 2 + note G#, 1 + rest 2 + octave 2 + note C_, 1 + rest 1 + note D_, 1 + note D#, 3 + rest 9 + octave 1 + note G_, 3 + note F#, 2 + octave 2 + note F#, 1 + note F_, 2 + rest 1 + note E_, 2 + rest 1 + note D#, 2 + rest 1 + note D_, 2 + rest 1 + note C#, 2 + rest 1 + note G#, 2 + rest 1 + note_type 12, 2, 2 + octave 3 + note D#, 2 + note D#, 16 + sound_loop 0, Music_CatchEmBlue_branch_41937 + +Music_CatchEmBlue_branch_41b46: + note A#, 2 + rest 1 + octave 2 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + octave 1 + note A#, 2 + rest 1 + note G#, 2 + rest 1 + octave 2 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + octave 1 + note G#, 2 + rest 1 + sound_ret + +Music_CatchEmBlue_branch_41b5b: + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F#, 2 + rest 1 + note F_, 2 + rest 1 + note E_, 2 + rest 1 + note F_, 2 + rest 1 + octave 1 + note F#, 2 + rest 1 + note F#, 2 + rest 1 + note G_, 2 + rest 1 + note G_, 2 + rest 1 + octave 2 + note G#, 2 + rest 1 + note G_, 2 + octave 3 + note D#, 1 + rest 2 + octave 2 + note F_, 4 + sound_ret + +Music_CatchEmBlue_branch_41b7e: + note A#, 2 + rest 3 + note A#, 1 + octave 2 + note F_, 1 + rest 1 + note D_, 1 + rest 2 + octave 1 + note A#, 1 + note A_, 1 + rest 1 + note A_, 1 + octave 2 + note D_, 2 + rest 1 + note F_, 1 + rest 2 + note A_, 2 + note G_, 1 + sound_ret + +Music_CatchEmBlue_Ch4: + toggle_noise 0 + drum_speed 8 + drum_note 4, 3 + drum_note 3, 3 + drum_note 4, 2 + drum_note 3, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 3, 3 + drum_note 2, 2 + drum_note 2, 1 + drum_note 3, 2 + drum_note 3, 1 +Music_CatchEmBlue_branch_41ba3: + drum_note 3, 3 + drum_note 4, 2 + drum_note 4, 1 + drum_note 4, 2 + drum_note 4, 3 + drum_note 2, 1 + drum_note 3, 3 + drum_note 3, 3 + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 4, 1 + drum_note 3, 5 + drum_note 3, 3 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 8, 1 + drum_note 7, 2 + drum_note 3, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 4, 2 + drum_note 3, 1 + drum_note 1, 5 + drum_note 3, 1 + drum_note 3, 2 + drum_note 4, 1 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 4, 1 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 7, 3 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 1, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 3, 1 + drum_note 3, 2 + drum_note 4, 1 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 7, 3 + sound_call Music_CatchEmBlue_branch_41cfe + drum_note 3, 2 + drum_note 4, 3 + drum_note 4, 1 + drum_note 4, 2 + drum_note 12, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 2 + drum_note 4, 3 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 1 + drum_note 12, 12 + sound_call Music_CatchEmBlue_branch_41d05 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 1 + sound_call Music_CatchEmBlue_branch_41d05 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 1 + sound_call Music_CatchEmBlue_branch_41d12 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_call Music_CatchEmBlue_branch_41d12 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 +Music_CatchEmBlue_branch_41c5e: + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + sound_loop 4, Music_CatchEmBlue_branch_41c5e + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 6 + sound_call Music_CatchEmBlue_branch_41d1c + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 4, 1 + sound_call Music_CatchEmBlue_branch_41d1c + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 3 + drum_note 4, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 4, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_call Music_CatchEmBlue_branch_41d23 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + sound_call Music_CatchEmBlue_branch_41d23 + drum_note 3, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + sound_call Music_CatchEmBlue_branch_41d23 + drum_note 3, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 4, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 1 +Music_CatchEmBlue_branch_41cba: + sound_call Music_CatchEmBlue_branch_41d30 + sound_loop 4, Music_CatchEmBlue_branch_41cba + sound_call Music_CatchEmBlue_branch_41d30 + drum_note 4, 2 + drum_note 3, 3 + drum_note 3, 1 + drum_note 4, 2 + drum_note 3, 3 + drum_note 3, 1 + sound_call Music_CatchEmBlue_branch_41d30 + sound_call Music_CatchEmBlue_branch_41d30 + sound_call Music_CatchEmBlue_branch_41d30 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 3 + drum_note 3, 3 + drum_note 4, 2 + drum_note 3, 1 + sound_call Music_CatchEmBlue_branch_41d30 + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 3, 1 + sound_call Music_CatchEmBlue_branch_41d30 + sound_call Music_CatchEmBlue_branch_41d30 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 2, 1 + drum_note 3, 3 + drum_note 3, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 2 + drum_note 3, 1 + sound_loop 0, Music_CatchEmBlue_branch_41ba3 + +Music_CatchEmBlue_branch_41cfe: + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + sound_ret + +Music_CatchEmBlue_branch_41d05: + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 4, 1 + sound_ret + +Music_CatchEmBlue_branch_41d12: + drum_note 4, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 3, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + sound_ret + +Music_CatchEmBlue_branch_41d1c: + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + sound_ret + +Music_CatchEmBlue_branch_41d23: + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 2 + drum_note 8, 1 + drum_note 4, 2 + drum_note 8, 1 + sound_ret + +Music_CatchEmBlue_branch_41d30: + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + sound_ret diff --git a/crysaudio/music/pinball/catchemred.asm b/crysaudio/music/pinball/catchemred.asm new file mode 100644 index 00000000..9ee67d9d --- /dev/null +++ b/crysaudio/music/pinball/catchemred.asm @@ -0,0 +1,1508 @@ +Music_CatchEmRed: + channel_count 4 + channel 1, Music_CatchEmRed_Ch1 + channel 2, Music_CatchEmRed_Ch2 + channel 3, Music_CatchEmRed_Ch3 + channel 4, Music_CatchEmRed_Ch4 + +Music_CatchEmRed_Ch1: + tempo 160 + volume 7, 7 + duty_cycle 3 + vibrato 18, 3, 4 + pitch_offset 1 + note_type 8, 10, 2 + rest 12 + rest 12 +Music_CatchEmRed_branch_3d30b: + octave 3 + note D#, 8 + note F#, 4 + note D#, 8 + note D#, 4 + note D#, 8 + note F#, 4 + note D#, 8 + note D#, 4 + rest 12 + rest 12 + rest 12 + rest 12 + sound_call Music_CatchEmRed_branch_3d360 + volume_envelope 9, 2 + octave 4 + note A_, 2 + note A_, 3 + note A_, 16 + rest 3 + sound_call Music_CatchEmRed_branch_3d360 + volume_envelope 9, 2 + octave 4 + note A_, 2 + note A_, 3 + note A_, 16 + rest 3 + volume_envelope 10, 2 + rest 12 + rest 12 + rest 12 + octave 4 + note G_, 2 + note F_, 3 + note D#, 3 + note D_, 12 + rest 6 + note D#, 6 + octave 5 + note C_, 16 + rest 12 + volume_envelope 7, 2 + octave 6 + note D_, 2 + note C_, 1 + octave 5 + note A#, 6 + octave 6 + note D_, 3 + note C_, 6 + octave 5 + note A#, 16 + volume_envelope 10, 2 + rest 2 + note D_, 2 + note D_, 3 + note C_, 3 + note D_, 4 + rest 12 + rest 12 + rest 12 + rest 12 + octave 4 + note A#, 2 + note A#, 3 + note A#, 16 + rest 3 + octave 5 + note C_, 2 + note C_, 3 + note C_, 16 + rest 3 + sound_loop 0, Music_CatchEmRed_branch_3d30b + +Music_CatchEmRed_branch_3d360: + volume_envelope 5, 2 + rest 3 + octave 3 + note F_, 5 + note F_, 3 + note F_, 13 + rest 3 + note G_, 5 + note G_, 4 + note G_, 5 + note A_, 7 + volume_envelope 10, 2 + rest 12 + rest 12 + rest 12 + rest 12 + rest 12 + octave 5 + note D#, 2 + note D_, 3 + note C_, 7 + rest 12 + rest 5 + octave 4 + note C_, 7 + rest 12 + rest 12 + rest 12 + rest 8 + note D_, 16 + rest 12 + note A#, 2 + note A#, 3 + note A#, 16 + rest 3 + sound_ret + +Music_CatchEmRed_Ch2: + duty_cycle 1 + vibrato 18, 3, 4 + note_type 8, 12, 1 + rest 12 + rest 6 + octave 4 + note G#, 2 + note F#, 1 + note F_, 2 + note D#, 1 +Music_CatchEmRed_branch_3d395: + duty_cycle 1 + volume_envelope 12, 1 + note D_, 2 + octave 3 + note A#, 1 + note G_, 2 + note D#, 1 + note G_, 2 + octave 4 + note F_, 4 + note D_, 2 + octave 2 + note A#, 1 + octave 3 + note D#, 2 + note F_, 1 + note G_, 2 + octave 4 + note C_, 4 + note D_, 2 + octave 3 + note D#, 1 + note G_, 2 + note A#, 1 + octave 4 + note D_, 2 + note F_, 4 + note D_, 2 + octave 3 + note C_, 1 + note D#, 2 + note F_, 1 + note A_, 2 + octave 4 + note C_, 4 + rest 12 + rest 12 + rest 12 + rest 12 + sound_call Music_CatchEmRed_branch_3d4fe + volume_envelope 9, 2 + octave 5 + note F_, 2 + note F_, 3 + volume_envelope 9, 4 + note F_, 12 + rest 7 + sound_call Music_CatchEmRed_branch_3d4fe + volume_envelope 9, 2 + octave 5 + note F_, 2 + note F_, 3 + volume_envelope 9, 4 + note F_, 13 + duty_cycle 2 + volume_envelope 8, 2 + octave 5 + note C_, 3 + note D_, 3 + volume_envelope 10, 2 + note D#, 2 + volume_envelope 8, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 2 + note G_, 1 + note A#, 2 + octave 5 + note D_, 1 + volume_envelope 10, 2 + note D#, 3 + note F_, 2 + note D#, 1 + volume_envelope 8, 1 + octave 4 + note G_, 2 + volume_envelope 10, 2 + octave 5 + note D_, 1 + volume_envelope 8, 2 + octave 4 + note A#, 2 + volume_envelope 10, 2 + octave 5 + note C_, 3 + volume_envelope 8, 3 + note C#, 1 + volume_envelope 10, 2 + note D_, 2 + volume_envelope 8, 1 + octave 3 + note A#, 1 + octave 4 + note D_, 2 + note F_, 1 + note A_, 2 + octave 5 + note C#, 1 + volume_envelope 10, 2 + note D_, 3 + volume_envelope 9, 3 + note D#, 2 + note D_, 3 + note C_, 3 + octave 4 + note A#, 4 + volume_envelope 10, 2 + octave 5 + note D#, 3 + note D_, 3 + note C_, 3 + note D#, 5 + volume_envelope 10, 4 + note G_, 4 + volume_envelope 8, 2 + octave 4 + note F_, 2 + volume_envelope 10, 4 + octave 5 + note F_, 4 + volume_envelope 8, 1 + octave 4 + note A_, 2 + note A#, 1 + volume_envelope 10, 2 + octave 5 + note D_, 2 + note F_, 4 + note D#, 3 + note D_, 3 + volume_envelope 6, 2 + octave 4 + note F_, 2 + note G#, 1 + volume_envelope 8, 2 + note B_, 2 + octave 5 + note D_, 1 + volume_envelope 10, 2 + note F_, 2 + note G#, 1 + volume_envelope 10, 3 + note A#, 2 + volume_envelope 8, 2 + note A_, 1 + volume_envelope 10, 3 + note G_, 3 + volume_envelope 8, 2 + note D#, 2 + octave 4 + note A#, 1 + volume_envelope 10, 3 + octave 5 + note A#, 2 + volume_envelope 8, 2 + note D#, 1 + volume_envelope 10, 3 + note A_, 3 + volume_envelope 8, 2 + note G_, 2 + note D#, 1 + volume_envelope 10, 3 + note G_, 3 + volume_envelope 8, 2 + note D#, 2 + note C_, 1 + volume_envelope 10, 3 + note F_, 3 + note G#, 6 + volume_envelope 10, 2 + note G_, 3 + note F_, 2 + note F_, 3 + note D#, 3 + volume_envelope 10, 3 + note F_, 4 + note G_, 2 + volume_envelope 5, 2 + octave 4 + note C_, 1 + volume_envelope 10, 3 + octave 5 + note F_, 2 + volume_envelope 5, 2 + octave 4 + note D#, 1 + note G_, 2 + note A#, 1 + volume_envelope 10, 3 + octave 5 + note D#, 2 + volume_envelope 5, 2 + note C_, 1 + volume_envelope 10, 3 + note A_, 2 + volume_envelope 6, 2 + octave 4 + note D_, 1 + volume_envelope 10, 3 + octave 5 + note G_, 2 + volume_envelope 6, 2 + octave 4 + note F_, 1 + note A_, 2 + octave 5 + note C_, 1 + volume_envelope 10, 3 + note F_, 2 + volume_envelope 6, 2 + note D_, 1 + volume_envelope 10, 3 + note A#, 2 + volume_envelope 7, 2 + octave 4 + note D#, 1 + volume_envelope 10, 3 + octave 5 + note A_, 2 + volume_envelope 7, 2 + octave 4 + note G_, 1 + note A#, 2 + octave 5 + note D_, 1 + volume_envelope 10, 3 + note G_, 2 + volume_envelope 7, 2 + note F_, 1 + volume_envelope 10, 3 + octave 6 + note C_, 2 + volume_envelope 8, 2 + octave 4 + note E_, 1 + volume_envelope 10, 3 + octave 6 + note D_, 2 + volume_envelope 8, 2 + octave 4 + note G_, 1 + note A#, 2 + octave 5 + note C_, 1 + volume_envelope 10, 3 + note A#, 2 + volume_envelope 8, 2 + note E_, 1 + volume_envelope 10, 2 + octave 6 + note C_, 2 + note C_, 3 + volume_envelope 10, 4 + note C_, 7 + volume_envelope 8, 2 + octave 5 + note C_, 2 + octave 4 + note F_, 1 + note A#, 2 + octave 5 + note C_, 1 + note A_, 2 + note F_, 1 + octave 6 + note C_, 2 + octave 5 + note A#, 1 + volume_envelope 10, 2 + note A_, 2 + note A_, 3 + volume_envelope 10, 4 + note A_, 13 + duty_cycle 1 + volume_envelope 8, 2 + octave 4 + note G#, 2 + note F#, 1 + note F_, 2 + note D#, 1 + sound_loop 0, Music_CatchEmRed_branch_3d395 + +Music_CatchEmRed_branch_3d4fe: + volume_envelope 7, 2 + octave 4 + rest 3 + note D_, 5 + note D_, 3 + note D_, 13 + rest 3 + note D#, 5 + note D#, 3 + note D#, 1 + note D#, 5 + note F_, 4 + octave 3 + note F_, 3 + volume_envelope 12, 3 + octave 4 + note D_, 2 + volume_envelope 6, 2 + octave 3 + note A#, 1 + note F_, 2 + note A#, 1 + volume_envelope 12, 3 + octave 4 + note D#, 2 + volume_envelope 6, 2 + octave 3 + note A#, 1 + note F_, 2 + note A#, 1 + volume_envelope 12, 3 + octave 4 + note F_, 2 + volume_envelope 6, 2 + note D_, 1 + octave 3 + note A#, 2 + octave 4 + note D_, 1 + volume_envelope 12, 3 + note A#, 2 + volume_envelope 6, 2 + note D_, 1 + octave 3 + note A#, 2 + octave 4 + note F_, 1 + volume_envelope 12, 3 + note A_, 2 + volume_envelope 6, 2 + note D#, 1 + note C_, 2 + octave 3 + note A_, 1 + octave 4 + note C_, 2 + note D#, 1 + volume_envelope 12, 3 + note G_, 2 + note A_, 1 + note G_, 2 + volume_envelope 6, 2 + note D#, 1 + note C_, 2 + octave 3 + note G_, 1 + octave 4 + note C_, 2 + note D#, 1 + note C_, 2 + note D#, 1 + note C_, 2 + octave 3 + note G_, 1 + volume_envelope 12, 3 + octave 4 + note D#, 2 + volume_envelope 6, 2 + octave 3 + note G_, 1 + volume_envelope 12, 3 + octave 4 + note F_, 2 + volume_envelope 6, 2 + octave 3 + note G_, 1 + volume_envelope 12, 3 + octave 4 + note G_, 2 + volume_envelope 6, 2 + note C_, 1 + volume_envelope 12, 3 + octave 5 + note C_, 2 + octave 4 + note A#, 3 + note A_, 4 + volume_envelope 10, 3 + note G_, 2 + note A_, 1 + volume_envelope 12, 3 + note A#, 2 + volume_envelope 7, 3 + note F_, 1 + note D_, 2 + octave 3 + note A#, 1 + octave 4 + note D_, 2 + note F_, 1 + volume_envelope 12, 3 + note G_, 3 + note F_, 2 + volume_envelope 7, 3 + note D_, 1 + octave 3 + note G#, 2 + volume_envelope 11, 4 + octave 4 + note G#, 7 + volume_envelope 7, 3 + note D#, 2 + note G_, 1 + volume_envelope 12, 3 + note A#, 2 + volume_envelope 7, 3 + note D#, 1 + octave 3 + note A#, 2 + volume_envelope 12, 3 + octave 4 + note A_, 1 + note A#, 2 + volume_envelope 7, 3 + note D#, 1 + volume_envelope 12, 3 + note G_, 3 + volume_envelope 7, 3 + octave 3 + note G_, 2 + note D#, 1 + note G_, 2 + note A#, 1 + octave 4 + note D#, 2 + note G_, 1 + note D_, 2 + note F_, 1 + volume_envelope 12, 3 + note A#, 3 + volume_envelope 7, 3 + note D_, 2 + volume_envelope 12, 3 + note A_, 1 + note A#, 2 + volume_envelope 7, 3 + octave 3 + note A#, 1 + volume_envelope 12, 3 + octave 4 + note F_, 2 + volume_envelope 7, 3 + note D_, 1 + note F_, 2 + octave 3 + note A#, 1 + note F_, 2 + volume_envelope 11, 4 + octave 4 + note G#, 4 + volume_envelope 7, 3 + note D#, 2 + note G_, 1 + volume_envelope 12, 3 + note A#, 2 + volume_envelope 7, 3 + note G_, 1 + note D#, 2 + octave 3 + note A#, 1 + volume_envelope 12, 3 + octave 5 + note D_, 2 + volume_envelope 7, 3 + octave 4 + note D#, 1 + volume_envelope 12, 3 + octave 5 + note C_, 2 + octave 4 + note A#, 1 + volume_envelope 7, 3 + note E_, 2 + volume_envelope 12, 3 + note A_, 1 + note A#, 2 + volume_envelope 7, 3 + note E_, 1 + volume_envelope 12, 3 + note B_, 3 + volume_envelope 10, 3 + octave 5 + note C_, 2 + note C_, 3 + note C_, 7 + volume_envelope 7, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 1 + note A#, 2 + octave 4 + note C_, 1 + note A_, 2 + note F_, 1 + octave 5 + note C_, 2 + octave 4 + note A#, 1 + sound_ret + +Music_CatchEmRed_Ch3: + note_type 8, 2, 3 + rest 12 + rest 6 + octave 2 + note D#, 6 +Music_CatchEmRed_branch_3d615: + note F_, 1 + rest 7 + note G#, 4 + note F_, 1 + rest 7 + note F#, 4 + note F_, 1 + rest 7 + note G#, 4 + note F_, 1 + rest 7 + note A_, 4 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F_, 2 + rest 1 + note D_, 2 + rest 1 + octave 1 + note A#, 2 + rest 1 + octave 2 + note D_, 2 + rest 1 + note D#, 2 + rest 1 + octave 3 + note C_, 2 + rest 1 + octave 2 + note B_, 2 + rest 1 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G_, 2 + rest 1 + note F_, 2 + rest 1 + note A_, 2 + rest 1 +Music_CatchEmRed_branch_3d645: + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F_, 2 + rest 1 + note D_, 2 + rest 1 + octave 1 + note A#, 2 + rest 1 + octave 2 + note D_, 2 + rest 1 + note D#, 2 + rest 1 + octave 3 + note C_, 2 + rest 1 + octave 2 + note B_, 2 + rest 1 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G_, 2 + rest 1 + note D#, 2 + rest 1 + note C_, 2 + rest 1 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F_, 2 + rest 1 + note D_, 2 + rest 1 + octave 1 + note A#, 2 + rest 1 + octave 2 + note D_, 2 + rest 1 + note C_, 2 + rest 1 + note D#, 2 + rest 1 + note G_, 2 + rest 1 + octave 3 + note C_, 2 + rest 1 + octave 2 + note B_, 2 + rest 1 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note G_, 2 + rest 1 + octave 3 + note C_, 2 + rest 1 + octave 2 + note B_, 2 + rest 1 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + octave 3 + note C_, 1 + rest 1 + octave 2 + note A_, 1 + rest 2 + note F_, 4 + note C_, 2 + rest 1 + octave 1 + note A#, 1 + rest 1 + octave 2 + note A#, 1 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note F#, 2 + rest 1 + note F_, 2 + octave 3 + note F_, 6 + rest 1 + octave 2 + note D#, 2 + rest 1 + octave 3 + note D#, 2 + rest 1 + note D_, 2 + rest 1 + note C#, 2 + rest 1 + note C_, 2 + rest 1 + octave 2 + note B_, 2 + rest 1 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note A#, 1 + note F_, 1 + note D#, 1 + note D_, 2 + rest 1 + note D#, 2 + rest 1 + note F_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note G#, 1 + rest 1 + octave 3 + note F_, 4 + octave 2 + note G_, 2 + rest 1 + note D#, 2 + rest 1 + note C_, 2 + rest 1 + note F#, 2 + rest 1 + note G_, 2 + rest 1 + note E_, 2 + rest 1 + note C_, 2 + rest 1 + octave 1 + note A#, 2 + rest 1 + octave 3 + note F_, 1 + rest 1 + note F_, 1 + rest 2 + note F_, 7 + note C_, 2 + rest 1 + octave 2 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note F_, 2 + rest 1 + octave 3 + note C_, 1 + rest 1 + note C_, 1 + rest 2 + note C_, 7 + octave 2 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note A_, 2 + rest 1 + sound_loop 2, Music_CatchEmRed_branch_3d645 + note C_, 2 + rest 10 + note C_, 1 + rest 1 + note F_, 1 + note C_, 2 + rest 1 + note C_, 2 + rest 1 + octave 1 + note B_, 3 + note A#, 2 + rest 7 + note A#, 1 + rest 2 + octave 2 + note A#, 1 + rest 1 + note F_, 1 + rest 2 + note D_, 1 + rest 2 + note F_, 3 + octave 1 + note B_, 1 + octave 2 + note C_, 2 + rest 7 + note C_, 2 + rest 1 + note F_, 1 + rest 1 + octave 3 + note C_, 4 + octave 2 + note D#, 1 + rest 1 + note A_, 4 + octave 1 + note A#, 2 + rest 7 + note A#, 2 + rest 1 + octave 2 + note G#, 1 + note F_, 1 + note D_, 1 + octave 1 + note B_, 2 + rest 1 + note G#, 2 + rest 1 + note B_, 2 + octave 2 + note D_, 1 + note D#, 3 + note D_, 1 + rest 1 + note D#, 3 + rest 1 + note G_, 2 + rest 1 + note A_, 3 + note D#, 1 + rest 1 + note C_, 1 + octave 3 + note C_, 3 + octave 2 + note A_, 1 + rest 1 + note D#, 1 + octave 3 + note D_, 2 + rest 1 + note C_, 2 + rest 1 + octave 2 + note F_, 2 + rest 1 + note G#, 2 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 2 + octave 3 + note F_, 1 + rest 2 + octave 2 + note G#, 3 + note C#, 1 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note A#, 2 + rest 1 + note G_, 2 + rest 1 + note D#, 2 + rest 1 + note D_, 2 + octave 3 + note D_, 1 + note C_, 2 + rest 1 + octave 2 + note A_, 2 + rest 1 + note F_, 3 + note D#, 2 + octave 3 + note D#, 1 + note D_, 2 + rest 1 + octave 2 + note A#, 2 + rest 1 + note G_, 2 + rest 1 + octave 3 + note E_, 1 + rest 1 + octave 2 + note G_, 1 + rest 2 + note G_, 1 + octave 3 + note E_, 1 + rest 1 + note E_, 1 + octave 2 + note A#, 1 + rest 1 + octave 3 + note E_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 2 + note F_, 7 + note C_, 2 + rest 1 + octave 2 + note A#, 2 + rest 1 + note A_, 2 + rest 1 + note F_, 2 + rest 1 + octave 3 + note F_, 1 + rest 1 + note F_, 1 + rest 2 + note F_, 7 + octave 2 + note A_, 2 + rest 1 + note G#, 2 + rest 1 + note G_, 2 + rest 1 + note A_, 2 + rest 1 + sound_loop 0, Music_CatchEmRed_branch_3d615 + +Music_CatchEmRed_Ch4: + toggle_noise 0 + drum_speed 8 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 +Music_CatchEmRed_branch_3d7c3: + drum_note 4, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 7, 4 + drum_note 4, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 7, 4 + drum_note 4, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 7, 4 + drum_note 4, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 7, 4 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 1, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 3 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 1, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 3 + drum_note 7, 1 + rest 6 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 4, 2 + drum_note 7, 3 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 2 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 7, 3 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 3 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 1, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 3 + drum_note 7, 7 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 4, 2 + drum_note 7, 3 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 2 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 3 + drum_note 4, 2 + drum_note 4, 1 + drum_note 1, 3 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 3 + drum_note 8, 4 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 7, 3 + drum_note 1, 2 + drum_note 3, 3 + drum_note 3, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 7, 4 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 3 + drum_note 8, 4 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 7, 3 + drum_note 1, 2 + drum_note 3, 3 + drum_note 3, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 4, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 2 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 1 + drum_note 8, 2 + drum_note 8, 1 + drum_note 7, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 3 + drum_note 4, 2 + drum_note 4, 1 + drum_note 1, 3 + sound_loop 0, Music_CatchEmRed_branch_3d7c3 diff --git a/crysaudio/music/pinball/diglettstage_digletts.asm b/crysaudio/music/pinball/diglettstage_digletts.asm deleted file mode 100644 index ab648514..00000000 --- a/crysaudio/music/pinball/diglettstage_digletts.asm +++ /dev/null @@ -1,807 +0,0 @@ -Music_Pinballdiglettstage_digletts: ; 44cb9 - dbw $c0, Music_Pinballdiglettstage_digletts_Ch1 - dbw $01, Music_Pinballdiglettstage_digletts_Ch2 - dbw $02, Music_Pinballdiglettstage_digletts_Ch3 - dbw $03, Music_Pinballdiglettstage_digletts_Ch4 -; 44cc5 - -Music_Pinballdiglettstage_digletts_Ch1: ; 44cc5 - tempo 208 - volume $77 - notetype $6, $73 - dutycycle $2 - note __, 8 - octave 6 - note C_, 2 - octave 2 - note G_, 1 - note __, 1 - note A_, 1 - note __, 1 - note G_, 1 - note __, 1 - note A#, 1 - note __, 1 - note G_, 1 - note __, 1 - note B_, 1 - note __, 1 - note G_, 1 - note __, 1 -Music_Pinballdiglettstage_digletts_branch_44ce1: ; 44ce1 - dutycycle $3 - callchannel Music_Pinballdiglettstage_digletts_branch_44d6e - callchannel Music_Pinballdiglettstage_digletts_branch_44d6e - callchannel Music_Pinballdiglettstage_digletts_branch_44d8e - callchannel Music_Pinballdiglettstage_digletts_branch_44d8e - callchannel Music_Pinballdiglettstage_digletts_branch_44d6e - callchannel Music_Pinballdiglettstage_digletts_branch_44d6e - callchannel Music_Pinballdiglettstage_digletts_branch_44d8e - octave 2 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 3 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 2 - note __, 2 - octave 4 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - notetype $c, $73 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype $6, $73 - dutycycle $0 -Music_Pinballdiglettstage_digletts_branch_44d25: ; 44d25 - octave 2 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 3 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44d25 -Music_Pinballdiglettstage_digletts_branch_44d48: ; 44d48 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 3 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44d48 - loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44ce1 -; 44d6e - -Music_Pinballdiglettstage_digletts_branch_44d6e: ; 44d6e - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 3 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 3 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - endchannel -; 44d8e - -Music_Pinballdiglettstage_digletts_branch_44d8e: ; 44d8e - octave 2 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 3 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 3 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - endchannel -; 44daf - -Music_Pinballdiglettstage_digletts_Ch2: ; 44daf - notetype $6, $b3 - vibrato $9, $34 - dutycycle $2 - tone $0001 - note __, 8 - octave 5 - note C_, 2 - dutycycle $3 - octave 2 - note C_, 1 - note __, 1 - note C#, 1 - note __, 1 - note C_, 1 - note __, 1 - note D#, 1 - note __, 1 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 -Music_Pinballdiglettstage_digletts_branch_44dce: ; 44dce - dutycycle $2 - intensity $b3 - callchannel Music_Pinballdiglettstage_digletts_branch_44eaf - octave 3 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 4 - note G_, 1 - note G#, 3 - note F_, 6 - note __, 2 - note D_, 1 - note __, 1 - note G#, 1 - note __, 1 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - note D_, 1 - note __, 1 - note F#, 1 - note __, 1 - octave 3 - note A#, 1 - note __, 1 - note B_, 1 - note __, 1 - callchannel Music_Pinballdiglettstage_digletts_branch_44eaf - octave 3 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 4 - note G_, 1 - note G#, 3 - note F_, 6 - note __, 2 - note D_, 1 - note __, 1 - octave 5 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - octave 4 - note D_, 1 - note __, 1 - octave 5 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - octave 4 - note D_, 1 - note __, 1 - octave 5 - note D_, 1 - note __, 1 - intensity $92 - dutycycle $0 -Music_Pinballdiglettstage_digletts_branch_44e16: ; 44e16 - octave 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note D#, 3 - note __, 1 - note D#, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e16 -Music_Pinballdiglettstage_digletts_branch_44e3e: ; 44e3e - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note G#, 3 - note __, 1 - note G#, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note __, 1 - note F_, 1 - note __, 1 - loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e3e - dutycycle $2 -Music_Pinballdiglettstage_digletts_branch_44e66: ; 44e66 - octave 3 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 3 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e66 -Music_Pinballdiglettstage_digletts_branch_44e89: ; 44e89 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 3 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e89 - loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44dce -; 44eaf - -Music_Pinballdiglettstage_digletts_branch_44eaf: ; 44eaf - octave 3 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note B_, 1 - octave 4 - note C_, 3 - octave 3 - note F_, 6 - note __, 2 - note G#, 1 - note __, 1 - note F_, 1 - note __, 1 - note B_, 1 - note __, 1 - octave 4 - note C_, 2 - note __, 2 - octave 3 - note D#, 2 - note __, 2 - intensity $b8 - note C_, 2 - intensity $b3 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note B_, 1 - octave 4 - note C_, 3 - octave 3 - note F_, 6 - note __, 2 - note G#, 1 - note __, 1 - note F_, 1 - note __, 1 - note B_, 1 - note __, 1 - octave 4 - note C_, 2 - note __, 2 - note D#, 2 - note D_, 1 - note __, 1 - note C_, 2 - octave 3 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 4 - note G_, 1 - note G#, 3 - note F_, 6 - note __, 2 - note G#, 1 - note __, 1 - note F_, 1 - note __, 1 - note B_, 1 - note __, 1 - octave 5 - note C_, 2 - note __, 2 - octave 4 - note D#, 2 - note D_, 1 - note __, 1 - note C_, 2 - endchannel -; 44efb - -Music_Pinballdiglettstage_digletts_Ch3: ; 44efb - notetype $6, $22 - note __, 8 - octave 4 - note E_, 2 - octave 1 - note C_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note D#, 1 - note __, 1 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 -Music_Pinballdiglettstage_digletts_branch_44f10: ; 44f10 - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note G#, 2 - note D_, 1 - note __, 1 - note G#, 1 - note __, 1 - octave 3 - note G#, 1 - note __, 1 - octave 2 - note D_, 1 - note __, 1 - note G#, 1 - note __, 1 - octave 3 - note G#, 1 - note __, 1 - octave 2 - note D_, 1 - note __, 1 - octave 3 - note G#, 1 - note __, 1 - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f69 - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - callchannel Music_Pinballdiglettstage_digletts_branch_44f8e - loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44f10 -; 44f69 - -Music_Pinballdiglettstage_digletts_branch_44f69: ; 44f69 - octave 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note D#, 3 - note __, 1 - note D#, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - endchannel -; 44f8e - -Music_Pinballdiglettstage_digletts_branch_44f8e: ; 44f8e - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note G#, 3 - note __, 1 - note G#, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note __, 1 - note F_, 1 - note __, 1 - endchannel -; 44fb1 - -Music_Pinballdiglettstage_digletts_Ch4: ; 44fb1 - togglenoise $0 - notetype $6 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note D_, 2 -Music_Pinballdiglettstage_digletts_branch_44fc3: ; 44fc3 - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - callchannel Music_Pinballdiglettstage_digletts_branch_4502f - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - callchannel Music_Pinballdiglettstage_digletts_branch_4502f - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note D_, 2 - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - callchannel Music_Pinballdiglettstage_digletts_branch_4502f - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D_, 2 - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - callchannel Music_Pinballdiglettstage_digletts_branch_4502f - callchannel Music_Pinballdiglettstage_digletts_branch_4501f - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 2 - loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44fc3 -; 4501f - -Music_Pinballdiglettstage_digletts_branch_4501f: ; 4501f - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 4 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - endchannel -; 4502f - -Music_Pinballdiglettstage_digletts_branch_4502f: ; 4502f - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 4 - note D#, 2 - note D_, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - endchannel -; 45040 - - diff --git a/crysaudio/music/pinball/diglettstage_dugtrio.asm b/crysaudio/music/pinball/diglettstage_dugtrio.asm deleted file mode 100644 index 81424f70..00000000 --- a/crysaudio/music/pinball/diglettstage_dugtrio.asm +++ /dev/null @@ -1,1148 +0,0 @@ -Music_Pinballdiglettstage_dugtrio: ; 45040 - dbw $c0, Music_Pinballdiglettstage_dugtrio_Ch1 - dbw $01, Music_Pinballdiglettstage_dugtrio_Ch2 - dbw $02, Music_Pinballdiglettstage_dugtrio_Ch3 - dbw $03, Music_Pinballdiglettstage_dugtrio_Ch4 -; 4504c - -Music_Pinballdiglettstage_dugtrio_Ch1: ; 4504c - tempo 144 - volume $77 - notetype $c, $83 - note __, 16 - dutycycle $2 -Music_Pinballdiglettstage_dugtrio_branch_45057: ; 45057 - note __, 16 - note __, 12 - notetype $6, $73 - octave 4 - note F_, 1 - intensity $43 - note F_, 1 - intensity $73 - note F#, 1 - intensity $43 - note F#, 1 - note __, 2 - intensity $73 - note G_, 1 - intensity $43 - note G_, 1 - notetype $c, $83 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 9 - notetype $6, $73 - octave 5 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 4 - note A#, 1 - note __, 1 - note G_, 1 - note __, 1 - note E_, 1 - note __, 1 - note G_, 1 - note __, 1 - octave 5 - note C_, 1 - note __, 1 - notetype $c, $83 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_45057 -; 4509e - -Music_Pinballdiglettstage_dugtrio_Ch2: ; 4509e - dutycycle $2 - tone $0001 - notetype $c, $b3 - note __, 12 - notetype $6, $83 - octave 3 - note D#, 1 - intensity $53 - note D#, 1 - intensity $83 - octave 4 - note D#, 1 - intensity $53 - note D#, 1 - intensity $83 - octave 3 - note E_, 1 - intensity $53 - note E_, 1 - intensity $83 - octave 4 - note E_, 1 - intensity $53 - note E_, 1 -Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4 - panning $ff - notetype $c, $b3 - note __, 16 - note __, 8 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - intensity $83 - octave 5 - note C#, 1 - intensity $53 - note C#, 1 - intensity $83 - note D_, 1 - intensity $33 - note D_, 1 - note __, 2 - intensity $83 - note D#, 1 - intensity $53 - note D#, 1 - notetype $c, $b3 - note __, 16 - note __, 8 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45221 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 - panning $ff - callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e - pitchoffset 0, E_ - panning $f0 - callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb - panning $f - callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 - panning $ff - callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb - callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 - intensity $83 - note __, 2 - octave 6 - note C_, 1 - note __, 1 - octave 5 - note A#, 1 - note __, 1 - note G_, 1 - note __, 1 - intensity $43 - note C_, 1 - note __, 1 - intensity $53 - octave 4 - note A#, 1 - note __, 1 - intensity $63 - octave 5 - note C_, 1 - note __, 1 - intensity $73 - note E_, 1 - note __, 1 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 - panning $f - callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e - pitchoffset 0, E_ - panning $f0 - callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb - callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 - panning $ff - intensity $83 - octave 1 - note D#, 1 - intensity $53 - note D#, 1 - intensity $83 - note D#, 1 - intensity $53 - note D#, 1 - intensity $83 - octave 2 - note D#, 1 - intensity $53 - note D#, 1 - intensity $83 - octave 1 - note D#, 1 - intensity $53 - note D#, 1 - intensity $83 - octave 2 - note C#, 1 - intensity $53 - note C#, 1 - intensity $83 - note D_, 1 - intensity $53 - note D_, 1 - note __, 2 - intensity $83 - note D#, 1 - intensity $53 - note D#, 1 - pitchoffset 0, C# - callchannel Music_Pinballdiglettstage_dugtrio_branch_45221 - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd - panning $f0 - callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e - pitchoffset 0, $e + 1 - panning $f - callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - pitchoffset 0, A# - callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - panning $ff - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45345 - panning $f0 - octave 3 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - note C#, 1 - note __, 1 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 3 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 3 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - note G_, 1 - note __, 1 - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd - callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e - panning $f - pitchoffset 0, $e + 1 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - pitchoffset 0, A# - callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45345 - panning $ff - intensity $83 - octave 1 - note C_, 1 - note __, 1 - octave 6 - note C_, 1 - intensity $53 - octave 5 - note G_, 1 - intensity $83 - note A#, 1 - note __, 1 - note G_, 1 - intensity $53 - note C_, 1 - note E_, 1 - note __, 1 - intensity $83 - note C_, 1 - intensity $53 - octave 4 - note G_, 1 - intensity $83 - note A#, 1 - note __, 1 - note G_, 1 - intensity $53 - note C_, 1 - intensity $83 - note E_, 1 - note __, 1 - note C_, 1 - intensity $53 - octave 3 - note G_, 1 - intensity $83 - note A#, 1 - note __, 1 - note G_, 1 - intensity $53 - note E_, 1 - panning $f0 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_450c4 -; 45213 - -Music_Pinballdiglettstage_dugtrio_branch_45213: ; 45213 - notetype $6, $83 - octave 1 - note B_, 1 - intensity $53 - octave 2 - note C_, 1 - loopchannel 4, Music_Pinballdiglettstage_dugtrio_branch_45213 - endchannel -; 45221 - -Music_Pinballdiglettstage_dugtrio_branch_45221: ; 45221 - notetype $6, $33 - octave 2 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - intensity $43 - note E_, 1 - intensity $53 - note F_, 1 - intensity $63 - note F#, 1 - intensity $73 - note G_, 1 - intensity $83 - note G#, 1 - intensity $93 - note A_, 1 - intensity $a3 - note A#, 1 - endchannel -; 45245 - -Music_Pinballdiglettstage_dugtrio_branch_45245: ; 45245 - panning $f0 - intensity $83 - octave 3 - note F_, 1 - note B_, 1 - intensity $53 - note F_, 1 - note B_, 1 - intensity $83 - note F_, 1 - octave 4 - note C_, 1 - intensity $53 - octave 3 - note F_, 1 - octave 4 - note C_, 1 - intensity $83 - octave 3 - note B_, 1 - octave 4 - note F_, 1 - intensity $53 - octave 3 - note B_, 1 - octave 4 - note F_, 1 - intensity $83 - octave 3 - note F_, 1 - note B_, 1 - intensity $53 - note F_, 1 - note B_, 1 - panning $f - intensity $83 - note F_, 1 - octave 4 - note C_, 1 - intensity $53 - octave 3 - note F_, 1 - octave 4 - note C_, 1 - intensity $83 - octave 3 - note B_, 1 - octave 4 - note F_, 1 - intensity $53 - octave 3 - note B_, 1 - octave 4 - note F_, 1 - intensity $83 - octave 3 - note F_, 1 - note B_, 1 - intensity $53 - note F_, 1 - note B_, 1 - intensity $83 - note F_, 1 - octave 4 - note C_, 1 - intensity $53 - octave 3 - note F_, 1 - octave 4 - note C_, 1 - endchannel -; 4529e - -Music_Pinballdiglettstage_dugtrio_branch_4529e: ; 4529e - intensity $83 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $53 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $83 - octave 3 - note G#, 1 - octave 4 - note D_, 1 - intensity $53 - octave 3 - note G#, 1 - octave 4 - note D_, 1 - intensity $83 - octave 3 - note F_, 1 - octave 4 - note C#, 1 - intensity $53 - octave 3 - note F_, 1 - octave 4 - note C#, 1 - intensity $83 - note C#, 1 - note G_, 1 - intensity $53 - note C#, 1 - note G_, 1 - endchannel -; 452cb - -Music_Pinballdiglettstage_dugtrio_branch_452cb: ; 452cb - intensity $73 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $63 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $53 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $43 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - endchannel -; 452e4 - -Music_Pinballdiglettstage_dugtrio_branch_452e4: ; 452e4 - intensity $33 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $43 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $53 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - intensity $63 - octave 3 - note A_, 1 - octave 4 - note D#, 1 - endchannel -; 452fd - -Music_Pinballdiglettstage_dugtrio_branch_452fd: ; 452fd - intensity $83 - octave 4 - note C_, 1 - note __, 1 - octave 1 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 3 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - octave 1 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 3 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - endchannel -; 4532e - -Music_Pinballdiglettstage_dugtrio_branch_4532e: ; 4532e - octave 1 - note G_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - octave 4 - note C#, 1 - note __, 1 - note D_, 1 - note __, 1 - octave 1 - note G_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - octave 4 - note C#, 1 - note __, 1 - note D_, 1 - note __, 1 - endchannel -; 45345 - -Music_Pinballdiglettstage_dugtrio_branch_45345: ; 45345 - intensity $83 - octave 4 - note C_, 1 - note __, 1 - octave 1 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 3 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - note E_, 1 - note __, 1 - octave 1 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 4 - note E_, 1 - note __, 1 - note G_, 1 - note __, 1 - endchannel -; 45375 - -Music_Pinballdiglettstage_dugtrio_Ch3: ; 45375 - notetype $6, $12 - octave 1 - note A_, 1 - note __, 1 - octave 2 - note A_, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note B_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note C#, 1 - intensity $32 - note C#, 1 - intensity $12 - octave 3 - note C#, 1 - intensity $32 - note C#, 1 - intensity $12 - octave 2 - note D_, 1 - intensity $32 - note D_, 1 - intensity $12 - octave 3 - note D_, 1 - intensity $32 - note D_, 1 - intensity $12 - octave 2 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 3 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note E_, 1 - intensity $32 - note E_, 1 - intensity $12 - octave 3 - note E_, 1 - intensity $32 - note E_, 1 -Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5 - pitchoffset 0, D_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5 - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5 - pitchoffset 0, D_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - pitchoffset 0, D_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - pitchoffset 0, D_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note C#, 1 - intensity $32 - note C#, 1 - intensity $12 - note D_, 1 - intensity $32 - note D_, 1 - note __, 2 - intensity $12 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - note __, 6 - intensity $12 - note B_, 1 - octave 2 - note C_, 1 - intensity $32 - octave 1 - note B_, 1 - octave 2 - note C_, 1 - intensity $12 - octave 1 - note B_, 1 - octave 2 - note C_, 1 - intensity $32 - octave 1 - note B_, 1 - octave 2 - note C_, 1 - pitchoffset 0, D_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - pitchoffset 0, D_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - intensity $22 - octave 4 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - intensity $32 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - intensity $22 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - note C#, 1 - note G_, 1 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45565 - pitchoffset 0, E_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - pitchoffset 0, C_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - pitchoffset 0, E_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - pitchoffset 0, C_ - intensity $12 - note F#, 1 - note G_, 1 - intensity $32 - note F#, 1 - note G_, 1 - intensity $12 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - intensity $22 - callchannel Music_Pinballdiglettstage_dugtrio_branch_45565 - octave 2 - note C_, 1 - note __, 1 - octave 5 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 4 - note A#, 1 - note __, 1 - note G_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 3 - note A#, 1 - note __, 1 - note G_, 1 - note __, 1 - note E_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - pitchoffset 0, E_ - callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_453c5 -; 454d5 - -Music_Pinballdiglettstage_dugtrio_branch_454d5: ; 454d5 - intensity $12 - octave 1 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 1 - octave 1 - note D#, 1 - note __, 1 - octave 2 - note C#, 1 - note __, 1 - note D_, 1 - note __, 3 - note D#, 1 - note __, 1 - intensity $22 - octave 1 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 1 - octave 1 - note D#, 1 - note __, 1 - octave 2 - note C#, 1 - note __, 1 - note D_, 1 - note __, 3 - note D#, 1 - note __, 1 - endchannel -; 454fe - -Music_Pinballdiglettstage_dugtrio_branch_454fe: ; 454fe - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note C#, 1 - intensity $32 - note C#, 1 - intensity $12 - note D_, 1 - intensity $32 - note D_, 1 - note __, 2 - intensity $12 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 1 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - note D#, 1 - intensity $32 - note D#, 1 - intensity $12 - octave 2 - note D#, 1 - intensity $32 - note D#, 1 - endchannel -; 45556 - -Music_Pinballdiglettstage_dugtrio_branch_45556: ; 45556 - intensity $12 - octave 1 - note E_, 1 - intensity $32 - note E_, 1 - intensity $12 - octave 2 - note E_, 1 - intensity $32 - note E_, 1 - endchannel -; 45565 - -Music_Pinballdiglettstage_dugtrio_branch_45565: ; 45565 - octave 3 - note E_, 1 - note __, 5 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note D#, 1 - note __, 1 - note E_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 5 - octave 3 - note E_, 1 - note __, 5 - note D#, 1 - note __, 1 - note E_, 1 - note __, 1 - note __, 4 - note G_, 1 - note __, 1 - note A_, 1 - note __, 5 - note G_, 1 - note __, 1 - note A_, 1 - note __, 16 - note __, 1 - note E_, 1 - note __, 5 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note D#, 1 - note __, 1 - note E_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 5 - octave 3 - note E_, 1 - note __, 5 - note G_, 1 - note __, 1 - octave 4 - note E_, 1 - note __, 1 - endchannel -; 4559a - -Music_Pinballdiglettstage_dugtrio_branch_4559a: ; 4559a - intensity $12 - octave 1 - note F#, 1 - note G_, 1 - intensity $32 - note F#, 1 - note G_, 1 - intensity $12 - note F#, 1 - note G_, 1 - intensity $32 - note F#, 1 - note G_, 1 - endchannel -; 455ac - -Music_Pinballdiglettstage_dugtrio_Ch4: ; 455ac - togglenoise $1 - notetype $c - note C_, 8 - notetype $8 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $c - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 -Music_Pinballdiglettstage_dugtrio_branch_455be: ; 455be - callchannel Music_Pinballdiglettstage_dugtrio_branch_455df - loopchannel 7, Music_Pinballdiglettstage_dugtrio_branch_455be - callchannel Music_Pinballdiglettstage_dugtrio_branch_455f0 - callchannel Music_Pinballdiglettstage_dugtrio_branch_455df - callchannel Music_Pinballdiglettstage_dugtrio_branch_455df - callchannel Music_Pinballdiglettstage_dugtrio_branch_455df - callchannel Music_Pinballdiglettstage_dugtrio_branch_455f0 -Music_Pinballdiglettstage_dugtrio_branch_455d4: ; 455d4 - callchannel Music_Pinballdiglettstage_dugtrio_branch_455df - loopchannel 8, Music_Pinballdiglettstage_dugtrio_branch_455d4 - loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_455be -; 455df - -Music_Pinballdiglettstage_dugtrio_branch_455df: ; 455df - note D#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note D#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note D#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note D#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - endchannel -; 455f0 - -Music_Pinballdiglettstage_dugtrio_branch_455f0: ; 455f0 - note D#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note D#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D#, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - endchannel -; 45601 - - diff --git a/crysaudio/music/pinball/endcredits.asm b/crysaudio/music/pinball/endcredits.asm index 2e5e5fa1..0cb1c331 100644 --- a/crysaudio/music/pinball/endcredits.asm +++ b/crysaudio/music/pinball/endcredits.asm @@ -1,18 +1,18 @@ -Music_Pinballendcredits: ; 4ccb5 - dbw $c0, Music_Pinballendcredits_Ch1 - dbw $01, Music_Pinballendcredits_Ch2 - dbw $02, Music_Pinballendcredits_Ch3 - dbw $03, Music_Pinballendcredits_Ch4 -; 4ccc1 +Music_EndCredits: + channel_count 4 + channel 1, Music_EndCredits_Ch1 + channel 2, Music_EndCredits_Ch2 + channel 3, Music_EndCredits_Ch3 + channel 4, Music_EndCredits_Ch4 -Music_Pinballendcredits_Ch1: ; 4ccc1 +Music_EndCredits_Ch1: tempo 144 - volume $77 - tone $0001 - vibrato $14, $24 - dutycycle $2 - notetype $8, $93 - note __, 3 + volume 7, 7 + pitch_offset 1 + vibrato 20, 2, 4 + duty_cycle 2 + note_type 8, 9, 3 + rest 3 octave 3 note F#, 3 octave 4 @@ -26,196 +26,196 @@ Music_Pinballendcredits_Ch1: ; 4ccc1 note B_, 2 note A_, 2 note G_, 2 -Music_Pinballendcredits_branch_4ccdf: ; 4ccdf - notetype $6, $48 +Music_EndCredits_branch_4ccdf: + note_type 6, 4, 8 octave 3 note A_, 1 - intensity $18 + volume_envelope 1, 8 note A_, 1 - intensity $48 + volume_envelope 4, 8 octave 4 note D_, 1 - intensity $18 + volume_envelope 1, 8 note D_, 1 - loopchannel 2, Music_Pinballendcredits_branch_4ccdf -Music_Pinballendcredits_branch_4ccf2: ; 4ccf2 - intensity $68 + sound_loop 2, Music_EndCredits_branch_4ccdf +Music_EndCredits_branch_4ccf2: + volume_envelope 6, 8 octave 3 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $68 + volume_envelope 6, 8 octave 4 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - loopchannel 2, Music_Pinballendcredits_branch_4ccf2 -Music_Pinballendcredits_branch_4cd04: ; 4cd04 - intensity $88 + sound_loop 2, Music_EndCredits_branch_4ccf2 +Music_EndCredits_branch_4cd04: + volume_envelope 8, 8 octave 3 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - loopchannel 2, Music_Pinballendcredits_branch_4cd04 - intensity $a8 + sound_loop 2, Music_EndCredits_branch_4cd04 + volume_envelope 10, 8 octave 3 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - intensity $88 + volume_envelope 8, 8 note D_, 4 - dutycycle $3 - intensity $98 - callchannel Music_Pinballendcredits_branch_4cef5 -Music_Pinballendcredits_branch_4cd2e: ; 4cd2e - pitchoffset 0, C# - callchannel Music_Pinballendcredits_branch_4cef5 - pitchoffset 0, F_ - callchannel Music_Pinballendcredits_branch_4cef5 - pitchoffset 0, C_ + duty_cycle 3 + volume_envelope 9, 8 + sound_call Music_EndCredits_branch_4cef5 +Music_EndCredits_branch_4cd2e: + transpose 0, 1 + sound_call Music_EndCredits_branch_4cef5 + transpose 0, 5 + sound_call Music_EndCredits_branch_4cef5 + transpose 0, 0 note D_, 2 - note __, 2 + rest 2 note D_, 4 - note __, 4 + rest 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 2 note D_, 2 octave 5 note D_, 6 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 4 - note __, 4 + rest 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 4 - note __, 4 + rest 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 4 - note __, 4 + rest 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 4 - note __, 4 + rest 4 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 3 note E_, 4 note F#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 15 - notetype $c, $b3 - note __, 16 - notetype $6, $88 + rest 15 + note_type 12, 11, 3 + rest 16 + note_type 6, 8, 8 octave 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 4 + rest 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note G_, 8 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 4 + rest 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 4 octave 3 note B_, 4 note F_, 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - notetype $8, $88 + note_type 8, 8, 8 note C_, 1 note E_, 1 note G_, 1 - notetype $c, $88 + note_type 12, 8, 8 octave 4 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - notetype $8, $88 + note_type 8, 8, 8 octave 3 note E_, 1 note G_, 1 octave 4 note C_, 1 - notetype $c, $88 + note_type 12, 8, 8 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - notetype $8, $68 + note_type 8, 6, 8 octave 3 note G_, 1 octave 4 note C#, 1 note F#, 1 - notetype $c, $68 + note_type 12, 6, 8 note G_, 1 note E_, 1 note C#, 1 octave 3 note A_, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note D_, 1 octave 3 @@ -233,70 +233,70 @@ Music_Pinballendcredits_branch_4cd2e: ; 4cd2e note D_, 1 octave 3 note A_, 1 - notetype $6, $88 + note_type 6, 8, 8 octave 4 note G#, 1 note A_, 7 - dutycycle $2 - vibrato $14, $4 - note __, 8 - notetype $8, $88 + duty_cycle 2 + vibrato 20, 0, 4 + rest 8 + note_type 8, 8, 8 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A#, 6 - note __, 6 - note __, 6 + rest 6 + rest 6 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A_, 6 - note __, 6 - note __, 6 + rest 6 + rest 6 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - intensity $58 + rest 1 + volume_envelope 5, 8 note A#, 6 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 6 note B_, 1 - note __, 1 - intensity $68 + rest 1 + volume_envelope 6, 8 note B_, 1 - note __, 1 - intensity $78 + rest 1 + volume_envelope 7, 8 note B_, 1 - note __, 1 - notetype $c, $88 + rest 1 + note_type 12, 8, 8 octave 5 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $8, $98 + rest 1 + note_type 8, 9, 8 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - vibrato $14, $24 - notetype $c, $62 + rest 1 + vibrato 20, 2, 4 + note_type 12, 6, 2 octave 3 note B_, 2 octave 4 @@ -306,7 +306,7 @@ Music_Pinballendcredits_branch_4cd2e: ; 4cd2e octave 4 note C_, 2 note E_, 2 - notetype $8, $62 + note_type 8, 6, 2 note G_, 2 note F#, 2 note F_, 2 @@ -320,7 +320,7 @@ Music_Pinballendcredits_branch_4cd2e: ; 4cd2e note B_, 2 note A#, 2 note A_, 2 - notetype $c, $62 + note_type 12, 6, 2 note G_, 1 note D_, 1 note G_, 1 @@ -337,9 +337,9 @@ Music_Pinballendcredits_branch_4cd2e: ; 4cd2e note A_, 1 octave 5 note A_, 1 - intensity $18 + volume_envelope 1, 8 note A_, 1 - intensity $62 + volume_envelope 6, 2 note E_, 1 note C_, 1 octave 4 @@ -351,29 +351,29 @@ Music_Pinballendcredits_branch_4cd2e: ; 4cd2e note C_, 1 octave 5 note A_, 1 - intensity $18 + volume_envelope 1, 8 note A_, 1 - intensity $62 + volume_envelope 6, 2 note F_, 1 note C_, 1 - intensity $98 + volume_envelope 9, 8 octave 3 note A_, 3 note G#, 1 note G_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note B_, 2 - notetype $8, $98 + note_type 8, 9, 8 octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - intensity $85 + rest 1 + volume_envelope 8, 5 octave 5 note E_, 6 note D#, 6 @@ -385,101 +385,99 @@ Music_Pinballendcredits_branch_4cd2e: ; 4cd2e note B_, 6 octave 5 note D_, 6 - dutycycle $3 - notetype $6, $a8 + duty_cycle 3 + note_type 6, 10, 8 octave 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 4 + rest 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 - notetype $8, $a8 + rest 2 + note_type 8, 10, 8 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - notetype $c, $52 + rest 1 + note_type 12, 5, 2 note F#, 1 note A_, 1 - intensity $72 + volume_envelope 7, 2 note F#, 1 note A_, 1 - intensity $92 + volume_envelope 9, 2 note F#, 1 note A_, 1 - intensity $b2 + volume_envelope 11, 2 note F#, 1 note A_, 1 - intensity $52 + volume_envelope 5, 2 note F#, 1 octave 5 note D_, 1 - intensity $72 + volume_envelope 7, 2 octave 4 note A_, 1 octave 5 note D_, 1 - intensity $92 + volume_envelope 9, 2 octave 4 note A_, 1 octave 5 note D_, 1 - intensity $b2 + volume_envelope 11, 2 octave 4 note A_, 1 octave 5 note D_, 1 - intensity $98 + volume_envelope 9, 8 octave 3 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 - notetype $6, $98 + rest 2 + note_type 6, 9, 8 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 10 - loopchannel 0, Music_Pinballendcredits_branch_4cd2e -; 4cef5 + rest 10 + sound_loop 0, Music_EndCredits_branch_4cd2e -Music_Pinballendcredits_branch_4cef5: ; 4cef5 +Music_EndCredits_branch_4cef5: octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 4 - note __, 4 + rest 4 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 10 - endchannel -; 4cf03 + rest 10 + sound_ret -Music_Pinballendcredits_Ch2: ; 4cf03 - vibrato $14, $24 - dutycycle $2 - notetype $c, $b3 - note __, 2 +Music_EndCredits_Ch2: + vibrato 20, 2, 4 + duty_cycle 2 + note_type 12, 11, 3 + rest 2 octave 4 note D_, 2 octave 5 @@ -487,82 +485,82 @@ Music_Pinballendcredits_Ch2: ; 4cf03 note C_, 2 octave 4 note B_, 2 - notetype $8, $b3 + note_type 8, 11, 3 note A_, 2 note G_, 2 note F#, 2 note G_, 2 note F#, 2 note F_, 2 - intensity $57 + volume_envelope 5, 7 note F#, 6 - intensity $67 + volume_envelope 6, 7 note G_, 6 - intensity $87 + volume_envelope 8, 7 note A_, 6 - intensity $a7 + volume_envelope 10, 7 octave 5 note C_, 6 - dutycycle $3 - notetype $6, $a8 + duty_cycle 3 + note_type 6, 10, 8 octave 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - callchannel Music_Pinballendcredits_branch_4d1f2 -Music_Pinballendcredits_branch_4cf36: ; 4cf36 - pitchoffset 0, D_ - callchannel Music_Pinballendcredits_branch_4d21e + sound_call Music_EndCredits_branch_4d1f2 +Music_EndCredits_branch_4cf36: + transpose 0, 2 + sound_call Music_EndCredits_branch_4d21e note A_, 2 - intensity $28 + volume_envelope 2, 8 note A_, 2 - intensity $a8 + volume_envelope 10, 8 octave 5 note G_, 2 - intensity $88 + volume_envelope 8, 8 octave 2 note A_, 1 note G#, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - pitchoffset 0, F_ - callchannel Music_Pinballendcredits_branch_4d21e + transpose 0, 5 + sound_call Music_EndCredits_branch_4d21e octave 5 note C_, 2 - intensity $28 + volume_envelope 2, 8 note C_, 2 - intensity $a8 + volume_envelope 10, 8 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 octave 4 note E_, 4 - intensity $78 + volume_envelope 7, 8 note D#, 1 note D_, 1 note C#, 1 note C_, 1 - pitchoffset 0, E_ - callchannel Music_Pinballendcredits_branch_4d21e + transpose 0, 4 + sound_call Music_EndCredits_branch_4d21e note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - intensity $a8 + volume_envelope 10, 8 octave 3 note B_, 2 octave 4 @@ -576,96 +574,96 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 note A#, 4 note A_, 4 note B_, 4 - intensity $28 + volume_envelope 2, 8 note B_, 2 - note __, 2 - dutycycle $2 - intensity $a2 + rest 2 + duty_cycle 2 + volume_envelope 10, 2 octave 4 note B_, 1 - intensity $22 + volume_envelope 2, 2 note B_, 1 - intensity $a2 + volume_envelope 10, 2 note B_, 2 note A#, 1 - intensity $22 + volume_envelope 2, 2 note A#, 1 - intensity $a2 + volume_envelope 10, 2 note A#, 2 note A_, 1 - intensity $22 + volume_envelope 2, 2 note A_, 1 - intensity $a2 + volume_envelope 10, 2 note A_, 2 - dutycycle $3 - intensity $a8 + duty_cycle 3 + volume_envelope 10, 8 octave 3 note B_, 4 note A#, 4 note A_, 4 note B_, 4 - intensity $28 + volume_envelope 2, 8 note B_, 2 - note __, 2 - dutycycle $2 - intensity $a2 + rest 2 + duty_cycle 2 + volume_envelope 10, 2 octave 4 note B_, 1 - intensity $22 + volume_envelope 2, 2 note B_, 1 - intensity $a2 + volume_envelope 10, 2 note B_, 2 octave 5 note C_, 1 - intensity $22 + volume_envelope 2, 2 note C_, 1 - intensity $a2 + volume_envelope 10, 2 note C_, 2 note D_, 1 - intensity $22 + volume_envelope 2, 2 note D_, 1 - intensity $a2 + volume_envelope 10, 2 note D_, 2 - dutycycle $3 - intensity $a8 + duty_cycle 3 + volume_envelope 10, 8 octave 4 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note E_, 2 octave 3 note G_, 4 note A_, 2 - intensity $28 + volume_envelope 2, 8 note A_, 2 - intensity $a8 + volume_envelope 10, 8 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 2 - note __, 1 - intensity $a8 + rest 1 + volume_envelope 10, 8 note B_, 4 - notetype $8, $a8 + note_type 8, 10, 8 note A_, 2 note G#, 2 note G_, 2 - notetype $6, $a8 + note_type 6, 10, 8 note F_, 1 note F#, 3 note E_, 2 - intensity $28 + volume_envelope 2, 8 note E_, 2 - intensity $a8 + volume_envelope 10, 8 note D_, 2 - intensity $28 + volume_envelope 2, 8 note D_, 2 - note __, 4 - intensity $a8 + rest 4 + volume_envelope 10, 8 octave 4 note D_, 2 note F#, 2 @@ -674,16 +672,16 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 note C_, 2 octave 4 note A#, 8 - dutycycle $2 - callchannel Music_Pinballendcredits_branch_4d24f + duty_cycle 2 + sound_call Music_EndCredits_branch_4d24f note B_, 2 - intensity $28 + volume_envelope 2, 8 note B_, 2 - intensity $a8 + volume_envelope 10, 8 octave 5 note C_, 4 note D_, 4 - callchannel Music_Pinballendcredits_branch_4d24f + sound_call Music_EndCredits_branch_4d24f note G_, 4 note A_, 4 note G_, 4 @@ -691,15 +689,15 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 note E_, 4 octave 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note A_, 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - note __, 3 - intensity $a8 + rest 3 + volume_envelope 10, 8 note A#, 1 note B_, 4 note A_, 4 @@ -707,9 +705,9 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 note G#, 1 note A_, 11 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 octave 5 note D_, 2 octave 4 @@ -719,491 +717,486 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 octave 5 note F_, 1 note F#, 7 - vibrato $14, $4 - callchannel Music_Pinballendcredits_branch_4d23e - intensity $a8 + vibrato 20, 0, 4 + sound_call Music_EndCredits_branch_4d23e + volume_envelope 10, 8 note G_, 6 octave 2 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 note A#, 1 - intensity $28 + volume_envelope 2, 8 note A#, 1 - intensity $a8 + volume_envelope 10, 8 octave 3 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 octave 2 note D_, 6 -Music_Pinballendcredits_branch_4d073: ; 4d073 +Music_EndCredits_branch_4d073: octave 5 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 - loopchannel 3, Music_Pinballendcredits_branch_4d073 + volume_envelope 10, 8 + sound_loop 3, Music_EndCredits_branch_4d073 note F#, 6 octave 2 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 - callchannel Music_Pinballendcredits_branch_4d23e - intensity $68 + volume_envelope 10, 8 + sound_call Music_EndCredits_branch_4d23e + volume_envelope 6, 8 note G_, 6 -Music_Pinballendcredits_branch_4d098: ; 4d098 - intensity $68 +Music_EndCredits_branch_4d098: + volume_envelope 6, 8 note G_, 1 - intensity $18 + volume_envelope 1, 8 note G_, 1 - loopchannel 3, Music_Pinballendcredits_branch_4d098 - intensity $88 + sound_loop 3, Music_EndCredits_branch_4d098 + volume_envelope 8, 8 note G#, 6 -Music_Pinballendcredits_branch_4d0a5: ; 4d0a5 - intensity $78 +Music_EndCredits_branch_4d0a5: + volume_envelope 7, 8 note G#, 1 - intensity $18 + volume_envelope 1, 8 note G#, 1 - loopchannel 3, Music_Pinballendcredits_branch_4d0a5 -Music_Pinballendcredits_branch_4d0af: ; 4d0af - notetype $c, $a8 + sound_loop 3, Music_EndCredits_branch_4d0a5 +Music_EndCredits_branch_4d0af: + note_type 12, 10, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - loopchannel 2, Music_Pinballendcredits_branch_4d0af -Music_Pinballendcredits_branch_4d0ba: ; 4d0ba - notetype $8, $b8 + sound_loop 2, Music_EndCredits_branch_4d0af +Music_EndCredits_branch_4d0ba: + note_type 8, 11, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - loopchannel 2, Music_Pinballendcredits_branch_4d0ba - intensity $b8 + sound_loop 2, Music_EndCredits_branch_4d0ba + volume_envelope 11, 8 note A_, 1 - vibrato $14, $24 - dutycycle $2 - intensity $78 + vibrato 20, 2, 4 + duty_cycle 2 + volume_envelope 7, 8 octave 4 note D#, 1 - notetype $c, $a8 + note_type 12, 10, 8 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 2 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note A#, 2 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 2 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $a8 + volume_envelope 10, 8 note A#, 2 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $a8 + volume_envelope 10, 8 octave 5 note D_, 2 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note B_, 2 octave 5 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - intensity $a8 + volume_envelope 10, 8 note C_, 2 octave 4 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 2 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 2 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 2 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 3 note F_, 1 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 2 - intensity $28 + volume_envelope 2, 8 note F#, 1 - note __, 1 - intensity $a8 + rest 1 + volume_envelope 10, 8 note G_, 2 - notetype $8, $a8 + note_type 8, 10, 8 octave 5 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - intensity $a8 + volume_envelope 10, 8 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - intensity $a8 + volume_envelope 10, 8 note D_, 1 - intensity $78 - dutycycle $3 + volume_envelope 7, 8 + duty_cycle 3 octave 3 note D#, 1 - notetype $6, $a8 + note_type 6, 10, 8 note E_, 2 - intensity $28 + volume_envelope 2, 8 note E_, 2 - intensity $a8 + volume_envelope 10, 8 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note A_, 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note A#, 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note A_, 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note B_, 2 - intensity $28 + volume_envelope 2, 8 note B_, 2 - intensity $a8 + volume_envelope 10, 8 note B_, 2 - intensity $28 + volume_envelope 2, 8 note B_, 2 - intensity $a8 + volume_envelope 10, 8 note A#, 4 note B_, 2 - intensity $28 + volume_envelope 2, 8 note B_, 2 - intensity $a8 + volume_envelope 10, 8 octave 4 note D_, 4 note C_, 2 - intensity $28 + volume_envelope 2, 8 note C_, 2 - intensity $a8 + volume_envelope 10, 8 octave 3 note B_, 4 octave 4 note D_, 2 - intensity $28 + volume_envelope 2, 8 note D_, 2 -Music_Pinballendcredits_branch_4d1a3: ; 4d1a3 - intensity $b8 +Music_EndCredits_branch_4d1a3: + volume_envelope 11, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - loopchannel 2, Music_Pinballendcredits_branch_4d1a3 - intensity $b8 + sound_loop 2, Music_EndCredits_branch_4d1a3 + volume_envelope 11, 8 note C_, 4 - intensity $28 + volume_envelope 2, 8 note C_, 2 - note __, 2 -Music_Pinballendcredits_branch_4d1b5: ; 4d1b5 - intensity $b8 + rest 2 +Music_EndCredits_branch_4d1b5: + volume_envelope 11, 8 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - loopchannel 2, Music_Pinballendcredits_branch_4d1b5 -Music_Pinballendcredits_branch_4d1bf: ; 4d1bf - intensity $b8 + sound_loop 2, Music_EndCredits_branch_4d1b5 +Music_EndCredits_branch_4d1bf: + volume_envelope 11, 8 note C#, 2 - intensity $28 + volume_envelope 2, 8 note C#, 2 - loopchannel 2, Music_Pinballendcredits_branch_4d1bf - notetype $8, $b8 + sound_loop 2, Music_EndCredits_branch_4d1bf + note_type 8, 11, 8 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $b8 + volume_envelope 11, 8 octave 4 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $b8 + volume_envelope 11, 8 octave 5 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 note D_, 12 - intensity $b8 + volume_envelope 11, 8 note F#, 12 - notetype $6, $a8 + note_type 6, 10, 8 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - callchannel Music_Pinballendcredits_branch_4d1f2 - loopchannel 0, Music_Pinballendcredits_branch_4cf36 -; 4d1f2 + sound_call Music_EndCredits_branch_4d1f2 + sound_loop 0, Music_EndCredits_branch_4cf36 -Music_Pinballendcredits_branch_4d1f2: ; 4d1f2 - intensity $a8 +Music_EndCredits_branch_4d1f2: + volume_envelope 10, 8 octave 4 note G_, 4 - intensity $28 + volume_envelope 2, 8 note G_, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 - pitchoffset 0, C_ + volume_envelope 10, 8 + transpose 0, 0 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 octave 5 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 octave 2 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - note __, 4 - endchannel -; 4d21e + rest 4 + sound_ret -Music_Pinballendcredits_branch_4d21e: ; 4d21e - notetype $6, $a8 +Music_EndCredits_branch_4d21e: + note_type 6, 10, 8 octave 4 note G_, 2 - intensity $28 + volume_envelope 2, 8 note G_, 2 - intensity $a8 + volume_envelope 10, 8 note G_, 4 - intensity $28 + volume_envelope 2, 8 note G_, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 - pitchoffset 0, C_ - endchannel -; 4d23e + volume_envelope 10, 8 + transpose 0, 0 + sound_ret -Music_Pinballendcredits_branch_4d23e: ; 4d23e - notetype $8, $a8 +Music_EndCredits_branch_4d23e: + note_type 8, 10, 8 octave 2 note D_, 6 -Music_Pinballendcredits_branch_4d243: ; 4d243 - intensity $a8 +Music_EndCredits_branch_4d243: + volume_envelope 10, 8 octave 5 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - loopchannel 3, Music_Pinballendcredits_branch_4d243 - endchannel -; 4d24f + sound_loop 3, Music_EndCredits_branch_4d243 + sound_ret -Music_Pinballendcredits_branch_4d24f: ; 4d24f +Music_EndCredits_branch_4d24f: octave 4 note B_, 4 note A#, 4 note A_, 4 note B_, 2 - intensity $28 + volume_envelope 2, 8 note B_, 2 - note __, 4 - intensity $a8 - endchannel -; 4d25b + rest 4 + volume_envelope 10, 8 + sound_ret -Music_Pinballendcredits_Ch3: ; 4d25b - notetype $8, $12 +Music_EndCredits_Ch3: + note_type 8, 1, 2 octave 1 note D_, 1 - intensity $22 + volume_envelope 2, 2 note D_, 1 note D_, 1 - notetype $c, $22 + note_type 12, 2, 2 octave 2 note D_, 16 - notetype $6, $32 + note_type 6, 3, 2 octave 1 note D_, 5 - note __, 3 + rest 3 note D_, 5 - note __, 3 - intensity $22 + rest 3 + volume_envelope 2, 2 note D_, 3 - note __, 1 - notetype $8, $12 + rest 1 + note_type 8, 1, 2 octave 3 note D_, 1 - intensity $32 + volume_envelope 3, 2 note D_, 1 note D_, 1 - intensity $12 + volume_envelope 1, 2 note D_, 3 octave 2 note D_, 1 - intensity $22 + volume_envelope 2, 2 note D_, 1 note D_, 1 - callchannel Music_Pinballendcredits_branch_4d401 - note __, 2 + sound_call Music_EndCredits_branch_4d401 + rest 2 octave 1 note G_, 2 - note __, 6 -Music_Pinballendcredits_branch_4d28e: ; 4d28e - callchannel Music_Pinballendcredits_branch_4d401 - intensity $32 + rest 6 +Music_EndCredits_branch_4d28e: + sound_call Music_EndCredits_branch_4d401 + volume_envelope 3, 2 octave 1 note A_, 1 note G#, 1 - intensity $22 + volume_envelope 2, 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - callchannel Music_Pinballendcredits_branch_4d401 - note __, 2 - intensity $32 + rest 1 + sound_call Music_EndCredits_branch_4d401 + rest 2 + volume_envelope 3, 2 note G_, 4 note F#, 1 note F_, 1 note E_, 1 note D#, 1 - intensity $22 + volume_envelope 2, 2 octave 2 note G_, 2 - note __, 2 + rest 2 note G_, 4 - note __, 4 + rest 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 2 note G_, 2 octave 4 note B_, 6 - note __, 2 -Music_Pinballendcredits_branch_4d2bd: ; 4d2bd + rest 2 +Music_EndCredits_branch_4d2bd: octave 1 note G_, 2 - note __, 2 + rest 2 note G_, 4 - note __, 4 + rest 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 4 - note __, 4 + rest 4 octave 1 note G_, 1 - note __, 1 - intensity $32 + rest 1 + volume_envelope 3, 2 note G_, 1 - note __, 1 - intensity $22 - loopchannel 2, Music_Pinballendcredits_branch_4d2bd + rest 1 + volume_envelope 2, 2 + sound_loop 2, Music_EndCredits_branch_4d2bd octave 2 note C_, 1 - note __, 1 + rest 1 note G_, 2 note C_, 2 octave 1 note G_, 2 octave 2 note C_, 6 - note __, 2 + rest 2 note C#, 1 - note __, 3 + rest 3 note G_, 4 - notetype $8, $22 + note_type 8, 2, 2 note C#, 2 note G_, 2 octave 3 note C#, 2 - notetype $6, $22 + note_type 6, 2, 2 octave 2 note C#, 1 note D_, 3 note D_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 6 + rest 6 octave 3 note D_, 2 note F#, 2 @@ -1211,514 +1204,507 @@ Music_Pinballendcredits_branch_4d2bd: ; 4d2bd note C_, 2 note D_, 2 note C#, 8 - callchannel Music_Pinballendcredits_branch_4d412 + sound_call Music_EndCredits_branch_4d412 octave 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 note D#, 2 octave 1 note G_, 2 note G_, 2 - callchannel Music_Pinballendcredits_branch_4d412 + sound_call Music_EndCredits_branch_4d412 octave 2 note B_, 4 - note __, 4 + rest 4 octave 1 note G_, 2 note G_, 2 octave 2 note C_, 2 - note __, 2 + rest 2 octave 1 note G_, 2 - note __, 6 + rest 6 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 3 note C#, 8 octave 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 6 + rest 6 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 13 - notetype $8, $32 + rest 13 + note_type 8, 3, 2 octave 3 note D_, 1 note D_, 1 note D_, 1 - intensity $22 + volume_envelope 2, 2 octave 1 note D_, 6 octave 2 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 - intensity $32 + rest 1 + volume_envelope 3, 2 octave 3 note D#, 6 - intensity $22 + volume_envelope 2, 2 octave 1 note C#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 1 note D_, 6 octave 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $32 + rest 1 + volume_envelope 3, 2 octave 3 note D_, 6 - intensity $22 + volume_envelope 2, 2 octave 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 6 octave 2 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 - intensity $32 + rest 1 + volume_envelope 3, 2 note D_, 6 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 + rest 1 note D_, 6 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 - notetype $c, $12 + rest 1 + note_type 12, 1, 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - notetype $8, $12 + rest 1 + note_type 8, 1, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 - notetype $c, $22 + rest 1 + note_type 12, 2, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note G_, 2 note C#, 1 - note __, 1 + rest 1 note C#, 2 note G_, 2 note C#, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 2 note E_, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 octave 3 note E_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 4 octave 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 2 - notetype $8, $22 + note_type 8, 2, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - intensity $32 + volume_envelope 3, 2 note B_, 1 octave 3 note C_, 12 note C#, 12 note D_, 12 note E_, 12 - notetype $6, $12 + note_type 6, 1, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 4 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - notetype $8, $12 + rest 2 + note_type 8, 1, 2 note C#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - intensity $22 + rest 1 + volume_envelope 2, 2 note A_, 12 octave 3 note D_, 12 - callchannel Music_Pinballendcredits_branch_4d401 - note __, 2 + sound_call Music_EndCredits_branch_4d401 + rest 2 octave 1 note G_, 2 - note __, 6 - loopchannel 0, Music_Pinballendcredits_branch_4d28e -; 4d401 + rest 6 + sound_loop 0, Music_EndCredits_branch_4d28e -Music_Pinballendcredits_branch_4d401: ; 4d401 - notetype $6, $22 +Music_EndCredits_branch_4d401: + note_type 6, 2, 2 octave 2 note G_, 2 - note __, 2 + rest 2 note G_, 4 - note __, 4 + rest 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - endchannel -; 4d412 + sound_ret -Music_Pinballendcredits_branch_4d412: ; 4d412 +Music_EndCredits_branch_4d412: octave 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 2 note B_, 4 - note __, 4 + rest 4 octave 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - endchannel -; 4d424 - -Music_Pinballendcredits_Ch4: ; 4d424 - togglenoise $1 - notetype $8 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $c - note B_, 16 - note __, 15 - notetype $6 - note C#, 1 - note C#, 1 -Music_Pinballendcredits_branch_4d433: ; 4d433 - notetype $6 - callchannel Music_Pinballendcredits_branch_4d51d - loopchannel 4, Music_Pinballendcredits_branch_4d433 - note E_, 4 - note C#, 8 - note D_, 2 - note C#, 2 - note E_, 4 - note D_, 8 - note D_, 2 - note C#, 2 - note E_, 4 - note C#, 8 - note D_, 2 - note C#, 2 - note E_, 4 - note C#, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note E_, 2 - note C#, 2 - note D_, 4 - note E_, 8 - note E_, 4 - note D_, 4 - notetype $8 - note E_, 2 - note D_, 2 - note E_, 2 - notetype $c - note D_, 1 - note C#, 1 - note D_, 2 - note D_, 4 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - notetype $6 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 2 - note D_, 2 - note C#, 8 - note D_, 2 - note C#, 2 - note E_, 4 - note D_, 4 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 4 - note D_, 8 - note D_, 2 - note C#, 2 - note E_, 2 - note D_, 2 - note E_, 4 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 4 - note D_, 8 - note D_, 2 - note C#, 2 - note E_, 4 - note D_, 12 - callchannel Music_Pinballendcredits_branch_4d51d -Music_Pinballendcredits_branch_4d493: ; 4d493 - note B_, 8 - notetype $8 - note E_, 2 - note C#, 2 - note D_, 2 - note E_, 3 - note D_, 3 - notetype $6 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 3, Music_Pinballendcredits_branch_4d493 - note D_, 4 - note C#, 4 - notetype $8 - note E_, 2 - note C#, 2 - note D_, 2 - note E_, 3 - note D_, 3 - note E_, 2 - note C#, 2 - note D_, 2 - note D_, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 3 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $6 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 4 - note C#, 4 - note E_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note E_, 4 - note C#, 4 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 4 - note C#, 2 - note D_, 2 - note B_, 8 - note E_, 4 - notetype $8 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $c - note B_, 4 - note E_, 2 - note C#, 2 - note E_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note E_, 2 - note C#, 2 - notetype $8 - note E_, 2 - note C#, 2 - note D_, 2 - notetype $c - note B_, 16 - note __, 16 - note E_, 1 - note D_, 1 - note E_, 4 - note E_, 1 - note D_, 1 - note E_, 2 - note E_, 2 - notetype $8 - note E_, 2 - note D_, 2 - note E_, 2 - notetype $6 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $8 - note E_, 1 - note D_, 1 - note D_, 1 - note B_, 12 - loopchannel 0, Music_Pinballendcredits_branch_4d433 -; 4d51d - -Music_Pinballendcredits_branch_4d51d: ; 4d51d - note E_, 4 - note C#, 8 - note D_, 2 - note C#, 2 - note E_, 4 - note D_, 4 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - endchannel -; 4d52c + rest 1 + sound_ret +Music_EndCredits_Ch4: + toggle_noise 1 + drum_speed 8 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 12, 16 + rest 15 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 +Music_EndCredits_branch_4d433: + drum_speed 6 + sound_call Music_EndCredits_branch_4d51d + sound_loop 4, Music_EndCredits_branch_4d433 + drum_note 5, 4 + drum_note 2, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 3, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 2, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 2, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 5, 8 + drum_note 5, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_speed 12 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 6 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 2 + drum_note 3, 2 + drum_note 2, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 3, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 4 + drum_note 3, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 4 + drum_note 3, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 3, 12 + sound_call Music_EndCredits_branch_4d51d +Music_EndCredits_branch_4d493: + drum_note 12, 8 + drum_speed 8 + drum_note 5, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 5, 3 + drum_note 3, 3 + drum_speed 6 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 3, Music_EndCredits_branch_4d493 + drum_note 3, 4 + drum_note 2, 4 + drum_speed 8 + drum_note 5, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 5, 3 + drum_note 3, 3 + drum_note 5, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 6 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_note 2, 4 + drum_note 5, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 2, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 4 + drum_note 2, 2 + drum_note 3, 2 + drum_note 12, 8 + drum_note 5, 4 + drum_speed 8 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 12, 4 + drum_note 5, 2 + drum_note 2, 2 + drum_note 5, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 5, 2 + drum_note 2, 2 + drum_speed 8 + drum_note 5, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 12, 16 + rest 16 + drum_note 5, 1 + drum_note 3, 1 + drum_note 5, 4 + drum_note 5, 1 + drum_note 3, 1 + drum_note 5, 2 + drum_note 5, 2 + drum_speed 8 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 5, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 12, 12 + sound_loop 0, Music_EndCredits_branch_4d433 +Music_EndCredits_branch_4d51d: + drum_note 5, 4 + drum_note 2, 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 5, 4 + drum_note 3, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_ret diff --git a/crysaudio/music/pinball/fieldselect.asm b/crysaudio/music/pinball/fieldselect.asm index 76e73f7b..95a803aa 100644 --- a/crysaudio/music/pinball/fieldselect.asm +++ b/crysaudio/music/pinball/fieldselect.asm @@ -1,447 +1,439 @@ -Music_Pinballfieldselect: ; 494bb - dbw $c0, Music_Pinballfieldselect_Ch1 - dbw $01, Music_Pinballfieldselect_Ch2 - dbw $02, Music_Pinballfieldselect_Ch3 - dbw $03, Music_Pinballfieldselect_Ch4 -; 494c7 +Music_FieldSelect: + channel_count 4 + channel 1, Music_FieldSelect_Ch1 + channel 2, Music_FieldSelect_Ch2 + channel 3, Music_FieldSelect_Ch3 + channel 4, Music_FieldSelect_Ch4 -Music_Pinballfieldselect_Ch1: ; 494c7 +Music_FieldSelect_Ch1: tempo 152 - volume $77 - tone $0001 - dutycycle $2 - notetype $8, $71 - note __, 12 - note __, 2 + volume 7, 7 + pitch_offset 1 + duty_cycle 2 + note_type 8, 7, 1 + rest 12 + rest 2 octave 6 note F_, 2 - note __, 2 - dutycycle $3 - notetype $6, $58 + rest 2 + duty_cycle 3 + note_type 6, 5, 8 octave 5 note C_, 1 note C#, 1 - intensity $68 + volume_envelope 6, 8 note C_, 1 note C#, 1 - intensity $78 + volume_envelope 7, 8 note C_, 1 - intensity $98 + volume_envelope 9, 8 note C#, 1 - intensity $b8 + volume_envelope 11, 8 note C_, 1 note C#, 1 -Music_Pinballfieldselect_branch_494ef: ; 494ef - dutycycle $2 - intensity $a8 +Music_FieldSelect_branch_494ef: + duty_cycle 2 + volume_envelope 10, 8 octave 3 note A#, 1 - note __, 16 - note __, 5 - callchannel Music_Pinballfieldselect_branch_49514 - note __, 14 - callchannel Music_Pinballfieldselect_branch_49514 - note __, 14 - callchannel Music_Pinballfieldselect_branch_49514 - panning $ff - note __, 14 - intensity $a4 + rest 16 + rest 5 + sound_call Music_FieldSelect_branch_49514 + rest 14 + sound_call Music_FieldSelect_branch_49514 + rest 14 + sound_call Music_FieldSelect_branch_49514 + force_stereo_panning TRUE, TRUE + rest 14 + volume_envelope 10, 4 octave 3 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $a4 + volume_envelope 10, 4 note A#, 4 note B_, 4 - loopchannel 0, Music_Pinballfieldselect_branch_494ef -; 49514 + sound_loop 0, Music_FieldSelect_branch_494ef -Music_Pinballfieldselect_branch_49514: ; 49514 - intensity $81 +Music_FieldSelect_branch_49514: + volume_envelope 8, 1 octave 4 note F#, 2 - panning $f + force_stereo_panning FALSE, TRUE note A#, 2 - intensity $74 + volume_envelope 7, 4 note F#, 2 - panning $f0 - intensity $64 + force_stereo_panning TRUE, FALSE + volume_envelope 6, 4 note A#, 2 - intensity $54 + volume_envelope 5, 4 note F#, 2 - panning $f - intensity $44 + force_stereo_panning FALSE, TRUE + volume_envelope 4, 4 note A#, 2 - intensity $34 + volume_envelope 3, 4 note F#, 2 - panning $f0 - intensity $24 + force_stereo_panning TRUE, FALSE + volume_envelope 2, 4 note A#, 2 - intensity $14 + volume_envelope 1, 4 note F#, 2 - endchannel -; 49537 + sound_ret -Music_Pinballfieldselect_Ch2: ; 49537 - dutycycle $2 - notetype $c, $b4 +Music_FieldSelect_Ch2: + duty_cycle 2 + note_type 12, 11, 4 octave 4 note C#, 1 octave 3 note C#, 1 - intensity $24 + volume_envelope 2, 4 note C#, 1 - intensity $b4 + volume_envelope 11, 4 note C#, 1 note C#, 1 octave 4 note C#, 1 octave 3 note C#, 1 - intensity $24 + volume_envelope 2, 4 note C#, 1 - notetype $8, $b4 + note_type 8, 11, 4 note C#, 2 octave 5 note C#, 2 octave 3 note C#, 2 - notetype $c, $b4 + note_type 12, 11, 4 octave 4 note C#, 1 octave 3 note C#, 1 - notetype $6, $b4 + note_type 6, 11, 4 note B_, 1 octave 4 note C_, 3 -Music_Pinballfieldselect_branch_49563: ; 49563 - intensity $b4 +Music_FieldSelect_branch_49563: + volume_envelope 11, 4 note C#, 1 - intensity $24 + volume_envelope 2, 4 note C#, 1 - intensity $91 + volume_envelope 9, 1 octave 3 note F#, 2 note C#, 2 - intensity $b4 + volume_envelope 11, 4 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note C#, 1 - intensity $24 + volume_envelope 2, 4 note C#, 1 - intensity $91 + volume_envelope 9, 1 octave 4 note F#, 2 - intensity $b4 + volume_envelope 11, 4 note C#, 1 - intensity $24 + volume_envelope 2, 4 note C#, 1 - note __, 2 - intensity $b4 + rest 2 + volume_envelope 11, 4 note C#, 1 - intensity $24 + volume_envelope 2, 4 note C#, 1 - intensity $91 + volume_envelope 9, 1 note A#, 2 - intensity $b4 + volume_envelope 11, 4 octave 3 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note C#, 2 - intensity $94 + volume_envelope 9, 4 octave 4 note C_, 1 - intensity $b4 + volume_envelope 11, 4 note C#, 3 - callchannel Music_Pinballfieldselect_branch_49630 - note __, 2 - intensity $b4 + sound_call Music_FieldSelect_branch_49630 + rest 2 + volume_envelope 11, 4 note D_, 1 - intensity $24 + volume_envelope 2, 4 note D_, 1 - intensity $91 + volume_envelope 9, 1 note A#, 2 - intensity $b4 + volume_envelope 11, 4 octave 3 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note D_, 2 - intensity $94 + volume_envelope 9, 4 octave 4 note C#, 1 - intensity $b4 + volume_envelope 11, 4 note D_, 3 note D#, 1 - intensity $24 + volume_envelope 2, 4 note D#, 1 - intensity $91 + volume_envelope 9, 1 octave 3 note F#, 2 note D#, 2 - intensity $b4 + volume_envelope 11, 4 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note D#, 1 - intensity $24 + volume_envelope 2, 4 note D#, 1 - intensity $91 + volume_envelope 9, 1 octave 4 note F#, 2 - intensity $b4 + volume_envelope 11, 4 note D#, 1 - intensity $24 + volume_envelope 2, 4 note D#, 1 - note __, 2 - intensity $b4 + rest 2 + volume_envelope 11, 4 note D#, 1 - intensity $24 + volume_envelope 2, 4 note D#, 1 - intensity $91 + volume_envelope 9, 1 note A#, 2 - intensity $b4 + volume_envelope 11, 4 octave 3 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note D#, 2 - intensity $94 + volume_envelope 9, 4 octave 4 note D_, 1 - intensity $b4 + volume_envelope 11, 4 note D#, 3 - callchannel Music_Pinballfieldselect_branch_49630 - note __, 2 - intensity $b4 + sound_call Music_FieldSelect_branch_49630 + rest 2 + volume_envelope 11, 4 note D_, 1 - intensity $24 + volume_envelope 2, 4 note D_, 1 - intensity $91 + volume_envelope 9, 1 note A#, 2 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 4 note G#, 4 - loopchannel 0, Music_Pinballfieldselect_branch_49563 -; 49630 + sound_loop 0, Music_FieldSelect_branch_49563 -Music_Pinballfieldselect_branch_49630: ; 49630 - intensity $b4 +Music_FieldSelect_branch_49630: + volume_envelope 11, 4 note D_, 1 - intensity $24 + volume_envelope 2, 4 note D_, 1 - intensity $91 + volume_envelope 9, 1 octave 3 note F#, 2 note D_, 2 - intensity $b4 + volume_envelope 11, 4 note A#, 1 - intensity $24 + volume_envelope 2, 4 note A#, 1 - intensity $b4 + volume_envelope 11, 4 note F#, 1 - intensity $24 + volume_envelope 2, 4 note F#, 1 - intensity $b4 + volume_envelope 11, 4 note D_, 1 - intensity $24 + volume_envelope 2, 4 note D_, 1 - intensity $91 + volume_envelope 9, 1 octave 4 note F#, 2 - intensity $b4 + volume_envelope 11, 4 note D_, 1 - intensity $24 + volume_envelope 2, 4 note D_, 1 - endchannel -; 49658 + sound_ret -Music_Pinballfieldselect_Ch3: ; 49658 - notetype $6, $22 +Music_FieldSelect_Ch3: + note_type 6, 2, 2 octave 1 note B_, 3 - note __, 1 + rest 1 octave 2 note C_, 3 - note __, 1 + rest 1 note C#, 3 - note __, 1 + rest 1 note D_, 3 - note __, 1 - notetype $8, $22 + rest 1 + note_type 8, 2, 2 note D#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - notetype $c, $22 + rest 1 + note_type 12, 2, 2 note F_, 1 octave 3 note F_, 1 - notetype $6, $22 + note_type 6, 2, 2 note G#, 1 note A_, 3 -Music_Pinballfieldselect_branch_49678: ; 49678 +Music_FieldSelect_branch_49678: octave 1 note F#, 4 - note __, 2 + rest 2 octave 2 note C#, 1 - note __, 1 + rest 1 note C#, 6 octave 1 note F#, 1 - note __, 3 + rest 3 octave 2 note C#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note F#, 4 octave 1 note F#, 2 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 octave 2 note D_, 1 - note __, 1 + rest 1 note D_, 6 octave 1 note F#, 1 - note __, 3 + rest 3 octave 2 note D_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note F#, 4 octave 1 note F#, 2 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 octave 2 note D#, 1 - note __, 1 + rest 1 note D#, 6 octave 1 note F#, 1 - note __, 3 + rest 3 octave 2 note D#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note F#, 4 octave 1 note F#, 2 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 octave 2 note D_, 1 - note __, 1 + rest 1 note D_, 6 octave 1 note F#, 1 - note __, 3 + rest 3 octave 2 note D_, 1 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 4 octave 2 note F_, 4 - loopchannel 0, Music_Pinballfieldselect_branch_49678 -; 496c5 - -Music_Pinballfieldselect_Ch4: ; 496c5 - togglenoise $0 - notetype $6 - note G#, 1 - note G#, 1 - note G#, 4 - note F#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note F#, 2 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c - note D#, 1 - note D_, 1 - note D_, 2 -Music_Pinballfieldselect_branch_496db: ; 496db - note D#, 4 - note D_, 1 - note D#, 2 - note D#, 2 - note D#, 5 - note D_, 2 - note D#, 3 - note C#, 1 - note D_, 1 - note D#, 2 - note D#, 2 - note D#, 3 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 3 - note D#, 1 - note D_, 3 - note D#, 4 - note D#, 2 - note D#, 1 - note D_, 2 - note D#, 3 - note D#, 1 - note D_, 2 - note D#, 2 - note D#, 3 - note D_, 1 - note D_, 2 - note D_, 1 - note D_, 1 - loopchannel 0, Music_Pinballfieldselect_branch_496db -; 496fe - + sound_loop 0, Music_FieldSelect_branch_49678 +Music_FieldSelect_Ch4: + toggle_noise 0 + drum_speed 6 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 4 + drum_note 7, 2 + drum_note 9, 2 + drum_note 7, 2 + drum_note 9, 2 + drum_note 7, 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 2 +Music_FieldSelect_branch_496db: + drum_note 4, 4 + drum_note 3, 1 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 5 + drum_note 3, 2 + drum_note 4, 3 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 3 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 3 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 4 + drum_note 4, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 3 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 3 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, Music_FieldSelect_branch_496db diff --git a/crysaudio/music/pinball/gameover.asm b/crysaudio/music/pinball/gameover.asm index e3dafa97..7ccd8d03 100644 --- a/crysaudio/music/pinball/gameover.asm +++ b/crysaudio/music/pinball/gameover.asm @@ -1,16 +1,16 @@ -Music_Pinballgameover: ; 4231d - dbw $c0, Music_Pinballgameover_Ch1 - dbw $01, Music_Pinballgameover_Ch2 - dbw $02, Music_Pinballgameover_Ch3 - dbw $03, Music_Pinballgameover_Ch4 -; 42329 +Music_GameOver: + channel_count 4 + channel 1, Music_GameOver_Ch1 + channel 2, Music_GameOver_Ch2 + channel 3, Music_GameOver_Ch3 + channel 4, Music_GameOver_Ch4 -Music_Pinballgameover_Ch1: ; 42329 +Music_GameOver_Ch1: tempo 152 - volume $77 - dutycycle $3 - vibrato $18, $34 - notetype $8, $91 + volume 7, 7 + duty_cycle 3 + vibrato 24, 3, 4 + note_type 8, 9, 1 octave 3 note C_, 2 note F_, 2 @@ -26,172 +26,166 @@ Music_Pinballgameover_Ch1: ; 42329 note G#, 2 octave 5 note C_, 2 - intensity $98 + volume_envelope 9, 8 octave 3 note G_, 4 - intensity $71 + volume_envelope 7, 1 note A#, 2 octave 4 note D_, 2 octave 3 note A#, 2 - intensity $98 + volume_envelope 9, 8 note A_, 6 - intensity $71 + volume_envelope 7, 1 note C_, 2 - intensity $98 + volume_envelope 9, 8 note F_, 4 - intensity $71 + volume_envelope 7, 1 note C_, 2 - notetype $c, $98 + note_type 12, 9, 8 note E_, 16 - intensity $78 + volume_envelope 7, 8 note B_, 8 - vibrato $0, $34 - intensity $77 + vibrato 0, 3, 4 + volume_envelope 7, 7 note B_, 8 - note __, 2 - endchannel -; 4236b + rest 2 + sound_ret -Music_Pinballgameover_Ch2: ; 4236b - dutycycle $1 - vibrato $20, $34 - notetype $8, $a8 +Music_GameOver_Ch2: + duty_cycle 1 + vibrato 32, 3, 4 + note_type 8, 10, 8 octave 5 note E_, 4 octave 4 note F_, 1 - intensity $28 + volume_envelope 2, 8 note F_, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 6 note F_, 1 - intensity $28 + volume_envelope 2, 8 note F_, 1 - intensity $a8 + volume_envelope 10, 8 note D#, 4 note F_, 1 - intensity $28 + volume_envelope 2, 8 note F_, 1 - intensity $a8 + volume_envelope 10, 8 note D_, 4 octave 4 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $a8 + volume_envelope 10, 8 note G_, 1 - intensity $28 + volume_envelope 2, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note A#, 1 - intensity $28 + volume_envelope 2, 8 note A#, 1 - intensity $a8 + volume_envelope 10, 8 octave 5 note C_, 6 octave 4 note D_, 1 - intensity $28 + volume_envelope 2, 8 note D_, 1 - intensity $a8 + volume_envelope 10, 8 octave 5 note C_, 4 octave 4 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - notetype $c, $a8 + note_type 12, 10, 8 note B_, 16 - intensity $88 + volume_envelope 8, 8 octave 5 note D_, 8 - vibrato $0, $34 - intensity $87 + vibrato 0, 3, 4 + volume_envelope 8, 7 octave 5 note D_, 8 - note __, 2 - endchannel -; 423cc + rest 2 + sound_ret -Music_Pinballgameover_Ch3: ; 423cc - notetype $8, $22 +Music_GameOver_Ch3: + note_type 8, 2, 2 octave 2 note F_, 4 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note G#, 6 octave 3 note D#, 1 - note __, 1 + rest 1 note C_, 4 note D#, 1 - note __, 1 + rest 1 octave 2 note D#, 4 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 6 note A_, 1 - note __, 1 + rest 1 note G#, 4 note F_, 1 - note __, 1 - notetype $c, $22 + rest 1 + note_type 12, 2, 2 note C_, 16 note C_, 8 note C_, 8 - note __, 2 - endchannel -; 423f8 - -Music_Pinballgameover_Ch4: ; 423f8 - togglenoise $0 - notetype $8 - note D_, 4 - note D#, 2 - note D_, 2 - note C#, 4 - note C#, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note C#, 4 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 6 - note F#, 6 - note F#, 2 - notetype $c - note B_, 16 - note __, 16 - note __, 2 - endchannel -; 42413 - + rest 2 + sound_ret +Music_GameOver_Ch4: + toggle_noise 0 + drum_speed 8 + drum_note 3, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 2, 4 + drum_note 2, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 6 + drum_note 7, 6 + drum_note 7, 2 + drum_speed 12 + drum_note 12, 16 + rest 16 + rest 2 + sound_ret diff --git a/crysaudio/music/pinball/gastlyinthegraveyard.asm b/crysaudio/music/pinball/gastlyinthegraveyard.asm new file mode 100644 index 00000000..40d69afe --- /dev/null +++ b/crysaudio/music/pinball/gastlyinthegraveyard.asm @@ -0,0 +1,376 @@ +Music_GastlyInTheGraveyard: + channel_count 3 + channel 1, Music_GastlyInTheGraveyard_Ch1 + channel 2, Music_GastlyInTheGraveyard_Ch2 + channel 3, Music_GastlyInTheGraveyard_Ch3 + +Music_GastlyInTheGraveyard_Ch1: + tempo 272 + volume 7, 7 +Music_GastlyInTheGraveyard_branch_3ddf8: + vibrato 18, 3, 3 + duty_cycle 3 + note_type 6, 4, 8 + octave 5 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note_type 12, 4, 8 + octave 6 + note C_, 14 + vibrato 0, 3, 3 + volume_envelope 4, 6 + note C_, 8 + rest 8 + rest 16 + rest 16 + rest 16 + vibrato 18, 3, 3 + duty_cycle 3 + note_type 6, 4, 8 + octave 4 + note G#, 1 + note A_, 16 + vibrato 0, 3, 3 + note A_, 11 + volume_envelope 3, 8 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + duty_cycle 2 + vibrato 18, 5, 3 + note_type 6, 11, 8 + octave 3 + note D_, 2 + note C#, 2 + note G_, 2 + note_type 12, 9, 8 + note F#, 9 + note_type 6, 4, 8 + note F_, 1 + note E_, 1 + note_type 6, 2, 8 + note D#, 1 + note D_, 1 + note_type 12, 11, 3 + rest 2 + rest 16 + sound_loop 0, Music_GastlyInTheGraveyard_branch_3ddf8 + +Music_GastlyInTheGraveyard_Ch2: + pitch_offset 1 +Music_GastlyInTheGraveyard_branch_3de4f: + duty_cycle 3 + vibrato 18, 3, 3 + note_type 6, 4, 8 + octave 6 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note_type 12, 4, 8 + note F_, 14 + vibrato 0, 3, 3 + volume_envelope 4, 6 + note F_, 8 + duty_cycle 2 + vibrato 18, 3, 3 + note_type 6, 9, 8 + octave 4 + note F#, 1 + volume_envelope 2, 8 + note F#, 1 + volume_envelope 9, 8 + note F_, 1 + volume_envelope 2, 8 + note F_, 1 + volume_envelope 9, 8 + note A#, 1 + volume_envelope 2, 8 + note A#, 1 + volume_envelope 9, 8 + note A_, 4 + volume_envelope 6, 8 + note C#, 4 + volume_envelope 4, 8 + note C_, 2 + volume_envelope 1, 8 + note C_, 2 + volume_envelope 6, 8 + octave 3 + note A#, 4 + volume_envelope 8, 8 + note A_, 2 + volume_envelope 2, 8 + note A_, 2 + volume_envelope 8, 8 + note F#, 6 + sound_call Music_GastlyInTheGraveyard_branch_3dee0 + sound_call Music_GastlyInTheGraveyard_branch_3dee0 + rest 16 + duty_cycle 3 + volume_envelope 4, 8 + octave 5 + note G_, 1 + note G#, 16 + vibrato 0, 3, 3 + note G#, 11 + vibrato 18, 3, 3 + volume_envelope 3, 8 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + duty_cycle 2 + vibrato 18, 5, 3 + volume_envelope 11, 8 + octave 3 + note F#, 2 + note F_, 2 + note B_, 2 + note_type 12, 10, 8 + note A#, 9 + note_type 6, 4, 8 + note A_, 1 + note G#, 1 + note_type 6, 3, 8 + note G_, 1 + note F#, 1 + volume_envelope 7, 8 + octave 1 + note F#, 4 + note_type 12, 11, 3 + rest 14 + note_type 6, 10, 8 + octave 2 + note B_, 1 + note A#, 1 + note G_, 1 + note F#, 1 + sound_loop 0, Music_GastlyInTheGraveyard_branch_3de4f + +Music_GastlyInTheGraveyard_branch_3dee0: + volume_envelope 2, 8 + note F_, 1 + note F#, 1 + volume_envelope 3, 8 + note F_, 1 + note F#, 1 + volume_envelope 4, 8 + note F_, 1 + note F#, 1 + volume_envelope 5, 8 + note F_, 1 + note F#, 1 + volume_envelope 6, 8 + note F_, 1 + note F#, 1 + volume_envelope 7, 8 + note F_, 1 + note F#, 1 + volume_envelope 11, 8 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + volume_envelope 10, 8 + note F_, 1 + note F#, 1 + volume_envelope 8, 8 + note F_, 1 + note F#, 1 + volume_envelope 7, 8 + note F_, 1 + note F#, 1 + volume_envelope 6, 8 + note F_, 1 + note F#, 1 + volume_envelope 5, 8 + note F_, 1 + note F#, 1 + volume_envelope 4, 8 + note F_, 1 + note F#, 1 + volume_envelope 2, 8 + note F_, 1 + note F#, 1 + volume_envelope 1, 8 + note F_, 1 + note F#, 1 + sound_ret + +Music_GastlyInTheGraveyard_Ch3: + note_type 6, 2, 2 + octave 1 + note B_, 2 + note_type 6, 3, 2 + octave 2 + note B_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note_type 6, 2, 2 + octave 1 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + note_type 6, 3, 2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note_type 6, 2, 2 + octave 1 + note B_, 2 + note_type 6, 3, 2 + octave 3 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + rest 2 + note_type 6, 2, 2 + octave 1 + note B_, 2 + note_type 6, 3, 2 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + rest 2 + note_type 6, 2, 2 + octave 1 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note_type 6, 3, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 1 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note_type 6, 2, 2 + octave 2 + note D_, 2 + rest 6 + note_type 6, 3, 2 + note D_, 2 + rest 6 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 1 + note B_, 2 + rest 6 + note_type 6, 2, 2 + octave 2 + note D_, 2 + rest 6 + note_type 6, 3, 2 + note D_, 2 + rest 6 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 1 + note B_, 2 + rest 6 +Music_GastlyInTheGraveyard_branch_3dfb0: + note_type 6, 2, 2 + octave 1 + note B_, 2 + note_type 6, 3, 2 + octave 2 + note B_, 1 + rest 1 + octave 3 + note D_, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + sound_loop 3, Music_GastlyInTheGraveyard_branch_3dfb0 + note_type 6, 2, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + rest 1 + octave 3 + note D_, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + note_type 6, 2, 2 + octave 1 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note_type 6, 3, 2 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + note_type 6, 1, 2 + note F#, 4 + note_type 6, 3, 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + note_type 6, 2, 2 + note B_, 1 + note A#, 1 + note G_, 1 + note F#, 1 + sound_loop 0, Music_GastlyInTheGraveyard_Ch3 diff --git a/crysaudio/music/pinball/gengarinthegraveyard.asm b/crysaudio/music/pinball/gengarinthegraveyard.asm new file mode 100644 index 00000000..b499ff72 --- /dev/null +++ b/crysaudio/music/pinball/gengarinthegraveyard.asm @@ -0,0 +1,778 @@ +Music_GengarInTheGraveyard: + channel_count 4 + channel 1, Music_GengarInTheGraveyard_Ch1 + channel 2, Music_GengarInTheGraveyard_Ch2 + channel 3, Music_GengarInTheGraveyard_Ch3 + channel 4, Music_GengarInTheGraveyard_Ch4 + +Music_GengarInTheGraveyard_Ch1: + tempo 124 + volume 7, 7 + note_type 12, 11, 3 + duty_cycle 3 + note_type 6, 2, 1 + rest 16 + octave 4 + note E_, 1 + note A_, 1 + volume_envelope 4, 8 + note E_, 1 + note A_, 1 + volume_envelope 6, 8 + note E_, 1 + note A_, 1 + volume_envelope 8, 8 + note E_, 1 + note A_, 1 + volume_envelope 10, 8 + note E_, 1 + note A_, 1 + volume_envelope 8, 8 + note E_, 1 + note A_, 1 + volume_envelope 6, 8 + note E_, 1 + note A_, 1 + volume_envelope 4, 8 + note E_, 1 + note A_, 1 + volume_envelope 2, 8 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + volume_envelope 3, 8 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + volume_envelope 4, 8 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + volume_envelope 5, 8 + note F_, 1 + note G#, 1 + volume_envelope 6, 8 + note F_, 1 + note G#, 1 + volume_envelope 7, 8 + note F_, 1 + note G#, 1 + volume_envelope 8, 8 + note F_, 1 + note G#, 1 + volume_envelope 9, 8 + note F_, 1 + note G#, 1 + volume_envelope 10, 8 + note F_, 1 + note G#, 1 + volume_envelope 11, 8 + note F_, 1 + note G#, 1 +Music_GengarInTheGraveyard_branch_3e081: + vibrato 8, 3, 3 + volume_envelope 8, 1 + octave 2 + note F_, 2 + note F_, 1 + rest 1 + note F_, 2 + note F_, 1 + rest 1 + note F_, 2 + note F_, 1 + rest 1 + note F_, 2 + note F_, 1 + rest 1 + volume_envelope 8, 8 + octave 3 + note D_, 6 + octave 2 + note B_, 6 + note G#, 2 + rest 2 + volume_envelope 8, 1 + note C_, 2 + note C_, 1 + rest 1 + note C_, 2 + note C_, 1 + rest 1 + note C_, 2 + note C_, 1 + rest 1 + note C_, 2 + note C_, 1 + rest 1 + volume_envelope 8, 8 + note A_, 6 + note F#, 6 + note D#, 2 + rest 2 + sound_loop 2, Music_GengarInTheGraveyard_branch_3e081 + sound_call Music_GengarInTheGraveyard_branch_3e12f + transpose 0, 3 + sound_call Music_GengarInTheGraveyard_branch_3e12f + transpose 0, 8 + sound_call Music_GengarInTheGraveyard_branch_3e12f + transpose 0, 0 + volume_envelope 8, 8 + octave 4 + note C#, 4 + volume_envelope 8, 1 + octave 3 + note D#, 1 + rest 1 + volume_envelope 8, 8 + octave 4 + note C_, 4 + volume_envelope 8, 1 + octave 3 + note D_, 1 + rest 1 + volume_envelope 8, 8 + note B_, 4 + volume_envelope 8, 1 + note C#, 1 + rest 1 + volume_envelope 8, 8 + note A#, 4 + volume_envelope 8, 1 + note C_, 1 + rest 1 + volume_envelope 8, 8 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + sound_call Music_GengarInTheGraveyard_branch_3e14e + volume_envelope 8, 1 + octave 2 + note C_, 2 + note C_, 1 + rest 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + rest 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + rest 1 + note C#, 2 + note D_, 1 + rest 1 + note D#, 2 + note E_, 1 + rest 1 + note F_, 2 + note F#, 1 + rest 1 + note G_, 2 + sound_call Music_GengarInTheGraveyard_branch_3e14e + volume_envelope 8, 8 + octave 2 + note B_, 2 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note B_, 2 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + vibrato 6, 5, 3 + volume_envelope 8, 8 + octave 2 + note A#, 1 + note B_, 11 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + sound_loop 0, Music_GengarInTheGraveyard_branch_3e081 + +Music_GengarInTheGraveyard_branch_3e12f: + volume_envelope 8, 8 + octave 3 + note C_, 4 + volume_envelope 8, 1 + octave 2 + note C_, 2 + note C_, 1 + rest 1 + note C_, 2 + note C_, 1 + rest 1 + note C_, 2 + note C_, 1 + rest 1 + volume_envelope 8, 8 + octave 3 + note C_, 4 + volume_envelope 8, 1 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + rest 2 + volume_envelope 8, 8 + note F#, 6 + sound_ret + +Music_GengarInTheGraveyard_branch_3e14e: + volume_envelope 8, 1 + octave 2 + note F_, 2 + rest 2 + note F_, 2 + note F_, 2 + note G#, 2 + volume_envelope 8, 8 + note B_, 6 + volume_envelope 8, 1 + note F_, 2 + rest 2 + note F_, 2 + note F_, 2 + note B_, 2 + volume_envelope 8, 8 + octave 3 + note D_, 6 + sound_ret + +Music_GengarInTheGraveyard_Ch2: + duty_cycle 1 + vibrato 18, 3, 4 + note_type 6, 11, 8 + octave 4 + note A_, 1 + volume_envelope 2, 8 + note A_, 1 + volume_envelope 11, 8 + note A#, 1 + volume_envelope 2, 8 + note A#, 1 + volume_envelope 11, 8 + note B_, 1 + volume_envelope 2, 8 + note B_, 1 + volume_envelope 11, 8 + octave 5 + note C_, 1 + volume_envelope 2, 8 + note C_, 1 + volume_envelope 4, 8 + octave 4 + note A_, 1 + volume_envelope 1, 8 + note A_, 1 + volume_envelope 6, 8 + note A#, 1 + volume_envelope 1, 8 + note A#, 1 + volume_envelope 8, 8 + note B_, 1 + volume_envelope 1, 8 + note B_, 1 + volume_envelope 10, 8 + octave 5 + note C_, 1 + volume_envelope 2, 8 + note C_, 1 + volume_envelope 11, 8 + note C#, 16 + note D_, 16 + octave 4 + note B_, 16 + vibrato 8, 3, 3 +Music_GengarInTheGraveyard_branch_3e1a8: + volume_envelope 9, 1 + octave 2 + note G#, 2 + note G#, 1 + rest 1 + note G#, 2 + note G#, 1 + rest 1 + note G#, 2 + note G#, 1 + rest 1 + note G#, 2 + note G#, 1 + rest 1 + volume_envelope 11, 8 + octave 3 + note F_, 6 + note D_, 6 + octave 2 + note B_, 2 + volume_envelope 1, 8 + note B_, 2 + volume_envelope 9, 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + volume_envelope 11, 8 + octave 3 + note C_, 6 + octave 2 + note A_, 6 + note F#, 2 + volume_envelope 1, 8 + note F#, 2 + sound_loop 2, Music_GengarInTheGraveyard_branch_3e1a8 + sound_call Music_GengarInTheGraveyard_branch_3e25f + transpose 0, 3 + sound_call Music_GengarInTheGraveyard_branch_3e25f + transpose 0, 8 + sound_call Music_GengarInTheGraveyard_branch_3e25f + transpose 0, 0 + volume_envelope 11, 8 + octave 4 + note E_, 4 + volume_envelope 10, 1 + octave 3 + note F#, 1 + rest 1 + volume_envelope 11, 8 + octave 4 + note D#, 4 + volume_envelope 10, 1 + octave 3 + note F_, 1 + rest 1 + volume_envelope 11, 8 + octave 4 + note D_, 4 + volume_envelope 10, 1 + octave 3 + note E_, 1 + rest 1 + volume_envelope 11, 8 + octave 4 + note C#, 4 + volume_envelope 10, 1 + octave 3 + note D#, 1 + rest 1 + volume_envelope 10, 8 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note A_, 2 + sound_call Music_GengarInTheGraveyard_branch_3e280 + volume_envelope 10, 1 + octave 2 + note D#, 2 + note D#, 1 + rest 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + rest 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + rest 1 + note E_, 2 + note F_, 1 + rest 1 + note F#, 2 + note G_, 1 + rest 1 + note G#, 2 + note A_, 1 + rest 1 + note A#, 2 + sound_call Music_GengarInTheGraveyard_branch_3e280 + volume_envelope 10, 1 + note D_, 2 + octave 2 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + octave 3 + note D_, 2 + octave 2 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + vibrato 6, 4, 3 + volume_envelope 11, 8 + octave 3 + note C#, 1 + note D_, 11 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + sound_loop 0, Music_GengarInTheGraveyard_branch_3e1a8 + +Music_GengarInTheGraveyard_branch_3e25f: + volume_envelope 11, 8 + octave 3 + note D#, 4 + volume_envelope 9, 1 + octave 2 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + volume_envelope 11, 8 + octave 3 + note D#, 4 + volume_envelope 10, 1 + octave 2 + note D#, 2 + octave 3 + note D#, 2 + volume_envelope 1, 8 + note D#, 2 + volume_envelope 11, 8 + note A_, 6 + sound_ret + +Music_GengarInTheGraveyard_branch_3e280: + volume_envelope 9, 1 + octave 2 + note G#, 2 + rest 2 + note G#, 2 + note G#, 2 + note B_, 2 + volume_envelope 11, 8 + octave 3 + note D_, 6 + volume_envelope 9, 1 + octave 2 + note G#, 2 + rest 2 + note G#, 2 + note G#, 2 + octave 3 + note D_, 2 + volume_envelope 11, 8 + note F_, 6 + sound_ret + +Music_GengarInTheGraveyard_Ch3: + note_type 6, 2, 2 + octave 2 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note_type 6, 3, 2 + note D#, 1 + rest 1 + note_type 6, 3, 2 + octave 3 + note D#, 1 + rest 1 + note_type 6, 2, 2 + octave 2 + note D#, 1 + rest 1 + octave 3 + note D#, 1 + rest 1 + octave 2 + note D#, 16 + note_type 6, 3, 2 + note D_, 1 + note C#, 1 + note C_, 1 + octave 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note_type 6, 2, 2 + note D#, 16 + note_type 6, 1, 2 + transpose 2, 8 + octave 3 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + transpose 0, 0 +Music_GengarInTheGraveyard_branch_3e2db: + note_type 6, 2, 2 + octave 1 + note G#, 2 + note G#, 1 + rest 1 + note G#, 2 + note G#, 1 + rest 1 + note G#, 2 + note G#, 1 + rest 1 + note G#, 2 + note G#, 1 + rest 1 + octave 2 + note F_, 6 + note D_, 6 + octave 1 + note B_, 2 + rest 2 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + octave 2 + note C_, 6 + octave 1 + note A_, 6 + note F#, 2 + rest 2 + sound_loop 2, Music_GengarInTheGraveyard_branch_3e2db + sound_call Music_GengarInTheGraveyard_branch_3e36d + transpose 0, 3 + sound_call Music_GengarInTheGraveyard_branch_3e36d + transpose 0, 8 + sound_call Music_GengarInTheGraveyard_branch_3e36d + transpose 0, 0 + note E_, 4 + octave 2 + note F#, 1 + rest 1 + octave 3 + note D#, 4 + octave 2 + note F_, 1 + rest 1 + octave 3 + note D_, 4 + octave 2 + note E_, 1 + rest 1 + octave 3 + note C#, 4 + octave 2 + note D#, 1 + rest 1 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note A_, 2 + sound_call Music_GengarInTheGraveyard_branch_3e382 + octave 1 + note D#, 2 + note D#, 1 + rest 1 + octave 2 + note D#, 2 + octave 1 + note D#, 1 + rest 1 + octave 2 + note D#, 2 + octave 1 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + octave 2 + note D#, 2 + octave 1 + note D#, 1 + rest 1 + note E_, 2 + note F_, 1 + rest 1 + note F#, 2 + note G_, 1 + rest 1 + note G#, 2 + note A_, 1 + rest 1 + note A#, 2 + sound_call Music_GengarInTheGraveyard_branch_3e382 + note D_, 2 + octave 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + octave 2 + note D_, 2 + octave 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + octave 2 + note C#, 1 + note D_, 11 + note C#, 2 + note C_, 2 + octave 1 + note B_, 2 + note A#, 2 + sound_loop 0, Music_GengarInTheGraveyard_branch_3e2db + +Music_GengarInTheGraveyard_branch_3e36d: + octave 2 + note D#, 4 + octave 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + note D#, 2 + note D#, 1 + rest 1 + octave 2 + note D#, 4 + octave 1 + note D#, 2 + octave 2 + note D#, 2 + rest 2 + note A_, 6 + sound_ret + +Music_GengarInTheGraveyard_branch_3e382: + octave 1 + note G#, 2 + rest 2 + note G#, 2 + note G#, 2 + note B_, 2 + octave 2 + note D_, 6 + octave 1 + note G#, 2 + rest 2 + note G#, 2 + note G#, 2 + octave 2 + note D_, 2 + note F_, 6 + sound_ret + +Music_GengarInTheGraveyard_Ch4: + toggle_noise 0 + drum_speed 12 + drum_note 6, 16 + rest 16 +Music_GengarInTheGraveyard_branch_3e399: + sound_call Music_GengarInTheGraveyard_branch_3e3c3 + sound_loop 7, Music_GengarInTheGraveyard_branch_3e399 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 +Music_GengarInTheGraveyard_branch_3e3ac: + sound_call Music_GengarInTheGraveyard_branch_3e3c3 + sound_loop 3, Music_GengarInTheGraveyard_branch_3e3ac + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, Music_GengarInTheGraveyard_branch_3e399 + +Music_GengarInTheGraveyard_branch_3e3c3: + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 2 + drum_note 4, 1 + drum_note 3, 2 + sound_ret diff --git a/crysaudio/music/pinball/gengarstage_gastly.asm b/crysaudio/music/pinball/gengarstage_gastly.asm deleted file mode 100644 index 85022caf..00000000 --- a/crysaudio/music/pinball/gengarstage_gastly.asm +++ /dev/null @@ -1,386 +0,0 @@ -Music_Pinballgengarstage_gastly: ; 3ddea - dbw $80, Music_Pinballgengarstage_gastly_Ch1 - dbw $01, Music_Pinballgengarstage_gastly_Ch2 - dbw $02, Music_Pinballgengarstage_gastly_Ch3 -; 3ddf3 - -Music_Pinballgengarstage_gastly_Ch1: ; 3ddf3 -Music_Pinballgengarstage_haunter_branch_3ddf3: ; 3ddf3 - tempo 272 - volume $77 -Music_Pinballgengarstage_gastly_branch_3ddf8: ; 3ddf8 - vibrato $12, $33 - dutycycle $3 - notetype $6, $48 - octave 5 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - notetype $c, $48 - octave 6 - note C_, 14 - vibrato $0, $33 - intensity $46 - note C_, 8 - note __, 8 - note __, 16 - note __, 16 - note __, 16 - vibrato $12, $33 - dutycycle $3 - notetype $6, $48 - octave 4 - note G#, 1 - note A_, 16 - vibrato $0, $33 - note A_, 11 - intensity $38 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - dutycycle $2 - vibrato $12, $53 - notetype $6, $b8 - octave 3 - note D_, 2 - note C#, 2 - note G_, 2 - notetype $c, $98 - note F#, 9 - notetype $6, $48 - note F_, 1 - note E_, 1 - notetype $6, $28 - note D#, 1 - note D_, 1 - notetype $c, $b3 - note __, 2 - note __, 16 - loopchannel 0, Music_Pinballgengarstage_gastly_branch_3ddf8 -; 3de4c - -Music_Pinballgengarstage_gastly_Ch2: ; 3de4c -Music_Pinballgengarstage_haunter_branch_3de4c: ; 3de4c - tone $0001 -Music_Pinballgengarstage_gastly_branch_3de4f: ; 3de4f - dutycycle $3 - vibrato $12, $33 - notetype $6, $48 - octave 6 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - notetype $c, $48 - note F_, 14 - vibrato $0, $33 - intensity $46 - note F_, 8 - dutycycle $2 - vibrato $12, $33 - notetype $6, $98 - octave 4 - note F#, 1 - intensity $28 - note F#, 1 - intensity $98 - note F_, 1 - intensity $28 - note F_, 1 - intensity $98 - note A#, 1 - intensity $28 - note A#, 1 - intensity $98 - note A_, 4 - intensity $68 - note C#, 4 - intensity $48 - note C_, 2 - intensity $18 - note C_, 2 - intensity $68 - octave 3 - note A#, 4 - intensity $88 - note A_, 2 - intensity $28 - note A_, 2 - intensity $88 - note F#, 6 - callchannel Music_Pinballgengarstage_gastly_branch_3dee0 - callchannel Music_Pinballgengarstage_gastly_branch_3dee0 - note __, 16 - dutycycle $3 - intensity $48 - octave 5 - note G_, 1 - note G#, 16 - vibrato $0, $33 - note G#, 11 - vibrato $12, $33 - intensity $38 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - dutycycle $2 - vibrato $12, $53 - intensity $b8 - octave 3 - note F#, 2 - note F_, 2 - note B_, 2 - notetype $c, $a8 - note A#, 9 - notetype $6, $48 - note A_, 1 - note G#, 1 - notetype $6, $38 - note G_, 1 - note F#, 1 - intensity $78 - octave 1 - note F#, 4 - notetype $c, $b3 - note __, 14 - notetype $6, $a8 - octave 2 - note B_, 1 - note A#, 1 - note G_, 1 - note F#, 1 - loopchannel 0, Music_Pinballgengarstage_gastly_branch_3de4f -; 3dee0 - -Music_Pinballgengarstage_gastly_branch_3dee0: ; 3dee0 - intensity $28 - note F_, 1 - note F#, 1 - intensity $38 - note F_, 1 - note F#, 1 - intensity $48 - note F_, 1 - note F#, 1 - intensity $58 - note F_, 1 - note F#, 1 - intensity $68 - note F_, 1 - note F#, 1 - intensity $78 - note F_, 1 - note F#, 1 - intensity $b8 - note F_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - intensity $a8 - note F_, 1 - note F#, 1 - intensity $88 - note F_, 1 - note F#, 1 - intensity $78 - note F_, 1 - note F#, 1 - intensity $68 - note F_, 1 - note F#, 1 - intensity $58 - note F_, 1 - note F#, 1 - intensity $48 - note F_, 1 - note F#, 1 - intensity $28 - note F_, 1 - note F#, 1 - intensity $18 - note F_, 1 - note F#, 1 - endchannel -; 3df1f - -Music_Pinballgengarstage_gastly_Ch3: ; 3df1f -Music_Pinballgengarstage_gastly_branch_3df1f: ; 3df1f -Music_Pinballgengarstage_haunter_branch_3df1f: ; 3df1f - notetype $6, $22 - octave 1 - note B_, 2 - notetype $6, $32 - octave 2 - note B_, 1 - note __, 1 - octave 4 - note D_, 1 - note __, 1 - note F_, 1 - note __, 1 - notetype $6, $22 - octave 1 - note B_, 2 - note __, 6 - note B_, 2 - note __, 6 - note B_, 2 - notetype $6, $32 - octave 4 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - notetype $6, $22 - octave 1 - note B_, 2 - notetype $6, $32 - octave 3 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note __, 2 - notetype $6, $22 - octave 1 - note B_, 2 - notetype $6, $32 - octave 4 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note __, 2 - notetype $6, $22 - octave 1 - note B_, 2 - note __, 6 - note B_, 2 - note __, 6 - notetype $6, $32 - octave 1 - note B_, 2 - octave 2 - note B_, 1 - note __, 1 - octave 4 - note D_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note B_, 2 - note __, 6 - note B_, 2 - note __, 6 - note B_, 2 - octave 4 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - notetype $6, $22 - octave 2 - note D_, 2 - note __, 6 - notetype $6, $32 - note D_, 2 - note __, 6 - octave 1 - note B_, 2 - octave 2 - note B_, 1 - note __, 1 - octave 4 - note D_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note B_, 2 - note __, 6 - notetype $6, $22 - octave 2 - note D_, 2 - note __, 6 - notetype $6, $32 - note D_, 2 - note __, 6 - octave 1 - note B_, 2 - octave 2 - note B_, 1 - note __, 1 - octave 4 - note D_, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note B_, 2 - note __, 6 -Music_Pinballgengarstage_gastly_branch_3dfb0: ; 3dfb0 - notetype $6, $22 - octave 1 - note B_, 2 - notetype $6, $32 - octave 2 - note B_, 1 - note __, 1 - octave 3 - note D_, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - loopchannel 3, Music_Pinballgengarstage_gastly_branch_3dfb0 - notetype $6, $22 - octave 1 - note B_, 2 - octave 2 - note B_, 1 - note __, 1 - octave 3 - note D_, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - notetype $6, $22 - octave 1 - note B_, 2 - note __, 6 - note B_, 2 - note __, 6 - notetype $6, $32 - note B_, 2 - note __, 6 - note B_, 2 - note __, 2 - notetype $6, $12 - note F#, 4 - notetype $6, $32 - note B_, 2 - note __, 6 - note B_, 2 - note __, 6 - note B_, 2 - note __, 6 - note B_, 2 - note __, 2 - notetype $6, $22 - note B_, 1 - note A#, 1 - note G_, 1 - note F#, 1 - loopchannel 0, Music_Pinballgengarstage_gastly_branch_3df1f -; 3dffc - - diff --git a/crysaudio/music/pinball/gengarstage_hauntergengar.asm b/crysaudio/music/pinball/gengarstage_hauntergengar.asm deleted file mode 100644 index 033a9174..00000000 --- a/crysaudio/music/pinball/gengarstage_hauntergengar.asm +++ /dev/null @@ -1,809 +0,0 @@ -Music_Pinballgengarstage_haunter: ; 3dffc - dbw $80, Music_Pinballgengarstage_haunter_Ch1 - dbw $01, Music_Pinballgengarstage_haunter_Ch2 - dbw $02, Music_Pinballgengarstage_haunter_Ch3 -; 3e005 - -Music_Pinballgengarstage_haunter_Ch1: ; 3e005 - pitchoffset 0, D_ - callchannel Music_Pinballgengarstage_haunter_branch_3ddf3 -Music_Pinballgengarstage_haunter_Ch2: ; 3e00a - pitchoffset 0, D_ - callchannel Music_Pinballgengarstage_haunter_branch_3de4c -Music_Pinballgengarstage_haunter_Ch3: ; 3e00f - pitchoffset 0, D_ - callchannel Music_Pinballgengarstage_haunter_branch_3df1f - -Music_Pinballgengarstage_gengar: ; 3e014 - dbw $c0, Music_Pinballgengarstage_gengar_Ch1 - dbw $01, Music_Pinballgengarstage_gengar_Ch2 - dbw $02, Music_Pinballgengarstage_gengar_Ch3 - dbw $03, Music_Pinballgengarstage_gengar_Ch4 -; 3e020 - -Music_Pinballgengarstage_gengar_Ch1: ; 3e020 - tempo 124 - volume $77 - notetype $c, $b3 - dutycycle $3 - notetype $6, $21 - note __, 16 - octave 4 - note E_, 1 - note A_, 1 - intensity $48 - note E_, 1 - note A_, 1 - intensity $68 - note E_, 1 - note A_, 1 - intensity $88 - note E_, 1 - note A_, 1 - intensity $a8 - note E_, 1 - note A_, 1 - intensity $88 - note E_, 1 - note A_, 1 - intensity $68 - note E_, 1 - note A_, 1 - intensity $48 - note E_, 1 - note A_, 1 - intensity $28 - note F_, 1 - note G#, 1 - note F_, 1 - note G#, 1 - note F_, 1 - note G#, 1 - note F_, 1 - note G#, 1 - note F_, 1 - intensity $38 - note G#, 1 - note F_, 1 - note G#, 1 - note F_, 1 - intensity $48 - note G#, 1 - note F_, 1 - note G#, 1 - note F_, 1 - note G#, 1 - intensity $58 - note F_, 1 - note G#, 1 - intensity $68 - note F_, 1 - note G#, 1 - intensity $78 - note F_, 1 - note G#, 1 - intensity $88 - note F_, 1 - note G#, 1 - intensity $98 - note F_, 1 - note G#, 1 - intensity $a8 - note F_, 1 - note G#, 1 - intensity $b8 - note F_, 1 - note G#, 1 -Music_Pinballgengarstage_gengar_branch_3e081: ; 3e081 -Music_Pinballgengarstage_haunter_branch_3e081: ; 3e081 - vibrato $8, $33 - intensity $81 - octave 2 - note F_, 2 - note F_, 1 - note __, 1 - note F_, 2 - note F_, 1 - note __, 1 - note F_, 2 - note F_, 1 - note __, 1 - note F_, 2 - note F_, 1 - note __, 1 - intensity $88 - octave 3 - note D_, 6 - octave 2 - note B_, 6 - note G#, 2 - note __, 2 - intensity $81 - note C_, 2 - note C_, 1 - note __, 1 - note C_, 2 - note C_, 1 - note __, 1 - note C_, 2 - note C_, 1 - note __, 1 - note C_, 2 - note C_, 1 - note __, 1 - intensity $88 - note A_, 6 - note F#, 6 - note D#, 2 - note __, 2 - loopchannel 2, Music_Pinballgengarstage_haunter_branch_3e081 - callchannel Music_Pinballgengarstage_haunter_branch_3e12f - pitchoffset 0, D# - callchannel Music_Pinballgengarstage_haunter_branch_3e12f - pitchoffset 0, G# - callchannel Music_Pinballgengarstage_haunter_branch_3e12f - pitchoffset 0, C_ - intensity $88 - octave 4 - note C#, 4 - intensity $81 - octave 3 - note D#, 1 - note __, 1 - intensity $88 - octave 4 - note C_, 4 - intensity $81 - octave 3 - note D_, 1 - note __, 1 - intensity $88 - note B_, 4 - intensity $81 - note C#, 1 - note __, 1 - intensity $88 - note A#, 4 - intensity $81 - note C_, 1 - note __, 1 - intensity $88 - note A_, 2 - note G#, 2 - note G_, 2 - note F#, 2 - callchannel Music_Pinballgengarstage_haunter_branch_3e14e - intensity $81 - octave 2 - note C_, 2 - note C_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note C_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note C_, 1 - note __, 1 - note C#, 2 - note D_, 1 - note __, 1 - note D#, 2 - note E_, 1 - note __, 1 - note F_, 2 - note F#, 1 - note __, 1 - note G_, 2 - callchannel Music_Pinballgengarstage_haunter_branch_3e14e - intensity $88 - octave 2 - note B_, 2 - octave 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - octave 2 - note B_, 2 - octave 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - vibrato $6, $53 - intensity $88 - octave 2 - note A#, 1 - note B_, 11 - note A#, 2 - note A_, 2 - note G#, 2 - note G_, 2 - loopchannel 0, Music_Pinballgengarstage_haunter_branch_3e081 -; 3e12f - -Music_Pinballgengarstage_gengar_branch_3e12f: ; 3e12f -Music_Pinballgengarstage_haunter_branch_3e12f: ; 3e12f - intensity $88 - octave 3 - note C_, 4 - intensity $81 - octave 2 - note C_, 2 - note C_, 1 - note __, 1 - note C_, 2 - note C_, 1 - note __, 1 - note C_, 2 - note C_, 1 - note __, 1 - intensity $88 - octave 3 - note C_, 4 - intensity $81 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - note __, 2 - intensity $88 - note F#, 6 - endchannel -; 3e14e - -Music_Pinballgengarstage_gengar_branch_3e14e: ; 3e14e -Music_Pinballgengarstage_haunter_branch_3e14e: ; 3e14e - intensity $81 - octave 2 - note F_, 2 - note __, 2 - note F_, 2 - note F_, 2 - note G#, 2 - intensity $88 - note B_, 6 - intensity $81 - note F_, 2 - note __, 2 - note F_, 2 - note F_, 2 - note B_, 2 - intensity $88 - octave 3 - note D_, 6 - endchannel -; 3e165 - -Music_Pinballgengarstage_gengar_Ch2: ; 3e165 - dutycycle $1 - vibrato $12, $34 - notetype $6, $b8 - octave 4 - note A_, 1 - intensity $28 - note A_, 1 - intensity $b8 - note A#, 1 - intensity $28 - note A#, 1 - intensity $b8 - note B_, 1 - intensity $28 - note B_, 1 - intensity $b8 - octave 5 - note C_, 1 - intensity $28 - note C_, 1 - intensity $48 - octave 4 - note A_, 1 - intensity $18 - note A_, 1 - intensity $68 - note A#, 1 - intensity $18 - note A#, 1 - intensity $88 - note B_, 1 - intensity $18 - note B_, 1 - intensity $a8 - octave 5 - note C_, 1 - intensity $28 - note C_, 1 - intensity $b8 - note C#, 16 - note D_, 16 - octave 4 - note B_, 16 - vibrato $8, $33 -Music_Pinballgengarstage_gengar_branch_3e1a8: ; 3e1a8 - intensity $91 - octave 2 - note G#, 2 - note G#, 1 - note __, 1 - note G#, 2 - note G#, 1 - note __, 1 - note G#, 2 - note G#, 1 - note __, 1 - note G#, 2 - note G#, 1 - note __, 1 - intensity $b8 - octave 3 - note F_, 6 - note D_, 6 - octave 2 - note B_, 2 - intensity $18 - note B_, 2 - intensity $91 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - intensity $b8 - octave 3 - note C_, 6 - octave 2 - note A_, 6 - note F#, 2 - intensity $18 - note F#, 2 - loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e1a8 - callchannel Music_Pinballgengarstage_gengar_branch_3e25f - pitchoffset 0, D# - callchannel Music_Pinballgengarstage_gengar_branch_3e25f - pitchoffset 0, G# - callchannel Music_Pinballgengarstage_gengar_branch_3e25f - pitchoffset 0, C_ - intensity $b8 - octave 4 - note E_, 4 - intensity $a1 - octave 3 - note F#, 1 - note __, 1 - intensity $b8 - octave 4 - note D#, 4 - intensity $a1 - octave 3 - note F_, 1 - note __, 1 - intensity $b8 - octave 4 - note D_, 4 - intensity $a1 - octave 3 - note E_, 1 - note __, 1 - intensity $b8 - octave 4 - note C#, 4 - intensity $a1 - octave 3 - note D#, 1 - note __, 1 - intensity $a8 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - note A#, 2 - note A_, 2 - callchannel Music_Pinballgengarstage_gengar_branch_3e280 - intensity $a1 - octave 2 - note D#, 2 - note D#, 1 - note __, 1 - octave 3 - note D#, 2 - octave 2 - note D#, 1 - note __, 1 - octave 3 - note D#, 2 - octave 2 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - octave 3 - note D#, 2 - octave 2 - note D#, 1 - note __, 1 - note E_, 2 - note F_, 1 - note __, 1 - note F#, 2 - note G_, 1 - note __, 1 - note G#, 2 - note A_, 1 - note __, 1 - note A#, 2 - callchannel Music_Pinballgengarstage_gengar_branch_3e280 - intensity $a1 - note D_, 2 - octave 2 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - octave 3 - note D_, 2 - octave 2 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - vibrato $6, $43 - intensity $b8 - octave 3 - note C#, 1 - note D_, 11 - note C#, 2 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - loopchannel 0, Music_Pinballgengarstage_gengar_branch_3e1a8 -; 3e25f - -Music_Pinballgengarstage_gengar_branch_3e25f: ; 3e25f - intensity $b8 - octave 3 - note D#, 4 - intensity $91 - octave 2 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - intensity $b8 - octave 3 - note D#, 4 - intensity $a1 - octave 2 - note D#, 2 - octave 3 - note D#, 2 - intensity $18 - note D#, 2 - intensity $b8 - note A_, 6 - endchannel -; 3e280 - -Music_Pinballgengarstage_gengar_branch_3e280: ; 3e280 - intensity $91 - octave 2 - note G#, 2 - note __, 2 - note G#, 2 - note G#, 2 - note B_, 2 - intensity $b8 - octave 3 - note D_, 6 - intensity $91 - octave 2 - note G#, 2 - note __, 2 - note G#, 2 - note G#, 2 - octave 3 - note D_, 2 - intensity $b8 - note F_, 6 - endchannel -; 3e299 - -Music_Pinballgengarstage_gengar_Ch3: ; 3e299 - notetype $6, $22 - octave 2 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - notetype $6, $32 - note D#, 1 - note __, 1 - notetype $6, $32 - octave 3 - note D#, 1 - note __, 1 - notetype $6, $22 - octave 2 - note D#, 1 - note __, 1 - octave 3 - note D#, 1 - note __, 1 - octave 2 - note D#, 16 - notetype $6, $32 - note D_, 1 - note C#, 1 - note C_, 1 - octave 1 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - notetype $6, $22 - note D#, 16 - notetype $6, $12 - pitchoffset 2, G# - octave 3 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - pitchoffset 0, C_ -Music_Pinballgengarstage_gengar_branch_3e2db: ; 3e2db - notetype $6, $22 - octave 1 - note G#, 2 - note G#, 1 - note __, 1 - note G#, 2 - note G#, 1 - note __, 1 - note G#, 2 - note G#, 1 - note __, 1 - note G#, 2 - note G#, 1 - note __, 1 - octave 2 - note F_, 6 - note D_, 6 - octave 1 - note B_, 2 - note __, 2 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - octave 2 - note C_, 6 - octave 1 - note A_, 6 - note F#, 2 - note __, 2 - loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e2db - callchannel Music_Pinballgengarstage_gengar_branch_3e36d - pitchoffset 0, D# - callchannel Music_Pinballgengarstage_gengar_branch_3e36d - pitchoffset 0, G# - callchannel Music_Pinballgengarstage_gengar_branch_3e36d - pitchoffset 0, C_ - note E_, 4 - octave 2 - note F#, 1 - note __, 1 - octave 3 - note D#, 4 - octave 2 - note F_, 1 - note __, 1 - octave 3 - note D_, 4 - octave 2 - note E_, 1 - note __, 1 - octave 3 - note C#, 4 - octave 2 - note D#, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note A_, 2 - callchannel Music_Pinballgengarstage_gengar_branch_3e382 - octave 1 - note D#, 2 - note D#, 1 - note __, 1 - octave 2 - note D#, 2 - octave 1 - note D#, 1 - note __, 1 - octave 2 - note D#, 2 - octave 1 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - octave 2 - note D#, 2 - octave 1 - note D#, 1 - note __, 1 - note E_, 2 - note F_, 1 - note __, 1 - note F#, 2 - note G_, 1 - note __, 1 - note G#, 2 - note A_, 1 - note __, 1 - note A#, 2 - callchannel Music_Pinballgengarstage_gengar_branch_3e382 - note D_, 2 - octave 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - octave 2 - note D_, 2 - octave 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - octave 2 - note C#, 1 - note D_, 11 - note C#, 2 - note C_, 2 - octave 1 - note B_, 2 - note A#, 2 - loopchannel 0, Music_Pinballgengarstage_gengar_branch_3e2db -; 3e36d - -Music_Pinballgengarstage_gengar_branch_3e36d: ; 3e36d - octave 2 - note D#, 4 - octave 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - note D#, 2 - note D#, 1 - note __, 1 - octave 2 - note D#, 4 - octave 1 - note D#, 2 - octave 2 - note D#, 2 - note __, 2 - note A_, 6 - endchannel -; 3e382 - -Music_Pinballgengarstage_gengar_branch_3e382: ; 3e382 - octave 1 - note G#, 2 - note __, 2 - note G#, 2 - note G#, 2 - note B_, 2 - octave 2 - note D_, 6 - octave 1 - note G#, 2 - note __, 2 - note G#, 2 - note G#, 2 - octave 2 - note D_, 2 - note F_, 6 - endchannel -; 3e393 - -Music_Pinballgengarstage_gengar_Ch4: ; 3e393 - togglenoise $0 - notetype $c - note F_, 16 - note __, 16 -Music_Pinballgengarstage_gengar_branch_3e399: ; 3e399 - callchannel Music_Pinballgengarstage_gengar_branch_3e3c3 - loopchannel 7, Music_Pinballgengarstage_gengar_branch_3e399 - note D_, 2 - note D#, 1 - note D_, 2 - note D#, 1 - note D_, 2 - note D#, 1 - note D_, 2 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D_, 1 -Music_Pinballgengarstage_gengar_branch_3e3ac: ; 3e3ac - callchannel Music_Pinballgengarstage_gengar_branch_3e3c3 - loopchannel 3, Music_Pinballgengarstage_gengar_branch_3e3ac - note D#, 2 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 2 - note D_, 1 - note D#, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_Pinballgengarstage_gengar_branch_3e399 -; 3e3c3 - -Music_Pinballgengarstage_gengar_branch_3e3c3: ; 3e3c3 - note D#, 2 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 2 - note D_, 1 - note D#, 2 - note D#, 1 - note D_, 2 - endchannel -; 3e3ce - diff --git a/crysaudio/music/pinball/haunterinthegraveyard.asm b/crysaudio/music/pinball/haunterinthegraveyard.asm new file mode 100644 index 00000000..87503cef --- /dev/null +++ b/crysaudio/music/pinball/haunterinthegraveyard.asm @@ -0,0 +1,17 @@ +Music_HaunterInTheGraveyard: + channel_count 3 + channel 1, Music_HaunterInTheGraveyard_Ch1 + channel 2, Music_HaunterInTheGraveyard_Ch2 + channel 3, Music_HaunterInTheGraveyard_Ch3 + +Music_HaunterInTheGraveyard_Ch1: + transpose 0, 2 + sound_call Music_GastlyInTheGraveyard_Ch1 + +Music_HaunterInTheGraveyard_Ch2: + transpose 0, 2 + sound_call Music_GastlyInTheGraveyard_Ch2 + +Music_HaunterInTheGraveyard_Ch3: + transpose 0, 2 + sound_call Music_GastlyInTheGraveyard_Ch3 diff --git a/crysaudio/music/pinball/hiscore.asm b/crysaudio/music/pinball/hiscore.asm new file mode 100644 index 00000000..e2b585b2 --- /dev/null +++ b/crysaudio/music/pinball/hiscore.asm @@ -0,0 +1,1151 @@ +Music_HiScore: + channel_count 4 + channel 1, Music_HiScore_Ch1 + channel 2, Music_HiScore_Ch2 + channel 3, Music_HiScore_Ch3 + channel 4, Music_HiScore_Ch4 + +Music_HiScore_Ch1: + tempo 112 + volume 7, 7 + pitch_offset 1 + note_type 12, 11, 3 + rest 16 +Music_HiScore_branch_41d4f: + note_type 8, 9, 2 + duty_cycle 2 + sound_call Music_HiScore_branch_41e36 + note G#, 4 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note F#, 4 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note E_, 4 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note E_, 1 + rest 5 + note F#, 3 + rest 1 + note F#, 1 + rest 1 + volume_envelope 8, 2 + sound_call Music_HiScore_branch_41e36 + note A_, 4 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + rest 1 + note G#, 4 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note B_, 4 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note A#, 1 + rest 5 + note A#, 3 + rest 1 + note B_, 1 + rest 1 + sound_call Music_HiScore_branch_41e36 + note A_, 4 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + rest 1 + note G#, 4 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note B_, 4 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note A#, 1 + rest 3 + volume_envelope 8, 4 + octave 4 + note E_, 2 + note G#, 4 + rest 2 +Music_HiScore_branch_41db2: + volume_envelope 8, 1 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note B_, 4 + note F#, 2 + note B_, 4 + note F#, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note F_, 2 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + volume_envelope 9, 1 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + volume_envelope 8, 1 + note A#, 2 + octave 3 + note C#, 2 + note F_, 2 + note A#, 4 + note F_, 2 + note A#, 4 + note F_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + volume_envelope 9, 1 + note D#, 2 + note G#, 2 + note A#, 2 + octave 4 + note D#, 2 + note G#, 2 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + note G_, 2 + note D#, 2 + octave 3 + note A#, 2 + note G_, 2 + sound_loop 3, Music_HiScore_branch_41db2 + volume_envelope 8, 1 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note B_, 4 + note F#, 2 + note B_, 4 + note F#, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note F_, 2 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + volume_envelope 9, 1 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + volume_envelope 8, 1 + note A#, 2 + octave 3 + note C#, 2 + note F_, 2 + note A#, 4 + note F_, 2 + note A#, 4 + note F_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + volume_envelope 9, 1 + note D#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D#, 2 + note G_, 2 + volume_envelope 9, 4 + note A#, 9 + volume_envelope 5, 4 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + sound_loop 0, Music_HiScore_branch_41d4f + +Music_HiScore_branch_41e36: + octave 3 + note G#, 4 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note F#, 4 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note G#, 4 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note F#, 1 + rest 5 + note F#, 4 + note F#, 1 + rest 1 + sound_loop 3, Music_HiScore_branch_41e36 + sound_ret + +Music_HiScore_Ch2: + vibrato 18, 3, 4 + note_type 12, 11, 3 + rest 16 +Music_HiScore_branch_41e5d: + duty_cycle 2 + note_type 8, 10, 2 + sound_call Music_HiScore_branch_41fd5 + sound_call Music_HiScore_branch_41fd5 + transpose 0, 2 + sound_call Music_HiScore_branch_41fd5 + transpose 0, 0 + volume_envelope 10, 2 + note E_, 4 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + volume_envelope 10, 2 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + rest 2 + volume_envelope 10, 2 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + volume_envelope 10, 2 + note D_, 4 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + volume_envelope 10, 2 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + rest 2 + volume_envelope 10, 2 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + volume_envelope 10, 2 + note C#, 4 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + rest 2 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + rest 4 + duty_cycle 3 + volume_envelope 9, 8 + note D_, 3 + volume_envelope 8, 8 + note G_, 1 + note G#, 1 + note A_, 1 + note_type 12, 10, 8 + note A#, 16 + note_type 8, 9, 8 + note A#, 2 + volume_envelope 4, 8 + note A#, 2 + rest 2 + volume_envelope 9, 8 + note B_, 4 + note C#, 2 + note A#, 4 + note B_, 4 + rest 2 + volume_envelope 6, 8 + note B_, 1 + octave 5 + note C_, 1 + volume_envelope 9, 8 + note C#, 12 + note C#, 4 + octave 4 + note B_, 2 + note A#, 4 + note F#, 4 + volume_envelope 3, 8 + note F#, 2 + rest 13 + volume_envelope 6, 8 + note F_, 1 + volume_envelope 9, 8 + note F#, 4 + octave 5 + note D#, 2 + note_type 12, 10, 8 + note D#, 16 + note_type 8, 10, 8 + volume_envelope 4, 8 + note D#, 2 + rest 4 + volume_envelope 9, 8 + note D#, 6 + note C#, 6 + octave 4 + note A#, 6 + note F#, 16 + note G#, 2 + note A_, 4 + note G#, 14 + volume_envelope 4, 8 + note G#, 2 + rest 2 + volume_envelope 9, 8 + note A#, 2 + note B_, 4 + note A#, 2 + note_type 12, 9, 8 + note A#, 16 + volume_envelope 4, 8 + note A#, 2 + rest 2 + note_type 8, 9, 8 + note B_, 4 + volume_envelope 4, 8 + note B_, 2 + volume_envelope 9, 8 + note A#, 4 + note B_, 4 + volume_envelope 4, 8 + note B_, 2 + volume_envelope 6, 8 + note B_, 1 + octave 5 + note C_, 1 + volume_envelope 9, 8 + note C#, 16 + octave 4 + note B_, 2 + note A#, 4 + note F#, 4 + volume_envelope 5, 8 + note F_, 1 + note E_, 1 + volume_envelope 4, 8 + note D#, 1 + note D_, 1 + volume_envelope 2, 8 + note D_, 2 + rest 9 + volume_envelope 6, 8 + note F_, 1 + volume_envelope 9, 8 + note F#, 4 + octave 5 + note D#, 2 + note_type 12, 9, 8 + note D#, 16 + note_type 8, 9, 8 + note D#, 2 + volume_envelope 4, 8 + note D#, 2 + rest 2 + volume_envelope 9, 8 + note D#, 4 + octave 4 + note F#, 1 + volume_envelope 4, 8 + note F#, 1 + volume_envelope 9, 8 + octave 5 + note C#, 4 + octave 4 + note F#, 1 + volume_envelope 4, 8 + note F#, 1 + volume_envelope 9, 8 + note A#, 4 + volume_envelope 4, 8 + note A#, 1 + volume_envelope 6, 8 + note F_, 1 + volume_envelope 9, 8 + note F#, 16 + note G#, 2 + note A_, 4 + note G#, 14 + volume_envelope 4, 8 + note G#, 2 + rest 2 + volume_envelope 9, 8 + duty_cycle 2 + note A#, 2 + note B_, 4 + volume_envelope 5, 8 + octave 5 + note C#, 1 + note D_, 1 + sound_call Music_HiScore_branch_42021 + sound_call Music_HiScore_branch_42047 + sound_call Music_HiScore_branch_42021 + volume_envelope 10, 8 + note C#, 4 + volume_envelope 10, 1 + note C_, 2 + note C#, 4 + octave 4 + note A#, 2 + rest 6 + volume_envelope 10, 8 + octave 5 + note G#, 5 + volume_envelope 4, 8 + note G#, 1 + volume_envelope 10, 8 + note G_, 1 + note G#, 9 + volume_envelope 10, 1 + note G_, 2 + rest 4 + volume_envelope 10, 8 + note G#, 2 + note A#, 1 + volume_envelope 2, 8 + note A#, 1 + rest 2 + volume_envelope 10, 8 + octave 6 + note D#, 2 + duty_cycle 3 + sound_call Music_HiScore_branch_42021 + sound_call Music_HiScore_branch_42047 + sound_call Music_HiScore_branch_42021 + volume_envelope 10, 8 + note C#, 4 + volume_envelope 10, 1 + note C_, 2 + note C#, 4 + octave 4 + note A#, 2 + rest 6 + volume_envelope 10, 8 + note G_, 1 + note G#, 5 + volume_envelope 10, 2 + note G_, 2 + rest 2 + note G#, 2 + note A#, 2 + rest 2 + volume_envelope 10, 8 + octave 5 + note D#, 9 + volume_envelope 6, 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + sound_loop 0, Music_HiScore_branch_41e5d + +Music_HiScore_branch_41fd5: + volume_envelope 10, 2 + octave 4 + note C#, 4 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + rest 2 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 4 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + rest 2 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 4 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + rest 2 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + volume_envelope 10, 2 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + rest 4 + volume_envelope 10, 2 + note C#, 4 + note C#, 1 + volume_envelope 2, 8 + note C#, 1 + sound_ret + +Music_HiScore_branch_42021: + volume_envelope 10, 8 + octave 5 + note D#, 4 + volume_envelope 10, 1 + note C#, 2 + note D#, 4 + octave 4 + note B_, 2 + rest 6 + volume_envelope 10, 8 + octave 5 + note F#, 4 + volume_envelope 7, 8 + note D#, 1 + note E_, 1 + volume_envelope 10, 8 + note F_, 4 + volume_envelope 10, 1 + note D#, 2 + note F_, 4 + note C#, 2 + rest 6 + volume_envelope 10, 8 + octave 4 + note A#, 4 + volume_envelope 7, 8 + note B_, 1 + octave 5 + note C_, 1 + sound_ret + +Music_HiScore_branch_42047: + volume_envelope 10, 8 + note C#, 4 + volume_envelope 10, 1 + note C_, 2 + note C#, 4 + octave 4 + note A#, 2 + rest 6 + volume_envelope 10, 8 + octave 5 + note G#, 5 + volume_envelope 7, 8 + note G_, 1 + volume_envelope 10, 8 + note G#, 4 + volume_envelope 10, 1 + note A#, 2 + note G#, 4 + volume_envelope 10, 8 + note G_, 8 + volume_envelope 4, 8 + note G_, 2 + rest 2 + volume_envelope 7, 8 + note C#, 1 + note D_, 1 + sound_ret + +Music_HiScore_Ch3: + note_type 12, 2, 2 + rest 16 + note_type 8, 2, 2 +Music_HiScore_branch_42072: + transpose 0, 2 + sound_call Music_HiScore_branch_42153 + transpose 0, 0 + sound_call Music_HiScore_branch_42153 + sound_call Music_HiScore_branch_4219a + octave 2 + note D_, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note F#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note B_, 4 + rest 2 + octave 2 + note C#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note D_, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note C#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note B_, 1 + rest 5 + octave 2 + note D_, 3 + rest 1 + note D_, 1 + rest 1 + transpose 0, 2 + sound_call Music_HiScore_branch_42153 + transpose 0, 0 + sound_call Music_HiScore_branch_42153 + sound_call Music_HiScore_branch_4219a + sound_call Music_HiScore_branch_421e1 + octave 2 + note B_, 4 + rest 2 + octave 3 + note E_, 4 + note_type 8, 3, 2 + octave 2 + note E_, 1 + rest 1 + note_type 8, 2, 2 + transpose 0, 2 + sound_call Music_HiScore_branch_42153 + transpose 0, 0 + sound_call Music_HiScore_branch_42153 + sound_call Music_HiScore_branch_4219a + sound_call Music_HiScore_branch_421e1 + note B_, 4 + octave 3 + note E_, 2 + octave 2 + note B_, 4 + note E_, 1 + rest 1 + sound_call Music_HiScore_branch_42219 + sound_call Music_HiScore_branch_42244 + note D#, 1 + rest 3 + octave 1 + note G_, 1 + rest 1 + octave 2 + note D#, 1 + rest 3 + note G_, 1 + rest 1 + sound_call Music_HiScore_branch_42219 + sound_call Music_HiScore_branch_42244 + note D#, 1 + rest 3 + octave 5 + note D#, 1 + rest 1 + note G_, 1 + rest 3 + note G_, 2 + sound_call Music_HiScore_branch_42219 + sound_call Music_HiScore_branch_42244 + note D#, 1 + rest 3 + octave 1 + note G_, 1 + rest 1 + octave 2 + note D#, 1 + rest 3 + note G_, 1 + rest 1 + sound_call Music_HiScore_branch_42219 + octave 1 + note A#, 2 + rest 2 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note C#, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 3 + note F_, 1 + rest 1 + note A#, 1 + rest 3 + note B_, 1 + rest 1 + octave 2 + note D#, 2 + rest 2 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note D#, 1 + rest 1 + note D#, 1 + rest 3 + octave 1 + note A#, 1 + rest 1 + octave 2 + note D#, 1 + rest 3 + note G_, 1 + rest 1 + sound_loop 0, Music_HiScore_branch_42072 + +Music_HiScore_branch_42153: + octave 2 + note E_, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note G#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note B_, 4 + rest 2 + octave 2 + note C#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note E_, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note C#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note B_, 4 + rest 2 + octave 2 + note G#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + sound_ret + +Music_HiScore_branch_4219a: + octave 2 + note D#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note F#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note B_, 4 + rest 2 + octave 2 + note C#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note D#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note C#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note B_, 4 + rest 2 + octave 2 + note B_, 4 + note_type 8, 3, 2 + octave 1 + note A#, 1 + rest 1 + note_type 8, 2, 2 + sound_ret + +Music_HiScore_branch_421e1: + octave 2 + note D_, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note F#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + note A_, 4 + rest 2 + note B_, 4 + note_type 8, 3, 2 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note E_, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + octave 2 + note G#, 4 + note_type 8, 3, 2 + octave 1 + note B_, 1 + rest 1 + note_type 8, 2, 2 + sound_ret + +Music_HiScore_branch_42219: + octave 1 + note B_, 2 + rest 2 + note B_, 1 + rest 1 + octave 2 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note F#, 1 + rest 1 + note B_, 1 + rest 3 + octave 2 + note C_, 1 + rest 1 + note C#, 2 + rest 2 + note C#, 1 + rest 1 + note G#, 1 + rest 1 + note F_, 1 + rest 1 + note C#, 1 + rest 1 + note C#, 1 + rest 3 + octave 1 + note G#, 1 + rest 1 + octave 2 + note C#, 1 + rest 3 + note C_, 1 + rest 1 + sound_ret + +Music_HiScore_branch_42244: + octave 1 + note A#, 2 + rest 2 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note C#, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 3 + note F_, 1 + rest 1 + note A#, 1 + rest 3 + note B_, 1 + rest 1 + octave 2 + note D#, 2 + rest 2 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note G#, 1 + rest 1 + note D#, 1 + rest 1 + sound_ret + +Music_HiScore_Ch4: + toggle_noise 1 + drum_speed 8 + drum_note 3, 4 + drum_note 2, 2 + drum_note 3, 4 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 +Music_HiScore_branch_42272: + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + sound_call Music_HiScore_branch_42309 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + drum_note 3, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + sound_call Music_HiScore_branch_42309 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 6, 2 + drum_note 4, 4 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + sound_call Music_HiScore_branch_42309 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 4 + drum_note 6, 6 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 6, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + sound_call Music_HiScore_branch_42313 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + sound_call Music_HiScore_branch_42313 + sound_call Music_HiScore_branch_422ee + sound_call Music_HiScore_branch_42300 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + sound_loop 0, Music_HiScore_branch_42272 + +Music_HiScore_branch_422ee: + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 4 + drum_note 6, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 6, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 4, 2 + sound_ret + +Music_HiScore_branch_42300: + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 4 + drum_note 6, 2 + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 4 + drum_note 6, 2 + sound_ret + +Music_HiScore_branch_42309: + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 6, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 4, 2 + sound_ret + +Music_HiScore_branch_42313: + drum_note 4, 4 + drum_note 6, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 6, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 2 + sound_ret diff --git a/crysaudio/music/pinball/hiscorescreen.asm b/crysaudio/music/pinball/hiscorescreen.asm deleted file mode 100644 index 2a0416ff..00000000 --- a/crysaudio/music/pinball/hiscorescreen.asm +++ /dev/null @@ -1,1170 +0,0 @@ -Music_Pinballhiscorescreen: ; 41d37 - dbw $c0, Music_Pinballhiscorescreen_Ch1 - dbw $01, Music_Pinballhiscorescreen_Ch2 - dbw $02, Music_Pinballhiscorescreen_Ch3 - dbw $03, Music_Pinballhiscorescreen_Ch4 -; 41d43 - -Music_Pinballhiscorescreen_Ch1: ; 41d43 - tempo 112 - volume $77 - tone $0001 - notetype $c, $b3 - note __, 16 -Music_Pinballhiscorescreen_branch_41d4f: ; 41d4f - notetype $8, $92 - dutycycle $2 - callchannel Music_Pinballhiscorescreen_branch_41e36 - note G#, 4 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note F#, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note __, 1 - note E_, 4 - note E_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note E_, 1 - note __, 5 - note F#, 3 - note __, 1 - note F#, 1 - note __, 1 - intensity $82 - callchannel Music_Pinballhiscorescreen_branch_41e36 - note A_, 4 - note A_, 1 - note __, 1 - note A_, 1 - note __, 3 - note A_, 1 - note __, 1 - note G#, 4 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note B_, 4 - note B_, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note __, 1 - note A#, 1 - note __, 5 - note A#, 3 - note __, 1 - note B_, 1 - note __, 1 - callchannel Music_Pinballhiscorescreen_branch_41e36 - note A_, 4 - note A_, 1 - note __, 1 - note A_, 1 - note __, 3 - note A_, 1 - note __, 1 - note G#, 4 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note B_, 4 - note B_, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note __, 1 - note A#, 1 - note __, 3 - intensity $84 - octave 4 - note E_, 2 - note G#, 4 - note __, 2 -Music_Pinballhiscorescreen_branch_41db2: ; 41db2 - intensity $81 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note F#, 2 - note B_, 4 - note F#, 2 - note B_, 4 - note F#, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note F_, 2 - note G#, 2 - octave 4 - note C#, 4 - octave 3 - note G#, 2 - octave 4 - note C#, 4 - octave 3 - note G#, 2 - intensity $91 - note C#, 2 - note C_, 2 - octave 2 - note B_, 2 - intensity $81 - note A#, 2 - octave 3 - note C#, 2 - note F_, 2 - note A#, 4 - note F_, 2 - note A#, 4 - note F_, 2 - note F#, 2 - note F_, 2 - note E_, 2 - intensity $91 - note D#, 2 - note G#, 2 - note A#, 2 - octave 4 - note D#, 2 - note G#, 2 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - note G_, 2 - note D#, 2 - octave 3 - note A#, 2 - note G_, 2 - loopchannel 3, Music_Pinballhiscorescreen_branch_41db2 - intensity $81 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note F#, 2 - note B_, 4 - note F#, 2 - note B_, 4 - note F#, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note F_, 2 - note G#, 2 - octave 4 - note C#, 4 - octave 3 - note G#, 2 - octave 4 - note C#, 4 - octave 3 - note G#, 2 - intensity $91 - note C#, 2 - note C_, 2 - octave 2 - note B_, 2 - intensity $81 - note A#, 2 - octave 3 - note C#, 2 - note F_, 2 - note A#, 4 - note F_, 2 - note A#, 4 - note F_, 2 - note F#, 2 - note F_, 2 - note E_, 2 - intensity $91 - note D#, 2 - note G_, 2 - note A#, 2 - octave 4 - note D#, 2 - note G_, 2 - intensity $94 - note A#, 9 - intensity $54 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - loopchannel 0, Music_Pinballhiscorescreen_branch_41d4f -; 41e36 - -Music_Pinballhiscorescreen_branch_41e36: ; 41e36 - octave 3 - note G#, 4 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note F#, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note __, 1 - note G#, 4 - note G#, 1 - note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 1 - note F#, 1 - note __, 5 - note F#, 4 - note F#, 1 - note __, 1 - loopchannel 3, Music_Pinballhiscorescreen_branch_41e36 - endchannel -; 41e56 - -Music_Pinballhiscorescreen_Ch2: ; 41e56 - vibrato $12, $34 - notetype $c, $b3 - note __, 16 -Music_Pinballhiscorescreen_branch_41e5d: ; 41e5d - dutycycle $2 - notetype $8, $a2 - callchannel Music_Pinballhiscorescreen_branch_41fd5 - callchannel Music_Pinballhiscorescreen_branch_41fd5 - pitchoffset 0, D_ - callchannel Music_Pinballhiscorescreen_branch_41fd5 - pitchoffset 0, C_ - intensity $a2 - note E_, 4 - note E_, 1 - intensity $28 - note E_, 1 - intensity $a2 - note E_, 1 - intensity $28 - note E_, 1 - note __, 2 - intensity $a2 - note E_, 1 - intensity $28 - note E_, 1 - intensity $a2 - note D_, 4 - note D_, 1 - intensity $28 - note D_, 1 - intensity $a2 - note D_, 1 - intensity $28 - note D_, 1 - note __, 2 - intensity $a2 - note D_, 1 - intensity $28 - note D_, 1 - intensity $a2 - note C#, 4 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - note __, 2 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - note __, 4 - dutycycle $3 - intensity $98 - note D_, 3 - intensity $88 - note G_, 1 - note G#, 1 - note A_, 1 - notetype $c, $a8 - note A#, 16 - notetype $8, $98 - note A#, 2 - intensity $48 - note A#, 2 - note __, 2 - intensity $98 - note B_, 4 - note C#, 2 - note A#, 4 - note B_, 4 - note __, 2 - intensity $68 - note B_, 1 - octave 5 - note C_, 1 - intensity $98 - note C#, 12 - note C#, 4 - octave 4 - note B_, 2 - note A#, 4 - note F#, 4 - intensity $38 - note F#, 2 - note __, 13 - intensity $68 - note F_, 1 - intensity $98 - note F#, 4 - octave 5 - note D#, 2 - notetype $c, $a8 - note D#, 16 - notetype $8, $a8 - intensity $48 - note D#, 2 - note __, 4 - intensity $98 - note D#, 6 - note C#, 6 - octave 4 - note A#, 6 - note F#, 16 - note G#, 2 - note A_, 4 - note G#, 14 - intensity $48 - note G#, 2 - note __, 2 - intensity $98 - note A#, 2 - note B_, 4 - note A#, 2 - notetype $c, $98 - note A#, 16 - intensity $48 - note A#, 2 - note __, 2 - notetype $8, $98 - note B_, 4 - intensity $48 - note B_, 2 - intensity $98 - note A#, 4 - note B_, 4 - intensity $48 - note B_, 2 - intensity $68 - note B_, 1 - octave 5 - note C_, 1 - intensity $98 - note C#, 16 - octave 4 - note B_, 2 - note A#, 4 - note F#, 4 - intensity $58 - note F_, 1 - note E_, 1 - intensity $48 - note D#, 1 - note D_, 1 - intensity $28 - note D_, 2 - note __, 9 - intensity $68 - note F_, 1 - intensity $98 - note F#, 4 - octave 5 - note D#, 2 - notetype $c, $98 - note D#, 16 - notetype $8, $98 - note D#, 2 - intensity $48 - note D#, 2 - note __, 2 - intensity $98 - note D#, 4 - octave 4 - note F#, 1 - intensity $48 - note F#, 1 - intensity $98 - octave 5 - note C#, 4 - octave 4 - note F#, 1 - intensity $48 - note F#, 1 - intensity $98 - note A#, 4 - intensity $48 - note A#, 1 - intensity $68 - note F_, 1 - intensity $98 - note F#, 16 - note G#, 2 - note A_, 4 - note G#, 14 - intensity $48 - note G#, 2 - note __, 2 - intensity $98 - dutycycle $2 - note A#, 2 - note B_, 4 - intensity $58 - octave 5 - note C#, 1 - note D_, 1 - callchannel Music_Pinballhiscorescreen_branch_42021 - callchannel Music_Pinballhiscorescreen_branch_42047 - callchannel Music_Pinballhiscorescreen_branch_42021 - intensity $a8 - note C#, 4 - intensity $a1 - note C_, 2 - note C#, 4 - octave 4 - note A#, 2 - note __, 6 - intensity $a8 - octave 5 - note G#, 5 - intensity $48 - note G#, 1 - intensity $a8 - note G_, 1 - note G#, 9 - intensity $a1 - note G_, 2 - note __, 4 - intensity $a8 - note G#, 2 - note A#, 1 - intensity $28 - note A#, 1 - note __, 2 - intensity $a8 - octave 6 - note D#, 2 - dutycycle $3 - callchannel Music_Pinballhiscorescreen_branch_42021 - callchannel Music_Pinballhiscorescreen_branch_42047 - callchannel Music_Pinballhiscorescreen_branch_42021 - intensity $a8 - note C#, 4 - intensity $a1 - note C_, 2 - note C#, 4 - octave 4 - note A#, 2 - note __, 6 - intensity $a8 - note G_, 1 - note G#, 5 - intensity $a2 - note G_, 2 - note __, 2 - note G#, 2 - note A#, 2 - note __, 2 - intensity $a8 - octave 5 - note D#, 9 - intensity $64 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note A#, 1 - loopchannel 0, Music_Pinballhiscorescreen_branch_41e5d -; 41fd5 - -Music_Pinballhiscorescreen_branch_41fd5: ; 41fd5 - intensity $a2 - octave 4 - note C#, 4 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - note __, 2 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 4 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - note __, 2 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 4 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - note __, 2 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - intensity $a2 - note C#, 1 - intensity $28 - note C#, 1 - note __, 4 - intensity $a2 - note C#, 4 - note C#, 1 - intensity $28 - note C#, 1 - endchannel -; 42021 - -Music_Pinballhiscorescreen_branch_42021: ; 42021 - intensity $a8 - octave 5 - note D#, 4 - intensity $a1 - note C#, 2 - note D#, 4 - octave 4 - note B_, 2 - note __, 6 - intensity $a8 - octave 5 - note F#, 4 - intensity $78 - note D#, 1 - note E_, 1 - intensity $a8 - note F_, 4 - intensity $a1 - note D#, 2 - note F_, 4 - note C#, 2 - note __, 6 - intensity $a8 - octave 4 - note A#, 4 - intensity $78 - note B_, 1 - octave 5 - note C_, 1 - endchannel -; 42047 - -Music_Pinballhiscorescreen_branch_42047: ; 42047 - intensity $a8 - note C#, 4 - intensity $a1 - note C_, 2 - note C#, 4 - octave 4 - note A#, 2 - note __, 6 - intensity $a8 - octave 5 - note G#, 5 - intensity $78 - note G_, 1 - intensity $a8 - note G#, 4 - intensity $a1 - note A#, 2 - note G#, 4 - intensity $a8 - note G_, 8 - intensity $48 - note G_, 2 - note __, 2 - intensity $78 - note C#, 1 - note D_, 1 - endchannel -; 4206b - -Music_Pinballhiscorescreen_Ch3: ; 4206b - notetype $c, $22 - note __, 16 - notetype $8, $22 -Music_Pinballhiscorescreen_branch_42072: ; 42072 - pitchoffset 0, D_ - callchannel Music_Pinballhiscorescreen_branch_42153 - pitchoffset 0, C_ - callchannel Music_Pinballhiscorescreen_branch_42153 - callchannel Music_Pinballhiscorescreen_branch_4219a - octave 2 - note D_, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note F#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note B_, 4 - note __, 2 - octave 2 - note C#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note D_, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note C#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note B_, 1 - note __, 5 - octave 2 - note D_, 3 - note __, 1 - note D_, 1 - note __, 1 - pitchoffset 0, D_ - callchannel Music_Pinballhiscorescreen_branch_42153 - pitchoffset 0, C_ - callchannel Music_Pinballhiscorescreen_branch_42153 - callchannel Music_Pinballhiscorescreen_branch_4219a - callchannel Music_Pinballhiscorescreen_branch_421e1 - octave 2 - note B_, 4 - note __, 2 - octave 3 - note E_, 4 - notetype $8, $32 - octave 2 - note E_, 1 - note __, 1 - notetype $8, $22 - pitchoffset 0, D_ - callchannel Music_Pinballhiscorescreen_branch_42153 - pitchoffset 0, C_ - callchannel Music_Pinballhiscorescreen_branch_42153 - callchannel Music_Pinballhiscorescreen_branch_4219a - callchannel Music_Pinballhiscorescreen_branch_421e1 - note B_, 4 - octave 3 - note E_, 2 - octave 2 - note B_, 4 - note E_, 1 - note __, 1 - callchannel Music_Pinballhiscorescreen_branch_42219 - callchannel Music_Pinballhiscorescreen_branch_42244 - note D#, 1 - note __, 3 - octave 1 - note G_, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 3 - note G_, 1 - note __, 1 - callchannel Music_Pinballhiscorescreen_branch_42219 - callchannel Music_Pinballhiscorescreen_branch_42244 - note D#, 1 - note __, 3 - octave 5 - note D#, 1 - note __, 1 - note G_, 1 - note __, 3 - note G_, 2 - callchannel Music_Pinballhiscorescreen_branch_42219 - callchannel Music_Pinballhiscorescreen_branch_42244 - note D#, 1 - note __, 3 - octave 1 - note G_, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 3 - note G_, 1 - note __, 1 - callchannel Music_Pinballhiscorescreen_branch_42219 - octave 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note C#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 3 - note F_, 1 - note __, 1 - note A#, 1 - note __, 3 - note B_, 1 - note __, 1 - octave 2 - note D#, 2 - note __, 2 - note D#, 1 - note __, 1 - note A#, 1 - note __, 1 - note G_, 1 - note __, 1 - note D#, 1 - note __, 1 - note D#, 1 - note __, 3 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 3 - note G_, 1 - note __, 1 - loopchannel 0, Music_Pinballhiscorescreen_branch_42072 -; 42153 - -Music_Pinballhiscorescreen_branch_42153: ; 42153 - octave 2 - note E_, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note G#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note B_, 4 - note __, 2 - octave 2 - note C#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note E_, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note C#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note B_, 4 - note __, 2 - octave 2 - note G#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - endchannel -; 4219a - -Music_Pinballhiscorescreen_branch_4219a: ; 4219a - octave 2 - note D#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note F#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note B_, 4 - note __, 2 - octave 2 - note C#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note D#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note C#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note B_, 4 - note __, 2 - octave 2 - note B_, 4 - notetype $8, $32 - octave 1 - note A#, 1 - note __, 1 - notetype $8, $22 - endchannel -; 421e1 - -Music_Pinballhiscorescreen_branch_421e1: ; 421e1 - octave 2 - note D_, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note F#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - note A_, 4 - note __, 2 - note B_, 4 - notetype $8, $32 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note E_, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - octave 2 - note G#, 4 - notetype $8, $32 - octave 1 - note B_, 1 - note __, 1 - notetype $8, $22 - endchannel -; 42219 - -Music_Pinballhiscorescreen_branch_42219: ; 42219 - octave 1 - note B_, 2 - note __, 2 - note B_, 1 - note __, 1 - octave 2 - note F#, 1 - note __, 1 - note D#, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 3 - note F#, 1 - note __, 1 - note B_, 1 - note __, 3 - octave 2 - note C_, 1 - note __, 1 - note C#, 2 - note __, 2 - note C#, 1 - note __, 1 - note G#, 1 - note __, 1 - note F_, 1 - note __, 1 - note C#, 1 - note __, 1 - note C#, 1 - note __, 3 - octave 1 - note G#, 1 - note __, 1 - octave 2 - note C#, 1 - note __, 3 - note C_, 1 - note __, 1 - endchannel -; 42244 - -Music_Pinballhiscorescreen_branch_42244: ; 42244 - octave 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - note C#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 3 - note F_, 1 - note __, 1 - note A#, 1 - note __, 3 - note B_, 1 - note __, 1 - octave 2 - note D#, 2 - note __, 2 - note D#, 1 - note __, 1 - note A#, 1 - note __, 1 - note G#, 1 - note __, 1 - note D#, 1 - note __, 1 - endchannel -; 42265 - -Music_Pinballhiscorescreen_Ch4: ; 42265 - togglenoise $1 - notetype $8 - note D_, 4 - note C#, 2 - note D_, 4 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note D_, 4 - note D_, 2 -Music_Pinballhiscorescreen_branch_42272: ; 42272 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - callchannel Music_Pinballhiscorescreen_branch_42309 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - note D_, 4 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 2 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - callchannel Music_Pinballhiscorescreen_branch_42309 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - note D#, 4 - note F_, 2 - note D_, 2 - note D_, 2 - note F_, 2 - note D#, 4 - note D_, 2 - note D_, 4 - note D_, 2 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - callchannel Music_Pinballhiscorescreen_branch_42309 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - note D#, 4 - note F_, 2 - note D_, 4 - note F_, 6 - note D_, 2 - note D_, 4 - note D_, 2 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - note D#, 4 - note F_, 2 - note D_, 2 - note D_, 2 - note F_, 2 - note D#, 4 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - callchannel Music_Pinballhiscorescreen_branch_42313 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - callchannel Music_Pinballhiscorescreen_branch_42313 - callchannel Music_Pinballhiscorescreen_branch_422ee - callchannel Music_Pinballhiscorescreen_branch_42300 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - loopchannel 0, Music_Pinballhiscorescreen_branch_42272 -; 422ee - -Music_Pinballhiscorescreen_branch_422ee: ; 422ee - note D#, 4 - note F_, 2 - note D_, 4 - note F_, 2 - note D#, 4 - note D#, 2 - note D_, 4 - note D_, 2 - note D#, 4 - note F_, 2 - note D_, 2 - note D_, 2 - note F_, 2 - note D#, 4 - note D#, 2 - note D_, 4 - note D#, 2 - endchannel -; 42300 - -Music_Pinballhiscorescreen_branch_42300: ; 42300 - note D#, 4 - note F_, 2 - note D_, 4 - note F_, 2 - note D#, 4 - note F_, 2 - note D_, 4 - note F_, 2 - endchannel -; 42309 - -Music_Pinballhiscorescreen_branch_42309: ; 42309 - note D#, 4 - note F_, 2 - note D_, 2 - note D_, 2 - note F_, 2 - note D#, 4 - note D#, 2 - note D_, 4 - note D#, 2 - endchannel -; 42313 - -Music_Pinballhiscorescreen_branch_42313: ; 42313 - note D#, 4 - note F_, 2 - note D_, 2 - note D_, 2 - note F_, 2 - note D#, 4 - note D#, 2 - note D_, 4 - note D_, 2 - endchannel -; 4231d - - diff --git a/crysaudio/music/pinball/hurryup_blue.asm b/crysaudio/music/pinball/hurryup_blue.asm deleted file mode 100644 index cffa3968..00000000 --- a/crysaudio/music/pinball/hurryup_blue.asm +++ /dev/null @@ -1,268 +0,0 @@ -Music_Pinballhurryup_blue: ; 42413 - dbw $80, Music_Pinballhurryup_blue_Ch1 - dbw $01, Music_Pinballhurryup_blue_Ch2 - dbw $02, Music_Pinballhurryup_blue_Ch3 -; 4241c - -Music_Pinballhurryup_blue_Ch1: ; 4241c - tempo 117 - volume $77 - dutycycle $2 - tone $0001 - notetype $c, $98 - octave 3 - note A_, 1 - note A#, 1 - note B_, 1 - note __, 1 - note A#, 1 - note __, 1 - note A_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note __, 1 - intensity $a8 - note D_, 2 - note F_, 2 -Music_Pinballhurryup_blue_branch_4243c: ; 4243c - intensity $91 - note __, 2 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 2 - note __, 2 - note E_, 4 - note E_, 4 - note E_, 3 - note E_, 1 - note F_, 1 - note E_, 1 - note __, 2 - note F_, 3 - note G_, 1 - note F_, 4 - note F_, 3 - note D_, 1 - note F_, 1 - note D_, 1 - note __, 2 - note G_, 3 - note A_, 1 - note G_, 4 - note G_, 6 - loopchannel 0, Music_Pinballhurryup_blue_branch_4243c -; 4245b - -Music_Pinballhurryup_blue_Ch2: ; 4245b - dutycycle $2 - vibrato $9, $33 - notetype $c, $a8 - octave 4 - note E_, 1 - note F_, 1 - intensity $a8 - note G_, 1 - intensity $28 - note G_, 1 - intensity $a8 - note F#, 1 - intensity $28 - note F#, 1 - intensity $a8 - note F_, 1 - intensity $28 - note F_, 1 - intensity $a8 - note E_, 1 - intensity $28 - note E_, 1 - intensity $a8 - note D_, 1 - intensity $28 - note D_, 1 - intensity $a8 - note C_, 1 - intensity $28 - note C_, 1 - intensity $a8 - octave 3 - note B_, 2 - octave 4 - note D_, 2 -Music_Pinballhurryup_blue_branch_42490: ; 42490 - dutycycle $2 - callchannel Music_Pinballhurryup_blue_branch_424b4 - callchannel Music_Pinballhurryup_blue_branch_424ba - callchannel Music_Pinballhurryup_blue_branch_424b4 - callchannel Music_Pinballhurryup_blue_branch_424ba - callchannel Music_Pinballhurryup_blue_branch_424b4 - dutycycle $3 - callchannel Music_Pinballhurryup_blue_branch_424ba - dutycycle $2 - callchannel Music_Pinballhurryup_blue_branch_424b4 - dutycycle $3 - callchannel Music_Pinballhurryup_blue_branch_424ba - loopchannel 0, Music_Pinballhurryup_blue_branch_42490 -; 424b4 - -Music_Pinballhurryup_blue_branch_424b4: ; 424b4 - octave 1 - note D_, 1 - intensity $28 - note D_, 1 - endchannel -; 424ba - -Music_Pinballhurryup_blue_branch_424ba: ; 424ba - intensity $a3 - octave 4 - note G_, 2 - intensity $a1 - octave 3 - note B_, 1 - intensity $a3 - octave 4 - note F_, 2 - intensity $a1 - octave 3 - note A_, 1 - intensity $a3 - octave 4 - note E_, 2 - intensity $a1 - octave 3 - note G_, 1 - intensity $a3 - octave 4 - note D#, 2 - intensity $a1 - octave 3 - note A_, 1 - intensity $a3 - octave 4 - note F_, 2 - note E_, 3 - note D#, 1 - note D_, 2 - note E_, 4 - note D#, 1 - intensity $28 - note D#, 1 - intensity $a3 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F_, 3 - note E_, 1 - note D_, 2 - note F_, 4 - note E_, 1 - intensity $28 - note E_, 1 - intensity $a3 - note F_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D_, 1 - note E_, 3 - note D#, 1 - note D_, 2 - note E_, 4 - note D#, 2 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - endchannel -; 42507 - -Music_Pinballhurryup_blue_Ch3: ; 42507 - notetype $c, $22 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note __, 1 - note F#, 1 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 1 - note B_, 2 - octave 2 - note G_, 2 -Music_Pinballhurryup_blue_branch_4251f: ; 4251f - intensity $12 - note D_, 1 - note __, 3 - intensity $22 - octave 1 - note D_, 1 - note __, 3 - note G_, 1 - note __, 3 - note G_, 1 - note __, 1 - note B_, 2 - octave 2 - note C_, 2 - note __, 2 - octave 1 - note G_, 1 - note __, 3 - octave 2 - note C_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note C#, 2 - note D_, 2 - note __, 2 - octave 1 - note G_, 1 - note __, 3 - octave 2 - note D_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note D_, 1 - note __, 1 - note D#, 2 - note E_, 2 - note __, 2 - octave 1 - note G_, 1 - note __, 3 - octave 2 - note E_, 2 - note E_, 1 - note __, 1 - note D#, 2 - note D_, 2 - loopchannel 0, Music_Pinballhurryup_blue_branch_4251f -; 4255b - diff --git a/crysaudio/music/pinball/hurryup_red.asm b/crysaudio/music/pinball/hurryup_red.asm deleted file mode 100644 index 930374f5..00000000 --- a/crysaudio/music/pinball/hurryup_red.asm +++ /dev/null @@ -1,269 +0,0 @@ -Music_Pinballhurryup_red: ; 3dca2 - dbw $80, Music_Pinballhurryup_red_Ch1 - dbw $01, Music_Pinballhurryup_red_Ch2 - dbw $02, Music_Pinballhurryup_red_Ch3 -; 3dcab - -Music_Pinballhurryup_red_Ch1: ; 3dcab - tempo 117 - volume $77 - dutycycle $2 - tone $0001 - notetype $c, $98 - octave 3 - note A_, 1 - note A#, 1 - note B_, 1 - note __, 1 - note A#, 1 - note __, 1 - note A_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note __, 1 - intensity $a8 - note D_, 2 - note F_, 2 -Music_Pinballhurryup_red_branch_3dccb: ; 3dccb - intensity $91 - note __, 2 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 2 - note __, 2 - note E_, 4 - note E_, 4 - note E_, 3 - note E_, 1 - note F_, 1 - note E_, 1 - note __, 2 - note F_, 3 - note G_, 1 - note F_, 4 - note F_, 3 - note D_, 1 - note F_, 1 - note D_, 1 - note __, 2 - note G_, 3 - note A_, 1 - note G_, 4 - note G_, 6 - loopchannel 0, Music_Pinballhurryup_red_branch_3dccb -; 3dcea - -Music_Pinballhurryup_red_Ch2: ; 3dcea - dutycycle $2 - vibrato $9, $33 - notetype $c, $a8 - octave 4 - note E_, 1 - note F_, 1 - intensity $a8 - note G_, 1 - intensity $28 - note G_, 1 - intensity $a8 - note F#, 1 - intensity $28 - note F#, 1 - intensity $a8 - note F_, 1 - intensity $28 - note F_, 1 - intensity $a8 - note E_, 1 - intensity $28 - note E_, 1 - intensity $a8 - note D_, 1 - intensity $28 - note D_, 1 - intensity $a8 - note C_, 1 - intensity $28 - note C_, 1 - intensity $a8 - octave 3 - note B_, 2 - octave 4 - note D_, 2 -Music_Pinballhurryup_red_branch_3dd1f: ; 3dd1f - dutycycle $2 - callchannel Music_Pinballhurryup_red_branch_3dd43 - callchannel Music_Pinballhurryup_red_branch_3dd49 - callchannel Music_Pinballhurryup_red_branch_3dd43 - callchannel Music_Pinballhurryup_red_branch_3dd49 - callchannel Music_Pinballhurryup_red_branch_3dd43 - dutycycle $3 - callchannel Music_Pinballhurryup_red_branch_3dd49 - dutycycle $2 - callchannel Music_Pinballhurryup_red_branch_3dd43 - dutycycle $3 - callchannel Music_Pinballhurryup_red_branch_3dd49 - loopchannel 0, Music_Pinballhurryup_red_branch_3dd1f -; 3dd43 - -Music_Pinballhurryup_red_branch_3dd43: ; 3dd43 - octave 1 - note D_, 1 - intensity $28 - note D_, 1 - endchannel -; 3dd49 - -Music_Pinballhurryup_red_branch_3dd49: ; 3dd49 - intensity $a3 - octave 4 - note G_, 2 - intensity $a1 - octave 3 - note B_, 1 - intensity $a3 - octave 4 - note F_, 2 - intensity $a1 - octave 3 - note A_, 1 - intensity $a3 - octave 4 - note E_, 2 - intensity $a1 - octave 3 - note G_, 1 - intensity $a3 - octave 4 - note D#, 2 - intensity $a1 - octave 3 - note A_, 1 - intensity $a3 - octave 4 - note F_, 2 - note E_, 3 - note D#, 1 - note D_, 2 - note E_, 4 - note D#, 1 - intensity $28 - note D#, 1 - intensity $a3 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F_, 3 - note E_, 1 - note D_, 2 - note F_, 4 - note E_, 1 - intensity $28 - note E_, 1 - intensity $a3 - note F_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D_, 1 - note E_, 3 - note D#, 1 - note D_, 2 - note E_, 4 - note D#, 2 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - endchannel -; 3dd96 - -Music_Pinballhurryup_red_Ch3: ; 3dd96 - notetype $c, $22 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note __, 1 - note F#, 1 - note __, 1 - note F_, 1 - note __, 1 - note E_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 1 - note B_, 2 - octave 2 - note G_, 2 -Music_Pinballhurryup_red_branch_3ddae: ; 3ddae - intensity $12 - note D_, 1 - note __, 3 - intensity $22 - octave 1 - note D_, 1 - note __, 3 - note G_, 1 - note __, 3 - note G_, 1 - note __, 1 - note B_, 2 - octave 2 - note C_, 2 - note __, 2 - octave 1 - note G_, 1 - note __, 3 - octave 2 - note C_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note C_, 1 - note __, 1 - note C#, 2 - note D_, 2 - note __, 2 - octave 1 - note G_, 1 - note __, 3 - octave 2 - note D_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 1 - octave 2 - note D_, 1 - note __, 1 - note D#, 2 - note E_, 2 - note __, 2 - octave 1 - note G_, 1 - note __, 3 - octave 2 - note E_, 2 - note E_, 1 - note __, 1 - note D#, 2 - note D_, 2 - loopchannel 0, Music_Pinballhurryup_red_branch_3ddae -; 3ddea - - diff --git a/crysaudio/music/pinball/hurryupblue.asm b/crysaudio/music/pinball/hurryupblue.asm new file mode 100644 index 00000000..7d2f4919 --- /dev/null +++ b/crysaudio/music/pinball/hurryupblue.asm @@ -0,0 +1,262 @@ +Music_HurryUpBlue: + channel_count 3 + channel 1, Music_HurryUpBlue_Ch1 + channel 2, Music_HurryUpBlue_Ch2 + channel 3, Music_HurryUpBlue_Ch3 + +Music_HurryUpBlue_Ch1: + tempo 117 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + note_type 12, 9, 8 + octave 3 + note A_, 1 + note A#, 1 + note B_, 1 + rest 1 + note A#, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + volume_envelope 10, 8 + note D_, 2 + note F_, 2 +Music_HurryUpBlue_branch_4243c: + volume_envelope 9, 1 + rest 2 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 2 + rest 2 + note E_, 4 + note E_, 4 + note E_, 3 + note E_, 1 + note F_, 1 + note E_, 1 + rest 2 + note F_, 3 + note G_, 1 + note F_, 4 + note F_, 3 + note D_, 1 + note F_, 1 + note D_, 1 + rest 2 + note G_, 3 + note A_, 1 + note G_, 4 + note G_, 6 + sound_loop 0, Music_HurryUpBlue_branch_4243c + +Music_HurryUpBlue_Ch2: + duty_cycle 2 + vibrato 9, 3, 3 + note_type 12, 10, 8 + octave 4 + note E_, 1 + note F_, 1 + volume_envelope 10, 8 + note G_, 1 + volume_envelope 2, 8 + note G_, 1 + volume_envelope 10, 8 + note F#, 1 + volume_envelope 2, 8 + note F#, 1 + volume_envelope 10, 8 + note F_, 1 + volume_envelope 2, 8 + note F_, 1 + volume_envelope 10, 8 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + volume_envelope 10, 8 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + volume_envelope 10, 8 + note C_, 1 + volume_envelope 2, 8 + note C_, 1 + volume_envelope 10, 8 + octave 3 + note B_, 2 + octave 4 + note D_, 2 +Music_HurryUpBlue_branch_42490: + duty_cycle 2 + sound_call Music_HurryUpBlue_branch_424b4 + sound_call Music_HurryUpBlue_branch_424ba + sound_call Music_HurryUpBlue_branch_424b4 + sound_call Music_HurryUpBlue_branch_424ba + sound_call Music_HurryUpBlue_branch_424b4 + duty_cycle 3 + sound_call Music_HurryUpBlue_branch_424ba + duty_cycle 2 + sound_call Music_HurryUpBlue_branch_424b4 + duty_cycle 3 + sound_call Music_HurryUpBlue_branch_424ba + sound_loop 0, Music_HurryUpBlue_branch_42490 + +Music_HurryUpBlue_branch_424b4: + octave 1 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + sound_ret + +Music_HurryUpBlue_branch_424ba: + volume_envelope 10, 3 + octave 4 + note G_, 2 + volume_envelope 10, 1 + octave 3 + note B_, 1 + volume_envelope 10, 3 + octave 4 + note F_, 2 + volume_envelope 10, 1 + octave 3 + note A_, 1 + volume_envelope 10, 3 + octave 4 + note E_, 2 + volume_envelope 10, 1 + octave 3 + note G_, 1 + volume_envelope 10, 3 + octave 4 + note D#, 2 + volume_envelope 10, 1 + octave 3 + note A_, 1 + volume_envelope 10, 3 + octave 4 + note F_, 2 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 1 + volume_envelope 2, 8 + note D#, 1 + volume_envelope 10, 3 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F_, 3 + note E_, 1 + note D_, 2 + note F_, 4 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + volume_envelope 10, 3 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 2 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + sound_ret + +Music_HurryUpBlue_Ch3: + note_type 12, 2, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + rest 1 + note F#, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + octave 1 + note B_, 2 + octave 2 + note G_, 2 +Music_HurryUpBlue_branch_4251f: + volume_envelope 1, 2 + note D_, 1 + rest 3 + volume_envelope 2, 2 + octave 1 + note D_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note B_, 2 + octave 2 + note C_, 2 + rest 2 + octave 1 + note G_, 1 + rest 3 + octave 2 + note C_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note C#, 2 + note D_, 2 + rest 2 + octave 1 + note G_, 1 + rest 3 + octave 2 + note D_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note D_, 1 + rest 1 + note D#, 2 + note E_, 2 + rest 2 + octave 1 + note G_, 1 + rest 3 + octave 2 + note E_, 2 + note E_, 1 + rest 1 + note D#, 2 + note D_, 2 + sound_loop 0, Music_HurryUpBlue_branch_4251f diff --git a/crysaudio/music/pinball/hurryupred.asm b/crysaudio/music/pinball/hurryupred.asm new file mode 100644 index 00000000..2b35f19f --- /dev/null +++ b/crysaudio/music/pinball/hurryupred.asm @@ -0,0 +1,262 @@ +Music_HurryUpRed: + channel_count 3 + channel 1, Music_HurryUpRed_Ch1 + channel 2, Music_HurryUpRed_Ch2 + channel 3, Music_HurryUpRed_Ch3 + +Music_HurryUpRed_Ch1: + tempo 117 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + note_type 12, 9, 8 + octave 3 + note A_, 1 + note A#, 1 + note B_, 1 + rest 1 + note A#, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + volume_envelope 10, 8 + note D_, 2 + note F_, 2 +Music_HurryUpRed_branch_3dccb: + volume_envelope 9, 1 + rest 2 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 2 + rest 2 + note E_, 4 + note E_, 4 + note E_, 3 + note E_, 1 + note F_, 1 + note E_, 1 + rest 2 + note F_, 3 + note G_, 1 + note F_, 4 + note F_, 3 + note D_, 1 + note F_, 1 + note D_, 1 + rest 2 + note G_, 3 + note A_, 1 + note G_, 4 + note G_, 6 + sound_loop 0, Music_HurryUpRed_branch_3dccb + +Music_HurryUpRed_Ch2: + duty_cycle 2 + vibrato 9, 3, 3 + note_type 12, 10, 8 + octave 4 + note E_, 1 + note F_, 1 + volume_envelope 10, 8 + note G_, 1 + volume_envelope 2, 8 + note G_, 1 + volume_envelope 10, 8 + note F#, 1 + volume_envelope 2, 8 + note F#, 1 + volume_envelope 10, 8 + note F_, 1 + volume_envelope 2, 8 + note F_, 1 + volume_envelope 10, 8 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + volume_envelope 10, 8 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + volume_envelope 10, 8 + note C_, 1 + volume_envelope 2, 8 + note C_, 1 + volume_envelope 10, 8 + octave 3 + note B_, 2 + octave 4 + note D_, 2 +Music_HurryUpRed_branch_3dd1f: + duty_cycle 2 + sound_call Music_HurryUpRed_branch_3dd43 + sound_call Music_HurryUpRed_branch_3dd49 + sound_call Music_HurryUpRed_branch_3dd43 + sound_call Music_HurryUpRed_branch_3dd49 + sound_call Music_HurryUpRed_branch_3dd43 + duty_cycle 3 + sound_call Music_HurryUpRed_branch_3dd49 + duty_cycle 2 + sound_call Music_HurryUpRed_branch_3dd43 + duty_cycle 3 + sound_call Music_HurryUpRed_branch_3dd49 + sound_loop 0, Music_HurryUpRed_branch_3dd1f + +Music_HurryUpRed_branch_3dd43: + octave 1 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + sound_ret + +Music_HurryUpRed_branch_3dd49: + volume_envelope 10, 3 + octave 4 + note G_, 2 + volume_envelope 10, 1 + octave 3 + note B_, 1 + volume_envelope 10, 3 + octave 4 + note F_, 2 + volume_envelope 10, 1 + octave 3 + note A_, 1 + volume_envelope 10, 3 + octave 4 + note E_, 2 + volume_envelope 10, 1 + octave 3 + note G_, 1 + volume_envelope 10, 3 + octave 4 + note D#, 2 + volume_envelope 10, 1 + octave 3 + note A_, 1 + volume_envelope 10, 3 + octave 4 + note F_, 2 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 1 + volume_envelope 2, 8 + note D#, 1 + volume_envelope 10, 3 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F_, 3 + note E_, 1 + note D_, 2 + note F_, 4 + note E_, 1 + volume_envelope 2, 8 + note E_, 1 + volume_envelope 10, 3 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 2 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + sound_ret + +Music_HurryUpRed_Ch3: + note_type 12, 2, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + rest 1 + note F#, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + octave 1 + note B_, 2 + octave 2 + note G_, 2 +Music_HurryUpRed_branch_3ddae: + volume_envelope 1, 2 + note D_, 1 + rest 3 + volume_envelope 2, 2 + octave 1 + note D_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note B_, 2 + octave 2 + note C_, 2 + rest 2 + octave 1 + note G_, 1 + rest 3 + octave 2 + note C_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note C#, 2 + note D_, 2 + rest 2 + octave 1 + note G_, 1 + rest 3 + octave 2 + note D_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note D_, 1 + rest 1 + note D#, 2 + note E_, 2 + rest 2 + octave 1 + note G_, 1 + rest 3 + octave 2 + note E_, 2 + note E_, 1 + rest 1 + note D#, 2 + note D_, 2 + sound_loop 0, Music_HurryUpRed_branch_3ddae diff --git a/crysaudio/music/pinball/meowthstage.asm b/crysaudio/music/pinball/meowthstage.asm index 7e208841..5e798f8c 100644 --- a/crysaudio/music/pinball/meowthstage.asm +++ b/crysaudio/music/pinball/meowthstage.asm @@ -1,51 +1,51 @@ -Music_Pinballmeowthstage: ; 496fe - dbw $c0, Music_Pinballmeowthstage_Ch1 - dbw $01, Music_Pinballmeowthstage_Ch2 - dbw $02, Music_Pinballmeowthstage_Ch3 - dbw $03, Music_Pinballmeowthstage_Ch4 -; 4970a +Music_MeowthStage: + channel_count 4 + channel 1, Music_MeowthStage_Ch1 + channel 2, Music_MeowthStage_Ch2 + channel 3, Music_MeowthStage_Ch3 + channel 4, Music_MeowthStage_Ch4 -Music_Pinballmeowthstage_Ch1: ; 4970a +Music_MeowthStage_Ch1: tempo 96 - volume $77 - vibrato $12, $24 - dutycycle $3 - notetype $8, $93 - callchannel Music_Pinballmeowthstage_branch_497e7 -Music_Pinballmeowthstage_branch_4971a: ; 4971a - intensity $91 + volume 7, 7 + vibrato 18, 2, 4 + duty_cycle 3 + note_type 8, 9, 3 + sound_call Music_MeowthStage_branch_497e7 +Music_MeowthStage_branch_4971a: + volume_envelope 9, 1 octave 3 - note __, 6 + rest 6 note D#, 4 octave 2 note B_, 2 octave 3 note D#, 4 note F#, 8 - note __, 6 + rest 6 note F#, 4 note D#, 2 note F#, 4 note A#, 8 - note __, 6 + rest 6 note F#, 4 note D#, 2 note A_, 4 note F#, 2 note D#, 4 note C_, 2 - intensity $97 + volume_envelope 9, 7 note D#, 4 - note __, 2 + rest 2 note C#, 4 - note __, 2 + rest 2 note C_, 4 - note __, 2 + rest 2 note C#, 4 - note __, 2 - callchannel Music_Pinballmeowthstage_branch_49804 - intensity $91 - note __, 6 + rest 2 + sound_call Music_MeowthStage_branch_49804 + volume_envelope 9, 1 + rest 6 note G_, 4 octave 4 note C#, 2 @@ -54,52 +54,52 @@ Music_Pinballmeowthstage_branch_4971a: ; 4971a note E_, 2 note C#, 4 note E_, 2 - intensity $97 + volume_envelope 9, 7 note F#, 4 - note __, 2 + rest 2 note D#, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note A#, 4 - note __, 2 - intensity $97 + rest 2 + volume_envelope 9, 7 note B_, 4 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note D#, 4 octave 2 note B_, 2 octave 3 note D#, 4 note F#, 8 - intensity $97 + volume_envelope 9, 7 note A#, 4 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note F#, 4 note D#, 2 note F#, 4 note A#, 8 note D#, 1 - note __, 3 - intensity $97 + rest 3 + volume_envelope 9, 7 note A_, 6 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note F#, 6 note D#, 6 - intensity $97 + volume_envelope 9, 7 note D#, 4 - note __, 2 + rest 2 note C#, 4 - note __, 2 + rest 2 note C_, 4 - note __, 2 + rest 2 note C#, 4 - note __, 2 - callchannel Music_Pinballmeowthstage_branch_49804 - intensity $97 + rest 2 + sound_call Music_MeowthStage_branch_49804 + volume_envelope 9, 7 note A#, 4 note B_, 2 octave 4 @@ -108,126 +108,123 @@ Music_Pinballmeowthstage_branch_4971a: ; 4971a octave 3 note B_, 2 note A#, 2 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note C#, 2 octave 4 note D#, 14 - note __, 10 - callchannel Music_Pinballmeowthstage_branch_49814 - intensity $97 + rest 10 + sound_call Music_MeowthStage_branch_49814 + volume_envelope 9, 7 note B_, 14 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note E_, 2 note B_, 4 note G#, 2 - intensity $97 + volume_envelope 9, 7 note A#, 8 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note G#, 8 note A#, 6 - intensity $97 + volume_envelope 9, 7 note F#, 14 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note E_, 6 note D#, 2 - intensity $97 + volume_envelope 9, 7 octave 4 note D#, 12 - note __, 4 - intensity $91 + rest 4 + volume_envelope 9, 1 note E_, 6 note D#, 2 - callchannel Music_Pinballmeowthstage_branch_49814 - intensity $97 + sound_call Music_MeowthStage_branch_49814 + volume_envelope 9, 7 note E_, 14 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note E_, 2 note F#, 4 note G#, 2 - intensity $97 + volume_envelope 9, 7 note F_, 8 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note E_, 8 note F_, 6 - notetype $c, $97 + note_type 12, 9, 7 note A#, 12 - notetype $8, $97 + note_type 8, 9, 7 note G#, 2 - note __, 4 - intensity $91 + rest 4 + volume_envelope 9, 1 note F#, 4 octave 4 note C#, 6 - intensity $97 + volume_envelope 9, 7 octave 5 note C#, 10 - note __, 4 - pitchoffset 0, CC - callchannel Music_Pinballmeowthstage_branch_497e7 - pitchoffset 0, C_ - loopchannel 0, Music_Pinballmeowthstage_branch_4971a -; 497e7 + rest 4 + transpose 0, 12 + sound_call Music_MeowthStage_branch_497e7 + transpose 0, 0 + sound_loop 0, Music_MeowthStage_branch_4971a -Music_Pinballmeowthstage_branch_497e7: ; 497e7 - intensity $91 +Music_MeowthStage_branch_497e7: + volume_envelope 9, 1 octave 2 note A#, 4 note B_, 2 octave 3 note C_, 4 - intensity $97 + volume_envelope 9, 7 note C#, 4 - note __, 2 - intensity $91 + rest 2 + volume_envelope 9, 1 note C_, 2 octave 2 note B_, 4 note A#, 2 - note __, 4 - intensity $97 + rest 4 + volume_envelope 9, 7 octave 4 note C#, 4 - note __, 4 - intensity $91 + rest 4 + volume_envelope 9, 1 octave 3 note A#, 6 note F#, 6 - endchannel -; 49804 + sound_ret -Music_Pinballmeowthstage_branch_49804: ; 49804 - intensity $91 +Music_MeowthStage_branch_49804: + volume_envelope 9, 1 octave 3 - note __, 6 + rest 6 note C#, 4 octave 2 note A#, 2 octave 3 note C#, 4 note E_, 8 - note __, 6 + rest 6 note E_, 4 note C#, 2 note E_, 4 note G#, 8 - endchannel -; 49814 + sound_ret -Music_Pinballmeowthstage_branch_49814: ; 49814 - intensity $91 +Music_MeowthStage_branch_49814: + volume_envelope 9, 1 octave 4 note G_, 4 note G#, 2 note A#, 4 - intensity $97 + volume_envelope 9, 7 note A#, 6 - intensity $91 + volume_envelope 9, 1 note G#, 2 note G_, 4 octave 3 @@ -244,10 +241,10 @@ Music_Pinballmeowthstage_branch_49814: ; 49814 note G_, 4 note G#, 2 note A#, 4 - intensity $97 + volume_envelope 9, 7 octave 5 note C#, 6 - intensity $91 + volume_envelope 9, 1 octave 4 note A#, 2 note A#, 4 @@ -259,18 +256,17 @@ Music_Pinballmeowthstage_branch_49814: ; 49814 note G#, 6 note G_, 6 note G#, 2 - endchannel -; 49841 + sound_ret -Music_Pinballmeowthstage_Ch2: ; 49841 - vibrato $12, $24 - dutycycle $3 - notetype $8, $b3 - callchannel Music_Pinballmeowthstage_branch_4993c -Music_Pinballmeowthstage_branch_4984c: ; 4984c - callchannel Music_Pinballmeowthstage_branch_4995b - callchannel Music_Pinballmeowthstage_branch_499bb - intensity $b1 +Music_MeowthStage_Ch2: + vibrato 18, 2, 4 + duty_cycle 3 + note_type 8, 11, 3 + sound_call Music_MeowthStage_branch_4993c +Music_MeowthStage_branch_4984c: + sound_call Music_MeowthStage_branch_4995b + sound_call Music_MeowthStage_branch_499bb + volume_envelope 11, 1 octave 4 note F#, 4 note C_, 2 @@ -280,55 +276,55 @@ Music_Pinballmeowthstage_branch_4984c: ; 4984c note C#, 2 note F#, 4 note C#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note E_, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note E_, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $18 + volume_envelope 1, 8 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - intensity $18 + volume_envelope 1, 8 note D#, 1 - intensity $68 + volume_envelope 6, 8 note D_, 1 - callchannel Music_Pinballmeowthstage_branch_4995b - callchannel Music_Pinballmeowthstage_branch_499bb - intensity $b7 + sound_call Music_MeowthStage_branch_4995b + sound_call Music_MeowthStage_branch_499bb + volume_envelope 11, 7 octave 4 note F#, 4 note G#, 2 @@ -336,154 +332,152 @@ Music_Pinballmeowthstage_branch_4984c: ; 4984c note A#, 6 note G#, 2 note F#, 2 - intensity $18 + volume_envelope 1, 8 note F#, 2 - intensity $b1 + volume_envelope 11, 1 octave 3 note F#, 2 octave 4 note B_, 4 - intensity $78 + volume_envelope 7, 8 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 3 - intensity $18 + volume_envelope 1, 8 note F#, 2 - note __, 1 - intensity $78 + rest 1 + volume_envelope 7, 8 note G#, 4 - intensity $18 + volume_envelope 1, 8 note G#, 2 - intensity $78 + volume_envelope 7, 8 note A_, 4 - intensity $18 + volume_envelope 1, 8 note A_, 1 - intensity $78 + volume_envelope 7, 8 octave 4 note A_, 1 - callchannel Music_Pinballmeowthstage_branch_499e5 - intensity $b7 + sound_call Music_MeowthStage_branch_499e5 + volume_envelope 11, 7 note G#, 14 - intensity $18 + volume_envelope 1, 8 note G#, 2 - intensity $b1 + volume_envelope 11, 1 note C#, 2 note G#, 4 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 8 - intensity $18 + volume_envelope 1, 8 note F#, 2 - intensity $b1 + volume_envelope 11, 1 note E_, 8 note F#, 6 - intensity $b7 + volume_envelope 11, 7 note D#, 14 - intensity $18 + volume_envelope 1, 8 note D#, 2 - intensity $b1 + volume_envelope 11, 1 note C#, 6 octave 3 note B_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note B_, 12 - intensity $18 + volume_envelope 1, 8 note B_, 2 - note __, 2 - intensity $b1 + rest 2 + volume_envelope 11, 1 octave 5 note C#, 6 octave 4 note B_, 2 - callchannel Music_Pinballmeowthstage_branch_499e5 - intensity $b7 + sound_call Music_MeowthStage_branch_499e5 + volume_envelope 11, 7 note G#, 14 - intensity $18 + volume_envelope 1, 8 note G#, 2 - intensity $b1 + volume_envelope 11, 1 note G#, 2 note A#, 4 note B_, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 8 - intensity $18 + volume_envelope 1, 8 note B_, 2 - intensity $b1 + volume_envelope 11, 1 note A#, 8 note B_, 6 - notetype $c, $b7 + note_type 12, 11, 7 octave 5 note C#, 12 - notetype $8, $b7 + note_type 8, 11, 7 octave 4 note B_, 2 - intensity $18 + volume_envelope 1, 8 note B_, 2 - note __, 2 - intensity $b1 + rest 2 + volume_envelope 11, 1 note A#, 4 note F#, 6 - intensity $b7 + volume_envelope 11, 7 octave 5 note F#, 10 - intensity $18 + volume_envelope 1, 8 note F#, 2 - note __, 2 - pitchoffset 0, CC - callchannel Music_Pinballmeowthstage_branch_4993c - pitchoffset 0, C_ - loopchannel 0, Music_Pinballmeowthstage_branch_4984c -; 4993c + rest 2 + transpose 0, 12 + sound_call Music_MeowthStage_branch_4993c + transpose 0, 0 + sound_loop 0, Music_MeowthStage_branch_4984c -Music_Pinballmeowthstage_branch_4993c: ; 4993c - intensity $b1 +Music_MeowthStage_branch_4993c: + volume_envelope 11, 1 octave 3 note F#, 4 note G#, 2 note A_, 4 - intensity $b7 + volume_envelope 11, 7 note A#, 4 - intensity $18 + volume_envelope 1, 8 note A#, 2 - intensity $b1 + volume_envelope 11, 1 note A_, 2 note G#, 4 note F#, 2 - note __, 4 - intensity $b7 + rest 4 + volume_envelope 11, 7 octave 4 note F#, 4 - intensity $18 + volume_envelope 1, 8 note F#, 2 - note __, 2 - intensity $b1 + rest 2 + volume_envelope 11, 1 note E_, 6 note C#, 6 - endchannel -; 4995b + sound_ret -Music_Pinballmeowthstage_branch_4995b: ; 4995b - intensity $b7 +Music_MeowthStage_branch_4995b: + volume_envelope 11, 7 octave 4 note D#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note B_, 1 - intensity $b1 + volume_envelope 11, 1 octave 4 note D_, 4 note D#, 2 @@ -507,60 +501,59 @@ Music_Pinballmeowthstage_branch_4995b: ; 4995b note D#, 2 note G#, 4 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 1 - intensity $68 + volume_envelope 6, 8 note C#, 1 - intensity $b7 + volume_envelope 11, 7 note F#, 1 - intensity $68 + volume_envelope 6, 8 note C#, 1 - intensity $b1 + volume_envelope 11, 1 note F#, 2 note E_, 1 - intensity $68 + volume_envelope 6, 8 note C#, 1 - intensity $b7 + volume_envelope 11, 7 note E_, 1 - intensity $68 + volume_envelope 6, 8 note C#, 1 - intensity $b7 + volume_envelope 11, 7 note E_, 1 - intensity $68 + volume_envelope 6, 8 note C#, 1 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - intensity $18 + volume_envelope 1, 8 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 4 - intensity $18 + volume_envelope 1, 8 note E_, 1 - intensity $68 + volume_envelope 6, 8 note C_, 1 - endchannel -; 499bb + sound_ret -Music_Pinballmeowthstage_branch_499bb: ; 499bb - intensity $b7 +Music_MeowthStage_branch_499bb: + volume_envelope 11, 7 octave 4 note C#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note A#, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note C#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note A#, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note C#, 1 - intensity $68 + volume_envelope 6, 8 octave 3 note A#, 1 - intensity $b1 + volume_envelope 11, 1 octave 4 note C_, 4 note C#, 2 @@ -576,42 +569,41 @@ Music_Pinballmeowthstage_branch_499bb: ; 499bb note F#, 2 note C_, 4 note C#, 2 - endchannel -; 499e5 + sound_ret -Music_Pinballmeowthstage_branch_499e5: ; 499e5 - intensity $b1 +Music_MeowthStage_branch_499e5: + volume_envelope 11, 1 octave 4 note A#, 4 note B_, 2 octave 5 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 6 - intensity $b1 + volume_envelope 11, 1 octave 4 note B_, 2 note A#, 4 note D#, 1 - intensity $78 + volume_envelope 7, 8 note A_, 1 - intensity $b1 + volume_envelope 11, 1 note A#, 4 note B_, 2 note A#, 4 note G#, 6 note G_, 6 note G#, 1 - intensity $78 + volume_envelope 7, 8 note A_, 1 - intensity $b1 + volume_envelope 11, 1 note A#, 4 note B_, 2 octave 5 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note E_, 6 - intensity $b1 + volume_envelope 11, 1 note D#, 2 note C#, 4 octave 4 @@ -624,47 +616,46 @@ Music_Pinballmeowthstage_branch_499e5: ; 499e5 note B_, 6 note A#, 6 note B_, 2 - endchannel -; 49a1b + sound_ret -Music_Pinballmeowthstage_Ch3: ; 49a1b - notetype $8, $22 - callchannel Music_Pinballmeowthstage_branch_49add -Music_Pinballmeowthstage_branch_49a21: ; 49a21 - callchannel Music_Pinballmeowthstage_branch_49af9 +Music_MeowthStage_Ch3: + note_type 8, 2, 2 + sound_call Music_MeowthStage_branch_49add +Music_MeowthStage_branch_49a21: + sound_call Music_MeowthStage_branch_49af9 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 octave 1 note B_, 4 - note __, 2 + rest 2 octave 2 note D#, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note A#, 4 - note __, 2 - callchannel Music_Pinballmeowthstage_branch_49af9 + rest 2 + sound_call Music_MeowthStage_branch_49af9 octave 2 note A#, 4 note B_, 2 @@ -674,65 +665,65 @@ Music_Pinballmeowthstage_branch_49a21: ; 49a21 octave 2 note B_, 2 note A#, 2 - note __, 2 + rest 2 octave 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 3 - note __, 3 + rest 3 note G#, 4 - note __, 2 + rest 2 note A_, 4 - note __, 2 - callchannel Music_Pinballmeowthstage_branch_49b66 + rest 2 + sound_call Music_MeowthStage_branch_49b66 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note G#, 6 - note __, 6 + rest 6 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A#, 6 - note __, 6 + rest 6 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note F#, 4 note E_, 2 @@ -740,331 +731,323 @@ Music_Pinballmeowthstage_branch_49a21: ; 49a21 note F#, 2 octave 1 note B_, 1 - note __, 2 - intensity $32 + rest 2 + volume_envelope 3, 2 octave 2 note G#, 1 - intensity $22 + volume_envelope 2, 2 note A_, 8 note G#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 4 - callchannel Music_Pinballmeowthstage_branch_49b66 + rest 4 + sound_call Music_MeowthStage_branch_49b66 octave 2 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 6 - note __, 6 + rest 6 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G#, 4 note G_, 2 note G#, 4 note A_, 2 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note E_, 4 - note __, 2 + rest 2 note D#, 4 - note __, 2 + rest 2 note C#, 4 - note __, 2 + rest 2 octave 1 note B_, 4 - note __, 2 + rest 2 note A#, 4 - note __, 2 + rest 2 octave 2 note C#, 4 - note __, 2 - pitchoffset 0, CC - callchannel Music_Pinballmeowthstage_branch_49add - pitchoffset 0, C_ - loopchannel 0, Music_Pinballmeowthstage_branch_49a21 -; 49add + rest 2 + transpose 0, 12 + sound_call Music_MeowthStage_branch_49add + transpose 0, 0 + sound_loop 0, Music_MeowthStage_branch_49a21 -Music_Pinballmeowthstage_branch_49add: ; 49add +Music_MeowthStage_branch_49add: octave 1 note F#, 1 - note __, 3 + rest 3 octave 2 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 3 + rest 3 note E_, 4 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 3 + rest 3 octave 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 5 + rest 5 note A#, 1 - note __, 5 - endchannel -; 49af9 + rest 5 + sound_ret -Music_Pinballmeowthstage_branch_49af9: ; 49af9 +Music_MeowthStage_branch_49af9: octave 1 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 2 + rest 2 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 1 note A#, 1 - note __, 1 + rest 1 octave 2 note D#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note C#, 4 - note __, 2 + rest 2 note E_, 4 - note __, 2 + rest 2 note G#, 4 - note __, 2 + rest 2 note E_, 4 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 1 note A#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note A#, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note A#, 1 - note __, 1 - endchannel -; 49b66 + rest 1 + sound_ret -Music_Pinballmeowthstage_branch_49b66: ; 49b66 +Music_MeowthStage_branch_49b66: octave 2 note A#, 2 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note A#, 4 - note __, 2 + rest 2 octave 3 note D#, 4 - note __, 2 + rest 2 octave 2 note G#, 4 - note __, 2 + rest 2 note G_, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note F_, 4 - note __, 2 + rest 2 note G_, 4 - note __, 2 + rest 2 note D#, 1 - note __, 3 + rest 3 note G_, 2 - note __, 4 + rest 4 note A#, 2 - note __, 4 + rest 4 octave 3 note D#, 2 octave 2 note G#, 4 - note __, 2 + rest 2 note G_, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note F_, 4 - note __, 2 - endchannel -; 49b8f + rest 2 + sound_ret -Music_Pinballmeowthstage_Ch4: ; 49b8f - togglenoise $1 - notetype $c - note C_, 16 - note __, 8 - notetype $8 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 4 - note G_, 2 -Music_Pinballmeowthstage_branch_49b9c: ; 49b9c - callchannel Music_Pinballmeowthstage_branch_49bf0 - callchannel Music_Pinballmeowthstage_branch_49bf9 -Music_Pinballmeowthstage_branch_49ba2: ; 49ba2 - callchannel Music_Pinballmeowthstage_branch_49bf0 - loopchannel 7, Music_Pinballmeowthstage_branch_49ba2 - callchannel Music_Pinballmeowthstage_branch_49bf9 -Music_Pinballmeowthstage_branch_49bac: ; 49bac - callchannel Music_Pinballmeowthstage_branch_49bf0 - loopchannel 5, Music_Pinballmeowthstage_branch_49bac - notetype $c - note G_, 16 - notetype $8 - callchannel Music_Pinballmeowthstage_branch_49bf0 - callchannel Music_Pinballmeowthstage_branch_49bf9 - callchannel Music_Pinballmeowthstage_branch_49bf0 - callchannel Music_Pinballmeowthstage_branch_49bf9 -Music_Pinballmeowthstage_branch_49bc4: ; 49bc4 - callchannel Music_Pinballmeowthstage_branch_49bf0 - loopchannel 3, Music_Pinballmeowthstage_branch_49bc4 - callchannel Music_Pinballmeowthstage_branch_49bf9 - callchannel Music_Pinballmeowthstage_branch_49bf0 - callchannel Music_Pinballmeowthstage_branch_49bf9 - callchannel Music_Pinballmeowthstage_branch_49bf0 - callchannel Music_Pinballmeowthstage_branch_49bf9 -Music_Pinballmeowthstage_branch_49bda: ; 49bda - callchannel Music_Pinballmeowthstage_branch_49bf0 - loopchannel 4, Music_Pinballmeowthstage_branch_49bda - notetype $c - note __, 16 - note __, 8 - notetype $8 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 4 - note G_, 2 - loopchannel 0, Music_Pinballmeowthstage_branch_49b9c -; 49bf0 +Music_MeowthStage_Ch4: + toggle_noise 1 + drum_speed 12 + drum_note 1, 16 + rest 8 + drum_speed 8 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 4 + drum_note 8, 2 +Music_MeowthStage_branch_49b9c: + sound_call Music_MeowthStage_branch_49bf0 + sound_call Music_MeowthStage_branch_49bf9 +Music_MeowthStage_branch_49ba2: + sound_call Music_MeowthStage_branch_49bf0 + sound_loop 7, Music_MeowthStage_branch_49ba2 + sound_call Music_MeowthStage_branch_49bf9 +Music_MeowthStage_branch_49bac: + sound_call Music_MeowthStage_branch_49bf0 + sound_loop 5, Music_MeowthStage_branch_49bac + drum_speed 12 + drum_note 8, 16 + drum_speed 8 + sound_call Music_MeowthStage_branch_49bf0 + sound_call Music_MeowthStage_branch_49bf9 + sound_call Music_MeowthStage_branch_49bf0 + sound_call Music_MeowthStage_branch_49bf9 +Music_MeowthStage_branch_49bc4: + sound_call Music_MeowthStage_branch_49bf0 + sound_loop 3, Music_MeowthStage_branch_49bc4 + sound_call Music_MeowthStage_branch_49bf9 + sound_call Music_MeowthStage_branch_49bf0 + sound_call Music_MeowthStage_branch_49bf9 + sound_call Music_MeowthStage_branch_49bf0 + sound_call Music_MeowthStage_branch_49bf9 +Music_MeowthStage_branch_49bda: + sound_call Music_MeowthStage_branch_49bf0 + sound_loop 4, Music_MeowthStage_branch_49bda + drum_speed 12 + rest 16 + rest 8 + drum_speed 8 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 4 + drum_note 8, 2 + sound_loop 0, Music_MeowthStage_branch_49b9c -Music_Pinballmeowthstage_branch_49bf0: ; 49bf0 - note G#, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G#, 4 - note G_, 2 - note G_, 4 - note G_, 2 - endchannel -; 49bf9 - -Music_Pinballmeowthstage_branch_49bf9: ; 49bf9 - note G_, 1 - note G_, 1 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G#, 4 - note G_, 2 - note G_, 4 - note G_, 2 - endchannel -; 49c04 +Music_MeowthStage_branch_49bf0: + drum_note 9, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 9, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + sound_ret +Music_MeowthStage_branch_49bf9: + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 9, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + sound_ret diff --git a/crysaudio/music/pinball/mewtwostage.asm b/crysaudio/music/pinball/mewtwostage.asm index 57cba01f..6b5bdd95 100644 --- a/crysaudio/music/pinball/mewtwostage.asm +++ b/crysaudio/music/pinball/mewtwostage.asm @@ -1,385 +1,377 @@ -Music_Pinballmewtwostage: ; 48cb9 - dbw $c0, Music_Pinballmewtwostage_Ch1 - dbw $01, Music_Pinballmewtwostage_Ch2 - dbw $02, Music_Pinballmewtwostage_Ch3 - dbw $03, Music_Pinballmewtwostage_Ch4 -; 48cc5 +Music_MewtwoStage: + channel_count 4 + channel 1, Music_MewtwoStage_Ch1 + channel 2, Music_MewtwoStage_Ch2 + channel 3, Music_MewtwoStage_Ch3 + channel 4, Music_MewtwoStage_Ch4 -Music_Pinballmewtwostage_Ch1: ; 48cc5 +Music_MewtwoStage_Ch1: tempo 112 - volume $77 - dutycycle $2 - notetype $c, $48 - note __, 16 - note __, 16 - note __, 16 - note __, 16 -Music_Pinballmewtwostage_branch_48cd3: ; 48cd3 - notetype $c, $48 - soundinput $88 - intensity $48 + volume 7, 7 + duty_cycle 2 + note_type 12, 4, 8 + rest 16 + rest 16 + rest 16 + rest 16 +Music_MewtwoStage_branch_48cd3: + note_type 12, 4, 8 + pitch_sweep 8, 8 + volume_envelope 4, 8 octave 4 note C_, 1 note D_, 1 note C_, 1 note D_, 1 - intensity $58 + volume_envelope 5, 8 note C_, 1 note D_, 1 - intensity $68 + volume_envelope 6, 8 note C_, 1 note D_, 1 - intensity $78 + volume_envelope 7, 8 note C_, 1 note D_, 1 - intensity $88 + volume_envelope 8, 8 note C_, 1 note D_, 1 - intensity $98 + volume_envelope 9, 8 note C_, 1 note D_, 1 - intensity $b8 + volume_envelope 11, 8 note C_, 1 note D_, 1 - intensity $c1 - callchannel Music_Pinballmewtwostage_branch_48e46 - callchannel Music_Pinballmewtwostage_branch_48e5c - callchannel Music_Pinballmewtwostage_branch_48e46 - soundinput $ab + volume_envelope 12, 1 + sound_call Music_MewtwoStage_branch_48e46 + sound_call Music_MewtwoStage_branch_48e5c + sound_call Music_MewtwoStage_branch_48e46 + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - callchannel Music_Pinballmewtwostage_branch_48dc4 - intensity $c1 - callchannel Music_Pinballmewtwostage_branch_48e46 - callchannel Music_Pinballmewtwostage_branch_48ddc - callchannel Music_Pinballmewtwostage_branch_48df4 - callchannel Music_Pinballmewtwostage_branch_48e11 - callchannel Music_Pinballmewtwostage_branch_48ddc - callchannel Music_Pinballmewtwostage_branch_48e20 - callchannel Music_Pinballmewtwostage_branch_48dc4 - intensity $c1 - callchannel Music_Pinballmewtwostage_branch_48e46 - intensity $c1 - soundinput $ab + rest 3 + sound_call Music_MewtwoStage_branch_48dc4 + volume_envelope 12, 1 + sound_call Music_MewtwoStage_branch_48e46 + sound_call Music_MewtwoStage_branch_48ddc + sound_call Music_MewtwoStage_branch_48df4 + sound_call Music_MewtwoStage_branch_48e11 + sound_call Music_MewtwoStage_branch_48ddc + sound_call Music_MewtwoStage_branch_48e20 + sound_call Music_MewtwoStage_branch_48dc4 + volume_envelope 12, 1 + sound_call Music_MewtwoStage_branch_48e46 + volume_envelope 12, 1 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 1 - intensity $a1 - soundinput $ad + rest 1 + volume_envelope 10, 1 + pitch_sweep 10, -5 octave 4 note F_, 1 - soundinput $ad + pitch_sweep 10, -5 note F_, 1 - soundinput $ad + pitch_sweep 10, -5 note C#, 1 - note __, 1 - soundinput $ad + rest 1 + pitch_sweep 10, -5 octave 3 note G_, 1 - intensity $c1 - soundinput $ab + volume_envelope 12, 1 + pitch_sweep 10, -3 octave 2 note F_, 1 - callchannel Music_Pinballmewtwostage_branch_48e46 - soundinput $ab + sound_call Music_MewtwoStage_branch_48e46 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - intensity $b1 - soundinput $ad + rest 3 + volume_envelope 11, 1 + pitch_sweep 10, -5 octave 4 note C#, 1 - note __, 1 - soundinput $ad + rest 1 + pitch_sweep 10, -5 octave 3 note G_, 1 - note __, 1 - callchannel Music_Pinballmewtwostage_branch_48dc4 - intensity $c1 - callchannel Music_Pinballmewtwostage_branch_48e46 - callchannel Music_Pinballmewtwostage_branch_48e5c - callchannel Music_Pinballmewtwostage_branch_48e46 - soundinput $ab + rest 1 + sound_call Music_MewtwoStage_branch_48dc4 + volume_envelope 12, 1 + sound_call Music_MewtwoStage_branch_48e46 + sound_call Music_MewtwoStage_branch_48e5c + sound_call Music_MewtwoStage_branch_48e46 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - intensity $b1 - soundinput $ad + volume_envelope 11, 1 + pitch_sweep 10, -5 octave 4 note D#, 1 - soundinput $ad + pitch_sweep 10, -5 note D#, 1 - soundinput $ad + pitch_sweep 10, -5 note C#, 1 - soundinput $ad + pitch_sweep 10, -5 note C#, 1 - soundinput $ad + pitch_sweep 10, -5 octave 3 note A#, 1 - soundinput $ad + pitch_sweep 10, -5 note A#, 1 - intensity $c1 - soundinput $ab + volume_envelope 12, 1 + pitch_sweep 10, -3 octave 2 note F_, 1 - callchannel Music_Pinballmewtwostage_branch_48e46 - callchannel Music_Pinballmewtwostage_branch_48e5c - callchannel Music_Pinballmewtwostage_branch_48e46 - callchannel Music_Pinballmewtwostage_branch_48e5c - callchannel Music_Pinballmewtwostage_branch_48e46 - callchannel Music_Pinballmewtwostage_branch_48ddc - callchannel Music_Pinballmewtwostage_branch_48df4 - callchannel Music_Pinballmewtwostage_branch_48e11 - callchannel Music_Pinballmewtwostage_branch_48ddc - callchannel Music_Pinballmewtwostage_branch_48e20 - callchannel Music_Pinballmewtwostage_branch_48dc4 - loopchannel 0, Music_Pinballmewtwostage_branch_48cd3 -; 48dc4 + sound_call Music_MewtwoStage_branch_48e46 + sound_call Music_MewtwoStage_branch_48e5c + sound_call Music_MewtwoStage_branch_48e46 + sound_call Music_MewtwoStage_branch_48e5c + sound_call Music_MewtwoStage_branch_48e46 + sound_call Music_MewtwoStage_branch_48ddc + sound_call Music_MewtwoStage_branch_48df4 + sound_call Music_MewtwoStage_branch_48e11 + sound_call Music_MewtwoStage_branch_48ddc + sound_call Music_MewtwoStage_branch_48e20 + sound_call Music_MewtwoStage_branch_48dc4 + sound_loop 0, Music_MewtwoStage_branch_48cd3 -Music_Pinballmewtwostage_branch_48dc4: ; 48dc4 - notetype $8, $b1 - soundinput $ad +Music_MewtwoStage_branch_48dc4: + note_type 8, 11, 1 + pitch_sweep 10, -5 octave 4 note D#, 1 - soundinput $ad + pitch_sweep 10, -5 note D#, 1 - soundinput $ad + pitch_sweep 10, -5 note D#, 1 - notetype $c, $b1 - soundinput $ad + note_type 12, 11, 1 + pitch_sweep 10, -5 octave 3 note B_, 1 - soundinput $ad + pitch_sweep 10, -5 note F#, 1 - endchannel -; 48ddc + sound_ret -Music_Pinballmewtwostage_branch_48ddc: ; 48ddc - intensity $c1 - soundinput $ab +Music_MewtwoStage_branch_48ddc: + volume_envelope 12, 1 + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 1 - intensity $b1 - soundinput $ad + rest 1 + volume_envelope 11, 1 + pitch_sweep 10, -5 octave 4 note F_, 1 - note __, 1 - soundinput $ad + rest 1 + pitch_sweep 10, -5 octave 3 note G_, 1 - note __, 1 - soundinput $ad + rest 1 + pitch_sweep 10, -5 note C_, 1 - note __, 1 - endchannel -; 48df4 + rest 1 + sound_ret -Music_Pinballmewtwostage_branch_48df4: ; 48df4 - intensity $c1 - soundinput $ab +Music_MewtwoStage_branch_48df4: + volume_envelope 12, 1 + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 1 - dutycycle $0 - intensity $a8 - soundinput $88 + rest 1 + duty_cycle 0 + volume_envelope 10, 8 + pitch_sweep 8, 8 octave 3 note C#, 1 - note __, 1 - dutycycle $2 - intensity $c1 - soundinput $ab + rest 1 + duty_cycle 2 + volume_envelope 12, 1 + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 2 - soundinput $ab + rest 2 + pitch_sweep 10, -3 note F_, 1 - endchannel -; 48e11 + sound_ret -Music_Pinballmewtwostage_branch_48e11: ; 48e11 - intensity $c1 - soundinput $ab +Music_MewtwoStage_branch_48e11: + volume_envelope 12, 1 + pitch_sweep 10, -3 note F_, 1 - note __, 1 - soundinput $ab + rest 1 + pitch_sweep 10, -3 note F_, 1 - note __, 1 - soundinput $ab + rest 1 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - endchannel -; 48e20 + rest 3 + sound_ret -Music_Pinballmewtwostage_branch_48e20: ; 48e20 - intensity $c1 - soundinput $ab +Music_MewtwoStage_branch_48e20: + volume_envelope 12, 1 + pitch_sweep 10, -3 note F_, 1 - note __, 1 - dutycycle $0 - intensity $a8 - soundinput $88 + rest 1 + duty_cycle 0 + volume_envelope 10, 8 + pitch_sweep 8, 8 octave 3 note C#, 1 - note __, 1 - dutycycle $2 - intensity $c1 - soundinput $ab + rest 1 + duty_cycle 2 + volume_envelope 12, 1 + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 3 - dutycycle $0 - intensity $a8 - soundinput $88 + rest 3 + duty_cycle 0 + volume_envelope 10, 8 + pitch_sweep 8, 8 octave 3 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - dutycycle $2 - endchannel -; 48e46 + rest 1 + duty_cycle 2 + sound_ret -Music_Pinballmewtwostage_branch_48e46: ; 48e46 - soundinput $ab +Music_MewtwoStage_branch_48e46: + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 1 - soundinput $ab + rest 1 + pitch_sweep 10, -3 note F_, 1 - note __, 1 - endchannel -; 48e5c + rest 1 + sound_ret -Music_Pinballmewtwostage_branch_48e5c: ; 48e5c - soundinput $ab +Music_MewtwoStage_branch_48e5c: + pitch_sweep 10, -3 octave 2 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 3 - soundinput $ab + rest 3 + pitch_sweep 10, -3 note F_, 1 - note __, 2 - soundinput $ab + rest 2 + pitch_sweep 10, -3 note F_, 1 - endchannel -; 48e71 + sound_ret -Music_Pinballmewtwostage_Ch2: ; 48e71 - dutycycle $2 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 - callchannel Music_Pinballmewtwostage_branch_49062 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 - callchannel Music_Pinballmewtwostage_branch_49033 - callchannel Music_Pinballmewtwostage_branch_49043 - callchannel Music_Pinballmewtwostage_branch_49043 - callchannel Music_Pinballmewtwostage_branch_49043 - callchannel Music_Pinballmewtwostage_branch_49043 - callchannel Music_Pinballmewtwostage_branch_49062 - note __, 4 - intensity $c8 +Music_MewtwoStage_Ch2: + duty_cycle 2 + sound_call Music_MewtwoStage_branch_49033 + rest 4 + sound_call Music_MewtwoStage_branch_49033 + rest 4 + sound_call Music_MewtwoStage_branch_49062 + sound_call Music_MewtwoStage_branch_49033 + rest 4 + sound_call Music_MewtwoStage_branch_49033 + sound_call Music_MewtwoStage_branch_49043 + sound_call Music_MewtwoStage_branch_49043 + sound_call Music_MewtwoStage_branch_49043 + sound_call Music_MewtwoStage_branch_49043 + sound_call Music_MewtwoStage_branch_49062 + rest 4 + volume_envelope 12, 8 octave 3 note C_, 1 - intensity $a8 + volume_envelope 10, 8 octave 2 note A_, 1 - intensity $78 + volume_envelope 7, 8 note F_, 1 - intensity $48 + volume_envelope 4, 8 note D_, 1 - callchannel Music_Pinballmewtwostage_branch_49033 -Music_Pinballmewtwostage_branch_48ea6: ; 48ea6 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 12 - loopchannel 3, Music_Pinballmewtwostage_branch_48ea6 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 -Music_Pinballmewtwostage_branch_48eb6: ; 48eb6 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 12 - loopchannel 3, Music_Pinballmewtwostage_branch_48eb6 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 8 - callchannel Music_Pinballmewtwostage_branch_49033 -Music_Pinballmewtwostage_branch_48ec5: ; 48ec5 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 12 - loopchannel 3, Music_Pinballmewtwostage_branch_48ec5 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 - callchannel Music_Pinballmewtwostage_branch_49033 - note __, 4 -Music_Pinballmewtwostage_branch_48ed5: ; 48ed5 - vibrato $12, $4 - notetype $c, $1e + sound_call Music_MewtwoStage_branch_49033 +Music_MewtwoStage_branch_48ea6: + sound_call Music_MewtwoStage_branch_49033 + rest 12 + sound_loop 3, Music_MewtwoStage_branch_48ea6 + sound_call Music_MewtwoStage_branch_49033 + rest 4 + sound_call Music_MewtwoStage_branch_49033 + rest 4 +Music_MewtwoStage_branch_48eb6: + sound_call Music_MewtwoStage_branch_49033 + rest 12 + sound_loop 3, Music_MewtwoStage_branch_48eb6 + sound_call Music_MewtwoStage_branch_49033 + rest 8 + sound_call Music_MewtwoStage_branch_49033 +Music_MewtwoStage_branch_48ec5: + sound_call Music_MewtwoStage_branch_49033 + rest 12 + sound_loop 3, Music_MewtwoStage_branch_48ec5 + sound_call Music_MewtwoStage_branch_49033 + rest 4 + sound_call Music_MewtwoStage_branch_49033 + rest 4 +Music_MewtwoStage_branch_48ed5: + vibrato 18, 0, 4 + note_type 12, 1, -6 octave 4 note G_, 16 - vibrato $12, $43 - callchannel Music_Pinballmewtwostage_branch_48f3f - callchannel Music_Pinballmewtwostage_branch_48fd6 - callchannel Music_Pinballmewtwostage_branch_48fe4 - callchannel Music_Pinballmewtwostage_branch_48fd6 - callchannel Music_Pinballmewtwostage_branch_48ff6 - callchannel Music_Pinballmewtwostage_branch_48f3f - dutycycle $3 - intensity $98 - callchannel Music_Pinballmewtwostage_branch_49018 - notetype $c, $98 + vibrato 18, 4, 3 + sound_call Music_MewtwoStage_branch_48f3f + sound_call Music_MewtwoStage_branch_48fd6 + sound_call Music_MewtwoStage_branch_48fe4 + sound_call Music_MewtwoStage_branch_48fd6 + sound_call Music_MewtwoStage_branch_48ff6 + sound_call Music_MewtwoStage_branch_48f3f + duty_cycle 3 + volume_envelope 9, 8 + sound_call Music_MewtwoStage_branch_49018 + note_type 12, 9, 8 note F#, 12 note A_, 4 note A#, 3 - notetype $6, $98 + note_type 6, 9, 8 note D#, 1 note D_, 1 - notetype $c, $98 + note_type 12, 9, 8 note C#, 2 note D_, 2 - intensity $28 + volume_envelope 2, 8 note D_, 2 - intensity $18 + volume_envelope 1, 8 note D_, 2 - note __, 4 - notetype $6, $98 - callchannel Music_Pinballmewtwostage_branch_49018 + rest 4 + note_type 6, 9, 8 + sound_call Music_MewtwoStage_branch_49018 note F#, 14 note F_, 1 note F#, 1 @@ -403,68 +395,67 @@ Music_Pinballmewtwostage_branch_48ed5: ; 48ed5 note D_, 2 octave 2 note A_, 2 - dutycycle $2 - callchannel Music_Pinballmewtwostage_branch_48fd6 - callchannel Music_Pinballmewtwostage_branch_48fe4 - callchannel Music_Pinballmewtwostage_branch_48fd6 - callchannel Music_Pinballmewtwostage_branch_48ff6 - loopchannel 0, Music_Pinballmewtwostage_branch_48ed5 -; 48f3f + duty_cycle 2 + sound_call Music_MewtwoStage_branch_48fd6 + sound_call Music_MewtwoStage_branch_48fe4 + sound_call Music_MewtwoStage_branch_48fd6 + sound_call Music_MewtwoStage_branch_48ff6 + sound_loop 0, Music_MewtwoStage_branch_48ed5 -Music_Pinballmewtwostage_branch_48f3f: ; 48f3f - notetype $6, $b8 +Music_MewtwoStage_branch_48f3f: + note_type 6, 11, 8 octave 1 note G_, 2 - intensity $98 + volume_envelope 9, 8 octave 4 note F_, 1 note F#, 1 note G_, 2 - intensity $18 + volume_envelope 1, 8 note G_, 2 - intensity $98 + volume_envelope 9, 8 note A#, 2 - intensity $18 + volume_envelope 1, 8 note A#, 2 - intensity $98 + volume_envelope 9, 8 note E_, 4 - intensity $b8 + volume_envelope 11, 8 octave 1 note G_, 2 - note __, 2 - intensity $98 + rest 2 + volume_envelope 9, 8 octave 3 note A#, 2 - intensity $18 + volume_envelope 1, 8 note A#, 2 - intensity $98 + volume_envelope 9, 8 note A_, 2 - intensity $18 + volume_envelope 1, 8 note A_, 2 - intensity $98 + volume_envelope 9, 8 note A#, 4 octave 4 note G_, 2 - intensity $18 + volume_envelope 1, 8 note G_, 2 - intensity $98 + volume_envelope 9, 8 note A#, 2 - intensity $18 + volume_envelope 1, 8 note A#, 2 - intensity $98 + volume_envelope 9, 8 octave 5 note F_, 2 - intensity $18 + volume_envelope 1, 8 note F_, 2 - intensity $98 + volume_envelope 9, 8 note E_, 2 - intensity $18 + volume_envelope 1, 8 note E_, 2 - intensity $b8 + volume_envelope 11, 8 octave 1 note G_, 2 - note __, 2 - intensity $98 + rest 2 + volume_envelope 9, 8 octave 5 note C#, 12 octave 4 @@ -473,127 +464,123 @@ Music_Pinballmewtwostage_branch_48f3f: ; 48f3f note A_, 1 note G#, 1 note G_, 2 - note __, 2 + rest 2 note A#, 2 - intensity $18 + volume_envelope 1, 8 note A#, 2 - intensity $98 + volume_envelope 9, 8 note E_, 4 - intensity $b8 + volume_envelope 11, 8 octave 1 note G_, 2 - note __, 2 - intensity $98 + rest 2 + volume_envelope 9, 8 octave 3 note A#, 2 - intensity $18 + volume_envelope 1, 8 note A#, 2 - intensity $98 + volume_envelope 9, 8 note A_, 2 - intensity $18 + volume_envelope 1, 8 note A_, 2 - intensity $98 + volume_envelope 9, 8 note A#, 4 octave 4 note G_, 2 - intensity $18 + volume_envelope 1, 8 note G_, 2 - intensity $98 + volume_envelope 9, 8 note A#, 2 - intensity $b8 + volume_envelope 11, 8 octave 1 note G_, 2 - intensity $98 + volume_envelope 9, 8 octave 5 note F_, 2 - intensity $18 + volume_envelope 1, 8 note F_, 2 - intensity $98 + volume_envelope 9, 8 note E_, 2 - intensity $18 + volume_envelope 1, 8 note E_, 2 - intensity $b8 + volume_envelope 11, 8 octave 1 note G_, 2 - note __, 2 - intensity $98 + rest 2 + volume_envelope 9, 8 octave 5 note G_, 8 note F#, 1 note F_, 1 note E_, 1 note D#, 1 - endchannel -; 48fd6 + sound_ret -Music_Pinballmewtwostage_branch_48fd6: ; 48fd6 - intensity $b8 +Music_MewtwoStage_branch_48fd6: + volume_envelope 11, 8 octave 1 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 - endchannel -; 48fe4 + rest 2 + sound_ret -Music_Pinballmewtwostage_branch_48fe4: ; 48fe4 +Music_MewtwoStage_branch_48fe4: note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 - dutycycle $0 + rest 2 + duty_cycle 0 octave 3 note G_, 2 - note __, 2 - dutycycle $2 + rest 2 + duty_cycle 2 octave 1 note G_, 2 - note __, 4 + rest 4 note G_, 2 - endchannel -; 48ff6 + sound_ret -Music_Pinballmewtwostage_branch_48ff6: ; 48ff6 +Music_MewtwoStage_branch_48ff6: note G_, 2 - note __, 2 - dutycycle $0 + rest 2 + duty_cycle 0 octave 3 note G_, 2 - dutycycle $2 + duty_cycle 2 octave 1 note G_, 2 note G_, 2 - note __, 6 - dutycycle $0 + rest 6 + duty_cycle 0 octave 3 note G_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 - dutycycle $2 - intensity $68 + rest 2 + duty_cycle 2 + volume_envelope 6, 8 octave 5 note G_, 1 - note __, 1 + rest 1 octave 6 note C#, 2 octave 5 note A#, 1 - note __, 1 + rest 1 octave 6 note F_, 2 - endchannel -; 49018 + sound_ret -Music_Pinballmewtwostage_branch_49018: ; 49018 +Music_MewtwoStage_branch_49018: octave 3 note A#, 2 octave 4 @@ -610,64 +597,70 @@ Music_Pinballmewtwostage_branch_49018: ; 49018 note A_, 3 note G#, 1 note G_, 12 - intensity $28 + volume_envelope 2, 8 note G_, 2 - note __, 2 - intensity $98 + rest 2 + volume_envelope 9, 8 note D_, 1 note D#, 1 note E_, 1 note F_, 1 - endchannel -; 49033 + sound_ret -Music_Pinballmewtwostage_branch_49033: ; 49033 - notetype $3, $c8 +Music_MewtwoStage_branch_49033: + note_type 3, 12, 8 octave 2 note F_, 1 - intensity $b8 + volume_envelope 11, 8 note C#, 1 - intensity $98 + volume_envelope 9, 8 octave 1 note A_, 1 - intensity $58 + volume_envelope 5, 8 note F#, 1 - endchannel -; 49043 + sound_ret -Music_Pinballmewtwostage_branch_49043: ; 49043 - notetype $3, $c8 +Music_MewtwoStage_branch_49043: + note_type 3, 12, 8 octave 3 note A#, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 1 - intensity $88 + volume_envelope 8, 8 note D#, 1 - intensity $78 + volume_envelope 7, 8 note C#, 1 - endchannel -; 49052 + sound_ret +; unreferenced +; note_type 2, 12, 8 +; octave 3 +; note B_, 1 +; volume_envelope 10, 8 +; note G_, 1 +; volume_envelope 7, 8 +; note D#, 1 +; volume_envelope 4, 8 +; octave 2 +; note B_, 1 +; sound_ret - - -Music_Pinballmewtwostage_branch_49062: ; 49062 - notetype $3, $c8 +Music_MewtwoStage_branch_49062: + note_type 3, 12, 8 octave 3 note F#, 1 - intensity $a8 + volume_envelope 10, 8 note D_, 1 - intensity $78 + volume_envelope 7, 8 octave 2 note B_, 1 - intensity $48 + volume_envelope 4, 8 note A#, 1 - endchannel -; 49072 + sound_ret -Music_Pinballmewtwostage_Ch3: ; 49072 - notetype $c, $22 - note __, 16 +Music_MewtwoStage_Ch3: + note_type 12, 2, 2 + rest 16 octave 1 note G_, 1 octave 3 @@ -697,46 +690,46 @@ Music_Pinballmewtwostage_Ch3: ; 49072 note A_, 1 octave 1 note G_, 1 - notetype $6, $32 + note_type 6, 3, 2 octave 5 note G_, 1 - note __, 1 + rest 1 octave 6 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - intensity $22 + rest 1 + volume_envelope 2, 2 octave 1 note G_, 2 - note __, 2 - intensity $32 + rest 2 + volume_envelope 3, 2 octave 6 note G_, 1 - note __, 3 - intensity $22 + rest 3 + volume_envelope 2, 2 octave 1 note G_, 2 - intensity $32 + volume_envelope 3, 2 octave 6 note D_, 1 - note __, 1 + rest 1 octave 1 note G_, 2 octave 6 note G_, 1 - note __, 1 - intensity $22 + rest 1 + volume_envelope 2, 2 octave 1 note G_, 2 - intensity $32 + volume_envelope 3, 2 octave 5 note G_, 1 - note __, 1 + rest 1 octave 6 note G_, 1 - note __, 1 - intensity $22 + rest 1 + volume_envelope 2, 2 octave 1 note G_, 2 note G_, 2 @@ -765,40 +758,40 @@ Music_Pinballmewtwostage_Ch3: ; 49072 note G_, 2 octave 3 note F_, 2 -Music_Pinballmewtwostage_branch_490e0: ; 490e0 - notetype $c, $32 +Music_MewtwoStage_branch_490e0: + note_type 12, 3, 2 octave 3 note G#, 8 - notetype $6, $22 + note_type 6, 2, 2 note G#, 8 - intensity $12 + volume_envelope 1, 2 note G#, 8 - callchannel Music_Pinballmewtwostage_branch_49156 - callchannel Music_Pinballmewtwostage_branch_491e6 - callchannel Music_Pinballmewtwostage_branch_49156 - intensity $22 - callchannel Music_Pinballmewtwostage_branch_49237 + sound_call Music_MewtwoStage_branch_49156 + sound_call Music_MewtwoStage_branch_491e6 + sound_call Music_MewtwoStage_branch_49156 + volume_envelope 2, 2 + sound_call Music_MewtwoStage_branch_49237 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note D_, 2 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note D_, 2 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note D_, 2 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note C#, 2 @@ -810,7 +803,7 @@ Music_Pinballmewtwostage_branch_490e0: ; 490e0 note A_, 2 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note D_, 2 @@ -824,7 +817,7 @@ Music_Pinballmewtwostage_branch_490e0: ; 490e0 note D_, 2 octave 1 note A_, 2 - callchannel Music_Pinballmewtwostage_branch_49237 + sound_call Music_MewtwoStage_branch_49237 octave 2 note D_, 2 note A_, 2 @@ -861,12 +854,11 @@ Music_Pinballmewtwostage_branch_490e0: ; 490e0 note F#, 4 octave 1 note A_, 4 - callchannel Music_Pinballmewtwostage_branch_491e6 - loopchannel 0, Music_Pinballmewtwostage_branch_490e0 -; 49156 + sound_call Music_MewtwoStage_branch_491e6 + sound_loop 0, Music_MewtwoStage_branch_490e0 -Music_Pinballmewtwostage_branch_49156: ; 49156 - notetype $6, $32 +Music_MewtwoStage_branch_49156: + note_type 6, 3, 2 octave 4 note C#, 1 octave 3 @@ -899,7 +891,7 @@ Music_Pinballmewtwostage_branch_49156: ; 49156 note C#, 1 octave 3 note E_, 1 - intensity $22 + volume_envelope 2, 2 octave 4 note C#, 1 octave 3 @@ -932,7 +924,7 @@ Music_Pinballmewtwostage_branch_49156: ; 49156 note C#, 1 octave 3 note E_, 1 - intensity $12 + volume_envelope 1, 2 octave 4 note D_, 1 octave 3 @@ -965,7 +957,7 @@ Music_Pinballmewtwostage_branch_49156: ; 49156 note D_, 1 octave 3 note F_, 1 - intensity $22 + volume_envelope 2, 2 octave 4 note D_, 1 octave 3 @@ -982,7 +974,7 @@ Music_Pinballmewtwostage_branch_49156: ; 49156 note D_, 1 octave 3 note F_, 1 - intensity $32 + volume_envelope 3, 2 octave 4 note D_, 1 octave 3 @@ -999,12 +991,11 @@ Music_Pinballmewtwostage_branch_49156: ; 49156 note D_, 1 octave 3 note F_, 1 - loopchannel 2, Music_Pinballmewtwostage_branch_49156 - endchannel -; 491e6 + sound_loop 2, Music_MewtwoStage_branch_49156 + sound_ret -Music_Pinballmewtwostage_branch_491e6: ; 491e6 - notetype $6, $32 +Music_MewtwoStage_branch_491e6: + note_type 6, 3, 2 octave 4 note A_, 1 note C#, 1 @@ -1022,7 +1013,7 @@ Music_Pinballmewtwostage_branch_491e6: ; 491e6 note C#, 1 note A_, 1 note C#, 1 - intensity $22 + volume_envelope 2, 2 note A_, 1 note C#, 1 note A_, 1 @@ -1039,7 +1030,7 @@ Music_Pinballmewtwostage_branch_491e6: ; 491e6 note C#, 1 note A_, 1 note C#, 1 - intensity $12 + volume_envelope 1, 2 note A#, 1 note D_, 1 note A#, 1 @@ -1056,7 +1047,7 @@ Music_Pinballmewtwostage_branch_491e6: ; 491e6 note D_, 1 note A#, 1 note D_, 1 - intensity $22 + volume_envelope 2, 2 note A#, 1 note D_, 1 note A#, 1 @@ -1065,7 +1056,7 @@ Music_Pinballmewtwostage_branch_491e6: ; 491e6 note D_, 1 note A#, 1 note D_, 1 - intensity $32 + volume_envelope 3, 2 note A#, 1 note D_, 1 note A#, 1 @@ -1074,32 +1065,31 @@ Music_Pinballmewtwostage_branch_491e6: ; 491e6 note D_, 1 note A#, 1 note D_, 1 - loopchannel 2, Music_Pinballmewtwostage_branch_491e6 - endchannel -; 49237 + sound_loop 2, Music_MewtwoStage_branch_491e6 + sound_ret -Music_Pinballmewtwostage_branch_49237: ; 49237 +Music_MewtwoStage_branch_49237: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 2 octave 3 note D#, 2 octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 2 octave 3 note D#, 2 octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 2 octave 3 note D#, 2 octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 2 octave 3 note D_, 2 @@ -1111,259 +1101,248 @@ Music_Pinballmewtwostage_branch_49237: ; 49237 note A#, 2 octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 2 octave 3 note D#, 2 octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 2 octave 3 note D#, 2 octave 2 note D#, 2 - note __, 2 + rest 2 note D_, 2 note F#, 2 - endchannel -; 49267 + sound_ret -Music_Pinballmewtwostage_Ch4: ; 49267 - togglenoise $0 - notetype $c - note G#, 2 - note G#, 2 - note G#, 1 - note G#, 2 - note G#, 1 - notetype $8 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 1 - note D_, 1 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_492f6 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 -Music_Pinballmewtwostage_branch_49292: ; 49292 - note __, 16 - callchannel Music_Pinballmewtwostage_branch_49306 - callchannel Music_Pinballmewtwostage_branch_492f6 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_49317 - callchannel Music_Pinballmewtwostage_branch_49306 - callchannel Music_Pinballmewtwostage_branch_4932d - callchannel Music_Pinballmewtwostage_branch_4934d - callchannel Music_Pinballmewtwostage_branch_49306 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note G#, 2 - note D_, 1 - note D_, 1 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_49317 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_49363 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_49363 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_49363 - callchannel Music_Pinballmewtwostage_branch_492e5 - callchannel Music_Pinballmewtwostage_branch_49363 - callchannel Music_Pinballmewtwostage_branch_49306 - callchannel Music_Pinballmewtwostage_branch_4932d - callchannel Music_Pinballmewtwostage_branch_4934d - loopchannel 0, Music_Pinballmewtwostage_branch_49292 -; 492e5 +Music_MewtwoStage_Ch4: + toggle_noise 0 + drum_speed 12 + drum_note 9, 2 + drum_note 9, 2 + drum_note 9, 1 + drum_note 9, 2 + drum_note 9, 1 + drum_speed 8 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_492f6 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 +Music_MewtwoStage_branch_49292: + rest 16 + sound_call Music_MewtwoStage_branch_49306 + sound_call Music_MewtwoStage_branch_492f6 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_49317 + sound_call Music_MewtwoStage_branch_49306 + sound_call Music_MewtwoStage_branch_4932d + sound_call Music_MewtwoStage_branch_4934d + sound_call Music_MewtwoStage_branch_49306 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 9, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_49317 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_49363 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_49363 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_49363 + sound_call Music_MewtwoStage_branch_492e5 + sound_call Music_MewtwoStage_branch_49363 + sound_call Music_MewtwoStage_branch_49306 + sound_call Music_MewtwoStage_branch_4932d + sound_call Music_MewtwoStage_branch_4934d + sound_loop 0, Music_MewtwoStage_branch_49292 -Music_Pinballmewtwostage_branch_492e5: ; 492e5 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note D_, 1 - endchannel -; 492f6 +Music_MewtwoStage_branch_492e5: + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 3, 1 + sound_ret -Music_Pinballmewtwostage_branch_492f6: ; 492f6 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 2 - note D_, 1 - note D_, 1 - endchannel -; 49306 +Music_MewtwoStage_branch_492f6: + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_Pinballmewtwostage_branch_49306: ; 49306 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note D_, 1 - endchannel -; 49317 +Music_MewtwoStage_branch_49306: + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 3, 1 + sound_ret -Music_Pinballmewtwostage_branch_49317: ; 49317 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - notetype $8 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - note D_, 1 - note D_, 1 - endchannel -; 4932d +Music_MewtwoStage_branch_49317: + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_speed 8 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_Pinballmewtwostage_branch_4932d: ; 4932d - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 2 - note D_, 1 - note D_, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D_, 1 - endchannel -; 4934d - -Music_Pinballmewtwostage_branch_4934d: ; 4934d - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - notetype $8 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - note D_, 1 - note D_, 1 - endchannel -; 49363 - -Music_Pinballmewtwostage_branch_49363: ; 49363 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note C#, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note G#, 1 - note D_, 1 - note G#, 1 - endchannel -; 49374 +Music_MewtwoStage_branch_4932d: + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret +Music_MewtwoStage_branch_4934d: + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_speed 8 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 3, 1 + drum_note 3, 1 + sound_ret +Music_MewtwoStage_branch_49363: + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 2, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 9, 1 + drum_note 3, 1 + drum_note 9, 1 + sound_ret diff --git a/crysaudio/music/pinball/nameentry.asm b/crysaudio/music/pinball/nameentry.asm index 34ce4fd4..e0be2bbd 100644 --- a/crysaudio/music/pinball/nameentry.asm +++ b/crysaudio/music/pinball/nameentry.asm @@ -1,206 +1,206 @@ -Music_Pinballnameentry: ; 4d52c - dbw $c0, Music_Pinballnameentry_Ch1 - dbw $01, Music_Pinballnameentry_Ch2 - dbw $02, Music_Pinballnameentry_Ch3 - dbw $03, Music_Pinballnameentry_Ch4 -; 4d538 +Music_NameEntry: + channel_count 4 + channel 1, Music_NameEntry_Ch1 + channel 2, Music_NameEntry_Ch2 + channel 3, Music_NameEntry_Ch3 + channel 4, Music_NameEntry_Ch4 -Music_Pinballnameentry_Ch1: ; 4d538 +Music_NameEntry_Ch1: tempo 144 - volume $77 - dutycycle $3 - vibrato $18, $34 - tone $0001 - notetype $c, $88 - note __, 12 + volume 7, 7 + duty_cycle 3 + vibrato 24, 3, 4 + pitch_offset 1 + note_type 12, 8, 8 + rest 12 octave 4 note C_, 4 - notetype $8, $a8 + note_type 8, 10, 8 octave 3 note A_, 4 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 3 + rest 3 octave 3 note B_, 6 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 3 - note __, 3 -Music_Pinballnameentry_branch_4d55c: ; 4d55c - dutycycle $2 - intensity $68 - pitchoffset 0, G_ - callchannel Music_Pinballnameentry_branch_4d80d - pitchoffset 0, F_ - callchannel Music_Pinballnameentry_branch_4d80d - callchannel Music_Pinballnameentry_branch_4d80d -Music_Pinballnameentry_branch_4d56d: ; 4d56d - pitchoffset 0, D# - callchannel Music_Pinballnameentry_branch_4d80d - loopchannel 3, Music_Pinballnameentry_branch_4d56d - pitchoffset 0, C_ - callchannel Music_Pinballnameentry_branch_4d80d + rest 3 +Music_NameEntry_branch_4d55c: + duty_cycle 2 + volume_envelope 6, 8 + transpose 0, 7 + sound_call Music_NameEntry_branch_4d80d + transpose 0, 5 + sound_call Music_NameEntry_branch_4d80d + sound_call Music_NameEntry_branch_4d80d +Music_NameEntry_branch_4d56d: + transpose 0, 3 + sound_call Music_NameEntry_branch_4d80d + sound_loop 3, Music_NameEntry_branch_4d56d + transpose 0, 0 + sound_call Music_NameEntry_branch_4d80d octave 3 note C#, 4 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note C_, 4 - note __, 10 - intensity $88 + rest 10 + volume_envelope 8, 8 octave 4 note C_, 1 note C#, 3 note F_, 1 - note __, 1 - intensity $81 + rest 1 + volume_envelope 8, 1 octave 6 note C#, 2 octave 5 note G#, 2 note F_, 14 - intensity $88 + volume_envelope 8, 8 octave 3 note B_, 1 octave 4 note C_, 3 - intensity $81 + volume_envelope 8, 1 note D#, 2 octave 6 note C_, 2 octave 5 note G#, 2 note D#, 14 - intensity $88 + volume_envelope 8, 8 octave 3 note A#, 1 note B_, 3 octave 4 note D#, 1 - note __, 1 - intensity $81 + rest 1 + volume_envelope 8, 1 octave 5 note B_, 2 note F#, 2 note D#, 6 - intensity $88 + volume_envelope 8, 8 octave 4 note G#, 6 note F_, 1 - note __, 1 + rest 1 note A#, 4 note G#, 1 - note __, 1 - intensity $81 + rest 1 + volume_envelope 8, 1 octave 6 note C#, 2 octave 5 note A#, 2 - intensity $88 + volume_envelope 8, 8 octave 4 note F#, 6 - note __, 2 - intensity $81 + rest 2 + volume_envelope 8, 1 note A#, 2 note F#, 2 note C#, 2 - intensity $88 + volume_envelope 8, 8 octave 3 note G#, 1 note A_, 3 octave 4 note C#, 1 - note __, 1 - intensity $81 + rest 1 + volume_envelope 8, 1 octave 6 note C#, 2 octave 5 note A_, 2 note F#, 6 - intensity $88 + volume_envelope 8, 8 octave 4 note F#, 1 - note __, 1 + rest 1 note G#, 4 note F#, 1 - note __, 1 - intensity $88 + rest 1 + volume_envelope 8, 8 octave 3 note G_, 1 note G#, 3 - intensity $98 + volume_envelope 9, 8 octave 4 note F_, 1 - note __, 7 - intensity $88 + rest 7 + volume_envelope 8, 8 octave 3 note G#, 1 - intensity $14 + volume_envelope 1, 4 note G#, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note C#, 1 - intensity $14 + volume_envelope 1, 4 note C#, 1 - intensity $88 + volume_envelope 8, 8 note G#, 1 - intensity $14 + volume_envelope 1, 4 note G#, 1 - intensity $98 + volume_envelope 9, 8 octave 5 note C#, 5 - intensity $88 + volume_envelope 8, 8 note D_, 1 note D#, 8 - note __, 2 + rest 2 octave 4 note A#, 2 note G_, 4 note D#, 1 - note __, 5 + rest 5 note G_, 1 - note __, 1 - intensity $78 + rest 1 + volume_envelope 7, 8 octave 3 note C_, 1 - intensity $14 + volume_envelope 1, 4 note C_, 1 - intensity $78 + volume_envelope 7, 8 note D#, 1 - intensity $14 + volume_envelope 1, 4 note D#, 1 - intensity $78 + volume_envelope 7, 8 note G#, 1 - intensity $14 + volume_envelope 1, 4 note G#, 1 - intensity $78 + volume_envelope 7, 8 octave 4 note C_, 1 - intensity $14 + volume_envelope 1, 4 note C_, 1 - intensity $78 + volume_envelope 7, 8 note D#, 1 - intensity $14 + volume_envelope 1, 4 note D#, 1 - intensity $98 + volume_envelope 9, 8 note F#, 8 - intensity $14 + volume_envelope 1, 4 note F#, 2 - note __, 4 - intensity $73 + rest 4 + volume_envelope 7, 3 octave 3 note G_, 1 note G#, 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 4 note D#, 1 - note __, 4 + rest 4 note D_, 1 note D#, 2 note E_, 4 @@ -209,26 +209,26 @@ Music_Pinballnameentry_branch_4d56d: ; 4d56d octave 4 note D_, 1 note D#, 5 - note __, 3 + rest 3 note F_, 1 note F#, 2 note D#, 2 - intensity $71 + volume_envelope 7, 1 octave 5 note D#, 4 note D#, 2 note D_, 2 note C#, 2 - intensity $73 + volume_envelope 7, 3 octave 4 note F#, 4 - intensity $71 + volume_envelope 7, 1 note B_, 2 - intensity $73 + volume_envelope 7, 3 note F#, 4 - intensity $71 + volume_envelope 7, 1 note B_, 5 - intensity $73 + volume_envelope 7, 3 note D_, 1 note D#, 2 octave 3 @@ -236,117 +236,117 @@ Music_Pinballnameentry_branch_4d56d: ; 4d56d octave 4 note D#, 2 note C#, 4 - note __, 2 + rest 2 octave 3 note B_, 4 - note __, 2 + rest 2 note G#, 4 - note __, 2 + rest 2 octave 4 note F_, 4 - note __, 2 - intensity $71 + rest 2 + volume_envelope 7, 1 note C#, 2 note F#, 2 note C#, 2 - intensity $73 + volume_envelope 7, 3 note F#, 4 - intensity $71 + volume_envelope 7, 1 note C#, 2 - intensity $73 + volume_envelope 7, 3 note F#, 4 - intensity $71 + volume_envelope 7, 1 note C#, 2 - intensity $73 + volume_envelope 7, 3 octave 3 note A_, 4 octave 4 note C#, 2 - intensity $73 + volume_envelope 7, 3 note F_, 4 - intensity $71 + volume_envelope 7, 1 octave 5 note C#, 2 - intensity $73 + volume_envelope 7, 3 octave 4 note F_, 4 - intensity $71 + volume_envelope 7, 1 octave 5 note C#, 2 - intensity $73 + volume_envelope 7, 3 octave 3 note G#, 1 note A_, 3 octave 4 note C#, 1 - note __, 1 + rest 1 note C#, 4 note E_, 1 - note __, 1 - intensity $71 + rest 1 + volume_envelope 7, 1 note C#, 2 note E_, 2 note C#, 2 - intensity $73 + volume_envelope 7, 3 note E_, 4 - intensity $71 + volume_envelope 7, 1 note C#, 2 - intensity $73 + volume_envelope 7, 3 note D#, 1 note E_, 3 note C#, 1 - note __, 1 + rest 1 octave 3 note B_, 4 octave 4 note C#, 2 - intensity $74 + volume_envelope 7, 4 note F#, 6 - note __, 6 + rest 6 octave 3 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 octave 5 note D#, 1 - dutycycle $3 - intensity $84 + duty_cycle 3 + volume_envelope 8, 4 octave 4 note E_, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 4 note G#, 1 - note __, 5 + rest 5 note G#, 1 - note __, 1 + rest 1 note A_, 4 note B_, 2 octave 4 note D#, 6 - note __, 2 + rest 2 note D_, 2 note C#, 2 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 note A#, 2 - note __, 2 + rest 2 note A_, 2 note G#, 4 note G_, 1 - note __, 1 + rest 1 note G#, 4 octave 4 note C#, 1 @@ -356,7 +356,7 @@ Music_Pinballnameentry_branch_4d56d: ; 4d56d note G#, 2 note B_, 6 note G#, 4 - note __, 2 + rest 2 octave 4 note F#, 4 note F_, 2 @@ -372,17 +372,17 @@ Music_Pinballnameentry_branch_4d56d: ; 4d56d note B_, 6 note A_, 2 note G#, 4 - intensity $87 + volume_envelope 8, 7 note A_, 10 - intensity $84 + volume_envelope 8, 4 note B_, 2 octave 4 note C#, 2 note F_, 2 - note __, 2 + rest 2 note A_, 2 note C#, 2 - note __, 2 + rest 2 octave 5 note C#, 2 octave 4 @@ -394,248 +394,246 @@ Music_Pinballnameentry_branch_4d56d: ; 4d56d note D#, 2 note E_, 4 note F#, 2 - intensity $88 + volume_envelope 8, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $88 + volume_envelope 8, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $88 + volume_envelope 8, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $88 + volume_envelope 8, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $88 + volume_envelope 8, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $88 + volume_envelope 8, 8 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $88 + volume_envelope 8, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $88 + volume_envelope 8, 8 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $88 + volume_envelope 8, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $68 + volume_envelope 6, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $78 + volume_envelope 7, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $88 + volume_envelope 8, 8 octave 4 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $98 + volume_envelope 9, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $b8 + volume_envelope 11, 8 octave 5 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $68 + volume_envelope 6, 8 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $78 + volume_envelope 7, 8 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $88 + volume_envelope 8, 8 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $98 + volume_envelope 9, 8 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $a8 + volume_envelope 10, 8 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $b8 + volume_envelope 11, 8 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $78 + volume_envelope 7, 8 octave 4 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $78 + volume_envelope 7, 8 note G#, 1 - intensity $28 + volume_envelope 2, 8 note G#, 1 - intensity $78 + volume_envelope 7, 8 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $78 + volume_envelope 7, 8 octave 5 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $88 + volume_envelope 8, 8 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $98 + volume_envelope 9, 8 note G#, 1 - intensity $28 + volume_envelope 2, 8 note G#, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 1 - intensity $24 + volume_envelope 2, 4 note B_, 4 - dutycycle $2 - vibrato $18, $4 - intensity $78 + duty_cycle 2 + vibrato 24, 0, 4 + volume_envelope 7, 8 note A#, 1 - intensity $98 + volume_envelope 9, 8 note B_, 6 - intensity $28 + volume_envelope 2, 8 note G#, 2 - intensity $18 + volume_envelope 1, 8 note G#, 2 - note __, 2 - dutycycle $3 - vibrato $18, $34 - notetype $c, $88 - note __, 8 + rest 2 + duty_cycle 3 + vibrato 24, 3, 4 + note_type 12, 8, 8 + rest 8 octave 3 note B_, 4 - notetype $8, $a8 + note_type 8, 10, 8 note E_, 4 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note F#, 6 note G#, 1 - note __, 1 + rest 1 note A_, 4 note B_, 1 - note __, 1 - loopchannel 0, Music_Pinballnameentry_branch_4d55c -; 4d80d + rest 1 + sound_loop 0, Music_NameEntry_branch_4d55c -Music_Pinballnameentry_branch_4d80d: ; 4d80d +Music_NameEntry_branch_4d80d: octave 2 note A#, 2 - note __, 4 + rest 4 note A#, 2 - note __, 4 + rest 4 note A#, 2 - note __, 4 + rest 4 note A#, 2 - note __, 4 - endchannel -; 4d817 + rest 4 + sound_ret -Music_Pinballnameentry_Ch2: ; 4d817 - dutycycle $3 - vibrato $18, $34 - notetype $8, $a8 +Music_NameEntry_Ch2: + duty_cycle 3 + vibrato 24, 3, 4 + note_type 8, 10, 8 octave 3 note A#, 4 octave 4 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $a8 + volume_envelope 10, 8 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note C_, 6 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 note D#, 6 note C#, 4 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $a8 + volume_envelope 10, 8 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note D#, 6 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 3 - intensity $28 + volume_envelope 2, 8 note F#, 1 - intensity $a8 + volume_envelope 10, 8 note F_, 1 note F#, 1 -Music_Pinballnameentry_branch_4d854: ; 4d854 - vibrato $18, $34 +Music_NameEntry_branch_4d854: + vibrato 24, 3, 4 octave 4 note G#, 12 - intensity $28 + volume_envelope 2, 8 note G#, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 octave 5 note D#, 6 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note G#, 12 - intensity $91 + volume_envelope 9, 1 note C_, 2 note D#, 2 note G#, 2 @@ -643,1407 +641,1396 @@ Music_Pinballnameentry_branch_4d854: ; 4d854 note F_, 2 note D#, 1 note F#, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 12 - intensity $28 + volume_envelope 2, 8 note G#, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 octave 5 note D#, 6 note C#, 1 - intensity $78 + volume_envelope 7, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note F_, 4 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 2 - note __, 3 - intensity $a8 + rest 3 + volume_envelope 10, 8 note C#, 6 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note B_, 1 octave 5 note C_, 2 - intensity $28 + volume_envelope 2, 8 note C_, 2 - intensity $a8 + volume_envelope 10, 8 note C#, 2 octave 4 note A_, 12 - intensity $28 + volume_envelope 2, 8 note A_, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 4 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 8 - intensity $28 + volume_envelope 2, 8 note G#, 1 - intensity $78 + volume_envelope 7, 8 octave 5 note C_, 1 - intensity $a8 + volume_envelope 10, 8 note C#, 8 note F_, 5 - intensity $78 + volume_envelope 7, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note A#, 3 - intensity $28 + volume_envelope 2, 8 note A#, 1 - intensity $a8 + volume_envelope 10, 8 note F_, 2 - intensity $28 + volume_envelope 2, 8 note F_, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note D#, 2 - intensity $28 + volume_envelope 2, 8 note D#, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 octave 4 note A#, 2 - intensity $28 + volume_envelope 2, 8 note A#, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 octave 5 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note B_, 1 octave 5 note C_, 3 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 2 - note __, 3 - intensity $a8 + rest 3 + volume_envelope 10, 8 note D#, 8 - dutycycle $2 + duty_cycle 2 octave 4 note F_, 2 - intensity $28 + volume_envelope 2, 8 note F_, 2 - intensity $a8 + volume_envelope 10, 8 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - intensity $78 + volume_envelope 7, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 11 note F_, 1 - intensity $28 + volume_envelope 2, 8 note F_, 3 - intensity $a8 + volume_envelope 10, 8 octave 5 note D#, 6 note C#, 2 octave 4 note G#, 12 - intensity $91 + volume_envelope 9, 1 note C_, 2 note D#, 2 note G#, 2 - intensity $93 + volume_envelope 9, 3 note F#, 2 - intensity $91 + volume_envelope 9, 1 note F_, 2 note D#, 1 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 12 - intensity $88 + volume_envelope 8, 8 note D#, 1 - intensity $18 + volume_envelope 1, 8 note D#, 3 - intensity $a8 + volume_envelope 10, 8 octave 5 note D#, 6 note C#, 1 - intensity $78 + volume_envelope 7, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note F_, 4 - intensity $88 + volume_envelope 8, 8 note D#, 1 - intensity $18 + volume_envelope 1, 8 note D#, 2 - note __, 3 - intensity $a8 + rest 3 + volume_envelope 10, 8 note C#, 6 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $78 + volume_envelope 7, 8 octave 4 note B_, 1 - intensity $a8 + volume_envelope 10, 8 octave 5 note C_, 2 - intensity $28 + volume_envelope 2, 8 note C_, 2 - intensity $a8 + volume_envelope 10, 8 note C#, 2 octave 4 note A_, 12 - intensity $88 + volume_envelope 8, 8 note F#, 1 - intensity $18 + volume_envelope 1, 8 note F#, 3 - intensity $a1 + volume_envelope 10, 1 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 4 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 8 - intensity $28 + volume_envelope 2, 8 note G#, 2 - intensity $a8 + volume_envelope 10, 8 octave 5 note C#, 6 - intensity $28 + volume_envelope 2, 8 note C#, 2 - intensity $a8 + volume_envelope 10, 8 note F_, 5 - intensity $78 + volume_envelope 7, 8 note A_, 1 - intensity $a8 - vibrato $18, $24 + volume_envelope 10, 8 + vibrato 24, 2, 4 note A#, 8 - vibrato $18, $34 - intensity $28 + vibrato 24, 3, 4 + volume_envelope 2, 8 note A#, 2 - intensity $a8 + volume_envelope 10, 8 note F_, 2 note D#, 4 octave 4 note A#, 1 - intensity $28 + volume_envelope 2, 8 note A#, 2 - note __, 3 - intensity $a8 + rest 3 + volume_envelope 10, 8 octave 5 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note B_, 1 octave 5 note C_, 3 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 2 - note __, 3 - intensity $a8 + rest 3 + volume_envelope 10, 8 note D#, 8 - dutycycle $3 + duty_cycle 3 octave 4 note E_, 4 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - callchannel Music_Pinballnameentry_branch_4da64 + sound_call Music_NameEntry_branch_4da64 note F#, 4 - intensity $28 + volume_envelope 2, 8 note F#, 2 - callchannel Music_Pinballnameentry_branch_4da8d - intensity $28 + sound_call Music_NameEntry_branch_4da8d + volume_envelope 2, 8 note A_, 3 - intensity $78 + volume_envelope 7, 8 note G#, 1 - intensity $88 + volume_envelope 8, 8 note A_, 2 - intensity $a8 + volume_envelope 10, 8 note B_, 4 octave 5 note C#, 2 octave 4 note B_, 6 - intensity $28 + volume_envelope 2, 8 note B_, 2 - note __, 4 - dutycycle $2 - intensity $a8 + rest 4 + duty_cycle 2 + volume_envelope 10, 8 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $a8 + volume_envelope 10, 8 octave 5 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 1 - intensity $28 + volume_envelope 2, 8 note F#, 1 - intensity $a8 + volume_envelope 10, 8 note A_, 1 - intensity $28 + volume_envelope 2, 8 note A_, 1 - intensity $a8 + volume_envelope 10, 8 note B_, 1 - intensity $78 + volume_envelope 7, 8 note G_, 1 - vibrato $18, $24 - pitchoffset 0, CC - callchannel Music_Pinballnameentry_branch_4da64 - pitchoffset 0, C_ + vibrato 24, 2, 4 + transpose 0, 12 + sound_call Music_NameEntry_branch_4da64 + transpose 0, 0 octave 5 note F_, 1 note F#, 5 - pitchoffset 0, CC - callchannel Music_Pinballnameentry_branch_4da8d - intensity $28 + transpose 0, 12 + sound_call Music_NameEntry_branch_4da8d + volume_envelope 2, 8 note A_, 2 octave 5 - note __, 2 - pitchoffset 0, C_ - intensity $a8 + rest 2 + transpose 0, 0 + volume_envelope 10, 8 note A_, 2 note G#, 2 - intensity $28 + volume_envelope 2, 8 note G#, 2 - intensity $a8 + volume_envelope 10, 8 note F#, 2 note E_, 12 - intensity $28 + volume_envelope 2, 8 note E_, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note C_, 2 note E_, 4 note C_, 1 - intensity $28 + volume_envelope 2, 8 note C_, 1 - intensity $a8 + volume_envelope 10, 8 note E_, 12 note F#, 12 note G#, 1 note G#, 16 - intensity $78 - vibrato $18, $4 + volume_envelope 7, 8 + vibrato 24, 0, 4 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 6 - vibrato $18, $34 - dutycycle $3 + vibrato 24, 3, 4 + duty_cycle 3 octave 3 note A_, 4 note B_, 1 - intensity $28 + volume_envelope 2, 8 note B_, 1 - intensity $a8 + volume_envelope 10, 8 octave 4 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 2 - note __, 1 - intensity $a8 + rest 1 + volume_envelope 10, 8 octave 3 note B_, 6 octave 4 note C#, 1 - intensity $28 + volume_envelope 2, 8 note C#, 1 - intensity $a8 + volume_envelope 10, 8 note D#, 6 note C#, 4 note D#, 1 - intensity $28 + volume_envelope 2, 8 note D#, 1 - intensity $a8 + volume_envelope 10, 8 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 2 - note __, 1 - intensity $a8 + rest 1 + volume_envelope 10, 8 note D#, 6 note E_, 1 - intensity $28 + volume_envelope 2, 8 note E_, 1 - intensity $a8 + volume_envelope 10, 8 note F#, 4 note F_, 1 note F#, 1 - loopchannel 0, Music_Pinballnameentry_branch_4d854 -; 4da64 + sound_loop 0, Music_NameEntry_branch_4d854 -Music_Pinballnameentry_branch_4da64: ; 4da64 - intensity $a8 +Music_NameEntry_branch_4da64: + volume_envelope 10, 8 octave 4 note G#, 12 - intensity $28 + volume_envelope 2, 8 note G#, 2 - note __, 1 - intensity $88 + rest 1 + volume_envelope 8, 8 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 2 note A_, 4 note G#, 2 note F#, 6 - intensity $28 + volume_envelope 2, 8 note F#, 3 - intensity $a8 + volume_envelope 10, 8 note A#, 1 note B_, 10 note A#, 2 note A_, 2 note G#, 12 - intensity $28 + volume_envelope 2, 8 note G#, 3 - intensity $78 + volume_envelope 7, 8 note G_, 1 - intensity $88 + volume_envelope 8, 8 note G#, 2 - intensity $a8 + volume_envelope 10, 8 note A_, 4 note G#, 2 - endchannel -; 4da8d + sound_ret -Music_Pinballnameentry_branch_4da8d: ; 4da8d - intensity $a8 +Music_NameEntry_branch_4da8d: + volume_envelope 10, 8 octave 4 note F_, 4 - intensity $28 + volume_envelope 2, 8 note F_, 2 - intensity $a8 + volume_envelope 10, 8 note F#, 4 - intensity $28 + volume_envelope 2, 8 note F#, 2 - intensity $a8 + volume_envelope 10, 8 note G#, 4 note A_, 14 - intensity $28 + volume_envelope 2, 8 note A_, 2 - note __, 2 - intensity $a8 + rest 2 + volume_envelope 10, 8 note A_, 2 note G#, 4 note F#, 2 note B_, 8 - intensity $28 + volume_envelope 2, 8 note B_, 2 - intensity $a8 + volume_envelope 10, 8 note A_, 2 - intensity $28 + volume_envelope 2, 8 note A_, 2 - note __, 4 - intensity $a8 + rest 4 + volume_envelope 10, 8 note G#, 2 - intensity $28 + volume_envelope 2, 8 note G#, 2 - intensity $a8 + volume_envelope 10, 8 note A_, 14 - endchannel -; 4dabc + sound_ret -Music_Pinballnameentry_Ch3: ; 4dabc - notetype $8, $22 +Music_NameEntry_Ch3: + note_type 8, 2, 2 octave 1 note F#, 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 1 note F#, 1 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 octave 1 note G#, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 3 + rest 3 octave 3 note D#, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 1 note A_, 1 - note __, 3 + rest 3 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 -Music_Pinballnameentry_branch_4daf5: ; 4daf5 + rest 1 +Music_NameEntry_branch_4daf5: note G#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D#, 4 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note G#, 4 octave 3 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 - notetype $8, $32 + rest 1 + note_type 8, 3, 2 octave 3 note G#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 3 - notetype $8, $22 + rest 3 + note_type 8, 2, 2 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 2 - note __, 2 + rest 2 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 - notetype $8, $32 + rest 1 + note_type 8, 3, 2 octave 3 note G#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 - notetype $8, $22 + rest 3 + note_type 8, 2, 2 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C_, 2 - note __, 2 + rest 2 octave 1 note A#, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 - notetype $8, $32 + rest 1 + note_type 8, 3, 2 octave 3 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 3 - notetype $8, $22 + rest 3 + note_type 8, 2, 2 octave 1 note G#, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note A#, 1 - note __, 1 - notetype $8, $32 + rest 1 + note_type 8, 3, 2 octave 3 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 3 - notetype $8, $22 + rest 3 + note_type 8, 2, 2 octave 1 note F#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note A_, 1 - note __, 1 - notetype $8, $32 + rest 1 + note_type 8, 3, 2 octave 3 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 3 - notetype $8, $22 + rest 3 + note_type 8, 2, 2 octave 1 note F#, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 1 note F_, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - notetype $8, $22 + rest 1 + note_type 8, 2, 2 octave 1 note G#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - notetype $8, $12 + rest 1 + note_type 8, 1, 2 note B_, 2 - note __, 2 + rest 2 octave 2 note D#, 1 - note __, 1 + rest 1 note F#, 4 - notetype $8, $32 + note_type 8, 3, 2 octave 1 note B_, 2 - notetype $8, $22 + note_type 8, 2, 2 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 1 - notetype $8, $32 + note_type 8, 3, 2 note D_, 1 - notetype $8, $22 + note_type 8, 2, 2 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 1 - notetype $8, $32 + note_type 8, 3, 2 note C#, 1 - notetype $8, $22 + note_type 8, 2, 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - notetype $8, $32 + note_type 8, 3, 2 note C_, 1 - notetype $8, $22 + note_type 8, 2, 2 note C#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 3 note C#, 4 octave 2 note B_, 1 - note __, 5 + rest 5 note G#, 2 - callchannel Music_Pinballnameentry_branch_4ddc7 + sound_call Music_NameEntry_branch_4ddc7 note D#, 6 - note __, 6 - notetype $8, $32 + rest 6 + note_type 8, 3, 2 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype $8, $22 + rest 1 + note_type 8, 2, 2 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 1 - notetype $8, $32 + note_type 8, 3, 2 note D_, 1 - notetype $8, $22 + note_type 8, 2, 2 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 - note __, 2 + rest 2 octave 2 note D#, 1 - notetype $8, $32 + note_type 8, 3, 2 note C#, 1 - notetype $8, $22 + note_type 8, 2, 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 - note __, 2 + rest 2 octave 2 note D_, 1 - notetype $8, $32 + note_type 8, 3, 2 note C_, 1 - notetype $8, $22 + note_type 8, 2, 2 note C#, 2 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 3 note C#, 4 octave 2 note B_, 1 - note __, 5 + rest 5 note G#, 2 - callchannel Music_Pinballnameentry_branch_4ddc7 + sound_call Music_NameEntry_branch_4ddc7 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - notetype $8, $32 + rest 1 + note_type 8, 3, 2 note D#, 12 octave 2 note A_, 12 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 1 note B_, 2 note E_, 2 - note __, 3 - notetype $8, $32 + rest 3 + note_type 8, 3, 2 octave 2 note D#, 1 - notetype $8, $22 + note_type 8, 2, 2 note E_, 6 octave 1 note A_, 3 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 2 note E_, 1 - note __, 3 + rest 3 octave 1 note B_, 6 octave 2 note D#, 1 - note __, 1 + rest 1 note F#, 6 note A_, 4 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 3 + rest 3 note B_, 6 note F#, 1 - note __, 1 + rest 1 note B_, 4 octave 3 note D#, 1 - note __, 1 - loopchannel 0, Music_Pinballnameentry_branch_4daf5 -; 4ddc7 + rest 1 + sound_loop 0, Music_NameEntry_branch_4daf5 -Music_Pinballnameentry_branch_4ddc7: ; 4ddc7 +Music_NameEntry_branch_4ddc7: note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note F#, 1 - notetype $8, $32 + note_type 8, 3, 2 note E_, 1 - notetype $8, $22 + note_type 8, 2, 2 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note F_, 1 - notetype $8, $32 + note_type 8, 3, 2 note D#, 1 - notetype $8, $22 + note_type 8, 2, 2 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note E_, 1 - notetype $8, $32 + note_type 8, 3, 2 note D_, 1 - notetype $8, $22 - endchannel -; 4de10 + note_type 8, 2, 2 + sound_ret -Music_Pinballnameentry_Ch4: ; 4de10 - togglenoise $0 - notetype $c - note F_, 16 - note __, 8 - notetype $8 - note D#, 2 - note D_, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note D_, 2 -Music_Pinballnameentry_branch_4de1e: ; 4de1e - callchannel Music_Pinballnameentry_branch_4dec7 - note D_, 2 - note G_, 2 - note G#, 2 - callchannel Music_Pinballnameentry_branch_4dec7 - note D_, 2 - note G_, 2 - note C#, 2 - callchannel Music_Pinballnameentry_branch_4dec7 - note D_, 2 - note G_, 2 - note G#, 2 - callchannel Music_Pinballnameentry_branch_4ded1 - note G#, 2 - note G_, 2 - note D_, 2 - callchannel Music_Pinballnameentry_branch_4dec7 - note D_, 2 - note G_, 2 - note G#, 2 - callchannel Music_Pinballnameentry_branch_4dec7 - note D_, 2 - note G_, 2 - note C#, 2 - callchannel Music_Pinballnameentry_branch_4ded1 - note D_, 2 - note G_, 2 - note D_, 2 - callchannel Music_Pinballnameentry_branch_4dec7 - note D_, 2 - note D_, 2 - note D_, 2 -Music_Pinballnameentry_branch_4de4e: ; 4de4e - callchannel Music_Pinballnameentry_branch_4dedb - note D#, 2 - note G_, 2 - note D#, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note G_, 2 - note C#, 2 - loopchannel 3, Music_Pinballnameentry_branch_4de4e - callchannel Music_Pinballnameentry_branch_4dedb - note D#, 2 - note G_, 2 - note D#, 2 - note D_, 2 - note G_, 2 - note D#, 2 - note D#, 2 - note G#, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D#, 2 - note G_, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note D#, 2 - note G_, 4 - note D_, 2 - note G_, 2 - note D_, 2 -Music_Pinballnameentry_branch_4de7a: ; 4de7a - callchannel Music_Pinballnameentry_branch_4dee8 - loopchannel 5, Music_Pinballnameentry_branch_4de7a - note D#, 2 - note G_, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note D#, 2 - note G#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note D_, 12 - note D#, 2 - note D_, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note D_, 2 -Music_Pinballnameentry_branch_4de93: ; 4de93 - callchannel Music_Pinballnameentry_branch_4dee8 - loopchannel 7, Music_Pinballnameentry_branch_4de93 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note F#, 9 - note G_, 1 - note G_, 1 - note G_, 1 - note F#, 12 - note D#, 2 - note G_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - notetype $c - note __, 16 - note __, 8 - notetype $8 - note D_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note C#, 2 - note D_, 2 - loopchannel 0, Music_Pinballnameentry_branch_4de1e -; 4dec7 +Music_NameEntry_Ch4: + toggle_noise 0 + drum_speed 12 + drum_note 6, 16 + rest 8 + drum_speed 8 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 +Music_NameEntry_branch_4de1e: + sound_call Music_NameEntry_branch_4dec7 + drum_note 3, 2 + drum_note 8, 2 + drum_note 9, 2 + sound_call Music_NameEntry_branch_4dec7 + drum_note 3, 2 + drum_note 8, 2 + drum_note 2, 2 + sound_call Music_NameEntry_branch_4dec7 + drum_note 3, 2 + drum_note 8, 2 + drum_note 9, 2 + sound_call Music_NameEntry_branch_4ded1 + drum_note 9, 2 + drum_note 8, 2 + drum_note 3, 2 + sound_call Music_NameEntry_branch_4dec7 + drum_note 3, 2 + drum_note 8, 2 + drum_note 9, 2 + sound_call Music_NameEntry_branch_4dec7 + drum_note 3, 2 + drum_note 8, 2 + drum_note 2, 2 + sound_call Music_NameEntry_branch_4ded1 + drum_note 3, 2 + drum_note 8, 2 + drum_note 3, 2 + sound_call Music_NameEntry_branch_4dec7 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 +Music_NameEntry_branch_4de4e: + sound_call Music_NameEntry_branch_4dedb + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 2, 2 + sound_loop 3, Music_NameEntry_branch_4de4e + sound_call Music_NameEntry_branch_4dedb + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 9, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 8, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 8, 4 + drum_note 3, 2 + drum_note 8, 2 + drum_note 3, 2 +Music_NameEntry_branch_4de7a: + sound_call Music_NameEntry_branch_4dee8 + sound_loop 5, Music_NameEntry_branch_4de7a + drum_note 4, 2 + drum_note 8, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 9, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 12 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 +Music_NameEntry_branch_4de93: + sound_call Music_NameEntry_branch_4dee8 + sound_loop 7, Music_NameEntry_branch_4de93 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 9, 2 + drum_note 9, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 7, 9 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 12 + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 9, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + rest 16 + rest 8 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + sound_loop 0, Music_NameEntry_branch_4de1e -Music_Pinballnameentry_branch_4dec7: ; 4dec7 - note D#, 2 - note G_, 2 - note G#, 2 - note D_, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - endchannel -; 4ded1 +Music_NameEntry_branch_4dec7: + drum_note 4, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + sound_ret -Music_Pinballnameentry_branch_4ded1: ; 4ded1 - note D#, 2 - note G_, 2 - note G#, 2 - note D_, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - endchannel -; 4dedb +Music_NameEntry_branch_4ded1: + drum_note 4, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret -Music_Pinballnameentry_branch_4dedb: ; 4dedb - note D#, 2 - note G_, 2 - note D#, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note G_, 2 - endchannel -; 4dee8 - -Music_Pinballnameentry_branch_4dee8: ; 4dee8 - note D#, 2 - note G_, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note D_, 2 - note G_, 2 - note F#, 2 - endchannel -; 4def4 +Music_NameEntry_branch_4dedb: + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 8, 2 + sound_ret +Music_NameEntry_branch_4dee8: + drum_note 4, 2 + drum_note 8, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 7, 2 + sound_ret diff --git a/crysaudio/music/pinball/options.asm b/crysaudio/music/pinball/options.asm index a948e41d..be605eb5 100644 --- a/crysaudio/music/pinball/options.asm +++ b/crysaudio/music/pinball/options.asm @@ -1,229 +1,221 @@ -Music_Pinballoptions: ; 49374 - dbw $80, Music_Pinballoptions_Ch1 - dbw $01, Music_Pinballoptions_Ch2 - dbw $02, Music_Pinballoptions_Ch3 -; 4937d +Music_Options: + channel_count 3 + channel 1, Music_Options_Ch1 + channel 2, Music_Options_Ch2 + channel 3, Music_Options_Ch3 -Music_Pinballoptions_Ch1: ; 4937d +Music_Options_Ch1: tempo 272 - volume $77 - endchannel -; 49383 + volume 7, 7 + sound_ret -Music_Pinballoptions_Ch2: ; 49383 - dutycycle $2 - tone $0001 -Music_Pinballoptions_branch_49388: ; 49388 - callchannel Music_Pinballoptions_branch_49406 - intensity $a2 +Music_Options_Ch2: + duty_cycle 2 + pitch_offset 1 +Music_Options_branch_49388: + sound_call Music_Options_branch_49406 + volume_envelope 10, 2 note A_, 1 - intensity $52 + volume_envelope 5, 2 note A_, 1 - intensity $22 + volume_envelope 2, 2 note A_, 2 - intensity $a2 + volume_envelope 10, 2 note G#, 1 - intensity $52 + volume_envelope 5, 2 note G#, 1 - callchannel Music_Pinballoptions_branch_49406 - intensity $a2 + sound_call Music_Options_branch_49406 + volume_envelope 10, 2 note B_, 1 - intensity $52 + volume_envelope 5, 2 note B_, 1 - intensity $22 + volume_envelope 2, 2 note B_, 2 - intensity $a2 + volume_envelope 10, 2 octave 6 note C#, 1 - intensity $52 + volume_envelope 5, 2 note C#, 1 - intensity $a2 + volume_envelope 10, 2 note D#, 1 - intensity $52 + volume_envelope 5, 2 note D#, 1 - intensity $a2 + volume_envelope 10, 2 octave 5 note F#, 1 - intensity $52 + volume_envelope 5, 2 note F#, 1 - intensity $a2 + volume_envelope 10, 2 note G#, 1 - intensity $52 + volume_envelope 5, 2 note G#, 1 - intensity $a2 + volume_envelope 10, 2 note F#, 1 - intensity $52 + volume_envelope 5, 2 note F#, 1 - intensity $22 + volume_envelope 2, 2 note F#, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 1 - intensity $52 + volume_envelope 5, 2 note A#, 1 - intensity $a2 + volume_envelope 10, 2 note G#, 1 - intensity $52 + volume_envelope 5, 2 note G#, 1 - intensity $a2 + volume_envelope 10, 2 note F#, 1 - intensity $52 + volume_envelope 5, 2 note F#, 1 - intensity $a2 + volume_envelope 10, 2 note F#, 1 - intensity $52 + volume_envelope 5, 2 note F#, 1 - intensity $a2 + volume_envelope 10, 2 note F_, 1 - intensity $52 + volume_envelope 5, 2 note F_, 1 - intensity $a2 + volume_envelope 10, 2 note E_, 1 - intensity $52 + volume_envelope 5, 2 note E_, 1 - intensity $a2 + volume_envelope 10, 2 note D#, 1 - intensity $52 + volume_envelope 5, 2 note D#, 1 - intensity $a2 + volume_envelope 10, 2 note C#, 1 - intensity $52 + volume_envelope 5, 2 note C#, 1 - intensity $22 + volume_envelope 2, 2 note C#, 4 - intensity $a2 + volume_envelope 10, 2 note A_, 1 - intensity $52 + volume_envelope 5, 2 note A_, 1 - loopchannel 0, Music_Pinballoptions_branch_49388 -; 49406 + sound_loop 0, Music_Options_branch_49388 -Music_Pinballoptions_branch_49406: ; 49406 - notetype $c, $a2 +Music_Options_branch_49406: + note_type 12, 10, 2 octave 5 note A#, 1 - intensity $52 + volume_envelope 5, 2 note A#, 1 - intensity $a2 + volume_envelope 10, 2 note A_, 1 - intensity $52 + volume_envelope 5, 2 note A_, 1 - intensity $a2 + volume_envelope 10, 2 note G#, 1 - intensity $52 + volume_envelope 5, 2 note G#, 1 - intensity $a2 + volume_envelope 10, 2 note A#, 1 - intensity $52 + volume_envelope 5, 2 note A#, 1 - intensity $22 + volume_envelope 2, 2 note A#, 2 - endchannel -; 49424 + sound_ret -Music_Pinballoptions_Ch3: ; 49424 -Music_Pinballoptions_branch_49424: ; 49424 - callchannel Music_Pinballoptions_branch_494ac - intensity $22 +Music_Options_Ch3: + sound_call Music_Options_branch_494ac + volume_envelope 2, 2 octave 5 note C#, 1 - intensity $32 + volume_envelope 3, 2 note C#, 1 - note __, 2 - callchannel Music_Pinballoptions_branch_494ac - intensity $22 + rest 2 + sound_call Music_Options_branch_494ac + volume_envelope 2, 2 octave 5 note D_, 1 - intensity $32 + volume_envelope 3, 2 note D_, 1 - note __, 2 - callchannel Music_Pinballoptions_branch_494ac - intensity $22 + rest 2 + sound_call Music_Options_branch_494ac + volume_envelope 2, 2 octave 5 note D#, 1 - intensity $32 + volume_envelope 3, 2 note D#, 1 - note __, 2 - callchannel Music_Pinballoptions_branch_494ac - intensity $22 + rest 2 + sound_call Music_Options_branch_494ac + volume_envelope 2, 2 octave 5 note E_, 1 - intensity $32 + volume_envelope 3, 2 note E_, 1 - note __, 2 - intensity $22 + rest 2 + volume_envelope 2, 2 octave 3 note B_, 1 - intensity $32 + volume_envelope 3, 2 note B_, 1 - intensity $22 + volume_envelope 2, 2 octave 4 note D#, 1 - intensity $32 + volume_envelope 3, 2 note D#, 1 - intensity $22 + volume_envelope 2, 2 note F#, 1 - intensity $32 + volume_envelope 3, 2 note F#, 1 - note __, 2 - intensity $22 + rest 2 + volume_envelope 2, 2 note C_, 1 - intensity $32 + volume_envelope 3, 2 note C_, 1 - intensity $22 + volume_envelope 2, 2 note D#, 1 - intensity $32 + volume_envelope 3, 2 note D#, 1 - intensity $22 + volume_envelope 2, 2 note F#, 1 - intensity $32 + volume_envelope 3, 2 note F#, 1 - note __, 2 - intensity $22 + rest 2 + volume_envelope 2, 2 note C#, 1 - intensity $32 + volume_envelope 3, 2 note C#, 1 - intensity $22 + volume_envelope 2, 2 note F_, 1 - intensity $32 + volume_envelope 3, 2 note F_, 1 - intensity $22 + volume_envelope 2, 2 note G#, 1 - intensity $32 + volume_envelope 3, 2 note G#, 1 - intensity $22 + volume_envelope 2, 2 note F_, 1 - intensity $32 + volume_envelope 3, 2 note F_, 1 - intensity $22 + volume_envelope 2, 2 note G#, 1 - intensity $32 + volume_envelope 3, 2 note G#, 1 - intensity $22 + volume_envelope 2, 2 note F_, 1 - intensity $32 + volume_envelope 3, 2 note F_, 1 - intensity $22 + volume_envelope 2, 2 note G#, 1 - intensity $32 + volume_envelope 3, 2 note G#, 1 - intensity $22 + volume_envelope 2, 2 note B_, 1 - intensity $32 + volume_envelope 3, 2 note B_, 1 - loopchannel 0, Music_Pinballoptions_branch_49424 -; 494ac + sound_loop 0, Music_Options_Ch3 -Music_Pinballoptions_branch_494ac: ; 494ac - notetype $c, $22 +Music_Options_branch_494ac: + note_type 12, 2, 2 octave 4 note F#, 1 - intensity $32 + volume_envelope 3, 2 note F#, 1 - intensity $22 + volume_envelope 2, 2 note A#, 1 - intensity $32 + volume_envelope 3, 2 note A#, 1 - endchannel -; 494bb - - + sound_ret diff --git a/crysaudio/music/pinball/pokedex.asm b/crysaudio/music/pinball/pokedex.asm index 1b2e1d9a..ec923799 100644 --- a/crysaudio/music/pinball/pokedex.asm +++ b/crysaudio/music/pinball/pokedex.asm @@ -1,191 +1,189 @@ -Music_Pinballpokedex: ; 3d973 - dbw $c0, Music_Pinballpokedex_Ch1 - dbw $01, Music_Pinballpokedex_Ch2 - dbw $02, Music_Pinballpokedex_Ch3 - dbw $03, Music_Pinballpokedex_Ch4 -; 3d97f +Music_Pokedex: + channel_count 4 + channel 1, Music_Pokedex_Ch1 + channel 2, Music_Pokedex_Ch2 + channel 3, Music_Pokedex_Ch3 + channel 4, Music_Pokedex_Ch4 -Music_Pinballpokedex_Ch1: ; 3d97f +Music_Pokedex_Ch1: tempo 157 - volume $77 - notetype $c, $b3 - note __, 4 -Music_Pinballpokedex_branch_3d988: ; 3d988 - notetype $c, $92 - dutycycle $2 - note __, 4 + volume 7, 7 + note_type 12, 11, 3 + rest 4 +Music_Pokedex_branch_3d988: + note_type 12, 9, 2 + duty_cycle 2 + rest 4 octave 4 note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - note __, 16 - note __, 4 + rest 1 + rest 16 + rest 4 note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - note __, 16 - callchannel Music_Pinballpokedex_branch_3d9e2 - note __, 2 + rest 1 + rest 16 + sound_call Music_Pokedex_branch_3d9e2 + rest 2 note D_, 1 - note __, 3 - intensity $52 + rest 3 + volume_envelope 5, 2 note D_, 1 - note __, 3 - intensity $72 + rest 3 + volume_envelope 7, 2 note D_, 1 - note __, 3 - intensity $b2 + rest 3 + volume_envelope 11, 2 note D_, 1 - note __, 1 - callchannel Music_Pinballpokedex_branch_3d9e2 - note __, 2 + rest 1 + sound_call Music_Pokedex_branch_3d9e2 + rest 2 note D_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 9 - loopchannel 0, Music_Pinballpokedex_branch_3d988 -; 3d9e2 + rest 9 + sound_loop 0, Music_Pokedex_branch_3d988 -Music_Pinballpokedex_branch_3d9e2: ; 3d9e2 - intensity $92 - note __, 4 +Music_Pokedex_branch_3d9e2: + volume_envelope 9, 2 + rest 4 note F#, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - endchannel -; 3d9ff + rest 1 + sound_ret -Music_Pinballpokedex_Ch2: ; 3d9ff - notetype $c, $b3 - note __, 4 - tone $0001 -Music_Pinballpokedex_branch_3da06: ; 3da06 - notetype $c, $a2 - dutycycle $2 - note __, 4 +Music_Pokedex_Ch2: + note_type 12, 11, 3 + rest 4 + pitch_offset 1 +Music_Pokedex_branch_3da06: + note_type 12, 10, 2 + duty_cycle 2 + rest 4 octave 4 note G#, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note B_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - intensity $b2 + rest 3 + volume_envelope 11, 2 note G#, 1 - note __, 1 - notetype $6, $a2 - note __, 2 - note __, 1 + rest 1 + note_type 6, 10, 2 + rest 2 + rest 1 note G_, 1 - notetype $c, $a2 + note_type 12, 10, 2 note G#, 2 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - notetype $6, $b2 + rest 1 + note_type 6, 11, 2 octave 3 note G#, 1 note A_, 1 note A#, 2 note G#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 - intensity $61 - note __, 2 + rest 2 + volume_envelope 6, 1 + rest 2 note A_, 2 octave 4 note C#, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G#, 2 - intensity $61 + volume_envelope 6, 1 note E_, 2 note C#, 2 octave 3 @@ -193,517 +191,509 @@ Music_Pinballpokedex_branch_3da06: ; 3da06 octave 4 note C#, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note F#, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 note E_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 note E_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 note C_, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 2 - intensity $61 + volume_envelope 6, 1 note C_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 2 - intensity $61 + volume_envelope 6, 1 octave 3 note G_, 2 note B_, 2 octave 4 note D_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 2 - note __, 4 - intensity $82 + rest 4 + volume_envelope 8, 2 note G#, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 2 - intensity $61 + volume_envelope 6, 1 octave 3 note B_, 2 octave 4 note D_, 2 note F#, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 2 - intensity $61 + volume_envelope 6, 1 octave 3 note F#, 2 note B_, 2 octave 4 note D_, 2 - intensity $b2 + volume_envelope 11, 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 octave 3 note B_, 2 - note __, 2 - intensity $b2 + rest 2 + volume_envelope 11, 2 octave 4 note G#, 2 - note __, 2 - note __, 3 - intensity $92 + rest 2 + rest 3 + volume_envelope 9, 2 note G_, 1 - intensity $a2 + volume_envelope 10, 2 note G#, 4 note F_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 - intensity $b2 + rest 2 + volume_envelope 11, 2 octave 3 note G#, 1 note A_, 1 note A#, 2 note G#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 - callchannel Music_Pinballpokedex_branch_3dae5 - note __, 4 - intensity $b2 + rest 2 + sound_call Music_Pokedex_branch_3dae5 + rest 4 + volume_envelope 11, 2 note A_, 2 - note __, 6 - intensity $52 + rest 6 + volume_envelope 5, 2 note A_, 2 - note __, 6 - intensity $82 + rest 6 + volume_envelope 8, 2 note A_, 2 - note __, 6 - intensity $c2 + rest 6 + volume_envelope 12, 2 note A_, 2 - note __, 2 - callchannel Music_Pinballpokedex_branch_3dae5 - note __, 4 - intensity $b2 + rest 2 + sound_call Music_Pokedex_branch_3dae5 + rest 4 + volume_envelope 11, 2 note A_, 2 - note __, 6 + rest 6 note G#, 2 - notetype $c, $b3 - note __, 9 - loopchannel 0, Music_Pinballpokedex_branch_3da06 -; 3dae5 + note_type 12, 11, 3 + rest 9 + sound_loop 0, Music_Pokedex_branch_3da06 -Music_Pinballpokedex_branch_3dae5: ; 3dae5 - note __, 2 - intensity $61 +Music_Pokedex_branch_3dae5: + rest 2 + volume_envelope 6, 1 octave 4 note D_, 2 note F#, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 octave 5 note C#, 2 - intensity $61 + volume_envelope 6, 1 octave 4 note A_, 2 note F#, 2 note D_, 2 note F#, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 note A_, 2 octave 5 note C_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 octave 4 note A_, 2 octave 5 note C_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 2 - note __, 2 - intensity $61 + rest 2 + volume_envelope 6, 1 octave 4 note F_, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 octave 5 note D_, 2 - intensity $61 + volume_envelope 6, 1 octave 4 note F_, 2 - intensity $b2 + volume_envelope 11, 2 octave 5 note C_, 2 - intensity $61 + volume_envelope 6, 1 octave 4 note C_, 2 note E_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 2 - note __, 4 - intensity $82 + rest 4 + volume_envelope 8, 2 note A#, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 6 + rest 6 note A_, 2 - note __, 2 - endchannel -; 3db3a + rest 2 + sound_ret -Music_Pinballpokedex_Ch3: ; 3db3a - notetype $c, $22 - note __, 4 -Music_Pinballpokedex_branch_3db3e: ; 3db3e - notetype $c, $22 +Music_Pokedex_Ch3: + note_type 12, 2, 2 + rest 4 +Music_Pokedex_branch_3db3e: + note_type 12, 2, 2 octave 1 note A_, 4 octave 2 note A_, 1 - note __, 1 + rest 1 octave 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 octave 3 note C_, 1 - note __, 3 + rest 3 octave 2 note C_, 1 - note __, 1 + rest 1 octave 1 note G_, 4 octave 2 note G_, 1 - note __, 1 + rest 1 octave 1 note G_, 1 - note __, 1 - notetype $6, $22 + rest 1 + note_type 6, 2, 2 note B_, 7 - note __, 1 + rest 1 octave 2 note B_, 2 - note __, 2 + rest 2 octave 1 note B_, 2 - note __, 2 + rest 2 note F#, 3 - note __, 1 + rest 1 octave 2 note B_, 2 - note __, 6 + rest 6 octave 1 note A#, 2 - notetype $c, $22 - note __, 1 - note __, 16 + note_type 12, 2, 2 + rest 1 + rest 16 note A_, 4 octave 2 note A_, 1 - note __, 1 + rest 1 octave 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 octave 3 note C_, 1 - note __, 3 + rest 3 octave 2 note C_, 1 - note __, 1 + rest 1 octave 1 note G_, 4 octave 2 note G_, 1 - note __, 1 + rest 1 octave 1 note G_, 1 - note __, 1 - notetype $6, $22 + rest 1 + note_type 6, 2, 2 note B_, 7 - note __, 1 + rest 1 octave 2 note B_, 2 - note __, 2 + rest 2 octave 1 note B_, 2 - note __, 2 + rest 2 note F#, 3 - note __, 1 + rest 1 octave 2 note B_, 2 - note __, 6 + rest 6 octave 1 note A#, 2 - note __, 2 - note __, 4 - notetype $6, $32 + rest 2 + rest 4 + note_type 6, 3, 2 octave 5 note G#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 4 note G#, 1 note A_, 1 note A#, 2 note G#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 - notetype $6, $22 + rest 2 + note_type 6, 2, 2 octave 2 note D_, 8 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note D_, 2 - note __, 2 + rest 2 octave 1 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 6 + rest 6 note F_, 2 - note __, 2 + rest 2 octave 2 note F_, 4 octave 3 note F_, 2 - note __, 6 + rest 6 octave 2 note F_, 2 - note __, 2 + rest 2 note C_, 8 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 8 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note C_, 2 - note __, 2 + rest 2 octave 1 note G_, 2 - note __, 2 + rest 2 octave 2 note E_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 + rest 2 octave 1 note B_, 4 octave 2 note B_, 2 - note __, 6 - notetype $6, $32 + rest 6 + note_type 6, 3, 2 octave 1 note A#, 2 - note __, 2 + rest 2 note A#, 4 - notetype $6, $22 + note_type 6, 2, 2 octave 2 note A#, 2 - note __, 6 + rest 6 octave 1 note A#, 2 - note __, 2 + rest 2 octave 2 note D_, 8 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note D_, 2 - note __, 2 + rest 2 octave 1 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 6 + rest 6 note F_, 2 - note __, 2 + rest 2 octave 2 note F_, 4 octave 3 note F_, 2 - note __, 6 + rest 6 octave 2 note F_, 2 - note __, 2 + rest 2 note C_, 8 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 8 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note C_, 2 - note __, 2 + rest 2 octave 1 note G_, 2 - note __, 2 + rest 2 octave 2 note E_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 - note __, 4 + rest 2 + rest 4 note B_, 2 - note __, 6 + rest 6 octave 3 note B_, 2 - note __, 6 + rest 6 octave 2 note E_, 2 - note __, 2 + rest 2 octave 1 note B_, 2 - note __, 2 + rest 2 note E_, 2 - notetype $c, $22 - note __, 1 - loopchannel 0, Music_Pinballpokedex_branch_3db3e -; 3dc48 + note_type 12, 2, 2 + rest 1 + sound_loop 0, Music_Pokedex_branch_3db3e -Music_Pinballpokedex_Ch4: ; 3dc48 - togglenoise $0 - notetype $8 - note F_, 3 - note C#, 1 - note C#, 1 - note C#, 1 -Music_Pinballpokedex_branch_3dc50: ; 3dc50 - notetype $8 - callchannel Music_Pinballpokedex_branch_3dc7c - callchannel Music_Pinballpokedex_branch_3dc97 - callchannel Music_Pinballpokedex_branch_3dc7c - callchannel Music_Pinballpokedex_branch_3dc97 - callchannel Music_Pinballpokedex_branch_3dc7c - note G_, 3 - note G_, 3 - note G_, 3 - note E_, 3 - note E_, 3 - note E_, 3 - note E_, 3 - note E_, 3 - callchannel Music_Pinballpokedex_branch_3dc7c - note G_, 3 - note F#, 3 - note G_, 3 - note E_, 3 - note E_, 3 - note D#, 3 - notetype $c - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - loopchannel 0, Music_Pinballpokedex_branch_3dc50 -; 3dc7c - -Music_Pinballpokedex_branch_3dc7c: ; 3dc7c - note F#, 3 - note G_, 3 - note E_, 3 - note G_, 3 - note G_, 3 - note E_, 3 - note G_, 3 - note E_, 3 - note G_, 3 - note E_, 3 - note G_, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note E_, 3 - note G_, 3 - note G_, 3 - note F#, 3 - note E_, 3 - note G_, 3 - note E_, 3 - note G_, 3 - note E_, 3 - note E_, 3 - note G_, 3 - note F#, 3 - endchannel -; 3dc97 - -Music_Pinballpokedex_branch_3dc97: ; 3dc97 - note G_, 3 - note G_, 3 - note G_, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note E_, 3 - note E_, 3 - note D#, 3 - note D#, 3 - endchannel -; 3dca2 +Music_Pokedex_Ch4: + toggle_noise 0 + drum_speed 8 + drum_note 6, 3 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 +Music_Pokedex_branch_3dc50: + drum_speed 8 + sound_call Music_Pokedex_branch_3dc7c + sound_call Music_Pokedex_branch_3dc97 + sound_call Music_Pokedex_branch_3dc7c + sound_call Music_Pokedex_branch_3dc97 + sound_call Music_Pokedex_branch_3dc7c + drum_note 8, 3 + drum_note 8, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 5, 3 + drum_note 5, 3 + drum_note 5, 3 + drum_note 5, 3 + sound_call Music_Pokedex_branch_3dc7c + drum_note 8, 3 + drum_note 7, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 5, 3 + drum_note 4, 3 + drum_speed 12 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_loop 0, Music_Pokedex_branch_3dc50 +Music_Pokedex_branch_3dc7c: + drum_note 7, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 5, 3 + drum_note 8, 3 + drum_note 8, 3 + drum_note 7, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 5, 3 + drum_note 5, 3 + drum_note 8, 3 + drum_note 7, 3 + sound_ret +Music_Pokedex_branch_3dc97: + drum_note 8, 3 + drum_note 8, 3 + drum_note 8, 3 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 5, 3 + drum_note 5, 3 + drum_note 4, 3 + drum_note 4, 3 + sound_ret diff --git a/crysaudio/music/pinball/redfield.asm b/crysaudio/music/pinball/redfield.asm index ff557946..c6cd51b6 100644 --- a/crysaudio/music/pinball/redfield.asm +++ b/crysaudio/music/pinball/redfield.asm @@ -1,208 +1,207 @@ -Music_Pinballredfield: ; 3ccbf - dbw $c0, Music_Pinballredfield_Ch1 - dbw $01, Music_Pinballredfield_Ch2 - dbw $02, Music_Pinballredfield_Ch3 - dbw $03, Music_Pinballredfield_Ch4 -; 3cccb +Music_RedField: + channel_count 4 + channel 1, Music_RedField_Ch1 + channel 2, Music_RedField_Ch2 + channel 3, Music_RedField_Ch3 + channel 4, Music_RedField_Ch4 -Music_Pinballredfield_Ch1: ; 3cccb +Music_RedField_Ch1: tempo 144 - volume $77 - dutycycle $3 - vibrato $12, $34 - tone $0001 - notetype $8, $b3 + volume 7, 7 + duty_cycle 3 + vibrato 18, 3, 4 + pitch_offset 1 + note_type 8, 11, 3 octave 3 note D#, 4 - intensity $83 + volume_envelope 8, 3 octave 2 note F#, 2 note B_, 2 octave 3 note D#, 2 - intensity $b3 + volume_envelope 11, 3 note D#, 8 - intensity $83 + volume_envelope 8, 3 octave 2 note F#, 2 octave 3 note C_, 2 note D#, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 4 - intensity $82 + volume_envelope 8, 2 note E_, 2 note D#, 4 - intensity $a3 + volume_envelope 10, 3 note G#, 6 - note __, 8 -Music_Pinballredfield_branch_3ccf9: ; 3ccf9 - note __, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - intensity $83 + rest 8 +Music_RedField_branch_3ccf9: + rest 8 + rest 16 + rest 16 + rest 16 + rest 16 + volume_envelope 8, 3 octave 4 note C#, 4 - intensity $82 + volume_envelope 8, 2 octave 3 note B_, 6 note G#, 6 - intensity $84 + volume_envelope 8, 4 note F_, 16 - note __, 6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 10 - intensity $83 + rest 6 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 10 + volume_envelope 8, 3 octave 4 note C#, 4 - intensity $82 + volume_envelope 8, 2 octave 3 note B_, 6 note G#, 6 - intensity $84 + volume_envelope 8, 4 note F_, 16 - note __, 6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 6 - intensity $21 + rest 6 + rest 16 + rest 16 + rest 16 + rest 16 + rest 6 + volume_envelope 2, 1 note A#, 2 - intensity $41 + volume_envelope 4, 1 octave 4 note C#, 2 - intensity $61 + volume_envelope 6, 1 octave 3 note A#, 2 - intensity $81 + volume_envelope 8, 1 octave 4 note C#, 2 - intensity $a1 + volume_envelope 10, 1 octave 3 note A#, 2 - intensity $c1 + volume_envelope 12, 1 octave 4 note C#, 12 - note __, 5 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 1 - loopchannel 0, Music_Pinballredfield_branch_3ccf9 -; 3cd5b + rest 5 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 1 + sound_loop 0, Music_RedField_branch_3ccf9 -Music_Pinballredfield_Ch2: ; 3cd5b - dutycycle $2 - vibrato $12, $34 - notetype $8, $c4 +Music_RedField_Ch2: + duty_cycle 2 + vibrato 18, 3, 4 + note_type 8, 12, 4 octave 3 note A#, 4 - intensity $a2 + volume_envelope 10, 2 octave 2 note B_, 2 octave 3 note D#, 2 note F#, 2 - intensity $c4 + volume_envelope 12, 4 note A#, 8 - intensity $a2 + volume_envelope 10, 2 octave 2 note B_, 2 octave 3 note D#, 2 note F#, 2 - intensity $c3 + volume_envelope 12, 3 note A#, 4 - intensity $a2 + volume_envelope 10, 2 note A_, 2 note G#, 4 - intensity $c5 + volume_envelope 12, 5 octave 4 note C#, 14 -Music_Pinballredfield_branch_3cd81: ; 3cd81 - callchannel Music_Pinballredfield_branch_3cf69 - dutycycle $3 - intensity $a3 +Music_RedField_branch_3cd81: + sound_call Music_RedField_branch_3cf69 + duty_cycle 3 + volume_envelope 10, 3 octave 4 note F_, 4 - intensity $a2 + volume_envelope 10, 2 note F#, 6 note G_, 6 - intensity $a4 + volume_envelope 10, 4 note G#, 8 - callchannel Music_Pinballredfield_branch_3cfa5 + sound_call Music_RedField_branch_3cfa5 note A#, 4 note F#, 2 - intensity $92 - panning $f + volume_envelope 9, 2 + force_stereo_panning FALSE, TRUE note A#, 4 note F#, 2 - intensity $72 - panning $f0 + volume_envelope 7, 2 + force_stereo_panning TRUE, FALSE note A#, 4 note F#, 2 - panning $f - intensity $42 + force_stereo_panning FALSE, TRUE + volume_envelope 4, 2 note A#, 4 note F#, 10 - panning $ff - note __, 16 - callchannel Music_Pinballredfield_branch_3cf69 - dutycycle $3 - intensity $a3 + force_stereo_panning TRUE, TRUE + rest 16 + sound_call Music_RedField_branch_3cf69 + duty_cycle 3 + volume_envelope 10, 3 octave 4 note F_, 4 - intensity $a2 + volume_envelope 10, 2 note F#, 6 note G_, 6 - intensity $a6 + volume_envelope 10, 6 note G#, 8 - callchannel Music_Pinballredfield_branch_3cfa5 - intensity $b2 + sound_call Music_RedField_branch_3cfa5 + volume_envelope 11, 2 note A#, 4 - intensity $a2 + volume_envelope 10, 2 note F#, 16 - note __, 4 - intensity $1d - note __, 12 + rest 4 + volume_envelope 1, -5 + rest 12 octave 4 note E_, 12 - dutycycle $0 - intensity $a2 + duty_cycle 0 + volume_envelope 10, 2 octave 5 note D#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 note F#, 2 @@ -214,39 +213,39 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 octave 4 note D#, 2 note F#, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note F#, 2 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note F#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 note F_, 2 note G#, 2 note F_, 2 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note G#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note F#, 2 note F_, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note F#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note D#, 2 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note C#, 2 note F_, 2 @@ -258,15 +257,15 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 octave 4 note C#, 2 note F_, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 2 - intensity $52 + volume_envelope 5, 2 note F_, 2 note C#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note E_, 2 note G#, 2 @@ -283,9 +282,9 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 octave 4 note G#, 2 note E_, 2 - intensity $a2 + volume_envelope 10, 2 note G#, 2 - intensity $52 + volume_envelope 5, 2 octave 3 note B_, 2 octave 4 @@ -296,36 +295,36 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 note B_, 2 note G#, 2 note B_, 2 - intensity $a2 + volume_envelope 10, 2 octave 4 note G#, 2 note A#, 2 - intensity $52 + volume_envelope 5, 2 note D#, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note D#, 2 note F_, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 note A#, 2 - intensity $52 + volume_envelope 5, 2 note F_, 2 note C#, 2 - intensity $a2 + volume_envelope 10, 2 note G#, 2 - intensity $52 + volume_envelope 5, 2 note D#, 2 note F_, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note F_, 2 note C#, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 2 - intensity $52 + volume_envelope 5, 2 octave 3 note A#, 2 octave 4 @@ -338,16 +337,16 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 octave 4 note C#, 2 note F_, 2 - intensity $a2 + volume_envelope 10, 2 note F#, 2 - intensity $52 + volume_envelope 5, 2 note C#, 2 octave 3 note A#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 3 note A#, 2 octave 4 @@ -365,10 +364,10 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 note E_, 2 note G_, 2 note A#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note D#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 note F#, 2 @@ -380,39 +379,39 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 octave 4 note D#, 2 note F#, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note F#, 2 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note F#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 note F_, 2 note G#, 2 note F_, 2 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note G#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note F#, 2 note F_, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note F#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note D#, 2 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note C#, 2 note F_, 2 @@ -423,40 +422,40 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 note G#, 2 octave 4 note C#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note C#, 2 note D#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note F_, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note E_, 4 - intensity $52 + volume_envelope 5, 2 octave 4 note E_, 2 note G#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note D#, 2 - intensity $52 + volume_envelope 5, 2 note E_, 2 note G#, 2 - intensity $a2 + volume_envelope 10, 2 note C#, 2 - intensity $52 + volume_envelope 5, 2 note G#, 2 note E_, 2 - intensity $a2 + volume_envelope 10, 2 octave 4 note A#, 2 - intensity $52 + volume_envelope 5, 2 note G#, 2 note E_, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 octave 3 note B_, 2 octave 4 @@ -467,44 +466,44 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 note B_, 2 note G#, 2 note B_, 2 - intensity $a2 + volume_envelope 10, 2 octave 4 note B_, 2 octave 5 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note D_, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note D_, 2 note F#, 2 note B_, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note F#, 2 note D_, 2 - intensity $a2 + volume_envelope 10, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note D_, 2 note F#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note D_, 2 - intensity $52 + volume_envelope 5, 2 octave 4 note F#, 2 - intensity $a2 + volume_envelope 10, 2 octave 5 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 3 note F#, 2 note A#, 2 @@ -538,31 +537,30 @@ Music_Pinballredfield_branch_3cd81: ; 3cd81 note D#, 2 octave 3 note B_, 2 - loopchannel 0, Music_Pinballredfield_branch_3cd81 -; 3cf69 + sound_loop 0, Music_RedField_branch_3cd81 -Music_Pinballredfield_branch_3cf69: ; 3cf69 - dutycycle $2 - intensity $c2 +Music_RedField_branch_3cf69: + duty_cycle 2 + volume_envelope 12, 2 octave 4 note C#, 2 - intensity $72 + volume_envelope 7, 2 octave 3 note C#, 2 note F#, 2 - intensity $c2 + volume_envelope 12, 2 note B_, 2 - intensity $72 + volume_envelope 7, 2 note C#, 2 note F#, 2 - intensity $c2 + volume_envelope 12, 2 note A#, 4 - intensity $72 + volume_envelope 7, 2 note C#, 2 note D#, 4 note C#, 2 note E_, 4 - intensity $c2 + volume_envelope 12, 2 note A#, 2 note B_, 4 octave 4 @@ -573,851 +571,845 @@ Music_Pinballredfield_branch_3cf69: ; 3cf69 note A#, 2 note B_, 4 note G#, 2 - intensity $92 - panning $f0 + volume_envelope 9, 2 + force_stereo_panning TRUE, FALSE note B_, 4 note G#, 2 - intensity $72 - panning $f + volume_envelope 7, 2 + force_stereo_panning FALSE, TRUE note B_, 4 note G#, 2 - panning $f0 - intensity $42 + force_stereo_panning TRUE, FALSE + volume_envelope 4, 2 note B_, 4 note G#, 2 - panning $ff - endchannel -; 3cfa5 + force_stereo_panning TRUE, TRUE + sound_ret -Music_Pinballredfield_branch_3cfa5: ; 3cfa5 - dutycycle $2 - intensity $c2 +Music_RedField_branch_3cfa5: + duty_cycle 2 + volume_envelope 12, 2 octave 3 note B_, 2 - intensity $72 + volume_envelope 7, 2 note D#, 2 note F#, 2 - intensity $c2 + volume_envelope 12, 2 note A#, 2 - intensity $72 + volume_envelope 7, 2 note D#, 2 note F#, 2 - intensity $c2 + volume_envelope 12, 2 note G#, 4 - intensity $72 + volume_envelope 7, 2 note D_, 2 note F#, 4 note D_, 2 note G#, 4 - intensity $c2 + volume_envelope 12, 2 note G#, 2 note A#, 4 - intensity $c3 + volume_envelope 12, 3 note B_, 6 - intensity $c2 + volume_envelope 12, 2 note B_, 2 note A#, 4 note G#, 2 - endchannel -; 3cfcc + sound_ret -Music_Pinballredfield_Ch3: ; 3cfcc - notetype $8, $23 +Music_RedField_Ch3: + note_type 8, 2, 3 octave 2 note B_, 4 - note __, 6 + rest 6 octave 3 note C_, 7 - note __, 7 + rest 7 note C#, 4 - note __, 6 + rest 6 octave 4 note F_, 6 - note __, 2 + rest 2 octave 3 note G#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 -Music_Pinballredfield_branch_3cfe1: ; 3cfe1 + rest 1 +Music_RedField_branch_3cfe1: octave 2 note F#, 1 - note __, 3 + rest 3 octave 3 note F#, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note E_, 4 - note __, 2 + rest 2 note D#, 4 - note __, 2 + rest 2 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 4 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note D#, 4 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 octave 3 note D#, 1 - note __, 1 + rest 1 note F_, 4 note G#, 1 - note __, 5 + rest 5 note B_, 1 - note __, 5 + rest 5 octave 4 note C#, 6 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 3 + rest 3 octave 3 note G#, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note D#, 4 - note __, 2 + rest 2 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G#, 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note B_, 4 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 4 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note G#, 4 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 note D#, 4 note E_, 1 - note __, 1 + rest 1 note F_, 4 note E_, 1 - note __, 1 + rest 1 note D#, 4 note D_, 1 - note __, 1 + rest 1 octave 2 note F#, 1 - note __, 3 + rest 3 octave 3 note F#, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note E_, 4 - note __, 2 + rest 2 note D#, 4 - note __, 2 + rest 2 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 4 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note D#, 4 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 octave 3 note D#, 1 - note __, 1 + rest 1 note F_, 4 note G#, 1 - note __, 5 + rest 5 note B_, 1 - note __, 5 + rest 5 octave 4 note C#, 6 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 3 + rest 3 octave 3 note G#, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note D#, 4 - note __, 2 + rest 2 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G#, 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note B_, 4 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 4 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note G#, 4 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note F#, 2 - note __, 10 + rest 10 octave 3 note E_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 3 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 7 + rest 7 note B_, 3 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 7 + rest 7 note A#, 3 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 7 + rest 7 note A#, 3 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 3 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 5 + rest 5 note G#, 3 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 7 + rest 7 note G#, 3 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 7 + rest 7 note F#, 3 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 7 + rest 7 note G_, 3 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 5 + rest 5 note B_, 3 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 7 + rest 7 note B_, 3 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 7 + rest 7 note A#, 3 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 7 + rest 7 note A#, 3 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 3 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 5 + rest 5 note G#, 3 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 7 + rest 7 note G#, 3 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 4 + rest 4 note F#, 3 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 7 + rest 7 note G#, 3 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - loopchannel 0, Music_Pinballredfield_branch_3cfe1 -; 3d1cd - -Music_Pinballredfield_Ch4: ; 3d1cd - togglenoise $0 - notetype $8 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 -Music_Pinballredfield_branch_3d1e4: ; 3d1e4 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 8 - note __, 16 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note D_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note D_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - loopchannel 0, Music_Pinballredfield_branch_3d1e4 -; 3d2ed - + rest 1 + sound_loop 0, Music_RedField_branch_3cfe1 +Music_RedField_Ch4: + toggle_noise 0 + drum_speed 8 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 +Music_RedField_branch_3d1e4: + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 8 + rest 16 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + drum_note 8, 4 + drum_note 8, 2 + drum_note 3, 4 + drum_note 8, 2 + sound_loop 0, Music_RedField_branch_3d1e4 diff --git a/crysaudio/music/pinball/seelstage.asm b/crysaudio/music/pinball/seelstage.asm index 1e81f217..4ee8f8e1 100644 --- a/crysaudio/music/pinball/seelstage.asm +++ b/crysaudio/music/pinball/seelstage.asm @@ -1,131 +1,131 @@ -Music_Pinballseelstage: ; 45601 - dbw $c0, Music_Pinballseelstage_Ch1 - dbw $01, Music_Pinballseelstage_Ch2 - dbw $02, Music_Pinballseelstage_Ch3 - dbw $03, Music_Pinballseelstage_Ch4 -; 4560d +Music_SeelStage: + channel_count 4 + channel 1, Music_SeelStage_Ch1 + channel 2, Music_SeelStage_Ch2 + channel 3, Music_SeelStage_Ch3 + channel 4, Music_SeelStage_Ch4 -Music_Pinballseelstage_Ch1: ; 4560d +Music_SeelStage_Ch1: tempo 153 - volume $77 - tone $0001 -Music_Pinballseelstage_branch_45615: ; 45615 - dutycycle $1 - notetype $c, $b3 - note __, 16 - notetype $6, $54 - note __, 4 + volume 7, 7 + pitch_offset 1 +Music_SeelStage_branch_45615: + duty_cycle 1 + note_type 12, 11, 3 + rest 16 + note_type 6, 5, 4 + rest 4 octave 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 16 - note __, 5 - notetype $c, $b3 - note __, 16 - note __, 2 - notetype $6, $54 + rest 16 + rest 5 + note_type 12, 11, 3 + rest 16 + rest 2 + note_type 6, 5, 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 16 - note __, 1 - notetype $c, $b3 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 2 - notetype $6, $54 + rest 16 + rest 1 + note_type 12, 11, 3 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 2 + note_type 6, 5, 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 16 - note __, 5 - notetype $c, $b3 - note __, 16 - note __, 2 - notetype $6, $54 + rest 16 + rest 5 + note_type 12, 11, 3 + rest 16 + rest 2 + note_type 6, 5, 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 16 - note __, 1 - dutycycle $2 - pitchoffset 0, G_ - callchannel Music_Pinballseelstage_branch_4570a - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_456f0 - pitchoffset 0, E_ - callchannel Music_Pinballseelstage_branch_4570a - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_4570a - pitchoffset 0, G_ - callchannel Music_Pinballseelstage_branch_4570a - notetype $8, $b3 - note __, 12 - note __, 12 - note __, 12 - pitchoffset 0, G_ - callchannel Music_Pinballseelstage_branch_4570a - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_456f0 - pitchoffset 0, CC - callchannel Music_Pinballseelstage_branch_4570a - pitchoffset 0, E_ - callchannel Music_Pinballseelstage_branch_4570a - pitchoffset 0, C_ - notetype $c, $b3 - note __, 16 - note __, 9 - notetype $6, $b1 + rest 16 + rest 1 + duty_cycle 2 + transpose 0, 7 + sound_call Music_SeelStage_branch_4570a + transpose 0, 0 + sound_call Music_SeelStage_branch_456f0 + transpose 0, 4 + sound_call Music_SeelStage_branch_4570a + transpose 0, 0 + sound_call Music_SeelStage_branch_4570a + transpose 0, 7 + sound_call Music_SeelStage_branch_4570a + note_type 8, 11, 3 + rest 12 + rest 12 + rest 12 + transpose 0, 7 + sound_call Music_SeelStage_branch_4570a + transpose 0, 0 + sound_call Music_SeelStage_branch_456f0 + transpose 0, 12 + sound_call Music_SeelStage_branch_4570a + transpose 0, 4 + sound_call Music_SeelStage_branch_4570a + transpose 0, 0 + note_type 12, 11, 3 + rest 16 + rest 9 + note_type 6, 11, 1 octave 2 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note D#, 1 - note __, 1 - intensity $c2 + rest 1 + volume_envelope 12, 2 note F#, 2 - callchannel Music_Pinballseelstage_branch_45725 - note __, 8 - intensity $52 + sound_call Music_SeelStage_branch_45725 + rest 8 + volume_envelope 5, 2 note F_, 2 - intensity $51 + volume_envelope 5, 1 note F#, 6 note B_, 2 octave 5 @@ -133,142 +133,137 @@ Music_Pinballseelstage_branch_45615: ; 45615 note C_, 4 note F#, 4 note F#, 2 - callchannel Music_Pinballseelstage_branch_45725 - note __, 8 - intensity $52 + sound_call Music_SeelStage_branch_45725 + rest 8 + volume_envelope 5, 2 note F_, 2 - intensity $51 + volume_envelope 5, 1 note F#, 16 - note __, 2 - intensity $62 + rest 2 + volume_envelope 6, 2 octave 3 note D#, 2 note C_, 2 - callchannel Music_Pinballseelstage_branch_45725 - dutycycle $1 - intensity $73 + sound_call Music_SeelStage_branch_45725 + duty_cycle 1 + volume_envelope 7, 3 octave 1 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note G#, 2 note A_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 15 - loopchannel 0, Music_Pinballseelstage_branch_45615 -; 456f0 + rest 15 + sound_loop 0, Music_SeelStage_branch_45615 -Music_Pinballseelstage_branch_456f0: ; 456f0 - intensity $a4 +Music_SeelStage_branch_456f0: + volume_envelope 10, 4 octave 3 note F#, 2 - intensity $24 + volume_envelope 2, 4 note F#, 2 - intensity $64 + volume_envelope 6, 4 note F#, 2 - intensity $14 + volume_envelope 1, 4 note F#, 2 - intensity $44 + volume_envelope 4, 4 note F#, 2 - intensity $14 + volume_envelope 1, 4 note F#, 2 - intensity $a4 + volume_envelope 10, 4 note B_, 2 - intensity $14 + volume_envelope 1, 4 note B_, 2 - endchannel -; 4570a + sound_ret -Music_Pinballseelstage_branch_4570a: ; 4570a - notetype $6, $a4 +Music_SeelStage_branch_4570a: + note_type 6, 10, 4 octave 3 note E_, 2 - intensity $24 + volume_envelope 2, 4 note E_, 2 - intensity $64 + volume_envelope 6, 4 note E_, 2 - intensity $14 + volume_envelope 1, 4 note E_, 2 - intensity $44 + volume_envelope 4, 4 note E_, 2 - intensity $14 + volume_envelope 1, 4 note E_, 2 - intensity $24 + volume_envelope 2, 4 note E_, 2 - intensity $14 + volume_envelope 1, 4 note E_, 2 - endchannel -; 45725 + sound_ret -Music_Pinballseelstage_branch_45725: ; 45725 - note __, 8 - intensity $52 +Music_SeelStage_branch_45725: + rest 8 + volume_envelope 5, 2 octave 4 note A#, 2 - intensity $51 + volume_envelope 5, 1 note B_, 6 - note __, 16 - note __, 8 - intensity $52 + rest 16 + rest 8 + volume_envelope 5, 2 note A_, 2 - intensity $51 + volume_envelope 5, 1 note A#, 6 - note __, 16 - note __, 8 - intensity $52 + rest 16 + rest 8 + volume_envelope 5, 2 note G_, 2 - intensity $51 + volume_envelope 5, 1 note G#, 6 - note __, 16 - endchannel -; 4573f + rest 16 + sound_ret -Music_Pinballseelstage_Ch2: ; 4573f -Music_Pinballseelstage_branch_4573f: ; 4573f - dutycycle $2 - notetype $6, $a1 - callchannel Music_Pinballseelstage_branch_45924 - note __, 15 - note __, 9 - callchannel Music_Pinballseelstage_branch_45924 - note __, 6 - intensity $54 +Music_SeelStage_Ch2: + duty_cycle 2 + note_type 6, 10, 1 + sound_call Music_SeelStage_branch_45924 + rest 15 + rest 9 + sound_call Music_SeelStage_branch_45924 + rest 6 + volume_envelope 5, 4 octave 4 note G#, 1 - note __, 15 - note __, 2 - pitchoffset 0, F_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45935 - pitchoffset 0, D# - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45969 - intensity $b2 + rest 15 + rest 2 + transpose 0, 5 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45935 + transpose 0, 3 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45969 + volume_envelope 11, 2 octave 3 note C_, 2 - intensity $43 - callchannel Music_Pinballseelstage_branch_45980 - pitchoffset 0, F_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45935 - pitchoffset 0, G_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45969 - intensity $42 + volume_envelope 4, 3 + sound_call Music_SeelStage_branch_45980 + transpose 0, 5 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45935 + transpose 0, 7 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45969 + volume_envelope 4, 2 octave 3 note G_, 2 - callchannel Music_Pinballseelstage_branch_459b6 - intensity $52 + sound_call Music_SeelStage_branch_459b6 + volume_envelope 5, 2 note F#, 2 note D#, 2 octave 2 @@ -279,248 +274,248 @@ Music_Pinballseelstage_branch_4573f: ; 4573f note B_, 2 note A#, 2 note B_, 2 - notetype $6, $91 - callchannel Music_Pinballseelstage_branch_45924 - note __, 15 - note __, 9 - callchannel Music_Pinballseelstage_branch_45924 - note __, 6 - intensity $54 + note_type 6, 9, 1 + sound_call Music_SeelStage_branch_45924 + rest 15 + rest 9 + sound_call Music_SeelStage_branch_45924 + rest 6 + volume_envelope 5, 4 octave 4 note G#, 1 - note __, 15 - note __, 2 - intensity $b1 - pitchoffset 0, F_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45935 - pitchoffset 0, D# - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45969 - pitchoffset 0, CC - intensity $a3 + rest 15 + rest 2 + volume_envelope 11, 1 + transpose 0, 5 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45935 + transpose 0, 3 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45969 + transpose 0, 12 + volume_envelope 10, 3 octave 3 note C_, 2 - callchannel Music_Pinballseelstage_branch_45980 - pitchoffset 0, F_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45935 - pitchoffset 0, G_ - callchannel Music_Pinballseelstage_branch_4594f - pitchoffset 0, C_ - callchannel Music_Pinballseelstage_branch_45969 - intensity $32 - pitchoffset 0, CC + sound_call Music_SeelStage_branch_45980 + transpose 0, 5 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45935 + transpose 0, 7 + sound_call Music_SeelStage_branch_4594f + transpose 0, 0 + sound_call Music_SeelStage_branch_45969 + volume_envelope 3, 2 + transpose 0, 12 octave 2 note G_, 2 - callchannel Music_Pinballseelstage_branch_459b6 - pitchoffset 0, C_ - intensity $b1 + sound_call Music_SeelStage_branch_459b6 + transpose 0, 0 + volume_envelope 11, 1 octave 2 note B_, 1 - intensity $18 + volume_envelope 1, 8 note B_, 1 - intensity $b1 + volume_envelope 11, 1 note A#, 1 - intensity $18 + volume_envelope 1, 8 note A#, 1 - intensity $b1 + volume_envelope 11, 1 note B_, 1 - intensity $18 + volume_envelope 1, 8 note B_, 1 - intensity $b1 + volume_envelope 11, 1 octave 4 note B_, 1 - intensity $18 + volume_envelope 1, 8 note B_, 1 - intensity $81 + volume_envelope 8, 1 octave 5 note D#, 1 - intensity $18 + volume_envelope 1, 8 note D#, 1 - intensity $91 + volume_envelope 9, 1 note F#, 1 - intensity $18 + volume_envelope 1, 8 note F#, 1 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - callchannel Music_Pinballseelstage_branch_459ef - note __, 10 - intensity $82 + sound_call Music_SeelStage_branch_459ef + rest 10 + volume_envelope 8, 2 note G_, 2 - intensity $a4 + volume_envelope 10, 4 note G#, 4 - callchannel Music_Pinballseelstage_branch_45a01 - note __, 10 - intensity $82 + sound_call Music_SeelStage_branch_45a01 + rest 10 + volume_envelope 8, 2 note A#, 2 - intensity $a4 + volume_envelope 10, 4 note B_, 4 - callchannel Music_Pinballseelstage_branch_45a14 - note __, 10 - intensity $82 + sound_call Music_SeelStage_branch_45a14 + rest 10 + volume_envelope 8, 2 note A_, 2 - intensity $a4 + volume_envelope 10, 4 note A#, 4 - callchannel Music_Pinballseelstage_branch_45a25 - intensity $51 + sound_call Music_SeelStage_branch_45a25 + volume_envelope 5, 1 octave 5 note F_, 2 note F#, 4 note F#, 4 - intensity $82 + volume_envelope 8, 2 octave 4 note A#, 2 - intensity $a4 + volume_envelope 10, 4 note B_, 4 octave 5 - callchannel Music_Pinballseelstage_branch_459ef - intensity $32 + sound_call Music_SeelStage_branch_459ef + volume_envelope 3, 2 octave 3 note A#, 2 - intensity $42 + volume_envelope 4, 2 octave 4 note C#, 2 - intensity $52 + volume_envelope 5, 2 octave 3 note A#, 2 - intensity $62 + volume_envelope 6, 2 octave 4 note C#, 2 - intensity $72 + volume_envelope 7, 2 note E_, 2 - intensity $92 + volume_envelope 9, 2 note G_, 2 - intensity $a4 + volume_envelope 10, 4 note G#, 4 - callchannel Music_Pinballseelstage_branch_45a01 - intensity $32 + sound_call Music_SeelStage_branch_45a01 + volume_envelope 3, 2 octave 3 note G#, 2 - intensity $42 + volume_envelope 4, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note G#, 2 - intensity $62 + volume_envelope 6, 2 note B_, 2 - intensity $72 + volume_envelope 7, 2 octave 4 note F#, 2 - intensity $92 + volume_envelope 9, 2 note A#, 2 - intensity $a4 + volume_envelope 10, 4 note B_, 4 - callchannel Music_Pinballseelstage_branch_45a14 - intensity $32 + sound_call Music_SeelStage_branch_45a14 + volume_envelope 3, 2 octave 3 note F#, 2 - intensity $42 + volume_envelope 4, 2 note A#, 2 - intensity $52 + volume_envelope 5, 2 note F#, 2 - intensity $62 + volume_envelope 6, 2 note A#, 2 - intensity $72 + volume_envelope 7, 2 octave 4 note C#, 2 - intensity $92 + volume_envelope 9, 2 note A_, 2 - intensity $a4 + volume_envelope 10, 4 note A#, 4 - callchannel Music_Pinballseelstage_branch_45a25 - intensity $71 + sound_call Music_SeelStage_branch_45a25 + volume_envelope 7, 1 octave 4 note A_, 2 - intensity $61 + volume_envelope 6, 1 note F#, 2 - intensity $51 + volume_envelope 5, 1 note D#, 2 note C_, 2 octave 3 note A_, 2 note F#, 2 - intensity $74 + volume_envelope 7, 4 octave 4 note B_, 4 - intensity $72 + volume_envelope 7, 2 octave 5 note C#, 2 - intensity $71 + volume_envelope 7, 1 octave 4 note G#, 2 - intensity $72 + volume_envelope 7, 2 note B_, 2 - intensity $71 + volume_envelope 7, 1 note E_, 6 - intensity $72 + volume_envelope 7, 2 note E_, 2 note G#, 2 - note __, 10 + rest 10 note G_, 2 - intensity $74 + volume_envelope 7, 4 note G#, 4 - intensity $72 + volume_envelope 7, 2 note F#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 2 - intensity $72 + volume_envelope 7, 2 note F_, 2 - intensity $71 + volume_envelope 7, 1 octave 3 note A#, 6 - intensity $72 + volume_envelope 7, 2 octave 4 note F#, 2 note B_, 2 - note __, 10 + rest 10 note A#, 2 - intensity $74 + volume_envelope 7, 4 note B_, 4 - intensity $72 + volume_envelope 7, 2 note A#, 2 - intensity $71 + volume_envelope 7, 1 note E_, 2 - intensity $72 + volume_envelope 7, 2 note G#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 6 - intensity $72 + volume_envelope 7, 2 note F#, 2 note A#, 2 - note __, 10 + rest 10 note A_, 2 - intensity $74 + volume_envelope 7, 4 note A#, 4 - intensity $b3 + volume_envelope 11, 3 note B_, 1 - intensity $63 + volume_envelope 6, 3 note D#, 1 - note __, 2 - intensity $b3 + rest 2 + volume_envelope 11, 3 note B_, 1 note D#, 1 - note __, 2 - intensity $63 + rest 2 + volume_envelope 6, 3 note G#, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 1 - intensity $63 + volume_envelope 6, 3 note C#, 1 - note __, 2 - intensity $b3 + rest 2 + volume_envelope 11, 3 note A#, 1 - intensity $63 + volume_envelope 6, 3 note D_, 1 - intensity $b3 + volume_envelope 11, 3 note B_, 1 note D#, 1 - note __, 6 - intensity $61 + rest 6 + volume_envelope 6, 1 octave 5 note F#, 1 note E_, 1 @@ -532,17 +527,16 @@ Music_Pinballseelstage_branch_4573f: ; 4573f note C#, 1 octave 3 note A#, 1 - loopchannel 0, Music_Pinballseelstage_branch_4573f -; 45924 + sound_loop 0, Music_SeelStage_Ch2 -Music_Pinballseelstage_branch_45924: ; 45924 +Music_SeelStage_branch_45924: octave 2 note B_, 2 note F#, 2 note A#, 2 note B_, 2 - note __, 15 - note __, 1 + rest 15 + rest 1 octave 3 note F#, 2 note D#, 2 @@ -552,89 +546,85 @@ Music_Pinballseelstage_branch_45924: ; 45924 note G#, 2 note G_, 2 note G#, 2 - endchannel -; 45935 + sound_ret -Music_Pinballseelstage_branch_45935: ; 45935 - intensity $a4 +Music_SeelStage_branch_45935: + volume_envelope 10, 4 octave 4 note D#, 2 - intensity $24 + volume_envelope 2, 4 note D#, 2 - intensity $74 + volume_envelope 7, 4 note D#, 2 - intensity $24 + volume_envelope 2, 4 note D#, 2 - intensity $54 + volume_envelope 5, 4 note D#, 2 - intensity $14 + volume_envelope 1, 4 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note F#, 2 - intensity $24 + volume_envelope 2, 4 note F#, 2 - endchannel -; 4594f + sound_ret -Music_Pinballseelstage_branch_4594f: ; 4594f - intensity $a4 +Music_SeelStage_branch_4594f: + volume_envelope 10, 4 octave 4 note C#, 2 - intensity $24 + volume_envelope 2, 4 note C#, 2 - intensity $74 + volume_envelope 7, 4 note C#, 2 - intensity $24 + volume_envelope 2, 4 note C#, 2 - intensity $54 + volume_envelope 5, 4 note C#, 2 - intensity $14 + volume_envelope 1, 4 note C#, 2 - intensity $34 + volume_envelope 3, 4 note C#, 2 - intensity $14 + volume_envelope 1, 4 note C#, 2 - endchannel -; 45969 + sound_ret -Music_Pinballseelstage_branch_45969: ; 45969 - intensity $a4 +Music_SeelStage_branch_45969: + volume_envelope 10, 4 octave 4 note E_, 2 - intensity $24 + volume_envelope 2, 4 note E_, 2 - intensity $74 + volume_envelope 7, 4 note E_, 2 - intensity $24 + volume_envelope 2, 4 note E_, 2 - intensity $54 + volume_envelope 5, 4 note E_, 2 - intensity $14 + volume_envelope 1, 4 note E_, 2 - intensity $34 + volume_envelope 3, 4 note E_, 2 - endchannel -; 45980 + sound_ret -Music_Pinballseelstage_branch_45980: ; 45980 - intensity $52 +Music_SeelStage_branch_45980: + volume_envelope 5, 2 note C#, 2 octave 2 note G#, 2 - intensity $b2 + volume_envelope 11, 2 octave 3 note G#, 2 - intensity $52 + volume_envelope 5, 2 note C#, 2 - intensity $b2 + volume_envelope 11, 2 note C_, 2 - intensity $52 + volume_envelope 5, 2 note C#, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note C#, 2 note F#, 2 - intensity $52 + volume_envelope 5, 2 octave 2 note A#, 2 note B_, 2 @@ -642,30 +632,29 @@ Music_Pinballseelstage_branch_45980: ; 45980 note B_, 2 note A#, 2 note B_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note C#, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 2 - intensity $52 + volume_envelope 5, 2 octave 2 note F#, 2 note G#, 2 note F#, 2 note G#, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 note G#, 2 - intensity $92 + volume_envelope 9, 2 note A#, 2 - endchannel -; 459b6 + sound_ret -Music_Pinballseelstage_branch_459b6: ; 459b6 - intensity $b2 +Music_SeelStage_branch_459b6: + volume_envelope 11, 2 octave 3 note G#, 2 - intensity $52 + volume_envelope 5, 2 octave 2 note B_, 2 octave 3 @@ -679,25 +668,25 @@ Music_Pinballseelstage_branch_459b6: ; 459b6 octave 3 note E_, 2 note G#, 2 - intensity $b2 + volume_envelope 11, 2 note F#, 2 - intensity $52 + volume_envelope 5, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G#, 2 - intensity $52 + volume_envelope 5, 2 octave 2 note F#, 2 note A#, 2 octave 3 note C#, 2 - intensity $b2 + volume_envelope 11, 2 note F#, 2 - intensity $52 + volume_envelope 5, 2 note A#, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - intensity $52 + volume_envelope 5, 2 note C#, 2 note E_, 2 note G#, 2 @@ -705,364 +694,358 @@ Music_Pinballseelstage_branch_459b6: ; 459b6 note E_, 2 note G_, 2 note A#, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - endchannel -; 459ef + sound_ret -Music_Pinballseelstage_branch_459ef: ; 459ef - intensity $b2 +Music_SeelStage_branch_459ef: + volume_envelope 11, 2 note C#, 2 - intensity $51 + volume_envelope 5, 1 octave 4 note G#, 2 - intensity $b2 + volume_envelope 11, 2 note B_, 2 - intensity $51 + volume_envelope 5, 1 note E_, 6 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note G#, 2 - endchannel -; 45a01 + sound_ret -Music_Pinballseelstage_branch_45a01: ; 45a01 - intensity $b2 +Music_SeelStage_branch_45a01: + volume_envelope 11, 2 note F#, 2 - intensity $51 + volume_envelope 5, 1 note C#, 2 - intensity $b2 + volume_envelope 11, 2 note F_, 2 - intensity $51 + volume_envelope 5, 1 octave 3 note A#, 6 - intensity $b2 + volume_envelope 11, 2 octave 4 note F#, 2 note B_, 2 - endchannel -; 45a14 + sound_ret -Music_Pinballseelstage_branch_45a14: ; 45a14 - intensity $b2 +Music_SeelStage_branch_45a14: + volume_envelope 11, 2 note A#, 2 - intensity $51 + volume_envelope 5, 1 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G#, 2 - intensity $51 + volume_envelope 5, 1 note C#, 6 - intensity $b2 + volume_envelope 11, 2 note F#, 2 note A#, 2 - endchannel -; 45a25 + sound_ret -Music_Pinballseelstage_branch_45a25: ; 45a25 - intensity $b2 +Music_SeelStage_branch_45a25: + volume_envelope 11, 2 note B_, 2 - intensity $51 + volume_envelope 5, 1 note F#, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 - intensity $51 + volume_envelope 5, 1 note D#, 6 - intensity $b2 + volume_envelope 11, 2 note B_, 2 octave 5 note D#, 2 - endchannel -; 45a37 + sound_ret -Music_Pinballseelstage_Ch3: ; 45a37 -Music_Pinballseelstage_branch_45a37: ; 45a37 - callchannel Music_Pinballseelstage_branch_45baa - callchannel Music_Pinballseelstage_branch_45bb9 - callchannel Music_Pinballseelstage_branch_45baa - callchannel Music_Pinballseelstage_branch_45bb9 - callchannel Music_Pinballseelstage_branch_45baa - notetype $6, $22 +Music_SeelStage_Ch3: + sound_call Music_SeelStage_branch_45baa + sound_call Music_SeelStage_branch_45bb9 + sound_call Music_SeelStage_branch_45baa + sound_call Music_SeelStage_branch_45bb9 + sound_call Music_SeelStage_branch_45baa + note_type 6, 2, 2 note E_, 2 - note __, 12 + rest 12 octave 1 note F#, 2 note A_, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 + rest 6 octave 2 note C#, 2 - note __, 12 + rest 12 octave 1 note F#, 2 note A#, 2 - note __, 2 + rest 2 octave 2 note F#, 2 - note __, 6 + rest 6 note F#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 12 + rest 12 octave 1 note F#, 2 note G#, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 - callchannel Music_Pinballseelstage_branch_45baa - notetype $6, $22 + rest 6 + sound_call Music_SeelStage_branch_45baa + note_type 6, 2, 2 note E_, 2 - note __, 12 + rest 12 octave 1 note G#, 2 note B_, 2 - note __, 6 + rest 6 octave 2 note E_, 2 - note __, 6 + rest 6 note E_, 2 - note __, 12 + rest 12 note C#, 2 note F#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 6 + rest 6 note A#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 14 + rest 14 octave 1 note B_, 2 - note __, 14 - callchannel Music_Pinballseelstage_branch_45baa - callchannel Music_Pinballseelstage_branch_45bb9 - callchannel Music_Pinballseelstage_branch_45baa - notetype $6, $22 + rest 14 + sound_call Music_SeelStage_branch_45baa + sound_call Music_SeelStage_branch_45bb9 + sound_call Music_SeelStage_branch_45baa + note_type 6, 2, 2 note E_, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 4 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note F#, 2 note A_, 2 - note __, 6 - notetype $6, $32 + rest 6 + note_type 6, 3, 2 octave 4 note F_, 8 - notetype $6, $22 - callchannel Music_Pinballseelstage_branch_45bd1 + note_type 6, 2, 2 + sound_call Music_SeelStage_branch_45bd1 octave 2 note E_, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note F#, 2 note A_, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 + rest 6 octave 2 note C#, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note F#, 2 note A#, 2 - note __, 2 + rest 2 octave 2 note F#, 2 - note __, 6 + rest 6 note F#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D_, 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note F#, 2 note G#, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 - callchannel Music_Pinballseelstage_branch_45bd1 + rest 6 + sound_call Music_SeelStage_branch_45bd1 note E_, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note G#, 2 note B_, 2 - note __, 6 + rest 6 octave 2 note E_, 2 - note __, 6 + rest 6 note E_, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 2 note C#, 2 note F#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 6 + rest 6 note A#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D_, 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 5 note D#, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 1 - callchannel Music_Pinballseelstage_branch_45bec - callchannel Music_Pinballseelstage_branch_45c23 - callchannel Music_Pinballseelstage_branch_45bec - callchannel Music_Pinballseelstage_branch_45c23 - notetype $6, $32 + rest 1 + sound_call Music_SeelStage_branch_45bec + sound_call Music_SeelStage_branch_45c23 + sound_call Music_SeelStage_branch_45bec + sound_call Music_SeelStage_branch_45c23 + note_type 6, 3, 2 octave 2 note E_, 2 - note __, 6 + rest 6 octave 5 note G_, 2 note G#, 1 - note __, 3 + rest 3 octave 2 note E_, 2 - note __, 2 + rest 2 octave 1 note B_, 2 - note __, 2 + rest 2 octave 3 note D#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note E_, 2 octave 3 note E_, 2 octave 2 note D#, 2 - note __, 6 + rest 6 octave 5 note F_, 2 note F#, 1 - note __, 3 + rest 3 octave 2 note D#, 2 - note __, 2 + rest 2 octave 1 note G#, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note D#, 2 - note __, 2 + rest 2 octave 2 note D#, 2 octave 3 note D#, 2 octave 2 note C#, 2 - note __, 6 + rest 6 octave 5 note D#, 2 note E_, 1 - note __, 3 + rest 3 octave 2 note C#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note C_, 2 note C#, 2 - note __, 2 + rest 2 octave 2 note F#, 2 octave 3 note C#, 2 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 + rest 3 note C_, 2 note C#, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 7 + rest 7 octave 4 note A#, 1 note F#, 1 @@ -1073,362 +1056,349 @@ Music_Pinballseelstage_branch_45a37: ; 45a37 note F#, 1 note E_, 1 note C#, 1 - loopchannel 0, Music_Pinballseelstage_branch_45a37 -; 45baa + sound_loop 0, Music_SeelStage_Ch3 -Music_Pinballseelstage_branch_45baa: ; 45baa - notetype $c, $22 +Music_SeelStage_branch_45baa: + note_type 12, 2, 2 octave 1 note B_, 1 - note __, 6 + rest 6 note F#, 1 note A_, 1 - note __, 1 + rest 1 octave 2 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 - endchannel -; 45bb9 + rest 1 + sound_ret -Music_Pinballseelstage_branch_45bb9: ; 45bb9 +Music_SeelStage_branch_45bb9: note E_, 1 - note __, 1 - notetype $6, $32 + rest 1 + note_type 6, 3, 2 octave 4 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note F#, 2 note A_, 2 - note __, 6 + rest 6 note A#, 2 - note __, 6 - endchannel -; 45bd1 + rest 6 + sound_ret -Music_Pinballseelstage_branch_45bd1: ; 45bd1 +Music_SeelStage_branch_45bd1: octave 1 note B_, 2 - note __, 2 - notetype $6, $32 + rest 2 + note_type 6, 3, 2 octave 5 note D_, 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 3 - notetype $6, $22 + rest 3 + note_type 6, 2, 2 octave 1 note F#, 2 note A_, 2 - note __, 2 + rest 2 octave 2 note F#, 2 - note __, 6 + rest 6 note F#, 2 - note __, 2 - endchannel -; 45bec + rest 2 + sound_ret -Music_Pinballseelstage_branch_45bec: ; 45bec +Music_SeelStage_branch_45bec: octave 2 note E_, 2 - note __, 6 - notetype $6, $32 + rest 6 + note_type 6, 3, 2 octave 5 note G_, 2 - notetype $6, $22 + note_type 6, 2, 2 note G#, 1 - note __, 3 + rest 3 octave 2 note E_, 2 - note __, 2 + rest 2 octave 1 note B_, 2 - note __, 2 + rest 2 octave 3 note D#, 2 note E_, 2 - note __, 2 + rest 2 octave 2 note E_, 2 octave 3 note E_, 2 octave 2 note D#, 2 - note __, 6 - notetype $6, $32 + rest 6 + note_type 6, 3, 2 octave 5 note F_, 2 - notetype $6, $22 + note_type 6, 2, 2 note F#, 1 - note __, 3 + rest 3 octave 2 note D#, 2 - note __, 2 + rest 2 octave 1 note G#, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note D#, 2 - note __, 2 + rest 2 octave 2 note D#, 2 octave 3 note D#, 2 - endchannel -; 45c23 + sound_ret -Music_Pinballseelstage_branch_45c23: ; 45c23 +Music_SeelStage_branch_45c23: octave 2 note C#, 2 - note __, 6 - notetype $6, $32 + rest 6 + note_type 6, 3, 2 octave 5 note D#, 2 - notetype $6, $22 + note_type 6, 2, 2 note E_, 1 - note __, 3 + rest 3 octave 2 note C#, 2 - note __, 2 + rest 2 octave 1 note F#, 2 - note __, 2 + rest 2 octave 3 note C_, 2 note C#, 2 - note __, 2 + rest 2 octave 2 note F#, 2 octave 3 note C#, 2 octave 1 note B_, 2 - note __, 6 - notetype $6, $32 + rest 6 + note_type 6, 3, 2 octave 5 note D_, 2 - notetype $6, $22 + note_type 6, 2, 2 note D#, 1 - note __, 3 + rest 3 octave 1 note B_, 2 - note __, 2 + rest 2 octave 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note A_, 2 - note __, 2 + rest 2 note F#, 2 note A_, 2 - endchannel -; 45c57 + sound_ret -Music_Pinballseelstage_Ch4: ; 45c57 - togglenoise $2 -Music_Pinballseelstage_branch_45c59: ; 45c59 - notetype $c - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d26 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d26 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d32 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d32 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d32 - callchannel Music_Pinballseelstage_branch_45d1b - note D#, 2 - note G_, 1 - note G_, 1 - note D_, 4 - note D#, 1 - note G_, 1 - note D_, 2 - note D_, 1 - note D#, 1 - note D_, 1 - note D_, 1 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d26 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d26 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d32 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d32 - callchannel Music_Pinballseelstage_branch_45d1b - callchannel Music_Pinballseelstage_branch_45d32 - callchannel Music_Pinballseelstage_branch_45d1b - note D#, 2 - note G_, 1 - note G_, 1 - note D_, 4 - note D#, 1 - note D#, 1 - note G_, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D_, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note G_, 1 - note G#, 1 - note G#, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note D_, 1 - note G#, 1 - note G_, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note G_, 1 - note G#, 1 - note G#, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note G_, 1 - note G#, 1 - note G#, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note D_, 1 - note G#, 1 - note G_, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note G_, 1 - note G#, 1 - note G#, 1 - callchannel Music_Pinballseelstage_branch_45d3e - note D_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - notetype $c - note C_, 2 - note C#, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note A_, 2 - note A#, 2 - note B_, 4 - note A#, 2 - note A_, 2 - note F#, 2 - note F_, 2 - note E_, 2 - note C#, 2 - note C_, 2 - note C_, 1 - note C#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note A_, 1 - note A#, 1 - note B_, 2 - note A#, 1 - note A_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note C#, 1 - note C_, 1 - notetype $6 - note D_, 4 - note D_, 4 - note D#, 2 - note D_, 4 - note D_, 2 - note D_, 8 - note D#, 4 - note D#, 2 - note D_, 2 - loopchannel 0, Music_Pinballseelstage_branch_45c59 -; 45d1b +Music_SeelStage_Ch4: + toggle_noise 2 +Music_SeelStage_branch_45c59: + drum_speed 12 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d26 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d26 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d32 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d32 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d32 + sound_call Music_SeelStage_branch_45d1b + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 4 + drum_note 4, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d26 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d26 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d32 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d32 + sound_call Music_SeelStage_branch_45d1b + sound_call Music_SeelStage_branch_45d32 + sound_call Music_SeelStage_branch_45d1b + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 4 + drum_note 4, 1 + drum_note 4, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 9, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 3, 1 + drum_note 9, 1 + drum_note 8, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 9, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 9, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 3, 1 + drum_note 9, 1 + drum_note 8, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 9, 1 + sound_call Music_SeelStage_branch_45d3e + drum_note 3, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 1, 2 + drum_note 2, 2 + drum_note 5, 2 + drum_note 6, 2 + drum_note 7, 2 + drum_note 10, 2 + drum_note 11, 2 + drum_note 12, 4 + drum_note 11, 2 + drum_note 10, 2 + drum_note 7, 2 + drum_note 6, 2 + drum_note 5, 2 + drum_note 2, 2 + drum_note 1, 2 + drum_note 1, 1 + drum_note 2, 1 + drum_note 5, 1 + drum_note 6, 1 + drum_note 7, 1 + drum_note 10, 1 + drum_note 11, 1 + drum_note 12, 2 + drum_note 11, 1 + drum_note 10, 1 + drum_note 7, 1 + drum_note 6, 1 + drum_note 5, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_speed 6 + drum_note 3, 4 + drum_note 3, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 8 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 2 + sound_loop 0, Music_SeelStage_branch_45c59 -Music_Pinballseelstage_branch_45d1b: ; 45d1b - note D#, 2 - note G_, 1 - note G_, 1 - note D_, 3 - note D#, 1 - note D#, 2 - note D#, 1 - note G_, 1 - note D_, 3 - note D#, 1 - endchannel -; 45d26 +Music_SeelStage_branch_45d1b: + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 2 + drum_note 4, 1 + drum_note 8, 1 + drum_note 3, 3 + drum_note 4, 1 + sound_ret -Music_Pinballseelstage_branch_45d26: ; 45d26 - note D#, 2 - note G_, 1 - note G_, 1 - note D_, 4 - note D#, 1 - note G_, 1 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 1 - note G_, 1 - endchannel -; 45d32 - -Music_Pinballseelstage_branch_45d32: ; 45d32 - note D#, 2 - note G_, 1 - note G_, 1 - note D_, 4 - note D#, 1 - note G_, 1 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - endchannel -; 45d3e - -Music_Pinballseelstage_branch_45d3e: ; 45d3e - note G#, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - endchannel -; 45d4b +Music_SeelStage_branch_45d26: + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 4 + drum_note 4, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 8, 1 + sound_ret +Music_SeelStage_branch_45d32: + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 4 + drum_note 4, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret +Music_SeelStage_branch_45d3e: + drum_note 9, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + sound_ret diff --git a/crysaudio/music/pinball/title.asm b/crysaudio/music/pinball/title.asm new file mode 100644 index 00000000..a0ab31b4 --- /dev/null +++ b/crysaudio/music/pinball/title.asm @@ -0,0 +1,1092 @@ +Music_Title: + channel_count 4 + channel 1, Music_Title_Ch1 + channel 2, Music_Title_Ch2 + channel 3, Music_Title_Ch3 + channel 4, Music_Title_Ch4 + +Music_Title_Ch1: + tempo 130 + volume 7, 7 + pitch_offset 1 + duty_cycle 2 + note_type 12, 9, 2 + rest 2 + rest 2 + octave 4 + note C_, 2 + note_type 6, 6, 1 + note C_, 2 + note D#, 2 + note C_, 2 + note D#, 2 + volume_envelope 9, 2 + octave 3 + note A_, 2 + rest 6 + note A_, 2 + rest 6 + note A#, 2 + rest 2 + note A#, 2 + rest 2 + note A#, 2 + rest 2 + volume_envelope 4, 1 + octave 4 + note C#, 2 + note G_, 2 + volume_envelope 5, 1 + note C#, 2 + note G_, 2 + volume_envelope 7, 1 + note C#, 2 + note G_, 2 + volume_envelope 9, 1 + note C#, 2 + note G_, 2 + volume_envelope 10, 1 + note C#, 2 + note G_, 2 +Music_Title_branch_45d91: + volume_envelope 8, 8 + rest 4 + octave 3 + note C_, 2 + rest 2 + sound_loop 8, Music_Title_branch_45d91 + volume_envelope 6, 1 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note D_, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D#, 2 + note C#, 4 + note C_, 4 + octave 3 + note A#, 16 + volume_envelope 9, 1 + octave 4 + note G#, 2 + note D#, 2 + volume_envelope 8, 8 + octave 3 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 2 + volume_envelope 9, 1 + octave 4 + note G#, 2 + note F_, 2 + volume_envelope 8, 8 + octave 3 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 2 + volume_envelope 9, 1 + octave 5 + note C#, 2 + octave 4 + note G#, 2 + volume_envelope 6, 1 + octave 3 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note D_, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + octave 2 + note B_, 2 + rest 16 + rest 7 + volume_envelope 6, 8 + octave 5 + note D_, 1 + volume_envelope 7, 8 + note D#, 8 + volume_envelope 8, 8 + rest 4 + octave 3 + note F_, 2 + rest 6 + note F_, 2 + rest 6 + note F_, 2 + rest 6 + note F_, 2 + rest 2 + rest 4 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note A_, 2 + rest 6 + note A_, 2 + rest 2 + rest 4 + octave 4 + note C#, 2 + rest 6 + note C#, 2 + rest 6 + octave 3 + note A#, 2 + rest 6 + note A#, 2 + rest 2 + volume_envelope 7, 2 + note D#, 2 + note G_, 2 + octave 4 + note C#, 2 + note D#, 2 + note C#, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note G_, 4 + octave 4 + note D#, 4 + volume_envelope 7, 1 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + volume_envelope 8, 8 + octave 3 + note F_, 2 + volume_envelope 7, 1 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + volume_envelope 8, 8 + octave 3 + note F_, 2 + volume_envelope 7, 1 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + volume_envelope 8, 8 + octave 3 + note F_, 2 + volume_envelope 7, 1 + octave 4 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + volume_envelope 8, 8 + octave 3 + note F_, 2 + volume_envelope 7, 1 + octave 4 + note D_, 2 + note C_, 2 + note D#, 2 + volume_envelope 8, 8 + octave 3 + note G#, 2 + volume_envelope 7, 1 + octave 4 + note D#, 2 + note C_, 2 + note D#, 2 + volume_envelope 8, 8 + octave 3 + note G#, 2 + volume_envelope 7, 1 + octave 4 + note D#, 2 + note C_, 2 + note D#, 2 + volume_envelope 8, 8 + octave 3 + note A_, 2 + volume_envelope 7, 1 + octave 4 + note D#, 2 + note F_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + note C#, 2 + note A#, 2 + volume_envelope 8, 8 + note F_, 2 + volume_envelope 7, 1 + note A#, 2 + note C#, 2 + note A#, 2 + volume_envelope 8, 8 + note F_, 2 + volume_envelope 7, 1 + note A#, 2 + note D_, 2 + note A#, 2 + volume_envelope 8, 8 + note F_, 2 + volume_envelope 7, 1 + note A#, 2 + note D_, 2 + note A#, 2 + volume_envelope 8, 8 + note F_, 2 + volume_envelope 7, 1 + note A#, 2 + volume_envelope 5, 7 + note G_, 8 + volume_envelope 7, 7 + note G#, 8 + volume_envelope 9, 7 + note A_, 8 + volume_envelope 10, 7 + note A#, 8 + sound_loop 0, Music_Title_branch_45d91 + +Music_Title_Ch2: + note_type 12, 11, 3 + duty_cycle 2 + vibrato 9, 2, 4 + rest 2 + volume_envelope 10, 8 + octave 2 + note G#, 1 + rest 1 + volume_envelope 10, 8 + octave 4 + note G#, 6 + volume_envelope 10, 1 + note G_, 1 + note_type 6, 7, 1 + note D#, 2 + note C_, 2 + note D#, 2 + volume_envelope 10, 1 + note G_, 2 + volume_envelope 7, 1 + note D#, 2 + note C_, 2 + note D#, 2 + volume_envelope 10, 1 + note F_, 2 + volume_envelope 7, 1 + note C#, 2 + volume_envelope 10, 1 + note E_, 2 + volume_envelope 7, 1 + note C#, 2 + volume_envelope 10, 1 + note D#, 2 + volume_envelope 7, 1 + note C#, 2 + note_type 12, 10, 8 + note A#, 10 +Music_Title_branch_45ee7: + note_type 12, 10, 8 + duty_cycle 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + octave 4 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + octave 3 + note B_, 2 + volume_envelope 2, 8 + note B_, 2 + volume_envelope 10, 8 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + octave 4 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note C#, 2 + volume_envelope 2, 8 + note C#, 2 + volume_envelope 10, 8 + note D#, 2 + sound_call Music_Title_branch_460da + volume_envelope 10, 8 + note G#, 1 + volume_envelope 2, 8 + note G#, 1 + volume_envelope 10, 8 + note G_, 1 + volume_envelope 2, 8 + note G_, 1 + volume_envelope 10, 8 + note F#, 1 + volume_envelope 2, 8 + note F#, 1 + volume_envelope 10, 8 + note F_, 1 + volume_envelope 2, 8 + note F_, 1 + volume_envelope 10, 8 + note D#, 1 + volume_envelope 2, 8 + note D#, 1 + note_type 6, 6, 1 + note G#, 4 + note G_, 4 + volume_envelope 7, 8 + note A#, 2 + volume_envelope 6, 8 + note B_, 2 + volume_envelope 10, 8 + octave 4 + note C_, 6 + octave 3 + note B_, 2 + note A#, 4 + octave 4 + note C_, 4 + volume_envelope 2, 8 + note C_, 4 + volume_envelope 10, 8 + octave 3 + note B_, 4 + volume_envelope 2, 8 + note B_, 4 + volume_envelope 10, 8 + note A#, 4 + octave 4 + note C_, 6 + octave 3 + note B_, 2 + note A#, 4 + octave 4 + note C_, 4 + volume_envelope 2, 8 + note C_, 4 + volume_envelope 10, 8 + note C#, 4 + volume_envelope 2, 8 + note C#, 4 + volume_envelope 10, 8 + note D#, 4 + note_type 12, 10, 8 + sound_call Music_Title_branch_460da + note_type 6, 10, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note D_, 1 + volume_envelope 2, 8 + note D_, 1 + volume_envelope 10, 8 + note D#, 1 + volume_envelope 2, 8 + note D#, 1 + volume_envelope 10, 8 + octave 2 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + note A_, 1 + volume_envelope 2, 8 + note A_, 1 + volume_envelope 10, 8 + note A#, 1 + volume_envelope 2, 8 + note A#, 1 + volume_envelope 10, 8 + note D#, 3 + volume_envelope 6, 8 + octave 4 + note F#, 1 + volume_envelope 7, 8 + note G_, 8 + duty_cycle 3 + volume_envelope 10, 8 + note F_, 2 + volume_envelope 2, 8 + note F_, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 1 + volume_envelope 5, 8 + note A#, 1 + volume_envelope 10, 8 + note B_, 2 + volume_envelope 2, 8 + note B_, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 5, 8 + note A#, 1 + note B_, 1 + volume_envelope 10, 8 + octave 5 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + octave 4 + note B_, 2 + volume_envelope 2, 8 + note B_, 2 + volume_envelope 10, 8 + octave 5 + note C_, 2 + volume_envelope 2, 8 + note C_, 1 + volume_envelope 5, 8 + note D_, 1 + volume_envelope 10, 8 + note D#, 2 + volume_envelope 2, 8 + note D#, 2 + volume_envelope 10, 8 + note C#, 2 + volume_envelope 2, 8 + note C#, 2 + volume_envelope 10, 8 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note D#, 2 + volume_envelope 2, 8 + note D#, 2 + volume_envelope 10, 8 + note C#, 2 + volume_envelope 2, 8 + note C#, 2 + volume_envelope 10, 8 + octave 4 + note F_, 2 + volume_envelope 2, 8 + note F_, 2 + volume_envelope 10, 8 + note G_, 2 + volume_envelope 2, 8 + note G_, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + octave 5 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + octave 4 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note G_, 6 + note F#, 2 + note F_, 2 + volume_envelope 2, 8 + note F_, 2 + volume_envelope 10, 8 + note G_, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note A#, 4 + volume_envelope 4, 8 + note A_, 1 + note G#, 1 + volume_envelope 2, 8 + note G_, 1 + note F#, 1 + volume_envelope 10, 8 + note F_, 2 + volume_envelope 2, 8 + note F_, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note B_, 2 + volume_envelope 2, 8 + note B_, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + note A#, 2 + volume_envelope 2, 8 + note A#, 2 + volume_envelope 10, 8 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + octave 5 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + octave 4 + note B_, 2 + volume_envelope 2, 8 + note B_, 2 + volume_envelope 10, 8 + octave 5 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note D#, 2 + volume_envelope 2, 8 + note D#, 2 + volume_envelope 10, 8 + note C#, 2 + volume_envelope 2, 8 + note C#, 2 + volume_envelope 10, 8 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note D#, 2 + volume_envelope 2, 8 + note D#, 2 + volume_envelope 10, 8 + note C#, 8 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note C#, 2 + volume_envelope 2, 8 + note C#, 2 + volume_envelope 10, 8 + note D_, 8 + note C_, 2 + volume_envelope 2, 8 + note C_, 2 + volume_envelope 10, 8 + note D_, 2 + volume_envelope 2, 8 + note D_, 2 + note_type 12, 10, 8 + note D#, 16 + sound_loop 0, Music_Title_branch_45ee7 + +Music_Title_branch_460da: + note F_, 2 + octave 3 + note G#, 2 + note A#, 2 + note G#, 2 + volume_envelope 2, 8 + note G#, 2 + volume_envelope 10, 8 + octave 4 + note C_, 1 + volume_envelope 2, 8 + note C_, 1 + volume_envelope 10, 8 + octave 3 + note A#, 1 + volume_envelope 2, 8 + note A#, 1 + volume_envelope 10, 8 + note G#, 1 + volume_envelope 2, 8 + note G#, 1 + sound_ret + +Music_Title_Ch3: + note_type 12, 2, 2 + rest 2 + octave 1 + note G#, 1 + rest 1 + octave 2 + note D#, 6 + octave 1 + note A_, 1 + rest 3 + note A_, 1 + rest 3 + note A#, 1 + rest 1 + octave 2 + note C#, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + octave 2 + note D#, 4 + note D#, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 +Music_Title_branch_46115: + note_type 12, 2, 2 + sound_call Music_Title_branch_461df + sound_call Music_Title_branch_46210 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 7 + sound_call Music_Title_branch_461df + sound_call Music_Title_branch_46210 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 5 + note_type 6, 2, 2 + octave 1 + note D#, 3 + note_type 6, 3, 2 + octave 3 + note A_, 1 + note_type 6, 2, 2 + note A#, 8 + note_type 12, 2, 2 + sound_call Music_Title_branch_46210 + sound_call Music_Title_branch_46222 + octave 2 + note A#, 1 + rest 1 + octave 3 + note F_, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + octave 3 + note F_, 1 + rest 1 + octave 2 + note F#, 1 + rest 1 + octave 3 + note C#, 1 + rest 1 + octave 2 + note F#, 1 + rest 1 + octave 3 + note C#, 1 + rest 1 + octave 2 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note F_, 1 + rest 1 + note D#, 1 + rest 1 + note G_, 1 + rest 1 + note D#, 1 + rest 1 + note G_, 1 + rest 1 + note A#, 1 + rest 1 + sound_call Music_Title_branch_46210 + sound_call Music_Title_branch_46222 + octave 2 + note A#, 1 + rest 1 + octave 3 + note C#, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + octave 3 + note C#, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + octave 3 + note D_, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + octave 3 + note D_, 1 + rest 1 + octave 2 + note A#, 1 + note_type 6, 3, 2 + octave 4 + note D#, 1 + rest 1 + note_type 6, 2, 2 + octave 3 + note G_, 2 + note_type 6, 3, 2 + octave 4 + note D#, 1 + rest 1 + note_type 6, 2, 2 + octave 2 + note A#, 2 + note_type 6, 3, 2 + octave 4 + note D#, 1 + rest 1 + note_type 6, 2, 2 + octave 3 + note G_, 2 + note_type 6, 3, 2 + octave 4 + note D#, 1 + rest 1 + note_type 6, 2, 2 + octave 2 + note A#, 2 + note_type 6, 3, 2 + octave 4 + note D#, 1 + rest 1 + note_type 6, 2, 2 + octave 3 + note G_, 2 + note_type 6, 3, 2 + octave 4 + note D#, 1 + rest 1 + note_type 6, 1, 2 + octave 3 + note G_, 1 + rest 1 + note D#, 1 + rest 1 + octave 2 + note D#, 4 + sound_loop 0, Music_Title_branch_46115 + +Music_Title_branch_461df: + octave 1 + note G#, 1 + rest 1 + octave 3 + note D#, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note D#, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note E_, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note E_, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note F_, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note F_, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note F#, 1 + rest 1 + octave 1 + note G#, 1 + rest 1 + octave 3 + note F#, 1 + rest 1 + sound_ret + +Music_Title_branch_46210: + octave 2 + note C#, 1 + rest 1 + note G#, 1 + rest 1 + note C#, 1 + rest 1 + note G#, 1 + rest 1 + note D_, 1 + rest 1 + note G#, 1 + rest 1 + note D_, 1 + rest 1 + note G#, 1 + rest 1 + sound_ret + +Music_Title_branch_46222: + note D#, 1 + rest 1 + octave 3 + note C_, 1 + rest 1 + octave 2 + note D#, 1 + rest 1 + octave 3 + note C_, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + octave 3 + note C_, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + octave 3 + note C_, 1 + rest 1 + sound_ret + +Music_Title_Ch4: + toggle_noise 1 + drum_speed 8 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 4, 2 + drum_note 12, 6 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + sound_call Music_Title_branch_462b8 +Music_Title_branch_4624f: + drum_speed 12 + sound_call Music_Title_branch_462cb + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_speed 8 + drum_note 10, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_speed 12 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + sound_call Music_Title_branch_462cb + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 8 + sound_call Music_Title_branch_462cb + sound_call Music_Title_branch_462b8 + sound_call Music_Title_branch_462cb + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 4, 1 + drum_speed 6 + rest 1 + drum_note 12, 9 + drum_speed 12 + sound_call Music_Title_branch_462cb + sound_call Music_Title_branch_462cb + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 +Music_Title_branch_4629d: + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + drum_note 10, 1 + drum_note 8, 1 + sound_loop 2, Music_Title_branch_4629d + sound_call Music_Title_branch_462cb + sound_call Music_Title_branch_462cb + sound_call Music_Title_branch_462cb + sound_call Music_Title_branch_462cb + sound_loop 0, Music_Title_branch_4624f + +Music_Title_branch_462b8: + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_speed 8 + drum_note 10, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_speed 12 + drum_note 8, 1 + drum_note 8, 1 + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + sound_ret + +Music_Title_branch_462cb: + drum_note 10, 2 + drum_note 8, 1 + drum_note 8, 1 + sound_loop 4, Music_Title_branch_462cb + sound_ret diff --git a/crysaudio/music/pinball/titlescreen.asm b/crysaudio/music/pinball/titlescreen.asm deleted file mode 100644 index 09c47501..00000000 --- a/crysaudio/music/pinball/titlescreen.asm +++ /dev/null @@ -1,1103 +0,0 @@ -Music_Pinballtitlescreen: ; 45d4b - dbw $c0, Music_Pinballtitlescreen_Ch1 - dbw $01, Music_Pinballtitlescreen_Ch2 - dbw $02, Music_Pinballtitlescreen_Ch3 - dbw $03, Music_Pinballtitlescreen_Ch4 -; 45d57 - -Music_Pinballtitlescreen_Ch1: ; 45d57 - tempo 130 - volume $77 - tone $0001 - dutycycle $2 - notetype $c, $92 - note __, 2 - note __, 2 - octave 4 - note C_, 2 - notetype $6, $61 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - intensity $92 - octave 3 - note A_, 2 - note __, 6 - note A_, 2 - note __, 6 - note A#, 2 - note __, 2 - note A#, 2 - note __, 2 - note A#, 2 - note __, 2 - intensity $41 - octave 4 - note C#, 2 - note G_, 2 - intensity $51 - note C#, 2 - note G_, 2 - intensity $71 - note C#, 2 - note G_, 2 - intensity $91 - note C#, 2 - note G_, 2 - intensity $a1 - note C#, 2 - note G_, 2 -Music_Pinballtitlescreen_branch_45d91: ; 45d91 - intensity $88 - note __, 4 - octave 3 - note C_, 2 - note __, 2 - loopchannel 8, Music_Pinballtitlescreen_branch_45d91 - intensity $61 - note F_, 2 - note C#, 2 - note F_, 2 - note C#, 2 - note F_, 2 - note C#, 2 - note F_, 2 - note C#, 2 - note D_, 2 - note F_, 2 - note G#, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - note A#, 2 - octave 4 - note D#, 2 - note C#, 4 - note C_, 4 - octave 3 - note A#, 16 - intensity $91 - octave 4 - note G#, 2 - note D#, 2 - intensity $88 - octave 3 - note C_, 2 - note __, 6 - note C_, 2 - note __, 6 - note C_, 2 - note __, 6 - note C_, 2 - note __, 2 - intensity $91 - octave 4 - note G#, 2 - note F_, 2 - intensity $88 - octave 3 - note C_, 2 - note __, 6 - note C_, 2 - note __, 6 - note C_, 2 - note __, 6 - note C_, 2 - note __, 2 - intensity $91 - octave 5 - note C#, 2 - octave 4 - note G#, 2 - intensity $61 - octave 3 - note F_, 2 - note C#, 2 - note F_, 2 - note C#, 2 - note F_, 2 - note C#, 2 - note D_, 2 - note F_, 2 - note G#, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - octave 2 - note B_, 2 - note __, 16 - note __, 7 - intensity $68 - octave 5 - note D_, 1 - intensity $78 - note D#, 8 - intensity $88 - note __, 4 - octave 3 - note F_, 2 - note __, 6 - note F_, 2 - note __, 6 - note F_, 2 - note __, 6 - note F_, 2 - note __, 2 - note __, 4 - note G#, 2 - note __, 6 - note G#, 2 - note __, 6 - note A_, 2 - note __, 6 - note A_, 2 - note __, 2 - note __, 4 - octave 4 - note C#, 2 - note __, 6 - note C#, 2 - note __, 6 - octave 3 - note A#, 2 - note __, 6 - note A#, 2 - note __, 2 - intensity $72 - note D#, 2 - note G_, 2 - octave 4 - note C#, 2 - note D#, 2 - note C#, 4 - note C_, 4 - octave 3 - note A#, 4 - note G#, 4 - note G_, 4 - octave 4 - note D#, 4 - intensity $71 - octave 3 - note G#, 2 - octave 4 - note C_, 2 - intensity $88 - octave 3 - note F_, 2 - intensity $71 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - octave 4 - note C_, 2 - intensity $88 - octave 3 - note F_, 2 - intensity $71 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - octave 4 - note D_, 2 - intensity $88 - octave 3 - note F_, 2 - intensity $71 - octave 4 - note D_, 2 - octave 3 - note G#, 2 - octave 4 - note D_, 2 - intensity $88 - octave 3 - note F_, 2 - intensity $71 - octave 4 - note D_, 2 - note C_, 2 - note D#, 2 - intensity $88 - octave 3 - note G#, 2 - intensity $71 - octave 4 - note D#, 2 - note C_, 2 - note D#, 2 - intensity $88 - octave 3 - note G#, 2 - intensity $71 - octave 4 - note D#, 2 - note C_, 2 - note D#, 2 - intensity $88 - octave 3 - note A_, 2 - intensity $71 - octave 4 - note D#, 2 - note F_, 2 - note A_, 2 - octave 5 - note C_, 2 - octave 4 - note A_, 2 - note C#, 2 - note A#, 2 - intensity $88 - note F_, 2 - intensity $71 - note A#, 2 - note C#, 2 - note A#, 2 - intensity $88 - note F_, 2 - intensity $71 - note A#, 2 - note D_, 2 - note A#, 2 - intensity $88 - note F_, 2 - intensity $71 - note A#, 2 - note D_, 2 - note A#, 2 - intensity $88 - note F_, 2 - intensity $71 - note A#, 2 - intensity $57 - note G_, 8 - intensity $77 - note G#, 8 - intensity $97 - note A_, 8 - intensity $a7 - note A#, 8 - loopchannel 0, Music_Pinballtitlescreen_branch_45d91 -; 45eae - -Music_Pinballtitlescreen_Ch2: ; 45eae - notetype $c, $b3 - dutycycle $2 - vibrato $9, $24 - note __, 2 - intensity $a8 - octave 2 - note G#, 1 - note __, 1 - intensity $a8 - octave 4 - note G#, 6 - intensity $a1 - note G_, 1 - notetype $6, $71 - note D#, 2 - note C_, 2 - note D#, 2 - intensity $a1 - note G_, 2 - intensity $71 - note D#, 2 - note C_, 2 - note D#, 2 - intensity $a1 - note F_, 2 - intensity $71 - note C#, 2 - intensity $a1 - note E_, 2 - intensity $71 - note C#, 2 - intensity $a1 - note D#, 2 - intensity $71 - note C#, 2 - notetype $c, $a8 - note A#, 10 -Music_Pinballtitlescreen_branch_45ee7: ; 45ee7 - notetype $c, $a8 - dutycycle $2 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - note A#, 2 - octave 4 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - octave 3 - note B_, 2 - intensity $28 - note B_, 2 - intensity $a8 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - note A#, 2 - octave 4 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note C#, 2 - intensity $28 - note C#, 2 - intensity $a8 - note D#, 2 - callchannel Music_Pinballtitlescreen_branch_460da - intensity $a8 - note G#, 1 - intensity $28 - note G#, 1 - intensity $a8 - note G_, 1 - intensity $28 - note G_, 1 - intensity $a8 - note F#, 1 - intensity $28 - note F#, 1 - intensity $a8 - note F_, 1 - intensity $28 - note F_, 1 - intensity $a8 - note D#, 1 - intensity $28 - note D#, 1 - notetype $6, $61 - note G#, 4 - note G_, 4 - intensity $78 - note A#, 2 - intensity $68 - note B_, 2 - intensity $a8 - octave 4 - note C_, 6 - octave 3 - note B_, 2 - note A#, 4 - octave 4 - note C_, 4 - intensity $28 - note C_, 4 - intensity $a8 - octave 3 - note B_, 4 - intensity $28 - note B_, 4 - intensity $a8 - note A#, 4 - octave 4 - note C_, 6 - octave 3 - note B_, 2 - note A#, 4 - octave 4 - note C_, 4 - intensity $28 - note C_, 4 - intensity $a8 - note C#, 4 - intensity $28 - note C#, 4 - intensity $a8 - note D#, 4 - notetype $c, $a8 - callchannel Music_Pinballtitlescreen_branch_460da - notetype $6, $a2 - note G#, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note D_, 1 - intensity $28 - note D_, 1 - intensity $a8 - note D#, 1 - intensity $28 - note D#, 1 - intensity $a8 - octave 2 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - note A_, 1 - intensity $28 - note A_, 1 - intensity $a8 - note A#, 1 - intensity $28 - note A#, 1 - intensity $a8 - note D#, 3 - intensity $68 - octave 4 - note F#, 1 - intensity $78 - note G_, 8 - dutycycle $3 - intensity $a8 - note F_, 2 - intensity $28 - note F_, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 1 - intensity $58 - note A#, 1 - intensity $a8 - note B_, 2 - intensity $28 - note B_, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - note G#, 2 - intensity $58 - note A#, 1 - note B_, 1 - intensity $a8 - octave 5 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - octave 4 - note B_, 2 - intensity $28 - note B_, 2 - intensity $a8 - octave 5 - note C_, 2 - intensity $28 - note C_, 1 - intensity $58 - note D_, 1 - intensity $a8 - note D#, 2 - intensity $28 - note D#, 2 - intensity $a8 - note C#, 2 - intensity $28 - note C#, 2 - intensity $a8 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note D#, 2 - intensity $28 - note D#, 2 - intensity $a8 - note C#, 2 - intensity $28 - note C#, 2 - intensity $a8 - octave 4 - note F_, 2 - intensity $28 - note F_, 2 - intensity $a8 - note G_, 2 - intensity $28 - note G_, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - octave 5 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - octave 4 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note G_, 6 - note F#, 2 - note F_, 2 - intensity $28 - note F_, 2 - intensity $a8 - note G_, 8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note A#, 4 - intensity $48 - note A_, 1 - note G#, 1 - intensity $28 - note G_, 1 - note F#, 1 - intensity $a8 - note F_, 2 - intensity $28 - note F_, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note B_, 2 - intensity $28 - note B_, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - note A#, 2 - intensity $28 - note A#, 2 - intensity $a8 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - octave 5 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - octave 4 - note B_, 2 - intensity $28 - note B_, 2 - intensity $a8 - octave 5 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note D#, 2 - intensity $28 - note D#, 2 - intensity $a8 - note C#, 2 - intensity $28 - note C#, 2 - intensity $a8 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note D#, 2 - intensity $28 - note D#, 2 - intensity $a8 - note C#, 8 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note C#, 2 - intensity $28 - note C#, 2 - intensity $a8 - note D_, 8 - note C_, 2 - intensity $28 - note C_, 2 - intensity $a8 - note D_, 2 - intensity $28 - note D_, 2 - notetype $c, $a8 - note D#, 16 - loopchannel 0, Music_Pinballtitlescreen_branch_45ee7 -; 460da - -Music_Pinballtitlescreen_branch_460da: ; 460da - note F_, 2 - octave 3 - note G#, 2 - note A#, 2 - note G#, 2 - intensity $28 - note G#, 2 - intensity $a8 - octave 4 - note C_, 1 - intensity $28 - note C_, 1 - intensity $a8 - octave 3 - note A#, 1 - intensity $28 - note A#, 1 - intensity $a8 - note G#, 1 - intensity $28 - note G#, 1 - endchannel -; 460f7 - -Music_Pinballtitlescreen_Ch3: ; 460f7 - notetype $c, $22 - note __, 2 - octave 1 - note G#, 1 - note __, 1 - octave 2 - note D#, 6 - octave 1 - note A_, 1 - note __, 3 - note A_, 1 - note __, 3 - note A#, 1 - note __, 1 - octave 2 - note C#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note D#, 4 - note D#, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 -Music_Pinballtitlescreen_branch_46115: ; 46115 - notetype $c, $22 - callchannel Music_Pinballtitlescreen_branch_461df - callchannel Music_Pinballtitlescreen_branch_46210 - note D#, 1 - note __, 1 - note A#, 1 - note __, 1 - note D#, 1 - note __, 1 - note A#, 1 - note __, 1 - note D#, 1 - note __, 7 - callchannel Music_Pinballtitlescreen_branch_461df - callchannel Music_Pinballtitlescreen_branch_46210 - note D#, 1 - note __, 1 - note A#, 1 - note __, 1 - note D#, 1 - note __, 5 - notetype $6, $22 - octave 1 - note D#, 3 - notetype $6, $32 - octave 3 - note A_, 1 - notetype $6, $22 - note A#, 8 - notetype $c, $22 - callchannel Music_Pinballtitlescreen_branch_46210 - callchannel Music_Pinballtitlescreen_branch_46222 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note F_, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note F_, 1 - note __, 1 - octave 2 - note F#, 1 - note __, 1 - octave 3 - note C#, 1 - note __, 1 - octave 2 - note F#, 1 - note __, 1 - octave 3 - note C#, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note F_, 1 - note __, 1 - note D#, 1 - note __, 1 - note G_, 1 - note __, 1 - note D#, 1 - note __, 1 - note G_, 1 - note __, 1 - note A#, 1 - note __, 1 - callchannel Music_Pinballtitlescreen_branch_46210 - callchannel Music_Pinballtitlescreen_branch_46222 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note C#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note C#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note D_, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 3 - note D_, 1 - note __, 1 - octave 2 - note A#, 1 - notetype $6, $32 - octave 4 - note D#, 1 - note __, 1 - notetype $6, $22 - octave 3 - note G_, 2 - notetype $6, $32 - octave 4 - note D#, 1 - note __, 1 - notetype $6, $22 - octave 2 - note A#, 2 - notetype $6, $32 - octave 4 - note D#, 1 - note __, 1 - notetype $6, $22 - octave 3 - note G_, 2 - notetype $6, $32 - octave 4 - note D#, 1 - note __, 1 - notetype $6, $22 - octave 2 - note A#, 2 - notetype $6, $32 - octave 4 - note D#, 1 - note __, 1 - notetype $6, $22 - octave 3 - note G_, 2 - notetype $6, $32 - octave 4 - note D#, 1 - note __, 1 - notetype $6, $12 - octave 3 - note G_, 1 - note __, 1 - note D#, 1 - note __, 1 - octave 2 - note D#, 4 - loopchannel 0, Music_Pinballtitlescreen_branch_46115 -; 461df - -Music_Pinballtitlescreen_branch_461df: ; 461df - octave 1 - note G#, 1 - note __, 1 - octave 3 - note D#, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note D#, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note E_, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note E_, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note F_, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note F_, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note F#, 1 - note __, 1 - octave 1 - note G#, 1 - note __, 1 - octave 3 - note F#, 1 - note __, 1 - endchannel -; 46210 - -Music_Pinballtitlescreen_branch_46210: ; 46210 - octave 2 - note C#, 1 - note __, 1 - note G#, 1 - note __, 1 - note C#, 1 - note __, 1 - note G#, 1 - note __, 1 - note D_, 1 - note __, 1 - note G#, 1 - note __, 1 - note D_, 1 - note __, 1 - note G#, 1 - note __, 1 - endchannel -; 46222 - -Music_Pinballtitlescreen_branch_46222: ; 46222 - note D#, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note D#, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note F_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - endchannel -; 4623a - -Music_Pinballtitlescreen_Ch4: ; 4623a - togglenoise $1 - notetype $8 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - note D#, 2 - note B_, 6 - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - callchannel Music_Pinballtitlescreen_branch_462b8 -Music_Pinballtitlescreen_branch_4624f: ; 4624f - notetype $c - callchannel Music_Pinballtitlescreen_branch_462cb - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 - notetype $8 - note A_, 1 - note G_, 1 - note G_, 1 - notetype $c - note A_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 - callchannel Music_Pinballtitlescreen_branch_462cb - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 8 - callchannel Music_Pinballtitlescreen_branch_462cb - callchannel Music_Pinballtitlescreen_branch_462b8 - callchannel Music_Pinballtitlescreen_branch_462cb - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note A_, 1 - note D#, 1 - notetype $6 - note __, 1 - note B_, 9 - notetype $c - callchannel Music_Pinballtitlescreen_branch_462cb - callchannel Music_Pinballtitlescreen_branch_462cb - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 -Music_Pinballtitlescreen_branch_4629d: ; 4629d - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - loopchannel 2, Music_Pinballtitlescreen_branch_4629d - callchannel Music_Pinballtitlescreen_branch_462cb - callchannel Music_Pinballtitlescreen_branch_462cb - callchannel Music_Pinballtitlescreen_branch_462cb - callchannel Music_Pinballtitlescreen_branch_462cb - loopchannel 0, Music_Pinballtitlescreen_branch_4624f -; 462b8 - -Music_Pinballtitlescreen_branch_462b8: ; 462b8 - note A_, 2 - note G_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 - notetype $8 - note A_, 1 - note G_, 1 - note G_, 1 - notetype $c - note G_, 1 - note G_, 1 - note A_, 2 - note G_, 1 - note G_, 1 - endchannel -; 462cb - -Music_Pinballtitlescreen_branch_462cb: ; 462cb - note A_, 2 - note G_, 1 - note G_, 1 - loopchannel 4, Music_Pinballtitlescreen_branch_462cb - endchannel -; 462d3 - diff --git a/crysaudio/music/pinball/whackthediglett.asm b/crysaudio/music/pinball/whackthediglett.asm new file mode 100644 index 00000000..5f58fe05 --- /dev/null +++ b/crysaudio/music/pinball/whackthediglett.asm @@ -0,0 +1,794 @@ +Music_WhackTheDiglett: + channel_count 4 + channel 1, Music_WhackTheDiglett_Ch1 + channel 2, Music_WhackTheDiglett_Ch2 + channel 3, Music_WhackTheDiglett_Ch3 + channel 4, Music_WhackTheDiglett_Ch4 + +Music_WhackTheDiglett_Ch1: + tempo 208 + volume 7, 7 + note_type 6, 7, 3 + duty_cycle 2 + rest 8 + octave 6 + note C_, 2 + octave 2 + note G_, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note B_, 1 + rest 1 + note G_, 1 + rest 1 +Music_WhackTheDiglett_branch_44ce1: + duty_cycle 3 + sound_call Music_WhackTheDiglett_branch_44d6e + sound_call Music_WhackTheDiglett_branch_44d6e + sound_call Music_WhackTheDiglett_branch_44d8e + sound_call Music_WhackTheDiglett_branch_44d8e + sound_call Music_WhackTheDiglett_branch_44d6e + sound_call Music_WhackTheDiglett_branch_44d6e + sound_call Music_WhackTheDiglett_branch_44d8e + octave 2 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 2 + rest 2 + octave 4 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note_type 12, 7, 3 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 6, 7, 3 + duty_cycle 0 +Music_WhackTheDiglett_branch_44d25: + octave 2 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 3 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + sound_loop 2, Music_WhackTheDiglett_branch_44d25 +Music_WhackTheDiglett_branch_44d48: + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 3 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + sound_loop 2, Music_WhackTheDiglett_branch_44d48 + sound_loop 0, Music_WhackTheDiglett_branch_44ce1 + +Music_WhackTheDiglett_branch_44d6e: + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 3 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 3 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + sound_ret + +Music_WhackTheDiglett_branch_44d8e: + octave 2 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 3 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + sound_ret + +Music_WhackTheDiglett_Ch2: + note_type 6, 11, 3 + vibrato 9, 3, 4 + duty_cycle 2 + pitch_offset 1 + rest 8 + octave 5 + note C_, 2 + duty_cycle 3 + octave 2 + note C_, 1 + rest 1 + note C#, 1 + rest 1 + note C_, 1 + rest 1 + note D#, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 +Music_WhackTheDiglett_branch_44dce: + duty_cycle 2 + volume_envelope 11, 3 + sound_call Music_WhackTheDiglett_branch_44eaf + octave 3 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 4 + note G_, 1 + note G#, 3 + note F_, 6 + rest 2 + note D_, 1 + rest 1 + note G#, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note A#, 1 + rest 1 + note B_, 1 + rest 1 + sound_call Music_WhackTheDiglett_branch_44eaf + octave 3 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 4 + note G_, 1 + note G#, 3 + note F_, 6 + rest 2 + note D_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + volume_envelope 9, 2 + duty_cycle 0 +Music_WhackTheDiglett_branch_44e16: + octave 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note D#, 3 + rest 1 + note D#, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + sound_loop 2, Music_WhackTheDiglett_branch_44e16 +Music_WhackTheDiglett_branch_44e3e: + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note G#, 3 + rest 1 + note G#, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + sound_loop 2, Music_WhackTheDiglett_branch_44e3e + duty_cycle 2 +Music_WhackTheDiglett_branch_44e66: + octave 3 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 3 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + sound_loop 2, Music_WhackTheDiglett_branch_44e66 +Music_WhackTheDiglett_branch_44e89: + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 3 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + sound_loop 2, Music_WhackTheDiglett_branch_44e89 + sound_loop 0, Music_WhackTheDiglett_branch_44dce + +Music_WhackTheDiglett_branch_44eaf: + octave 3 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note B_, 1 + octave 4 + note C_, 3 + octave 3 + note F_, 6 + rest 2 + note G#, 1 + rest 1 + note F_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note C_, 2 + rest 2 + octave 3 + note D#, 2 + rest 2 + volume_envelope 11, 8 + note C_, 2 + volume_envelope 11, 3 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note B_, 1 + octave 4 + note C_, 3 + octave 3 + note F_, 6 + rest 2 + note G#, 1 + rest 1 + note F_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note C_, 2 + rest 2 + note D#, 2 + note D_, 1 + rest 1 + note C_, 2 + octave 3 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 4 + note G_, 1 + note G#, 3 + note F_, 6 + rest 2 + note G#, 1 + rest 1 + note F_, 1 + rest 1 + note B_, 1 + rest 1 + octave 5 + note C_, 2 + rest 2 + octave 4 + note D#, 2 + note D_, 1 + rest 1 + note C_, 2 + sound_ret + +Music_WhackTheDiglett_Ch3: + note_type 6, 2, 2 + rest 8 + octave 4 + note E_, 2 + octave 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note D#, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 +Music_WhackTheDiglett_branch_44f10: + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f8e + sound_call Music_WhackTheDiglett_branch_44f8e + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f8e + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note G#, 2 + note D_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note G#, 1 + rest 1 + octave 2 + note D_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note G#, 1 + rest 1 + octave 2 + note D_, 1 + rest 1 + octave 3 + note G#, 1 + rest 1 + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f8e + sound_call Music_WhackTheDiglett_branch_44f8e + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f69 + sound_call Music_WhackTheDiglett_branch_44f8e + sound_call Music_WhackTheDiglett_branch_44f8e + sound_loop 0, Music_WhackTheDiglett_branch_44f10 + +Music_WhackTheDiglett_branch_44f69: + octave 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note D#, 3 + rest 1 + note D#, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + sound_ret + +Music_WhackTheDiglett_branch_44f8e: + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + note G#, 3 + rest 1 + note G#, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + sound_ret + +Music_WhackTheDiglett_Ch4: + toggle_noise 0 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 +Music_WhackTheDiglett_branch_44fc3: + sound_call Music_WhackTheDiglett_branch_4501f + sound_call Music_WhackTheDiglett_branch_4502f + sound_call Music_WhackTheDiglett_branch_4501f + sound_call Music_WhackTheDiglett_branch_4501f + sound_call Music_WhackTheDiglett_branch_4501f + sound_call Music_WhackTheDiglett_branch_4502f + sound_call Music_WhackTheDiglett_branch_4501f + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + sound_call Music_WhackTheDiglett_branch_4501f + sound_call Music_WhackTheDiglett_branch_4502f + sound_call Music_WhackTheDiglett_branch_4501f + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + sound_call Music_WhackTheDiglett_branch_4501f + sound_call Music_WhackTheDiglett_branch_4502f + sound_call Music_WhackTheDiglett_branch_4501f + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_loop 0, Music_WhackTheDiglett_branch_44fc3 + +Music_WhackTheDiglett_branch_4501f: + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_ret + +Music_WhackTheDiglett_branch_4502f: + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + sound_ret diff --git a/crysaudio/music/pinball/whackthedugtrio.asm b/crysaudio/music/pinball/whackthedugtrio.asm new file mode 100644 index 00000000..917038ea --- /dev/null +++ b/crysaudio/music/pinball/whackthedugtrio.asm @@ -0,0 +1,1126 @@ +Music_WhackTheDugtrio: + channel_count 4 + channel 1, Music_WhackTheDugtrio_Ch1 + channel 2, Music_WhackTheDugtrio_Ch2 + channel 3, Music_WhackTheDugtrio_Ch3 + channel 4, Music_WhackTheDugtrio_Ch4 + +Music_WhackTheDugtrio_Ch1: + tempo 144 + volume 7, 7 + note_type 12, 8, 3 + rest 16 + duty_cycle 2 +Music_WhackTheDugtrio_branch_45057: + rest 16 + rest 12 + note_type 6, 7, 3 + octave 4 + note F_, 1 + volume_envelope 4, 3 + note F_, 1 + volume_envelope 7, 3 + note F#, 1 + volume_envelope 4, 3 + note F#, 1 + rest 2 + volume_envelope 7, 3 + note G_, 1 + volume_envelope 4, 3 + note G_, 1 + note_type 12, 8, 3 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 9 + note_type 6, 7, 3 + octave 5 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + octave 4 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + note_type 12, 8, 3 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_WhackTheDugtrio_branch_45057 + +Music_WhackTheDugtrio_Ch2: + duty_cycle 2 + pitch_offset 1 + note_type 12, 11, 3 + rest 12 + note_type 6, 8, 3 + octave 3 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + volume_envelope 8, 3 + octave 4 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + volume_envelope 8, 3 + octave 3 + note E_, 1 + volume_envelope 5, 3 + note E_, 1 + volume_envelope 8, 3 + octave 4 + note E_, 1 + volume_envelope 5, 3 + note E_, 1 +Music_WhackTheDugtrio_branch_450c4: + force_stereo_panning TRUE, TRUE + note_type 12, 11, 3 + rest 16 + rest 8 + sound_call Music_WhackTheDugtrio_branch_45213 + volume_envelope 8, 3 + octave 5 + note C#, 1 + volume_envelope 5, 3 + note C#, 1 + volume_envelope 8, 3 + note D_, 1 + volume_envelope 3, 3 + note D_, 1 + rest 2 + volume_envelope 8, 3 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + note_type 12, 11, 3 + rest 16 + rest 8 + sound_call Music_WhackTheDugtrio_branch_45221 + sound_call Music_WhackTheDugtrio_branch_45245 + force_stereo_panning TRUE, TRUE + sound_call Music_WhackTheDugtrio_branch_4529e + transpose 0, 4 + force_stereo_panning TRUE, FALSE + sound_call Music_WhackTheDugtrio_branch_452cb + force_stereo_panning FALSE, TRUE + sound_call Music_WhackTheDugtrio_branch_452e4 + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45245 + force_stereo_panning TRUE, TRUE + sound_call Music_WhackTheDugtrio_branch_452cb + sound_call Music_WhackTheDugtrio_branch_452e4 + volume_envelope 8, 3 + rest 2 + octave 6 + note C_, 1 + rest 1 + octave 5 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + volume_envelope 4, 3 + note C_, 1 + rest 1 + volume_envelope 5, 3 + octave 4 + note A#, 1 + rest 1 + volume_envelope 6, 3 + octave 5 + note C_, 1 + rest 1 + volume_envelope 7, 3 + note E_, 1 + rest 1 + sound_call Music_WhackTheDugtrio_branch_45245 + force_stereo_panning FALSE, TRUE + sound_call Music_WhackTheDugtrio_branch_4529e + transpose 0, 4 + force_stereo_panning TRUE, FALSE + sound_call Music_WhackTheDugtrio_branch_452cb + sound_call Music_WhackTheDugtrio_branch_452e4 + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45245 + force_stereo_panning TRUE, TRUE + volume_envelope 8, 3 + octave 1 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + volume_envelope 8, 3 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + volume_envelope 8, 3 + octave 2 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + volume_envelope 8, 3 + octave 1 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + volume_envelope 8, 3 + octave 2 + note C#, 1 + volume_envelope 5, 3 + note C#, 1 + volume_envelope 8, 3 + note D_, 1 + volume_envelope 5, 3 + note D_, 1 + rest 2 + volume_envelope 8, 3 + note D#, 1 + volume_envelope 5, 3 + note D#, 1 + transpose 0, 1 + sound_call Music_WhackTheDugtrio_branch_45221 + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_452fd + force_stereo_panning TRUE, FALSE + sound_call Music_WhackTheDugtrio_branch_4532e + transpose 0, 14 + force_stereo_panning FALSE, TRUE + sound_call Music_WhackTheDugtrio_branch_45213 + transpose 0, 10 + sound_call Music_WhackTheDugtrio_branch_45213 + force_stereo_panning TRUE, TRUE + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45345 + force_stereo_panning TRUE, FALSE + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note C#, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_452fd + sound_call Music_WhackTheDugtrio_branch_4532e + force_stereo_panning FALSE, TRUE + transpose 0, 14 + sound_call Music_WhackTheDugtrio_branch_45213 + transpose 0, 10 + sound_call Music_WhackTheDugtrio_branch_45213 + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45345 + force_stereo_panning TRUE, TRUE + volume_envelope 8, 3 + octave 1 + note C_, 1 + rest 1 + octave 6 + note C_, 1 + volume_envelope 5, 3 + octave 5 + note G_, 1 + volume_envelope 8, 3 + note A#, 1 + rest 1 + note G_, 1 + volume_envelope 5, 3 + note C_, 1 + note E_, 1 + rest 1 + volume_envelope 8, 3 + note C_, 1 + volume_envelope 5, 3 + octave 4 + note G_, 1 + volume_envelope 8, 3 + note A#, 1 + rest 1 + note G_, 1 + volume_envelope 5, 3 + note C_, 1 + volume_envelope 8, 3 + note E_, 1 + rest 1 + note C_, 1 + volume_envelope 5, 3 + octave 3 + note G_, 1 + volume_envelope 8, 3 + note A#, 1 + rest 1 + note G_, 1 + volume_envelope 5, 3 + note E_, 1 + force_stereo_panning TRUE, FALSE + sound_call Music_WhackTheDugtrio_branch_45213 + sound_loop 0, Music_WhackTheDugtrio_branch_450c4 + +Music_WhackTheDugtrio_branch_45213: + note_type 6, 8, 3 + octave 1 + note B_, 1 + volume_envelope 5, 3 + octave 2 + note C_, 1 + sound_loop 4, Music_WhackTheDugtrio_branch_45213 + sound_ret + +Music_WhackTheDugtrio_branch_45221: + note_type 6, 3, 3 + octave 2 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + volume_envelope 4, 3 + note E_, 1 + volume_envelope 5, 3 + note F_, 1 + volume_envelope 6, 3 + note F#, 1 + volume_envelope 7, 3 + note G_, 1 + volume_envelope 8, 3 + note G#, 1 + volume_envelope 9, 3 + note A_, 1 + volume_envelope 10, 3 + note A#, 1 + sound_ret + +Music_WhackTheDugtrio_branch_45245: + force_stereo_panning TRUE, FALSE + volume_envelope 8, 3 + octave 3 + note F_, 1 + note B_, 1 + volume_envelope 5, 3 + note F_, 1 + note B_, 1 + volume_envelope 8, 3 + note F_, 1 + octave 4 + note C_, 1 + volume_envelope 5, 3 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + volume_envelope 8, 3 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + volume_envelope 5, 3 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + volume_envelope 8, 3 + octave 3 + note F_, 1 + note B_, 1 + volume_envelope 5, 3 + note F_, 1 + note B_, 1 + force_stereo_panning FALSE, TRUE + volume_envelope 8, 3 + note F_, 1 + octave 4 + note C_, 1 + volume_envelope 5, 3 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + volume_envelope 8, 3 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + volume_envelope 5, 3 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + volume_envelope 8, 3 + octave 3 + note F_, 1 + note B_, 1 + volume_envelope 5, 3 + note F_, 1 + note B_, 1 + volume_envelope 8, 3 + note F_, 1 + octave 4 + note C_, 1 + volume_envelope 5, 3 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + sound_ret + +Music_WhackTheDugtrio_branch_4529e: + volume_envelope 8, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 5, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 8, 3 + octave 3 + note G#, 1 + octave 4 + note D_, 1 + volume_envelope 5, 3 + octave 3 + note G#, 1 + octave 4 + note D_, 1 + volume_envelope 8, 3 + octave 3 + note F_, 1 + octave 4 + note C#, 1 + volume_envelope 5, 3 + octave 3 + note F_, 1 + octave 4 + note C#, 1 + volume_envelope 8, 3 + note C#, 1 + note G_, 1 + volume_envelope 5, 3 + note C#, 1 + note G_, 1 + sound_ret + +Music_WhackTheDugtrio_branch_452cb: + volume_envelope 7, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 6, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 5, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 4, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + sound_ret + +Music_WhackTheDugtrio_branch_452e4: + volume_envelope 3, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 4, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 5, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + volume_envelope 6, 3 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + sound_ret + +Music_WhackTheDugtrio_branch_452fd: + volume_envelope 8, 3 + octave 4 + note C_, 1 + rest 1 + octave 1 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + octave 1 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + sound_ret + +Music_WhackTheDugtrio_branch_4532e: + octave 1 + note G_, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + octave 1 + note G_, 1 + rest 1 + octave 2 + note F_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + sound_ret + +Music_WhackTheDugtrio_branch_45345: + volume_envelope 8, 3 + octave 4 + note C_, 1 + rest 1 + octave 1 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + octave 1 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + octave 2 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + sound_ret + +Music_WhackTheDugtrio_Ch3: + note_type 6, 1, 2 + octave 1 + note A_, 1 + rest 1 + octave 2 + note A_, 1 + rest 1 + octave 1 + note A#, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + octave 2 + note B_, 1 + rest 1 + note C_, 1 + rest 1 + octave 3 + note C_, 1 + rest 1 + octave 2 + note C#, 1 + volume_envelope 3, 2 + note C#, 1 + volume_envelope 1, 2 + octave 3 + note C#, 1 + volume_envelope 3, 2 + note C#, 1 + volume_envelope 1, 2 + octave 2 + note D_, 1 + volume_envelope 3, 2 + note D_, 1 + volume_envelope 1, 2 + octave 3 + note D_, 1 + volume_envelope 3, 2 + note D_, 1 + volume_envelope 1, 2 + octave 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 3 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note E_, 1 + volume_envelope 3, 2 + note E_, 1 + volume_envelope 1, 2 + octave 3 + note E_, 1 + volume_envelope 3, 2 + note E_, 1 +Music_WhackTheDugtrio_branch_453c5: + transpose 0, 2 + sound_call Music_WhackTheDugtrio_branch_454d5 + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_454d5 + transpose 0, 2 + sound_call Music_WhackTheDugtrio_branch_454fe + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45556 + sound_call Music_WhackTheDugtrio_branch_454fe + sound_call Music_WhackTheDugtrio_branch_45556 + transpose 0, 2 + sound_call Music_WhackTheDugtrio_branch_454fe + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45556 + sound_call Music_WhackTheDugtrio_branch_454fe + sound_call Music_WhackTheDugtrio_branch_45556 + transpose 0, 2 + sound_call Music_WhackTheDugtrio_branch_454fe + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45556 + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note C#, 1 + volume_envelope 3, 2 + note C#, 1 + volume_envelope 1, 2 + note D_, 1 + volume_envelope 3, 2 + note D_, 1 + rest 2 + volume_envelope 1, 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + rest 6 + volume_envelope 1, 2 + note B_, 1 + octave 2 + note C_, 1 + volume_envelope 3, 2 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + volume_envelope 1, 2 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + volume_envelope 3, 2 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + transpose 0, 2 + sound_call Music_WhackTheDugtrio_branch_454fe + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45556 + sound_call Music_WhackTheDugtrio_branch_454fe + sound_call Music_WhackTheDugtrio_branch_45556 + transpose 0, 2 + sound_call Music_WhackTheDugtrio_branch_454fe + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_45556 + volume_envelope 2, 2 + octave 4 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + volume_envelope 3, 2 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + volume_envelope 2, 2 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + sound_call Music_WhackTheDugtrio_branch_45565 + transpose 0, 4 + sound_call Music_WhackTheDugtrio_branch_4559a + transpose 0, 0 + sound_call Music_WhackTheDugtrio_branch_4559a + transpose 0, 4 + sound_call Music_WhackTheDugtrio_branch_4559a + transpose 0, 0 + volume_envelope 1, 2 + note F#, 1 + note G_, 1 + volume_envelope 3, 2 + note F#, 1 + note G_, 1 + volume_envelope 1, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + volume_envelope 2, 2 + sound_call Music_WhackTheDugtrio_branch_45565 + octave 2 + note C_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + octave 4 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + octave 3 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + octave 2 + note A#, 1 + rest 1 + transpose 0, 4 + sound_call Music_WhackTheDugtrio_branch_4559a + sound_loop 0, Music_WhackTheDugtrio_branch_453c5 + +Music_WhackTheDugtrio_branch_454d5: + volume_envelope 1, 2 + octave 1 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + octave 2 + note D#, 1 + rest 1 + octave 1 + note D#, 1 + rest 1 + octave 2 + note C#, 1 + rest 1 + note D_, 1 + rest 3 + note D#, 1 + rest 1 + volume_envelope 2, 2 + octave 1 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + octave 2 + note D#, 1 + rest 1 + octave 1 + note D#, 1 + rest 1 + octave 2 + note C#, 1 + rest 1 + note D_, 1 + rest 3 + note D#, 1 + rest 1 + sound_ret + +Music_WhackTheDugtrio_branch_454fe: + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note C#, 1 + volume_envelope 3, 2 + note C#, 1 + volume_envelope 1, 2 + note D_, 1 + volume_envelope 3, 2 + note D_, 1 + rest 2 + volume_envelope 1, 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 1 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + volume_envelope 1, 2 + octave 2 + note D#, 1 + volume_envelope 3, 2 + note D#, 1 + sound_ret + +Music_WhackTheDugtrio_branch_45556: + volume_envelope 1, 2 + octave 1 + note E_, 1 + volume_envelope 3, 2 + note E_, 1 + volume_envelope 1, 2 + octave 2 + note E_, 1 + volume_envelope 3, 2 + note E_, 1 + sound_ret + +Music_WhackTheDugtrio_branch_45565: + octave 3 + note E_, 1 + rest 5 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + octave 4 + note C_, 1 + rest 5 + octave 3 + note E_, 1 + rest 5 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + rest 4 + note G_, 1 + rest 1 + note A_, 1 + rest 5 + note G_, 1 + rest 1 + note A_, 1 + rest 16 + rest 1 + note E_, 1 + rest 5 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + octave 4 + note C_, 1 + rest 5 + octave 3 + note E_, 1 + rest 5 + note G_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + sound_ret + +Music_WhackTheDugtrio_branch_4559a: + volume_envelope 1, 2 + octave 1 + note F#, 1 + note G_, 1 + volume_envelope 3, 2 + note F#, 1 + note G_, 1 + volume_envelope 1, 2 + note F#, 1 + note G_, 1 + volume_envelope 3, 2 + note F#, 1 + note G_, 1 + sound_ret + +Music_WhackTheDugtrio_Ch4: + toggle_noise 1 + drum_speed 12 + drum_note 1, 8 + drum_speed 8 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 +Music_WhackTheDugtrio_branch_455be: + sound_call Music_WhackTheDugtrio_branch_455df + sound_loop 7, Music_WhackTheDugtrio_branch_455be + sound_call Music_WhackTheDugtrio_branch_455f0 + sound_call Music_WhackTheDugtrio_branch_455df + sound_call Music_WhackTheDugtrio_branch_455df + sound_call Music_WhackTheDugtrio_branch_455df + sound_call Music_WhackTheDugtrio_branch_455f0 +Music_WhackTheDugtrio_branch_455d4: + sound_call Music_WhackTheDugtrio_branch_455df + sound_loop 8, Music_WhackTheDugtrio_branch_455d4 + sound_loop 0, Music_WhackTheDugtrio_branch_455be + +Music_WhackTheDugtrio_branch_455df: + drum_note 4, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 7, 1 + sound_ret + +Music_WhackTheDugtrio_branch_455f0: + drum_note 4, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret diff --git a/crysaudio/music/pokeflutechannel.asm b/crysaudio/music/pokeflutechannel.asm index e324c559..46d164c2 100644 --- a/crysaudio/music/pokeflutechannel.asm +++ b/crysaudio/music/pokeflutechannel.asm @@ -1,20 +1,21 @@ Music_PokeFluteChannel: - musicheader 3, 1, Music_PokeFluteChannel_Ch1 - musicheader 1, 2, Music_PokeFluteChannel_Ch2 - musicheader 1, 3, Music_PokeFluteChannel_Ch3 + channel_count 3 + channel 1, Music_PokeFluteChannel_Ch1 + channel 2, Music_PokeFluteChannel_Ch2 + channel 3, Music_PokeFluteChannel_Ch3 Music_PokeFluteChannel_Ch1: tempo 240 - volume $77 - stereopanning $f0 - dutycycle $3 - tone $0002 - notetype $c, $b4 - note __, 4 + volume 7, 7 + stereo_panning TRUE, FALSE + duty_cycle 3 + pitch_offset 2 + note_type 12, 11, 4 + rest 4 octave 3 note E_, 8 note E_, 8 - notetype $c, $b3 + note_type 12, 11, 3 note F_, 2 note E_, 2 note D_, 2 @@ -25,11 +26,11 @@ Music_PokeFluteChannel_Ch1: note B_, 2 note A_, 2 note B_, 16 - note __, 2 + rest 2 octave 2 note G_, 4 note A_, 8 -Music_PokeFluteChannel_branch_f7b40: +.mainloop: octave 3 note E_, 2 note G_, 2 @@ -66,14 +67,14 @@ Music_PokeFluteChannel_branch_f7b40: octave 2 note G_, 4 note A_, 8 - loopchannel 0, Music_PokeFluteChannel_branch_f7b40 + sound_loop 0, .mainloop Music_PokeFluteChannel_Ch2: - stereopanning $f - dutycycle $3 - tone $0001 - notetype $c, $c4 - note __, 4 + stereo_panning FALSE, TRUE + duty_cycle 3 + pitch_offset 1 + note_type 12, 12, 4 + rest 4 octave 3 note C_, 8 octave 2 @@ -81,7 +82,7 @@ Music_PokeFluteChannel_Ch2: note A_, 8 octave 3 note E_, 8 - notetype $c, $c3 + note_type 12, 12, 3 octave 2 note E_, 2 note G_, 2 @@ -105,7 +106,7 @@ Music_PokeFluteChannel_Ch2: octave 2 note E_, 2 note G_, 2 -Music_PokeFluteChannel_branch_f7b94: +.mainloop: octave 3 note C_, 2 note E_, 2 @@ -167,15 +168,15 @@ Music_PokeFluteChannel_branch_f7b94: octave 2 note E_, 2 note G_, 2 - loopchannel 0, Music_PokeFluteChannel_branch_f7b94 + sound_loop 0, .mainloop Music_PokeFluteChannel_Ch3: - vibrato $10, $14 - notetype $c, $10 - callchannel Music_PokeFluteChannel_branch_f7c05 - callchannel Music_PokeFluteChannel_branch_f7c05 -Music_PokeFluteChannel_branch_f7be1: - note __, 4 + vibrato 16, 1, 4 + note_type 12, 1, 0 + sound_call .sub1 + sound_call .sub1 +.mainloop: + rest 4 octave 4 note C_, 2 octave 5 @@ -184,7 +185,7 @@ Music_PokeFluteChannel_branch_f7be1: note F_, 2 octave 6 note C_, 4 - note __, 4 + rest 4 octave 4 note C_, 2 octave 5 @@ -203,11 +204,11 @@ Music_PokeFluteChannel_branch_f7be1: note G_, 2 note F#, 2 note G_, 8 - note __, 4 - callchannel Music_PokeFluteChannel_branch_f7c05 - loopchannel 0, Music_PokeFluteChannel_branch_f7be1 + rest 4 + sound_call .sub1 + sound_loop 0, .mainloop -Music_PokeFluteChannel_branch_f7c05: +.sub1: octave 5 note E_, 2 note F_, 2 @@ -224,4 +225,4 @@ Music_PokeFluteChannel_branch_f7c05: note A_, 2 note F_, 2 note G_, 4 - endchannel + sound_ret diff --git a/crysaudio/music/pokemoncenter.asm b/crysaudio/music/pokemoncenter.asm index 01865045..a5687ca8 100644 --- a/crysaudio/music/pokemoncenter.asm +++ b/crysaudio/music/pokemoncenter.asm @@ -1,18 +1,19 @@ Music_PokemonCenter: - musicheader 4, 1, Music_PokemonCenter_Ch1 - musicheader 1, 2, Music_PokemonCenter_Ch2 - musicheader 1, 3, Music_PokemonCenter_Ch3 - musicheader 1, 4, Music_PokemonCenter_Ch4 + channel_count 4 + channel 1, Music_PokemonCenter_Ch1 + channel 2, Music_PokemonCenter_Ch2 + channel 3, Music_PokemonCenter_Ch3 + channel 4, Music_PokemonCenter_Ch4 Music_PokemonCenter_Ch1: tempo 152 - volume $77 - dutycycle $2 - vibrato $a, $14 - tone $0001 -Music_PokemonCenter_branch_ed5df: - stereopanning $f - notetype $c, $83 + volume 7, 7 + duty_cycle 2 + vibrato 10, 1, 4 + pitch_offset 1 +.mainloop: + stereo_panning FALSE, TRUE + note_type 12, 8, 3 octave 3 note F#, 2 note F_, 2 @@ -76,7 +77,7 @@ Music_PokemonCenter_branch_ed5df: note B_, 2 note A_, 2 note G_, 2 - notetype $c, $b4 + note_type 12, 11, 4 note F#, 2 note E_, 2 note D_, 2 @@ -85,7 +86,7 @@ Music_PokemonCenter_branch_ed5df: note G_, 2 note A_, 2 note B_, 2 - stereopanning $f0 + stereo_panning TRUE, FALSE note F#, 2 note E_, 2 note D_, 4 @@ -147,43 +148,43 @@ Music_PokemonCenter_branch_ed5df: note E_, 2 note F#, 2 note G_, 2 - loopchannel 0, Music_PokemonCenter_branch_ed5df + sound_loop 0, .mainloop Music_PokemonCenter_Ch2: - vibrato $10, $25 -Music_PokemonCenter_branch_ed674: - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6d1 - stereopanning $f - notetype $c, $a5 + vibrato 16, 2, 5 +.mainloop: + stereo_panning TRUE, TRUE + sound_call .sub1 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6e4 + stereo_panning TRUE, TRUE + sound_call .sub2 note D_, 2 note F#, 6 - stereopanning $f - notetype $c, $a5 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6d1 - stereopanning $f - notetype $c, $a5 + stereo_panning TRUE, TRUE + sound_call .sub1 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6e4 + stereo_panning TRUE, TRUE + sound_call .sub2 note D_, 8 - stereopanning $f - notetype $c, $a5 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note D_, 4 note E_, 4 - notetype $c, $c6 + note_type 12, 12, 6 octave 4 note F#, 8 note A_, 8 @@ -215,190 +216,190 @@ Music_PokemonCenter_branch_ed674: note F#, 2 note E_, 2 note D_, 8 - loopchannel 0, Music_PokemonCenter_branch_ed674 + sound_loop 0, .mainloop -Music_PokemonCenter_branch_ed6d1: - dutycycle $2 - notetype $c, $c2 +.sub1: + duty_cycle 2 + note_type 12, 12, 2 octave 4 note D_, 2 octave 3 note A_, 2 octave 4 note D_, 2 - intensity $c3 + volume_envelope 12, 3 note A_, 4 note G_, 4 note F#, 2 note E_, 2 note C#, 6 - endchannel + sound_ret -Music_PokemonCenter_branch_ed6e4: - notetype $c, $c2 +.sub2: + note_type 12, 12, 2 octave 4 note C#, 2 octave 3 note A_, 2 octave 4 note C#, 2 - intensity $c3 + volume_envelope 12, 3 note F#, 4 note E_, 4 note C#, 2 - endchannel + sound_ret Music_PokemonCenter_Ch3: - notetype $c, $28 -Music_PokemonCenter_branch_ed6f6: - stereopanning $f0 + note_type 12, 2, 8 +.mainloop: + stereo_panning TRUE, FALSE octave 3 note D_, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_PokemonCenter_branch_ed76f - callchannel Music_PokemonCenter_branch_ed778 + rest 1 + sound_call .sub1 + sound_call .sub2 note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_PokemonCenter_branch_ed76f - callchannel Music_PokemonCenter_branch_ed778 + rest 1 + sound_call .sub1 + sound_call .sub2 note D_, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed783 + rest 1 + stereo_panning TRUE, TRUE + sound_call .sub3 note G_, 1 - note __, 5 + rest 5 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - callchannel Music_PokemonCenter_branch_ed783 + rest 1 + sound_call .sub3 note G_, 1 - note __, 5 + rest 5 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - loopchannel 0, Music_PokemonCenter_branch_ed6f6 + rest 1 + sound_loop 0, .mainloop -Music_PokemonCenter_branch_ed76f: +.sub1: note E_, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_PokemonCenter_branch_ed778: +.sub2: note E_, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_PokemonCenter_branch_ed783: +.sub3: note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_PokemonCenter_Ch4: - togglenoise $3 - notetype $c - stereopanning $ff -Music_PokemonCenter_branch_ed792: - note G_, 6 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - loopchannel 0, Music_PokemonCenter_branch_ed792 + toggle_noise 3 + drum_speed 12 + stereo_panning TRUE, TRUE +.mainloop: + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/pokemonchannel.asm b/crysaudio/music/pokemonchannel.asm index 34d64262..23483234 100644 --- a/crysaudio/music/pokemonchannel.asm +++ b/crysaudio/music/pokemonchannel.asm @@ -1,55 +1,56 @@ Music_PokemonChannel: - musicheader 4, 1, Music_PokemonChannel_Ch1 - musicheader 1, 2, Music_PokemonChannel_Ch2 - musicheader 1, 3, Music_PokemonChannel_Ch3 - musicheader 1, 4, Music_PokemonChannel_Ch4 + channel_count 4 + channel 1, Music_PokemonChannel_Ch1 + channel 2, Music_PokemonChannel_Ch2 + channel 3, Music_PokemonChannel_Ch3 + channel 4, Music_PokemonChannel_Ch4 Music_PokemonChannel_Ch1: tempo 128 - volume $77 - vibrato $8, $38 - dutycycle $1 - stereopanning $f - notetype $c, $b3 + volume 7, 7 + vibrato 8, 3, 8 + duty_cycle 1 + stereo_panning FALSE, TRUE + note_type 12, 11, 3 octave 2 note B_, 1 - note __, 2 + rest 2 note F#, 1 note B_, 1 - note __, 1 + rest 1 octave 3 note F#, 4 - dutycycle $0 + duty_cycle 0 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - notetype $6, $b3 + rest 1 + note_type 6, 11, 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - dutycycle $1 + rest 1 + duty_cycle 1 octave 3 note C_, 2 - note __, 4 + rest 4 note G_, 2 note C_, 2 - note __, 2 + rest 2 note B_, 8 - dutycycle $0 + duty_cycle 0 note C_, 4 note C_, 4 octave 2 note G_, 2 - note __, 2 - dutycycle $3 + rest 2 + duty_cycle 3 octave 4 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 note B_, 2 @@ -57,131 +58,131 @@ Music_PokemonChannel_Ch1: note D_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - note __, 8 + rest 2 + rest 8 octave 3 note G_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note D_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_PokemonChannel_Ch2: - dutycycle $1 - vibrato $8, $38 - stereopanning $ff - notetype $c, $b3 + duty_cycle 1 + vibrato 8, 3, 8 + stereo_panning TRUE, TRUE + note_type 12, 11, 3 octave 3 note G_, 3 note A_, 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 - dutycycle $0 + duty_cycle 0 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - notetype $6, $b3 + rest 1 + note_type 6, 11, 3 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - dutycycle $1 + rest 1 + duty_cycle 1 octave 4 note C_, 6 note D_, 2 note E_, 2 - note __, 2 + rest 2 note G_, 8 - dutycycle $0 + duty_cycle 0 octave 3 note G_, 4 note F#, 4 note E_, 2 - note __, 2 - dutycycle $3 + rest 2 + duty_cycle 3 octave 4 note B_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note B_, 8 octave 5 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note A#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 - note __, 8 + rest 2 + rest 8 note D_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note G_, 2 - note __, 6 + rest 6 octave 3 note G_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_PokemonChannel_Ch3: - vibrato $8, $38 - notetype $c, $25 - stereopanning $f0 + vibrato 8, 3, 8 + note_type 12, 2, 5 + stereo_panning TRUE, FALSE octave 2 note G_, 1 - note __, 2 + rest 2 note B_, 1 octave 3 note D_, 1 - note __, 1 + rest 1 note G_, 6 - note __, 4 + rest 4 note C_, 1 - note __, 2 + rest 2 octave 2 note G_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 note E_, 6 - note __, 4 + rest 4 octave 4 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note G_, 4 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note D_, 1 octave 3 note B_, 1 @@ -195,37 +196,37 @@ Music_PokemonChannel_Ch3: note D_, 1 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_PokemonChannel_Ch4: - togglenoise $3 - notetype $c -Music_PokemonChannel_branch_ee54d: - note A#, 3 - note A#, 1 - note D_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note A#, 1 - note D_, 1 - loopchannel 2, Music_PokemonChannel_branch_ee54d - note G#, 2 - note A#, 2 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note C_, 4 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note B_, 4 - note D_, 4 - note A#, 4 - note A#, 4 - endchannel + toggle_noise 3 + drum_speed 12 +.loop1: + drum_note 11, 3 + drum_note 11, 1 + drum_note 3, 2 + drum_note 1, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 11, 1 + drum_note 3, 1 + sound_loop 2, .loop1 + drum_note 9, 2 + drum_note 11, 2 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 1, 4 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 12, 4 + drum_note 3, 4 + drum_note 11, 4 + drum_note 11, 4 + sound_ret diff --git a/crysaudio/music/pokemonlullaby.asm b/crysaudio/music/pokemonlullaby.asm index 86116a9a..277a5d6f 100644 --- a/crysaudio/music/pokemonlullaby.asm +++ b/crysaudio/music/pokemonlullaby.asm @@ -1,40 +1,41 @@ Music_PokemonLullaby: - musicheader 3, 1, Music_PokemonLullaby_Ch1 - musicheader 1, 2, Music_PokemonLullaby_Ch2 - musicheader 1, 3, Music_PokemonLullaby_Ch3 + channel_count 3 + channel 1, Music_PokemonLullaby_Ch1 + channel 2, Music_PokemonLullaby_Ch2 + channel 3, Music_PokemonLullaby_Ch3 Music_PokemonLullaby_Ch1: tempo 224 - volume $77 - dutycycle $3 - tone $0001 -Music_PokemonLullaby_branch_f6d8c: - notetype $c, $a7 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 +.mainloop: + note_type 12, 10, 7 octave 3 note G_, 16 octave 4 note C_, 16 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 3 note G_, 16 - stereopanning $f + stereo_panning FALSE, TRUE octave 4 note C_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 3 note B_, 8 - stereopanning $f + stereo_panning FALSE, TRUE note G_, 16 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 4 note C_, 8 - stereopanning $f + stereo_panning FALSE, TRUE octave 3 note B_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE note G_, 8 - stereopanning $ff - note __, 2 + stereo_panning TRUE, TRUE + rest 2 note G_, 2 note G_, 2 note B_, 2 @@ -51,20 +52,20 @@ Music_PokemonLullaby_branch_f6d8c: note C_, 8 octave 3 note B_, 8 - loopchannel 0, Music_PokemonLullaby_branch_f6d8c + sound_loop 0, .mainloop Music_PokemonLullaby_Ch2: - vibrato $10, $14 - dutycycle $0 - notetype $c, $b4 -Music_PokemonLullaby_branch_f6dcc: - note __, 16 - note __, 10 + vibrato 16, 1, 4 + duty_cycle 0 + note_type 12, 11, 4 +.mainloop: + rest 16 + rest 10 octave 4 note G_, 2 note F#, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 12 note D_, 2 note E_, 2 @@ -75,38 +76,38 @@ Music_PokemonLullaby_branch_f6dcc: note D_, 2 note F_, 2 note E_, 10 - intensity $b5 + volume_envelope 11, 5 note D_, 2 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note E_, 2 note F_, 4 note E_, 4 note F_, 4 - intensity $b5 + volume_envelope 11, 5 note G_, 2 note G_, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 14 - intensity $87 + volume_envelope 8, 7 octave 3 note F_, 8 note G_, 4 - intensity $b5 + volume_envelope 11, 5 octave 4 note G_, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 2 note E_, 16 - note __, 14 - loopchannel 0, Music_PokemonLullaby_branch_f6dcc + rest 14 + sound_loop 0, .mainloop Music_PokemonLullaby_Ch3: - notetype $c, $11 -Music_PokemonLullaby_branch_f6e06: - stereopanning $f0 + note_type 12, 1, 1 +.mainloop: + stereo_panning TRUE, FALSE octave 4 note C_, 2 note E_, 2 @@ -118,7 +119,7 @@ Music_PokemonLullaby_branch_f6e06: note B_, 2 note A_, 2 note G_, 2 - stereopanning $f + stereo_panning FALSE, TRUE note D_, 2 note F_, 2 note A_, 2 @@ -129,4 +130,4 @@ Music_PokemonLullaby_branch_f6e06: octave 4 note B_, 2 note A_, 2 - loopchannel 0, Music_PokemonLullaby_branch_f6e06 + sound_loop 0, .mainloop diff --git a/crysaudio/music/pokemonmarch.asm b/crysaudio/music/pokemonmarch.asm index 346e042b..80acde98 100644 --- a/crysaudio/music/pokemonmarch.asm +++ b/crysaudio/music/pokemonmarch.asm @@ -1,72 +1,73 @@ Music_PokemonMarch: - musicheader 4, 1, Music_PokemonMarch_Ch1 - musicheader 1, 2, Music_PokemonMarch_Ch2 - musicheader 1, 3, Music_PokemonMarch_Ch3 - musicheader 1, 4, Music_PokemonMarch_Ch4 + channel_count 4 + channel 1, Music_PokemonMarch_Ch1 + channel 2, Music_PokemonMarch_Ch2 + channel 3, Music_PokemonMarch_Ch3 + channel 4, Music_PokemonMarch_Ch4 Music_PokemonMarch_Ch1: tempo 144 - volume $77 - stereopanning $f0 - dutycycle $3 - tone $0001 - notetype $c, $42 + volume 7, 7 + stereo_panning TRUE, FALSE + duty_cycle 3 + pitch_offset 1 + note_type 12, 4, 2 octave 3 note D_, 4 - intensity $62 + volume_envelope 6, 2 note D_, 4 - intensity $82 + volume_envelope 8, 2 note D_, 4 - intensity $a2 + volume_envelope 10, 2 note D_, 4 - notetype $8, $a2 -Music_PokemonMarch_branch_f6e4c: - callchannel Music_PokemonMarch_branch_f6eae + note_type 8, 10, 2 +.mainloop: + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 note C_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 note G_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note C_, 2 note C_, 2 note D#, 2 note C_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note C#, 2 note D#, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note D_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note A_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note D_, 2 note D_, 2 note F_, 2 note D_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note G_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note D_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 @@ -81,9 +82,9 @@ Music_PokemonMarch_branch_f6e4c: note C_, 2 octave 2 note A#, 2 - note __, 4 + rest 4 note D#, 2 - note __, 4 + rest 4 octave 3 note D#, 2 note D#, 2 @@ -95,56 +96,56 @@ Music_PokemonMarch_branch_f6e4c: note F_, 2 note G_, 4 note A#, 2 - loopchannel 0, Music_PokemonMarch_branch_f6e4c + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f6eae: - note __, 4 +.sub1: + rest 4 octave 3 note D#, 1 note D_, 1 note D#, 2 - note __, 2 + rest 2 note D#, 2 note D#, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_PokemonMarch_branch_f6eb8: - note __, 4 +.sub2: + rest 4 note F_, 1 note E_, 1 note F_, 2 - note __, 2 + rest 2 note F_, 2 note F_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_PokemonMarch_Ch2: - dutycycle $2 - vibrato $10, $22 - notetype $c, $b2 + duty_cycle 2 + vibrato 16, 2, 2 + note_type 12, 11, 2 octave 3 note G_, 4 note G_, 4 note G_, 4 note G_, 4 -Music_PokemonMarch_branch_f6ece: - notetype $c, $b7 +.mainloop: + note_type 12, 11, 7 octave 3 note G#, 12 - notetype $8, $b3 + note_type 8, 11, 3 note D#, 2 note G#, 2 note A#, 2 octave 4 note C_, 2 - note __, 16 - note __, 6 - notetype $8, $b7 + rest 16 + rest 6 + note_type 8, 11, 7 octave 3 note G#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note D#, 2 note G#, 4 note A#, 2 @@ -159,21 +160,21 @@ Music_PokemonMarch_branch_f6ece: octave 3 note A#, 2 note G#, 2 - notetype $8, $b7 + note_type 8, 11, 7 note A#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note A#, 2 note F_, 2 note A#, 2 octave 4 note C_, 2 note D_, 2 - note __, 16 - note __, 6 - notetype $8, $b7 + rest 16 + rest 6 + note_type 8, 11, 7 octave 3 note A#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note F_, 2 note A#, 4 octave 4 @@ -188,17 +189,17 @@ Music_PokemonMarch_branch_f6ece: note C_, 2 octave 3 note B_, 2 - notetype $8, $b7 + note_type 8, 11, 7 note A#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note A_, 2 note A#, 4 octave 4 note C_, 2 - notetype $8, $b7 + note_type 8, 11, 7 octave 3 note G#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note A#, 2 note G#, 4 note F_, 2 @@ -209,12 +210,12 @@ Music_PokemonMarch_branch_f6ece: note F#, 2 note F_, 2 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 note D_, 1 note D#, 1 - note __, 5 + rest 5 octave 3 note G_, 2 note G_, 2 @@ -223,87 +224,87 @@ Music_PokemonMarch_branch_f6ece: note A_, 2 note G#, 2 note G_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 note F#, 1 note G_, 1 - note __, 5 - loopchannel 0, Music_PokemonMarch_branch_f6ece + rest 5 + sound_loop 0, .mainloop Music_PokemonMarch_Ch3: - stereopanning $f - notetype $c, $16 - note __, 16 - notetype $8, $16 -Music_PokemonMarch_branch_f6f56: - callchannel Music_PokemonMarch_branch_f6fe8 - note __, 2 + stereo_panning FALSE, TRUE + note_type 12, 1, 6 + rest 16 + note_type 8, 1, 6 +.mainloop: + sound_call .sub1 + rest 2 octave 4 note D#, 2 - callchannel Music_PokemonMarch_branch_f6fe8 + sound_call .sub1 octave 4 note G#, 2 note D#, 2 - callchannel Music_PokemonMarch_branch_f6fe8 - note __, 2 + sound_call .sub1 + rest 2 octave 4 note D#, 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 note G_, 2 note G#, 2 -Music_PokemonMarch_branch_f6f7b: +.loop1: octave 3 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note A_, 2 - note __, 1 + rest 1 octave 4 note F_, 2 - note __, 1 - loopchannel 3, Music_PokemonMarch_branch_f6f7b + rest 1 + sound_loop 3, .loop1 octave 3 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 note D_, 2 @@ -311,17 +312,17 @@ Music_PokemonMarch_branch_f6f7b: octave 3 note B_, 2 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 @@ -329,22 +330,22 @@ Music_PokemonMarch_branch_f6f7b: note G_, 2 note A#, 2 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note C_, 2 note D#, 2 @@ -354,10 +355,10 @@ Music_PokemonMarch_branch_f6f7b: note F#, 2 note F_, 2 note D#, 2 - note __, 4 + rest 4 octave 3 note D#, 2 - note __, 4 + rest 4 octave 4 note G_, 2 note G_, 2 @@ -366,94 +367,94 @@ Music_PokemonMarch_branch_f6f7b: note A_, 2 note G#, 2 note G_, 2 - note __, 2 + rest 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note G#, 2 - loopchannel 0, Music_PokemonMarch_branch_f6f56 + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f6fe8: +.sub1: octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note G_, 2 - endchannel + sound_ret Music_PokemonMarch_Ch4: - stereopanning $f0 - togglenoise $5 - notetype $8 - callchannel Music_PokemonMarch_branch_f704c -Music_PokemonMarch_branch_f7003: - callchannel Music_PokemonMarch_branch_f7042 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 5 - notetype $6 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $8 - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 6 - note C_, 2 - notetype $4 - note __, 5 - notetype $6 - note D_, 1 - note D_, 1 - notetype $8 - callchannel Music_PokemonMarch_branch_f704c - loopchannel 0, Music_PokemonMarch_branch_f7003 + stereo_panning TRUE, FALSE + toggle_noise 5 + drum_speed 8 + sound_call .sub2 +.mainloop: + sound_call .sub1 + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 5 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 8 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 6 + drum_note 1, 2 + drum_speed 4 + rest 5 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 8 + sound_call .sub2 + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f7042: - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note C#, 2 - note C#, 2 - endchannel +.sub1: + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 2, 2 + sound_ret -Music_PokemonMarch_branch_f704c: - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 4 - note C_, 4 - note C#, 2 - note D_, 2 - note C#, 2 - endchannel +.sub2: + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 4 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + sound_ret diff --git a/crysaudio/music/postcredits.asm b/crysaudio/music/postcredits.asm index 0997828f..d352a5fc 100644 --- a/crysaudio/music/postcredits.asm +++ b/crysaudio/music/postcredits.asm @@ -1,17 +1,18 @@ Music_PostCredits: - musicheader 2, 1, Music_PostCredits_Ch1 - musicheader 1, 2, Music_PostCredits_Ch2 + channel_count 2 + channel 1, Music_PostCredits_Ch1 + channel 2, Music_PostCredits_Ch2 - db $2 + db $2 ; unused Music_PostCredits_Ch1: tempo 271 - volume $77 - pitchoffset 0, D# - dutycycle $2 - notetype $c, $93 - note __, 8 -Music_PostCredits_branch_cfdb2: + volume 7, 7 + transpose 0, 3 + duty_cycle 2 + note_type 12, 9, 3 + rest 8 +.mainloop: octave 3 note C_, 2 note E_, 2 @@ -19,13 +20,13 @@ Music_PostCredits_branch_cfdb2: octave 4 note C_, 2 note E_, 2 - intensity $73 + volume_envelope 7, 3 note E_, 2 - intensity $53 + volume_envelope 5, 3 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note B_, 2 octave 3 @@ -34,13 +35,13 @@ Music_PostCredits_branch_cfdb2: note B_, 2 octave 4 note D_, 2 - intensity $73 + volume_envelope 7, 3 note D_, 2 - intensity $53 + volume_envelope 5, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note A#, 2 octave 3 @@ -49,13 +50,13 @@ Music_PostCredits_branch_cfdb2: note A#, 2 octave 4 note D_, 2 - intensity $73 + volume_envelope 7, 3 note D_, 2 - intensity $53 + volume_envelope 5, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note A_, 2 octave 3 @@ -64,13 +65,13 @@ Music_PostCredits_branch_cfdb2: note A_, 2 octave 4 note C_, 2 - intensity $73 + volume_envelope 7, 3 note C_, 2 - intensity $53 + volume_envelope 5, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note G#, 2 octave 3 @@ -79,13 +80,13 @@ Music_PostCredits_branch_cfdb2: note G#, 2 octave 4 note C_, 2 - intensity $73 + volume_envelope 7, 3 note C_, 2 - intensity $53 + volume_envelope 5, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note G_, 2 octave 3 @@ -94,13 +95,13 @@ Music_PostCredits_branch_cfdb2: note G_, 2 octave 4 note C_, 2 - intensity $73 + volume_envelope 7, 3 note C_, 2 - intensity $63 + volume_envelope 6, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note F#, 2 note A_, 2 @@ -108,13 +109,13 @@ Music_PostCredits_branch_cfdb2: note D_, 2 note F#, 2 note A_, 2 - intensity $73 + volume_envelope 7, 3 note A_, 2 - intensity $63 + volume_envelope 6, 3 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note G_, 2 octave 3 @@ -122,36 +123,36 @@ Music_PostCredits_branch_cfdb2: note D_, 2 note G_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 octave 2 note G_, 2 - loopchannel 0, Music_PostCredits_branch_cfdb2 + sound_loop 0, .mainloop Music_PostCredits_Ch2: - pitchoffset 0, D# - dutycycle $2 - notetype $c, $a3 + transpose 0, 3 + duty_cycle 2 + note_type 12, 10, 3 octave 5 note E_, 2 - intensity $73 + volume_envelope 7, 3 note E_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 - intensity $73 + volume_envelope 7, 3 note F_, 2 -Music_PostCredits_branch_cfe5a: - intensity $a3 +.mainloop: + volume_envelope 10, 3 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 octave 6 note D_, 2 note C_, 2 @@ -161,104 +162,104 @@ Music_PostCredits_branch_cfe5a: note C_, 2 octave 5 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $33 + volume_envelope 3, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note E_, 2 - intensity $73 + volume_envelope 7, 3 note E_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $33 + volume_envelope 3, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note A_, 2 - intensity $73 + volume_envelope 7, 3 note A_, 2 - intensity $a3 + volume_envelope 10, 3 note E_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 - intensity $73 + volume_envelope 7, 3 note F_, 2 - intensity $53 + volume_envelope 5, 3 note F_, 2 - intensity $a3 + volume_envelope 10, 3 note D_, 2 note E_, 2 note F_, 2 - intensity $73 + volume_envelope 7, 3 note F_, 2 - intensity $53 + volume_envelope 5, 3 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - intensity $33 + volume_envelope 3, 3 note F_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 note E_, 2 note D#, 2 note E_, 2 note B_, 2 - intensity $73 + volume_envelope 7, 3 note B_, 2 - intensity $53 + volume_envelope 5, 3 note B_, 2 - intensity $a3 + volume_envelope 10, 3 note A_, 2 - intensity $73 + volume_envelope 7, 3 note A_, 2 - intensity $a3 + volume_envelope 10, 3 note D_, 2 - intensity $73 + volume_envelope 7, 3 note D_, 2 - intensity $53 + volume_envelope 5, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $33 + volume_envelope 3, 3 note D_, 2 note D_, 2 - intensity $23 + volume_envelope 2, 3 note D_, 2 note D_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $73 + volume_envelope 7, 3 octave 4 note G_, 2 - intensity $a3 + volume_envelope 10, 3 octave 5 note D_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note E_, 2 note F_, 2 - loopchannel 0, Music_PostCredits_branch_cfe5a + sound_loop 0, .mainloop diff --git a/crysaudio/music/printer.asm b/crysaudio/music/printer.asm index 886f6b76..18ceb4e0 100644 --- a/crysaudio/music/printer.asm +++ b/crysaudio/music/printer.asm @@ -1,319 +1,320 @@ Music_Printer: - musicheader 1, 3, Music_Printer_Ch3 + channel_count 1 + channel 3, Music_Printer_Ch3 Music_Printer_Ch3: tempo 256 - notetype $c, $20 + note_type 12, 2, 0 octave 4 note B_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 -Music_Printer_branch_f0823: + rest 1 +.mainloop: note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 note C_, 1 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 note A#, 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - loopchannel 0, Music_Printer_branch_f0823 + rest 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/profoak.asm b/crysaudio/music/profoak.asm index 5e34e2c6..d9fdca7a 100644 --- a/crysaudio/music/profoak.asm +++ b/crysaudio/music/profoak.asm @@ -1,16 +1,17 @@ Music_ProfOak: - musicheader 3, 1, Music_ProfOak_Ch1 - musicheader 1, 2, Music_ProfOak_Ch2 - musicheader 1, 3, Music_ProfOak_Ch3 + channel_count 3 + channel 1, Music_ProfOak_Ch1 + channel 2, Music_ProfOak_Ch2 + channel 3, Music_ProfOak_Ch3 Music_ProfOak_Ch1: tempo 118 - volume $77 - vibrato $12, $34 - tone $0001 - stereopanning $f0 - dutycycle $3 - notetype $c, $98 + volume 7, 7 + vibrato 18, 3, 4 + pitch_offset 1 + stereo_panning TRUE, FALSE + duty_cycle 3 + note_type 12, 9, 8 octave 2 note F#, 1 note B_, 1 @@ -19,29 +20,29 @@ Music_ProfOak_Ch1: note F#, 1 note A_, 16 note G#, 8 - intensity $97 + volume_envelope 9, 7 note G#, 8 -Music_ProfOak_branch_f4e10: - intensity $91 - callchannel Music_ProfOak_branch_f4e42 - callchannel Music_ProfOak_branch_f4e42 - callchannel Music_ProfOak_branch_f4e4d - callchannel Music_ProfOak_branch_f4e4d - loopchannel 2, Music_ProfOak_branch_f4e10 -Music_ProfOak_branch_f4e22: - callchannel Music_ProfOak_branch_f4e58 - callchannel Music_ProfOak_branch_f4e58 - callchannel Music_ProfOak_branch_f4e6c - callchannel Music_ProfOak_branch_f4e6c - pitchoffset 0, D_ - callchannel Music_ProfOak_branch_f4e58 - callchannel Music_ProfOak_branch_f4e58 - pitchoffset 0, C_ - callchannel Music_ProfOak_branch_f4e6c - callchannel Music_ProfOak_branch_f4e6c - loopchannel 0, Music_ProfOak_branch_f4e22 +.loop1: + volume_envelope 9, 1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + transpose 0, 2 + sound_call .sub3 + sound_call .sub3 + transpose 0, 0 + sound_call .sub4 + sound_call .sub4 + sound_loop 0, .mainloop -Music_ProfOak_branch_f4e42: +.sub1: octave 2 note B_, 2 octave 3 @@ -52,9 +53,9 @@ Music_ProfOak_branch_f4e42: note E_, 2 note G#, 2 note E_, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4e4d: +.sub2: octave 2 note B_, 2 octave 3 @@ -65,9 +66,9 @@ Music_ProfOak_branch_f4e4d: note D#, 2 note F#, 2 note D#, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4e58: +.sub3: octave 2 note A_, 2 octave 3 @@ -76,35 +77,35 @@ Music_ProfOak_branch_f4e58: note C#, 1 note E_, 1 note C#, 2 - intensity $92 + volume_envelope 9, 2 note A_, 2 - intensity $91 + volume_envelope 9, 1 note C#, 2 - intensity $92 + volume_envelope 9, 2 note E_, 2 - intensity $91 - endchannel + volume_envelope 9, 1 + sound_ret -Music_ProfOak_branch_f4e6c: +.sub4: octave 2 note B_, 1 octave 3 note E_, 1 - intensity $92 + volume_envelope 9, 2 note G#, 4 note E_, 4 - intensity $91 + volume_envelope 9, 1 note E_, 1 note G#, 1 - intensity $92 + volume_envelope 9, 2 note B_, 4 - intensity $91 - endchannel + volume_envelope 9, 1 + sound_ret Music_ProfOak_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $c, $a8 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 12, 10, 8 octave 3 note B_, 1 octave 4 @@ -112,11 +113,11 @@ Music_ProfOak_Ch2: note F#, 1 note A#, 1 note B_, 16 - intensity $a7 + volume_envelope 10, 7 note B_, 10 - dutycycle $2 -Music_ProfOak_branch_f4e92: - intensity $b2 + duty_cycle 2 +.loop1: + volume_envelope 11, 2 octave 3 note B_, 2 octave 4 @@ -125,7 +126,7 @@ Music_ProfOak_branch_f4e92: note E_, 4 note D#, 2 note C#, 4 - intensity $91 + volume_envelope 9, 1 note B_, 2 octave 5 note C#, 2 @@ -133,16 +134,16 @@ Music_ProfOak_branch_f4e92: note E_, 4 note D#, 2 note C#, 4 - intensity $b2 + volume_envelope 11, 2 octave 3 note B_, 2 note A_, 2 note G#, 2 note A_, 4 note B_, 1 - note __, 1 + rest 1 note B_, 4 - intensity $91 + volume_envelope 9, 1 octave 4 note B_, 2 note A_, 2 @@ -150,10 +151,10 @@ Music_ProfOak_branch_f4e92: note A_, 4 note B_, 2 note B_, 4 - loopchannel 2, Music_ProfOak_branch_f4e92 - note __, 6 - intensity $b4 -Music_ProfOak_branch_f4ebf: + sound_loop 2, .loop1 + rest 6 + volume_envelope 11, 4 +.mainloop: note C#, 6 octave 3 note A_, 1 @@ -172,14 +173,14 @@ Music_ProfOak_branch_f4ebf: note B_, 1 octave 4 note E_, 8 - intensity $82 + volume_envelope 8, 2 note B_, 6 note G#, 1 note B_, 1 - intensity $83 + volume_envelope 8, 3 octave 5 note E_, 8 - intensity $b4 + volume_envelope 11, 4 octave 3 note A_, 6 note F#, 1 @@ -201,111 +202,111 @@ Music_ProfOak_branch_f4ebf: octave 4 note E_, 1 note G#, 16 - loopchannel 0, Music_ProfOak_branch_f4ebf + sound_loop 0, .mainloop Music_ProfOak_Ch3: - stereopanning $f - notetype $c, $14 - note __, 4 + stereo_panning FALSE, TRUE + note_type 12, 1, 4 + rest 4 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note E_, 2 - callchannel Music_ProfOak_branch_f4f3d -Music_ProfOak_branch_f4f0d: - callchannel Music_ProfOak_branch_f4f3d - callchannel Music_ProfOak_branch_f4f3d - callchannel Music_ProfOak_branch_f4f4c - callchannel Music_ProfOak_branch_f4f4c - loopchannel 2, Music_ProfOak_branch_f4f0d -Music_ProfOak_branch_f4f1d: - callchannel Music_ProfOak_branch_f4f5a - callchannel Music_ProfOak_branch_f4f5a - callchannel Music_ProfOak_branch_f4f69 - callchannel Music_ProfOak_branch_f4f69 - pitchoffset 0, D_ - callchannel Music_ProfOak_branch_f4f5a - callchannel Music_ProfOak_branch_f4f5a - pitchoffset 0, C_ - callchannel Music_ProfOak_branch_f4f69 - callchannel Music_ProfOak_branch_f4f69 - loopchannel 0, Music_ProfOak_branch_f4f1d + sound_call .sub1 +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + transpose 0, 2 + sound_call .sub3 + sound_call .sub3 + transpose 0, 0 + sound_call .sub4 + sound_call .sub4 + sound_loop 0, .mainloop -Music_ProfOak_branch_f4f3d: +.sub1: note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note E_, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4f4c: +.sub2: octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 note F#, 2 note B_, 1 - note __, 1 + rest 1 note D#, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4f5a: +.sub3: octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 note A_, 1 - note __, 1 + rest 1 note C#, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4f69: +.sub4: octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note E_, 2 note G#, 1 - note __, 1 + rest 1 octave 2 note B_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/profoakspokemontalk.asm b/crysaudio/music/profoakspokemontalk.asm index bd299466..7ee5f379 100644 --- a/crysaudio/music/profoakspokemontalk.asm +++ b/crysaudio/music/profoakspokemontalk.asm @@ -1,18 +1,19 @@ Music_ProfOaksPokemonTalk: - musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1 - musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2 - musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3 + channel_count 3 + channel 1, Music_ProfOaksPokemonTalk_Ch1 + channel 2, Music_ProfOaksPokemonTalk_Ch2 + channel 3, Music_ProfOaksPokemonTalk_Ch3 - db $3 + db $3 ; unused Music_ProfOaksPokemonTalk_Ch1: tempo 164 - volume $77 - stereopanning $f - vibrato $6, $25 - dutycycle $1 - notetype $c, $94 - note __, 8 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 6, 2, 5 + duty_cycle 1 + note_type 12, 9, 4 + rest 8 octave 3 note B_, 1 octave 4 @@ -23,7 +24,7 @@ Music_ProfOaksPokemonTalk_Ch1: note D#, 1 note E_, 1 note F#, 1 -Music_ProfOaksPokemonTalk_branch_f4cc3: +.mainloop: note D#, 6 note C#, 1 octave 3 @@ -31,22 +32,22 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 note A#, 1 note B_, 2 note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note A#, 4 octave 4 note D#, 6 @@ -56,23 +57,23 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: note G#, 1 note B_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 note B_, 1 note F#, 1 note A#, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note A#, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note E_, 2 octave 2 @@ -116,27 +117,27 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: note C#, 2 octave 3 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3 + rest 1 + sound_loop 0, .mainloop Music_ProfOaksPokemonTalk_Ch2: - vibrato $8, $24 - dutycycle $3 - notetype $c, $a7 - stereopanning $ff + vibrato 8, 2, 4 + duty_cycle 3 + note_type 12, 10, 7 + stereo_panning TRUE, TRUE octave 3 note B_, 1 octave 4 @@ -155,7 +156,7 @@ Music_ProfOaksPokemonTalk_Ch2: note F#, 1 note G#, 1 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d4d: +.mainloop: note B_, 6 note A#, 1 note G#, 1 @@ -192,26 +193,26 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: note G#, 2 note F#, 2 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 - loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d + rest 1 + sound_loop 0, .mainloop Music_ProfOaksPokemonTalk_Ch3: - vibrato $6, $38 - notetype $c, $25 - stereopanning $f0 - note __, 8 + vibrato 6, 3, 8 + note_type 12, 2, 5 + stereo_panning TRUE, FALSE + rest 8 octave 3 note F#, 1 note E_, 1 @@ -222,7 +223,7 @@ Music_ProfOaksPokemonTalk_Ch3: note C#, 1 octave 2 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d95: +.mainloop: note B_, 6 octave 3 note D#, 1 @@ -252,23 +253,23 @@ Music_ProfOaksPokemonTalk_branch_f4d95: note F#, 2 note D#, 2 note E_, 2 - note __, 4 + rest 4 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 4 note F#, 2 - note __, 4 + rest 4 note F#, 1 note F#, 1 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 4 note F#, 2 @@ -290,18 +291,18 @@ Music_ProfOaksPokemonTalk_branch_f4d95: note F#, 2 octave 3 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 - loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 + rest 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/rivalbattle.asm b/crysaudio/music/rivalbattle.asm index 4ba8840b..655164c4 100644 --- a/crysaudio/music/rivalbattle.asm +++ b/crysaudio/music/rivalbattle.asm @@ -1,62 +1,63 @@ Music_RivalBattle: - musicheader 3, 1, Music_RivalBattle_Ch1 - musicheader 1, 2, Music_RivalBattle_Ch2 - musicheader 1, 3, Music_RivalBattle_Ch3 + channel_count 3 + channel 1, Music_RivalBattle_Ch1 + channel 2, Music_RivalBattle_Ch2 + channel 3, Music_RivalBattle_Ch3 Music_RivalBattle_Ch1: tempo 102 - volume $77 - dutycycle $3 - tone $0002 - vibrato $8, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 8, 1, 5 + note_type 12, 11, 2 octave 3 note F#, 2 note A#, 4 - intensity $b7 + volume_envelope 11, 7 note A#, 10 - intensity $b2 + volume_envelope 11, 2 note F#, 2 octave 4 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 6 note E_, 4 -Music_RivalBattle_branch_e9777: - intensity $b2 +.loop1: + volume_envelope 11, 2 octave 2 note A#, 6 - intensity $b7 + volume_envelope 11, 7 octave 3 note C#, 6 - intensity $b2 + volume_envelope 11, 2 note D#, 4 - loopchannel 3, Music_RivalBattle_branch_e9777 - intensity $b2 + sound_loop 3, .loop1 + volume_envelope 11, 2 octave 2 note A#, 2 octave 3 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 10 -Music_RivalBattle_branch_e978f: - intensity $b2 +.loop2: + volume_envelope 11, 2 octave 3 note G#, 6 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $b2 + volume_envelope 11, 2 octave 4 note C#, 4 - loopchannel 3, Music_RivalBattle_branch_e978f - intensity $b2 + sound_loop 3, .loop2 + volume_envelope 11, 2 octave 3 note G#, 2 note B_, 4 - intensity $4d + volume_envelope 4, -5 note B_, 10 -Music_RivalBattle_branch_e97a6: - intensity $b7 +.mainloop: + volume_envelope 11, 7 note A#, 6 note F#, 6 note D#, 4 @@ -64,21 +65,21 @@ Music_RivalBattle_branch_e97a6: note F#, 4 note G#, 2 note A#, 6 - intensity $b2 + volume_envelope 11, 2 note F_, 1 note D#, 1 note C#, 1 note D#, 1 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note G#, 1 note F#, 1 note F_, 1 note F#, 1 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b6 + volume_envelope 11, 6 note G#, 2 note A#, 2 note B_, 2 @@ -90,7 +91,7 @@ Music_RivalBattle_branch_e97a6: note B_, 2 octave 4 note E_, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note A#, 6 note F#, 6 @@ -106,7 +107,7 @@ Music_RivalBattle_branch_e97a6: note C#, 6 octave 3 note G#, 4 - intensity $b5 + volume_envelope 11, 5 note C#, 2 note F_, 2 note G#, 2 @@ -117,32 +118,32 @@ Music_RivalBattle_branch_e97a6: note G#, 2 note F_, 2 note G#, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 10 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 2 octave 3 note D#, 2 note F#, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 note D#, 4 note C#, 2 note D#, 6 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - intensity $a0 + volume_envelope 10, 0 octave 2 note A#, 8 - intensity $a7 + volume_envelope 10, 7 note A#, 8 - intensity $b7 + volume_envelope 11, 7 octave 3 note F#, 10 - intensity $b5 + volume_envelope 11, 5 octave 2 note B_, 2 octave 3 @@ -156,17 +157,17 @@ Music_RivalBattle_branch_e97a6: note F#, 2 note F_, 2 note G#, 2 - intensity $a0 + volume_envelope 10, 0 note A#, 16 - intensity $a7 + volume_envelope 10, 7 note A#, 16 - intensity $a0 + volume_envelope 10, 0 note B_, 8 - intensity $a7 + volume_envelope 10, 7 note B_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b5 + volume_envelope 11, 5 octave 4 note E_, 2 note D#, 2 @@ -178,7 +179,7 @@ Music_RivalBattle_branch_e97a6: note E_, 2 note D#, 2 note C#, 2 -Music_RivalBattle_branch_e9837: +.loop3: octave 3 note A#, 2 note E_, 2 @@ -203,8 +204,8 @@ Music_RivalBattle_branch_e9837: note A#, 2 octave 4 note D#, 2 - loopchannel 2, Music_RivalBattle_branch_e9837 - intensity $94 + sound_loop 2, .loop3 + volume_envelope 9, 4 octave 3 note D#, 8 octave 2 @@ -212,14 +213,14 @@ Music_RivalBattle_branch_e9837: octave 3 note G_, 8 note F_, 8 - intensity $96 + volume_envelope 9, 6 octave 2 note G#, 8 note A#, 8 note B_, 8 octave 3 note C#, 8 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 8 octave 3 @@ -233,16 +234,16 @@ Music_RivalBattle_branch_e9837: note B_, 8 octave 4 note C#, 8 - intensity $a0 + volume_envelope 10, 0 note D#, 8 - intensity $a7 + volume_envelope 10, 7 note D#, 8 - intensity $a0 + volume_envelope 10, 0 octave 3 note G_, 8 - intensity $a7 + volume_envelope 10, 7 note G_, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 note C#, 8 note D#, 4 @@ -251,7 +252,7 @@ Music_RivalBattle_branch_e9837: note B_, 4 octave 3 note C#, 4 - intensity $c7 + volume_envelope 12, 7 octave 2 note A#, 6 octave 3 @@ -283,13 +284,13 @@ Music_RivalBattle_branch_e9837: note B_, 6 octave 3 note C#, 10 - loopchannel 0, Music_RivalBattle_branch_e97a6 + sound_loop 0, .mainloop Music_RivalBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 octave 4 note E_, 1 note D#, 1 @@ -327,94 +328,94 @@ Music_RivalBattle_Ch2: note C_, 1 octave 2 note B_, 1 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 6 - intensity $c7 + volume_envelope 12, 7 octave 3 note F#, 6 - intensity $c2 + volume_envelope 12, 2 note G#, 4 -Music_RivalBattle_branch_e98ea: - intensity $c2 +.loop1: + volume_envelope 12, 2 note D#, 6 - intensity $c7 + volume_envelope 12, 7 note F#, 6 - intensity $c2 + volume_envelope 12, 2 note G#, 4 - loopchannel 2, Music_RivalBattle_branch_e98ea - intensity $c2 + sound_loop 2, .loop1 + volume_envelope 12, 2 note D#, 2 note F#, 4 - intensity $c7 + volume_envelope 12, 7 note F#, 8 - intensity $a2 + volume_envelope 10, 2 note B_, 1 octave 4 note C_, 1 -Music_RivalBattle_branch_e9903: - intensity $c2 +.loop2: + volume_envelope 12, 2 note C#, 6 - intensity $c7 + volume_envelope 12, 7 note E_, 6 - intensity $c2 + volume_envelope 12, 2 note F#, 4 - loopchannel 3, Music_RivalBattle_branch_e9903 - intensity $c2 + sound_loop 3, .loop2 + volume_envelope 12, 2 note C#, 2 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note E_, 6 -Music_RivalBattle_branch_e991a: - callchannel Music_RivalBattle_branch_e99e0 - intensity $b0 +.mainloop: + sound_call .sub1 + volume_envelope 11, 0 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - callchannel Music_RivalBattle_branch_e99e0 - intensity $4e + sound_call .sub1 + volume_envelope 4, -6 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note B_, 10 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $b0 + volume_envelope 11, 0 octave 4 note C#, 8 octave 3 note B_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 10 - intensity $b7 + volume_envelope 11, 7 note A#, 6 - intensity $2f + volume_envelope 2, -7 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - intensity $b0 + volume_envelope 11, 0 note B_, 10 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 8 octave 3 note B_, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 16 - intensity $b0 + volume_envelope 11, 0 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note E_, 6 - intensity $c7 + volume_envelope 12, 7 note E_, 2 note G#, 2 note B_, 2 @@ -422,36 +423,36 @@ Music_RivalBattle_branch_e991a: note C#, 8 octave 4 note B_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 10 - intensity $b7 + volume_envelope 11, 7 note A#, 6 - intensity $b0 + volume_envelope 11, 0 note A_, 10 - intensity $b7 + volume_envelope 11, 7 note A_, 6 - intensity $b0 + volume_envelope 11, 0 note G#, 10 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $b0 + volume_envelope 11, 0 note G_, 10 - intensity $b7 + volume_envelope 11, 7 note G_, 6 - intensity $a4 + volume_envelope 10, 4 octave 3 note G_, 8 note D#, 8 note A#, 8 note G#, 8 - intensity $a6 + volume_envelope 10, 6 octave 2 note B_, 8 octave 3 note C#, 8 note D#, 8 note F_, 8 - intensity $c7 + volume_envelope 12, 7 octave 4 note G_, 8 note D#, 8 @@ -463,94 +464,94 @@ Music_RivalBattle_branch_e991a: note C#, 8 note D#, 8 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note G_, 16 note D#, 16 octave 3 note B_, 8 note A#, 8 note G#, 8 - intensity $c7 + volume_envelope 12, 7 note F_, 8 -Music_RivalBattle_branch_e99a6: - intensity $c2 +.loop3: + volume_envelope 12, 2 octave 3 note A#, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 6 - intensity $c2 + volume_envelope 12, 2 note D#, 4 - loopchannel 3, Music_RivalBattle_branch_e99a6 - intensity $c2 + sound_loop 3, .loop3 + volume_envelope 12, 2 octave 3 note A#, 2 octave 4 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 6 - intensity $9a + volume_envelope 9, -2 note C#, 4 -Music_RivalBattle_branch_e99c1: - intensity $c2 +.loop4: + volume_envelope 12, 2 octave 3 note G#, 6 - intensity $c7 + volume_envelope 12, 7 note B_, 6 - intensity $c2 + volume_envelope 12, 2 octave 4 note C#, 4 - loopchannel 3, Music_RivalBattle_branch_e99c1 - intensity $c2 + sound_loop 3, .loop4 + volume_envelope 12, 2 octave 3 note G#, 2 note B_, 4 - intensity $c7 + volume_envelope 12, 7 note B_, 6 - intensity $6a + volume_envelope 6, -2 octave 4 note D_, 4 - loopchannel 0, Music_RivalBattle_branch_e991a + sound_loop 0, .mainloop -Music_RivalBattle_branch_e99e0: - intensity $c7 +.sub1: + volume_envelope 12, 7 note D#, 10 - intensity $c4 + volume_envelope 12, 4 octave 3 note A#, 2 octave 4 note D#, 2 note F#, 2 - intensity $c5 + volume_envelope 12, 5 note F_, 4 note D#, 4 - intensity $c2 + volume_envelope 12, 2 note C#, 2 - intensity $c7 + volume_envelope 12, 7 note D#, 6 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - endchannel + sound_ret Music_RivalBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 3 note F#, 2 note A#, 2 - note __, 2 + rest 2 note A#, 10 octave 3 note F#, 2 octave 4 note C#, 2 - note __, 2 + rest 2 note C#, 6 octave 3 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a0c: +.loop1: note D#, 2 note C#, 2 note D#, 2 @@ -558,8 +559,8 @@ Music_RivalBattle_branch_e9a0c: note E_, 2 note D#, 2 note C#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a0c -Music_RivalBattle_branch_e9a17: + sound_loop 4, .loop1 +.loop2: octave 3 note C#, 2 octave 2 @@ -571,7 +572,7 @@ Music_RivalBattle_branch_e9a17: note C#, 2 octave 2 note B_, 2 - loopchannel 3, Music_RivalBattle_branch_e9a17 + sound_loop 3, .loop2 octave 3 note C#, 2 note E_, 2 @@ -582,8 +583,8 @@ Music_RivalBattle_branch_e9a17: note C_, 2 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a30: - callchannel Music_RivalBattle_branch_e9b47 +.mainloop: + sound_call .sub1 octave 2 note A#, 2 octave 4 @@ -600,7 +601,7 @@ Music_RivalBattle_branch_e9a30: note A#, 2 octave 3 note G#, 2 - callchannel Music_RivalBattle_branch_e9b50 + sound_call .sub2 note C#, 2 note G#, 2 octave 4 @@ -611,7 +612,7 @@ Music_RivalBattle_branch_e9a30: note C_, 2 octave 2 note B_, 2 - callchannel Music_RivalBattle_branch_e9b47 + sound_call .sub1 octave 2 note A#, 2 octave 3 @@ -628,20 +629,20 @@ Music_RivalBattle_branch_e9a30: note A#, 2 octave 3 note F_, 2 - callchannel Music_RivalBattle_branch_e9b50 -Music_RivalBattle_branch_e9a66: + sound_call .sub2 +.loop3: note C#, 2 note G#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a66 - callchannel Music_RivalBattle_branch_e9b5c + sound_loop 4, .loop3 + sound_call .sub3 note G#, 2 note F#, 2 -Music_RivalBattle_branch_e9a71: +.loop4: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 4, Music_RivalBattle_branch_e9a71 + sound_loop 4, .loop4 octave 2 note A#, 2 octave 3 @@ -656,17 +657,17 @@ Music_RivalBattle_branch_e9a71: note F#, 2 note F_, 2 note D#, 2 - callchannel Music_RivalBattle_branch_e9b5c + sound_call .sub3 octave 2 note B_, 2 octave 3 note D_, 2 - callchannel Music_RivalBattle_branch_e9b65 + sound_call .sub4 octave 3 note D#, 2 octave 4 note D#, 2 - callchannel Music_RivalBattle_branch_e9b65 + sound_call .sub4 octave 3 note D#, 2 note A#, 2 @@ -694,34 +695,34 @@ Music_RivalBattle_branch_e9a71: note F#, 2 note G_, 2 note G#, 2 -Music_RivalBattle_branch_e9ab3: +.loop5: note D#, 2 note A#, 2 - loopchannel 4, Music_RivalBattle_branch_e9ab3 -Music_RivalBattle_branch_e9ab9: + sound_loop 4, .loop5 +.loop6: note D#, 2 note A_, 2 - loopchannel 4, Music_RivalBattle_branch_e9ab9 -Music_RivalBattle_branch_e9abf: + sound_loop 4, .loop6 +.loop7: note D#, 2 note G#, 2 - loopchannel 4, Music_RivalBattle_branch_e9abf -Music_RivalBattle_branch_e9ac5: + sound_loop 4, .loop7 +.loop8: note D#, 2 note G_, 2 - loopchannel 12, Music_RivalBattle_branch_e9ac5 -Music_RivalBattle_branch_e9acb: + sound_loop 12, .loop8 +.loop9: octave 2 note B_, 2 octave 3 note D#, 2 - loopchannel 4, Music_RivalBattle_branch_e9acb -Music_RivalBattle_branch_e9ad3: + sound_loop 4, .loop9 +.loop10: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 4, Music_RivalBattle_branch_e9ad3 + sound_loop 4, .loop10 note D#, 2 note G_, 2 note A#, 2 @@ -775,40 +776,40 @@ Music_RivalBattle_branch_e9ad3: note C#, 8 note D#, 8 note F_, 8 -Music_RivalBattle_branch_e9b10: +.loop11: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b10 + sound_loop 7, .loop11 note E_, 2 note D#, 2 -Music_RivalBattle_branch_e9b1a: +.loop12: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 6, Music_RivalBattle_branch_e9b1a + sound_loop 6, .loop12 octave 2 note A#, 2 octave 3 note F#, 2 note F_, 2 note E_, 2 -Music_RivalBattle_branch_e9b28: +.loop13: octave 2 note G#, 2 octave 3 note C#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b28 + sound_loop 7, .loop13 note D_, 2 note C#, 2 -Music_RivalBattle_branch_e9b32: +.loop14: octave 2 note G#, 2 octave 3 note C#, 2 - loopchannel 4, Music_RivalBattle_branch_e9b32 + sound_loop 4, .loop14 octave 2 note B_, 2 note G#, 2 @@ -818,17 +819,18 @@ Music_RivalBattle_branch_e9b32: note E_, 2 note D#, 2 note D_, 2 - loopchannel 0, Music_RivalBattle_branch_e9a30 + sound_loop 0, .mainloop -Music_RivalBattle_branch_e9b47: +.sub1: +.sub1loop1: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 4, Music_RivalBattle_branch_e9b47 - endchannel + sound_loop 4, .sub1loop1 + sound_ret -Music_RivalBattle_branch_e9b50: +.sub2: note C#, 2 note G#, 2 octave 4 @@ -840,21 +842,23 @@ Music_RivalBattle_branch_e9b50: octave 3 note C#, 2 note G#, 2 - endchannel + sound_ret -Music_RivalBattle_branch_e9b5c: +.sub3: +.sub3loop1: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b5c - endchannel + sound_loop 7, .sub3loop1 + sound_ret -Music_RivalBattle_branch_e9b65: +.sub4: +.sub4loop1: octave 3 note D#, 2 note A#, 2 octave 4 note D#, 2 - loopchannel 2, Music_RivalBattle_branch_e9b65 - endchannel + sound_loop 2, .sub4loop1 + sound_ret diff --git a/crysaudio/music/rocketbattle.asm b/crysaudio/music/rocketbattle.asm index 30c90b08..b95f2a89 100644 --- a/crysaudio/music/rocketbattle.asm +++ b/crysaudio/music/rocketbattle.asm @@ -1,15 +1,16 @@ Music_RocketBattle: - musicheader 3, 1, Music_RocketBattle_Ch1 - musicheader 1, 2, Music_RocketBattle_Ch2 - musicheader 1, 3, Music_RocketBattle_Ch3 + channel_count 3 + channel 1, Music_RocketBattle_Ch1 + channel 2, Music_RocketBattle_Ch2 + channel 3, Music_RocketBattle_Ch3 Music_RocketBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 1, 5 + note_type 12, 11, 2 octave 4 note E_, 1 note D#, 1 @@ -47,36 +48,36 @@ Music_RocketBattle_Ch1: note C_, 1 octave 2 note B_, 1 -Music_RocketBattle_branch_e9bad: - intensity $b2 +.loop1: + volume_envelope 11, 2 octave 3 note C_, 6 note C_, 4 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 4 - loopchannel 3, Music_RocketBattle_branch_e9bad - intensity $b2 + sound_loop 3, .loop1 + volume_envelope 11, 2 note C_, 6 note C_, 6 - intensity $b7 + volume_envelope 11, 7 note D_, 4 -Music_RocketBattle_branch_e9bc1: - intensity $b2 +.loop2: + volume_envelope 11, 2 octave 4 note E_, 6 note E_, 4 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - loopchannel 3, Music_RocketBattle_branch_e9bc1 - intensity $b2 + sound_loop 3, .loop2 + volume_envelope 11, 2 note E_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 2 note D#, 4 - intensity $b3 + volume_envelope 11, 3 octave 4 note C_, 2 octave 3 @@ -100,22 +101,22 @@ Music_RocketBattle_branch_e9bc1: note F_, 2 note E_, 2 note F_, 2 - intensity $b5 + volume_envelope 11, 5 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note G_, 2 note F_, 2 note D#, 2 note D_, 2 note C#, 2 note D_, 2 - intensity $b5 + volume_envelope 11, 5 note D#, 4 - intensity $b3 + volume_envelope 11, 3 note D#, 2 note D_, 2 note F_, 2 -Music_RocketBattle_branch_e9c02: +.mainloop: octave 4 note E_, 2 octave 3 @@ -145,9 +146,9 @@ Music_RocketBattle_branch_e9c02: note F_, 2 note E_, 2 note F_, 2 - intensity $b5 + volume_envelope 11, 5 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note G_, 2 note F_, 2 octave 4 @@ -155,24 +156,24 @@ Music_RocketBattle_branch_e9c02: note D_, 2 note C_, 2 note D_, 2 - intensity $b5 + volume_envelope 11, 5 note F_, 4 - intensity $b2 + volume_envelope 11, 2 octave 3 note F_, 2 note G_, 2 note G#, 4 - intensity $b5 + volume_envelope 11, 5 note D_, 4 note C_, 4 note D_, 4 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note F_, 2 note A_, 4 - intensity $b7 + volume_envelope 11, 7 note A_, 4 - intensity $b5 + volume_envelope 11, 5 note A_, 2 note G_, 2 note F_, 4 @@ -188,7 +189,7 @@ Music_RocketBattle_branch_e9c02: note G_, 2 note A_, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note E_, 6 note D_, 4 @@ -202,11 +203,11 @@ Music_RocketBattle_branch_e9c02: note E_, 6 note D_, 6 note D#, 4 - intensity $a0 + volume_envelope 10, 0 note E_, 8 - intensity $a7 + volume_envelope 10, 7 note E_, 8 - intensity $b7 + volume_envelope 11, 7 octave 2 note A_, 8 note G_, 8 @@ -232,7 +233,7 @@ Music_RocketBattle_branch_e9c02: octave 3 note D_, 6 note C_, 4 - intensity $b5 + volume_envelope 11, 5 octave 2 note A#, 2 octave 3 @@ -261,71 +262,71 @@ Music_RocketBattle_branch_e9c02: octave 3 note A#, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 6 note E_, 6 note E_, 4 note E_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note G_, 2 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note G_, 2 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 6 octave 4 note D_, 1 note D#, 1 - intensity $a0 + volume_envelope 10, 0 note E_, 8 - intensity $b2 + volume_envelope 11, 2 octave 3 note F_, 6 note F_, 4 - intensity $b7 + volume_envelope 11, 7 note A#, 2 note G_, 4 -Music_RocketBattle_branch_e9cc5: - intensity $b2 +.loop3: + volume_envelope 11, 2 note F_, 6 note F_, 4 - intensity $b7 + volume_envelope 11, 7 note A_, 2 note G_, 4 - loopchannel 2, Music_RocketBattle_branch_e9cc5 - intensity $b2 + sound_loop 2, .loop3 + volume_envelope 11, 2 note F_, 6 octave 4 note D_, 1 note E_, 1 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $b3 + volume_envelope 11, 3 note D_, 2 octave 3 note A_, 2 note E_, 2 note A_, 4 note A_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note D#, 2 octave 3 note A#, 2 note G_, 2 note A#, 4 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note E_, 2 note C_, 2 octave 3 @@ -333,16 +334,16 @@ Music_RocketBattle_branch_e9cc5: octave 4 note C_, 4 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - intensity $a0 + volume_envelope 10, 0 note E_, 4 - intensity $a7 + volume_envelope 10, 7 note E_, 6 - intensity $a0 + volume_envelope 10, 0 octave 3 note G#, 6 - intensity $b3 + volume_envelope 11, 3 note C_, 2 note E_, 2 note E_, 2 @@ -370,9 +371,9 @@ Music_RocketBattle_branch_e9cc5: note A#, 2 octave 3 note C_, 2 - intensity $b5 + volume_envelope 11, 5 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note D_, 2 note C_, 2 octave 2 @@ -381,152 +382,152 @@ Music_RocketBattle_branch_e9cc5: note D_, 2 note C#, 2 note D_, 2 - intensity $b5 + volume_envelope 11, 5 note D#, 4 - intensity $b3 + volume_envelope 11, 3 note D#, 2 note D_, 2 note F_, 2 - loopchannel 0, Music_RocketBattle_branch_e9c02 + sound_loop 0, .mainloop Music_RocketBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $b2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 11, 2 octave 4 note A_, 4 note A#, 4 note B_, 4 octave 5 note C_, 1 - intensity $82 + volume_envelope 8, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note C#, 1 - intensity $92 + volume_envelope 9, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note D_, 1 - intensity $a2 + volume_envelope 10, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note D#, 1 - intensity $b2 + volume_envelope 11, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note E_, 1 octave 4 note G#, 1 note A_, 1 note G#, 1 -Music_RocketBattle_branch_e9d7b: - intensity $c2 +.loop1: + volume_envelope 12, 2 octave 3 note A_, 6 note A_, 4 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 octave 3 note A#, 4 - loopchannel 3, Music_RocketBattle_branch_e9d7b - intensity $c2 + sound_loop 3, .loop1 + volume_envelope 12, 2 note A_, 6 note A_, 6 - intensity $4a + volume_envelope 4, -2 note G#, 4 -Music_RocketBattle_branch_e9d91: - intensity $c2 +.loop2: + volume_envelope 12, 2 octave 4 note A_, 6 note A_, 4 octave 5 note C_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note A#, 4 - loopchannel 3, Music_RocketBattle_branch_e9d91 - intensity $c2 + sound_loop 3, .loop2 + volume_envelope 12, 2 note A_, 6 note A_, 4 - intensity $c7 + volume_envelope 12, 7 note G_, 2 note G#, 4 - callchannel Music_RocketBattle_branch_e9ea0 - intensity $b0 + sound_call .sub1 + volume_envelope 11, 0 note F_, 16 - intensity $b7 + volume_envelope 11, 7 note F_, 16 -Music_RocketBattle_branch_e9db1: - callchannel Music_RocketBattle_branch_e9ea0 - intensity $b0 +.mainloop: + sound_call .sub1 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - intensity $c4 + volume_envelope 12, 4 octave 3 note A_, 2 note G_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 octave 3 note A#, 2 note A_, 2 note G_, 2 - intensity $c2 + volume_envelope 12, 2 note A_, 2 octave 4 note C_, 4 - intensity $b0 + volume_envelope 11, 0 note C_, 6 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $c4 + volume_envelope 12, 4 octave 3 note A#, 2 note A_, 2 note A#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 4 note C_, 2 octave 3 note A#, 2 note A_, 2 - intensity $c2 + volume_envelope 12, 2 note A#, 2 octave 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 6 - intensity $4f + volume_envelope 4, -7 note A_, 6 - intensity $a0 + volume_envelope 10, 0 note G_, 6 note F_, 4 note E_, 6 @@ -536,92 +537,92 @@ Music_RocketBattle_branch_e9db1: note A#, 6 note G#, 4 note A_, 6 - intensity $a7 + volume_envelope 10, 7 note A_, 10 - intensity $3f + volume_envelope 3, -7 octave 3 note D_, 8 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $3f + volume_envelope 3, -7 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 8 - intensity $3f + volume_envelope 3, -7 note D_, 8 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $3f + volume_envelope 3, -7 note E_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $4e + volume_envelope 4, -6 note F_, 8 - intensity $a0 + volume_envelope 10, 0 note F_, 8 note E_, 16 note F_, 16 note A_, 16 - intensity $3f + volume_envelope 3, -7 note F_, 16 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 8 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note E_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $3c + volume_envelope 3, -4 note A_, 6 - intensity $c7 + volume_envelope 12, 7 note A_, 10 - intensity $c2 + volume_envelope 12, 2 octave 3 note A_, 6 note A_, 6 note A_, 4 note A_, 6 note A_, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 2 octave 3 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note A_, 6 note A_, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 2 octave 3 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note A_, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note G_, 1 note G#, 1 note A_, 8 -Music_RocketBattle_branch_e9e5a: - intensity $c2 +.loop3: + volume_envelope 12, 2 octave 3 note A#, 6 note A#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 2 note C_, 4 - loopchannel 3, Music_RocketBattle_branch_e9e5a - intensity $c2 + sound_loop 3, .loop3 + volume_envelope 12, 2 octave 3 note A#, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note G_, 1 note A_, 1 note A#, 8 - intensity $c7 + volume_envelope 12, 7 note A_, 6 note G_, 6 note A_, 4 @@ -632,13 +633,13 @@ Music_RocketBattle_branch_e9e5a: note A#, 4 note A_, 6 note G_, 6 - intensity $c5 + volume_envelope 12, 5 note A_, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 8 - intensity $b7 + volume_envelope 11, 7 note A_, 8 - intensity $c6 + volume_envelope 12, 6 octave 3 note A_, 6 note G#, 6 @@ -646,18 +647,18 @@ Music_RocketBattle_branch_e9e5a: note A_, 6 note G#, 6 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $3d + volume_envelope 3, -5 note A#, 8 - intensity $c7 + volume_envelope 12, 7 note A#, 8 - loopchannel 0, Music_RocketBattle_branch_e9db1 + sound_loop 0, .mainloop -Music_RocketBattle_branch_e9ea0: - intensity $c6 +.sub1: + volume_envelope 12, 6 octave 4 note A_, 6 note G#, 6 @@ -665,10 +666,10 @@ Music_RocketBattle_branch_e9ea0: note A_, 6 note G#, 6 note E_, 4 - endchannel + sound_ret Music_RocketBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 3 note A_, 2 octave 4 @@ -700,9 +701,9 @@ Music_RocketBattle_Ch3: octave 2 note B_, 2 note A#, 2 -Music_RocketBattle_branch_e9ecc: - callchannel Music_RocketBattle_branch_e9fe6 - loopchannel 3, Music_RocketBattle_branch_e9ecc +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 octave 2 note A_, 2 octave 3 @@ -715,9 +716,9 @@ Music_RocketBattle_branch_e9ecc: note F_, 2 note E_, 2 note D_, 2 -Music_RocketBattle_branch_e9edf: - callchannel Music_RocketBattle_branch_e9fe6 - loopchannel 3, Music_RocketBattle_branch_e9edf +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 octave 2 note A_, 2 octave 3 @@ -731,14 +732,14 @@ Music_RocketBattle_branch_e9edf: note G_, 2 note A_, 2 note A#, 2 - callchannel Music_RocketBattle_branch_e9ff3 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub2 + sound_call .sub3 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_ea01d -Music_RocketBattle_branch_e9efe: - callchannel Music_RocketBattle_branch_e9ff3 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub4 +.mainloop: + sound_call .sub2 + sound_call .sub3 octave 3 note A#, 2 octave 2 @@ -755,7 +756,7 @@ Music_RocketBattle_branch_e9efe: note F_, 2 note E_, 2 note D_, 2 - callchannel Music_RocketBattle_branch_ea02a + sound_call .sub5 octave 2 note A_, 2 octave 3 @@ -770,12 +771,12 @@ Music_RocketBattle_branch_e9efe: note A_, 2 octave 3 note E_, 2 -Music_RocketBattle_branch_e9f25: +.loop3: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 5, Music_RocketBattle_branch_e9f25 + sound_loop 5, .loop3 note A#, 2 octave 2 note A#, 2 @@ -786,7 +787,7 @@ Music_RocketBattle_branch_e9f25: note A#, 2 octave 3 note A#, 2 - callchannel Music_RocketBattle_branch_ea02a + sound_call .sub5 octave 2 note A_, 2 octave 3 @@ -801,9 +802,9 @@ Music_RocketBattle_branch_e9f25: note F_, 2 note E_, 2 note D_, 2 - callchannel Music_RocketBattle_branch_ea02a - callchannel Music_RocketBattle_branch_ea02a -Music_RocketBattle_branch_e9f4e: + sound_call .sub5 + sound_call .sub5 +.loop4: octave 2 note A_, 2 octave 3 @@ -816,7 +817,7 @@ Music_RocketBattle_branch_e9f4e: note D_, 2 note G_, 2 note F_, 2 - loopchannel 7, Music_RocketBattle_branch_e9f4e + sound_loop 7, .loop4 octave 2 note A_, 2 octave 3 @@ -829,12 +830,12 @@ Music_RocketBattle_branch_e9f4e: note A_, 2 note G_, 2 note F_, 2 -Music_RocketBattle_branch_e9f6a: +.loop5: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 4, Music_RocketBattle_branch_e9f6a + sound_loop 4, .loop5 octave 2 note A#, 2 octave 3 @@ -845,12 +846,12 @@ Music_RocketBattle_branch_e9f6a: note D_, 2 note C#, 2 note D_, 2 -Music_RocketBattle_branch_e9f7c: +.loop6: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 13, Music_RocketBattle_branch_e9f7c + sound_loop 13, .loop6 octave 2 note A_, 2 octave 3 @@ -859,12 +860,12 @@ Music_RocketBattle_branch_e9f7c: note C_, 2 octave 2 note A#, 2 -Music_RocketBattle_branch_e9f8c: +.loop7: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 4, Music_RocketBattle_branch_e9f8c + sound_loop 4, .loop7 octave 2 note A_, 2 octave 4 @@ -875,20 +876,20 @@ Music_RocketBattle_branch_e9f8c: note A_, 2 note G_, 2 note A#, 2 -Music_RocketBattle_branch_e9f9e: +.loop8: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 7, Music_RocketBattle_branch_e9f9e + sound_loop 7, .loop8 note E_, 2 note F_, 2 -Music_RocketBattle_branch_e9fa8: +.loop9: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 5, Music_RocketBattle_branch_e9fa8 + sound_loop 5, .loop9 octave 3 note A#, 2 octave 4 @@ -897,13 +898,13 @@ Music_RocketBattle_branch_e9fa8: octave 3 note A#, 2 note G_, 2 - callchannel Music_RocketBattle_branch_ea033 + sound_call .sub6 octave 3 note E_, 2 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub3 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_ea033 + sound_call .sub6 octave 3 note A_, 2 octave 2 @@ -922,14 +923,14 @@ Music_RocketBattle_branch_e9fa8: note A_, 2 octave 3 note E_, 2 - callchannel Music_RocketBattle_branch_e9ff3 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub2 + sound_call .sub3 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_ea01d - loopchannel 0, Music_RocketBattle_branch_e9efe + sound_call .sub4 + sound_loop 0, .mainloop -Music_RocketBattle_branch_e9fe6: +.sub1: octave 2 note A_, 2 octave 3 @@ -942,9 +943,9 @@ Music_RocketBattle_branch_e9fe6: note E_, 2 note G_, 2 note F_, 2 - endchannel + sound_ret -Music_RocketBattle_branch_e9ff3: +.sub2: octave 2 note A_, 2 octave 3 @@ -973,9 +974,9 @@ Music_RocketBattle_branch_e9ff3: note E_, 2 note D#, 2 note D_, 2 - endchannel + sound_ret -Music_RocketBattle_branch_ea010: +.sub3: octave 2 note A#, 2 octave 3 @@ -988,9 +989,9 @@ Music_RocketBattle_branch_ea010: note A#, 2 octave 2 note A#, 2 - endchannel + sound_ret -Music_RocketBattle_branch_ea01d: +.sub4: octave 2 note A#, 2 octave 3 @@ -1003,17 +1004,18 @@ Music_RocketBattle_branch_ea01d: note A#, 2 octave 3 note F_, 2 - endchannel + sound_ret -Music_RocketBattle_branch_ea02a: +.sub5: +.sub5loop1: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 4, Music_RocketBattle_branch_ea02a - endchannel + sound_loop 4, .sub5loop1 + sound_ret -Music_RocketBattle_branch_ea033: +.sub6: octave 2 note A_, 2 octave 3 @@ -1026,4 +1028,4 @@ Music_RocketBattle_branch_ea033: note A_, 2 octave 2 note A_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/rockethideout.asm b/crysaudio/music/rockethideout.asm index 6c3a116a..850eb29d 100644 --- a/crysaudio/music/rockethideout.asm +++ b/crysaudio/music/rockethideout.asm @@ -1,32 +1,34 @@ Music_RocketHideout: - musicheader 4, 1, Music_RocketHideout_Ch1 - musicheader 1, 2, Music_RocketHideout_Ch2 - musicheader 1, 3, Music_RocketHideout_Ch3 - musicheader 1, 4, Music_RocketHideout_Ch4 + channel_count 4 + channel 1, Music_RocketHideout_Ch1 + channel 2, Music_RocketHideout_Ch2 + channel 3, Music_RocketHideout_Ch3 + channel 4, Music_RocketHideout_Ch4 Music_RocketHideout_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0004 - vibrato $10, $44 - notetype $c, $b3 - stereopanning $f0 -Music_RocketHideout_branch_eeb93: - note __, 16 - loopchannel 4, Music_RocketHideout_branch_eeb93 -Music_RocketHideout_branch_eeb98: + volume 7, 7 + duty_cycle 3 + pitch_offset 4 + vibrato 16, 4, 4 + note_type 12, 11, 3 + stereo_panning TRUE, FALSE +.mainloop: +.loop1 + rest 16 + sound_loop 4, .loop1 +.loop2: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 - loopchannel 2, Music_RocketHideout_branch_eeb98 + rest 8 + sound_loop 2, .loop2 octave 3 note A#, 2 note A_, 2 @@ -106,44 +108,44 @@ Music_RocketHideout_branch_eeb98: note C#, 2 note F_, 2 note G_, 2 - note __, 16 - intensity $b7 + rest 16 + volume_envelope 11, 7 octave 2 note G#, 16 - note __, 16 + rest 16 note A_, 16 - intensity $b3 -Music_RocketHideout_branch_eebfe: - note __, 16 - loopchannel 4, Music_RocketHideout_branch_eebfe - loopchannel 0, Music_RocketHideout_branch_eeb93 + volume_envelope 11, 3 +.loop3: + rest 16 + sound_loop 4, .loop3 + sound_loop 0, .mainloop Music_RocketHideout_Ch2: - dutycycle $3 - tone $0002 - vibrato $0, $f0 - notetype $c, $c4 - stereopanning $f -Music_RocketHideout_branch_eec14: + duty_cycle 3 + pitch_offset 2 + vibrato 0, 15, 0 + note_type 12, 12, 4 + stereo_panning FALSE, TRUE +.mainloop: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 + rest 8 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 + rest 8 octave 3 note D#, 12 note A#, 2 @@ -181,127 +183,128 @@ Music_RocketHideout_branch_eec14: note C_, 8 octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 - intensity $c7 + rest 6 + volume_envelope 12, 7 octave 3 note C#, 16 - intensity $c4 + volume_envelope 12, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 - intensity $c7 + rest 6 + volume_envelope 12, 7 octave 3 note C#, 16 - intensity $c4 + volume_envelope 12, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 note C#, 2 note G#, 4 note G_, 2 - note __, 8 + rest 8 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 note C#, 2 note G#, 4 note G_, 2 - note __, 8 - loopchannel 0, Music_RocketHideout_branch_eec14 + rest 8 + sound_loop 0, .mainloop Music_RocketHideout_Ch3: - notetype $c, $19 -Music_RocketHideout_branch_eec7c: + note_type 12, 1, -1 +.mainloop: +.loop1: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 - loopchannel 6, Music_RocketHideout_branch_eec7c -Music_RocketHideout_branch_eec8a: + rest 8 + sound_loop 6, .loop1 +.loop2: note F_, 2 - note __, 2 + rest 2 octave 3 note C_, 4 octave 2 note B_, 2 - note __, 6 + rest 6 note F_, 2 octave 3 note C_, 4 octave 2 note B_, 2 - note __, 8 - loopchannel 2, Music_RocketHideout_branch_eec8a -Music_RocketHideout_branch_eec9b: + rest 8 + sound_loop 2, .loop2 +.loop3: note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 octave 3 note C#, 16 - loopchannel 2, Music_RocketHideout_branch_eec9b -Music_RocketHideout_branch_eeca6: + sound_loop 2, .loop3 +.loop4: octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 note C#, 2 note G#, 4 note G_, 2 - note __, 8 - loopchannel 2, Music_RocketHideout_branch_eeca6 - loopchannel 0, Music_RocketHideout_branch_eec7c + rest 8 + sound_loop 2, .loop4 + sound_loop 0, .mainloop Music_RocketHideout_Ch4: - togglenoise $0 - notetype $c - stereopanning $f - note __, 16 - note __, 16 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - callchannel Music_RocketHideout_branch_eecdb -Music_RocketHideout_branch_eecc7: - callchannel Music_RocketHideout_branch_eecdb - note E_, 4 - callchannel Music_RocketHideout_branch_eecdb - note F_, 4 - callchannel Music_RocketHideout_branch_eecdb - note A#, 4 - callchannel Music_RocketHideout_branch_eecdb - note F#, 4 - loopchannel 0, Music_RocketHideout_branch_eecc7 + toggle_noise 0 + drum_speed 12 + stereo_panning FALSE, TRUE + rest 16 + rest 16 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + sound_call .sub1 +.mainloop: + sound_call .sub1 + drum_note 5, 4 + sound_call .sub1 + drum_note 6, 4 + sound_call .sub1 + drum_note 11, 4 + sound_call .sub1 + drum_note 7, 4 + sound_loop 0, .mainloop -Music_RocketHideout_branch_eecdb: - stereopanning $f0 - note D#, 1 - note D#, 1 - stereopanning $f - note A_, 4 - note D#, 1 - note D#, 1 - stereopanning $f0 - note A_, 4 - endchannel +.sub1: + stereo_panning TRUE, FALSE + drum_note 4, 1 + drum_note 4, 1 + stereo_panning FALSE, TRUE + drum_note 10, 4 + drum_note 4, 1 + drum_note 4, 1 + stereo_panning TRUE, FALSE + drum_note 10, 4 + sound_ret diff --git a/crysaudio/music/rockettheme.asm b/crysaudio/music/rockettheme.asm index 6f13d8b6..6b37371c 100644 --- a/crysaudio/music/rockettheme.asm +++ b/crysaudio/music/rockettheme.asm @@ -1,48 +1,49 @@ Music_RocketTheme: - musicheader 4, 1, Music_RocketTheme_Ch1 - musicheader 1, 2, Music_RocketTheme_Ch2 - musicheader 1, 3, Music_RocketTheme_Ch3 - musicheader 1, 4, Music_RocketTheme_Ch4 + channel_count 4 + channel 1, Music_RocketTheme_Ch1 + channel 2, Music_RocketTheme_Ch2 + channel 3, Music_RocketTheme_Ch3 + channel 4, Music_RocketTheme_Ch4 Music_RocketTheme_Ch1: tempo 128 - volume $77 - dutycycle $3 - stereopanning $f - vibrato $5, $64 - notetype $c, $a8 + volume 7, 7 + duty_cycle 3 + stereo_panning FALSE, TRUE + vibrato 5, 6, 4 + note_type 12, 10, 8 octave 4 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f768b: - dutycycle $3 - notetype $c, $a8 - callchannel Music_RocketTheme_branch_f74e6 - dutycycle $1 - intensity $a8 - callchannel Music_RocketTheme_branch_f74f7 - callchannel Music_RocketTheme_branch_f758a +.mainloop: + duty_cycle 3 + note_type 12, 10, 8 + sound_call Music_LookRocket_Ch1.sub1 + duty_cycle 1 + volume_envelope 10, 8 + sound_call Music_LookRocket_Ch1.sub2 + sound_call Music_LookRocket_Ch2.sub5 octave 4 note F#, 1 - note __, 1 - intensity $53 - callchannel Music_RocketTheme_branch_f750c - intensity $c3 - callchannel Music_RocketTheme_branch_f750c - intensity $e3 - callchannel Music_RocketTheme_branch_f750c - note __, 16 - dutycycle $0 - notetype $6, $b3 - vibrato $6, $64 - callchannel Music_RocketTheme_branch_f7727 + rest 1 + volume_envelope 5, 3 + sound_call Music_LookRocket_Ch1.sub3 + volume_envelope 12, 3 + sound_call Music_LookRocket_Ch1.sub3 + volume_envelope 14, 3 + sound_call Music_LookRocket_Ch1.sub3 + rest 16 + duty_cycle 0 + note_type 6, 11, 3 + vibrato 6, 6, 4 + sound_call .sub1 octave 4 note F_, 1 note F#, 3 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C_, 2 note D_, 2 note D#, 2 @@ -53,21 +54,21 @@ Music_RocketTheme_branch_f768b: note A#, 2 octave 4 note C_, 2 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note D#, 2 note F#, 2 - callchannel Music_RocketTheme_branch_f7727 + sound_call .sub1 octave 3 note F#, 1 note G_, 3 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C_, 2 note D_, 2 note D#, 2 @@ -78,141 +79,141 @@ Music_RocketTheme_branch_f768b: note A#, 2 octave 3 note C_, 2 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note D#, 4 note F_, 2 note E_, 2 note D#, 2 note D_, 2 -Music_RocketTheme_branch_f76ef: - note __, 4 +.loop1: + rest 4 note F_, 2 - note __, 14 + rest 14 note F#, 2 - note __, 10 - loopchannel 3, Music_RocketTheme_branch_f76ef - note __, 4 + rest 10 + sound_loop 3, .loop1 + rest 4 note F_, 2 - note __, 14 + rest 14 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note C_, 2 -Music_RocketTheme_branch_f7701: +.loop2: note F#, 2 note A_, 2 - loopchannel 4, Music_RocketTheme_branch_f7701 -Music_RocketTheme_branch_f7707: + sound_loop 4, .loop2 +.loop3: note G_, 2 note A#, 2 - loopchannel 4, Music_RocketTheme_branch_f7707 -Music_RocketTheme_branch_f770d: + sound_loop 4, .loop3 +.loop4: note G#, 2 note B_, 2 - loopchannel 4, Music_RocketTheme_branch_f770d -Music_RocketTheme_branch_f7713: + sound_loop 4, .loop4 +.loop5: octave 3 note A_, 2 octave 4 note C_, 2 - loopchannel 4, Music_RocketTheme_branch_f7713 - notetype $c, $b3 - note __, 16 - note __, 12 + sound_loop 4, .loop5 + note_type 12, 11, 3 + rest 16 + rest 12 note F_, 2 note C_, 1 note D_, 1 - loopchannel 0, Music_RocketTheme_branch_f768b + sound_loop 0, .mainloop -Music_RocketTheme_branch_f7727: - note __, 7 +.sub1: + rest 7 note B_, 1 octave 4 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 6 + rest 6 octave 4 note D#, 12 note D_, 8 octave 3 note A#, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 10 - endchannel + rest 10 + sound_ret Music_RocketTheme_Ch2: - stereopanning $ff - vibrato $4, $64 - dutycycle $3 - notetype $c, $b7 + stereo_panning TRUE, TRUE + vibrato 4, 6, 4 + duty_cycle 3 + note_type 12, 11, 7 octave 5 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f774b: - notetype $c, $b7 - callchannel Music_RocketTheme_branch_f7547 - intensity $b7 - callchannel Music_RocketTheme_branch_f758a +.mainloop: + note_type 12, 11, 7 + sound_call Music_LookRocket_Ch2.sub1 + volume_envelope 11, 7 + sound_call Music_LookRocket_Ch2.sub5 octave 5 note C_, 1 - note __, 1 - callchannel Music_RocketTheme_branch_f7554 - intensity $53 - callchannel Music_RocketTheme_branch_f7568 - intensity $c3 - callchannel Music_RocketTheme_branch_f7568 - intensity $e3 - callchannel Music_RocketTheme_branch_f7568 - callchannel Music_RocketTheme_branch_f756f - vibrato $6, $64 - callchannel Music_RocketTheme_branch_f7800 + rest 1 + sound_call Music_LookRocket_Ch2.sub2 + volume_envelope 5, 3 + sound_call Music_LookRocket_Ch2.sub3 + volume_envelope 12, 3 + sound_call Music_LookRocket_Ch2.sub3 + volume_envelope 14, 3 + sound_call Music_LookRocket_Ch2.sub3 + sound_call Music_LookRocket_Ch2.sub4 + vibrato 6, 6, 4 + sound_call .sub1 octave 4 note A_, 1 - vibrato $0, $0 - intensity $b8 + vibrato 0, 0, 0 + volume_envelope 11, 8 note A#, 14 - vibrato $5, $22 - intensity $b7 + vibrato 5, 2, 2 + volume_envelope 11, 7 note A#, 5 - vibrato $6, $64 - notetype $c, $b7 + vibrato 6, 6, 4 + note_type 12, 11, 7 note A#, 12 - note __, 2 + rest 2 octave 5 note C_, 1 note D_, 1 - callchannel Music_RocketTheme_branch_f7800 + sound_call .sub1 note B_, 1 - vibrato $0, $0 - intensity $b8 + vibrato 0, 0, 0 + volume_envelope 11, 8 octave 4 note C_, 14 - vibrato $5, $22 - intensity $b7 + vibrato 5, 2, 2 + volume_envelope 11, 7 note C_, 5 - vibrato $6, $64 - notetype $c, $b7 + vibrato 6, 6, 4 + note_type 12, 11, 7 note C_, 12 octave 3 note A#, 1 note A_, 1 note G#, 1 note G_, 1 - notetype $6, $b7 - callchannel Music_RocketTheme_branch_f781c + note_type 6, 11, 7 + sound_call .sub2 octave 4 note D_, 1 note D#, 9 @@ -220,22 +221,22 @@ Music_RocketTheme_branch_f774b: note C#, 1 note C_, 12 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 - callchannel Music_RocketTheme_branch_f781c + rest 2 + sound_call .sub2 octave 3 note B_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D#, 8 - note __, 4 + rest 4 note D_, 2 - note __, 2 + rest 2 note C_, 2 octave 3 note G_, 2 @@ -287,37 +288,37 @@ Music_RocketTheme_branch_f774b: octave 5 note C_, 2 note D_, 2 - loopchannel 0, Music_RocketTheme_branch_f774b + sound_loop 0, .mainloop -Music_RocketTheme_branch_f7800: - notetype $6, $b7 - note __, 7 +.sub1: + note_type 6, 11, 7 + rest 7 octave 4 note D_, 1 note D#, 2 - note __, 6 + rest 6 note D#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 6 + rest 6 note F#, 12 note F_, 8 note D#, 2 - note __, 6 + rest 6 note C_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_RocketTheme_branch_f781c: +.sub2: octave 3 note B_, 1 octave 4 @@ -327,148 +328,148 @@ Music_RocketTheme_branch_f781c: note F#, 8 note F_, 8 note C_, 4 - endchannel + sound_ret Music_RocketTheme_Ch3: - stereopanning $f0 - vibrato $4, $22 - notetype $c, $14 - note __, 2 -Music_RocketTheme_branch_f782f: - notetype $c, $14 - callchannel Music_RocketTheme_branch_f75bf - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - intensity $24 - callchannel Music_RocketTheme_branch_f7623 - intensity $14 - callchannel Music_RocketTheme_branch_f75cc - callchannel Music_RocketTheme_branch_f7623 - callchannel Music_RocketTheme_branch_f75e1 - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f7623 - callchannel Music_RocketTheme_branch_f75cc - callchannel Music_RocketTheme_branch_f7623 - callchannel Music_RocketTheme_branch_f75cc + stereo_panning TRUE, FALSE + vibrato 4, 2, 2 + note_type 12, 1, 4 + rest 2 +.mainloop: + note_type 12, 1, 4 + sound_call Music_LookRocket_Ch3.sub1 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + volume_envelope 2, 4 + sound_call Music_LookRocket_Ch3.sub5 + volume_envelope 1, 4 + sound_call Music_LookRocket_Ch3.sub2 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub3 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub2 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub2 octave 3 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 note G_, 1 note E_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 note C_, 1 octave 3 note A_, 1 note F#, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note F#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 4 note G#, 1 - note __, 1 - loopchannel 0, Music_RocketTheme_branch_f782f + rest 1 + sound_loop 0, .mainloop Music_RocketTheme_Ch4: - togglenoise $3 - notetype $c - note __, 2 -Music_RocketTheme_branch_f78c3: - callchannel Music_RocketTheme_branch_f765c - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f765c -Music_RocketTheme_branch_f78de: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 11, Music_RocketTheme_branch_f78de - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f765c - callchannel Music_RocketTheme_branch_f765c - loopchannel 0, Music_RocketTheme_branch_f78c3 + toggle_noise 3 + drum_speed 12 + rest 2 +.mainloop: + sound_call Music_LookRocket_Ch4.sub1 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub1 +.loop1: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 11, .loop1 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub1 + sound_call Music_LookRocket_Ch4.sub1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/route1.asm b/crysaudio/music/route1.asm index 8a537b9f..0ae4c8a5 100644 --- a/crysaudio/music/route1.asm +++ b/crysaudio/music/route1.asm @@ -1,17 +1,18 @@ Music_Route1: - musicheader 3, 1, Music_Route1_Ch1 - musicheader 1, 2, Music_Route1_Ch2 - musicheader 1, 3, Music_Route1_Ch3 + channel_count 3 + channel 1, Music_Route1_Ch1 + channel 2, Music_Route1_Ch2 + channel 3, Music_Route1_Ch3 - db $3 + db $3 ; unused Music_Route1_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 184 - volume $77 - vibrato $16, $11 - dutycycle $3 - notetype $c, $83 + volume 7, 7 + vibrato 22, 1, 1 + duty_cycle 3 + note_type 12, 8, 3 octave 4 note D_, 1 note E_, 1 @@ -53,26 +54,26 @@ Music_Route1_Ch1: note A_, 2 note G_, 2 note F#, 2 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 2 note D_, 2 - intensity $83 - note __, 2 -Music_Route1_branch_ec04a: - intensity $83 - note __, 2 + volume_envelope 8, 3 + rest 2 +.mainloop: + volume_envelope 8, 3 + rest 2 octave 4 note D_, 2 octave 3 note A_, 2 - note __, 4 + rest 4 octave 4 note D_, 2 octave 3 note A_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 octave 4 note D_, 2 octave 3 @@ -81,23 +82,23 @@ Music_Route1_branch_ec04a: note D_, 1 octave 3 note E_, 2 - intensity $81 + volume_envelope 8, 1 note G_, 2 note G_, 2 - intensity $83 - note __, 2 - note __, 2 + volume_envelope 8, 3 + rest 2 + rest 2 octave 4 note C#, 2 octave 3 note A_, 2 - note __, 4 + rest 4 octave 4 note C#, 2 octave 3 note A_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 octave 4 note C#, 2 note C#, 1 @@ -109,13 +110,13 @@ Music_Route1_branch_ec04a: note A_, 2 octave 4 note D_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 octave 3 note F#, 1 note G_, 1 note A_, 4 - note __, 2 + rest 2 note D_, 1 note E_, 1 note F#, 2 @@ -128,15 +129,15 @@ Music_Route1_branch_ec04a: note A_, 1 note B_, 1 note A_, 2 - intensity $81 + volume_envelope 8, 1 octave 4 note G_, 2 note G_, 2 - intensity $83 + volume_envelope 8, 3 octave 3 note F#, 1 note E_, 1 - note __, 2 + rest 2 note E_, 1 note F#, 1 note G_, 6 @@ -148,24 +149,24 @@ Music_Route1_branch_ec04a: note E_, 1 note F#, 1 note G_, 4 - notetype $8, $83 + note_type 8, 8, 3 note A_, 1 note B_, 1 note A_, 1 - notetype $c, $83 + note_type 12, 8, 3 note G_, 1 note E_, 1 note F#, 2 - intensity $81 + volume_envelope 8, 1 octave 4 note A_, 2 note A_, 2 - intensity $83 + volume_envelope 8, 3 octave 3 note A_, 1 note G_, 1 - intensity $77 - intensity $1d + volume_envelope 7, 7 + volume_envelope 1, -5 note F#, 4 note A_, 4 note G_, 2 @@ -182,8 +183,8 @@ Music_Route1_branch_ec04a: octave 3 note A_, 1 note G_, 1 - dutycycle $2 - intensity $87 + duty_cycle 2 + volume_envelope 8, 7 octave 6 note F#, 4 note A_, 4 @@ -196,48 +197,48 @@ Music_Route1_branch_ec04a: note E_, 2 note C#, 2 note D_, 2 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 2 note D_, 2 - note __, 2 - loopchannel 0, Music_Route1_branch_ec04a + rest 2 + sound_loop 0, .mainloop Music_Route1_Ch2: - stereopanning $f0 - vibrato $12, $22 - dutycycle $2 - notetype $c, $92 + stereo_panning TRUE, FALSE + vibrato 18, 2, 2 + duty_cycle 2 + note_type 12, 9, 2 octave 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec198 + sound_call .sub2 octave 3 note A_, 2 note A_, 2 octave 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec1aa + sound_call .sub3 note C#, 2 note E_, 2 note D_, 2 - intensity $81 + volume_envelope 8, 1 note F#, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note D_, 1 note E_, 1 - dutycycle $2 -Music_Route1_branch_ec112: - intensity $82 - callchannel Music_Route1_branch_ec188 - intensity $81 + duty_cycle 2 +.mainloop: + volume_envelope 8, 2 + sound_call .sub1 + volume_envelope 8, 1 octave 3 note A_, 2 note A_, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note C#, 1 note D_, 1 @@ -258,15 +259,15 @@ Music_Route1_branch_ec112: note E_, 1 note F#, 1 note D_, 2 - note __, 2 + rest 2 note F#, 2 note D_, 1 note E_, 1 - callchannel Music_Route1_branch_ec188 - intensity $81 + sound_call .sub1 + volume_envelope 8, 1 note A_, 2 note A_, 2 - intensity $82 + volume_envelope 8, 2 note C#, 1 note D_, 1 note E_, 2 @@ -280,49 +281,49 @@ Music_Route1_branch_ec112: note A_, 2 octave 4 note B_, 4 - notetype $8, $92 + note_type 8, 9, 2 note C#, 1 note D_, 1 note C#, 1 - notetype $c, $92 + note_type 12, 9, 2 octave 3 note B_, 1 octave 4 note C#, 1 note D_, 2 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 2 note D_, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec198 - note __, 4 + sound_call .sub2 + rest 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec1aa - notetype $8, $92 + sound_call .sub3 + note_type 8, 9, 2 note C#, 1 note D_, 1 note C#, 1 - notetype $c, $92 + note_type 12, 9, 2 octave 4 note B_, 1 octave 5 note C#, 1 note D_, 2 - intensity $81 + volume_envelope 8, 1 note F#, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note D_, 1 note E_, 1 - loopchannel 0, Music_Route1_branch_ec112 + sound_loop 0, .mainloop -Music_Route1_branch_ec188: +.sub1: note F#, 2 note F#, 2 note F#, 2 @@ -338,9 +339,9 @@ Music_Route1_branch_ec188: note G_, 3 note F#, 1 note E_, 2 - endchannel + sound_ret -Music_Route1_branch_ec198: +.sub2: note A_, 2 note A_, 2 note F#, 2 @@ -358,9 +359,9 @@ Music_Route1_branch_ec198: note D_, 3 note F#, 1 note E_, 2 - endchannel + sound_ret -Music_Route1_branch_ec1aa: +.sub3: note A_, 2 note A_, 2 note F#, 2 @@ -374,47 +375,47 @@ Music_Route1_branch_ec1aa: note A_, 2 octave 5 note D_, 2 - endchannel + sound_ret Music_Route1_Ch3: - stereopanning $ff - vibrato $10, $23 - notetype $c, $25 - note __, 2 + stereo_panning TRUE, TRUE + vibrato 16, 2, 3 + note_type 12, 2, 5 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note C#, 1 octave 3 note A_, 1 @@ -453,75 +454,75 @@ Music_Route1_Ch3: note G_, 1 note F#, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 -Music_Route1_branch_ec20c: + rest 3 +.mainloop: octave 3 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 @@ -534,22 +535,22 @@ Music_Route1_branch_ec20c: note E_, 1 octave 2 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note E_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 octave 2 note F#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 @@ -562,29 +563,29 @@ Music_Route1_branch_ec20c: note E_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 note B_, 1 @@ -600,9 +601,9 @@ Music_Route1_branch_ec20c: note D_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 4 note F#, 4 @@ -640,7 +641,7 @@ Music_Route1_branch_ec20c: note D_, 2 octave 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - loopchannel 0, Music_Route1_branch_ec20c + rest 3 + sound_loop 0, .mainloop diff --git a/crysaudio/music/route12.asm b/crysaudio/music/route12.asm index d94d88c2..2e7fc75f 100644 --- a/crysaudio/music/route12.asm +++ b/crysaudio/music/route12.asm @@ -1,20 +1,21 @@ Music_Route12: - musicheader 4, 1, Music_Route12_Ch1 - musicheader 1, 2, Music_Route12_Ch2 - musicheader 1, 3, Music_Route12_Ch3 - musicheader 1, 4, Music_Route12_Ch4 + channel_count 4 + channel 1, Music_Route12_Ch1 + channel 2, Music_Route12_Ch2 + channel 3, Music_Route12_Ch3 + channel 4, Music_Route12_Ch4 Music_Route12_Ch1: tempo 148 - volume $77 - vibrato $12, $34 - tone $0001 - stereopanning $f - dutycycle $3 - notetype $c, $98 + volume 7, 7 + vibrato 18, 3, 4 + pitch_offset 1 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 9, 8 octave 3 note G#, 1 - note __, 2 + rest 2 note A_, 1 note G#, 8 octave 2 @@ -24,27 +25,27 @@ Music_Route12_Ch1: note F#, 1 note G#, 1 note F#, 1 - note __, 2 + rest 2 note E_, 1 - intensity $97 + volume_envelope 9, 7 note D#, 12 -Music_Route12_branch_ec535: - dutycycle $2 - intensity $96 - callchannel Music_Route12_branch_ec5b1 - callchannel Music_Route12_branch_ec5bf - callchannel Music_Route12_branch_ec5b1 +.mainloop: + duty_cycle 2 + volume_envelope 9, 6 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 note E_, 1 - note __, 2 + rest 2 note F#, 1 note E_, 4 note B_, 4 octave 4 note D#, 4 - callchannel Music_Route12_branch_ec5b1 - callchannel Music_Route12_branch_ec5bf - callchannel Music_Route12_branch_ec5b1 - intensity $92 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + volume_envelope 9, 2 octave 4 note E_, 1 octave 3 @@ -67,14 +68,14 @@ Music_Route12_branch_ec535: note F_, 1 note G#, 1 note B_, 1 - dutycycle $3 - intensity $7f + duty_cycle 3 + volume_envelope 7, -7 octave 4 note C#, 3 octave 3 note B_, 3 note A_, 1 - note __, 1 + rest 1 note A_, 4 octave 4 note C#, 2 @@ -95,7 +96,7 @@ Music_Route12_branch_ec535: note B_, 3 note A_, 3 note G#, 1 - note __, 1 + rest 1 note G#, 4 note B_, 2 note A_, 2 @@ -114,8 +115,8 @@ Music_Route12_branch_ec535: note F#, 8 note D#, 4 note F#, 4 -Music_Route12_branch_ec59b: - intensity $97 +.loop1: + volume_envelope 9, 7 note G#, 1 note A_, 1 note B_, 4 @@ -124,57 +125,57 @@ Music_Route12_branch_ec59b: octave 3 note D#, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 note G#, 4 - loopchannel 2, Music_Route12_branch_ec59b - loopchannel 0, Music_Route12_branch_ec535 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Route12_branch_ec5b1: +.sub1: octave 3 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 octave 3 note D#, 1 note E_, 4 note G#, 4 - endchannel + sound_ret -Music_Route12_branch_ec5bf: +.sub2: note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 note G#, 1 note A_, 4 note F#, 4 - endchannel + sound_ret Music_Route12_Ch2: - dutycycle $3 - vibrato $12, $34 - notetype $c, $b8 + duty_cycle 3 + vibrato 18, 3, 4 + note_type 12, 11, 8 octave 4 note E_, 1 - note __, 2 + rest 2 note F#, 1 note E_, 12 octave 3 note B_, 1 - note __, 2 + rest 2 octave 4 note C_, 1 - intensity $b7 + volume_envelope 11, 7 octave 3 note B_, 8 note D#, 1 @@ -182,23 +183,23 @@ Music_Route12_Ch2: note B_, 1 octave 4 note D#, 1 -Music_Route12_branch_ec5e5: - dutycycle $3 - intensity $b7 - callchannel Music_Route12_branch_ec647 +.mainloop: + duty_cycle 3 + volume_envelope 11, 7 + sound_call .sub1 note F#, 1 note A_, 1 note G#, 1 note F#, 1 note G#, 2 - note __, 1 + rest 1 note E_, 1 octave 3 note B_, 12 - dutycycle $2 + duty_cycle 2 octave 2 note B_, 1 - note __, 2 + rest 2 octave 3 note C_, 1 octave 2 @@ -206,8 +207,8 @@ Music_Route12_branch_ec5e5: octave 3 note D#, 4 note F#, 4 - dutycycle $3 - callchannel Music_Route12_branch_ec647 + duty_cycle 3 + sound_call .sub1 note A_, 1 octave 5 note C#, 1 @@ -215,40 +216,40 @@ Music_Route12_branch_ec5e5: note B_, 1 note A_, 1 note B_, 2 - note __, 1 + rest 1 note A_, 1 - intensity $b8 + volume_envelope 11, 8 note G#, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $6f + volume_envelope 6, -7 note G#, 16 - dutycycle $2 - intensity $a8 + duty_cycle 2 + volume_envelope 10, 8 note A_, 3 note G#, 3 note F#, 1 - note __, 1 + rest 1 note F#, 8 - intensity $a7 + volume_envelope 10, 7 note F#, 10 - note __, 2 + rest 2 note F#, 4 - intensity $a8 + volume_envelope 10, 8 note G#, 3 note F#, 3 note E_, 1 - note __, 1 + rest 1 note E_, 8 - intensity $a7 + volume_envelope 10, 7 note E_, 10 - note __, 2 + rest 2 note E_, 4 note F#, 3 note D#, 3 octave 3 note B_, 2 - intensity $a8 + volume_envelope 10, 8 octave 4 note B_, 8 note B_, 8 @@ -257,60 +258,60 @@ Music_Route12_branch_ec5e5: note F#, 1 note E_, 14 note E_, 10 - intensity $a4 + volume_envelope 10, 4 note E_, 6 - loopchannel 0, Music_Route12_branch_ec5e5 + sound_loop 0, .mainloop -Music_Route12_branch_ec647: +.sub1: octave 4 note E_, 6 - intensity $b1 + volume_envelope 11, 1 octave 3 note B_, 1 note B_, 1 - intensity $b7 + volume_envelope 11, 7 note B_, 4 octave 4 note B_, 4 note A_, 4 note G#, 4 note F#, 4 - endchannel + sound_ret Music_Route12_Ch3: - vibrato $12, $54 - notetype $c, $16 + vibrato 18, 5, 4 + note_type 12, 1, 6 octave 3 note G#, 2 - note __, 4 + rest 4 note G#, 1 note A_, 1 note B_, 2 - note __, 2 + rest 2 note E_, 4 note D#, 2 - note __, 4 + rest 4 note D#, 1 note E_, 1 note F#, 2 - note __, 2 + rest 2 note D#, 4 -Music_Route12_branch_ec66c: - callchannel Music_Route12_branch_ec6b4 +.mainloop: + sound_call .sub1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note D#, 1 note E_, 1 note F#, 4 octave 2 note B_, 4 - callchannel Music_Route12_branch_ec6b4 + sound_call .sub1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 octave 2 note B_, 1 octave 3 @@ -318,11 +319,11 @@ Music_Route12_branch_ec66c: note D_, 4 note F_, 4 note F#, 13 - note __, 1 + rest 1 note F#, 1 note G#, 1 note A_, 5 - note __, 1 + rest 1 note A_, 1 note B_, 1 octave 4 @@ -339,7 +340,7 @@ Music_Route12_branch_ec66c: note E_, 4 octave 2 note B_, 5 - note __, 1 + rest 1 note B_, 1 octave 3 note D#, 1 @@ -347,104 +348,105 @@ Music_Route12_branch_ec66c: note E_, 8 note F#, 4 note D#, 4 -Music_Route12_branch_ec6a3: +.loop1: note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note F#, 1 note G#, 4 note E_, 3 - note __, 1 - loopchannel 2, Music_Route12_branch_ec6a3 - loopchannel 0, Music_Route12_branch_ec66c + rest 1 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Route12_branch_ec6b4: +.sub1: octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note F#, 1 note G#, 4 note E_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 note E_, 1 note F#, 4 note D_, 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note F#, 1 note G#, 4 note E_, 4 - endchannel + sound_ret Music_Route12_Ch4: - togglenoise $4 - stereopanning $f0 - notetype $c - note B_, 10 - note C#, 1 - note C#, 1 - note D_, 4 - note B_, 6 - note C#, 1 - note C#, 1 - note D_, 4 - notetype $6 - callchannel Music_Route12_branch_ec717 -Music_Route12_branch_ec6e1: - note D_, 4 - note D_, 8 - note C#, 2 - note C#, 2 - note D_, 8 - callchannel Music_Route12_branch_ec717 - loopchannel 8, Music_Route12_branch_ec6e1 -Music_Route12_branch_ec6ed: - notetype $c - note B_, 10 - note D_, 1 - note D_, 1 - note D_, 6 - note C#, 1 - note C#, 1 - note D_, 6 - note C#, 1 - note C#, 1 - note D_, 4 - loopchannel 2, Music_Route12_branch_ec6ed - note B_, 16 - notetype $6 - callchannel Music_Route12_branch_ec717 - callchannel Music_Route12_branch_ec717 - note B_, 16 -Music_Route12_branch_ec707: - note D_, 4 - note D_, 8 - note C#, 2 - note C#, 2 - note D_, 8 - callchannel Music_Route12_branch_ec717 - loopchannel 2, Music_Route12_branch_ec707 - loopchannel 0, Music_Route12_branch_ec6e1 + toggle_noise 4 + stereo_panning TRUE, FALSE + drum_speed 12 + drum_note 12, 10 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_note 12, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_speed 6 + sound_call .sub1 +.mainloop: +.loop1: + drum_note 3, 4 + drum_note 3, 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 8 + sound_call .sub1 + sound_loop 8, .loop1 +.loop2: + drum_speed 12 + drum_note 12, 10 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + sound_loop 2, .loop2 + drum_note 12, 16 + drum_speed 6 + sound_call .sub1 + sound_call .sub1 + drum_note 12, 16 +.loop3: + drum_note 3, 4 + drum_note 3, 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 8 + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_Route12_branch_ec717: - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - endchannel +.sub1: + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_ret diff --git a/crysaudio/music/route2.asm b/crysaudio/music/route2.asm index b5ff1feb..a4594e06 100644 --- a/crysaudio/music/route2.asm +++ b/crysaudio/music/route2.asm @@ -1,20 +1,21 @@ Music_Route2: - musicheader 4, 1, Music_Route2_Ch1 - musicheader 1, 2, Music_Route2_Ch2 - musicheader 1, 3, Music_Route2_Ch3 - musicheader 1, 4, Music_Route2_Ch4 + channel_count 4 + channel 1, Music_Route2_Ch1 + channel 2, Music_Route2_Ch2 + channel 3, Music_Route2_Ch3 + channel 4, Music_Route2_Ch4 Music_Route2_Ch1: tempo 151 - volume $77 - stereopanning $f - vibrato $6, $23 - notetype $c, $b1 - note __, 16 - note __, 16 - callchannel Music_Route2_branch_ed931 -Music_Route2_branch_ed8fb: - intensity $b1 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 6, 2, 3 + note_type 12, 11, 1 + rest 16 + rest 16 + sound_call .sub1 +.mainloop: + volume_envelope 11, 1 octave 3 note B_, 4 note B_, 4 @@ -25,10 +26,10 @@ Music_Route2_branch_ed8fb: note E_, 4 note E_, 4 note E_, 4 - callchannel Music_Route2_branch_ed931 - callchannel Music_Route2_branch_ed940 - callchannel Music_Route2_branch_ed940 - callchannel Music_Route2_branch_ed971 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 octave 3 note G_, 2 octave 4 @@ -42,7 +43,7 @@ Music_Route2_branch_ed8fb: octave 3 note B_, 2 note G_, 2 - callchannel Music_Route2_branch_ed971 + sound_call .sub3 note G_, 2 octave 4 note C_, 2 @@ -53,9 +54,9 @@ Music_Route2_branch_ed8fb: octave 3 note B_, 2 note G_, 2 - loopchannel 0, Music_Route2_branch_ed8fb + sound_loop 0, .mainloop -Music_Route2_branch_ed931: +.sub1: octave 4 note C_, 4 note C_, 4 @@ -63,14 +64,14 @@ Music_Route2_branch_ed931: note C_, 4 note C_, 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 note C_, 4 octave 3 note B_, 4 - intensity $b1 - endchannel + volume_envelope 11, 1 + sound_ret -Music_Route2_branch_ed940: +.sub2: octave 2 note B_, 2 octave 3 @@ -107,7 +108,7 @@ Music_Route2_branch_ed940: note G#, 2 note C_, 2 note G#, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note B_, 2 octave 3 @@ -116,10 +117,10 @@ Music_Route2_branch_ed940: note B_, 2 octave 3 note G_, 2 - intensity $b1 - endchannel + volume_envelope 11, 1 + sound_ret -Music_Route2_branch_ed971: +.sub3: note B_, 2 note G_, 2 note B_, 2 @@ -156,25 +157,25 @@ Music_Route2_branch_ed971: note C_, 2 octave 3 note A_, 2 - endchannel + sound_ret Music_Route2_Ch2: - stereopanning $ff - vibrato $8, $24 - notetype $c, $b2 - callchannel Music_Route2_branch_ed9ba -Music_Route2_branch_ed9a1: - intensity $b2 - callchannel Music_Route2_branch_ed9ba - dutycycle $2 - intensity $b5 - callchannel Music_Route2_branch_ed9dc - callchannel Music_Route2_branch_ed9dc - callchannel Music_Route2_branch_eda02 - callchannel Music_Route2_branch_eda02 - loopchannel 0, Music_Route2_branch_ed9a1 + stereo_panning TRUE, TRUE + vibrato 8, 2, 4 + note_type 12, 11, 2 + sound_call .sub1 +.mainloop: + volume_envelope 11, 2 + sound_call .sub1 + duty_cycle 2 + volume_envelope 11, 5 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route2_branch_ed9ba: +.sub1: octave 4 note E_, 4 note E_, 4 @@ -202,162 +203,162 @@ Music_Route2_branch_ed9ba: note A_, 4 note G#, 4 note G#, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 4 note G_, 4 - intensity $b2 - endchannel + volume_envelope 11, 2 + sound_ret -Music_Route2_branch_ed9dc: +.sub2: octave 2 note C_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 note D_, 4 - endchannel + sound_ret -Music_Route2_branch_eda02: +.sub3: octave 2 note E_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_Route2_Ch3: - stereopanning $f0 - vibrato $16, $15 - notetype $c, $14 + stereo_panning TRUE, FALSE + vibrato 22, 1, 5 + note_type 12, 1, 4 octave 4 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 octave 5 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - callchannel Music_Route2_branch_eda9e + rest 3 + sound_call .sub1 octave 3 note D_, 4 -Music_Route2_branch_eda4b: - notetype $c, $15 +.mainloop: + note_type 12, 1, 5 octave 3 note C_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - callchannel Music_Route2_branch_eda9e + rest 1 + sound_call .sub1 octave 3 note D_, 2 - intensity $10 + volume_envelope 1, 0 octave 6 note C_, 1 note D_, 1 - callchannel Music_Route2_branch_edaaf - note __, 4 + sound_call .sub2 + rest 4 note G_, 8 note F_, 2 note G_, 2 - notetype $c, $10 - callchannel Music_Route2_branch_edaaf - note __, 16 - intensity $25 - callchannel Music_Route2_branch_edacb - note __, 4 + note_type 12, 1, 0 + sound_call .sub2 + rest 16 + volume_envelope 2, 5 + sound_call .sub3 + rest 4 note D#, 1 note E_, 7 note D_, 4 @@ -373,48 +374,48 @@ Music_Route2_branch_eda4b: octave 6 note A_, 4 note G_, 4 - callchannel Music_Route2_branch_edacb - note __, 4 + sound_call .sub3 + rest 4 note G#, 1 note A_, 7 note B_, 4 note F#, 1 note G_, 16 note G_, 15 - loopchannel 0, Music_Route2_branch_eda4b + sound_loop 0, .mainloop -Music_Route2_branch_eda9e: +.sub1: octave 3 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - endchannel + sound_ret -Music_Route2_branch_edaaf: +.sub2: octave 6 note E_, 10 note D_, 2 - note __, 2 + rest 2 note C_, 2 - notetype $6, $10 + note_type 6, 1, 0 octave 5 note F#, 1 note G_, 15 note A_, 4 note A#, 4 - note __, 4 + rest 4 octave 6 note C_, 2 note D_, 2 @@ -428,12 +429,12 @@ Music_Route2_branch_edaaf: note D_, 4 note C_, 4 note D_, 4 - endchannel + sound_ret -Music_Route2_branch_edacb: +.sub3: octave 5 note B_, 16 - note __, 4 + rest 4 octave 6 note C#, 1 note D_, 7 @@ -444,71 +445,72 @@ Music_Route2_branch_edacb: note C_, 16 note C_, 3 note D_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 16 - endchannel + sound_ret Music_Route2_Ch4: - togglenoise $5 - notetype $c -Music_Route2_branch_edae0: - note A_, 4 - note A_, 4 - note A_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - loopchannel 3, Music_Route2_branch_edae0 - note A_, 4 - note A_, 4 - note A_, 2 - note A_, 2 - note D#, 4 -Music_Route2_branch_edaef: - note A_, 4 - note A_, 4 - note A_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - loopchannel 4, Music_Route2_branch_edaef -Music_Route2_branch_edaf9: - note B_, 4 - note A_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - loopchannel 7, Music_Route2_branch_edaf9 - note B_, 4 - note A_, 4 - note A_, 2 - note A_, 2 - note D#, 4 -Music_Route2_branch_edb09: - note B_, 4 - note C_, 4 - note B_, 2 - note B_, 2 - note C_, 4 - loopchannel 3, Music_Route2_branch_edb09 - note B_, 4 - note C_, 4 - note C#, 2 - note C_, 2 - note C#, 4 -Music_Route2_branch_edb17: - note B_, 4 - note C_, 4 - note B_, 2 - note B_, 2 - note C_, 4 - loopchannel 3, Music_Route2_branch_edb17 - note B_, 4 - note C_, 4 - note D_, 2 - note D_, 2 - note D#, 4 - loopchannel 0, Music_Route2_branch_edaef + toggle_noise 5 + drum_speed 12 +.loop1: + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + drum_note 12, 2 + sound_loop 3, .loop1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 2 + drum_note 4, 4 +.mainloop: +.loop2: + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + sound_loop 4, .loop2 +.loop3: + drum_note 12, 4 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + drum_note 12, 2 + sound_loop 7, .loop3 + drum_note 12, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 2 + drum_note 4, 4 +.loop4: + drum_note 12, 4 + drum_note 1, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 1, 4 + sound_loop 3, .loop4 + drum_note 12, 4 + drum_note 1, 4 + drum_note 2, 2 + drum_note 1, 2 + drum_note 2, 4 +.loop5: + drum_note 12, 4 + drum_note 1, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 1, 4 + sound_loop 3, .loop5 + drum_note 12, 4 + drum_note 1, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/route26.asm b/crysaudio/music/route26.asm index fb1a7a8e..49cad4d3 100644 --- a/crysaudio/music/route26.asm +++ b/crysaudio/music/route26.asm @@ -1,42 +1,43 @@ Music_Route26: - musicheader 4, 1, Music_Route26_Ch1 - musicheader 1, 2, Music_Route26_Ch2 - musicheader 1, 3, Music_Route26_Ch3 - musicheader 1, 4, Music_Route26_Ch4 + channel_count 4 + channel 1, Music_Route26_Ch1 + channel 2, Music_Route26_Ch2 + channel 3, Music_Route26_Ch3 + channel 4, Music_Route26_Ch4 Music_Route26_Ch1: - stereopanning $f - vibrato $12, $23 + stereo_panning FALSE, TRUE + vibrato 18, 2, 3 tempo 151 - volume $77 - vibrato $14, $23 - dutycycle $0 - notetype $c, $a7 + volume 7, 7 + vibrato 20, 2, 3 + duty_cycle 0 + note_type 12, 10, 7 octave 3 note D_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note F#, 4 - note __, 4 + rest 4 note G#, 12 - notetype $8, $a7 + note_type 8, 10, 7 octave 4 note C_, 2 octave 3 note G#, 2 note F#, 2 -Music_Route26_branch_eefe0: - dutycycle $0 - notetype $c, $a7 +.mainloop: + duty_cycle 0 + note_type 12, 10, 7 octave 3 note F_, 1 - note __, 2 + rest 2 note C#, 1 note F_, 3 note G_, 1 note G#, 1 - note __, 2 + rest 2 note F_, 1 octave 4 note C#, 4 @@ -46,13 +47,13 @@ Music_Route26_branch_eefe0: note A_, 4 note F#, 4 note F_, 1 - note __, 1 + rest 1 note C#, 1 note F_, 1 note G#, 3 note G_, 1 note G#, 1 - note __, 1 + rest 1 note F_, 1 note G#, 1 octave 4 @@ -63,38 +64,38 @@ Music_Route26_branch_eefe0: note A_, 4 note B_, 4 note A#, 1 - note __, 1 + rest 1 note F_, 1 note A#, 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 octave 4 note C#, 1 note F_, 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note A#, 4 - note __, 2 - notetype $6, $a7 + rest 2 + note_type 6, 10, 7 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 - notetype $8, $a5 + rest 2 + note_type 8, 10, 5 note G#, 2 octave 4 note C#, 2 @@ -109,8 +110,8 @@ Music_Route26_branch_eefe0: note C_, 6 octave 3 note G#, 6 - dutycycle $2 - notetype $c, $a5 + duty_cycle 2 + note_type 12, 10, 5 note A_, 3 note G#, 3 note F#, 4 @@ -135,36 +136,36 @@ Music_Route26_branch_eefe0: note G#, 2 note F_, 4 note F#, 2 - notetype $6, $a5 + note_type 6, 10, 5 note G#, 7 octave 4 note C_, 1 note C#, 8 - notetype $8, $a5 + note_type 8, 10, 5 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 6 - notetype $6, $a5 - note __, 7 + note_type 6, 10, 5 + rest 7 octave 4 note D#, 1 note E_, 8 - notetype $8, $a5 + note_type 8, 10, 5 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 6 - note __, 6 - notetype $c, $a5 + rest 6 + note_type 12, 10, 5 octave 2 note B_, 1 note F#, 1 @@ -191,50 +192,50 @@ Music_Route26_branch_eefe0: note D#, 4 octave 2 note B_, 4 - note __, 4 - loopchannel 0, Music_Route26_branch_eefe0 + rest 4 + sound_loop 0, .mainloop Music_Route26_Ch2: - stereopanning $f0 - vibrato $14, $23 - dutycycle $2 - notetype $c, $c7 + stereo_panning TRUE, FALSE + vibrato 20, 2, 3 + duty_cycle 2 + note_type 12, 12, 7 octave 1 note A#, 4 - note __, 2 - notetype $6, $c7 + rest 2 + note_type 6, 12, 7 note A#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 octave 1 note G#, 8 - note __, 4 + rest 4 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 1 note F#, 8 - note __, 4 + rest 4 note F#, 1 - note __, 1 + rest 1 octave 2 note F#, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 octave 1 note G#, 12 - notetype $8, $c7 + note_type 8, 12, 7 note G#, 2 octave 2 note C_, 2 note D#, 2 -Music_Route26_branch_ef0ce: - dutycycle $2 - notetype $c, $c2 +.mainloop: + duty_cycle 2 + note_type 12, 12, 2 octave 2 note C#, 6 note C#, 1 @@ -253,12 +254,12 @@ Music_Route26_branch_ef0ce: note B_, 2 note B_, 2 note B_, 2 - callchannel Music_Route26_branch_ef14e + sound_call .sub1 note A_, 6 note A_, 1 octave 2 note B_, 1 - notetype $8, $c2 + note_type 8, 12, 2 octave 1 note B_, 2 note B_, 2 @@ -267,39 +268,39 @@ Music_Route26_branch_ef0ce: note B_, 2 note B_, 2 note B_, 2 - notetype $c, $c2 - callchannel Music_Route26_branch_ef14e - intensity $c7 + note_type 12, 12, 2 + sound_call .sub1 + volume_envelope 12, 7 octave 2 note F#, 4 - note __, 2 - notetype $6, $c2 + rest 2 + note_type 6, 12, 2 note F#, 2 note F#, 2 note F#, 4 note F#, 4 note D#, 4 note D#, 4 - notetype $8, $c2 -Music_Route26_branch_ef10e: + note_type 8, 12, 2 +.loop1: octave 2 note G#, 2 note G#, 2 note G#, 2 octave 1 note G#, 6 - loopchannel 3, Music_Route26_branch_ef10e + sound_loop 3, .loop1 octave 2 note G#, 2 note G#, 2 note G#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note F#, 1 note D#, 1 note C_, 1 octave 1 note G#, 1 - dutycycle $3 + duty_cycle 3 octave 4 note C#, 6 note D#, 6 @@ -311,34 +312,34 @@ Music_Route26_branch_ef10e: note A_, 2 note G#, 6 note D#, 2 - note __, 2 + rest 2 note D#, 2 note G#, 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F_, 2 note F#, 6 note G#, 4 note A_, 8 - note __, 2 + rest 2 note A_, 2 note G#, 2 note F#, 2 note A_, 8 - note __, 4 + rest 4 note G#, 2 note A_, 2 note B_, 12 - note __, 4 + rest 4 note D#, 12 note D#, 1 note C#, 1 note C_, 1 note D#, 1 - loopchannel 0, Music_Route26_branch_ef0ce + sound_loop 0, .mainloop -Music_Route26_branch_ef14e: +.sub1: note A#, 6 note A#, 1 octave 2 @@ -350,71 +351,71 @@ Music_Route26_branch_ef14e: note A#, 2 octave 1 note A#, 2 - endchannel + sound_ret Music_Route26_Ch3: - stereopanning $ff - vibrato $12, $23 - notetype $c, $14 - vibrato $18, $23 + stereo_panning TRUE, TRUE + vibrato 18, 2, 3 + note_type 12, 1, 4 + vibrato 24, 2, 3 octave 4 note A#, 4 - note __, 2 - notetype $6, $14 + rest 2 + note_type 6, 1, 4 note F_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 8 - note __, 4 + rest 4 octave 4 note G#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note C#, 8 - note __, 4 + rest 4 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 note D#, 12 - notetype $8, $14 + note_type 8, 1, 4 note F#, 2 note F_, 2 note D#, 2 -Music_Route26_branch_ef18a: - vibrato $18, $23 - notetype $c, $14 +.mainloop: + vibrato 24, 2, 3 + note_type 12, 1, 4 octave 5 note C#, 1 - note __, 2 + rest 2 octave 4 note G#, 1 - callchannel Music_Route26_branch_ef22f - vibrato $25, $13 + sound_call .sub1 + vibrato 37, 1, 3 note C#, 1 - note __, 1 + rest 1 octave 4 note G#, 1 octave 5 note C#, 1 - callchannel Music_Route26_branch_ef22f + sound_call .sub1 note F_, 1 - note __, 1 + rest 1 note C#, 1 note F_, 1 note A#, 8 note A#, 1 - note __, 1 + rest 1 octave 6 note C_, 1 - note __, 1 + rest 1 note C#, 12 note D#, 4 note C#, 8 @@ -428,114 +429,114 @@ Music_Route26_branch_ef18a: note C_, 1 octave 5 note G#, 1 - intensity $15 + volume_envelope 1, 5 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - notetype $6, $15 + rest 3 + note_type 6, 1, 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 4 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note A_, 4 note G#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 6 + rest 6 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note C#, 2 - note __, 10 + rest 10 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 - note __, 2 + rest 2 note C#, 4 octave 3 note F#, 8 - notetype $8, $15 + note_type 8, 1, 5 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 6 - note __, 6 + rest 6 octave 4 note C_, 6 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 6 - note __, 6 - notetype $c, $15 + rest 6 + note_type 12, 1, 5 octave 2 note B_, 16 note B_, 8 octave 3 note F#, 4 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 octave 3 note C_, 1 - loopchannel 0, Music_Route26_branch_ef18a + sound_loop 0, .mainloop -Music_Route26_branch_ef22f: +.sub1: octave 5 note F_, 8 note C#, 2 @@ -544,122 +545,122 @@ Music_Route26_branch_ef22f: note F#, 4 note C#, 4 note D#, 4 - endchannel + sound_ret Music_Route26_Ch4: - togglenoise $4 - notetype $c -Music_Route26_branch_ef23c: - note B_, 6 - note D_, 1 - note D_, 1 - loopchannel 3, Music_Route26_branch_ef23c - callchannel Music_Route26_branch_ef2b0 -Music_Route26_branch_ef246: - notetype $6 - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef2a8 - note D_, 12 - note D_, 2 - note D_, 2 - notetype $8 - note D_, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note E_, 2 - notetype $6 - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef29a - notetype $8 -Music_Route26_branch_ef266: - note D_, 2 - note D_, 2 - note D_, 2 - note B_, 6 - loopchannel 4, Music_Route26_branch_ef266 - notetype $6 - callchannel Music_Route26_branch_ef2a8 - callchannel Music_Route26_branch_ef2a8 - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef2a8 -Music_Route26_branch_ef27c: - notetype $6 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - note B_, 12 - loopchannel 2, Music_Route26_branch_ef27c - notetype $c - note B_, 16 - callchannel Music_Route26_branch_ef2b0 - loopchannel 0, Music_Route26_branch_ef246 + toggle_noise 4 + drum_speed 12 +.loop1: + drum_note 12, 6 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 3, .loop1 + sound_call .sub3 +.mainloop: + drum_speed 6 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + drum_note 3, 12 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_speed 6 + sound_call .sub1 + sound_call .sub1 + drum_speed 8 +.loop2: + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 12, 6 + sound_loop 4, .loop2 + drum_speed 6 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 +.loop3: + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 12, 12 + sound_loop 2, .loop3 + drum_speed 12 + drum_note 12, 16 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route26_branch_ef29a: - note E_, 12 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - endchannel +.sub1: + drum_note 5, 12 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_ret -Music_Route26_branch_ef2a8: - note E_, 12 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note E_, 4 - note D_, 4 - endchannel +.sub2: + drum_note 5, 12 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 5, 4 + drum_note 3, 4 + sound_ret -Music_Route26_branch_ef2b0: - notetype $6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $8 - note D_, 2 - note D_, 2 - note E_, 2 - endchannel +.sub3: + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 5, 2 + sound_ret diff --git a/crysaudio/music/route29.asm b/crysaudio/music/route29.asm index d7cecf4f..aaf32372 100644 --- a/crysaudio/music/route29.asm +++ b/crysaudio/music/route29.asm @@ -1,20 +1,21 @@ Music_Route29: - musicheader 4, 1, Music_Route29_Ch1 - musicheader 1, 2, Music_Route29_Ch2 - musicheader 1, 3, Music_Route29_Ch3 - musicheader 1, 4, Music_Route29_Ch4 + channel_count 4 + channel 1, Music_Route29_Ch1 + channel 2, Music_Route29_Ch2 + channel 3, Music_Route29_Ch3 + channel 4, Music_Route29_Ch4 Music_Route29_Ch1: tempo 146 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f - notetype $c, $b2 - note __, 2 -Music_Route29_branch_f03a5: - note __, 2 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning FALSE, TRUE + note_type 12, 11, 2 + rest 2 +.mainloop: + rest 2 octave 4 note C_, 2 note E_, 2 @@ -95,7 +96,7 @@ Music_Route29_branch_f03a5: note G_, 2 note G_, 2 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note A_, 4 octave 4 note C_, 2 @@ -104,31 +105,31 @@ Music_Route29_branch_f03a5: note E_, 4 note G_, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 6 - intensity $b4 + volume_envelope 11, 4 note F_, 4 note A_, 2 note G_, 2 note F_, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 4 - intensity $b4 + volume_envelope 11, 4 note C#, 4 note E_, 2 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note E_, 8 - intensity $b4 + volume_envelope 11, 4 note A_, 2 note G_, 2 note A_, 2 octave 4 note C_, 4 - intensity $b2 + volume_envelope 11, 2 octave 3 note A_, 6 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note E_, 2 note G_, 2 @@ -142,10 +143,10 @@ Music_Route29_branch_f03a5: octave 3 note B_, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 4 note B_, 4 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note E_, 2 octave 4 @@ -162,21 +163,21 @@ Music_Route29_branch_f03a5: note C_, 2 octave 3 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note C_, 2 note G_, 2 note G_, 4 - loopchannel 0, Music_Route29_branch_f03a5 + sound_loop 0, .mainloop Music_Route29_Ch2: - dutycycle $3 - vibrato $12, $36 - notetype $c, $c2 + duty_cycle 3 + vibrato 18, 3, 6 + note_type 12, 12, 2 octave 4 note C_, 1 note D_, 1 -Music_Route29_branch_f0458: - callchannel Music_Route29_branch_f04de +.mainloop: + sound_call .sub1 note F_, 1 note E_, 1 note D_, 2 @@ -191,14 +192,14 @@ Music_Route29_branch_f0458: octave 4 note C_, 1 note D_, 1 - callchannel Music_Route29_branch_f04de + sound_call .sub1 note F_, 1 note E_, 1 note D_, 2 note D_, 2 octave 3 note B_, 2 - intensity $c4 + volume_envelope 12, 4 octave 4 note C_, 8 octave 3 @@ -263,10 +264,10 @@ Music_Route29_branch_f0458: note E_, 2 note D_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 note E_, 4 note D_, 4 - intensity $c4 + volume_envelope 12, 4 note C_, 2 octave 3 note G_, 2 @@ -290,7 +291,7 @@ Music_Route29_branch_f0458: note E_, 2 octave 3 note G_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note C_, 2 note C_, 2 @@ -298,9 +299,9 @@ Music_Route29_branch_f0458: octave 4 note C_, 1 note D_, 1 - loopchannel 0, Music_Route29_branch_f0458 + sound_loop 0, .mainloop -Music_Route29_branch_f04de: +.sub1: note E_, 2 note E_, 2 note G_, 2 @@ -329,86 +330,86 @@ Music_Route29_branch_f04de: note D_, 2 note E_, 2 note C_, 2 - endchannel + sound_ret Music_Route29_Ch3: - stereopanning $f0 - notetype $c, $25 - vibrato $9, $27 - note __, 2 -Music_Route29_branch_f0504: - note __, 2 + stereo_panning TRUE, FALSE + note_type 12, 2, 5 + vibrato 9, 2, 7 + rest 2 +.mainloop: + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 3 + rest 3 octave 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note E_, 4 note G_, 4 octave 4 @@ -478,7 +479,7 @@ Music_Route29_branch_f0504: note F_, 6 note F_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 octave 3 note B_, 2 @@ -492,29 +493,29 @@ Music_Route29_branch_f0504: note C_, 4 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 - loopchannel 0, Music_Route29_branch_f0504 + rest 3 + sound_loop 0, .mainloop Music_Route29_Ch4: - stereopanning $f - togglenoise $0 - notetype $c - note __, 2 -Music_Route29_branch_f05b0: - note __, 2 - note F_, 2 - note F_, 6 - note F_, 2 - note F_, 2 - note F_, 2 - note __, 2 - note F_, 4 - note F_, 4 - note F_, 2 - note F_, 4 - loopchannel 0, Music_Route29_branch_f05b0 + stereo_panning FALSE, TRUE + toggle_noise 0 + drum_speed 12 + rest 2 +.mainloop: + rest 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 2 + drum_note 6, 2 + drum_note 6, 2 + rest 2 + drum_note 6, 4 + drum_note 6, 4 + drum_note 6, 2 + drum_note 6, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/route3.asm b/crysaudio/music/route3.asm index f36dbd53..cb93d6e6 100644 --- a/crysaudio/music/route3.asm +++ b/crysaudio/music/route3.asm @@ -1,17 +1,18 @@ Music_Route3: - musicheader 4, 1, Music_Route3_Ch1 - musicheader 1, 2, Music_Route3_Ch2 - musicheader 1, 3, Music_Route3_Ch3 - musicheader 1, 4, Music_Route3_Ch4 + channel_count 4 + channel 1, Music_Route3_Ch1 + channel 2, Music_Route3_Ch2 + channel 3, Music_Route3_Ch3 + channel 4, Music_Route3_Ch4 Music_Route3_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 160 - volume $77 - notetype $c, $91 - note __, 10 - dutycycle $0 - vibrato $14, $6 + volume 7, 7 + note_type 12, 9, 1 + rest 10 + duty_cycle 0 + vibrato 20, 0, 6 octave 3 note C#, 1 note E_, 1 @@ -45,8 +46,8 @@ Music_Route3_Ch1: note E_, 1 note F#, 1 note G#, 1 -Music_Route3_branch_ec307: - callchannel Music_Route3_branch_ec3a4 +.mainloop: + sound_call .sub1 note G_, 1 note D_, 1 octave 2 @@ -131,10 +132,10 @@ Music_Route3_branch_ec307: note B_, 1 octave 3 note D_, 1 - intensity $6f + volume_envelope 6, -7 note G_, 1 note D_, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note B_, 1 octave 3 @@ -144,7 +145,7 @@ Music_Route3_branch_ec307: note E_, 1 note G#, 1 note B_, 4 - intensity $6f + volume_envelope 6, -7 octave 3 note G#, 2 note E_, 2 @@ -173,7 +174,7 @@ Music_Route3_branch_ec307: note D_, 2 note E_, 2 note F_, 2 - intensity $91 + volume_envelope 9, 1 note F#, 1 note D_, 1 octave 2 @@ -193,37 +194,38 @@ Music_Route3_branch_ec307: note B_, 1 octave 4 note D_, 1 - loopchannel 0, Music_Route3_branch_ec307 + sound_loop 0, .mainloop -Music_Route3_branch_ec3a4: +.sub1: +.sub1loop1: octave 3 note A_, 1 note E_, 1 note C#, 1 note E_, 1 - loopchannel 3, Music_Route3_branch_ec3a4 + sound_loop 3, .sub1loop1 note C#, 1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3b1: +.sub1loop2: note A_, 1 note E_, 1 note C#, 1 note E_, 1 - loopchannel 3, Music_Route3_branch_ec3b1 + sound_loop 3, .sub1loop2 note C#, 1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3bd: +.sub1loop3: note G_, 1 note D_, 1 octave 2 note B_, 1 octave 3 note D_, 1 - loopchannel 3, Music_Route3_branch_ec3bd + sound_loop 3, .sub1loop3 octave 2 note B_, 1 octave 3 @@ -232,22 +234,22 @@ Music_Route3_branch_ec3bd: note B_, 1 octave 3 note D_, 1 - endchannel + sound_ret Music_Route3_Ch2: - stereopanning $f0 - notetype $c, $5e - dutycycle $2 - vibrato $6, $3 + stereo_panning TRUE, FALSE + note_type 12, 5, -6 + duty_cycle 2 + vibrato 6, 0, 3 octave 4 note E_, 1 note G_, 1 note G#, 6 - intensity $87 + volume_envelope 8, 7 note F#, 1 note G#, 1 note A_, 1 - note __, 7 + rest 7 note C#, 4 note E_, 4 note D_, 4 @@ -255,45 +257,45 @@ Music_Route3_Ch2: note B_, 4 octave 4 note C#, 4 - intensity $a7 - dutycycle $2 + volume_envelope 10, 7 + duty_cycle 2 octave 3 note A_, 1 octave 4 note C#, 1 note E_, 1 note G#, 1 -Music_Route3_branch_ec3f5: - intensity $7d - callchannel Music_Route3_branch_ec443 +.mainloop: + volume_envelope 7, -5 + sound_call .sub1 note G_, 1 note B_, 10 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $7d - note __, 4 - dutycycle $3 + volume_envelope 7, -5 + rest 4 + duty_cycle 3 note G#, 4 - callchannel Music_Route3_branch_ec443 + sound_call .sub1 note B_, 1 - intensity $7d + volume_envelope 7, -5 octave 5 note D_, 5 - intensity $b7 + volume_envelope 11, 7 octave 5 note D_, 5 - dutycycle $0 + duty_cycle 0 octave 3 note D_, 1 note G_, 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 note B_, 1 octave 4 note D_, 4 - intensity $8f - dutycycle $2 + volume_envelope 8, -7 + duty_cycle 2 octave 4 note E_, 2 note D_, 2 @@ -316,7 +318,7 @@ Music_Route3_branch_ec3f5: note C#, 3 octave 3 note A_, 10 - dutycycle $2 + duty_cycle 2 octave 4 note F#, 6 note E_, 1 @@ -324,18 +326,18 @@ Music_Route3_branch_ec3f5: note G#, 6 note F#, 1 note G#, 1 - loopchannel 0, Music_Route3_branch_ec3f5 + sound_loop 0, .mainloop -Music_Route3_branch_ec443: +.sub1: note A_, 6 note E_, 1 note A_, 1 octave 5 note C#, 7 - intensity $b7 + volume_envelope 11, 7 octave 5 note C#, 3 - intensity $7d + volume_envelope 7, -5 octave 4 note E_, 2 note A_, 2 @@ -348,12 +350,12 @@ Music_Route3_branch_ec443: note A_, 2 note G_, 6 note D_, 1 - endchannel + sound_ret Music_Route3_Ch3: - stereopanning $ff - vibrato $6, $3 - notetype $c, $13 + stereo_panning TRUE, TRUE + vibrato 6, 0, 3 + note_type 12, 1, 3 octave 3 note B_, 1 octave 4 @@ -362,31 +364,31 @@ Music_Route3_Ch3: note D_, 1 octave 3 note B_, 1 - intensity $14 + volume_envelope 1, 4 octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 2 - callchannel Music_Route3_branch_ec4bd -Music_Route3_branch_ec47f: - intensity $14 - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4ce - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4ce + sound_call .sub1 +.mainloop: + volume_envelope 1, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note A_, 2 octave 3 note C#, 2 @@ -400,7 +402,7 @@ Music_Route3_branch_ec47f: note B_, 2 note G#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 note B_, 2 octave 3 @@ -414,88 +416,88 @@ Music_Route3_branch_ec47f: note C_, 2 note C#, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 note D_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note F#, 1 note G#, 1 - loopchannel 0, Music_Route3_branch_ec47f + sound_loop 0, .mainloop -Music_Route3_branch_ec4bd: +.sub1: octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note G#, 2 - endchannel + sound_ret -Music_Route3_branch_ec4ce: +.sub2: octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 note G_, 2 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 2 note B_, 2 - endchannel + sound_ret Music_Route3_Ch4: - togglenoise $4 - notetype $c - note __, 10 -Music_Route3_branch_ec4f0: - notetype $c - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - notetype $6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 0, Music_Route3_branch_ec4f0 + toggle_noise 4 + drum_speed 12 + rest 10 +.mainloop: + drum_speed 12 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/route30.asm b/crysaudio/music/route30.asm index 22623579..a8f947db 100644 --- a/crysaudio/music/route30.asm +++ b/crysaudio/music/route30.asm @@ -1,17 +1,18 @@ Music_Route30: - musicheader 4, 1, Music_Route30_Ch1 - musicheader 1, 2, Music_Route30_Ch2 - musicheader 1, 3, Music_Route30_Ch3 - musicheader 1, 4, Music_Route30_Ch4 + channel_count 4 + channel 1, Music_Route30_Ch1 + channel 2, Music_Route30_Ch2 + channel 3, Music_Route30_Ch3 + channel 4, Music_Route30_Ch4 Music_Route30_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f0 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 11, 2 octave 3 note D_, 6 note D_, 1 @@ -24,12 +25,12 @@ Music_Route30_Ch1: note D_, 1 note D_, 2 note D_, 2 - intensity $4e + volume_envelope 4, -6 note C_, 4 -Music_Route30_branch_efc2e: - intensity $b6 +.mainloop: + volume_envelope 11, 6 note D_, 6 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 2 octave 3 @@ -37,9 +38,9 @@ Music_Route30_branch_efc2e: note E_, 2 note D_, 2 note E_, 2 - intensity $b6 + volume_envelope 11, 6 note F_, 6 - intensity $b4 + volume_envelope 11, 4 note C_, 2 note A_, 2 note G_, 2 @@ -60,10 +61,10 @@ Music_Route30_branch_efc2e: note B_, 1 octave 4 note C_, 1 - intensity $b7 + volume_envelope 11, 7 octave 3 note B_, 12 - intensity $b5 + volume_envelope 11, 5 note F_, 6 note C_, 2 note A_, 2 @@ -86,11 +87,11 @@ Music_Route30_branch_efc2e: note E_, 1 note D_, 1 note E_, 1 - intensity $b6 + volume_envelope 11, 6 note D_, 4 note G_, 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 1 octave 3 @@ -99,14 +100,14 @@ Music_Route30_branch_efc2e: note B_, 1 octave 3 note C_, 1 - intensity $b6 + volume_envelope 11, 6 octave 2 note B_, 4 octave 3 note D_, 4 octave 2 note B_, 4 - intensity $b4 + volume_envelope 11, 4 octave 3 note F_, 2 note E_, 2 @@ -116,7 +117,7 @@ Music_Route30_branch_efc2e: note G_, 2 note F_, 2 note E_, 2 - intensity $b6 + volume_envelope 11, 6 note A_, 4 note B_, 4 octave 4 @@ -131,9 +132,9 @@ Music_Route30_branch_efc2e: note C_, 2 octave 3 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 14 - intensity $b6 + volume_envelope 11, 6 note F_, 2 note E_, 2 note D_, 2 @@ -167,7 +168,7 @@ Music_Route30_branch_efc2e: note G_, 2 octave 4 note D_, 2 - intensity $b5 + volume_envelope 11, 5 octave 3 note B_, 2 octave 4 @@ -181,13 +182,13 @@ Music_Route30_branch_efc2e: note B_, 2 octave 4 note D_, 2 - loopchannel 0, Music_Route30_branch_efc2e + sound_loop 0, .mainloop Music_Route30_Ch2: - dutycycle $3 - vibrato $12, $36 - stereopanning $f - notetype $c, $c2 + duty_cycle 3 + vibrato 18, 3, 6 + stereo_panning FALSE, TRUE + note_type 12, 12, 2 octave 3 note G_, 6 note G_, 1 @@ -200,13 +201,13 @@ Music_Route30_Ch2: note G_, 1 note G_, 2 note G_, 2 - intensity $c4 + volume_envelope 12, 4 note D_, 1 note E_, 1 note F_, 1 note F#, 1 -Music_Route30_branch_efcf6: - intensity $c7 +.mainloop: + volume_envelope 12, 7 note G_, 10 octave 4 note D_, 2 @@ -222,15 +223,15 @@ Music_Route30_branch_efcf6: note E_, 1 note D_, 1 note E_, 1 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $3f + volume_envelope 3, -7 note D_, 8 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $c7 + volume_envelope 12, 7 note C_, 10 note C_, 2 octave 3 @@ -259,11 +260,11 @@ Music_Route30_branch_efcf6: note F_, 8 note A_, 8 note G_, 2 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 10 - intensity $c7 + volume_envelope 12, 7 note C_, 4 octave 3 note B_, 4 @@ -279,63 +280,63 @@ Music_Route30_branch_efcf6: note C_, 8 octave 4 note B_, 2 - intensity $b0 + volume_envelope 11, 0 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note G_, 8 - intensity $c7 + volume_envelope 12, 7 note B_, 2 - intensity $b0 + volume_envelope 11, 0 note G_, 4 - intensity $b7 + volume_envelope 11, 7 note G_, 8 - intensity $a7 + volume_envelope 10, 7 octave 3 note F#, 2 - loopchannel 0, Music_Route30_branch_efcf6 + sound_loop 0, .mainloop Music_Route30_Ch3: - notetype $c, $27 + note_type 12, 2, 7 octave 2 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 -Music_Route30_branch_efd79: + rest 1 +.mainloop: note G_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 note A_, 2 @@ -343,16 +344,16 @@ Music_Route30_branch_efd79: note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 octave 3 note D_, 2 @@ -360,16 +361,16 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note D_, 2 @@ -377,15 +378,15 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 @@ -393,16 +394,16 @@ Music_Route30_branch_efd79: note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 note F_, 2 @@ -410,14 +411,14 @@ Music_Route30_branch_efd79: note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 octave 2 note F_, 2 note F#, 2 note G_, 1 - note __, 1 + rest 1 note B_, 2 octave 3 note G_, 2 @@ -425,14 +426,14 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 octave 3 @@ -441,14 +442,14 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 octave 2 note G_, 2 note G#, 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 @@ -456,31 +457,31 @@ Music_Route30_branch_efd79: note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note F_, 2 note E_, 2 note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 note A_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note D_, 2 @@ -488,28 +489,28 @@ Music_Route30_branch_efd79: note B_, 1 note B_, 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 note A_, 2 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 @@ -517,31 +518,31 @@ Music_Route30_branch_efd79: note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note F_, 2 note E_, 2 note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 note A_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 note D_, 2 @@ -549,15 +550,15 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note D_, 2 @@ -565,105 +566,105 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_Route30_branch_efd79 + rest 1 + sound_loop 0, .mainloop Music_Route30_Ch4: - togglenoise $3 - notetype $c - callchannel Music_Route30_branch_efeb8 - callchannel Music_Route30_branch_efec1 -Music_Route30_branch_efe84: - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efee1 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efee1 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efee1 - loopchannel 0, Music_Route30_branch_efe84 + toggle_noise 3 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 +.mainloop: + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub4 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 + sound_loop 0, .mainloop -Music_Route30_branch_efeb8: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 4 - endchannel +.sub1: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + sound_ret -Music_Route30_branch_efec1: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - endchannel +.sub2: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_Route30_branch_efecd: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - endchannel +.sub3: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_ret -Music_Route30_branch_efed7: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note F#, 2 - note D_, 2 - note D_, 2 - endchannel +.sub4: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_ret -Music_Route30_branch_efee1: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - endchannel +.sub5: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + sound_ret diff --git a/crysaudio/music/route36.asm b/crysaudio/music/route36.asm index 1899116b..ca954ad5 100644 --- a/crysaudio/music/route36.asm +++ b/crysaudio/music/route36.asm @@ -1,32 +1,33 @@ Music_Route36: - musicheader 4, 1, Music_Route36_Ch1 - musicheader 1, 2, Music_Route36_Ch2 - musicheader 1, 3, Music_Route36_Ch3 - musicheader 1, 4, Music_Route36_Ch4 + channel_count 4 + channel 1, Music_Route36_Ch1 + channel 2, Music_Route36_Ch2 + channel 3, Music_Route36_Ch3 + channel 4, Music_Route36_Ch4 Music_Route36_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f - notetype $c, $b3 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning FALSE, TRUE + note_type 12, 11, 3 octave 3 note C_, 4 note C_, 6 note F_, 1 note E_, 1 - intensity $b5 + volume_envelope 11, 5 note F_, 8 - intensity $b3 + volume_envelope 11, 3 note F_, 6 note A#, 1 note A_, 1 - intensity $5d + volume_envelope 5, -5 note A#, 4 -Music_Route36_branch_e9517: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note F_, 4 note A_, 2 note G_, 2 @@ -53,10 +54,10 @@ Music_Route36_branch_e9517: note D#, 4 octave 3 note A#, 2 - intensity $b6 + volume_envelope 11, 6 octave 4 note F_, 10 - intensity $b5 + volume_envelope 11, 5 note C_, 2 note F_, 2 note C_, 2 @@ -68,7 +69,7 @@ Music_Route36_branch_e9517: note C_, 2 octave 3 note A#, 4 - intensity $b4 + volume_envelope 11, 4 note A_, 2 octave 4 note D_, 2 @@ -82,7 +83,7 @@ Music_Route36_branch_e9517: note A_, 2 octave 4 note D_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note A_, 2 octave 4 @@ -97,8 +98,8 @@ Music_Route36_branch_e9517: note A_, 2 octave 4 note D_, 2 - stereopanning $f0 - intensity $95 + stereo_panning TRUE, FALSE + volume_envelope 9, 5 octave 3 note D_, 6 octave 2 @@ -110,11 +111,11 @@ Music_Route36_branch_e9517: octave 3 note D_, 6 note E_, 4 - intensity $b5 + volume_envelope 11, 5 note D_, 6 note A_, 6 note G_, 4 - intensity $a5 + volume_envelope 10, 5 octave 2 note A_, 6 octave 3 @@ -125,7 +126,7 @@ Music_Route36_branch_e9517: note A_, 6 octave 3 note D_, 4 - intensity $b5 + volume_envelope 11, 5 note F#, 6 note E_, 6 note C#, 4 @@ -141,7 +142,7 @@ Music_Route36_branch_e9517: note G_, 6 note C_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note C_, 6 note G_, 4 note D_, 2 @@ -157,65 +158,65 @@ Music_Route36_branch_e9517: note B_, 2 note A_, 6 note D_, 6 - stereopanning $f - intensity $b5 + stereo_panning FALSE, TRUE + volume_envelope 11, 5 note D#, 2 note E_, 2 - loopchannel 0, Music_Route36_branch_e9517 + sound_loop 0, .mainloop Music_Route36_Ch2: - dutycycle $3 - vibrato $10, $36 - stereopanning $f0 - notetype $c, $c2 + duty_cycle 3 + vibrato 16, 3, 6 + stereo_panning TRUE, FALSE + note_type 12, 12, 2 octave 3 note F_, 2 note C_, 1 note F_, 1 - intensity $c7 + volume_envelope 12, 7 note A_, 8 note C_, 4 - intensity $c3 + volume_envelope 12, 3 octave 4 note C_, 2 octave 3 note A_, 1 octave 4 note C_, 1 - intensity $c7 + volume_envelope 12, 7 note F_, 8 octave 3 note G_, 4 -Music_Route36_branch_e95ce: - intensity $c7 +.mainloop: + volume_envelope 12, 7 octave 4 note C_, 10 - intensity $c4 + volume_envelope 12, 4 octave 3 note A_, 2 octave 4 note C_, 2 note A_, 2 note G_, 3 - intensity $c2 + volume_envelope 12, 2 note D#, 1 - intensity $c7 + volume_envelope 12, 7 note D#, 12 note C_, 10 - intensity $c4 + volume_envelope 12, 4 octave 3 note A_, 2 octave 4 note C_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 1 note F_, 1 - intensity $c7 + volume_envelope 12, 7 note G_, 12 note A_, 10 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note A_, 2 octave 5 @@ -223,15 +224,15 @@ Music_Route36_branch_e95ce: octave 4 note A#, 3 note A_, 1 - intensity $c7 + volume_envelope 12, 7 note G_, 8 note A#, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 16 - intensity $b7 + volume_envelope 11, 7 note A_, 16 - stereopanning $f - intensity $a4 + stereo_panning FALSE, TRUE + volume_envelope 10, 4 octave 3 note A_, 6 note G_, 6 @@ -239,84 +240,84 @@ Music_Route36_branch_e95ce: note E_, 6 note F#, 6 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note A_, 2 note F#, 1 note A_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 12 - intensity $a4 + volume_envelope 10, 4 octave 3 note F#, 2 note D_, 1 note F#, 1 - intensity $a7 + volume_envelope 10, 7 note A_, 12 - intensity $c7 + volume_envelope 12, 7 note A_, 6 note G_, 6 note F#, 4 note B_, 6 note A_, 6 note G_, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note F#, 1 note A_, 1 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 12 - intensity $c3 + volume_envelope 12, 3 octave 3 note F#, 2 note D_, 1 note F#, 1 - intensity $c7 + volume_envelope 12, 7 note A_, 12 - intensity $c2 + volume_envelope 12, 2 note G_, 2 note E_, 1 note G_, 1 - intensity $b0 + volume_envelope 11, 0 octave 4 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note C_, 10 - intensity $c5 + volume_envelope 12, 5 octave 3 note G_, 2 note E_, 1 note G_, 1 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 8 note C#, 4 - stereopanning $ff + stereo_panning TRUE, TRUE note D_, 6 note A_, 6 note G_, 2 note F#, 2 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - stereopanning $f0 - intensity $c4 + stereo_panning TRUE, FALSE + volume_envelope 12, 4 octave 3 note F#, 1 note G_, 1 note A_, 1 note B_, 1 - loopchannel 0, Music_Route36_branch_e95ce + sound_loop 0, .mainloop Music_Route36_Ch3: - notetype $c, $25 + note_type 12, 2, 5 octave 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 4 octave 3 @@ -324,9 +325,9 @@ Music_Route36_Ch3: note F_, 2 note C_, 2 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 1 + rest 1 octave 4 note F_, 4 octave 2 @@ -334,7 +335,7 @@ Music_Route36_Ch3: octave 3 note D#, 2 note E_, 2 -Music_Route36_branch_e9684: +.mainloop: note F_, 4 note C_, 2 note F_, 4 @@ -464,57 +465,58 @@ Music_Route36_branch_e9684: note D_, 2 note D#, 2 note E_, 2 - loopchannel 0, Music_Route36_branch_e9684 + sound_loop 0, .mainloop Music_Route36_Ch4: - togglenoise $1 - notetype $c - callchannel Music_Route36_branch_e9734 - callchannel Music_Route36_branch_e9741 -Music_Route36_branch_e9713: - callchannel Music_Route36_branch_e9734 - callchannel Music_Route36_branch_e973b - callchannel Music_Route36_branch_e9734 - callchannel Music_Route36_branch_e9741 - loopchannel 2, Music_Route36_branch_e9713 -Music_Route36_branch_e9723: - note A#, 4 - note A_, 2 - note F_, 4 - note B_, 1 - note B_, 1 - note A_, 4 - loopchannel 11, Music_Route36_branch_e9723 - callchannel Music_Route36_branch_e9741 - loopchannel 0, Music_Route36_branch_e9713 + toggle_noise 1 + drum_speed 12 + sound_call .sub1 + sound_call .sub3 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_loop 2, .loop1 +.loop2: + drum_note 11, 4 + drum_note 10, 2 + drum_note 6, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + sound_loop 11, .loop2 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route36_branch_e9734: - note A_, 4 - note A_, 6 - note A#, 1 - note A#, 1 - note A_, 2 - note A#, 2 - endchannel +.sub1: + drum_note 10, 4 + drum_note 10, 6 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 11, 2 + sound_ret -Music_Route36_branch_e973b: - note A_, 4 - note A_, 6 - note B_, 1 - note A#, 1 - note A_, 4 - endchannel +.sub2: + drum_note 10, 4 + drum_note 10, 6 + drum_note 12, 1 + drum_note 11, 1 + drum_note 10, 4 + sound_ret -Music_Route36_branch_e9741: - note A_, 4 - note A_, 6 - note A#, 1 - note A#, 1 - note A_, 2 - notetype $6 - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - notetype $c - endchannel +.sub3: + drum_note 10, 4 + drum_note 10, 6 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_speed 6 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_speed 12 + sound_ret diff --git a/crysaudio/music/route37.asm b/crysaudio/music/route37.asm index 000db4e3..ec7f9006 100644 --- a/crysaudio/music/route37.asm +++ b/crysaudio/music/route37.asm @@ -1,29 +1,30 @@ Music_Route37: - musicheader 4, 1, Music_Route37_Ch1 - musicheader 1, 2, Music_Route37_Ch2 - musicheader 1, 3, Music_Route37_Ch3 - musicheader 1, 4, Music_Route37_Ch4 + channel_count 4 + channel 1, Music_Route37_Ch1 + channel 2, Music_Route37_Ch2 + channel 3, Music_Route37_Ch3 + channel 4, Music_Route37_Ch4 Music_Route37_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $22 - notetype $c, $b3 - note __, 16 - note __, 16 -Music_Route37_branch_ee969: - intensity $b3 - note __, 2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 2, 2 + note_type 12, 11, 3 + rest 16 + rest 16 +.mainloop: + volume_envelope 11, 3 + rest 2 octave 2 note F#, 2 note B_, 2 octave 3 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 - intensity $b3 + volume_envelope 11, 3 note E_, 4 note D#, 4 note C#, 4 @@ -33,19 +34,19 @@ Music_Route37_branch_ee969: note D#, 3 octave 2 note B_, 1 - intensity $b7 + volume_envelope 11, 7 note F#, 8 note B_, 8 octave 3 note B_, 12 - intensity $b3 - note __, 2 + volume_envelope 11, 3 + rest 2 octave 2 note F#, 2 note B_, 2 octave 3 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 octave 2 note A_, 4 @@ -66,39 +67,39 @@ Music_Route37_branch_ee969: note F#, 4 note E_, 2 note D#, 4 - stereopanning $f -Music_Route37_branch_ee9a5: - callchannel Music_Route37_branch_ee9da + stereo_panning FALSE, TRUE +.loop1: + sound_call .sub1 octave 3 note C#, 4 - loopchannel 2, Music_Route37_branch_ee9a5 - callchannel Music_Route37_branch_ee9e9 + sound_loop 2, .loop1 + sound_call .sub2 octave 3 note F#, 4 - callchannel Music_Route37_branch_ee9e9 + sound_call .sub2 octave 3 note F#, 4 - callchannel Music_Route37_branch_ee9da + sound_call .sub1 octave 3 note E_, 4 - callchannel Music_Route37_branch_ee9da + sound_call .sub1 octave 3 note G#, 4 - callchannel Music_Route37_branch_ee9e9 + sound_call .sub2 octave 4 note D#, 4 - callchannel Music_Route37_branch_ee9e9 + sound_call .sub2 octave 3 note F_, 4 - stereopanning $ff - callchannel Music_Route37_branch_ee9e9 - note __, 4 - callchannel Music_Route37_branch_ee9e9 - note __, 4 - loopchannel 0, Music_Route37_branch_ee969 + stereo_panning TRUE, TRUE + sound_call .sub2 + rest 4 + sound_call .sub2 + rest 4 + sound_loop 0, .mainloop -Music_Route37_branch_ee9da: - intensity $c2 +.sub1: + volume_envelope 12, 2 octave 2 note A_, 2 note A_, 1 @@ -109,11 +110,11 @@ Music_Route37_branch_ee9da: note A_, 1 note A_, 1 note A_, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret -Music_Route37_branch_ee9e9: - intensity $c2 +.sub2: + volume_envelope 12, 2 octave 2 note B_, 2 note B_, 1 @@ -124,57 +125,57 @@ Music_Route37_branch_ee9e9: note B_, 1 note B_, 1 note B_, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret Music_Route37_Ch2: - dutycycle $3 - vibrato $1c, $12 - notetype $c, $c2 + duty_cycle 3 + vibrato 28, 1, 2 + note_type 12, 12, 2 octave 2 note B_, 2 - notetype $c, $c1 + note_type 12, 12, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 1 note B_, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 6 note B_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 1 note B_, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 2 -Music_Route37_branch_eea24: - callchannel Music_Route37_branch_eeab7 - intensity $c6 +.mainloop: + sound_call .sub1 + volume_envelope 12, 6 octave 4 note C#, 4 octave 3 note B_, 4 note A_, 4 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note F#, 8 - intensity $b7 + volume_envelope 11, 7 note F#, 8 - intensity $c7 + volume_envelope 12, 7 note D#, 12 - callchannel Music_Route37_branch_eeab7 - intensity $c7 + sound_call .sub1 + volume_envelope 12, 7 octave 4 note C#, 4 octave 3 @@ -182,119 +183,119 @@ Music_Route37_branch_eea24: octave 4 note C#, 4 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 16 - intensity $b0 + volume_envelope 11, 0 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c4 - note __, 4 + volume_envelope 12, 4 + rest 4 octave 3 note A_, 3 octave 4 note E_, 1 note A_, 4 note G#, 4 - intensity $a0 + volume_envelope 10, 0 note C#, 6 note D#, 6 note E_, 4 - intensity $c3 + volume_envelope 12, 3 note F#, 3 note E_, 1 - intensity $b0 + volume_envelope 11, 0 note D#, 6 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - intensity $c3 + volume_envelope 12, 3 octave 3 note B_, 3 note F#, 1 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 6 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 6 - intensity $c4 - note __, 4 + volume_envelope 12, 4 + rest 4 octave 3 note A_, 3 octave 4 note E_, 1 note A_, 4 note G#, 4 - intensity $b0 + volume_envelope 11, 0 note C#, 6 note D#, 6 note E_, 4 - intensity $c3 + volume_envelope 12, 3 note F#, 3 note D#, 1 - intensity $b0 + volume_envelope 11, 0 note B_, 6 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $c3 + volume_envelope 12, 3 note B_, 3 note F#, 1 - intensity $b0 + volume_envelope 11, 0 octave 5 note D#, 6 - intensity $b7 + volume_envelope 11, 7 octave 5 note D#, 6 - intensity $c2 + volume_envelope 12, 2 octave 3 note F#, 2 note F#, 1 note F#, 1 note F#, 2 - intensity $c1 + volume_envelope 12, 1 note F#, 1 note F#, 1 note F#, 1 note F#, 1 - intensity $c2 + volume_envelope 12, 2 note F#, 6 note F#, 2 note F#, 1 note F#, 1 note F#, 2 - intensity $c1 + volume_envelope 12, 1 note F#, 1 note F#, 1 note F#, 1 note F#, 1 - intensity $c2 + volume_envelope 12, 2 note F#, 2 - loopchannel 0, Music_Route37_branch_eea24 + sound_loop 0, .mainloop -Music_Route37_branch_eeab7: - intensity $c7 +.sub1: + volume_envelope 12, 7 octave 3 note F#, 4 - intensity $b0 + volume_envelope 11, 0 note B_, 5 - intensity $b7 + volume_envelope 11, 7 note B_, 5 - intensity $c3 + volume_envelope 12, 3 note F#, 2 note F#, 2 note B_, 2 - endchannel + sound_ret Music_Route37_Ch3: - stereopanning $f0 - notetype $c, $14 -Music_Route37_branch_eeacc: + stereo_panning TRUE, FALSE + note_type 12, 1, 4 +.loop1: octave 2 note F#, 2 - note __, 6 - loopchannel 4, Music_Route37_branch_eeacc -Music_Route37_branch_eead3: - callchannel Music_Route37_branch_eeb32 + rest 6 + sound_loop 4, .loop1 +.mainloop: + sound_call .sub1 note A_, 2 octave 3 note C#, 2 @@ -305,12 +306,12 @@ Music_Route37_branch_eead3: note A_, 2 note F#, 2 note E_, 2 -Music_Route37_branch_eeae0: +.loop2: note D#, 2 note F#, 2 - loopchannel 4, Music_Route37_branch_eeae0 - callchannel Music_Route37_branch_eeb32 - callchannel Music_Route37_branch_eeb32 + sound_loop 4, .loop2 + sound_call .sub1 + sound_call .sub1 note A_, 2 octave 3 note C#, 2 @@ -323,45 +324,45 @@ Music_Route37_branch_eeae0: note C#, 2 octave 2 note A_, 2 - callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeafb: + sound_call .sub1 +.loop3: octave 2 note B_, 2 octave 3 note D#, 2 - loopchannel 4, Music_Route37_branch_eeafb -Music_Route37_branch_eeb03: + sound_loop 4, .loop3 +.loop4: octave 2 note A_, 2 octave 3 note C#, 2 - loopchannel 7, Music_Route37_branch_eeb03 + sound_loop 7, .loop4 note E_, 2 note C#, 2 - callchannel Music_Route37_branch_eeb3c -Music_Route37_branch_eeb10: + sound_call .sub2 +.loop5: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 4, Music_Route37_branch_eeb10 -Music_Route37_branch_eeb18: + sound_loop 4, .loop5 +.loop6: octave 2 note A_, 2 octave 3 note C#, 2 - loopchannel 7, Music_Route37_branch_eeb18 + sound_loop 7, .loop6 note E_, 2 note C#, 2 - callchannel Music_Route37_branch_eeb3c - callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeb28: + sound_call .sub2 + sound_call .sub1 +.loop7: note F#, 2 - note __, 6 - loopchannel 4, Music_Route37_branch_eeb28 - loopchannel 0, Music_Route37_branch_eead3 + rest 6 + sound_loop 4, .loop7 + sound_loop 0, .mainloop -Music_Route37_branch_eeb32: +.sub1: octave 2 note F#, 2 note B_, 2 @@ -371,9 +372,9 @@ Music_Route37_branch_eeb32: note B_, 2 note F#, 2 note B_, 2 - endchannel + sound_ret -Music_Route37_branch_eeb3c: +.sub2: octave 2 note B_, 2 octave 3 @@ -390,38 +391,38 @@ Music_Route37_branch_eeb3c: note B_, 2 octave 3 note D#, 2 - endchannel + sound_ret Music_Route37_Ch4: - stereopanning $f - togglenoise $0 -Music_Route37_branch_eeb51: - notetype $c - callchannel Music_Route37_branch_eeb6b - note D_, 1 - note D#, 1 - note D#, 1 - note D_, 1 - callchannel Music_Route37_branch_eeb6b - notetype $6 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_Route37_branch_eeb51 + stereo_panning FALSE, TRUE + toggle_noise 0 +.mainloop: + drum_speed 12 + sound_call .sub1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + sound_call .sub1 + drum_speed 6 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop -Music_Route37_branch_eeb6b: - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D#, 1 - endchannel +.sub1: + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + sound_ret diff --git a/crysaudio/music/ruinsofalphinterior.asm b/crysaudio/music/ruinsofalphinterior.asm index f353b63a..7799b2c8 100644 --- a/crysaudio/music/ruinsofalphinterior.asm +++ b/crysaudio/music/ruinsofalphinterior.asm @@ -1,23 +1,24 @@ Music_RuinsOfAlphInterior: - musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1 - musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2 - musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3 + channel_count 3 + channel 1, Music_RuinsOfAlphInterior_Ch1 + channel 2, Music_RuinsOfAlphInterior_Ch2 + channel 3, Music_RuinsOfAlphInterior_Ch3 Music_RuinsOfAlphInterior_Ch1: tempo 224 - volume $77 - dutycycle $0 - stereopanning $f0 - notetype $c, $44 - note __, 1 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 + volume 7, 7 + duty_cycle 0 + stereo_panning TRUE, FALSE + note_type 12, 4, 4 + rest 1 + sound_loop 0, Music_RuinsOfAlphInterior_Ch2.mainloop Music_RuinsOfAlphInterior_Ch2: - tone $0002 - dutycycle $0 - stereopanning $f - notetype $c, $a4 -Music_RuinsOfAlphInterior_branch_ebdc2: + pitch_offset 2 + duty_cycle 0 + stereo_panning FALSE, TRUE + note_type 12, 10, 4 +.mainloop: octave 4 note C_, 4 octave 3 @@ -32,15 +33,15 @@ Music_RuinsOfAlphInterior_branch_ebdc2: note C_, 4 octave 3 note A#, 4 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 + sound_loop 0, .mainloop Music_RuinsOfAlphInterior_Ch3: - notetype $c, $10 -Music_RuinsOfAlphInterior_branch_ebdd7: + note_type 12, 1, 0 +.mainloop: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 2 - note __, 10 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 + rest 10 + sound_loop 0, .mainloop diff --git a/crysaudio/music/ruinsofalphradio.asm b/crysaudio/music/ruinsofalphradio.asm index 5584b279..3cf7c774 100644 --- a/crysaudio/music/ruinsofalphradio.asm +++ b/crysaudio/music/ruinsofalphradio.asm @@ -1,40 +1,41 @@ Music_RuinsOfAlphRadio: - musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1 - musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2 - musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3 + channel_count 3 + channel 1, Music_RuinsOfAlphRadio_Ch1 + channel 2, Music_RuinsOfAlphRadio_Ch2 + channel 3, Music_RuinsOfAlphRadio_Ch3 Music_RuinsOfAlphRadio_Ch1: tempo 160 - volume $77 - dutycycle $0 - tone $0118 - vibrato $0, $f0 - stereopanning $f0 -Music_RuinsOfAlphRadio_branch_eede3: - notetype $6, $71 - callchannel Music_RuinsOfAlphRadio_branch_eee01 - notetype $c, $a1 - note __, 16 - note __, 16 - callchannel Music_RuinsOfAlphRadio_branch_eee08 - notetype $c, $a1 - note __, 16 - note __, 16 - callchannel Music_RuinsOfAlphRadio_branch_eee01 - notetype $c, $a1 - note __, 16 - loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3 + volume 7, 7 + duty_cycle 0 + pitch_offset 280 + vibrato 0, 15, 0 + stereo_panning TRUE, FALSE +.mainloop: + note_type 6, 7, 1 + sound_call .sub1 + note_type 12, 10, 1 + rest 16 + rest 16 + sound_call .sub2 + note_type 12, 10, 1 + rest 16 + rest 16 + sound_call .sub1 + note_type 12, 10, 1 + rest 16 + sound_loop 0, .mainloop -Music_RuinsOfAlphRadio_branch_eee01: +.sub1: octave 4 note G_, 1 note F#, 1 note G_, 1 note F#, 1 note C_, 8 - endchannel + sound_ret -Music_RuinsOfAlphRadio_branch_eee08: +.sub2: octave 4 note G_, 1 note F#, 1 @@ -44,30 +45,30 @@ Music_RuinsOfAlphRadio_branch_eee08: note G_, 1 octave 5 note C_, 8 - endchannel + sound_ret Music_RuinsOfAlphRadio_Ch2: - dutycycle $1 - vibrato $1, $e0 -Music_RuinsOfAlphRadio_branch_eee17: - stereopanning $f - notetype $6, $81 - callchannel Music_RuinsOfAlphRadio_branch_eee01 - notetype $c, $a1 - note __, 16 - note __, 16 - notetype $6, $81 - callchannel Music_RuinsOfAlphRadio_branch_eee08 - notetype $c, $a1 - note __, 16 - loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17 + duty_cycle 1 + vibrato 1, 14, 0 +.mainloop: + stereo_panning FALSE, TRUE + note_type 6, 8, 1 + sound_call Music_RuinsOfAlphRadio_Ch1.sub1 + note_type 12, 10, 1 + rest 16 + rest 16 + note_type 6, 8, 1 + sound_call Music_RuinsOfAlphRadio_Ch1.sub2 + note_type 12, 10, 1 + rest 16 + sound_loop 0, .mainloop Music_RuinsOfAlphRadio_Ch3: - notetype $6, $26 -Music_RuinsOfAlphRadio_branch_eee35: + note_type 6, 2, 6 +.mainloop: octave 2 note C_, 1 note C#, 1 note C_, 1 - note __, 16 - loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 + rest 16 + sound_loop 0, .mainloop diff --git a/crysaudio/music/showmearound.asm b/crysaudio/music/showmearound.asm index 344b8fe3..8bf35208 100644 --- a/crysaudio/music/showmearound.asm +++ b/crysaudio/music/showmearound.asm @@ -1,15 +1,16 @@ Music_ShowMeAround: - musicheader 4, 1, Music_ShowMeAround_Ch1 - musicheader 1, 2, Music_ShowMeAround_Ch2 - musicheader 1, 3, Music_ShowMeAround_Ch3 - musicheader 1, 4, Music_ShowMeAround_Ch4 + channel_count 4 + channel 1, Music_ShowMeAround_Ch1 + channel 2, Music_ShowMeAround_Ch2 + channel 3, Music_ShowMeAround_Ch3 + channel 4, Music_ShowMeAround_Ch4 Music_ShowMeAround_Ch1: tempo 144 - volume $77 - stereopanning $f - dutycycle $2 - notetype $c, $b1 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 2 + note_type 12, 11, 1 octave 4 note B_, 2 note A_, 2 @@ -27,44 +28,44 @@ Music_ShowMeAround_Ch1: note D_, 1 note E_, 1 note G#, 8 -Music_ShowMeAround_branch_edc01: - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc15 - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc15 - loopchannel 0, Music_ShowMeAround_branch_edc01 +.mainloop: + rest 16 + rest 16 + rest 16 + rest 16 + sound_call Music_ShowMeAround_Ch2.sub3 + sound_call .sub1 + sound_call Music_ShowMeAround_Ch2.sub3 + sound_call .sub1 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edc15: - note __, 4 +.sub1: + rest 4 octave 3 note C#, 1 - note __, 5 + rest 5 note D_, 4 note C_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 octave 2 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_ShowMeAround_Ch2: - stereopanning $ff - dutycycle $2 - notetype $c, $b1 + stereo_panning TRUE, TRUE + duty_cycle 2 + note_type 12, 11, 1 octave 5 note E_, 2 note D_, 2 @@ -82,11 +83,11 @@ Music_ShowMeAround_Ch2: octave 5 note D_, 1 note E_, 8 - dutycycle $1 -Music_ShowMeAround_branch_edc44: - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc86 + duty_cycle 1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub1 note A_, 4 octave 3 note A_, 2 @@ -97,7 +98,7 @@ Music_ShowMeAround_branch_edc44: note C#, 2 octave 3 note B_, 4 - callchannel Music_ShowMeAround_branch_edc86 + sound_call .sub1 note A_, 2 note A_, 2 note G#, 2 @@ -107,7 +108,7 @@ Music_ShowMeAround_branch_edc44: note A_, 2 note A_, 2 note A_, 4 - callchannel Music_ShowMeAround_branch_edc8e + sound_call .sub2 note A_, 4 octave 5 note C#, 2 @@ -119,10 +120,10 @@ Music_ShowMeAround_branch_edc44: note F#, 1 note F_, 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 note E_, 1 - callchannel Music_ShowMeAround_branch_edc8e + sound_call .sub2 note A_, 2 octave 5 note E_, 2 @@ -134,9 +135,9 @@ Music_ShowMeAround_branch_edc44: note A_, 2 note A_, 2 note A_, 4 - loopchannel 0, Music_ShowMeAround_branch_edc44 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edc86: +.sub1: octave 3 note A_, 2 octave 4 @@ -144,9 +145,9 @@ Music_ShowMeAround_branch_edc86: note E_, 4 note D_, 2 note F#, 2 - endchannel + sound_ret -Music_ShowMeAround_branch_edc8e: +.sub2: octave 5 note C#, 2 octave 4 @@ -156,60 +157,60 @@ Music_ShowMeAround_branch_edc8e: note F#, 2 octave 4 note A_, 2 - endchannel + sound_ret -Music_ShowMeAround_branch_edc98: - note __, 4 +.sub3: + rest 4 octave 3 note C#, 1 - note __, 5 + rest 5 note D_, 4 note C_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note C#, 1 - note __, 5 + rest 5 octave 2 note E_, 1 - note __, 3 + rest 3 note A#, 2 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_ShowMeAround_Ch3: - stereopanning $f0 - vibrato $10, $22 - notetype $6, $25 + stereo_panning TRUE, FALSE + vibrato 16, 2, 2 + note_type 6, 2, 5 octave 2 note B_, 1 - note __, 3 + rest 3 octave 3 note D_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 octave 4 note D_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note D_, 2 - note __, 6 + rest 6 note D_, 2 octave 3 note B_, 2 note G#, 2 note B_, 2 note E_, 2 - note __, 6 - intensity $14 + rest 6 + volume_envelope 1, 4 octave 2 note B_, 1 note A#, 1 @@ -218,132 +219,132 @@ Music_ShowMeAround_Ch3: note G_, 1 note F_, 1 note E_, 2 - intensity $14 -Music_ShowMeAround_branch_edcd9: - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edd0f - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edd0f - loopchannel 0, Music_ShowMeAround_branch_edcd9 + volume_envelope 1, 4 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edcef: +.sub1: octave 2 note A_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 8 note D#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 - note __, 6 + rest 6 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 6 + rest 6 note C#, 4 note D_, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_ShowMeAround_branch_edd0f: +.sub2: octave 2 note A_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 8 note D#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 6 + rest 6 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_ShowMeAround_Ch4: - togglenoise $3 - notetype $c - note __, 16 - note __, 8 - note D_, 2 - note D#, 2 - note F#, 4 -Music_ShowMeAround_branch_edd39: - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd5e - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd5e - loopchannel 0, Music_ShowMeAround_branch_edd39 + toggle_noise 3 + drum_speed 12 + rest 16 + rest 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 7, 4 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edd4f: - note D#, 2 - note F#, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note F#, 4 - note D_, 2 - note D#, 2 - note F#, 4 - note D_, 2 - note G_, 2 - note G_, 2 - note D_, 2 - note D#, 2 - endchannel +.sub1: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret -Music_ShowMeAround_branch_edd5e: - note D#, 2 - note F#, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note F#, 4 - note D_, 2 - note D#, 2 - note F#, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note F#, 2 - endchannel +.sub2: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret diff --git a/crysaudio/music/sprouttower.asm b/crysaudio/music/sprouttower.asm index d44de631..c77e4426 100644 --- a/crysaudio/music/sprouttower.asm +++ b/crysaudio/music/sprouttower.asm @@ -1,21 +1,22 @@ Music_SproutTower: - musicheader 4, 1, Music_SproutTower_Ch1 - musicheader 1, 2, Music_SproutTower_Ch2 - musicheader 1, 3, Music_SproutTower_Ch3 - musicheader 1, 4, Music_SproutTower_Ch4 + channel_count 4 + channel 1, Music_SproutTower_Ch1 + channel 2, Music_SproutTower_Ch2 + channel 3, Music_SproutTower_Ch3 + channel 4, Music_SproutTower_Ch4 Music_SproutTower_Ch1: tempo 176 - volume $77 - dutycycle $3 - tone $0002 - vibrato $8, $45 - stereopanning $f - notetype $c, $a3 - note __, 16 - note __, 16 -Music_SproutTower_branch_f6994: - note __, 6 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 8, 4, 5 + stereo_panning FALSE, TRUE + note_type 12, 10, 3 + rest 16 + rest 16 +.mainloop: + rest 6 octave 3 note F_, 2 note F#, 4 @@ -39,18 +40,18 @@ Music_SproutTower_branch_f6994: note F_, 2 note D#, 2 note C#, 2 - intensity $a5 + volume_envelope 10, 5 note C_, 8 - intensity $a3 + volume_envelope 10, 3 note C#, 2 note C_, 2 octave 2 note A#, 2 octave 3 note C#, 2 - intensity $a7 + volume_envelope 10, 7 note C_, 16 - intensity $a3 + volume_envelope 10, 3 note F_, 4 note F_, 4 note F#, 4 @@ -59,13 +60,13 @@ Music_SproutTower_branch_f6994: note F_, 4 note D#, 4 note D#, 4 - loopchannel 0, Music_SproutTower_branch_f6994 + sound_loop 0, .mainloop Music_SproutTower_Ch2: - dutycycle $3 - tone $0001 - vibrato $8, $48 - notetype $c, $b2 + duty_cycle 3 + pitch_offset 1 + vibrato 8, 4, 8 + note_type 12, 11, 2 octave 3 note F_, 4 note F_, 4 @@ -75,8 +76,8 @@ Music_SproutTower_Ch2: note F_, 4 note D#, 4 note D#, 4 -Music_SproutTower_branch_f69dc: - intensity $b5 +.mainloop: + volume_envelope 11, 5 octave 4 note C_, 4 octave 3 @@ -91,9 +92,9 @@ Music_SproutTower_branch_f69dc: octave 3 note A#, 2 note F#, 4 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note F#, 4 note A#, 4 octave 4 @@ -108,90 +109,90 @@ Music_SproutTower_branch_f69dc: note D#, 2 note C#, 2 note C_, 8 - intensity $b5 + volume_envelope 11, 5 note C#, 2 note C_, 2 octave 3 note A#, 2 note F#, 2 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - intensity $b5 + volume_envelope 11, 5 octave 4 note C_, 2 octave 3 note A#, 2 note F#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b3 + volume_envelope 11, 3 note F_, 4 note F_, 4 note F#, 4 note A#, 2 note F_, 1 note A#, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note C_, 16 - note __, 16 - loopchannel 0, Music_SproutTower_branch_f69dc + rest 16 + sound_loop 0, .mainloop Music_SproutTower_Ch3: - vibrato $14, $e8 - notetype $c, $14 + vibrato 20, 14, 8 + note_type 12, 1, 4 octave 3 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - stereopanning $f0 -Music_SproutTower_branch_f6a3e: - note __, 4 + stereo_panning TRUE, FALSE +.mainloop: + rest 4 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 2 octave 3 note D#, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 8 note F#, 4 @@ -201,42 +202,42 @@ Music_SproutTower_branch_f6a3e: note F#, 4 note F_, 16 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 - loopchannel 0, Music_SproutTower_branch_f6a3e + sound_loop 0, .mainloop Music_SproutTower_Ch4: - togglenoise $0 - notetype $c - note __, 4 -Music_SproutTower_branch_f6a7f: - note F#, 4 - stereopanning $f0 - note D#, 4 - note F#, 2 - stereopanning $f - note D#, 2 - stereopanning $ff - note F#, 4 - note F#, 4 - stereopanning $f - note D#, 4 - note F#, 2 - stereopanning $f0 - note D#, 2 - stereopanning $ff - note F#, 4 - loopchannel 0, Music_SproutTower_branch_f6a7f + toggle_noise 0 + drum_speed 12 + rest 4 +.mainloop: + drum_note 7, 4 + stereo_panning TRUE, FALSE + drum_note 4, 4 + drum_note 7, 2 + stereo_panning FALSE, TRUE + drum_note 4, 2 + stereo_panning TRUE, TRUE + drum_note 7, 4 + drum_note 7, 4 + stereo_panning FALSE, TRUE + drum_note 4, 4 + drum_note 7, 2 + stereo_panning TRUE, FALSE + drum_note 4, 2 + stereo_panning TRUE, TRUE + drum_note 7, 4 + sound_loop 0, .mainloop diff --git a/crysaudio/music/ssaqua.asm b/crysaudio/music/ssaqua.asm index 5b06b27b..8d00d46d 100644 --- a/crysaudio/music/ssaqua.asm +++ b/crysaudio/music/ssaqua.asm @@ -1,48 +1,49 @@ Music_SSAqua: - musicheader 4, 1, Music_SSAqua_Ch1 - musicheader 1, 2, Music_SSAqua_Ch2 - musicheader 1, 3, Music_SSAqua_Ch3 - musicheader 1, 4, Music_SSAqua_Ch4 + channel_count 4 + channel 1, Music_SSAqua_Ch1 + channel 2, Music_SSAqua_Ch2 + channel 3, Music_SSAqua_Ch3 + channel 4, Music_SSAqua_Ch4 Music_SSAqua_Ch1: tempo 117 - volume $77 - stereopanning $f - tone $0001 - vibrato $12, $33 - dutycycle $2 - notetype $6, $97 + volume 7, 7 + stereo_panning FALSE, TRUE + pitch_offset 1 + vibrato 18, 3, 3 + duty_cycle 2 + note_type 6, 9, 7 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 -Music_SSAqua_branch_eadbc: + rest 1 +.mainloop: octave 2 note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $97 + rest 2 + note_type 12, 9, 7 note G_, 2 note G_, 10 - note __, 4 - notetype $6, $97 + rest 4 + note_type 6, 9, 7 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $97 + rest 2 + note_type 12, 9, 7 note G_, 2 note G_, 8 - note __, 8 - dutycycle $1 - intensity $61 - callchannel Music_SSAqua_branch_eaff5 + rest 8 + duty_cycle 1 + volume_envelope 6, 1 + sound_call Music_SSAqua_Ch2.sub4 octave 5 note G_, 1 octave 4 @@ -67,29 +68,29 @@ Music_SSAqua_branch_eadbc: note B_, 1 note A_, 1 note G_, 1 - callchannel Music_SSAqua_branch_eaff5 - callchannel Music_SSAqua_branch_eb03e - note __, 16 - note __, 16 - note __, 16 - intensity $97 - note __, 14 - notetype $6, $97 + sound_call Music_SSAqua_Ch2.sub4 + sound_call Music_SSAqua_Ch2.sub5 + rest 16 + rest 16 + rest 16 + volume_envelope 9, 7 + rest 14 + note_type 6, 9, 7 note D_, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 - notetype $c, $97 - note __, 16 - note __, 16 - intensity $95 - note __, 2 + rest 1 + note_type 12, 9, 7 + rest 16 + rest 16 + volume_envelope 9, 5 + rest 2 octave 4 note C_, 1 note E_, 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 note C_, 1 octave 3 @@ -116,8 +117,8 @@ Music_SSAqua_branch_eadbc: octave 4 note G_, 1 note F#, 1 - dutycycle $2 - intensity $97 + duty_cycle 2 + volume_envelope 9, 7 note G_, 8 note F#, 8 note E_, 8 @@ -125,48 +126,48 @@ Music_SSAqua_branch_eadbc: octave 3 note B_, 8 note A#, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 2 - intensity $75 + volume_envelope 7, 5 octave 5 note A_, 4 note F#, 4 note D_, 4 octave 4 note A#, 2 - notetype $6, $97 + note_type 6, 9, 7 note D_, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 - intensity $97 + rest 1 + volume_envelope 9, 7 note G_, 16 note A_, 16 note B_, 4 - note __, 4 + rest 4 note B_, 4 - note __, 4 + rest 4 octave 4 note E_, 8 note G_, 8 note F#, 1 - vibrato $0, $0 - intensity $88 + vibrato 0, 0, 0 + volume_envelope 8, 8 note G_, 10 - vibrato $2, $23 - intensity $87 + vibrato 2, 2, 3 + volume_envelope 8, 7 note G_, 9 - vibrato $8, $33 + vibrato 8, 3, 3 note C_, 4 note E_, 4 note C_, 4 note D_, 12 note F#, 12 - note __, 8 + rest 8 octave 2 note B_, 2 octave 3 @@ -179,10 +180,10 @@ Music_SSAqua_branch_eadbc: octave 4 note D_, 2 note F#, 2 - notetype $c, $97 - note __, 7 - note __, 16 - note __, 16 + note_type 12, 9, 7 + rest 7 + rest 16 + rest 16 note G_, 8 note F#, 1 note D_, 1 @@ -207,24 +208,24 @@ Music_SSAqua_branch_eadbc: octave 4 note D_, 1 note F#, 1 - note __, 7 - note __, 16 - note __, 2 + rest 7 + rest 16 + rest 2 note E_, 2 note G_, 1 - note __, 1 + rest 1 note E_, 1 - notetype $6, $97 - note __, 1 + note_type 6, 9, 7 + rest 1 note C_, 1 note C#, 4 octave 3 note B_, 2 - note __, 2 + rest 2 note A_, 3 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note F#, 2 note D_, 2 octave 2 @@ -246,27 +247,27 @@ Music_SSAqua_branch_eadbc: note D_, 2 note F#, 2 note A_, 2 - loopchannel 0, Music_SSAqua_branch_eadbc + sound_loop 0, .mainloop Music_SSAqua_Ch2: - stereopanning $f0 - dutycycle $2 - vibrato $8, $33 - notetype $c, $b7 - note __, 2 -Music_SSAqua_branch_eaed5: - notetype $c, $b7 - dutycycle $1 - intensity $61 - callchannel Music_SSAqua_branch_eaff5 - callchannel Music_SSAqua_branch_eb03e - dutycycle $2 - intensity $d7 - callchannel Music_SSAqua_branch_eafe0 + stereo_panning TRUE, FALSE + duty_cycle 2 + vibrato 8, 3, 3 + note_type 12, 11, 7 + rest 2 +.mainloop: + note_type 12, 11, 7 + duty_cycle 1 + volume_envelope 6, 1 + sound_call .sub4 + sound_call .sub5 + duty_cycle 2 + volume_envelope 13, 7 + sound_call .sub3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 octave 3 note G_, 6 note G_, 1 @@ -274,30 +275,30 @@ Music_SSAqua_branch_eaed5: octave 4 note C#, 1 note E_, 1 - pitchoffset 0, CC - callchannel Music_SSAqua_branch_eafe0 - pitchoffset 0, C_ + transpose 0, 12 + sound_call .sub3 + transpose 0, 0 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 octave 4 note G_, 6 - note __, 2 - dutycycle $3 - intensity $b7 + rest 2 + duty_cycle 3 + volume_envelope 11, 7 octave 3 note B_, 1 octave 4 note C_, 1 - callchannel Music_SSAqua_branch_eaf88 + sound_call .sub1 note G_, 4 - note __, 4 + rest 4 note G_, 8 note A_, 8 note B_, 8 - notetype $c, $b7 + note_type 12, 11, 7 octave 5 note C_, 10 note D_, 2 @@ -306,92 +307,92 @@ Music_SSAqua_branch_eaed5: note G_, 2 note B_, 6 note A_, 6 - note __, 2 + rest 2 octave 3 note B_, 1 octave 4 note C_, 1 - callchannel Music_SSAqua_branch_eaf88 + sound_call .sub1 note G_, 4 - note __, 4 + rest 4 note G_, 8 note A_, 8 note B_, 8 octave 5 note D#, 1 - vibrato $0, $0 - intensity $98 + vibrato 0, 0, 0 + volume_envelope 9, 8 note E_, 10 - vibrato $4, $23 - intensity $97 + vibrato 4, 2, 3 + volume_envelope 9, 7 note E_, 9 - vibrato $8, $23 + vibrato 8, 2, 3 note D_, 4 note C_, 4 octave 4 note G_, 4 note B_, 12 note A_, 12 - note __, 4 - dutycycle $0 + rest 4 + duty_cycle 0 note B_, 2 note A_, 2 - callchannel Music_SSAqua_branch_eafd5 - notetype $6, $b7 + sound_call .sub2 + note_type 6, 11, 7 note G#, 1 note A_, 11 note G_, 2 note F#, 2 note G_, 12 - note __, 4 - note __, 4 + rest 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 16 note A#, 12 note B_, 2 note A_, 2 - callchannel Music_SSAqua_branch_eafd5 - notetype $6, $b7 + sound_call .sub2 + note_type 6, 11, 7 note G#, 1 note A_, 11 note B_, 4 note G_, 12 - note __, 4 - note __, 4 + rest 4 + rest 4 octave 5 note C_, 4 note D_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 1 + rest 1 octave 4 note A#, 1 note B_, 4 note A_, 2 - note __, 2 + rest 2 note G_, 4 note E_, 2 - note __, 2 + rest 2 note F#, 8 note G_, 8 note A_, 8 - note __, 8 - loopchannel 0, Music_SSAqua_branch_eaed5 + rest 8 + sound_loop 0, .mainloop -Music_SSAqua_branch_eaf88: +.sub1: note D_, 6 octave 3 note B_, 1 @@ -408,51 +409,51 @@ Music_SSAqua_branch_eaf88: octave 4 note C_, 1 note D_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note B_, 6 note F#, 6 - note __, 4 - dutycycle $1 - notetype $6, $b7 + rest 4 + duty_cycle 1 + note_type 6, 11, 7 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - dutycycle $3 + rest 1 + duty_cycle 3 note E_, 2 note F#, 2 note G_, 12 @@ -464,43 +465,43 @@ Music_SSAqua_branch_eaf88: note G_, 4 note E_, 2 note F#, 2 - endchannel + sound_ret -Music_SSAqua_branch_eafd5: - notetype $c, $b7 +.sub2: + note_type 12, 11, 7 note B_, 10 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_SSAqua_branch_eafe0: +.sub3: octave 3 note D_, 10 note E_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note C#, 12 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 8 - note __, 2 + rest 2 octave 2 note B_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_SSAqua_branch_eaff5: +.sub4: octave 5 note G_, 1 note D_, 1 @@ -573,9 +574,9 @@ Music_SSAqua_branch_eaff5: octave 4 note A_, 1 note G_, 1 - endchannel + sound_ret -Music_SSAqua_branch_eb03e: +.sub5: octave 5 note G_, 1 octave 4 @@ -599,36 +600,36 @@ Music_SSAqua_branch_eb03e: note C#, 1 octave 3 note G_, 1 - endchannel + sound_ret Music_SSAqua_Ch3: - stereopanning $ff - vibrato $8, $34 - notetype $6, $15 + stereo_panning TRUE, TRUE + vibrato 8, 3, 4 + note_type 6, 1, 5 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 -Music_SSAqua_branch_eb063: + rest 1 +.mainloop: note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $15 + rest 2 + note_type 12, 1, 5 note G_, 2 note G_, 10 - note __, 4 - notetype $6, $15 + rest 4 + note_type 6, 1, 5 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $15 + rest 2 + note_type 12, 1, 5 note G_, 2 note G_, 8 note B_, 1 @@ -641,531 +642,532 @@ Music_SSAqua_branch_eb063: note B_, 1 octave 4 note E_, 1 - callchannel Music_SSAqua_branch_eb14d - callchannel Music_SSAqua_branch_eb14d -Music_SSAqua_branch_eb08d: + sound_call .sub1 + sound_call .sub1 +.loop1: note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 - loopchannel 4, Music_SSAqua_branch_eb08d - callchannel Music_SSAqua_branch_eb172 - callchannel Music_SSAqua_branch_eb172 - callchannel Music_SSAqua_branch_eb230 + rest 1 + sound_loop 4, .loop1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 - callchannel Music_SSAqua_branch_eb230 + rest 3 + sound_call .sub3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C#, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C#, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_SSAqua_branch_eb063 + rest 1 + sound_loop 0, .mainloop -Music_SSAqua_branch_eb14d: - notetype $6, $15 +.sub1: + note_type 6, 1, 5 octave 2 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_SSAqua_branch_eb172: +.sub2: octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note G_, 4 note F#, 4 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note C#, 2 - note __, 2 + rest 2 octave 4 note B_, 4 note G_, 4 note E_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 - endchannel + rest 3 + sound_ret -Music_SSAqua_branch_eb230: +.sub3: octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_SSAqua_Ch4: - togglenoise $3 - notetype $c - note __, 2 -Music_SSAqua_branch_eb24e: - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - loopchannel 12, Music_SSAqua_branch_eb24e - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2c7 - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2c7 - loopchannel 0, Music_SSAqua_branch_eb24e + toggle_noise 3 + drum_speed 12 + rest 2 +.mainloop: +.loop1: + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + sound_loop 12, .loop1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_loop 0, .mainloop -Music_SSAqua_branch_eb2ae: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - endchannel +.sub1: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + sound_ret -Music_SSAqua_branch_eb2bb: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - endchannel +.sub2: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_ret -Music_SSAqua_branch_eb2c7: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C_, 2 - endchannel +.sub3: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 1, 2 + sound_ret diff --git a/crysaudio/music/successfulcapture.asm b/crysaudio/music/successfulcapture.asm index 1b53f4a1..2c4e355c 100644 --- a/crysaudio/music/successfulcapture.asm +++ b/crysaudio/music/successfulcapture.asm @@ -1,22 +1,23 @@ Music_SuccessfulCapture: - musicheader 3, 1, Music_SuccessfulCapture_Ch1 - musicheader 1, 2, Music_SuccessfulCapture_Ch2 - musicheader 1, 3, Music_SuccessfulCapture_Ch3 + channel_count 3 + channel 1, Music_SuccessfulCapture_Ch1 + channel 2, Music_SuccessfulCapture_Ch2 + channel 3, Music_SuccessfulCapture_Ch3 Music_SuccessfulCapture_Ch1: tempo 126 - volume $77 - dutycycle $3 - tone $0001 - notetype $c, $a1 - jumpchannel Music_SuccessfulCapture_branch_f4536 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + note_type 12, 10, 1 + sound_jump Music_WildPokemonVictory_Ch1.body Music_SuccessfulCapture_Ch2: - vibrato $12, $24 - notetype $c, $c1 - dutycycle $2 - jumpchannel Music_SuccessfulCapture_branch_f4585 + vibrato 18, 2, 4 + note_type 12, 12, 1 + duty_cycle 2 + sound_jump Music_WildPokemonVictory_Ch2.body Music_SuccessfulCapture_Ch3: - notetype $c, $25 - jumpchannel Music_SuccessfulCapture_branch_f45cf + note_type 12, 2, 5 + sound_jump Music_WildPokemonVictory_Ch3.body diff --git a/crysaudio/music/suicunebattle.asm b/crysaudio/music/suicunebattle.asm index 189e6b18..041d307b 100644 --- a/crysaudio/music/suicunebattle.asm +++ b/crysaudio/music/suicunebattle.asm @@ -1,15 +1,16 @@ Music_SuicuneBattle: - musicheader 3, 1, Music_SuicuneBattle_Ch1 - musicheader 1, 2, Music_SuicuneBattle_Ch2 - musicheader 1, 3, Music_SuicuneBattle_Ch3 + channel_count 3 + channel 1, Music_SuicuneBattle_Ch1 + channel 2, Music_SuicuneBattle_Ch2 + channel 3, Music_SuicuneBattle_Ch3 Music_SuicuneBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b7 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 7 octave 4 note A_, 1 note G#, 1 @@ -29,7 +30,7 @@ Music_SuicuneBattle_Ch1: note C#, 4 octave 2 note A#, 2 - notetype $c, $b2 + note_type 12, 11, 2 note A_, 2 note A_, 4 note A_, 2 @@ -41,11 +42,11 @@ Music_SuicuneBattle_Ch1: note A_, 2 note A_, 2 note A_, 2 - notetype $c, $b3 + note_type 12, 11, 3 octave 4 note F_, 4 note E_, 2 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note A_, 4 note A_, 2 @@ -57,11 +58,11 @@ Music_SuicuneBattle_Ch1: note A_, 2 note A_, 2 note A_, 2 - notetype $c, $b3 + note_type 12, 11, 3 octave 4 note F_, 4 note E_, 2 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note A_, 4 note A_, 2 @@ -73,11 +74,11 @@ Music_SuicuneBattle_Ch1: note A_, 2 note A_, 2 note A_, 2 - notetype $c, $b3 + note_type 12, 11, 3 octave 4 note F_, 4 note E_, 2 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note A_, 4 note A_, 2 @@ -94,8 +95,8 @@ Music_SuicuneBattle_Ch1: octave 3 note E_, 1 note G#, 1 -Music_SuicuneBattle_branch_178bfc: - notetype $c, $b4 +.mainloop: + note_type 12, 11, 4 octave 2 note A_, 2 note B_, 2 @@ -246,12 +247,12 @@ Music_SuicuneBattle_branch_178bfc: note A_, 2 note G_, 2 note C_, 2 - notetype $c, $b3 + note_type 12, 11, 3 octave 2 note B_, 2 octave 3 note C_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 2 note C_, 2 @@ -271,24 +272,24 @@ Music_SuicuneBattle_branch_178bfc: note C_, 2 octave 2 note G_, 2 - note __, 2 - notetype $c, $b6 + rest 2 + note_type 12, 11, 6 octave 3 note G_, 10 - notetype $c, $b3 + note_type 12, 11, 3 note C_, 2 octave 2 note G_, 2 - note __, 2 - notetype $c, $b7 + rest 2 + note_type 12, 11, 7 octave 3 note G_, 10 - notetype $c, $b3 + note_type 12, 11, 3 octave 2 note B_, 2 octave 3 note C_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 2 note C_, 2 @@ -329,7 +330,7 @@ Music_SuicuneBattle_branch_178bfc: note C_, 2 octave 3 note G_, 2 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note B_, 2 note B_, 6 @@ -338,31 +339,31 @@ Music_SuicuneBattle_branch_178bfc: note B_, 2 note B_, 6 note B_, 2 - notetype $c, $b4 + note_type 12, 11, 4 octave 3 note C_, 6 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note B_, 2 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note B_, 2 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note B_, 2 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 2 note B_, 2 octave 3 @@ -374,61 +375,61 @@ Music_SuicuneBattle_branch_178bfc: note A_, 1 octave 4 note C_, 1 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 4 note C_, 6 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note B_, 2 - notetype $c, $b4 + note_type 12, 11, 4 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note B_, 2 - notetype $c, $b4 + note_type 12, 11, 4 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 note B_, 2 - notetype $c, $b4 + note_type 12, 11, 4 octave 1 note F#, 4 - notetype $c, $b2 + note_type 12, 11, 2 octave 3 note B_, 2 - notetype $c, $b5 + note_type 12, 11, 5 octave 4 note C_, 6 - notetype $c, $b7 + note_type 12, 11, 7 octave 2 note B_, 8 note E_, 8 @@ -442,7 +443,7 @@ Music_SuicuneBattle_branch_178bfc: note C_, 2 note D_, 2 note C_, 2 - notetype $c, $a0 + note_type 12, 10, 0 octave 1 note F#, 8 note B_, 8 @@ -453,22 +454,22 @@ Music_SuicuneBattle_branch_178bfc: note B_, 8 note E_, 8 note F_, 8 - notetype $c, $a7 + note_type 12, 10, 7 note F_, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype $c, $b2 - note __, 4 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + note_type 12, 11, 2 + rest 4 octave 3 note D_, 8 note D_, 8 @@ -487,19 +488,19 @@ Music_SuicuneBattle_branch_178bfc: note F_, 8 note F_, 4 note E_, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - vibrato $8, $24 - dutycycle $2 - notetype $c, $96 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + vibrato 8, 2, 4 + duty_cycle 2 + note_type 12, 9, 6 octave 4 note E_, 6 note F#, 6 @@ -507,15 +508,15 @@ Music_SuicuneBattle_branch_178bfc: note A_, 4 octave 4 note A_, 16 - vibrato $12, $15 - dutycycle $3 - loopchannel 0, Music_SuicuneBattle_branch_178bfc + vibrato 18, 1, 5 + duty_cycle 3 + sound_loop 0, .mainloop Music_SuicuneBattle_Ch2: - dutycycle $3 - vibrato $14, $34 - tone $0001 - notetype $c, $c3 + duty_cycle 3 + vibrato 20, 3, 4 + pitch_offset 1 + note_type 12, 12, 3 octave 5 note E_, 1 octave 4 @@ -556,62 +557,62 @@ Music_SuicuneBattle_Ch2: octave 4 note E_, 1 note A_, 6 - notetype $c, $c2 + note_type 12, 12, 2 octave 2 note E_, 8 note E_, 8 note E_, 8 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note A#, 4 - notetype $c, $c2 + note_type 12, 12, 2 note A_, 4 octave 2 note E_, 8 note E_, 8 note E_, 8 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note A#, 4 - notetype $c, $c2 + note_type 12, 12, 2 note A_, 4 octave 4 note E_, 8 note E_, 8 note E_, 8 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note A#, 4 - notetype $c, $c2 + note_type 12, 12, 2 note A_, 4 octave 4 note E_, 8 note E_, 8 note E_, 8 note E_, 4 -Music_SuicuneBattle_branch_178e4e: - notetype $c, $c7 +.mainloop: + note_type 12, 12, 7 octave 3 note A_, 8 note B_, 8 note D_, 8 - notetype $c, $b0 + note_type 12, 11, 0 octave 4 note D_, 8 - notetype $c, $b6 + note_type 12, 11, 6 note D_, 8 - vibrato $10, $24 - dutycycle $2 - notetype $c, $a4 + vibrato 16, 2, 4 + duty_cycle 2 + note_type 12, 10, 4 octave 5 note A_, 6 note B_, 6 note D_, 4 octave 6 note D_, 8 - vibrato $14, $34 - dutycycle $3 - notetype $c, $c7 + vibrato 20, 3, 4 + duty_cycle 3 + note_type 12, 12, 7 octave 4 note C_, 8 note D_, 8 @@ -619,40 +620,40 @@ Music_SuicuneBattle_branch_178e4e: note G_, 8 octave 4 note F_, 8 - notetype $c, $b0 + note_type 12, 11, 0 note E_, 10 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 6 - notetype $c, $a5 + note_type 12, 10, 5 octave 2 note G_, 4 note A_, 4 note G_, 4 note B_, 4 - notetype $c, $c7 + note_type 12, 12, 7 octave 3 note A_, 8 note B_, 8 note D_, 8 - notetype $c, $c7 + note_type 12, 12, 7 octave 4 note D_, 8 - notetype $c, $4c + note_type 12, 4, -4 note D_, 4 - notetype $c, $c6 + note_type 12, 12, 6 note D_, 4 - notetype $c, $a4 - vibrato $8, $24 - dutycycle $2 + note_type 12, 10, 4 + vibrato 8, 2, 4 + duty_cycle 2 octave 5 note A_, 6 note B_, 6 note D_, 4 octave 6 note D_, 8 - vibrato $14, $34 - notetype $c, $c7 - dutycycle $3 + vibrato 20, 3, 4 + note_type 12, 12, 7 + duty_cycle 3 octave 4 note C_, 8 note D_, 8 @@ -660,18 +661,18 @@ Music_SuicuneBattle_branch_178e4e: note G_, 8 octave 4 note F_, 8 - notetype $c, $4c + note_type 12, 4, -4 note E_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note E_, 8 - notetype $c, $c6 + note_type 12, 12, 6 note C_, 8 note G_, 8 - notetype $c, $c2 + note_type 12, 12, 2 octave 3 note F#, 2 note G_, 2 - note __, 2 + rest 2 note B_, 4 note A_, 2 note G_, 2 @@ -686,23 +687,23 @@ Music_SuicuneBattle_branch_178e4e: note F#, 2 note G_, 2 note C_, 2 - note __, 2 - notetype $c, $c7 + rest 2 + note_type 12, 12, 7 octave 4 note C_, 10 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note G_, 2 note C_, 2 - note __, 2 - notetype $c, $c7 + rest 2 + note_type 12, 12, 7 octave 5 note C_, 10 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note F#, 2 note G_, 2 - note __, 2 + rest 2 note B_, 4 note A_, 2 note G_, 2 @@ -715,12 +716,12 @@ Music_SuicuneBattle_branch_178e4e: note F#, 2 note E_, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 8 note F#, 8 note E_, 8 note G_, 8 - notetype $c, $c2 + note_type 12, 12, 2 octave 3 note F#, 2 note F#, 6 @@ -729,85 +730,85 @@ Music_SuicuneBattle_branch_178e4e: note F#, 2 note F#, 6 note F#, 2 - notetype $c, $b7 + note_type 12, 11, 7 note G_, 6 - notetype $c, $c2 + note_type 12, 12, 2 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 3 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 3 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 3 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 6 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 6 - notetype $c, $c2 + note_type 12, 12, 2 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 4 - notetype $c, $c2 + note_type 12, 12, 2 octave 4 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 6 - notetype $c, $b0 + note_type 12, 11, 0 octave 3 note F#, 8 octave 2 @@ -820,10 +821,10 @@ Music_SuicuneBattle_branch_178e4e: note B_, 8 octave 3 note C_, 8 - notetype $c, $b7 + note_type 12, 11, 7 octave 3 note C_, 8 - notetype $c, $c7 + note_type 12, 12, 7 octave 1 note B_, 8 octave 2 @@ -833,13 +834,13 @@ Music_SuicuneBattle_branch_178e4e: note E_, 8 octave 1 note B_, 8 - notetype $c, $b0 + note_type 12, 11, 0 octave 2 note C_, 10 - notetype $c, $b7 + note_type 12, 11, 7 octave 2 note C_, 6 - notetype $c, $c3 + note_type 12, 12, 3 octave 1 note B_, 2 octave 2 @@ -1060,9 +1061,9 @@ Music_SuicuneBattle_branch_178e4e: octave 4 note D_, 2 note G_, 2 - notetype $c, $c2 + note_type 12, 12, 2 note A_, 8 - notetype $c, $c3 + note_type 12, 12, 3 octave 2 note A_, 2 note B_, 2 @@ -1184,12 +1185,12 @@ Music_SuicuneBattle_branch_178e4e: note E_, 2 note A_, 2 note B_, 2 - loopchannel 0, Music_SuicuneBattle_branch_178e4e + sound_loop 0, .mainloop Music_SuicuneBattle_Ch3: - notetype $c, $18 - note __, 16 - note __, 4 + note_type 12, 1, 8 + rest 16 + rest 4 octave 2 note A_, 4 note D_, 2 @@ -1278,8 +1279,8 @@ Music_SuicuneBattle_Ch3: octave 2 note D_, 2 note E_, 2 - notetype $c, $16 -Music_SuicuneBattle_branch_179182: + note_type 12, 1, 6 +.mainloop: octave 1 note A_, 2 octave 2 @@ -1581,24 +1582,24 @@ Music_SuicuneBattle_branch_179182: note G_, 2 note F#, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 note G_, 6 note F#, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 note G_, 6 note B_, 2 @@ -1662,27 +1663,27 @@ Music_SuicuneBattle_branch_179182: note B_, 8 octave 2 note C_, 16 - note __, 4 + rest 4 octave 1 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 - note __, 4 + rest 2 + rest 4 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 - note __, 4 + rest 2 + rest 4 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 - note __, 4 + rest 2 + rest 4 note B_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 2 + rest 2 note B_, 2 octave 2 note F_, 2 @@ -1889,7 +1890,7 @@ Music_SuicuneBattle_branch_179182: note D_, 2 note G#, 2 note A_, 4 - note __, 4 + rest 4 octave 1 note A_, 2 octave 2 @@ -2053,4 +2054,4 @@ Music_SuicuneBattle_branch_179182: note E_, 2 note D_, 2 note E_, 2 - loopchannel 0, Music_SuicuneBattle_branch_179182 + sound_loop 0, .mainloop diff --git a/crysaudio/music/surf.asm b/crysaudio/music/surf.asm index c3948f5f..ac1faed5 100644 --- a/crysaudio/music/surf.asm +++ b/crysaudio/music/surf.asm @@ -1,78 +1,79 @@ Music_Surf: - musicheader 3, 1, Music_Surf_Ch1 - musicheader 1, 2, Music_Surf_Ch2 - musicheader 1, 3, Music_Surf_Ch3 + channel_count 3 + channel 1, Music_Surf_Ch1 + channel 2, Music_Surf_Ch2 + channel 3, Music_Surf_Ch3 - db $3 + db $3 ; unused Music_Surf_Ch1: tempo 108 - volume $77 - notetype $c, $a7 - stereopanning $f -Music_Surf_branch_f519e: - dutycycle $2 - vibrato $10, $24 - intensity $73 + volume 7, 7 + note_type 12, 10, 7 + stereo_panning FALSE, TRUE +.mainloop: + duty_cycle 2 + vibrato 16, 2, 4 + volume_envelope 7, 3 octave 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $73 + rest 1 + volume_envelope 7, 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $73 + rest 1 + volume_envelope 7, 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 1 - intensity $93 - note __, 1 + volume_envelope 9, 3 + rest 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $a7 + rest 1 + volume_envelope 10, 7 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 1 - intensity $b7 - note __, 1 + volume_envelope 11, 7 + rest 1 note A#, 2 note G#, 2 note F_, 2 note D_, 2 - notetype $8, $c7 + note_type 8, 12, 7 octave 2 note A#, 2 octave 3 note D_, 2 note F_, 2 - intensity $f7 + volume_envelope 15, 7 note G#, 2 note A#, 2 octave 4 note D_, 2 - dutycycle $0 - callchannel Music_Surf_branch_f5233 - dutycycle $1 - notetype $8, $a7 - callchannel Music_Surf_branch_f5233 - callchannel Music_Surf_branch_f5293 + duty_cycle 0 + sound_call .sub1 + duty_cycle 1 + note_type 8, 10, 7 + sound_call .sub1 + sound_call .sub2 octave 4 note C_, 2 octave 3 @@ -85,26 +86,26 @@ Music_Surf_branch_f519e: note C_, 2 note D#, 2 note G_, 2 - dutycycle $1 - notetype $6, $97 - callchannel Music_Surf_branch_f5293 - intensity $a8 + duty_cycle 1 + note_type 6, 9, 7 + sound_call .sub2 + volume_envelope 10, 8 note G#, 6 note A_, 6 note A#, 3 octave 4 note D_, 3 - intensity $a8 - dutycycle $1 - callchannel Music_Surf_branch_f52d9 + volume_envelope 10, 8 + duty_cycle 1 + sound_call .sub3 octave 3 note D#, 8 note G#, 8 note D#, 8 - dutycycle $3 - notetype $8, $98 - callchannel Music_Surf_branch_f52d9 - notetype $c, $a7 + duty_cycle 3 + note_type 8, 9, 8 + sound_call .sub3 + note_type 12, 10, 7 octave 3 note D#, 12 octave 2 @@ -117,89 +118,89 @@ Music_Surf_branch_f519e: note B_, 2 octave 3 note D#, 2 - loopchannel 0, Music_Surf_branch_f519e + sound_loop 0, .mainloop -Music_Surf_branch_f5233: - notetype $c, $a7 +.sub1: + note_type 12, 10, 7 octave 3 note D#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note C#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note C#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note C_, 4 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 4 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 - notetype $6, $a7 + rest 1 + note_type 6, 10, 7 octave 3 note A#, 1 note B_, 15 @@ -211,9 +212,9 @@ Music_Surf_branch_f5233: note F_, 8 note C#, 4 note D_, 4 - endchannel + sound_ret -Music_Surf_branch_f5293: +.sub2: octave 4 note G#, 16 note D#, 4 @@ -226,7 +227,7 @@ Music_Surf_branch_f5293: note D#, 4 note G_, 4 note G#, 4 - notetype $8, $92 + note_type 8, 9, 2 note A#, 2 note F_, 2 note D_, 2 @@ -251,7 +252,7 @@ Music_Surf_branch_f5293: note A#, 2 octave 4 note D_, 2 - notetype $6, $97 + note_type 6, 9, 7 note C#, 1 note D_, 15 note G_, 4 @@ -264,7 +265,7 @@ Music_Surf_branch_f5293: note G_, 4 note A_, 4 note A#, 4 - notetype $8, $92 + note_type 8, 9, 2 octave 5 note C_, 2 octave 4 @@ -277,16 +278,16 @@ Music_Surf_branch_f5293: note C_, 2 octave 3 note G_, 2 - endchannel + sound_ret -Music_Surf_branch_f52d9: +.sub3: octave 3 note A#, 3 note G_, 3 note A#, 3 octave 4 note D#, 9 - notetype $6, $58 + note_type 6, 5, 8 note D_, 1 note C#, 1 note C_, 1 @@ -296,7 +297,7 @@ Music_Surf_branch_f52d9: note A_, 1 note G#, 1 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note D#, 4 note D_, 4 note D#, 4 @@ -316,7 +317,7 @@ Music_Surf_branch_f52d9: octave 4 note C_, 4 note F_, 12 - intensity $58 + volume_envelope 5, 8 note D#, 1 note D_, 1 note C#, 1 @@ -326,7 +327,7 @@ Music_Surf_branch_f52d9: note A#, 1 note A_, 1 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 8 octave 4 note D#, 4 @@ -336,31 +337,31 @@ Music_Surf_branch_f52d9: note D#, 8 octave 2 note B_, 8 - endchannel + sound_ret Music_Surf_Ch2: -Music_Surf_branch_f5317: - notetype $c, $c2 - stereopanning $f0 - dutycycle $2 - vibrato $14, $23 -Music_Surf_branch_f5321: +.mainloop: + note_type 12, 12, 2 + stereo_panning TRUE, FALSE + duty_cycle 2 + vibrato 20, 2, 3 +.loop1: octave 1 note A#, 4 octave 2 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 - loopchannel 3, Music_Surf_branch_f5321 + rest 3 + sound_loop 3, .loop1 octave 1 note A#, 4 octave 2 note F_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 -Music_Surf_branch_f5333: + rest 3 +.loop2: note D#, 4 note G_, 2 note G#, 2 @@ -395,56 +396,56 @@ Music_Surf_branch_f5333: note B_, 4 note A#, 4 note G#, 4 - loopchannel 2, Music_Surf_branch_f5333 - intensity $c7 - callchannel Music_Surf_branch_f53b2 + sound_loop 2, .loop2 + volume_envelope 12, 7 + sound_call .sub1 note D#, 4 note D_, 4 note C#, 4 - callchannel Music_Surf_branch_f53b2 + sound_call .sub1 note D_, 4 note D#, 4 octave 1 note A#, 4 - notetype $6, $b8 - callchannel Music_Surf_branch_f53d6 - dutycycle $1 - intensity $b8 - callchannel Music_Surf_branch_f53e8 - dutycycle $2 - callchannel Music_Surf_branch_f53f3 - dutycycle $1 - intensity $b8 - callchannel Music_Surf_branch_f5404 + note_type 6, 11, 8 + sound_call .sub2 + duty_cycle 1 + volume_envelope 11, 8 + sound_call .sub3 + duty_cycle 2 + sound_call .sub4 + duty_cycle 1 + volume_envelope 11, 8 + sound_call .sub5 octave 3 note B_, 16 octave 4 note C#, 8 - pitchoffset 0, CC - dutycycle $3 - callchannel Music_Surf_branch_f53d6 - intensity $b8 - dutycycle $1 - callchannel Music_Surf_branch_f53e8 - dutycycle $3 - callchannel Music_Surf_branch_f53f3 - intensity $b8 - dutycycle $1 - callchannel Music_Surf_branch_f5404 - pitchoffset 0, C_ - notetype $c, $b8 + transpose 0, 12 + duty_cycle 3 + sound_call .sub2 + volume_envelope 11, 8 + duty_cycle 1 + sound_call .sub3 + duty_cycle 3 + sound_call .sub4 + volume_envelope 11, 8 + duty_cycle 1 + sound_call .sub5 + transpose 0, 0 + note_type 12, 11, 8 octave 4 note B_, 12 - dutycycle $2 + duty_cycle 2 note A#, 4 note G#, 4 note D#, 4 note G#, 4 note A#, 4 note B_, 4 - loopchannel 0, Music_Surf_branch_f5317 + sound_loop 0, .mainloop -Music_Surf_branch_f53b2: +.sub1: octave 1 note G#, 4 octave 3 @@ -480,15 +481,15 @@ Music_Surf_branch_f53b2: octave 3 note F_, 4 note G_, 4 - endchannel + sound_ret -Music_Surf_branch_f53d6: +.sub2: octave 4 note F_, 4 note D#, 4 note F_, 4 note G_, 12 - intensity $58 + volume_envelope 5, 8 note F#, 1 note F_, 1 note E_, 1 @@ -499,9 +500,9 @@ Music_Surf_branch_f53d6: octave 3 note B_, 1 note A_, 1 - endchannel + sound_ret -Music_Surf_branch_f53e8: +.sub3: note A#, 7 octave 4 note C_, 8 @@ -512,15 +513,15 @@ Music_Surf_branch_f53e8: octave 4 note C_, 16 note G_, 8 - endchannel + sound_ret -Music_Surf_branch_f53f3: +.sub4: note F#, 1 note G_, 3 note F_, 4 note G_, 4 note G#, 12 - intensity $58 + volume_envelope 5, 8 note G_, 1 note F#, 1 note F_, 1 @@ -530,9 +531,9 @@ Music_Surf_branch_f53f3: note C#, 1 octave 3 note B_, 1 - endchannel + sound_ret -Music_Surf_branch_f5404: +.sub5: octave 4 note C_, 8 note G_, 4 @@ -540,13 +541,13 @@ Music_Surf_branch_f5404: note A#, 8 note G#, 8 note D#, 8 - endchannel + sound_ret Music_Surf_Ch3: -Music_Surf_branch_f540c: - stereopanning $ff - notetype $c, $15 - vibrato $16, $23 +.mainloop: + stereo_panning TRUE, TRUE + note_type 12, 1, 5 + vibrato 22, 2, 3 octave 4 note A#, 12 octave 5 @@ -556,12 +557,12 @@ Music_Surf_branch_f540c: note F_, 4 note G_, 4 note G#, 4 - intensity $12 + volume_envelope 1, 2 note A#, 12 - note __, 4 + rest 4 note G#, 4 note G_, 4 - notetype $6, $12 + note_type 6, 1, 2 note F#, 1 note G_, 15 note G#, 4 @@ -569,24 +570,24 @@ Music_Surf_branch_f540c: note F_, 16 octave 4 note A#, 8 - notetype $c, $12 + note_type 12, 1, 2 octave 5 note G#, 16 note G_, 4 note F_, 4 - notetype $6, $12 + note_type 6, 1, 2 note E_, 1 note F_, 15 note G_, 4 note F_, 4 note D#, 16 note F_, 8 - notetype $c, $14 + note_type 12, 1, 4 note A#, 12 - note __, 4 + rest 4 note G#, 4 note G_, 4 - notetype $6, $14 + note_type 6, 1, 4 note F#, 1 note G_, 15 note G#, 4 @@ -594,12 +595,12 @@ Music_Surf_branch_f540c: note F_, 16 octave 4 note A#, 8 - notetype $c, $14 + note_type 12, 1, 4 octave 5 note G#, 16 note G_, 4 note F_, 4 - notetype $6, $14 + note_type 6, 1, 4 note E_, 1 note F_, 15 note G_, 4 @@ -607,11 +608,11 @@ Music_Surf_branch_f540c: note D#, 16 octave 6 note D#, 8 - notetype $c, $13 + note_type 12, 1, 3 note C_, 16 note D_, 4 note D#, 4 - notetype $6, $13 + note_type 6, 1, 3 note D_, 1 note D#, 15 note D_, 4 @@ -620,10 +621,10 @@ Music_Surf_branch_f540c: note D_, 16 octave 6 note D_, 8 - notetype $c, $13 + note_type 12, 1, 3 octave 5 note A#, 12 - notetype $6, $13 + note_type 6, 1, 3 note A_, 1 note A#, 7 octave 6 @@ -634,12 +635,12 @@ Music_Surf_branch_f540c: note D_, 4 note D#, 16 note D_, 8 - notetype $c, $14 + note_type 12, 1, 4 note C_, 12 note C_, 4 note D_, 4 note D#, 4 - notetype $6, $14 + note_type 6, 1, 4 note D_, 1 note D#, 15 note D_, 4 @@ -648,22 +649,22 @@ Music_Surf_branch_f540c: note D_, 16 octave 6 note D_, 8 - notetype $c, $14 + note_type 12, 1, 4 octave 5 note A#, 12 - notetype $6, $14 + note_type 6, 1, 4 note A_, 1 note A#, 7 octave 6 note C_, 8 note D_, 8 - notetype $c, $14 + note_type 12, 1, 4 note F_, 12 note G_, 8 octave 5 note A#, 4 - intensity $15 - callchannel Music_Surf_branch_f54c8 + volume_envelope 1, 5 + sound_call .sub1 octave 2 note B_, 4 octave 3 @@ -672,7 +673,7 @@ Music_Surf_branch_f540c: note G#, 4 note A#, 4 note B_, 4 - callchannel Music_Surf_branch_f54c8 + sound_call .sub1 octave 2 note B_, 4 octave 3 @@ -685,38 +686,38 @@ Music_Surf_branch_f540c: note D#, 8 octave 2 note B_, 4 - loopchannel 0, Music_Surf_branch_f540c + sound_loop 0, .mainloop -Music_Surf_branch_f54c8: +.sub1: octave 3 note D#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note D#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note C#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note C#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note C_, 4 note F_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note C_, 4 note F_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 - endchannel + rest 3 + sound_ret diff --git a/crysaudio/music/tintower.asm b/crysaudio/music/tintower.asm index 3871f4ee..75030677 100644 --- a/crysaudio/music/tintower.asm +++ b/crysaudio/music/tintower.asm @@ -1,18 +1,19 @@ Music_TinTower: - musicheader 4, 1, Music_TinTower_Ch1 - musicheader 1, 2, Music_TinTower_Ch2 - musicheader 1, 3, Music_TinTower_Ch3 - musicheader 1, 4, Music_TinTower_Ch4 + channel_count 4 + channel 1, Music_TinTower_Ch1 + channel 2, Music_TinTower_Ch2 + channel 3, Music_TinTower_Ch3 + channel 4, Music_TinTower_Ch4 Music_TinTower_Ch1: tempo 208 - volume $77 - dutycycle $3 - tone $0004 - vibrato $8, $45 -Music_TinTower_branch_f682a: - stereopanning $f0 - notetype $c, $a5 + volume 7, 7 + duty_cycle 3 + pitch_offset 4 + vibrato 8, 4, 5 +.mainloop: + stereo_panning TRUE, FALSE + note_type 12, 10, 5 octave 3 note G_, 4 note C_, 4 @@ -63,25 +64,25 @@ Music_TinTower_branch_f682a: note G_, 4 octave 3 note G_, 8 - intensity $a2 + volume_envelope 10, 2 octave 2 note G_, 4 note G_, 12 note G_, 4 note G_, 8 - intensity $a7 + volume_envelope 10, 7 note G_, 4 - intensity $a2 + volume_envelope 10, 2 note G#, 4 note G#, 8 - intensity $a7 + volume_envelope 10, 7 note G_, 4 - intensity $a2 + volume_envelope 10, 2 note G#, 4 note G#, 8 - intensity $a7 + volume_envelope 10, 7 note A#, 4 - intensity $a2 + volume_envelope 10, 2 note G_, 4 note G_, 12 note G_, 4 @@ -90,19 +91,19 @@ Music_TinTower_branch_f682a: note G_, 12 note G_, 4 note G_, 8 - intensity $a5 + volume_envelope 10, 5 octave 3 note A#, 4 - loopchannel 0, Music_TinTower_branch_f682a + sound_loop 0, .mainloop Music_TinTower_Ch2: - dutycycle $3 - tone $0002 - vibrato $18, $44 -Music_TinTower_branch_f6893: - stereopanning $ff -Music_TinTower_branch_f6895: - notetype $c, $b5 + duty_cycle 3 + pitch_offset 2 + vibrato 24, 4, 4 +.mainloop: + stereo_panning TRUE, TRUE +.loop1: + note_type 12, 11, 5 octave 4 note C_, 4 note C_, 4 @@ -131,28 +132,28 @@ Music_TinTower_branch_f6895: note C_, 4 octave 4 note C_, 8 - stereopanning $f - loopchannel 2, Music_TinTower_branch_f6895 - intensity $b2 + stereo_panning FALSE, TRUE + sound_loop 2, .loop1 + volume_envelope 11, 2 octave 3 note C_, 4 note C_, 12 note C_, 4 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $b2 + volume_envelope 11, 2 note C#, 4 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $b2 + volume_envelope 11, 2 note C#, 4 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - intensity $90 - stereopanning $ff + volume_envelope 9, 0 + stereo_panning TRUE, TRUE note G_, 4 octave 4 note C_, 4 @@ -180,17 +181,17 @@ Music_TinTower_branch_f6895: note C_, 4 octave 4 note C_, 6 - intensity $95 + volume_envelope 9, 5 note C#, 2 - loopchannel 0, Music_TinTower_branch_f6893 + sound_loop 0, .mainloop Music_TinTower_Ch3: - notetype $c, $14 -Music_TinTower_branch_f68fb: - note __, 16 - note __, 16 - note __, 16 - note __, 10 + note_type 12, 1, 4 +.mainloop: + rest 16 + rest 16 + rest 16 + rest 10 octave 2 note G_, 2 note G#, 2 @@ -212,80 +213,80 @@ Music_TinTower_branch_f68fb: note C_, 8 octave 3 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 + rest 11 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 7 + rest 7 note C_, 4 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 7 + rest 7 note C_, 4 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 7 + rest 7 note D#, 4 - stereopanning $f + stereo_panning FALSE, TRUE note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 + rest 11 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 - stereopanning $ff + rest 3 + stereo_panning TRUE, TRUE octave 2 note A#, 2 octave 3 note C_, 2 note C#, 2 note D#, 2 - stereopanning $f + stereo_panning FALSE, TRUE note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 + rest 11 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 - stereopanning $ff - loopchannel 0, Music_TinTower_branch_f68fb + rest 11 + stereo_panning TRUE, TRUE + sound_loop 0, .mainloop Music_TinTower_Ch4: - togglenoise $0 - notetype $c -Music_TinTower_branch_f694c: - stereopanning $f - note G_, 2 - stereopanning $f0 - note G_, 1 - note G_, 1 - stereopanning $f - note G_, 2 - stereopanning $f0 - note F_, 4 - stereopanning $f - note G_, 2 - note G_, 2 - note F_, 2 - stereopanning $f0 - note G_, 2 - stereopanning $f - note G_, 1 - note G_, 1 - stereopanning $f0 - note G_, 2 - stereopanning $f - note F_, 4 - stereopanning $f0 - note G_, 2 - note G_, 2 - note F_, 2 - loopchannel 0, Music_TinTower_branch_f694c + toggle_noise 0 + drum_speed 12 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 8, 2 + stereo_panning TRUE, FALSE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning FALSE, TRUE + drum_note 8, 2 + stereo_panning TRUE, FALSE + drum_note 6, 4 + stereo_panning FALSE, TRUE + drum_note 8, 2 + drum_note 8, 2 + drum_note 6, 2 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning FALSE, TRUE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning FALSE, TRUE + drum_note 6, 4 + stereo_panning TRUE, FALSE + drum_note 8, 2 + drum_note 8, 2 + drum_note 6, 2 + sound_loop 0, .mainloop diff --git a/crysaudio/music/titlescreen.asm b/crysaudio/music/titlescreen.asm index a59608a4..3c3bff5c 100644 --- a/crysaudio/music/titlescreen.asm +++ b/crysaudio/music/titlescreen.asm @@ -1,52 +1,53 @@ Music_TitleScreen: - musicheader 4, 1, Music_TitleScreen_Ch1 - musicheader 1, 2, Music_TitleScreen_Ch2 - musicheader 1, 3, Music_TitleScreen_Ch3 - musicheader 1, 4, Music_TitleScreen_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_TitleScreen_Ch1: tempo 134 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $12 - stereopanning $f0 - notetype $c, $a7 - intensity $a0 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 1, 2 + stereo_panning TRUE, FALSE + note_type 12, 10, 7 + volume_envelope 10, 0 octave 3 - note __, 4 - intensity $a7 + rest 4 + volume_envelope 10, 7 octave 2 note G_, 1 - note __, 2 + rest 2 note A_, 1 note B_, 8 note G_, 4 octave 3 note C_, 1 - note __, 2 + rest 2 note D_, 1 note E_, 8 note C_, 4 octave 2 note B_, 1 - note __, 2 + rest 2 octave 3 note C_, 1 octave 2 note B_, 8 note A_, 4 note A_, 1 - note __, 2 + rest 2 note B_, 1 octave 3 note C_, 6 note E_, 4 note F#, 2 - stereopanning $ff + stereo_panning TRUE, TRUE octave 4 note G_, 1 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 3 note D_, 5 octave 2 @@ -60,14 +61,14 @@ Music_TitleScreen_Ch1: note F_, 6 note C_, 4 note D_, 6 - intensity $b7 + volume_envelope 11, 7 note D#, 1 note E_, 1 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype $8, $a7 + note_type 8, 10, 7 note C_, 4 octave 2 note B_, 4 @@ -87,22 +88,22 @@ Music_TitleScreen_Ch1: note E_, 4 note E_, 4 note C_, 4 - notetype $8, $a0 + note_type 8, 10, 0 octave 2 note B_, 6 - notetype $8, $a7 + note_type 8, 10, 7 note B_, 6 - notetype $8, $a7 + note_type 8, 10, 7 octave 3 note F_, 4 note E_, 4 note C_, 4 - notetype $8, $a0 + note_type 8, 10, 0 note D_, 6 - notetype $8, $a7 + note_type 8, 10, 7 note D_, 6 - notetype $8, $a7 - note __, 3 + note_type 8, 10, 7 + rest 3 octave 2 note B_, 3 octave 3 @@ -120,14 +121,14 @@ Music_TitleScreen_Ch1: note F_, 9 note C_, 6 note D_, 9 - notetype $c, $b7 + note_type 12, 11, 7 note D#, 1 note E_, 1 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype $8, $a7 + note_type 8, 10, 7 note C_, 4 octave 2 note B_, 4 @@ -138,7 +139,7 @@ Music_TitleScreen_Ch1: note B_, 3 octave 3 note D_, 9 - notetype $8, $b7 + note_type 8, 11, 7 note G_, 3 note A_, 4 note G_, 4 @@ -150,29 +151,29 @@ Music_TitleScreen_Ch1: note G_, 3 note D_, 6 note G_, 3 - notetype $8, $54 + note_type 8, 5, 4 octave 2 note G_, 3 note B_, 3 - notetype $8, $94 + note_type 8, 9, 4 octave 3 note D_, 3 note G_, 3 tempo 136 - notetype $8, $b4 + note_type 8, 11, 4 note F_, 3 note A_, 3 - notetype $8, $d4 + note_type 8, 13, 4 octave 4 note C_, 3 note F_, 3 tempo 138 - notetype $8, $b4 + note_type 8, 11, 4 note D_, 9 note C_, 9 octave 3 note A#, 6 - notetype $c, $b7 + note_type 12, 11, 7 note F_, 1 note E_, 1 note D_, 1 @@ -184,7 +185,7 @@ Music_TitleScreen_Ch1: note E_, 6 octave 3 note G_, 2 - notetype $8, $b7 + note_type 8, 11, 7 note A_, 4 note G_, 4 note F_, 4 @@ -194,33 +195,33 @@ Music_TitleScreen_Ch1: tempo 136 note C#, 6 tempo 134 - callchannel Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 3 note E_, 4 note E_, 4 note C_, 4 - notetype $c, $a0 + note_type 12, 10, 0 note D_, 6 - notetype $c, $a7 + note_type 12, 10, 7 note D_, 10 - intensity $a0 + volume_envelope 10, 0 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $a0 + volume_envelope 10, 0 octave 2 note B_, 8 - intensity $a7 + volume_envelope 10, 7 note B_, 8 octave 3 note C_, 8 @@ -239,63 +240,63 @@ Music_TitleScreen_Ch1: note F#, 1 note F_, 8 note E_, 8 - intensity $a0 + volume_envelope 10, 0 note D_, 16 - intensity $a7 + volume_envelope 10, 7 note D_, 16 - intensity $a3 + volume_envelope 10, 3 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - notetype $8, $b2 + rest 3 + note_type 8, 11, 2 note A_, 2 note A_, 2 note A_, 2 note A_, 2 note A_, 2 note F#, 2 - notetype $c, $b7 + note_type 12, 11, 7 note G_, 1 - note __, 3 + rest 3 octave 1 note G_, 1 - note __, 11 - endchannel + rest 11 + sound_ret -Music_TitleScreen_branch_eb96d: - notetype $c, $c3 +.sub1: + note_type 12, 12, 3 note D_, 1 -Music_TitleScreen_branch_eb971: - note __, 1 +.sub1loop1: + rest 1 octave 2 note D_, 1 octave 1 note A_, 1 octave 2 note D_, 1 - loopchannel 5, Music_TitleScreen_branch_eb971 - note __, 1 + sound_loop 5, .sub1loop1 + rest 1 note D_, 1 octave 1 note A_, 1 - notetype $8, $b7 - endchannel + note_type 8, 11, 7 + sound_ret Music_TitleScreen_Ch2: - dutycycle $3 - vibrato $14, $12 - notetype $c, $c7 - intensity $a4 + duty_cycle 3 + vibrato 20, 1, 2 + note_type 12, 12, 7 + volume_envelope 10, 4 octave 1 note G_, 1 octave 2 @@ -303,21 +304,21 @@ Music_TitleScreen_Ch2: note G_, 1 octave 3 note C_, 1 - intensity $c2 + volume_envelope 12, 2 octave 3 note B_, 1 - note __, 2 + rest 2 note A_, 1 - intensity $b0 + volume_envelope 11, 0 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note G_, 6 - note __, 16 - note __, 16 - intensity $c7 + rest 16 + rest 16 + volume_envelope 12, 7 octave 4 note C_, 1 - note __, 2 + rest 2 note D_, 1 note E_, 8 note F#, 2 @@ -328,26 +329,26 @@ Music_TitleScreen_Ch2: note B_, 2 octave 4 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 4 note F_, 4 - stereopanning $ff - intensity $c7 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 6 octave 3 note C_, 2 - stereopanning $f - intensity $a3 + stereo_panning FALSE, TRUE + volume_envelope 10, 3 octave 4 note D_, 4 note D_, 2 @@ -355,21 +356,21 @@ Music_TitleScreen_Ch2: note C_, 2 octave 3 note B_, 4 - stereopanning $ff - intensity $c7 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 2 note F_, 4 note A_, 2 - stereopanning $ff - notetype $8, $c7 + stereo_panning TRUE, TRUE + note_type 8, 12, 7 octave 4 note C_, 4 octave 3 @@ -377,123 +378,123 @@ Music_TitleScreen_Ch2: octave 4 note C_, 4 note D_, 12 - stereopanning $f0 - notetype $8, $b7 + stereo_panning TRUE, FALSE + note_type 8, 11, 7 octave 2 note A_, 9 - stereopanning $f - notetype $c, $c7 + stereo_panning FALSE, TRUE + note_type 12, 12, 7 note G_, 1 note A_, 1 note B_, 6 note E_, 1 note F#, 1 note G_, 4 - notetype $c, $4b + note_type 12, 4, -3 note A_, 4 - stereopanning $ff - notetype $c, $c7 + stereo_panning TRUE, TRUE + note_type 12, 12, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 2 note F_, 6 - stereopanning $ff - intensity $c7 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 3 note C_, 2 octave 2 note A_, 6 note B_, 6 note G_, 2 - notetype $8, $c7 + note_type 8, 12, 7 note F_, 4 note G_, 4 note F_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE octave 3 note G_, 9 note B_, 3 octave 4 note D_, 12 - stereopanning $f0 - notetype $8, $a7 + stereo_panning TRUE, FALSE + note_type 8, 10, 7 octave 3 note D_, 4 note C_, 4 note D_, 4 - stereopanning $ff - notetype $8, $c7 + stereo_panning TRUE, TRUE + note_type 8, 12, 7 octave 4 note F_, 4 note E_, 4 note F_, 4 note G_, 9 note A#, 3 - notetype $c, $b0 + note_type 12, 11, 0 note G_, 8 - notetype $c, $b7 + note_type 12, 11, 7 note G_, 8 - intensity $c6 + volume_envelope 12, 6 note A_, 4 - intensity $5d + volume_envelope 5, -5 note A_, 4 - intensity $c7 + volume_envelope 12, 7 note A#, 6 - intensity $c3 + volume_envelope 12, 3 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - intensity $a7 + volume_envelope 10, 7 octave 3 note A#, 8 - intensity $c7 + volume_envelope 12, 7 octave 4 note A#, 4 note B_, 4 octave 5 note C_, 6 - intensity $c3 + volume_envelope 12, 3 octave 4 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 8 - intensity $a7 + volume_envelope 10, 7 octave 3 note E_, 8 - intensity $c7 + volume_envelope 12, 7 octave 5 note C_, 4 note C#, 4 - tone $0001 - stereopanning $f - callchannel Music_TitleScreen_branch_ebae7 + pitch_offset 1 + stereo_panning FALSE, TRUE + sound_call .sub1 note C#, 4 - callchannel Music_TitleScreen_branch_ebae7 + sound_call .sub1 note C#, 4 - callchannel Music_TitleScreen_branch_ebae7 + sound_call .sub1 octave 4 note A_, 4 - stereopanning $ff - tone 0 - notetype $c, $b0 + stereo_panning TRUE, TRUE + pitch_offset 0 + note_type 12, 11, 0 octave 3 note B_, 6 - notetype $c, $b7 + note_type 12, 11, 7 note B_, 10 - intensity $c7 + volume_envelope 12, 7 note A_, 8 note F_, 6 note E_, 1 @@ -502,11 +503,11 @@ Music_TitleScreen_Ch2: note G_, 8 note F_, 8 note A_, 8 - intensity $b0 + volume_envelope 11, 0 note G_, 8 - intensity $b7 + volume_envelope 11, 7 note G_, 8 - intensity $c7 + volume_envelope 12, 7 note F_, 8 octave 4 note F_, 6 @@ -520,25 +521,25 @@ Music_TitleScreen_Ch2: note A_, 6 note F_, 1 note A_, 1 - intensity $b0 + volume_envelope 11, 0 note G_, 16 - intensity $b7 + volume_envelope 11, 7 note G_, 16 - intensity $c2 + volume_envelope 12, 2 octave 4 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - intensity $90 + rest 3 + volume_envelope 9, 0 note G_, 4 - notetype $8, $c2 + note_type 8, 12, 2 octave 3 note F_, 2 note F_, 2 @@ -546,53 +547,53 @@ Music_TitleScreen_Ch2: note F_, 2 note F_, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 1 - note __, 11 - endchannel + rest 11 + sound_ret -Music_TitleScreen_branch_ebae7: - notetype $c, $b2 +.sub1: + note_type 12, 11, 2 note D_, 1 -Music_TitleScreen_branch_ebaeb: +.sub1loop1: octave 3 note A_, 1 octave 4 note D_, 1 note A_, 1 note D_, 1 - loopchannel 5, Music_TitleScreen_branch_ebaeb + sound_loop 5, .sub1loop1 octave 3 note A_, 1 octave 4 note D_, 1 note A_, 1 - notetype $8, $b7 + note_type 8, 11, 7 octave 5 note C_, 4 note C_, 4 - endchannel + sound_ret Music_TitleScreen_Ch3: - stereopanning $f - vibrato $10, $14 - tone $0001 - notetype $c, $16 + stereo_panning FALSE, TRUE + vibrato 16, 1, 4 + pitch_offset 1 + note_type 12, 1, 6 octave 3 octave 3 - note __, 4 + rest 4 octave 2 note G_, 2 note D_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note G_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 note G_, 2 note D_, 2 @@ -602,10 +603,10 @@ Music_TitleScreen_Ch3: note B_, 1 octave 2 note C_, 1 - note __, 1 + rest 1 note F_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 2 note F_, 2 note C_, 2 @@ -613,10 +614,10 @@ Music_TitleScreen_Ch3: note D_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note G_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 note G_, 2 note D_, 2 @@ -624,7 +625,7 @@ Music_TitleScreen_Ch3: note F_, 1 note E_, 1 note F_, 1 - note __, 1 + rest 1 note A_, 2 note F_, 2 note A_, 4 @@ -767,10 +768,10 @@ Music_TitleScreen_Ch3: note G_, 6 note E_, 4 note D_, 1 - note __, 1 - stereopanning $ff - notetype $c, $16 - tone 0 + rest 1 + stereo_panning TRUE, TRUE + note_type 12, 1, 6 + pitch_offset 0 octave 4 note A_, 2 octave 5 @@ -779,17 +780,17 @@ Music_TitleScreen_Ch3: note G_, 2 note F#, 2 note D_, 1 - note __, 2 + rest 2 note E_, 1 note F#, 4 - notetype $8, $16 + note_type 8, 1, 6 octave 3 note C_, 4 note C_, 4 note C#, 4 - notetype $c, $16 + note_type 12, 1, 6 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 2 octave 5 @@ -798,18 +799,18 @@ Music_TitleScreen_Ch3: note G_, 2 note F#, 2 note B_, 1 - note __, 2 + rest 2 note A_, 1 note A_, 4 - notetype $8, $16 + note_type 8, 1, 6 octave 3 note C_, 4 note C_, 4 note C#, 4 - notetype $c, $16 + note_type 12, 1, 6 note D_, 1 - note __, 1 - notetype $c, $16 + rest 1 + note_type 12, 1, 6 octave 4 note A_, 2 octave 5 @@ -820,15 +821,15 @@ Music_TitleScreen_Ch3: note F#, 1 note E_, 1 note D_, 6 - tone $0001 - notetype $8, $16 + pitch_offset 1 + note_type 8, 1, 6 octave 3 note C_, 4 note C_, 4 note E_, 2 note F#, 2 - stereopanning $f - notetype $c, $16 + stereo_panning FALSE, TRUE + note_type 12, 1, 6 note G_, 16 note F_, 16 note G_, 8 @@ -849,320 +850,321 @@ Music_TitleScreen_Ch3: note E_, 1 note F_, 16 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - notetype $8, $16 + rest 3 + note_type 8, 1, 6 note F_, 2 note F_, 2 note F_, 2 note F_, 2 note F_, 2 note A_, 2 - notetype $c, $16 + note_type 12, 1, 6 note G_, 1 - note __, 3 + rest 3 octave 1 note G_, 1 - note __, 11 - endchannel + rest 11 + sound_ret Music_TitleScreen_Ch4: - togglenoise $5 - stereopanning $f0 - notetype $c - note __, 4 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 6 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 3 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 4 - note D#, 2 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd77 - callchannel Music_TitleScreen_branch_ebd81 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd77 - note C_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 2 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - callchannel Music_TitleScreen_branch_ebd77 - callchannel Music_TitleScreen_branch_ebd81 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note C#, 1 - note D_, 1 - note D_, 1 - note C#, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd77 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $c - note A_, 2 - note D#, 4 - note A_, 4 - note D#, 2 - note A_, 4 - note A_, 2 - note D#, 4 - note A_, 4 - note D#, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note D#, 4 - note A_, 4 - note D#, 2 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 2 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - callchannel Music_TitleScreen_branch_ebd8b - callchannel Music_TitleScreen_branch_ebd93 - note C#, 1 - note D_, 1 - note D_, 1 - note C#, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd8b - callchannel Music_TitleScreen_branch_ebd93 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd8b - callchannel Music_TitleScreen_branch_ebd93 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $c - note G#, 16 -Music_TitleScreen_branch_ebd40: - note __, 16 - loopchannel 6, Music_TitleScreen_branch_ebd40 - note __, 12 - notetype $6 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - note C_, 4 - note C_, 6 - note C_, 1 - note C_, 1 - note C_, 4 - note C_, 4 - note C_, 6 - note C_, 1 - note C_, 1 - note C_, 4 - note C_, 4 - note C_, 6 - note C_, 1 - note C_, 1 - note C_, 4 - note C_, 4 - note C_, 4 - notetype $8 - note C_, 2 - note C_, 2 - note C_, 2 - notetype $6 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - note C_, 4 - note B_, 4 - endchannel + toggle_noise 5 + stereo_panning TRUE, FALSE + drum_speed 12 + rest 4 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 6 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 3 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 4, 2 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + sound_call .sub1 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 6, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 2 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 6, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 10, 2 + drum_note 4, 4 + drum_note 10, 4 + drum_note 4, 2 + drum_note 10, 4 + drum_note 10, 2 + drum_note 4, 4 + drum_note 10, 4 + drum_note 4, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 4, 4 + drum_note 10, 4 + drum_note 4, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + sound_call .sub3 + sound_call .sub4 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 12 + sound_call .sub3 + sound_call .sub4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + sound_call .sub3 + sound_call .sub4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 9, 16 +.loop1: + rest 16 + sound_loop 6, .loop1 + rest 12 + drum_speed 6 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + drum_note 1, 4 + drum_note 1, 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 4 + drum_speed 8 + drum_note 1, 2 + drum_note 1, 2 + drum_note 1, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + drum_note 1, 4 + drum_note 12, 4 + sound_ret -Music_TitleScreen_branch_ebd77: - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note F_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note D#, 2 - endchannel +.sub1: + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 6, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 2 + sound_ret -Music_TitleScreen_branch_ebd81: - note C_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note D#, 2 - endchannel +.sub2: + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 6, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 2 + sound_ret -Music_TitleScreen_branch_ebd8b: - note C_, 2 - note C_, 1 - note C_, 1 - loopchannel 4, Music_TitleScreen_branch_ebd8b - endchannel +.sub3: +.sub3loop1: + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + sound_loop 4, .sub3loop1 + sound_ret -Music_TitleScreen_branch_ebd93: - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - notetype $8 - note C_, 4 - note C_, 4 - endchannel +.sub4: + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 8 + drum_note 1, 4 + drum_note 1, 4 + sound_ret diff --git a/crysaudio/music/trainervictory.asm b/crysaudio/music/trainervictory.asm index 56b2d847..e4b5f4e1 100644 --- a/crysaudio/music/trainervictory.asm +++ b/crysaudio/music/trainervictory.asm @@ -1,14 +1,15 @@ Music_TrainerVictory: - musicheader 3, 1, Music_TrainerVictory_Ch1 - musicheader 1, 2, Music_TrainerVictory_Ch2 - musicheader 1, 3, Music_TrainerVictory_Ch3 + channel_count 3 + channel 1, Music_TrainerVictory_Ch1 + channel 2, Music_TrainerVictory_Ch2 + channel 3, Music_TrainerVictory_Ch3 Music_TrainerVictory_Ch1: tempo 120 - volume $77 - dutycycle $2 - tone $0001 - notetype $8, $b1 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + note_type 8, 11, 1 octave 4 note E_, 2 note E_, 2 @@ -16,13 +17,14 @@ Music_TrainerVictory_Ch1: note E_, 2 note F#, 2 note G_, 2 - intensity $b6 + volume_envelope 11, 6 note A_, 12 - stereopanning $f -Music_TrainerVictory_branch_ebecd: - intensity $72 - callchannel Music_TrainerVictory_branch_ebf11 - intensity $51 + stereo_panning FALSE, TRUE +.mainloop: +.loop1: + volume_envelope 7, 2 + sound_call .sub1 + volume_envelope 5, 1 note C#, 2 note E_, 2 note F#, 2 @@ -30,63 +32,63 @@ Music_TrainerVictory_branch_ebecd: note B_, 2 octave 4 note C#, 2 - intensity $72 + volume_envelope 7, 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 note E_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebecd - callchannel Music_TrainerVictory_branch_ebf11 + sound_loop 2, .loop1 + sound_call .sub1 note A_, 2 - note __, 2 + rest 2 note F_, 2 note A_, 6 note A#, 2 - note __, 2 + rest 2 note G_, 2 note A#, 6 -Music_TrainerVictory_branch_ebef2: - intensity $72 +.loop2: + volume_envelope 7, 2 octave 4 note D_, 2 note C#, 2 octave 3 note A_, 2 - loopchannel 3, Music_TrainerVictory_branch_ebef2 + sound_loop 3, .loop2 note F#, 2 note A_, 2 octave 4 note D_, 2 -Music_TrainerVictory_branch_ebf01: +.loop3: octave 4 note C#, 2 octave 3 note B_, 2 note A_, 2 - loopchannel 3, Music_TrainerVictory_branch_ebf01 + sound_loop 3, .loop3 note E_, 2 note F#, 2 note G_, 2 - loopchannel 0, Music_TrainerVictory_branch_ebecd + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebf11: +.sub1: octave 3 note F#, 2 - note __, 2 + rest 2 note D_, 2 note F#, 6 note G_, 2 - note __, 2 + rest 2 note E_, 2 note G_, 6 - endchannel + sound_ret Music_TrainerVictory_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $8, $d1 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 13, 1 octave 4 note A_, 2 note A_, 2 @@ -95,93 +97,95 @@ Music_TrainerVictory_Ch2: note B_, 2 octave 5 note C#, 2 - intensity $d6 + volume_envelope 13, 6 note D_, 12 - stereopanning $f0 -Music_TrainerVictory_branch_ebf30: - notetype $8, $82 - callchannel Music_TrainerVictory_branch_ebf56 + stereo_panning TRUE, FALSE +.mainloop: +.loop1: + note_type 8, 8, 2 + sound_call .sub1 note F#, 2 - note __, 2 + rest 2 note G_, 2 note A_, 6 note E_, 2 - note __, 2 + rest 2 note F#, 2 note G_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebf30 - callchannel Music_TrainerVictory_branch_ebf56 + sound_loop 2, .loop1 + sound_call .sub1 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 6 note G_, 2 - note __, 2 + rest 2 note D_, 2 note G_, 6 - notetype $c, $88 + note_type 12, 8, 8 note F#, 16 note E_, 16 - loopchannel 0, Music_TrainerVictory_branch_ebf30 + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebf56: +.sub1: octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 octave 4 note D_, 6 note E_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note E_, 6 - endchannel + sound_ret Music_TrainerVictory_Ch3: - notetype $8, $25 + note_type 8, 2, 5 octave 3 note G_, 6 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 6 note D_, 2 note C#, 2 octave 2 note B_, 2 -Music_TrainerVictory_branch_ebf74: - callchannel Music_TrainerVictory_branch_ebfb1 +.mainloop: +.loop1: + sound_call .sub1 octave 3 note C#, 2 - note __, 2 + rest 2 note C#, 2 note A_, 2 note F#, 2 note C#, 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebf74 - callchannel Music_TrainerVictory_branch_ebfb1 + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note C_, 2 - note __, 2 + rest 2 note C_, 2 note A_, 2 note F_, 2 note C_, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 4 note D_, 2 @@ -206,12 +210,12 @@ Music_TrainerVictory_branch_ebf74: note G_, 2 note E_, 2 note C#, 2 - loopchannel 0, Music_TrainerVictory_branch_ebf74 + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebfb1: +.sub1: octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note F#, 2 @@ -219,11 +223,11 @@ Music_TrainerVictory_branch_ebfb1: octave 2 note A_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 octave 3 note G_, 2 note E_, 2 octave 2 note B_, 2 - endchannel + sound_ret diff --git a/crysaudio/music/unioncave.asm b/crysaudio/music/unioncave.asm index 94c7aec6..d492b7db 100644 --- a/crysaudio/music/unioncave.asm +++ b/crysaudio/music/unioncave.asm @@ -1,22 +1,23 @@ Music_UnionCave: - musicheader 4, 1, Music_UnionCave_Ch1 - musicheader 1, 2, Music_UnionCave_Ch2 - musicheader 1, 3, Music_UnionCave_Ch3 - musicheader 1, 4, Music_UnionCave_Ch4 + channel_count 4 + channel 1, Music_UnionCave_Ch1 + channel 2, Music_UnionCave_Ch2 + channel 3, Music_UnionCave_Ch3 + channel 4, Music_UnionCave_Ch4 Music_UnionCave_Ch1: tempo 160 - volume $77 - dutycycle $1 - tone $0002 - vibrato $18, $34 - stereopanning $f -Music_UnionCave_branch_f5c7b: - notetype $c, $b3 -Music_UnionCave_branch_f5c7e: - callchannel Music_UnionCave_branch_f5ccf - loopchannel 4, Music_UnionCave_branch_f5c7e -Music_UnionCave_branch_f5c85: + volume 7, 7 + duty_cycle 1 + pitch_offset 2 + vibrato 24, 3, 4 + stereo_panning FALSE, TRUE +.mainloop: + note_type 12, 11, 3 +.loop1: + sound_call .sub1 + sound_loop 4, .loop1 +.loop2: octave 2 note G#, 2 octave 3 @@ -25,8 +26,8 @@ Music_UnionCave_branch_f5c85: note C#, 2 note E_, 2 note F_, 4 - loopchannel 8, Music_UnionCave_branch_f5c85 -Music_UnionCave_branch_f5c91: + sound_loop 8, .loop2 +.loop3: octave 2 note A_, 2 octave 3 @@ -35,9 +36,9 @@ Music_UnionCave_branch_f5c91: note D_, 2 note F_, 2 note F#, 4 - loopchannel 4, Music_UnionCave_branch_f5c91 - note __, 4 - intensity $80 + sound_loop 4, .loop3 + rest 4 + volume_envelope 8, 0 note F_, 16 note F#, 16 note G_, 16 @@ -52,37 +53,37 @@ Music_UnionCave_branch_f5c91: note C_, 8 octave 3 note A_, 8 - intensity $95 - tone $0004 - callchannel Music_UnionCave_branch_f5ccf - tone $0008 - callchannel Music_UnionCave_branch_f5ccf - tone $000c - callchannel Music_UnionCave_branch_f5ccf - tone $0010 - callchannel Music_UnionCave_branch_f5ccf - tone $0002 - loopchannel 0, Music_UnionCave_branch_f5c7b + volume_envelope 9, 5 + pitch_offset 4 + sound_call .sub1 + pitch_offset 8 + sound_call .sub1 + pitch_offset 12 + sound_call .sub1 + pitch_offset 16 + sound_call .sub1 + pitch_offset 2 + sound_loop 0, .mainloop -Music_UnionCave_branch_f5ccf: +.sub1: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 - endchannel + sound_ret Music_UnionCave_Ch2: - dutycycle $3 - vibrato $8, $24 -Music_UnionCave_branch_f5cda: - notetype $c, $c4 - callchannel Music_UnionCave_branch_f5d34 - intensity $c5 - callchannel Music_UnionCave_branch_f5d34 - intensity $c7 - callchannel Music_UnionCave_branch_f5d34 - intensity $c4 + duty_cycle 3 + vibrato 8, 2, 4 +.mainloop: + note_type 12, 12, 4 + sound_call .sub1 + volume_envelope 12, 5 + sound_call .sub1 + volume_envelope 12, 7 + sound_call .sub1 + volume_envelope 12, 4 note C#, 4 octave 3 note B_, 4 @@ -111,8 +112,8 @@ Music_UnionCave_branch_f5cda: note C#, 8 note D_, 4 note C#, 4 - note __, 4 - intensity $a0 + rest 4 + volume_envelope 10, 0 note C_, 16 note C#, 16 note D_, 16 @@ -121,19 +122,19 @@ Music_UnionCave_branch_f5cda: note D#, 16 note A#, 16 note A_, 16 - intensity $a5 - vibrato $6, $44 - callchannel Music_UnionCave_branch_f5d52 - vibrato $4, $33 - callchannel Music_UnionCave_branch_f5d52 - vibrato $2, $22 - callchannel Music_UnionCave_branch_f5d52 - vibrato $1, $41 - callchannel Music_UnionCave_branch_f5d52 - vibrato $8, $24 - loopchannel 0, Music_UnionCave_branch_f5cda + volume_envelope 10, 5 + vibrato 6, 4, 4 + sound_call .sub2 + vibrato 4, 3, 3 + sound_call .sub2 + vibrato 2, 2, 2 + sound_call .sub2 + vibrato 1, 4, 1 + sound_call .sub2 + vibrato 8, 2, 4 + sound_loop 0, .mainloop -Music_UnionCave_branch_f5d34: +.sub1: octave 4 note C_, 4 octave 3 @@ -163,50 +164,51 @@ Music_UnionCave_branch_f5d34: note C_, 8 note C#, 4 note C_, 4 - endchannel + sound_ret -Music_UnionCave_branch_f5d52: +.sub2: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 - endchannel + sound_ret Music_UnionCave_Ch3: - notetype $c, $16 - stereopanning $f0 -Music_UnionCave_branch_f5d5d: - note __, 16 - loopchannel 7, Music_UnionCave_branch_f5d5d - note __, 14 + note_type 12, 1, 6 + stereo_panning TRUE, FALSE +.mainloop: +.loop1: + rest 16 + sound_loop 7, .loop1 + rest 14 octave 4 note C_, 2 -Music_UnionCave_branch_f5d65: - note __, 2 +.loop2: + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 note E_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - loopchannel 4, Music_UnionCave_branch_f5d65 -Music_UnionCave_branch_f5d73: - note __, 2 + sound_loop 4, .loop2 +.loop3: + rest 2 octave 3 note F_, 2 - note __, 2 + rest 2 note F_, 2 note A_, 2 note F_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 - loopchannel 4, Music_UnionCave_branch_f5d73 - note __, 4 + sound_loop 4, .loop3 + rest 4 note C_, 8 octave 3 note B_, 8 @@ -218,7 +220,7 @@ Music_UnionCave_branch_f5d73: octave 3 note B_, 8 note A#, 8 -Music_UnionCave_branch_f5d8d: +.loop4: note A_, 4 note G_, 4 note A#, 2 @@ -227,32 +229,33 @@ Music_UnionCave_branch_f5d8d: octave 3 note A_, 2 note G_, 2 - loopchannel 3, Music_UnionCave_branch_f5d8d + sound_loop 3, .loop4 note A_, 4 note G_, 4 note A#, 8 -Music_UnionCave_branch_f5d9c: - note __, 16 - loopchannel 4, Music_UnionCave_branch_f5d9c - loopchannel 0, Music_UnionCave_branch_f5d5d +.loop5: + rest 16 + sound_loop 4, .loop5 + sound_loop 0, .mainloop Music_UnionCave_Ch4: - togglenoise $1 - notetype $c -Music_UnionCave_branch_f5da9: - stereopanning $f0 - note E_, 4 - stereopanning $ff - note F_, 4 - stereopanning $f - note G#, 4 - note __, 8 - stereopanning $f - note E_, 4 - stereopanning $ff - note F_, 4 - stereopanning $f0 - note G#, 4 - note __, 8 - loopchannel 0, Music_UnionCave_branch_f5da9 - loopchannel 0, Music_UnionCave_branch_f5da9 ; unused + toggle_noise 1 + drum_speed 12 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 5, 4 + stereo_panning TRUE, TRUE + drum_note 6, 4 + stereo_panning FALSE, TRUE + drum_note 9, 4 + rest 8 + stereo_panning FALSE, TRUE + drum_note 5, 4 + stereo_panning TRUE, TRUE + drum_note 6, 4 + stereo_panning TRUE, FALSE + drum_note 9, 4 + rest 8 + sound_loop 0, .mainloop + + sound_loop 0, .mainloop ; unused diff --git a/crysaudio/music/vermilioncity.asm b/crysaudio/music/vermilioncity.asm index ec88085e..26431ff3 100644 --- a/crysaudio/music/vermilioncity.asm +++ b/crysaudio/music/vermilioncity.asm @@ -1,16 +1,17 @@ Music_VermilionCity: - musicheader 3, 1, Music_VermilionCity_Ch1 - musicheader 1, 2, Music_VermilionCity_Ch2 - musicheader 1, 3, Music_VermilionCity_Ch3 + channel_count 3 + channel 1, Music_VermilionCity_Ch1 + channel 2, Music_VermilionCity_Ch2 + channel 3, Music_VermilionCity_Ch3 - db $3 + db $3 ; unused Music_VermilionCity_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 176 - volume $77 - dutycycle $2 - notetype $c, $65 + volume 7, 7 + duty_cycle 2 + note_type 12, 6, 5 octave 4 note B_, 4 note G#, 4 @@ -28,21 +29,21 @@ Music_VermilionCity_Ch1: note B_, 1 octave 5 note D_, 1 - vibrato $10, $23 -Music_VermilionCity_branch_eb6a0: - dutycycle $1 - notetype $c, $85 - callchannel Music_VermilionCity_branch_eb6f9 + vibrato 16, 2, 3 +.mainloop: + duty_cycle 1 + note_type 12, 8, 5 + sound_call .sub1 note F_, 4 octave 4 note D_, 4 note C#, 4 note E_, 4 - callchannel Music_VermilionCity_branch_eb6f9 - callchannel Music_VermilionCity_branch_eb701 - dutycycle $2 - notetype $c, $85 - callchannel Music_VermilionCity_branch_eb6f9 + sound_call .sub1 + sound_call .sub2 + duty_cycle 2 + note_type 12, 8, 5 + sound_call .sub1 note F_, 4 octave 4 note D_, 4 @@ -57,22 +58,22 @@ Music_VermilionCity_branch_eb6a0: note A_, 1 note E_, 1 note C_, 1 - callchannel Music_VermilionCity_branch_eb6f9 - callchannel Music_VermilionCity_branch_eb701 - intensity $93 - dutycycle $0 - note __, 2 + sound_call .sub1 + sound_call .sub2 + volume_envelope 9, 3 + duty_cycle 0 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - callchannel Music_VermilionCity_branch_eb70c - callchannel Music_VermilionCity_branch_eb70c - intensity $87 - dutycycle $2 + sound_call .sub3 + sound_call .sub3 + volume_envelope 8, 7 + duty_cycle 2 octave 4 note D_, 8 octave 3 @@ -89,9 +90,9 @@ Music_VermilionCity_branch_eb6a0: note B_, 4 octave 3 note D_, 4 - loopchannel 0, Music_VermilionCity_branch_eb6a0 + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb6f9: +.sub1: octave 3 note C#, 4 note E_, 4 @@ -99,9 +100,9 @@ Music_VermilionCity_branch_eb6f9: note A_, 2 note E_, 2 note G#, 2 - endchannel + sound_ret -Music_VermilionCity_branch_eb701: +.sub2: note D_, 2 note F_, 2 note A_, 2 @@ -112,10 +113,10 @@ Music_VermilionCity_branch_eb701: octave 3 note A_, 2 note E_, 2 - endchannel + sound_ret -Music_VermilionCity_branch_eb70c: - note __, 2 +.sub3: + rest 2 note F#, 2 note A_, 2 note F#, 2 @@ -125,7 +126,7 @@ Music_VermilionCity_branch_eb70c: note F#, 2 note A_, 2 note F#, 2 - note __, 2 + rest 2 note G#, 2 note B_, 2 note G#, 2 @@ -135,13 +136,13 @@ Music_VermilionCity_branch_eb70c: note G#, 2 note B_, 2 note G#, 2 - endchannel + sound_ret Music_VermilionCity_Ch2: - stereopanning $ff - dutycycle $3 - notetype $c, $77 - vibrato $10, $23 + stereo_panning TRUE, TRUE + duty_cycle 3 + note_type 12, 7, 7 + vibrato 16, 2, 3 octave 5 note E_, 4 note D_, 4 @@ -152,21 +153,21 @@ Music_VermilionCity_Ch2: note E_, 4 note F#, 4 note G#, 4 -Music_VermilionCity_branch_eb735: - notetype $c, $97 - callchannel Music_VermilionCity_branch_eb768 +.mainloop: + note_type 12, 9, 7 + sound_call .sub1 note G#, 2 - callchannel Music_VermilionCity_branch_eb768 + sound_call .sub1 note E_, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note B_, 4 octave 4 note C#, 4 note D_, 4 note E_, 4 - callchannel Music_VermilionCity_branch_eb77e - callchannel Music_VermilionCity_branch_eb77e + sound_call .sub2 + sound_call .sub2 note F#, 6 note E_, 1 note F#, 1 @@ -176,18 +177,18 @@ Music_VermilionCity_branch_eb735: note A_, 1 note G#, 8 note G#, 14 - notetype $6, $57 - note __, 1 + note_type 6, 5, 7 + rest 1 octave 4 note E_, 1 note G#, 1 note B_, 1 - notetype $c, $87 + note_type 12, 8, 7 octave 5 note E_, 16 - loopchannel 0, Music_VermilionCity_branch_eb735 + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb768: +.sub1: octave 1 note A_, 8 octave 2 @@ -209,21 +210,21 @@ Music_VermilionCity_branch_eb768: note E_, 2 octave 1 note A_, 2 - endchannel + sound_ret -Music_VermilionCity_branch_eb77e: +.sub2: note F#, 8 note B_, 8 note A_, 4 note G#, 4 note F#, 4 note E_, 4 - endchannel + sound_ret Music_VermilionCity_Ch3: - stereopanning $f0 - vibrato $22, $23 - notetype $c, $25 + stereo_panning TRUE, FALSE + vibrato 34, 2, 3 + note_type 12, 2, 5 octave 2 note E_, 4 note B_, 4 @@ -241,17 +242,17 @@ Music_VermilionCity_Ch3: note D_, 1 octave 2 note B_, 1 -Music_VermilionCity_branch_eb79e: - notetype $c, $22 - callchannel Music_VermilionCity_branch_eb7de +.mainloop: + note_type 12, 2, 2 + sound_call .sub1 octave 5 note A_, 6 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G#, 1 - callchannel Music_VermilionCity_branch_eb7de + sound_call .sub1 note A_, 8 - intensity $14 + volume_envelope 1, 4 octave 3 note D_, 4 note C#, 4 @@ -260,18 +261,18 @@ Music_VermilionCity_branch_eb79e: note A_, 4 octave 3 note D_, 2 - note __, 4 + rest 4 note D_, 1 note D_, 1 - callchannel Music_VermilionCity_branch_eb7f5 + sound_call .sub2 octave 4 note D_, 2 octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 - callchannel Music_VermilionCity_branch_eb7f5 - intensity $25 + sound_call .sub2 + volume_envelope 2, 5 octave 3 note E_, 8 octave 4 @@ -284,13 +285,13 @@ Music_VermilionCity_branch_eb79e: note E_, 16 octave 3 note E_, 14 - intensity $22 + volume_envelope 2, 2 octave 5 note E_, 1 note G#, 1 - loopchannel 0, Music_VermilionCity_branch_eb79e + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb7de: +.sub1: octave 5 note A_, 8 octave 6 @@ -313,25 +314,25 @@ Music_VermilionCity_branch_eb7de: note C#, 1 octave 5 note B_, 1 - endchannel + sound_ret -Music_VermilionCity_branch_eb7f5: +.sub2: note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note F#, 2 note E_, 2 - note __, 4 + rest 4 note E_, 1 note E_, 1 octave 4 note E_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 1 octave 4 note C#, 1 - endchannel + sound_ret diff --git a/crysaudio/music/victoryroad.asm b/crysaudio/music/victoryroad.asm index ea914865..ff602cee 100644 --- a/crysaudio/music/victoryroad.asm +++ b/crysaudio/music/victoryroad.asm @@ -1,30 +1,32 @@ Music_VictoryRoad: - musicheader 4, 1, Music_VictoryRoad_Ch1 - musicheader 1, 2, Music_VictoryRoad_Ch2 - musicheader 1, 3, Music_VictoryRoad_Ch3 - musicheader 1, 4, Music_VictoryRoad_Ch4 + channel_count 4 + channel 1, Music_VictoryRoad_Ch1 + channel 2, Music_VictoryRoad_Ch2 + channel 3, Music_VictoryRoad_Ch3 + channel 4, Music_VictoryRoad_Ch4 Music_VictoryRoad_Ch1: tempo 144 - volume $77 - stereopanning $f - dutycycle $3 - tone $0002 - notetype $c, $b3 -Music_VictoryRoad_branch_f6c8d: - callchannel Music_VictoryRoad_branch_f6cb9 - loopchannel 6, Music_VictoryRoad_branch_f6c8d -Music_VictoryRoad_branch_f6c94: - intensity $b2 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 3 + pitch_offset 2 + note_type 12, 11, 3 +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 6, .loop1 +.loop2: + volume_envelope 11, 2 octave 2 note A_, 1 octave 3 note C#, 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - intensity $b7 + volume_envelope 11, 7 octave 3 note C#, 3 octave 2 @@ -35,23 +37,23 @@ Music_VictoryRoad_branch_f6c94: note A_, 1 octave 3 note G#, 3 - loopchannel 2, Music_VictoryRoad_branch_f6c94 -Music_VictoryRoad_branch_f6cae: - callchannel Music_VictoryRoad_branch_f6cb9 - loopchannel 2, Music_VictoryRoad_branch_f6cae - loopchannel 0, Music_VictoryRoad_branch_f6c8d + sound_loop 2, .loop2 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6cb9: - intensity $b2 +.sub1: + volume_envelope 11, 2 octave 2 note G_, 1 note B_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - intensity $b7 + volume_envelope 11, 7 note B_, 3 note G_, 1 octave 3 @@ -60,20 +62,20 @@ Music_VictoryRoad_branch_f6cb9: note G_, 1 octave 3 note F#, 3 - endchannel + sound_ret Music_VictoryRoad_Ch2: - dutycycle $3 - vibrato $10, $24 -Music_VictoryRoad_branch_f6cd3: - notetype $c, $c2 - callchannel Music_VictoryRoad_branch_f6d1e - note __, 2 - callchannel Music_VictoryRoad_branch_f6d1e - note __, 1 + duty_cycle 3 + vibrato 16, 2, 4 +.mainloop: + note_type 12, 12, 2 + sound_call .sub1 + rest 2 + sound_call .sub1 + rest 1 octave 4 note C_, 1 - notetype $c, $b0 + note_type 12, 11, 0 note E_, 8 octave 5 note C_, 4 @@ -81,33 +83,33 @@ Music_VictoryRoad_branch_f6cd3: note B_, 4 note E_, 15 note D#, 1 - notetype $c, $b0 + note_type 12, 11, 0 note E_, 8 octave 5 note C_, 4 octave 4 note B_, 4 - notetype $c, $b0 + note_type 12, 11, 0 octave 5 note E_, 8 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE note C#, 4 - stereopanning $f + stereo_panning FALSE, TRUE octave 4 note A_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE octave 5 note C_, 8 - stereopanning $f + stereo_panning FALSE, TRUE octave 4 note A#, 4 - stereopanning $f0 + stereo_panning TRUE, FALSE note F_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE note A_, 12 note D_, 1 note F#, 1 @@ -115,83 +117,84 @@ Music_VictoryRoad_branch_f6cd3: octave 5 note C#, 1 note D_, 16 - loopchannel 0, Music_VictoryRoad_branch_f6cd3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6d1e: +.sub1: octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 note F#, 1 - note __, 2 + rest 2 note G#, 1 note G#, 1 - note __, 2 + rest 2 note A_, 1 note A_, 1 - endchannel + sound_ret Music_VictoryRoad_Ch3: - stereopanning $f0 - notetype $c, $28 -Music_VictoryRoad_branch_f6d31: - callchannel Music_VictoryRoad_branch_f6d52 - loopchannel 6, Music_VictoryRoad_branch_f6d31 -Music_VictoryRoad_branch_f6d38: + stereo_panning TRUE, FALSE + note_type 12, 2, 8 +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 6, .loop1 +.loop2: note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F_, 1 note A_, 3 note D_, 1 note B_, 1 - note __, 2 + rest 2 note D_, 1 note B_, 3 - loopchannel 2, Music_VictoryRoad_branch_f6d38 -Music_VictoryRoad_branch_f6d47: - callchannel Music_VictoryRoad_branch_f6d52 - loopchannel 2, Music_VictoryRoad_branch_f6d47 - loopchannel 0, Music_VictoryRoad_branch_f6d31 + sound_loop 2, .loop2 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6d52: +.sub1: octave 3 note C_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D#, 1 note G_, 3 note C_, 1 note A_, 1 - note __, 2 + rest 2 note C_, 1 note A_, 3 - endchannel + sound_ret Music_VictoryRoad_Ch4: - togglenoise $0 - notetype $c -Music_VictoryRoad_branch_f6d63: - note D_, 2 - note D_, 2 - note D#, 1 - note D_, 3 - note D#, 1 - note D_, 3 - note D#, 1 - note D_, 3 - note D_, 2 - note D_, 2 - note D#, 1 - note D_, 3 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D_, 2 - note D#, 1 - loopchannel 0, Music_VictoryRoad_branch_f6d63 + toggle_noise 0 + drum_speed 12 +.mainloop: + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + sound_loop 0, .mainloop diff --git a/crysaudio/music/violetcity.asm b/crysaudio/music/violetcity.asm index a8a89c3c..44c1b7e3 100644 --- a/crysaudio/music/violetcity.asm +++ b/crysaudio/music/violetcity.asm @@ -1,40 +1,41 @@ Music_VioletCity: - musicheader 4, 1, Music_VioletCity_Ch1 - musicheader 1, 2, Music_VioletCity_Ch2 - musicheader 1, 3, Music_VioletCity_Ch3 - musicheader 1, 4, Music_VioletCity_Ch4 + channel_count 4 + channel 1, Music_VioletCity_Ch1 + channel 2, Music_VioletCity_Ch2 + channel 3, Music_VioletCity_Ch3 + channel 4, Music_VioletCity_Ch4 Music_VioletCity_Ch1: tempo 164 - volume $77 - vibrato $12, $25 - dutycycle $2 - notetype $c, $95 - note __, 16 - stereopanning $f0 + volume 7, 7 + vibrato 18, 2, 5 + duty_cycle 2 + note_type 12, 9, 5 + rest 16 + stereo_panning TRUE, FALSE octave 2 note E_, 1 note G#, 1 note B_, 1 - stereopanning $ff + stereo_panning TRUE, TRUE octave 3 note D#, 1 note G#, 1 - note __, 1 + rest 1 note A#, 4 note G#, 2 note F#, 2 note C#, 2 - stereopanning $f + stereo_panning FALSE, TRUE octave 2 note D#, 1 note F#, 1 note A#, 1 - stereopanning $ff + stereo_panning TRUE, TRUE octave 3 note C#, 1 note F#, 1 - note __, 1 + rest 1 note D#, 4 note G#, 2 note D#, 2 @@ -46,10 +47,10 @@ Music_VioletCity_Ch1: note B_, 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note B_, 4 - notetype $6, $91 + note_type 6, 9, 1 octave 3 note C#, 2 note F_, 2 @@ -57,16 +58,16 @@ Music_VioletCity_Ch1: note F_, 2 note G#, 2 note B_, 2 - intensity $a4 + volume_envelope 10, 4 octave 2 note B_, 8 - note __, 4 + rest 4 octave 3 note C#, 12 - note __, 8 -Music_VioletCity_branch_f0056: - notetype $6, $95 - note __, 4 + rest 8 +.mainloop: + note_type 6, 9, 5 + rest 4 octave 2 note B_, 2 octave 3 @@ -75,14 +76,14 @@ Music_VioletCity_branch_f0056: note D#, 2 note E_, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 - stereopanning $f0 + rest 2 + stereo_panning TRUE, FALSE octave 4 note C#, 2 octave 3 @@ -90,22 +91,22 @@ Music_VioletCity_branch_f0056: note E_, 2 octave 4 note C#, 2 - stereopanning $ff + stereo_panning TRUE, TRUE note C_, 2 octave 3 note G#, 2 note E_, 2 octave 4 note C_, 2 - stereopanning $f + stereo_panning FALSE, TRUE octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note A#, 8 - stereopanning $ff - note __, 4 + stereo_panning TRUE, TRUE + rest 4 note C#, 2 note E_, 2 note A#, 4 @@ -114,60 +115,60 @@ Music_VioletCity_branch_f0056: note C#, 2 octave 3 note A#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - stereopanning $f + rest 2 + stereo_panning FALSE, TRUE note D#, 8 - stereopanning $ff + stereo_panning TRUE, TRUE note E_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE note F_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE note G#, 2 note D#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note B_, 4 note G#, 2 note G#, 2 note A#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note D#, 4 note F#, 2 - note __, 2 - notetype $c, $95 - note __, 8 + rest 2 + note_type 12, 9, 5 + rest 8 octave 4 note F_, 3 - dutycycle $1 - notetype $6, $75 + duty_cycle 1 + note_type 6, 7, 5 note G#, 1 note B_, 1 octave 5 note D#, 8 - notetype $c, $93 - dutycycle $2 - note __, 16 - notetype $6, $91 - stereopanning $f0 + note_type 12, 9, 3 + duty_cycle 2 + rest 16 + note_type 6, 9, 1 + stereo_panning TRUE, FALSE octave 3 note E_, 2 octave 2 @@ -175,27 +176,27 @@ Music_VioletCity_branch_f0056: note G#, 2 octave 3 note E_, 2 - stereopanning $f + stereo_panning FALSE, TRUE octave 2 note B_, 2 note G#, 2 note B_, 2 octave 3 note E_, 2 - intensity $a4 - stereopanning $ff + volume_envelope 10, 4 + stereo_panning TRUE, TRUE note D#, 8 - note __, 8 - dutycycle $3 - intensity $84 - note __, 4 + rest 8 + duty_cycle 3 + volume_envelope 8, 4 + rest 4 note G_, 2 note A_, 2 note B_, 4 octave 4 note D_, 4 note C#, 4 - notetype $8, $84 + note_type 8, 8, 4 octave 3 note B_, 1 octave 4 @@ -203,36 +204,36 @@ Music_VioletCity_branch_f0056: octave 3 note B_, 1 note A_, 3 - notetype $c, $84 + note_type 12, 8, 4 note F#, 1 - note __, 1 + rest 1 note F#, 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 note D_, 4 note E_, 4 note F#, 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 octave 4 note C#, 1 note D_, 2 note F#, 2 note E_, 2 - notetype $8, $84 + note_type 8, 8, 4 note D_, 1 note E_, 1 note D_, 1 note C#, 3 - notetype $c, $84 + note_type 12, 8, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 2 octave 4 note E_, 4 @@ -245,11 +246,11 @@ Music_VioletCity_branch_f0056: octave 4 note E_, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 note A#, 1 note B_, 4 - note __, 4 + rest 4 note G#, 1 note F_, 1 octave 3 @@ -257,11 +258,11 @@ Music_VioletCity_branch_f0056: octave 4 note F_, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 note A#, 1 note B_, 4 - note __, 4 + rest 4 note C#, 1 octave 3 note B_, 1 @@ -285,7 +286,7 @@ Music_VioletCity_branch_f0056: note A#, 1 octave 5 note C#, 1 - dutycycle $2 + duty_cycle 2 octave 4 note C#, 6 note C_, 1 @@ -293,21 +294,21 @@ Music_VioletCity_branch_f0056: note B_, 1 octave 4 note C#, 4 - note __, 4 - loopchannel 0, Music_VioletCity_branch_f0056 + rest 4 + sound_loop 0, .mainloop Music_VioletCity_Ch2: - vibrato $12, $24 - dutycycle $2 - notetype $c, $c7 - note __, 16 + vibrato 18, 2, 4 + duty_cycle 2 + note_type 12, 12, 7 + rest 16 octave 3 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D#, 4 note C#, 2 @@ -315,11 +316,11 @@ Music_VioletCity_Ch2: note A#, 2 note G#, 2 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 4 octave 3 @@ -327,11 +328,11 @@ Music_VioletCity_Ch2: note A#, 2 note B_, 2 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 4 note A#, 2 note B_, 2 @@ -342,63 +343,63 @@ Music_VioletCity_Ch2: note F#, 2 octave 4 note D#, 1 - note __, 1 + rest 1 note C#, 6 - note __, 2 + rest 2 note D#, 1 note E_, 1 -Music_VioletCity_branch_f0199: - intensity $b7 +.mainloop: + volume_envelope 11, 7 note F#, 4 - note __, 2 + rest 2 note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 14 note C#, 1 note D#, 1 note E_, 4 - note __, 2 + rest 2 note E_, 1 note F#, 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 12 - note __, 2 + rest 2 octave 3 note B_, 1 octave 4 note C#, 1 note D#, 4 - note __, 2 + rest 2 note D#, 1 note E_, 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 4 note G#, 4 note B_, 3 - note __, 3 + rest 3 note C#, 1 note D#, 1 note E_, 2 @@ -421,41 +422,41 @@ Music_VioletCity_branch_f0199: note C#, 1 octave 3 note B_, 12 - note __, 4 - intensity $a7 - dutycycle $3 - note __, 2 + rest 4 + volume_envelope 10, 7 + duty_cycle 3 + rest 2 note B_, 1 octave 4 note C#, 1 note D_, 2 note F#, 2 note E_, 2 - notetype $8, $a7 + note_type 8, 10, 7 note D_, 1 note E_, 1 note D_, 1 note C#, 3 - notetype $c, $a7 + note_type 12, 10, 7 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 2 octave 4 note E_, 4 note D_, 4 note C#, 2 - note __, 2 + rest 2 note G_, 1 note A_, 1 note B_, 2 octave 5 note D_, 2 note C#, 2 - notetype $8, $a7 + note_type 8, 10, 7 octave 4 note B_, 1 octave 5 @@ -463,130 +464,130 @@ Music_VioletCity_branch_f0199: octave 4 note B_, 1 note A_, 3 - notetype $c, $a7 + note_type 12, 10, 7 note G_, 1 - note __, 1 + rest 1 note F#, 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 - vibrato $0, $0 - intensity $87 + vibrato 0, 0, 0 + volume_envelope 8, 7 octave 5 note E_, 4 note F#, 4 note D_, 1 note E_, 1 note F#, 12 - note __, 2 + rest 2 note D_, 1 note E_, 1 note F#, 12 - note __, 2 + rest 2 octave 4 note A#, 1 note B_, 1 octave 5 note C#, 11 - note __, 5 - vibrato $12, $24 - intensity $a7 - dutycycle $2 + rest 5 + vibrato 18, 2, 4 + volume_envelope 10, 7 + duty_cycle 2 octave 4 note A#, 6 note A_, 1 note G#, 1 note F#, 4 - note __, 2 + rest 2 note D#, 1 note E_, 1 - loopchannel 0, Music_VioletCity_branch_f0199 + sound_loop 0, .mainloop Music_VioletCity_Ch3: - notetype $c, $25 - note __, 16 - note __, 6 + note_type 12, 2, 5 + rest 16 + rest 6 octave 4 note E_, 4 - note __, 6 - note __, 6 + rest 6 + rest 6 octave 3 note G#, 4 - note __, 6 - note __, 6 + rest 6 + rest 6 note F_, 4 - note __, 6 + rest 6 octave 2 note F#, 4 octave 3 note C#, 1 - note __, 1 + rest 1 note A#, 4 note A_, 1 note G#, 1 note F#, 2 octave 2 note A#, 2 -Music_VioletCity_branch_f0261: - notetype $c, $25 +.mainloop: + note_type 12, 2, 5 note B_, 1 - note __, 5 + rest 5 note B_, 1 note B_, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 2 note F#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 5 + rest 5 note C#, 1 note C#, 1 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note G#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 5 + rest 5 note F#, 1 note F#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 note C#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 5 + rest 5 note B_, 1 note B_, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 4 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 2 note F#, 1 - note __, 1 - notetype $6, $25 + rest 1 + note_type 6, 2, 5 octave 3 note C#, 2 note F_, 2 @@ -599,82 +600,82 @@ Music_VioletCity_branch_f0261: note B_, 2 octave 4 note C#, 6 - notetype $c, $25 - note __, 5 - notetype $6, $25 + note_type 12, 2, 5 + rest 5 + note_type 6, 2, 5 octave 2 note E_, 2 - note __, 10 + rest 10 note E_, 2 note E_, 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note C#, 4 note C_, 4 octave 2 note B_, 2 - note __, 10 + rest 10 note B_, 2 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 2 + rest 2 note A_, 8 - callchannel Music_VioletCity_branch_f0311 + sound_call .sub1 note F#, 2 - note __, 10 + rest 10 note B_, 2 note B_, 2 note B_, 2 - note __, 2 + rest 2 note A#, 8 note A_, 2 - note __, 2 - callchannel Music_VioletCity_branch_f0311 + rest 2 + sound_call .sub1 note F#, 2 - note __, 10 + rest 10 note B_, 2 note B_, 2 note B_, 2 - note __, 2 + rest 2 note A#, 8 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 10 + rest 10 note E_, 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note B_, 4 note G#, 2 note F#, 2 note F_, 2 - note __, 10 + rest 10 note F_, 2 note F_, 2 - note __, 4 + rest 4 note F_, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 3 note A#, 2 note G#, 2 note F#, 2 - note __, 10 + rest 10 note F#, 2 note F#, 2 octave 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note F#, 4 octave 2 @@ -685,90 +686,90 @@ Music_VioletCity_branch_f0261: note G#, 2 note A_, 2 note A#, 8 - note __, 4 + rest 4 octave 2 note A#, 4 - loopchannel 0, Music_VioletCity_branch_f0261 + sound_loop 0, .mainloop -Music_VioletCity_branch_f0311: +.sub1: note G_, 2 - note __, 10 + rest 10 note G_, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 4 octave 2 note A_, 4 - endchannel + sound_ret Music_VioletCity_Ch4: - togglenoise $3 - notetype $c - note D#, 2 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D_, 4 - note F#, 4 - callchannel Music_VioletCity_branch_f036c - callchannel Music_VioletCity_branch_f036c - callchannel Music_VioletCity_branch_f036c - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note C_, 8 - note D#, 2 -Music_VioletCity_branch_f0338: - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - loopchannel 0, Music_VioletCity_branch_f0338 + toggle_noise 3 + drum_speed 12 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 3, 4 + drum_note 7, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 1, 8 + drum_note 4, 2 +.mainloop: + 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_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 -Music_VioletCity_branch_f036c: - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - note D_, 2 - note G_, 2 - note G_, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - endchannel +.sub1: + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_ret -Music_VioletCity_branch_f037a: - note D#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note D#, 1 - note D#, 1 - note __, 2 - note D#, 2 - note D_, 2 - note D#, 2 - endchannel +.sub2: + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + rest 1 + drum_note 4, 1 + drum_note 4, 1 + rest 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret diff --git a/crysaudio/music/viridiancity.asm b/crysaudio/music/viridiancity.asm index ea38a0e6..6bc72006 100644 --- a/crysaudio/music/viridiancity.asm +++ b/crysaudio/music/viridiancity.asm @@ -1,53 +1,54 @@ Music_ViridianCity: - musicheader 4, 1, Music_ViridianCity_Ch1 - musicheader 1, 2, Music_ViridianCity_Ch2 - musicheader 1, 3, Music_ViridianCity_Ch3 - musicheader 1, 4, Music_ViridianCity_Ch4 + channel_count 4 + channel 1, Music_ViridianCity_Ch1 + channel 2, Music_ViridianCity_Ch2 + channel 3, Music_ViridianCity_Ch3 + channel 4, Music_ViridianCity_Ch4 Music_ViridianCity_Ch1: tempo 157 - volume $77 - stereopanning $f - dutycycle $2 - vibrato $12, $34 - notetype $c, $a7 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 2 + vibrato 18, 3, 4 + note_type 12, 10, 7 octave 3 note F#, 1 - note __, 3 + rest 3 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F#, 4 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note G_, 8 - note __, 4 -Music_ViridianCity_branch_f4039: - callchannel Music_ViridianCity_branch_f40c5 - note __, 4 - callchannel Music_ViridianCity_branch_f40c5 + rest 4 +.mainloop: + sound_call .sub1 + rest 4 + sound_call .sub1 octave 4 note C_, 4 - callchannel Music_ViridianCity_branch_f410f + sound_call .sub2 octave 4 note B_, 2 note G_, 2 @@ -57,35 +58,35 @@ Music_ViridianCity_branch_f4039: note F#, 2 note E_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note F#, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - intensity $87 + rest 1 + volume_envelope 8, 7 octave 5 note F#, 4 note F_, 4 - intensity $a7 + volume_envelope 10, 7 octave 3 note G_, 6 note B_, 8 octave 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 3 note B_, 4 @@ -97,27 +98,27 @@ Music_ViridianCity_branch_f4039: note A_, 2 octave 3 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note D_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note F#, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D#, 2 note C_, 2 octave 3 note B_, 2 note A_, 2 - callchannel Music_ViridianCity_branch_f410f + sound_call .sub2 octave 4 note A_, 2 note G_, 2 @@ -127,430 +128,430 @@ Music_ViridianCity_branch_f4039: note F#, 2 note E_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note F#, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note E_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 2 note G_, 6 note B_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 note F#, 2 note G_, 6 note E_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 octave 4 note E_, 2 - note __, 2 + rest 2 note F#, 6 note D_, 4 octave 3 note A_, 4 note F#, 4 note G_, 1 - note __, 3 + rest 3 note G_, 8 note A#, 4 - loopchannel 0, Music_ViridianCity_branch_f4039 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f40c5: +.sub1: octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 4 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 3 + rest 3 note G_, 2 - note __, 4 + rest 4 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 3 + rest 3 note D_, 2 - note __, 4 + rest 4 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 octave 3 note G_, 4 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 3 + rest 3 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note G_, 8 - endchannel + sound_ret -Music_ViridianCity_branch_f410f: +.sub2: octave 3 note B_, 2 note D_, 2 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note G_, 2 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 octave 3 note B_, 2 octave 4 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_ViridianCity_Ch2: - vibrato $10, $46 - dutycycle $1 - notetype $c, $b7 - stereopanning $f0 + vibrato 16, 4, 6 + duty_cycle 1 + note_type 12, 11, 7 + stereo_panning TRUE, FALSE octave 2 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note E_, 8 - note __, 4 -Music_ViridianCity_branch_f414c: - callchannel Music_ViridianCity_branch_f41c0 - note __, 4 - callchannel Music_ViridianCity_branch_f41c0 + rest 4 +.mainloop: + sound_call .sub1 + rest 4 + sound_call .sub1 octave 2 note F#, 4 - callchannel Music_ViridianCity_branch_f4201 + sound_call .sub2 note G_, 4 - note __, 2 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 4 octave 2 note B_, 2 - callchannel Music_ViridianCity_branch_f420b - note __, 2 + sound_call .sub3 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 4 note C_, 4 - callchannel Music_ViridianCity_branch_f4215 + sound_call .sub4 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note E_, 2 note B_, 2 note G_, 4 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 note C_, 2 note C#, 2 - note __, 2 + rest 2 note D#, 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note D#, 2 note C_, 2 octave 2 note A_, 2 note F#, 2 - callchannel Music_ViridianCity_branch_f4201 + sound_call .sub2 note G_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 4 note G_, 2 - callchannel Music_ViridianCity_branch_f420b - note __, 2 + sound_call .sub3 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note D#, 2 - callchannel Music_ViridianCity_branch_f4215 + sound_call .sub4 note E_, 4 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note A#, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 8 octave 1 note A_, 4 - loopchannel 0, Music_ViridianCity_branch_f414c + sound_loop 0, .mainloop -Music_ViridianCity_branch_f41c0: +.sub1: octave 2 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 4 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 4 + rest 4 octave 2 note A_, 4 - note __, 2 + rest 2 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 - note __, 1 + rest 1 octave 2 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note E_, 8 - endchannel + sound_ret -Music_ViridianCity_branch_f4201: +.sub2: note G_, 4 - note __, 2 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 4 octave 2 note F_, 2 note F#, 2 - endchannel + sound_ret -Music_ViridianCity_branch_f420b: +.sub3: note F#, 4 - note __, 2 + rest 2 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 4 octave 2 note E_, 2 note F_, 2 - endchannel + sound_ret -Music_ViridianCity_branch_f4215: +.sub4: octave 2 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 4 note D_, 2 note D#, 2 - endchannel + sound_ret Music_ViridianCity_Ch3: - vibrato $12, $24 - notetype $c, $13 - stereopanning $ff + vibrato 18, 2, 4 + note_type 12, 1, 3 + stereo_panning TRUE, TRUE octave 4 note A_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 octave 5 note F#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 octave 5 note D_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note D_, 8 note F#, 2 note G_, 2 -Music_ViridianCity_branch_f4246: - intensity $13 - callchannel Music_ViridianCity_branch_f42a2 +.mainloop: + volume_envelope 1, 3 + sound_call .sub1 octave 5 note F#, 2 note G_, 2 - callchannel Music_ViridianCity_branch_f42a2 + sound_call .sub1 note E_, 4 - vibrato $18, $25 - intensity $25 + vibrato 24, 2, 5 + volume_envelope 2, 5 note B_, 12 note G_, 4 octave 6 @@ -569,7 +570,7 @@ Music_ViridianCity_branch_f4246: note E_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 note F#, 4 note E_, 4 @@ -577,7 +578,7 @@ Music_ViridianCity_branch_f4246: note F#, 12 note D_, 4 note A_, 4 - note __, 4 + rest 4 octave 6 note C_, 8 octave 5 @@ -586,57 +587,57 @@ Music_ViridianCity_branch_f4246: note C#, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 5 note B_, 2 - note __, 2 + rest 2 note A_, 10 note A_, 2 note B_, 2 octave 6 note C_, 2 - note __, 2 + rest 2 octave 5 note B_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 12 note G_, 2 note A_, 2 note A#, 6 note A_, 2 - note __, 2 + rest 2 note G_, 2 note A#, 2 - note __, 2 + rest 2 note A_, 14 - note __, 4 + rest 4 note D_, 1 - note __, 3 + rest 3 note D_, 8 note E_, 4 - loopchannel 0, Music_ViridianCity_branch_f4246 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f42a2: +.sub1: octave 5 note A_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 6 - note __, 2 + rest 6 + rest 2 note F#, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 note G_, 2 note F#, 2 @@ -644,32 +645,32 @@ Music_ViridianCity_branch_f42a2: note E_, 2 octave 4 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 2 + rest 2 octave 5 note G_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 4 octave 5 note E_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 6 - note __, 2 + rest 6 + rest 2 note E_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 note F#, 2 note E_, 2 @@ -677,106 +678,106 @@ Music_ViridianCity_branch_f42a2: note D_, 2 octave 4 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 octave 5 note D_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note D_, 8 - endchannel + sound_ret Music_ViridianCity_Ch4: - togglenoise $3 - notetype $c - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f432c -Music_ViridianCity_branch_f42e9: - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f432c - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f432c - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f434b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f434b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f433b - loopchannel 0, Music_ViridianCity_branch_f42e9 + toggle_noise 3 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + sound_call .sub3 + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub3 + sound_call .sub3 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f431d: - note E_, 2 - note E_, 2 - note D_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 2 - note D_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - endchannel +.sub1: + drum_note 5, 2 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 4 + drum_note 3, 2 + drum_note 5, 2 + drum_note 7, 2 + drum_note 5, 2 + drum_note 5, 2 + drum_note 3, 4 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_note 7, 2 + sound_ret -Music_ViridianCity_branch_f432c: - note E_, 2 - note E_, 2 - note D_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 2 - note F#, 4 - note D_, 2 - note D_, 2 - note A#, 2 - note A#, 2 - endchannel +.sub2: + drum_note 5, 2 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 4 + drum_note 3, 2 + drum_note 5, 2 + drum_note 7, 2 + drum_note 5, 2 + drum_note 5, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 11, 2 + drum_note 11, 2 + sound_ret -Music_ViridianCity_branch_f433b: - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - endchannel +.sub3: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret -Music_ViridianCity_branch_f434b: - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note F#, 2 - endchannel +.sub4: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret diff --git a/crysaudio/music/wildpokemonvictory.asm b/crysaudio/music/wildpokemonvictory.asm index f1438dc6..95159517 100644 --- a/crysaudio/music/wildpokemonvictory.asm +++ b/crysaudio/music/wildpokemonvictory.asm @@ -1,48 +1,49 @@ Music_WildPokemonVictory: - musicheader 3, 1, Music_WildPokemonVictory_Ch1 - musicheader 1, 2, Music_WildPokemonVictory_Ch2 - musicheader 1, 3, Music_WildPokemonVictory_Ch3 + channel_count 3 + channel 1, Music_WildPokemonVictory_Ch1 + channel 2, Music_WildPokemonVictory_Ch2 + channel 3, Music_WildPokemonVictory_Ch3 Music_WildPokemonVictory_Ch1: tempo 126 - volume $77 - dutycycle $3 - tone $0001 - notetype $c, $b1 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + note_type 12, 11, 1 octave 3 note B_, 1 note A_, 1 note G#, 1 note F#, 1 - intensity $b6 + volume_envelope 11, 6 note E_, 12 -Music_SuccessfulCapture_branch_f4536: - stereopanning $f -Music_WildPokemonVictory_branch_f4538: - callchannel Music_WildPokemonVictory_branch_f455c +.body: + stereo_panning FALSE, TRUE +.mainloop: + sound_call .sub1 note F#, 2 note F#, 2 note F#, 4 - callchannel Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note G#, 4 - intensity $78 + volume_envelope 7, 8 octave 3 note G_, 4 - pitchoffset 0, C# - callchannel Music_WildPokemonVictory_branch_f455c + transpose 0, 1 + sound_call .sub1 note F#, 2 note F#, 2 note F#, 4 - callchannel Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note G#, 4 - pitchoffset 0, C_ - intensity $78 + transpose 0, 0 + volume_envelope 7, 8 octave 3 note F#, 4 - loopchannel 0, Music_WildPokemonVictory_branch_f4538 + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f455c: - intensity $71 +.sub1: + volume_envelope 7, 1 octave 3 note G#, 1 note B_, 1 @@ -65,56 +66,56 @@ Music_WildPokemonVictory_branch_f455c: note E_, 2 note E_, 2 note A_, 2 - endchannel + sound_ret Music_WildPokemonVictory_Ch2: - vibrato $12, $24 - dutycycle $2 - notetype $c, $d1 + vibrato 18, 2, 4 + duty_cycle 2 + note_type 12, 13, 1 octave 4 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - intensity $d6 + volume_envelope 13, 6 note B_, 12 -Music_SuccessfulCapture_branch_f4585: - stereopanning $f0 -Music_WildPokemonVictory_branch_f4587: - callchannel Music_WildPokemonVictory_branch_f45b5 +.body: + stereo_panning TRUE, FALSE +.mainloop: + sound_call .sub1 octave 4 note B_, 2 note B_, 2 note B_, 4 - callchannel Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 4 - intensity $81 + volume_envelope 8, 1 note C_, 1 note E_, 1 note G_, 1 note A#, 1 - pitchoffset 0, C# - callchannel Music_WildPokemonVictory_branch_f45b5 + transpose 0, 1 + sound_call .sub1 octave 4 note B_, 2 note B_, 2 note B_, 4 - callchannel Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 4 - pitchoffset 0, C_ - intensity $81 + transpose 0, 0 + volume_envelope 8, 1 octave 3 note B_, 1 octave 4 note D#, 1 note F#, 1 note A_, 1 - loopchannel 0, Music_WildPokemonVictory_branch_f4587 + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f45b5: - intensity $81 +.sub1: + volume_envelope 8, 1 octave 4 note B_, 2 note A_, 2 @@ -127,56 +128,56 @@ Music_WildPokemonVictory_branch_f45b5: note C#, 2 note C#, 2 note C#, 4 - endchannel + sound_ret Music_WildPokemonVictory_Ch3: - notetype $c, $20 - note __, 6 + note_type 12, 2, 0 + rest 6 octave 6 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 -Music_SuccessfulCapture_branch_f45cf: -Music_WildPokemonVictory_branch_f45cf: - callchannel Music_WildPokemonVictory_branch_f45f4 + rest 3 +.body: +.mainloop: + sound_call .sub1 note D#, 2 note C#, 2 octave 2 note B_, 2 - note __, 2 - callchannel Music_WildPokemonVictory_branch_f45f4 + rest 2 + sound_call .sub1 note E_, 2 - note __, 2 + rest 2 note C_, 4 - pitchoffset 0, C# - callchannel Music_WildPokemonVictory_branch_f45f4 + transpose 0, 1 + sound_call .sub1 note D#, 2 note C#, 2 octave 2 note B_, 2 - note __, 2 - callchannel Music_WildPokemonVictory_branch_f45f4 + rest 2 + sound_call .sub1 note E_, 2 - note __, 2 - pitchoffset 0, C_ + rest 2 + transpose 0, 0 octave 2 note B_, 4 - loopchannel 0, Music_WildPokemonVictory_branch_f45cf + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f45f4: - intensity $25 +.sub1: + volume_envelope 2, 5 octave 3 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 note C#, 2 - note __, 4 + rest 4 note C#, 2 - endchannel + sound_ret diff --git a/crysaudio/music_pointers.asm b/crysaudio/music_pointers.asm index 7efd8c29..19296273 100644 --- a/crysaudio/music_pointers.asm +++ b/crysaudio/music_pointers.asm @@ -106,15 +106,3 @@ Music: dba Music_SuicuneBattle dba Music_BattleTowerLobby dba Music_MobileCenter -; remixes and custom songs - dba Music_JohtoGSC - dba Music_CeruleanGSC - dba Music_CinnabarGSC - dba Music_NuggetBridge - dba Music_Shop - dba Music_PokeathelonFinal - dba Music_PokeRadar - dba Music_NaljoWildBattle - dba Music_NaljoGymBattle - dba Music_PalletBattle - diff --git a/crysaudio/sfx.asm b/crysaudio/sfx.asm index d193643a..4b9b7169 100644 --- a/crysaudio/sfx.asm +++ b/crysaudio/sfx.asm @@ -1,459 +1,570 @@ Sfx_PokeballsPlacedOnTable: - musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 + channel_count 1 + channel 5, Sfx_PokeballsPlacedOnTable_Ch5 Sfx_BallWobble: - musicheader 1, 5, Sfx_BallWobble_Ch5 + channel_count 1 + channel 5, Sfx_BallWobble_Ch5 Sfx_Potion: - musicheader 1, 5, Sfx_Potion_Ch5 + channel_count 1 + channel 5, Sfx_Potion_Ch5 Sfx_FullHeal: - musicheader 1, 5, Sfx_FullHeal_Ch5 + channel_count 1 + channel 5, Sfx_FullHeal_Ch5 Sfx_Menu: - musicheader 1, 8, Sfx_Menu_Ch8 + channel_count 1 + channel 8, Sfx_Menu_Ch8 -Sfx_ReadText2: Sfx_ReadText: - musicheader 1, 5, Sfx_ReadText2_Ch5 +Sfx_ReadText2: + channel_count 1 + channel 5, Sfx_ReadText_Ch5 + assert Sfx_ReadText_Ch5 == Sfx_ReadText2_Ch5 Sfx_Poison: - musicheader 1, 5, Sfx_Poison_Ch5 + channel_count 1 + channel 5, Sfx_Poison_Ch5 Sfx_GotSafariBalls: - musicheader 1, 5, Sfx_GotSafariBalls_Ch5 + channel_count 1 + channel 5, Sfx_GotSafariBalls_Ch5 Sfx_BootPc: - musicheader 1, 5, Sfx_BootPc_Ch5 + channel_count 1 + channel 5, Sfx_BootPc_Ch5 Sfx_ShutDownPc: - musicheader 1, 5, Sfx_ShutDownPc_Ch5 + channel_count 1 + channel 5, Sfx_ShutDownPc_Ch5 Sfx_ChoosePcOption: - musicheader 1, 5, Sfx_ChoosePcOption_Ch5 + channel_count 1 + channel 5, Sfx_ChoosePcOption_Ch5 Sfx_EscapeRope: - musicheader 1, 5, Sfx_EscapeRope_Ch5 + channel_count 1 + channel 5, Sfx_EscapeRope_Ch5 Sfx_PushButton: - musicheader 1, 5, Sfx_PushButton_Ch5 + channel_count 1 + channel 5, Sfx_PushButton_Ch5 Sfx_SecondPartOfItemfinder: - musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5 + channel_count 1 + channel 5, Sfx_SecondPartOfItemfinder_Ch5 Sfx_WarpTo: - musicheader 1, 5, Sfx_WarpTo_Ch5 + channel_count 1 + channel 5, Sfx_WarpTo_Ch5 Sfx_WarpFrom: - musicheader 1, 5, Sfx_WarpFrom_Ch5 + channel_count 1 + channel 5, Sfx_WarpFrom_Ch5 Sfx_ChangeDexMode: - musicheader 1, 5, Sfx_ChangeDexMode_Ch5 + channel_count 1 + channel 5, Sfx_ChangeDexMode_Ch5 Sfx_JumpOverLedge: - musicheader 1, 5, Sfx_JumpOverLedge_Ch5 + channel_count 1 + channel 5, Sfx_JumpOverLedge_Ch5 Sfx_GrassRustle: - musicheader 1, 8, Sfx_GrassRustle_Ch8 + channel_count 1 + channel 8, Sfx_GrassRustle_Ch8 Sfx_Fly: - musicheader 1, 8, Sfx_Fly_Ch8 + channel_count 1 + channel 8, Sfx_Fly_Ch8 Sfx_Wrong: - musicheader 2, 5, Sfx_Wrong_Ch5 - musicheader 1, 6, Sfx_Wrong_Ch6 + channel_count 2 + channel 5, Sfx_Wrong_Ch5 + channel 6, Sfx_Wrong_Ch6 Sfx_Squeak: - musicheader 1, 5, Sfx_Squeak_Ch5 + channel_count 1 + channel 5, Sfx_Squeak_Ch5 Sfx_Strength: - musicheader 1, 8, Sfx_Strength_Ch8 + channel_count 1 + channel 8, Sfx_Strength_Ch8 Sfx_Boat: - musicheader 2, 5, Sfx_Boat_Ch5 - musicheader 1, 6, Sfx_Boat_Ch6 + channel_count 2 + channel 5, Sfx_Boat_Ch5 + channel 6, Sfx_Boat_Ch6 Sfx_WallOpen: - musicheader 1, 5, Sfx_WallOpen_Ch5 + channel_count 1 + channel 5, Sfx_WallOpen_Ch5 Sfx_PlacePuzzlePieceDown: - musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8 + channel_count 1 + channel 8, Sfx_PlacePuzzlePieceDown_Ch8 Sfx_EnterDoor: - musicheader 1, 8, Sfx_EnterDoor_Ch8 + channel_count 1 + channel 8, Sfx_EnterDoor_Ch8 Sfx_SwitchPokemon: - musicheader 2, 5, Sfx_SwitchPokemon_Ch5 - musicheader 1, 6, Sfx_SwitchPokemon_Ch6 + channel_count 2 + channel 5, Sfx_SwitchPokemon_Ch5 + channel 6, Sfx_SwitchPokemon_Ch6 Sfx_Tally: - musicheader 2, 5, Sfx_Tally_Ch5 - musicheader 1, 6, Sfx_Tally_Ch6 + channel_count 2 + channel 5, Sfx_Tally_Ch5 + channel 6, Sfx_Tally_Ch6 Sfx_Transaction: - musicheader 2, 5, Sfx_Transaction_Ch5 - musicheader 1, 6, Sfx_Transaction_Ch6 + channel_count 2 + channel 5, Sfx_Transaction_Ch5 + channel 6, Sfx_Transaction_Ch6 Sfx_Bump: - musicheader 1, 5, Sfx_Bump_Ch5 + channel_count 1 + channel 5, Sfx_Bump_Ch5 Sfx_ExitBuilding: - musicheader 1, 8, Sfx_ExitBuilding_Ch8 + channel_count 1 + channel 8, Sfx_ExitBuilding_Ch8 Sfx_Save: - musicheader 2, 5, Sfx_Save_Ch5 - musicheader 1, 6, Sfx_Save_Ch6 + channel_count 2 + channel 5, Sfx_Save_Ch5 + channel 6, Sfx_Save_Ch6 Sfx_Save_Ch5: - dutycycle $2 - sound __, 3, $f1, $0700 - sound __, 2, $e1, $0600 - sound __, 2, $e1, $0680 - sound __, 2, $e1, $06c0 - sound __, 3, $e1, $0700 - sound __, 3, $e1, $07c0 - sound __, 16, $f2, $07e0 - endchannel + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 1, 14, 1, 1536 + square_note 1, 14, 1, 1664 + square_note 1, 14, 1, 1728 + square_note 2, 14, 1, 1792 + square_note 2, 14, 1, 1984 + square_note 15, 15, 2, 2016 + sound_ret Sfx_Save_Ch6: - dutycycle $2 - sound __, 3, $8, 0 - sound __, 3, $a1, $0701 - sound __, 2, $91, $0601 - sound __, 2, $91, $0681 - sound __, 2, $91, $06c1 - sound __, 3, $91, $0701 - sound __, 3, $91, $07c1 - sound __, 16, $d2, $07e1 - endchannel + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 2, 10, 1, 1793 + square_note 1, 9, 1, 1537 + square_note 1, 9, 1, 1665 + square_note 1, 9, 1, 1729 + square_note 2, 9, 1, 1793 + square_note 2, 9, 1, 1985 + square_note 15, 13, 2, 2017 + sound_ret Sfx_Pokeflute: - musicheader 1, 7, Sfx_Pokeflute_Ch7 + channel_count 1 + channel 7, Sfx_Pokeflute_Ch7 Sfx_ElevatorEnd: - musicheader 1, 5, Sfx_ElevatorEnd_Ch5 + channel_count 1 + channel 5, Sfx_ElevatorEnd_Ch5 Sfx_ThrowBall: - musicheader 2, 5, Sfx_ThrowBall_Ch5 - musicheader 1, 6, Sfx_ThrowBall_Ch6 + channel_count 2 + channel 5, Sfx_ThrowBall_Ch5 + channel 6, Sfx_ThrowBall_Ch6 Sfx_BallPoof: - musicheader 2, 5, Sfx_BallPoof_Ch5 - musicheader 1, 8, Sfx_BallPoof_Ch8 + channel_count 2 + channel 5, Sfx_BallPoof_Ch5 + channel 8, Sfx_BallPoof_Ch8 Sfx_Unknown3A: - musicheader 2, 5, Sfx_Unknown3A_Ch5 - musicheader 1, 8, Sfx_Unknown3A_Ch8 + channel_count 2 + channel 5, Sfx_Unknown3A_Ch5 + channel 8, Sfx_Unknown3A_Ch8 Sfx_Run: - musicheader 1, 8, Sfx_Run_Ch8 + channel_count 1 + channel 8, Sfx_Run_Ch8 Sfx_SlotMachineStart: - musicheader 2, 5, Sfx_SlotMachineStart_Ch5 - musicheader 1, 6, Sfx_SlotMachineStart_Ch6 + channel_count 2 + channel 5, Sfx_SlotMachineStart_Ch5 + channel 6, Sfx_SlotMachineStart_Ch6 Sfx_Call: - musicheader 1, 5, Sfx_Call_Ch5 + channel_count 1 + channel 5, Sfx_Call_Ch5 Sfx_Unknown60: - musicheader 1, 8, Sfx_Unknown60_Ch8 + channel_count 1 + channel 8, Sfx_Unknown60_Ch8 Sfx_Unknown61: - musicheader 1, 8, Sfx_Unknown61_Ch8 + channel_count 1 + channel 8, Sfx_Unknown61_Ch8 Sfx_SwitchPockets: - musicheader 1, 8, Sfx_SwitchPockets_Ch8 + channel_count 1 + channel 8, Sfx_SwitchPockets_Ch8 Sfx_Unknown63: - musicheader 1, 8, Sfx_Unknown63_Ch8 + channel_count 1 + channel 8, Sfx_Unknown63_Ch8 Sfx_Burn: - musicheader 1, 8, Sfx_Burn_Ch8 + channel_count 1 + channel 8, Sfx_Burn_Ch8 Sfx_TitleScreenEntrance: - musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8 + channel_count 1 + channel 8, Sfx_TitleScreenEntrance_Ch8 Sfx_Unknown66: - musicheader 1, 5, Sfx_Unknown66_Ch5 + channel_count 1 + channel 5, Sfx_Unknown66_Ch5 Sfx_GetCoinFromSlots: - musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5 + channel_count 1 + channel 5, Sfx_GetCoinFromSlots_Ch5 Sfx_PayDay: - musicheader 2, 5, Sfx_PayDay_Ch5 - musicheader 1, 6, Sfx_PayDay_Ch6 + channel_count 2 + channel 5, Sfx_PayDay_Ch5 + channel 6, Sfx_PayDay_Ch6 Sfx_Metronome: - musicheader 1, 5, Sfx_Metronome_Ch5 + channel_count 1 + channel 5, Sfx_Metronome_Ch5 Sfx_Peck: - musicheader 1, 8, Sfx_Peck_Ch8 + channel_count 1 + channel 8, Sfx_Peck_Ch8 Sfx_Kinesis: - musicheader 1, 5, Sfx_Kinesis_Ch5 + channel_count 1 + channel 5, Sfx_Kinesis_Ch5 Sfx_Lick: - musicheader 1, 5, Sfx_Lick_Ch5 + channel_count 1 + channel 5, Sfx_Lick_Ch5 Sfx_Pound: - musicheader 1, 8, Sfx_Pound_Ch8 + channel_count 1 + channel 8, Sfx_Pound_Ch8 Sfx_MovePuzzlePiece: - musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8 + channel_count 1 + channel 8, Sfx_MovePuzzlePiece_Ch8 Sfx_CometPunch: - musicheader 1, 8, Sfx_CometPunch_Ch8 + channel_count 1 + channel 8, Sfx_CometPunch_Ch8 Sfx_MegaPunch: - musicheader 1, 8, Sfx_MegaPunch_Ch8 + channel_count 1 + channel 8, Sfx_MegaPunch_Ch8 Sfx_Scratch: - musicheader 1, 8, Sfx_Scratch_Ch8 + channel_count 1 + channel 8, Sfx_Scratch_Ch8 Sfx_Vicegrip: - musicheader 1, 8, Sfx_Vicegrip_Ch8 + channel_count 1 + channel 8, Sfx_Vicegrip_Ch8 Sfx_RazorWind: - musicheader 1, 8, Sfx_RazorWind_Ch8 + channel_count 1 + channel 8, Sfx_RazorWind_Ch8 Sfx_Cut: - musicheader 1, 8, Sfx_Cut_Ch8 + channel_count 1 + channel 8, Sfx_Cut_Ch8 Sfx_WingAttack: - musicheader 1, 8, Sfx_WingAttack_Ch8 + channel_count 1 + channel 8, Sfx_WingAttack_Ch8 Sfx_Whirlwind: - musicheader 1, 8, Sfx_Whirlwind_Ch8 + channel_count 1 + channel 8, Sfx_Whirlwind_Ch8 Sfx_Bind: - musicheader 1, 8, Sfx_Bind_Ch8 + channel_count 1 + channel 8, Sfx_Bind_Ch8 Sfx_VineWhip: - musicheader 1, 8, Sfx_VineWhip_Ch8 + channel_count 1 + channel 8, Sfx_VineWhip_Ch8 Sfx_DoubleKick: - musicheader 1, 8, Sfx_DoubleKick_Ch8 + channel_count 1 + channel 8, Sfx_DoubleKick_Ch8 Sfx_MegaKick: - musicheader 1, 8, Sfx_MegaKick_Ch8 + channel_count 1 + channel 8, Sfx_MegaKick_Ch8 Sfx_Headbutt: - musicheader 1, 8, Sfx_Headbutt_Ch8 + channel_count 1 + channel 8, Sfx_Headbutt_Ch8 Sfx_HornAttack: - musicheader 1, 8, Sfx_HornAttack_Ch8 + channel_count 1 + channel 8, Sfx_HornAttack_Ch8 Sfx_Tackle: - musicheader 1, 8, Sfx_Tackle_Ch8 + channel_count 1 + channel 8, Sfx_Tackle_Ch8 Sfx_PoisonSting: - musicheader 1, 8, Sfx_PoisonSting_Ch8 + channel_count 1 + channel 8, Sfx_PoisonSting_Ch8 Sfx_Powder: - musicheader 1, 8, Sfx_Powder_Ch8 + channel_count 1 + channel 8, Sfx_Powder_Ch8 Sfx_Doubleslap: - musicheader 1, 8, Sfx_Doubleslap_Ch8 + channel_count 1 + channel 8, Sfx_Doubleslap_Ch8 Sfx_Bite: - musicheader 2, 5, Sfx_Bite_Ch5 - musicheader 1, 8, Sfx_Bite_Ch8 + channel_count 2 + channel 5, Sfx_Bite_Ch5 + channel 8, Sfx_Bite_Ch8 Sfx_JumpKick: - musicheader 1, 8, Sfx_JumpKick_Ch8 + channel_count 1 + channel 8, Sfx_JumpKick_Ch8 Sfx_Stomp: - musicheader 1, 8, Sfx_Stomp_Ch8 + channel_count 1 + channel 8, Sfx_Stomp_Ch8 Sfx_TailWhip: - musicheader 1, 8, Sfx_TailWhip_Ch8 + channel_count 1 + channel 8, Sfx_TailWhip_Ch8 Sfx_KarateChop: - musicheader 1, 8, Sfx_KarateChop_Ch8 + channel_count 1 + channel 8, Sfx_KarateChop_Ch8 Sfx_Submission: - musicheader 1, 8, Sfx_Submission_Ch8 + channel_count 1 + channel 8, Sfx_Submission_Ch8 Sfx_WaterGun: - musicheader 2, 5, Sfx_WaterGun_Ch5 - musicheader 1, 8, Sfx_WaterGun_Ch8 + channel_count 2 + channel 5, Sfx_WaterGun_Ch5 + channel 8, Sfx_WaterGun_Ch8 Sfx_SwordsDance: - musicheader 1, 8, Sfx_SwordsDance_Ch8 + channel_count 1 + channel 8, Sfx_SwordsDance_Ch8 Sfx_Thunder: - musicheader 1, 8, Sfx_Thunder_Ch8 + channel_count 1 + channel 8, Sfx_Thunder_Ch8 Sfx_Supersonic: - musicheader 3, 5, Sfx_Supersonic_Ch5 - musicheader 1, 6, Sfx_Supersonic_Ch6 - musicheader 1, 8, Sfx_Supersonic_Ch8 + channel_count 3 + channel 5, Sfx_Supersonic_Ch5 + channel 6, Sfx_Supersonic_Ch6 + channel 8, Sfx_Supersonic_Ch8 Sfx_Leer: - musicheader 3, 5, Sfx_Leer_Ch5 - musicheader 1, 6, Sfx_Leer_Ch6 - musicheader 1, 8, Sfx_Leer_Ch8 + channel_count 3 + channel 5, Sfx_Leer_Ch5 + channel 6, Sfx_Leer_Ch6 + channel 8, Sfx_Leer_Ch8 Sfx_Ember: - musicheader 2, 5, Sfx_Ember_Ch5 - musicheader 1, 8, Sfx_Ember_Ch8 + channel_count 2 + channel 5, Sfx_Ember_Ch5 + channel 8, Sfx_Ember_Ch8 Sfx_Bubblebeam: - musicheader 3, 5, Sfx_Bubblebeam_Ch5 - musicheader 1, 6, Sfx_Bubblebeam_Ch6 - musicheader 1, 8, Sfx_Bubblebeam_Ch8 + channel_count 3 + channel 5, Sfx_Bubblebeam_Ch5 + channel 6, Sfx_Bubblebeam_Ch6 + channel 8, Sfx_Bubblebeam_Ch8 Sfx_HydroPump: - musicheader 2, 5, Sfx_HydroPump_Ch5 - musicheader 1, 8, Sfx_HydroPump_Ch8 + channel_count 2 + channel 5, Sfx_HydroPump_Ch5 + channel 8, Sfx_HydroPump_Ch8 Sfx_Surf: - musicheader 3, 5, Sfx_Surf_Ch5 - musicheader 1, 6, Sfx_Surf_Ch6 - musicheader 1, 8, Sfx_Surf_Ch8 + channel_count 3 + channel 5, Sfx_Surf_Ch5 + channel 6, Sfx_Surf_Ch6 + channel 8, Sfx_Surf_Ch8 Sfx_Psybeam: - musicheader 3, 5, Sfx_Psybeam_Ch5 - musicheader 1, 6, Sfx_Psybeam_Ch6 - musicheader 1, 8, Sfx_Psybeam_Ch8 + channel_count 3 + channel 5, Sfx_Psybeam_Ch5 + channel 6, Sfx_Psybeam_Ch6 + channel 8, Sfx_Psybeam_Ch8 Sfx_Charge: - musicheader 3, 5, Sfx_Charge_Ch5 - musicheader 1, 6, Sfx_Charge_Ch6 - musicheader 1, 8, Sfx_Charge_Ch8 + channel_count 3 + channel 5, Sfx_Charge_Ch5 + channel 6, Sfx_Charge_Ch6 + channel 8, Sfx_Charge_Ch8 Sfx_Thundershock: - musicheader 3, 5, Sfx_Thundershock_Ch5 - musicheader 1, 6, Sfx_Thundershock_Ch6 - musicheader 1, 8, Sfx_Thundershock_Ch8 + channel_count 3 + channel 5, Sfx_Thundershock_Ch5 + channel 6, Sfx_Thundershock_Ch6 + channel 8, Sfx_Thundershock_Ch8 Sfx_Psychic: - musicheader 3, 5, Sfx_Psychic_Ch5 - musicheader 1, 6, Sfx_Psychic_Ch6 - musicheader 1, 8, Sfx_Psychic_Ch8 + channel_count 3 + channel 5, Sfx_Psychic_Ch5 + channel 6, Sfx_Psychic_Ch6 + channel 8, Sfx_Psychic_Ch8 Sfx_Screech: - musicheader 2, 5, Sfx_Screech_Ch5 - musicheader 1, 6, Sfx_Screech_Ch6 + channel_count 2 + channel 5, Sfx_Screech_Ch5 + channel 6, Sfx_Screech_Ch6 Sfx_BoneClub: - musicheader 2, 5, Sfx_BoneClub_Ch5 - musicheader 1, 6, Sfx_BoneClub_Ch6 + channel_count 2 + channel 5, Sfx_BoneClub_Ch5 + channel 6, Sfx_BoneClub_Ch6 Sfx_Sharpen: - musicheader 2, 5, Sfx_Sharpen_Ch5 - musicheader 1, 6, Sfx_Sharpen_Ch6 + channel_count 2 + channel 5, Sfx_Sharpen_Ch5 + channel 6, Sfx_Sharpen_Ch6 Sfx_EggBomb: - musicheader 3, 5, Sfx_EggBomb_Ch5 - musicheader 1, 6, Sfx_EggBomb_Ch6 - musicheader 1, 8, Sfx_EggBomb_Ch8 + channel_count 3 + channel 5, Sfx_EggBomb_Ch5 + channel 6, Sfx_EggBomb_Ch6 + channel 8, Sfx_EggBomb_Ch8 Sfx_Sing: - musicheader 2, 5, Sfx_Sing_Ch5 - musicheader 1, 6, Sfx_Sing_Ch6 + channel_count 2 + channel 5, Sfx_Sing_Ch5 + channel 6, Sfx_Sing_Ch6 Sfx_HyperBeam: - musicheader 3, 5, Sfx_HyperBeam_Ch5 - musicheader 1, 6, Sfx_HyperBeam_Ch6 - musicheader 1, 8, Sfx_HyperBeam_Ch8 + channel_count 3 + channel 5, Sfx_HyperBeam_Ch5 + channel 6, Sfx_HyperBeam_Ch6 + channel 8, Sfx_HyperBeam_Ch8 Sfx_Shine: - musicheader 1, 5, Sfx_Shine_Ch5 + channel_count 1 + channel 5, Sfx_Shine_Ch5 Sfx_Unknown5F: - musicheader 3, 5, Sfx_Unknown5F_Ch5 - musicheader 1, 6, Sfx_Unknown5F_Ch6 - + channel_count 3 + channel 5, Sfx_Unknown5F_Ch5 + channel 6, Sfx_Unknown5F_Ch6 Sfx_Sandstorm: - musicheader 1, 8, Sfx_Sandstorm_Ch8 + channel 8, Sfx_Sandstorm_Ch8 + assert Sfx_Sandstorm_Ch8 == Sfx_Unknown5F_Ch8 Sfx_HangUp: - musicheader 1, 5, Sfx_HangUp_Ch5 + channel_count 1 + channel 5, Sfx_HangUp_Ch5 Sfx_NoSignal: - musicheader 1, 5, Sfx_NoSignal_Ch5 + channel_count 1 + channel 5, Sfx_NoSignal_Ch5 Sfx_Elevator: - musicheader 4, 5, Sfx_Elevator_Ch5 - musicheader 1, 6, Sfx_Elevator_Ch6 - musicheader 1, 7, Sfx_Elevator_Ch7 - musicheader 1, 8, Sfx_Elevator_Ch8 + channel_count 4 + channel 5, Sfx_Elevator_Ch5 + channel 6, Sfx_Elevator_Ch6 + channel 7, Sfx_Elevator_Ch7 + channel 8, Sfx_Elevator_Ch8 -Sfx_DexFanfare5079: Sfx_LevelUp: - musicheader 4, 5, Sfx_DexFanfare5079_Ch5 - musicheader 1, 6, Sfx_DexFanfare5079_Ch6 - musicheader 1, 7, Sfx_DexFanfare5079_Ch7 - musicheader 1, 8, Sfx_DexFanfare5079_Ch8 +Sfx_DexFanfare5079: + channel_count 4 + channel 5, Sfx_LevelUp_Ch5 + channel 6, Sfx_LevelUp_Ch6 + channel 7, Sfx_LevelUp_Ch7 + channel 8, Sfx_LevelUp_Ch8 + assert Sfx_LevelUp_Ch5 == Sfx_DexFanfare5079_Ch5 + assert Sfx_LevelUp_Ch6 == Sfx_DexFanfare5079_Ch6 + assert Sfx_LevelUp_Ch7 == Sfx_DexFanfare5079_Ch7 + assert Sfx_LevelUp_Ch8 == Sfx_DexFanfare5079_Ch8 -Sfx_DexFanfare5079_Ch5: Sfx_LevelUp_Ch5: - togglesfx +Sfx_DexFanfare5079_Ch5: + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - notetype $8, $b1 + volume 7, 7 + duty_cycle 2 + note_type 8, 11, 1 octave 3 note B_, 2 note B_, 2 note B_, 2 - intensity $b3 + volume_envelope 11, 3 octave 4 note G#, 12 - endchannel + sound_ret -Sfx_DexFanfare5079_Ch6: Sfx_LevelUp_Ch6: - togglesfx - dutycycle $2 - notetype $8, $c1 +Sfx_DexFanfare5079_Ch6: + toggle_sfx + duty_cycle 2 + note_type 8, 12, 1 octave 4 note E_, 2 note E_, 2 note E_, 2 - intensity $c3 + volume_envelope 12, 3 note B_, 12 - endchannel + sound_ret -Sfx_DexFanfare5079_Ch7: Sfx_LevelUp_Ch7: - togglesfx - notetype $8, $25 +Sfx_DexFanfare5079_Ch7: + toggle_sfx + note_type 8, 2, 5 octave 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 5 note E_, 5 - intensity $35 + volume_envelope 3, 5 note E_, 3 - note __, 4 - endchannel + rest 4 + sound_ret -Sfx_DexFanfare5079_Ch8: Sfx_LevelUp_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c +Sfx_DexFanfare5079_Ch8: + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 12 - endchannel + sound_ret Sfx_KeyItem: - musicheader 4, 5, Sfx_KeyItem_Ch5 - musicheader 1, 6, Sfx_KeyItem_Ch6 - musicheader 1, 7, Sfx_KeyItem_Ch7 - musicheader 1, 8, Sfx_KeyItem_Ch8 + channel_count 4 + channel 5, Sfx_KeyItem_Ch5 + channel 6, Sfx_KeyItem_Ch6 + channel 7, Sfx_KeyItem_Ch7 + channel 8, Sfx_KeyItem_Ch8 Sfx_KeyItem_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - notetype $6, $b1 + volume 7, 7 + duty_cycle 2 + note_type 6, 11, 1 octave 3 note B_, 4 note B_, 2 @@ -461,87 +572,88 @@ Sfx_KeyItem_Ch5: note B_, 4 octave 4 note E_, 4 - intensity $b3 + volume_envelope 11, 3 note G#, 16 - endchannel + sound_ret Sfx_KeyItem_Ch6: - togglesfx - dutycycle $2 - notetype $6, $c1 + toggle_sfx + duty_cycle 2 + note_type 6, 12, 1 octave 4 note E_, 4 note E_, 2 note E_, 2 note E_, 4 note G#, 4 - intensity $c3 + volume_envelope 12, 3 note B_, 16 - endchannel + sound_ret Sfx_KeyItem_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 4 note G#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 5 note E_, 8 - intensity $35 + volume_envelope 3, 5 note E_, 4 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_KeyItem_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - endchannel + sound_ret Sfx_DexFanfare2049: - musicheader 4, 5, Sfx_DexFanfare2049_Ch5 - musicheader 1, 6, Sfx_DexFanfare2049_Ch6 - musicheader 1, 7, Sfx_DexFanfare2049_Ch7 - musicheader 1, 8, Sfx_DexFanfare2049_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfare2049_Ch5 + channel 6, Sfx_DexFanfare2049_Ch6 + channel 7, Sfx_DexFanfare2049_Ch7 + channel 8, Sfx_DexFanfare2049_Ch8 Sfx_DexFanfare2049_Ch5: - togglesfx + toggle_sfx tempo 104 - volume $77 - dutycycle $2 - notetype $c, $88 + volume 7, 7 + duty_cycle 2 + note_type 12, 8, 8 octave 3 note A_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A#, 4 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note A#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_DexFanfare2049_Ch6: - togglesfx - dutycycle $2 - notetype $c, $c1 + toggle_sfx + duty_cycle 2 + note_type 12, 12, 1 octave 5 note F_, 2 note E_, 2 @@ -556,49 +668,50 @@ Sfx_DexFanfare2049_Ch6: note F_, 4 note G_, 4 note F_, 8 - endchannel + sound_ret Sfx_DexFanfare2049_Ch7: - togglesfx - notetype $c, $25 + toggle_sfx + note_type 12, 2, 5 octave 4 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_DexFanfare2049_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_Item: - musicheader 4, 5, Sfx_Item_Ch5 - musicheader 1, 6, Sfx_Item_Ch6 - musicheader 1, 7, Sfx_Item_Ch7 - musicheader 1, 8, Sfx_Item_Ch8 + channel_count 4 + channel 5, Sfx_Item_Ch5 + channel 6, Sfx_Item_Ch6 + channel 7, Sfx_Item_Ch7 + channel 8, Sfx_Item_Ch8 Sfx_Item_Ch5: - togglesfx + toggle_sfx tempo 108 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $8, $b2 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 8, 11, 2 octave 4 note C_, 6 note C_, 2 @@ -608,14 +721,14 @@ Sfx_Item_Ch5: note G_, 4 note G_, 4 note F_, 12 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_Item_Ch6: - togglesfx - vibrato $8, $27 - dutycycle $2 - notetype $8, $c3 + toggle_sfx + vibrato 8, 2, 7 + duty_cycle 2 + note_type 8, 12, 3 octave 4 note A_, 6 note A_, 2 @@ -625,60 +738,61 @@ Sfx_Item_Ch6: note A#, 4 note A#, 4 note A_, 12 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_Item_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 4 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F_, 6 - intensity $35 + volume_envelope 3, 5 note F_, 4 - note __, 14 - endchannel + rest 14 + sound_ret Sfx_Item_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_CaughtMon: - musicheader 4, 5, Sfx_CaughtMon_Ch5 - musicheader 1, 6, Sfx_CaughtMon_Ch6 - musicheader 1, 7, Sfx_CaughtMon_Ch7 - musicheader 1, 8, Sfx_CaughtMon_Ch8 + channel_count 4 + channel 5, Sfx_CaughtMon_Ch5 + channel 6, Sfx_CaughtMon_Ch6 + channel 7, Sfx_CaughtMon_Ch7 + channel 8, Sfx_CaughtMon_Ch8 Sfx_CaughtMon_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $8, $b3 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 8, 11, 3 octave 4 note C_, 6 octave 3 note A_, 6 note F_, 12 - intensity $b1 + volume_envelope 11, 1 octave 4 note D#, 2 note D#, 2 @@ -686,33 +800,33 @@ Sfx_CaughtMon_Ch5: note D#, 2 note D#, 2 note G_, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 12 - endchannel + sound_ret Sfx_CaughtMon_Ch6: - togglesfx - dutycycle $2 - vibrato $8, $27 - notetype $8, $c3 + toggle_sfx + duty_cycle 2 + vibrato 8, 2, 7 + note_type 8, 12, 3 octave 4 note A_, 6 note F_, 6 note C_, 12 - intensity $c1 + volume_envelope 12, 1 note A#, 2 note A#, 2 note A#, 2 note G_, 2 note G_, 2 note A#, 2 - intensity $c3 + volume_envelope 12, 3 note A_, 12 - endchannel + sound_ret Sfx_CaughtMon_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C_, 12 note C_, 6 @@ -724,32 +838,33 @@ Sfx_CaughtMon_Ch7: note G_, 6 note A#, 6 note A_, 6 - intensity $35 + volume_envelope 3, 5 note A_, 3 - note __, 3 - endchannel + rest 3 + sound_ret Sfx_CaughtMon_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_DexFanfare80109: - musicheader 4, 5, Sfx_DexFanfare80109_Ch5 - musicheader 1, 6, Sfx_DexFanfare80109_Ch6 - musicheader 1, 7, Sfx_DexFanfare80109_Ch7 - musicheader 1, 8, Sfx_DexFanfare80109_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfare80109_Ch5 + channel 6, Sfx_DexFanfare80109_Ch6 + channel 7, Sfx_DexFanfare80109_Ch7 + channel 8, Sfx_DexFanfare80109_Ch8 Sfx_DexFanfare80109_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $c, $b1 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 11, 1 octave 4 note D#, 2 note D#, 1 @@ -765,15 +880,15 @@ Sfx_DexFanfare80109_Ch5: note F_, 2 note F_, 1 note F_, 1 - intensity $a5 + volume_envelope 10, 5 note A#, 16 - endchannel + sound_ret Sfx_DexFanfare80109_Ch6: - togglesfx - vibrato $8, $27 - dutycycle $2 - notetype $c, $c1 + toggle_sfx + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 12, 1 octave 4 note G_, 2 note G_, 1 @@ -787,64 +902,66 @@ Sfx_DexFanfare80109_Ch6: note A#, 2 note A#, 1 note A#, 1 - intensity $b5 + volume_envelope 11, 5 octave 5 note D#, 16 - endchannel + sound_ret Sfx_DexFanfare80109_Ch7: - togglesfx - notetype $c, $25 + toggle_sfx + note_type 12, 2, 5 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 2 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 2 octave 4 note D#, 1 - note __, 1 + rest 1 note C_, 2 note D_, 1 - note __, 1 + rest 1 octave 3 note A#, 2 note D#, 4 - intensity $35 + volume_envelope 3, 5 note D#, 3 - note __, 9 - endchannel + rest 9 + sound_ret Sfx_DexFanfare80109_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_Fanfare2: - musicheader 3, 5, Sfx_Fanfare2_Ch5 - musicheader 1, 6, Sfx_Fanfare2_Ch6 - musicheader 1, 8, Sfx_Fanfare2_Ch8 + channel_count 3 + channel 5, Sfx_Fanfare2_Ch5 + channel 6, Sfx_Fanfare2_Ch6 + channel 8, Sfx_Fanfare2_Ch8 -UnusedSfx: - musicheader 4, 5, UnusedSfx_Ch5 - musicheader 1, 6, UnusedSfx_Ch6 - musicheader 1, 7, UnusedSfx_Ch7 - musicheader 1, 8, UnusedSfx_Ch8 +Sfx_Unused: ; unreferenced + channel_count 4 + channel 5, Sfx_Unused_Ch5 + channel 6, Sfx_Unused_Ch6 + channel 7, Sfx_Unused_Ch7 + channel 8, Sfx_Unused_Ch8 -UnusedSfx_Ch5: - togglesfx +Sfx_Unused_Ch5: + toggle_sfx tempo 124 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $c, $b1 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 11, 1 octave 4 note F_, 2 note F_, 1 @@ -858,15 +975,15 @@ UnusedSfx_Ch5: note C_, 2 note E_, 1 note E_, 1 - intensity $a5 + volume_envelope 10, 5 note F_, 16 - endchannel + sound_ret -UnusedSfx_Ch6: - togglesfx - vibrato $8, $27 - dutycycle $2 - notetype $c, $c1 +Sfx_Unused_Ch6: + toggle_sfx + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 12, 1 octave 4 note A_, 2 note A_, 1 @@ -882,13 +999,13 @@ UnusedSfx_Ch6: note A#, 2 note A#, 1 note A#, 1 - intensity $b5 + volume_envelope 11, 5 note A_, 16 - endchannel + sound_ret -UnusedSfx_Ch7: - togglesfx - notetype $c, $25 +Sfx_Unused_Ch7: + toggle_sfx + note_type 12, 2, 5 octave 4 note F_, 8 note C_, 2 @@ -896,37 +1013,39 @@ UnusedSfx_Ch7: note G_, 2 note A#, 2 note A_, 4 - intensity $35 + volume_envelope 3, 5 note A_, 3 - note __, 9 - endchannel + rest 9 + sound_ret -UnusedSfx_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c +Sfx_Unused_Ch8: + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_Fanfare: - musicheader 3, 5, Sfx_Fanfare_Ch5 - musicheader 1, 6, Sfx_Fanfare_Ch6 - musicheader 1, 8, Sfx_Fanfare_Ch8 + channel_count 3 + channel 5, Sfx_Fanfare_Ch5 + channel 6, Sfx_Fanfare_Ch6 + channel 8, Sfx_Fanfare_Ch8 Sfx_RegisterPhoneNumber: - musicheader 4, 5, Sfx_RegisterPhoneNumber_Ch5 - musicheader 1, 6, Sfx_RegisterPhoneNumber_Ch6 - musicheader 1, 7, Sfx_RegisterPhoneNumber_Ch7 - musicheader 1, 8, Sfx_RegisterPhoneNumber_Ch8 + channel_count 4 + channel 5, Sfx_RegisterPhoneNumber_Ch5 + channel 6, Sfx_RegisterPhoneNumber_Ch6 + channel 7, Sfx_RegisterPhoneNumber_Ch7 + channel 8, Sfx_RegisterPhoneNumber_Ch8 Sfx_RegisterPhoneNumber_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - dutycycle $3 - notetype $c, $a2 - note __, 2 + volume 7, 7 + duty_cycle 3 + note_type 12, 10, 2 + rest 2 octave 3 note C_, 4 note G#, 4 @@ -941,21 +1060,21 @@ Sfx_RegisterPhoneNumber_Ch5: octave 4 note C#, 3 note C_, 2 - note __, 8 - endchannel + rest 8 + sound_ret Sfx_RegisterPhoneNumber_Ch6: - togglesfx - dutycycle $3 - notetype $c, $c2 - note __, 2 + toggle_sfx + duty_cycle 3 + note_type 12, 12, 2 + rest 2 octave 4 note D#, 2 note C#, 2 note C_, 2 note D#, 2 note F_, 2 - note __, 1 + rest 1 note G#, 3 octave 5 note C_, 2 @@ -963,105 +1082,105 @@ Sfx_RegisterPhoneNumber_Ch6: octave 4 note G_, 3 note G#, 2 - note __, 8 - endchannel + rest 8 + sound_ret Sfx_RegisterPhoneNumber_Ch7: - togglesfx - notetype $c, $25 - note __, 2 + toggle_sfx + note_type 12, 2, 5 + rest 2 octave 3 note D#, 7 - note __, 1 + rest 1 note G#, 2 - note __, 1 + rest 1 note C_, 2 - note __, 1 + rest 1 note G#, 2 note G_, 2 - note __, 1 + rest 1 note A#, 3 note G#, 2 - note __, 8 - endchannel + rest 8 + sound_ret Sfx_RegisterPhoneNumber_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 2 - note __, 16 - note __, 16 - endchannel + rest 16 + rest 16 + sound_ret -Sfx_3RdPlace: - musicheader 3, 5, Sfx_3RdPlace_Ch5 - musicheader 1, 6, Sfx_3RdPlace_Ch6 - musicheader 1, 7, Sfx_3RdPlace_Ch7 +Sfx_3rdPlace: + channel_count 3 + channel 5, Sfx_3rdPlace_Ch5 + channel 6, Sfx_3rdPlace_Ch6 + channel 7, Sfx_3rdPlace_Ch7 -Sfx_3RdPlace_Ch5: - togglesfx +Sfx_3rdPlace_Ch5: + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - notetype $c, $a4 + volume 7, 7 + duty_cycle 2 + note_type 12, 10, 4 octave 4 note F_, 1 note A_, 1 octave 5 note C_, 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 6 - endchannel + sound_ret -Sfx_3RdPlace_Ch6: - togglesfx - dutycycle $2 - notetype $c, $b4 +Sfx_3rdPlace_Ch6: + toggle_sfx + duty_cycle 2 + note_type 12, 11, 4 octave 4 note A_, 1 octave 5 note C_, 1 note F_, 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 note G_, 6 - endchannel + sound_ret -Sfx_3RdPlace_Ch7: - togglesfx - notetype $c, $25 +Sfx_3rdPlace_Ch7: + toggle_sfx + note_type 12, 2, 5 octave 3 note A_, 1 note F_, 1 note A_, 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 note B_, 6 - endchannel + sound_ret -Sfx_GetEggFromDayCareLady: -Sfx_GetEggFromDayCareMan: - musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5 - musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6 - musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7 - musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8 +Sfx_GetEgg: + channel_count 4 + channel 5, Sfx_GetEgg_Ch5 + channel 6, Sfx_GetEgg_Ch6 + channel 7, Sfx_GetEgg_Ch7 + channel 8, Sfx_GetEgg_Ch8 -Sfx_GetEggFromDayCareLady_Ch5: -Sfx_GetEggFromDayCareMan_Ch5: - togglesfx +Sfx_GetEgg_Ch5: + toggle_sfx tempo 120 - volume $77 - vibrato $12, $34 - dutycycle $2 - notetype $8, $a1 - note __, 2 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 2 + note_type 8, 10, 1 + rest 2 octave 3 note C_, 2 note F_, 2 @@ -1070,53 +1189,51 @@ Sfx_GetEggFromDayCareMan_Ch5: note A#, 2 octave 4 note D_, 2 - intensity $a2 + volume_envelope 10, 2 note F_, 6 - intensity $a1 - dutycycle $3 + volume_envelope 10, 1 + duty_cycle 3 octave 3 note E_, 2 note G_, 2 octave 4 note C_, 2 - intensity $a4 + volume_envelope 10, 4 note F_, 9 - note __, 9 - endchannel + rest 9 + sound_ret -Sfx_GetEggFromDayCareLady_Ch6: -Sfx_GetEggFromDayCareMan_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $c2 - note __, 2 +Sfx_GetEgg_Ch6: + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 12, 2 + rest 2 octave 4 note F_, 2 - note __, 2 + rest 2 note A_, 2 - intensity $c1 + volume_envelope 12, 1 note A#, 2 note A_, 2 note A#, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 6 - intensity $c1 + volume_envelope 12, 1 octave 4 note C_, 2 note E_, 2 note G_, 2 - intensity $c4 + volume_envelope 12, 4 note A_, 9 - note __, 9 - endchannel + rest 9 + sound_ret -Sfx_GetEggFromDayCareLady_Ch7: -Sfx_GetEggFromDayCareMan_Ch7: - togglesfx - notetype $8, $25 - note __, 2 +Sfx_GetEgg_Ch7: + toggle_sfx + note_type 8, 2, 5 + rest 2 octave 3 note C_, 6 octave 2 @@ -1127,136 +1244,137 @@ Sfx_GetEggFromDayCareMan_Ch7: note G_, 2 note A#, 6 note A_, 9 - note __, 9 - endchannel + rest 9 + sound_ret -Sfx_GetEggFromDayCareLady_Ch8: -Sfx_GetEggFromDayCareMan_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 - note __, 2 - notetype $c - note __, 16 - note __, 12 - endchannel +Sfx_GetEgg_Ch8: + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 + rest 2 + drum_speed 12 + rest 16 + rest 12 + sound_ret Sfx_MoveDeleted: - musicheader 4, 5, Sfx_MoveDeleted_Ch5 - musicheader 1, 6, Sfx_MoveDeleted_Ch6 - musicheader 1, 7, Sfx_MoveDeleted_Ch7 - musicheader 1, 8, Sfx_MoveDeleted_Ch8 + channel_count 4 + channel 5, Sfx_MoveDeleted_Ch5 + channel 6, Sfx_MoveDeleted_Ch6 + channel 7, Sfx_MoveDeleted_Ch7 + channel 8, Sfx_MoveDeleted_Ch8 Sfx_MoveDeleted_Ch5: - togglesfx + toggle_sfx tempo 116 - volume $77 - dutycycle $2 - vibrato $c, $44 - notetype $c, $a4 - note __, 8 + volume 7, 7 + duty_cycle 2 + vibrato 12, 4, 4 + note_type 12, 10, 4 + rest 8 octave 2 note G_, 1 - note __, 2 + rest 2 note C#, 1 note E_, 1 note D#, 1 note E_, 4 - intensity $a1 + volume_envelope 10, 1 note G_, 2 note F_, 2 note E_, 2 note D_, 2 note G#, 2 note B_, 2 - intensity $a6 + volume_envelope 10, 6 octave 3 note D_, 10 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_MoveDeleted_Ch6: - togglesfx - dutycycle $3 - vibrato $c, $44 - notetype $c, $74 + toggle_sfx + duty_cycle 3 + vibrato 12, 4, 4 + note_type 12, 7, 4 octave 1 note B_, 1 octave 2 note D_, 1 note F_, 1 note G#, 1 - intensity $94 + volume_envelope 9, 4 note D_, 1 note F_, 1 note G#, 1 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note C#, 1 - note __, 2 + rest 2 octave 2 note A#, 1 octave 3 note C#, 4 - note __, 2 - intensity $b1 + rest 2 + volume_envelope 11, 1 note C#, 2 note D#, 2 note E_, 2 - intensity $b6 + volume_envelope 11, 6 note F_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_MoveDeleted_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 2 note G#, 8 note A_, 8 note A#, 2 - note __, 4 + rest 4 note A#, 1 - note __, 1 + rest 1 note A#, 8 - note __, 4 + rest 4 octave 3 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 2 note A#, 2 - note __, 2 - notetype $c, $20 + rest 2 + note_type 12, 2, 0 note B_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_MoveDeleted_Ch8: - togglesfx - sfxtogglenoise $3 - notetype $c + toggle_sfx + sfx_toggle_noise 3 + drum_speed 12 note F_, 8 - note __, 16 - note __, 16 - note __, 6 - endchannel + rest 16 + rest 16 + rest 6 + sound_ret Sfx_2ndPlace: - musicheader 4, 5, Sfx_2ndPlace_Ch5 - musicheader 1, 6, Sfx_2ndPlace_Ch6 - musicheader 1, 7, Sfx_2ndPlace_Ch7 - musicheader 1, 8, Sfx_2ndPlace_Ch8 + channel_count 4 + channel 5, Sfx_2ndPlace_Ch5 + channel 6, Sfx_2ndPlace_Ch6 + channel 7, Sfx_2ndPlace_Ch7 + channel 8, Sfx_2ndPlace_Ch8 Sfx_2ndPlace_Ch5: - togglesfx + toggle_sfx tempo 116 - volume $77 - dutycycle $2 - vibrato $c, $34 - notetype $8, $a1 + volume 7, 7 + duty_cycle 2 + vibrato 12, 3, 4 + note_type 8, 10, 1 octave 4 note E_, 2 note E_, 2 @@ -1277,95 +1395,96 @@ Sfx_2ndPlace_Ch5: note A_, 2 note A_, 2 note A_, 2 - intensity $a7 + volume_envelope 10, 7 note B_, 12 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_2ndPlace_Ch6: - togglesfx - dutycycle $2 - notetype $8, $b1 + toggle_sfx + duty_cycle 2 + note_type 8, 11, 1 octave 4 note G_, 2 note G_, 2 note G_, 2 note A_, 4 note B_, 2 - intensity $b4 + volume_envelope 11, 4 octave 5 note C_, 12 - intensity $b1 + volume_envelope 11, 1 note C_, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 12 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_2ndPlace_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 octave 2 note F_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 octave 2 note F_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note G_, 12 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_2ndPlace_Ch8: - togglesfx - sfxtogglenoise $3 - notetype $8 -.loop + toggle_sfx + sfx_toggle_noise 3 + drum_speed 8 +.loop1: note C#, 1 - loopchannel 6, .loop + sound_loop 6, .loop1 note B_, 12 note B_, 12 note B_, 12 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_1stPlace: - musicheader 4, 5, Sfx_1stPlace_Ch5 - musicheader 1, 6, Sfx_1stPlace_Ch6 - musicheader 1, 7, Sfx_1stPlace_Ch7 - musicheader 1, 8, Sfx_1stPlace_Ch8 + channel_count 4 + channel 5, Sfx_1stPlace_Ch5 + channel 6, Sfx_1stPlace_Ch6 + channel 7, Sfx_1stPlace_Ch7 + channel 8, Sfx_1stPlace_Ch8 Sfx_1stPlace_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - dutycycle $3 - vibrato $c, $34 - notetype $c, $a1 + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + note_type 12, 10, 1 octave 5 note D_, 2 octave 4 @@ -1376,76 +1495,76 @@ Sfx_1stPlace_Ch5: note F_, 1 note D_, 1 note F_, 1 - intensity $91 + volume_envelope 9, 1 note D_, 1 octave 4 note A#, 1 note F_, 1 note A#, 1 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 1 octave 4 note A#, 1 note F_, 1 note D_, 1 - intensity $a1 + volume_envelope 10, 1 note C_, 2 note E_, 2 note G_, 2 - intensity $a7 + volume_envelope 10, 7 note A_, 10 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_1stPlace_Ch6: - togglesfx - dutycycle $3 - vibrato $c, $34 - notetype $c, $c1 + toggle_sfx + duty_cycle 3 + vibrato 12, 3, 4 + note_type 12, 12, 1 octave 3 note B_, 2 note G_, 2 note B_, 2 - intensity $b6 + volume_envelope 11, 6 octave 4 note D_, 12 - intensity $c1 + volume_envelope 12, 1 note E_, 2 note G_, 2 octave 5 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 10 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_1stPlace_Ch7: - togglesfx - notetype $c, $25 + toggle_sfx + note_type 12, 2, 5 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 6 note F_, 6 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 10 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_1stPlace_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 note D_, 4 note D_, 4 note D_, 4 @@ -1456,113 +1575,114 @@ Sfx_1stPlace_Ch8: note D_, 4 note D_, 4 note D_, 4 - notetype $c + drum_speed 12 note B_, 10 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_ChooseACard: - musicheader 4, 5, Sfx_ChooseACard_Ch5 - musicheader 1, 6, Sfx_ChooseACard_Ch6 - musicheader 1, 7, Sfx_ChooseACard_Ch7 - musicheader 1, 8, Sfx_ChooseACard_Ch8 + channel_count 4 + channel 5, Sfx_ChooseACard_Ch5 + channel 6, Sfx_ChooseACard_Ch6 + channel 7, Sfx_ChooseACard_Ch7 + channel 8, Sfx_ChooseACard_Ch8 Sfx_ChooseACard_Ch5: - togglesfx + toggle_sfx tempo 152 - volume $77 - dutycycle $3 - notetype $6, $a4 + volume 7, 7 + duty_cycle 3 + note_type 6, 10, 4 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 4 note C#, 4 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 - intensity $71 + volume_envelope 7, 1 octave 3 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - intensity $91 + volume_envelope 9, 1 note B_, 1 octave 4 note C#, 1 note D_, 1 note D#, 1 - intensity $a4 + volume_envelope 10, 4 note E_, 4 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_ChooseACard_Ch6: - togglesfx - dutycycle $3 - notetype $6, $b4 + toggle_sfx + duty_cycle 3 + note_type 6, 11, 4 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note F_, 4 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note G_, 4 note G#, 8 note A_, 4 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_ChooseACard_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 @@ -1572,13 +1692,13 @@ Sfx_ChooseACard_Ch7: note B_, 2 note G#, 2 note A_, 4 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_ChooseACard_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 note D_, 2 note C#, 2 note B_, 4 @@ -1596,92 +1716,93 @@ Sfx_ChooseACard_Ch8: note C#, 2 note D_, 2 note B_, 16 - endchannel + sound_ret Sfx_GetTm: - musicheader 4, 5, Sfx_GetTm_Ch5 - musicheader 1, 6, Sfx_GetTm_Ch6 - musicheader 1, 7, Sfx_GetTm_Ch7 - musicheader 1, 8, Sfx_GetTm_Ch8 + channel_count 4 + channel 5, Sfx_GetTm_Ch5 + channel 6, Sfx_GetTm_Ch6 + channel 7, Sfx_GetTm_Ch7 + channel 8, Sfx_GetTm_Ch8 Sfx_GetTm_Ch5: - togglesfx + toggle_sfx tempo 144 - volume $77 - dutycycle $3 - vibrato $8, $24 - notetype $c, $a3 + volume 7, 7 + duty_cycle 3 + vibrato 8, 2, 4 + note_type 12, 10, 3 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 octave 4 note D_, 1 note G_, 6 - intensity $b1 + volume_envelope 11, 1 note E_, 2 note F#, 2 note G_, 2 - intensity $a5 + volume_envelope 10, 5 note F#, 8 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_GetTm_Ch6: - togglesfx - dutycycle $3 - vibrato $8, $24 - notetype $c, $b3 + toggle_sfx + duty_cycle 3 + vibrato 8, 2, 4 + note_type 12, 11, 3 octave 4 note G_, 1 - note __, 1 + rest 1 note D_, 1 note G_, 1 note B_, 6 - intensity $c1 + volume_envelope 12, 1 note A_, 2 note B_, 2 octave 5 note C_, 2 - intensity $b5 + volume_envelope 11, 5 note D_, 8 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_GetTm_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 note B_, 2 octave 3 note D_, 4 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 4 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note C_, 4 octave 2 note A_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_GetTm_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 note D_, 4 note C#, 2 note D_, 2 @@ -1693,36 +1814,37 @@ Sfx_GetTm_Ch8: note C#, 1 note D_, 2 note B_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_GetBadge: - musicheader 4, 5, Sfx_GetBadge_Ch5 - musicheader 1, 6, Sfx_GetBadge_Ch6 - musicheader 1, 7, Sfx_GetBadge_Ch7 - musicheader 1, 8, Sfx_GetBadge_Ch8 + channel_count 4 + channel 5, Sfx_GetBadge_Ch5 + channel 6, Sfx_GetBadge_Ch6 + channel 7, Sfx_GetBadge_Ch7 + channel 8, Sfx_GetBadge_Ch8 Sfx_GetBadge_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - vibrato $8, $24 - notetype $6, $92 + volume 7, 7 + duty_cycle 2 + vibrato 8, 2, 4 + note_type 6, 9, 2 octave 4 note F_, 3 - callchannel Sfx_GetBadge_branch_f11aa + sound_call .sub1 note A#, 3 - pitchoffset 0, D_ - callchannel Sfx_GetBadge_branch_f11aa - pitchoffset 0, C_ - intensity $a7 + transpose 0, 2 + sound_call .sub1 + transpose 0, 0 + volume_envelope 10, 7 note A_, 16 - note __, 6 - endchannel + rest 6 + sound_ret -Sfx_GetBadge_branch_f11aa: - note __, 5 +.sub1: + rest 5 octave 3 note F_, 2 note G#, 2 @@ -1741,97 +1863,97 @@ Sfx_GetBadge_branch_f11aa: octave 4 note C#, 2 note F_, 2 - endchannel + sound_ret Sfx_GetBadge_Ch6: - togglesfx - dutycycle $3 - vibrato $8, $24 - notetype $6, $b5 + toggle_sfx + duty_cycle 3 + vibrato 8, 2, 4 + note_type 6, 11, 5 octave 5 note C#, 3 - note __, 3 + rest 3 octave 4 note G#, 1 - note __, 1 + rest 1 note G#, 8 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 1 - intensity $95 + rest 1 + volume_envelope 9, 5 octave 5 note C_, 1 - intensity $b5 + volume_envelope 11, 5 note C#, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D#, 3 - note __, 3 + rest 3 octave 4 note A#, 1 - note __, 1 + rest 1 note A#, 8 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 2 - note __, 1 - intensity $95 + rest 1 + volume_envelope 9, 5 octave 5 note D_, 1 - intensity $b5 + volume_envelope 11, 5 note D#, 8 note F_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_GetBadge_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 2 note G#, 3 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 8 note G#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note C#, 2 note C_, 2 octave 2 note A#, 2 note G#, 2 note G_, 3 - note __, 3 + rest 3 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 8 note A#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 note F_, 2 note G_, 2 note D#, 2 note F_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_GetBadge_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 -.loop + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 +.loop1: note B_, 12 note D_, 1 note D_, 1 @@ -1846,26 +1968,27 @@ Sfx_GetBadge_Ch8: note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, .loop + sound_loop 2, .loop1 note B_, 16 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_QuitSlots: - musicheader 4, 5, Sfx_QuitSlots_Ch5 - musicheader 1, 6, Sfx_QuitSlots_Ch6 - musicheader 1, 7, Sfx_QuitSlots_Ch7 - musicheader 1, 8, Sfx_QuitSlots_Ch8 + channel_count 4 + channel 5, Sfx_QuitSlots_Ch5 + channel 6, Sfx_QuitSlots_Ch6 + channel 7, Sfx_QuitSlots_Ch7 + channel 8, Sfx_QuitSlots_Ch8 Sfx_QuitSlots_Ch5: - togglesfx + toggle_sfx tempo 144 - volume $77 - dutycycle $2 - notetype $8, $82 + volume 7, 7 + duty_cycle 2 + note_type 8, 8, 2 octave 3 note G#, 2 - note __, 4 + rest 4 note C#, 2 note F_, 2 note G#, 2 @@ -1882,16 +2005,16 @@ Sfx_QuitSlots_Ch5: note A#, 2 note G#, 2 note F#, 2 - intensity $97 + volume_envelope 9, 7 note G#, 14 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_QuitSlots_Ch6: - togglesfx - dutycycle $2 - notetype $8, $b3 - note __, 3 + toggle_sfx + duty_cycle 2 + note_type 8, 11, 3 + rest 3 octave 4 note B_, 1 octave 5 @@ -1899,7 +2022,7 @@ Sfx_QuitSlots_Ch6: octave 4 note G#, 4 note A#, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 4 note A#, 2 note G#, 4 @@ -1907,23 +2030,23 @@ Sfx_QuitSlots_Ch6: note F#, 4 note F_, 2 note D#, 4 - intensity $b7 + volume_envelope 11, 7 note F_, 14 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_QuitSlots_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C#, 2 - note __, 2 + rest 2 note F_, 2 note D#, 2 note C#, 2 note G#, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 2 note G#, 2 @@ -1931,20 +2054,20 @@ Sfx_QuitSlots_Ch7: octave 3 note D_, 2 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 2 octave 3 note C_, 2 - note __, 2 + rest 2 note C#, 14 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_QuitSlots_Ch8: - togglesfx - sfxtogglenoise $3 - notetype $8 + toggle_sfx + sfx_toggle_noise 3 + drum_speed 8 note D#, 6 note D_, 4 note D#, 2 @@ -1956,18 +2079,19 @@ Sfx_QuitSlots_Ch8: note D#, 2 note D_, 4 note B_, 14 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_Protect: - musicheader 2, 5, Sfx_Protect_Ch5 - musicheader 1, 8, Sfx_Protect_Ch8 + channel_count 2 + channel 5, Sfx_Protect_Ch5 + channel 8, Sfx_Protect_Ch8 Sfx_Protect_Ch5: - togglesfx - notetype $1, $f1 - dutycycle $0 -.loop + toggle_sfx + note_type 1, 15, 1 + duty_cycle 0 +.loop1: octave 5 note F_, 5 note A_, 5 @@ -1980,335 +2104,354 @@ Sfx_Protect_Ch5: octave 6 note C#, 5 note E_, 5 - loopchannel 3, .loop - intensity $c1 + sound_loop 3, .loop1 + volume_envelope 12, 1 octave 5 note F_, 5 note A_, 5 - intensity $91 + volume_envelope 9, 1 octave 6 note C_, 5 note E_, 5 - intensity $71 + volume_envelope 7, 1 octave 5 note F#, 5 note A#, 5 - intensity $51 + volume_envelope 5, 1 octave 6 note C#, 5 note E_, 5 - endchannel + sound_ret Sfx_Protect_Ch8: - noise __, 10, $9e, $0 - noise __, 10, $be, $11 - loopchannel 6, Sfx_Protect_Ch8 - noise __, 10, $a7, $0 - noise C_, 1, $75, $11 - endchannel + noise_note 9, 9, -6, 0 + noise_note 9, 11, -6, 17 + sound_loop 6, Sfx_Protect_Ch8 + noise_note 9, 10, 7, 0 + noise_note 16, 7, 5, 17 + sound_ret Sfx_Sketch: - musicheader 1, 5, Sfx_Sketch_Ch5 + channel_count 1 + channel 5, Sfx_Sketch_Ch5 Sfx_Sketch_Ch5: - dutycycle $1 - soundinput $a5 -.loop - sound __, 3, $f1, $06e0 - sound __, 14, $af, $05b0 - sound __, 5, $0, 0 - sound __, 10, $f4, $0718 - loopchannel 3, .loop - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 10, 5 +.loop1: + square_note 2, 15, 1, 1760 + square_note 13, 10, -7, 1456 + square_note 4, 0, 0, 0 + square_note 9, 15, 4, 1816 + sound_loop 3, .loop1 + pitch_sweep 0, 8 + sound_ret Sfx_RainDance: - musicheader 1, 8, Sfx_RainDance_Ch8 + channel_count 1 + channel 8, Sfx_RainDance_Ch8 Sfx_RainDance_Ch8: - noise __, 12, $7d, $50 - noise __, 7, $7d, $4f - noise __, 12, $7f, $47 - noise __, 16, $6e, $22 - loopchannel 3, Sfx_RainDance_Ch8 - noise __, 7, $6d, $50 - noise __, 6, $5d, $4f - noise __, 6, $4f, $47 - noise __, 11, $32, $46 - endchannel + noise_note 11, 7, -5, 80 + noise_note 6, 7, -5, 79 + noise_note 11, 7, -7, 71 + noise_note 15, 6, -6, 34 + sound_loop 3, Sfx_RainDance_Ch8 + noise_note 6, 6, -5, 80 + noise_note 5, 5, -5, 79 + noise_note 5, 4, -7, 71 + noise_note 10, 3, 2, 70 + sound_ret Sfx_Aeroblast: - musicheader 2, 5, Sfx_Aeroblast_Ch5 - musicheader 1, 8, Sfx_Aeroblast_Ch8 + channel_count 2 + channel 5, Sfx_Aeroblast_Ch5 + channel 8, Sfx_Aeroblast_Ch8 Sfx_Aeroblast_Ch5: - sound_duty 2, 0, 3, 3 - soundinput $f5 - sound C_, 13, $f8, $0580 - soundinput $8 - endchannel + duty_cycle_pattern 3, 3, 0, 2 + pitch_sweep 15, 5 + square_note 28, 15, 8, 1408 + pitch_sweep 0, 8 + sound_ret Sfx_Aeroblast_Ch8: - noise __, 5, $f8, $6c - noise __, 5, $c8, $5c - noise __, 5, $78, $5b - noise C_, 1, $31, $5a - endchannel + noise_note 4, 15, 8, 108 + noise_note 4, 12, 8, 92 + noise_note 4, 7, 8, 91 + noise_note 16, 3, 1, 90 + sound_ret Sfx_Spark: - musicheader 1, 8, Sfx_Spark_Ch8 + channel_count 1 + channel 8, Sfx_Spark_Ch8 Sfx_Spark_Ch8: - noise __, 5, $f8, $5d - noise __, 5, $d8, $6f - loopchannel 2, Sfx_Spark_Ch8 - endchannel + noise_note 4, 15, 8, 93 + noise_note 4, 13, 8, 111 + sound_loop 2, Sfx_Spark_Ch8 + sound_ret Sfx_Curse: - musicheader 2, 5, Sfx_Curse_Ch5 - musicheader 1, 8, Sfx_Curse_Ch8 + channel_count 2 + channel 5, Sfx_Curse_Ch5 + channel 8, Sfx_Curse_Ch8 Sfx_Curse_Ch5: - dutycycle $3 - sound __, 5, $f2, $0483 - sound __, 5, $f2, $0511 - sound __, 5, $f2, $0589 - sound __, 5, $f2, $05ed - endchannel + duty_cycle 3 + square_note 4, 15, 2, 1155 + square_note 4, 15, 2, 1297 + square_note 4, 15, 2, 1417 + square_note 4, 15, 2, 1517 + sound_ret Sfx_Curse_Ch8: - noise C_, 5, $9a, $9 - endchannel + noise_note 20, 9, -2, 9 + sound_ret Sfx_Rage: - musicheader 2, 5, Sfx_Rage_Ch5 - musicheader 1, 8, Sfx_Rage_Ch8 + channel_count 2 + channel 5, Sfx_Rage_Ch5 + channel 8, Sfx_Rage_Ch8 Sfx_Rage_Ch5: - dutycycle $0 - sound __, 4, $d1, $07b0 - sound __, 4, $d1, $07c2 - sound C_, 9, $d2, $07d5 - endchannel + duty_cycle 0 + square_note 3, 13, 1, 1968 + square_note 3, 13, 1, 1986 + square_note 24, 13, 2, 2005 + sound_ret Sfx_Rage_Ch8: - noise __, 4, $f4, $1a - noise __, 4, $f4, $19 - noise C_, 9, $f2, $18 - endchannel + noise_note 3, 15, 4, 26 + noise_note 3, 15, 4, 25 + noise_note 24, 15, 2, 24 + sound_ret Sfx_Thief: - musicheader 1, 8, Sfx_Thief_Ch8 + channel_count 1 + channel 8, Sfx_Thief_Ch8 Sfx_Thief_Ch8: - noise __, 1, $0, $0 - noise __, 5, $e1, $12 - noise __, 1, $0, $0 - noise __, 3, $b1, $22 - loopchannel 2, Sfx_Thief_Ch8 - endchannel + noise_note 0, 0, 0, 0 + noise_note 4, 14, 1, 18 + noise_note 0, 0, 0, 0 + noise_note 2, 11, 1, 34 + sound_loop 2, Sfx_Thief_Ch8 + sound_ret Sfx_Thief2: - musicheader 1, 5, Sfx_Thief2_Ch5 + channel_count 1 + channel 5, Sfx_Thief2_Ch5 Sfx_Thief2_Ch5: - togglesfx - notetype $2, $f4 - dutycycle $0 + toggle_sfx + note_type 2, 15, 4 + duty_cycle 0 octave 4 note C#, 3 note A#, 3 - intensity $d2 + volume_envelope 13, 2 note C#, 3 note A#, 3 - intensity $b1 + volume_envelope 11, 1 note C_, 3 note A_, 3 - intensity $81 + volume_envelope 8, 1 note C_, 3 note A_, 3 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_SpiderWeb: - musicheader 2, 5, Sfx_SpiderWeb_Ch5 - musicheader 1, 8, Sfx_SpiderWeb_Ch8 + channel_count 2 + channel 5, Sfx_SpiderWeb_Ch5 + channel 8, Sfx_SpiderWeb_Ch8 Sfx_SpiderWeb_Ch5: - dutycycle $0 - sound C#, 1, $7f, $0720 - soundinput $95 - sound __, 5, $f8, $0620 - sound __, 5, $e8, $0630 - sound __, 5, $d8, $0640 - sound __, 5, $95, $0620 - sound __, 5, $73, $0630 - sound __, 5, $51, $0640 - soundinput $8 - endchannel + duty_cycle 0 + square_note 32, 7, -7, 1824 + pitch_sweep 9, 5 + square_note 4, 15, 8, 1568 + square_note 4, 14, 8, 1584 + square_note 4, 13, 8, 1600 + square_note 4, 9, 5, 1568 + square_note 4, 7, 3, 1584 + square_note 4, 5, 1, 1600 + pitch_sweep 0, 8 + sound_ret Sfx_SpiderWeb_Ch8: - noise C#, 1, $ef, $0 - endchannel + noise_note 32, 14, -7, 0 + sound_ret Sfx_MindReader: - musicheader 2, 5, Sfx_MindReader_Ch5 - musicheader 1, 8, Sfx_MindReader_Ch8 + channel_count 2 + channel 5, Sfx_MindReader_Ch5 + channel 8, Sfx_MindReader_Ch8 Sfx_MindReader_Ch5: - togglesfx - dutycycle $2 - notetype $2, $f1 + toggle_sfx + duty_cycle 2 + note_type 2, 15, 1 octave 5 note C_, 3 - intensity $41 + volume_envelope 4, 1 note C_, 3 - intensity $f1 + volume_envelope 15, 1 note C#, 3 - intensity $41 + volume_envelope 4, 1 note C#, 3 - intensity $f1 + volume_envelope 15, 1 note D_, 3 - intensity $41 + volume_envelope 4, 1 note D_, 3 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_MindReader_Ch8: - noise C_, 2, $af, $19 - noise C_, 3, $af, $18 - endchannel + noise_note 17, 10, -7, 25 + noise_note 18, 10, -7, 24 + sound_ret Sfx_Nightmare: - musicheader 1, 5, Sfx_Nightmare_Ch5 + channel_count 1 + channel 5, Sfx_Nightmare_Ch5 Sfx_Nightmare_Ch5: - dutycycle $0 - soundinput $34 -.loop - sound __, 4, $ba, $0631 - sound __, 3, $0, 0 - sound __, 4, $f8, $0621 - sound __, 3, $0, 0 - sound __, 4, $f8, $0611 - sound __, 3, $0, 0 - sound __, 4, $e8, $0601 - sound __, 3, $0, 0 - sound __, 4, $e8, $05f1 - sound __, 3, $0, 0 - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 3, 4 +.loop1: + square_note 3, 11, -2, 1585 + square_note 2, 0, 0, 0 + square_note 3, 15, 8, 1569 + square_note 2, 0, 0, 0 + square_note 3, 15, 8, 1553 + square_note 2, 0, 0, 0 + square_note 3, 14, 8, 1537 + square_note 2, 0, 0, 0 + square_note 3, 14, 8, 1521 + square_note 2, 0, 0, 0 + sound_loop 2, .loop1 + pitch_sweep 0, 8 + sound_ret Sfx_Snore: - musicheader 1, 8, Sfx_Snore_Ch8 + channel_count 1 + channel 8, Sfx_Snore_Ch8 Sfx_Snore_Ch8: - noise __, 3, $ea, $4b - noise __, 3, $ea, $5b - noise __, 3, $0, $0 - noise __, 5, $ee, $47 - noise __, 5, $ee, $46 - noise __, 5, $ee, $45 - endchannel + noise_note 2, 14, -2, 75 + noise_note 2, 14, -2, 91 + noise_note 2, 0, 0, 0 + noise_note 4, 14, -6, 71 + noise_note 4, 14, -6, 70 + noise_note 4, 14, -6, 69 + sound_ret Sfx_SweetKiss: - musicheader 1, 5, Sfx_SweetKiss_Ch5 + channel_count 1 + channel 5, Sfx_SweetKiss_Ch5 Sfx_SweetKiss_Ch5: - dutycycle $2 -.loop - sound __, 3, $c1, $07c8 - sound __, 3, $d1, $07da - loopchannel 2, .loop - sound C_, 11, $f1, $07e2 - endchannel + duty_cycle 2 +.loop1: + square_note 2, 12, 1, 1992 + square_note 2, 13, 1, 2010 + sound_loop 2, .loop1 + square_note 26, 15, 1, 2018 + sound_ret Sfx_SweetKiss2: - musicheader 1, 5, Sfx_SweetKiss2_Ch5 + channel_count 1 + channel 5, Sfx_SweetKiss2_Ch5 Sfx_SweetKiss2_Ch5: - dutycycle $0 - soundinput $97 - sound __, 3, $f4, $0772 - sound __, 5, $0, 0 - sound __, 3, $c4, $0772 - sound __, 5, $0, 0 - sound __, 3, $b4, $0772 - sound __, 5, $0, 0 - sound __, 3, $a1, $0772 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 9, 7 + square_note 2, 15, 4, 1906 + square_note 4, 0, 0, 0 + square_note 2, 12, 4, 1906 + square_note 4, 0, 0, 0 + square_note 2, 11, 4, 1906 + square_note 4, 0, 0, 0 + square_note 2, 10, 1, 1906 + pitch_sweep 0, 8 + sound_ret Sfx_BellyDrum: - musicheader 2, 5, Sfx_BellyDrum_Ch5 - musicheader 1, 8, Sfx_BellyDrum_Ch8 + channel_count 2 + channel 5, Sfx_BellyDrum_Ch5 + channel 8, Sfx_BellyDrum_Ch8 Sfx_BellyDrum_Ch5: - dutycycle $2 - soundinput $ac - sound __, 13, $f1, $05a3 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 10, -4 + square_note 12, 15, 1, 1443 + pitch_sweep 0, 8 + sound_ret Sfx_BellyDrum_Ch8: - noise __, 13, $b1, $6c - endchannel + noise_note 12, 11, 1, 108 + sound_ret Sfx_Unknown7F: - musicheader 1, 5, Sfx_Unknown7F_Ch5 + channel_count 1 + channel 5, Sfx_Unknown7F_Ch5 Sfx_Unknown7F_Ch5: - dutycycle $2 - soundinput $95 - sound __, 3, $c9, $03b3 - sound __, 6, $f8, $0463 - sound __, 5, $d1, $0543 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 5 + square_note 2, 12, -1, 947 + square_note 5, 15, 8, 1123 + square_note 4, 13, 1, 1347 + pitch_sweep 0, 8 + sound_ret Sfx_SludgeBomb: - musicheader 2, 5, Sfx_SludgeBomb_Ch5 - musicheader 1, 8, Sfx_SludgeBomb_Ch8 + channel_count 2 + channel 5, Sfx_SludgeBomb_Ch5 + channel 8, Sfx_SludgeBomb_Ch8 Sfx_SludgeBomb_Ch5: - dutycycle $2 - soundinput $c5 - sound __, 4, $f8, $0581 - sound __, 2, $0, 0 - soundinput $cb - sound C_, 1, $f2, $05d1 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 12, 5 + square_note 3, 15, 8, 1409 + square_note 1, 0, 0, 0 + pitch_sweep 12, -3 + square_note 16, 15, 2, 1489 + pitch_sweep 0, 8 + sound_ret Sfx_SludgeBomb_Ch8: - noise __, 4, $e2, $6e - noise __, 2, $0, $0 - noise C_, 1, $e2, $6d - endchannel + noise_note 3, 14, 2, 110 + noise_note 1, 0, 0, 0 + noise_note 16, 14, 2, 109 + sound_ret Sfx_Foresight: - musicheader 1, 5, Sfx_Foresight_Ch5 + channel_count 1 + channel 5, Sfx_Foresight_Ch5 Sfx_Foresight_Ch5: - sound __, 4, $f4, $07b5 - sound __, 4, $f5, $07c8 - sound __, 9, $f4, $07da - sound __, 3, $0, 0 - sound __, 9, $c1, $07da - sound __, 3, $0, 0 - sound __, 9, $91, $07da - endchannel + square_note 3, 15, 4, 1973 + square_note 3, 15, 5, 1992 + square_note 8, 15, 4, 2010 + square_note 2, 0, 0, 0 + square_note 8, 12, 1, 2010 + square_note 2, 0, 0, 0 + square_note 8, 9, 1, 2010 + sound_ret Sfx_Spite: - musicheader 1, 5, Sfx_Spite_Ch5 + channel_count 1 + channel 5, Sfx_Spite_Ch5 Sfx_Spite_Ch5: - togglesfx - vibrato $0, $12 - dutycycle $3 - soundinput $fd - notetype $3, $f8 + toggle_sfx + vibrato 0, 1, 2 + duty_cycle 3 + pitch_sweep 15, -5 + note_type 3, 15, 8 octave 3 note F_, 3 note G#, 3 @@ -2316,326 +2459,346 @@ Sfx_Spite_Ch5: note E_, 3 note G_, 3 note A#, 3 - intensity $bf + volume_envelope 11, -7 note D#, 3 note F#, 3 note A_, 3 - intensity $5f + volume_envelope 5, -7 note D_, 3 - intensity $2f + volume_envelope 2, -7 note F_, 3 note G#, 3 - soundinput $8 - togglesfx - endchannel + pitch_sweep 0, 8 + toggle_sfx + sound_ret Sfx_Outrage: - musicheader 1, 8, Sfx_Outrage_Ch8 + channel_count 1 + channel 8, Sfx_Outrage_Ch8 Sfx_Outrage_Ch8: - noise __, 12, $ea, $6c - noise __, 12, $ea, $6b - noise __, 12, $ea, $6a - noise __, 12, $ea, $69 - noise __, 12, $e1, $59 - endchannel + noise_note 11, 14, -2, 108 + noise_note 11, 14, -2, 107 + noise_note 11, 14, -2, 106 + noise_note 11, 14, -2, 105 + noise_note 11, 14, 1, 89 + sound_ret Sfx_PerishSong: - musicheader 2, 5, Sfx_PerishSong_Ch5 - musicheader 1, 6, Sfx_PerishSong_Ch6 + channel_count 2 + channel 5, Sfx_PerishSong_Ch5 + channel 6, Sfx_PerishSong_Ch6 Sfx_PerishSong_Ch5: - togglesfx - dutycycle $0 - vibrato $12, $53 - notetype $8, $af + toggle_sfx + duty_cycle 0 + vibrato 18, 5, 3 + note_type 8, 10, -7 octave 4 note A_, 9 note G#, 9 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_PerishSong_Ch6: - togglesfx - dutycycle $0 - vibrato $12, $53 - notetype $8, $af + toggle_sfx + duty_cycle 0 + vibrato 18, 5, 3 + note_type 8, 10, -7 octave 4 note C_, 9 octave 3 note B_, 9 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_GigaDrain: - musicheader 2, 5, Sfx_GigaDrain_Ch5 - musicheader 1, 8, Sfx_GigaDrain_Ch8 + channel_count 2 + channel 5, Sfx_GigaDrain_Ch5 + channel 8, Sfx_GigaDrain_Ch8 Sfx_GigaDrain_Ch5: - dutycycle $2 - soundinput $97 - sound __, 5, $f8, $0680 - sound C_, 5, $f8, $0680 - sound C_, 5, $c8, $0660 - sound C_, 5, $a8, $0670 - sound C_, 5, $88, $0680 - sound C_, 5, $f8, $0561 - sound C_, 5, $c8, $0541 - sound C_, 5, $a8, $0521 - sound C_, 5, $88, $0511 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 7 + square_note 4, 15, 8, 1664 + square_note 20, 15, 8, 1664 + square_note 20, 12, 8, 1632 + square_note 20, 10, 8, 1648 + square_note 20, 8, 8, 1664 + square_note 20, 15, 8, 1377 + square_note 20, 12, 8, 1345 + square_note 20, 10, 8, 1313 + square_note 20, 8, 8, 1297 + pitch_sweep 0, 8 + sound_ret Sfx_GigaDrain_Ch8: - noise __, 5, $c8, $44 - noise C_, 5, $c8, $50 - noise C_, 5, $c8, $52 - noise C_, 5, $c8, $54 - noise C_, 5, $c8, $56 - noise D#, 1, $c7, $57 - endchannel + noise_note 4, 12, 8, 68 + noise_note 20, 12, 8, 80 + noise_note 20, 12, 8, 82 + noise_note 20, 12, 8, 84 + noise_note 20, 12, 8, 86 + noise_note 64, 12, 7, 87 + sound_ret Sfx_Attract: - musicheader 1, 5, Sfx_Attract_Ch5 + channel_count 1 + channel 5, Sfx_Attract_Ch5 Sfx_Attract_Ch5: - dutycycle $0 - soundinput $77 - sound __, 5, $a9, $06f0 - sound __, 13, $f8, $0720 - soundinput $7f - sound __, 9, $f1, $0740 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 7, 7 + square_note 4, 10, -1, 1776 + square_note 12, 15, 8, 1824 + pitch_sweep 7, -7 + square_note 8, 15, 1, 1856 + pitch_sweep 0, 8 + sound_ret Sfx_Kinesis2: - musicheader 1, 5, Sfx_Kinesis2_Ch5 + channel_count 1 + channel 5, Sfx_Kinesis2_Ch5 Sfx_Kinesis2_Ch5: - dutycycle $0 - sound __, 3, $f3, $0796 - sound __, 3, $23, $0796 - sound C_, 5, $f1, $07c4 - endchannel + duty_cycle 0 + square_note 2, 15, 3, 1942 + square_note 2, 2, 3, 1942 + square_note 20, 15, 1, 1988 + sound_ret Sfx_ZapCannon: - musicheader 1, 8, Sfx_ZapCannon_Ch8 + channel_count 1 + channel 8, Sfx_ZapCannon_Ch8 Sfx_ZapCannon_Ch8: - noise __, 3, $e1, $49 - noise __, 1, $0, $0 - loopchannel 8, Sfx_ZapCannon_Ch8 - noise __, 9, $e1, $49 - endchannel + noise_note 2, 14, 1, 73 + noise_note 0, 0, 0, 0 + sound_loop 8, Sfx_ZapCannon_Ch8 + noise_note 8, 14, 1, 73 + sound_ret Sfx_MeanLook: - musicheader 1, 5, Sfx_MeanLook_Ch5 + channel_count 1 + channel 5, Sfx_MeanLook_Ch5 Sfx_MeanLook_Ch5: - soundinput $77 - dutycycle $3 - sound __, 3, $f8, $0720 -.loop - sound __, 2, $88, $0660 - sound __, 3, $f8, $0790 - loopchannel 5, .loop - sound __, 13, $f8, $0700 - sound __, 13, $c8, $0720 - sound __, 13, $a8, $0700 - sound __, 13, $78, $0720 - sound __, 13, $48, $0700 - sound __, 13, $28, $0720 - soundinput $8 - endchannel + pitch_sweep 7, 7 + duty_cycle 3 + square_note 2, 15, 8, 1824 +.loop1: + square_note 1, 8, 8, 1632 + square_note 2, 15, 8, 1936 + sound_loop 5, .loop1 + square_note 12, 15, 8, 1792 + square_note 12, 12, 8, 1824 + square_note 12, 10, 8, 1792 + square_note 12, 7, 8, 1824 + square_note 12, 4, 8, 1792 + square_note 12, 2, 8, 1824 + pitch_sweep 0, 8 + sound_ret Sfx_HealBell: - musicheader 1, 5, Sfx_HealBell_Ch5 + channel_count 1 + channel 5, Sfx_HealBell_Ch5 Sfx_HealBell_Ch5: - dutycycle $1 - sound __, 2, $f1, $07da - sound __, 2, $d1, $07d9 - sound __, 2, $f1, $07da - sound __, 9, $d1, $07db - endchannel + duty_cycle 1 + square_note 1, 15, 1, 2010 + square_note 1, 13, 1, 2009 + square_note 1, 15, 1, 2010 + square_note 8, 13, 1, 2011 + sound_ret Sfx_Return: - musicheader 1, 5, Sfx_Return_Ch5 + channel_count 1 + channel 5, Sfx_Return_Ch5 Sfx_Return_Ch5: - dutycycle $0 -.loop - soundinput $bf - sound __, 9, $f1, $0759 - soundinput $57 - sound __, 9, $f1, $0759 - sound C_, 1, $0, 0 - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 0 +.loop1: + pitch_sweep 11, -7 + square_note 8, 15, 1, 1881 + pitch_sweep 5, 7 + square_note 8, 15, 1, 1881 + square_note 16, 0, 0, 0 + sound_loop 2, .loop1 + pitch_sweep 0, 8 + sound_ret Sfx_ExpBar: - musicheader 1, 5, Sfx_ExpBar_Ch5 + channel_count 1 + channel 5, Sfx_ExpBar_Ch5 Sfx_ExpBar_Ch5: - dutycycle $2 - soundinput $d7 - sound __, 9, $e1, $0750 - soundinput $e7 - sound __, 9, $48, $06e0 - sound __, 9, $58, $06f8 - sound __, 9, $68, $0710 - sound __, 9, $78, $0728 - sound __, 9, $88, $0740 - sound __, 9, $98, $0758 - sound C_, 1, $a8, $0770 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 13, 7 + square_note 8, 14, 1, 1872 + pitch_sweep 14, 7 + square_note 8, 4, 8, 1760 + square_note 8, 5, 8, 1784 + square_note 8, 6, 8, 1808 + square_note 8, 7, 8, 1832 + square_note 8, 8, 8, 1856 + square_note 8, 9, 8, 1880 + square_note 16, 10, 8, 1904 + pitch_sweep 0, 8 + sound_ret Sfx_MilkDrink: - musicheader 1, 5, Sfx_MilkDrink_Ch5 + channel_count 1 + channel 5, Sfx_MilkDrink_Ch5 Sfx_MilkDrink_Ch5: - dutycycle $2 -.loop - soundinput $a4 - sound __, 3, $ea, $04e0 - sound __, 14, $f7, $0290 - soundinput $9e - sound __, 5, $c9, $05e1 - sound __, 3, $0, 0 - loopchannel 6, .loop - soundinput $8 - endchannel + duty_cycle 2 +.loop1: + pitch_sweep 10, 4 + square_note 2, 14, -2, 1248 + square_note 13, 15, 7, 656 + pitch_sweep 9, -6 + square_note 4, 12, -1, 1505 + square_note 2, 0, 0, 0 + sound_loop 6, .loop1 + pitch_sweep 0, 8 + sound_ret Sfx_Present: - musicheader 1, 5, Sfx_Present_Ch5 + channel_count 1 + channel 5, Sfx_Present_Ch5 Sfx_Present_Ch5: - dutycycle $2 - soundinput $d6 -.loop - sound __, 3, $f1, $0740 - sound __, 2, $0, 0 - loopchannel 3, .loop - sound C_, 1, $f1, $0780 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 13, 6 +.loop1: + square_note 2, 15, 1, 1856 + square_note 1, 0, 0, 0 + sound_loop 3, .loop1 + square_note 16, 15, 1, 1920 + pitch_sweep 0, 8 + sound_ret Sfx_MorningSun: - musicheader 1, 5, Sfx_MorningSun_Ch5 + channel_count 1 + channel 5, Sfx_MorningSun_Ch5 Sfx_MorningSun_Ch5: - dutycycle $3 -.loop - sound __, 3, $f1, $07e4 - sound __, 3, $f1, $07e0 - sound __, 6, $f2, $07e7 - loopchannel 3, .loop - sound __, 2, $0, 0 - sound __, 9, $c2, $07e7 - sound __, 2, $0, 0 - sound __, 9, $82, $07e7 - endchannel + duty_cycle 3 +.loop1: + square_note 2, 15, 1, 2020 + square_note 2, 15, 1, 2016 + square_note 5, 15, 2, 2023 + sound_loop 3, .loop1 + square_note 1, 0, 0, 0 + square_note 8, 12, 2, 2023 + square_note 1, 0, 0, 0 + square_note 8, 8, 2, 2023 + sound_ret Sfx_Moonlight: - musicheader 1, 5, Sfx_Moonlight_Ch5 + channel_count 1 + channel 5, Sfx_Moonlight_Ch5 Sfx_Moonlight_Ch5: - dutycycle $2 -.loop - sound __, 2, $f8, $07d0 - sound __, 5, $f1, $07e0 - loopchannel 2, .loop - sound C_, 1, $f1, $07e0 - sound C_, 1, $d1, $07e0 - sound C_, 1, $81, $07e0 - endchannel + duty_cycle 2 +.loop1: + square_note 1, 15, 8, 2000 + square_note 4, 15, 1, 2016 + sound_loop 2, .loop1 + square_note 16, 15, 1, 2016 + square_note 16, 13, 1, 2016 + square_note 16, 8, 1, 2016 + sound_ret Sfx_Encore: - musicheader 2, 5, Sfx_Encore_Ch5 - musicheader 1, 8, Sfx_Encore_Ch8 + channel_count 2 + channel 5, Sfx_Encore_Ch5 + channel 8, Sfx_Encore_Ch8 Sfx_Encore_Ch5: - dutycycle $2 - soundinput $ce - sound C_, 1, $0, 0 -.loop - sound __, 3, $f8, $0774 - sound C#, 5, $0, 0 - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 12, -6 + square_note 16, 0, 0, 0 +.loop1: + square_note 2, 15, 8, 1908 + square_note 36, 0, 0, 0 + sound_loop 2, .loop1 + pitch_sweep 0, 8 + sound_ret Sfx_Encore_Ch8: - noise D_, 1, $1f, $36 - noise D_, 1, $76, $36 - endchannel + noise_note 48, 1, -7, 54 + noise_note 48, 7, 6, 54 + sound_ret Sfx_BeatUp: - musicheader 1, 8, Sfx_BeatUp_Ch8 + channel_count 1 + channel 8, Sfx_BeatUp_Ch8 Sfx_BeatUp_Ch8: - noise __, 3, $e8, $69 - noise __, 7, $d8, $24 - noise __, 3, $e8, $6c - noise __, 5, $c8, $46 - noise __, 7, $d1, $24 - endchannel + noise_note 2, 14, 8, 105 + noise_note 6, 13, 8, 36 + noise_note 2, 14, 8, 108 + noise_note 4, 12, 8, 70 + noise_note 6, 13, 1, 36 + sound_ret Sfx_SweetScent: - musicheader 1, 5, Sfx_SweetScent_Ch5 + channel_count 1 + channel 5, Sfx_SweetScent_Ch5 Sfx_SweetScent_Ch5: - dutycycle $2 - soundinput $96 - sound __, 7, $f8, $0760 - sound __, 7, $e8, $0720 - soundinput $df - sound C_, 7, $f1, $0730 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 6 + square_note 6, 15, 8, 1888 + square_note 6, 14, 8, 1824 + pitch_sweep 13, -7 + square_note 22, 15, 1, 1840 + pitch_sweep 0, 8 + sound_ret Sfx_BatonPass: - musicheader 2, 5, Sfx_BatonPass_Ch5 - musicheader 1, 8, Sfx_BatonPass_Ch8 + channel_count 2 + channel 5, Sfx_BatonPass_Ch5 + channel 8, Sfx_BatonPass_Ch8 Sfx_BatonPass_Ch5: - dutycycle $2 - soundinput $f7 - sound C#, 1, $f2, $0680 - sound __, 2, $f1, $0760 - sound C#, 1, $0, 0 - sound __, 2, $f1, $0760 - sound C_, 11, $0, 0 - sound __, 2, $f1, $0760 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 15, 7 + square_note 32, 15, 2, 1664 + square_note 1, 15, 1, 1888 + square_note 32, 0, 0, 0 + square_note 1, 15, 1, 1888 + square_note 26, 0, 0, 0 + square_note 1, 15, 1, 1888 + pitch_sweep 0, 8 + sound_ret Sfx_BatonPass_Ch8: - noise C#, 1, $f2, $20 - endchannel + noise_note 32, 15, 2, 32 + sound_ret Sfx_EggCrack: - musicheader 1, 5, Sfx_EggCrack_Ch5 + channel_count 1 + channel 5, Sfx_EggCrack_Ch5 Sfx_EggCrack_Ch5: - togglesfx - notetype $1, $f1 - dutycycle $0 + toggle_sfx + note_type 1, 15, 1 + duty_cycle 0 octave 4 note D#, 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - endchannel + sound_ret Sfx_Evolved: - musicheader 1, 5, Sfx_Evolved_Ch5 + channel_count 1 + channel 5, Sfx_Evolved_Ch5 Sfx_Evolved_Ch5: - togglesfx - notetype $1, $c1 + toggle_sfx + note_type 1, 12, 1 octave 4 note C_, 2 note E_, 2 @@ -2651,15 +2814,16 @@ Sfx_Evolved_Ch5: note B_, 3 octave 7 note C_, 16 - endchannel + sound_ret Sfx_MasterBall: - musicheader 1, 5, Sfx_MasterBall_Ch5 + channel_count 1 + channel 5, Sfx_MasterBall_Ch5 Sfx_MasterBall_Ch5: - togglesfx - dutycycle $1 - notetype $2, $e1 + toggle_sfx + duty_cycle 1 + note_type 2, 14, 1 octave 6 note B_, 2 octave 7 @@ -2672,120 +2836,126 @@ Sfx_MasterBall_Ch5: note A_, 2 note A#, 2 note A_, 2 - intensity $c1 + volume_envelope 12, 1 note G#, 2 note G_, 2 note F#, 2 - intensity $91 + volume_envelope 9, 1 note F_, 2 note E_, 2 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D_, 2 note C#, 2 note C_, 2 - endchannel + sound_ret Sfx_EggHatch: - musicheader 1, 5, Sfx_EggHatch_Ch5 + channel_count 1 + channel 5, Sfx_EggHatch_Ch5 Sfx_EggHatch_Ch5: - togglesfx - notetype $2, $f1 - dutycycle $2 + toggle_sfx + note_type 2, 15, 1 + duty_cycle 2 octave 5 note E_, 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 note D_, 1 - intensity $e2 + volume_envelope 14, 2 note B_, 7 - intensity $82 + volume_envelope 8, 2 note B_, 7 - intensity $42 + volume_envelope 4, 2 note B_, 7 - endchannel + sound_ret Sfx_GsIntroCharizardFireball: - musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8 + channel_count 1 + channel 8, Sfx_GsIntroCharizardFireball_Ch8 Sfx_GsIntroCharizardFireball_Ch8: - noise __, 9, $cf, $4d - noise __, 9, $f1, $37 -.loop - noise __, 2, $f8, $4f - noise __, 1, $c8, $26 - noise __, 2, $d8, $5f - noise __, 1, $a8, $37 - loopchannel 12, .loop - noise __, 4, $f8, $6f - noise __, 5, $d8, $5f - noise __, 13, $d8, $5c - noise C#, 9, $d3, $4f - endchannel + noise_note 8, 12, -7, 77 + noise_note 8, 15, 1, 55 +.loop1: + noise_note 1, 15, 8, 79 + noise_note 0, 12, 8, 38 + noise_note 1, 13, 8, 95 + noise_note 0, 10, 8, 55 + sound_loop 12, .loop1 + noise_note 3, 15, 8, 111 + noise_note 4, 13, 8, 95 + noise_note 12, 13, 8, 92 + noise_note 40, 13, 3, 79 + sound_ret Sfx_GsIntroPokemonAppears: - musicheader 1, 8, Sfx_GsIntroPokemonAppears_Ch8 + channel_count 1 + channel 8, Sfx_GsIntroPokemonAppears_Ch8 Sfx_GsIntroPokemonAppears_Ch8: - noise __, 2, $88, $4f - noise __, 3, $8f, $2 - noise __, 3, $5f, $12 - noise __, 3, $3f, $22 - noise __, 1, $f8, $27 - noise __, 2, $f8, $4f - noise __, 9, $f1, $0 - endchannel + noise_note 1, 8, 8, 79 + noise_note 2, 8, -7, 2 + noise_note 2, 5, -7, 18 + noise_note 2, 3, -7, 34 + noise_note 0, 15, 8, 39 + noise_note 1, 15, 8, 79 + noise_note 8, 15, 1, 0 + sound_ret Sfx_Flash: - musicheader 1, 5, Sfx_Flash_Ch5 + channel_count 1 + channel 5, Sfx_Flash_Ch5 Sfx_Flash_Ch5: - dutycycle $1 - soundinput $ef - sound __, 2, $40, $07e8 - sound __, 2, $60, $07e8 - sound __, 3, $80, $07e8 - sound __, 6, $a0, $07e8 - sound __, 7, $a0, $07e8 - sound __, 8, $80, $07e8 - sound __, 9, $60, $07e8 - sound __, 10, $30, $07e8 - sound __, 16, $12, $07e8 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 14, -7 + square_note 1, 4, 0, 2024 + square_note 1, 6, 0, 2024 + square_note 2, 8, 0, 2024 + square_note 5, 10, 0, 2024 + square_note 6, 10, 0, 2024 + square_note 7, 8, 0, 2024 + square_note 8, 6, 0, 2024 + square_note 9, 3, 0, 2024 + square_note 15, 1, 2, 2024 + pitch_sweep 0, 8 + sound_ret Sfx_GameFreakLogoGs: - musicheader 1, 5, Sfx_GameFreakLogoGs_Ch5 + channel_count 1 + channel 5, Sfx_GameFreakLogoGs_Ch5 Sfx_GameFreakLogoGs_Ch5: - dutycycle $3 - soundinput $7f - sound __, 5, $55, $07e2 - sound __, 6, $75, $07e2 - sound __, 7, $94, $07e2 - sound __, 8, $b4, $07e2 - sound __, 9, $b3, $07e2 - sound __, 10, $93, $07e2 - sound __, 11, $72, $07e2 - sound __, 11, $53, $07e2 - sound __, 11, $34, $07e2 - sound __, 11, $15, $07e2 - soundinput $8 - endchannel + duty_cycle 3 + pitch_sweep 7, -7 + square_note 4, 5, 5, 2018 + square_note 5, 7, 5, 2018 + square_note 6, 9, 4, 2018 + square_note 7, 11, 4, 2018 + square_note 8, 11, 3, 2018 + square_note 9, 9, 3, 2018 + square_note 10, 7, 2, 2018 + square_note 10, 5, 3, 2018 + square_note 10, 3, 4, 2018 + square_note 10, 1, 5, 2018 + pitch_sweep 0, 8 + sound_ret Sfx_DexFanfareLessThan20: - musicheader 4, 5, Sfx_DexFanfareLessThan20_Ch5 - musicheader 1, 6, Sfx_DexFanfareLessThan20_Ch6 - musicheader 1, 7, Sfx_DexFanfareLessThan20_Ch7 - musicheader 1, 8, Sfx_DexFanfareLessThan20_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfareLessThan20_Ch5 + channel 6, Sfx_DexFanfareLessThan20_Ch6 + channel 7, Sfx_DexFanfareLessThan20_Ch7 + channel 8, Sfx_DexFanfareLessThan20_Ch8 Sfx_DexFanfareLessThan20_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - notetype $8, $b1 + volume 7, 7 + note_type 8, 11, 1 octave 3 note A_, 4 note F#, 2 @@ -2798,11 +2968,11 @@ Sfx_DexFanfareLessThan20_Ch5: note E_, 2 note E_, 2 note D_, 6 - endchannel + sound_ret Sfx_DexFanfareLessThan20_Ch6: - togglesfx - notetype $8, $c1 + toggle_sfx + note_type 8, 12, 1 octave 3 note B_, 4 note A_, 2 @@ -2815,64 +2985,65 @@ Sfx_DexFanfareLessThan20_Ch6: note A_, 2 note G_, 2 note F#, 6 - endchannel + sound_ret Sfx_DexFanfareLessThan20_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 4 note D_, 6 octave 3 note A_, 2 - note __, 2 + rest 2 note A_, 2 note A#, 4 note G_, 2 octave 4 note D#, 6 note D_, 2 - note __, 4 + rest 4 octave 3 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_DexFanfareLessThan20_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C#, 6 - note __, 16 - note __, 12 - endchannel + rest 16 + rest 12 + sound_ret Sfx_DexFanfare140169: - musicheader 4, 5, Sfx_DexFanfare140169_Ch5 - musicheader 1, 6, Sfx_DexFanfare140169_Ch6 - musicheader 1, 7, Sfx_DexFanfare140169_Ch7 - musicheader 1, 8, Sfx_DexFanfare140169_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfare140169_Ch5 + channel 6, Sfx_DexFanfare140169_Ch6 + channel 7, Sfx_DexFanfare140169_Ch7 + channel 8, Sfx_DexFanfare140169_Ch8 Sfx_DexFanfare140169_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - dutycycle $3 - vibrato $12, $34 - notetype $6, $b1 - note __, 8 + volume 7, 7 + duty_cycle 3 + vibrato 18, 3, 4 + note_type 6, 11, 1 + rest 8 octave 3 note E_, 4 note E_, 4 note A_, 4 octave 4 note C#, 4 - intensity $a4 + volume_envelope 10, 4 note D_, 4 note C_, 4 octave 3 @@ -2882,14 +3053,14 @@ Sfx_DexFanfare140169_Ch5: note G_, 16 octave 2 note B_, 8 - note __, 8 - endchannel + rest 8 + sound_ret Sfx_DexFanfare140169_Ch6: - togglesfx - dutycycle $2 - vibrato $12, $34 - notetype $6, $c1 + toggle_sfx + duty_cycle 2 + vibrato 18, 3, 4 + note_type 6, 12, 1 octave 4 note E_, 4 note F#, 4 @@ -2897,7 +3068,7 @@ Sfx_DexFanfare140169_Ch6: note G_, 4 note G_, 4 note G_, 4 - intensity $b4 + volume_envelope 11, 4 note F#, 4 note G_, 4 note A_, 4 @@ -2906,13 +3077,13 @@ Sfx_DexFanfare140169_Ch6: octave 4 note B_, 16 note G_, 8 - note __, 8 - endchannel + rest 8 + sound_ret Sfx_DexFanfare140169_Ch7: - togglesfx - notetype $c, $25 - note __, 4 + toggle_sfx + note_type 12, 2, 5 + rest 4 octave 2 note A_, 1 octave 3 @@ -2920,7 +3091,7 @@ Sfx_DexFanfare140169_Ch7: note E_, 1 note A_, 3 note C#, 1 - note __, 1 + rest 1 note D_, 1 note F#, 1 note A_, 1 @@ -2928,7 +3099,7 @@ Sfx_DexFanfare140169_Ch7: note D_, 3 octave 2 note A_, 1 - note __, 1 + rest 1 note G_, 1 note B_, 1 octave 3 @@ -2936,115 +3107,116 @@ Sfx_DexFanfare140169_Ch7: note G_, 3 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_DexFanfare140169_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 4 -.loop +.loop1: note D_, 4 note C#, 1 note C#, 1 note C#, 1 note C#, 1 - loopchannel 3, .loop + sound_loop 3, .loop1 note D_, 8 - endchannel + sound_ret Sfx_DexFanfare170199: - musicheader 4, 5, Sfx_DexFanfare170199_Ch5 - musicheader 1, 6, Sfx_DexFanfare170199_Ch6 - musicheader 1, 7, Sfx_DexFanfare170199_Ch7 - musicheader 1, 8, Sfx_DexFanfare170199_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfare170199_Ch5 + channel 6, Sfx_DexFanfare170199_Ch6 + channel 7, Sfx_DexFanfare170199_Ch7 + channel 8, Sfx_DexFanfare170199_Ch8 Sfx_DexFanfare170199_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $12, $34 - dutycycle $3 - notetype $8, $b4 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 4 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 6 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $c1 + rest 1 + volume_envelope 12, 1 note F_, 4 note G_, 4 note A_, 4 - notetype $c, $a8 + note_type 12, 10, 8 note A#, 12 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_DexFanfare170199_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $c4 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 12, 4 octave 3 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 6 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 - intensity $d1 + rest 1 + volume_envelope 13, 1 octave 4 note D#, 4 note D#, 4 note D#, 4 - notetype $c, $b8 + note_type 12, 11, 8 note D_, 12 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_DexFanfare170199_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 6 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 - notetype $c, $25 + rest 2 + note_type 12, 2, 5 octave 2 note A#, 12 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_DexFanfare170199_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 note D_, 2 note D_, 2 note D_, 4 @@ -3057,23 +3229,24 @@ Sfx_DexFanfare170199_Ch8: note C#, 1 note C#, 1 note C#, 1 - notetype $c + drum_speed 12 note B_, 16 - endchannel + sound_ret Sfx_DexFanfare200229: - musicheader 4, 5, Sfx_DexFanfare200229_Ch5 - musicheader 1, 6, Sfx_DexFanfare200229_Ch6 - musicheader 1, 7, Sfx_DexFanfare200229_Ch7 - musicheader 1, 8, Sfx_DexFanfare200229_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfare200229_Ch5 + channel 6, Sfx_DexFanfare200229_Ch6 + channel 7, Sfx_DexFanfare200229_Ch7 + channel 8, Sfx_DexFanfare200229_Ch8 Sfx_DexFanfare200229_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - vibrato $12, $34 - dutycycle $3 - notetype $8, $b2 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 2 octave 3 note C_, 2 note E_, 2 @@ -3087,16 +3260,16 @@ Sfx_DexFanfare200229_Ch5: octave 4 note D#, 4 note G_, 4 - notetype $c, $a8 + note_type 12, 10, 8 note F#, 12 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_DexFanfare200229_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $b2 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 2 octave 3 note E_, 2 note G_, 2 @@ -3108,21 +3281,21 @@ Sfx_DexFanfare200229_Ch6: note D#, 4 note G_, 4 note A#, 4 - notetype $c, $b8 + note_type 12, 11, 8 note A_, 12 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_DexFanfare200229_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 note E_, 2 note G_, 2 @@ -3138,27 +3311,27 @@ Sfx_DexFanfare200229_Ch7: octave 3 note D#, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 3 note D_, 6 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_DexFanfare200229_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 note C#, 1 note C#, 1 note C#, 1 @@ -3180,71 +3353,72 @@ Sfx_DexFanfare200229_Ch8: note D_, 2 note D_, 2 note B_, 12 - endchannel + sound_ret Sfx_DexFanfare230Plus: - musicheader 4, 5, Sfx_DexFanfare230Plus_Ch5 - musicheader 1, 6, Sfx_DexFanfare230Plus_Ch6 - musicheader 1, 7, Sfx_DexFanfare230Plus_Ch7 - musicheader 1, 8, Sfx_DexFanfare230Plus_Ch8 + channel_count 4 + channel 5, Sfx_DexFanfare230Plus_Ch5 + channel 6, Sfx_DexFanfare230Plus_Ch6 + channel 7, Sfx_DexFanfare230Plus_Ch7 + channel 8, Sfx_DexFanfare230Plus_Ch8 Sfx_DexFanfare230Plus_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $12, $34 - dutycycle $3 - notetype $8, $a5 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 10, 5 octave 3 note B_, 2 note G_, 2 note B_, 2 octave 4 note D_, 14 - note __, 2 - dutycycle $2 - intensity $85 + rest 2 + duty_cycle 2 + volume_envelope 8, 5 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 6 - intensity $a5 - dutycycle $3 + volume_envelope 10, 5 + duty_cycle 3 octave 3 note A_, 2 note G_, 2 note F_, 10 - note __, 2 - dutycycle $2 - intensity $85 + rest 2 + duty_cycle 2 + volume_envelope 8, 5 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 6 - intensity $a5 - dutycycle $3 + volume_envelope 10, 5 + duty_cycle 3 octave 3 note A#, 12 - intensity $b2 + volume_envelope 11, 2 note G_, 4 note A_, 4 note A#, 4 - notetype $c, $a8 + note_type 12, 10, 8 note A_, 14 - note __, 2 - endchannel + rest 2 + sound_ret Sfx_DexFanfare230Plus_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $b5 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 5 octave 4 note G_, 2 note D_, 2 note G_, 2 note F_, 14 - note __, 4 + rest 4 note F_, 2 note E_, 2 note D_, 2 @@ -3252,76 +3426,76 @@ Sfx_DexFanfare230Plus_Ch6: octave 3 note B_, 2 note A_, 10 - note __, 4 + rest 4 note A_, 2 octave 4 note C_, 2 note D_, 2 note D#, 12 - intensity $c2 + volume_envelope 12, 2 note G_, 4 note G_, 4 note G_, 4 - notetype $c, $b8 + note_type 12, 11, 8 note F#, 14 - note __, 2 - endchannel + rest 2 + sound_ret Sfx_DexFanfare230Plus_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note G_, 6 note A#, 4 note F_, 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 6 note A_, 4 note F_, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 6 note G_, 4 note D#, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 4 note G_, 4 note D#, 4 - notetype $c, $25 + note_type 12, 2, 5 note D_, 14 - note __, 2 - endchannel + rest 2 + sound_ret Sfx_DexFanfare230Plus_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 note D_, 2 note D_, 2 note D_, 2 -.loop1 +.loop1: note D_, 6 note D_, 2 note D_, 2 @@ -3333,7 +3507,7 @@ Sfx_DexFanfare230Plus_Ch8: note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, .loop1 + sound_loop 2, .loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3342,211 +3516,222 @@ Sfx_DexFanfare230Plus_Ch8: note D_, 4 note D_, 4 note D_, 4 -.loop2 +.loop2: note C#, 1 - loopchannel 18, .loop2 + sound_loop 18, .loop2 note D_, 6 - endchannel + sound_ret Sfx_NotVeryEffective: - musicheader 1, 8, Sfx_NotVeryEffective_Ch8 + channel_count 1 + channel 8, Sfx_NotVeryEffective_Ch8 Sfx_NotVeryEffective_Ch8: - noise __, 5, $f1, $5f - noise __, 2, $a0, $42 - noise C_, 1, $f1, $53 - endchannel + noise_note 4, 15, 1, 95 + noise_note 1, 10, 0, 66 + noise_note 16, 15, 1, 83 + sound_ret Sfx_Damage: - musicheader 1, 8, Sfx_Damage_Ch8 + channel_count 1 + channel 8, Sfx_Damage_Ch8 Sfx_Damage_Ch8: - noise __, 5, $f1, $5e - noise __, 2, $a0, $12 - noise __, 5, $f0, $32 - noise C_, 1, $f1, $44 - endchannel + noise_note 4, 15, 1, 94 + noise_note 1, 10, 0, 18 + noise_note 4, 15, 0, 50 + noise_note 16, 15, 1, 68 + sound_ret Sfx_SuperEffective: - musicheader 1, 8, Sfx_SuperEffective_Ch8 + channel_count 1 + channel 8, Sfx_SuperEffective_Ch8 Sfx_SuperEffective_Ch8: - noise __, 4, $f1, $4f - noise __, 2, $c8, $22 - noise __, 3, $f8, $3f - noise __, 4, $d0, $15 - noise C#, 1, $f2, $35 - endchannel + noise_note 3, 15, 1, 79 + noise_note 1, 12, 8, 34 + noise_note 2, 15, 8, 63 + noise_note 3, 13, 0, 21 + noise_note 32, 15, 2, 53 + sound_ret Sfx_BallBounce: - musicheader 2, 5, Sfx_BallBounce_Ch5 - musicheader 1, 6, Sfx_BallBounce_Ch6 + channel_count 2 + channel 5, Sfx_BallBounce_Ch5 + channel 6, Sfx_BallBounce_Ch6 Sfx_BallBounce_Ch5: - dutycycle $2 - sound __, 9, $e1, $0740 - sound C_, 8, $0, 0 - sound __, 9, $b1, $0740 - sound C_, 8, $0, 0 - sound __, 9, $81, $0740 - sound C_, 8, $0, 0 - sound __, 9, $51, $0740 - sound C_, 8, $0, 0 - endchannel + duty_cycle 2 + square_note 8, 14, 1, 1856 + square_note 23, 0, 0, 0 + square_note 8, 11, 1, 1856 + square_note 23, 0, 0, 0 + square_note 8, 8, 1, 1856 + square_note 23, 0, 0, 0 + square_note 8, 5, 1, 1856 + square_note 23, 0, 0, 0 + sound_ret Sfx_BallBounce_Ch6: - dutycycle $2 - sound __, 3, $8, 0 - sound __, 9, $b1, $0741 - sound C_, 8, $0, 0 - sound __, 9, $81, $0741 - sound C_, 8, $0, 0 - sound __, 9, $51, $0741 - sound C_, 8, $0, 0 - sound __, 9, $21, $0741 - sound C_, 8, $0, 0 - endchannel + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + square_note 23, 0, 0, 0 + square_note 8, 8, 1, 1857 + square_note 23, 0, 0, 0 + square_note 8, 5, 1, 1857 + square_note 23, 0, 0, 0 + square_note 8, 2, 1, 1857 + square_note 23, 0, 0, 0 + sound_ret Sfx_SweetScent2: - musicheader 2, 5, Sfx_SweetScent2_Ch5 - musicheader 1, 8, Sfx_SweetScent2_Ch8 + channel_count 2 + channel 5, Sfx_SweetScent2_Ch5 + channel 8, Sfx_SweetScent2_Ch8 Sfx_SweetScent2_Ch5: - soundinput $af - dutycycle $1 - sound __, 7, $f8, $05f0 - sound __, 3, $f1, $0620 - sound C_, 1, $f1, $0650 - soundinput $8 - endchannel + pitch_sweep 10, -7 + duty_cycle 1 + square_note 6, 15, 8, 1520 + square_note 2, 15, 1, 1568 + square_note 16, 15, 1, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_SweetScent2_Ch8: - noise __, 3, $e8, $22 - noise C_, 2, $aa, $0 -.loop - noise __, 5, $d9, $10 - noise __, 9, $91, $0 - noise __, 3, $61, $7 - loopchannel 5, .loop - noise __, 5, $99, $0 - noise __, 11, $61, $0 - noise __, 7, $59, $0 - noise __, 3, $21, $7 - endchannel + noise_note 2, 14, 8, 34 + noise_note 17, 10, -2, 0 +.loop1: + noise_note 4, 13, -1, 16 + noise_note 8, 9, 1, 0 + noise_note 2, 6, 1, 7 + sound_loop 5, .loop1 + noise_note 4, 9, -1, 0 + noise_note 10, 6, 1, 0 + noise_note 6, 5, -1, 0 + noise_note 2, 2, 1, 7 + sound_ret Sfx_HitEndOfExpBar: - musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5 - musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6 + channel_count 2 + channel 5, Sfx_HitEndOfExpBar_Ch5 + channel 6, Sfx_HitEndOfExpBar_Ch6 Sfx_HitEndOfExpBar_Ch5: - dutycycle $2 - sound __, 2, $e1, $0789 - sound __, 2, $e1, $07a2 - sound C_, 1, $e1, $07b1 - endchannel + duty_cycle 2 + square_note 1, 14, 1, 1929 + square_note 1, 14, 1, 1954 + square_note 16, 14, 1, 1969 + sound_ret Sfx_HitEndOfExpBar_Ch6: - dutycycle $2 - sound __, 2, $e1, $07a2 - sound __, 2, $e1, $07b1 - sound C_, 1, $e1, $07c4 - endchannel + duty_cycle 2 + square_note 1, 14, 1, 1954 + square_note 1, 14, 1, 1969 + square_note 16, 14, 1, 1988 + sound_ret Sfx_GiveTrademon: - musicheader 1, 5, Sfx_GiveTrademon_Ch5 + channel_count 1 + channel 5, Sfx_GiveTrademon_Ch5 Sfx_GiveTrademon_Ch5: - sound C#, 1, $0, 0 - dutycycle $1 - soundinput $a7 - sound C_, 12, $f4, $0750 - sound C_, 12, $d4, $0750 - sound C_, 12, $b4, $0750 - sound C_, 12, $94, $0750 - sound C_, 12, $74, $0750 - sound C_, 12, $54, $0750 - sound C_, 12, $34, $0750 - sound C_, 12, $14, $0750 - soundinput $8 - endchannel + square_note 32, 0, 0, 0 + duty_cycle 1 + pitch_sweep 10, 7 + square_note 27, 15, 4, 1872 + square_note 27, 13, 4, 1872 + square_note 27, 11, 4, 1872 + square_note 27, 9, 4, 1872 + square_note 27, 7, 4, 1872 + square_note 27, 5, 4, 1872 + square_note 27, 3, 4, 1872 + square_note 27, 1, 4, 1872 + pitch_sweep 0, 8 + sound_ret Sfx_GetTrademon: - musicheader 1, 5, Sfx_GetTrademon_Ch5 + channel_count 1 + channel 5, Sfx_GetTrademon_Ch5 Sfx_GetTrademon_Ch5: - sound C#, 1, $0, 0 - dutycycle $2 - soundinput $bf - sound C_, 12, $14, $07bc - sound C_, 12, $34, $07bc - sound C_, 12, $54, $07bc - sound C_, 12, $74, $07bc - sound C_, 12, $94, $07bc - sound C_, 12, $b4, $07bc - sound C_, 12, $d4, $07bc - sound C_, 12, $f4, $07bc - soundinput $8 - endchannel + square_note 32, 0, 0, 0 + duty_cycle 2 + pitch_sweep 11, -7 + square_note 27, 1, 4, 1980 + square_note 27, 3, 4, 1980 + square_note 27, 5, 4, 1980 + square_note 27, 7, 4, 1980 + square_note 27, 9, 4, 1980 + square_note 27, 11, 4, 1980 + square_note 27, 13, 4, 1980 + square_note 27, 15, 4, 1980 + pitch_sweep 0, 8 + sound_ret Sfx_TrainArrived: - musicheader 3, 5, Sfx_TrainArrived_Ch5 - musicheader 1, 6, Sfx_TrainArrived_Ch6 - musicheader 1, 8, Sfx_TrainArrived_Ch8 + channel_count 3 + channel 5, Sfx_TrainArrived_Ch5 + channel 6, Sfx_TrainArrived_Ch6 + channel 8, Sfx_TrainArrived_Ch8 Sfx_TrainArrived_Ch6: - tone $0008 - sound __, 9, $0, 0 + pitch_offset 8 + square_note 8, 0, 0, 0 Sfx_TrainArrived_Ch5: - dutycycle $2 - sound __, 5, $5f, $0691 - sound __, 5, $6f, $0694 - sound __, 5, $78, $0697 - sound __, 5, $7f, $069a - sound __, 5, $68, $06ae - sound C_, 1, $6f, $06ab - sound F_, 9, $65, $06a8 - endchannel + duty_cycle 2 + square_note 4, 5, -7, 1681 + square_note 4, 6, -7, 1684 + square_note 4, 7, 8, 1687 + square_note 4, 7, -7, 1690 + square_note 4, 6, 8, 1710 + square_note 16, 6, -7, 1707 + square_note 104, 6, 5, 1704 + sound_ret Sfx_TrainArrived_Ch8: - noise __, 6, $af, $10 - noise __, 5, $9f, $20 - noise __, 5, $8f, $21 - noise __, 5, $7f, $22 - noise __, 5, $8f, $21 - noise __, 5, $9f, $20 - noise __, 5, $9f, $10 - noise F_, 9, $a3, $0 - endchannel + noise_note 5, 10, -7, 16 + noise_note 4, 9, -7, 32 + noise_note 4, 8, -7, 33 + noise_note 4, 7, -7, 34 + noise_note 4, 8, -7, 33 + noise_note 4, 9, -7, 32 + noise_note 4, 9, -7, 16 + noise_note 104, 10, 3, 0 + sound_ret Sfx_2Boops: - musicheader 1, 5, Sfx_2Boops_Ch5 + channel_count 1 + channel 5, Sfx_2Boops_Ch5 Sfx_2Boops_Ch5: - dutycycle $2 -.loop - soundinput $79 - sound __, 2, $99, $0563 - sound __, 5, $f2, $04b5 - soundinput $43 - sound C_, 1, $f8, $05cd - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 2 +.loop1: + pitch_sweep 7, -1 + square_note 1, 9, -1, 1379 + square_note 4, 15, 2, 1205 + pitch_sweep 4, 3 + square_note 16, 15, 8, 1485 + sound_loop 2, .loop1 + pitch_sweep 0, 8 + sound_ret Sfx_IntroWhoosh: - musicheader 1, 8, Sfx_IntroWhoosh_Ch8 + channel_count 1 + channel 8, Sfx_IntroWhoosh_Ch8 Sfx_Menu_Ch8: - noise __, 2, $e2, $33 - noise __, 9, $e1, $22 - endchannel + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret Sfx_Pokeflute_Ch7: tempo 256 - volume $77 - togglesfx - vibrato $10, $14 - notetype $c, $10 + volume 7, 7 + toggle_sfx + vibrato 16, 1, 4 + note_type 12, 1, 0 octave 5 note E_, 2 note F_, 2 @@ -3563,948 +3748,948 @@ Sfx_Pokeflute_Ch7: note A_, 2 note F_, 2 note G_, 8 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_PlacePuzzlePieceDown_Ch8: - noise __, 3, $f7, $24 - noise __, 3, $f7, $34 - noise __, 5, $f7, $44 - noise __, 9, $f4, $55 - noise __, 9, $f1, $44 - endchannel + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret Sfx_EnterDoor_Ch8: - noise __, 10, $f1, $44 - noise __, 9, $d1, $43 - endchannel + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret Sfx_SwitchPokemon_Ch5: - dutycycle $2 - sound __, 9, $e1, $0740 - endchannel + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret Sfx_SwitchPokemon_Ch6: - dutycycle $2 - sound __, 3, $8, 0 - sound __, 9, $b1, $0741 - endchannel + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret Sfx_PokeballsPlacedOnTable_Ch5: - dutycycle $2 - soundinput $3a - sound __, 5, $f2, $0200 - soundinput $22 - sound __, 9, $e2, $0200 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret Sfx_BallWobble_Ch5: - dutycycle $2 - soundinput $3a - sound __, 5, $f2, $0400 - soundinput $22 - sound __, 9, $e2, $0400 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1024 + pitch_sweep 2, 2 + square_note 8, 14, 2, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_Tally_Ch5: - dutycycle $2 - sound __, 5, $f1, $0780 - endchannel + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret Sfx_Tally_Ch6: - dutycycle $2 - sound __, 2, $8, 0 - sound __, 5, $a1, $0761 - endchannel + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret Sfx_Transaction_Ch5: - dutycycle $2 - sound __, 5, $e1, $0700 - sound C_, 9, $f2, $07e0 - endchannel + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 24, 15, 2, 2016 + sound_ret Sfx_Transaction_Ch6: - dutycycle $2 - sound __, 2, $8, 0 - sound __, 5, $91, $06c1 - sound C_, 9, $a2, $07a1 - endchannel + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 24, 10, 2, 1953 + sound_ret Sfx_Bump_Ch5: - dutycycle $2 - soundinput $5a - sound __, 16, $f1, $0300 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 8 + sound_ret Sfx_ExitBuilding_Ch8: - noise __, 3, $f1, $54 - noise __, 13, $71, $23 - noise __, 3, $b1, $54 - noise __, 13, $61, $23 - noise __, 7, $41, $54 - endchannel + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret -Sfx_ReadText2_Ch5: Sfx_ReadText_Ch5: - dutycycle $2 - sound __, 1, $91, $07c0 - sound __, 1, $81, $07d0 - sound __, 1, $91, $07c0 - sound __, 13, $a1, $07d0 - endchannel +Sfx_ReadText2_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret Sfx_Potion_Ch5: - dutycycle $2 - soundinput $17 - sound __, 16, $f0, $04f0 - sound __, 16, $f2, $0650 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_Poison_Ch5: - dutycycle $0 - soundinput $14 - sound __, 5, $f2, $0600 - loopchannel 4, Sfx_Poison_Ch5 - sound __, 16, $f3, $0600 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, Sfx_Poison_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 8 + sound_ret Sfx_FullHeal_Ch5: - dutycycle $2 - soundinput $14 - sound __, 5, $f2, $0600 - sound __, 5, $f2, $0600 - soundinput $17 - sound __, 16, $f2, $0600 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret Sfx_GotSafariBalls_Ch5: - dutycycle $2 - soundinput $15 - sound __, 16, $f0, $04f0 - sound __, 16, $f2, $0650 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_BootPc_Ch5: - dutycycle $2 - sound __, 16, $f2, $07c0 - sound __, 16, $0, 0 - sound __, 4, $a1, $0780 - sound __, 4, $a1, $0700 - sound __, 4, $a1, $0740 - sound __, 4, $a1, $0700 - sound __, 4, $a1, $0780 - sound __, 4, $a1, $0700 - sound __, 4, $a1, $07c0 - sound __, 9, $a1, $0700 - endchannel + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1856 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1984 + square_note 8, 10, 1, 1792 + sound_ret Sfx_ShutDownPc_Ch5: - dutycycle $2 - sound __, 5, $f0, $0600 - sound __, 5, $f0, $0400 - sound __, 5, $f0, $0200 - sound __, 2, $0, 0 - endchannel + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret Sfx_ChoosePcOption_Ch5: - dutycycle $2 - sound __, 7, $f0, $0700 - sound __, 5, $0, 0 - sound __, 7, $f0, $0700 - sound __, 2, $0, 0 - endchannel + duty_cycle 2 + square_note 6, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 6, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret Sfx_EscapeRope_Ch5: - dutycycle $1 - soundinput $17 - sound __, 16, $d7, $0600 - sound __, 16, $b7, $0580 - sound __, 16, $87, $0500 - sound __, 16, $47, $0480 - sound __, 16, $17, $0400 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_PushButton_Ch5: - dutycycle $2 - sound __, 5, $0, 0 - sound __, 3, $f1, $0680 - sound __, 2, $0, 0 - sound __, 5, $f1, $0780 - sound __, 5, $0, 0 - endchannel + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret Sfx_SecondPartOfItemfinder_Ch5: - dutycycle $2 - soundinput $2c - sound __, 5, $f2, $0500 - soundinput $22 - sound __, 3, $f1, $0500 - soundinput $8 - sound __, 2, $0, 0 - endchannel + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 8 + square_note 1, 0, 0, 0 + sound_ret Sfx_WarpTo_Ch5: - dutycycle $1 - soundinput $17 - sound __, 16, $d7, $0500 - sound __, 16, $b7, $0580 - sound __, 16, $87, $0600 - sound __, 16, $47, $0680 - sound __, 16, $17, $0700 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_WarpFrom_Ch5: - dutycycle $1 - soundinput $17 - sound __, 16, $d7, $0700 - sound __, 16, $b7, $0680 - sound __, 16, $87, $0600 - sound __, 16, $47, $0580 - sound __, 16, $17, $0500 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 8 + sound_ret Sfx_ChangeDexMode_Ch5: - dutycycle $1 - soundinput $16 - sound __, 16, $d2, $0500 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 8 + sound_ret Sfx_JumpOverLedge_Ch5: - dutycycle $2 - soundinput $95 - sound __, 16, $f2, $0400 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_GrassRustle_Ch8: - noise __, 3, $f1, $32 - noise __, 3, $0, $0 - noise __, 3, $f1, $22 - noise __, 2, $0, $0 - endchannel + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret Sfx_Fly_Ch8: - noise __, 3, $f1, $12 - noise __, 3, $0, $0 - noise __, 3, $a1, $12 - noise __, 3, $0, $0 - noise __, 3, $d1, $12 - noise __, 3, $0, $0 - noise __, 3, $81, $12 - noise __, 3, $0, $0 - noise __, 3, $b1, $12 - noise __, 3, $0, $0 - noise __, 3, $61, $12 - noise __, 3, $0, $0 - noise __, 3, $91, $12 - noise __, 3, $0, $0 - noise __, 3, $41, $12 - noise __, 3, $0, $0 - endchannel + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret Sfx_Wrong_Ch5: - dutycycle $3 - soundinput $5a - sound __, 5, $f0, $0500 - soundinput $8 - sound __, 5, $0, 0 - sound __, 16, $f0, $0500 - sound __, 2, $0, 0 - endchannel + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret Sfx_Wrong_Ch6: - dutycycle $3 - sound __, 5, $f0, $0401 - sound __, 5, $0, 0 - sound __, 16, $f0, $0401 - sound __, 2, $0, 0 - endchannel + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret Sfx_Squeak_Ch5: - dutycycle $0 - soundinput $17 - sound __, 16, $d2, $0700 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_Strength_Ch8: - noise __, 5, $a2, $23 - noise __, 9, $f1, $34 - noise __, 16, $0, $0 - noise __, 3, $f7, $24 - noise __, 3, $f7, $34 - noise __, 5, $f7, $44 - noise __, 9, $f4, $55 - noise __, 9, $f1, $44 - endchannel + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret Sfx_Boat_Ch5: - dutycycle $2 - sound __, 16, $f0, $0500 - sound __, 5, $0, 0 - sound __, 16, $f0, $0500 - sound __, 16, $f0, $0500 - sound __, 16, $f0, $0500 - sound __, 16, $f0, $0500 - sound __, 16, $f2, $0500 - endchannel + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret Sfx_Boat_Ch6: - dutycycle $3 - sound __, 16, $f0, $0482 - sound __, 5, $0, 0 - sound __, 16, $f0, $0482 - sound __, 16, $f0, $0482 - sound __, 16, $f0, $0482 - sound __, 16, $f0, $0482 - sound __, 16, $f2, $0482 - endchannel + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret Sfx_WallOpen_Ch5: - dutycycle $1 - soundinput $3a - sound __, 5, $f2, $0500 - soundinput $22 - sound __, 5, $e2, $0500 - soundinput $3a - sound __, 5, $f2, $0700 - soundinput $22 - sound __, 16, $e2, $0700 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_ElevatorEnd_Ch5: - dutycycle $2 - sound __, 16, $f3, $0730 - sound __, 9, $65, $0730 - sound __, 16, $f4, $0700 - sound __, 16, $74, $0700 - sound __, 16, $44, $0700 - sound __, 16, $24, $0700 - endchannel + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret Sfx_ThrowBall_Ch5: - dutycycle $2 - soundinput $2f - sound __, 16, $f2, $0780 - endchannel + duty_cycle 2 + pitch_sweep 2, -7 + square_note 15, 15, 2, 1920 + sound_ret Sfx_ThrowBall_Ch6: - dutycycle $2 - sound __, 16, $c2, $0782 - endchannel + duty_cycle 2 + square_note 15, 12, 2, 1922 + sound_ret Sfx_Shine_Ch5: - dutycycle $0 - sound __, 1, $d2, $0700 - sound __, 1, $d2, $0740 - sound __, 1, $d2, $0780 - sound __, 1, $d2, $07c0 - sound __, 11, $e1, $07e0 - sound __, 2, $0, 0 - endchannel + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret Sfx_BallPoof_Ch5: - dutycycle $2 - soundinput $16 - sound __, 16, $f2, $0400 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 6 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_BallPoof_Ch8: - noise __, 16, $a2, $22 - endchannel + noise_note 15, 10, 2, 34 + sound_ret Sfx_Unknown3A_Ch5: - sound __, 16, $d1, $0200 - soundinput $8 - endchannel + square_note 15, 13, 1, 512 + pitch_sweep 0, 8 + sound_ret Sfx_Unknown3A_Ch8: - noise __, 5, $f5, $33 - noise __, 9, $f4, $22 - noise __, 16, $f2, $21 - endchannel + noise_note 4, 15, 5, 51 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret Sfx_Run_Ch8: - noise __, 3, $61, $23 - noise __, 3, $a1, $33 - noise __, 3, $c1, $33 - noise __, 3, $51, $11 - noise __, 3, $f1, $33 - noise __, 3, $41, $11 - noise __, 3, $c1, $33 - noise __, 3, $31, $11 - noise __, 3, $81, $33 - noise __, 3, $31, $11 - noise __, 9, $41, $33 - endchannel + noise_note 2, 6, 1, 35 + noise_note 2, 10, 1, 51 + noise_note 2, 12, 1, 51 + noise_note 2, 5, 1, 17 + noise_note 2, 15, 1, 51 + noise_note 2, 4, 1, 17 + noise_note 2, 12, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 2, 8, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 8, 4, 1, 51 + sound_ret Sfx_SlotMachineStart_Ch5: - dutycycle $2 - soundinput $44 - sound __, 16, $f0, $04f0 - soundinput $17 - sound __, 16, $f2, $0650 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 4, 4 + square_note 15, 15, 0, 1264 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_SlotMachineStart_Ch6: - dutycycle $2 - sound __, 16, $92, $0600 - sound __, 16, $92, $0782 - endchannel + duty_cycle 2 + square_note 15, 9, 2, 1536 + square_note 15, 9, 2, 1922 + sound_ret Sfx_Call_Ch5: - soundinput $67 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - soundinput $8 - sound __, 5, $0, 0 - endchannel + pitch_sweep 6, 7 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + sound_ret Sfx_Peck_Ch8: - noise __, 3, $a1, $12 - endchannel + noise_note 2, 10, 1, 18 + sound_ret Sfx_Kinesis_Ch5: - dutycycle $1 - soundinput $af - sound __, 16, $f2, $0780 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 10, -7 + square_note 15, 15, 2, 1920 + pitch_sweep 0, 8 + sound_ret Sfx_Lick_Ch5: - dutycycle $1 - soundinput $97 - sound __, 16, $f2, $0500 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1280 + pitch_sweep 0, 8 + sound_ret Sfx_Pound_Ch8: - noise __, 3, $a1, $22 - endchannel + noise_note 2, 10, 1, 34 + sound_ret Sfx_MovePuzzlePiece_Ch8: - noise __, 9, $f1, $54 - endchannel + noise_note 8, 15, 1, 84 + sound_ret Sfx_CometPunch_Ch8: - noise __, 16, $8f, $11 - noise __, 5, $ff, $12 - noise __, 11, $f1, $55 - endchannel + noise_note 15, 8, -7, 17 + noise_note 4, 15, -7, 18 + noise_note 10, 15, 1, 85 + sound_ret Sfx_MegaPunch_Ch8: - noise __, 16, $8f, $34 - noise __, 9, $f2, $35 - noise __, 11, $f1, $55 - endchannel + noise_note 15, 8, -7, 52 + noise_note 8, 15, 2, 53 + noise_note 10, 15, 1, 85 + sound_ret Sfx_Scratch_Ch8: - noise __, 16, $9f, $23 - noise __, 9, $f1, $21 - endchannel + noise_note 15, 9, -7, 35 + noise_note 8, 15, 1, 33 + sound_ret Sfx_Vicegrip_Ch8: - noise __, 3, $e1, $4b - noise __, 11, $f1, $44 - noise __, 3, $e1, $3a - noise __, 7, $f1, $34 - endchannel + noise_note 2, 14, 1, 75 + noise_note 10, 15, 1, 68 + noise_note 2, 14, 1, 58 + noise_note 6, 15, 1, 52 + sound_ret Sfx_RazorWind_Ch8: - noise __, 3, $f4, $44 - noise __, 3, $f4, $14 - noise __, 16, $f1, $32 - endchannel + noise_note 2, 15, 4, 68 + noise_note 2, 15, 4, 20 + noise_note 15, 15, 1, 50 + sound_ret Sfx_Cut_Ch8: - noise __, 5, $8f, $55 - noise __, 3, $f4, $44 - noise __, 9, $f4, $22 - noise __, 16, $f2, $21 - endchannel + noise_note 4, 8, -7, 85 + noise_note 2, 15, 4, 68 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret Sfx_WingAttack_Ch8: - noise __, 9, $4f, $23 - noise __, 5, $c4, $22 - noise __, 7, $f2, $23 - loopchannel 4, Sfx_WingAttack_Ch8 - endchannel + noise_note 8, 4, -7, 35 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + sound_loop 4, Sfx_WingAttack_Ch8 + sound_ret Sfx_Whirlwind_Ch8: - noise __, 9, $4f, $33 - noise __, 5, $c4, $22 - noise __, 7, $f2, $23 - noise __, 16, $f2, $22 - endchannel + noise_note 8, 4, -7, 51 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + noise_note 15, 15, 2, 34 + sound_ret Sfx_Bind_Ch8: - noise __, 9, $ff, $32 - noise __, 9, $f4, $43 - noise __, 9, $f2, $54 - noise __, 9, $f1, $65 - endchannel + noise_note 8, 15, -7, 50 + noise_note 8, 15, 4, 67 + noise_note 8, 15, 2, 84 + noise_note 8, 15, 1, 101 + sound_ret Sfx_VineWhip_Ch8: - noise __, 2, $c2, $33 - noise __, 3, $f2, $21 - noise __, 2, $e2, $33 - noise __, 2, $c2, $32 - noise __, 2, $92, $12 - noise __, 2, $b2, $31 - noise __, 13, $91, $10 - noise __, 9, $f2, $41 - endchannel + noise_note 1, 12, 2, 51 + noise_note 2, 15, 2, 33 + noise_note 1, 14, 2, 51 + noise_note 1, 12, 2, 50 + noise_note 1, 9, 2, 18 + noise_note 1, 11, 2, 49 + noise_note 12, 9, 1, 16 + noise_note 8, 15, 2, 65 + sound_ret Sfx_DoubleKick_Ch8: - noise __, 2, $94, $23 - noise __, 2, $b4, $22 - noise __, 9, $f1, $44 - endchannel + noise_note 1, 9, 4, 35 + noise_note 1, 11, 4, 34 + noise_note 8, 15, 1, 68 + sound_ret Sfx_MegaKick_Ch8: - noise __, 3, $94, $33 - noise __, 5, $b4, $22 - noise __, 5, $f1, $44 - noise __, 9, $f1, $55 - endchannel + noise_note 2, 9, 4, 51 + noise_note 4, 11, 4, 34 + noise_note 4, 15, 1, 68 + noise_note 8, 15, 1, 85 + sound_ret Sfx_Headbutt_Ch8: - noise __, 5, $ff, $55 - noise __, 9, $f1, $65 - endchannel + noise_note 4, 15, -7, 85 + noise_note 8, 15, 1, 101 + sound_ret Sfx_HornAttack_Ch8: - noise __, 3, $84, $43 - noise __, 3, $c4, $22 - noise __, 9, $f2, $34 - endchannel + noise_note 2, 8, 4, 67 + noise_note 2, 12, 4, 34 + noise_note 8, 15, 2, 52 + sound_ret Sfx_Tackle_Ch8: - noise __, 5, $f1, $34 - noise __, 16, $f2, $64 - endchannel + noise_note 4, 15, 1, 52 + noise_note 15, 15, 2, 100 + sound_ret Sfx_PoisonSting_Ch8: - noise __, 3, $f1, $22 - noise __, 16, $f2, $12 - endchannel + noise_note 2, 15, 1, 34 + noise_note 15, 15, 2, 18 + sound_ret Sfx_Powder_Ch8: - noise __, 3, $c2, $1 - noise __, 16, $f4, $1 - noise __, 16, $f2, $1 - endchannel + noise_note 2, 12, 2, 1 + noise_note 15, 15, 4, 1 + noise_note 15, 15, 2, 1 + sound_ret Sfx_Doubleslap_Ch8: - noise __, 9, $f1, $32 - noise __, 9, $f1, $33 - endchannel + noise_note 8, 15, 1, 50 + noise_note 8, 15, 1, 51 + sound_ret Sfx_Bite_Ch5: - dutycycle $0 - soundinput $3a - sound __, 5, $f2, $0200 - soundinput $22 - sound __, 9, $e2, $0200 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret Sfx_Bite_Ch8: - noise __, 1, $d1, $42 - noise __, 5, $a1, $32 - noise __, 1, $d1, $22 - noise __, 7, $a1, $32 - endchannel + noise_note 0, 13, 1, 66 + noise_note 4, 10, 1, 50 + noise_note 0, 13, 1, 34 + noise_note 6, 10, 1, 50 + sound_ret Sfx_JumpKick_Ch8: - noise __, 4, $92, $31 - noise __, 4, $b2, $32 - noise __, 4, $c2, $33 - noise __, 9, $f1, $54 - endchannel + noise_note 3, 9, 2, 49 + noise_note 3, 11, 2, 50 + noise_note 3, 12, 2, 51 + noise_note 8, 15, 1, 84 + sound_ret Sfx_Stomp_Ch8: - noise __, 13, $f1, $54 - noise __, 9, $f1, $64 - endchannel + noise_note 12, 15, 1, 84 + noise_note 8, 15, 1, 100 + sound_ret Sfx_TailWhip_Ch8: - noise __, 3, $f1, $33 - noise __, 3, $c1, $32 - noise __, 3, $a1, $31 - noise __, 16, $82, $32 - noise __, 9, $f1, $34 - endchannel + noise_note 2, 15, 1, 51 + noise_note 2, 12, 1, 50 + noise_note 2, 10, 1, 49 + noise_note 15, 8, 2, 50 + noise_note 8, 15, 1, 52 + sound_ret Sfx_KarateChop_Ch8: - noise __, 3, $d2, $32 - noise __, 16, $f2, $43 - endchannel + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret Sfx_Submission_Ch8: - noise __, 3, $f2, $43 - noise __, 5, $b5, $32 - noise __, 10, $86, $31 - noise __, 8, $64, $0 - noise __, 16, $f2, $55 - endchannel + noise_note 2, 15, 2, 67 + noise_note 4, 11, 5, 50 + noise_note 9, 8, 6, 49 + noise_note 7, 6, 4, 0 + noise_note 15, 15, 2, 85 + sound_ret Sfx_WaterGun_Ch5: - dutycycle $1 - soundinput $97 - sound __, 16, $f2, $0700 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_WaterGun_Ch8: - noise __, 16, $3f, $22 - noise __, 16, $f2, $21 - endchannel + noise_note 15, 3, -7, 34 + noise_note 15, 15, 2, 33 + sound_ret Sfx_SwordsDance_Ch8: - noise __, 16, $4f, $41 - noise __, 9, $8f, $41 - noise __, 9, $cf, $41 - noise __, 9, $f2, $42 - noise __, 16, $f2, $41 - endchannel + noise_note 15, 4, -7, 65 + noise_note 8, 8, -7, 65 + noise_note 8, 12, -7, 65 + noise_note 8, 15, 2, 66 + noise_note 15, 15, 2, 65 + sound_ret Sfx_Thunder_Ch8: - noise __, 11, $ff, $50 - noise __, 16, $ff, $51 - noise __, 9, $f2, $51 - noise __, 7, $ff, $52 - noise __, 7, $ff, $53 - noise __, 9, $ff, $54 - noise __, 16, $f2, $54 - endchannel + noise_note 10, 15, -7, 80 + noise_note 15, 15, -7, 81 + noise_note 8, 15, 2, 81 + noise_note 6, 15, -7, 82 + noise_note 6, 15, -7, 83 + noise_note 8, 15, -7, 84 + noise_note 15, 15, 2, 84 + sound_ret Sfx_Supersonic_Ch5: - dutycycle $2 - sound __, 16, $3f, $07c0 -.loop - sound __, 16, $df, $07c0 - loopchannel 4, .loop - sound __, 16, $d1, $07c0 - endchannel + duty_cycle 2 + square_note 15, 3, -7, 1984 +.loop: + square_note 15, 13, -7, 1984 + sound_loop 4, .loop + square_note 15, 13, 1, 1984 + sound_ret Sfx_Supersonic_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 16, $2f, $07c8 -.loop - sound __, 16, $cf, $07c7 - loopchannel 4, .loop - sound __, 16, $c1, $07c8 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 15, 2, -7, 1992 +.loop: + square_note 15, 12, -7, 1991 + sound_loop 4, .loop + square_note 15, 12, 1, 1992 + sound_ret Sfx_Supersonic_Ch8: - noise __, 4, $97, $12 - noise __, 4, $a1, $11 - loopchannel 10, Sfx_Supersonic_Ch8 - endchannel + noise_note 3, 9, 7, 18 + noise_note 3, 10, 1, 17 + sound_loop 10, Sfx_Supersonic_Ch8 + sound_ret Sfx_Leer_Ch5: - dutycycle $0 - sound __, 1, $f1, $07c0 - sound __, 1, $f1, $0700 - loopchannel 12, Sfx_Leer_Ch5 - endchannel + duty_cycle 0 + square_note 0, 15, 1, 1984 + square_note 0, 15, 1, 1792 + sound_loop 12, Sfx_Leer_Ch5 + sound_ret Sfx_Leer_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 1, $e1, $07c1 - sound __, 1, $e1, $0701 - loopchannel 12, Sfx_Leer_Ch6 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 0, 14, 1, 1985 + square_note 0, 14, 1, 1793 + sound_loop 12, Sfx_Leer_Ch6 + sound_ret Sfx_Leer_Ch8: - noise __, 2, $d1, $49 - noise __, 2, $d1, $29 - loopchannel 6, Sfx_Leer_Ch8 - endchannel + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 6, Sfx_Leer_Ch8 + sound_ret Sfx_Ember_Ch5: - sound_duty 1, 2, 0, 3 - sound __, 12, $f3, $0120 - sound __, 10, $d3, $0150 - loopchannel 5, Sfx_Ember_Ch5 - sound __, 9, $e3, $0130 - sound __, 16, $c2, $0110 - endchannel + duty_cycle_pattern 3, 0, 2, 1 + square_note 11, 15, 3, 288 + square_note 9, 13, 3, 336 + sound_loop 5, Sfx_Ember_Ch5 + square_note 8, 14, 3, 304 + square_note 15, 12, 2, 272 + sound_ret Sfx_Ember_Ch8: - noise __, 11, $f3, $35 - noise __, 15, $f6, $45 - loopchannel 4, Sfx_Ember_Ch8 - noise __, 13, $f4, $bc - noise __, 13, $f5, $9c - noise __, 16, $f4, $ac - endchannel + noise_note 10, 15, 3, 53 + noise_note 14, 15, 6, 69 + sound_loop 4, Sfx_Ember_Ch8 + noise_note 12, 15, 4, 188 + noise_note 12, 15, 5, 156 + noise_note 15, 15, 4, 172 + sound_ret Sfx_Bubblebeam_Ch5: - sound_duty 1, 2, 3, 0 - sound __, 5, $f4, $0600 - sound __, 4, $c4, $0500 - sound __, 6, $b5, $0600 - sound __, 14, $e2, $06c0 - loopchannel 3, Sfx_Bubblebeam_Ch5 - sound __, 9, $d1, $0600 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + square_note 4, 15, 4, 1536 + square_note 3, 12, 4, 1280 + square_note 5, 11, 5, 1536 + square_note 13, 14, 2, 1728 + sound_loop 3, Sfx_Bubblebeam_Ch5 + square_note 8, 13, 1, 1536 + sound_ret Sfx_Bubblebeam_Ch6: - sound_duty 1, 3, 0, 2 - sound __, 6, $e4, $05e0 - sound __, 5, $b4, $04e0 - sound __, 7, $a5, $05e8 - sound __, 15, $d1, $06a0 - loopchannel 3, Sfx_Bubblebeam_Ch6 - endchannel + duty_cycle_pattern 2, 0, 3, 1 + square_note 5, 14, 4, 1504 + square_note 4, 11, 4, 1248 + square_note 6, 10, 5, 1512 + square_note 14, 13, 1, 1696 + sound_loop 3, Sfx_Bubblebeam_Ch6 + sound_ret Sfx_Bubblebeam_Ch8: - noise __, 6, $c3, $33 - noise __, 4, $92, $43 - noise __, 11, $b5, $33 - noise __, 16, $c3, $32 - loopchannel 2, Sfx_Bubblebeam_Ch8 - endchannel + noise_note 5, 12, 3, 51 + noise_note 3, 9, 2, 67 + noise_note 10, 11, 5, 51 + noise_note 15, 12, 3, 50 + sound_loop 2, Sfx_Bubblebeam_Ch8 + sound_ret Sfx_HydroPump_Ch5: - sound_duty 2, 0, 1, 3 - sound __, 4, $81, $0300 - sound __, 4, $c1, $0400 - sound __, 4, $f1, $0500 - sound __, 4, $b1, $0400 - sound __, 4, $71, $0300 - loopchannel 5, Sfx_HydroPump_Ch5 - sound __, 9, $81, $0400 - endchannel + duty_cycle_pattern 3, 1, 0, 2 + square_note 3, 8, 1, 768 + square_note 3, 12, 1, 1024 + square_note 3, 15, 1, 1280 + square_note 3, 11, 1, 1024 + square_note 3, 7, 1, 768 + sound_loop 5, Sfx_HydroPump_Ch5 + square_note 8, 8, 1, 1024 + sound_ret Sfx_HydroPump_Ch8: - noise __, 4, $62, $22 - noise __, 4, $a2, $32 - noise __, 4, $d2, $33 - noise __, 4, $92, $23 - noise __, 4, $52, $12 - loopchannel 5, Sfx_HydroPump_Ch8 - noise __, 9, $81, $12 - endchannel + noise_note 3, 6, 2, 34 + noise_note 3, 10, 2, 50 + noise_note 3, 13, 2, 51 + noise_note 3, 9, 2, 35 + noise_note 3, 5, 2, 18 + sound_loop 5, Sfx_HydroPump_Ch8 + noise_note 8, 8, 1, 18 + sound_ret Sfx_Surf_Ch5: - sound_duty 1, 2, 3, 0 - sound __, 16, $f4, $0500 - sound __, 16, $c4, $0400 - sound __, 16, $e2, $05c0 - loopchannel 3, Sfx_Surf_Ch5 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + square_note 15, 15, 4, 1280 + square_note 15, 12, 4, 1024 + square_note 15, 14, 2, 1472 + sound_loop 3, Sfx_Surf_Ch5 + sound_ret Sfx_Surf_Ch6: - sound_duty 1, 3, 0, 2 - sound __, 8, $e4, $0430 - sound __, 16, $b4, $0330 - sound __, 16, $a2, $0438 - loopchannel 4, Sfx_Surf_Ch6 - endchannel + duty_cycle_pattern 2, 0, 3, 1 + square_note 7, 14, 4, 1072 + square_note 15, 11, 4, 816 + square_note 15, 10, 2, 1080 + sound_loop 4, Sfx_Surf_Ch6 + sound_ret Sfx_Surf_Ch8: - noise __, 10, $f4, $44 - noise __, 10, $f2, $43 - noise __, 16, $f4, $42 - noise __, 16, $f4, $41 - loopchannel 3, Sfx_Surf_Ch8 - endchannel + noise_note 9, 15, 4, 68 + noise_note 9, 15, 2, 67 + noise_note 15, 15, 4, 66 + noise_note 15, 15, 4, 65 + sound_loop 3, Sfx_Surf_Ch8 + sound_ret Sfx_Psybeam_Ch5: - sound_duty 1, 0, 2, 2 - sound __, 11, $f1, $0640 - sound __, 11, $f3, $0680 - sound __, 11, $f2, $0620 - loopchannel 4, Sfx_Psybeam_Ch5 - sound __, 11, $f1, $0640 - endchannel + duty_cycle_pattern 2, 2, 0, 1 + square_note 10, 15, 1, 1600 + square_note 10, 15, 3, 1664 + square_note 10, 15, 2, 1568 + sound_loop 4, Sfx_Psybeam_Ch5 + square_note 10, 15, 1, 1600 + sound_ret Sfx_Psybeam_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 11, $f3, $0571 - sound __, 8, $e3, $0531 - sound __, 11, $f1, $0551 - loopchannel 4, Sfx_Psybeam_Ch6 - sound __, 11, $f1, $0571 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 10, 15, 3, 1393 + square_note 7, 14, 3, 1329 + square_note 10, 15, 1, 1361 + sound_loop 4, Sfx_Psybeam_Ch6 + square_note 10, 15, 1, 1393 + sound_ret Sfx_Psybeam_Ch8: - noise __, 3, $d1, $4a - noise __, 3, $d2, $2a - loopchannel 21, Sfx_Psybeam_Ch8 - endchannel + noise_note 2, 13, 1, 74 + noise_note 2, 13, 2, 42 + sound_loop 21, Sfx_Psybeam_Ch8 + sound_ret Sfx_Charge_Ch5: - dutycycle $0 - sound __, 3, $f1, $0200 - sound __, 4, $f1, $0700 - sound __, 5, $f1, $0500 - sound __, 6, $f1, $07f0 - loopchannel 8, Sfx_Charge_Ch5 - endchannel + duty_cycle 0 + square_note 2, 15, 1, 512 + square_note 3, 15, 1, 1792 + square_note 4, 15, 1, 1280 + square_note 5, 15, 1, 2032 + sound_loop 8, Sfx_Charge_Ch5 + sound_ret Sfx_Charge_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 3, $e1, $0302 - sound __, 4, $e1, $07f2 - sound __, 5, $e1, $0602 - sound __, 6, $e1, $0702 - loopchannel 8, Sfx_Charge_Ch6 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 14, 1, 770 + square_note 3, 14, 1, 2034 + square_note 4, 14, 1, 1538 + square_note 5, 14, 1, 1794 + sound_loop 8, Sfx_Charge_Ch6 + sound_ret Sfx_Charge_Ch8: - noise __, 3, $d3, $10 - noise __, 4, $d3, $11 - noise __, 3, $d2, $10 - noise __, 6, $d2, $12 - loopchannel 9, Sfx_Charge_Ch8 - endchannel + noise_note 2, 13, 3, 16 + noise_note 3, 13, 3, 17 + noise_note 2, 13, 2, 16 + noise_note 5, 13, 2, 18 + sound_loop 9, Sfx_Charge_Ch8 + sound_ret Sfx_Thundershock_Ch5: - sound_duty 3, 2, 2, 0 - sound __, 4, $f1, $07f0 - sound __, 5, $f2, $0200 - loopchannel 8, Sfx_Thundershock_Ch5 - endchannel + duty_cycle_pattern 0, 2, 2, 3 + square_note 3, 15, 1, 2032 + square_note 4, 15, 2, 512 + sound_loop 8, Sfx_Thundershock_Ch5 + sound_ret Sfx_Thundershock_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 5, $e2, $0202 - sound __, 5, $e1, $07e2 - loopchannel 9, Sfx_Thundershock_Ch6 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 4, 14, 2, 514 + square_note 4, 14, 1, 2018 + sound_loop 9, Sfx_Thundershock_Ch6 + sound_ret Sfx_Thundershock_Ch8: - noise __, 5, $ff, $43 - noise __, 5, $f2, $44 - loopchannel 9, Sfx_Thundershock_Ch8 - endchannel + noise_note 4, 15, -7, 67 + noise_note 4, 15, 2, 68 + sound_loop 9, Sfx_Thundershock_Ch8 + sound_ret Sfx_Psychic_Ch5: - dutycycle $2 - soundinput $f7 - sound __, 9, $c4, $07bd - sound __, 9, $c4, $07be - sound __, 9, $c4, $07bf - sound __, 9, $c4, $07c0 - sound __, 16, $c4, $07c1 - sound __, 16, $f2, $07c0 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 15, 7 + square_note 8, 12, 4, 1981 + square_note 8, 12, 4, 1982 + square_note 8, 12, 4, 1983 + square_note 8, 12, 4, 1984 + square_note 15, 12, 4, 1985 + square_note 15, 15, 2, 1984 + pitch_sweep 0, 8 + sound_ret Sfx_Psychic_Ch6: - dutycycle $2 - sound __, 9, $c4, $0770 - sound __, 9, $c4, $0761 - sound __, 9, $c4, $0762 - sound __, 9, $c4, $0763 - sound __, 16, $c4, $0764 - sound __, 16, $f2, $0764 - endchannel + duty_cycle 2 + square_note 8, 12, 4, 1904 + square_note 8, 12, 4, 1889 + square_note 8, 12, 4, 1890 + square_note 8, 12, 4, 1891 + square_note 15, 12, 4, 1892 + square_note 15, 15, 2, 1892 + sound_ret Sfx_Psychic_Ch8: - noise __, 16, $3f, $14 - noise __, 16, $cf, $13 - noise __, 16, $cf, $12 - noise __, 16, $cf, $11 - noise __, 16, $cf, $10 - noise __, 16, $c2, $10 - endchannel + noise_note 15, 3, -7, 20 + noise_note 15, 12, -7, 19 + noise_note 15, 12, -7, 18 + noise_note 15, 12, -7, 17 + noise_note 15, 12, -7, 16 + noise_note 15, 12, 2, 16 + sound_ret Sfx_Screech_Ch5: - dutycycle $2 - sound __, 16, $ff, $07e0 - sound __, 16, $ff, $07e0 - sound __, 16, $ff, $07e0 - sound __, 16, $ff, $07e0 - sound __, 16, $f2, $07e0 - endchannel + duty_cycle 2 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, 2, 2016 + sound_ret Sfx_Screech_Ch6: - dutycycle $3 - sound __, 16, $ff, $07e2 - sound __, 16, $ff, $07e1 - sound __, 16, $ff, $07e2 - sound __, 16, $ff, $07e1 - sound __, 16, $f2, $07e2 - endchannel + duty_cycle 3 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, 2, 2018 + sound_ret Sfx_BoneClub_Ch5: - dutycycle $2 - soundinput $af - sound __, 9, $f1, $0700 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 10, -7 + square_note 8, 15, 1, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_BoneClub_Ch6: - dutycycle $3 - sound __, 9, $f1, $0701 - endchannel + duty_cycle 3 + square_note 8, 15, 1, 1793 + sound_ret Sfx_Sharpen_Ch5: - dutycycle $2 - sound __, 7, $f1, $0500 - sound __, 7, $f1, $0580 - sound __, 7, $f1, $0600 - sound __, 7, $f1, $0680 - sound __, 9, $f1, $0700 - endchannel + duty_cycle 2 + square_note 6, 15, 1, 1280 + square_note 6, 15, 1, 1408 + square_note 6, 15, 1, 1536 + square_note 6, 15, 1, 1664 + square_note 8, 15, 1, 1792 + sound_ret Sfx_Sharpen_Ch6: - dutycycle $3 - sound __, 7, $e1, $0510 - sound __, 7, $e1, $0590 - sound __, 7, $e1, $0610 - sound __, 7, $e1, $0690 - sound __, 9, $e1, $0710 - endchannel + duty_cycle 3 + square_note 6, 14, 1, 1296 + square_note 6, 14, 1, 1424 + square_note 6, 14, 1, 1552 + square_note 6, 14, 1, 1680 + square_note 8, 14, 1, 1808 + sound_ret Sfx_EggBomb_Ch5: - sound_duty 1, 3, 2, 3 - sound __, 9, $ff, $03f8 - sound __, 16, $ff, $0400 - sound __, 16, $f3, $0400 - endchannel + duty_cycle_pattern 3, 2, 3, 1 + square_note 8, 15, -7, 1016 + square_note 15, 15, -7, 1024 + square_note 15, 15, 3, 1024 + sound_ret Sfx_EggBomb_Ch6: - sound_duty 0, 1, 3, 2 - sound __, 9, $ef, $03c0 - sound __, 16, $ef, $03c0 - sound __, 16, $e3, $03c0 - endchannel + duty_cycle_pattern 2, 3, 1, 0 + square_note 8, 14, -7, 960 + square_note 15, 14, -7, 960 + square_note 15, 14, 3, 960 + sound_ret Sfx_EggBomb_Ch8: - noise __, 5, $ff, $51 - noise __, 9, $ff, $54 - noise __, 16, $ff, $55 - noise __, 16, $f3, $56 - endchannel + noise_note 4, 15, -7, 81 + noise_note 8, 15, -7, 84 + noise_note 15, 15, -7, 85 + noise_note 15, 15, 3, 86 + sound_ret Sfx_Sing_Ch5: - togglesfx - vibrato $a, $24 - dutycycle $2 - notetype $a, $87 + toggle_sfx + vibrato 10, 2, 4 + duty_cycle 2 + note_type 10, 8, 7 octave 5 note G_, 8 octave 6 @@ -4512,186 +4697,187 @@ Sfx_Sing_Ch5: note D#, 4 octave 5 note G_, 8 - endchannel + sound_ret Sfx_Sing_Ch6: - togglesfx - vibrato $a, $23 - dutycycle $2 - notetype $b, $67 + toggle_sfx + vibrato 10, 2, 3 + duty_cycle 2 + note_type 11, 6, 7 octave 5 note G_, 8 - notetype $a, $67 + note_type 10, 6, 7 octave 6 note F_, 4 note D#, 4 octave 5 note G_, 8 - endchannel + sound_ret Sfx_HyperBeam_Ch5: - dutycycle $0 - sound __, 3, $f1, $0780 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $0790 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07a0 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07b0 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07c0 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07d0 -.loop - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07e0 - loopchannel 12, .loop - sound __, 16, $f1, $0700 - endchannel + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 +.loop: + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, .loop + square_note 15, 15, 1, 1792 + sound_ret Sfx_HyperBeam_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 3, $f1, $0781 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $0791 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07a1 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07b1 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07c1 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07d1 -.loop - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07e1 - loopchannel 12, .loop - sound __, 16, $f1, $0701 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2001 +.loop: + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2017 + sound_loop 12, .loop + square_note 15, 15, 1, 1793 + sound_ret Sfx_HyperBeam_Ch8: - noise __, 2, $d1, $49 - noise __, 2, $d1, $29 - loopchannel 26, Sfx_HyperBeam_Ch8 - endchannel + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, Sfx_HyperBeam_Ch8 + sound_ret Sfx_Unknown60_Ch8: - noise __, 7, $20, $10 - noise __, 7, $2f, $40 - noise __, 7, $4f, $41 - noise __, 7, $8f, $41 - noise __, 7, $cf, $42 - noise __, 9, $d7, $42 - noise __, 16, $e7, $43 - noise __, 16, $f2, $43 - endchannel + noise_note 6, 2, 0, 16 + noise_note 6, 2, -7, 64 + noise_note 6, 4, -7, 65 + noise_note 6, 8, -7, 65 + noise_note 6, 12, -7, 66 + noise_note 8, 13, 7, 66 + noise_note 15, 14, 7, 67 + noise_note 15, 15, 2, 67 + sound_ret Sfx_IntroWhoosh_Ch8: - noise __, 2, $10, $10 - noise __, 3, $20, $10 - noise __, 3, $30, $20 - noise __, 3, $40, $20 - noise __, 3, $50, $21 - noise __, 3, $60, $22 - noise __, 5, $70, $22 - noise __, 9, $80, $22 - noise __, 16, $94, $22 - endchannel + noise_note 1, 1, 0, 16 + noise_note 2, 2, 0, 16 + noise_note 2, 3, 0, 32 + noise_note 2, 4, 0, 32 + noise_note 2, 5, 0, 33 + noise_note 2, 6, 0, 34 + noise_note 4, 7, 0, 34 + noise_note 8, 8, 0, 34 + noise_note 15, 9, 4, 34 + sound_ret Sfx_Unknown61_Ch8: - noise __, 5, $d1, $41 - endchannel + noise_note 4, 13, 1, 65 + sound_ret Sfx_SwitchPockets_Ch8: - noise __, 5, $c1, $42 - endchannel + noise_note 4, 12, 1, 66 + sound_ret Sfx_Unknown63_Ch8: - noise __, 3, $6f, $21 - noise __, 3, $af, $31 - noise __, 16, $f2, $41 - endchannel + noise_note 2, 6, -7, 33 + noise_note 2, 10, -7, 49 + noise_note 15, 15, 2, 65 + sound_ret Sfx_Burn_Ch8: - noise __, 3, $d2, $32 - noise __, 16, $f2, $43 - endchannel + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret Sfx_TitleScreenEntrance_Ch8: - noise __, 3, $70, $22 - noise __, 3, $80, $23 - noise __, 3, $90, $24 - noise __, 3, $a0, $25 - noise __, 3, $b0, $26 - noise __, 16, $c2, $26 - endchannel + noise_note 2, 7, 0, 34 + noise_note 2, 8, 0, 35 + noise_note 2, 9, 0, 36 + noise_note 2, 10, 0, 37 + noise_note 2, 11, 0, 38 + noise_note 15, 12, 2, 38 + sound_ret Sfx_Unknown66_Ch5: - dutycycle $2 - sound __, 2, $f2, $06a0 - sound __, 2, $f2, $06e0 - sound __, 9, $f1, $0700 - endchannel + duty_cycle 2 + square_note 1, 15, 2, 1696 + square_note 1, 15, 2, 1760 + square_note 8, 15, 1, 1792 + sound_ret Sfx_GetCoinFromSlots_Ch5: - dutycycle $2 - sound __, 3, $f1, $0700 - sound __, 9, $81, $07e0 - endchannel + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 8, 8, 1, 2016 + sound_ret Sfx_PayDay_Ch5: - dutycycle $3 - sound __, 6, $e1, $0700 - sound __, 3, $e1, $0780 - sound __, 16, $f1, $07c0 - endchannel + duty_cycle 3 + square_note 5, 14, 1, 1792 + square_note 2, 14, 1, 1920 + square_note 15, 15, 1, 1984 + sound_ret Sfx_PayDay_Ch6: - dutycycle $2 - sound __, 5, $c1, $06c1 - sound __, 3, $c1, $0741 - sound __, 16, $d1, $0781 - endchannel + duty_cycle 2 + square_note 4, 12, 1, 1729 + square_note 2, 12, 1, 1857 + square_note 15, 13, 1, 1921 + sound_ret Sfx_Metronome_Ch5: - dutycycle $2 - soundinput $5f - sound __, 5, $40, $07e0 - sound __, 5, $60, $07e0 - sound __, 5, $80, $07e0 - sound __, 9, $a0, $07e0 - sound __, 9, $a0, $07e0 - sound __, 9, $80, $07e0 - sound __, 9, $60, $07e0 - sound __, 9, $30, $07e0 - sound __, 16, $12, $07e0 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 5, -7 + square_note 4, 4, 0, 2016 + square_note 4, 6, 0, 2016 + square_note 4, 8, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 8, 0, 2016 + square_note 8, 6, 0, 2016 + square_note 8, 3, 0, 2016 + square_note 15, 1, 2, 2016 + pitch_sweep 0, 8 + sound_ret Sfx_Unknown5F_Ch5: - sound __, 3, $f7, $0601 - sound __, 3, $f7, $0701 - loopchannel 8, Sfx_Unknown5F_Ch5 - endchannel +.loop: + square_note 2, 15, 7, 1537 + square_note 2, 15, 7, 1793 + sound_loop 8, .loop + sound_ret Sfx_Unknown5F_Ch6: - sound __, 2, $f7, $ffff - sound __, 3, $f7, $0602 - sound __, 3, $f7, $0702 - loopchannel 8, Sfx_Unknown5F_Ch5 - endchannel + square_note 1, 15, 7, 65535 + square_note 2, 15, 7, 1538 + square_note 2, 15, 7, 1794 + sound_loop 8, Sfx_Unknown5F_Ch5.loop + sound_ret Sfx_Fanfare2_Ch5: - togglesfx - sfxpriorityon + toggle_sfx + sfx_priority_on tempo 256 - volume $77 - tone $0001 - dutycycle $3 - notetype $6, $b5 + volume 7, 7 + pitch_offset 1 + duty_cycle 3 + note_type 6, 11, 5 octave 3 note G#, 4 - notetype $4, $b2 + note_type 4, 11, 2 note F_, 2 note G#, 2 note A_, 2 @@ -4701,59 +4887,59 @@ Sfx_Fanfare2_Ch5: octave 4 note C_, 4 note C_, 2 - notetype $4, $b6 + note_type 4, 11, 6 note C#, 12 - sfxpriorityoff - endchannel + sfx_priority_off + sound_ret Sfx_Fanfare2_Ch6: - togglesfx - dutycycle $2 - notetype $6, $c5 + toggle_sfx + duty_cycle 2 + note_type 6, 12, 5 octave 4 note C#, 6 - notetype $4, $c1 + note_type 4, 12, 1 note C#, 1 note C#, 1 note C#, 1 - notetype $4, $c2 + note_type 4, 12, 2 note D#, 2 note C#, 2 note D#, 2 note E_, 4 note E_, 2 - notetype $4, $c6 + note_type 4, 12, 6 note F_, 12 - endchannel + sound_ret Sfx_Fanfare2_Ch8: - togglesfx - notetype $6 + toggle_sfx + drum_speed 6 note C_, 1 octave 5 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - notetype $4 + rest 2 + drum_speed 4 note C_, 1 note C#, 2 - note __, 2 + rest 2 note C#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 note G#, 6 - endchannel + sound_ret Sfx_Fanfare_Ch5: - togglesfx - sfxpriorityon + toggle_sfx + sfx_priority_on tempo 256 - volume $77 - dutycycle $3 - tone $0001 - notetype $6, $b3 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + note_type 6, 11, 3 octave 3 note F_, 4 note C#, 4 @@ -4763,7 +4949,7 @@ Sfx_Fanfare_Ch5: note F_, 4 note A#, 4 note F#, 4 - notetype $4, $b3 + note_type 4, 11, 3 note A#, 4 note B_, 4 octave 4 @@ -4771,18 +4957,18 @@ Sfx_Fanfare_Ch5: note C#, 4 note D#, 4 note C_, 4 - notetype $4, $b6 + note_type 4, 11, 6 note C#, 12 - sfxpriorityoff - endchannel + sfx_priority_off + sound_ret Sfx_Fanfare_Ch6: - togglesfx - dutycycle $2 - notetype $6, $c4 + toggle_sfx + duty_cycle 2 + note_type 6, 12, 4 octave 4 note C#, 4 - notetype $4, $c4 + note_type 4, 12, 4 note C#, 2 octave 3 note A#, 2 @@ -4808,25 +4994,25 @@ Sfx_Fanfare_Ch6: note F_, 4 note F#, 4 note G#, 4 - notetype $4, $c6 + note_type 4, 12, 6 note F#, 12 - endchannel + sound_ret Sfx_Fanfare_Ch8: - togglesfx - notetype $6 + toggle_sfx + drum_speed 6 note C_, 1 octave 4 note A#, 4 - note __, 4 + rest 4 note B_, 4 - note __, 4 + rest 4 octave 5 note C#, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 - notetype $4 + rest 4 + drum_speed 4 note C_, 1 note F_, 4 note D#, 4 @@ -4835,84 +5021,87 @@ Sfx_Fanfare_Ch8: note G#, 4 note F_, 4 note F#, 6 - endchannel + sound_ret Sfx_HangUp_Ch5: - dutycycle $2 - sound __, 5, $b8, $077b - sound __, 3, $21, $077b - sound C_, 1, $0, 0 + duty_cycle 2 + square_note 4, 11, 8, 1915 + square_note 2, 2, 1, 1915 + square_note 16, 0, 0, 0 Sfx_NoSignal_Ch5: - dutycycle $2 - sound C_, 5, $e8, $070b - sound C_, 13, $0, 0 - loopchannel 3, Sfx_NoSignal_Ch5 - endchannel + duty_cycle 2 + square_note 20, 14, 8, 1803 + square_note 28, 0, 0, 0 + sound_loop 3, Sfx_NoSignal_Ch5 + sound_ret -Sfx_Sandstorm_Ch8: Sfx_Unknown5F_Ch8: - noise __, 2, $f8, $41 - noise __, 3, $9c, $24 - noise __, 1, $0, $0 - noise __, 4, $59, $16 - noise __, 3, $0, $0 - loopchannel 3, Sfx_Sandstorm_Ch8 - endchannel +Sfx_Sandstorm_Ch8: + noise_note 1, 15, 8, 65 + noise_note 2, 9, -4, 36 + noise_note 0, 0, 0, 0 + noise_note 3, 5, -1, 22 + noise_note 2, 0, 0, 0 + sound_loop 3, Sfx_Sandstorm_Ch8 + sound_ret Sfx_Elevator_Ch5: - dutycycle $2 - soundinput $5a -.loop - sound __, 3, $f1, $0300 - loopchannel 48, .loop - soundinput $8 - dutycycle $2 - sound __, 16, $f3, $0730 - sound __, 9, $65, $0730 - sound __, 16, $f4, $0700 - sound __, 16, $74, $0700 - sound __, 16, $44, $0700 - sound __, 16, $24, $0700 - endchannel + duty_cycle 2 + pitch_sweep 5, -2 +.loop: + square_note 2, 15, 1, 768 + sound_loop 48, .loop + pitch_sweep 0, 8 + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret Sfx_Elevator_Ch6: Sfx_Elevator_Ch7: - sound F_, 1, $0, 0 - sound E_, 4, $0, 0 - endchannel + square_note 96, 0, 0, 0 + square_note 83, 0, 0, 0 + sound_ret Sfx_Elevator_Ch8: - noise F_, 1, $0, $0 - noise E_, 4, $0, $0 - endchannel + noise_note 96, 0, 0, 0 + noise_note 83, 0, 0, 0 + sound_ret Sfx_StopSlot: - musicheader 1, 5, Sfx_StopSlot_Ch5 + channel_count 1 + channel 5, Sfx_StopSlot_Ch5 Sfx_StopSlot_Ch5: - dutycycle $2 - sound __, 2, $f8, $0760 - sound __, 5, $82, $0760 - endchannel + duty_cycle 2 + square_note 1, 15, 8, 1888 + square_note 4, 8, 2, 1888 + sound_ret Sfx_GlassTing: - musicheader 1, 5, Sfx_GlassTing_Ch5 + channel_count 1 + channel 5, Sfx_GlassTing_Ch5 Sfx_GlassTing_Ch5: - dutycycle $2 - sound C#, 1, $d1, $07dc - endchannel + duty_cycle 2 + square_note 32, 13, 1, 2012 + sound_ret Sfx_GlassTing2: - musicheader 2, 5, Sfx_GlassTing2_Ch5 - musicheader 1, 6, Sfx_GlassTing2_Ch6 + channel_count 2 + channel 5, Sfx_GlassTing2_Ch5 + channel 6, Sfx_GlassTing2_Ch6 Sfx_GlassTing2_Ch5: - dutycycle $2 - sound C_, 1, $f1, $07dc - endchannel + duty_cycle 2 + square_note 16, 15, 1, 2012 + sound_ret Sfx_GlassTing2_Ch6: - dutycycle $2 - sound C_, 1, $d1, $07dd - endchannel + duty_cycle 2 + square_note 16, 13, 1, 2013 + sound_ret diff --git a/crysaudio/sfx_crystal.asm b/crysaudio/sfx_crystal.asm index 0c283123..1a5d1e2d 100644 --- a/crysaudio/sfx_crystal.asm +++ b/crysaudio/sfx_crystal.asm @@ -1,152 +1,164 @@ Sfx_IntroUnown1: - musicheader 1, 5, Sfx_IntroUnown1_Ch5 + channel_count 1 + channel 5, Sfx_IntroUnown1_Ch5 Sfx_IntroUnown1_Ch5: - vibrato $1, $a3 - dutycycle $2 - sound __, 9, $39, $0705 - sound C#, 1, $e2, $0705 - endchannel + vibrato 1, 10, 3 + duty_cycle 2 + square_note 8, 3, -1, 1797 + square_note 32, 14, 2, 1797 + sound_ret Sfx_IntroUnown2: - musicheader 1, 6, Sfx_IntroUnown2_Ch6 + channel_count 1 + channel 6, Sfx_IntroUnown2_Ch6 Sfx_IntroUnown2_Ch6: - vibrato $1, $73 - dutycycle $2 - sound __, 9, $39, $0758 - sound C#, 1, $e2, $0758 - endchannel + vibrato 1, 7, 3 + duty_cycle 2 + square_note 8, 3, -1, 1880 + square_note 32, 14, 2, 1880 + sound_ret Sfx_IntroUnown3: - musicheader 1, 7, Sfx_IntroUnown3_Ch7 + channel_count 1 + channel 7, Sfx_IntroUnown3_Ch7 Sfx_IntroUnown3_Ch7: - vibrato $1, $53 - sound __, 4, $32, $07c2 - sound __, 4, $22, $07c2 - sound __, 4, $12, $07c2 - sound C_, 1, $12, $07c2 - sound __, 7, $22, $07c2 - sound __, 7, $32, $07c2 - endchannel + vibrato 1, 5, 3 + square_note 3, 3, 2, 1986 + square_note 3, 2, 2, 1986 + square_note 3, 1, 2, 1986 + square_note 16, 1, 2, 1986 + square_note 6, 2, 2, 1986 + square_note 6, 3, 2, 1986 + sound_ret Sfx_DittoPopUp: - musicheader 1, 5, Sfx_DittoPopUp_Ch5 + channel_count 1 + channel 5, Sfx_DittoPopUp_Ch5 Sfx_DittoPopUp_Ch5: - dutycycle $2 - soundinput $1e - sound __, 4, $82, $0700 - sound __, 2, $31, $0701 - soundinput $16 - sound __, 5, $b1, $0640 - sound C_, 1, $31, $0641 - endchannel + duty_cycle 2 + pitch_sweep 1, -6 + square_note 3, 8, 2, 1792 + square_note 1, 3, 1, 1793 + pitch_sweep 1, 6 + square_note 4, 11, 1, 1600 + square_note 16, 3, 1, 1601 + sound_ret Sfx_DittoTransform: - musicheader 1, 5, Sfx_DittoTransform_Ch5 + channel_count 1 + channel 5, Sfx_DittoTransform_Ch5 Sfx_DittoTransform_Ch5: - dutycycle $1 - soundinput $26 - sound C_, 5, $3b, $0440 - sound __, 5, $97, $04c0 - sound __, 5, $67, $04c1 - sound __, 5, $42, $04c2 - endchannel + duty_cycle 1 + pitch_sweep 2, 6 + square_note 20, 3, -3, 1088 + square_note 4, 9, 7, 1216 + square_note 4, 6, 7, 1217 + square_note 4, 4, 2, 1218 + sound_ret Sfx_IntroSuicune1: - musicheader 1, 8, Sfx_IntroSuicune1_Ch8 + channel_count 1 + channel 8, Sfx_IntroSuicune1_Ch8 Sfx_IntroSuicune1_Ch8: - noise __, 2, $58, $59 - noise __, 3, $91, $23 - endchannel + noise_note 1, 5, 8, 89 + noise_note 2, 9, 1, 35 + sound_ret Sfx_IntroPichu: - musicheader 1, 5, Sfx_IntroPichu_Ch5 + channel_count 1 + channel 5, Sfx_IntroPichu_Ch5 Sfx_IntroPichu_Ch5: - dutycycle $3 - soundinput $4d - sound __, 2, $88, $0770 - sound __, 4, $0, 0 - soundinput $17 - sound __, 3, $88, $0776 - endchannel + duty_cycle 3 + pitch_sweep 4, -5 + square_note 1, 8, 8, 1904 + square_note 3, 0, 0, 0 + pitch_sweep 1, 7 + square_note 2, 8, 8, 1910 + sound_ret Sfx_IntroSuicune2: - musicheader 1, 8, Sfx_IntroSuicune2_Ch8 + channel_count 1 + channel 8, Sfx_IntroSuicune2_Ch8 Sfx_IntroSuicune2_Ch8: - noise __, 2, $a7, $31 - noise __, 2, $91, $0 - noise __, 2, $92, $21 - noise __, 2, $91, $0 - noise __, 2, $92, $22 - noise __, 2, $82, $11 - noise __, 2, $82, $22 - noise __, 2, $72, $11 - noise __, 2, $72, $12 - noise __, 2, $62, $10 - noise __, 2, $63, $0 - noise __, 2, $53, $10 - noise __, 2, $43, $0 - noise __, 2, $33, $10 - noise __, 2, $23, $0 - noise __, 2, $13, $10 - endchannel + noise_note 1, 10, 7, 49 + noise_note 1, 9, 1, 0 + noise_note 1, 9, 2, 33 + noise_note 1, 9, 1, 0 + noise_note 1, 9, 2, 34 + noise_note 1, 8, 2, 17 + noise_note 1, 8, 2, 34 + noise_note 1, 7, 2, 17 + noise_note 1, 7, 2, 18 + noise_note 1, 6, 2, 16 + noise_note 1, 6, 3, 0 + noise_note 1, 5, 3, 16 + noise_note 1, 4, 3, 0 + noise_note 1, 3, 3, 16 + noise_note 1, 2, 3, 0 + noise_note 1, 1, 3, 16 + sound_ret Sfx_IntroSuicune3: - musicheader 1, 8, Sfx_IntroSuicune3_Ch8 + channel_count 1 + channel 8, Sfx_IntroSuicune3_Ch8 Sfx_IntroSuicune3_Ch8: - noise __, 2, $88, $31 - noise __, 9, $39, $11 - noise __, 5, $a4, $10 - noise __, 5, $44, $10 - noise __, 5, $24, $10 - endchannel + noise_note 1, 8, 8, 49 + noise_note 8, 3, -1, 17 + noise_note 4, 10, 4, 16 + noise_note 4, 4, 4, 16 + noise_note 4, 2, 4, 16 + sound_ret Sfx_DittoBounce: - musicheader 1, 5, Sfx_DittoBounce_Ch5 + channel_count 1 + channel 5, Sfx_DittoBounce_Ch5 Sfx_DittoBounce_Ch5: - dutycycle $2 - soundinput $2c - sound __, 3, $82, $04b0 - sound __, 1, $31, $04b0 - soundinput $34 - sound C_, 1, $b1, $0420 - endchannel + duty_cycle 2 + pitch_sweep 2, -4 + square_note 2, 8, 2, 1200 + square_note 0, 3, 1, 1200 + pitch_sweep 3, 4 + square_note 16, 11, 1, 1056 + sound_ret Sfx_IntroSuicune4: - musicheader 1, 8, Sfx_IntroSuicune4_Ch8 + channel_count 1 + channel 8, Sfx_IntroSuicune4_Ch8 Sfx_IntroSuicune4_Ch8: - noise __, 2, $a1, $5c - noise __, 1, $0, $0 - noise __, 2, $c1, $4d - noise __, 1, $0, $0 - noise __, 5, $b2, $31 - noise __, 1, $0, $0 - noise __, 5, $a2, $2 - noise __, 1, $0, $0 - noise __, 5, $92, $1 - noise __, 1, $0, $0 - noise C#, 1, $72, $0 - endchannel + noise_note 1, 10, 1, 92 + noise_note 0, 0, 0, 0 + noise_note 1, 12, 1, 77 + noise_note 0, 0, 0, 0 + noise_note 4, 11, 2, 49 + noise_note 0, 0, 0, 0 + noise_note 4, 10, 2, 2 + noise_note 0, 0, 0, 0 + noise_note 4, 9, 2, 1 + noise_note 0, 0, 0, 0 + noise_note 32, 7, 2, 0 + sound_ret Sfx_GameFreakPresents: - musicheader 1, 5, Sfx_GameFreakPresents_Ch5 + channel_count 1 + channel 5, Sfx_GameFreakPresents_Ch5 Sfx_GameFreakPresents_Ch5: - togglesfx - dutycycle $2 - notetype $2, $b1 - soundinput $ff - pitchoffset 1, A# + toggle_sfx + duty_cycle 2 + note_type 2, 11, 1 + pitch_sweep 15, -7 + transpose 1, 10 octave 5 note C_, 2 note E_, 2 @@ -155,115 +167,119 @@ Sfx_GameFreakPresents_Ch5: note C_, 2 note E_, 2 note G_, 3 - intensity $81 + volume_envelope 8, 1 note G_, 3 - intensity $51 + volume_envelope 5, 1 note G_, 3 - intensity $31 + volume_envelope 3, 1 note G_, 3 - endchannel + sound_ret Sfx_Tingle: - musicheader 1, 5, Sfx_Tingle_Ch5 + channel_count 1 + channel 5, Sfx_Tingle_Ch5 Sfx_Tingle_Ch5: - togglesfx - dutycycle $1 - pitchoffset 0, B_ - notetype $1, $b1 -.loop + toggle_sfx + duty_cycle 1 + transpose 0, 11 + note_type 1, 11, 1 +.loop1: octave 5 note C_, 3 octave 6 note G_, 2 octave 5 note C_, 3 - note __, 2 - loopchannel 2, .loop + rest 2 + sound_loop 2, .loop1 note C_, 2 - intensity $a1 + volume_envelope 10, 1 note G_, 13 - endchannel + sound_ret Sfx_TwoPcBeeps: - musicheader 1, 5, Sfx_TwoPcBeeps_Ch5 + channel_count 1 + channel 5, Sfx_TwoPcBeeps_Ch5 Sfx_TwoPcBeeps_Ch5: - dutycycle $2 - sound __, 3, $e8, $07c2 - sound __, 3, $28, $07c2 - sound __, 3, $e8, $07c2 - sound __, 3, $28, $07c2 - endchannel + duty_cycle 2 + square_note 2, 14, 8, 1986 + square_note 2, 2, 8, 1986 + square_note 2, 14, 8, 1986 + square_note 2, 2, 8, 1986 + sound_ret Sfx_4NoteDitty: - musicheader 3, 5, Sfx_4NoteDitty_Ch5 - musicheader 1, 6, Sfx_4NoteDitty_Ch6 - musicheader 1, 7, Sfx_4NoteDitty_Ch7 + channel_count 3 + channel 5, Sfx_4NoteDitty_Ch5 + channel 6, Sfx_4NoteDitty_Ch6 + channel 7, Sfx_4NoteDitty_Ch7 Sfx_4NoteDitty_Ch5: - togglesfx - dutycycle $2 - notetype $2, $e8 - pitchoffset 0, D_ + toggle_sfx + duty_cycle 2 + note_type 2, 14, 8 + transpose 0, 2 octave 4 note C_, 2 - intensity $48 + volume_envelope 4, 8 note C_, 2 - intensity $e8 + volume_envelope 14, 8 note G_, 2 - intensity $48 + volume_envelope 4, 8 note G_, 2 octave 5 - intensity $e8 + volume_envelope 14, 8 note E_, 2 - intensity $48 + volume_envelope 4, 8 note E_, 2 octave 6 - intensity $e8 + volume_envelope 14, 8 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 16 - endchannel + sound_ret Sfx_4NoteDitty_Ch6: - togglesfx - notetype $2, $b8 - note __, 9 - note __, 16 - endchannel + toggle_sfx + note_type 2, 11, 8 + rest 9 + rest 16 + sound_ret Sfx_4NoteDitty_Ch7: - togglesfx - notetype $2, $b8 - note __, 9 - note __, 16 - endchannel + toggle_sfx + note_type 2, 11, 8 + rest 9 + rest 16 + sound_ret Sfx_Twinkle: - musicheader 1, 5, Sfx_Twinkle_Ch5 + channel_count 1 + channel 5, Sfx_Twinkle_Ch5 Sfx_Twinkle_Ch5: - togglesfx - dutycycle $0 - pitchoffset 0, D_ - notetype $2, $e1 + toggle_sfx + duty_cycle 0 + transpose 0, 2 + note_type 2, 14, 1 octave 3 note G_, 2 - intensity $b1 + volume_envelope 11, 1 octave 4 note D_, 2 - intensity $e1 + volume_envelope 14, 1 note B_, 2 - intensity $b1 + volume_envelope 11, 1 note G_, 2 - intensity $e1 + volume_envelope 14, 1 octave 5 note D_, 2 - intensity $b1 + volume_envelope 11, 1 octave 4 note B_, 2 - intensity $e1 + volume_envelope 14, 1 octave 5 note G_, 6 - endchannel + sound_ret diff --git a/crysaudio/sfx_pointers.asm b/crysaudio/sfx_pointers.asm index 0e066c60..815a6570 100644 --- a/crysaudio/sfx_pointers.asm +++ b/crysaudio/sfx_pointers.asm @@ -148,9 +148,9 @@ SFX: dba Sfx_KeyItem dba Sfx_Fanfare2 dba Sfx_RegisterPhoneNumber - dba Sfx_3RdPlace - dba Sfx_GetEggFromDayCareMan - dba Sfx_GetEggFromDayCareLady + dba Sfx_3rdPlace + dba Sfx_GetEgg + dba Sfx_GetEgg dba Sfx_MoveDeleted dba Sfx_2ndPlace dba Sfx_1stPlace @@ -188,9 +188,9 @@ SFX: dba Sfx_TrainArrived dba Sfx_StopSlot dba Sfx_2Boops +; new to Crystal dba Sfx_GlassTing dba Sfx_GlassTing2 -; new to Crystal dba Sfx_IntroUnown1 dba Sfx_IntroUnown2 dba Sfx_IntroUnown3 diff --git a/crysaudio/trainer_encounters.asm b/crysaudio/trainer_encounters.asm index a64d160f..2634e99d 100644 --- a/crysaudio/trainer_encounters.asm +++ b/crysaudio/trainer_encounters.asm @@ -70,6 +70,6 @@ TrainerEncounterMusic:: db MUSIC_HIKER_ENCOUNTER ; officer db MUSIC_ROCKET_ENCOUNTER ; gruntf db MUSIC_HIKER_ENCOUNTER ; mysticalman - db MUSIC_HIKER_ENCOUNTER - db MUSIC_HIKER_ENCOUNTER - db MUSIC_HIKER_ENCOUNTER + db MUSIC_HIKER_ENCOUNTER ; unused + db MUSIC_HIKER_ENCOUNTER ; unused + db MUSIC_HIKER_ENCOUNTER ; unused diff --git a/crysmacros.asm b/crysmacros.asm deleted file mode 100644 index 442ae2f8..00000000 --- a/crysmacros.asm +++ /dev/null @@ -1,342 +0,0 @@ -INCLUDE "crysaudio/enum.asm" - - - -maskbits: MACRO -; masks just enough bits to cover the first argument -; the second argument is an optional shift amount -; e.g. "maskbits 26" becomes "and %00011111" (since 26 - 1 = %00011001) -; and "maskbits 3, 2" becomes "and %00001100" (since "maskbits 3" becomes %00000011) -; example usage in rejection sampling: -; .loop -; call Random -; maskbits 26 -; cp 26 -; jr nc, .loop -x = 1 -rept 8 -if x + 1 < (\1) -x = x << 1 | 1 -endc -endr -if _NARG == 2 - and x << (\2) -else - and x -endc -ENDM - - - -musicheader: MACRO - ; number of tracks, track idx, address - dbw ((\1 - 1) << 6) + (\2 - 1), \3 -ENDM - -note: MACRO - dn (\1), (\2) - 1 -ENDM - -sound: MACRO - note \1, \2 - db \3 ; intensity - dw \4 ; frequency -ENDM - -noise: MACRO - note \1, \2 ; duration - db \3 ; intensity - db \4 ; frequency -ENDM - -; MusicCommands indexes (see audio/engine.asm) - enum_start $d0, +8 -FIRST_MUSIC_CMD EQU __enum__ - - enum octave_cmd ; $d0 -octave: MACRO - db octave_cmd | 8 - (\1) -ENDM - -__enumdir__ = +1 - - enum notetype_cmd ; $d8 -notetype: MACRO - db notetype_cmd - db \1 ; note_length -if _NARG >= 2 - db \2 ; intensity -endc -ENDM - - enum pitchoffset_cmd ; $d9 -pitchoffset: MACRO - db pitchoffset_cmd - dn \1, \2 - 1 ; octave, key -ENDM - - enum tempo_cmd ; $da -tempo: MACRO - db tempo_cmd - bigdw \1 ; tempo -ENDM - - enum dutycycle_cmd ; $db -dutycycle: MACRO - db dutycycle_cmd - db \1 ; duty_cycle -ENDM - - enum intensity_cmd ; $dc -intensity: MACRO - db intensity_cmd - db \1 ; intensity -ENDM - - enum soundinput_cmd ; $dd -soundinput: MACRO - db soundinput_cmd - db \1 ; input -ENDM - - enum sound_duty_cmd ; $de -sound_duty: MACRO - db sound_duty_cmd -if _NARG == 4 - db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence -else - db \1 ; LEGACY: Support for one-byte duty value -endc -ENDM - - enum togglesfx_cmd ; $df -togglesfx: MACRO - db togglesfx_cmd -ENDM - - enum slidepitchto_cmd ; $e0 -slidepitchto: MACRO - db slidepitchto_cmd - db \1 - 1 ; duration - dn \2, \3 ; octave, pitch -ENDM - - enum vibrato_cmd ; $e1 -vibrato: MACRO - db vibrato_cmd - db \1 ; delay - db \2 ; extent -ENDM - - enum unknownmusic0xe2_cmd ; $e2 -unknownmusic0xe2: MACRO - db unknownmusic0xe2_cmd - db \1 ; unknown -ENDM - - enum togglenoise_cmd ; $e3 -togglenoise: MACRO - db togglenoise_cmd - db \1 ; id -ENDM - - enum panning_cmd ; $e4 -panning: MACRO - db panning_cmd - db \1 ; tracks -ENDM - - enum volume_cmd ; $e5 -volume: MACRO - db volume_cmd - db \1 ; volume -ENDM - - enum tone_cmd ; $e6 -tone: MACRO - db tone_cmd - bigdw \1 ; tone -ENDM - - enum unknownmusic0xe7_cmd ; $e7 -unknownmusic0xe7: MACRO - db unknownmusic0xe7_cmd - db \1 ; unknown -ENDM - - enum unknownmusic0xe8_cmd ; $e8 -unknownmusic0xe8: MACRO - db unknownmusic0xe8_cmd - db \1 ; unknown -ENDM - - enum tempo_relative_cmd ; $e9 -tempo_relative: MACRO - db tempo_relative_cmd - bigdw \1 ; value -ENDM - - enum restartchannel_cmd ; $ea -restartchannel: MACRO - db restartchannel_cmd - dw \1 ; address -ENDM - - enum newsong_cmd ; $eb -newsong: MACRO - db newsong_cmd - bigdw \1 ; id -ENDM - - enum sfxpriorityon_cmd ; $ec -sfxpriorityon: MACRO - db sfxpriorityon_cmd -ENDM - - enum sfxpriorityoff_cmd ; $ed -sfxpriorityoff: MACRO - db sfxpriorityoff_cmd -ENDM - - enum unknownmusic0xee_cmd ; $ee -unknownmusic0xee: MACRO - db unknownmusic0xee_cmd - dw \1 ; address -ENDM - - enum stereopanning_cmd ; $ef -stereopanning: MACRO - db stereopanning_cmd - db \1 ; tracks -ENDM - - enum sfxtogglenoise_cmd ; $f0 -sfxtogglenoise: MACRO - db sfxtogglenoise_cmd - db \1 ; id -ENDM - - enum music0xf1_cmd ; $f1 -music0xf1: MACRO - db music0xf1_cmd -ENDM - - enum music0xf2_cmd ; $f2 -music0xf2: MACRO - db music0xf2_cmd -ENDM - - enum music0xf3_cmd ; $f3 -music0xf3: MACRO - db music0xf3_cmd -ENDM - - enum music0xf4_cmd ; $f4 -music0xf4: MACRO - db music0xf4_cmd -ENDM - - enum music0xf5_cmd ; $f5 -music0xf5: MACRO - db music0xf5_cmd -ENDM - - enum music0xf6_cmd ; $f6 -music0xf6: MACRO - db music0xf6_cmd -ENDM - - enum music0xf7_cmd ; $f7 -music0xf7: MACRO - db music0xf7_cmd -ENDM - - enum music0xf8_cmd ; $f8 -music0xf8: MACRO - db music0xf8_cmd -ENDM - - enum unknownmusic0xf9_cmd ; $f9 -unknownmusic0xf9: MACRO - db unknownmusic0xf9_cmd -ENDM - - enum setcondition_cmd ; $fa -setcondition: MACRO - db setcondition_cmd - db \1 ; condition -ENDM - - enum jumpif_cmd ; $fb -jumpif: MACRO - db jumpif_cmd - db \1 ; condition - dw \2 ; address -ENDM - - enum jumpchannel_cmd ; $fc -jumpchannel: MACRO - db jumpchannel_cmd - dw \1 ; address -ENDM - - enum loopchannel_cmd ; $fd -loopchannel: MACRO - db loopchannel_cmd - db \1 ; count - dw \2 ; address -ENDM - - enum callchannel_cmd ; $fe -callchannel: MACRO - db callchannel_cmd - dw \1 ; address -ENDM - - enum endchannel_cmd ; $ff -endchannel: MACRO - db endchannel_cmd -ENDM - -; custom commands: - -load_wave: MACRO - db $f3 - IF _NARG > 16 - REPT 16 - dn \1, \2 - SHIFT - SHIFT - ENDR - ELSE - REPT 16 - db \1 - SHIFT - ENDR - ENDC - ENDM - -inc_octave: MACRO - db $f4 - ENDM - -dec_octave: MACRO - db $f5 - ENDM - -notetype0: MACRO - db $f6, \1 - ENDM - -notetype1: MACRO - db $f7, \1 - ENDM - -notetype2: MACRO - db $f8, \1 - ENDM - - -; not reimplemented yet -toggleperfectpitch: MACRO ; XXX - ENDM diff --git a/data/animations.asm b/data/animations.asm deleted file mode 100755 index 8c388afd..00000000 --- a/data/animations.asm +++ /dev/null @@ -1,3628 +0,0 @@ -AttackAnimationPointers: - dw PoundAnim - dw KarateChopAnim - dw DoubleSlapAnim - dw CometPunchAnim - dw MegaPunchAnim - dw PayDayAnim - dw FirePunchAnim - dw IcePunchAnim - dw ThunderPunchAnim - dw ScratchAnim - dw VicegripAnim - dw GuillotineAnim - dw RazorWindAnim - dw SwordsDanceAnim - dw CutAnim - dw GustAnim - dw WingAttackAnim - dw WhirlwindAnim - dw FlyAnim - dw BindAnim - dw SlamAnim - dw VineWhipAnim - dw StompAnim - dw DoubleKickAnim - dw MegaKickAnim - dw JumpKickAnim - dw RollingKickAnim - dw SandAttackAnim - dw HeatButtAnim - dw HornAttackAnim - dw FuryAttackAnim - dw HornDrillAnim - dw TackleAnim - dw BodySlamAnim - dw WrapAnim - dw TakeDownAnim - dw ThrashAnim - dw DoubleEdgeAnim - dw TailWhipAnim - dw PoisonStingAnim - dw TwineedleAnim - dw PinMissileAnim - dw LeerAnim - dw BiteAnim - dw GrowlAnim - dw RoarAnim - dw SingAnim - dw SupersonicAnim - dw SonicBoomAnim - dw DisableAnim - dw AcidAnim - dw EmberAnim - dw FlamethrowerAnim - dw MistAnim - dw WaterGunAnim - dw HydroPumpAnim - dw SurfAnim - dw IceBeamAnim - dw BlizzardAnim - dw PsyBeamAnim - dw BubbleBeamAnim - dw AuroraBeamAnim - dw HyperBeamAnim - dw PeckAnim - dw DrillPeckAnim - dw SubmissionAnim - dw LowKickAnim - dw CounterAnim - dw SeismicTossAnim - dw StrengthAnim - dw AbsorbAnim - dw MegaDrainAnim - dw LeechSeedAnim - dw GrowthAnim - dw RazorLeafAnim - dw SolarBeamAnim - dw PoisonPowderAnim - dw StunSporeAnim - dw SleepPowderAnim - dw PedalDanceAnim - dw StringShotAnim - dw DragonRageAnim - dw FireSpinAnim - dw ThunderShockAnim - dw ThunderBoltAnim - dw ThunderWaveAnim - dw ThunderAnim - dw RockThrowAnim - dw EarthquakeAnim - dw FissureAnim - dw DigAnim - dw ToxicAnim - dw ConfusionAnim - dw PsychicAnim - dw HypnosisAnim - dw MeditateAnim - dw AgilityAnim - dw QuickAttackAnim - dw RageAnim - dw TeleportAnim - dw NightShadeAnim - dw MimicAnim - dw ScreechAnim - dw DoubleTeamAnim - dw RecoverAnim - dw HardenAnim - dw MinimizeAnim - dw SmokeScreenAnim - dw ConfuseRayAnim - dw WithdrawAnim - dw DefenseCurlAnim - dw BarrierAnim - dw LightScreenAnim - dw HazeAnim - dw ReflectAnim - dw FocusEnergyAnim - dw BideAnim - dw MetronomeAnim - dw MirrorMoveAnim - dw SelfdestructAnim - dw EggBombAnim - dw LickAnim - dw SmogAnim - dw SludgeAnim - dw BoneClubAnim - dw FireBlastAnim - dw WaterfallAnim - dw ClampAnim - dw SwiftAnim - dw SkullBashAnim - dw SpikeCannonAnim - dw ConstrictAnim - dw AmnesiaAnim - dw KinesisAnim - dw SoftboiledAnim - dw HiJumpKickAnim - dw GlareAnim - dw DreamEaterAnim - dw PoisonGasAnim - dw BarrageAnim - dw LeechLifeAnim - dw LovelyKissAnim - dw SkyAttackAnim - dw TransformAnim - dw BubbleAnim - dw DizzyPunchAnim - dw SporeAnim - dw FlashAnim - dw PsywaveAnim - dw SplashAnim - dw AcidArmorAnim - dw CrabHammerAnim - dw ExplosionAnim - dw FurySwipesAnim - dw BonemerangAnim - dw RestAnim - dw RockSlideAnim - dw HyperFangAnim - dw SharpenAnim - dw ConversionAnim - dw TriAttackAnim - dw SuperFangAnim - dw SlashAnim - dw SubstituteAnim - dw StruggleAnim - dw ShowPicAnim - dw EnemyFlashAnim - dw PlayerFlashAnim - dw EnemyHUDShakeAnim - dw TradeBallDropAnim - dw TradeBallAppear1Anim - dw TradeBallAppear2Anim - dw TradeBallPoofAnim - dw XStatItemAnim - dw XStatItemAnim - dw ShrinkingSquareAnim - dw ShrinkingSquareAnim - dw XStatItemBlackAnim - dw XStatItemBlackAnim - dw ShrinkingSquareBlackAnim - dw ShrinkingSquareBlackAnim - dw UnusedAnim - dw UnusedAnim - dw ParalyzeAnim - dw ParalyzeAnim - dw PoisonAnim - dw PoisonAnim - dw SleepPlayerAnim - dw SleepEnemyAnim - dw ConfusedPlayerAnim - dw ConfusedEnemyAnim - dw FaintAnim - dw BallTossAnim - dw BallShakeAnim - dw BallPoofAnim - dw BallBlockAnim - dw GreatTossAnim - dw UltraTossAnim - dw ShakeScreenAnim - dw HidePicAnim - dw ThrowRockAnim - dw ThrowBaitAnim - dw ZigZagScreenAnim - -; each animation is a list of subanimations and special effects -; if first byte < $56 -; db tileset_and_delay, sound_id, subanimation_id -; if first byte >= $D8 -; db special_effect_id, sound_id -; $FF terminated -ZigZagScreenAnim: - db SE_WAVY_SCREEN, $FF - db $FF - -PoundAnim: -StruggleAnim: - db $08,$00,$01 - db $FF - -KarateChopAnim: - db $08,$01,$03 - db $FF - -DoubleSlapAnim: - db $05,$02,$01 - db $05,$02,$01 - db $FF - -CometPunchAnim: - db $04,$03,$02 - db $04,$03,$02 - db $FF - -MegaPunchAnim: - db $46,$04,$04 - db $FF - -PayDayAnim: - db $08,$00,$01 - db $04,$05,$52 - db $FF - -FirePunchAnim: - db $06,$06,$02 - db $46,$FF,$11 - db $FF - -IcePunchAnim: - db $06,$07,$02 - db $10,$FF,$2F - db $FF - -ThunderPunchAnim: - db $06,$08,$02 - db SE_DARK_SCREEN_PALETTE, $FF - db $46,$FF,$2B - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ScratchAnim: - db $06,$09,$0F - db $FF - -VicegripAnim: - db $08,$0A,$2A - db $FF - -GuillotineAnim: - db $06,$0B,$2A - db $FF - -RazorWindAnim: - db $04,$0C,$16 - db $FF - -SwordsDanceAnim: - db $46,$0D,$18 - db $46,$0D,$18 - db $46,$0D,$18 - db $FF - -CutAnim: - db SE_DARK_SCREEN_FLASH, $0E - db $04,$FF,$16 - db $FF - -GustAnim: - db $46,$0F,$10 - db $06,$FF,$02 - db $FF - -WingAttackAnim: - db $46,$10,$04 - db $FF - -WhirlwindAnim: - db $46,$11,$10 - db SE_SLIDE_ENEMY_MON_OFF, $FF - db $FF - -FlyAnim: - db $46,$12,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -BindAnim: - db $04,$13,$23 - db $04,$13,$23 - db $FF - -SlamAnim: - db $06,$14,$02 - db $FF - -VineWhipAnim: - db $01,$15,$16 - db $08,$FF,$01 - db $FF - -StompAnim: - db $48,$16,$05 - db $FF - -DoubleKickAnim: - db $08,$17,$01 - db $08,$17,$01 - db $FF - -MegaKickAnim: - db $46,$18,$04 - db $FF - -JumpKickAnim: - db $46,$19,$04 - db $FF - -RollingKickAnim: - db SE_DARK_SCREEN_FLASH, $1A - db $46,$FF,$04 - db $FF - -SandAttackAnim: - db $46,$1B,$28 - db $FF - -HeatButtAnim: - db $46,$1C,$05 - db $FF - -HornAttackAnim: - db $06,$1D,$45 - db $46,$FF,$05 - db $FF - -FuryAttackAnim: - db $02,$1E,$46 - db $02,$FF,$46 - db $FF - -HornDrillAnim: - db $42,$1F,$05 - db $42,$FF,$05 - db $42,$FF,$05 - db $42,$FF,$05 - db $42,$FF,$05 - db $FF - -TackleAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_RESET_MON_POSITION, $FF - db $FF - -BodySlamAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_MON_POSITION, $FF - db $FF - -WrapAnim: - db $04,$22,$23 - db $04,$22,$23 - db $04,$22,$23 - db $FF - -TakeDownAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_DARK_SCREEN_FLASH, $23 - db SE_RESET_MON_POSITION, $FF - db $FF - -ThrashAnim: - db $46,$24,$04 - db $FF - -DoubleEdgeAnim: - db SE_LIGHT_SCREEN_PALETTE, $48 - db $06,$FF,$2D - db SE_RESET_SCREEN_PALETTE, $FF - db SE_MOVE_MON_HORIZONTALLY, $FF - db SE_DARK_SCREEN_FLASH, $25 - db SE_RESET_MON_POSITION, $FF - db $FF - -TailWhipAnim: - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db $FF - -PoisonStingAnim: - db $06,$27,$00 - db $FF - -TwineedleAnim: - db $05,$28,$01 - db $05,$28,$01 - db $FF - -PinMissileAnim: - db $03,$29,$01 - db $FF - -LeerAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $2A - db SE_DARK_SCREEN_FLASH, $2A - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -BiteAnim: - db $08,$2B,$02 - db $FF - -GrowlAnim: - db $46,$2C,$12 - db $FF - -RoarAnim: - db $46,$2D,$15 - db $46,$2D,$15 - db $46,$2D,$15 - db $FF - -SingAnim: - db $46,$2E,$12 - db $50,$FF,$40 - db $50,$FF,$40 - db $FF - -SupersonicAnim: - db $06,$2F,$31 - db $FF - -SonicBoomAnim: - db $46,$2D,$15 - db $46,$2D,$15 - db $46,$0F,$10 - db $46,$FF,$05 - db $FF - -DisableAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $2A - db SE_DARK_SCREEN_FLASH, $2A - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -AcidAnim: - db $46,$32,$13 - db $46,$32,$14 - db $FF - -EmberAnim: - db $46,$33,$11 - db $FF - -FlamethrowerAnim: - db $46,$34,$1F - db $46,$34,$0C - db $46,$34,$0D - db $FF - -MistAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -WaterGunAnim: - db $06,$36,$2C - db $FF - -HydroPumpAnim: - db $06,$37,$1A - db $06,$37,$1A - db $FF - -SurfAnim: - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db $06,$37,$1A - db $FF - -IceBeamAnim: - db $03,$39,$2E - db $10,$FF,$2F - db $FF - -BlizzardAnim: - db $04,$3A,$38 - db $04,$37,$38 - db $FF - -PsyBeamAnim: - db $03,$3B,$2E - db SE_FLASH_SCREEN_LONG, $FF - db $FF - -BubbleBeamAnim: - db $12,$3C,$35 - db $FF - -AuroraBeamAnim: - db $03,$3D,$2E - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db $FF - -HyperBeamAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_SPIRAL_BALLS_INWARD, $FF - db $02,$3E,$2E - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db $46,$04,$04 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -PeckAnim: - db $08,$3F,$01 - db $FF - -DrillPeckAnim: - db $46,$40,$04 - db $FF - -SubmissionAnim: - db SE_SLIDE_MON_OFF, $41 - db $06,$FF,$01 - db SE_SHOW_MON_PIC, $FF - db $FF - -LowKickAnim: - db SE_SLIDE_MON_OFF, $42 - db $46,$FF,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -CounterAnim: - db SE_SLIDE_MON_OFF, $43 - db $46,$FF,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -SeismicTossAnim: - db SE_BLINK_ENEMY_MON, $FF - db $41,$8B,$4E - db SE_HIDE_ENEMY_MON_PIC, $FF - db SE_SLIDE_MON_OFF, $FF - db $42,$44,$4F - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_SHOW_MON_PIC, $FF - db $41,$44,$50 - db SE_SHOW_ENEMY_MON_PIC, $FF - db SE_SHAKE_SCREEN, $FF - db $FF - -StrengthAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_RESET_MON_POSITION, $FF - db $46,$06,$04 - db $FF - -AbsorbAnim: - db SE_LIGHT_SCREEN_PALETTE, $46 - db $06,$FF,$21 - db $06,$FF,$22 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -MegaDrainAnim: - db SE_LIGHT_SCREEN_PALETTE, $47 - db SE_DARK_SCREEN_FLASH, $FF - db $06,$FF,$21 - db $06,$FF,$22 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -LeechSeedAnim: - db $46,$48,$1B - db $55,$4D,$1C - db $FF - -GrowthAnim: - db SE_LIGHT_SCREEN_PALETTE, $49 - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -RazorLeafAnim: - db SE_LEAVES_FALLING, $4A - db $41,$80,$44 - db $01,$0C,$16 - db $FF - -SolarBeamAnim: - db $06,$4B,$2E - db $06,$FF,$01 - db $FF - -PoisonPowderAnim: - db $06,$4C,$36 - db $FF - -StunSporeAnim: - db $06,$4D,$36 - db $FF - -SleepPowderAnim: - db $06,$4E,$36 - db $FF - -PedalDanceAnim: - db SE_LIGHT_SCREEN_PALETTE, $4F - db SE_PETALS_FALLING, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -StringShotAnim: - db $08,$50,$37 - db $FF - -DragonRageAnim: - db $46,$51,$1F - db $46,$FF,$0C - db $46,$FF,$0D - db $46,$FF,$0E - db $FF - -FireSpinAnim: - db $46,$52,$0C - db $46,$FF,$0D - db $46,$FF,$0E - db $FF - -ThunderShockAnim: - db $42,$53,$29 - db $FF - -ThunderBoltAnim: - db $41,$54,$29 - db $41,$54,$29 - db $FF - -ThunderWaveAnim: - db $42,$55,$29 - db $02,$FF,$23 - db $04,$FF,$23 - db $FF - -ThunderAnim: - db SE_DARK_SCREEN_PALETTE, $56 - db SE_DARK_SCREEN_FLASH, $FF - db $46,$FF,$2B - db SE_DARK_SCREEN_FLASH, $FF - db $42,$54,$29 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -RockThrowAnim: - db $04,$57,$30 - db $FF - -EarthquakeAnim: - db SE_SHAKE_SCREEN, $58 - db SE_SHAKE_SCREEN, $58 - db $FF - -FissureAnim: - db SE_DARK_SCREEN_FLASH, $59 - db SE_SHAKE_SCREEN, $FF - db SE_DARK_SCREEN_FLASH, $59 - db SE_SHAKE_SCREEN, $FF - db $FF - -DigAnim: - db $46,$5A,$04 - db SE_SLIDE_MON_UP, $FF - db $FF - -ToxicAnim: - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db $46,$5B,$14 - db $FF - -ConfusionAnim: - db SE_FLASH_SCREEN_LONG, $5C - db $FF - -PsychicAnim: - db SE_FLASH_SCREEN_LONG, $5D - db SE_WAVY_SCREEN, $FF - db $FF - -HypnosisAnim: - db SE_FLASH_SCREEN_LONG, $5E - db $FF - -MeditateAnim: - db SE_LIGHT_SCREEN_PALETTE, $5F - db $46,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -AgilityAnim: - db SE_LIGHT_SCREEN_PALETTE, $60 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -QuickAttackAnim: - db SE_SLIDE_MON_OFF, $61 - db $46,$FF,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -RageAnim: - db $06,$62,$01 - db $FF - -TeleportAnim: - db SE_SQUISH_MON_PIC, $63 - db SE_SHOOT_BALLS_UPWARD, $FF - db $FF - -NightShadeAnim: - db SE_FLASH_SCREEN_LONG, $5C - db SE_WAVY_SCREEN, $FF - db $FF - -MimicAnim: - db $46,$65,$21 - db $46,$65,$22 - db $FF - -ScreechAnim: - db $46,$66,$12 - db $FF - -DoubleTeamAnim: - db SE_DARK_SCREEN_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHAKE_BACK_AND_FORTH, $67 - db SE_SHOW_MON_PIC, $FF - db $46,$6F,$33 - db $FF - -RecoverAnim: - db SE_BLINK_MON, $68 - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -HardenAnim: - db SE_LIGHT_SCREEN_PALETTE, $69 - db $46,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -MinimizeAnim: - db SE_LIGHT_SCREEN_PALETTE, $6A - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_MINIMIZE_MON, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -SmokeScreenAnim: - db $46,$6B,$28 - db $04,$FF,$0A - db SE_DARKEN_MON_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARK_SCREEN_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARKEN_MON_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ConfuseRayAnim: - db SE_DARK_SCREEN_PALETTE, $6C - db $46,$FF,$3E - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -WithdrawAnim: - db SE_LIGHT_SCREEN_PALETTE, $6E - db SE_SLIDE_MON_DOWN, $FF - db $06,$FF,$51 - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHOW_MON_PIC, $FF - db $FF - -DefenseCurlAnim: - db SE_LIGHT_SCREEN_PALETTE, $6E - db $06,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -BarrierAnim: - db $46,$6F,$33 - db $46,$6F,$33 - db $FF - -LightScreenAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db $46,$70,$33 - db $46,$70,$33 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -HazeAnim: - db SE_DARKEN_MON_PALETTE, $FF - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ReflectAnim: - db SE_DARK_SCREEN_PALETTE, $FF - db $46,$72,$33 - db $46,$72,$33 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -FocusEnergyAnim: - db SE_SPIRAL_BALLS_INWARD, $73 - db $FF - -BideAnim: - db $46,$74,$04 - db $FF - -MetronomeAnim: - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db $FF - -MirrorMoveAnim: - db $08,$76,$01 - db $FF - -SelfdestructAnim: - db $43,$77,$34 - db $FF - -EggBombAnim: - db $44,$78,$41 - db $44,$78,$42 - db $FF - -LickAnim: - db $46,$7B,$14 - db $FF - -SmogAnim: - db SE_DARKEN_MON_PALETTE, $48 - db $46,$7A,$19 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -SludgeAnim: - db $46,$7B,$13 - db $46,$7B,$14 - db $FF - -BoneClubAnim: - db $08,$7C,$02 - db $FF - -FireBlastAnim: - db $46,$7D,$1F - db $46,$FF,$20 - db $46,$FF,$20 - db $46,$FF,$0C - db $46,$FF,$0D - db $FF - -WaterfallAnim: - db SE_SLIDE_MON_DOWN, $48 - db $06,$37,$1A - db $08,$FF,$02 - db SE_SLIDE_MON_UP, $FF - db $FF - -ClampAnim: - db $08,$7F,$2A - db $06,$83,$23 - db $06,$83,$23 - db $FF - -SwiftAnim: - db $43,$80,$3F - db $FF - -SkullBashAnim: - db $46,$81,$05 - db $FF - -SpikeCannonAnim: - db $44,$82,$04 - db $FF - -ConstrictAnim: - db $06,$83,$23 - db $06,$83,$23 - db $06,$83,$23 - db $FF - -AmnesiaAnim: - db $08,$84,$25 - db $08,$84,$25 - db $FF - -KinesisAnim: - db $08,$85,$01 - db $FF - -SoftboiledAnim: - db SE_SLIDE_MON_HALF_OFF, $48 - db $08,$86,$4C - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHOW_MON_PIC, $FF - db $FF - -HiJumpKickAnim: - db $46,$87,$04 - db $FF - -GlareAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $88 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -DreamEaterAnim: - db SE_FLASH_SCREEN_LONG, $89 - db SE_DARK_SCREEN_PALETTE, $89 - db $08,$89,$02 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -PoisonGasAnim: - db $46,$8A,$19 - db $FF - -BarrageAnim: - db $43,$8B,$41 - db $05,$FF,$55 - db $FF - -LeechLifeAnim: - db $08,$8C,$02 - db SE_DARK_SCREEN_FLASH, $FF - db $06,$FF,$21 - db $06,$FF,$22 - db SE_DARK_SCREEN_FLASH, $FF - db $FF - -LovelyKissAnim: - db $06,$8D,$12 - db $FF - -SkyAttackAnim: - db SE_SQUISH_MON_PIC, $8E - db SE_SHOOT_BALLS_UPWARD, $FF - db $46,$87,$04 - db SE_SHOW_MON_PIC, $FF - db $FF - -TransformAnim: - db $46,$8F,$21 - db $44,$8F,$22 - db $08,$FF,$47 - db SE_TRANSFORM_MON, $FF - db $FF - -BubbleAnim: - db $16,$90,$35 - db $FF - -DizzyPunchAnim: - db $06,$91,$17 - db $06,$91,$17 - db $06,$91,$17 - db $06,$02,$02 - db $FF - -SporeAnim: - db $06,$92,$36 - db $FF - -FlashAnim: - db SE_LIGHT_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $88 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -PsywaveAnim: - db $06,$2F,$31 - db SE_WAVY_SCREEN, $5C - db $FF - -SplashAnim: - db SE_BOUNCE_UP_AND_DOWN, $95 - db $FF - -AcidArmorAnim: - db SE_SLIDE_MON_DOWN_AND_HIDE, $96 - db $FF - -CrabHammerAnim: - db $46,$97,$05 - db $06,$FF,$2A - db $FF - -ExplosionAnim: - db $43,$98,$34 - db $FF - -FurySwipesAnim: - db $04,$99,$0F - db $FF - -BonemerangAnim: - db $06,$9A,$02 - db $FF - -RestAnim: - db $10,$9B,$3A - db $10,$9B,$3A - db $FF - -RockSlideAnim: - db $04,$9C,$1D - db $03,$9C,$1E - db $46,$9D,$04 - db $FF - -HyperFangAnim: - db $06,$9D,$02 - db $FF - -SharpenAnim: - db SE_LIGHT_SCREEN_PALETTE, $9E - db $46,$FF,$43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ConversionAnim: - db SE_DARK_SCREEN_FLASH, $9F - db $46,$FF,$21 - db $46,$FF,$22 - db SE_DARK_SCREEN_FLASH, $FF - db $FF - -TriAttackAnim: - db SE_DARK_SCREEN_FLASH, $A0 - db $46,$FF,$4D - db SE_DARK_SCREEN_FLASH, $FF - db $FF - -SuperFangAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db $46,$A1,$04 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -SlashAnim: - db $06,$A2,$0F - db $FF - -SubstituteAnim: - db SE_SLIDE_MON_OFF, $A3 - db $08,$FF,$47 - db SE_SUBSTITUTE_MON, $FF - db $FF - -BallTossAnim: - db $03,$FF,$06 - db $FF - -GreatTossAnim: - db $03,$FF,$07 - db $FF - -UltraTossAnim: - db $02,$FF,$08 - db $FF - -BallShakeAnim: - db $04,$FF,$09 - db $FF - -BallPoofAnim: - db $04,$FF,$0A - db $FF - -ShowPicAnim: - db SE_SHOW_ENEMY_MON_PIC, $FF - db $FF - -HidePicAnim: - db SE_HIDE_ENEMY_MON_PIC, $FF - db $FF - -EnemyFlashAnim: - db SE_SHOW_MON_PIC, $FF - db $FF - -PlayerFlashAnim: - db SE_FLASH_MON_PIC, $FF - db $FF - -EnemyHUDShakeAnim: - db SE_SHAKE_ENEMY_HUD, $FF - db $FF - -TradeBallDropAnim: - db $86,$FF,$48 - db $FF - -TradeBallAppear1Anim: - db $84,$FF,$49 - db $FF - -TradeBallAppear2Anim: - db $86,$FF,$4A - db $FF - -TradeBallPoofAnim: - db $86,$FF,$4B - db $FF - -XStatItemAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ShrinkingSquareAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db $46,$FF,$43 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -XStatItemBlackAnim: - db SE_DARKEN_MON_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ShrinkingSquareBlackAnim: - db SE_DARKEN_MON_PALETTE, $FF - db $46,$FF,$43 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -UnusedAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SHOOT_MANY_BALLS_UPWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF - -ParalyzeAnim: - db $04,$13,$24 - db $04,$13,$24 - db $FF - -PoisonAnim: - db $08,$13,$27 - db $08,$13,$27 - db $FF - -SleepPlayerAnim: - db $10,$9B,$3A - db $10,$9B,$3A - db $FF - -SleepEnemyAnim: - db $10,$9B,$3B - db $10,$9B,$3B - db $FF - -ConfusedPlayerAnim: - db $08,$84,$25 - db $08,$84,$25 - db $FF - -ConfusedEnemyAnim: - db $08,$84,$26 - db $08,$84,$26 - db $FF - -BallBlockAnim: - db $03,$FF,$0B - db $FF - -FaintAnim: - db SE_SLIDE_MON_DOWN, $5A - db $FF - -ShakeScreenAnim: - db SE_SHAKE_SCREEN, $FF - db $FF - -ThrowRockAnim: - db $03,$8B,$53 - db $FF - -ThrowBaitAnim: - db $03,$8B,$54 - db $FF - -SubanimationPointers: - dw Subanimation00 - dw Subanimation01 - dw Subanimation02 - dw Subanimation03 - dw Subanimation04 - dw Subanimation05 - dw Subanimation06 - dw Subanimation07 - dw Subanimation08 - dw Subanimation09 - dw Subanimation0a - dw Subanimation0b - dw Subanimation0c - dw Subanimation0d - dw Subanimation0e - dw Subanimation0f - dw Subanimation10 - dw Subanimation11 - dw Subanimation12 - dw Subanimation13 - dw Subanimation14 - dw Subanimation15 - dw Subanimation16 - dw Subanimation17 - dw Subanimation18 - dw Subanimation19 - dw Subanimation1a - dw Subanimation1b - dw Subanimation1c - dw Subanimation1d - dw Subanimation1e - dw Subanimation1f - dw Subanimation20 - dw Subanimation21 - dw Subanimation22 - dw Subanimation23 - dw Subanimation24 - dw Subanimation25 - dw Subanimation26 - dw Subanimation27 - dw Subanimation28 - dw Subanimation29 - dw Subanimation2a - dw Subanimation2b - dw Subanimation2c - dw Subanimation2d - dw Subanimation2e - dw Subanimation2f - dw Subanimation30 - dw Subanimation31 - dw Subanimation32 - dw Subanimation33 - dw Subanimation34 - dw Subanimation35 - dw Subanimation36 - dw Subanimation37 - dw Subanimation38 - dw Subanimation39 - dw Subanimation3a - dw Subanimation3b - dw Subanimation3c - dw Subanimation3d - dw Subanimation3e - dw Subanimation3f - dw Subanimation40 - dw Subanimation41 - dw Subanimation42 - dw Subanimation43 - dw Subanimation44 - dw Subanimation45 - dw Subanimation46 - dw Subanimation47 - dw Subanimation48 - dw Subanimation49 - dw Subanimation4a - dw Subanimation4b - dw Subanimation4c - dw Subanimation4d - dw Subanimation4e - dw Subanimation4f - dw Subanimation50 - dw Subanimation51 - dw Subanimation52 - dw Subanimation53 - dw Subanimation54 - dw Subanimation55 - -Subanimation04: - db $43 - db $02,$1a,$00 - db $02,$10,$00 - db $02,$03,$00 - -Subanimation05: - db $41 - db $02,$10,$00 - -Subanimation08: - db $0b - db $03,$30,$00 - db $03,$44,$00 - db $03,$94,$00 - db $03,$60,$00 - db $03,$76,$00 - db $03,$9f,$00 - db $03,$8d,$00 - db $03,$a0,$00 - db $03,$1a,$00 - db $03,$a1,$00 - db $03,$34,$00 - -Subanimation07: - db $0b - db $03,$30,$00 - db $03,$a2,$00 - db $03,$31,$00 - db $03,$a3,$00 - db $03,$32,$00 - db $03,$a4,$00 - db $03,$92,$00 - db $03,$a5,$00 - db $03,$15,$00 - db $03,$a6,$00 - db $03,$34,$00 - -Subanimation06: - db $0b - db $03,$30,$00 - db $03,$a2,$00 - db $03,$93,$00 - db $03,$61,$00 - db $03,$73,$00 - db $03,$a7,$00 - db $03,$33,$00 - db $03,$a8,$00 - db $03,$0e,$00 - db $03,$a9,$00 - db $03,$34,$00 - -Subanimation09: - db $04 - db $03,$21,$04 - db $04,$21,$04 - db $03,$21,$04 - db $05,$21,$04 - -Subanimation0a: - db $46 - db $06,$1b,$00 - db $07,$1b,$00 - db $08,$36,$00 - db $09,$36,$00 - db $0a,$15,$00 - db $0a,$15,$00 - -Subanimation0b: - db $04 - db $01,$2d,$00 - db $03,$2f,$00 - db $03,$35,$00 - db $03,$4d,$00 - -Subanimation55: - db $41 - db $01,$9d,$00 - -Subanimation11: - db $4c - db $0b,$26,$00 - db $0c,$26,$00 - db $0b,$26,$00 - db $0c,$26,$00 - db $0b,$28,$00 - db $0c,$28,$00 - db $0b,$28,$00 - db $0c,$28,$00 - db $0b,$27,$00 - db $0c,$27,$00 - db $0b,$27,$00 - db $0c,$27,$00 - -Subanimation2b: - db $4b - db $0d,$03,$03 - db $0e,$03,$03 - db $0f,$03,$00 - db $0d,$11,$00 - db $0d,$11,$00 - db $0d,$37,$00 - db $0d,$37,$00 - db $10,$21,$00 - db $10,$21,$00 - db $11,$1b,$00 - db $11,$1b,$00 - -Subanimation2c: - db $4c - db $12,$01,$00 - db $12,$0f,$00 - db $12,$1b,$00 - db $12,$25,$00 - db $13,$38,$00 - db $13,$38,$02 - db $14,$38,$00 - db $14,$38,$02 - db $15,$38,$00 - db $15,$38,$00 - db $16,$38,$00 - db $16,$38,$00 - -Subanimation12: - db $69 - db $17,$30,$00 - db $17,$39,$00 - db $17,$3a,$00 - db $17,$3b,$00 - db $17,$3c,$00 - db $17,$3d,$00 - db $17,$3e,$00 - db $17,$3f,$00 - db $17,$1f,$00 - -Subanimation00: - db $41 - db $01,$17,$00 - -Subanimation01: - db $42 - db $01,$0f,$00 - db $01,$1d,$00 - -Subanimation02: - db $43 - db $01,$12,$00 - db $01,$15,$00 - db $01,$1c,$00 - -Subanimation03: - db $44 - db $01,$0b,$00 - db $01,$11,$00 - db $01,$18,$00 - db $01,$1d,$00 - -Subanimation0c: - db $43 - db $0c,$20,$00 - db $0c,$21,$00 - db $0c,$23,$00 - -Subanimation0d: - db $46 - db $0c,$20,$02 - db $0c,$15,$00 - db $0c,$21,$02 - db $0c,$17,$00 - db $0c,$23,$02 - db $0c,$19,$00 - -Subanimation0e: - db $49 - db $0c,$20,$02 - db $0c,$15,$02 - db $0c,$07,$00 - db $0c,$21,$02 - db $0c,$17,$02 - db $0c,$09,$00 - db $0c,$23,$02 - db $0c,$19,$02 - db $0c,$0c,$00 - -Subanimation1f: - db $85 - db $0c,$30,$03 - db $0c,$40,$03 - db $0c,$41,$03 - db $0c,$42,$03 - db $0c,$21,$00 - -Subanimation2e: - db $2e - db $18,$43,$02 - db $75,$52,$04 - db $19,$43,$02 - db $75,$63,$04 - db $1a,$43,$02 - db $75,$4d,$04 - db $1b,$43,$02 - db $75,$97,$04 - db $1c,$43,$02 - db $75,$98,$04 - db $1d,$43,$02 - db $75,$58,$04 - db $1e,$43,$02 - db $75,$1b,$00 - -Subanimation2f: - db $44 - db $1f,$24,$00 - db $20,$20,$00 - db $21,$1a,$00 - db $22,$15,$00 - -Subanimation30: - db $52 - db $23,$00,$02 - db $23,$02,$02 - db $23,$04,$00 - db $23,$07,$02 - db $23,$02,$02 - db $23,$04,$00 - db $23,$0e,$02 - db $23,$02,$02 - db $23,$0c,$00 - db $25,$07,$00 - db $25,$0e,$00 - db $25,$15,$00 - db $24,$24,$02 - db $23,$1c,$02 - db $23,$23,$00 - db $23,$21,$02 - db $24,$28,$00 - db $24,$28,$00 - -Subanimation0f: - db $4c - db $26,$0e,$02 - db $26,$16,$02 - db $26,$1c,$00 - db $27,$0e,$02 - db $27,$16,$02 - db $27,$1c,$00 - db $28,$0e,$02 - db $28,$16,$02 - db $28,$1c,$00 - db $29,$0e,$02 - db $29,$16,$02 - db $29,$1c,$00 - -Subanimation16: - db $4c - db $2a,$05,$00 - db $2b,$05,$02 - db $2b,$0c,$02 - db $2a,$11,$04 - db $2b,$11,$02 - db $2b,$17,$02 - db $2a,$1b,$04 - db $2b,$1b,$02 - db $2b,$20,$02 - db $2a,$2f,$04 - db $2c,$00,$02 - db $2c,$00,$00 - -Subanimation10: - db $88 - db $2d,$44,$00 - db $2e,$45,$00 - db $2d,$46,$00 - db $2e,$47,$00 - db $2d,$48,$00 - db $2e,$49,$00 - db $2d,$2f,$00 - db $2e,$1a,$00 - -Subanimation31: - db $2a - db $2f,$46,$00 - db $2f,$4a,$00 - db $2f,$4b,$00 - db $2f,$4c,$00 - db $2f,$4d,$00 - db $2f,$4e,$00 - db $2f,$4f,$00 - db $2f,$50,$00 - db $2f,$2e,$00 - db $2f,$51,$00 - -Subanimation13: - db $86 - db $30,$31,$00 - db $30,$32,$00 - db $30,$92,$00 - db $30,$0e,$00 - db $30,$0f,$00 - db $30,$10,$00 - -Subanimation14: - db $49 - db $30,$10,$00 - db $30,$10,$03 - db $31,$1c,$04 - db $31,$21,$04 - db $31,$26,$00 - db $30,$10,$02 - db $31,$1d,$04 - db $31,$22,$04 - db $31,$27,$00 - -Subanimation41: - db $85 - db $03,$31,$00 - db $03,$32,$00 - db $03,$92,$00 - db $03,$0e,$00 - db $03,$10,$00 - -Subanimation42: - db $43 - db $48,$08,$00 - db $49,$08,$00 - db $5a,$08,$00 - -Subanimation15: - db $22 - db $35,$52,$00 - db $35,$53,$00 - -Subanimation17: - db $44 - db $36,$54,$00 - db $36,$55,$00 - db $37,$56,$00 - db $37,$57,$00 - -Subanimation18: - db $a4 - db $36,$54,$00 - db $36,$55,$00 - db $37,$56,$00 - db $37,$57,$00 - -Subanimation40: - db $46 - db $17,$54,$00 - db $17,$55,$00 - db $17,$0e,$00 - db $17,$56,$00 - db $17,$57,$00 - db $17,$13,$00 - -Subanimation19: - db $8c - db $38,$31,$00 - db $39,$31,$00 - db $38,$32,$00 - db $39,$32,$00 - db $38,$92,$00 - db $39,$92,$00 - db $38,$0e,$00 - db $39,$0e,$00 - db $38,$0f,$00 - db $39,$0f,$00 - db $38,$10,$00 - db $39,$10,$00 - -Subanimation1a: - db $50 - db $3a,$08,$00 - db $3b,$08,$00 - db $3c,$08,$00 - db $3d,$08,$00 - db $3e,$08,$00 - db $3f,$08,$00 - db $3e,$08,$00 - db $3f,$08,$00 - db $3a,$0b,$00 - db $3b,$0b,$00 - db $3c,$0b,$00 - db $3d,$0b,$00 - db $3e,$0b,$00 - db $3f,$0b,$00 - db $3e,$0b,$00 - db $3f,$0b,$00 - -Subanimation1b: - db $84 - db $40,$31,$00 - db $40,$32,$00 - db $40,$92,$00 - db $40,$15,$00 - -Subanimation1c: - db $43 - db $41,$58,$00 - db $41,$59,$00 - db $41,$21,$00 - -Subanimation1d: - db $af - db $24,$9a,$00 - db $23,$1b,$02 - db $24,$22,$00 - db $23,$16,$02 - db $23,$1d,$02 - db $24,$98,$00 - db $25,$2c,$04 - db $25,$2a,$04 - db $25,$99,$04 - db $25,$62,$04 - db $25,$99,$04 - db $25,$62,$04 - db $25,$99,$04 - db $25,$62,$04 - db $25,$99,$03 - -Subanimation1e: - db $01 - db $25,$75,$00 - -Subanimation20: - db $42 - db $42,$07,$00 - db $43,$07,$00 - -Subanimation21: - db $43 - db $44,$00,$00 - db $45,$08,$00 - db $46,$10,$02 - -Subanimation22: - db $8b - db $47,$10,$00 - db $47,$56,$00 - db $47,$07,$00 - db $47,$aa,$00 - db $47,$ab,$00 - db $47,$ac,$00 - db $47,$ad,$00 - db $47,$ae,$00 - db $47,$af,$00 - db $47,$89,$00 - db $47,$b0,$00 - -Subanimation2d: - db $66 - db $44,$64,$00 - db $45,$65,$00 - db $46,$66,$00 - db $47,$66,$00 - db $47,$66,$00 - db $47,$66,$00 - -Subanimation39: - db $61 - db $47,$67,$00 - -Subanimation4e: - db $41 - db $71,$0f,$03 - -Subanimation4f: - db $47 - db $71,$0f,$00 - db $71,$08,$00 - db $71,$01,$00 - db $71,$95,$00 - db $72,$95,$00 - db $73,$95,$00 - db $74,$95,$00 - -Subanimation50: - db $48 - db $74,$95,$00 - db $73,$95,$00 - db $72,$95,$00 - db $71,$95,$00 - db $71,$01,$00 - db $71,$08,$00 - db $71,$0f,$00 - db $71,$16,$00 - -Subanimation29: - db $5d - db $48,$0f,$00 - db $4a,$68,$03 - db $4b,$2a,$03 - db $49,$0f,$00 - db $4a,$68,$03 - db $4b,$2a,$00 - db $4c,$6a,$03 - db $4d,$69,$03 - db $49,$6b,$00 - db $4c,$6a,$03 - db $4d,$69,$00 - db $4a,$68,$03 - db $4b,$2a,$03 - db $49,$6c,$00 - db $4a,$68,$03 - db $4b,$2a,$00 - db $4c,$6a,$03 - db $4d,$69,$03 - db $49,$6d,$00 - db $4c,$6a,$03 - db $4d,$2a,$00 - db $4a,$68,$03 - db $4b,$2a,$03 - db $49,$0f,$00 - db $4a,$68,$03 - db $4b,$2a,$00 - db $4c,$6a,$03 - db $4d,$2a,$03 - db $49,$6b,$00 - -Subanimation2a: - db $44 - db $4e,$2b,$00 - db $4f,$2b,$00 - db $50,$2b,$00 - db $50,$2b,$00 - -Subanimation23: - db $42 - db $51,$2d,$00 - db $51,$6e,$00 - -Subanimation24: - db $a2 - db $51,$2d,$00 - db $51,$6e,$00 - -Subanimation25: - db $62 - db $52,$71,$00 - db $52,$72,$00 - -Subanimation26: - db $02 - db $52,$01,$00 - db $52,$2c,$00 - -Subanimation3a: - db $63 - db $53,$71,$00 - db $53,$7f,$00 - db $53,$81,$00 - -Subanimation3b: - db $03 - db $53,$01,$00 - db $53,$15,$00 - db $53,$2c,$00 - -Subanimation27: - db $a2 - db $54,$01,$00 - db $54,$2c,$00 - -Subanimation28: - db $23 - db $55,$73,$03 - db $56,$73,$03 - db $57,$73,$00 - -Subanimation32: - db $63 - db $47,$74,$00 - db $47,$43,$00 - db $47,$75,$00 - -Subanimation33: - db $26 - db $58,$76,$00 - db $34,$76,$00 - db $58,$76,$00 - db $34,$76,$00 - db $58,$76,$00 - db $34,$76,$00 - -Subanimation3c: - db $67 - db $59,$79,$03 - db $59,$7b,$03 - db $59,$77,$03 - db $59,$7a,$03 - db $59,$78,$03 - db $59,$7c,$03 - db $59,$76,$00 - -Subanimation3d: - db $08 - db $3a,$4d,$00 - db $3b,$4d,$00 - db $3c,$4d,$00 - db $3d,$4d,$00 - db $3e,$4d,$00 - db $3f,$4d,$00 - db $3e,$4d,$00 - db $3f,$4d,$00 - -Subanimation34: - db $35 - db $48,$7d,$00 - db $49,$7d,$00 - db $5a,$7d,$00 - db $48,$30,$00 - db $49,$30,$00 - db $5a,$30,$00 - db $48,$7e,$00 - db $49,$7e,$00 - db $5a,$7e,$00 - db $48,$7f,$00 - db $49,$7f,$00 - db $5a,$7f,$00 - db $48,$80,$00 - db $49,$80,$00 - db $5a,$80,$00 - db $48,$81,$00 - db $49,$81,$00 - db $5a,$81,$00 - db $48,$82,$00 - db $49,$82,$00 - db $5a,$82,$00 - -Subanimation35: - db $24 - db $5b,$83,$03 - db $5c,$84,$03 - db $5d,$85,$03 - db $5e,$09,$00 - -Subanimation36: - db $48 - db $5f,$2a,$00 - db $5f,$00,$00 - db $60,$2a,$00 - db $60,$00,$00 - db $61,$2a,$00 - db $61,$00,$00 - db $62,$2a,$00 - db $62,$00,$00 - -Subanimation37: - db $2a - db $63,$89,$00 - db $64,$75,$00 - db $63,$76,$00 - db $65,$0d,$00 - db $65,$86,$00 - db $65,$12,$00 - db $65,$87,$00 - db $65,$17,$00 - db $65,$88,$00 - db $65,$1a,$00 - -Subanimation38: - db $50 - db $66,$8a,$00 - db $66,$33,$00 - db $66,$2e,$00 - db $67,$24,$03 - db $66,$01,$04 - db $66,$10,$04 - db $66,$1d,$04 - db $67,$28,$03 - db $66,$2a,$04 - db $66,$0e,$04 - db $66,$1b,$04 - db $67,$26,$03 - db $66,$03,$04 - db $66,$12,$04 - db $66,$1e,$04 - db $67,$29,$00 - -Subanimation3e: - db $92 - db $02,$31,$00 - db $34,$31,$00 - db $02,$31,$00 - db $02,$32,$00 - db $34,$32,$00 - db $02,$32,$00 - db $02,$92,$00 - db $34,$92,$00 - db $02,$92,$00 - db $02,$0e,$00 - db $34,$0e,$00 - db $02,$0e,$00 - db $02,$0f,$00 - db $34,$0f,$00 - db $02,$0f,$00 - db $02,$10,$00 - db $34,$10,$00 - db $02,$10,$00 - -Subanimation3f: - db $72 - db $68,$4b,$00 - db $68,$8c,$00 - db $68,$20,$00 - db $68,$1c,$00 - db $68,$19,$00 - db $68,$14,$00 - db $68,$76,$00 - db $68,$8d,$00 - db $68,$15,$00 - db $68,$10,$00 - db $68,$0c,$00 - db $68,$06,$00 - db $68,$8e,$00 - db $68,$8f,$00 - db $68,$90,$00 - db $68,$26,$00 - db $68,$23,$00 - db $68,$1f,$00 - -Subanimation44: - db $2c - db $69,$4b,$00 - db $69,$8c,$00 - db $69,$20,$00 - db $69,$1c,$00 - db $69,$19,$00 - db $69,$14,$00 - db $69,$76,$00 - db $69,$8d,$00 - db $69,$15,$00 - db $69,$10,$00 - db $69,$0c,$00 - db $69,$06,$00 - -Subanimation43: - db $a3 - db $6a,$07,$00 - db $6b,$0f,$00 - db $6c,$17,$00 - -Subanimation45: - db $24 - db $6d,$8b,$00 - db $6d,$84,$00 - db $6d,$63,$00 - db $6d,$8c,$00 - -Subanimation46: - db $26 - db $6d,$8b,$00 - db $6d,$84,$00 - db $6d,$63,$00 - db $6d,$8c,$00 - db $6d,$0a,$00 - db $6d,$89,$00 - -Subanimation47: - db $23 - db $06,$82,$00 - db $07,$82,$00 - db $08,$96,$00 - -Subanimation48: - db $06 - db $03,$41,$04 - db $03,$48,$04 - db $04,$48,$04 - db $03,$48,$04 - db $05,$48,$04 - db $03,$48,$03 - -Subanimation49: - db $04 - db $04,$48,$04 - db $03,$48,$04 - db $05,$48,$04 - db $03,$48,$03 - -Subanimation4a: - db $01 - db $04,$84,$03 - -Subanimation4b: - db $03 - db $06,$72,$00 - db $07,$72,$00 - db $08,$72,$00 - -Subanimation4c: - db $68 - db $6f,$30,$00 - db $6e,$30,$00 - db $70,$30,$00 - db $6e,$30,$00 - db $6f,$30,$00 - db $6e,$30,$00 - db $70,$30,$00 - db $6e,$30,$00 - -Subanimation4d: - db $26 - db $32,$4b,$00 - db $33,$4f,$00 - db $32,$20,$00 - db $33,$16,$00 - db $32,$19,$00 - db $33,$0d,$00 - -Subanimation51: - db $a6 - db $76,$1b,$00 - db $34,$1b,$00 - db $76,$1b,$00 - db $34,$1b,$00 - db $76,$1b,$00 - db $34,$1b,$00 - -Subanimation52: - db $47 - db $77,$25,$00 - db $77,$9b,$00 - db $77,$1a,$00 - db $77,$9c,$00 - db $77,$2f,$00 - db $77,$50,$00 - db $77,$8c,$00 - -Subanimation53: - db $0c - db $78,$30,$00 - db $78,$a2,$00 - db $78,$93,$00 - db $78,$61,$00 - db $78,$73,$00 - db $78,$a7,$00 - db $78,$33,$00 - db $78,$a8,$00 - db $78,$0e,$00 - db $78,$a9,$00 - db $78,$34,$00 - db $01,$9e,$00 - -Subanimation54: - db $0b - db $79,$30,$00 - db $79,$a2,$00 - db $79,$93,$00 - db $79,$61,$00 - db $79,$73,$00 - db $79,$a7,$00 - db $79,$33,$00 - db $79,$a8,$00 - db $79,$0e,$00 - db $79,$a9,$00 - db $79,$34,$00 - -FrameBlockPointers: - dw FrameBlock00 - dw FrameBlock01 - dw FrameBlock02 - dw FrameBlock03 - dw FrameBlock04 - dw FrameBlock05 - dw FrameBlock06 - dw FrameBlock07 - dw FrameBlock08 - dw FrameBlock09 - dw FrameBlock0a - dw FrameBlock0b - dw FrameBlock0c - dw FrameBlock0d - dw FrameBlock0e - dw FrameBlock0f - dw FrameBlock10 - dw FrameBlock11 - dw FrameBlock12 - dw FrameBlock13 - dw FrameBlock14 - dw FrameBlock15 - dw FrameBlock16 - dw FrameBlock17 - dw FrameBlock18 - dw FrameBlock19 - dw FrameBlock1a - dw FrameBlock1b - dw FrameBlock1c - dw FrameBlock1d - dw FrameBlock1e - dw FrameBlock1f - dw FrameBlock20 - dw FrameBlock21 - dw FrameBlock22 - dw FrameBlock23 - dw FrameBlock24 - dw FrameBlock25 - dw FrameBlock26 - dw FrameBlock27 - dw FrameBlock28 - dw FrameBlock29 - dw FrameBlock2a - dw FrameBlock2b - dw FrameBlock2c - dw FrameBlock2d - dw FrameBlock2e - dw FrameBlock2f - dw FrameBlock30 - dw FrameBlock31 - dw FrameBlock32 - dw FrameBlock33 - dw FrameBlock34 - dw FrameBlock35 - dw FrameBlock36 - dw FrameBlock37 - dw FrameBlock38 - dw FrameBlock39 - dw FrameBlock3a - dw FrameBlock3b - dw FrameBlock3c - dw FrameBlock3d - dw FrameBlock3e - dw FrameBlock3f - dw FrameBlock40 - dw FrameBlock41 - dw FrameBlock42 - dw FrameBlock43 - dw FrameBlock44 - dw FrameBlock45 - dw FrameBlock46 - dw FrameBlock47 - dw SmallBlackCircleFrameBlock - dw LargeBlockCircleFrameBlock - dw FrameBlock4a - dw FrameBlock4b - dw FrameBlock4c - dw FrameBlock4d - dw FrameBlock4e - dw FrameBlock4f - dw FrameBlock50 - dw FrameBlock51 - dw FrameBlock52 - dw FrameBlock53 - dw FrameBlock54 - dw FrameBlock55 - dw FrameBlock56 - dw FrameBlock57 - dw FrameBlock58 - dw FrameBlock59 - dw FrameBlock5a - dw FrameBlock5b - dw FrameBlock5c - dw FrameBlock5d - dw FrameBlock5e - dw FrameBlock5f - dw FrameBlock60 - dw FrameBlock61 - dw FrameBlock62 - dw FrameBlock63 - dw FrameBlock64 - dw FrameBlock65 - dw FrameBlock66 - dw FrameBlock67 - dw FrameBlock68 - dw FrameBlock69 - dw FrameBlock6a - dw FrameBlock6b - dw FrameBlock6c - dw FrameBlock6d - dw FrameBlock6e - dw FrameBlock6f - dw FrameBlock70 - dw FrameBlock71 - dw FrameBlock72 - dw FrameBlock73 - dw FrameBlock74 - dw FrameBlock75 - dw FrameBlock76 - dw FrameBlock77 - dw FrameBlock78 - dw FrameBlock79 - -; FrameBlock format is as follows: -; first byte = number of tiles in FrameBlock -; -; Next, each group of 4 bytes describes a tile in the FrameBlock -; first byte = y offset -; second byte = x offset -; third byte = tile id (it's actually tile id - $31) -; fourth byte = tile properties (xflip/yflip/etc.) -FrameBlock01: - db $09 - db $00,$00,$2c,$00 - db $00,$08,$2d,$00 - db $00,$10,$2c,$20 - db $08,$00,$3c,$00 - db $08,$08,$3d,$00 - db $08,$10,$3c,$20 - db $10,$00,$2c,$40 - db $10,$08,$2d,$40 - db $10,$10,$2c,$60 - -FrameBlock02: - db $10 - db $00,$00,$20,$00 - db $00,$08,$21,$00 - db $00,$10,$21,$20 - db $00,$18,$20,$20 - db $08,$00,$30,$00 - db $08,$08,$31,$00 - db $08,$10,$31,$20 - db $08,$18,$30,$20 - db $10,$00,$30,$40 - db $10,$08,$31,$40 - db $10,$10,$31,$60 - db $10,$18,$30,$60 - db $18,$00,$20,$40 - db $18,$08,$21,$40 - db $18,$10,$21,$60 - db $18,$18,$20,$60 - -FrameBlock03: - db $04 - db $00,$00,$02,$00 - db $00,$08,$02,$20 - db $08,$00,$12,$00 - db $08,$08,$12,$20 - -FrameBlock04: - db $04 - db $00,$00,$06,$00 - db $00,$08,$07,$00 - db $08,$00,$16,$00 - db $08,$08,$17,$00 - -FrameBlock05: - db $04 - db $00,$00,$07,$20 - db $00,$08,$06,$20 - db $08,$00,$17,$20 - db $08,$08,$16,$20 - -FrameBlock06: - db $0c - db $00,$08,$23,$00 - db $08,$00,$32,$00 - db $08,$08,$33,$00 - db $00,$10,$23,$20 - db $08,$10,$33,$20 - db $08,$18,$32,$20 - db $10,$00,$32,$40 - db $10,$08,$33,$40 - db $18,$08,$23,$40 - db $10,$10,$33,$60 - db $10,$18,$32,$60 - db $18,$10,$23,$60 - -FrameBlock07: - db $10 - db $00,$00,$20,$00 - db $00,$08,$21,$00 - db $08,$00,$30,$00 - db $08,$08,$31,$00 - db $00,$10,$21,$20 - db $00,$18,$20,$20 - db $08,$10,$31,$20 - db $08,$18,$30,$20 - db $10,$00,$30,$40 - db $10,$08,$31,$40 - db $18,$00,$20,$40 - db $18,$08,$21,$40 - db $10,$10,$31,$60 - db $10,$18,$30,$60 - db $18,$10,$21,$60 - db $18,$18,$20,$60 - -FrameBlock08: - db $10 - db $00,$00,$20,$00 - db $00,$08,$21,$00 - db $08,$00,$30,$00 - db $08,$08,$31,$00 - db $00,$18,$21,$20 - db $00,$20,$20,$20 - db $08,$18,$31,$20 - db $08,$20,$30,$20 - db $18,$00,$30,$40 - db $18,$08,$31,$40 - db $20,$00,$20,$40 - db $20,$08,$21,$40 - db $18,$18,$31,$60 - db $18,$20,$30,$60 - db $20,$18,$21,$60 - db $20,$20,$20,$60 - -FrameBlock09: - db $0c - db $00,$00,$24,$00 - db $00,$08,$25,$00 - db $08,$00,$34,$00 - db $00,$18,$25,$20 - db $00,$20,$24,$20 - db $08,$20,$34,$20 - db $18,$00,$34,$40 - db $20,$00,$24,$40 - db $20,$08,$25,$40 - db $18,$20,$34,$60 - db $20,$18,$25,$60 - db $20,$20,$24,$60 - -FrameBlock0a: - db $0c - db $00,$00,$24,$00 - db $00,$08,$25,$00 - db $08,$00,$34,$00 - db $00,$20,$25,$20 - db $00,$28,$24,$20 - db $08,$28,$34,$20 - db $20,$00,$34,$40 - db $28,$00,$24,$40 - db $28,$08,$25,$40 - db $20,$28,$34,$60 - db $28,$20,$25,$60 - db $28,$28,$24,$60 - -FrameBlock0b: - db $04 - db $00,$00,$05,$00 - db $00,$08,$05,$20 - db $08,$00,$15,$00 - db $08,$08,$15,$20 - -FrameBlock0c: - db $04 - db $00,$00,$04,$00 - db $00,$08,$04,$20 - db $08,$00,$14,$00 - db $08,$08,$14,$20 - -FrameBlock0d: - db $08 - db $00,$00,$0c,$00 - db $00,$08,$0d,$00 - db $08,$00,$1c,$00 - db $08,$08,$1d,$00 - db $10,$00,$1d,$60 - db $10,$08,$1c,$60 - db $18,$00,$0d,$60 - db $18,$08,$0c,$60 - -FrameBlock0e: - db $04 - db $20,$00,$0c,$00 - db $20,$08,$0d,$00 - db $28,$00,$1c,$00 - db $28,$08,$1d,$00 - -FrameBlock0f: - db $04 - db $30,$00,$1d,$60 - db $30,$08,$1c,$60 - db $38,$00,$0d,$60 - db $38,$08,$0c,$60 - -FrameBlock10: - db $08 - db $00,$00,$0e,$00 - db $00,$08,$0f,$00 - db $08,$00,$1e,$00 - db $08,$08,$1f,$00 - db $00,$10,$0f,$20 - db $00,$18,$0e,$20 - db $08,$10,$1f,$20 - db $08,$18,$1e,$20 - -FrameBlock11: - db $08 - db $00,$00,$0e,$00 - db $00,$08,$0f,$00 - db $08,$00,$1e,$00 - db $08,$08,$1f,$00 - db $00,$20,$0f,$20 - db $00,$28,$0e,$20 - db $08,$20,$1f,$20 - db $08,$28,$1e,$20 - -FrameBlock12: - db $03 - db $00,$00,$37,$00 - db $08,$10,$37,$00 - db $00,$20,$37,$00 - -FrameBlock13: - db $04 - db $00,$00,$36,$00 - db $00,$08,$36,$20 - db $08,$00,$36,$40 - db $08,$08,$36,$60 - -FrameBlock14: - db $08 - db $00,$10,$28,$00 - db $00,$18,$28,$20 - db $08,$10,$38,$00 - db $08,$18,$38,$20 - db $00,$20,$36,$00 - db $00,$28,$36,$20 - db $08,$20,$36,$40 - db $08,$28,$36,$60 - -FrameBlock15: - db $0c - db $00,$00,$28,$00 - db $00,$08,$28,$20 - db $08,$00,$38,$00 - db $08,$08,$38,$20 - db $00,$10,$29,$00 - db $00,$18,$29,$20 - db $08,$10,$39,$00 - db $08,$18,$39,$20 - db $00,$20,$28,$00 - db $00,$28,$28,$20 - db $08,$20,$38,$00 - db $08,$28,$38,$20 - -FrameBlock16: - db $08 - db $00,$00,$29,$00 - db $00,$08,$29,$20 - db $08,$00,$39,$00 - db $08,$08,$39,$20 - db $00,$20,$29,$00 - db $00,$28,$29,$20 - db $08,$20,$39,$00 - db $08,$28,$39,$20 - -FrameBlock17: - db $04 - db $00,$00,$08,$00 - db $00,$08,$09,$00 - db $08,$00,$18,$00 - db $08,$08,$19,$00 - -FrameBlock18: - db $01 - db $18,$00,$45,$60 - -FrameBlock19: - db $02 - db $18,$08,$45,$00 - db $10,$08,$46,$60 - -FrameBlock1a: - db $02 - db $10,$10,$45,$60 - db $18,$10,$46,$00 - -FrameBlock1b: - db $02 - db $10,$18,$45,$00 - db $08,$18,$46,$60 - -FrameBlock1c: - db $02 - db $08,$20,$45,$60 - db $10,$20,$46,$00 - -FrameBlock1d: - db $02 - db $08,$28,$45,$00 - db $00,$28,$46,$60 - -FrameBlock1e: - db $02 - db $00,$30,$45,$60 - db $08,$30,$46,$00 - -FrameBlock75: - db $04 - db $00,$00,$43,$00 - db $00,$08,$43,$20 - db $08,$00,$22,$00 - db $08,$08,$43,$60 - -FrameBlock1f: - db $02 - db $00,$00,$03,$00 - db $00,$30,$03,$20 - -FrameBlock20: - db $06 - db $00,$00,$03,$00 - db $00,$30,$03,$20 - db $08,$08,$03,$00 - db $08,$28,$03,$20 - db $08,$00,$13,$00 - db $08,$30,$13,$20 - -FrameBlock21: - db $0c - db $00,$00,$03,$00 - db $00,$30,$03,$20 - db $08,$08,$03,$00 - db $08,$28,$03,$20 - db $08,$00,$13,$00 - db $08,$30,$13,$20 - db $10,$10,$03,$00 - db $10,$20,$03,$20 - db $10,$08,$13,$00 - db $10,$28,$13,$20 - db $10,$00,$03,$00 - db $10,$30,$03,$20 - -FrameBlock22: - db $13 - db $00,$00,$03,$00 - db $08,$00,$13,$00 - db $10,$00,$03,$00 - db $18,$00,$13,$00 - db $08,$08,$03,$00 - db $10,$08,$13,$00 - db $18,$08,$03,$00 - db $10,$10,$03,$00 - db $18,$10,$13,$00 - db $18,$18,$03,$00 - db $10,$20,$03,$20 - db $18,$20,$13,$20 - db $08,$28,$03,$20 - db $10,$28,$13,$20 - db $18,$28,$03,$20 - db $00,$30,$03,$20 - db $08,$30,$13,$20 - db $10,$30,$03,$20 - db $18,$30,$13,$20 - -FrameBlock23: - db $04 - db $00,$00,$0a,$00 - db $00,$08,$0b,$00 - db $08,$00,$1a,$00 - db $08,$08,$1b,$00 - -FrameBlock24: - db $02 - db $08,$00,$0a,$00 - db $08,$08,$0b,$00 - -FrameBlock25: - db $0c - db $10,$00,$0a,$00 - db $10,$08,$0b,$00 - db $18,$00,$1a,$00 - db $18,$08,$1b,$00 - db $00,$10,$0a,$00 - db $00,$18,$0b,$00 - db $08,$10,$1a,$00 - db $08,$18,$1b,$00 - db $08,$20,$0a,$00 - db $08,$28,$0b,$00 - db $10,$20,$1a,$00 - db $10,$28,$1b,$00 - -FrameBlock26: - db $04 - db $00,$10,$44,$00 - db $00,$18,$44,$20 - db $08,$10,$44,$40 - db $08,$18,$44,$60 - -FrameBlock27: - db $05 - db $08,$08,$44,$00 - db $08,$10,$44,$20 - db $10,$08,$44,$40 - db $10,$10,$44,$60 - db $00,$18,$47,$00 - -FrameBlock28: - db $06 - db $10,$00,$44,$00 - db $10,$08,$44,$20 - db $18,$00,$44,$40 - db $18,$08,$44,$60 - db $08,$10,$47,$00 - db $02,$16,$47,$00 - -FrameBlock29: - db $04 - db $18,$00,$47,$00 - db $12,$06,$47,$00 - db $0c,$0c,$47,$00 - db $06,$12,$47,$00 - -FrameBlock2a: - db $04 - db $00,$00,$44,$00 - db $00,$08,$44,$20 - db $08,$00,$44,$40 - db $08,$08,$44,$60 - -FrameBlock2b: - db $02 - db $06,$02,$47,$00 - db $00,$08,$47,$00 - -FrameBlock2c: - db $01 - db $a0,$00,$4d,$00 - -FrameBlock2d: - db $08 - db $00,$00,$26,$00 - db $00,$08,$27,$00 - db $08,$00,$36,$00 - db $08,$08,$37,$00 - db $10,$00,$28,$00 - db $10,$08,$29,$00 - db $18,$00,$38,$00 - db $18,$08,$39,$00 - -FrameBlock2e: - db $08 - db $00,$00,$27,$20 - db $00,$08,$26,$20 - db $08,$00,$37,$20 - db $08,$08,$36,$20 - db $10,$00,$29,$20 - db $10,$08,$28,$20 - db $18,$00,$39,$20 - db $18,$08,$38,$20 - -FrameBlock2f: - db $04 - db $00,$00,$0c,$00 - db $00,$08,$0d,$00 - db $08,$00,$0c,$40 - db $08,$08,$0d,$40 - -FrameBlock30: - db $04 - db $00,$00,$44,$00 - db $00,$08,$44,$20 - db $08,$00,$44,$40 - db $08,$08,$44,$60 - -FrameBlock31: - db $01 - db $00,$00,$45,$00 - -FrameBlock32: - db $07 - db $00,$00,$4d,$00 - db $00,$08,$2f,$00 - db $00,$10,$4d,$20 - db $08,$00,$4e,$00 - db $08,$08,$07,$00 - db $08,$10,$4e,$20 - db $10,$08,$3f,$00 - -FrameBlock33: - db $07 - db $00,$08,$3f,$40 - db $08,$00,$4e,$40 - db $08,$08,$07,$40 - db $08,$10,$4e,$60 - db $10,$00,$4d,$40 - db $10,$08,$2f,$40 - db $10,$10,$4d,$60 - -FrameBlock34: - db $01 - db $a0,$00,$00,$10 - -FrameBlock35: - db $06 - db $00,$00,$2a,$00 - db $00,$08,$2b,$00 - db $08,$00,$3a,$00 - db $10,$00,$3a,$40 - db $18,$00,$2a,$40 - db $18,$08,$2b,$40 - -FrameBlock36: - db $04 - db $00,$00,$00,$00 - db $00,$08,$01,$00 - db $08,$00,$10,$00 - db $08,$08,$11,$00 - -FrameBlock37: - db $04 - db $00,$00,$01,$a0 - db $00,$08,$00,$a0 - db $08,$00,$11,$a0 - db $08,$08,$10,$a0 - -FrameBlock38: - db $04 - db $00,$00,$0a,$00 - db $00,$08,$0b,$00 - db $08,$00,$1a,$00 - db $08,$08,$1b,$00 - -FrameBlock39: - db $04 - db $00,$00,$0b,$20 - db $00,$08,$0a,$20 - db $08,$00,$1b,$20 - db $08,$08,$1a,$20 - -FrameBlock3a: - db $04 - db $20,$00,$05,$00 - db $20,$08,$05,$20 - db $28,$00,$15,$00 - db $28,$08,$15,$20 - -FrameBlock3b: - db $05 - db $18,$00,$04,$00 - db $18,$08,$04,$20 - db $20,$00,$14,$00 - db $20,$08,$14,$20 - db $28,$04,$41,$00 - -FrameBlock3c: - db $06 - db $10,$00,$05,$00 - db $10,$08,$05,$20 - db $18,$00,$15,$00 - db $18,$08,$15,$20 - db $20,$04,$42,$00 - db $28,$04,$42,$00 - -FrameBlock3d: - db $07 - db $08,$00,$04,$00 - db $08,$08,$04,$20 - db $10,$00,$14,$00 - db $10,$08,$14,$20 - db $18,$04,$41,$00 - db $20,$04,$41,$00 - db $28,$04,$41,$00 - -FrameBlock3e: - db $08 - db $00,$00,$05,$00 - db $00,$08,$05,$20 - db $08,$00,$15,$00 - db $08,$08,$15,$20 - db $10,$04,$42,$00 - db $18,$04,$42,$00 - db $20,$04,$42,$00 - db $28,$04,$42,$00 - -FrameBlock3f: - db $08 - db $00,$00,$04,$00 - db $00,$08,$04,$20 - db $08,$00,$14,$00 - db $08,$08,$14,$20 - db $10,$04,$41,$00 - db $18,$04,$41,$00 - db $20,$04,$41,$00 - db $28,$04,$41,$00 - -FrameBlock40: - db $03 - db $00,$00,$3d,$00 - db $00,$08,$3d,$00 - db $08,$08,$3d,$00 - -FrameBlock41: - db $04 - db $00,$00,$06,$00 - db $00,$08,$06,$20 - db $08,$00,$16,$00 - db $08,$08,$17,$00 - -FrameBlock42: - db $0b - db $00,$10,$42,$00 - db $08,$00,$42,$00 - db $08,$08,$42,$00 - db $08,$10,$42,$00 - db $08,$18,$42,$00 - db $08,$20,$42,$00 - db $10,$10,$42,$00 - db $18,$08,$42,$00 - db $18,$18,$42,$00 - db $20,$00,$42,$00 - db $20,$20,$42,$00 - -FrameBlock43: - db $0b - db $00,$10,$41,$00 - db $08,$00,$41,$00 - db $08,$08,$41,$00 - db $08,$10,$41,$00 - db $08,$18,$41,$00 - db $08,$20,$41,$00 - db $10,$10,$41,$00 - db $18,$08,$41,$00 - db $18,$18,$41,$00 - db $20,$00,$41,$00 - db $20,$20,$41,$00 - -FrameBlock44: - db $04 - db $00,$00,$49,$00 - db $00,$28,$49,$00 - db $28,$00,$49,$00 - db $28,$28,$49,$00 - -FrameBlock45: - db $04 - db $00,$00,$49,$00 - db $00,$18,$49,$00 - db $18,$00,$49,$00 - db $18,$18,$49,$00 - -FrameBlock46: - db $04 - db $00,$00,$49,$00 - db $00,$08,$49,$00 - db $08,$00,$49,$00 - db $08,$08,$49,$00 - -FrameBlock47: - db $04 - db $00,$00,$43,$00 - db $00,$08,$43,$20 - db $08,$00,$43,$40 - db $08,$08,$43,$60 - -SmallBlackCircleFrameBlock: - db $04 - db $08,$08,$33,$00 - db $08,$10,$33,$20 - db $10,$08,$33,$40 - db $10,$10,$33,$60 - -LargeBlockCircleFrameBlock: - db $10 - db $00,$00,$22,$00 - db $00,$08,$23,$00 - db $00,$10,$23,$20 - db $00,$18,$22,$20 - db $08,$00,$32,$00 - db $08,$08,$43,$00 - db $08,$10,$43,$20 - db $08,$18,$32,$20 - db $10,$00,$32,$40 - db $10,$08,$43,$40 - db $10,$10,$43,$60 - db $10,$18,$32,$60 - db $18,$00,$22,$40 - db $18,$08,$23,$40 - db $18,$10,$23,$60 - db $18,$18,$22,$60 - -FrameBlock71: - db $10 - db $00,$00,$22,$00 - db $00,$08,$3b,$00 - db $00,$10,$23,$20 - db $00,$18,$22,$20 - db $08,$00,$32,$00 - db $08,$08,$43,$00 - db $08,$10,$43,$20 - db $08,$18,$32,$20 - db $10,$00,$32,$40 - db $10,$08,$43,$40 - db $10,$10,$43,$60 - db $10,$18,$32,$60 - db $18,$00,$22,$40 - db $18,$08,$23,$40 - db $18,$10,$23,$60 - db $18,$18,$22,$60 - -FrameBlock72: - db $0c - db $00,$00,$32,$00 - db $00,$08,$43,$00 - db $00,$10,$43,$20 - db $00,$18,$32,$20 - db $08,$00,$32,$40 - db $08,$08,$43,$40 - db $08,$10,$43,$60 - db $08,$18,$32,$60 - db $10,$00,$22,$40 - db $10,$08,$23,$40 - db $10,$10,$23,$60 - db $10,$18,$22,$60 - -FrameBlock73: - db $08 - db $00,$00,$32,$40 - db $00,$08,$43,$40 - db $00,$10,$43,$60 - db $00,$18,$32,$60 - db $08,$00,$22,$40 - db $08,$08,$23,$40 - db $08,$10,$23,$60 - db $08,$18,$22,$60 - -FrameBlock74: - db $04 - db $00,$00,$22,$40 - db $00,$08,$23,$40 - db $00,$10,$23,$60 - db $00,$18,$22,$60 - -FrameBlock4a: - db $04 - db $08,$18,$4c,$20 - db $20,$08,$4b,$00 - db $30,$20,$4c,$00 - db $18,$30,$4b,$40 - -FrameBlock4b: - db $04 - db $00,$18,$4c,$00 - db $20,$00,$4b,$40 - db $38,$20,$4c,$20 - db $18,$38,$4b,$00 - -FrameBlock4c: - db $04 - db $10,$08,$4a,$40 - db $30,$10,$4a,$00 - db $28,$30,$4a,$20 - db $08,$28,$4a,$60 - -FrameBlock4d: - db $04 - db $08,$00,$4a,$20 - db $38,$08,$4a,$60 - db $30,$38,$4a,$40 - db $00,$30,$4a,$00 - -FrameBlock4e: - db $08 - db $00,$30,$44,$00 - db $00,$38,$44,$20 - db $08,$30,$44,$40 - db $08,$38,$44,$60 - db $26,$0a,$44,$00 - db $26,$12,$44,$20 - db $2e,$0a,$44,$40 - db $2e,$12,$44,$60 - -FrameBlock4f: - db $0c - db $0e,$22,$44,$00 - db $0e,$2a,$44,$20 - db $16,$22,$44,$40 - db $16,$2a,$44,$60 - db $06,$32,$47,$00 - db $00,$38,$47,$00 - db $1a,$16,$44,$00 - db $1a,$1e,$44,$20 - db $22,$16,$44,$40 - db $22,$1e,$44,$60 - db $30,$08,$47,$00 - db $2a,$0e,$47,$00 - -FrameBlock50: - db $08 - db $06,$32,$47,$00 - db $00,$38,$47,$00 - db $12,$26,$47,$00 - db $0c,$2c,$47,$00 - db $1e,$1a,$47,$00 - db $18,$20,$47,$00 - db $2a,$0e,$47,$00 - db $24,$14,$47,$00 - -FrameBlock51: - db $08 - db $00,$00,$35,$20 - db $08,$00,$35,$40 - db $10,$00,$35,$00 - db $18,$00,$35,$60 - db $00,$40,$35,$00 - db $08,$40,$35,$60 - db $10,$40,$35,$20 - db $18,$40,$35,$40 - -FrameBlock52: - db $04 - db $00,$00,$2a,$00 - db $00,$08,$2b,$00 - db $08,$00,$3a,$00 - db $08,$08,$3b,$00 - -FrameBlock53: - db $03 - db $00,$00,$3f,$00 - db $00,$08,$3f,$00 - db $08,$06,$3f,$00 - -FrameBlock54: - db $04 - db $00,$00,$0e,$00 - db $00,$08,$0e,$20 - db $08,$00,$0f,$00 - db $08,$08,$0f,$20 - -FrameBlock55: - db $03 - db $10,$00,$2c,$00 - db $10,$08,$3c,$00 - db $10,$10,$2d,$00 - -FrameBlock56: - db $06 - db $10,$10,$31,$00 - db $10,$18,$31,$00 - db $08,$10,$2c,$00 - db $08,$18,$3c,$00 - db $08,$20,$2d,$00 - db $10,$20,$2d,$00 - -FrameBlock57: - db $09 - db $08,$20,$31,$00 - db $10,$20,$31,$00 - db $08,$28,$31,$00 - db $10,$28,$31,$00 - db $00,$20,$2c,$00 - db $00,$28,$3c,$00 - db $00,$30,$2d,$00 - db $08,$30,$2d,$00 - db $10,$30,$2d,$00 - -FrameBlock58: - db $07 - db $00,$00,$46,$00 - db $08,$02,$47,$00 - db $10,$03,$48,$00 - db $18,$04,$48,$00 - db $20,$05,$48,$00 - db $28,$05,$48,$00 - db $30,$05,$48,$00 - -FrameBlock59: - db $01 - db $00,$00,$42,$00 - -FrameBlock5a: - db $0c - db $00,$00,$24,$00 - db $00,$08,$25,$00 - db $08,$00,$34,$00 - db $00,$10,$25,$20 - db $00,$18,$24,$20 - db $08,$18,$34,$20 - db $10,$00,$34,$40 - db $18,$00,$24,$40 - db $18,$08,$25,$40 - db $10,$18,$34,$60 - db $18,$10,$25,$60 - db $18,$18,$24,$60 - -FrameBlock5b: - db $04 - db $00,$00,$43,$00 - db $00,$08,$43,$20 - db $08,$00,$43,$40 - db $08,$08,$43,$60 - -FrameBlock5c: - db $08 - db $00,$00,$49,$00 - db $02,$08,$49,$00 - db $18,$00,$49,$00 - db $10,$10,$49,$00 - db $08,$00,$43,$00 - db $08,$08,$43,$20 - db $10,$00,$43,$40 - db $10,$08,$43,$60 - -FrameBlock5d: - db $0b - db $00,$00,$49,$00 - db $18,$02,$49,$00 - db $14,$10,$49,$00 - db $08,$00,$43,$00 - db $00,$08,$43,$20 - db $10,$00,$43,$40 - db $10,$08,$43,$60 - db $04,$08,$43,$00 - db $04,$10,$43,$20 - db $0c,$08,$43,$40 - db $0c,$10,$43,$60 - -FrameBlock5e: - db $0f - db $00,$08,$49,$00 - db $08,$10,$49,$00 - db $20,$00,$49,$00 - db $08,$00,$43,$00 - db $08,$08,$43,$20 - db $10,$00,$43,$40 - db $10,$08,$43,$60 - db $10,$10,$43,$00 - db $10,$18,$43,$20 - db $18,$10,$43,$40 - db $18,$18,$43,$60 - db $20,$08,$43,$00 - db $20,$10,$43,$20 - db $28,$08,$43,$40 - db $28,$10,$43,$60 - -FrameBlock5f: - db $04 - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - -FrameBlock60: - db $08 - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - db $08,$08,$49,$00 - db $08,$18,$49,$00 - db $08,$28,$49,$00 - db $08,$38,$49,$00 - -FrameBlock61: - db $0c - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - db $08,$08,$49,$00 - db $08,$18,$49,$00 - db $08,$28,$49,$00 - db $08,$38,$49,$00 - db $10,$00,$49,$00 - db $10,$10,$49,$00 - db $10,$20,$49,$00 - db $10,$30,$49,$00 - -FrameBlock62: - db $0f - db $00,$00,$49,$00 - db $00,$10,$49,$00 - db $00,$20,$49,$00 - db $00,$30,$49,$00 - db $08,$08,$49,$00 - db $08,$18,$49,$00 - db $08,$28,$49,$00 - db $08,$38,$49,$00 - db $10,$00,$49,$00 - db $10,$10,$49,$00 - db $10,$20,$49,$00 - db $10,$30,$49,$00 - db $18,$08,$49,$00 - db $18,$18,$49,$00 - db $18,$28,$49,$00 - db $18,$38,$49,$00 ; unused - -FrameBlock63: - db $06 - db $10,$00,$26,$00 - db $10,$08,$27,$00 - db $08,$10,$26,$00 - db $08,$18,$27,$00 - db $00,$20,$26,$00 - db $00,$28,$27,$00 - -FrameBlock64: - db $06 - db $18,$00,$27,$00 - db $10,$08,$26,$00 - db $10,$10,$27,$00 - db $08,$18,$26,$00 - db $08,$20,$27,$00 - db $00,$28,$26,$00 - -FrameBlock65: - db $06 - db $00,$00,$1c,$00 - db $00,$08,$1d,$00 - db $10,$00,$1c,$00 - db $10,$08,$1d,$00 - db $20,$00,$1c,$00 - db $20,$08,$1d,$00 - -FrameBlock66: - db $02 - db $00,$00,$03,$00 - db $08,$00,$13,$00 - -FrameBlock67: - db $01 - db $00,$00,$03,$00 - -FrameBlock68: - db $04 - db $00,$00,$03,$00 - db $00,$08,$03,$20 - db $08,$00,$13,$00 - db $08,$08,$13,$20 - -FrameBlock69: - db $01 - db $00,$00,$06,$00 - -FrameBlock6a: - db $08 - db $00,$00,$2e,$00 - db $00,$30,$2e,$20 - db $30,$00,$2e,$40 - db $30,$30,$2e,$60 - db $00,$18,$2f,$00 - db $30,$18,$2f,$40 - db $18,$00,$3e,$00 - db $18,$30,$3e,$20 - -FrameBlock6b: - db $08 - db $00,$00,$2e,$00 - db $00,$20,$2e,$20 - db $20,$00,$2e,$40 - db $20,$20,$2e,$60 - db $00,$10,$2f,$00 - db $20,$10,$2f,$40 - db $10,$00,$3e,$00 - db $10,$20,$3e,$20 - -FrameBlock6c: - db $08 - db $00,$00,$2e,$00 - db $00,$10,$2e,$20 - db $10,$00,$2e,$40 - db $10,$10,$2e,$60 - db $00,$08,$2f,$00 - db $10,$08,$2f,$40 - db $08,$00,$3e,$00 - db $08,$10,$3e,$20 - -FrameBlock6d: - db $02 - db $00,$00,$1e,$00 - db $00,$08,$1f,$00 - -FrameBlock6e: - db $04 - db $00,$00,$48,$00 - db $00,$08,$48,$20 - db $08,$00,$12,$00 - db $08,$08,$12,$20 - -FrameBlock6f: - db $04 - db $00,$00,$4a,$00 - db $00,$08,$07,$00 - db $08,$00,$16,$00 - db $08,$08,$17,$00 - -FrameBlock70: - db $04 - db $00,$00,$07,$20 - db $00,$08,$4a,$20 - db $08,$00,$17,$20 - db $08,$08,$16,$20 - -FrameBlock76: - db $07 - db $00,$10,$2f,$00 - db $01,$08,$2f,$00 - db $01,$18,$2f,$00 - db $02,$00,$2e,$00 - db $02,$20,$2e,$20 - db $0a,$00,$3e,$00 - db $0a,$20,$3e,$20 - -FrameBlock77: - db $04 - db $00,$02,$4b,$00 - db $00,$0a,$4c,$00 - db $08,$00,$4c,$60 - db $08,$08,$4b,$60 - -FrameBlock78: - db $01 - db $00,$00,$4d,$00 - -FrameBlock79: - db $01 - db $00,$00,$4e,$00 - -FrameBlockBaseCoords: - db $10,$68 - db $10,$70 - db $10,$78 - db $10,$80 - db $10,$88 - db $10,$90 - db $10,$98 - db $18,$68 - db $18,$70 - db $18,$78 - db $34,$28 - db $18,$80 - db $18,$88 - db $18,$98 - db $20,$68 - db $20,$70 - db $20,$78 - db $20,$80 - db $20,$88 - db $20,$90 - db $20,$98 - db $28,$68 - db $28,$70 - db $28,$78 - db $28,$80 - db $28,$88 - db $30,$68 - db $30,$70 - db $30,$78 - db $30,$80 - db $30,$90 - db $30,$98 - db $38,$68 - db $38,$78 - db $38,$80 - db $38,$88 - db $40,$68 - db $40,$70 - db $40,$78 - db $40,$80 - db $40,$88 - db $40,$98 - db $10,$60 - db $18,$60 - db $20,$60 - db $28,$60 - db $30,$60 - db $40,$60 - db $58,$28 - db $43,$38 - db $33,$48 - db $20,$58 - db $32,$78 - db $58,$58 - db $2C,$6C - db $34,$80 - db $48,$70 - db $42,$36 - db $38,$44 - db $40,$52 - db $48,$60 - db $3E,$6E - db $28,$7C - db $28,$8A - db $50,$3C - db $48,$50 - db $40,$64 - db $38,$38 - db $50,$30 - db $50,$38 - db $50,$40 - db $50,$48 - db $50,$50 - db $48,$58 - db $50,$44 - db $48,$48 - db $48,$4C - db $40,$50 - db $40,$54 - db $38,$58 - db $38,$5C - db $30,$64 - db $48,$40 - db $48,$39 - db $24,$88 - db $24,$70 - db $1C,$70 - db $1C,$88 - db $34,$68 - db $34,$88 - db $68,$50 - db $60,$50 - db $68,$60 - db $58,$50 - db $60,$60 - db $68,$40 - db $40,$40 - db $38,$40 - db $0B,$60 - db $44,$48 - db $40,$14 - db $48,$1C - db $50,$24 - db $4C,$24 - db $10,$62 - db $12,$62 - db $12,$60 - db $20,$72 - db $22,$72 - db $22,$70 - db $28,$62 - db $50,$0A - db $52,$0A - db $38,$30 - db $40,$48 - db $30,$48 - db $40,$30 - db $30,$40 - db $38,$48 - db $40,$4A - db $48,$4B - db $50,$4C - db $58,$4D - db $60,$4D - db $68,$4D - db $38,$10 - db $50,$10 - db $38,$28 - db $48,$18 - db $40,$20 - db $48,$20 - db $40,$3C - db $38,$50 - db $28,$64 - db $1C,$90 - db $24,$80 - db $2C,$70 - db $30,$38 - db $10,$50 - db $3C,$40 - db $40,$58 - db $30,$58 - db $58,$48 - db $50,$58 - db $48,$68 - db $40,$18 - db $28,$58 - db $40,$38 - db $48,$38 - db $08,$70 - db $44,$1C - db $3C,$58 - db $38,$60 - db $08,$60 - db $38,$70 - db $38,$6C - db $38,$64 - db $1C,$74 - db $2E,$74 - db $34,$50 - db $2F,$60 - db $31,$70 - db $4C,$30 - db $3B,$40 - db $2D,$50 - db $26,$60 - db $2D,$70 - db $28,$50 - db $1E,$60 - db $29,$70 - db $16,$60 - db $14,$58 - db $12,$54 - db $14,$50 - db $18,$4C - db $1C,$48 - db $48,$28 - -FrameBlock00: - db $00,$00 diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm deleted file mode 100644 index 1a41bb5c..00000000 --- a/data/baseStats/abra.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ABRA ; pokedex id -db 25 ; base hp -db 20 ; base attack -db 15 ; base defense -db 90 ; base speed -db 105 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 200 ; catch rate -db 73 ; base exp yield -INCBIN "pic/bmon/abra.pic",0,1 ; 55, sprite dimensions -dw AbraPicFront -dw AbraPicBack -; attacks known at lvl 0 -db TELEPORT -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm deleted file mode 100644 index 874dd57d..00000000 --- a/data/baseStats/aerodactyl.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_AERODACTYL ; pokedex id -db 80 ; base hp -db 105 ; base attack -db 65 ; base defense -db 130 ; base speed -db 60 ; base special -db ROCK ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 202 ; base exp yield -INCBIN "pic/bmon/aerodactyl.pic",0,1 ; 77, sprite dimensions -dw AerodactylPicFront -dw AerodactylPicBack -; attacks known at lvl 0 -db WING_ATTACK -db AGILITY -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,23 - tmlearn 31,32 - tmlearn 33,34,38,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm deleted file mode 100644 index c20b6c41..00000000 --- a/data/baseStats/alakazam.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ALAKAZAM ; pokedex id -db 55 ; base hp -db 50 ; base attack -db 45 ; base defense -db 120 ; base speed -db 135 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 50 ; catch rate -db 186 ; base exp yield -INCBIN "pic/bmon/alakazam.pic",0,1 ; 77, sprite dimensions -dw AlakazamPicFront -dw AlakazamPicBack -; attacks known at lvl 0 -db TELEPORT -db CONFUSION -db DISABLE -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 28,29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm deleted file mode 100644 index 6beee569..00000000 --- a/data/baseStats/arbok.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ARBOK ; pokedex id -db 60 ; base hp -db 85 ; base attack -db 69 ; base defense -db 80 ; base speed -db 65 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 90 ; catch rate -db 147 ; base exp yield -INCBIN "pic/bmon/arbok.pic",0,1 ; 77, sprite dimensions -dw ArbokPicFront -dw ArbokPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db POISON_STING -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20,21 - tmlearn 26,27,28,31,32 - tmlearn 34,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm deleted file mode 100644 index 2a2dda3b..00000000 --- a/data/baseStats/arcanine.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ARCANINE ; pokedex id -db 90 ; base hp -db 110 ; base attack -db 80 ; base defense -db 95 ; base speed -db 80 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 75 ; catch rate -db 213 ; base exp yield -INCBIN "pic/bmon/arcanine.pic",0,1 ; 77, sprite dimensions -dw ArcaninePicFront -dw ArcaninePicBack -; attacks known at lvl 0 -db ROAR -db EMBER -db LEER -db TAKE_DOWN -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20,23 - tmlearn 28,30,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm deleted file mode 100644 index ef791055..00000000 --- a/data/baseStats/articuno.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ARTICUNO ; pokedex id -db 90 ; base hp -db 85 ; base attack -db 100 ; base defense -db 85 ; base speed -db 125 ; base special -db ICE ; species type 1 -db FLYING ; species type 2 -db 3 ; catch rate -db 215 ; base exp yield -INCBIN "pic/bmon/articuno.pic",0,1 ; 77, sprite dimensions -dw ArticunoPicFront -dw ArticunoPicBack -; attacks known at lvl 0 -db PECK -db ICE_BEAM -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm deleted file mode 100644 index 6bf091b8..00000000 --- a/data/baseStats/beedrill.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BEEDRILL ; pokedex id -db 65 ; base hp -db 80 ; base attack -db 40 ; base defense -db 75 ; base speed -db 45 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 159 ; base exp yield -INCBIN "pic/bmon/beedrill.pic",0,1 ; 77, sprite dimensions -dw BeedrillPicFront -dw BeedrillPicBack -; attacks known at lvl 0 -db FURY_ATTACK -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,15 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm deleted file mode 100644 index 1c908bbb..00000000 --- a/data/baseStats/bellsprout.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BELLSPROUT ; pokedex id -db 50 ; base hp -db 75 ; base attack -db 35 ; base defense -db 40 ; base speed -db 70 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 84 ; base exp yield -INCBIN "pic/bmon/bellsprout.pic",0,1 ; 55, sprite dimensions -dw BellsproutPicFront -dw BellsproutPicBack -; attacks known at lvl 0 -db VINE_WHIP -db GROWTH -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm deleted file mode 100644 index eaf18b41..00000000 --- a/data/baseStats/blastoise.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BLASTOISE ; pokedex id -db 79 ; base hp -db 83 ; base attack -db 100 ; base defense -db 78 ; base speed -db 85 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 210 ; base exp yield -INCBIN "pic/bmon/blastoise.pic",0,1 ; 77, sprite dimensions -dw BlastoisePicFront -dw BlastoisePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db BUBBLE -db WATER_GUN -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm deleted file mode 100644 index 7b3567b5..00000000 --- a/data/baseStats/bulbasaur.asm +++ /dev/null @@ -1,30 +0,0 @@ -MonBaseStats: -db DEX_BULBASAUR ; pokedex id -db 45 ; base hp -db 49 ; base attack -db 49 ; base defense -db 45 ; base speed -db 65 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 64 ; base exp yield -INCBIN "pic/bmon/bulbasaur.pic",0,1 ; 55, sprite dimensions -dw BulbasaurPicFront -dw BulbasaurPicBack -; attacks known at lvl 0 -db TACKLE -db GROWL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding -MonBaseStatsEnd: diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm deleted file mode 100644 index c0fb5f6c..00000000 --- a/data/baseStats/butterfree.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_BUTTERFREE ; pokedex id -db 60 ; base hp -db 45 ; base attack -db 50 ; base defense -db 70 ; base speed -db 80 ; base special -db BUG ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 160 ; base exp yield -INCBIN "pic/bmon/butterfree.pic",0,1 ; 77, sprite dimensions -dw ButterfreePicFront -dw ButterfreePicBack -; attacks known at lvl 0 -db CONFUSION -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm deleted file mode 100644 index d26bc5d9..00000000 --- a/data/baseStats/caterpie.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CATERPIE ; pokedex id -db 45 ; base hp -db 30 ; base attack -db 35 ; base defense -db 45 ; base speed -db 20 ; base special -db BUG ; species type 1 -db BUG ; species type 2 -db 255 ; catch rate -db 53 ; base exp yield -INCBIN "pic/bmon/caterpie.pic",0,1 ; 55, sprite dimensions -dw CaterpiePicFront -dw CaterpiePicBack -; attacks known at lvl 0 -db TACKLE -db STRING_SHOT -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm deleted file mode 100644 index 434b1c26..00000000 --- a/data/baseStats/chansey.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHANSEY ; pokedex id -db 250 ; base hp -db 5 ; base attack -db 5 ; base defense -db 50 ; base speed -db 105 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 30 ; catch rate -db 255 ; base exp yield -INCBIN "pic/bmon/chansey.pic",0,1 ; 66, sprite dimensions -dw ChanseyPicFront -dw ChanseyPicBack -; attacks known at lvl 0 -db POUND -db DOUBLESLAP -db 0 -db 0 -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,37,38,40 - tmlearn 41,44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm deleted file mode 100644 index 2479a60c..00000000 --- a/data/baseStats/charizard.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHARIZARD ; pokedex id -db 78 ; base hp -db 84 ; base attack -db 78 ; base defense -db 100 ; base speed -db 85 ; base special -db FIRE ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 209 ; base exp yield -INCBIN "pic/bmon/charizard.pic",0,1 ; 77, sprite dimensions -dw CharizardPicFront -dw CharizardPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db EMBER -db LEER -db 3 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,23 - tmlearn 26,27,28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm deleted file mode 100644 index ccd53458..00000000 --- a/data/baseStats/charmander.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHARMANDER ; pokedex id -db 39 ; base hp -db 52 ; base attack -db 43 ; base defense -db 65 ; base speed -db 50 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 65 ; base exp yield -INCBIN "pic/bmon/charmander.pic",0,1 ; 55, sprite dimensions -dw CharmanderPicFront -dw CharmanderPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20,23 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm deleted file mode 100644 index 80aa2bca..00000000 --- a/data/baseStats/charmeleon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CHARMELEON ; pokedex id -db 58 ; base hp -db 64 ; base attack -db 58 ; base defense -db 80 ; base speed -db 65 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 142 ; base exp yield -INCBIN "pic/bmon/charmeleon.pic",0,1 ; 66, sprite dimensions -dw CharmeleonPicFront -dw CharmeleonPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db EMBER -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20,23 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm deleted file mode 100644 index 17837da4..00000000 --- a/data/baseStats/clefable.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CLEFABLE ; pokedex id -db 95 ; base hp -db 70 ; base attack -db 73 ; base defense -db 60 ; base speed -db 85 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 25 ; catch rate -db 129 ; base exp yield -INCBIN "pic/bmon/clefable.pic",0,1 ; 66, sprite dimensions -dw ClefablePicFront -dw ClefablePicBack -; attacks known at lvl 0 -db SING -db DOUBLESLAP -db MINIMIZE -db METRONOME -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm deleted file mode 100644 index 952391c7..00000000 --- a/data/baseStats/clefairy.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CLEFAIRY ; pokedex id -db 70 ; base hp -db 45 ; base attack -db 48 ; base defense -db 35 ; base speed -db 60 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 150 ; catch rate -db 68 ; base exp yield -INCBIN "pic/bmon/clefairy.pic",0,1 ; 55, sprite dimensions -dw ClefairyPicFront -dw ClefairyPicBack -; attacks known at lvl 0 -db POUND -db GROWL -db 0 -db 0 -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm deleted file mode 100644 index 10f38bdb..00000000 --- a/data/baseStats/cloyster.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CLOYSTER ; pokedex id -db 50 ; base hp -db 95 ; base attack -db 180 ; base defense -db 70 ; base speed -db 85 ; base special -db WATER ; species type 1 -db ICE ; species type 2 -db 60 ; catch rate -db 203 ; base exp yield -INCBIN "pic/bmon/cloyster.pic",0,1 ; 77, sprite dimensions -dw CloysterPicFront -dw CloysterPicBack -; attacks known at lvl 0 -db WITHDRAW -db SUPERSONIC -db CLAMP -db AURORA_BEAM -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 30,31,32 - tmlearn 33,34,36,39 - tmlearn 44,47 - tmlearn 49,50,53 -db 0 ; padding diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm deleted file mode 100644 index b1222d98..00000000 --- a/data/baseStats/cubone.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_CUBONE ; pokedex id -db 50 ; base hp -db 50 ; base attack -db 95 ; base defense -db 35 ; base speed -db 40 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 190 ; catch rate -db 87 ; base exp yield -INCBIN "pic/bmon/cubone.pic",0,1 ; 55, sprite dimensions -dw CubonePicFront -dw CubonePicBack -; attacks known at lvl 0 -db BONE_CLUB -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm deleted file mode 100644 index fb0cf2c2..00000000 --- a/data/baseStats/dewgong.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DEWGONG ; pokedex id -db 90 ; base hp -db 70 ; base attack -db 80 ; base defense -db 70 ; base speed -db 95 ; base special -db WATER ; species type 1 -db ICE ; species type 2 -db 75 ; catch rate -db 176 ; base exp yield -INCBIN "pic/bmon/dewgong.pic",0,1 ; 66, sprite dimensions -dw DewgongPicFront -dw DewgongPicBack -; attacks known at lvl 0 -db HEADBUTT -db GROWL -db AURORA_BEAM -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm deleted file mode 100644 index 8ef6e381..00000000 --- a/data/baseStats/diglett.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DIGLETT ; pokedex id -db 10 ; base hp -db 55 ; base attack -db 25 ; base defense -db 95 ; base speed -db 45 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 255 ; catch rate -db 81 ; base exp yield -INCBIN "pic/bmon/diglett.pic",0,1 ; 55, sprite dimensions -dw DiglettPicFront -dw DiglettPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 26,27,28,31,32 - tmlearn 34 - tmlearn 44,48 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm deleted file mode 100644 index 90ea4c5e..00000000 --- a/data/baseStats/ditto.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DITTO ; pokedex id -db 48 ; base hp -db 48 ; base attack -db 48 ; base defense -db 48 ; base speed -db 48 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 35 ; catch rate -db 61 ; base exp yield -INCBIN "pic/bmon/ditto.pic",0,1 ; 55, sprite dimensions -dw DittoPicFront -dw DittoPicBack -; attacks known at lvl 0 -db TRANSFORM -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm deleted file mode 100644 index 99608f48..00000000 --- a/data/baseStats/dodrio.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DODRIO ; pokedex id -db 60 ; base hp -db 110 ; base attack -db 70 ; base defense -db 100 ; base speed -db 60 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 158 ; base exp yield -INCBIN "pic/bmon/dodrio.pic",0,1 ; 77, sprite dimensions -dw DodrioPicFront -dw DodrioPicBack -; attacks known at lvl 0 -db PECK -db GROWL -db FURY_ATTACK -db 0 -db 0 ; growth rate -; learnset - tmlearn 4,6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 43,44 - tmlearn 49,50,52 -db 0 ; padding diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm deleted file mode 100644 index 760c258b..00000000 --- a/data/baseStats/doduo.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DODUO ; pokedex id -db 35 ; base hp -db 85 ; base attack -db 45 ; base defense -db 75 ; base speed -db 35 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 190 ; catch rate -db 96 ; base exp yield -INCBIN "pic/bmon/doduo.pic",0,1 ; 55, sprite dimensions -dw DoduoPicFront -dw DoduoPicBack -; attacks known at lvl 0 -db PECK -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 4,6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 43,44 - tmlearn 49,50,52 -db 0 ; padding diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm deleted file mode 100644 index 041300e0..00000000 --- a/data/baseStats/dragonair.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DRAGONAIR ; pokedex id -db 61 ; base hp -db 84 ; base attack -db 65 ; base defense -db 70 ; base speed -db 70 ; base special -db DRAGON ; species type 1 -db DRAGON ; species type 2 -db 45 ; catch rate -db 144 ; base exp yield -INCBIN "pic/bmon/dragonair.pic",0,1 ; 66, sprite dimensions -dw DragonairPicFront -dw DragonairPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db THUNDER_WAVE -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm deleted file mode 100644 index 442275b2..00000000 --- a/data/baseStats/dragonite.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DRAGONITE ; pokedex id -db 91 ; base hp -db 134 ; base attack -db 95 ; base defense -db 80 ; base speed -db 100 ; base special -db DRAGON ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 218 ; base exp yield -INCBIN "pic/bmon/dragonite.pic",0,1 ; 77, sprite dimensions -dw DragonitePicFront -dw DragonitePicBack -; attacks known at lvl 0 -db WRAP -db LEER -db THUNDER_WAVE -db AGILITY -db 5 ; growth rate -; learnset - tmlearn 2,6,7,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm deleted file mode 100644 index 5fb5c75d..00000000 --- a/data/baseStats/dratini.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DRATINI ; pokedex id -db 41 ; base hp -db 64 ; base attack -db 45 ; base defense -db 50 ; base speed -db 50 ; base special -db DRAGON ; species type 1 -db DRAGON ; species type 2 -db 45 ; catch rate -db 67 ; base exp yield -INCBIN "pic/bmon/dratini.pic",0,1 ; 55, sprite dimensions -dw DratiniPicFront -dw DratiniPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm deleted file mode 100644 index 452db1bc..00000000 --- a/data/baseStats/drowzee.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DROWZEE ; pokedex id -db 60 ; base hp -db 48 ; base attack -db 45 ; base defense -db 42 ; base speed -db 90 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 190 ; catch rate -db 102 ; base exp yield -INCBIN "pic/bmon/drowzee.pic",0,1 ; 66, sprite dimensions -dw DrowzeePicFront -dw DrowzeePicBack -; attacks known at lvl 0 -db POUND -db HYPNOSIS -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 42,44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm deleted file mode 100644 index c763680f..00000000 --- a/data/baseStats/dugtrio.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_DUGTRIO ; pokedex id -db 35 ; base hp -db 80 ; base attack -db 50 ; base defense -db 120 ; base speed -db 70 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 50 ; catch rate -db 153 ; base exp yield -INCBIN "pic/bmon/dugtrio.pic",0,1 ; 66, sprite dimensions -dw DugtrioPicFront -dw DugtrioPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db DIG -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 26,27,28,31,32 - tmlearn 34 - tmlearn 44,48 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm deleted file mode 100644 index 51e36621..00000000 --- a/data/baseStats/eevee.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EEVEE ; pokedex id -db 55 ; base hp -db 55 ; base attack -db 50 ; base defense -db 55 ; base speed -db 65 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 92 ; base exp yield -INCBIN "pic/bmon/eevee.pic",0,1 ; 55, sprite dimensions -dw EeveePicFront -dw EeveePicBack -; attacks known at lvl 0 -db TACKLE -db SAND_ATTACK -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm deleted file mode 100644 index b029a67c..00000000 --- a/data/baseStats/ekans.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EKANS ; pokedex id -db 35 ; base hp -db 60 ; base attack -db 44 ; base defense -db 55 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 62 ; base exp yield -INCBIN "pic/bmon/ekans.pic",0,1 ; 55, sprite dimensions -dw EkansPicFront -dw EkansPicBack -; attacks known at lvl 0 -db WRAP -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20,21 - tmlearn 26,27,28,31,32 - tmlearn 34,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm deleted file mode 100644 index 4b44604e..00000000 --- a/data/baseStats/electabuzz.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ELECTABUZZ ; pokedex id -db 65 ; base hp -db 83 ; base attack -db 57 ; base defense -db 105 ; base speed -db 85 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 45 ; catch rate -db 156 ; base exp yield -INCBIN "pic/bmon/electabuzz.pic",0,1 ; 66, sprite dimensions -dw ElectabuzzPicFront -dw ElectabuzzPicBack -; attacks known at lvl 0 -db QUICK_ATTACK -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,39,40 - tmlearn 44,45,46 - tmlearn 50,54,55 -db 0 ; padding diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm deleted file mode 100644 index 1b292f2f..00000000 --- a/data/baseStats/electrode.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ELECTRODE ; pokedex id -db 60 ; base hp -db 50 ; base attack -db 70 ; base defense -db 140 ; base speed -db 80 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 60 ; catch rate -db 150 ; base exp yield -INCBIN "pic/bmon/electrode.pic",0,1 ; 55, sprite dimensions -dw ElectrodePicFront -dw ElectrodePicBack -; attacks known at lvl 0 -db TACKLE -db SCREECH -db SONICBOOM -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,15 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,36,39,40 - tmlearn 44,45,47 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm deleted file mode 100644 index 8503889b..00000000 --- a/data/baseStats/exeggcute.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EXEGGCUTE ; pokedex id -db 60 ; base hp -db 40 ; base attack -db 80 ; base defense -db 40 ; base speed -db 60 ; base special -db GRASS ; species type 1 -db PSYCHIC ; species type 2 -db 90 ; catch rate -db 98 ; base exp yield -INCBIN "pic/bmon/exeggcute.pic",0,1 ; 77, sprite dimensions -dw ExeggcutePicFront -dw ExeggcutePicBack -; attacks known at lvl 0 -db BARRAGE -db HYPNOSIS -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10 - tmlearn 20 - tmlearn 29,30,31,32 - tmlearn 33,34,36,37 - tmlearn 44,46,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm deleted file mode 100644 index 4d739430..00000000 --- a/data/baseStats/exeggutor.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_EXEGGUTOR ; pokedex id -db 95 ; base hp -db 95 ; base attack -db 85 ; base defense -db 55 ; base speed -db 125 ; base special -db GRASS ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 212 ; base exp yield -INCBIN "pic/bmon/exeggutor.pic",0,1 ; 77, sprite dimensions -dw ExeggutorPicFront -dw ExeggutorPicBack -; attacks known at lvl 0 -db BARRAGE -db HYPNOSIS -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,36,37 - tmlearn 44,46,47 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm deleted file mode 100644 index 2aa7eca0..00000000 --- a/data/baseStats/farfetchd.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_FARFETCHD ; pokedex id -db 52 ; base hp -db 65 ; base attack -db 55 ; base defense -db 60 ; base speed -db 58 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 94 ; base exp yield -INCBIN "pic/bmon/farfetchd.pic",0,1 ; 66, sprite dimensions -dw FarfetchdPicFront -dw FarfetchdPicBack -; attacks known at lvl 0 -db PECK -db SAND_ATTACK -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,3,4,6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50,51,52 -db 0 ; padding diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm deleted file mode 100644 index 4ad88723..00000000 --- a/data/baseStats/fearow.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_FEAROW ; pokedex id -db 65 ; base hp -db 90 ; base attack -db 65 ; base defense -db 100 ; base speed -db 61 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 90 ; catch rate -db 162 ; base exp yield -INCBIN "pic/bmon/fearow.pic",0,1 ; 77, sprite dimensions -dw FearowPicFront -dw FearowPicBack -; attacks known at lvl 0 -db PECK -db GROWL -db LEER -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm deleted file mode 100644 index 70621a6a..00000000 --- a/data/baseStats/flareon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_FLAREON ; pokedex id -db 65 ; base hp -db 130 ; base attack -db 60 ; base defense -db 65 ; base speed -db 110 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 198 ; base exp yield -INCBIN "pic/bmon/flareon.pic",0,1 ; 66, sprite dimensions -dw FlareonPicFront -dw FlareonPicBack -; attacks known at lvl 0 -db TACKLE -db SAND_ATTACK -db QUICK_ATTACK -db EMBER -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm deleted file mode 100644 index fdcaaa71..00000000 --- a/data/baseStats/gastly.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GASTLY ; pokedex id -db 30 ; base hp -db 35 ; base attack -db 30 ; base defense -db 80 ; base speed -db 100 ; base special -db GHOST ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 95 ; base exp yield -INCBIN "pic/bmon/gastly.pic",0,1 ; 77, sprite dimensions -dw GastlyPicFront -dw GastlyPicBack -; attacks known at lvl 0 -db LICK -db CONFUSE_RAY -db NIGHT_SHADE -db 0 -db 3 ; growth rate -; learnset - tmlearn 6 - tmlearn 0 - tmlearn 20,21,24 - tmlearn 25,29,31,32 - tmlearn 34,36 - tmlearn 42,44,46,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm deleted file mode 100644 index 0e3e877c..00000000 --- a/data/baseStats/gengar.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GENGAR ; pokedex id -db 60 ; base hp -db 65 ; base attack -db 60 ; base defense -db 110 ; base speed -db 130 ; base special -db GHOST ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 190 ; base exp yield -INCBIN "pic/bmon/gengar.pic",0,1 ; 66, sprite dimensions -dw GengarPicFront -dw GengarPicBack -; attacks known at lvl 0 -db LICK -db CONFUSE_RAY -db NIGHT_SHADE -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,21,24 - tmlearn 25,29,31,32 - tmlearn 34,35,36,40 - tmlearn 42,44,46,47 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm deleted file mode 100644 index a47a993a..00000000 --- a/data/baseStats/geodude.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GEODUDE ; pokedex id -db 40 ; base hp -db 80 ; base attack -db 100 ; base defense -db 20 ; base speed -db 30 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 255 ; catch rate -db 86 ; base exp yield -INCBIN "pic/bmon/geodude.pic",0,1 ; 55, sprite dimensions -dw GeodudePicFront -dw GeodudePicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,36,38 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm deleted file mode 100644 index f2153e5c..00000000 --- a/data/baseStats/gloom.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GLOOM ; pokedex id -db 60 ; base hp -db 65 ; base attack -db 70 ; base defense -db 40 ; base speed -db 85 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 132 ; base exp yield -INCBIN "pic/bmon/gloom.pic",0,1 ; 66, sprite dimensions -dw GloomPicFront -dw GloomPicBack -; attacks known at lvl 0 -db ABSORB -db POISONPOWDER -db STUN_SPORE -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm deleted file mode 100644 index 845adf4b..00000000 --- a/data/baseStats/golbat.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLBAT ; pokedex id -db 75 ; base hp -db 80 ; base attack -db 70 ; base defense -db 90 ; base speed -db 75 ; base special -db POISON ; species type 1 -db FLYING ; species type 2 -db 90 ; catch rate -db 171 ; base exp yield -INCBIN "pic/bmon/golbat.pic",0,1 ; 77, sprite dimensions -dw GolbatPicFront -dw GolbatPicBack -; attacks known at lvl 0 -db LEECH_LIFE -db SCREECH -db BITE -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm deleted file mode 100644 index ed3a4fdb..00000000 --- a/data/baseStats/goldeen.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLDEEN ; pokedex id -db 45 ; base hp -db 67 ; base attack -db 60 ; base defense -db 63 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 111 ; base exp yield -INCBIN "pic/bmon/goldeen.pic",0,1 ; 66, sprite dimensions -dw GoldeenPicFront -dw GoldeenPicBack -; attacks known at lvl 0 -db PECK -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm deleted file mode 100644 index cce89da7..00000000 --- a/data/baseStats/golduck.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLDUCK ; pokedex id -db 80 ; base hp -db 82 ; base attack -db 78 ; base defense -db 85 ; base speed -db 80 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 75 ; catch rate -db 174 ; base exp yield -INCBIN "pic/bmon/golduck.pic",0,1 ; 77, sprite dimensions -dw GolduckPicFront -dw GolduckPicBack -; attacks known at lvl 0 -db SCRATCH -db TAIL_WHIP -db DISABLE -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm deleted file mode 100644 index 28f2a326..00000000 --- a/data/baseStats/golem.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GOLEM ; pokedex id -db 80 ; base hp -db 110 ; base attack -db 130 ; base defense -db 45 ; base speed -db 55 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 177 ; base exp yield -INCBIN "pic/bmon/golem.pic",0,1 ; 66, sprite dimensions -dw GolemPicFront -dw GolemPicBack -; attacks known at lvl 0 -db TACKLE -db DEFENSE_CURL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,36,38 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm deleted file mode 100644 index 08776ab1..00000000 --- a/data/baseStats/graveler.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GRAVELER ; pokedex id -db 55 ; base hp -db 95 ; base attack -db 115 ; base defense -db 35 ; base speed -db 45 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 120 ; catch rate -db 134 ; base exp yield -INCBIN "pic/bmon/graveler.pic",0,1 ; 66, sprite dimensions -dw GravelerPicFront -dw GravelerPicBack -; attacks known at lvl 0 -db TACKLE -db DEFENSE_CURL -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,36,38 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm deleted file mode 100644 index 5f7a64a7..00000000 --- a/data/baseStats/grimer.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GRIMER ; pokedex id -db 80 ; base hp -db 80 ; base attack -db 50 ; base defense -db 25 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 90 ; base exp yield -INCBIN "pic/bmon/grimer.pic",0,1 ; 55, sprite dimensions -dw GrimerPicFront -dw GrimerPicBack -; attacks known at lvl 0 -db POUND -db DISABLE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 0 - tmlearn 20,21,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm deleted file mode 100644 index df305636..00000000 --- a/data/baseStats/growlithe.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GROWLITHE ; pokedex id -db 55 ; base hp -db 70 ; base attack -db 45 ; base defense -db 60 ; base speed -db 50 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 190 ; catch rate -db 91 ; base exp yield -INCBIN "pic/bmon/growlithe.pic",0,1 ; 55, sprite dimensions -dw GrowlithePicFront -dw GrowlithePicBack -; attacks known at lvl 0 -db BITE -db ROAR -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20,23 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm deleted file mode 100644 index 6bfc34a0..00000000 --- a/data/baseStats/gyarados.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_GYARADOS ; pokedex id -db 95 ; base hp -db 125 ; base attack -db 79 ; base defense -db 81 ; base speed -db 100 ; base special -db WATER ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 214 ; base exp yield -INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions -dw GyaradosPicFront -dw GyaradosPicBack -; attacks known at lvl 0 -db BITE -db DRAGON_RAGE -db LEER -db HYDRO_PUMP -db 5 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,23,24 - tmlearn 25,31,32 - tmlearn 33,34,38,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm deleted file mode 100644 index bd39eaf4..00000000 --- a/data/baseStats/haunter.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HAUNTER ; pokedex id -db 45 ; base hp -db 50 ; base attack -db 45 ; base defense -db 95 ; base speed -db 115 ; base special -db GHOST ; species type 1 -db POISON ; species type 2 -db 90 ; catch rate -db 126 ; base exp yield -INCBIN "pic/bmon/haunter.pic",0,1 ; 66, sprite dimensions -dw HaunterPicFront -dw HaunterPicBack -; attacks known at lvl 0 -db LICK -db CONFUSE_RAY -db NIGHT_SHADE -db 0 -db 3 ; growth rate -; learnset - tmlearn 6 - tmlearn 0 - tmlearn 20,21,24 - tmlearn 25,29,31,32 - tmlearn 34,36 - tmlearn 42,44,46,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm deleted file mode 100644 index 37021f65..00000000 --- a/data/baseStats/hitmonchan.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HITMONCHAN ; pokedex id -db 50 ; base hp -db 105 ; base attack -db 79 ; base defense -db 76 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 140 ; base exp yield -INCBIN "pic/bmon/hitmonchan.pic",0,1 ; 66, sprite dimensions -dw HitmonchanPicFront -dw HitmonchanPicBack -; attacks known at lvl 0 -db COMET_PUNCH -db AGILITY -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 31,32 - tmlearn 34,35,39,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm deleted file mode 100644 index d16db130..00000000 --- a/data/baseStats/hitmonlee.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HITMONLEE ; pokedex id -db 50 ; base hp -db 120 ; base attack -db 53 ; base defense -db 87 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 139 ; base exp yield -INCBIN "pic/bmon/hitmonlee.pic",0,1 ; 77, sprite dimensions -dw HitmonleePicFront -dw HitmonleePicBack -; attacks known at lvl 0 -db DOUBLE_KICK -db MEDITATE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 31,32 - tmlearn 34,35,39,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm deleted file mode 100644 index 01de3ff6..00000000 --- a/data/baseStats/horsea.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HORSEA ; pokedex id -db 30 ; base hp -db 40 ; base attack -db 70 ; base defense -db 60 ; base speed -db 70 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 83 ; base exp yield -INCBIN "pic/bmon/horsea.pic",0,1 ; 55, sprite dimensions -dw HorseaPicFront -dw HorseaPicBack -; attacks known at lvl 0 -db BUBBLE -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm deleted file mode 100644 index 4e4959b4..00000000 --- a/data/baseStats/hypno.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_HYPNO ; pokedex id -db 85 ; base hp -db 73 ; base attack -db 70 ; base defense -db 67 ; base speed -db 115 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 75 ; catch rate -db 165 ; base exp yield -INCBIN "pic/bmon/hypno.pic",0,1 ; 77, sprite dimensions -dw HypnoPicFront -dw HypnoPicBack -; attacks known at lvl 0 -db POUND -db HYPNOSIS -db DISABLE -db CONFUSION -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 42,44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm deleted file mode 100644 index 3e19f2a1..00000000 --- a/data/baseStats/ivysaur.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_IVYSAUR ; pokedex id -db 60 ; base hp -db 62 ; base attack -db 63 ; base defense -db 60 ; base speed -db 80 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 141 ; base exp yield -INCBIN "pic/bmon/ivysaur.pic",0,1 ; 66, sprite dimensions -dw IvysaurPicFront -dw IvysaurPicBack -; attacks known at lvl 0 -db TACKLE -db GROWL -db LEECH_SEED -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm deleted file mode 100644 index fac03fc9..00000000 --- a/data/baseStats/jigglypuff.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_JIGGLYPUFF ; pokedex id -db 115 ; base hp -db 45 ; base attack -db 20 ; base defense -db 20 ; base speed -db 25 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 170 ; catch rate -db 76 ; base exp yield -INCBIN "pic/bmon/jigglypuff.pic",0,1 ; 55, sprite dimensions -dw JigglypuffPicFront -dw JigglypuffPicBack -; attacks known at lvl 0 -db SING -db 0 -db 0 -db 0 -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm deleted file mode 100644 index b33d6327..00000000 --- a/data/baseStats/jolteon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_JOLTEON ; pokedex id -db 65 ; base hp -db 65 ; base attack -db 60 ; base defense -db 130 ; base speed -db 110 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 45 ; catch rate -db 197 ; base exp yield -INCBIN "pic/bmon/jolteon.pic",0,1 ; 66, sprite dimensions -dw JolteonPicFront -dw JolteonPicBack -; attacks known at lvl 0 -db TACKLE -db SAND_ATTACK -db QUICK_ATTACK -db THUNDERSHOCK -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm deleted file mode 100644 index e69b87b9..00000000 --- a/data/baseStats/jynx.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_JYNX ; pokedex id -db 65 ; base hp -db 50 ; base attack -db 35 ; base defense -db 95 ; base speed -db 95 ; base special -db ICE ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 137 ; base exp yield -INCBIN "pic/bmon/jynx.pic",0,1 ; 66, sprite dimensions -dw JynxPicFront -dw JynxPicBack -; attacks known at lvl 0 -db POUND -db LOVELY_KISS -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,46 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm deleted file mode 100644 index 60f3e959..00000000 --- a/data/baseStats/kabuto.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KABUTO ; pokedex id -db 30 ; base hp -db 80 ; base attack -db 90 ; base defense -db 55 ; base speed -db 45 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 119 ; base exp yield -INCBIN "pic/bmon/kabuto.pic",0,1 ; 55, sprite dimensions -dw KabutoPicFront -dw KabutoPicBack -; attacks known at lvl 0 -db SCRATCH -db HARDEN -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm deleted file mode 100644 index dbddab2e..00000000 --- a/data/baseStats/kabutops.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KABUTOPS ; pokedex id -db 60 ; base hp -db 115 ; base attack -db 105 ; base defense -db 80 ; base speed -db 70 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 201 ; base exp yield -INCBIN "pic/bmon/kabutops.pic",0,1 ; 66, sprite dimensions -dw KabutopsPicFront -dw KabutopsPicBack -; attacks known at lvl 0 -db SCRATCH -db HARDEN -db ABSORB -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,3,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,19,20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm deleted file mode 100644 index 472cc4c5..00000000 --- a/data/baseStats/kadabra.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KADABRA ; pokedex id -db 40 ; base hp -db 35 ; base attack -db 30 ; base defense -db 105 ; base speed -db 120 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 100 ; catch rate -db 145 ; base exp yield -INCBIN "pic/bmon/kadabra.pic",0,1 ; 66, sprite dimensions -dw KadabraPicFront -dw KadabraPicBack -; attacks known at lvl 0 -db TELEPORT -db CONFUSION -db DISABLE -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 28,29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm deleted file mode 100644 index ec593f91..00000000 --- a/data/baseStats/kakuna.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KAKUNA ; pokedex id -db 45 ; base hp -db 25 ; base attack -db 50 ; base defense -db 35 ; base speed -db 25 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 71 ; base exp yield -INCBIN "pic/bmon/kakuna.pic",0,1 ; 55, sprite dimensions -dw KakunaPicFront -dw KakunaPicBack -; attacks known at lvl 0 -db HARDEN -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm deleted file mode 100644 index 6dcd1e3c..00000000 --- a/data/baseStats/kangaskhan.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KANGASKHAN ; pokedex id -db 105 ; base hp -db 95 ; base attack -db 80 ; base defense -db 90 ; base speed -db 40 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 175 ; base exp yield -INCBIN "pic/bmon/kangaskhan.pic",0,1 ; 77, sprite dimensions -dw KangaskhanPicFront -dw KangaskhanPicBack -; attacks known at lvl 0 -db COMET_PUNCH -db RAGE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm deleted file mode 100644 index 8708d5cf..00000000 --- a/data/baseStats/kingler.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KINGLER ; pokedex id -db 55 ; base hp -db 130 ; base attack -db 115 ; base defense -db 75 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 60 ; catch rate -db 206 ; base exp yield -INCBIN "pic/bmon/kingler.pic",0,1 ; 77, sprite dimensions -dw KinglerPicFront -dw KinglerPicBack -; attacks known at lvl 0 -db BUBBLE -db LEER -db VICEGRIP -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34 - tmlearn 44 - tmlearn 50,51,53,54 -db 0 ; padding diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm deleted file mode 100644 index fced6246..00000000 --- a/data/baseStats/koffing.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KOFFING ; pokedex id -db 40 ; base hp -db 65 ; base attack -db 95 ; base defense -db 35 ; base speed -db 60 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 114 ; base exp yield -INCBIN "pic/bmon/koffing.pic",0,1 ; 66, sprite dimensions -dw KoffingPicFront -dw KoffingPicBack -; attacks known at lvl 0 -db TACKLE -db SMOG -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 0 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm deleted file mode 100644 index 88d690b6..00000000 --- a/data/baseStats/krabby.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_KRABBY ; pokedex id -db 30 ; base hp -db 105 ; base attack -db 90 ; base defense -db 50 ; base speed -db 25 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 115 ; base exp yield -INCBIN "pic/bmon/krabby.pic",0,1 ; 55, sprite dimensions -dw KrabbyPicFront -dw KrabbyPicBack -; attacks known at lvl 0 -db BUBBLE -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 34 - tmlearn 44 - tmlearn 50,51,53,54 -db 0 ; padding diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm deleted file mode 100644 index 3a897525..00000000 --- a/data/baseStats/lapras.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_LAPRAS ; pokedex id -db 130 ; base hp -db 85 ; base attack -db 80 ; base defense -db 60 ; base speed -db 95 ; base special -db WATER ; species type 1 -db ICE ; species type 2 -db 45 ; catch rate -db 219 ; base exp yield -INCBIN "pic/bmon/lapras.pic",0,1 ; 77, sprite dimensions -dw LaprasPicFront -dw LaprasPicBack -; attacks known at lvl 0 -db WATER_GUN -db GROWL -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,22,23,24 - tmlearn 25,29,31,32 - tmlearn 33,34,40 - tmlearn 44,46 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm deleted file mode 100644 index 05020627..00000000 --- a/data/baseStats/lickitung.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_LICKITUNG ; pokedex id -db 90 ; base hp -db 55 ; base attack -db 75 ; base defense -db 30 ; base speed -db 60 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 127 ; base exp yield -INCBIN "pic/bmon/lickitung.pic",0,1 ; 77, sprite dimensions -dw LickitungPicFront -dw LickitungPicBack -; attacks known at lvl 0 -db WRAP -db SUPERSONIC -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,3,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,51,53,54 -db 0 ; padding diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm deleted file mode 100644 index b461d45a..00000000 --- a/data/baseStats/machamp.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MACHAMP ; pokedex id -db 90 ; base hp -db 130 ; base attack -db 80 ; base defense -db 55 ; base speed -db 65 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 193 ; base exp yield -INCBIN "pic/bmon/machamp.pic",0,1 ; 77, sprite dimensions -dw MachampPicFront -dw MachampPicBack -; attacks known at lvl 0 -db KARATE_CHOP -db LOW_KICK -db LEER -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm deleted file mode 100644 index b8a41efd..00000000 --- a/data/baseStats/machoke.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MACHOKE ; pokedex id -db 80 ; base hp -db 100 ; base attack -db 70 ; base defense -db 45 ; base speed -db 50 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 90 ; catch rate -db 146 ; base exp yield -INCBIN "pic/bmon/machoke.pic",0,1 ; 77, sprite dimensions -dw MachokePicFront -dw MachokePicBack -; attacks known at lvl 0 -db KARATE_CHOP -db LOW_KICK -db LEER -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm deleted file mode 100644 index 9ed22dc2..00000000 --- a/data/baseStats/machop.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MACHOP ; pokedex id -db 70 ; base hp -db 80 ; base attack -db 50 ; base defense -db 35 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 180 ; catch rate -db 88 ; base exp yield -INCBIN "pic/bmon/machop.pic",0,1 ; 55, sprite dimensions -dw MachopPicFront -dw MachopPicBack -; attacks known at lvl 0 -db KARATE_CHOP -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,35,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm deleted file mode 100644 index 50cc651c..00000000 --- a/data/baseStats/magikarp.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGIKARP ; pokedex id -db 20 ; base hp -db 10 ; base attack -db 55 ; base defense -db 80 ; base speed -db 20 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 255 ; catch rate -db 20 ; base exp yield -INCBIN "pic/bmon/magikarp.pic",0,1 ; 66, sprite dimensions -dw MagikarpPicFront -dw MagikarpPicBack -; attacks known at lvl 0 -db SPLASH -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm deleted file mode 100644 index 379e91df..00000000 --- a/data/baseStats/magmar.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGMAR ; pokedex id -db 65 ; base hp -db 95 ; base attack -db 57 ; base defense -db 93 ; base speed -db 85 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 45 ; catch rate -db 167 ; base exp yield -INCBIN "pic/bmon/magmar.pic",0,1 ; 66, sprite dimensions -dw MagmarPicFront -dw MagmarPicBack -; attacks known at lvl 0 -db EMBER -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20 - tmlearn 29,30,31,32 - tmlearn 34,35,38,40 - tmlearn 44,46 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm deleted file mode 100644 index ce042457..00000000 --- a/data/baseStats/magnemite.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGNEMITE ; pokedex id -db 25 ; base hp -db 35 ; base attack -db 70 ; base defense -db 45 ; base speed -db 95 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 190 ; catch rate -db 89 ; base exp yield -INCBIN "pic/bmon/magnemite.pic",0,1 ; 55, sprite dimensions -dw MagnemitePicFront -dw MagnemitePicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,39 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm deleted file mode 100644 index a2890bbd..00000000 --- a/data/baseStats/magneton.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAGNETON ; pokedex id -db 50 ; base hp -db 60 ; base attack -db 95 ; base defense -db 70 ; base speed -db 120 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 60 ; catch rate -db 161 ; base exp yield -INCBIN "pic/bmon/magneton.pic",0,1 ; 66, sprite dimensions -dw MagnetonPicFront -dw MagnetonPicBack -; attacks known at lvl 0 -db TACKLE -db SONICBOOM -db THUNDERSHOCK -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,15 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,39 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm deleted file mode 100644 index 406a1364..00000000 --- a/data/baseStats/mankey.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MANKEY ; pokedex id -db 40 ; base hp -db 80 ; base attack -db 35 ; base defense -db 70 ; base speed -db 35 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 190 ; catch rate -db 74 ; base exp yield -INCBIN "pic/bmon/mankey.pic",0,1 ; 55, sprite dimensions -dw MankeyPicFront -dw MankeyPicBack -; attacks known at lvl 0 -db SCRATCH -db LEER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,16 - tmlearn 17,18,19,20,24 - tmlearn 25,28,31,32 - tmlearn 34,35,39,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm deleted file mode 100644 index 3b90dbb1..00000000 --- a/data/baseStats/marowak.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MAROWAK ; pokedex id -db 60 ; base hp -db 80 ; base attack -db 110 ; base defense -db 45 ; base speed -db 50 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 75 ; catch rate -db 124 ; base exp yield -INCBIN "pic/bmon/marowak.pic",0,1 ; 66, sprite dimensions -dw MarowakPicFront -dw MarowakPicBack -; attacks known at lvl 0 -db BONE_CLUB -db GROWL -db LEER -db FOCUS_ENERGY -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm deleted file mode 100644 index dc146cf3..00000000 --- a/data/baseStats/meowth.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MEOWTH ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 35 ; base defense -db 90 ; base speed -db 40 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 255 ; catch rate -db 69 ; base exp yield -INCBIN "pic/bmon/meowth.pic",0,1 ; 55, sprite dimensions -dw MeowthPicFront -dw MeowthPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,16 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm deleted file mode 100644 index 9da351ad..00000000 --- a/data/baseStats/metapod.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_METAPOD ; pokedex id -db 50 ; base hp -db 20 ; base attack -db 55 ; base defense -db 30 ; base speed -db 25 ; base special -db BUG ; species type 1 -db BUG ; species type 2 -db 120 ; catch rate -db 72 ; base exp yield -INCBIN "pic/bmon/metapod.pic",0,1 ; 55, sprite dimensions -dw MetapodPicFront -dw MetapodPicBack -; attacks known at lvl 0 -db HARDEN -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm deleted file mode 100644 index 6919fd0e..00000000 --- a/data/baseStats/mew.asm +++ /dev/null @@ -1,29 +0,0 @@ -MewBaseStats: -db DEX_MEW ; pokedex id -db 100 ; base hp -db 100 ; base attack -db 100 ; base defense -db 100 ; base speed -db 100 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 64 ; base exp yield -INCBIN "pic/bmon/mew.pic",0,1 ; 55, sprite dimensions -dw MewPicFront -dw MewPicBack -; attacks known at lvl 0 -db POUND -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,2,3,4,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,21,22,23,24 - tmlearn 25,26,27,28,29,30,31,32 - tmlearn 33,34,35,36,37,38,39,40 - tmlearn 41,42,43,44,45,46,47,48 - tmlearn 49,50,51,52,53,54,55,56 -db %11111111 ; usually spacing diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm deleted file mode 100644 index dc597345..00000000 --- a/data/baseStats/mewtwo.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MEWTWO ; pokedex id -db 106 ; base hp -db 110 ; base attack -db 90 ; base defense -db 130 ; base speed -db 154 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 3 ; catch rate -db 220 ; base exp yield -INCBIN "pic/bmon/mewtwo.pic",0,1 ; 77, sprite dimensions -dw MewtwoPicFront -dw MewtwoPicBack -; attacks known at lvl 0 -db CONFUSION -db DISABLE -db SWIFT -db PSYCHIC_M -db 5 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,36,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm deleted file mode 100644 index e9437405..00000000 --- a/data/baseStats/moltres.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MOLTRES ; pokedex id -db 90 ; base hp -db 100 ; base attack -db 90 ; base defense -db 90 ; base speed -db 125 ; base special -db FIRE ; species type 1 -db FLYING ; species type 2 -db 3 ; catch rate -db 217 ; base exp yield -INCBIN "pic/bmon/moltres.pic",0,1 ; 77, sprite dimensions -dw MoltresPicFront -dw MoltresPicBack -; attacks known at lvl 0 -db PECK -db FIRE_SPIN -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm deleted file mode 100644 index 8640e340..00000000 --- a/data/baseStats/mrmime.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MR_MIME ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 65 ; base defense -db 90 ; base speed -db 100 ; base special -db PSYCHIC ; species type 1 -db PSYCHIC ; species type 2 -db 45 ; catch rate -db 136 ; base exp yield -INCBIN "pic/bmon/mr.mime.pic",0,1 ; 66, sprite dimensions -dw MrMimePicFront -dw MrMimePicBack -; attacks known at lvl 0 -db CONFUSION -db BARRIER -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,35,40 - tmlearn 44,45,46 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm deleted file mode 100644 index cb15563e..00000000 --- a/data/baseStats/muk.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_MUK ; pokedex id -db 105 ; base hp -db 105 ; base attack -db 75 ; base defense -db 50 ; base speed -db 65 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 75 ; catch rate -db 157 ; base exp yield -INCBIN "pic/bmon/muk.pic",0,1 ; 77, sprite dimensions -dw MukPicFront -dw MukPicBack -; attacks known at lvl 0 -db POUND -db DISABLE -db POISON_GAS -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 15 - tmlearn 20,21,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm deleted file mode 100644 index ebef0965..00000000 --- a/data/baseStats/nidoking.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDOKING ; pokedex id -db 81 ; base hp -db 92 ; base attack -db 77 ; base defense -db 85 ; base speed -db 75 ; base special -db POISON ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 195 ; base exp yield -INCBIN "pic/bmon/nidoking.pic",0,1 ; 77, sprite dimensions -dw NidokingPicFront -dw NidokingPicBack -; attacks known at lvl 0 -db TACKLE -db HORN_ATTACK -db POISON_STING -db THRASH -db 3 ; growth rate -; learnset - tmlearn 1,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 33,34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm deleted file mode 100644 index 9ea29a31..00000000 --- a/data/baseStats/nidoqueen.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDOQUEEN ; pokedex id -db 90 ; base hp -db 82 ; base attack -db 87 ; base defense -db 76 ; base speed -db 75 ; base special -db POISON ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 194 ; base exp yield -INCBIN "pic/bmon/nidoqueen.pic",0,1 ; 77, sprite dimensions -dw NidoqueenPicFront -dw NidoqueenPicBack -; attacks known at lvl 0 -db TACKLE -db SCRATCH -db TAIL_WHIP -db BODY_SLAM -db 3 ; growth rate -; learnset - tmlearn 1,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,31,32 - tmlearn 33,34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm deleted file mode 100644 index 67832f18..00000000 --- a/data/baseStats/nidoranf.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORAN_F ; pokedex id -db 55 ; base hp -db 47 ; base attack -db 52 ; base defense -db 41 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 235 ; catch rate -db 59 ; base exp yield -INCBIN "pic/bmon/nidoranf.pic",0,1 ; 55, sprite dimensions -dw NidoranFPicFront -dw NidoranFPicBack -; attacks known at lvl 0 -db GROWL -db TACKLE -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm deleted file mode 100644 index a7882766..00000000 --- a/data/baseStats/nidoranm.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORAN_M ; pokedex id -db 46 ; base hp -db 57 ; base attack -db 40 ; base defense -db 50 ; base speed -db 40 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 235 ; catch rate -db 60 ; base exp yield -INCBIN "pic/bmon/nidoranm.pic",0,1 ; 55, sprite dimensions -dw NidoranMPicFront -dw NidoranMPicBack -; attacks known at lvl 0 -db LEER -db TACKLE -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm deleted file mode 100644 index 0ddecf70..00000000 --- a/data/baseStats/nidorina.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORINA ; pokedex id -db 70 ; base hp -db 62 ; base attack -db 67 ; base defense -db 56 ; base speed -db 55 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 117 ; base exp yield -INCBIN "pic/bmon/nidorina.pic",0,1 ; 66, sprite dimensions -dw NidorinaPicFront -dw NidorinaPicBack -; attacks known at lvl 0 -db GROWL -db TACKLE -db SCRATCH -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm deleted file mode 100644 index fc435fc4..00000000 --- a/data/baseStats/nidorino.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NIDORINO ; pokedex id -db 61 ; base hp -db 72 ; base attack -db 57 ; base defense -db 65 ; base speed -db 55 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 118 ; base exp yield -INCBIN "pic/bmon/nidorino.pic",0,1 ; 66, sprite dimensions -dw NidorinoPicFront -dw NidorinoPicBack -; attacks known at lvl 0 -db LEER -db TACKLE -db HORN_ATTACK -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/ninetales.asm b/data/baseStats/ninetales.asm deleted file mode 100644 index e98028dc..00000000 --- a/data/baseStats/ninetales.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_NINETALES ; pokedex id -db 73 ; base hp -db 76 ; base attack -db 75 ; base defense -db 100 ; base speed -db 100 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 75 ; catch rate -db 178 ; base exp yield -INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions -dw NinetalesPicFront -dw NinetalesPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db QUICK_ATTACK -db ROAR -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm deleted file mode 100644 index c91c5138..00000000 --- a/data/baseStats/oddish.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ODDISH ; pokedex id -db 45 ; base hp -db 50 ; base attack -db 55 ; base defense -db 30 ; base speed -db 75 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 78 ; base exp yield -INCBIN "pic/bmon/oddish.pic",0,1 ; 55, sprite dimensions -dw OddishPicFront -dw OddishPicBack -; attacks known at lvl 0 -db ABSORB -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm deleted file mode 100644 index 3c461876..00000000 --- a/data/baseStats/omanyte.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_OMANYTE ; pokedex id -db 35 ; base hp -db 40 ; base attack -db 100 ; base defense -db 35 ; base speed -db 90 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 120 ; base exp yield -INCBIN "pic/bmon/omanyte.pic",0,1 ; 55, sprite dimensions -dw OmanytePicFront -dw OmanytePicBack -; attacks known at lvl 0 -db WATER_GUN -db WITHDRAW -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm deleted file mode 100644 index 09a2ae77..00000000 --- a/data/baseStats/omastar.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_OMASTAR ; pokedex id -db 70 ; base hp -db 60 ; base attack -db 125 ; base defense -db 55 ; base speed -db 115 ; base special -db ROCK ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 199 ; base exp yield -INCBIN "pic/bmon/omastar.pic",0,1 ; 66, sprite dimensions -dw OmastarPicFront -dw OmastarPicBack -; attacks known at lvl 0 -db WATER_GUN -db WITHDRAW -db HORN_ATTACK -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,19,20 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm deleted file mode 100644 index 6f3be4df..00000000 --- a/data/baseStats/onix.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ONIX ; pokedex id -db 35 ; base hp -db 45 ; base attack -db 160 ; base defense -db 70 ; base speed -db 30 ; base special -db ROCK ; species type 1 -db GROUND ; species type 2 -db 45 ; catch rate -db 108 ; base exp yield -INCBIN "pic/bmon/onix.pic",0,1 ; 77, sprite dimensions -dw OnixPicFront -dw OnixPicBack -; attacks known at lvl 0 -db TACKLE -db SCREECH -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 26,27,28,31,32 - tmlearn 34,36,40 - tmlearn 44,47,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm deleted file mode 100644 index 2c918e68..00000000 --- a/data/baseStats/paras.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PARAS ; pokedex id -db 35 ; base hp -db 70 ; base attack -db 55 ; base defense -db 25 ; base speed -db 55 ; base special -db BUG ; species type 1 -db GRASS ; species type 2 -db 190 ; catch rate -db 70 ; base exp yield -INCBIN "pic/bmon/paras.pic",0,1 ; 55, sprite dimensions -dw ParasPicFront -dw ParasPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm deleted file mode 100644 index dfa0c73e..00000000 --- a/data/baseStats/parasect.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PARASECT ; pokedex id -db 60 ; base hp -db 95 ; base attack -db 80 ; base defense -db 30 ; base speed -db 80 ; base special -db BUG ; species type 1 -db GRASS ; species type 2 -db 75 ; catch rate -db 128 ; base exp yield -INCBIN "pic/bmon/parasect.pic",0,1 ; 77, sprite dimensions -dw ParasectPicFront -dw ParasectPicBack -; attacks known at lvl 0 -db SCRATCH -db STUN_SPORE -db LEECH_LIFE -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm deleted file mode 100644 index 2f5ef125..00000000 --- a/data/baseStats/persian.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PERSIAN ; pokedex id -db 65 ; base hp -db 70 ; base attack -db 60 ; base defense -db 115 ; base speed -db 65 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 90 ; catch rate -db 148 ; base exp yield -INCBIN "pic/bmon/persian.pic",0,1 ; 77, sprite dimensions -dw PersianPicFront -dw PersianPicBack -; attacks known at lvl 0 -db SCRATCH -db GROWL -db BITE -db SCREECH -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,15,16 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm deleted file mode 100644 index 05350d07..00000000 --- a/data/baseStats/pidgeot.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIDGEOT ; pokedex id -db 83 ; base hp -db 80 ; base attack -db 75 ; base defense -db 91 ; base speed -db 70 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 172 ; base exp yield -INCBIN "pic/bmon/pidgeot.pic",0,1 ; 77, sprite dimensions -dw PidgeotPicFront -dw PidgeotPicBack -; attacks known at lvl 0 -db GUST -db SAND_ATTACK -db QUICK_ATTACK -db 0 -db 3 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm deleted file mode 100644 index 74440fcc..00000000 --- a/data/baseStats/pidgeotto.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIDGEOTTO ; pokedex id -db 63 ; base hp -db 60 ; base attack -db 55 ; base defense -db 71 ; base speed -db 50 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 120 ; catch rate -db 113 ; base exp yield -INCBIN "pic/bmon/pidgeotto.pic",0,1 ; 66, sprite dimensions -dw PidgeottoPicFront -dw PidgeottoPicBack -; attacks known at lvl 0 -db GUST -db SAND_ATTACK -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm deleted file mode 100644 index ec032d6b..00000000 --- a/data/baseStats/pidgey.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIDGEY ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 40 ; base defense -db 56 ; base speed -db 35 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 255 ; catch rate -db 55 ; base exp yield -INCBIN "pic/bmon/pidgey.pic",0,1 ; 55, sprite dimensions -dw PidgeyPicFront -dw PidgeyPicBack -; attacks known at lvl 0 -db GUST -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm deleted file mode 100644 index 09971b79..00000000 --- a/data/baseStats/pikachu.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PIKACHU ; pokedex id -db 35 ; base hp -db 55 ; base attack -db 30 ; base defense -db 90 ; base speed -db 50 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 190 ; catch rate -db 82 ; base exp yield -INCBIN "pic/bmon/pikachu.pic",0,1 ; 55, sprite dimensions -dw PikachuPicFront -dw PikachuPicBack -; attacks known at lvl 0 -db THUNDERSHOCK -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,16 - tmlearn 17,19,20,24 - tmlearn 25,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm deleted file mode 100644 index 08c0e95a..00000000 --- a/data/baseStats/pinsir.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PINSIR ; pokedex id -db 65 ; base hp -db 125 ; base attack -db 100 ; base defense -db 85 ; base speed -db 55 ; base special -db BUG ; species type 1 -db BUG ; species type 2 -db 45 ; catch rate -db 200 ; base exp yield -INCBIN "pic/bmon/pinsir.pic",0,1 ; 77, sprite dimensions -dw PinsirPicFront -dw PinsirPicBack -; attacks known at lvl 0 -db VICEGRIP -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 17,19,20 - tmlearn 31,32 - tmlearn 34 - tmlearn 44 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm deleted file mode 100644 index 8014811e..00000000 --- a/data/baseStats/poliwag.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_POLIWAG ; pokedex id -db 40 ; base hp -db 50 ; base attack -db 40 ; base defense -db 90 ; base speed -db 40 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 255 ; catch rate -db 77 ; base exp yield -INCBIN "pic/bmon/poliwag.pic",0,1 ; 55, sprite dimensions -dw PoliwagPicFront -dw PoliwagPicBack -; attacks known at lvl 0 -db BUBBLE -db 0 -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 29,31,32 - tmlearn 34,40 - tmlearn 44,46 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm deleted file mode 100644 index 6209da68..00000000 --- a/data/baseStats/poliwhirl.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_POLIWHIRL ; pokedex id -db 65 ; base hp -db 65 ; base attack -db 65 ; base defense -db 90 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 120 ; catch rate -db 131 ; base exp yield -INCBIN "pic/bmon/poliwhirl.pic",0,1 ; 66, sprite dimensions -dw PoliwhirlPicFront -dw PoliwhirlPicBack -; attacks known at lvl 0 -db BUBBLE -db HYPNOSIS -db WATER_GUN -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 26,27,29,31,32 - tmlearn 34,35,40 - tmlearn 44,46 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm deleted file mode 100644 index 9489a6a3..00000000 --- a/data/baseStats/poliwrath.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_POLIWRATH ; pokedex id -db 90 ; base hp -db 85 ; base attack -db 95 ; base defense -db 70 ; base speed -db 70 ; base special -db WATER ; species type 1 -db FIGHTING ; species type 2 -db 45 ; catch rate -db 185 ; base exp yield -INCBIN "pic/bmon/poliwrath.pic",0,1 ; 77, sprite dimensions -dw PoliwrathPicFront -dw PoliwrathPicBack -; attacks known at lvl 0 -db HYPNOSIS -db WATER_GUN -db DOUBLESLAP -db BODY_SLAM -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20 - tmlearn 26,27,29,31,32 - tmlearn 34,35,40 - tmlearn 44,46 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm deleted file mode 100644 index a6ff9e4b..00000000 --- a/data/baseStats/ponyta.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PONYTA ; pokedex id -db 50 ; base hp -db 85 ; base attack -db 55 ; base defense -db 90 ; base speed -db 65 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 190 ; catch rate -db 152 ; base exp yield -INCBIN "pic/bmon/ponyta.pic",0,1 ; 66, sprite dimensions -dw PonytaPicFront -dw PonytaPicBack -; attacks known at lvl 0 -db EMBER -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm deleted file mode 100644 index a049fa7f..00000000 --- a/data/baseStats/porygon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PORYGON ; pokedex id -db 65 ; base hp -db 60 ; base attack -db 70 ; base defense -db 40 ; base speed -db 75 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 130 ; base exp yield -INCBIN "pic/bmon/porygon.pic",0,1 ; 66, sprite dimensions -dw PorygonPicFront -dw PorygonPicBack -; attacks known at lvl 0 -db TACKLE -db SHARPEN -db CONVERSION -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,13,14,15 - tmlearn 20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45,46 - tmlearn 49,50,55 -db 0 ; padding diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm deleted file mode 100644 index 659edefd..00000000 --- a/data/baseStats/primeape.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PRIMEAPE ; pokedex id -db 65 ; base hp -db 105 ; base attack -db 60 ; base defense -db 95 ; base speed -db 60 ; base special -db FIGHTING ; species type 1 -db FIGHTING ; species type 2 -db 75 ; catch rate -db 149 ; base exp yield -INCBIN "pic/bmon/primeape.pic",0,1 ; 77, sprite dimensions -dw PrimeapePicFront -dw PrimeapePicBack -; attacks known at lvl 0 -db SCRATCH -db LEER -db KARATE_CHOP -db FURY_SWIPES -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,28,31,32 - tmlearn 34,35,39,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm deleted file mode 100644 index db3ac79f..00000000 --- a/data/baseStats/psyduck.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_PSYDUCK ; pokedex id -db 50 ; base hp -db 52 ; base attack -db 48 ; base defense -db 55 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 190 ; catch rate -db 80 ; base exp yield -INCBIN "pic/bmon/psyduck.pic",0,1 ; 55, sprite dimensions -dw PsyduckPicFront -dw PsyduckPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,16 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm deleted file mode 100644 index c830483c..00000000 --- a/data/baseStats/raichu.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RAICHU ; pokedex id -db 60 ; base hp -db 90 ; base attack -db 55 ; base defense -db 100 ; base speed -db 90 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 75 ; catch rate -db 122 ; base exp yield -INCBIN "pic/bmon/raichu.pic",0,1 ; 77, sprite dimensions -dw RaichuPicFront -dw RaichuPicBack -; attacks known at lvl 0 -db THUNDERSHOCK -db GROWL -db THUNDER_WAVE -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,15,16 - tmlearn 17,19,20,24 - tmlearn 25,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm deleted file mode 100644 index c452159e..00000000 --- a/data/baseStats/rapidash.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RAPIDASH ; pokedex id -db 65 ; base hp -db 100 ; base attack -db 70 ; base defense -db 105 ; base speed -db 80 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 60 ; catch rate -db 192 ; base exp yield -INCBIN "pic/bmon/rapidash.pic",0,1 ; 77, sprite dimensions -dw RapidashPicFront -dw RapidashPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db STOMP -db GROWL -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm deleted file mode 100644 index ff8373d5..00000000 --- a/data/baseStats/raticate.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RATICATE ; pokedex id -db 55 ; base hp -db 81 ; base attack -db 60 ; base defense -db 97 ; base speed -db 50 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 90 ; catch rate -db 116 ; base exp yield -INCBIN "pic/bmon/raticate.pic",0,1 ; 66, sprite dimensions -dw RaticatePicFront -dw RaticatePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db QUICK_ATTACK -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,24 - tmlearn 25,28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm deleted file mode 100644 index 7edfb626..00000000 --- a/data/baseStats/rattata.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RATTATA ; pokedex id -db 30 ; base hp -db 56 ; base attack -db 35 ; base defense -db 72 ; base speed -db 25 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 255 ; catch rate -db 57 ; base exp yield -INCBIN "pic/bmon/rattata.pic",0,1 ; 55, sprite dimensions -dw RattataPicFront -dw RattataPicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,14 - tmlearn 20,24 - tmlearn 25,28,31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm deleted file mode 100644 index d7066906..00000000 --- a/data/baseStats/rhydon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RHYDON ; pokedex id -db 105 ; base hp -db 130 ; base attack -db 120 ; base defense -db 40 ; base speed -db 45 ; base special -db GROUND ; species type 1 -db ROCK ; species type 2 -db 60 ; catch rate -db 204 ; base exp yield -INCBIN "pic/bmon/rhydon.pic",0,1 ; 77, sprite dimensions -dw RhydonPicFront -dw RhydonPicBack -; attacks known at lvl 0 -db HORN_ATTACK -db STOMP -db TAIL_WHIP -db FURY_ATTACK -db 5 ; growth rate -; learnset - tmlearn 1,5,6,7,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,24 - tmlearn 25,26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm deleted file mode 100644 index a6491bd5..00000000 --- a/data/baseStats/rhyhorn.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_RHYHORN ; pokedex id -db 80 ; base hp -db 85 ; base attack -db 95 ; base defense -db 25 ; base speed -db 30 ; base special -db GROUND ; species type 1 -db ROCK ; species type 2 -db 120 ; catch rate -db 135 ; base exp yield -INCBIN "pic/bmon/rhyhorn.pic",0,1 ; 77, sprite dimensions -dw RhyhornPicFront -dw RhyhornPicBack -; attacks known at lvl 0 -db HORN_ATTACK -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10 - tmlearn 20,24 - tmlearn 25,26,27,28,31,32 - tmlearn 34,38,40 - tmlearn 44,48 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm deleted file mode 100644 index a9875a8e..00000000 --- a/data/baseStats/sandshrew.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SANDSHREW ; pokedex id -db 50 ; base hp -db 75 ; base attack -db 85 ; base defense -db 40 ; base speed -db 30 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 255 ; catch rate -db 93 ; base exp yield -INCBIN "pic/bmon/sandshrew.pic",0,1 ; 55, sprite dimensions -dw SandshrewPicFront -dw SandshrewPicBack -; attacks known at lvl 0 -db SCRATCH -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10 - tmlearn 17,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,39,40 - tmlearn 44,48 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm deleted file mode 100644 index 30477eb4..00000000 --- a/data/baseStats/sandslash.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SANDSLASH ; pokedex id -db 75 ; base hp -db 100 ; base attack -db 110 ; base defense -db 65 ; base speed -db 55 ; base special -db GROUND ; species type 1 -db GROUND ; species type 2 -db 90 ; catch rate -db 163 ; base exp yield -INCBIN "pic/bmon/sandslash.pic",0,1 ; 66, sprite dimensions -dw SandslashPicFront -dw SandslashPicBack -; attacks known at lvl 0 -db SCRATCH -db SAND_ATTACK -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 17,19,20 - tmlearn 26,27,28,31,32 - tmlearn 34,39,40 - tmlearn 44,48 - tmlearn 50,51,54 -db 0 ; padding diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm deleted file mode 100644 index 13de0d2b..00000000 --- a/data/baseStats/scyther.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SCYTHER ; pokedex id -db 70 ; base hp -db 110 ; base attack -db 80 ; base defense -db 105 ; base speed -db 55 ; base special -db BUG ; species type 1 -db FLYING ; species type 2 -db 45 ; catch rate -db 187 ; base exp yield -INCBIN "pic/bmon/scyther.pic",0,1 ; 77, sprite dimensions -dw ScytherPicFront -dw ScytherPicBack -; attacks known at lvl 0 -db QUICK_ATTACK -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm deleted file mode 100644 index 9f28001b..00000000 --- a/data/baseStats/seadra.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SEADRA ; pokedex id -db 55 ; base hp -db 65 ; base attack -db 95 ; base defense -db 85 ; base speed -db 95 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 75 ; catch rate -db 155 ; base exp yield -INCBIN "pic/bmon/seadra.pic",0,1 ; 66, sprite dimensions -dw SeadraPicFront -dw SeadraPicBack -; attacks known at lvl 0 -db BUBBLE -db SMOKESCREEN -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm deleted file mode 100644 index d4fbe8ea..00000000 --- a/data/baseStats/seaking.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SEAKING ; pokedex id -db 80 ; base hp -db 92 ; base attack -db 65 ; base defense -db 68 ; base speed -db 80 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 60 ; catch rate -db 170 ; base exp yield -INCBIN "pic/bmon/seaking.pic",0,1 ; 77, sprite dimensions -dw SeakingPicFront -dw SeakingPicBack -; attacks known at lvl 0 -db PECK -db TAIL_WHIP -db SUPERSONIC -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm deleted file mode 100644 index ef9c2898..00000000 --- a/data/baseStats/seel.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SEEL ; pokedex id -db 65 ; base hp -db 45 ; base attack -db 55 ; base defense -db 45 ; base speed -db 70 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 190 ; catch rate -db 100 ; base exp yield -INCBIN "pic/bmon/seel.pic",0,1 ; 66, sprite dimensions -dw SeelPicFront -dw SeelPicBack -; attacks known at lvl 0 -db HEADBUTT -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,11,12,13,14,16 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm deleted file mode 100644 index 7c2cdf9d..00000000 --- a/data/baseStats/shellder.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SHELLDER ; pokedex id -db 30 ; base hp -db 65 ; base attack -db 100 ; base defense -db 40 ; base speed -db 45 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 190 ; catch rate -db 97 ; base exp yield -INCBIN "pic/bmon/shellder.pic",0,1 ; 55, sprite dimensions -dw ShellderPicFront -dw ShellderPicBack -; attacks known at lvl 0 -db TACKLE -db WITHDRAW -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14 - tmlearn 20 - tmlearn 30,31,32 - tmlearn 33,34,36,39 - tmlearn 44,47 - tmlearn 49,50,53 -db 0 ; padding diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm deleted file mode 100644 index ffeda79e..00000000 --- a/data/baseStats/slowbro.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SLOWBRO ; pokedex id -db 95 ; base hp -db 75 ; base attack -db 110 ; base defense -db 30 ; base speed -db 80 ; base special -db WATER ; species type 1 -db PSYCHIC ; species type 2 -db 75 ; catch rate -db 164 ; base exp yield -INCBIN "pic/bmon/slowbro.pic",0,1 ; 77, sprite dimensions -dw SlowbroPicFront -dw SlowbroPicBack -; attacks known at lvl 0 -db CONFUSION -db DISABLE -db HEADBUTT -db 0 -db 0 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20 - tmlearn 26,27,28,29,30,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,54,55 -db 0 ; padding diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm deleted file mode 100644 index ea238a6e..00000000 --- a/data/baseStats/slowpoke.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SLOWPOKE ; pokedex id -db 90 ; base hp -db 65 ; base attack -db 65 ; base defense -db 15 ; base speed -db 40 ; base special -db WATER ; species type 1 -db PSYCHIC ; species type 2 -db 190 ; catch rate -db 99 ; base exp yield -INCBIN "pic/bmon/slowpoke.pic",0,1 ; 55, sprite dimensions -dw SlowpokePicFront -dw SlowpokePicBack -; attacks known at lvl 0 -db CONFUSION -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,16 - tmlearn 20 - tmlearn 26,27,28,29,30,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,54,55 -db 0 ; padding diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm deleted file mode 100644 index 2d1fd6e3..00000000 --- a/data/baseStats/snorlax.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SNORLAX ; pokedex id -db 160 ; base hp -db 110 ; base attack -db 65 ; base defense -db 30 ; base speed -db 65 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 25 ; catch rate -db 154 ; base exp yield -INCBIN "pic/bmon/snorlax.pic",0,1 ; 77, sprite dimensions -dw SnorlaxPicFront -dw SnorlaxPicBack -; attacks known at lvl 0 -db HEADBUTT -db AMNESIA -db REST -db 0 -db 5 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 - tmlearn 17,18,19,20,22,24 - tmlearn 25,26,27,29,31,32 - tmlearn 33,34,35,36,38,40 - tmlearn 44,46,48 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm deleted file mode 100644 index eb8ab1ec..00000000 --- a/data/baseStats/spearow.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SPEAROW ; pokedex id -db 40 ; base hp -db 60 ; base attack -db 30 ; base defense -db 70 ; base speed -db 31 ; base special -db NORMAL ; species type 1 -db FLYING ; species type 2 -db 255 ; catch rate -db 58 ; base exp yield -INCBIN "pic/bmon/spearow.pic",0,1 ; 55, sprite dimensions -dw SpearowPicFront -dw SpearowPicBack -; attacks known at lvl 0 -db PECK -db GROWL -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 43,44 - tmlearn 50,52 -db 0 ; padding diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm deleted file mode 100644 index f8dcd0a1..00000000 --- a/data/baseStats/squirtle.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_SQUIRTLE ; pokedex id -db 44 ; base hp -db 48 ; base attack -db 65 ; base defense -db 43 ; base speed -db 50 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 66 ; base exp yield -INCBIN "pic/bmon/squirtle.pic",0,1 ; 55, sprite dimensions -dw SquirtlePicFront -dw SquirtlePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db 0 -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm deleted file mode 100644 index 686dfa57..00000000 --- a/data/baseStats/starmie.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_STARMIE ; pokedex id -db 60 ; base hp -db 75 ; base attack -db 85 ; base defense -db 115 ; base speed -db 100 ; base special -db WATER ; species type 1 -db PSYCHIC ; species type 2 -db 60 ; catch rate -db 207 ; base exp yield -INCBIN "pic/bmon/starmie.pic",0,1 ; 66, sprite dimensions -dw StarmiePicFront -dw StarmiePicBack -; attacks known at lvl 0 -db TACKLE -db WATER_GUN -db HARDEN -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,55 -db 0 ; padding diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm deleted file mode 100644 index 35f51a6a..00000000 --- a/data/baseStats/staryu.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_STARYU ; pokedex id -db 30 ; base hp -db 45 ; base attack -db 55 ; base defense -db 85 ; base speed -db 70 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 225 ; catch rate -db 106 ; base exp yield -INCBIN "pic/bmon/staryu.pic",0,1 ; 66, sprite dimensions -dw StaryuPicFront -dw StaryuPicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10,11,12,13,14 - tmlearn 20,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,39,40 - tmlearn 44,45,46 - tmlearn 49,50,53,55 -db 0 ; padding diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm deleted file mode 100644 index b50a57bc..00000000 --- a/data/baseStats/tangela.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TANGELA ; pokedex id -db 65 ; base hp -db 55 ; base attack -db 115 ; base defense -db 60 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db GRASS ; species type 2 -db 45 ; catch rate -db 166 ; base exp yield -INCBIN "pic/bmon/tangela.pic",0,1 ; 66, sprite dimensions -dw TangelaPicFront -dw TangelaPicBack -; attacks known at lvl 0 -db CONSTRICT -db BIND -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 34,40 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm deleted file mode 100644 index 87f28ec6..00000000 --- a/data/baseStats/tauros.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TAUROS ; pokedex id -db 75 ; base hp -db 100 ; base attack -db 95 ; base defense -db 110 ; base speed -db 70 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 45 ; catch rate -db 211 ; base exp yield -INCBIN "pic/bmon/tauros.pic",0,1 ; 77, sprite dimensions -dw TaurosPicFront -dw TaurosPicBack -; attacks known at lvl 0 -db TACKLE -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 6,7,8 - tmlearn 9,10,13,14,15 - tmlearn 20,24 - tmlearn 25,26,27,31,32 - tmlearn 34,38,40 - tmlearn 44 - tmlearn 50,54 -db 0 ; padding diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm deleted file mode 100644 index 7237f083..00000000 --- a/data/baseStats/tentacool.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TENTACOOL ; pokedex id -db 40 ; base hp -db 40 ; base attack -db 35 ; base defense -db 70 ; base speed -db 100 ; base special -db WATER ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 105 ; base exp yield -INCBIN "pic/bmon/tentacool.pic",0,1 ; 55, sprite dimensions -dw TentacoolPicFront -dw TentacoolPicBack -; attacks known at lvl 0 -db ACID -db 0 -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,11,12,13,14 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51,53 -db 0 ; padding diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm deleted file mode 100644 index d3d93919..00000000 --- a/data/baseStats/tentacruel.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_TENTACRUEL ; pokedex id -db 80 ; base hp -db 70 ; base attack -db 65 ; base defense -db 100 ; base speed -db 120 ; base special -db WATER ; species type 1 -db POISON ; species type 2 -db 60 ; catch rate -db 205 ; base exp yield -INCBIN "pic/bmon/tentacruel.pic",0,1 ; 66, sprite dimensions -dw TentacruelPicFront -dw TentacruelPicBack -; attacks known at lvl 0 -db ACID -db SUPERSONIC -db WRAP -db 0 -db 5 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,51,53 -db 0 ; padding diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm deleted file mode 100644 index e22b3185..00000000 --- a/data/baseStats/vaporeon.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VAPOREON ; pokedex id -db 130 ; base hp -db 65 ; base attack -db 60 ; base defense -db 65 ; base speed -db 110 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 196 ; base exp yield -INCBIN "pic/bmon/vaporeon.pic",0,1 ; 66, sprite dimensions -dw VaporeonPicFront -dw VaporeonPicBack -; attacks known at lvl 0 -db TACKLE -db SAND_ATTACK -db QUICK_ATTACK -db WATER_GUN -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 20 - tmlearn 31,32 - tmlearn 33,34,39,40 - tmlearn 44 - tmlearn 50,53 -db 0 ; padding diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm deleted file mode 100644 index 7a5bd981..00000000 --- a/data/baseStats/venomoth.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VENOMOTH ; pokedex id -db 70 ; base hp -db 65 ; base attack -db 60 ; base defense -db 90 ; base speed -db 90 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 75 ; catch rate -db 138 ; base exp yield -INCBIN "pic/bmon/venomoth.pic",0,1 ; 77, sprite dimensions -dw VenomothPicFront -dw VenomothPicBack -; attacks known at lvl 0 -db TACKLE -db DISABLE -db POISONPOWDER -db LEECH_LIFE -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,39 - tmlearn 44,46 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm deleted file mode 100644 index aeadc6cd..00000000 --- a/data/baseStats/venonat.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VENONAT ; pokedex id -db 60 ; base hp -db 55 ; base attack -db 50 ; base defense -db 45 ; base speed -db 40 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 190 ; catch rate -db 75 ; base exp yield -INCBIN "pic/bmon/venonat.pic",0,1 ; 55, sprite dimensions -dw VenonatPicFront -dw VenonatPicBack -; attacks known at lvl 0 -db TACKLE -db DISABLE -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 29,31,32 - tmlearn 33,34 - tmlearn 44,46 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm deleted file mode 100644 index 0a457321..00000000 --- a/data/baseStats/venusaur.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VENUSAUR ; pokedex id -db 80 ; base hp -db 82 ; base attack -db 83 ; base defense -db 80 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 208 ; base exp yield -INCBIN "pic/bmon/venusaur.pic",0,1 ; 77, sprite dimensions -dw VenusaurPicFront -dw VenusaurPicBack -; attacks known at lvl 0 -db TACKLE -db GROWL -db LEECH_SEED -db VINE_WHIP -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm deleted file mode 100644 index 7a82c86e..00000000 --- a/data/baseStats/victreebel.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VICTREEBEL ; pokedex id -db 80 ; base hp -db 105 ; base attack -db 65 ; base defense -db 70 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 191 ; base exp yield -INCBIN "pic/bmon/victreebel.pic",0,1 ; 77, sprite dimensions -dw VictreebelPicFront -dw VictreebelPicBack -; attacks known at lvl 0 -db SLEEP_POWDER -db STUN_SPORE -db ACID -db RAZOR_LEAF -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm deleted file mode 100644 index 17bb9739..00000000 --- a/data/baseStats/vileplume.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VILEPLUME ; pokedex id -db 75 ; base hp -db 80 ; base attack -db 85 ; base defense -db 50 ; base speed -db 100 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 45 ; catch rate -db 184 ; base exp yield -INCBIN "pic/bmon/vileplume.pic",0,1 ; 77, sprite dimensions -dw VileplumePicFront -dw VileplumePicBack -; attacks known at lvl 0 -db STUN_SPORE -db SLEEP_POWDER -db ACID -db PETAL_DANCE -db 3 ; growth rate -; learnset - tmlearn 3,6,8 - tmlearn 9,10,15 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm deleted file mode 100644 index 92d2ccb3..00000000 --- a/data/baseStats/voltorb.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VOLTORB ; pokedex id -db 40 ; base hp -db 30 ; base attack -db 50 ; base defense -db 100 ; base speed -db 55 ; base special -db ELECTRIC ; species type 1 -db ELECTRIC ; species type 2 -db 190 ; catch rate -db 103 ; base exp yield -INCBIN "pic/bmon/voltorb.pic",0,1 ; 55, sprite dimensions -dw VoltorbPicFront -dw VoltorbPicBack -; attacks known at lvl 0 -db TACKLE -db SCREECH -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 9 - tmlearn 20,24 - tmlearn 25,30,31,32 - tmlearn 33,34,36,39 - tmlearn 44,45,47 - tmlearn 50,55 -db 0 ; padding diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm deleted file mode 100644 index 9577ae30..00000000 --- a/data/baseStats/vulpix.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_VULPIX ; pokedex id -db 38 ; base hp -db 41 ; base attack -db 40 ; base defense -db 65 ; base speed -db 65 ; base special -db FIRE ; species type 1 -db FIRE ; species type 2 -db 190 ; catch rate -db 63 ; base exp yield -INCBIN "pic/bmon/vulpix.pic",0,1 ; 66, sprite dimensions -dw VulpixPicFront -dw VulpixPicBack -; attacks known at lvl 0 -db EMBER -db TAIL_WHIP -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 6,8 - tmlearn 9,10 - tmlearn 20 - tmlearn 28,31,32 - tmlearn 33,34,38,39,40 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm deleted file mode 100644 index bc86bd6f..00000000 --- a/data/baseStats/wartortle.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WARTORTLE ; pokedex id -db 59 ; base hp -db 63 ; base attack -db 80 ; base defense -db 58 ; base speed -db 65 ; base special -db WATER ; species type 1 -db WATER ; species type 2 -db 45 ; catch rate -db 143 ; base exp yield -INCBIN "pic/bmon/wartortle.pic",0,1 ; 66, sprite dimensions -dw WartortlePicFront -dw WartortlePicBack -; attacks known at lvl 0 -db TACKLE -db TAIL_WHIP -db BUBBLE -db 0 -db 3 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14 - tmlearn 17,18,19,20 - tmlearn 28,31,32 - tmlearn 33,34,40 - tmlearn 44 - tmlearn 50,53,54 -db 0 ; padding diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm deleted file mode 100644 index 8370dc41..00000000 --- a/data/baseStats/weedle.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WEEDLE ; pokedex id -db 40 ; base hp -db 35 ; base attack -db 30 ; base defense -db 50 ; base speed -db 20 ; base special -db BUG ; species type 1 -db POISON ; species type 2 -db 255 ; catch rate -db 52 ; base exp yield -INCBIN "pic/bmon/weedle.pic",0,1 ; 55, sprite dimensions -dw WeedlePicFront -dw WeedlePicBack -; attacks known at lvl 0 -db POISON_STING -db STRING_SHOT -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 - tmlearn 0 -db 0 ; padding diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm deleted file mode 100644 index 735a453f..00000000 --- a/data/baseStats/weepinbell.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WEEPINBELL ; pokedex id -db 65 ; base hp -db 90 ; base attack -db 50 ; base defense -db 55 ; base speed -db 85 ; base special -db GRASS ; species type 1 -db POISON ; species type 2 -db 120 ; catch rate -db 151 ; base exp yield -INCBIN "pic/bmon/weepinbell.pic",0,1 ; 66, sprite dimensions -dw WeepinbellPicFront -dw WeepinbellPicBack -; attacks known at lvl 0 -db VINE_WHIP -db GROWTH -db WRAP -db 0 -db 3 ; growth rate -; learnset - tmlearn 3,6 - tmlearn 9,10 - tmlearn 20,21,22 - tmlearn 31,32 - tmlearn 33,34 - tmlearn 44 - tmlearn 50,51 -db 0 ; padding diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm deleted file mode 100644 index 0dd09dfe..00000000 --- a/data/baseStats/weezing.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WEEZING ; pokedex id -db 65 ; base hp -db 90 ; base attack -db 120 ; base defense -db 60 ; base speed -db 85 ; base special -db POISON ; species type 1 -db POISON ; species type 2 -db 60 ; catch rate -db 173 ; base exp yield -INCBIN "pic/bmon/weezing.pic",0,1 ; 77, sprite dimensions -dw WeezingPicFront -dw WeezingPicBack -; attacks known at lvl 0 -db TACKLE -db SMOG -db SLUDGE -db 0 -db 0 ; growth rate -; learnset - tmlearn 6 - tmlearn 15 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 34,36,38 - tmlearn 44,47 - tmlearn 50 -db 0 ; padding diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm deleted file mode 100644 index d5fd08e2..00000000 --- a/data/baseStats/wigglytuff.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_WIGGLYTUFF ; pokedex id -db 140 ; base hp -db 70 ; base attack -db 45 ; base defense -db 45 ; base speed -db 50 ; base special -db NORMAL ; species type 1 -db NORMAL ; species type 2 -db 50 ; catch rate -db 109 ; base exp yield -INCBIN "pic/bmon/wigglytuff.pic",0,1 ; 66, sprite dimensions -dw WigglytuffPicFront -dw WigglytuffPicBack -; attacks known at lvl 0 -db SING -db DISABLE -db DEFENSE_CURL -db DOUBLESLAP -db 4 ; growth rate -; learnset - tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15 - tmlearn 17,18,19,20,22,24 - tmlearn 25,29,30,31,32 - tmlearn 33,34,38,40 - tmlearn 44,45,46 - tmlearn 49,50,54,55 -db 0 ; padding diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm deleted file mode 100644 index 487052ba..00000000 --- a/data/baseStats/zapdos.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ZAPDOS ; pokedex id -db 90 ; base hp -db 90 ; base attack -db 85 ; base defense -db 100 ; base speed -db 125 ; base special -db ELECTRIC ; species type 1 -db FLYING ; species type 2 -db 3 ; catch rate -db 216 ; base exp yield -INCBIN "pic/bmon/zapdos.pic",0,1 ; 77, sprite dimensions -dw ZapdosPicFront -dw ZapdosPicBack -; attacks known at lvl 0 -db THUNDERSHOCK -db DRILL_PECK -db 0 -db 0 -db 5 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10,15 - tmlearn 20,24 - tmlearn 25,31,32 - tmlearn 33,34,39 - tmlearn 43,44,45 - tmlearn 50,52,55 -db 0 ; padding diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm deleted file mode 100644 index 1caa4259..00000000 --- a/data/baseStats/zubat.asm +++ /dev/null @@ -1,28 +0,0 @@ -db DEX_ZUBAT ; pokedex id -db 40 ; base hp -db 45 ; base attack -db 35 ; base defense -db 55 ; base speed -db 40 ; base special -db POISON ; species type 1 -db FLYING ; species type 2 -db 255 ; catch rate -db 54 ; base exp yield -INCBIN "pic/bmon/zubat.pic",0,1 ; 55, sprite dimensions -dw ZubatPicFront -dw ZubatPicBack -; attacks known at lvl 0 -db LEECH_LIFE -db 0 -db 0 -db 0 -db 0 ; growth rate -; learnset - tmlearn 2,4,6 - tmlearn 9,10 - tmlearn 20,21 - tmlearn 31,32 - tmlearn 34,39 - tmlearn 44 - tmlearn 50 -db 0 ; padding diff --git a/data/base_stats.asm b/data/base_stats.asm deleted file mode 100755 index a84693a4..00000000 --- a/data/base_stats.asm +++ /dev/null @@ -1,150 +0,0 @@ -INCLUDE "data/baseStats/bulbasaur.asm" -INCLUDE "data/baseStats/ivysaur.asm" -INCLUDE "data/baseStats/venusaur.asm" -INCLUDE "data/baseStats/charmander.asm" -INCLUDE "data/baseStats/charmeleon.asm" -INCLUDE "data/baseStats/charizard.asm" -INCLUDE "data/baseStats/squirtle.asm" -INCLUDE "data/baseStats/wartortle.asm" -INCLUDE "data/baseStats/blastoise.asm" -INCLUDE "data/baseStats/caterpie.asm" -INCLUDE "data/baseStats/metapod.asm" -INCLUDE "data/baseStats/butterfree.asm" -INCLUDE "data/baseStats/weedle.asm" -INCLUDE "data/baseStats/kakuna.asm" -INCLUDE "data/baseStats/beedrill.asm" -INCLUDE "data/baseStats/pidgey.asm" -INCLUDE "data/baseStats/pidgeotto.asm" -INCLUDE "data/baseStats/pidgeot.asm" -INCLUDE "data/baseStats/rattata.asm" -INCLUDE "data/baseStats/raticate.asm" -INCLUDE "data/baseStats/spearow.asm" -INCLUDE "data/baseStats/fearow.asm" -INCLUDE "data/baseStats/ekans.asm" -INCLUDE "data/baseStats/arbok.asm" -INCLUDE "data/baseStats/pikachu.asm" -INCLUDE "data/baseStats/raichu.asm" -INCLUDE "data/baseStats/sandshrew.asm" -INCLUDE "data/baseStats/sandslash.asm" -INCLUDE "data/baseStats/nidoranf.asm" -INCLUDE "data/baseStats/nidorina.asm" -INCLUDE "data/baseStats/nidoqueen.asm" -INCLUDE "data/baseStats/nidoranm.asm" -INCLUDE "data/baseStats/nidorino.asm" -INCLUDE "data/baseStats/nidoking.asm" -INCLUDE "data/baseStats/clefairy.asm" -INCLUDE "data/baseStats/clefable.asm" -INCLUDE "data/baseStats/vulpix.asm" -INCLUDE "data/baseStats/ninetales.asm" -INCLUDE "data/baseStats/jigglypuff.asm" -INCLUDE "data/baseStats/wigglytuff.asm" -INCLUDE "data/baseStats/zubat.asm" -INCLUDE "data/baseStats/golbat.asm" -INCLUDE "data/baseStats/oddish.asm" -INCLUDE "data/baseStats/gloom.asm" -INCLUDE "data/baseStats/vileplume.asm" -INCLUDE "data/baseStats/paras.asm" -INCLUDE "data/baseStats/parasect.asm" -INCLUDE "data/baseStats/venonat.asm" -INCLUDE "data/baseStats/venomoth.asm" -INCLUDE "data/baseStats/diglett.asm" -INCLUDE "data/baseStats/dugtrio.asm" -INCLUDE "data/baseStats/meowth.asm" -INCLUDE "data/baseStats/persian.asm" -INCLUDE "data/baseStats/psyduck.asm" -INCLUDE "data/baseStats/golduck.asm" -INCLUDE "data/baseStats/mankey.asm" -INCLUDE "data/baseStats/primeape.asm" -INCLUDE "data/baseStats/growlithe.asm" -INCLUDE "data/baseStats/arcanine.asm" -INCLUDE "data/baseStats/poliwag.asm" -INCLUDE "data/baseStats/poliwhirl.asm" -INCLUDE "data/baseStats/poliwrath.asm" -INCLUDE "data/baseStats/abra.asm" -INCLUDE "data/baseStats/kadabra.asm" -INCLUDE "data/baseStats/alakazam.asm" -INCLUDE "data/baseStats/machop.asm" -INCLUDE "data/baseStats/machoke.asm" -INCLUDE "data/baseStats/machamp.asm" -INCLUDE "data/baseStats/bellsprout.asm" -INCLUDE "data/baseStats/weepinbell.asm" -INCLUDE "data/baseStats/victreebel.asm" -INCLUDE "data/baseStats/tentacool.asm" -INCLUDE "data/baseStats/tentacruel.asm" -INCLUDE "data/baseStats/geodude.asm" -INCLUDE "data/baseStats/graveler.asm" -INCLUDE "data/baseStats/golem.asm" -INCLUDE "data/baseStats/ponyta.asm" -INCLUDE "data/baseStats/rapidash.asm" -INCLUDE "data/baseStats/slowpoke.asm" -INCLUDE "data/baseStats/slowbro.asm" -INCLUDE "data/baseStats/magnemite.asm" -INCLUDE "data/baseStats/magneton.asm" -INCLUDE "data/baseStats/farfetchd.asm" -INCLUDE "data/baseStats/doduo.asm" -INCLUDE "data/baseStats/dodrio.asm" -INCLUDE "data/baseStats/seel.asm" -INCLUDE "data/baseStats/dewgong.asm" -INCLUDE "data/baseStats/grimer.asm" -INCLUDE "data/baseStats/muk.asm" -INCLUDE "data/baseStats/shellder.asm" -INCLUDE "data/baseStats/cloyster.asm" -INCLUDE "data/baseStats/gastly.asm" -INCLUDE "data/baseStats/haunter.asm" -INCLUDE "data/baseStats/gengar.asm" -INCLUDE "data/baseStats/onix.asm" -INCLUDE "data/baseStats/drowzee.asm" -INCLUDE "data/baseStats/hypno.asm" -INCLUDE "data/baseStats/krabby.asm" -INCLUDE "data/baseStats/kingler.asm" -INCLUDE "data/baseStats/voltorb.asm" -INCLUDE "data/baseStats/electrode.asm" -INCLUDE "data/baseStats/exeggcute.asm" -INCLUDE "data/baseStats/exeggutor.asm" -INCLUDE "data/baseStats/cubone.asm" -INCLUDE "data/baseStats/marowak.asm" -INCLUDE "data/baseStats/hitmonlee.asm" -INCLUDE "data/baseStats/hitmonchan.asm" -INCLUDE "data/baseStats/lickitung.asm" -INCLUDE "data/baseStats/koffing.asm" -INCLUDE "data/baseStats/weezing.asm" -INCLUDE "data/baseStats/rhyhorn.asm" -INCLUDE "data/baseStats/rhydon.asm" -INCLUDE "data/baseStats/chansey.asm" -INCLUDE "data/baseStats/tangela.asm" -INCLUDE "data/baseStats/kangaskhan.asm" -INCLUDE "data/baseStats/horsea.asm" -INCLUDE "data/baseStats/seadra.asm" -INCLUDE "data/baseStats/goldeen.asm" -INCLUDE "data/baseStats/seaking.asm" -INCLUDE "data/baseStats/staryu.asm" -INCLUDE "data/baseStats/starmie.asm" -INCLUDE "data/baseStats/mrmime.asm" -INCLUDE "data/baseStats/scyther.asm" -INCLUDE "data/baseStats/jynx.asm" -INCLUDE "data/baseStats/electabuzz.asm" -INCLUDE "data/baseStats/magmar.asm" -INCLUDE "data/baseStats/pinsir.asm" -INCLUDE "data/baseStats/tauros.asm" -INCLUDE "data/baseStats/magikarp.asm" -INCLUDE "data/baseStats/gyarados.asm" -INCLUDE "data/baseStats/lapras.asm" -INCLUDE "data/baseStats/ditto.asm" -INCLUDE "data/baseStats/eevee.asm" -INCLUDE "data/baseStats/vaporeon.asm" -INCLUDE "data/baseStats/jolteon.asm" -INCLUDE "data/baseStats/flareon.asm" -INCLUDE "data/baseStats/porygon.asm" -INCLUDE "data/baseStats/omanyte.asm" -INCLUDE "data/baseStats/omastar.asm" -INCLUDE "data/baseStats/kabuto.asm" -INCLUDE "data/baseStats/kabutops.asm" -INCLUDE "data/baseStats/aerodactyl.asm" -INCLUDE "data/baseStats/snorlax.asm" -INCLUDE "data/baseStats/articuno.asm" -INCLUDE "data/baseStats/zapdos.asm" -INCLUDE "data/baseStats/moltres.asm" -INCLUDE "data/baseStats/dratini.asm" -INCLUDE "data/baseStats/dragonair.asm" -INCLUDE "data/baseStats/dragonite.asm" -INCLUDE "data/baseStats/mewtwo.asm" diff --git a/data/battle/always_happen_effects.asm b/data/battle/always_happen_effects.asm new file mode 100644 index 00000000..c8e5247e --- /dev/null +++ b/data/battle/always_happen_effects.asm @@ -0,0 +1,13 @@ +AlwaysHappenSideEffects: +; Attacks that aren't finished after they faint the opponent. + db DRAIN_HP_EFFECT + db EXPLODE_EFFECT + db DREAM_EATER_EFFECT + db PAY_DAY_EFFECT + db TWO_TO_FIVE_ATTACKS_EFFECT + db EFFECT_1E + db ATTACK_TWICE_EFFECT + db RECOIL_EFFECT + db TWINEEDLE_EFFECT + db RAGE_EFFECT + db -1 ; end diff --git a/data/battle/critical_hit_moves.asm b/data/battle/critical_hit_moves.asm new file mode 100644 index 00000000..a567a934 --- /dev/null +++ b/data/battle/critical_hit_moves.asm @@ -0,0 +1,6 @@ +HighCriticalMoves: + db KARATE_CHOP + db RAZOR_LEAF + db CRABHAMMER + db SLASH + db -1 ; end diff --git a/data/battle/residual_effects_1.asm b/data/battle/residual_effects_1.asm new file mode 100644 index 00000000..b478487d --- /dev/null +++ b/data/battle/residual_effects_1.asm @@ -0,0 +1,20 @@ +; These are move effects (second value from the Moves table in bank $E). +ResidualEffects1: +; most non-side effects + db CONVERSION_EFFECT + db HAZE_EFFECT + db SWITCH_AND_TELEPORT_EFFECT + db MIST_EFFECT + db FOCUS_ENERGY_EFFECT + db CONFUSION_EFFECT + db HEAL_EFFECT + db TRANSFORM_EFFECT + db LIGHT_SCREEN_EFFECT + db REFLECT_EFFECT + db POISON_EFFECT + db PARALYZE_EFFECT + db SUBSTITUTE_EFFECT + db MIMIC_EFFECT + db LEECH_SEED_EFFECT + db SPLASH_EFFECT + db -1 ; end diff --git a/data/battle/residual_effects_2.asm b/data/battle/residual_effects_2.asm new file mode 100644 index 00000000..f58bb47c --- /dev/null +++ b/data/battle/residual_effects_2.asm @@ -0,0 +1,32 @@ +ResidualEffects2: +; non-side effects not included in ResidualEffects1 +; stat-affecting moves, sleep-inflicting moves, and Bide +; e.g., Meditate, Bide, Hypnosis + db EFFECT_01 + db ATTACK_UP1_EFFECT + db DEFENSE_UP1_EFFECT + db SPEED_UP1_EFFECT + db SPECIAL_UP1_EFFECT + db ACCURACY_UP1_EFFECT + db EVASION_UP1_EFFECT + db ATTACK_DOWN1_EFFECT + db DEFENSE_DOWN1_EFFECT + db SPEED_DOWN1_EFFECT + db SPECIAL_DOWN1_EFFECT + db ACCURACY_DOWN1_EFFECT + db EVASION_DOWN1_EFFECT + db BIDE_EFFECT + db SLEEP_EFFECT + db ATTACK_UP2_EFFECT + db DEFENSE_UP2_EFFECT + db SPEED_UP2_EFFECT + db SPECIAL_UP2_EFFECT + db ACCURACY_UP2_EFFECT + db EVASION_UP2_EFFECT + db ATTACK_DOWN2_EFFECT + db DEFENSE_DOWN2_EFFECT + db SPEED_DOWN2_EFFECT + db SPECIAL_DOWN2_EFFECT + db ACCURACY_DOWN2_EFFECT + db EVASION_DOWN2_EFFECT + db -1 ; end diff --git a/data/battle/set_damage_effects.asm b/data/battle/set_damage_effects.asm new file mode 100644 index 00000000..cedb3bc1 --- /dev/null +++ b/data/battle/set_damage_effects.asm @@ -0,0 +1,6 @@ +SetDamageEffects: +; moves that do damage but not through normal calculations +; e.g., Super Fang, Psywave + db SUPER_FANG_EFFECT + db SPECIAL_DAMAGE_EFFECT + db -1 ; end diff --git a/data/battle/special_effects.asm b/data/battle/special_effects.asm new file mode 100644 index 00000000..3e21ee2f --- /dev/null +++ b/data/battle/special_effects.asm @@ -0,0 +1,24 @@ +SpecialEffects: +; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage. +; Includes all effects that do not need to be called at the end of +; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled + db DRAIN_HP_EFFECT + db EXPLODE_EFFECT + db DREAM_EATER_EFFECT + db PAY_DAY_EFFECT + db SWIFT_EFFECT + db TWO_TO_FIVE_ATTACKS_EFFECT + db EFFECT_1E + db CHARGE_EFFECT + db SUPER_FANG_EFFECT + db SPECIAL_DAMAGE_EFFECT + db FLY_EFFECT + db ATTACK_TWICE_EFFECT + db JUMP_KICK_EFFECT + db RECOIL_EFFECT + ; fallthrough +SpecialEffectsCont: +; damaging moves whose effect is executed prior to damage calculation + db THRASH_PETAL_DANCE_EFFECT + db TRAPPING_EFFECT + db -1 ; end diff --git a/data/battle/stat_modifiers.asm b/data/battle/stat_modifiers.asm new file mode 100644 index 00000000..c0a6355a --- /dev/null +++ b/data/battle/stat_modifiers.asm @@ -0,0 +1,15 @@ +StatModifierRatios: +; first byte is numerator, second byte is denominator + db 25, 100 ; 0.25 + db 28, 100 ; 0.28 + db 33, 100 ; 0.33 + db 40, 100 ; 0.40 + db 50, 100 ; 0.50 + db 66, 100 ; 0.66 + db 1, 1 ; 1.00 + db 15, 10 ; 1.50 + db 2, 1 ; 2.00 + db 25, 10 ; 2.50 + db 3, 1 ; 3.00 + db 35, 10 ; 3.50 + db 4, 1 ; 4.00 diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm new file mode 100644 index 00000000..854780c6 --- /dev/null +++ b/data/battle/stat_names.asm @@ -0,0 +1,7 @@ +StatsTextStrings: + db "ATTACK@" + db "DEFENSE@" + db "SPEED@" + db "SPECIAL@" + db "ACCURACY@" + db "EVADE@" diff --git a/data/battle/unused_critical_hit_moves.asm b/data/battle/unused_critical_hit_moves.asm new file mode 100644 index 00000000..bc88b2cb --- /dev/null +++ b/data/battle/unused_critical_hit_moves.asm @@ -0,0 +1,6 @@ +UnusedHighCriticalMoves: + db KARATE_CHOP + db RAZOR_LEAF + db CRABHAMMER + db SLASH + db -1 ; end diff --git a/data/battle_anims/base_coords.asm b/data/battle_anims/base_coords.asm new file mode 100644 index 00000000..ad67baff --- /dev/null +++ b/data/battle_anims/base_coords.asm @@ -0,0 +1,178 @@ +FrameBlockBaseCoords: + db $10, $68 ; BASECOORD_00 + db $10, $70 ; BASECOORD_01 + db $10, $78 ; BASECOORD_02 + db $10, $80 ; BASECOORD_03 + db $10, $88 ; BASECOORD_04 + db $10, $90 ; BASECOORD_05 + db $10, $98 ; BASECOORD_06 + db $18, $68 ; BASECOORD_07 + db $18, $70 ; BASECOORD_08 + db $18, $78 ; BASECOORD_09 + db $34, $28 ; BASECOORD_0A + db $18, $80 ; BASECOORD_0B + db $18, $88 ; BASECOORD_0C + db $18, $98 ; BASECOORD_0D + db $20, $68 ; BASECOORD_0E + db $20, $70 ; BASECOORD_0F + db $20, $78 ; BASECOORD_10 + db $20, $80 ; BASECOORD_11 + db $20, $88 ; BASECOORD_12 + db $20, $90 ; BASECOORD_13 + db $20, $98 ; BASECOORD_14 + db $28, $68 ; BASECOORD_15 + db $28, $70 ; BASECOORD_16 + db $28, $78 ; BASECOORD_17 + db $28, $80 ; BASECOORD_18 + db $28, $88 ; BASECOORD_19 + db $30, $68 ; BASECOORD_1A + db $30, $70 ; BASECOORD_1B + db $30, $78 ; BASECOORD_1C + db $30, $80 ; BASECOORD_1D + db $30, $90 ; BASECOORD_1E + db $30, $98 ; BASECOORD_1F + db $38, $68 ; BASECOORD_20 + db $38, $78 ; BASECOORD_21 + db $38, $80 ; BASECOORD_22 + db $38, $88 ; BASECOORD_23 + db $40, $68 ; BASECOORD_24 + db $40, $70 ; BASECOORD_25 + db $40, $78 ; BASECOORD_26 + db $40, $80 ; BASECOORD_27 + db $40, $88 ; BASECOORD_28 + db $40, $98 ; BASECOORD_29 + db $10, $60 ; BASECOORD_2A + db $18, $60 ; BASECOORD_2B + db $20, $60 ; BASECOORD_2C + db $28, $60 ; BASECOORD_2D + db $30, $60 ; BASECOORD_2E + db $40, $60 ; BASECOORD_2F + db $58, $28 ; BASECOORD_30 + db $43, $38 ; BASECOORD_31 + db $33, $48 ; BASECOORD_32 + db $20, $58 ; BASECOORD_33 + db $32, $78 ; BASECOORD_34 + db $58, $58 ; BASECOORD_35 + db $2C, $6C ; BASECOORD_36 + db $34, $80 ; BASECOORD_37 + db $48, $70 ; BASECOORD_38 + db $42, $36 ; BASECOORD_39 + db $38, $44 ; BASECOORD_3A + db $40, $52 ; BASECOORD_3B + db $48, $60 ; BASECOORD_3C + db $3E, $6E ; BASECOORD_3D + db $28, $7C ; BASECOORD_3E + db $28, $8A ; BASECOORD_3F + db $50, $3C ; BASECOORD_40 + db $48, $50 ; BASECOORD_41 + db $40, $64 ; BASECOORD_42 + db $38, $38 ; BASECOORD_43 + db $50, $30 ; BASECOORD_44 + db $50, $38 ; BASECOORD_45 + db $50, $40 ; BASECOORD_46 + db $50, $48 ; BASECOORD_47 + db $50, $50 ; BASECOORD_48 + db $48, $58 ; BASECOORD_49 + db $50, $44 ; BASECOORD_4A + db $48, $48 ; BASECOORD_4B + db $48, $4C ; BASECOORD_4C + db $40, $50 ; BASECOORD_4D + db $40, $54 ; BASECOORD_4E + db $38, $58 ; BASECOORD_4F + db $38, $5C ; BASECOORD_50 + db $30, $64 ; BASECOORD_51 + db $48, $40 ; BASECOORD_52 + db $48, $39 ; BASECOORD_53 + db $24, $88 ; BASECOORD_54 + db $24, $70 ; BASECOORD_55 + db $1C, $70 ; BASECOORD_56 + db $1C, $88 ; BASECOORD_57 + db $34, $68 ; BASECOORD_58 + db $34, $88 ; BASECOORD_59 + db $68, $50 ; BASECOORD_5A + db $60, $50 ; BASECOORD_5B + db $68, $60 ; BASECOORD_5C + db $58, $50 ; BASECOORD_5D + db $60, $60 ; BASECOORD_5E + db $68, $40 ; BASECOORD_5F + db $40, $40 ; BASECOORD_60 + db $38, $40 ; BASECOORD_61 + db $0B, $60 ; BASECOORD_62 + db $44, $48 ; BASECOORD_63 + db $40, $14 ; BASECOORD_64 + db $48, $1C ; BASECOORD_65 + db $50, $24 ; BASECOORD_66 + db $4C, $24 ; BASECOORD_67 + db $10, $62 ; BASECOORD_68 + db $12, $62 ; BASECOORD_69 + db $12, $60 ; BASECOORD_6A + db $20, $72 ; BASECOORD_6B + db $22, $72 ; BASECOORD_6C + db $22, $70 ; BASECOORD_6D + db $28, $62 ; BASECOORD_6E + db $50, $0A ; BASECOORD_6F + db $52, $0A ; BASECOORD_70 + db $38, $30 ; BASECOORD_71 + db $40, $48 ; BASECOORD_72 + db $30, $48 ; BASECOORD_73 + db $40, $30 ; BASECOORD_74 + db $30, $40 ; BASECOORD_75 + db $38, $48 ; BASECOORD_76 + db $40, $4A ; BASECOORD_77 + db $48, $4B ; BASECOORD_78 + db $50, $4C ; BASECOORD_79 + db $58, $4D ; BASECOORD_7A + db $60, $4D ; BASECOORD_7B + db $68, $4D ; BASECOORD_7C + db $38, $10 ; BASECOORD_7D + db $50, $10 ; BASECOORD_7E + db $38, $28 ; BASECOORD_7F + db $48, $18 ; BASECOORD_80 + db $40, $20 ; BASECOORD_81 + db $48, $20 ; BASECOORD_82 + db $40, $3C ; BASECOORD_83 + db $38, $50 ; BASECOORD_84 + db $28, $64 ; BASECOORD_85 + db $1C, $90 ; BASECOORD_86 + db $24, $80 ; BASECOORD_87 + db $2C, $70 ; BASECOORD_88 + db $30, $38 ; BASECOORD_89 + db $10, $50 ; BASECOORD_8A + db $3C, $40 ; BASECOORD_8B + db $40, $58 ; BASECOORD_8C + db $30, $58 ; BASECOORD_8D + db $58, $48 ; BASECOORD_8E + db $50, $58 ; BASECOORD_8F + db $48, $68 ; BASECOORD_90 + db $40, $18 ; BASECOORD_91 + db $28, $58 ; BASECOORD_92 + db $40, $38 ; BASECOORD_93 + db $48, $38 ; BASECOORD_94 + db $08, $70 ; BASECOORD_95 + db $44, $1C ; BASECOORD_96 + db $3C, $58 ; BASECOORD_97 + db $38, $60 ; BASECOORD_98 + db $08, $60 ; BASECOORD_99 + db $38, $70 ; BASECOORD_9A + db $38, $6C ; BASECOORD_9B + db $38, $64 ; BASECOORD_9C + db $1C, $74 ; BASECOORD_9D + db $2E, $74 ; BASECOORD_9E + db $34, $50 ; BASECOORD_9F + db $2F, $60 ; BASECOORD_A0 + db $31, $70 ; BASECOORD_A1 + db $4C, $30 ; BASECOORD_A2 + db $3B, $40 ; BASECOORD_A3 + db $2D, $50 ; BASECOORD_A4 + db $26, $60 ; BASECOORD_A5 + db $2D, $70 ; BASECOORD_A6 + db $28, $50 ; BASECOORD_A7 + db $1E, $60 ; BASECOORD_A8 + db $29, $70 ; BASECOORD_A9 + db $16, $60 ; BASECOORD_AA + db $14, $58 ; BASECOORD_AB + db $12, $54 ; BASECOORD_AC + db $14, $50 ; BASECOORD_AD + db $18, $4C ; BASECOORD_AE + db $1C, $48 ; BASECOORD_AF + db $48, $28 ; BASECOORD_B0 diff --git a/data/battle_anims/frame_blocks.asm b/data/battle_anims/frame_blocks.asm new file mode 100644 index 00000000..8b9b0919 --- /dev/null +++ b/data/battle_anims/frame_blocks.asm @@ -0,0 +1,1238 @@ +FrameBlockPointers: + dw FrameBlock00 + dw FrameBlock01 + dw FrameBlock02 + dw FrameBlock03 + dw FrameBlock04 + dw FrameBlock05 + dw FrameBlock06 + dw FrameBlock07 + dw FrameBlock08 + dw FrameBlock09 + dw FrameBlock0a + dw FrameBlock0b + dw FrameBlock0c + dw FrameBlock0d + dw FrameBlock0e + dw FrameBlock0f + dw FrameBlock10 + dw FrameBlock11 + dw FrameBlock12 + dw FrameBlock13 + dw FrameBlock14 + dw FrameBlock15 + dw FrameBlock16 + dw FrameBlock17 + dw FrameBlock18 + dw FrameBlock19 + dw FrameBlock1a + dw FrameBlock1b + dw FrameBlock1c + dw FrameBlock1d + dw FrameBlock1e + dw FrameBlock1f + dw FrameBlock20 + dw FrameBlock21 + dw FrameBlock22 + dw FrameBlock23 + dw FrameBlock24 + dw FrameBlock25 + dw FrameBlock26 + dw FrameBlock27 + dw FrameBlock28 + dw FrameBlock29 + dw FrameBlock2a + dw FrameBlock2b + dw FrameBlock2c + dw FrameBlock2d + dw FrameBlock2e + dw FrameBlock2f + dw FrameBlock30 + dw FrameBlock31 + dw FrameBlock32 + dw FrameBlock33 + dw FrameBlock34 + dw FrameBlock35 + dw FrameBlock36 + dw FrameBlock37 + dw FrameBlock38 + dw FrameBlock39 + dw FrameBlock3a + dw FrameBlock3b + dw FrameBlock3c + dw FrameBlock3d + dw FrameBlock3e + dw FrameBlock3f + dw FrameBlock40 + dw FrameBlock41 + dw FrameBlock42 + dw FrameBlock43 + dw FrameBlock44 + dw FrameBlock45 + dw FrameBlock46 + dw FrameBlock47 + dw SmallBlackCircleFrameBlock + dw LargeBlackCircleFrameBlock + dw FrameBlock4a + dw FrameBlock4b + dw FrameBlock4c + dw FrameBlock4d + dw FrameBlock4e + dw FrameBlock4f + dw FrameBlock50 + dw FrameBlock51 + dw FrameBlock52 + dw FrameBlock53 + dw FrameBlock54 + dw FrameBlock55 + dw FrameBlock56 + dw FrameBlock57 + dw FrameBlock58 + dw FrameBlock59 + dw FrameBlock5a + dw FrameBlock5b + dw FrameBlock5c + dw FrameBlock5d + dw FrameBlock5e + dw FrameBlock5f + dw FrameBlock60 + dw FrameBlock61 + dw FrameBlock62 + dw FrameBlock63 + dw FrameBlock64 + dw FrameBlock65 + dw FrameBlock66 + dw FrameBlock67 + dw FrameBlock68 + dw FrameBlock69 + dw FrameBlock6a + dw FrameBlock6b + dw FrameBlock6c + dw FrameBlock6d + dw FrameBlock6e + dw FrameBlock6f + dw FrameBlock70 + dw FrameBlock71 + dw FrameBlock72 + dw FrameBlock73 + dw FrameBlock74 + dw FrameBlock75 + dw FrameBlock76 + dw FrameBlock77 + dw FrameBlock78 + dw FrameBlock79 + +FrameBlock01: + db 9 ; # + dbsprite 0, 0, 0, 0, $2c, 0 + dbsprite 1, 0, 0, 0, $2d, 0 + dbsprite 2, 0, 0, 0, $2c, OAM_HFLIP + dbsprite 0, 1, 0, 0, $3c, 0 + dbsprite 1, 1, 0, 0, $3d, 0 + dbsprite 2, 1, 0, 0, $3c, OAM_HFLIP + dbsprite 0, 2, 0, 0, $2c, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2d, OAM_VFLIP + dbsprite 2, 2, 0, 0, $2c, OAM_HFLIP | OAM_VFLIP + +FrameBlock02: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 2, 0, 0, 0, $21, OAM_HFLIP + dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 2, 1, 0, 0, $31, OAM_HFLIP + dbsprite 3, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 2, 0, 0, $30, OAM_VFLIP + dbsprite 1, 2, 0, 0, $31, OAM_VFLIP + dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $20, OAM_VFLIP + dbsprite 1, 3, 0, 0, $21, OAM_VFLIP + dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock03: + db 4 ; # + dbsprite 0, 0, 0, 0, $02, 0 + dbsprite 1, 0, 0, 0, $02, OAM_HFLIP + dbsprite 0, 1, 0, 0, $12, 0 + dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + +FrameBlock04: + db 4 ; # + dbsprite 0, 0, 0, 0, $06, 0 + dbsprite 1, 0, 0, 0, $07, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock05: + db 4 ; # + dbsprite 0, 0, 0, 0, $07, OAM_HFLIP + dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 0, 1, 0, 0, $17, OAM_HFLIP + dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + +FrameBlock06: + db 12 ; # + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $33, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 2, 1, 0, 0, $33, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $33, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + +FrameBlock07: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 2, 0, 0, 0, $21, OAM_HFLIP + dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 2, 1, 0, 0, $31, OAM_HFLIP + dbsprite 3, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 2, 0, 0, $30, OAM_VFLIP + dbsprite 1, 2, 0, 0, $31, OAM_VFLIP + dbsprite 0, 3, 0, 0, $20, OAM_VFLIP + dbsprite 1, 3, 0, 0, $21, OAM_VFLIP + dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock08: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 3, 0, 0, 0, $21, OAM_HFLIP + dbsprite 4, 0, 0, 0, $20, OAM_HFLIP + dbsprite 3, 1, 0, 0, $31, OAM_HFLIP + dbsprite 4, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 3, 0, 0, $30, OAM_VFLIP + dbsprite 1, 3, 0, 0, $31, OAM_VFLIP + dbsprite 0, 4, 0, 0, $20, OAM_VFLIP + dbsprite 1, 4, 0, 0, $21, OAM_VFLIP + dbsprite 3, 3, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 3, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 4, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 4, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock09: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 3, 0, 0, 0, $25, OAM_HFLIP + dbsprite 4, 0, 0, 0, $24, OAM_HFLIP + dbsprite 4, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 3, 0, 0, $34, OAM_VFLIP + dbsprite 0, 4, 0, 0, $24, OAM_VFLIP + dbsprite 1, 4, 0, 0, $25, OAM_VFLIP + dbsprite 4, 3, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 4, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 4, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock0a: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 4, 0, 0, 0, $25, OAM_HFLIP + dbsprite 5, 0, 0, 0, $24, OAM_HFLIP + dbsprite 5, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 4, 0, 0, $34, OAM_VFLIP + dbsprite 0, 5, 0, 0, $24, OAM_VFLIP + dbsprite 1, 5, 0, 0, $25, OAM_VFLIP + dbsprite 5, 4, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 5, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 5, 5, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock0b: + db 4 ; # + dbsprite 0, 0, 0, 0, $05, 0 + dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 0, 1, 0, 0, $15, 0 + dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + +FrameBlock0c: + db 4 ; # + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 0, 1, 0, 0, $14, 0 + dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + +FrameBlock0d: + db 8 ; # + dbsprite 0, 0, 0, 0, $0c, 0 + dbsprite 1, 0, 0, 0, $0d, 0 + dbsprite 0, 1, 0, 0, $1c, 0 + dbsprite 1, 1, 0, 0, $1d, 0 + dbsprite 0, 2, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 2, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 3, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + +FrameBlock0e: + db 4 ; # + dbsprite 0, 4, 0, 0, $0c, 0 + dbsprite 1, 4, 0, 0, $0d, 0 + dbsprite 0, 5, 0, 0, $1c, 0 + dbsprite 1, 5, 0, 0, $1d, 0 + +FrameBlock0f: + db 4 ; # + dbsprite 0, 6, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 6, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 7, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 7, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + +FrameBlock10: + db 8 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0f, 0 + dbsprite 0, 1, 0, 0, $1e, 0 + dbsprite 1, 1, 0, 0, $1f, 0 + dbsprite 2, 0, 0, 0, $0f, OAM_HFLIP + dbsprite 3, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 2, 1, 0, 0, $1f, OAM_HFLIP + dbsprite 3, 1, 0, 0, $1e, OAM_HFLIP + +FrameBlock11: + db 8 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0f, 0 + dbsprite 0, 1, 0, 0, $1e, 0 + dbsprite 1, 1, 0, 0, $1f, 0 + dbsprite 4, 0, 0, 0, $0f, OAM_HFLIP + dbsprite 5, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 4, 1, 0, 0, $1f, OAM_HFLIP + dbsprite 5, 1, 0, 0, $1e, OAM_HFLIP + +FrameBlock12: + db 3 ; # + dbsprite 0, 0, 0, 0, $37, 0 + dbsprite 2, 1, 0, 0, $37, 0 + dbsprite 4, 0, 0, 0, $37, 0 + +FrameBlock13: + db 4 ; # + dbsprite 0, 0, 0, 0, $36, 0 + dbsprite 1, 0, 0, 0, $36, OAM_HFLIP + dbsprite 0, 1, 0, 0, $36, OAM_VFLIP + dbsprite 1, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + +FrameBlock14: + db 8 ; # + dbsprite 2, 0, 0, 0, $28, 0 + dbsprite 3, 0, 0, 0, $28, OAM_HFLIP + dbsprite 2, 1, 0, 0, $38, 0 + dbsprite 3, 1, 0, 0, $38, OAM_HFLIP + dbsprite 4, 0, 0, 0, $36, 0 + dbsprite 5, 0, 0, 0, $36, OAM_HFLIP + dbsprite 4, 1, 0, 0, $36, OAM_VFLIP + dbsprite 5, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + +FrameBlock15: + db 12 ; # + dbsprite 0, 0, 0, 0, $28, 0 + dbsprite 1, 0, 0, 0, $28, OAM_HFLIP + dbsprite 0, 1, 0, 0, $38, 0 + dbsprite 1, 1, 0, 0, $38, OAM_HFLIP + dbsprite 2, 0, 0, 0, $29, 0 + dbsprite 3, 0, 0, 0, $29, OAM_HFLIP + dbsprite 2, 1, 0, 0, $39, 0 + dbsprite 3, 1, 0, 0, $39, OAM_HFLIP + dbsprite 4, 0, 0, 0, $28, 0 + dbsprite 5, 0, 0, 0, $28, OAM_HFLIP + dbsprite 4, 1, 0, 0, $38, 0 + dbsprite 5, 1, 0, 0, $38, OAM_HFLIP + +FrameBlock16: + db 8 ; # + dbsprite 0, 0, 0, 0, $29, 0 + dbsprite 1, 0, 0, 0, $29, OAM_HFLIP + dbsprite 0, 1, 0, 0, $39, 0 + dbsprite 1, 1, 0, 0, $39, OAM_HFLIP + dbsprite 4, 0, 0, 0, $29, 0 + dbsprite 5, 0, 0, 0, $29, OAM_HFLIP + dbsprite 4, 1, 0, 0, $39, 0 + dbsprite 5, 1, 0, 0, $39, OAM_HFLIP + +FrameBlock17: + db 4 ; # + dbsprite 0, 0, 0, 0, $08, 0 + dbsprite 1, 0, 0, 0, $09, 0 + dbsprite 0, 1, 0, 0, $18, 0 + dbsprite 1, 1, 0, 0, $19, 0 + +FrameBlock18: + db 1 ; # + dbsprite 0, 3, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + +FrameBlock19: + db 2 ; # + dbsprite 1, 3, 0, 0, $45, 0 + dbsprite 1, 2, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1a: + db 2 ; # + dbsprite 2, 2, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $46, 0 + +FrameBlock1b: + db 2 ; # + dbsprite 3, 2, 0, 0, $45, 0 + dbsprite 3, 1, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1c: + db 2 ; # + dbsprite 4, 1, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 2, 0, 0, $46, 0 + +FrameBlock1d: + db 2 ; # + dbsprite 5, 1, 0, 0, $45, 0 + dbsprite 5, 0, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1e: + db 2 ; # + dbsprite 6, 0, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 1, 0, 0, $46, 0 + +FrameBlock75: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $22, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock1f: + db 2 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + +FrameBlock20: + db 6 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + +FrameBlock21: + db 12 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 2, 2, 0, 0, $03, 0 + dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 1, 2, 0, 0, $13, 0 + dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 0, 2, 0, 0, $03, 0 + dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + +FrameBlock22: + db 19 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 0, 2, 0, 0, $03, 0 + dbsprite 0, 3, 0, 0, $13, 0 + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 1, 2, 0, 0, $13, 0 + dbsprite 1, 3, 0, 0, $03, 0 + dbsprite 2, 2, 0, 0, $03, 0 + dbsprite 2, 3, 0, 0, $13, 0 + dbsprite 3, 3, 0, 0, $03, 0 + dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 4, 3, 0, 0, $13, OAM_HFLIP + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 5, 3, 0, 0, $03, OAM_HFLIP + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + dbsprite 6, 3, 0, 0, $13, OAM_HFLIP + +FrameBlock23: + db 4 ; # + dbsprite 0, 0, 0, 0, $0a, 0 + dbsprite 1, 0, 0, 0, $0b, 0 + dbsprite 0, 1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1b, 0 + +FrameBlock24: + db 2 ; # + dbsprite 0, 1, 0, 0, $0a, 0 + dbsprite 1, 1, 0, 0, $0b, 0 + +FrameBlock25: + db 12 ; # + dbsprite 0, 2, 0, 0, $0a, 0 + dbsprite 1, 2, 0, 0, $0b, 0 + dbsprite 0, 3, 0, 0, $1a, 0 + dbsprite 1, 3, 0, 0, $1b, 0 + dbsprite 2, 0, 0, 0, $0a, 0 + dbsprite 3, 0, 0, 0, $0b, 0 + dbsprite 2, 1, 0, 0, $1a, 0 + dbsprite 3, 1, 0, 0, $1b, 0 + dbsprite 4, 1, 0, 0, $0a, 0 + dbsprite 5, 1, 0, 0, $0b, 0 + dbsprite 4, 2, 0, 0, $1a, 0 + dbsprite 5, 2, 0, 0, $1b, 0 + +FrameBlock26: + db 4 ; # + dbsprite 2, 0, 0, 0, $44, 0 + dbsprite 3, 0, 0, 0, $44, OAM_HFLIP + dbsprite 2, 1, 0, 0, $44, OAM_VFLIP + dbsprite 3, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock27: + db 5 ; # + dbsprite 1, 1, 0, 0, $44, 0 + dbsprite 2, 1, 0, 0, $44, OAM_HFLIP + dbsprite 1, 2, 0, 0, $44, OAM_VFLIP + dbsprite 2, 2, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $47, 0 + +FrameBlock28: + db 6 ; # + dbsprite 0, 2, 0, 0, $44, 0 + dbsprite 1, 2, 0, 0, $44, OAM_HFLIP + dbsprite 0, 3, 0, 0, $44, OAM_VFLIP + dbsprite 1, 3, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $47, 0 + dbsprite 2, 0, 6, 2, $47, 0 + +FrameBlock29: + db 4 ; # + dbsprite 0, 3, 0, 0, $47, 0 + dbsprite 0, 2, 6, 2, $47, 0 + dbsprite 1, 1, 4, 4, $47, 0 + dbsprite 2, 0, 2, 6, $47, 0 + +FrameBlock2a: + db 4 ; # + dbsprite 0, 0, 0, 0, $44, 0 + dbsprite 1, 0, 0, 0, $44, OAM_HFLIP + dbsprite 0, 1, 0, 0, $44, OAM_VFLIP + dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock2b: + db 2 ; # + dbsprite 0, 0, 2, 6, $47, 0 + dbsprite 1, 0, 0, 0, $47, 0 + +FrameBlock2c: + db 1 ; # + dbsprite 0, 20, 0, 0, $4d, 0 + +FrameBlock2d: + db 8 ; # + dbsprite 0, 0, 0, 0, $26, 0 + dbsprite 1, 0, 0, 0, $27, 0 + dbsprite 0, 1, 0, 0, $36, 0 + dbsprite 1, 1, 0, 0, $37, 0 + dbsprite 0, 2, 0, 0, $28, 0 + dbsprite 1, 2, 0, 0, $29, 0 + dbsprite 0, 3, 0, 0, $38, 0 + dbsprite 1, 3, 0, 0, $39, 0 + +FrameBlock2e: + db 8 ; # + dbsprite 0, 0, 0, 0, $27, OAM_HFLIP + dbsprite 1, 0, 0, 0, $26, OAM_HFLIP + dbsprite 0, 1, 0, 0, $37, OAM_HFLIP + dbsprite 1, 1, 0, 0, $36, OAM_HFLIP + dbsprite 0, 2, 0, 0, $29, OAM_HFLIP + dbsprite 1, 2, 0, 0, $28, OAM_HFLIP + dbsprite 0, 3, 0, 0, $39, OAM_HFLIP + dbsprite 1, 3, 0, 0, $38, OAM_HFLIP + +FrameBlock2f: + db 4 ; # + dbsprite 0, 0, 0, 0, $0c, 0 + dbsprite 1, 0, 0, 0, $0d, 0 + dbsprite 0, 1, 0, 0, $0c, OAM_VFLIP + dbsprite 1, 1, 0, 0, $0d, OAM_VFLIP + +FrameBlock30: + db 4 ; # + dbsprite 0, 0, 0, 0, $44, 0 + dbsprite 1, 0, 0, 0, $44, OAM_HFLIP + dbsprite 0, 1, 0, 0, $44, OAM_VFLIP + dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock31: + db 1 ; # + dbsprite 0, 0, 0, 0, $45, 0 + +FrameBlock32: + db 7 ; # + dbsprite 0, 0, 0, 0, $4d, 0 + dbsprite 1, 0, 0, 0, $2f, 0 + dbsprite 2, 0, 0, 0, $4d, OAM_HFLIP + dbsprite 0, 1, 0, 0, $4e, 0 + dbsprite 1, 1, 0, 0, $07, 0 + dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP + dbsprite 1, 2, 0, 0, $3f, 0 + +FrameBlock33: + db 7 ; # + dbsprite 1, 0, 0, 0, $3f, OAM_VFLIP + dbsprite 0, 1, 0, 0, $4e, OAM_VFLIP + dbsprite 1, 1, 0, 0, $07, OAM_VFLIP + dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $4d, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 2, 2, 0, 0, $4d, OAM_HFLIP | OAM_VFLIP + +FrameBlock34: + db 1 ; # + dbsprite 0, 20, 0, 0, $00, OAM_OBP1 + +FrameBlock35: + db 6 ; # + dbsprite 0, 0, 0, 0, $2a, 0 + dbsprite 1, 0, 0, 0, $2b, 0 + dbsprite 0, 1, 0, 0, $3a, 0 + dbsprite 0, 2, 0, 0, $3a, OAM_VFLIP + dbsprite 0, 3, 0, 0, $2a, OAM_VFLIP + dbsprite 1, 3, 0, 0, $2b, OAM_VFLIP + +FrameBlock36: + db 4 ; # + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 0, 1, 0, 0, $10, 0 + dbsprite 1, 1, 0, 0, $11, 0 + +FrameBlock37: + db 4 ; # + dbsprite 0, 0, 0, 0, $01, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 1, 0, 0, 0, $00, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 0, 1, 0, 0, $11, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 1, 1, 0, 0, $10, OAM_BEHIND_BG | OAM_HFLIP + +FrameBlock38: + db 4 ; # + dbsprite 0, 0, 0, 0, $0a, 0 + dbsprite 1, 0, 0, 0, $0b, 0 + dbsprite 0, 1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1b, 0 + +FrameBlock39: + db 4 ; # + dbsprite 0, 0, 0, 0, $0b, OAM_HFLIP + dbsprite 1, 0, 0, 0, $0a, OAM_HFLIP + dbsprite 0, 1, 0, 0, $1b, OAM_HFLIP + dbsprite 1, 1, 0, 0, $1a, OAM_HFLIP + +FrameBlock3a: + db 4 ; # + dbsprite 0, 4, 0, 0, $05, 0 + dbsprite 1, 4, 0, 0, $05, OAM_HFLIP + dbsprite 0, 5, 0, 0, $15, 0 + dbsprite 1, 5, 0, 0, $15, OAM_HFLIP + +FrameBlock3b: + db 5 ; # + dbsprite 0, 3, 0, 0, $04, 0 + dbsprite 1, 3, 0, 0, $04, OAM_HFLIP + dbsprite 0, 4, 0, 0, $14, 0 + dbsprite 1, 4, 0, 0, $14, OAM_HFLIP + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock3c: + db 6 ; # + dbsprite 0, 2, 0, 0, $05, 0 + dbsprite 1, 2, 0, 0, $05, OAM_HFLIP + dbsprite 0, 3, 0, 0, $15, 0 + dbsprite 1, 3, 0, 0, $15, OAM_HFLIP + dbsprite 0, 4, 4, 0, $42, 0 + dbsprite 0, 5, 4, 0, $42, 0 + +FrameBlock3d: + db 7 ; # + dbsprite 0, 1, 0, 0, $04, 0 + dbsprite 1, 1, 0, 0, $04, OAM_HFLIP + dbsprite 0, 2, 0, 0, $14, 0 + dbsprite 1, 2, 0, 0, $14, OAM_HFLIP + dbsprite 0, 3, 4, 0, $41, 0 + dbsprite 0, 4, 4, 0, $41, 0 + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock3e: + db 8 ; # + dbsprite 0, 0, 0, 0, $05, 0 + dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 0, 1, 0, 0, $15, 0 + dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + dbsprite 0, 2, 4, 0, $42, 0 + dbsprite 0, 3, 4, 0, $42, 0 + dbsprite 0, 4, 4, 0, $42, 0 + dbsprite 0, 5, 4, 0, $42, 0 + +FrameBlock3f: + db 8 ; # + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 0, 1, 0, 0, $14, 0 + dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + dbsprite 0, 2, 4, 0, $41, 0 + dbsprite 0, 3, 4, 0, $41, 0 + dbsprite 0, 4, 4, 0, $41, 0 + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock40: + db 3 ; # + dbsprite 0, 0, 0, 0, $3d, 0 + dbsprite 1, 0, 0, 0, $3d, 0 + dbsprite 1, 1, 0, 0, $3d, 0 + +FrameBlock41: + db 4 ; # + dbsprite 0, 0, 0, 0, $06, 0 + dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock42: + db 11 ; # + dbsprite 2, 0, 0, 0, $42, 0 + dbsprite 0, 1, 0, 0, $42, 0 + dbsprite 1, 1, 0, 0, $42, 0 + dbsprite 2, 1, 0, 0, $42, 0 + dbsprite 3, 1, 0, 0, $42, 0 + dbsprite 4, 1, 0, 0, $42, 0 + dbsprite 2, 2, 0, 0, $42, 0 + dbsprite 1, 3, 0, 0, $42, 0 + dbsprite 3, 3, 0, 0, $42, 0 + dbsprite 0, 4, 0, 0, $42, 0 + dbsprite 4, 4, 0, 0, $42, 0 + +FrameBlock43: + db 11 ; # + dbsprite 2, 0, 0, 0, $41, 0 + dbsprite 0, 1, 0, 0, $41, 0 + dbsprite 1, 1, 0, 0, $41, 0 + dbsprite 2, 1, 0, 0, $41, 0 + dbsprite 3, 1, 0, 0, $41, 0 + dbsprite 4, 1, 0, 0, $41, 0 + dbsprite 2, 2, 0, 0, $41, 0 + dbsprite 1, 3, 0, 0, $41, 0 + dbsprite 3, 3, 0, 0, $41, 0 + dbsprite 0, 4, 0, 0, $41, 0 + dbsprite 4, 4, 0, 0, $41, 0 + +FrameBlock44: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 5, 0, 0, 0, $49, 0 + dbsprite 0, 5, 0, 0, $49, 0 + dbsprite 5, 5, 0, 0, $49, 0 + +FrameBlock45: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 3, 0, 0, 0, $49, 0 + dbsprite 0, 3, 0, 0, $49, 0 + dbsprite 3, 3, 0, 0, $49, 0 + +FrameBlock46: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 1, 0, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + +FrameBlock47: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $43, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +SmallBlackCircleFrameBlock: + db 4 ; # + dbsprite 1, 1, 0, 0, $33, 0 + dbsprite 2, 1, 0, 0, $33, OAM_HFLIP + dbsprite 1, 2, 0, 0, $33, OAM_VFLIP + dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + +LargeBlackCircleFrameBlock: + db 16 ; # + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $43, 0 + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $22, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock71: + db 16 ; # + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $3b, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $43, 0 + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $22, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock72: + db 12 ; # + dbsprite 0, 0, 0, 0, $32, 0 + dbsprite 1, 0, 0, 0, $43, 0 + dbsprite 2, 0, 0, 0, $43, OAM_HFLIP + dbsprite 3, 0, 0, 0, $32, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_VFLIP + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $22, OAM_VFLIP + dbsprite 1, 2, 0, 0, $23, OAM_VFLIP + dbsprite 2, 2, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock73: + db 8 ; # + dbsprite 0, 0, 0, 0, $32, OAM_VFLIP + dbsprite 1, 0, 0, 0, $43, OAM_VFLIP + dbsprite 2, 0, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 1, 0, 0, $22, OAM_VFLIP + dbsprite 1, 1, 0, 0, $23, OAM_VFLIP + dbsprite 2, 1, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock74: + db 4 ; # + dbsprite 0, 0, 0, 0, $22, OAM_VFLIP + dbsprite 1, 0, 0, 0, $23, OAM_VFLIP + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock4a: + db 4 ; # + dbsprite 3, 1, 0, 0, $4c, OAM_HFLIP + dbsprite 1, 4, 0, 0, $4b, 0 + dbsprite 4, 6, 0, 0, $4c, 0 + dbsprite 6, 3, 0, 0, $4b, OAM_VFLIP + +FrameBlock4b: + db 4 ; # + dbsprite 3, 0, 0, 0, $4c, 0 + dbsprite 0, 4, 0, 0, $4b, OAM_VFLIP + dbsprite 4, 7, 0, 0, $4c, OAM_HFLIP + dbsprite 7, 3, 0, 0, $4b, 0 + +FrameBlock4c: + db 4 ; # + dbsprite 1, 2, 0, 0, $4a, OAM_VFLIP + dbsprite 2, 6, 0, 0, $4a, 0 + dbsprite 6, 5, 0, 0, $4a, OAM_HFLIP + dbsprite 5, 1, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + +FrameBlock4d: + db 4 ; # + dbsprite 0, 1, 0, 0, $4a, OAM_HFLIP + dbsprite 1, 7, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + dbsprite 7, 6, 0, 0, $4a, OAM_VFLIP + dbsprite 6, 0, 0, 0, $4a, 0 + +FrameBlock4e: + db 8 ; # + dbsprite 6, 0, 0, 0, $44, 0 + dbsprite 7, 0, 0, 0, $44, OAM_HFLIP + dbsprite 6, 1, 0, 0, $44, OAM_VFLIP + dbsprite 7, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 4, 2, 6, $44, 0 + dbsprite 2, 4, 2, 6, $44, OAM_HFLIP + dbsprite 1, 5, 2, 6, $44, OAM_VFLIP + dbsprite 2, 5, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock4f: + db 12 ; # + dbsprite 4, 1, 2, 6, $44, 0 + dbsprite 5, 1, 2, 6, $44, OAM_HFLIP + dbsprite 4, 2, 2, 6, $44, OAM_VFLIP + dbsprite 5, 2, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 0, 2, 6, $47, 0 + dbsprite 7, 0, 0, 0, $47, 0 + dbsprite 2, 3, 6, 2, $44, 0 + dbsprite 3, 3, 6, 2, $44, OAM_HFLIP + dbsprite 2, 4, 6, 2, $44, OAM_VFLIP + dbsprite 3, 4, 6, 2, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 6, 0, 0, $47, 0 + dbsprite 1, 5, 6, 2, $47, 0 + +FrameBlock50: + db 8 ; # + dbsprite 6, 0, 2, 6, $47, 0 + dbsprite 7, 0, 0, 0, $47, 0 + dbsprite 4, 2, 6, 2, $47, 0 + dbsprite 5, 1, 4, 4, $47, 0 + dbsprite 3, 3, 2, 6, $47, 0 + dbsprite 4, 3, 0, 0, $47, 0 + dbsprite 1, 5, 6, 2, $47, 0 + dbsprite 2, 4, 4, 4, $47, 0 + +FrameBlock51: + db 8 ; # + dbsprite 0, 0, 0, 0, $35, OAM_HFLIP + dbsprite 0, 1, 0, 0, $35, OAM_VFLIP + dbsprite 0, 2, 0, 0, $35, 0 + dbsprite 0, 3, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 8, 0, 0, 0, $35, 0 + dbsprite 8, 1, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 8, 2, 0, 0, $35, OAM_HFLIP + dbsprite 8, 3, 0, 0, $35, OAM_VFLIP + +FrameBlock52: + db 4 ; # + dbsprite 0, 0, 0, 0, $2a, 0 + dbsprite 1, 0, 0, 0, $2b, 0 + dbsprite 0, 1, 0, 0, $3a, 0 + dbsprite 1, 1, 0, 0, $3b, 0 + +FrameBlock53: + db 3 ; # + dbsprite 0, 0, 0, 0, $3f, 0 + dbsprite 1, 0, 0, 0, $3f, 0 + dbsprite 0, 1, 6, 0, $3f, 0 + +FrameBlock54: + db 4 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 0, 1, 0, 0, $0f, 0 + dbsprite 1, 1, 0, 0, $0f, OAM_HFLIP + +FrameBlock55: + db 3 ; # + dbsprite 0, 2, 0, 0, $2c, 0 + dbsprite 1, 2, 0, 0, $3c, 0 + dbsprite 2, 2, 0, 0, $2d, 0 + +FrameBlock56: + db 6 ; # + dbsprite 2, 2, 0, 0, $31, 0 + dbsprite 3, 2, 0, 0, $31, 0 + dbsprite 2, 1, 0, 0, $2c, 0 + dbsprite 3, 1, 0, 0, $3c, 0 + dbsprite 4, 1, 0, 0, $2d, 0 + dbsprite 4, 2, 0, 0, $2d, 0 + +FrameBlock57: + db 9 ; # + dbsprite 4, 1, 0, 0, $31, 0 + dbsprite 4, 2, 0, 0, $31, 0 + dbsprite 5, 1, 0, 0, $31, 0 + dbsprite 5, 2, 0, 0, $31, 0 + dbsprite 4, 0, 0, 0, $2c, 0 + dbsprite 5, 0, 0, 0, $3c, 0 + dbsprite 6, 0, 0, 0, $2d, 0 + dbsprite 6, 1, 0, 0, $2d, 0 + dbsprite 6, 2, 0, 0, $2d, 0 + +FrameBlock58: + db 7 ; # + dbsprite 0, 0, 0, 0, $46, 0 + dbsprite 0, 1, 2, 0, $47, 0 + dbsprite 0, 2, 3, 0, $48, 0 + dbsprite 0, 3, 4, 0, $48, 0 + dbsprite 0, 4, 5, 0, $48, 0 + dbsprite 0, 5, 5, 0, $48, 0 + dbsprite 0, 6, 5, 0, $48, 0 + +FrameBlock59: + db 1 ; # + dbsprite 0, 0, 0, 0, $42, 0 + +FrameBlock5a: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 2, 0, 0, 0, $25, OAM_HFLIP + dbsprite 3, 0, 0, 0, $24, OAM_HFLIP + dbsprite 3, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 2, 0, 0, $34, OAM_VFLIP + dbsprite 0, 3, 0, 0, $24, OAM_VFLIP + dbsprite 1, 3, 0, 0, $25, OAM_VFLIP + dbsprite 3, 2, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock5b: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $43, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5c: + db 8 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 1, 0, 0, 2, $49, 0 + dbsprite 0, 3, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5d: + db 11 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 0, 3, 2, 0, $49, 0 + dbsprite 2, 2, 0, 4, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 4, $43, 0 + dbsprite 2, 0, 0, 4, $43, OAM_HFLIP + dbsprite 1, 1, 0, 4, $43, OAM_VFLIP + dbsprite 2, 1, 0, 4, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5e: + db 15 ; # + dbsprite 1, 0, 0, 0, $49, 0 + dbsprite 2, 1, 0, 0, $49, 0 + dbsprite 0, 4, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, 0 + dbsprite 3, 2, 0, 0, $43, OAM_HFLIP + dbsprite 2, 3, 0, 0, $43, OAM_VFLIP + dbsprite 3, 3, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 4, 0, 0, $43, 0 + dbsprite 2, 4, 0, 0, $43, OAM_HFLIP + dbsprite 1, 5, 0, 0, $43, OAM_VFLIP + dbsprite 2, 5, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5f: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + +FrameBlock60: + db 8 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + +FrameBlock61: + db 12 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + dbsprite 0, 2, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 4, 2, 0, 0, $49, 0 + dbsprite 6, 2, 0, 0, $49, 0 + +FrameBlock62: + db 15 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + dbsprite 0, 2, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 4, 2, 0, 0, $49, 0 + dbsprite 6, 2, 0, 0, $49, 0 + dbsprite 1, 3, 0, 0, $49, 0 + dbsprite 3, 3, 0, 0, $49, 0 + dbsprite 5, 3, 0, 0, $49, 0 + dbsprite 7, 3, 0, 0, $49, 0 + +FrameBlock63: + db 6 ; # + dbsprite 0, 2, 0, 0, $26, 0 + dbsprite 1, 2, 0, 0, $27, 0 + dbsprite 2, 1, 0, 0, $26, 0 + dbsprite 3, 1, 0, 0, $27, 0 + dbsprite 4, 0, 0, 0, $26, 0 + dbsprite 5, 0, 0, 0, $27, 0 + +FrameBlock64: + db 6 ; # + dbsprite 0, 3, 0, 0, $27, 0 + dbsprite 1, 2, 0, 0, $26, 0 + dbsprite 2, 2, 0, 0, $27, 0 + dbsprite 3, 1, 0, 0, $26, 0 + dbsprite 4, 1, 0, 0, $27, 0 + dbsprite 5, 0, 0, 0, $26, 0 + +FrameBlock65: + db 6 ; # + dbsprite 0, 0, 0, 0, $1c, 0 + dbsprite 1, 0, 0, 0, $1d, 0 + dbsprite 0, 2, 0, 0, $1c, 0 + dbsprite 1, 2, 0, 0, $1d, 0 + dbsprite 0, 4, 0, 0, $1c, 0 + dbsprite 1, 4, 0, 0, $1d, 0 + +FrameBlock66: + db 2 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 0, 1, 0, 0, $13, 0 + +FrameBlock67: + db 1 ; # + dbsprite 0, 0, 0, 0, $03, 0 + +FrameBlock68: + db 4 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 1, 0, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 1, 1, 0, 0, $13, OAM_HFLIP + +FrameBlock69: + db 1 ; # + dbsprite 0, 0, 0, 0, $06, 0 + +FrameBlock6a: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 6, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 6, 0, 0, $2e, OAM_VFLIP + dbsprite 6, 6, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $2f, 0 + dbsprite 3, 6, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 3, 0, 0, $3e, 0 + dbsprite 6, 3, 0, 0, $3e, OAM_HFLIP + +FrameBlock6b: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 4, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 4, 0, 0, $2e, OAM_VFLIP + dbsprite 4, 4, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $2f, 0 + dbsprite 2, 4, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 2, 0, 0, $3e, 0 + dbsprite 4, 2, 0, 0, $3e, OAM_HFLIP + +FrameBlock6c: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 2, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 2, 0, 0, $2e, OAM_VFLIP + dbsprite 2, 2, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $2f, 0 + dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 1, 0, 0, $3e, 0 + dbsprite 2, 1, 0, 0, $3e, OAM_HFLIP + +FrameBlock6d: + db 2 ; # + dbsprite 0, 0, 0, 0, $1e, 0 + dbsprite 1, 0, 0, 0, $1f, 0 + +FrameBlock6e: + db 4 ; # + dbsprite 0, 0, 0, 0, $48, 0 + dbsprite 1, 0, 0, 0, $48, OAM_HFLIP + dbsprite 0, 1, 0, 0, $12, 0 + dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + +FrameBlock6f: + db 4 ; # + dbsprite 0, 0, 0, 0, $4a, 0 + dbsprite 1, 0, 0, 0, $07, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock70: + db 4 ; # + dbsprite 0, 0, 0, 0, $07, OAM_HFLIP + dbsprite 1, 0, 0, 0, $4a, OAM_HFLIP + dbsprite 0, 1, 0, 0, $17, OAM_HFLIP + dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + +FrameBlock76: + db 7 ; # + dbsprite 2, 0, 0, 0, $2f, 0 + dbsprite 1, 0, 0, 1, $2f, 0 + dbsprite 3, 0, 0, 1, $2f, 0 + dbsprite 0, 0, 0, 2, $2e, 0 + dbsprite 4, 0, 0, 2, $2e, OAM_HFLIP + dbsprite 0, 1, 0, 2, $3e, 0 + dbsprite 4, 1, 0, 2, $3e, OAM_HFLIP + +FrameBlock77: + db 4 ; # + dbsprite 0, 0, 2, 0, $4b, 0 + dbsprite 1, 0, 2, 0, $4c, 0 + dbsprite 0, 1, 0, 0, $4c, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 1, 0, 0, $4b, OAM_HFLIP | OAM_VFLIP + +FrameBlock78: + db 1 ; # + dbsprite 0, 0, 0, 0, $4d, 0 + +FrameBlock79: + db 1 ; # + dbsprite 0, 0, 0, 0, $4e, 0 + +INCLUDE "data/battle_anims/base_coords.asm" + +FrameBlock00: + db 0 ; # + + db $00 ; unused diff --git a/data/battle_anims/special_effect_pointers.asm b/data/battle_anims/special_effect_pointers.asm new file mode 100644 index 00000000..4e2fb857 --- /dev/null +++ b/data/battle_anims/special_effect_pointers.asm @@ -0,0 +1,47 @@ +special_effect: MACRO + db \1 + dw \2 +ENDM + +SpecialEffectPointers: + ; special effect id, effect routine address + special_effect SE_DARK_SCREEN_FLASH, AnimationFlashScreen ; $FE + special_effect SE_DARK_SCREEN_PALETTE, AnimationDarkScreenPalette ; $FD + special_effect SE_RESET_SCREEN_PALETTE, AnimationResetScreenPalette ; $FC + special_effect SE_SHAKE_SCREEN, AnimationShakeScreen ; $FB + special_effect SE_WATER_DROPLETS_EVERYWHERE, AnimationWaterDropletsEverywhere ; $FA + special_effect SE_DARKEN_MON_PALETTE, AnimationDarkenMonPalette ; $F9 + special_effect SE_FLASH_SCREEN_LONG, AnimationFlashScreenLong ; $F8 + special_effect SE_SLIDE_MON_UP, AnimationSlideMonUp ; $F7 + special_effect SE_SLIDE_MON_DOWN, AnimationSlideMonDown ; $F6 + special_effect SE_FLASH_MON_PIC, AnimationFlashMonPic ; $F5 + special_effect SE_SLIDE_MON_OFF, AnimationSlideMonOff ; $F4 + special_effect SE_BLINK_MON, AnimationBlinkMon ; $F3 + special_effect SE_MOVE_MON_HORIZONTALLY, AnimationMoveMonHorizontally ; $F2 + special_effect SE_RESET_MON_POSITION, AnimationResetMonPosition ; $F1 + special_effect SE_LIGHT_SCREEN_PALETTE, AnimationLightScreenPalette ; $F0 + special_effect SE_HIDE_MON_PIC, AnimationHideMonPic ; $EF + special_effect SE_SQUISH_MON_PIC, AnimationSquishMonPic ; $EE + special_effect SE_SHOOT_BALLS_UPWARD, AnimationShootBallsUpward ; $ED + special_effect SE_SHOOT_MANY_BALLS_UPWARD, AnimationShootManyBallsUpward ; $EC + special_effect SE_BOUNCE_UP_AND_DOWN, AnimationBoundUpAndDown ; $EB + special_effect SE_MINIMIZE_MON, AnimationMinimizeMon ; $EA + special_effect SE_SLIDE_MON_DOWN_AND_HIDE, AnimationSlideMonDownAndHide ; $E9 + special_effect SE_TRANSFORM_MON, AnimationTransformMon ; $E8 + special_effect SE_LEAVES_FALLING, AnimationLeavesFalling ; $E7 + special_effect SE_PETALS_FALLING, AnimationPetalsFalling ; $E6 + special_effect SE_SLIDE_MON_HALF_OFF, AnimationSlideMonHalfOff ; $E5 + special_effect SE_SHAKE_ENEMY_HUD, AnimationShakeEnemyHUD ; $E4 + special_effect SE_SHAKE_ENEMY_HUD_2, AnimationShakeEnemyHUD ; $E3 unused + special_effect SE_SPIRAL_BALLS_INWARD, AnimationSpiralBallsInward ; $E2 + special_effect SE_DELAY_ANIMATION_10, AnimationDelay10 ; $E1 + special_effect SE_FLASH_ENEMY_MON_PIC, AnimationFlashEnemyMonPic ; $E0 unused + special_effect SE_HIDE_ENEMY_MON_PIC, AnimationHideEnemyMonPic ; $DF + special_effect SE_BLINK_ENEMY_MON, AnimationBlinkEnemyMon ; $DE + special_effect SE_SHOW_MON_PIC, AnimationShowMonPic ; $DD + special_effect SE_SHOW_ENEMY_MON_PIC, AnimationShowEnemyMonPic ; $DC + special_effect SE_SLIDE_ENEMY_MON_OFF, AnimationSlideEnemyMonOff ; $DB + special_effect SE_SHAKE_BACK_AND_FORTH, AnimationShakeBackAndForth ; $DA + special_effect SE_SUBSTITUTE_MON, AnimationSubstitute ; $D9 + special_effect SE_WAVY_SCREEN, AnimationWavyScreen ; $D8 + db -1 ; end diff --git a/data/battle_anims/special_effects.asm b/data/battle_anims/special_effects.asm new file mode 100644 index 00000000..98385d47 --- /dev/null +++ b/data/battle_anims/special_effects.asm @@ -0,0 +1,32 @@ +anim_special_effect: MACRO + db \1 + dw \2 +ENDM + +AnimationIdSpecialEffects: + ; animation id, effect routine address + anim_special_effect MEGA_PUNCH, AnimationFlashScreen + anim_special_effect GUILLOTINE, AnimationFlashScreen + anim_special_effect MEGA_KICK, AnimationFlashScreen + anim_special_effect HEADBUTT, AnimationFlashScreen + anim_special_effect TAIL_WHIP, TailWhipAnimationUnused + anim_special_effect GROWL, DoGrowlSpecialEffects + anim_special_effect DISABLE, AnimationFlashScreen + anim_special_effect BLIZZARD, DoBlizzardSpecialEffects + anim_special_effect BUBBLEBEAM, AnimationFlashScreen + anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks + anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks + anim_special_effect REFLECT, AnimationFlashScreen + anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects + anim_special_effect SPORE, AnimationFlashScreen + anim_special_effect EXPLOSION, DoExplodeSpecialEffects + anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects + anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon + anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball + anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball + anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects + anim_special_effect POOF_ANIM, DoPoofSpecialEffects + anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects + db -1 ; end diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm new file mode 100644 index 00000000..bbdc45c0 --- /dev/null +++ b/data/battle_anims/subanimations.asm @@ -0,0 +1,954 @@ +SubanimationPointers: + dw Subanimation00 + dw Subanimation01 + dw Subanimation02 + dw Subanimation03 + dw Subanimation04 + dw Subanimation05 + dw Subanimation06 + dw Subanimation07 + dw Subanimation08 + dw Subanimation09 + dw Subanimation0a + dw Subanimation0b + dw Subanimation0c + dw Subanimation0d + dw Subanimation0e + dw Subanimation0f + dw Subanimation10 + dw Subanimation11 + dw Subanimation12 + dw Subanimation13 + dw Subanimation14 + dw Subanimation15 + dw Subanimation16 + dw Subanimation17 + dw Subanimation18 + dw Subanimation19 + dw Subanimation1a + dw Subanimation1b + dw Subanimation1c + dw Subanimation1d + dw Subanimation1e + dw Subanimation1f + dw Subanimation20 + dw Subanimation21 + dw Subanimation22 + dw Subanimation23 + dw Subanimation24 + dw Subanimation25 + dw Subanimation26 + dw Subanimation27 + dw Subanimation28 + dw Subanimation29 + dw Subanimation2a + dw Subanimation2b + dw Subanimation2c + dw Subanimation2d + dw Subanimation2e + dw Subanimation2f + dw Subanimation30 + dw Subanimation31 + dw Subanimation32 + dw Subanimation33 + dw Subanimation34 + dw Subanimation35 + dw Subanimation36 + dw Subanimation37 + dw Subanimation38 + dw Subanimation39 + dw Subanimation3a + dw Subanimation3b + dw Subanimation3c + dw Subanimation3d + dw Subanimation3e + dw Subanimation3f + dw Subanimation40 + dw Subanimation41 + dw Subanimation42 + dw Subanimation43 + dw Subanimation44 + dw Subanimation45 + dw Subanimation46 + dw Subanimation47 + dw Subanimation48 + dw Subanimation49 + dw Subanimation4a + dw Subanimation4b + dw Subanimation4c + dw Subanimation4d + dw Subanimation4e + dw Subanimation4f + dw Subanimation50 + dw Subanimation51 + dw Subanimation52 + dw Subanimation53 + dw Subanimation54 + dw Subanimation55 + +; format: +; subanim type, count +; REPT count +; db frame block id, base coordinate id, frame block mode +; endr + +subanim: MACRO + db (\1 << 5) | \2 +ENDM + +Subanimation04: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_02, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_03, FRAMEBLOCKMODE_00 + +Subanimation05: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation08: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_44, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_94, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_60, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_9F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A0, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A1, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation07: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A3, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A4, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A5, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A6, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation06: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation09: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_04, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_21, FRAMEBLOCKMODE_04 + +Subanimation0a: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_06, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_36, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_09, BASECOORD_36, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation0b: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_01, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_35, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_4D, FRAMEBLOCKMODE_00 + +Subanimation55: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_01, BASECOORD_9D, FRAMEBLOCKMODE_00 + +Subanimation11: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00 + +Subanimation2b: + subanim SUBANIMTYPE_HFLIP, 11 + db FRAMEBLOCK_0D, BASECOORD_03, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0E, BASECOORD_03, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0F, BASECOORD_03, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation2c: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_12, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_25, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00 + +Subanimation12: + subanim SUBANIMTYPE_COORDFLIP, 9 + db FRAMEBLOCK_17, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_39, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_1F, FRAMEBLOCKMODE_00 + +Subanimation00: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_01, BASECOORD_17, FRAMEBLOCKMODE_00 + +Subanimation01: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_01, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + +Subanimation02: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_01, BASECOORD_12, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1C, FRAMEBLOCKMODE_00 + +Subanimation03: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_01, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_18, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + +Subanimation0c: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_00 + +Subanimation0d: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_00 + +Subanimation0e: + subanim SUBANIMTYPE_HFLIP, 9 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_09, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_0C, FRAMEBLOCKMODE_00 + +Subanimation1f: + subanim SUBANIMTYPE_REVERSE, 5 + db FRAMEBLOCK_0C, BASECOORD_30, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_40, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_41, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_42, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00 + +Subanimation2e: + subanim SUBANIMTYPE_HVFLIP, 14 + db FRAMEBLOCK_18, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_52, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_19, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_63, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1A, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_4D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1B, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_97, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1C, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_98, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1D, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_58, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1E, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation2f: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_1F, BASECOORD_24, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_20, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_21, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_22, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation30: + subanim SUBANIMTYPE_HFLIP, 18 + db FRAMEBLOCK_23, BASECOORD_00, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_07, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_24, BASECOORD_24, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_1C, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_23, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00 + +Subanimation0f: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_26, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_26, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_26, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_27, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_27, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_27, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_28, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_28, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_28, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_29, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_29, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_29, BASECOORD_1C, FRAMEBLOCKMODE_00 + +Subanimation16: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_2A, BASECOORD_05, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2B, BASECOORD_05, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_0C, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_11, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2B, BASECOORD_11, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_17, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_1B, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2B, BASECOORD_1B, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_2F, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_00 + +Subanimation10: + subanim SUBANIMTYPE_REVERSE, 8 + db FRAMEBLOCK_2D, BASECOORD_44, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_45, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_46, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_47, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_48, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_49, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_1A, FRAMEBLOCKMODE_00 + +Subanimation31: + subanim SUBANIMTYPE_HVFLIP, 10 + db FRAMEBLOCK_2F, BASECOORD_46, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_50, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_2E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_51, FRAMEBLOCKMODE_00 + +Subanimation13: + subanim SUBANIMTYPE_REVERSE, 6 + db FRAMEBLOCK_30, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation14: + subanim SUBANIMTYPE_HFLIP, 9 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_31, BASECOORD_1C, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_31, BASECOORD_1D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_22, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_27, FRAMEBLOCKMODE_00 + +Subanimation41: + subanim SUBANIMTYPE_REVERSE, 5 + db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation42: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_08, FRAMEBLOCKMODE_00 + +Subanimation15: + subanim SUBANIMTYPE_HVFLIP, 2 + db FRAMEBLOCK_35, BASECOORD_52, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_35, BASECOORD_53, FRAMEBLOCKMODE_00 + +Subanimation17: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00 + +Subanimation18: + subanim SUBANIMTYPE_ENEMY, 4 + db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00 + +Subanimation40: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_17, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_57, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_13, FRAMEBLOCKMODE_00 + +Subanimation19: + subanim SUBANIMTYPE_REVERSE, 12 + db FRAMEBLOCK_38, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation1a: + subanim SUBANIMTYPE_HFLIP, 16 + db FRAMEBLOCK_3A, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3A, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00 + +Subanimation1b: + subanim SUBANIMTYPE_REVERSE, 4 + db FRAMEBLOCK_40, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation1c: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_41, BASECOORD_58, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_41, BASECOORD_59, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_41, BASECOORD_21, FRAMEBLOCKMODE_00 + +Subanimation1d: + subanim SUBANIMTYPE_ENEMY, 15 + db FRAMEBLOCK_24, BASECOORD_9A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_1B, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_22, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_1D, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_98, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_2C, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_2A, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_03 + +Subanimation1e: + subanim SUBANIMTYPE_NORMAL, 1 + db FRAMEBLOCK_25, BASECOORD_75, FRAMEBLOCKMODE_00 + +Subanimation20: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_42, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_43, BASECOORD_07, FRAMEBLOCKMODE_00 + +Subanimation21: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_44, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_45, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_46, BASECOORD_10, FRAMEBLOCKMODE_02 + +Subanimation22: + subanim SUBANIMTYPE_REVERSE, 11 + db FRAMEBLOCK_47, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AA, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AB, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AC, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AD, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AE, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AF, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_89, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_B0, FRAMEBLOCKMODE_00 + +Subanimation2d: + subanim SUBANIMTYPE_COORDFLIP, 6 + db FRAMEBLOCK_44, BASECOORD_64, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_45, BASECOORD_65, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_46, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + +Subanimation39: + subanim SUBANIMTYPE_COORDFLIP, 1 + db FRAMEBLOCK_47, BASECOORD_67, FRAMEBLOCKMODE_00 + +Subanimation4e: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_03 + +Subanimation4f: + subanim SUBANIMTYPE_HFLIP, 7 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00 + +Subanimation50: + subanim SUBANIMTYPE_HFLIP, 8 + db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_16, FRAMEBLOCKMODE_00 + +Subanimation29: + subanim SUBANIMTYPE_HFLIP, 29 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00 + +Subanimation2a: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_4E, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4F, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00 + +Subanimation23: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00 + +Subanimation24: + subanim SUBANIMTYPE_ENEMY, 2 + db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00 + +Subanimation25: + subanim SUBANIMTYPE_COORDFLIP, 2 + db FRAMEBLOCK_52, BASECOORD_71, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_52, BASECOORD_72, FRAMEBLOCKMODE_00 + +Subanimation26: + subanim SUBANIMTYPE_NORMAL, 2 + db FRAMEBLOCK_52, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_52, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation3a: + subanim SUBANIMTYPE_COORDFLIP, 3 + db FRAMEBLOCK_53, BASECOORD_71, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_81, FRAMEBLOCKMODE_00 + +Subanimation3b: + subanim SUBANIMTYPE_NORMAL, 3 + db FRAMEBLOCK_53, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation27: + subanim SUBANIMTYPE_ENEMY, 2 + db FRAMEBLOCK_54, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_54, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation28: + subanim SUBANIMTYPE_HVFLIP, 3 + db FRAMEBLOCK_55, BASECOORD_73, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_56, BASECOORD_73, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_57, BASECOORD_73, FRAMEBLOCKMODE_00 + +Subanimation32: + subanim SUBANIMTYPE_COORDFLIP, 3 + db FRAMEBLOCK_47, BASECOORD_74, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_43, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_75, FRAMEBLOCKMODE_00 + +Subanimation33: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + +Subanimation3c: + subanim SUBANIMTYPE_COORDFLIP, 7 + db FRAMEBLOCK_59, BASECOORD_79, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7B, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_77, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_78, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7C, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_76, FRAMEBLOCKMODE_00 + +Subanimation3d: + subanim SUBANIMTYPE_NORMAL, 8 + db FRAMEBLOCK_3A, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00 + +Subanimation34: + subanim SUBANIMTYPE_HVFLIP, 21 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_82, FRAMEBLOCKMODE_00 + +Subanimation35: + subanim SUBANIMTYPE_HVFLIP, 4 + db FRAMEBLOCK_5B, BASECOORD_83, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5C, BASECOORD_84, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5D, BASECOORD_85, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5E, BASECOORD_09, FRAMEBLOCKMODE_00 + +Subanimation36: + subanim SUBANIMTYPE_HFLIP, 8 + db FRAMEBLOCK_5F, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5F, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_60, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_60, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_61, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_61, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_62, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_62, BASECOORD_00, FRAMEBLOCKMODE_00 + +Subanimation37: + subanim SUBANIMTYPE_HVFLIP, 10 + db FRAMEBLOCK_63, BASECOORD_89, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_64, BASECOORD_75, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_63, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_0D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_86, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_12, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_87, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_17, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_88, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_1A, FRAMEBLOCKMODE_00 + +Subanimation38: + subanim SUBANIMTYPE_HFLIP, 16 + db FRAMEBLOCK_66, BASECOORD_8A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_66, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_66, BASECOORD_2E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_67, BASECOORD_24, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_01, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_10, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_28, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_2A, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_0E, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1B, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_26, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_03, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_12, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1E, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_29, FRAMEBLOCKMODE_00 + +Subanimation3e: + subanim SUBANIMTYPE_REVERSE, 18 + db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation3f: + subanim SUBANIMTYPE_COORDFLIP, 18 + db FRAMEBLOCK_68, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_14, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_06, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_90, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_23, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_1F, FRAMEBLOCKMODE_00 + +Subanimation44: + subanim SUBANIMTYPE_HVFLIP, 12 + db FRAMEBLOCK_69, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_14, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_06, FRAMEBLOCKMODE_00 + +Subanimation43: + subanim SUBANIMTYPE_ENEMY, 3 + db FRAMEBLOCK_6A, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6B, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6C, BASECOORD_17, FRAMEBLOCKMODE_00 + +Subanimation45: + subanim SUBANIMTYPE_HVFLIP, 4 + db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00 + +Subanimation46: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_0A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_89, FRAMEBLOCKMODE_00 + +Subanimation47: + subanim SUBANIMTYPE_HVFLIP, 3 + db FRAMEBLOCK_06, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_96, FRAMEBLOCKMODE_00 + +Subanimation48: + subanim SUBANIMTYPE_NORMAL, 6 + db FRAMEBLOCK_03, BASECOORD_41, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03 + +Subanimation49: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03 + +Subanimation4a: + subanim SUBANIMTYPE_NORMAL, 1 + db FRAMEBLOCK_04, BASECOORD_84, FRAMEBLOCKMODE_03 + +Subanimation4b: + subanim SUBANIMTYPE_NORMAL, 3 + db FRAMEBLOCK_06, BASECOORD_72, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_72, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_72, FRAMEBLOCKMODE_00 + +Subanimation4c: + subanim SUBANIMTYPE_COORDFLIP, 8 + db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + +Subanimation4d: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_32, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_4F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_32, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_16, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_32, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_0D, FRAMEBLOCKMODE_00 + +Subanimation51: + subanim SUBANIMTYPE_ENEMY, 6 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation52: + subanim SUBANIMTYPE_HFLIP, 7 + db FRAMEBLOCK_77, BASECOORD_25, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_9B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_9C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_50, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_8C, FRAMEBLOCKMODE_00 + +Subanimation53: + subanim SUBANIMTYPE_NORMAL, 12 + db FRAMEBLOCK_78, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_34, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_9E, FRAMEBLOCKMODE_00 + +Subanimation54: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_79, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_34, FRAMEBLOCKMODE_00 diff --git a/data/bike_riding_tilesets.asm b/data/bike_riding_tilesets.asm deleted file mode 100755 index 48c2cee6..00000000 --- a/data/bike_riding_tilesets.asm +++ /dev/null @@ -1,2 +0,0 @@ -BikeRidingTilesets:: - db OVERWORLD, FOREST, UNDERGROUND, SHIP_PORT, CAVERN, $FF diff --git a/data/collision.asm b/data/collision.asm deleted file mode 100644 index 78579242..00000000 --- a/data/collision.asm +++ /dev/null @@ -1,24 +0,0 @@ -Underground_Coll:: INCBIN "gfx/tilesets/underground.tilecoll" -Overworld_Coll:: INCBIN "gfx/tilesets/overworld.tilecoll" -RedsHouse1_Coll:: -RedsHouse2_Coll:: INCBIN "gfx/tilesets/reds_house.tilecoll" -Mart_Coll:: -Pokecenter_Coll:: INCBIN "gfx/tilesets/pokecenter.tilecoll" -Dojo_Coll:: -Gym_Coll:: INCBIN "gfx/tilesets/gym.tilecoll" -Forest_Coll:: INCBIN "gfx/tilesets/forest.tilecoll" -House_Coll:: INCBIN "gfx/tilesets/house.tilecoll" -ForestGate_Coll:: -Museum_Coll:: -Gate_Coll:: INCBIN "gfx/tilesets/gate.tilecoll" -Ship_Coll:: INCBIN "gfx/tilesets/ship.tilecoll" -ShipPort_Coll:: INCBIN "gfx/tilesets/ship_port.tilecoll" -Cemetery_Coll:: INCBIN "gfx/tilesets/cemetery.tilecoll" -Interior_Coll:: INCBIN "gfx/tilesets/interior.tilecoll" -Cavern_Coll:: INCBIN "gfx/tilesets/cavern.tilecoll" -Lobby_Coll:: INCBIN "gfx/tilesets/lobby.tilecoll" -Mansion_Coll:: INCBIN "gfx/tilesets/mansion.tilecoll" -Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" -Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" -Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" -Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" diff --git a/data/credit_mons.asm b/data/credits/credits_mons.asm old mode 100755 new mode 100644 similarity index 100% rename from data/credit_mons.asm rename to data/credits/credits_mons.asm diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm new file mode 100644 index 00000000..f8454e91 --- /dev/null +++ b/data/credits/credits_order.asm @@ -0,0 +1,40 @@ +CreditsOrder: +; subsequent credits elements will be displayed on separate lines. +; CRED_TEXT, CRED_TEXT_FADE, CRED_TEXT_MON, and CRED_TEXT_FADE_MON are +; commands that are used to go to the next set of credits texts. + db CRED_MON, CRED_VERSION, CRED_TEXT_FADE_MON + db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON + db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, CRED_TEXT_MON + db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON + db CRED_MUSIC, CRED_MASUDE, CRED_TEXT_FADE + db CRED_SOUND_EFFECTS, CRED_MASUDE, CRED_TEXT_MON + db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_TEXT_FADE_MON + db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, CRED_TEXT_FADE + db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, CRED_TEXT_MON + db CRED_GAME_SCENE, CRED_TAJIRI, CRED_TEXT_FADE + db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, CRED_TEXT_MON + db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, CRED_TEXT_FADE_MON + db CRED_MAP, CRED_TAJIRI, CRED_NISINO, CRED_TEXT_FADE + db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, CRED_TEXT_MON + db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, CRED_TEXT_FADE + db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, CRED_TEXT_MON + db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, CRED_TEXT_FADE + db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, CRED_TEXT + db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, CRED_TEXT_MON + db CRED_PRODUCERS, CRED_MIYAMOTO, CRED_TEXT_FADE + db CRED_PRODUCERS, CRED_KAWAGUCHI, CRED_TEXT + db CRED_PRODUCERS, CRED_ISHIHARA, CRED_TEXT_MON + db CRED_US_STAFF, CRED_TEXT_FADE + db CRED_US_COORD, CRED_TILDEN, CRED_TEXT_FADE + db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_TEXT + db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, CRED_TEXT + db CRED_TRANS, CRED_OGASAWARA, CRED_TEXT_FADE + db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE + db CRED_SPECIAL, CRED_IWATA, CRED_TEXT_FADE + db CRED_SPECIAL, CRED_HARADA, CRED_TEXT + db CRED_TEST, CRED_PAAD, CRED_CLUB, CRED_TEXT_FADE + db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE + db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON + db CRED_COPYRIGHT, CRED_TEXT_FADE_MON + db CRED_THE_END diff --git a/text/credits_text.asm b/data/credits/credits_text.asm old mode 100755 new mode 100644 similarity index 98% rename from text/credits_text.asm rename to data/credits/credits_text.asm index a68c33d3..ded7f5d6 --- a/text/credits_text.asm +++ b/data/credits/credits_text.asm @@ -1,4 +1,5 @@ CreditsTextPointers: +; entries correspond to CRED_* constants dw CredVersion dw CredTajiri dw CredTaOota diff --git a/data/credits_order.asm b/data/credits_order.asm deleted file mode 100755 index 20b9137f..00000000 --- a/data/credits_order.asm +++ /dev/null @@ -1,39 +0,0 @@ -CreditsOrder: -; subsequent credits elements will be displayed on separate lines. -; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used -; to go to the next set of credits texts. - db CRED_MON, CRED_VERSION, $FF - db CRED_DIRECTOR, CRED_TAJIRI, $FF - db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, $FD - db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, $FE - db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, $FF - db CRED_MUSIC, CRED_MASUDE, $FD - db CRED_SOUND_EFFECTS, CRED_MASUDE, $FE - db CRED_GAME_DESIGN, CRED_TAJIRI, $FF - db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, $FD - db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, $FE - db CRED_GAME_SCENE, CRED_TAJIRI, $FD - db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, $FE - db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, $FF - db CRED_MAP, CRED_TAJIRI, CRED_NISINO, $FD - db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, $FE - db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, $FD - db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, $FE - db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, $FD - db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, $FC - db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, $FE - db CRED_PRODUCERS, CRED_MIYAMOTO, $FD - db CRED_PRODUCERS, CRED_KAWAGUCHI, $FC - db CRED_PRODUCERS, CRED_ISHIHARA, $FE - db CRED_US_STAFF, $FD - db CRED_US_COORD, CRED_TILDEN, $FD - db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC - db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC - db CRED_TRANS, CRED_OGASAWARA, $FD - db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD - db CRED_SPECIAL, CRED_IWATA, $FD - db CRED_SPECIAL, CRED_HARADA, $FC - db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD - db CRED_PRODUCER, CRED_IZUSHI, $FD - db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF - db $FB, $FF, $FA diff --git a/data/cries.asm b/data/cries.asm deleted file mode 100755 index 7031536e..00000000 --- a/data/cries.asm +++ /dev/null @@ -1,192 +0,0 @@ -CryData: - ;$BaseCry, $Pitch, $Length - db $11, $00, $80; Rhydon - db $03, $00, $80; Kangaskhan - db $00, $00, $80; Nidoran♂ - db $19, $CC, $01; Clefairy - db $10, $00, $80; Spearow - db $06, $ED, $80; Voltorb - db $09, $00, $80; Nidoking - db $1F, $00, $80; Slowbro - db $0F, $20, $80; Ivysaur - db $0D, $00, $80; Exeggutor - db $0C, $00, $80; Lickitung - db $0B, $00, $80; Exeggcute - db $05, $00, $80; Grimer - db $07, $00, $FF; Gengar - db $01, $00, $80; Nidoran♀ - db $0A, $00, $80; Nidoqueen - db $19, $00, $80; Cubone - db $04, $00, $80; Rhyhorn - db $1B, $00, $80; Lapras - db $15, $00, $80; Arcanine - db $1E, $EE, $FF; Mew - db $17, $00, $80; Gyarados - db $18, $00, $80; Shellder - db $1A, $00, $80; Tentacool - db $1C, $00, $80; Gastly - db $16, $00, $80; Scyther - db $1E, $02, $20; Staryu - db $13, $00, $80; Blastoise - db $14, $00, $80; Pinsir - db $12, $00, $80; Tangela - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $1F, $20, $40; Growlithe - db $17, $FF, $C0; Onix - db $18, $40, $A0; Fearow - db $0E, $DF, $04; Pidgey - db $02, $00, $80; Slowpoke - db $1C, $A8, $C0; Kadabra - db $24, $00, $80; Graveler - db $14, $0A, $C0; Chansey - db $1F, $48, $60; Machoke - db $20, $08, $40; Mr.Mime - db $12, $80, $C0; Hitmonlee - db $0C, $EE, $C0; Hitmonchan - db $17, $E0, $10; Arbok - db $1E, $42, $FF; Parasect - db $21, $20, $60; Psyduck - db $0D, $88, $20; Drowzee - db $12, $E0, $40; Golem - db $00, $00, $00; MissingNo. - db $04, $FF, $30; Magmar - db $00, $00, $00; MissingNo. - db $06, $8F, $FF; Electabuzz - db $1C, $20, $C0; Magneton - db $12, $E6, $DD; Koffing - db $00, $00, $00; MissingNo. - db $0A, $DD, $60; Mankey - db $0C, $88, $C0; Seel - db $0B, $AA, $01; Diglett - db $1D, $11, $40; Tauros - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $10, $DD, $01; Farfetch'd - db $1A, $44, $40; Venonat - db $0F, $3C, $C0; Dragonite - db $00, $80, $10; MissingNo. - db $00, $00, $00; MissingNo. - db $1D, $E0, $80; MissingNo. - db $0B, $BB, $01; Doduo - db $0E, $FF, $FF; Poliwag - db $0D, $FF, $FF; Jynx - db $09, $F8, $40; Moltres - db $09, $80, $40; Articuno - db $18, $FF, $80; Zapdos - db $0E, $FF, $FF; Ditto - db $19, $77, $10; Meowth - db $20, $20, $E0; Krabby - db $22, $FF, $40; MissingNo. - db $00, $00, $00; MissingNo. - db $0E, $E0, $60; MissingNo. - db $24, $4F, $10; Vulpix - db $24, $88, $60; Ninetales - db $0F, $EE, $01; Pikachu - db $09, $EE, $08; Raichu - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $0F, $60, $40; Dratini - db $0F, $40, $80; Dragonair - db $16, $BB, $40; Kabuto - db $18, $EE, $01; Kabutops - db $19, $99, $10; Horsea - db $19, $3C, $01; Seadra - db $0F, $40, $C0; MissingNo. - db $0F, $20, $C0; MissingNo. - db $00, $20, $40; Sandshrew - db $00, $FF, $FF; Sandslash - db $1F, $F0, $01; Omanyte - db $1F, $FF, $40; Omastar - db $0E, $FF, $35; Jigglypuff - db $0E, $68, $60; Wigglytuff - db $1A, $88, $60; Eevee - db $1A, $10, $20; Flareon - db $1A, $3D, $80; Jolteon - db $1A, $AA, $FF; Vaporeon - db $1F, $EE, $01; Machop - db $1D, $E0, $80; Zubat - db $17, $12, $40; Ekans - db $1E, $20, $E0; Paras - db $0E, $77, $60; Poliwhirl - db $0E, $00, $FF; Poliwrath - db $15, $EE, $01; Weedle - db $13, $FF, $01; Kakuna - db $13, $60, $80; Beedrill - db $00, $00, $00; MissingNo. - db $0B, $99, $20; Dodrio - db $0A, $AF, $40; Primeape - db $0B, $2A, $10; Dugtrio - db $1A, $29, $80; Venomoth - db $0C, $23, $FF; Dewgong - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $16, $80, $20; Caterpie - db $1C, $CC, $01; Metapod - db $16, $77, $40; Butterfree - db $1F, $08, $C0; Machamp - db $11, $20, $10; MissingNo. - db $21, $FF, $40; Golduck - db $0D, $EE, $40; Hypno - db $1D, $FA, $80; Golbat - db $1E, $99, $FF; Mewtwo - db $05, $55, $01; Snorlax - db $17, $80, $00; Magikarp - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $07, $EF, $FF; Muk - db $0F, $40, $80; MissingNo. - db $20, $EE, $E0; Kingler - db $18, $6F, $E0; Cloyster - db $00, $00, $00; MissingNo. - db $06, $A8, $90; Electrode - db $19, $AA, $20; Clefable - db $12, $FF, $FF; Weezing - db $19, $99, $FF; Persian - db $08, $4F, $60; Marowak - db $00, $00, $00; MissingNo. - db $1C, $30, $40; Haunter - db $1C, $C0, $01; Abra - db $1C, $98, $FF; Alakazam - db $14, $28, $C0; Pidgeotto - db $14, $11, $FF; Pidgeot - db $1E, $00, $80; Starmie - db $0F, $80, $01; Bulbasaur - db $0F, $00, $C0; Venusaur - db $1A, $EE, $FF; Tentacruel - db $00, $00, $00; MissingNo. - db $16, $80, $40; Goldeen - db $16, $10, $FF; Seaking - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $25, $00, $80; Ponyta - db $25, $20, $C0; Rapidash - db $22, $00, $80; Rattata - db $22, $20, $FF; Raticate - db $00, $2C, $C0; Nidorino - db $01, $2C, $E0; Nidorina - db $24, $F0, $10; Geodude - db $25, $AA, $FF; Porygon - db $23, $20, $F0; Aerodactyl - db $00, $00, $00; MissingNo. - db $1C, $80, $60; Magnemite - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $04, $60, $40; Charmander - db $1D, $60, $40; Squirtle - db $04, $20, $40; Charmeleon - db $1D, $20, $40; Wartortle - db $04, $00, $80; Charizard - db $1D, $00, $80; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $08, $DD, $01; Oddish - db $08, $AA, $40; Gloom - db $23, $22, $FF; Vileplume - db $21, $55, $01; Bellsprout - db $25, $44, $20; Weepinbell - db $25, $66, $CC; Victreebel diff --git a/data/dungeon_tilesets.asm b/data/dungeon_tilesets.asm deleted file mode 100755 index 01e86714..00000000 --- a/data/dungeon_tilesets.asm +++ /dev/null @@ -1,2 +0,0 @@ -DungeonTilesets: - db FOREST, MUSEUM, SHIP, CAVERN, LOBBY, MANSION, GATE, LAB, FACILITY, CEMETERY, GYM, $FF diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm new file mode 100644 index 00000000..2e7eeb2a --- /dev/null +++ b/data/events/bench_guys.asm @@ -0,0 +1,20 @@ +bench_guy_text: MACRO + db \1, \2 + db_tx_pre \3 +ENDM + +BenchGuyTextPointers: + ; map id, player facing direction, predef text + bench_guy_text VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT, ViridianCityPokecenterBenchGuyText + bench_guy_text PEWTER_POKECENTER, SPRITE_FACING_LEFT, PewterCityPokecenterBenchGuyText + bench_guy_text CERULEAN_POKECENTER, SPRITE_FACING_LEFT, CeruleanCityPokecenterBenchGuyText + bench_guy_text LAVENDER_POKECENTER, SPRITE_FACING_LEFT, LavenderCityPokecenterBenchGuyText + bench_guy_text VERMILION_POKECENTER, SPRITE_FACING_LEFT, VermilionCityPokecenterBenchGuyText + bench_guy_text CELADON_POKECENTER, SPRITE_FACING_LEFT, CeladonCityPokecenterBenchGuyText + bench_guy_text CELADON_HOTEL, SPRITE_FACING_LEFT, CeladonCityHotelText + bench_guy_text FUCHSIA_POKECENTER, SPRITE_FACING_LEFT, FuchsiaCityPokecenterBenchGuyText + bench_guy_text CINNABAR_POKECENTER, SPRITE_FACING_LEFT, CinnabarIslandPokecenterBenchGuyText + bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText + bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText + bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText + db -1 ; end diff --git a/data/events/card_key_coords.asm b/data/events/card_key_coords.asm new file mode 100644 index 00000000..afdcfbd4 --- /dev/null +++ b/data/events/card_key_coords.asm @@ -0,0 +1,36 @@ +; These tables are probably supposed to be door locations in Silph Co., +; but they are unused. +; The reason there are 3 tables is unknown. + +; Format: map ID, Y, X, gate ID? + +CardKeyTable1: + db SILPH_CO_2F, $04, $04, 0 + db SILPH_CO_2F, $04, $05, 1 + db SILPH_CO_4F, $0C, $04, 2 + db SILPH_CO_4F, $0C, $05, 3 + db SILPH_CO_7F, $06, $0A, 4 + db SILPH_CO_7F, $06, $0B, 5 + db SILPH_CO_9F, $04, $12, 6 + db SILPH_CO_9F, $04, $13, 7 + db SILPH_CO_10F, $08, $0A, 8 + db SILPH_CO_10F, $08, $0B, 9 + db -1 ; end + +CardKeyTable2: + db SILPH_CO_3F, $08, $09, 10 + db SILPH_CO_3F, $09, $09, 11 + db SILPH_CO_5F, $04, $07, 12 + db SILPH_CO_5F, $05, $07, 13 + db SILPH_CO_6F, $0C, $05, 14 + db SILPH_CO_6F, $0D, $05, 15 + db SILPH_CO_8F, $08, $07, 16 + db SILPH_CO_8F, $09, $07, 17 + db SILPH_CO_9F, $08, $03, 18 + db SILPH_CO_9F, $09, $03, 19 + db -1 ; end + +CardKeyTable3: + db SILPH_CO_11F, $08, $09, 20 + db SILPH_CO_11F, $09, $09, 21 + db -1 ; end diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm new file mode 100644 index 00000000..c66f31d9 --- /dev/null +++ b/data/events/card_key_maps.asm @@ -0,0 +1,12 @@ +SilphCoMapList: + db SILPH_CO_2F + db SILPH_CO_3F + db SILPH_CO_4F + db SILPH_CO_5F + db SILPH_CO_6F + db SILPH_CO_7F + db SILPH_CO_8F + db SILPH_CO_9F + db SILPH_CO_10F + db SILPH_CO_11F + db -1 ; end diff --git a/data/events/hidden_coins.asm b/data/events/hidden_coins.asm new file mode 100644 index 00000000..bcdbcd80 --- /dev/null +++ b/data/events/hidden_coins.asm @@ -0,0 +1,19 @@ +hidden_coin: MACRO + db \1, \3, \2 +ENDM + +HiddenCoinCoords: + ; map id, x, y + hidden_coin GAME_CORNER, 0, 8 + hidden_coin GAME_CORNER, 1, 16 + hidden_coin GAME_CORNER, 3, 11 + hidden_coin GAME_CORNER, 3, 14 + hidden_coin GAME_CORNER, 4, 12 + hidden_coin GAME_CORNER, 9, 12 + hidden_coin GAME_CORNER, 9, 15 + hidden_coin GAME_CORNER, 16, 14 + hidden_coin GAME_CORNER, 10, 16 + hidden_coin GAME_CORNER, 11, 7 + hidden_coin GAME_CORNER, 15, 8 + hidden_coin GAME_CORNER, 12, 15 + db -1 ; end diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm new file mode 100644 index 00000000..115f53aa --- /dev/null +++ b/data/events/hidden_item_coords.asm @@ -0,0 +1,61 @@ +hidden_item: MACRO + db \1, \3, \2 +ENDM + +HiddenItemCoords: + ; map id, x, y + hidden_item VIRIDIAN_FOREST, 1, 18 + hidden_item VIRIDIAN_FOREST, 16, 42 + hidden_item MT_MOON_B2F, 18, 12 + hidden_item ROUTE_25, 38, 3 + hidden_item ROUTE_9, 14, 7 + hidden_item SS_ANNE_KITCHEN, 13, 9 + hidden_item SS_ANNE_B1F_ROOMS, 3, 1 + hidden_item ROUTE_10, 9, 17 + hidden_item ROUTE_10, 16, 53 + hidden_item ROCKET_HIDEOUT_B1F, 21, 15 + hidden_item ROCKET_HIDEOUT_B3F, 27, 17 + hidden_item ROCKET_HIDEOUT_B4F, 25, 1 + hidden_item POKEMON_TOWER_5F, 4, 12 + hidden_item ROUTE_13, 1, 14 + hidden_item ROUTE_13, 16, 13 + hidden_item POKEMON_MANSION_B1F, 1, 9 + hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible + hidden_item SAFARI_ZONE_WEST, 6, 5 + hidden_item SILPH_CO_5F, 12, 3 + hidden_item SILPH_CO_9F, 2, 15 + hidden_item COPYCATS_HOUSE_2F, 1, 1 + hidden_item CERULEAN_CAVE_1F, 14, 11 + hidden_item CERULEAN_CAVE_B1F, 27, 3 + hidden_item POWER_PLANT, 17, 16 + hidden_item POWER_PLANT, 12, 1 + hidden_item SEAFOAM_ISLANDS_B2F, 15, 15 + hidden_item SEAFOAM_ISLANDS_B4F, 25, 17 + hidden_item POKEMON_MANSION_1F, 8, 16 + hidden_item POKEMON_MANSION_3F, 1, 9 + hidden_item ROUTE_23, 9, 44 + hidden_item ROUTE_23, 19, 70 + hidden_item ROUTE_23, 8, 90 + hidden_item VICTORY_ROAD_2F, 5, 2 + hidden_item VICTORY_ROAD_2F, 26, 7 + hidden_item UNUSED_MAP_6F, 14, 11 + hidden_item VIRIDIAN_CITY, 14, 4 + hidden_item ROUTE_11, 48, 5 + hidden_item ROUTE_12, 2, 63 + hidden_item ROUTE_17, 15, 14 + hidden_item ROUTE_17, 8, 45 + hidden_item ROUTE_17, 17, 72 + hidden_item ROUTE_17, 4, 91 + hidden_item ROUTE_17, 8, 121 + hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 3, 4 + hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 4, 34 + hidden_item UNDERGROUND_PATH_WEST_EAST, 12, 2 + hidden_item UNDERGROUND_PATH_WEST_EAST, 21, 5 + hidden_item CELADON_CITY, 48, 15 + hidden_item ROUTE_25, 10, 1 + hidden_item MT_MOON_B2F, 33, 9 + hidden_item SEAFOAM_ISLANDS_B3F, 9, 16 + hidden_item VERMILION_CITY, 14, 11 + hidden_item CERULEAN_CITY, 15, 8 + hidden_item ROUTE_4, 40, 3 + db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm new file mode 100644 index 00000000..efb99026 --- /dev/null +++ b/data/events/hidden_objects.asm @@ -0,0 +1,668 @@ +HiddenObjectMaps: + db REDS_HOUSE_2F + db BLUES_HOUSE + db OAKS_LAB + db VIRIDIAN_POKECENTER + db VIRIDIAN_MART + db VIRIDIAN_SCHOOL_HOUSE + db VIRIDIAN_GYM + db MUSEUM_1F + db PEWTER_GYM + db PEWTER_MART + db PEWTER_POKECENTER + db CERULEAN_POKECENTER + db CERULEAN_GYM + db CERULEAN_MART + db LAVENDER_POKECENTER + db VERMILION_POKECENTER + db VERMILION_GYM + db CELADON_MANSION_2F + db CELADON_POKECENTER + db CELADON_GYM + db GAME_CORNER + db CELADON_HOTEL + db FUCHSIA_POKECENTER + db FUCHSIA_GYM + db CINNABAR_GYM + db CINNABAR_POKECENTER + db SAFFRON_GYM + db MT_MOON_POKECENTER + db ROCK_TUNNEL_POKECENTER + db TRADE_CENTER + db COLOSSEUM + db VIRIDIAN_FOREST + db MT_MOON_B2F + db INDIGO_PLATEAU + db ROUTE_25 + db ROUTE_9 + db SS_ANNE_KITCHEN + db SS_ANNE_B1F_ROOMS + db ROCKET_HIDEOUT_B1F + db ROCKET_HIDEOUT_B3F + db ROCKET_HIDEOUT_B4F + db SAFFRON_POKECENTER + db POKEMON_TOWER_5F + db ROUTE_13 + db SAFARI_ZONE_GATE + db SAFARI_ZONE_WEST + db SILPH_CO_5F + db SILPH_CO_9F + db COPYCATS_HOUSE_2F + db CERULEAN_CAVE_1F + db CERULEAN_CAVE_B1F + db POWER_PLANT + db SEAFOAM_ISLANDS_B2F + db SEAFOAM_ISLANDS_B4F + db POKEMON_MANSION_1F + db POKEMON_MANSION_3F + db ROUTE_23 + db VICTORY_ROAD_2F + db UNUSED_MAP_6F + db BILLS_HOUSE + db VIRIDIAN_CITY + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE + db ROUTE_15_GATE_2F + db MR_FUJIS_HOUSE + db CELADON_MANSION_ROOF_HOUSE + db FIGHTING_DOJO + db ROUTE_10 + db INDIGO_PLATEAU_LOBBY + db CINNABAR_LAB_FOSSIL_ROOM + db BIKE_SHOP + db ROUTE_11 + db ROUTE_12 + db POKEMON_MANSION_2F + db POKEMON_MANSION_B1F + db SILPH_CO_11F + db ROUTE_17 + db UNDERGROUND_PATH_NORTH_SOUTH + db UNDERGROUND_PATH_WEST_EAST + db CELADON_CITY + db SEAFOAM_ISLANDS_B3F + db VERMILION_CITY + db CERULEAN_CITY + db ROUTE_4 + db -1 ; end + +HiddenObjectPointers: +; each of these pointers is for the corresponding map in HiddenObjectMaps + dw RedsHouse2FHiddenObjects + dw BluesHouseHiddenObjects + dw OaksLabHiddenObjects + dw ViridianPokecenterHiddenObjects + dw ViridianMartHiddenObjects + dw ViridianSchoolHiddenObjects + dw ViridianGymHiddenObjects + dw Museum1FHiddenObjects + dw PewterGymHiddenObjects + dw PewterMartHiddenObjects + dw PewterPokecenterHiddenObjects + dw CeruleanPokecenterHiddenObjects + dw CeruleanGymHiddenObjects + dw CeruleanMartHiddenObjects + dw LavenderPokecenterHiddenObjects + dw VermilionPokecenterHiddenObjects + dw VermilionGymHiddenObjects + dw CeladonMansion2HiddenObjects + dw CeladonPokecenterHiddenObjects + dw CeladonGymHiddenObjects + dw GameCornerHiddenObjects + dw CeladonHotelHiddenObjects + dw FuchsiaPokecenterHiddenObjects + dw FuchsiaGymHiddenObjects + dw CinnabarGymHiddenObjects + dw CinnabarPokecenterHiddenObjects + dw SaffronGymHiddenObjects + dw MtMoonPokecenterHiddenObjects + dw RockTunnelPokecenterHiddenObjects + dw TradeCenterHiddenObjects + dw ColosseumHiddenObjects + dw ViridianForestHiddenObjects + dw MtMoon3HiddenObjects + dw IndigoPlateauHiddenObjects + dw Route25HiddenObjects + dw Route9HiddenObjects + dw SSAnne6HiddenObjects + dw SSAnne10HiddenObjects + dw RocketHideout1HiddenObjects + dw RocketHideout3HiddenObjects + dw RocketHideout4HiddenObjects + dw SaffronPokecenterHiddenObjects + dw PokemonTower5HiddenObjects + dw Route13HiddenObjects + dw SafariZoneEntranceHiddenObjects + dw SafariZoneWestHiddenObjects + dw SilphCo5FHiddenObjects + dw SilphCo9FHiddenObjects + dw CopycatsHouse2FHiddenObjects + dw CeruleanCave1HiddenObjects + dw CeruleanCave3HiddenObjects + dw PowerPlantHiddenObjects + dw SeafoamIslands3HiddenObjects + dw SeafoamIslands5HiddenObjects + dw Mansion1HiddenObjects + dw Mansion3HiddenObjects + dw Route23HiddenObjects + dw VictoryRoad2HiddenObjects + dw Unused6FHiddenObjects + dw BillsHouseHiddenObjects + dw ViridianCityHiddenObjects + dw SafariZoneRestHouse2HiddenObjects + dw SafariZoneRestHouse3HiddenObjects + dw SafariZoneRestHouse4HiddenObjects + dw Route15GateUpstairsHiddenObjects + dw LavenderHouse1HiddenObjects + dw CeladonMansion5HiddenObjects + dw FightingDojoHiddenObjects + dw Route10HiddenObjects + dw IndigoPlateauLobbyHiddenObjects + dw CinnabarLab4HiddenObjects + dw BikeShopHiddenObjects + dw Route11HiddenObjects + dw Route12HiddenObjects + dw Mansion2HiddenObjects + dw Mansion4HiddenObjects + dw SilphCo11FHiddenObjects + dw Route17HiddenObjects + dw UndergroundPathNsHiddenObjects + dw UndergroundPathWeHiddenObjects + dw CeladonCityHiddenObjects + dw SeafoamIslands4HiddenObjects + dw VermilionCityHiddenObjects + dw CeruleanCityHiddenObjects + dw Route4HiddenObjects + +hidden_object: MACRO + db \2 ; y coord + db \1 ; x coord + db \3 ; item id + dba \4 ; object routine +ENDM + +hidden_text_predef: MACRO + db \2 ; y coord + db \1 ; x coord + db_tx_pre \3 ; text id + dba \4 ; object routine +ENDM + +; Some hidden objects use SPRITE_FACING_* values, +; but these do not actually prevent the player +; from interacting with them in any direction. +ANY_FACING EQU $d0 + +TradeCenterHiddenObjects: + hidden_object 5, 4, ANY_FACING, CableClubRightGameboy + hidden_object 4, 4, ANY_FACING, CableClubLeftGameboy + db -1 ; end + +ColosseumHiddenObjects: + hidden_object 5, 4, ANY_FACING, CableClubRightGameboy + hidden_object 4, 4, ANY_FACING, CableClubLeftGameboy + db -1 ; end + +RedsHouse2FHiddenObjects: + hidden_object 0, 1, SPRITE_FACING_UP, OpenRedsPC + hidden_object 3, 5, ANY_FACING, PrintRedSNESText + db -1 ; end + +BluesHouseHiddenObjects: + hidden_object 0, 1, SPRITE_FACING_UP, PrintBookcaseText + hidden_object 1, 1, SPRITE_FACING_UP, PrintBookcaseText + hidden_object 7, 1, SPRITE_FACING_UP, PrintBookcaseText + db -1 ; end + +OaksLabHiddenObjects: + hidden_object 4, 0, SPRITE_FACING_UP, DisplayOakLabLeftPoster + hidden_object 5, 0, SPRITE_FACING_UP, DisplayOakLabRightPoster + hidden_object 0, 1, SPRITE_FACING_UP, DisplayOakLabEmailText + hidden_object 1, 1, SPRITE_FACING_UP, DisplayOakLabEmailText + db -1 ; end + +ViridianPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +ViridianMartHiddenObjects: + db -1 ; end + +ViridianSchoolHiddenObjects: + hidden_text_predef 3, 4, ViridianSchoolNotebook, PrintNotebookText + hidden_text_predef 3, 0, ViridianSchoolBlackboard, PrintBlackboardLinkCableText + db -1 ; end + +ViridianGymHiddenObjects: + hidden_object 15, 15, SPRITE_FACING_UP, GymStatues + hidden_object 18, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +Museum1FHiddenObjects: + hidden_object 2, 3, SPRITE_FACING_UP, AerodactylFossil + hidden_object 2, 6, SPRITE_FACING_UP, KabutopsFossil + db -1 ; end + +PewterGymHiddenObjects: + hidden_object 3, 10, SPRITE_FACING_UP, GymStatues + hidden_object 6, 10, SPRITE_FACING_UP, GymStatues + db -1 ; end + +PewterMartHiddenObjects: + db -1 ; end + +PewterPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +CeruleanPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +CeruleanGymHiddenObjects: + hidden_object 3, 11, SPRITE_FACING_UP, GymStatues + hidden_object 6, 11, SPRITE_FACING_UP, GymStatues + db -1 ; end + +CeruleanMartHiddenObjects: + db -1 ; end + +LavenderPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +VermilionPokecenterHiddenObjects: + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText + db -1 ; end + +VermilionGymHiddenObjects: + hidden_object 3, 14, SPRITE_FACING_UP, GymStatues + hidden_object 6, 14, SPRITE_FACING_UP, GymStatues + hidden_object 6, 1, SPRITE_FACING_DOWN, PrintTrashText + ; third param: [wGymTrashCanIndex] + hidden_object 1, 7, 0, GymTrashScript + hidden_object 1, 9, 1, GymTrashScript + hidden_object 1, 11, 2, GymTrashScript + hidden_object 3, 7, 3, GymTrashScript + hidden_object 3, 9, 4, GymTrashScript + hidden_object 3, 11, 5, GymTrashScript + hidden_object 5, 7, 6, GymTrashScript + hidden_object 5, 9, 7, GymTrashScript + hidden_object 5, 11, 8, GymTrashScript + hidden_object 7, 7, 9, GymTrashScript + hidden_object 7, 9, 10, GymTrashScript + hidden_object 7, 11, 11, GymTrashScript + hidden_object 9, 7, 12, GymTrashScript + hidden_object 9, 9, 13, GymTrashScript + hidden_object 9, 11, 14, GymTrashScript + db -1 ; end + +CeladonMansion2HiddenObjects: + hidden_object 0, 5, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +CeladonPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +CeladonGymHiddenObjects: + hidden_object 3, 15, SPRITE_FACING_UP, GymStatues + hidden_object 6, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +GameCornerHiddenObjects: + hidden_object 18, 15, ANY_FACING, StartSlotMachine + hidden_object 18, 14, ANY_FACING, StartSlotMachine + hidden_object 18, 13, ANY_FACING, StartSlotMachine + hidden_object 18, 12, ANY_FACING, StartSlotMachine + hidden_object 18, 11, ANY_FACING, StartSlotMachine + hidden_object 18, 10, SLOTS_SOMEONESKEYS, StartSlotMachine + hidden_object 13, 10, ANY_FACING, StartSlotMachine + hidden_object 13, 11, ANY_FACING, StartSlotMachine + hidden_object 13, 12, SLOTS_OUTTOLUNCH, StartSlotMachine + hidden_object 13, 13, ANY_FACING, StartSlotMachine + hidden_object 13, 14, ANY_FACING, StartSlotMachine + hidden_object 13, 15, ANY_FACING, StartSlotMachine + hidden_object 12, 15, ANY_FACING, StartSlotMachine + hidden_object 12, 14, ANY_FACING, StartSlotMachine + hidden_object 12, 13, ANY_FACING, StartSlotMachine + hidden_object 12, 12, ANY_FACING, StartSlotMachine + hidden_object 12, 11, ANY_FACING, StartSlotMachine + hidden_object 12, 10, ANY_FACING, StartSlotMachine + hidden_object 7, 10, ANY_FACING, StartSlotMachine + hidden_object 7, 11, ANY_FACING, StartSlotMachine + hidden_object 7, 12, ANY_FACING, StartSlotMachine + hidden_object 7, 13, ANY_FACING, StartSlotMachine + hidden_object 7, 14, ANY_FACING, StartSlotMachine + hidden_object 7, 15, ANY_FACING, StartSlotMachine + hidden_object 6, 15, ANY_FACING, StartSlotMachine + hidden_object 6, 14, ANY_FACING, StartSlotMachine + hidden_object 6, 13, ANY_FACING, StartSlotMachine + hidden_object 6, 12, SLOTS_OUTOFORDER, StartSlotMachine + hidden_object 6, 11, ANY_FACING, StartSlotMachine + hidden_object 6, 10, ANY_FACING, StartSlotMachine + hidden_object 1, 10, ANY_FACING, StartSlotMachine + hidden_object 1, 11, ANY_FACING, StartSlotMachine + hidden_object 1, 12, ANY_FACING, StartSlotMachine + hidden_object 1, 13, ANY_FACING, StartSlotMachine + hidden_object 1, 14, ANY_FACING, StartSlotMachine + hidden_object 1, 15, ANY_FACING, StartSlotMachine + hidden_object 0, 8, COIN+10, HiddenCoins + hidden_object 1, 16, COIN+10, HiddenCoins + hidden_object 3, 11, COIN+20, HiddenCoins + hidden_object 3, 14, COIN+10, HiddenCoins + hidden_object 4, 12, COIN+10, HiddenCoins + hidden_object 9, 12, COIN+20, HiddenCoins + hidden_object 9, 15, COIN+10, HiddenCoins + hidden_object 16, 14, COIN+10, HiddenCoins + hidden_object 10, 16, COIN+10, HiddenCoins + hidden_object 11, 7, COIN+40, HiddenCoins + hidden_object 15, 8, COIN+100, HiddenCoins + hidden_object 12, 15, COIN+10, HiddenCoins + db -1 ; end + +CeladonHotelHiddenObjects: + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + db -1 ; end + +FuchsiaPokecenterHiddenObjects: + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText + db -1 ; end + +FuchsiaGymHiddenObjects: + hidden_object 3, 15, SPRITE_FACING_UP, GymStatues + hidden_object 6, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +CinnabarGymHiddenObjects: + hidden_object 17, 13, SPRITE_FACING_UP, GymStatues + ; third param: ([hGymGateAnswer] << 4) | [hGymGateIndex] + hidden_object 15, 7, (FALSE << 4) | 1, PrintCinnabarQuiz + hidden_object 10, 1, (TRUE << 4) | 2, PrintCinnabarQuiz + hidden_object 9, 7, (TRUE << 4) | 3, PrintCinnabarQuiz + hidden_object 9, 13, (TRUE << 4) | 4, PrintCinnabarQuiz + hidden_object 1, 13, (FALSE << 4) | 5, PrintCinnabarQuiz + hidden_object 1, 7, (TRUE << 4) | 6, PrintCinnabarQuiz + db -1 ; end + +CinnabarPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +SaffronGymHiddenObjects: + hidden_object 9, 15, SPRITE_FACING_UP, GymStatues + db -1 ; end + +MtMoonPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +RockTunnelPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +ViridianForestHiddenObjects: + hidden_object 1, 18, POTION, HiddenItems + hidden_object 16, 42, ANTIDOTE, HiddenItems + db -1 ; end + +MtMoon3HiddenObjects: + hidden_object 18, 12, MOON_STONE, HiddenItems + hidden_object 33, 9, ETHER, HiddenItems + db -1 ; end + +IndigoPlateauHiddenObjects: + hidden_object 8, 13, $ff, PrintIndigoPlateauHQText ; inaccessible + hidden_object 11, 13, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText ; inaccessible + db -1 ; end + +Route25HiddenObjects: + hidden_object 38, 3, ETHER, HiddenItems + hidden_object 10, 1, ELIXER, HiddenItems + db -1 ; end + +Route9HiddenObjects: + hidden_object 14, 7, ETHER, HiddenItems + db -1 ; end + +SSAnne6HiddenObjects: + hidden_object 13, 5, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 13, 7, SPRITE_FACING_DOWN, PrintTrashText + hidden_object 13, 9, GREAT_BALL, HiddenItems + db -1 ; end + +SSAnne10HiddenObjects: + hidden_object 3, 1, HYPER_POTION, HiddenItems + db -1 ; end + +Route10HiddenObjects: + hidden_object 9, 17, SUPER_POTION, HiddenItems + hidden_object 16, 53, MAX_ETHER, HiddenItems + db -1 ; end + +RocketHideout1HiddenObjects: + hidden_object 21, 15, PP_UP, HiddenItems + db -1 ; end + +RocketHideout3HiddenObjects: + hidden_object 27, 17, NUGGET, HiddenItems + db -1 ; end + +RocketHideout4HiddenObjects: + hidden_object 25, 1, SUPER_POTION, HiddenItems + db -1 ; end + +SaffronPokecenterHiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +PokemonTower5HiddenObjects: + hidden_object 4, 12, ELIXER, HiddenItems + db -1 ; end + +Route13HiddenObjects: + hidden_object 1, 14, PP_UP, HiddenItems + hidden_object 16, 13, CALCIUM, HiddenItems + db -1 ; end + +SafariZoneEntranceHiddenObjects: + hidden_object 10, 1, NUGGET, HiddenItems ; inaccessible + db -1 ; end + +SafariZoneWestHiddenObjects: + hidden_object 6, 5, REVIVE, HiddenItems + db -1 ; end + +SilphCo5FHiddenObjects: + hidden_object 12, 3, ELIXER, HiddenItems + db -1 ; end + +SilphCo9FHiddenObjects: + hidden_object 2, 15, MAX_POTION, HiddenItems + db -1 ; end + +CopycatsHouse2FHiddenObjects: + hidden_object 1, 1, NUGGET, HiddenItems + db -1 ; end + +CeruleanCave1HiddenObjects: + hidden_object 14, 11, RARE_CANDY, HiddenItems + db -1 ; end + +CeruleanCave3HiddenObjects: + hidden_object 27, 3, ULTRA_BALL, HiddenItems + db -1 ; end + +PowerPlantHiddenObjects: + hidden_object 17, 16, MAX_ELIXER, HiddenItems + hidden_object 12, 1, PP_UP, HiddenItems + db -1 ; end + +SeafoamIslands3HiddenObjects: + hidden_object 15, 15, NUGGET, HiddenItems + db -1 ; end + +SeafoamIslands5HiddenObjects: + hidden_object 25, 17, ULTRA_BALL, HiddenItems + db -1 ; end + +Mansion1HiddenObjects: + hidden_object 8, 16, MOON_STONE, HiddenItems + hidden_object 2, 5, SPRITE_FACING_UP, Mansion1Script_Switches + db -1 ; end + +Mansion2HiddenObjects: + hidden_object 2, 11, SPRITE_FACING_UP, Mansion2Script_Switches + db -1 ; end + +Mansion3HiddenObjects: + hidden_object 1, 9, MAX_REVIVE, HiddenItems + hidden_object 10, 5, SPRITE_FACING_UP, Mansion3Script_Switches + db -1 ; end + +Mansion4HiddenObjects: + hidden_object 1, 9, RARE_CANDY, HiddenItems + hidden_object 20, 3, SPRITE_FACING_UP, Mansion4Script_Switches + hidden_object 18, 25, SPRITE_FACING_UP, Mansion4Script_Switches + db -1 ; end + +Route23HiddenObjects: + hidden_object 9, 44, FULL_RESTORE, HiddenItems + hidden_object 19, 70, ULTRA_BALL, HiddenItems + hidden_object 8, 90, MAX_ETHER, HiddenItems + db -1 ; end + +VictoryRoad2HiddenObjects: + hidden_object 5, 2, ULTRA_BALL, HiddenItems + hidden_object 26, 7, FULL_RESTORE, HiddenItems + db -1 ; end + +Unused6FHiddenObjects: + hidden_object 14, 11, MAX_ELIXER, HiddenItems + db -1 ; end + +BillsHouseHiddenObjects: + hidden_object 1, 4, SPRITE_FACING_UP, BillsHousePC + db -1 ; end + +ViridianCityHiddenObjects: + hidden_object 14, 4, POTION, HiddenItems + db -1 ; end + +SafariZoneRestHouse2HiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +SafariZoneRestHouse3HiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +SafariZoneRestHouse4HiddenObjects: + hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText + hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +Route15GateUpstairsHiddenObjects: + hidden_object 1, 2, SPRITE_FACING_UP, Route15GateLeftBinoculars + db -1 ; end + +LavenderHouse1HiddenObjects: + hidden_object 0, 1, SPRITE_FACING_DOWN, PrintMagazinesText + hidden_object 1, 1, SPRITE_FACING_DOWN, PrintMagazinesText + hidden_object 7, 1, SPRITE_FACING_DOWN, PrintMagazinesText + db -1 ; end + +CeladonMansion5HiddenObjects: + hidden_text_predef 3, 0, LinkCableHelp, PrintBlackboardLinkCableText + hidden_text_predef 4, 0, LinkCableHelp, PrintBlackboardLinkCableText + hidden_text_predef 3, 4, TMNotebook, PrintNotebookText + db -1 ; end + +FightingDojoHiddenObjects: + hidden_object 3, 9, SPRITE_FACING_UP, PrintFightingDojoText + hidden_object 6, 9, SPRITE_FACING_UP, PrintFightingDojoText + hidden_object 4, 0, SPRITE_FACING_UP, PrintFightingDojoText2 + hidden_object 5, 0, SPRITE_FACING_UP, PrintFightingDojoText3 + db -1 ; end + +IndigoPlateauLobbyHiddenObjects: + hidden_object 15, 7, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +CinnabarLab4HiddenObjects: + hidden_object 0, 4, SPRITE_FACING_UP, OpenPokemonCenterPC + hidden_object 2, 4, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +BikeShopHiddenObjects: + hidden_object 1, 0, ANY_FACING, PrintNewBikeText + hidden_object 2, 1, ANY_FACING, PrintNewBikeText + hidden_object 1, 2, ANY_FACING, PrintNewBikeText + hidden_object 3, 2, ANY_FACING, PrintNewBikeText + hidden_object 0, 4, ANY_FACING, PrintNewBikeText + hidden_object 1, 5, ANY_FACING, PrintNewBikeText + db -1 ; end + +Route11HiddenObjects: + hidden_object 48, 5, ESCAPE_ROPE, HiddenItems + db -1 ; end + +Route12HiddenObjects: + hidden_object 2, 63, HYPER_POTION, HiddenItems + db -1 ; end + +SilphCo11FHiddenObjects: + hidden_object 10, 12, SPRITE_FACING_UP, OpenPokemonCenterPC + db -1 ; end + +Route17HiddenObjects: + hidden_object 15, 14, RARE_CANDY, HiddenItems + hidden_object 8, 45, FULL_RESTORE, HiddenItems + hidden_object 17, 72, PP_UP, HiddenItems + hidden_object 4, 91, MAX_REVIVE, HiddenItems + hidden_object 8, 121, MAX_ELIXER, HiddenItems + db -1 ; end + +UndergroundPathNsHiddenObjects: + hidden_object 3, 4, FULL_RESTORE, HiddenItems + hidden_object 4, 34, X_SPECIAL, HiddenItems + db -1 ; end + +UndergroundPathWeHiddenObjects: + hidden_object 12, 2, NUGGET, HiddenItems + hidden_object 21, 5, ELIXER, HiddenItems + db -1 ; end + +CeladonCityHiddenObjects: + hidden_object 48, 15, PP_UP, HiddenItems + db -1 ; end + +SeafoamIslands4HiddenObjects: + hidden_object 9, 16, MAX_ELIXER, HiddenItems + db -1 ; end + +VermilionCityHiddenObjects: + hidden_object 14, 11, MAX_ETHER, HiddenItems + db -1 ; end + +CeruleanCityHiddenObjects: + hidden_object 15, 8, RARE_CANDY, HiddenItems + db -1 ; end + +Route4HiddenObjects: + hidden_object 40, 3, GREAT_BALL, HiddenItems + db -1 ; end diff --git a/data/events/prize_mon_levels.asm b/data/events/prize_mon_levels.asm new file mode 100644 index 00000000..eb30ac80 --- /dev/null +++ b/data/events/prize_mon_levels.asm @@ -0,0 +1,19 @@ +PrizeMonLevelDictionary: +IF DEF(_RED) + db ABRA, 9 + db CLEFAIRY, 8 + db NIDORINA, 17 + + db DRATINI, 18 + db SCYTHER, 25 + db PORYGON, 26 +ENDC +IF DEF(_BLUE) + db ABRA, 6 + db CLEFAIRY, 12 + db NIDORINO, 17 + + db PINSIR, 20 + db DRATINI, 24 + db PORYGON, 18 +ENDC diff --git a/data/prizes.asm b/data/events/prizes.asm old mode 100755 new mode 100644 similarity index 77% rename from data/prizes.asm rename to data/events/prizes.asm index 1120c0d0..684add94 --- a/data/prizes.asm +++ b/data/events/prizes.asm @@ -1,12 +1,7 @@ PrizeDifferentMenuPtrs: - dw PrizeMenuMon1Entries - dw PrizeMenuMon1Cost - - dw PrizeMenuMon2Entries - dw PrizeMenuMon2Cost - - dw PrizeMenuTMsEntries - dw PrizeMenuTMsCost + dw PrizeMenuMon1Entries, PrizeMenuMon1Cost + dw PrizeMenuMon2Entries, PrizeMenuMon2Cost + dw PrizeMenuTMsEntries, PrizeMenuTMsCost NoThanksText: db "NO THANKS@" @@ -60,9 +55,9 @@ ENDC db "@" PrizeMenuTMsEntries: - db TM_23 - db TM_15 - db TM_50 + db TM_DRAGON_RAGE + db TM_HYPER_BEAM + db TM_SUBSTITUTE db "@" PrizeMenuTMsCost: diff --git a/data/slot_machine_wheels.asm b/data/events/slot_machine_wheels.asm old mode 100755 new mode 100644 similarity index 100% rename from data/slot_machine_wheels.asm rename to data/events/slot_machine_wheels.asm diff --git a/data/events/trades.asm b/data/events/trades.asm new file mode 100644 index 00000000..7018c22f --- /dev/null +++ b/data/events/trades.asm @@ -0,0 +1,13 @@ +TradeMons: +; entries correspond to TRADE_FOR_* constants + ; give mon, get mon, dialog id, nickname + db NIDORINO, NIDORINA, TRADE_DIALOGSET_CASUAL, "TERRY@@@@@@" + db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" + db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" + db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@" + db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" + db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@" + db POLIWHIRL, JYNX, TRADE_DIALOGSET_POLITE, "LOLA@@@@@@@" + db RAICHU, ELECTRODE, TRADE_DIALOGSET_POLITE, "DORIS@@@@@@" + db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@" + db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT@@@@@@@" diff --git a/data/evos_moves.asm b/data/evos_moves.asm deleted file mode 100755 index 26f09b87..00000000 --- a/data/evos_moves.asm +++ /dev/null @@ -1,2134 +0,0 @@ -; See constants/evolution_constants.asm -; The max number of evolutions per monster is MAX_EVOLUTIONS - -EvosMovesPointerTable: - dw RhydonEvosMoves - dw KangaskhanEvosMoves - dw NidoranMEvosMoves - dw ClefairyEvosMoves - dw SpearowEvosMoves - dw VoltorbEvosMoves - dw NidokingEvosMoves - dw SlowbroEvosMoves - dw IvysaurEvosMoves - dw ExeggutorEvosMoves - dw LickitungEvosMoves - dw ExeggcuteEvosMoves - dw GrimerEvosMoves - dw GengarEvosMoves - dw NidoranFEvosMoves - dw NidoqueenEvosMoves - dw CuboneEvosMoves - dw RhyhornEvosMoves - dw LaprasEvosMoves - dw ArcanineEvosMoves - dw MewEvosMoves - dw GyaradosEvosMoves - dw ShellderEvosMoves - dw TentacoolEvosMoves - dw GastlyEvosMoves - dw ScytherEvosMoves - dw StaryuEvosMoves - dw BlastoiseEvosMoves - dw PinsirEvosMoves - dw TangelaEvosMoves - dw MissingNo1FEvosMoves - dw MissingNo20EvosMoves - dw GrowlitheEvosMoves - dw OnixEvosMoves - dw FearowEvosMoves - dw PidgeyEvosMoves - dw SlowpokeEvosMoves - dw KadabraEvosMoves - dw GravelerEvosMoves - dw ChanseyEvosMoves - dw MachokeEvosMoves - dw MrMimeEvosMoves - dw HitmonleeEvosMoves - dw HitmonchanEvosMoves - dw ArbokEvosMoves - dw ParasectEvosMoves - dw PsyduckEvosMoves - dw DrowzeeEvosMoves - dw GolemEvosMoves - dw MissingNo32EvosMoves - dw MagmarEvosMoves - dw MissingNo34EvosMoves - dw ElectabuzzEvosMoves - dw MagnetonEvosMoves - dw KoffingEvosMoves - dw MissingNo38EvosMoves - dw MankeyEvosMoves - dw SeelEvosMoves - dw DiglettEvosMoves - dw TaurosEvosMoves - dw MissingNo3DEvosMoves - dw MissingNo3EEvosMoves - dw MissingNo3FEvosMoves - dw FarfetchdEvosMoves - dw VenonatEvosMoves - dw DragoniteEvosMoves - dw MissingNo43EvosMoves - dw MissingNo44EvosMoves - dw MissingNo45EvosMoves - dw DoduoEvosMoves - dw PoliwagEvosMoves - dw JynxEvosMoves - dw MoltresEvosMoves - dw ArticunoEvosMoves - dw ZapdosEvosMoves - dw DittoEvosMoves - dw MeowthEvosMoves - dw KrabbyEvosMoves - dw MissingNo4FEvosMoves - dw MissingNo50EvosMoves - dw MissingNo51EvosMoves - dw VulpixEvosMoves - dw NinetalesEvosMoves - dw PikachuEvosMoves - dw RaichuEvosMoves - dw MissingNo56EvosMoves - dw MissingNo57EvosMoves - dw DratiniEvosMoves - dw DragonairEvosMoves - dw KabutoEvosMoves - dw KabutopsEvosMoves - dw HorseaEvosMoves - dw SeadraEvosMoves - dw MissingNo5EEvosMoves - dw MissingNo5FEvosMoves - dw SandshrewEvosMoves - dw SandslashEvosMoves - dw OmanyteEvosMoves - dw OmastarEvosMoves - dw JigglypuffEvosMoves - dw WigglytuffEvosMoves - dw EeveeEvosMoves - dw FlareonEvosMoves - dw JolteonEvosMoves - dw VaporeonEvosMoves - dw MachopEvosMoves - dw ZubatEvosMoves - dw EkansEvosMoves - dw ParasEvosMoves - dw PoliwhirlEvosMoves - dw PoliwrathEvosMoves - dw WeedleEvosMoves - dw KakunaEvosMoves - dw BeedrillEvosMoves - dw MissingNo73EvosMoves - dw DodrioEvosMoves - dw PrimeapeEvosMoves - dw DugtrioEvosMoves - dw VenomothEvosMoves - dw DewgongEvosMoves - dw MissingNo79EvosMoves - dw MissingNo7AEvosMoves - dw CaterpieEvosMoves - dw MetapodEvosMoves - dw ButterfreeEvosMoves - dw MachampEvosMoves - dw MissingNo7FEvosMoves - dw GolduckEvosMoves - dw HypnoEvosMoves - dw GolbatEvosMoves - dw MewtwoEvosMoves - dw SnorlaxEvosMoves - dw MagikarpEvosMoves - dw MissingNo86EvosMoves - dw MissingNo87EvosMoves - dw MukEvosMoves - dw MissingNo8AEvosMoves - dw KinglerEvosMoves - dw CloysterEvosMoves - dw MissingNo8CEvosMoves - dw ElectrodeEvosMoves - dw ClefableEvosMoves - dw WeezingEvosMoves - dw PersianEvosMoves - dw MarowakEvosMoves - dw MissingNo92EvosMoves - dw HaunterEvosMoves - dw AbraEvosMoves - dw AlakazamEvosMoves - dw PidgeottoEvosMoves - dw PidgeotEvosMoves - dw StarmieEvosMoves - dw BulbasaurEvosMoves - dw VenusaurEvosMoves - dw TentacruelEvosMoves - dw MissingNo9CEvosMoves - dw GoldeenEvosMoves - dw SeakingEvosMoves - dw MissingNo9FEvosMoves - dw MissingNoA0EvosMoves - dw MissingNoA1EvosMoves - dw MissingNoA2EvosMoves - dw PonytaEvosMoves - dw RapidashEvosMoves - dw RattataEvosMoves - dw RaticateEvosMoves - dw NidorinoEvosMoves - dw NidorinaEvosMoves - dw GeodudeEvosMoves - dw PorygonEvosMoves - dw AerodactylEvosMoves - dw MissingNoACEvosMoves - dw MagnemiteEvosMoves - dw MissingNoAEEvosMoves - dw MissingNoAFEvosMoves - dw CharmanderEvosMoves - dw SquirtleEvosMoves - dw CharmeleonEvosMoves - dw WartortleEvosMoves - dw CharizardEvosMoves - dw MissingNoB5EvosMoves - dw FossilKabutopsEvosMoves - dw FossilAerodactylEvosMoves - dw MonGhostEvosMoves - dw OddishEvosMoves - dw GloomEvosMoves - dw VileplumeEvosMoves - dw BellsproutEvosMoves - dw WeepinbellEvosMoves - dw VictreebelEvosMoves - -RhydonEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 48, HORN_DRILL - db 55, LEER - db 64, TAKE_DOWN - db 0 - -KangaskhanEvosMoves: -; Evolutions - db 0 -; Learnset - db 26, BITE - db 31, TAIL_WHIP - db 36, MEGA_PUNCH - db 41, LEER - db 46, DIZZY_PUNCH - db 0 - -NidoranMEvosMoves: -; Evolutions - db EV_LEVEL, 16, NIDORINO - db 0 -; Learnset - db 8, HORN_ATTACK - db 14, POISON_STING - db 21, FOCUS_ENERGY - db 29, FURY_ATTACK - db 36, HORN_DRILL - db 43, DOUBLE_KICK - db 0 - -ClefairyEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, CLEFABLE - db 0 -; Learnset - db 13, SING - db 18, DOUBLESLAP - db 24, MINIMIZE - db 31, METRONOME - db 39, DEFENSE_CURL - db 48, LIGHT_SCREEN - db 0 - -SpearowEvosMoves: -; Evolutions - db EV_LEVEL, 20, FEAROW - db 0 -; Learnset - db 9, LEER - db 15, FURY_ATTACK - db 22, MIRROR_MOVE - db 29, DRILL_PECK - db 36, AGILITY - db 0 - -VoltorbEvosMoves: -; Evolutions - db EV_LEVEL, 30, ELECTRODE - db 0 -; Learnset - db 17, SONICBOOM - db 22, SELFDESTRUCT - db 29, LIGHT_SCREEN - db 36, SWIFT - db 43, EXPLOSION - db 0 - -NidokingEvosMoves: -; Evolutions - db 0 -; Learnset - db 8, HORN_ATTACK - db 14, POISON_STING - db 23, THRASH - db 0 - -SlowbroEvosMoves: -; Evolutions - db 0 -; Learnset - db 18, DISABLE - db 22, HEADBUTT - db 27, GROWL - db 33, WATER_GUN - db 37, WITHDRAW - db 44, AMNESIA - db 55, PSYCHIC_M - db 0 - -IvysaurEvosMoves: -; Evolutions - db EV_LEVEL, 32, VENUSAUR - db 0 -; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 22, POISONPOWDER - db 30, RAZOR_LEAF - db 38, GROWTH - db 46, SLEEP_POWDER - db 54, SOLARBEAM - db 0 - -ExeggutorEvosMoves: -; Evolutions - db 0 -; Learnset - db 28, STOMP - db 0 - -LickitungEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, STOMP - db 15, DISABLE - db 23, DEFENSE_CURL - db 31, SLAM - db 39, SCREECH - db 0 - -ExeggcuteEvosMoves: -; Evolutions - db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR - db 0 -; Learnset - db 25, REFLECT - db 28, LEECH_SEED - db 32, STUN_SPORE - db 37, POISONPOWDER - db 42, SOLARBEAM - db 48, SLEEP_POWDER - db 0 - -GrimerEvosMoves: -; Evolutions - db EV_LEVEL, 38, MUK - db 0 -; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 42, HARDEN - db 48, SCREECH - db 55, ACID_ARMOR - db 0 - -GengarEvosMoves: -; Evolutions - db 0 -; Learnset - db 29, HYPNOSIS - db 38, DREAM_EATER - db 0 - -NidoranFEvosMoves: -; Evolutions - db EV_LEVEL, 16, NIDORINA - db 0 -; Learnset - db 8, SCRATCH - db 14, POISON_STING - db 21, TAIL_WHIP - db 29, BITE - db 36, FURY_SWIPES - db 43, DOUBLE_KICK - db 0 - -NidoqueenEvosMoves: -; Evolutions - db 0 -; Learnset - db 8, SCRATCH - db 14, POISON_STING - db 23, BODY_SLAM - db 0 - -CuboneEvosMoves: -; Evolutions - db EV_LEVEL, 28, MAROWAK - db 0 -; Learnset - db 25, LEER - db 31, FOCUS_ENERGY - db 38, THRASH - db 43, BONEMERANG - db 46, RAGE - db 0 - -RhyhornEvosMoves: -; Evolutions - db EV_LEVEL, 42, RHYDON - db 0 -; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 45, HORN_DRILL - db 50, LEER - db 55, TAKE_DOWN - db 0 - -LaprasEvosMoves: -; Evolutions - db 0 -; Learnset - db 16, SING - db 20, MIST - db 25, BODY_SLAM - db 31, CONFUSE_RAY - db 38, ICE_BEAM - db 46, HYDRO_PUMP - db 0 - -ArcanineEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MewEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, TRANSFORM - db 20, MEGA_PUNCH - db 30, METRONOME - db 40, PSYCHIC_M - db 0 - -GyaradosEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, BITE - db 25, DRAGON_RAGE - db 32, LEER - db 41, HYDRO_PUMP - db 52, HYPER_BEAM - db 0 - -ShellderEvosMoves: -; Evolutions - db EV_ITEM, WATER_STONE, 1, CLOYSTER - db 0 -; Learnset - db 18, SUPERSONIC - db 23, CLAMP - db 30, AURORA_BEAM - db 39, LEER - db 50, ICE_BEAM - db 0 - -TentacoolEvosMoves: -; Evolutions - db EV_LEVEL, 30, TENTACRUEL - db 0 -; Learnset - db 7, SUPERSONIC - db 13, WRAP - db 18, POISON_STING - db 22, WATER_GUN - db 27, CONSTRICT - db 33, BARRIER - db 40, SCREECH - db 48, HYDRO_PUMP - db 0 - -GastlyEvosMoves: -; Evolutions - db EV_LEVEL, 25, HAUNTER - db 0 -; Learnset - db 27, HYPNOSIS - db 35, DREAM_EATER - db 0 - -ScytherEvosMoves: -; Evolutions - db 0 -; Learnset - db 17, LEER - db 20, FOCUS_ENERGY - db 24, DOUBLE_TEAM - db 29, SLASH - db 35, SWORDS_DANCE - db 42, AGILITY - db 0 - -StaryuEvosMoves: -; Evolutions - db EV_ITEM, WATER_STONE, 1, STARMIE - db 0 -; Learnset - db 17, WATER_GUN - db 22, HARDEN - db 27, RECOVER - db 32, SWIFT - db 37, MINIMIZE - db 42, LIGHT_SCREEN - db 47, HYDRO_PUMP - db 0 - -BlastoiseEvosMoves: -; Evolutions - db 0 -; Learnset - db 8, BUBBLE - db 15, WATER_GUN - db 24, BITE - db 31, WITHDRAW - db 42, SKULL_BASH - db 52, HYDRO_PUMP - db 0 - -PinsirEvosMoves: -; Evolutions - db 0 -; Learnset - db 25, SEISMIC_TOSS - db 30, GUILLOTINE - db 36, FOCUS_ENERGY - db 43, HARDEN - db 49, SLASH - db 54, SWORDS_DANCE - db 0 - -TangelaEvosMoves: -; Evolutions - db 0 -; Learnset - db 29, ABSORB - db 32, POISONPOWDER - db 36, STUN_SPORE - db 39, SLEEP_POWDER - db 45, SLAM - db 49, GROWTH - db 0 - -MissingNo1FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo20EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -GrowlitheEvosMoves: -; Evolutions - db EV_ITEM, FIRE_STONE, 1, ARCANINE - db 0 -; Learnset - db 18, EMBER - db 23, LEER - db 30, TAKE_DOWN - db 39, AGILITY - db 50, FLAMETHROWER - db 0 - -OnixEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, BIND - db 19, ROCK_THROW - db 25, RAGE - db 33, SLAM - db 43, HARDEN - db 0 - -FearowEvosMoves: -; Evolutions - db 0 -; Learnset - db 9, LEER - db 15, FURY_ATTACK - db 25, MIRROR_MOVE - db 34, DRILL_PECK - db 43, AGILITY - db 0 - -PidgeyEvosMoves: -; Evolutions - db EV_LEVEL, 18, PIDGEOTTO - db 0 -; Learnset - db 5, SAND_ATTACK - db 12, QUICK_ATTACK - db 19, WHIRLWIND - db 28, WING_ATTACK - db 36, AGILITY - db 44, MIRROR_MOVE - db 0 - -SlowpokeEvosMoves: -; Evolutions - db EV_LEVEL, 37, SLOWBRO - db 0 -; Learnset - db 18, DISABLE - db 22, HEADBUTT - db 27, GROWL - db 33, WATER_GUN - db 40, AMNESIA - db 48, PSYCHIC_M - db 0 - -KadabraEvosMoves: -; Evolutions - db EV_TRADE, 1, ALAKAZAM - db 0 -; Learnset - db 16, CONFUSION - db 20, DISABLE - db 27, PSYBEAM - db 31, RECOVER - db 38, PSYCHIC_M - db 42, REFLECT - db 0 - -GravelerEvosMoves: -; Evolutions - db EV_TRADE, 1, GOLEM - db 0 -; Learnset - db 11, DEFENSE_CURL - db 16, ROCK_THROW - db 21, SELFDESTRUCT - db 29, HARDEN - db 36, EARTHQUAKE - db 43, EXPLOSION - db 0 - -ChanseyEvosMoves: -; Evolutions - db 0 -; Learnset - db 24, SING - db 30, GROWL - db 38, MINIMIZE - db 44, DEFENSE_CURL - db 48, LIGHT_SCREEN - db 54, DOUBLE_EDGE - db 0 - -MachokeEvosMoves: -; Evolutions - db EV_TRADE, 1, MACHAMP - db 0 -; Learnset - db 20, LOW_KICK - db 25, LEER - db 36, FOCUS_ENERGY - db 44, SEISMIC_TOSS - db 52, SUBMISSION - db 0 - -MrMimeEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, CONFUSION - db 23, LIGHT_SCREEN - db 31, DOUBLESLAP - db 39, MEDITATE - db 47, SUBSTITUTE - db 0 - -HitmonleeEvosMoves: -; Evolutions - db 0 -; Learnset - db 33, ROLLING_KICK - db 38, JUMP_KICK - db 43, FOCUS_ENERGY - db 48, HI_JUMP_KICK - db 53, MEGA_KICK - db 0 - -HitmonchanEvosMoves: -; Evolutions - db 0 -; Learnset - db 33, FIRE_PUNCH - db 38, ICE_PUNCH - db 43, THUNDERPUNCH - db 48, MEGA_PUNCH - db 53, COUNTER - db 0 - -ArbokEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, POISON_STING - db 17, BITE - db 27, GLARE - db 36, SCREECH - db 47, ACID - db 0 - -ParasectEvosMoves: -; Evolutions - db 0 -; Learnset - db 13, STUN_SPORE - db 20, LEECH_LIFE - db 30, SPORE - db 39, SLASH - db 48, GROWTH - db 0 - -PsyduckEvosMoves: -; Evolutions - db EV_LEVEL, 33, GOLDUCK - db 0 -; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 36, CONFUSION - db 43, FURY_SWIPES - db 52, HYDRO_PUMP - db 0 - -DrowzeeEvosMoves: -; Evolutions - db EV_LEVEL, 26, HYPNO - db 0 -; Learnset - db 12, DISABLE - db 17, CONFUSION - db 24, HEADBUTT - db 29, POISON_GAS - db 32, PSYCHIC_M - db 37, MEDITATE - db 0 - -GolemEvosMoves: -; Evolutions - db 0 -; Learnset - db 11, DEFENSE_CURL - db 16, ROCK_THROW - db 21, SELFDESTRUCT - db 29, HARDEN - db 36, EARTHQUAKE - db 43, EXPLOSION - db 0 - -MissingNo32EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MagmarEvosMoves: -; Evolutions - db 0 -; Learnset - db 36, LEER - db 39, CONFUSE_RAY - db 43, FIRE_PUNCH - db 48, SMOKESCREEN - db 52, SMOG - db 55, FLAMETHROWER - db 0 - -MissingNo34EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -ElectabuzzEvosMoves: -; Evolutions - db 0 -; Learnset - db 34, THUNDERSHOCK - db 37, SCREECH - db 42, THUNDERPUNCH - db 49, LIGHT_SCREEN - db 54, THUNDER - db 0 - -MagnetonEvosMoves: -; Evolutions - db 0 -; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 38, THUNDER_WAVE - db 46, SWIFT - db 54, SCREECH - db 0 - -KoffingEvosMoves: -; Evolutions - db EV_LEVEL, 35, WEEZING - db 0 -; Learnset - db 32, SLUDGE - db 37, SMOKESCREEN - db 40, SELFDESTRUCT - db 45, HAZE - db 48, EXPLOSION - db 0 - -MissingNo38EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MankeyEvosMoves: -; Evolutions - db EV_LEVEL, 28, PRIMEAPE - db 0 -; Learnset - db 15, KARATE_CHOP - db 21, FURY_SWIPES - db 27, FOCUS_ENERGY - db 33, SEISMIC_TOSS - db 39, THRASH - db 0 - -SeelEvosMoves: -; Evolutions - db EV_LEVEL, 34, DEWGONG - db 0 -; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 40, REST - db 45, TAKE_DOWN - db 50, ICE_BEAM - db 0 - -DiglettEvosMoves: -; Evolutions - db EV_LEVEL, 26, DUGTRIO - db 0 -; Learnset - db 15, GROWL - db 19, DIG - db 24, SAND_ATTACK - db 31, SLASH - db 40, EARTHQUAKE - db 0 - -TaurosEvosMoves: -; Evolutions - db 0 -; Learnset - db 21, STOMP - db 28, TAIL_WHIP - db 35, LEER - db 44, RAGE - db 51, TAKE_DOWN - db 0 - -MissingNo3DEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo3EEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo3FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -FarfetchdEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, LEER - db 15, FURY_ATTACK - db 23, SWORDS_DANCE - db 31, AGILITY - db 39, SLASH - db 0 - -VenonatEvosMoves: -; Evolutions - db EV_LEVEL, 31, VENOMOTH - db 0 -; Learnset - db 24, POISONPOWDER - db 27, LEECH_LIFE - db 30, STUN_SPORE - db 35, PSYBEAM - db 38, SLEEP_POWDER - db 43, PSYCHIC_M - db 0 - -DragoniteEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, THUNDER_WAVE - db 20, AGILITY - db 35, SLAM - db 45, DRAGON_RAGE - db 60, HYPER_BEAM - db 0 - -MissingNo43EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo44EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo45EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -DoduoEvosMoves: -; Evolutions - db EV_LEVEL, 31, DODRIO - db 0 -; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 36, RAGE - db 40, TRI_ATTACK - db 44, AGILITY - db 0 - -PoliwagEvosMoves: -; Evolutions - db EV_LEVEL, 25, POLIWHIRL - db 0 -; Learnset - db 16, HYPNOSIS - db 19, WATER_GUN - db 25, DOUBLESLAP - db 31, BODY_SLAM - db 38, AMNESIA - db 45, HYDRO_PUMP - db 0 - -JynxEvosMoves: -; Evolutions - db 0 -; Learnset - db 18, LICK - db 23, DOUBLESLAP - db 31, ICE_PUNCH - db 39, BODY_SLAM - db 47, THRASH - db 58, BLIZZARD - db 0 - -MoltresEvosMoves: -; Evolutions - db 0 -; Learnset - db 51, LEER - db 55, AGILITY - db 60, SKY_ATTACK - db 0 - -ArticunoEvosMoves: -; Evolutions - db 0 -; Learnset - db 51, BLIZZARD - db 55, AGILITY - db 60, MIST - db 0 - -ZapdosEvosMoves: -; Evolutions - db 0 -; Learnset - db 51, THUNDER - db 55, AGILITY - db 60, LIGHT_SCREEN - db 0 - -DittoEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MeowthEvosMoves: -; Evolutions - db EV_LEVEL, 28, PERSIAN - db 0 -; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 33, FURY_SWIPES - db 44, SLASH - db 0 - -KrabbyEvosMoves: -; Evolutions - db EV_LEVEL, 28, KINGLER - db 0 -; Learnset - db 20, VICEGRIP - db 25, GUILLOTINE - db 30, STOMP - db 35, CRABHAMMER - db 40, HARDEN - db 0 - -MissingNo4FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo50EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo51EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -VulpixEvosMoves: -; Evolutions - db EV_ITEM, FIRE_STONE, 1, NINETALES - db 0 -; Learnset - db 16, QUICK_ATTACK - db 21, ROAR - db 28, CONFUSE_RAY - db 35, FLAMETHROWER - db 42, FIRE_SPIN - db 0 - -NinetalesEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -PikachuEvosMoves: -; Evolutions - db EV_ITEM, THUNDER_STONE, 1, RAICHU - db 0 -; Learnset - db 9, THUNDER_WAVE - db 16, QUICK_ATTACK - db 26, SWIFT - db 33, AGILITY - db 43, THUNDER - db 0 - -RaichuEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo56EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo57EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -DratiniEvosMoves: -; Evolutions - db EV_LEVEL, 30, DRAGONAIR - db 0 -; Learnset - db 10, THUNDER_WAVE - db 20, AGILITY - db 30, SLAM - db 40, DRAGON_RAGE - db 50, HYPER_BEAM - db 0 - -DragonairEvosMoves: -; Evolutions - db EV_LEVEL, 55, DRAGONITE - db 0 -; Learnset - db 10, THUNDER_WAVE - db 20, AGILITY - db 35, SLAM - db 45, DRAGON_RAGE - db 55, HYPER_BEAM - db 0 - -KabutoEvosMoves: -; Evolutions - db EV_LEVEL, 40, KABUTOPS - db 0 -; Learnset - db 34, ABSORB - db 39, SLASH - db 44, LEER - db 49, HYDRO_PUMP - db 0 - -KabutopsEvosMoves: -; Evolutions - db 0 -; Learnset - db 34, ABSORB - db 39, SLASH - db 46, LEER - db 53, HYDRO_PUMP - db 0 - -HorseaEvosMoves: -; Evolutions - db EV_LEVEL, 32, SEADRA - db 0 -; Learnset - db 19, SMOKESCREEN - db 24, LEER - db 30, WATER_GUN - db 37, AGILITY - db 45, HYDRO_PUMP - db 0 - -SeadraEvosMoves: -; Evolutions - db 0 -; Learnset - db 19, SMOKESCREEN - db 24, LEER - db 30, WATER_GUN - db 41, AGILITY - db 52, HYDRO_PUMP - db 0 - -MissingNo5EEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo5FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -SandshrewEvosMoves: -; Evolutions - db EV_LEVEL, 22, SANDSLASH - db 0 -; Learnset - db 10, SAND_ATTACK - db 17, SLASH - db 24, POISON_STING - db 31, SWIFT - db 38, FURY_SWIPES - db 0 - -SandslashEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, SAND_ATTACK - db 17, SLASH - db 27, POISON_STING - db 36, SWIFT - db 47, FURY_SWIPES - db 0 - -OmanyteEvosMoves: -; Evolutions - db EV_LEVEL, 40, OMASTAR - db 0 -; Learnset - db 34, HORN_ATTACK - db 39, LEER - db 46, SPIKE_CANNON - db 53, HYDRO_PUMP - db 0 - -OmastarEvosMoves: -; Evolutions - db 0 -; Learnset - db 34, HORN_ATTACK - db 39, LEER - db 44, SPIKE_CANNON - db 49, HYDRO_PUMP - db 0 - -JigglypuffEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF - db 0 -; Learnset - db 9, POUND - db 14, DISABLE - db 19, DEFENSE_CURL - db 24, DOUBLESLAP - db 29, REST - db 34, BODY_SLAM - db 39, DOUBLE_EDGE - db 0 - -WigglytuffEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -EeveeEvosMoves: -; Evolutions - db EV_ITEM, FIRE_STONE, 1, FLAREON - db EV_ITEM, THUNDER_STONE, 1, JOLTEON - db EV_ITEM, WATER_STONE, 1, VAPOREON - db 0 -; Learnset - db 27, QUICK_ATTACK - db 31, TAIL_WHIP - db 37, BITE - db 45, TAKE_DOWN - db 0 - -FlareonEvosMoves: -; Evolutions - db 0 -; Learnset - db 27, QUICK_ATTACK - db 31, EMBER - db 37, TAIL_WHIP - db 40, BITE - db 42, LEER - db 44, FIRE_SPIN - db 48, RAGE - db 54, FLAMETHROWER - db 0 - -JolteonEvosMoves: -; Evolutions - db 0 -; Learnset - db 27, QUICK_ATTACK - db 31, THUNDERSHOCK - db 37, TAIL_WHIP - db 40, THUNDER_WAVE - db 42, DOUBLE_KICK - db 44, AGILITY - db 48, PIN_MISSILE - db 54, THUNDER - db 0 - -VaporeonEvosMoves: -; Evolutions - db 0 -; Learnset - db 27, QUICK_ATTACK - db 31, WATER_GUN - db 37, TAIL_WHIP - db 40, BITE - db 42, ACID_ARMOR - db 44, HAZE - db 48, MIST - db 54, HYDRO_PUMP - db 0 - -MachopEvosMoves: -; Evolutions - db EV_LEVEL, 28, MACHOKE - db 0 -; Learnset - db 20, LOW_KICK - db 25, LEER - db 32, FOCUS_ENERGY - db 39, SEISMIC_TOSS - db 46, SUBMISSION - db 0 - -ZubatEvosMoves: -; Evolutions - db EV_LEVEL, 22, GOLBAT - db 0 -; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 28, WING_ATTACK - db 36, HAZE - db 0 - -EkansEvosMoves: -; Evolutions - db EV_LEVEL, 22, ARBOK - db 0 -; Learnset - db 10, POISON_STING - db 17, BITE - db 24, GLARE - db 31, SCREECH - db 38, ACID - db 0 - -ParasEvosMoves: -; Evolutions - db EV_LEVEL, 24, PARASECT - db 0 -; Learnset - db 13, STUN_SPORE - db 20, LEECH_LIFE - db 27, SPORE - db 34, SLASH - db 41, GROWTH - db 0 - -PoliwhirlEvosMoves: -; Evolutions - db EV_ITEM, WATER_STONE, 1, POLIWRATH - db 0 -; Learnset - db 16, HYPNOSIS - db 19, WATER_GUN - db 26, DOUBLESLAP - db 33, BODY_SLAM - db 41, AMNESIA - db 49, HYDRO_PUMP - db 0 - -PoliwrathEvosMoves: -; Evolutions - db 0 -; Learnset - db 16, HYPNOSIS - db 19, WATER_GUN - db 0 - -WeedleEvosMoves: -; Evolutions - db EV_LEVEL, 7, KAKUNA - db 0 -; Learnset - db 0 - -KakunaEvosMoves: -; Evolutions - db EV_LEVEL, 10, BEEDRILL - db 0 -; Learnset - db 0 - -BeedrillEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, FURY_ATTACK - db 16, FOCUS_ENERGY - db 20, TWINEEDLE - db 25, RAGE - db 30, PIN_MISSILE - db 35, AGILITY - db 0 - -MissingNo73EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -DodrioEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 39, RAGE - db 45, TRI_ATTACK - db 51, AGILITY - db 0 - -PrimeapeEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, KARATE_CHOP - db 21, FURY_SWIPES - db 27, FOCUS_ENERGY - db 37, SEISMIC_TOSS - db 46, THRASH - db 0 - -DugtrioEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, GROWL - db 19, DIG - db 24, SAND_ATTACK - db 35, SLASH - db 47, EARTHQUAKE - db 0 - -VenomothEvosMoves: -; Evolutions - db 0 -; Learnset - db 24, POISONPOWDER - db 27, LEECH_LIFE - db 30, STUN_SPORE - db 38, PSYBEAM - db 43, SLEEP_POWDER - db 50, PSYCHIC_M - db 0 - -DewgongEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 44, REST - db 50, TAKE_DOWN - db 56, ICE_BEAM - db 0 - -MissingNo79EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo7AEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -CaterpieEvosMoves: -; Evolutions - db EV_LEVEL, 7, METAPOD - db 0 -; Learnset - db 0 - -MetapodEvosMoves: -; Evolutions - db EV_LEVEL, 10, BUTTERFREE - db 0 -; Learnset - db 0 - -ButterfreeEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, CONFUSION - db 15, POISONPOWDER - db 16, STUN_SPORE - db 17, SLEEP_POWDER - db 21, SUPERSONIC - db 26, WHIRLWIND - db 32, PSYBEAM - db 0 - -MachampEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, LOW_KICK - db 25, LEER - db 36, FOCUS_ENERGY - db 44, SEISMIC_TOSS - db 52, SUBMISSION - db 0 - -MissingNo7FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -GolduckEvosMoves: -; Evolutions - db 0 -; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 39, CONFUSION - db 48, FURY_SWIPES - db 59, HYDRO_PUMP - db 0 - -HypnoEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, DISABLE - db 17, CONFUSION - db 24, HEADBUTT - db 33, POISON_GAS - db 37, PSYCHIC_M - db 43, MEDITATE - db 0 - -GolbatEvosMoves: -; Evolutions - db 0 -; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 32, WING_ATTACK - db 43, HAZE - db 0 - -MewtwoEvosMoves: -; Evolutions - db 0 -; Learnset - db 63, BARRIER - db 66, PSYCHIC_M - db 70, RECOVER - db 75, MIST - db 81, AMNESIA - db 0 - -SnorlaxEvosMoves: -; Evolutions - db 0 -; Learnset - db 35, BODY_SLAM - db 41, HARDEN - db 48, DOUBLE_EDGE - db 56, HYPER_BEAM - db 0 - -MagikarpEvosMoves: -; Evolutions - db EV_LEVEL, 20, GYARADOS - db 0 -; Learnset - db 15, TACKLE - db 0 - -MissingNo86EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNo87EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MukEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 45, HARDEN - db 53, SCREECH - db 60, ACID_ARMOR - db 0 - -MissingNo8AEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -KinglerEvosMoves: -; Evolutions - db 0 -; Learnset - db 20, VICEGRIP - db 25, GUILLOTINE - db 34, STOMP - db 42, CRABHAMMER - db 49, HARDEN - db 0 - -CloysterEvosMoves: -; Evolutions - db 0 -; Learnset - db 50, SPIKE_CANNON - db 0 - -MissingNo8CEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -ElectrodeEvosMoves: -; Evolutions - db 0 -; Learnset - db 17, SONICBOOM - db 22, SELFDESTRUCT - db 29, LIGHT_SCREEN - db 40, SWIFT - db 50, EXPLOSION - db 0 - -ClefableEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -WeezingEvosMoves: -; Evolutions - db 0 -; Learnset - db 32, SLUDGE - db 39, SMOKESCREEN - db 43, SELFDESTRUCT - db 49, HAZE - db 53, EXPLOSION - db 0 - -PersianEvosMoves: -; Evolutions - db 0 -; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 37, FURY_SWIPES - db 51, SLASH - db 0 - -MarowakEvosMoves: -; Evolutions - db 0 -; Learnset - db 25, LEER - db 33, FOCUS_ENERGY - db 41, THRASH - db 48, BONEMERANG - db 55, RAGE - db 0 - -MissingNo92EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -HaunterEvosMoves: -; Evolutions - db EV_TRADE, 1, GENGAR - db 0 -; Learnset - db 29, HYPNOSIS - db 38, DREAM_EATER - db 0 - -AbraEvosMoves: -; Evolutions - db EV_LEVEL, 16, KADABRA - db 0 -; Learnset - db 0 - -AlakazamEvosMoves: -; Evolutions - db 0 -; Learnset - db 16, CONFUSION - db 20, DISABLE - db 27, PSYBEAM - db 31, RECOVER - db 38, PSYCHIC_M - db 42, REFLECT - db 0 - -PidgeottoEvosMoves: -; Evolutions - db EV_LEVEL, 36, PIDGEOT - db 0 -; Learnset - db 5, SAND_ATTACK - db 12, QUICK_ATTACK - db 21, WHIRLWIND - db 31, WING_ATTACK - db 40, AGILITY - db 49, MIRROR_MOVE - db 0 - -PidgeotEvosMoves: -; Evolutions - db 0 -; Learnset - db 5, SAND_ATTACK - db 12, QUICK_ATTACK - db 21, WHIRLWIND - db 31, WING_ATTACK - db 44, AGILITY - db 54, MIRROR_MOVE - db 0 - -StarmieEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -BulbasaurEvosMoves: -; Evolutions - db EV_LEVEL, 16, IVYSAUR - db 0 -; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 20, POISONPOWDER - db 27, RAZOR_LEAF - db 34, GROWTH - db 41, SLEEP_POWDER - db 48, SOLARBEAM - db 0 - -VenusaurEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 22, POISONPOWDER - db 30, RAZOR_LEAF - db 43, GROWTH - db 55, SLEEP_POWDER - db 65, SOLARBEAM - db 0 - -TentacruelEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, SUPERSONIC - db 13, WRAP - db 18, POISON_STING - db 22, WATER_GUN - db 27, CONSTRICT - db 35, BARRIER - db 43, SCREECH - db 50, HYDRO_PUMP - db 0 - -MissingNo9CEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -GoldeenEvosMoves: -; Evolutions - db EV_LEVEL, 33, SEAKING - db 0 -; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 37, WATERFALL - db 45, HORN_DRILL - db 54, AGILITY - db 0 - -SeakingEvosMoves: -; Evolutions - db 0 -; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 39, WATERFALL - db 48, HORN_DRILL - db 54, AGILITY - db 0 - -MissingNo9FEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoA0EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoA1EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoA2EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -PonytaEvosMoves: -; Evolutions - db EV_LEVEL, 40, RAPIDASH - db 0 -; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 43, TAKE_DOWN - db 48, AGILITY - db 0 - -RapidashEvosMoves: -; Evolutions - db 0 -; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 47, TAKE_DOWN - db 55, AGILITY - db 0 - -RattataEvosMoves: -; Evolutions - db EV_LEVEL, 20, RATICATE - db 0 -; Learnset - db 7, QUICK_ATTACK - db 14, HYPER_FANG - db 23, FOCUS_ENERGY - db 34, SUPER_FANG - db 0 - -RaticateEvosMoves: -; Evolutions - db 0 -; Learnset - db 7, QUICK_ATTACK - db 14, HYPER_FANG - db 27, FOCUS_ENERGY - db 41, SUPER_FANG - db 0 - -NidorinoEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOKING - db 0 -; Learnset - db 8, HORN_ATTACK - db 14, POISON_STING - db 23, FOCUS_ENERGY - db 32, FURY_ATTACK - db 41, HORN_DRILL - db 50, DOUBLE_KICK - db 0 - -NidorinaEvosMoves: -; Evolutions - db EV_ITEM, MOON_STONE, 1, NIDOQUEEN - db 0 -; Learnset - db 8, SCRATCH - db 14, POISON_STING - db 23, TAIL_WHIP - db 32, BITE - db 41, FURY_SWIPES - db 50, DOUBLE_KICK - db 0 - -GeodudeEvosMoves: -; Evolutions - db EV_LEVEL, 25, GRAVELER - db 0 -; Learnset - db 11, DEFENSE_CURL - db 16, ROCK_THROW - db 21, SELFDESTRUCT - db 26, HARDEN - db 31, EARTHQUAKE - db 36, EXPLOSION - db 0 - -PorygonEvosMoves: -; Evolutions - db 0 -; Learnset - db 23, PSYBEAM - db 28, RECOVER - db 35, AGILITY - db 42, TRI_ATTACK - db 0 - -AerodactylEvosMoves: -; Evolutions - db 0 -; Learnset - db 33, SUPERSONIC - db 38, BITE - db 45, TAKE_DOWN - db 54, HYPER_BEAM - db 0 - -MissingNoACEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MagnemiteEvosMoves: -; Evolutions - db EV_LEVEL, 30, MAGNETON - db 0 -; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 35, THUNDER_WAVE - db 41, SWIFT - db 47, SCREECH - db 0 - -MissingNoAEEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MissingNoAFEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -CharmanderEvosMoves: -; Evolutions - db EV_LEVEL, 16, CHARMELEON - db 0 -; Learnset - db 9, EMBER - db 15, LEER - db 22, RAGE - db 30, SLASH - db 38, FLAMETHROWER - db 46, FIRE_SPIN - db 0 - -SquirtleEvosMoves: -; Evolutions - db EV_LEVEL, 16, WARTORTLE - db 0 -; Learnset - db 8, BUBBLE - db 15, WATER_GUN - db 22, BITE - db 28, WITHDRAW - db 35, SKULL_BASH - db 42, HYDRO_PUMP - db 0 - -CharmeleonEvosMoves: -; Evolutions - db EV_LEVEL, 36, CHARIZARD - db 0 -; Learnset - db 9, EMBER - db 15, LEER - db 24, RAGE - db 33, SLASH - db 42, FLAMETHROWER - db 56, FIRE_SPIN - db 0 - -WartortleEvosMoves: -; Evolutions - db EV_LEVEL, 36, BLASTOISE - db 0 -; Learnset - db 8, BUBBLE - db 15, WATER_GUN - db 24, BITE - db 31, WITHDRAW - db 39, SKULL_BASH - db 47, HYDRO_PUMP - db 0 - -CharizardEvosMoves: -; Evolutions - db 0 -; Learnset - db 9, EMBER - db 15, LEER - db 24, RAGE - db 36, SLASH - db 46, FLAMETHROWER - db 55, FIRE_SPIN - db 0 - -MissingNoB5EvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -FossilKabutopsEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -FossilAerodactylEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -MonGhostEvosMoves: -; Evolutions - db 0 -; Learnset - db 0 - -OddishEvosMoves: -; Evolutions - db EV_LEVEL, 21, GLOOM - db 0 -; Learnset - db 15, POISONPOWDER - db 17, STUN_SPORE - db 19, SLEEP_POWDER - db 24, ACID - db 33, PETAL_DANCE - db 46, SOLARBEAM - db 0 - -GloomEvosMoves: -; Evolutions - db EV_ITEM, LEAF_STONE, 1, VILEPLUME - db 0 -; Learnset - db 15, POISONPOWDER - db 17, STUN_SPORE - db 19, SLEEP_POWDER - db 28, ACID - db 38, PETAL_DANCE - db 52, SOLARBEAM - db 0 - -VileplumeEvosMoves: -; Evolutions - db 0 -; Learnset - db 15, POISONPOWDER - db 17, STUN_SPORE - db 19, SLEEP_POWDER - db 0 - -BellsproutEvosMoves: -; Evolutions - db EV_LEVEL, 21, WEEPINBELL - db 0 -; Learnset - db 13, WRAP - db 15, POISONPOWDER - db 18, SLEEP_POWDER - db 21, STUN_SPORE - db 26, ACID - db 33, RAZOR_LEAF - db 42, SLAM - db 0 - -WeepinbellEvosMoves: -; Evolutions - db EV_ITEM, LEAF_STONE, 1, VICTREEBEL - db 0 -; Learnset - db 13, WRAP - db 15, POISONPOWDER - db 18, SLEEP_POWDER - db 23, STUN_SPORE - db 29, ACID - db 38, RAZOR_LEAF - db 49, SLAM - db 0 - -VictreebelEvosMoves: -; Evolutions - db 0 -; Learnset - db 13, WRAP - db 15, POISONPOWDER - db 18, SLEEP_POWDER - db 0 diff --git a/data/facing.asm b/data/facing.asm deleted file mode 100644 index c412247a..00000000 --- a/data/facing.asm +++ /dev/null @@ -1,57 +0,0 @@ -SpriteFacingAndAnimationTable: - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0 - dw SpriteFacingDownAndWalking, SpriteOAMParameters ; facing down, walk animation frame 1 - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 2 - dw SpriteFacingDownAndWalking, SpriteOAMParametersFlipped ; facing down, walk animation frame 3 - dw SpriteFacingUpAndStanding, SpriteOAMParameters ; facing up, walk animation frame 0 - dw SpriteFacingUpAndWalking, SpriteOAMParameters ; facing up, walk animation frame 1 - dw SpriteFacingUpAndStanding, SpriteOAMParameters ; facing up, walk animation frame 2 - dw SpriteFacingUpAndWalking, SpriteOAMParametersFlipped ; facing up, walk animation frame 3 - dw SpriteFacingLeftAndStanding, SpriteOAMParameters ; facing left, walk animation frame 0 - dw SpriteFacingLeftAndWalking, SpriteOAMParameters ; facing left, walk animation frame 1 - dw SpriteFacingLeftAndStanding, SpriteOAMParameters ; facing left, walk animation frame 2 - dw SpriteFacingLeftAndWalking, SpriteOAMParameters ; facing left, walk animation frame 3 - dw SpriteFacingLeftAndStanding, SpriteOAMParametersFlipped ; facing right, walk animation frame 0 - dw SpriteFacingLeftAndWalking, SpriteOAMParametersFlipped ; facing right, walk animation frame 1 - dw SpriteFacingLeftAndStanding, SpriteOAMParametersFlipped ; facing right, walk animation frame 2 - dw SpriteFacingLeftAndWalking, SpriteOAMParametersFlipped ; facing right, walk animation frame 3 - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; --- - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; This table is used for sprites $a and $b. - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; All orientation and animation parameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; lead to the same result. Used for immobile - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; sprites like items on the ground - dw SpriteFacingDownAndStanding, SpriteOAMParameters ; --- - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - dw SpriteFacingDownAndStanding, SpriteOAMParameters - -SpriteFacingDownAndStanding: - db $00,$01,$02,$03 -SpriteFacingDownAndWalking: - db $80,$81,$82,$83 -SpriteFacingUpAndStanding: - db $04,$05,$06,$07 -SpriteFacingUpAndWalking: - db $84,$85,$86,$87 -SpriteFacingLeftAndStanding: - db $08,$09,$0a,$0b -SpriteFacingLeftAndWalking: - db $88,$89,$8a,$8b - -SpriteOAMParameters: - db $00,$00, $00 ; top left - db $00,$08, $00 ; top right - db $08,$00, OAMFLAG_CANBEMASKED ; bottom left - db $08,$08, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right -SpriteOAMParametersFlipped: - db $00,$08, OAMFLAG_VFLIPPED - db $00,$00, OAMFLAG_VFLIPPED - db $08,$08, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED - db $08,$00, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm deleted file mode 100755 index fb352aa9..00000000 --- a/data/force_bike_surf.asm +++ /dev/null @@ -1,11 +0,0 @@ -ForcedBikeOrSurfMaps: -; map id, y, x - db ROUTE_16,$0A,$11 - db ROUTE_16,$0B,$11 - db ROUTE_18,$08,$21 - db ROUTE_18,$09,$21 - db SEAFOAM_ISLANDS_B3F,$07,$12 - db SEAFOAM_ISLANDS_B3F,$07,$13 - db SEAFOAM_ISLANDS_B4F,$0E,$04 - db SEAFOAM_ISLANDS_B4F,$0E,$05 - db $FF ;end diff --git a/data/good_rod.asm b/data/good_rod.asm deleted file mode 100755 index 6c23f402..00000000 --- a/data/good_rod.asm +++ /dev/null @@ -1,3 +0,0 @@ -GoodRodMons: - db 10,GOLDEEN - db 10,POLIWAG diff --git a/data/growth_rates.asm b/data/growth_rates.asm new file mode 100644 index 00000000..e2cb8c90 --- /dev/null +++ b/data/growth_rates.asm @@ -0,0 +1,19 @@ +growth_rate: MACRO +; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5] + dn \1, \2 + if \3 < 0 + db -\3 | $80 ; signed magnitude + else + db \3 + endc + db \4, \5 +ENDM + +GrowthRateTable: +; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm) + growth_rate 1, 1, 0, 0, 0 ; Medium Fast + growth_rate 3, 4, 10, 0, 30 ; Slightly Fast + growth_rate 3, 4, 20, 0, 70 ; Slightly Slow + growth_rate 6, 5, -15, 100, 140 ; Medium Slow + growth_rate 4, 5, 0, 0, 0 ; Fast + growth_rate 5, 4, 0, 0, 0 ; Slow diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm deleted file mode 100755 index b7358572..00000000 --- a/data/hidden_coins.asm +++ /dev/null @@ -1,14 +0,0 @@ -HiddenCoinCoords: - db GAME_CORNER,$08,$00 - db GAME_CORNER,$10,$01 - db GAME_CORNER,$0b,$03 - db GAME_CORNER,$0e,$03 - db GAME_CORNER,$0c,$04 - db GAME_CORNER,$0c,$09 - db GAME_CORNER,$0f,$09 - db GAME_CORNER,$0e,$10 - db GAME_CORNER,$10,$0a - db GAME_CORNER,$07,$0b - db GAME_CORNER,$08,$0f - db GAME_CORNER,$0f,$0c - db $ff diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm deleted file mode 100755 index 6b911dea..00000000 --- a/data/hidden_item_coords.asm +++ /dev/null @@ -1,57 +0,0 @@ -HiddenItemCoords: -; map ID, then coords - db VIRIDIAN_FOREST,$12,$01 - db VIRIDIAN_FOREST,$2a,$10 - db MT_MOON_B2F,$0c,$12 - db ROUTE_25,$03,$26 - db ROUTE_9,$07,$0e - db SS_ANNE_KITCHEN,$09,$0d - db SS_ANNE_B1F_ROOMS,$01,$03 - db ROUTE_10,$11,$09 - db ROUTE_10,$35,$10 - db ROCKET_HIDEOUT_B1F,$0f,$15 - db ROCKET_HIDEOUT_B3F,$11,$1b - db ROCKET_HIDEOUT_B4F,$01,$19 - db POKEMON_TOWER_5F,$0c,$04 - db ROUTE_13,$0e,$01 - db ROUTE_13,$0d,$10 - db POKEMON_MANSION_B1F,$09,$01 - db SAFARI_ZONE_GATE,$01,$0a - db SAFARI_ZONE_WEST,$05,$06 - db SILPH_CO_5F,$03,$0c - db SILPH_CO_9F,$0f,$02 - db COPYCATS_HOUSE_2F,$01,$01 - db CERULEAN_CAVE_1F,$0b,$0e - db CERULEAN_CAVE_B1F,$03,$1b - db POWER_PLANT,$10,$11 - db POWER_PLANT,$01,$0c - db SEAFOAM_ISLANDS_B2F,$0f,$0f - db SEAFOAM_ISLANDS_B4F,$11,$19 - db POKEMON_MANSION_1F,$10,$08 - db POKEMON_MANSION_3F,$09,$01 - db ROUTE_23,$2c,$09 - db ROUTE_23,$46,$13 - db ROUTE_23,$5a,$08 - db VICTORY_ROAD_2F,$02,$05 - db VICTORY_ROAD_2F,$07,$1a - db UNUSED_MAP_6F,$0b,$0e - db VIRIDIAN_CITY,$04,$0e - db ROUTE_11,$05,$30 - db ROUTE_12,$3f,$02 - db ROUTE_17,$0e,$0f - db ROUTE_17,$2d,$08 - db ROUTE_17,$48,$11 - db ROUTE_17,$5b,$04 - db ROUTE_17,$79,$08 - db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03 - db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04 - db UNDERGROUND_PATH_WEST_EAST,$02,$0c - db UNDERGROUND_PATH_WEST_EAST,$05,$15 - db CELADON_CITY,$0f,$30 - db ROUTE_25,$01,$0a - db MT_MOON_B2F,$09,$21 - db SEAFOAM_ISLANDS_B3F,$10,$09 - db VERMILION_CITY,$0b,$0e - db CERULEAN_CITY,$08,$0f - db ROUTE_4,$03,$28 - db $ff diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm deleted file mode 100755 index b1bfd844..00000000 --- a/data/hidden_objects.asm +++ /dev/null @@ -1,853 +0,0 @@ -HiddenObjectMaps: - db REDS_HOUSE_2F - db BLUES_HOUSE - db OAKS_LAB - db VIRIDIAN_POKECENTER - db VIRIDIAN_MART - db VIRIDIAN_SCHOOL_HOUSE - db VIRIDIAN_GYM - db MUSEUM_1F - db PEWTER_GYM - db PEWTER_MART - db PEWTER_POKECENTER - db CERULEAN_POKECENTER - db CERULEAN_GYM - db CERULEAN_MART - db LAVENDER_POKECENTER - db VERMILION_POKECENTER - db VERMILION_GYM - db CELADON_MANSION_2F - db CELADON_POKECENTER - db CELADON_GYM - db GAME_CORNER - db CELADON_HOTEL - db FUCHSIA_POKECENTER - db FUCHSIA_GYM - db CINNABAR_GYM - db CINNABAR_POKECENTER - db SAFFRON_GYM - db MT_MOON_POKECENTER - db ROCK_TUNNEL_POKECENTER - db TRADE_CENTER - db COLOSSEUM - db VIRIDIAN_FOREST - db MT_MOON_B2F - db INDIGO_PLATEAU - db ROUTE_25 - db ROUTE_9 - db SS_ANNE_KITCHEN - db SS_ANNE_B1F_ROOMS - db ROCKET_HIDEOUT_B1F - db ROCKET_HIDEOUT_B3F - db ROCKET_HIDEOUT_B4F - db SAFFRON_POKECENTER - db POKEMON_TOWER_5F - db ROUTE_13 - db SAFARI_ZONE_GATE - db SAFARI_ZONE_WEST - db SILPH_CO_5F - db SILPH_CO_9F - db COPYCATS_HOUSE_2F - db CERULEAN_CAVE_1F - db CERULEAN_CAVE_B1F - db POWER_PLANT - db SEAFOAM_ISLANDS_B2F - db SEAFOAM_ISLANDS_B4F - db POKEMON_MANSION_1F - db POKEMON_MANSION_3F - db ROUTE_23 - db VICTORY_ROAD_2F - db UNUSED_MAP_6F - db BILLS_HOUSE - db VIRIDIAN_CITY - db SAFARI_ZONE_WEST_REST_HOUSE - db SAFARI_ZONE_EAST_REST_HOUSE - db SAFARI_ZONE_NORTH_REST_HOUSE - db ROUTE_15_GATE_2F - db MR_FUJIS_HOUSE - db CELADON_MANSION_ROOF_HOUSE - db FIGHTING_DOJO - db ROUTE_10 - db INDIGO_PLATEAU_LOBBY - db CINNABAR_LAB_FOSSIL_ROOM - db BIKE_SHOP - db ROUTE_11 - db ROUTE_12 - db POKEMON_MANSION_2F - db POKEMON_MANSION_B1F - db SILPH_CO_11F - db ROUTE_17 - db UNDERGROUND_PATH_NORTH_SOUTH - db UNDERGROUND_PATH_WEST_EAST - db CELADON_CITY - db SEAFOAM_ISLANDS_B3F - db VERMILION_CITY - db CERULEAN_CITY - db ROUTE_4 - db $FF - -HiddenObjectPointers: -; each of these pointers is for the corresponding map in HiddenObjectMaps - dw RedsHouse2FHiddenObjects - dw BluesHouseHiddenObjects - dw OaksLabHiddenObjects - dw ViridianPokecenterHiddenObjects - dw ViridianMartHiddenObjects - dw ViridianSchoolHiddenObjects - dw ViridianGymHiddenObjects - dw Museum1FHiddenObjects - dw PewterGymHiddenObjects - dw PewterMartHiddenObjects - dw PewterPokecenterHiddenObjects - dw CeruleanPokecenterHiddenObjects - dw CeruleanGymHiddenObjects - dw CeruleanMartHiddenObjects - dw LavenderPokecenterHiddenObjects - dw VermilionPokecenterHiddenObjects - dw VermilionGymHiddenObjects - dw CeladonMansion2HiddenObjects - dw CeladonPokecenterHiddenObjects - dw CeladonGymHiddenObjects - dw GameCornerHiddenObjects - dw CeladonHotelHiddenObjects - dw FuchsiaPokecenterHiddenObjects - dw FuchsiaGymHiddenObjects - dw CinnabarGymHiddenObjects - dw CinnabarPokecenterHiddenObjects - dw SaffronGymHiddenObjects - dw MtMoonPokecenterHiddenObjects - dw RockTunnelPokecenterHiddenObjects - dw TradeCenterHiddenObjects - dw ColosseumHiddenObjects - dw ViridianForestHiddenObjects - dw MtMoon3HiddenObjects - dw IndigoPlateauHiddenObjects - dw Route25HiddenObjects - dw Route9HiddenObjects - dw SSAnne6HiddenObjects - dw SSAnne10HiddenObjects - dw RocketHideout1HiddenObjects - dw RocketHideout3HiddenObjects - dw RocketHideout4HiddenObjects - dw SaffronPokecenterHiddenObjects - dw PokemonTower5HiddenObjects - dw Route13HiddenObjects - dw SafariZoneEntranceHiddenObjects - dw SafariZoneWestHiddenObjects - dw SilphCo5FHiddenObjects - dw SilphCo9FHiddenObjects - dw CopycatsHouse2FHiddenObjects - dw UnknownDungeon1HiddenObjects - dw UnknownDungeon3HiddenObjects - dw PowerPlantHiddenObjects - dw SeafoamIslands3HiddenObjects - dw SeafoamIslands5HiddenObjects - dw Mansion1HiddenObjects - dw Mansion3HiddenObjects - dw Route23HiddenObjects - dw VictoryRoad2HiddenObjects - dw Unused6FHiddenObjects - dw BillsHouseHiddenObjects - dw ViridianCityHiddenObjects - dw SafariZoneRestHouse2HiddenObjects - dw SafariZoneRestHouse3HiddenObjects - dw SafariZoneRestHouse4HiddenObjects - dw Route15GateUpstairsHiddenObjects - dw LavenderHouse1HiddenObjects - dw CeladonMansion5HiddenObjects - dw FightingDojoHiddenObjects - dw Route10HiddenObjects - dw IndigoPlateauLobbyHiddenObjects - dw CinnabarLab4HiddenObjects - dw BikeShopHiddenObjects - dw Route11HiddenObjects - dw Route12HiddenObjects - dw Mansion2HiddenObjects - dw Mansion4HiddenObjects - dw SilphCo11FHiddenObjects - dw Route17HiddenObjects - dw UndergroundPathNsHiddenObjects - dw UndergroundPathWeHiddenObjects - dw CeladonCityHiddenObjects - dw SeafoamIslands4HiddenObjects - dw VermilionCityHiddenObjects - dw CeruleanCityHiddenObjects - dw Route4HiddenObjects - -; format: y-coord, x-coord, text id/item id, object routine -TradeCenterHiddenObjects: - db $04,$05,$d0 - db BANK(CableClubRightGameboy) - dw CableClubRightGameboy - db $04,$04,$d0 - db BANK(CableClubLeftGameboy) - dw CableClubLeftGameboy - db $FF -ColosseumHiddenObjects: - db $04,$05,$d0 - db BANK(CableClubRightGameboy) - dw CableClubRightGameboy - db $04,$04,$d0 - db BANK(CableClubLeftGameboy) - dw CableClubLeftGameboy - db $FF -RedsHouse2FHiddenObjects: - db $01,$00,$04 - dbw BANK(OpenRedsPC), OpenRedsPC - db $05,$03,$d0 - dbw BANK(PrintRedSNESText), PrintRedSNESText - db $FF -BluesHouseHiddenObjects: - db $01,$00,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText - db $01,$01,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText - db $01,$07,$04 - db BANK(PrintBookcaseText) - dw PrintBookcaseText - db $FF -OaksLabHiddenObjects: - db $00,$04,$04 - db BANK(DisplayOakLabLeftPoster) - dw DisplayOakLabLeftPoster - db $00,$05,$04 - db BANK(DisplayOakLabRightPoster) - dw DisplayOakLabRightPoster - db $01,$00,$04 - db BANK(DisplayOakLabEmailText) - dw DisplayOakLabEmailText - db $01,$01,$04 - db BANK(DisplayOakLabEmailText) - dw DisplayOakLabEmailText - db $FF -ViridianPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -ViridianMartHiddenObjects: - db $FF -ViridianSchoolHiddenObjects: - db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 - db Bank(PrintNotebookText) - dw PrintNotebookText - db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText - db $FF -ViridianGymHiddenObjects: - db $0f,$0f,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$12,$04 - dbw BANK(GymStatues),GymStatues - db $FF -Museum1FHiddenObjects: - db $03,$02,$04 - dbw BANK(AerodactylFossil), AerodactylFossil - db $06,$02,$04 - dbw BANK(KabutopsFossil), KabutopsFossil - db $FF -PewterGymHiddenObjects: - db $0a,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0a,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -PewterMartHiddenObjects: - db $FF -PewterPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeruleanPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeruleanGymHiddenObjects: - db $0b,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0b,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -CeruleanMartHiddenObjects: - db $FF -LavenderPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -VermilionPokecenterHiddenObjects: - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $FF -VermilionGymHiddenObjects: - db $0e,$03,$04 - dbw BANK(GymStatues), GymStatues - db $0e,$06,$04 - dbw BANK(GymStatues), GymStatues - db $01,$06,$00 - dbw BANK(PrintTrashText), PrintTrashText - db $07,$01,$00 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$01,$01 - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$01,$02 - dbw BANK(GymTrashScript), GymTrashScript - db $07,$03,$03 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$03,$04 - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$03,$05 - dbw BANK(GymTrashScript), GymTrashScript - db $07,$05,$06 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$05,$07 - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$05,$08 - dbw BANK(GymTrashScript), GymTrashScript - db $07,$07,$09 - dbw BANK(GymTrashScript), GymTrashScript - db $09,$07,$0a - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$07,$0b - dbw BANK(GymTrashScript), GymTrashScript - db $07,$09,$0c - dbw BANK(GymTrashScript), GymTrashScript - db $09,$09,$0d - dbw BANK(GymTrashScript), GymTrashScript - db $0b,$09,$0e - dbw BANK(GymTrashScript), GymTrashScript - db $FF -CeladonMansion2HiddenObjects: - db $05,$00,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeladonPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CeladonGymHiddenObjects: - db $0f,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -GameCornerHiddenObjects: - db $0f,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$12,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$12,$ff ; "Someone's Keys" - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$0d,$fe ; "Out To Lunch" - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$0d,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$0c,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$07,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$06,$fd ; "Out Of Order" - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$06,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0a,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0b,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0c,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0d,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0e,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $0f,$01,$d0 - dbw BANK(StartSlotMachine), StartSlotMachine - db $08,$00,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $10,$01,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0b,$03,COIN+20 - dbw BANK(HiddenCoins),HiddenCoins - db $0e,$03,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0c,$04,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0c,$09,COIN+20 - dbw BANK(HiddenCoins),HiddenCoins - db $0f,$09,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $0e,$10,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $10,$0a,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $07,$0b,COIN+40 - dbw BANK(HiddenCoins),HiddenCoins - db $08,$0f,COIN+100 - dbw BANK(HiddenCoins),HiddenCoins - db $0f,$0c,COIN+10 - dbw BANK(HiddenCoins),HiddenCoins - db $FF -CeladonHotelHiddenObjects: - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $FF -FuchsiaPokecenterHiddenObjects: - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $FF -FuchsiaGymHiddenObjects: - db $0f,$03,$04 - dbw BANK(GymStatues),GymStatues - db $0f,$06,$04 - dbw BANK(GymStatues),GymStatues - db $FF -CinnabarGymHiddenObjects: - db $0d,$11,$04 - dbw BANK(GymStatues),GymStatues - db $07,$0f,$01 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $01,$0a,$12 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $07,$09,$13 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $0d,$09,$14 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $0d,$01,$05 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $07,$01,$16 - db Bank(PrintCinnabarQuiz) - dw PrintCinnabarQuiz - db $FF -CinnabarPokecenterHiddenObjects: - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -SaffronGymHiddenObjects: - db $0f,$09,$04 - dbw BANK(GymStatues),GymStatues - db $FF -MtMoonPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -RockTunnelPokecenterHiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -ViridianForestHiddenObjects: - db $12,$01,POTION - dbw BANK(HiddenItems),HiddenItems - db $2a,$10,ANTIDOTE - dbw BANK(HiddenItems),HiddenItems - db $FF -MtMoon3HiddenObjects: - db $0c,$12,MOON_STONE - dbw BANK(HiddenItems),HiddenItems - db $09,$21,ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -IndigoPlateauHiddenObjects: - db $0d,$08,$ff - db BANK(PrintIndigoPlateauHQText) - dw PrintIndigoPlateauHQText - db $0d,$0b,$00 - db BANK(PrintIndigoPlateauHQText) - dw PrintIndigoPlateauHQText - db $FF -Route25HiddenObjects: - db $03,$26,ETHER - dbw BANK(HiddenItems),HiddenItems - db $01,$0a,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -Route9HiddenObjects: - db $07,$0e,ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -SSAnne6HiddenObjects: - db $05,$0d,$00 - dbw BANK(PrintTrashText), PrintTrashText - db $07,$0d,$00 - dbw BANK(PrintTrashText), PrintTrashText - db $09,$0d,GREAT_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF -SSAnne10HiddenObjects: - db $01,$03,HYPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -Route10HiddenObjects: - db $11,$09,SUPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $35,$10,MAX_ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -RocketHideout1HiddenObjects: - db $0f,$15,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $FF -RocketHideout3HiddenObjects: - db $11,$1b,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -RocketHideout4HiddenObjects: - db $01,$19,SUPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -SaffronPokecenterHiddenObjects: - db $04,$00,$04 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -PokemonTower5HiddenObjects: - db $0c,$04,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -Route13HiddenObjects: - db $0e,$01,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $0d,$10,CALCIUM - dbw BANK(HiddenItems),HiddenItems - db $FF -SafariZoneEntranceHiddenObjects: - db $01,$0a,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -SafariZoneWestHiddenObjects: - db $05,$06,REVIVE - dbw BANK(HiddenItems),HiddenItems - db $FF -SilphCo5FHiddenObjects: - db $03,$0c,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -SilphCo9FHiddenObjects: - db $0f,$02,MAX_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -CopycatsHouse2FHiddenObjects: - db $01,$01,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -UnknownDungeon1HiddenObjects: - db $0b,$0e,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $FF -UnknownDungeon3HiddenObjects: - db $03,$1b,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF -PowerPlantHiddenObjects: - db $10,$11,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $01,$0c,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $FF -SeafoamIslands3HiddenObjects: - db $0f,$0f,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $FF -SeafoamIslands5HiddenObjects: - db $11,$19,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF -Mansion1HiddenObjects: - db $10,$08,MOON_STONE - dbw BANK(HiddenItems),HiddenItems - db $05,$02,$04 - db BANK(Mansion1Script_Switches) - dw Mansion1Script_Switches - db $FF -Mansion2HiddenObjects: - db $0b,$02,$04 - db BANK(Mansion2Script_Switches) - dw Mansion2Script_Switches - db $FF -Mansion3HiddenObjects: - db $09,$01,MAX_REVIVE - dbw BANK(HiddenItems),HiddenItems - db $05,$0a,$04 - db BANK(Mansion3Script_Switches) - dw Mansion3Script_Switches - db $FF -Mansion4HiddenObjects: - db $09,$01,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $03,$14,$04 - db BANK(Mansion4Script_Switches) - dw Mansion4Script_Switches - db $19,$12,$04 - db BANK(Mansion4Script_Switches) - dw Mansion4Script_Switches - db $FF -Route23HiddenObjects: - db $2c,$09,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $46,$13,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $5a,$08,MAX_ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -VictoryRoad2HiddenObjects: - db $02,$05,ULTRA_BALL - dbw BANK(HiddenItems),HiddenItems - db $07,$1a,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $FF -Unused6FHiddenObjects: - db $0b,$0e,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -BillsHouseHiddenObjects: - db $04,$01,$04 - dbw BANK(BillsHousePC), BillsHousePC - db $FF -ViridianCityHiddenObjects: - db $04,$0e,POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -SafariZoneRestHouse2HiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -SafariZoneRestHouse3HiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -SafariZoneRestHouse4HiddenObjects: - db $04,$00,$08 - db Bank(PrintBenchGuyText) - dw PrintBenchGuyText - db $03,$0d,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -Route15GateUpstairsHiddenObjects: - db $02,$01,$04 - db BANK(Route15GateLeftBinoculars) - dw Route15GateLeftBinoculars - db $FF -LavenderHouse1HiddenObjects: - db $01,$00,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText - db $01,$01,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText - db $01,$07,$00 - db BANK(PrintMagazinesText) - dw PrintMagazinesText - db $FF -CeladonMansion5HiddenObjects: - db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText - db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1 - db BANK(PrintBlackboardLinkCableText) - dw PrintBlackboardLinkCableText - db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1 - db Bank(PrintNotebookText) - dw PrintNotebookText - db $FF -FightingDojoHiddenObjects: - db $09,$03,$04 - db BANK(PrintFightingDojoText) - dw PrintFightingDojoText - db $09,$06,$04 - db BANK(PrintFightingDojoText) - dw PrintFightingDojoText - db $00,$04,$04 - db BANK(PrintFightingDojoText2) - dw PrintFightingDojoText2 - db $00,$05,$04 - db BANK(PrintFightingDojoText3) - dw PrintFightingDojoText3 - db $FF -IndigoPlateauLobbyHiddenObjects: - db $07,$0f,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -CinnabarLab4HiddenObjects: - db $04,$00,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $04,$02,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -BikeShopHiddenObjects: - db $00,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $01,$02,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $02,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $02,$03,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $04,$00,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $05,$01,$d0 - dbw BANK(PrintNewBikeText), PrintNewBikeText - db $FF -Route11HiddenObjects: - db $05,$30,ESCAPE_ROPE - dbw BANK(HiddenItems),HiddenItems - db $FF -Route12HiddenObjects: - db $3f,$02,HYPER_POTION - dbw BANK(HiddenItems),HiddenItems - db $FF -SilphCo11FHiddenObjects: - db $0c,$0a,$04 - db BANK(OpenPokemonCenterPC) - dw OpenPokemonCenterPC - db $FF -Route17HiddenObjects: - db $0e,$0f,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $2d,$08,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $48,$11,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $5b,$04,MAX_REVIVE - dbw BANK(HiddenItems),HiddenItems - db $79,$08,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -UndergroundPathNsHiddenObjects: - db $04,$03,FULL_RESTORE - dbw BANK(HiddenItems),HiddenItems - db $22,$04,X_SPECIAL - dbw BANK(HiddenItems),HiddenItems - db $FF -UndergroundPathWeHiddenObjects: - db $02,$0c,NUGGET - dbw BANK(HiddenItems),HiddenItems - db $05,$15,ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -CeladonCityHiddenObjects: - db $0f,$30,PP_UP - dbw BANK(HiddenItems),HiddenItems - db $FF -SeafoamIslands4HiddenObjects: - db $10,$09,MAX_ELIXER - dbw BANK(HiddenItems),HiddenItems - db $FF -VermilionCityHiddenObjects: - db $0b,$0e,MAX_ETHER - dbw BANK(HiddenItems),HiddenItems - db $FF -CeruleanCityHiddenObjects: - db $08,$0f,RARE_CANDY - dbw BANK(HiddenItems),HiddenItems - db $FF -Route4HiddenObjects: - db $03,$28,GREAT_BALL - dbw BANK(HiddenItems),HiddenItems - db $FF diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm deleted file mode 100755 index 7f4593ca..00000000 --- a/data/hide_show_data.asm +++ /dev/null @@ -1,577 +0,0 @@ -; data for default hidden/shown -; objects for each map ($00-$F8) - -; Table of 2-Byte pointers, one pointer per map, -; goes up to Map_F7, ends with $FFFF. -; points to table listing all missable object in the area -MapHSPointers: - dw MapHS00 - dw MapHS01 - dw MapHS02 - dw MapHS03 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS0A - dw MapHSXX - dw MapHSXX - dw MapHS0D - dw MapHSXX - dw MapHS0F - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS14 - dw MapHSXX - dw MapHSXX - dw MapHS17 - dw MapHSXX - dw MapHSXX - dw MapHS1A - dw MapHS1B - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS21 - dw MapHSXX - dw MapHS23 - dw MapHS24 - dw MapHSXX - dw MapHSXX - dw MapHS27 - dw MapHS28 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS2D - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS33 - dw MapHS34 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS3B - dw MapHSXX - dw MapHS3D - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS53 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS58 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS60 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS66 - dw MapHS67 - dw MapHS68 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS6C - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS78 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS84 - dw MapHSXX - dw MapHSXX - dw MapHS87 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS8F - dw MapHS90 - dw MapHS91 - dw MapHS92 - dw MapHS93 - dw MapHS94 - dw MapHS95 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS9B - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHS9F - dw MapHSA0 - dw MapHSA1 - dw MapHSA2 - dw MapHSXX - dw MapHSXX - dw MapHSA5 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSB1 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSB5 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSC0 - dw MapHSXX - dw MapHSC2 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSC6 - dw MapHSC7 - dw MapHSC8 - dw MapHSC9 - dw MapHSCA - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSCF - dw MapHSD0 - dw MapHSD1 - dw MapHSD2 - dw MapHSD3 - dw MapHSD4 - dw MapHSD5 - dw MapHSD6 - dw MapHSD7 - dw MapHSD8 - dw MapHSD9 - dw MapHSDA - dw MapHSDB - dw MapHSDC - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSE2 - dw MapHSE3 - dw MapHSE4 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSE9 - dw MapHSEA - dw MapHSEB - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw MapHSF4 - dw MapHSXX - dw MapHSXX - dw MapHSXX - dw $FFFF - -; Structure: -; 3 bytes per object -; [Map_ID][Object_ID][H/S] -; -; Program stops reading when either: -; a) Map_ID = $FF -; b) Map_ID ≠ currentMapID -; -; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList) - -; These constants come from the bytes for Predef functions: -Hide equ $11 -Show equ $15 - -MapHSXX: - db $FF,$FF,$FF -MapHS00: - db PALLET_TOWN,$01,Hide -MapHS01: - db VIRIDIAN_CITY,$05,Show - db VIRIDIAN_CITY,$07,Hide -MapHS02: - db PEWTER_CITY,$03,Show - db PEWTER_CITY,$05,Show -MapHS03: - db CERULEAN_CITY,$01,Hide - db CERULEAN_CITY,$02,Show - db CERULEAN_CITY,$06,Hide - db CERULEAN_CITY,$0A,Show - db CERULEAN_CITY,$0B,Show -MapHS0A: - db SAFFRON_CITY,$01,Show - db SAFFRON_CITY,$02,Show - db SAFFRON_CITY,$03,Show - db SAFFRON_CITY,$04,Show - db SAFFRON_CITY,$05,Show - db SAFFRON_CITY,$06,Show - db SAFFRON_CITY,$07,Show - db SAFFRON_CITY,$08,Hide - db SAFFRON_CITY,$09,Hide - db SAFFRON_CITY,$0A,Hide - db SAFFRON_CITY,$0B,Hide - db SAFFRON_CITY,$0C,Hide - db SAFFRON_CITY,$0D,Hide - db SAFFRON_CITY,$0E,Show - db SAFFRON_CITY,$0F,Hide -MapHS0D: - db ROUTE_2,$01,Show - db ROUTE_2,$02,Show -MapHS0F: - db ROUTE_4,$03,Show -MapHS14: - db ROUTE_9,$0A,Show -MapHS17: - db ROUTE_12,$01,Show - db ROUTE_12,$09,Show - db ROUTE_12,$0A,Show -MapHS1A: - db ROUTE_15,$0B,Show -MapHS1B: - db ROUTE_16,$07,Show -MapHS21: - db ROUTE_22,$01,Hide - db ROUTE_22,$02,Hide -MapHS23: - db ROUTE_24,$01,Show - db ROUTE_24,$08,Show -MapHS24: - db ROUTE_25,$0A,Show -MapHS27: - db BLUES_HOUSE,$01,Show - db BLUES_HOUSE,$02,Hide - db BLUES_HOUSE,$03,Show -MapHS28: - db OAKS_LAB,$01,Show - db OAKS_LAB,$02,Show - db OAKS_LAB,$03,Show - db OAKS_LAB,$04,Show - db OAKS_LAB,$05,Hide - db OAKS_LAB,$06,Show - db OAKS_LAB,$07,Show - db OAKS_LAB,$08,Hide -MapHS2D: - db VIRIDIAN_GYM,$01,Show - db VIRIDIAN_GYM,$0B,Show -MapHS34: - db MUSEUM_1F,$05,Show -MapHSE4: - db CERULEAN_CAVE_1F,$01,Show - db CERULEAN_CAVE_1F,$02,Show - db CERULEAN_CAVE_1F,$03,Show -MapHS8F: - db POKEMON_TOWER_2F,$01,Show -MapHS90: - db POKEMON_TOWER_3F,$04,Show -MapHS91: - db POKEMON_TOWER_4F,$04,Show - db POKEMON_TOWER_4F,$05,Show - db POKEMON_TOWER_4F,$06,Show -MapHS92: - db POKEMON_TOWER_5F,$06,Show -MapHS93: - db POKEMON_TOWER_6F,$04,Show - db POKEMON_TOWER_6F,$05,Show -MapHS94: - db POKEMON_TOWER_7F,$01,Show - db POKEMON_TOWER_7F,$02,Show - db POKEMON_TOWER_7F,$03,Show - db POKEMON_TOWER_7F,$04,Show -MapHS95: - db MR_FUJIS_HOUSE,$05,Hide -MapHS84: - db CELADON_MANSION_ROOF_HOUSE,$02,Show -MapHS87: - db GAME_CORNER,$0B,Show -MapHS9B: - db WARDENS_HOUSE,$02,Show -MapHSA5: - db POKEMON_MANSION_1F,$02,Show - db POKEMON_MANSION_1F,$03,Show -MapHSB1: - db FIGHTING_DOJO,$06,Show - db FIGHTING_DOJO,$07,Show -MapHSB5: - db SILPH_CO_1F,$01,Hide -MapHS53: - db POWER_PLANT,$01,Show - db POWER_PLANT,$02,Show - db POWER_PLANT,$03,Show - db POWER_PLANT,$04,Show - db POWER_PLANT,$05,Show - db POWER_PLANT,$06,Show - db POWER_PLANT,$07,Show - db POWER_PLANT,$08,Show - db POWER_PLANT,$09,Show - db POWER_PLANT,$0A,Show - db POWER_PLANT,$0B,Show - db POWER_PLANT,$0C,Show - db POWER_PLANT,$0D,Show - db POWER_PLANT,$0E,Show -MapHSC2: - db VICTORY_ROAD_2F,$06,Show - db VICTORY_ROAD_2F,$07,Show - db VICTORY_ROAD_2F,$08,Show - db VICTORY_ROAD_2F,$09,Show - db VICTORY_ROAD_2F,$0A,Show - db VICTORY_ROAD_2F,$0D,Show -MapHS58: - db BILLS_HOUSE,$01,Show - db BILLS_HOUSE,$02,Hide - db BILLS_HOUSE,$03,Hide -MapHS33: - db VIRIDIAN_FOREST,$05,Show - db VIRIDIAN_FOREST,$06,Show - db VIRIDIAN_FOREST,$07,Show -MapHS3B: - db MT_MOON_1F,$08,Show - db MT_MOON_1F,$09,Show - db MT_MOON_1F,$0A,Show - db MT_MOON_1F,$0B,Show - db MT_MOON_1F,$0C,Show - db MT_MOON_1F,$0D,Show -MapHS3D: - db MT_MOON_B2F,$06,Show - db MT_MOON_B2F,$07,Show - db MT_MOON_B2F,$08,Show - db MT_MOON_B2F,$09,Show -MapHS60: - db SS_ANNE_2F,$02,Hide -MapHS66: - db SS_ANNE_1F_ROOMS,$0A,Show -MapHS67: - db SS_ANNE_2F_ROOMS,$06,Show - db SS_ANNE_2F_ROOMS,$09,Show -MapHS68: - db SS_ANNE_B1F_ROOMS,$09,Show - db SS_ANNE_B1F_ROOMS,$0A,Show - db SS_ANNE_B1F_ROOMS,$0B,Show -MapHSC6: - db VICTORY_ROAD_3F,$05,Show - db VICTORY_ROAD_3F,$06,Show - db VICTORY_ROAD_3F,$0A,Show -MapHSC7: - db ROCKET_HIDEOUT_B1F,$06,Show - db ROCKET_HIDEOUT_B1F,$07,Show -MapHSC8: - db ROCKET_HIDEOUT_B2F,$02,Show - db ROCKET_HIDEOUT_B2F,$03,Show - db ROCKET_HIDEOUT_B2F,$04,Show - db ROCKET_HIDEOUT_B2F,$05,Show -MapHSC9: - db ROCKET_HIDEOUT_B3F,$03,Show - db ROCKET_HIDEOUT_B3F,$04,Show -MapHSCA: - db ROCKET_HIDEOUT_B4F,$01,Show - db ROCKET_HIDEOUT_B4F,$05,Show - db ROCKET_HIDEOUT_B4F,$06,Show - db ROCKET_HIDEOUT_B4F,$07,Show - db ROCKET_HIDEOUT_B4F,$08,Hide - db ROCKET_HIDEOUT_B4F,$09,Hide -MapHSCF: - db SILPH_CO_2F,$01,Show - db SILPH_CO_2F,$02,Show - db SILPH_CO_2F,$03,Show - db SILPH_CO_2F,$04,Show - db SILPH_CO_2F,$05,Show -MapHSD0: - db SILPH_CO_3F,$02,Show - db SILPH_CO_3F,$03,Show - db SILPH_CO_3F,$04,Show -MapHSD1: - db SILPH_CO_4F,$02,Show - db SILPH_CO_4F,$03,Show - db SILPH_CO_4F,$04,Show - db SILPH_CO_4F,$05,Show - db SILPH_CO_4F,$06,Show - db SILPH_CO_4F,$07,Show -MapHSD2: - db SILPH_CO_5F,$02,Show - db SILPH_CO_5F,$03,Show - db SILPH_CO_5F,$04,Show - db SILPH_CO_5F,$05,Show - db SILPH_CO_5F,$06,Show - db SILPH_CO_5F,$07,Show - db SILPH_CO_5F,$08,Show -MapHSD3: - db SILPH_CO_6F,$06,Show - db SILPH_CO_6F,$07,Show - db SILPH_CO_6F,$08,Show - db SILPH_CO_6F,$09,Show - db SILPH_CO_6F,$0A,Show -MapHSD4: - db SILPH_CO_7F,$05,Show - db SILPH_CO_7F,$06,Show - db SILPH_CO_7F,$07,Show - db SILPH_CO_7F,$08,Show - db SILPH_CO_7F,$09,Show - db SILPH_CO_7F,$0A,Show - db SILPH_CO_7F,$0B,Show - db SILPH_CO_7F,$0C,Show -MapHSD5: - db SILPH_CO_8F,$02,Show - db SILPH_CO_8F,$03,Show - db SILPH_CO_8F,$04,Show -MapHSE9: - db SILPH_CO_9F,$02,Show - db SILPH_CO_9F,$03,Show - db SILPH_CO_9F,$04,Show -MapHSEA: - db SILPH_CO_10F,$01,Show - db SILPH_CO_10F,$02,Show - db SILPH_CO_10F,$03,Show - db SILPH_CO_10F,$04,Show - db SILPH_CO_10F,$05,Show - db SILPH_CO_10F,$06,Show -MapHSEB: - db SILPH_CO_11F,$03,Show - db SILPH_CO_11F,$04,Show - db SILPH_CO_11F,$05,Show -MapHSF4: - db UNUSED_MAP_F4,$02,Show -MapHSD6: - db POKEMON_MANSION_2F,$02,Show -MapHSD7: - db POKEMON_MANSION_3F,$03,Show - db POKEMON_MANSION_3F,$04,Show -MapHSD8: - db POKEMON_MANSION_B1F,$03,Show - db POKEMON_MANSION_B1F,$04,Show - db POKEMON_MANSION_B1F,$05,Show - db POKEMON_MANSION_B1F,$06,Show - db POKEMON_MANSION_B1F,$08,Show -MapHSD9: - db SAFARI_ZONE_EAST,$01,Show - db SAFARI_ZONE_EAST,$02,Show - db SAFARI_ZONE_EAST,$03,Show - db SAFARI_ZONE_EAST,$04,Show -MapHSDA: - db SAFARI_ZONE_NORTH,$01,Show - db SAFARI_ZONE_NORTH,$02,Show -MapHSDB: - db SAFARI_ZONE_WEST,$01,Show - db SAFARI_ZONE_WEST,$02,Show - db SAFARI_ZONE_WEST,$03,Show - db SAFARI_ZONE_WEST,$04,Show -MapHSDC: - db SAFARI_ZONE_CENTER,$01,Show -MapHSE2: - db CERULEAN_CAVE_2F,$01,Show - db CERULEAN_CAVE_2F,$02,Show - db CERULEAN_CAVE_2F,$03,Show -MapHSE3: - db CERULEAN_CAVE_B1F,$01,Show - db CERULEAN_CAVE_B1F,$02,Show - db CERULEAN_CAVE_B1F,$03,Show -MapHS6C: - db VICTORY_ROAD_1F,$03,Show - db VICTORY_ROAD_1F,$04,Show -MapHS78: - db CHAMPIONS_ROOM,$02,Hide -MapHSC0: - db SEAFOAM_ISLANDS_1F,$01,Show - db SEAFOAM_ISLANDS_1F,$02,Show -MapHS9F: - db SEAFOAM_ISLANDS_B1F,$01,Hide - db SEAFOAM_ISLANDS_B1F,$02,Hide -MapHSA0: - db SEAFOAM_ISLANDS_B2F,$01,Hide - db SEAFOAM_ISLANDS_B2F,$02,Hide -MapHSA1: - db SEAFOAM_ISLANDS_B3F,$02,Show - db SEAFOAM_ISLANDS_B3F,$03,Show - db SEAFOAM_ISLANDS_B3F,$05,Hide - db SEAFOAM_ISLANDS_B3F,$06,Hide -MapHSA2: - db SEAFOAM_ISLANDS_B4F,$01,Hide - db SEAFOAM_ISLANDS_B4F,$02,Hide - db SEAFOAM_ISLANDS_B4F,$03,Show - - db $FF,$01,Show diff --git a/data/icon_pointers.asm b/data/icon_pointers.asm new file mode 100644 index 00000000..79db936e --- /dev/null +++ b/data/icon_pointers.asm @@ -0,0 +1,37 @@ +mon_icon_header: MACRO + dw \1 tile \2 + db \3 + db BANK(\1) + dw vSprites tile (\4) +ENDM + +MonPartySpritePointers: + ; gfx pointer, gfx tile offset, # tiles, vSprites tile offset + mon_icon_header MonsterSprite, 12, 4, ICON_MON << 2 + mon_icon_header PokeBallSprite, 0, 8, ICON_BALL << 2 + mon_icon_header FairySprite, 12, 4, ICON_FAIRY << 2 + mon_icon_header BirdSprite, 12, 4, ICON_BIRD << 2 + mon_icon_header SeelSprite, 0, 4, ICON_WATER << 2 + mon_icon_header BugIconFrame2, 0, 1, ICON_BUG << 2 + mon_icon_header BugIconFrame2, 1, 1, ICON_BUG << 2 + 2 + mon_icon_header PlantIconFrame2, 0, 1, ICON_GRASS << 2 + mon_icon_header PlantIconFrame2, 1, 1, ICON_GRASS << 2 + 2 + mon_icon_header SnakeIconFrame1, 0, 1, ICON_SNAKE << 2 + mon_icon_header SnakeIconFrame1, 1, 1, ICON_SNAKE << 2 + 2 + mon_icon_header QuadrupedIconFrame1, 0, 1, ICON_QUADRUPED << 2 + mon_icon_header QuadrupedIconFrame1, 1, 1, ICON_QUADRUPED << 2 + 2 + mon_icon_header TradeBubbleIconGFX, 0, 4, ICON_TRADEBUBBLE << 2 + mon_icon_header MonsterSprite, 0, 4, ICONOFFSET + ICON_MON << 2 + mon_icon_header PokeBallSprite, 0, 8, ICONOFFSET + ICON_BALL << 2 + mon_icon_header FairySprite, 0, 4, ICONOFFSET + ICON_FAIRY << 2 + mon_icon_header BirdSprite, 0, 4, ICONOFFSET + ICON_BIRD << 2 + mon_icon_header SeelSprite, 12, 4, ICONOFFSET + ICON_WATER << 2 + mon_icon_header BugIconFrame1, 0, 1, ICONOFFSET + ICON_BUG << 2 + mon_icon_header BugIconFrame1, 1, 1, ICONOFFSET + ICON_BUG << 2 + 2 + mon_icon_header PlantIconFrame1, 0, 1, ICONOFFSET + ICON_GRASS << 2 + mon_icon_header PlantIconFrame1, 1, 1, ICONOFFSET + ICON_GRASS << 2 + 2 + mon_icon_header SnakeIconFrame2, 0, 1, ICONOFFSET + ICON_SNAKE << 2 + mon_icon_header SnakeIconFrame2, 1, 1, ICONOFFSET + ICON_SNAKE << 2 + 2 + mon_icon_header QuadrupedIconFrame2, 0, 1, ICONOFFSET + ICON_QUADRUPED << 2 + mon_icon_header QuadrupedIconFrame2, 1, 1, ICONOFFSET + ICON_QUADRUPED << 2 + 2 + mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2 diff --git a/data/item_prices.asm b/data/item_prices.asm deleted file mode 100755 index 15a1bd34..00000000 --- a/data/item_prices.asm +++ /dev/null @@ -1,98 +0,0 @@ -ItemPrices: - money 0 ; MASTER_BALL - money 1200 ; ULTRA_BALL - money 600 ; GREAT_BALL - money 200 ; POKE_BALL - money 0 ; TOWN_MAP - money 0 ; BICYCLE - money 0 ; SURFBOARD - money 1000 ; SAFARI_BALL - money 0 ; POKEDEX - money 0 ; MOON_STONE - money 100 ; ANTIDOTE - money 250 ; BURN_HEAL - money 250 ; ICE_HEAL - money 200 ; AWAKENING - money 200 ; PARLYZ_HEAL - money 3000 ; FULL_RESTORE - money 2500 ; MAX_POTION - money 1500 ; HYPER_POTION - money 700 ; SUPER_POTION - money 300 ; POTION - money 0 ; BOULDERBADGE - money 0 ; CASCADEBADGE - money 0 ; THUNDERBADGE - money 0 ; RAINBOWBADGE - money 0 ; SOULBADGE - money 0 ; MARSHBADGE - money 0 ; VOLCANOBADGE - money 0 ; EARTHBADGE - money 550 ; ESCAPE_ROPE - money 350 ; REPEL - money 0 ; OLD_AMBER - money 2100 ; FIRE_STONE - money 2100 ; THUNDER_STONE - money 2100 ; WATER_STONE - money 9800 ; HP_UP - money 9800 ; PROTEIN - money 9800 ; IRON - money 9800 ; CARBOS - money 9800 ; CALCIUM - money 4800 ; RARE_CANDY - money 0 ; DOME_FOSSIL - money 0 ; HELIX_FOSSIL - money 0 ; SECRET_KEY - money 0 ; XXX - money 0 ; BIKE_VOUCHER - money 950 ; X_ACCURACY - money 2100 ; LEAF_STONE - money 0 ; CARD_KEY - money 10000 ; NUGGET - money 9800 ; XXX PP_UP - money 1000 ; POKE_DOLL - money 600 ; FULL_HEAL - money 1500 ; REVIVE - money 4000 ; MAX_REVIVE - money 700 ; GUARD_SPEC - money 500 ; SUPER_REPEL - money 700 ; MAX_REPEL - money 650 ; DIRE_HIT - money 10 ; COIN - money 200 ; FRESH_WATER - money 300 ; SODA_POP - money 350 ; LEMONADE - money 0 ; S_S_TICKET - money 0 ; GOLD_TEETH - money 500 ; X_ATTACK - money 550 ; X_DEFEND - money 350 ; X_SPEED - money 350 ; X_SPECIAL - money 0 ; COIN_CASE - money 0 ; OAKS_PARCEL - money 0 ; ITEMFINDER - money 0 ; SILPH_SCOPE - money 0 ; POKE_FLUTE - money 0 ; LIFT_KEY - money 0 ; EXP_ALL - money 0 ; OLD_ROD - money 0 ; GOOD_ROD - money 0 ; SUPER_ROD - money 0 ; PP_UP - money 0 ; ETHER - money 0 ; MAX_ETHER - money 0 ; ELIXER - money 0 ; MAX_ELIXER - money 0 ; FLOOR_B2F - money 0 ; FLOOR_B1F - money 0 ; FLOOR_1F - money 0 ; FLOOR_2F - money 0 ; FLOOR_3F - money 0 ; FLOOR_4F - money 0 ; FLOOR_5F - money 0 ; FLOOR_6F - money 0 ; FLOOR_7F - money 0 ; FLOOR_8F - money 0 ; FLOOR_9F - money 0 ; FLOOR_10F - money 0 ; FLOOR_11F - money 0 ; FLOOR_B4F diff --git a/data/items/guard_drink_items.asm b/data/items/guard_drink_items.asm new file mode 100644 index 00000000..e76d1f77 --- /dev/null +++ b/data/items/guard_drink_items.asm @@ -0,0 +1,5 @@ +GuardDrinksList: + db FRESH_WATER + db SODA_POP + db LEMONADE + db 0 ; end diff --git a/data/items/key_items.asm b/data/items/key_items.asm new file mode 100644 index 00000000..aca8cf81 --- /dev/null +++ b/data/items/key_items.asm @@ -0,0 +1,103 @@ +key_item_bits: MACRO +_bit = 0 +_byte = 0 +REPT _NARG +_byte = _byte | ((\1) << _bit) +_bit = _bit + 1 +IF _bit == 8 + db _byte +_byte = 0 +_bit = 0 +ENDC +SHIFT +ENDR +IF _bit > 0 + db _byte +ENDC +ENDM + +KeyItemBitfield: + key_item_bits \ + FALSE, \ ; MASTER_BALL + FALSE, \ ; ULTRA_BALL + FALSE, \ ; GREAT_BALL + FALSE, \ ; POKE_BALL + TRUE, \ ; TOWN_MAP + TRUE, \ ; BICYCLE + TRUE, \ ; SURFBOARD + TRUE, \ ; SAFARI_BALL + TRUE, \ ; POKEDEX + FALSE, \ ; MOON_STONE + FALSE, \ ; ANTIDOTE + FALSE, \ ; BURN_HEAL + FALSE, \ ; ICE_HEAL + FALSE, \ ; AWAKENING + FALSE, \ ; PARLYZ_HEAL + FALSE, \ ; FULL_RESTORE + FALSE, \ ; MAX_POTION + FALSE, \ ; HYPER_POTION + FALSE, \ ; SUPER_POTION + FALSE, \ ; POTION + TRUE, \ ; BOULDERBADGE + TRUE, \ ; CASCADEBADGE + TRUE, \ ; THUNDERBADGE + TRUE, \ ; RAINBOWBADGE + TRUE, \ ; SOULBADGE + TRUE, \ ; MARSHBADGE + TRUE, \ ; VOLCANOBADGE + TRUE, \ ; EARTHBADGE + FALSE, \ ; ESCAPE_ROPE + FALSE, \ ; REPEL + TRUE, \ ; OLD_AMBER + FALSE, \ ; FIRE_STONE + FALSE, \ ; THUNDER_STONE + FALSE, \ ; WATER_STONE + FALSE, \ ; HP_UP + FALSE, \ ; PROTEIN + FALSE, \ ; IRON + FALSE, \ ; CARBOS + FALSE, \ ; CALCIUM + FALSE, \ ; RARE_CANDY + TRUE, \ ; DOME_FOSSIL + TRUE, \ ; HELIX_FOSSIL + TRUE, \ ; SECRET_KEY + TRUE, \ ; UNUSED_ITEM + TRUE, \ ; BIKE_VOUCHER + FALSE, \ ; X_ACCURACY + FALSE, \ ; LEAF_STONE + TRUE, \ ; CARD_KEY + FALSE, \ ; NUGGET + FALSE, \ ; PP_UP_2 + FALSE, \ ; POKE_DOLL + FALSE, \ ; FULL_HEAL + FALSE, \ ; REVIVE + FALSE, \ ; MAX_REVIVE + FALSE, \ ; GUARD_SPEC + FALSE, \ ; SUPER_REPEL + FALSE, \ ; MAX_REPEL + FALSE, \ ; DIRE_HIT + FALSE, \ ; COIN + FALSE, \ ; FRESH_WATER + FALSE, \ ; SODA_POP + FALSE, \ ; LEMONADE + TRUE, \ ; S_S_TICKET + TRUE, \ ; GOLD_TEETH + FALSE, \ ; X_ATTACK + FALSE, \ ; X_DEFEND + FALSE, \ ; X_SPEED + FALSE, \ ; X_SPECIAL + TRUE, \ ; COIN_CASE + TRUE, \ ; OAKS_PARCEL + TRUE, \ ; ITEMFINDER + TRUE, \ ; SILPH_SCOPE + TRUE, \ ; POKE_FLUTE + TRUE, \ ; LIFT_KEY + FALSE, \ ; EXP_ALL + TRUE, \ ; OLD_ROD + TRUE, \ ; GOOD_ROD + TRUE, \ ; SUPER_ROD + FALSE, \ ; PP_UP + FALSE, \ ; ETHER + FALSE, \ ; MAX_ETHER + FALSE, \ ; ELIXER + FALSE ; MAX_ELIXER diff --git a/data/items/marts.asm b/data/items/marts.asm new file mode 100644 index 00000000..80d62931 --- /dev/null +++ b/data/items/marts.asm @@ -0,0 +1,64 @@ +; mart inventories are below +; they are texts + +; Viridian +ViridianCashierText:: + script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL + +; Pewter +PewterCashierText:: + script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL + +; Cerulean +CeruleanCashierText:: + script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL + +; Bike shop + script_mart BICYCLE + +; Vermilion +VermilionCashierText:: + script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL + +; Lavender +LavenderCashierText:: + script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL + +; Celadon Dept. Store 2F (1) +CeladonMart2Clerk1Text:: + script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL + +; Celadon Dept. Store 2F (2) +CeladonMart2Clerk2Text:: + script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION + +; Celadon Dept. Store 4F +CeladonMart4ClerkText:: + script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE + +; Celadon Dept. Store 5F (1) +CeladonMart5Clerk1Text:: + script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL + +; Celadon Dept. Store 5F (2) +CeladonMart5Clerk2Text:: + script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM + +; Fuchsia +FuchsiaCashierText:: + script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL + +; unused? + script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE + +; Cinnabar +CinnabarCashierText:: + script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE + +; Saffron +SaffronCashierText:: + script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE + +; Indigo +IndigoCashierText:: + script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL diff --git a/data/items/names.asm b/data/items/names.asm new file mode 100644 index 00000000..0c07fe5d --- /dev/null +++ b/data/items/names.asm @@ -0,0 +1,98 @@ +ItemNames:: + db "MASTER BALL@" + db "ULTRA BALL@" + db "GREAT BALL@" + db "POKé BALL@" + db "TOWN MAP@" + db "BICYCLE@" + db "?????@" + db "SAFARI BALL@" + db "POKéDEX@" + db "MOON STONE@" + db "ANTIDOTE@" + db "BURN HEAL@" + db "ICE HEAL@" + db "AWAKENING@" + db "PARLYZ HEAL@" + db "FULL RESTORE@" + db "MAX POTION@" + db "HYPER POTION@" + db "SUPER POTION@" + db "POTION@" + db "BOULDERBADGE@" + db "CASCADEBADGE@" + db "THUNDERBADGE@" + db "RAINBOWBADGE@" + db "SOULBADGE@" + db "MARSHBADGE@" + db "VOLCANOBADGE@" + db "EARTHBADGE@" + db "ESCAPE ROPE@" + db "REPEL@" + db "OLD AMBER@" + db "FIRE STONE@" + db "THUNDERSTONE@" + db "WATER STONE@" + db "HP UP@" + db "PROTEIN@" + db "IRON@" + db "CARBOS@" + db "CALCIUM@" + db "RARE CANDY@" + db "DOME FOSSIL@" + db "HELIX FOSSIL@" + db "SECRET KEY@" + db "?????@" + db "BIKE VOUCHER@" + db "X ACCURACY@" + db "LEAF STONE@" + db "CARD KEY@" + db "NUGGET@" + db "PP UP@" + db "POKé DOLL@" + db "FULL HEAL@" + db "REVIVE@" + db "MAX REVIVE@" + db "GUARD SPEC.@" + db "SUPER REPEL@" + db "MAX REPEL@" + db "DIRE HIT@" + db "COIN@" + db "FRESH WATER@" + db "SODA POP@" + db "LEMONADE@" + db "S.S.TICKET@" + db "GOLD TEETH@" + db "X ATTACK@" + db "X DEFEND@" + db "X SPEED@" + db "X SPECIAL@" + db "COIN CASE@" + db "OAK's PARCEL@" + db "ITEMFINDER@" + db "SILPH SCOPE@" + db "POKé FLUTE@" + db "LIFT KEY@" + db "EXP.ALL@" + db "OLD ROD@" + db "GOOD ROD@" + db "SUPER ROD@" + db "PP UP@" + db "ETHER@" + db "MAX ETHER@" + db "ELIXER@" + db "MAX ELIXER@" + db "B2F@" + db "B1F@" + db "1F@" + db "2F@" + db "3F@" + db "4F@" + db "5F@" + db "6F@" + db "7F@" + db "8F@" + db "9F@" + db "10F@" + db "11F@" + db "B4F@" diff --git a/data/items/prices.asm b/data/items/prices.asm new file mode 100644 index 00000000..f3d8f76b --- /dev/null +++ b/data/items/prices.asm @@ -0,0 +1,98 @@ +ItemPrices:: + money 0 ; MASTER_BALL + money 1200 ; ULTRA_BALL + money 600 ; GREAT_BALL + money 200 ; POKE_BALL + money 0 ; TOWN_MAP + money 0 ; BICYCLE + money 0 ; SURFBOARD + money 1000 ; SAFARI_BALL + money 0 ; POKEDEX + money 0 ; MOON_STONE + money 100 ; ANTIDOTE + money 250 ; BURN_HEAL + money 250 ; ICE_HEAL + money 200 ; AWAKENING + money 200 ; PARLYZ_HEAL + money 3000 ; FULL_RESTORE + money 2500 ; MAX_POTION + money 1500 ; HYPER_POTION + money 700 ; SUPER_POTION + money 300 ; POTION + money 0 ; BOULDERBADGE + money 0 ; CASCADEBADGE + money 0 ; THUNDERBADGE + money 0 ; RAINBOWBADGE + money 0 ; SOULBADGE + money 0 ; MARSHBADGE + money 0 ; VOLCANOBADGE + money 0 ; EARTHBADGE + money 550 ; ESCAPE_ROPE + money 350 ; REPEL + money 0 ; OLD_AMBER + money 2100 ; FIRE_STONE + money 2100 ; THUNDER_STONE + money 2100 ; WATER_STONE + money 9800 ; HP_UP + money 9800 ; PROTEIN + money 9800 ; IRON + money 9800 ; CARBOS + money 9800 ; CALCIUM + money 4800 ; RARE_CANDY + money 0 ; DOME_FOSSIL + money 0 ; HELIX_FOSSIL + money 0 ; SECRET_KEY + money 0 ; XXX + money 0 ; BIKE_VOUCHER + money 950 ; X_ACCURACY + money 2100 ; LEAF_STONE + money 0 ; CARD_KEY + money 10000 ; NUGGET + money 9800 ; XXX PP_UP + money 1000 ; POKE_DOLL + money 600 ; FULL_HEAL + money 1500 ; REVIVE + money 4000 ; MAX_REVIVE + money 700 ; GUARD_SPEC + money 500 ; SUPER_REPEL + money 700 ; MAX_REPEL + money 650 ; DIRE_HIT + money 10 ; COIN + money 200 ; FRESH_WATER + money 300 ; SODA_POP + money 350 ; LEMONADE + money 0 ; S_S_TICKET + money 0 ; GOLD_TEETH + money 500 ; X_ATTACK + money 550 ; X_DEFEND + money 350 ; X_SPEED + money 350 ; X_SPECIAL + money 0 ; COIN_CASE + money 0 ; OAKS_PARCEL + money 0 ; ITEMFINDER + money 0 ; SILPH_SCOPE + money 0 ; POKE_FLUTE + money 0 ; LIFT_KEY + money 0 ; EXP_ALL + money 0 ; OLD_ROD + money 0 ; GOOD_ROD + money 0 ; SUPER_ROD + money 0 ; PP_UP + money 0 ; ETHER + money 0 ; MAX_ETHER + money 0 ; ELIXER + money 0 ; MAX_ELIXER + money 0 ; FLOOR_B2F + money 0 ; FLOOR_B1F + money 0 ; FLOOR_1F + money 0 ; FLOOR_2F + money 0 ; FLOOR_3F + money 0 ; FLOOR_4F + money 0 ; FLOOR_5F + money 0 ; FLOOR_6F + money 0 ; FLOOR_7F + money 0 ; FLOOR_8F + money 0 ; FLOOR_9F + money 0 ; FLOOR_10F + money 0 ; FLOOR_11F + money 0 ; FLOOR_B4F diff --git a/data/items/tm_prices.asm b/data/items/tm_prices.asm new file mode 100644 index 00000000..7f007e9d --- /dev/null +++ b/data/items/tm_prices.asm @@ -0,0 +1,27 @@ +TechnicalMachinePrices: +; In thousands (nybbles). + dn 3, 2 ; TM01, TM02 + dn 2, 1 ; TM03, TM04 + dn 3, 4 ; TM05, TM06 + dn 2, 4 ; TM07, TM08 + dn 3, 4 ; TM09, TM10 + dn 2, 1 ; TM11, TM12 + dn 4, 5 ; TM13, TM14 + dn 5, 5 ; TM15, TM16 + dn 3, 2 ; TM17, TM18 + dn 3, 2 ; TM19, TM20 + dn 5, 5 ; TM21, TM22 + dn 5, 2 ; TM23, TM24 + dn 5, 4 ; TM25, TM26 + dn 5, 2 ; TM27, TM28 + dn 4, 1 ; TM29, TM30 + dn 2, 1 ; TM31, TM32 + dn 1, 2 ; TM33, TM34 + dn 4, 2 ; TM35, TM36 + dn 2, 5 ; TM37, TM38 + dn 2, 4 ; TM39, TM40 + dn 2, 2 ; TM41, TM42 + dn 5, 2 ; TM43, TM44 + dn 2, 4 ; TM45, TM46 + dn 3, 4 ; TM47, TM48 + dn 4, 2 ; TM49, TM50 diff --git a/data/items/use_overworld.asm b/data/items/use_overworld.asm new file mode 100644 index 00000000..5a2ba102 --- /dev/null +++ b/data/items/use_overworld.asm @@ -0,0 +1,9 @@ +; items which close the item menu when used +UsableItems_CloseMenu: + db ESCAPE_ROPE + db ITEMFINDER + db POKE_FLUTE + db OLD_ROD + db GOOD_ROD + db SUPER_ROD + db -1 ; end diff --git a/data/items/use_party.asm b/data/items/use_party.asm new file mode 100644 index 00000000..e8da68be --- /dev/null +++ b/data/items/use_party.asm @@ -0,0 +1,39 @@ +; items which bring up the party menu when used +UsableItems_PartyMenu: + db MOON_STONE + db ANTIDOTE + db BURN_HEAL + db ICE_HEAL + db AWAKENING + db PARLYZ_HEAL + db FULL_RESTORE + db MAX_POTION + db HYPER_POTION + db SUPER_POTION + db POTION + db FIRE_STONE + db THUNDER_STONE + db WATER_STONE + db HP_UP + db PROTEIN + db IRON + db CARBOS + db CALCIUM + db RARE_CANDY + db LEAF_STONE + db FULL_HEAL + db REVIVE + db MAX_REVIVE + db FRESH_WATER + db SODA_POP + db LEMONADE + db X_ATTACK + db X_DEFEND + db X_SPEED + db X_SPECIAL + db PP_UP + db ETHER + db MAX_ETHER + db ELIXER + db MAX_ELIXER + db -1 ; end diff --git a/data/items/vending_prices.asm b/data/items/vending_prices.asm new file mode 100644 index 00000000..131d525d --- /dev/null +++ b/data/items/vending_prices.asm @@ -0,0 +1,10 @@ +vend_item: MACRO + db \1 + money \2 +ENDM + +VendingPrices: + ; item id, price + vend_item FRESH_WATER, 200 + vend_item SODA_POP, 300 + vend_item LEMONADE, 350 diff --git a/data/key_items.asm b/data/key_items.asm deleted file mode 100755 index afa586af..00000000 --- a/data/key_items.asm +++ /dev/null @@ -1,12 +0,0 @@ -KeyItemBitfield: - db %11110000 - db %00000001 - db %11110000 - db %01001111 - db %00000000 - db %10011111 - db %00000000 - db %11000000 - db %11110000 - db %00111011 - db %00000000 diff --git a/data/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm deleted file mode 100755 index 73cd7291..00000000 --- a/data/mapHeaders/AgathasRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -AgathasRoom_h: - db CEMETERY ; tileset - db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x) - dw AgathasRoom_Blocks ; blocks - dw AgathasRoom_TextPointers ; texts - dw AgathasRoom_Script ; scripts - db 0 ; connections - dw AgathasRoom_Object ; objects diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm deleted file mode 100755 index c447fd80..00000000 --- a/data/mapHeaders/BikeShop.asm +++ /dev/null @@ -1,8 +0,0 @@ -BikeShop_h: - db CLUB ; tileset - db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x) - dw BikeShop_Blocks ; blocks - dw BikeShop_TextPointers ; texts - dw BikeShop_Script ; scripts - db 0 ; connections - dw BikeShop_Object ; objects diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm deleted file mode 100755 index bba9cf83..00000000 --- a/data/mapHeaders/BillsHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -BillsHouse_h: - db INTERIOR ; tileset - db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x) - dw BillsHouse_Blocks ; blocks - dw BillsHouse_TextPointers ; texts - dw BillsHouse_Script ; scripts - db 0 ; connections - dw BillsHouse_Object ; objects diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm deleted file mode 100755 index 6ef0433e..00000000 --- a/data/mapHeaders/BluesHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -BluesHouse_h: - db HOUSE ; tileset - db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x) - dw BluesHouse_Blocks ; blocks - dw BluesHouse_TextPointers ; texts - dw BluesHouse_Script ; scripts - db 0 ; connections - dw BluesHouse_Object ; objects diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm deleted file mode 100755 index 78c7989d..00000000 --- a/data/mapHeaders/BrunosRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -BrunosRoom_h: - db GYM ; tileset - db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x) - dw BrunosRoom_Blocks ; blocks - dw BrunosRoom_TextPointers ; texts - dw BrunosRoom_Script ; scripts - db 0 ; connections - dw BrunosRoom_Object ; objects diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm deleted file mode 100755 index a31c8121..00000000 --- a/data/mapHeaders/CeladonChiefHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonChiefHouse_h: - db MANSION ; tileset - db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x) - dw CeladonChiefHouse_Blocks ; blocks - dw CeladonChiefHouse_TextPointers ; texts - dw CeladonChiefHouse_Script ; scripts - db 0 ; connections - dw CeladonChiefHouse_Object ; objects diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm deleted file mode 100755 index 62243d27..00000000 --- a/data/mapHeaders/CeladonCity.asm +++ /dev/null @@ -1,10 +0,0 @@ -CeladonCity_h: - db OVERWORLD ; tileset - db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) - dw CeladonCity_Blocks ; blocks - dw CeladonCity_TextPointers ; texts - dw CeladonCity_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks - EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1 - dw CeladonCity_Object ; objects diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm deleted file mode 100755 index d4220db7..00000000 --- a/data/mapHeaders/CeladonDiner.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonDiner_h: - db LOBBY ; tileset - db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x) - dw CeladonDiner_Blocks ; blocks - dw CeladonDiner_TextPointers ; texts - dw CeladonDiner_Script ; scripts - db 0 ; connections - dw CeladonDiner_Object ; objects diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm deleted file mode 100755 index 04a9427c..00000000 --- a/data/mapHeaders/CeladonGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonGym_h: - db GYM ; tileset - db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x) - dw CeladonGym_Blocks ; blocks - dw CeladonGym_TextPointers ; texts - dw CeladonGym_Script ; scripts - db 0 ; connections - dw CeladonGym_Object ; objects diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm deleted file mode 100755 index e06c2fd3..00000000 --- a/data/mapHeaders/CeladonHotel.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonHotel_h: - db POKECENTER ; tileset - db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x) - dw CeladonHotel_Blocks ; blocks - dw CeladonHotel_TextPointers ; texts - dw CeladonHotel_Script ; scripts - db 0 ; connections - dw CeladonHotel_Object ; objects diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm deleted file mode 100755 index d2d0ee99..00000000 --- a/data/mapHeaders/CeladonMansion1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansion1F_h: - db MANSION ; tileset - db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x) - dw CeladonMansion1F_Blocks ; blocks - dw CeladonMansion1F_TextPointers ; texts - dw CeladonMansion1F_Script ; scripts - db 0 ; connections - dw CeladonMansion1F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm deleted file mode 100755 index eceac30e..00000000 --- a/data/mapHeaders/CeladonMansion2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansion2F_h: - db MANSION ; tileset - db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x) - dw CeladonMansion2F_Blocks ; blocks - dw CeladonMansion2F_TextPointers ; texts - dw CeladonMansion2F_Script ; scripts - db 0 ; connections - dw CeladonMansion2F_Object ; objects diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm deleted file mode 100755 index b5a0a705..00000000 --- a/data/mapHeaders/CeladonMansion3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansion3F_h: - db MANSION ; tileset - db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x) - dw CeladonMansion3F_Blocks ; blocks - dw CeladonMansion3F_TextPointers ; texts - dw CeladonMansion3F_Script ; scripts - db 0 ; connections - dw CeladonMansion3F_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm deleted file mode 100755 index d7a050c8..00000000 --- a/data/mapHeaders/CeladonMansionRoof.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansionRoof_h: - db MANSION ; tileset - db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x) - dw CeladonMansionRoof_Blocks ; blocks - dw CeladonMansionRoof_TextPointers ; texts - dw CeladonMansionRoof_Script ; scripts - db 0 ; connections - dw CeladonMansionRoof_Object ; objects diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm deleted file mode 100755 index 7fcf49e1..00000000 --- a/data/mapHeaders/CeladonMansionRoofHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMansionRoofHouse_h: - db HOUSE ; tileset - db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x) - dw CeladonMansionRoofHouse_Blocks ; blocks - dw CeladonMansionRoofHouse_TextPointers ; texts - dw CeladonMansionRoofHouse_Script ; scripts - db 0 ; connections - dw CeladonMansionRoofHouse_Object ; objects diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm deleted file mode 100755 index 51e968fa..00000000 --- a/data/mapHeaders/CeladonMart1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart1F_h: - db LOBBY ; tileset - db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x) - dw CeladonMart1F_Blocks ; blocks - dw CeladonMart1F_TextPointers ; texts - dw CeladonMart1F_Script ; scripts - db 0 ; connections - dw CeladonMart1F_Object ; objects diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm deleted file mode 100755 index 77106405..00000000 --- a/data/mapHeaders/CeladonMart2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart2F_h: - db LOBBY ; tileset - db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x) - dw CeladonMart2F_Blocks ; blocks - dw CeladonMart2F_TextPointers ; texts - dw CeladonMart2F_Script ; scripts - db 0 ; connections - dw CeladonMart2F_Object ; objects diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm deleted file mode 100755 index c460945c..00000000 --- a/data/mapHeaders/CeladonMart3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart3F_h: - db LOBBY ; tileset - db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x) - dw CeladonMart3F_Blocks ; blocks - dw CeladonMart3F_TextPointers ; texts - dw CeladonMart3F_Script ; scripts - db 0 ; connections - dw CeladonMart3F_Object ; objects diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm deleted file mode 100755 index a742570b..00000000 --- a/data/mapHeaders/CeladonMart4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart4F_h: - db LOBBY ; tileset - db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x) - dw CeladonMart4F_Blocks ; blocks - dw CeladonMart4F_TextPointers ; texts - dw CeladonMart4F_Script ; scripts - db 0 ; connections - dw CeladonMart4F_Object ; objects diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm deleted file mode 100755 index 4b5223e0..00000000 --- a/data/mapHeaders/CeladonMart5F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMart5F_h: - db LOBBY ; tileset - db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x) - dw CeladonMart5F_Blocks ; blocks - dw CeladonMart5F_TextPointers ; texts - dw CeladonMart5F_Script ; scripts - db 0 ; connections - dw CeladonMart5F_Object ; objects diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm deleted file mode 100755 index 06e87608..00000000 --- a/data/mapHeaders/CeladonMartElevator.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMartElevator_h: - db LOBBY ; tileset - db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x) - dw CeladonMartElevator_Blocks ; blocks - dw CeladonMartElevator_TextPointers ; texts - dw CeladonMartElevator_Script ; scripts - db 0 ; connections - dw CeladonMartElevator_Object ; objects diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm deleted file mode 100755 index 163e25ed..00000000 --- a/data/mapHeaders/CeladonMartRoof.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonMartRoof_h: - db LOBBY ; tileset - db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x) - dw CeladonMartRoof_Blocks ; blocks - dw CeladonMartRoof_TextPointers ; texts - dw CeladonMartRoof_Script ; scripts - db 0 ; connections - dw CeladonMartRoof_Object ; objects diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm deleted file mode 100755 index b5d9bd73..00000000 --- a/data/mapHeaders/CeladonPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeladonPokecenter_h: - db POKECENTER ; tileset - db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x) - dw CeladonPokecenter_Blocks ; blocks - dw CeladonPokecenter_TextPointers ; texts - dw CeladonPokecenter_Script ; scripts - db 0 ; connections - dw CeladonPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm deleted file mode 100755 index a94f1912..00000000 --- a/data/mapHeaders/CeruleanBadgeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanBadgeHouse_h: - db SHIP ; tileset - db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanBadgeHouse_Blocks ; blocks - dw CeruleanBadgeHouse_TextPointers ; texts - dw CeruleanBadgeHouse_Script ; scripts - db 0 ; connections - dw CeruleanBadgeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm deleted file mode 100755 index 932dfb48..00000000 --- a/data/mapHeaders/CeruleanCave1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave1F_h: - db CAVERN ; tileset - db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x) - dw CeruleanCave1F_Blocks ; blocks - dw CeruleanCave1F_TextPointers ; texts - dw CeruleanCave1F_Script ; scripts - db 0 ; connections - dw CeruleanCave1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm deleted file mode 100755 index 7cf82371..00000000 --- a/data/mapHeaders/CeruleanCave2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCave2F_h: - db CAVERN ; tileset - db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x) - dw CeruleanCave2F_Blocks ; blocks - dw CeruleanCave2F_TextPointers ; texts - dw CeruleanCave2F_Script ; scripts - db 0 ; connections - dw CeruleanCave2F_Object ; objects diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm deleted file mode 100755 index eb940faa..00000000 --- a/data/mapHeaders/CeruleanCaveB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanCaveB1F_h: - db CAVERN ; tileset - db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x) - dw CeruleanCaveB1F_Blocks ; blocks - dw CeruleanCaveB1F_TextPointers ; texts - dw CeruleanCaveB1F_Script ; scripts - db 0 ; connections - dw CeruleanCaveB1F_Object ; objects diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm deleted file mode 100755 index cd5444ab..00000000 --- a/data/mapHeaders/CeruleanCity.asm +++ /dev/null @@ -1,12 +0,0 @@ -CeruleanCity_h: - db OVERWORLD ; tileset - db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) - dw CeruleanCity_Blocks ; blocks - dw CeruleanCity_TextPointers ; texts - dw CeruleanCity_Script ; scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks - SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1 - WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks - EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks - dw CeruleanCity_Object ; objects diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm deleted file mode 100755 index 3bdb0283..00000000 --- a/data/mapHeaders/CeruleanGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanGym_h: - db GYM ; tileset - db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x) - dw CeruleanGym_Blocks ; blocks - dw CeruleanGym_TextPointers ; texts - dw CeruleanGym_Script ; scripts - db 0 ; connections - dw CeruleanGym_Object ; objects diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm deleted file mode 100755 index f020d4a3..00000000 --- a/data/mapHeaders/CeruleanMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanMart_h: - db MART ; tileset - db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x) - dw CeruleanMart_Blocks ; blocks - dw CeruleanMart_TextPointers ; texts - dw CeruleanMart_Script ; scripts - db 0 ; connections - dw CeruleanMart_Object ; objects diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm deleted file mode 100755 index 3286acbb..00000000 --- a/data/mapHeaders/CeruleanPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanPokecenter_h: - db POKECENTER ; tileset - db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x) - dw CeruleanPokecenter_Blocks ; blocks - dw CeruleanPokecenter_TextPointers ; texts - dw CeruleanPokecenter_Script ; scripts - db 0 ; connections - dw CeruleanPokecenter_Object ; objects diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm deleted file mode 100755 index 23c5062c..00000000 --- a/data/mapHeaders/CeruleanTradeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanTradeHouse_h: - db HOUSE ; tileset - db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanTradeHouse_Blocks ; blocks - dw CeruleanTradeHouse_TextPointers ; texts - dw CeruleanTradeHouse_Script ; scripts - db 0 ; connections - dw CeruleanTradeHouse_Object ; objects diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm deleted file mode 100755 index e105b1ed..00000000 --- a/data/mapHeaders/CeruleanTrashedHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -CeruleanTrashedHouse_h: - db HOUSE ; tileset - db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x) - dw CeruleanTrashedHouse_Blocks ; blocks - dw CeruleanTrashedHouse_TextPointers ; texts - dw CeruleanTrashedHouse_Script ; scripts - db 0 ; connections - dw CeruleanTrashedHouse_Object ; objects diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm deleted file mode 100755 index a22b236a..00000000 --- a/data/mapHeaders/ChampionsRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -ChampionsRoom_h: - db GYM ; tileset - db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x) - dw ChampionsRoom_Blocks ; blocks - dw ChampionsRoom_TextPointers ; texts - dw ChampionsRoom_Script ; scripts - db $0 ; connections - dw ChampionsRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm deleted file mode 100755 index e871b8f3..00000000 --- a/data/mapHeaders/CinnabarGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarGym_h: - db FACILITY ; tileset - db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x) - dw CinnabarGym_Blocks ; blocks - dw CinnabarGym_TextPointers ; texts - dw CinnabarGym_Script ; scripts - db 0 ; connections - dw CinnabarGym_Object ; objects diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm deleted file mode 100755 index b8c5d7d4..00000000 --- a/data/mapHeaders/CinnabarIsland.asm +++ /dev/null @@ -1,10 +0,0 @@ -CinnabarIsland_h: - db OVERWORLD ; tileset - db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) - dw CinnabarIsland_Blocks ; blocks - dw CinnabarIsland_TextPointers ; texts - dw CinnabarIsland_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21_Blocks - EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20_Blocks - dw CinnabarIsland_Object ; objects diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm deleted file mode 100755 index c1167960..00000000 --- a/data/mapHeaders/CinnabarLab.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLab_h: - db LAB ; tileset - db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x) - dw CinnabarLab_Blocks ; blocks - dw CinnabarLab_TextPointers ; texts - dw CinnabarLab_Script ; scripts - db 0 ; connections - dw CinnabarLab_Object ; objects diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm deleted file mode 100755 index 4ac2963b..00000000 --- a/data/mapHeaders/CinnabarLabFossilRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLabFossilRoom_h: - db LAB ; tileset - db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x) - dw CinnabarLabFossilRoom_Blocks ; blocks - dw CinnabarLabFossilRoom_TextPointers ; texts - dw CinnabarLabFossilRoom_Script ; scripts - db 0 ; connections - dw CinnabarLabFossilRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm deleted file mode 100755 index 8eb9e502..00000000 --- a/data/mapHeaders/CinnabarLabMetronomeRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLabMetronomeRoom_h: - db LAB ; tileset - db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x) - dw CinnabarLabMetronomeRoom_Blocks ; blocks - dw CinnabarLabMetronomeRoom_TextPointers ; texts - dw CinnabarLabMetronomeRoom_Script ; scripts - db 0 ; connections - dw CinnabarLabMetronomeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm deleted file mode 100755 index 1e0ffd0e..00000000 --- a/data/mapHeaders/CinnabarLabTradeRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarLabTradeRoom_h: - db LAB ; tileset - db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x) - dw CinnabarLabTradeRoom_Blocks ; blocks - dw CinnabarLabTradeRoom_TextPointers ; texts - dw CinnabarLabTradeRoom_Script ; scripts - db 0 ; connections - dw CinnabarLabTradeRoom_Object ; objects diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm deleted file mode 100755 index 5833b2ef..00000000 --- a/data/mapHeaders/CinnabarMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarMart_h: - db MART ; tileset - db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x) - dw CinnabarMart_Blocks ; blocks - dw CinnabarMart_TextPointers ; texts - dw CinnabarMart_Script ; scripts - db 0 ; connections - dw CinnabarMart_Object ; objects diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm deleted file mode 100755 index 9c54b9b9..00000000 --- a/data/mapHeaders/CinnabarPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -CinnabarPokecenter_h: - db POKECENTER ; tileset - db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x) - dw CinnabarPokecenter_Blocks ; blocks - dw CinnabarPokecenter_TextPointers ; texts - dw CinnabarPokecenter_Script ; scripts - db 0 ; connections - dw CinnabarPokecenter_Object ; objects diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm deleted file mode 100755 index 9b106204..00000000 --- a/data/mapHeaders/Colosseum.asm +++ /dev/null @@ -1,8 +0,0 @@ -Colosseum_h: - db CLUB ; tileset - db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x) - dw Colosseum_Blocks ; blocks - dw Colosseum_TextPointers ; texts - dw Colosseum_Script ; scripts - db 0 ; connections - dw Colosseum_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm deleted file mode 100755 index f3cfc261..00000000 --- a/data/mapHeaders/CopycatsHouse1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CopycatsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw CopycatsHouse1F_Blocks ; blocks - dw CopycatsHouse1F_TextPointers ; texts - dw CopycatsHouse1F_Script ; scripts - db 0 ; connections - dw CopycatsHouse1F_Object ; objects diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm deleted file mode 100755 index 453ba455..00000000 --- a/data/mapHeaders/CopycatsHouse2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -CopycatsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw CopycatsHouse2F_Blocks ; blocks - dw CopycatsHouse2F_TextPointers ; texts - dw CopycatsHouse2F_Script ; scripts - db 0 ; connections - dw CopycatsHouse2F_Object ; objects diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm deleted file mode 100755 index 2fb7a771..00000000 --- a/data/mapHeaders/Daycare.asm +++ /dev/null @@ -1,8 +0,0 @@ -Daycare_h: - db HOUSE ; tileset - db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x) - dw Daycare_Blocks ; blocks - dw Daycare_TextPointers ; texts - dw Daycare_Script ; scripts - db 0 ; connections - dw Daycare_Object ; objects diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm deleted file mode 100755 index 096019de..00000000 --- a/data/mapHeaders/DiglettsCave.asm +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCave_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x) - dw DiglettsCave_Blocks ; blocks - dw DiglettsCave_TextPointers ; texts - dw DiglettsCave_Script ; scripts - db 0 ; connections - dw DiglettsCave_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm deleted file mode 100755 index 363859b2..00000000 --- a/data/mapHeaders/DiglettsCaveRoute11.asm +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCaveRoute11_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x) - dw DiglettsCaveRoute11_Blocks ; blocks - dw DiglettsCaveRoute11_TextPointers ; texts - dw DiglettsCaveRoute11_Script ; scripts - db 0 ; connections - dw DiglettsCaveRoute11_Object ; objects diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm deleted file mode 100755 index c977415b..00000000 --- a/data/mapHeaders/DiglettsCaveRoute2.asm +++ /dev/null @@ -1,8 +0,0 @@ -DiglettsCaveRoute2_h: - db CAVERN ; tileset - db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x) - dw DiglettsCaveRoute2_Blocks ; blocks - dw DiglettsCaveRoute2_TextPointers ; texts - dw DiglettsCaveRoute2_Script ; scripts - db 0 ; connections - dw DiglettsCaveRoute2_Object ; objects diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm deleted file mode 100755 index 5c802843..00000000 --- a/data/mapHeaders/FightingDojo.asm +++ /dev/null @@ -1,8 +0,0 @@ -FightingDojo_h: - db DOJO ; tileset - db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x) - dw FightingDojo_Blocks ; blocks - dw FightingDojo_TextPointers ; texts - dw FightingDojo_Script ; scripts - db 0 ; connections - dw FightingDojo_Object ; objects diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm deleted file mode 100755 index bc4fe8e6..00000000 --- a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaBillsGrandpasHouse_h: - db HOUSE ; tileset - db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x) - dw FuchsiaBillsGrandpasHouse_Blocks ; blocks - dw FuchsiaBillsGrandpasHouse_TextPointers ; texts - dw FuchsiaBillsGrandpasHouse_Script ; scripts - db 0 ; connections - dw FuchsiaBillsGrandpasHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm deleted file mode 100755 index 87398877..00000000 --- a/data/mapHeaders/FuchsiaCity.asm +++ /dev/null @@ -1,11 +0,0 @@ -FuchsiaCity_h: - db OVERWORLD ; tileset - db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) - dw FuchsiaCity_Blocks ; blocks - dw FuchsiaCity_TextPointers ; texts - dw FuchsiaCity_Script ; scripts - db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19_Blocks - WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18_Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15_Blocks - dw FuchsiaCity_Object ; objects diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm deleted file mode 100755 index 4871970e..00000000 --- a/data/mapHeaders/FuchsiaGoodRodHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaGoodRodHouse_h: - db SHIP ; tileset - db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x) - dw FuchsiaGoodRodHouse_Blocks ; blocks - dw FuchsiaGoodRodHouse_TextPointers ; texts - dw FuchsiaGoodRodHouse_Script ; scripts - db 0 ; connections - dw FuchsiaGoodRodHouse_Object ; objects diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm deleted file mode 100755 index 71ef5960..00000000 --- a/data/mapHeaders/FuchsiaGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaGym_h: - db GYM ; tileset - db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x) - dw FuchsiaGym_Blocks ; blocks - dw FuchsiaGym_TextPointers ; texts - dw FuchsiaGym_Script ; scripts - db 0 ; connections - dw FuchsiaGym_Object ; objects diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm deleted file mode 100755 index 7c1c34d2..00000000 --- a/data/mapHeaders/FuchsiaMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaMart_h: - db MART ; tileset - db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x) - dw FuchsiaMart_Blocks ; blocks - dw FuchsiaMart_TextPointers ; texts - dw FuchsiaMart_Script ; scripts - db 0 ; connections - dw FuchsiaMart_Object ; objects diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm deleted file mode 100755 index 8bc0cdbf..00000000 --- a/data/mapHeaders/FuchsiaMeetingRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaMeetingRoom_h: - db LAB ; tileset - db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x) - dw FuchsiaMeetingRoom_Blocks ; blocks - dw FuchsiaMeetingRoom_TextPointers ; texts - dw FuchsiaMeetingRoom_Script ; scripts - db 0 ; connections - dw FuchsiaMeetingRoom_Object ; objects diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm deleted file mode 100755 index bf654ea6..00000000 --- a/data/mapHeaders/FuchsiaPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -FuchsiaPokecenter_h: - db POKECENTER ; tileset - db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x) - dw FuchsiaPokecenter_Blocks ; blocks - dw FuchsiaPokecenter_TextPointers ; texts - dw FuchsiaPokecenter_Script ; scripts - db 0 ; connections - dw FuchsiaPokecenter_Object ; objects diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm deleted file mode 100755 index c8b69724..00000000 --- a/data/mapHeaders/GameCorner.asm +++ /dev/null @@ -1,8 +0,0 @@ -GameCorner_h: - db LOBBY ; tileset - db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x) - dw GameCorner_Blocks ; blocks - dw GameCorner_TextPointers ; texts - dw GameCorner_Script ; scripts - db 0 ; connections - dw GameCorner_Object ; objects diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm deleted file mode 100755 index e43d2ec7..00000000 --- a/data/mapHeaders/GameCornerPrizeRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -GameCornerPrizeRoom_h: - db LOBBY ; tileset - db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x) - dw GameCornerPrizeRoom_Blocks ; blocks - dw GameCornerPrizeRoom_TextPointers ; texts - dw GameCornerPrizeRoom_Script ; scripts - db 0 ; connections - dw GameCornerPrizeRoom_Object ; objects diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm deleted file mode 100755 index e7f7a982..00000000 --- a/data/mapHeaders/HallOfFame.asm +++ /dev/null @@ -1,8 +0,0 @@ -HallOfFame_h: - db GYM ; tileset - db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x) - dw HallOfFame_Blocks ; blocks - dw HallOfFame_TextPointers ; texts - dw HallOfFame_Script ; scripts - db 0 ; connections - dw HallOfFame_Object ; objects diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm deleted file mode 100755 index ee8b2f0c..00000000 --- a/data/mapHeaders/IndigoPlateau.asm +++ /dev/null @@ -1,9 +0,0 @@ -IndigoPlateau_h: - db PLATEAU ; tileset - db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) - dw IndigoPlateau_Blocks ; blocks - dw IndigoPlateau_TextPointers ; texts - dw IndigoPlateau_Script ; scripts - db SOUTH ; connections - SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23_Blocks - dw IndigoPlateau_Object ; objects diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm deleted file mode 100755 index f099c87d..00000000 --- a/data/mapHeaders/IndigoPlateauLobby.asm +++ /dev/null @@ -1,8 +0,0 @@ -IndigoPlateauLobby_h: - db MART ; tileset - db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x) - dw IndigoPlateauLobby_Blocks ; blocks - dw IndigoPlateauLobby_TextPointers ; texts - dw IndigoPlateauLobby_Script ; scripts - db 0 ; connections - dw IndigoPlateauLobby_Object ; objects diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm deleted file mode 100755 index a9cea4b6..00000000 --- a/data/mapHeaders/LancesRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -LancesRoom_h: - db DOJO ; tileset - db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x) - dw LancesRoom_Blocks ; blocks - dw LancesRoom_TextPointers ; texts - dw LancesRoom_Script ; scripts - db 0 ; connections - dw LancesRoom_Object ; objects diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm deleted file mode 100755 index 06e9cb40..00000000 --- a/data/mapHeaders/LavenderCuboneHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -LavenderCuboneHouse_h: - db HOUSE ; tileset - db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x) - dw LavenderCuboneHouse_Blocks ; blocks - dw LavenderCuboneHouse_TextPointers ; texts - dw LavenderCuboneHouse_Script ; scripts - db 0 ; connections - dw LavenderCuboneHouse_Object ; objects diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm deleted file mode 100755 index c6869d3c..00000000 --- a/data/mapHeaders/LavenderMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -LavenderMart_h: - db MART ; tileset - db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x) - dw LavenderMart_Blocks ; blocks - dw LavenderMart_TextPointers ; texts - dw LavenderMart_Script ; scripts - db 0 ; connections - dw LavenderMart_Object ; objects diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm deleted file mode 100755 index 820e19cd..00000000 --- a/data/mapHeaders/LavenderPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -LavenderPokecenter_h: - db POKECENTER ; tileset - db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x) - dw LavenderPokecenter_Blocks ; blocks - dw LavenderPokecenter_TextPointers ; texts - dw LavenderPokecenter_Script ; scripts - db 0 ; connections - dw LavenderPokecenter_Object ; objects diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm deleted file mode 100755 index 99c9515d..00000000 --- a/data/mapHeaders/LavenderTown.asm +++ /dev/null @@ -1,11 +0,0 @@ -LavenderTown_h: - db OVERWORLD ; tileset - db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) - dw LavenderTown_Blocks ; blocks - dw LavenderTown_TextPointers ; texts - dw LavenderTown_Script ; scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10_Blocks - SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12_Blocks, 1 - WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8_Blocks - dw LavenderTown_Object ; objects diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm deleted file mode 100755 index 216b6621..00000000 --- a/data/mapHeaders/LoreleisRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -LoreleisRoom_h: - db GYM ; tileset - db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x) - dw LoreleisRoom_Blocks ; blocks - dw LoreleisRoom_TextPointers ; texts - dw LoreleisRoom_Script ; scripts - db 0 ; connections - dw LoreleisRoom_Object ; objects diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm deleted file mode 100755 index 4ae9c5b7..00000000 --- a/data/mapHeaders/MrFujisHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -MrFujisHouse_h: - db HOUSE ; tileset - db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x) - dw MrFujisHouse_Blocks ; blocks - dw MrFujisHouse_TextPointers ; texts - dw MrFujisHouse_Script ; scripts - db 0 ; connections - dw MrFujisHouse_Object ; objects diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm deleted file mode 100755 index 5e4ce91b..00000000 --- a/data/mapHeaders/MrPsychicsHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -MrPsychicsHouse_h: - db HOUSE ; tileset - db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x) - dw MrPsychicsHouse_Blocks ; blocks - dw MrPsychicsHouse_TextPointers ; texts - dw MrPsychicsHouse_Script ; scripts - db 0 ; connections - dw MrPsychicsHouse_Object ; objects diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm deleted file mode 100755 index 29ce5d6b..00000000 --- a/data/mapHeaders/MtMoon1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoon1F_h: - db CAVERN ; tileset - db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x) - dw MtMoon1F_Blocks ; blocks - dw MtMoon1F_TextPointers ; texts - dw MtMoon1F_Script ; scripts - db 0 ; connections - dw MtMoon1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm deleted file mode 100755 index 7ebc3dab..00000000 --- a/data/mapHeaders/MtMoonB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoonB1F_h: - db CAVERN ; tileset - db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x) - dw MtMoonB1F_Blocks ; blocks - dw MtMoonB1F_TextPointers ; texts - dw MtMoonB1F_Script ; scripts - db 0 ; connections - dw MtMoonB1F_Object ; objects diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm deleted file mode 100755 index 2ec86247..00000000 --- a/data/mapHeaders/MtMoonB2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoonB2F_h: - db CAVERN ; tileset - db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x) - dw MtMoonB2F_Blocks ; blocks - dw MtMoonB2F_TextPointers ; texts - dw MtMoonB2F_Script ; scripts - db 0 ; connections - dw MtMoonB2F_Object ; objects diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm deleted file mode 100755 index c3c014ff..00000000 --- a/data/mapHeaders/MtMoonPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -MtMoonPokecenter_h: - db POKECENTER ; tileset - db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x) - dw MtMoonPokecenter_Blocks ; blocks - dw MtMoonPokecenter_TextPointers ; texts - dw MtMoonPokecenter_Script ; scripts - db 0 ; connections - dw MtMoonPokecenter_Object ; objects diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm deleted file mode 100755 index 55625fc4..00000000 --- a/data/mapHeaders/Museum1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Museum1F_h: - db MUSEUM ; tileset - db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x) - dw Museum1F_Blocks ; blocks - dw Museum1F_TextPointers ; texts - dw Museum1F_Script ; scripts - db 0 ; connections - dw Museum1F_Object ; objects diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm deleted file mode 100755 index b39e161d..00000000 --- a/data/mapHeaders/Museum2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Museum2F_h: - db MUSEUM ; tileset - db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x) - dw Museum2F_Blocks ; blocks - dw Museum2F_TextPointers ; texts - dw Museum2F_Script ; scripts - db 0 ; connections - dw Museum2F_Object ; objects diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm deleted file mode 100755 index 7e3acee1..00000000 --- a/data/mapHeaders/NameRatersHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -NameRatersHouse_h: - db HOUSE ; tileset - db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x) - dw NameRatersHouse_Blocks ; blocks - dw NameRatersHouse_TextPointers ; texts - dw NameRatersHouse_Script ; scripts - db 0 ; connections - dw NameRatersHouse_Object ; objects diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm deleted file mode 100755 index ffbcdd52..00000000 --- a/data/mapHeaders/OaksLab.asm +++ /dev/null @@ -1,8 +0,0 @@ -OaksLab_h: - db DOJO ; tileset - db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x) - dw OaksLab_Blocks ; blocks - dw OaksLab_TextPointers ; texts - dw OaksLab_Script ; scripts - db 0 ; connections - dw OaksLab_Object ; objects diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm deleted file mode 100755 index eb8525ae..00000000 --- a/data/mapHeaders/PalletTown.asm +++ /dev/null @@ -1,10 +0,0 @@ -PalletTown_h: - db OVERWORLD ; tileset - db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x) - dw PalletTown_Blocks ; blocks - dw PalletTown_TextPointers ; texts - dw PalletTown_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1_Blocks - SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21_Blocks, 1 - dw PalletTown_Object ; objects diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm deleted file mode 100755 index 73610f86..00000000 --- a/data/mapHeaders/PewterCity.asm +++ /dev/null @@ -1,10 +0,0 @@ -PewterCity_h: - db OVERWORLD ; tileset - db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) - dw PewterCity_Blocks ; blocks - dw PewterCity_TextPointers ; texts - dw PewterCity_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2_Blocks - EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3_Blocks - dw PewterCity_Object ; objects diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm deleted file mode 100755 index bb9c2e84..00000000 --- a/data/mapHeaders/PewterGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterGym_h: - db GYM ; tileset - db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x) - dw PewterGym_Blocks ; blocks - dw PewterGym_TextPointers ; texts - dw PewterGym_Script ; scripts - db 0 ; connections - dw PewterGym_Object ; objects diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm deleted file mode 100755 index dc8c5c78..00000000 --- a/data/mapHeaders/PewterMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterMart_h: - db MART ; tileset - db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x) - dw PewterMart_Blocks ; blocks - dw PewterMart_TextPointers ; texts - dw PewterMart_Script ; scripts - db 0 ; connections - dw PewterMart_Object ; objects diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm deleted file mode 100755 index ffab8473..00000000 --- a/data/mapHeaders/PewterNidoranHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterNidoranHouse_h: - db HOUSE ; tileset - db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x) - dw PewterNidoranHouse_Blocks ; blocks - dw PewterNidoranHouse_TextPointers ; texts - dw PewterNidoranHouse_Script ; scripts - db 0 ; connections - dw PewterNidoranHouse_Object ; objects diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm deleted file mode 100755 index 89adbb80..00000000 --- a/data/mapHeaders/PewterPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterPokecenter_h: - db POKECENTER ; tileset - db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x) - dw PewterPokecenter_Blocks ; blocks - dw PewterPokecenter_TextPointers ; texts - dw PewterPokecenter_Script ; scripts - db 0 ; connections - dw PewterPokecenter_Object ; objects diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm deleted file mode 100755 index 7750c8c7..00000000 --- a/data/mapHeaders/PewterSpeechHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -PewterSpeechHouse_h: - db HOUSE ; tileset - db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x) - dw PewterSpeechHouse_Blocks ; blocks - dw PewterSpeechHouse_TextPointers ; texts - dw PewterSpeechHouse_Script ; scripts - db 0 ; connections - dw PewterSpeechHouse_Object ; objects diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm deleted file mode 100755 index 18ebb923..00000000 --- a/data/mapHeaders/PokemonFanClub.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonFanClub_h: - db INTERIOR ; tileset - db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x) - dw PokemonFanClub_Blocks ; blocks - dw PokemonFanClub_TextPointers ; texts - dw PokemonFanClub_Script ; scripts - db 0 ; connections - dw PokemonFanClub_Object ; objects diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm deleted file mode 100755 index 357b0cbb..00000000 --- a/data/mapHeaders/PokemonMansion1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion1F_h: - db FACILITY ; tileset - db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x) - dw PokemonMansion1F_Blocks ; blocks - dw PokemonMansion1F_TextPointers ; texts - dw PokemonMansion1F_Script ; scripts - db 0 ; connections - dw PokemonMansion1F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm deleted file mode 100755 index 71c0e3bb..00000000 --- a/data/mapHeaders/PokemonMansion2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion2F_h: - db FACILITY ; tileset - db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x) - dw PokemonMansion2F_Blocks ; blocks - dw PokemonMansion2F_TextPointers ; texts - dw PokemonMansion2F_Script ; scripts - db 0 ; connections - dw PokemonMansion2F_Object ; objects diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm deleted file mode 100755 index fe4076f9..00000000 --- a/data/mapHeaders/PokemonMansion3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansion3F_h: - db FACILITY ; tileset - db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x) - dw PokemonMansion3F_Blocks ; blocks - dw PokemonMansion3F_TextPointers ; texts - dw PokemonMansion3F_Script ; scripts - db 0 ; connections - dw PokemonMansion3F_Object ; objects diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm deleted file mode 100755 index ccf892b2..00000000 --- a/data/mapHeaders/PokemonMansionB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonMansionB1F_h: - db FACILITY ; tileset - db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x) - dw PokemonMansionB1F_Blocks ; blocks - dw PokemonMansionB1F_TextPointers ; texts - dw PokemonMansionB1F_Script ; scripts - db 0 ; connections - dw PokemonMansionB1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm deleted file mode 100755 index 561274bb..00000000 --- a/data/mapHeaders/PokemonTower1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower1F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x) - dw PokemonTower1F_Blocks ; blocks - dw PokemonTower1F_TextPointers ; texts - dw PokemonTower1F_Script ; scripts - db 0 ; connections - dw PokemonTower1F_Object ; objects diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm deleted file mode 100755 index 41e3271e..00000000 --- a/data/mapHeaders/PokemonTower2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower2F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x) - dw PokemonTower2F_Blocks ; blocks - dw PokemonTower2F_TextPointers ; texts - dw PokemonTower2F_Script ; scripts - db 0 ; connections - dw PokemonTower2F_Object ; objects diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm deleted file mode 100755 index 932c4a20..00000000 --- a/data/mapHeaders/PokemonTower3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower3F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x) - dw PokemonTower3F_Blocks ; blocks - dw PokemonTower3F_TextPointers ; texts - dw PokemonTower3F_Script ; scripts - db 0 ; connections - dw PokemonTower3F_Object ; objects diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm deleted file mode 100755 index b3027cb0..00000000 --- a/data/mapHeaders/PokemonTower4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower4F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x) - dw PokemonTower4F_Blocks ; blocks - dw PokemonTower4F_TextPointers ; texts - dw PokemonTower4F_Script ; scripts - db 0 ; connections - dw PokemonTower4F_Object ; objects diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm deleted file mode 100755 index 9452c553..00000000 --- a/data/mapHeaders/PokemonTower5F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower5F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x) - dw PokemonTower5F_Blocks ; blocks - dw PokemonTower5F_TextPointers ; texts - dw PokemonTower5F_Script ; scripts - db 0 ; connections - dw PokemonTower5F_Object ; objects diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm deleted file mode 100755 index 336c8f66..00000000 --- a/data/mapHeaders/PokemonTower6F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower6F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x) - dw PokemonTower6F_Blocks ; blocks - dw PokemonTower6F_TextPointers ; texts - dw PokemonTower6F_Script ; scripts - db 0 ; connections - dw PokemonTower6F_Object ; objects diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm deleted file mode 100755 index da10fa53..00000000 --- a/data/mapHeaders/PokemonTower7F.asm +++ /dev/null @@ -1,8 +0,0 @@ -PokemonTower7F_h: - db CEMETERY ; tileset - db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x) - dw PokemonTower7F_Blocks ; blocks - dw PokemonTower7F_TextPointers ; texts - dw PokemonTower7F_Script ; scripts - db 0 ; connections - dw PokemonTower7F_Object ; objects diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm deleted file mode 100755 index 91f03d63..00000000 --- a/data/mapHeaders/PowerPlant.asm +++ /dev/null @@ -1,8 +0,0 @@ -PowerPlant_h: - db FACILITY ; tileset - db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x) - dw PowerPlant_Blocks ; blocks - dw PowerPlant_TextPointers ; texts - dw PowerPlant_Script ; scripts - db 0 ; connections - dw PowerPlant_Object ; objects diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm deleted file mode 100755 index c9acc489..00000000 --- a/data/mapHeaders/RedsHouse1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RedsHouse1F_h: - db REDS_HOUSE_1 ; tileset - db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x) - dw RedsHouse1F_Blocks ; blocks - dw RedsHouse1F_TextPointers ; texts - dw RedsHouse1F_Script ; scripts - db 0 ; connections - dw RedsHouse1F_Object ; objects diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm deleted file mode 100755 index 42215466..00000000 --- a/data/mapHeaders/RedsHouse2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RedsHouse2F_h: - db REDS_HOUSE_2 ; tileset - db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x) - dw RedsHouse2F_Blocks ; blocks - dw RedsHouse2F_TextPointers ; texts - dw RedsHouse2F_Script ; scripts - db $00 ; connections - dw RedsHouse2F_Object ; objects diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm deleted file mode 100755 index dd552ac9..00000000 --- a/data/mapHeaders/RockTunnel1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnel1F_h: - db CAVERN ; tileset - db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x) - dw RockTunnel1F_Blocks ; blocks - dw RockTunnel1F_TextPointers ; texts - dw RockTunnel1F_Script ; scripts - db 0 ; connections - dw RockTunnel1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm deleted file mode 100755 index 4e765f20..00000000 --- a/data/mapHeaders/RockTunnelB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnelB1F_h: - db CAVERN ; tileset - db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x) - dw RockTunnelB1F_Blocks ; blocks - dw RockTunnelB1F_TextPointers ; texts - dw RockTunnelB1F_Script ; scripts - db 0 ; connections - dw RockTunnelB1F_Object ; objects diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm deleted file mode 100755 index ac29f1cf..00000000 --- a/data/mapHeaders/RockTunnelPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -RockTunnelPokecenter_h: - db POKECENTER ; tileset - db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x) - dw RockTunnelPokecenter_Blocks ; blocks - dw RockTunnelPokecenter_TextPointers ; texts - dw RockTunnelPokecenter_Script ; scripts - db 0 ; connections - dw RockTunnelPokecenter_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm deleted file mode 100755 index 3c842f1e..00000000 --- a/data/mapHeaders/RocketHideoutB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB1F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x) - dw RocketHideoutB1F_Blocks ; blocks - dw RocketHideoutB1F_TextPointers ; texts - dw RocketHideoutB1F_Script ; scripts - db 0 ; connections - dw RocketHideoutB1F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm deleted file mode 100755 index b570c2a6..00000000 --- a/data/mapHeaders/RocketHideoutB2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB2F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x) - dw RocketHideoutB2F_Blocks ; blocks - dw RocketHideoutB2F_TextPointers ; texts - dw RocketHideoutB2F_Script ; scripts - db 0 ; connections - dw RocketHideoutB2F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm deleted file mode 100755 index 7eab257e..00000000 --- a/data/mapHeaders/RocketHideoutB3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB3F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x) - dw RocketHideoutB3F_Blocks ; blocks - dw RocketHideoutB3F_TextPointers ; texts - dw RocketHideoutB3F_Script ; scripts - db 0 ; connections - dw RocketHideoutB3F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm deleted file mode 100755 index 57797c56..00000000 --- a/data/mapHeaders/RocketHideoutB4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutB4F_h: - db FACILITY ; tileset - db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x) - dw RocketHideoutB4F_Blocks ; blocks - dw RocketHideoutB4F_TextPointers ; texts - dw RocketHideoutB4F_Script ; scripts - db 0 ; connections - dw RocketHideoutB4F_Object ; objects diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm deleted file mode 100755 index 742d0038..00000000 --- a/data/mapHeaders/RocketHideoutElevator.asm +++ /dev/null @@ -1,8 +0,0 @@ -RocketHideoutElevator_h: - db LOBBY ; tileset - db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x) - dw RocketHideoutElevator_Blocks ; blocks - dw RocketHideoutElevator_TextPointers ; texts - dw RocketHideoutElevator_Script ; scripts - db 0 ; connections - dw RocketHideoutElevator_Object ; objects diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm deleted file mode 100755 index ce460937..00000000 --- a/data/mapHeaders/Route1.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route1_h: - db OVERWORLD ; tileset - db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) - dw Route1_Blocks ; blocks - dw Route1_TextPointers ; texts - dw Route1_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTown_Blocks, 1 - dw Route1_Object ; objects diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm deleted file mode 100755 index 8c51bfc6..00000000 --- a/data/mapHeaders/Route10.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route10_h: - db OVERWORLD ; tileset - db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) - dw Route10_Blocks ; blocks - dw Route10_TextPointers ; texts - dw Route10_Script ; scripts - db SOUTH | WEST ; connections - SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks - WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9_Blocks - dw Route10_Object ; objects diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm deleted file mode 100755 index b7814465..00000000 --- a/data/mapHeaders/Route11.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route11_h: - db OVERWORLD ; tileset - db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) - dw Route11_Blocks ; blocks - dw Route11_TextPointers ; texts - dw Route11_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCity_Blocks - EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12_Blocks, 1 - dw Route11_Object ; objects diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm deleted file mode 100755 index 2e01d168..00000000 --- a/data/mapHeaders/Route11Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route11Gate1F_h: - db GATE ; tileset - db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x) - dw Route11Gate1F_Blocks ; blocks - dw Route11Gate1F_TextPointers ; texts - dw Route11Gate1F_Script ; scripts - db 0 ; connections - dw Route11Gate1F_Object ; objects diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm deleted file mode 100755 index ecb2ab7c..00000000 --- a/data/mapHeaders/Route11Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route11Gate2F_h: - db GATE ; tileset - db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x) - dw Route11Gate2F_Blocks ; blocks - dw Route11Gate2F_TextPointers ; texts - dw Route11Gate2F_Script ; scripts - db 0 ; connections - dw Route11Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm deleted file mode 100755 index 2f76aa27..00000000 --- a/data/mapHeaders/Route12.asm +++ /dev/null @@ -1,11 +0,0 @@ -Route12_h: - db OVERWORLD ; tileset - db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) - dw Route12_Blocks ; blocks - dw Route12_TextPointers ; texts - dw Route12_Script ; scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks - SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13_Blocks - WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11_Blocks - dw Route12_Object ; objects diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm deleted file mode 100755 index e44aecab..00000000 --- a/data/mapHeaders/Route12Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route12Gate1F_h: - db GATE ; tileset - db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x) - dw Route12Gate1F_Blocks ; blocks - dw Route12Gate1F_TextPointers ; texts - dw Route12Gate1F_Script ; scripts - db 0 ; connections - dw Route12Gate1F_Object ; objects diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm deleted file mode 100755 index 94d5d54c..00000000 --- a/data/mapHeaders/Route12Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route12Gate2F_h: - db GATE ; tileset - db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x) - dw Route12Gate2F_Blocks ; blocks - dw Route12Gate2F_TextPointers ; texts - dw Route12Gate2F_Script ; scripts - db 0 ; connections - dw Route12Gate2F_Object ; objects diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm deleted file mode 100755 index ef5e0f2c..00000000 --- a/data/mapHeaders/Route12SuperRodHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route12SuperRodHouse_h: - db HOUSE ; tileset - db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x) - dw Route12SuperRodHouse_Blocks ; blocks - dw Route12SuperRodHouse_TextPointers ; texts - dw Route12SuperRodHouse_Script ; scripts - db 0 ; connections - dw Route12SuperRodHouse_Object ; objects diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm deleted file mode 100755 index e6e244b9..00000000 --- a/data/mapHeaders/Route13.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route13_h: - db OVERWORLD ; tileset - db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) - dw Route13_Blocks ; blocks - dw Route13_TextPointers ; texts - dw Route13_Script ; scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12_Blocks - WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14_Blocks - dw Route13_Object ; objects diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm deleted file mode 100755 index c3934ac5..00000000 --- a/data/mapHeaders/Route14.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route14_h: - db OVERWORLD ; tileset - db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) - dw Route14_Blocks ; blocks - dw Route14_TextPointers ; texts - dw Route14_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15_Blocks - EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13_Blocks - dw Route14_Object ; objects diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm deleted file mode 100755 index eb14d750..00000000 --- a/data/mapHeaders/Route15.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route15_h: - db OVERWORLD ; tileset - db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) - dw Route15_Blocks ; blocks - dw Route15_TextPointers ; texts - dw Route15_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks - EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14_Blocks - dw Route15_Object ; objects diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm deleted file mode 100755 index b1ae5662..00000000 --- a/data/mapHeaders/Route15Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route15Gate1F_h: - db GATE ; tileset - db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x) - dw Route15Gate1F_Blocks ; blocks - dw Route15Gate1F_TextPointers ; texts - dw Route15Gate1F_Script ; scripts - db 0 ; connections - dw Route15Gate1F_Object ; objects diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm deleted file mode 100755 index 501da092..00000000 --- a/data/mapHeaders/Route15Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route15Gate2F_h: - db GATE ; tileset - db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x) - dw Route15Gate2F_Blocks ; blocks - dw Route15Gate2F_TextPointers ; texts - dw Route15Gate2F_Script ; scripts - db 0 ; connections - dw Route15Gate2F_Object ; objects diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm deleted file mode 100755 index d12b6ea9..00000000 --- a/data/mapHeaders/Route16.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route16_h: - db OVERWORLD ; tileset - db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) - dw Route16_Blocks ; blocks - dw Route16_TextPointers ; texts - dw Route16_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17_Blocks - EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCity_Blocks, 1 - dw Route16_Object ; objects diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm deleted file mode 100755 index 0d3f828d..00000000 --- a/data/mapHeaders/Route16FlyHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16FlyHouse_h: - db HOUSE ; tileset - db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x) - dw Route16FlyHouse_Blocks ; blocks - dw Route16FlyHouse_TextPointers ; texts - dw Route16FlyHouse_Script ; scripts - db 0 ; connections - dw Route16FlyHouse_Object ; objects diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm deleted file mode 100755 index 561fb597..00000000 --- a/data/mapHeaders/Route16Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16Gate1F_h: - db GATE ; tileset - db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x) - dw Route16Gate1F_Blocks ; blocks - dw Route16Gate1F_TextPointers ; texts - dw Route16Gate1F_Script ; scripts - db 0 ; connections - dw Route16Gate1F_Object ; objects diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm deleted file mode 100755 index 90783ab7..00000000 --- a/data/mapHeaders/Route16Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route16Gate2F_h: - db GATE ; tileset - db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x) - dw Route16Gate2F_Blocks ; blocks - dw Route16Gate2F_TextPointers ; texts - dw Route16Gate2F_Script ; scripts - db 0 ; connections - dw Route16Gate2F_Object ; objects diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm deleted file mode 100755 index 58a785b4..00000000 --- a/data/mapHeaders/Route17.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route17_h: - db OVERWORLD ; tileset - db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) - dw Route17_Blocks ; blocks - dw Route17_TextPointers ; texts - dw Route17_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16_Blocks - SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18_Blocks, 1 - dw Route17_Object ; objects diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm deleted file mode 100755 index 5e10bdbd..00000000 --- a/data/mapHeaders/Route18.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route18_h: - db OVERWORLD ; tileset - db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) - dw Route18_Blocks ; blocks - dw Route18_TextPointers ; texts - dw Route18_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17_Blocks - EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks, 1 - dw Route18_Object ; objects diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm deleted file mode 100755 index 0e4a0dc3..00000000 --- a/data/mapHeaders/Route18Gate1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route18Gate1F_h: - db GATE ; tileset - db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x) - dw Route18Gate1F_Blocks ; blocks - dw Route18Gate1F_TextPointers ; texts - dw Route18Gate1F_Script ; scripts - db 0 ; connections - dw Route18Gate1F_Object ; objects diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm deleted file mode 100755 index 5d8f7126..00000000 --- a/data/mapHeaders/Route18Gate2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route18Gate2F_h: - db GATE ; tileset - db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x) - dw Route18Gate2F_Blocks ; blocks - dw Route18Gate2F_TextPointers ; texts - dw Route18Gate2F_Script ; scripts - db 0 ; connections - dw Route18Gate2F_Object ; objects diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm deleted file mode 100755 index 79972677..00000000 --- a/data/mapHeaders/Route19.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route19_h: - db OVERWORLD ; tileset - db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) - dw Route19_Blocks ; blocks - dw Route19_TextPointers ; texts - dw Route19_Script ; scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCity_Blocks - WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20_Blocks - dw Route19_Object ; objects diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm deleted file mode 100755 index 94511d06..00000000 --- a/data/mapHeaders/Route2.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route2_h: - db OVERWORLD ; tileset - db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x) - dw Route2_Blocks ; blocks - dw Route2_TextPointers ; texts - dw Route2_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks, 1 - dw Route2_Object ; objects diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm deleted file mode 100755 index 689f51cd..00000000 --- a/data/mapHeaders/Route20.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route20_h: - db OVERWORLD ; tileset - db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) - dw Route20_Blocks ; blocks - dw Route20_TextPointers ; texts - dw Route20_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks - EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19_Blocks - dw Route20_Object ; objects diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm deleted file mode 100755 index f37869dc..00000000 --- a/data/mapHeaders/Route21.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route21_h: - db OVERWORLD ; tileset - db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) - dw Route21_Blocks ; blocks - dw Route21_TextPointers ; texts - dw Route21_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTown_Blocks - SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks, 1 - dw Route21_Object ; objects diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm deleted file mode 100755 index 4d07475f..00000000 --- a/data/mapHeaders/Route22.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route22_h: - db OVERWORLD ; tileset - db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) - dw Route22_Blocks ; blocks - dw Route22_TextPointers ; texts - dw Route22_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23_Blocks - EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCity_Blocks, 1 - dw Route22_Object ; objects diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm deleted file mode 100755 index 4d3ae0cc..00000000 --- a/data/mapHeaders/Route22Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route22Gate_h: - db GATE ; tileset - db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x) - dw Route22Gate_Blocks ; blocks - dw Route22Gate_TextPointers ; texts - dw Route22Gate_Script ; scripts - db 0 ; connections - dw Route22Gate_Object ; objects diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm deleted file mode 100755 index 6b1fde97..00000000 --- a/data/mapHeaders/Route23.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route23_h: - db PLATEAU ; tileset - db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) - dw Route23_Blocks ; blocks - dw Route23_TextPointers ; texts - dw Route23_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateau_Blocks - SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22_Blocks, 1 - dw Route23_Object ; objects diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm deleted file mode 100755 index 87776f60..00000000 --- a/data/mapHeaders/Route24.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route24_h: - db OVERWORLD ; tileset - db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) - dw Route24_Blocks ; blocks - dw Route24_TextPointers ; texts - dw Route24_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks, 1 - EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25_Blocks - dw Route24_Object ; objects diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm deleted file mode 100755 index c300eeb3..00000000 --- a/data/mapHeaders/Route25.asm +++ /dev/null @@ -1,9 +0,0 @@ -Route25_h: - db OVERWORLD ; tileset - db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) - dw Route25_Blocks ; blocks - dw Route25_TextPointers ; texts - dw Route25_Script ; scripts - db WEST ; connections - WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24_Blocks - dw Route25_Object ; objects diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm deleted file mode 100755 index 9b284178..00000000 --- a/data/mapHeaders/Route2Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route2Gate_h: - db GATE ; tileset - db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x) - dw Route2Gate_Blocks ; blocks - dw Route2Gate_TextPointers ; texts - dw Route2Gate_Script ; scripts - db 0 ; connections - dw Route2Gate_Object ; objects diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm deleted file mode 100755 index 33693943..00000000 --- a/data/mapHeaders/Route2TradeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route2TradeHouse_h: - db HOUSE ; tileset - db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x) - dw Route2TradeHouse_Blocks ; blocks - dw Route2TradeHouse_TextPointers ; texts - dw Route2TradeHouse_Script ; scripts - db 0 ; connections - dw Route2TradeHouse_Object ; objects diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm deleted file mode 100755 index c611e4b8..00000000 --- a/data/mapHeaders/Route3.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route3_h: - db OVERWORLD ; tileset - db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) - dw Route3_Blocks ; blocks - dw Route3_TextPointers ; texts - dw Route3_Script ; scripts - db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4_Blocks - WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCity_Blocks - dw Route3_Object ; objects diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm deleted file mode 100755 index 999a1207..00000000 --- a/data/mapHeaders/Route4.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route4_h: - db OVERWORLD ; tileset - db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) - dw Route4_Blocks ; blocks - dw Route4_TextPointers ; texts - dw Route4_Script ; scripts - db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3_Blocks - EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks, 1 - dw Route4_Object ; objects diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm deleted file mode 100755 index 6480aebd..00000000 --- a/data/mapHeaders/Route5.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route5_h: - db OVERWORLD ; tileset - db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) - dw Route5_Blocks ; blocks - dw Route5_TextPointers ; texts - dw Route5_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCity_Blocks, 1 - dw Route5_Object ; objects diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm deleted file mode 100755 index bb418182..00000000 --- a/data/mapHeaders/Route5Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route5Gate_h: - db GATE ; tileset - db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x) - dw Route5Gate_Blocks ; blocks - dw Route5Gate_TextPointers ; texts - dw Route5Gate_Script ; scripts - db 0 ; connections - dw Route5Gate_Object ; objects diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm deleted file mode 100755 index 9385ce5f..00000000 --- a/data/mapHeaders/Route6.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route6_h: - db OVERWORLD ; tileset - db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) - dw Route6_Blocks ; blocks - dw Route6_TextPointers ; texts - dw Route6_Script ; scripts - db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCity_Blocks - SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCity_Blocks, 1 - dw Route6_Object ; objects diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm deleted file mode 100755 index 282cc5b6..00000000 --- a/data/mapHeaders/Route6Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route6Gate_h: - db GATE ; tileset - db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x) - dw Route6Gate_Blocks ; blocks - dw Route6Gate_TextPointers ; texts - dw Route6Gate_Script ; scripts - db 0 ; connections - dw Route6Gate_Object ; objects diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm deleted file mode 100755 index 9b34ea1f..00000000 --- a/data/mapHeaders/Route7.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route7_h: - db OVERWORLD ; tileset - db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) - dw Route7_Blocks ; blocks - dw Route7_TextPointers ; texts - dw Route7_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCity_Blocks - EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCity_Blocks, 1 - dw Route7_Object ; objects diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm deleted file mode 100755 index 61771e42..00000000 --- a/data/mapHeaders/Route7Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route7Gate_h: - db GATE ; tileset - db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x) - dw Route7Gate_Blocks ; blocks - dw Route7Gate_TextPointers ; texts - dw Route7Gate_Script ; scripts - db 0 ; connections - dw Route7Gate_Object ; objects diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm deleted file mode 100755 index bd2ee71e..00000000 --- a/data/mapHeaders/Route8.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route8_h: - db OVERWORLD ; tileset - db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) - dw Route8_Blocks ; blocks - dw Route8_TextPointers ; texts - dw Route8_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCity_Blocks - EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks - dw Route8_Object ; objects diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm deleted file mode 100755 index dd14a237..00000000 --- a/data/mapHeaders/Route8Gate.asm +++ /dev/null @@ -1,8 +0,0 @@ -Route8Gate_h: - db GATE ; tileset - db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x) - dw Route8Gate_Blocks ; blocks - dw Route8Gate_TextPointers ; texts - dw Route8Gate_Script ; scripts - db 0 ; connections - dw Route8Gate_Object ; objects diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm deleted file mode 100755 index 3dec3b0a..00000000 --- a/data/mapHeaders/Route9.asm +++ /dev/null @@ -1,10 +0,0 @@ -Route9_h: - db OVERWORLD ; tileset - db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) - dw Route9_Blocks ; blocks - dw Route9_TextPointers ; texts - dw Route9_Script ; scripts - db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks - EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10_Blocks, 1 - dw Route9_Object ; objects diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm deleted file mode 100755 index a69423d6..00000000 --- a/data/mapHeaders/SSAnne1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne1F_h: - db SHIP ; tileset - db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x) - dw SSAnne1F_Blocks ; blocks - dw SSAnne1F_TextPointers ; texts - dw SSAnne1F_Script ; scripts - db 0 ; connections - dw SSAnne1F_Object ; objects diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm deleted file mode 100755 index 1f8af23d..00000000 --- a/data/mapHeaders/SSAnne1FRooms.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne1FRooms_h: - db SHIP ; tileset - db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x) - dw SSAnne1FRooms_Blocks ; blocks - dw SSAnne1FRooms_TextPointers ; texts - dw SSAnne1FRooms_Script ; scripts - db 0 ; connections - dw SSAnne1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm deleted file mode 100755 index d42d16f4..00000000 --- a/data/mapHeaders/SSAnne2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne2F_h: - db SHIP ; tileset - db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x) - dw SSAnne2F_Blocks ; blocks - dw SSAnne2F_TextPointers ; texts - dw SSAnne2F_Script ; scripts - db 0 ; connections - dw SSAnne2F_Object ; objects diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm deleted file mode 100755 index f22de0fa..00000000 --- a/data/mapHeaders/SSAnne2FRooms.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne2FRooms_h: - db SHIP ; tileset - db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x) - dw SSAnne2FRooms_Blocks ; blocks - dw SSAnne2FRooms_TextPointers ; texts - dw SSAnne2FRooms_Script ; scripts - db 0 ; connections - dw SSAnne2FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm deleted file mode 100755 index 1c5dafea..00000000 --- a/data/mapHeaders/SSAnne3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnne3F_h: - db SHIP ; tileset - db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x) - dw SSAnne3F_Blocks ; blocks - dw SSAnne3F_TextPointers ; texts - dw SSAnne3F_Script ; scripts - db 0 ; connections - dw SSAnne3F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm deleted file mode 100755 index a3ca6dfa..00000000 --- a/data/mapHeaders/SSAnneB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneB1F_h: - db SHIP ; tileset - db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x) - dw SSAnneB1F_Blocks ; blocks - dw SSAnneB1F_TextPointers ; texts - dw SSAnneB1F_Script ; scripts - db 0 ; connections - dw SSAnneB1F_Object ; objects diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm deleted file mode 100755 index f08e343b..00000000 --- a/data/mapHeaders/SSAnneB1FRooms.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneB1FRooms_h: - db SHIP ; tileset - db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x) - dw SSAnneB1FRooms_Blocks ; blocks - dw SSAnneB1FRooms_TextPointers ; texts - dw SSAnneB1FRooms_Script ; scripts - db 0 ; connections - dw SSAnneB1FRooms_Object ; objects diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm deleted file mode 100755 index baa71147..00000000 --- a/data/mapHeaders/SSAnneBow.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneBow_h: - db SHIP ; tileset - db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x) - dw SSAnneBow_Blocks ; blocks - dw SSAnneBow_TextPointers ; texts - dw SSAnneBow_Script ; scripts - db 0 ; connections - dw SSAnneBow_Object ; objects diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm deleted file mode 100755 index 433f060a..00000000 --- a/data/mapHeaders/SSAnneCaptainsRoom.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneCaptainsRoom_h: - db SHIP ; tileset - db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x) - dw SSAnneCaptainsRoom_Blocks ; blocks - dw SSAnneCaptainsRoom_TextPointers ; texts - dw SSAnneCaptainsRoom_Script ; scripts - db 0 ; connections - dw SSAnneCaptainsRoom_Object ; objects diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm deleted file mode 100755 index eacbbfb8..00000000 --- a/data/mapHeaders/SSAnneKitchen.asm +++ /dev/null @@ -1,8 +0,0 @@ -SSAnneKitchen_h: - db SHIP ; tileset - db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x) - dw SSAnneKitchen_Blocks ; blocks - dw SSAnneKitchen_TextPointers ; texts - dw SSAnneKitchen_Script ; scripts - db 0 ; connections - dw SSAnneKitchen_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm deleted file mode 100755 index 8ec6c890..00000000 --- a/data/mapHeaders/SafariZoneCenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneCenter_h: - db FOREST ; tileset - db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x) - dw SafariZoneCenter_Blocks ; blocks - dw SafariZoneCenter_TextPointers ; texts - dw SafariZoneCenter_Script ; scripts - db 0 ; connections - dw SafariZoneCenter_Object ; objects diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm deleted file mode 100755 index 9b1064f2..00000000 --- a/data/mapHeaders/SafariZoneCenterRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneCenterRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneCenterRestHouse_Blocks ; blocks - dw SafariZoneCenterRestHouse_TextPointers ; texts - dw SafariZoneCenterRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneCenterRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm deleted file mode 100755 index 99556473..00000000 --- a/data/mapHeaders/SafariZoneEast.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneEast_h: - db FOREST ; tileset - db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x) - dw SafariZoneEast_Blocks ; blocks - dw SafariZoneEast_TextPointers ; texts - dw SafariZoneEast_Script ; scripts - db 0 ; connections - dw SafariZoneEast_Object ; objects diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm deleted file mode 100755 index b9f219c5..00000000 --- a/data/mapHeaders/SafariZoneEastRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneEastRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneEastRestHouse_Blocks ; blocks - dw SafariZoneEastRestHouse_TextPointers ; texts - dw SafariZoneEastRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneEastRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm deleted file mode 100755 index ed306ad0..00000000 --- a/data/mapHeaders/SafariZoneGate.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneGate_h: - db GATE ; tileset - db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x) - dw SafariZoneGate_Blocks ; blocks - dw SafariZoneGate_TextPointers ; texts - dw SafariZoneGate_Script ; scripts - db 0 ; connections - dw SafariZoneGate_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm deleted file mode 100755 index 3d1a2f51..00000000 --- a/data/mapHeaders/SafariZoneNorth.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneNorth_h: - db FOREST ; tileset - db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x) - dw SafariZoneNorth_Blocks ; blocks - dw SafariZoneNorth_TextPointers ; texts - dw SafariZoneNorth_Script ; scripts - db 0 ; connections - dw SafariZoneNorth_Object ; objects diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm deleted file mode 100755 index 938c15cf..00000000 --- a/data/mapHeaders/SafariZoneNorthRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneNorthRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneNorthRestHouse_Blocks ; blocks - dw SafariZoneNorthRestHouse_TextPointers ; texts - dw SafariZoneNorthRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneNorthRestHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm deleted file mode 100755 index 91068691..00000000 --- a/data/mapHeaders/SafariZoneSecretHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneSecretHouse_h: - db LAB ; tileset - db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneSecretHouse_Blocks ; blocks - dw SafariZoneSecretHouse_TextPointers ; texts - dw SafariZoneSecretHouse_Script ; scripts - db 0 ; connections - dw SafariZoneSecretHouse_Object ; objects diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm deleted file mode 100755 index 876169d1..00000000 --- a/data/mapHeaders/SafariZoneWest.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneWest_h: - db FOREST ; tileset - db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x) - dw SafariZoneWest_Blocks ; blocks - dw SafariZoneWest_TextPointers ; texts - dw SafariZoneWest_Script ; scripts - db 0 ; connections - dw SafariZoneWest_Object ; objects diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm deleted file mode 100755 index 886382ec..00000000 --- a/data/mapHeaders/SafariZoneWestRestHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SafariZoneWestRestHouse_h: - db GATE ; tileset - db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x) - dw SafariZoneWestRestHouse_Blocks ; blocks - dw SafariZoneWestRestHouse_TextPointers ; texts - dw SafariZoneWestRestHouse_Script ; scripts - db 0 ; connections - dw SafariZoneWestRestHouse_Object ; objects diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm deleted file mode 100755 index 13239891..00000000 --- a/data/mapHeaders/SaffronCity.asm +++ /dev/null @@ -1,12 +0,0 @@ -SaffronCity_h: - db OVERWORLD ; tileset - db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) - dw SaffronCity_Blocks ; blocks - dw SaffronCity_TextPointers ; texts - dw SaffronCity_Script ; scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1 - WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks - EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks - dw SaffronCity_Object ; objects diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm deleted file mode 100755 index 6cbadb2c..00000000 --- a/data/mapHeaders/SaffronGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronGym_h: - db FACILITY ; tileset - db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x) - dw SaffronGym_Blocks ; blocks - dw SaffronGym_TextPointers ; texts - dw SaffronGym_Script ; scripts - db 0 ; connections - dw SaffronGym_Object ; objects diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm deleted file mode 100755 index abd537b6..00000000 --- a/data/mapHeaders/SaffronMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronMart_h: - db MART ; tileset - db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x) - dw SaffronMart_Blocks ; blocks - dw SaffronMart_TextPointers ; texts - dw SaffronMart_Script ; scripts - db 0 ; connections - dw SaffronMart_Object ; objects diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm deleted file mode 100755 index 5d6e21ae..00000000 --- a/data/mapHeaders/SaffronPidgeyHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronPidgeyHouse_h: - db HOUSE ; tileset - db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) - dw SaffronPidgeyHouse_Blocks ; blocks - dw SaffronPidgeyHouse_TextPointers ; texts - dw SaffronPidgeyHouse_Script ; scripts - db 0 ; connections - dw SaffronPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm deleted file mode 100755 index 32f1ec71..00000000 --- a/data/mapHeaders/SaffronPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -SaffronPokecenter_h: - db POKECENTER ; tileset - db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x) - dw SaffronPokecenter_Blocks ; blocks - dw SaffronPokecenter_TextPointers ; texts - dw SaffronPokecenter_Script ; scripts - db 0 ; connections - dw SaffronPokecenter_Object ; objects diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm deleted file mode 100755 index f5260cda..00000000 --- a/data/mapHeaders/SeafoamIslands1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslands1F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x) - dw SeafoamIslands1F_Blocks ; blocks - dw SeafoamIslands1F_TextPointers ; texts - dw SeafoamIslands1F_Script ; scripts - db 0 ; connections - dw SeafoamIslands1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm deleted file mode 100755 index 23116f74..00000000 --- a/data/mapHeaders/SeafoamIslandsB1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB1F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB1F_Blocks ; blocks - dw SeafoamIslandsB1F_TextPointers ; texts - dw SeafoamIslandsB1F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB1F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm deleted file mode 100755 index 10d45dad..00000000 --- a/data/mapHeaders/SeafoamIslandsB2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB2F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB2F_Blocks ; blocks - dw SeafoamIslandsB2F_TextPointers ; texts - dw SeafoamIslandsB2F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB2F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm deleted file mode 100755 index 812d1121..00000000 --- a/data/mapHeaders/SeafoamIslandsB3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB3F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB3F_Blocks ; blocks - dw SeafoamIslandsB3F_TextPointers ; texts - dw SeafoamIslandsB3F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB3F_Object ; objects diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm deleted file mode 100755 index 96c25e06..00000000 --- a/data/mapHeaders/SeafoamIslandsB4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SeafoamIslandsB4F_h: - db CAVERN ; tileset - db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x) - dw SeafoamIslandsB4F_Blocks ; blocks - dw SeafoamIslandsB4F_TextPointers ; texts - dw SeafoamIslandsB4F_Script ; scripts - db 0 ; connections - dw SeafoamIslandsB4F_Object ; objects diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm deleted file mode 100755 index ad040479..00000000 --- a/data/mapHeaders/SilphCo10F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo10F_h: - db FACILITY ; tileset - db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x) - dw SilphCo10F_Blocks ; blocks - dw SilphCo10F_TextPointers ; texts - dw SilphCo10F_Script ; scripts - db 0 ; connections - dw SilphCo10F_Object ; objects diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm deleted file mode 100755 index 08d6d650..00000000 --- a/data/mapHeaders/SilphCo11F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo11F_h: - db INTERIOR ; tileset - db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x) - dw SilphCo11F_Blocks ; blocks - dw SilphCo11F_TextPointers ; texts - dw SilphCo11F_Script ; scripts - db 0 ; connections - dw SilphCo11F_Object ; objects diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm deleted file mode 100755 index 45e6c5bf..00000000 --- a/data/mapHeaders/SilphCo1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo1F_h: - db FACILITY ; tileset - db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x) - dw SilphCo1F_Blocks ; blocks - dw SilphCo1F_TextPointers ; texts - dw SilphCo1F_Script ; scripts - db 0 ; connections - dw SilphCo1F_Object ; objects diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm deleted file mode 100755 index 69c2fb51..00000000 --- a/data/mapHeaders/SilphCo2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo2F_h: - db FACILITY ; tileset - db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x) - dw SilphCo2F_Blocks ; blocks - dw SilphCo2F_TextPointers ; texts - dw SilphCo2F_Script ; scripts - db 0 ; connections - dw SilphCo2F_Object ; objects diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm deleted file mode 100755 index 6911a604..00000000 --- a/data/mapHeaders/SilphCo3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo3F_h: - db FACILITY ; tileset - db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x) - dw SilphCo3F_Blocks ; blocks - dw SilphCo3F_TextPointers ; texts - dw SilphCo3F_Script ; scripts - db 0 ; connections - dw SilphCo3F_Object ; objects diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm deleted file mode 100755 index 591ddc07..00000000 --- a/data/mapHeaders/SilphCo4F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo4F_h: - db FACILITY ; tileset - db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x) - dw SilphCo4F_Blocks ; blocks - dw SilphCo4F_TextPointers ; texts - dw SilphCo4F_Script ; scripts - db 0 ; connections - dw SilphCo4F_Object ; objects diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm deleted file mode 100755 index 0303ceba..00000000 --- a/data/mapHeaders/SilphCo5F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo5F_h: - db FACILITY ; tileset - db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x) - dw SilphCo5F_Blocks ; blocks - dw SilphCo5F_TextPointers ; texts - dw SilphCo5F_Script ; scripts - db 0 ; connections - dw SilphCo5F_Object ; objects diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm deleted file mode 100755 index b26a7587..00000000 --- a/data/mapHeaders/SilphCo6F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo6F_h: - db FACILITY ; tileset - db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x) - dw SilphCo6F_Blocks ; blocks - dw SilphCo6F_TextPointers ; texts - dw SilphCo6F_Script ; scripts - db 0 ; connections - dw SilphCo6F_Object ; objects diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm deleted file mode 100755 index 5c6ea959..00000000 --- a/data/mapHeaders/SilphCo7F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo7F_h: - db FACILITY ; tileset - db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x) - dw SilphCo7F_Blocks ; blocks - dw SilphCo7F_TextPointers ; texts - dw SilphCo7F_Script ; scripts - db 0 ; connections - dw SilphCo7F_Object ; objects diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm deleted file mode 100755 index e467298e..00000000 --- a/data/mapHeaders/SilphCo8F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo8F_h: - db FACILITY ; tileset - db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x) - dw SilphCo8F_Blocks ; blocks - dw SilphCo8F_TextPointers ; texts - dw SilphCo8F_Script ; scripts - db 0 ; connections - dw SilphCo8F_Object ; objects diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm deleted file mode 100755 index ec591e51..00000000 --- a/data/mapHeaders/SilphCo9F.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCo9F_h: - db FACILITY ; tileset - db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x) - dw SilphCo9F_Blocks ; blocks - dw SilphCo9F_TextPointers ; texts - dw SilphCo9F_Script ; scripts - db 0 ; connections - dw SilphCo9F_Object ; objects diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm deleted file mode 100755 index 0abe2810..00000000 --- a/data/mapHeaders/SilphCoElevator.asm +++ /dev/null @@ -1,8 +0,0 @@ -SilphCoElevator_h: - db LOBBY ; tileset - db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x) - dw SilphCoElevator_Blocks ; blocks - dw SilphCoElevator_TextPointers ; texts - dw SilphCoElevator_Script ; scripts - db 0 ; connections - dw SilphCoElevator_Object ; objects diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm deleted file mode 100755 index 39981c35..00000000 --- a/data/mapHeaders/TradeCenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -TradeCenter_h: - db CLUB ; tileset - db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x) - dw TradeCenter_Blocks ; blocks - dw TradeCenter_TextPointers ; texts - dw TradeCenter_Script ; scripts - db 0 ; connections - dw TradeCenter_Object ; objects diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm deleted file mode 100755 index 5dd8cdf8..00000000 --- a/data/mapHeaders/UndergroundPathNorthSouth.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathNorthSouth_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x) - dw UndergroundPathNorthSouth_Blocks ; blocks - dw UndergroundPathNorthSouth_TextPointers ; texts - dw UndergroundPathNorthSouth_Script ; scripts - db 0 ; connections - dw UndergroundPathNorthSouth_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm deleted file mode 100755 index 14c6aa4d..00000000 --- a/data/mapHeaders/UndergroundPathRoute5.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute5_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute5_Blocks ; blocks - dw UndergroundPathRoute5_TextPointers ; texts - dw UndergroundPathRoute5_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute5_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm deleted file mode 100755 index 6aea459c..00000000 --- a/data/mapHeaders/UndergroundPathRoute6.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute6_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute6_Blocks ; blocks - dw UndergroundPathRoute6_TextPointers ; texts - dw UndergroundPathRoute6_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute6_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm deleted file mode 100755 index 91495ea3..00000000 --- a/data/mapHeaders/UndergroundPathRoute7.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute7_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute7_Blocks ; blocks - dw UndergroundPathRoute7_TextPointers ; texts - dw UndergroundPathRoute7_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute7_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm deleted file mode 100755 index 9d3f4c62..00000000 --- a/data/mapHeaders/UndergroundPathRoute7Copy.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute7Copy_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute7Copy_Blocks ; blocks - dw UndergroundPathRoute7Copy_TextPointers ; texts - dw UndergroundPathRoute7Copy_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute7Copy_Object ; objects diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm deleted file mode 100755 index f34265b8..00000000 --- a/data/mapHeaders/UndergroundPathRoute8.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathRoute8_h: - db GATE ; tileset - db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x) - dw UndergroundPathRoute8_Blocks ; blocks - dw UndergroundPathRoute8_TextPointers ; texts - dw UndergroundPathRoute8_Script ; scripts - db 0 ; connections - dw UndergroundPathRoute8_Object ; objects diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm deleted file mode 100755 index d084bd73..00000000 --- a/data/mapHeaders/UndergroundPathWestEast.asm +++ /dev/null @@ -1,8 +0,0 @@ -UndergroundPathWestEast_h: - db UNDERGROUND ; tileset - db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x) - dw UndergroundPathWestEast_Blocks ; blocks - dw UndergroundPathWestEast_TextPointers ; texts - dw UndergroundPathWestEast_Script ; scripts - db 0 ; connections - dw UndergroundPathWestEast_Object ; objects diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm deleted file mode 100755 index 6521ad89..00000000 --- a/data/mapHeaders/VermilionCity.asm +++ /dev/null @@ -1,10 +0,0 @@ -VermilionCity_h: - db OVERWORLD ; tileset - db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) - dw VermilionCity_Blocks ; blocks - dw VermilionCity_TextPointers ; texts - dw VermilionCity_Script ; scripts - db NORTH | EAST ; connections - NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6_Blocks - EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11_Blocks - dw VermilionCity_Object ; objects diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm deleted file mode 100755 index f7dca8e6..00000000 --- a/data/mapHeaders/VermilionDock.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionDock_h: - db SHIP_PORT ; tileset - db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x) - dw VermilionDock_Blocks ; blocks - dw VermilionDock_TextPointers ; texts - dw VermilionDock_Script ; scripts - db 0 ; connections - dw VermilionDock_Object ; objects diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm deleted file mode 100755 index fe304a2e..00000000 --- a/data/mapHeaders/VermilionGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionGym_h: - db GYM ; tileset - db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x) - dw VermilionGym_Blocks ; blocks - dw VermilionGym_TextPointers ; texts - dw VermilionGym_Script ; scripts - db 0 ; connections - dw VermilionGym_Object ; objects diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm deleted file mode 100755 index 67f24f59..00000000 --- a/data/mapHeaders/VermilionMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionMart_h: - db MART ; tileset - db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x) - dw VermilionMart_Blocks ; blocks - dw VermilionMart_TextPointers ; texts - dw VermilionMart_Script ; scripts - db 0 ; connections - dw VermilionMart_Object ; objects diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm deleted file mode 100755 index f4b69110..00000000 --- a/data/mapHeaders/VermilionOldRodHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionOldRodHouse_h: - db HOUSE ; tileset - db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x) - dw VermilionOldRodHouse_Blocks ; blocks - dw VermilionOldRodHouse_TextPointers ; texts - dw VermilionOldRodHouse_Script ; scripts - db 0 ; connections - dw VermilionOldRodHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm deleted file mode 100755 index af052fa6..00000000 --- a/data/mapHeaders/VermilionPidgeyHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionPidgeyHouse_h: - db HOUSE ; tileset - db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x) - dw VermilionPidgeyHouse_Blocks ; blocks - dw VermilionPidgeyHouse_TextPointers ; texts - dw VermilionPidgeyHouse_Script ; scripts - db 0 ; connections - dw VermilionPidgeyHouse_Object ; objects diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm deleted file mode 100755 index 3d4c23ec..00000000 --- a/data/mapHeaders/VermilionPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionPokecenter_h: - db POKECENTER ; tileset - db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x) - dw VermilionPokecenter_Blocks ; blocks - dw VermilionPokecenter_TextPointers ; texts - dw VermilionPokecenter_Script ; scripts - db 0 ; connections - dw VermilionPokecenter_Object ; objects diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm deleted file mode 100755 index 21d30049..00000000 --- a/data/mapHeaders/VermilionTradeHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -VermilionTradeHouse_h: - db HOUSE ; tileset - db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x) - dw VermilionTradeHouse_Blocks ; blocks - dw VermilionTradeHouse_TextPointers ; texts - dw VermilionTradeHouse_Script ; scripts - db 0 ; connections - dw VermilionTradeHouse_Object ; objects diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm deleted file mode 100755 index 3508d782..00000000 --- a/data/mapHeaders/VictoryRoad1F.asm +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad1F_h: - db CAVERN ; tileset - db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x) - dw VictoryRoad1F_Blocks ; blocks - dw VictoryRoad1F_TextPointers ; texts - dw VictoryRoad1F_Script ; scripts - db 0 ; connections - dw VictoryRoad1F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm deleted file mode 100755 index 31693c1c..00000000 --- a/data/mapHeaders/VictoryRoad2F.asm +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad2F_h: - db CAVERN ; tileset - db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x) - dw VictoryRoad2F_Blocks ; blocks - dw VictoryRoad2F_TextPointers ; texts - dw VictoryRoad2F_Script ; scripts - db 0 ; connections - dw VictoryRoad2F_Object ; objects diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm deleted file mode 100755 index 3f5e21d2..00000000 --- a/data/mapHeaders/VictoryRoad3F.asm +++ /dev/null @@ -1,8 +0,0 @@ -VictoryRoad3F_h: - db CAVERN ; tileset - db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x) - dw VictoryRoad3F_Blocks ; blocks - dw VictoryRoad3F_TextPointers ; texts - dw VictoryRoad3F_Script ; scripts - db 0 ; connections - dw VictoryRoad3F_Object ; objects diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm deleted file mode 100755 index 09f7b9f4..00000000 --- a/data/mapHeaders/ViridianCity.asm +++ /dev/null @@ -1,11 +0,0 @@ -ViridianCity_h: - db OVERWORLD ; tileset - db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) - dw ViridianCity_Blocks ; blocks - dw ViridianCity_TextPointers ; texts - dw ViridianCity_Script ; scripts - db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2_Blocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1_Blocks, 1 - WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22_Blocks - dw ViridianCity_Object ; objects diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm deleted file mode 100755 index a8df3e6e..00000000 --- a/data/mapHeaders/ViridianForest.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForest_h: - db FOREST ; tileset - db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x) - dw ViridianForest_Blocks ; blocks - dw ViridianForest_TextPointers ; texts - dw ViridianForest_Script ; scripts - db 0 ; connections - dw ViridianForest_Object ; objects diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm deleted file mode 100755 index 48535977..00000000 --- a/data/mapHeaders/ViridianForestNorthGate.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForestNorthGate_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x) - dw ViridianForestNorthGate_Blocks ; blocks - dw ViridianForestNorthGate_TextPointers ; texts - dw ViridianForestNorthGate_Script ; scripts - db 0 ; connections - dw ViridianForestNorthGate_Object ; objects diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm deleted file mode 100755 index b134ebea..00000000 --- a/data/mapHeaders/ViridianForestSouthGate.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianForestSouthGate_h: - db FOREST_GATE ; tileset - db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x) - dw ViridianForestSouthGate_Blocks ; blocks - dw ViridianForestSouthGate_TextPointers ; texts - dw ViridianForestSouthGate_Script ; scripts - db 0 ; connections - dw ViridianForestSouthGate_Object ; objects diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm deleted file mode 100755 index 9b27845c..00000000 --- a/data/mapHeaders/ViridianGym.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianGym_h: - db GYM ; tileset - db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x) - dw ViridianGym_Blocks ; blocks - dw ViridianGym_TextPointers ; texts - dw ViridianGym_Script ; scripts - db 0 ; connections - dw ViridianGym_Object ; objects diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm deleted file mode 100755 index 063f3327..00000000 --- a/data/mapHeaders/ViridianMart.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianMart_h: - db MART ; tileset - db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x) - dw ViridianMart_Blocks ; blocks - dw ViridianMart_TextPointers ; texts - dw ViridianMart_Script ; scripts - db 0 ; connections - dw ViridianMart_Object ; objects diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm deleted file mode 100755 index b6a00392..00000000 --- a/data/mapHeaders/ViridianNicknameHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianNicknameHouse_h: - db HOUSE ; tileset - db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x) - dw ViridianNicknameHouse_Blocks ; blocks - dw ViridianNicknameHouse_TextPointers ; texts - dw ViridianNicknameHouse_Script ; scripts - db 0 ; connections - dw ViridianNicknameHouse_Object ; objects diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm deleted file mode 100755 index 25c569d8..00000000 --- a/data/mapHeaders/ViridianPokecenter.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianPokecenter_h: - db POKECENTER ; tileset - db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x) - dw ViridianPokecenter_Blocks ; blocks - dw ViridianPokecenter_TextPointers ; texts - dw ViridianPokecenter_Script ; scripts - db 0 ; connections - dw ViridianPokecenter_Object ; objects diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm deleted file mode 100755 index 15e5c88f..00000000 --- a/data/mapHeaders/ViridianSchoolHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -ViridianSchoolHouse_h: - db HOUSE ; tileset - db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x) - dw ViridianSchoolHouse_Blocks ; blocks - dw ViridianSchoolHouse_TextPointers ; texts - dw ViridianSchoolHouse_Script ; scripts - db 0 ; connections - dw ViridianSchoolHouse_Object ; objects diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm deleted file mode 100755 index 128e357a..00000000 --- a/data/mapHeaders/WardensHouse.asm +++ /dev/null @@ -1,8 +0,0 @@ -WardensHouse_h: - db LAB ; tileset - db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x) - dw WardensHouse_Blocks ; blocks - dw WardensHouse_TextPointers ; texts - dw WardensHouse_Script ; scripts - db 0 ; connections - dw WardensHouse_Object ; objects diff --git a/data/mapObjects/AgathasRoom.asm b/data/mapObjects/AgathasRoom.asm deleted file mode 100755 index 4a82e78d..00000000 --- a/data/mapObjects/AgathasRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -AgathasRoom_Object: - db $0 ; border block - - db 4 ; warps - warp 4, 11, 2, BRUNOS_ROOM - warp 5, 11, 3, BRUNOS_ROOM - warp 4, 0, 0, LANCES_ROOM - warp 5, 0, 0, LANCES_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 - - ; warp-to - warp_to 4, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 11, AGATHAS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 4, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM - warp_to 5, 0, AGATHAS_ROOM_WIDTH ; LANCES_ROOM diff --git a/data/mapObjects/BikeShop.asm b/data/mapObjects/BikeShop.asm deleted file mode 100755 index 9f21ab3e..00000000 --- a/data/mapObjects/BikeShop.asm +++ /dev/null @@ -1,17 +0,0 @@ -BikeShop_Object: - db $e ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person - object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, BIKE_SHOP_WIDTH - warp_to 3, 7, BIKE_SHOP_WIDTH diff --git a/data/mapObjects/BillsHouse.asm b/data/mapObjects/BillsHouse.asm deleted file mode 100755 index c8f708cb..00000000 --- a/data/mapObjects/BillsHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -BillsHouse_Object: - db $d ; border block - - db 2 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, BILLS_HOUSE_WIDTH - warp_to 3, 7, BILLS_HOUSE_WIDTH diff --git a/data/mapObjects/BluesHouse.asm b/data/mapObjects/BluesHouse.asm deleted file mode 100755 index 45ca1286..00000000 --- a/data/mapObjects/BluesHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -BluesHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map - object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table - - ; warp-to - warp_to 2, 7, BLUES_HOUSE_WIDTH - warp_to 3, 7, BLUES_HOUSE_WIDTH diff --git a/data/mapObjects/BrunosRoom.asm b/data/mapObjects/BrunosRoom.asm deleted file mode 100755 index dde1e2dd..00000000 --- a/data/mapObjects/BrunosRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -BrunosRoom_Object: - db $3 ; border block - - db 4 ; warps - warp 4, 11, 2, LORELEIS_ROOM - warp 5, 11, 3, LORELEIS_ROOM - warp 4, 0, 0, AGATHAS_ROOM - warp 5, 0, 1, AGATHAS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 - - ; warp-to - warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM - warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM - warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM diff --git a/data/mapObjects/CeladonChiefHouse.asm b/data/mapObjects/CeladonChiefHouse.asm deleted file mode 100755 index 88850f35..00000000 --- a/data/mapObjects/CeladonChiefHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonChiefHouse_Object: - db $f ; border block - - db 2 ; warps - warp 2, 7, 11, -1 - warp 3, 7, 11, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person - object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person - - ; warp-to - warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH - warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH diff --git a/data/mapObjects/CeladonCity.asm b/data/mapObjects/CeladonCity.asm deleted file mode 100755 index 005fc61e..00000000 --- a/data/mapObjects/CeladonCity.asm +++ /dev/null @@ -1,54 +0,0 @@ -CeladonCity_Object: - db $f ; border block - - db 13 ; warps - warp 8, 13, 0, CELADON_MART_1F - warp 10, 13, 2, CELADON_MART_1F - warp 24, 9, 0, CELADON_MANSION_1F - warp 24, 3, 2, CELADON_MANSION_1F - warp 25, 3, 2, CELADON_MANSION_1F - warp 41, 9, 0, CELADON_POKECENTER - warp 12, 27, 0, CELADON_GYM - warp 28, 19, 0, GAME_CORNER - warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used - warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM - warp 31, 27, 0, CELADON_DINER - warp 35, 27, 0, CELADON_CHIEF_HOUSE - warp 43, 27, 0, CELADON_HOTEL - - db 9 ; signs - sign 27, 15, 10 ; CeladonCityText10 - sign 19, 15, 11 ; CeladonCityText11 - sign 42, 9, 12 ; PokeCenterSignText - sign 13, 29, 13 ; CeladonCityText13 - sign 21, 9, 14 ; CeladonCityText14 - sign 12, 13, 15 ; CeladonCityText15 - sign 39, 21, 16 ; CeladonCityText16 - sign 33, 21, 17 ; CeladonCityText17 - sign 27, 21, 18 ; CeladonCityText18 - - db 9 ; objects - object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person - object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person - object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person - object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person - object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person - object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person - object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person - object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person - object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person - - ; warp-to - warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F - warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F - warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER - warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM - warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER - warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F - warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM - warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER - warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE - warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL diff --git a/data/mapObjects/CeladonDiner.asm b/data/mapObjects/CeladonDiner.asm deleted file mode 100755 index 0a4a895d..00000000 --- a/data/mapObjects/CeladonDiner.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonDiner_Object: - db $f ; border block - - db 2 ; warps - warp 3, 7, 10, -1 - warp 4, 7, 10, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person - object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person - object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person - object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 3, 7, CELADON_DINER_WIDTH - warp_to 4, 7, CELADON_DINER_WIDTH diff --git a/data/mapObjects/CeladonGym.asm b/data/mapObjects/CeladonGym.asm deleted file mode 100755 index 98fce576..00000000 --- a/data/mapObjects/CeladonGym.asm +++ /dev/null @@ -1,22 +0,0 @@ -CeladonGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 6, -1 - warp 5, 17, 6, -1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 - object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 - object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 - object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 - object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 - object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 - object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 - object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 - - ; warp-to - warp_to 4, 17, CELADON_GYM_WIDTH - warp_to 5, 17, CELADON_GYM_WIDTH diff --git a/data/mapObjects/CeladonHotel.asm b/data/mapObjects/CeladonHotel.asm deleted file mode 100755 index f4aa1305..00000000 --- a/data/mapObjects/CeladonHotel.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonHotel_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 12, -1 - warp 4, 7, 12, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, CELADON_HOTEL_WIDTH - warp_to 4, 7, CELADON_HOTEL_WIDTH diff --git a/data/mapObjects/CeladonMansion1F.asm b/data/mapObjects/CeladonMansion1F.asm deleted file mode 100755 index 1abd434c..00000000 --- a/data/mapObjects/CeladonMansion1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeladonMansion1F_Object: - db $f ; border block - - db 5 ; warps - warp 4, 11, 2, -1 - warp 5, 11, 2, -1 - warp 4, 0, 4, -1 - warp 7, 1, 1, CELADON_MANSION_2F - warp 2, 1, 2, CELADON_MANSION_2F - - db 1 ; signs - sign 4, 9, 5 ; CeladonMansion1Text5 - - db 4 ; objects - object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person - object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person - object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person - - ; warp-to - warp_to 4, 11, CELADON_MANSION_1F_WIDTH - warp_to 5, 11, CELADON_MANSION_1F_WIDTH - warp_to 4, 0, CELADON_MANSION_1F_WIDTH - warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F - warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/mapObjects/CeladonMansion2F.asm deleted file mode 100755 index 09c94d29..00000000 --- a/data/mapObjects/CeladonMansion2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeladonMansion2F_Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_3F - warp 7, 1, 3, CELADON_MANSION_1F - warp 2, 1, 4, CELADON_MANSION_1F - warp 4, 1, 3, CELADON_MANSION_3F - - db 1 ; signs - sign 4, 9, 1 ; CeladonMansion2Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F - warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F - warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F - warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/mapObjects/CeladonMansion3F.asm deleted file mode 100755 index 32701f14..00000000 --- a/data/mapObjects/CeladonMansion3F.asm +++ /dev/null @@ -1,26 +0,0 @@ -CeladonMansion3F_Object: - db $f ; border block - - db 4 ; warps - warp 6, 1, 0, CELADON_MANSION_2F - warp 7, 1, 0, CELADON_MANSION_ROOF - warp 2, 1, 1, CELADON_MANSION_ROOF - warp 4, 1, 3, CELADON_MANSION_2F - - db 4 ; signs - sign 1, 3, 5 ; CeladonMansion3Text5 - sign 4, 3, 6 ; CeladonMansion3Text6 - sign 1, 6, 7 ; CeladonMansion3Text7 - sign 4, 9, 8 ; CeladonMansion3Text8 - - db 4 ; objects - object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person - object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person - object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person - - ; warp-to - warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F - warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF - warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF - warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/mapObjects/CeladonMansionRoof.asm deleted file mode 100755 index 353b0b96..00000000 --- a/data/mapObjects/CeladonMansionRoof.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeladonMansionRoof_Object: - db $9 ; border block - - db 3 ; warps - warp 6, 1, 1, CELADON_MANSION_3F - warp 2, 1, 2, CELADON_MANSION_3F - warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE - - db 1 ; signs - sign 3, 7, 1 ; CeladonMansion4Text1 - - db 0 ; objects - - ; warp-to - warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F - warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F - warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/mapObjects/CeladonMansionRoofHouse.asm deleted file mode 100755 index b6a6149f..00000000 --- a/data/mapObjects/CeladonMansionRoofHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeladonMansionRoofHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, CELADON_MANSION_ROOF - warp 3, 7, 2, CELADON_MANSION_ROOF - - db 0 ; signs - - db 2 ; objects - object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF - warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF diff --git a/data/mapObjects/CeladonMart1F.asm b/data/mapObjects/CeladonMart1F.asm deleted file mode 100755 index 2037369a..00000000 --- a/data/mapObjects/CeladonMart1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeladonMart1F_Object: - db $f ; border block - - db 6 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 16, 7, 1, -1 - warp 17, 7, 1, -1 - warp 12, 1, 0, CELADON_MART_2F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 2 ; signs - sign 11, 4, 2 ; CeladonMart1Text2 - sign 14, 1, 3 ; CeladonMart1Text3 - - db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 2, 7, CELADON_MART_1F_WIDTH - warp_to 3, 7, CELADON_MART_1F_WIDTH - warp_to 16, 7, CELADON_MART_1F_WIDTH - warp_to 17, 7, CELADON_MART_1F_WIDTH - warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F - warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart2F.asm b/data/mapObjects/CeladonMart2F.asm deleted file mode 100755 index 2f5f428e..00000000 --- a/data/mapObjects/CeladonMart2F.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart2F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 4, CELADON_MART_1F - warp 16, 1, 1, CELADON_MART_3F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 5 ; CeladonMart2Text5 - - db 4 ; objects - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person - object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F - warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F - warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart3F.asm b/data/mapObjects/CeladonMart3F.asm deleted file mode 100755 index 6dfce535..00000000 --- a/data/mapObjects/CeladonMart3F.asm +++ /dev/null @@ -1,33 +0,0 @@ -CeladonMart3F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_4F - warp 16, 1, 1, CELADON_MART_2F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 12 ; signs - sign 2, 4, 6 ; CeladonMart3Text6 - sign 3, 4, 7 ; CeladonMart3Text7 - sign 5, 4, 8 ; CeladonMart3Text8 - sign 6, 4, 9 ; CeladonMart3Text9 - sign 2, 6, 10 ; CeladonMart3Text10 - sign 3, 6, 11 ; CeladonMart3Text11 - sign 5, 6, 12 ; CeladonMart3Text12 - sign 6, 6, 13 ; CeladonMart3Text13 - sign 14, 1, 14 ; CeladonMart3Text14 - sign 4, 1, 15 ; CeladonMart3Text15 - sign 6, 1, 16 ; CeladonMart3Text16 - sign 10, 1, 17 ; CeladonMart3Text17 - - db 5 ; objects - object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person - object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person - object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person - object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F - warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F - warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart4F.asm b/data/mapObjects/CeladonMart4F.asm deleted file mode 100755 index 18ba3bdc..00000000 --- a/data/mapObjects/CeladonMart4F.asm +++ /dev/null @@ -1,20 +0,0 @@ -CeladonMart4F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_3F - warp 16, 1, 1, CELADON_MART_5F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 4 ; CeladonMart4Text4 - - db 3 ; objects - object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person - object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F - warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F - warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMart5F.asm b/data/mapObjects/CeladonMart5F.asm deleted file mode 100755 index fb1201c9..00000000 --- a/data/mapObjects/CeladonMart5F.asm +++ /dev/null @@ -1,21 +0,0 @@ -CeladonMart5F_Object: - db $f ; border block - - db 3 ; warps - warp 12, 1, 0, CELADON_MART_ROOF - warp 16, 1, 1, CELADON_MART_4F - warp 1, 1, 0, CELADON_MART_ELEVATOR - - db 1 ; signs - sign 14, 1, 5 ; CeladonMart5Text5 - - db 4 ; objects - object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person - object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF - warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F - warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/mapObjects/CeladonMartElevator.asm deleted file mode 100755 index 9688daef..00000000 --- a/data/mapObjects/CeladonMartElevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -CeladonMartElevator_Object: - db $f ; border block - - db 2 ; warps - warp 1, 3, 5, CELADON_MART_1F - warp 2, 3, 5, CELADON_MART_1F - - db 1 ; signs - sign 3, 0, 1 ; CeladonMartElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F - warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F diff --git a/data/mapObjects/CeladonMartRoof.asm b/data/mapObjects/CeladonMartRoof.asm deleted file mode 100755 index 05cef2d4..00000000 --- a/data/mapObjects/CeladonMartRoof.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeladonMartRoof_Object: - db $42 ; border block - - db 1 ; warps - warp 15, 2, 0, CELADON_MART_5F - - db 4 ; signs - sign 10, 1, 3 ; CeladonMartRoofText3 - sign 11, 1, 4 ; CeladonMartRoofText4 - sign 12, 2, 5 ; CeladonMartRoofText5 - sign 13, 2, 6 ; CeladonMartRoofText6 - - db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person - - ; warp-to - warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F diff --git a/data/mapObjects/CeladonPokecenter.asm b/data/mapObjects/CeladonPokecenter.asm deleted file mode 100755 index da5d595f..00000000 --- a/data/mapObjects/CeladonPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeladonPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, CELADON_POKECENTER_WIDTH - warp_to 4, 7, CELADON_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanBadgeHouse.asm b/data/mapObjects/CeruleanBadgeHouse.asm deleted file mode 100755 index 62a6873b..00000000 --- a/data/mapObjects/CeruleanBadgeHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanBadgeHouse_Object: - db $c ; border block - - db 3 ; warps - warp 2, 0, 9, -1 - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH - warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH - warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm deleted file mode 100755 index f9670482..00000000 --- a/data/mapObjects/CeruleanCave1F.asm +++ /dev/null @@ -1,31 +0,0 @@ -CeruleanCave1F_Object: - db $7d ; border block - - db 9 ; warps - warp 24, 17, 6, -1 - warp 25, 17, 6, -1 - warp 27, 1, 0, CERULEAN_CAVE_2F - warp 23, 7, 1, CERULEAN_CAVE_2F - warp 18, 9, 2, CERULEAN_CAVE_2F - warp 7, 1, 3, CERULEAN_CAVE_2F - warp 1, 3, 4, CERULEAN_CAVE_2F - warp 3, 11, 5, CERULEAN_CAVE_2F - warp 0, 6, 0, CERULEAN_CAVE_B1F - - db 0 ; signs - - db 3 ; objects - object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER - object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET - - ; warp-to - warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH - warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH - warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F - warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm deleted file mode 100755 index f8312da0..00000000 --- a/data/mapObjects/CeruleanCave2F.asm +++ /dev/null @@ -1,25 +0,0 @@ -CeruleanCave2F_Object: - db $7d ; border block - - db 6 ; warps - warp 29, 1, 2, CERULEAN_CAVE_1F - warp 22, 6, 3, CERULEAN_CAVE_1F - warp 19, 7, 4, CERULEAN_CAVE_1F - warp 9, 1, 5, CERULEAN_CAVE_1F - warp 1, 3, 6, CERULEAN_CAVE_1F - warp 3, 11, 7, CERULEAN_CAVE_1F - - db 0 ; signs - - db 3 ; objects - object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP - object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE - - ; warp-to - warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCaveB1F.asm b/data/mapObjects/CeruleanCaveB1F.asm deleted file mode 100755 index 461f77aa..00000000 --- a/data/mapObjects/CeruleanCaveB1F.asm +++ /dev/null @@ -1,15 +0,0 @@ -CeruleanCaveB1F_Object: - db $7d ; border block - - db 1 ; warps - warp 3, 6, 8, CERULEAN_CAVE_1F - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE - - ; warp-to - warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/mapObjects/CeruleanCity.asm b/data/mapObjects/CeruleanCity.asm deleted file mode 100755 index d5adcfd7..00000000 --- a/data/mapObjects/CeruleanCity.asm +++ /dev/null @@ -1,47 +0,0 @@ -CeruleanCity_Object: - db $f ; border block - - db 10 ; warps - warp 27, 11, 0, CERULEAN_TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_TRADE_HOUSE - warp 19, 17, 0, CERULEAN_POKECENTER - warp 30, 19, 0, CERULEAN_GYM - warp 13, 25, 0, BIKE_SHOP - warp 25, 25, 0, CERULEAN_MART - warp 4, 11, 0, CERULEAN_CAVE_1F - warp 27, 9, 2, CERULEAN_TRASHED_HOUSE - warp 9, 11, 1, CERULEAN_BADGE_HOUSE - warp 9, 9, 0, CERULEAN_BADGE_HOUSE - - db 6 ; signs - sign 23, 19, 12 ; CeruleanCityText12 - sign 17, 29, 13 ; CeruleanCityText13 - sign 26, 25, 14 ; MartSignText - sign 20, 17, 15 ; PokeCenterSignText - sign 11, 25, 16 ; CeruleanCityText16 - sign 27, 21, 17 ; CeruleanCityText17 - - db 11 ; objects - object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 - object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person - object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person - object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person - object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person - object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person - object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person - object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person - - ; warp-to - warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE - warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE - warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER - warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM - warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP - warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART - warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F - warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE - warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE - warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE diff --git a/data/mapObjects/CeruleanGym.asm b/data/mapObjects/CeruleanGym.asm deleted file mode 100755 index 96713648..00000000 --- a/data/mapObjects/CeruleanGym.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeruleanGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 13, 3, -1 - warp 5, 13, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 - object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 - object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 4, 13, CERULEAN_GYM_WIDTH - warp_to 5, 13, CERULEAN_GYM_WIDTH diff --git a/data/mapObjects/CeruleanMart.asm b/data/mapObjects/CeruleanMart.asm deleted file mode 100755 index 4659375f..00000000 --- a/data/mapObjects/CeruleanMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -CeruleanMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person - object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, CERULEAN_MART_WIDTH - warp_to 4, 7, CERULEAN_MART_WIDTH diff --git a/data/mapObjects/CeruleanPokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm deleted file mode 100755 index f65db52c..00000000 --- a/data/mapObjects/CeruleanPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -CeruleanPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person - object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, CERULEAN_POKECENTER_WIDTH - warp_to 4, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/mapObjects/CeruleanTradeHouse.asm b/data/mapObjects/CeruleanTradeHouse.asm deleted file mode 100755 index a4a46e9b..00000000 --- a/data/mapObjects/CeruleanTradeHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -CeruleanTradeHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH - warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/CeruleanTrashedHouse.asm b/data/mapObjects/CeruleanTrashedHouse.asm deleted file mode 100755 index 44b7cf20..00000000 --- a/data/mapObjects/CeruleanTrashedHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -CeruleanTrashedHouse_Object: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 3, 0, 7, -1 - - db 1 ; signs - sign 3, 0, 3 ; CeruleanHouseTrashedText3 - - db 2 ; objects - object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person - object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person - - ; warp-to - warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH - warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH - warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH diff --git a/data/mapObjects/ChampionsRoom.asm b/data/mapObjects/ChampionsRoom.asm deleted file mode 100755 index 1e0cb7f4..00000000 --- a/data/mapObjects/ChampionsRoom.asm +++ /dev/null @@ -1,20 +0,0 @@ -ChampionsRoom_Object: - db $3 ; border block - - db 4 ; warps - warp 3, 7, 1, LANCES_ROOM - warp 4, 7, 2, LANCES_ROOM - warp 3, 0, 0, HALL_OF_FAME - warp 4, 0, 0, HALL_OF_FAME - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person - - ; warp-to - warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME - warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME diff --git a/data/mapObjects/CinnabarGym.asm b/data/mapObjects/CinnabarGym.asm deleted file mode 100755 index ab204d43..00000000 --- a/data/mapObjects/CinnabarGym.asm +++ /dev/null @@ -1,23 +0,0 @@ -CinnabarGym_Object: - db $2e ; border block - - db 2 ; warps - warp 16, 17, 1, -1 - warp 17, 17, 1, -1 - - db 0 ; signs - - db 9 ; objects - object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 - object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 - object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 - object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 - object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 - object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 - object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 - object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person - - ; warp-to - warp_to 16, 17, CINNABAR_GYM_WIDTH - warp_to 17, 17, CINNABAR_GYM_WIDTH diff --git a/data/mapObjects/CinnabarIsland.asm b/data/mapObjects/CinnabarIsland.asm deleted file mode 100755 index 1932e134..00000000 --- a/data/mapObjects/CinnabarIsland.asm +++ /dev/null @@ -1,27 +0,0 @@ -CinnabarIsland_Object: - db $43 ; border block - - db 5 ; warps - warp 6, 3, 1, POKEMON_MANSION_1F - warp 18, 3, 0, CINNABAR_GYM - warp 6, 9, 0, CINNABAR_LAB - warp 11, 11, 0, CINNABAR_POKECENTER - warp 15, 11, 0, CINNABAR_MART - - db 5 ; signs - sign 9, 5, 3 ; CinnabarIslandText3 - sign 16, 11, 4 ; MartSignText - sign 12, 11, 5 ; PokeCenterSignText - sign 9, 11, 6 ; CinnabarIslandText6 - sign 13, 3, 7 ; CinnabarIslandText7 - - db 2 ; objects - object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person - - ; warp-to - warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F - warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM - warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB - warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER - warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm deleted file mode 100755 index deb5d8ed..00000000 --- a/data/mapObjects/CinnabarLab.asm +++ /dev/null @@ -1,25 +0,0 @@ -CinnabarLab_Object: - db $17 ; border block - - db 5 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM - warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM - warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM - - db 4 ; signs - sign 3, 2, 2 ; Lab1Text2 - sign 9, 4, 3 ; Lab1Text3 - sign 13, 4, 4 ; Lab1Text4 - sign 17, 4, 5 ; Lab1Text5 - - db 1 ; objects - object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_WIDTH - warp_to 3, 7, CINNABAR_LAB_WIDTH - warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM - warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM - warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/mapObjects/CinnabarLabFossilRoom.asm deleted file mode 100755 index d31502e6..00000000 --- a/data/mapObjects/CinnabarLabFossilRoom.asm +++ /dev/null @@ -1,16 +0,0 @@ -CinnabarLabFossilRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 4, CINNABAR_LAB - warp 3, 7, 4, CINNABAR_LAB - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarLabMetronomeRoom.asm b/data/mapObjects/CinnabarLabMetronomeRoom.asm deleted file mode 100755 index 37f93d43..00000000 --- a/data/mapObjects/CinnabarLabMetronomeRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -CinnabarLabMetronomeRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 3, CINNABAR_LAB - warp 3, 7, 3, CINNABAR_LAB - - db 3 ; signs - sign 0, 4, 3 ; Lab3Text3 - sign 1, 4, 4 ; Lab3Text4 - sign 2, 1, 5 ; Lab3Text5 - - db 2 ; objects - object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/mapObjects/CinnabarLabTradeRoom.asm deleted file mode 100755 index 449cc914..00000000 --- a/data/mapObjects/CinnabarLabTradeRoom.asm +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarLabTradeRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 2, CINNABAR_LAB - warp 3, 7, 2, CINNABAR_LAB - - db 0 ; signs - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person - - ; warp-to - warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/mapObjects/CinnabarMart.asm b/data/mapObjects/CinnabarMart.asm deleted file mode 100755 index af88ddf0..00000000 --- a/data/mapObjects/CinnabarMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -CinnabarMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, CINNABAR_MART_WIDTH - warp_to 4, 7, CINNABAR_MART_WIDTH diff --git a/data/mapObjects/CinnabarPokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm deleted file mode 100755 index 9583ef2a..00000000 --- a/data/mapObjects/CinnabarPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -CinnabarPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person - object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, CINNABAR_POKECENTER_WIDTH - warp_to 4, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/mapObjects/Colosseum.asm b/data/mapObjects/Colosseum.asm deleted file mode 100755 index 18762584..00000000 --- a/data/mapObjects/Colosseum.asm +++ /dev/null @@ -1,9 +0,0 @@ -Colosseum_Object: - db $e ; border block - - db 0 ; warps - - db 0 ; signs - - db 1 ; objects - object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/CopycatsHouse1F.asm b/data/mapObjects/CopycatsHouse1F.asm deleted file mode 100755 index cb4dbb0b..00000000 --- a/data/mapObjects/CopycatsHouse1F.asm +++ /dev/null @@ -1,19 +0,0 @@ -CopycatsHouse1F_Object: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 7, 1, 0, COPYCATS_HOUSE_2F - - db 0 ; signs - - db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person - object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person - - ; warp-to - warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH - warp_to 3, 7, COPYCATS_HOUSE_1F_WIDTH - warp_to 7, 1, COPYCATS_HOUSE_1F_WIDTH ; COPYCATS_HOUSE_2F diff --git a/data/mapObjects/CopycatsHouse2F.asm b/data/mapObjects/CopycatsHouse2F.asm deleted file mode 100755 index 18b56419..00000000 --- a/data/mapObjects/CopycatsHouse2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -CopycatsHouse2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 1, 2, COPYCATS_HOUSE_1F - - db 2 ; signs - sign 3, 5, 6 ; CopycatsHouse2FText6 - sign 0, 1, 7 ; CopycatsHouse2FText7 - - db 5 ; objects - object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person - object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person - object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person - object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person - - ; warp-to - warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/Daycare.asm b/data/mapObjects/Daycare.asm deleted file mode 100755 index c58c83e4..00000000 --- a/data/mapObjects/Daycare.asm +++ /dev/null @@ -1,15 +0,0 @@ -Daycare_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, DAYCARE_WIDTH - warp_to 3, 7, DAYCARE_WIDTH diff --git a/data/mapObjects/DiglettsCave.asm b/data/mapObjects/DiglettsCave.asm deleted file mode 100755 index b4fd0af8..00000000 --- a/data/mapObjects/DiglettsCave.asm +++ /dev/null @@ -1,14 +0,0 @@ -DiglettsCave_Object: - db $19 ; border block - - db 2 ; warps - warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2 - warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2 - warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/DiglettsCaveRoute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm deleted file mode 100755 index a4c70f06..00000000 --- a/data/mapObjects/DiglettsCaveRoute11.asm +++ /dev/null @@ -1,17 +0,0 @@ -DiglettsCaveRoute11_Object: - db $7d ; border block - - db 3 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - warp 4, 4, 1, DIGLETTS_CAVE - - db 0 ; signs - - db 1 ; objects - object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/DiglettsCaveRoute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm deleted file mode 100755 index 0567fee6..00000000 --- a/data/mapObjects/DiglettsCaveRoute2.asm +++ /dev/null @@ -1,17 +0,0 @@ -DiglettsCaveRoute2_Object: - db $7d ; border block - - db 3 ; warps - warp 2, 7, 0, -1 - warp 3, 7, 0, -1 - warp 4, 4, 0, DIGLETTS_CAVE - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH - warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH - warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE diff --git a/data/mapObjects/FightingDojo.asm b/data/mapObjects/FightingDojo.asm deleted file mode 100755 index fdc7b838..00000000 --- a/data/mapObjects/FightingDojo.asm +++ /dev/null @@ -1,21 +0,0 @@ -FightingDojo_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 11, 1, -1 - warp 5, 11, 1, -1 - - db 0 ; signs - - db 7 ; objects - object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 - object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 - object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 - object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 - object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 - object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person - object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person - - ; warp-to - warp_to 4, 11, FIGHTING_DOJO_WIDTH - warp_to 5, 11, FIGHTING_DOJO_WIDTH diff --git a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm deleted file mode 100755 index 363b56f9..00000000 --- a/data/mapObjects/FuchsiaBillsGrandpasHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaBillsGrandpasHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person - object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH - warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH diff --git a/data/mapObjects/FuchsiaCity.asm b/data/mapObjects/FuchsiaCity.asm deleted file mode 100755 index 09c97b02..00000000 --- a/data/mapObjects/FuchsiaCity.asm +++ /dev/null @@ -1,52 +0,0 @@ -FuchsiaCity_Object: - db $f ; border block - - db 9 ; warps - warp 5, 13, 0, FUCHSIA_MART - warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE - warp 19, 27, 0, FUCHSIA_POKECENTER - warp 27, 27, 0, WARDENS_HOUSE - warp 18, 3, 0, SAFARI_ZONE_GATE - warp 5, 27, 0, FUCHSIA_GYM - warp 22, 13, 0, FUCHSIA_MEETING_ROOM - warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE - warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE - - db 14 ; signs - sign 15, 23, 11 ; FuchsiaCityText11 - sign 25, 15, 12 ; FuchsiaCityText12 - sign 17, 5, 13 ; FuchsiaCityText13 - sign 6, 13, 14 ; MartSignText - sign 20, 27, 15 ; PokeCenterSignText - sign 27, 29, 16 ; FuchsiaCityText16 - sign 21, 15, 17 ; FuchsiaCityText17 - sign 5, 29, 18 ; FuchsiaCityText18 - sign 33, 7, 19 ; FuchsiaCityText19 - sign 27, 7, 20 ; FuchsiaCityText20 - sign 13, 7, 21 ; FuchsiaCityText21 - sign 31, 13, 22 ; FuchsiaCityText22 - sign 13, 15, 23 ; FuchsiaCityText23 - sign 7, 7, 24 ; FuchsiaCityText24 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person - object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person - object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person - object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person - object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person - object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person - object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person - object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person - object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person - - ; warp-to - warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE - warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE - warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE - warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM - warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE - warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/mapObjects/FuchsiaGoodRodHouse.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm deleted file mode 100755 index 390447c8..00000000 --- a/data/mapObjects/FuchsiaGoodRodHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaGoodRodHouse_Object: - db $c ; border block - - db 3 ; warps - warp 2, 0, 8, -1 - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH - warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH - warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/FuchsiaGym.asm b/data/mapObjects/FuchsiaGym.asm deleted file mode 100755 index 5d707d53..00000000 --- a/data/mapObjects/FuchsiaGym.asm +++ /dev/null @@ -1,22 +0,0 @@ -FuchsiaGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 5, -1 - warp 5, 17, 5, -1 - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 - object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 - object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 - object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 - object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 - object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 - object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 - object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person - - ; warp-to - warp_to 4, 17, FUCHSIA_GYM_WIDTH - warp_to 5, 17, FUCHSIA_GYM_WIDTH diff --git a/data/mapObjects/FuchsiaMart.asm b/data/mapObjects/FuchsiaMart.asm deleted file mode 100755 index cfa71d8d..00000000 --- a/data/mapObjects/FuchsiaMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person - - ; warp-to - warp_to 3, 7, FUCHSIA_MART_WIDTH - warp_to 4, 7, FUCHSIA_MART_WIDTH diff --git a/data/mapObjects/FuchsiaMeetingRoom.asm b/data/mapObjects/FuchsiaMeetingRoom.asm deleted file mode 100755 index 9130d920..00000000 --- a/data/mapObjects/FuchsiaMeetingRoom.asm +++ /dev/null @@ -1,17 +0,0 @@ -FuchsiaMeetingRoom_Object: - db $17 ; border block - - db 2 ; warps - warp 4, 7, 6, -1 - warp 5, 7, 6, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person - object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person - object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH - warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/mapObjects/FuchsiaPokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm deleted file mode 100755 index 73dc529d..00000000 --- a/data/mapObjects/FuchsiaPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -FuchsiaPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH - warp_to 4, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/mapObjects/GameCorner.asm b/data/mapObjects/GameCorner.asm deleted file mode 100755 index 2704f6ab..00000000 --- a/data/mapObjects/GameCorner.asm +++ /dev/null @@ -1,28 +0,0 @@ -GameCorner_Object: - db $f ; border block - - db 3 ; warps - warp 15, 17, 7, -1 - warp 16, 17, 7, -1 - warp 17, 4, 1, ROCKET_HIDEOUT_B1F - - db 1 ; signs - sign 9, 4, 12 ; CeladonGameCornerText12 - - db 11 ; objects - object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person - object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person - object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person - object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person - object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person - object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person - object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person - object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 - - ; warp-to - warp_to 15, 17, GAME_CORNER_WIDTH - warp_to 16, 17, GAME_CORNER_WIDTH - warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/GameCornerPrizeRoom.asm b/data/mapObjects/GameCornerPrizeRoom.asm deleted file mode 100755 index 35cd3ac8..00000000 --- a/data/mapObjects/GameCornerPrizeRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -GameCornerPrizeRoom_Object: - db $f ; border block - - db 2 ; warps - warp 4, 7, 9, -1 - warp 5, 7, 9, -1 - - db 3 ; signs - sign 2, 2, 3 ; CeladonPrizeRoomText3 - sign 4, 2, 4 ; CeladonPrizeRoomText4 - sign 6, 2, 5 ; CeladonPrizeRoomText5 - - db 2 ; objects - object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person - object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person - - ; warp-to - warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH - warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH diff --git a/data/mapObjects/HallOfFame.asm b/data/mapObjects/HallOfFame.asm deleted file mode 100755 index 3762d871..00000000 --- a/data/mapObjects/HallOfFame.asm +++ /dev/null @@ -1,15 +0,0 @@ -HallOfFame_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 7, 2, CHAMPIONS_ROOM - warp 5, 7, 3, CHAMPIONS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM - warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/IndigoPlateau.asm b/data/mapObjects/IndigoPlateau.asm deleted file mode 100755 index 1447be11..00000000 --- a/data/mapObjects/IndigoPlateau.asm +++ /dev/null @@ -1,14 +0,0 @@ -IndigoPlateau_Object: - db $e ; border block - - db 2 ; warps - warp 9, 5, 0, INDIGO_PLATEAU_LOBBY - warp 10, 5, 0, INDIGO_PLATEAU_LOBBY - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 9, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 10, 5, INDIGO_PLATEAU_WIDTH ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/IndigoPlateauLobby.asm b/data/mapObjects/IndigoPlateauLobby.asm deleted file mode 100755 index ea113a16..00000000 --- a/data/mapObjects/IndigoPlateauLobby.asm +++ /dev/null @@ -1,21 +0,0 @@ -IndigoPlateauLobby_Object: - db $0 ; border block - - db 3 ; warps - warp 7, 11, 0, -1 - warp 8, 11, 1, -1 - warp 8, 0, 0, LORELEIS_ROOM - - db 0 ; signs - - db 5 ; objects - object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person - object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person - object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH - warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM diff --git a/data/mapObjects/LancesRoom.asm b/data/mapObjects/LancesRoom.asm deleted file mode 100755 index 6f22631a..00000000 --- a/data/mapObjects/LancesRoom.asm +++ /dev/null @@ -1,17 +0,0 @@ -LancesRoom_Object: - db $3 ; border block - - db 3 ; warps - warp 24, 16, 2, AGATHAS_ROOM - warp 5, 0, 0, CHAMPIONS_ROOM - warp 6, 0, 0, CHAMPIONS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 - - ; warp-to - warp_to 24, 16, LANCES_ROOM_WIDTH ; AGATHAS_ROOM - warp_to 5, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM - warp_to 6, 0, LANCES_ROOM_WIDTH ; CHAMPIONS_ROOM diff --git a/data/mapObjects/LavenderCuboneHouse.asm b/data/mapObjects/LavenderCuboneHouse.asm deleted file mode 100755 index 96f1b3ba..00000000 --- a/data/mapObjects/LavenderCuboneHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -LavenderCuboneHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person - object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH - warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH diff --git a/data/mapObjects/LavenderMart.asm b/data/mapObjects/LavenderMart.asm deleted file mode 100755 index df14ad39..00000000 --- a/data/mapObjects/LavenderMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -LavenderMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, LAVENDER_MART_WIDTH - warp_to 4, 7, LAVENDER_MART_WIDTH diff --git a/data/mapObjects/LavenderPokecenter.asm b/data/mapObjects/LavenderPokecenter.asm deleted file mode 100755 index 89e25571..00000000 --- a/data/mapObjects/LavenderPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -LavenderPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person - object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, LAVENDER_POKECENTER_WIDTH - warp_to 4, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/mapObjects/LavenderTown.asm b/data/mapObjects/LavenderTown.asm deleted file mode 100755 index 4aead666..00000000 --- a/data/mapObjects/LavenderTown.asm +++ /dev/null @@ -1,31 +0,0 @@ -LavenderTown_Object: - db $2c ; border block - - db 6 ; warps - warp 3, 5, 0, LAVENDER_POKECENTER - warp 14, 5, 0, POKEMON_TOWER_1F - warp 7, 9, 0, MR_FUJIS_HOUSE - warp 15, 13, 0, LAVENDER_MART - warp 3, 13, 0, LAVENDER_CUBONE_HOUSE - warp 7, 13, 0, NAME_RATERS_HOUSE - - db 6 ; signs - sign 11, 9, 4 ; LavenderTownText4 - sign 9, 3, 5 ; LavenderTownText5 - sign 16, 13, 6 ; MartSignText - sign 4, 5, 7 ; PokeCenterSignText - sign 5, 9, 8 ; LavenderTownText8 - sign 17, 7, 9 ; LavenderTownText9 - - db 3 ; objects - object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER - warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F - warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE - warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART - warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE - warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE diff --git a/data/mapObjects/LoreleisRoom.asm b/data/mapObjects/LoreleisRoom.asm deleted file mode 100755 index 06450bb4..00000000 --- a/data/mapObjects/LoreleisRoom.asm +++ /dev/null @@ -1,19 +0,0 @@ -LoreleisRoom_Object: - db $3 ; border block - - db 4 ; warps - warp 4, 11, 2, INDIGO_PLATEAU_LOBBY - warp 5, 11, 2, INDIGO_PLATEAU_LOBBY - warp 4, 0, 0, BRUNOS_ROOM - warp 5, 0, 1, BRUNOS_ROOM - - db 0 ; signs - - db 1 ; objects - object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 - - ; warp-to - warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY - warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM - warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM diff --git a/data/mapObjects/MrFujisHouse.asm b/data/mapObjects/MrFujisHouse.asm deleted file mode 100755 index 5b6ca2a6..00000000 --- a/data/mapObjects/MrFujisHouse.asm +++ /dev/null @@ -1,20 +0,0 @@ -MrFujisHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person - object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person - object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person - - ; warp-to - warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH - warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH diff --git a/data/mapObjects/MrPsychicsHouse.asm b/data/mapObjects/MrPsychicsHouse.asm deleted file mode 100755 index 01f9e11c..00000000 --- a/data/mapObjects/MrPsychicsHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -MrPsychicsHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH - warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH diff --git a/data/mapObjects/MtMoon1F.asm b/data/mapObjects/MtMoon1F.asm deleted file mode 100755 index 56820161..00000000 --- a/data/mapObjects/MtMoon1F.asm +++ /dev/null @@ -1,34 +0,0 @@ -MtMoon1F_Object: - db $3 ; border block - - db 5 ; warps - warp 14, 35, 1, -1 - warp 15, 35, 1, -1 - warp 5, 5, 0, MT_MOON_B1F - warp 17, 11, 2, MT_MOON_B1F - warp 25, 15, 3, MT_MOON_B1F - - db 1 ; signs - sign 15, 23, 14 ; MtMoon1Text14 - - db 13 ; objects - object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 - object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 - object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 - object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 - object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 - object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 - object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 - object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION - object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE - object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY - object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE - object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION - object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12 - - ; warp-to - warp_to 14, 35, MT_MOON_1F_WIDTH - warp_to 15, 35, MT_MOON_1F_WIDTH - warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F - warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F - warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonB1F.asm b/data/mapObjects/MtMoonB1F.asm deleted file mode 100755 index a8365ba7..00000000 --- a/data/mapObjects/MtMoonB1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -MtMoonB1F_Object: - db $3 ; border block - - db 8 ; warps - warp 5, 5, 2, MT_MOON_1F - warp 17, 11, 0, MT_MOON_B2F - warp 25, 9, 3, MT_MOON_1F - warp 25, 15, 4, MT_MOON_1F - warp 21, 17, 1, MT_MOON_B2F - warp 13, 27, 2, MT_MOON_B2F - warp 23, 3, 3, MT_MOON_B2F - warp 27, 3, 2, -1 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 27, 3, MT_MOON_B1F_WIDTH diff --git a/data/mapObjects/MtMoonB2F.asm b/data/mapObjects/MtMoonB2F.asm deleted file mode 100755 index 27b2383f..00000000 --- a/data/mapObjects/MtMoonB2F.asm +++ /dev/null @@ -1,27 +0,0 @@ -MtMoonB2F_Object: - db $3 ; border block - - db 4 ; warps - warp 25, 9, 1, MT_MOON_B1F - warp 21, 17, 4, MT_MOON_B1F - warp 15, 27, 5, MT_MOON_B1F - warp 5, 7, 6, MT_MOON_B1F - - db 0 ; signs - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 - object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 - object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 - object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 - object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 - object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person - object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person - object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP - object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01 - - ; warp-to - warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F - warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F - warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F - warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/MtMoonPokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm deleted file mode 100755 index b23703e6..00000000 --- a/data/mapObjects/MtMoonPokecenter.asm +++ /dev/null @@ -1,20 +0,0 @@ -MtMoonPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 6 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person - object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person - object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person - object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 3, 7, MT_MOON_POKECENTER_WIDTH - warp_to 4, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/mapObjects/Museum1F.asm b/data/mapObjects/Museum1F.asm deleted file mode 100755 index 1cfd2c68..00000000 --- a/data/mapObjects/Museum1F.asm +++ /dev/null @@ -1,25 +0,0 @@ -Museum1F_Object: - db $a ; border block - - db 5 ; warps - warp 10, 7, 0, -1 - warp 11, 7, 0, -1 - warp 16, 7, 1, -1 - warp 17, 7, 1, -1 - warp 7, 7, 0, MUSEUM_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person - object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person - object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person - object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person - - ; warp-to - warp_to 10, 7, MUSEUM_1F_WIDTH - warp_to 11, 7, MUSEUM_1F_WIDTH - warp_to 16, 7, MUSEUM_1F_WIDTH - warp_to 17, 7, MUSEUM_1F_WIDTH - warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F diff --git a/data/mapObjects/Museum2F.asm b/data/mapObjects/Museum2F.asm deleted file mode 100755 index 80815820..00000000 --- a/data/mapObjects/Museum2F.asm +++ /dev/null @@ -1,19 +0,0 @@ -Museum2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, MUSEUM_1F - - db 2 ; signs - sign 11, 2, 6 ; Museum2FText6 - sign 2, 5, 7 ; Museum2FText7 - - db 5 ; objects - object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person - object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person - object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person - object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person - object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F diff --git a/data/mapObjects/NameRatersHouse.asm b/data/mapObjects/NameRatersHouse.asm deleted file mode 100755 index da95bc43..00000000 --- a/data/mapObjects/NameRatersHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -NameRatersHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 5, -1 - warp 3, 7, 5, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH - warp_to 3, 7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/mapObjects/OaksLab.asm b/data/mapObjects/OaksLab.asm deleted file mode 100755 index fa78ccdf..00000000 --- a/data/mapObjects/OaksLab.asm +++ /dev/null @@ -1,25 +0,0 @@ -OaksLab_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 11, 2, -1 - warp 5, 11, 2, -1 - - db 0 ; signs - - db 11 ; objects - object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 - object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person - object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person - object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person - object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person - object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person - object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person - object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person - object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person - object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person - - ; warp-to - warp_to 4, 11, OAKS_LAB_WIDTH - warp_to 5, 11, OAKS_LAB_WIDTH diff --git a/data/mapObjects/PalletTown.asm b/data/mapObjects/PalletTown.asm deleted file mode 100755 index 68b01175..00000000 --- a/data/mapObjects/PalletTown.asm +++ /dev/null @@ -1,23 +0,0 @@ -PalletTown_Object: - db $b ; border block - - db 3 ; warps - warp 5, 5, 0, REDS_HOUSE_1F - warp 13, 5, 0, BLUES_HOUSE - warp 12, 11, 1, OAKS_LAB - - db 4 ; signs - sign 13, 13, 4 ; PalletTownText4 - sign 7, 9, 5 ; PalletTownText5 - sign 3, 5, 6 ; PalletTownText6 - sign 11, 5, 7 ; PalletTownText7 - - db 3 ; objects - object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person - object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person - object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person - - ; warp-to - warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F - warp_to 13, 5, PALLET_TOWN_WIDTH ; BLUES_HOUSE - warp_to 12, 11, PALLET_TOWN_WIDTH ; OAKS_LAB diff --git a/data/mapObjects/PewterCity.asm b/data/mapObjects/PewterCity.asm deleted file mode 100755 index e1a3eecb..00000000 --- a/data/mapObjects/PewterCity.asm +++ /dev/null @@ -1,36 +0,0 @@ -PewterCity_Object: - db $a ; border block - - db 7 ; warps - warp 14, 7, 0, MUSEUM_1F - warp 19, 5, 2, MUSEUM_1F - warp 16, 17, 0, PEWTER_GYM - warp 29, 13, 0, PEWTER_NIDORAN_HOUSE - warp 23, 17, 0, PEWTER_MART - warp 7, 29, 0, PEWTER_SPEECH_HOUSE - warp 13, 25, 0, PEWTER_POKECENTER - - db 7 ; signs - sign 19, 29, 6 ; PewterCityText6 - sign 33, 19, 7 ; PewterCityText7 - sign 24, 17, 8 ; MartSignText - sign 14, 25, 9 ; PokeCenterSignText - sign 15, 9, 10 ; PewterCityText10 - sign 11, 17, 11 ; PewterCityText11 - sign 25, 23, 12 ; PewterCityText12 - - db 5 ; objects - object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person - object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F - warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM - warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE - warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART - warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE - warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER diff --git a/data/mapObjects/PewterGym.asm b/data/mapObjects/PewterGym.asm deleted file mode 100755 index 538c3923..00000000 --- a/data/mapObjects/PewterGym.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 13, 2, -1 - warp 5, 13, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 - object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 4, 13, PEWTER_GYM_WIDTH - warp_to 5, 13, PEWTER_GYM_WIDTH diff --git a/data/mapObjects/PewterMart.asm b/data/mapObjects/PewterMart.asm deleted file mode 100755 index 9b983316..00000000 --- a/data/mapObjects/PewterMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, PEWTER_MART_WIDTH - warp_to 4, 7, PEWTER_MART_WIDTH diff --git a/data/mapObjects/PewterNidoranHouse.asm b/data/mapObjects/PewterNidoranHouse.asm deleted file mode 100755 index f00317d1..00000000 --- a/data/mapObjects/PewterNidoranHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -PewterNidoranHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person - object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH - warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH diff --git a/data/mapObjects/PewterPokecenter.asm b/data/mapObjects/PewterPokecenter.asm deleted file mode 100755 index 2b375bf9..00000000 --- a/data/mapObjects/PewterPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -PewterPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 6, -1 - warp 4, 7, 6, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person - object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, PEWTER_POKECENTER_WIDTH - warp_to 4, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/mapObjects/PewterSpeechHouse.asm b/data/mapObjects/PewterSpeechHouse.asm deleted file mode 100755 index e7134cb5..00000000 --- a/data/mapObjects/PewterSpeechHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -PewterSpeechHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 5, -1 - warp 3, 7, 5, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH - warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH diff --git a/data/mapObjects/PokemonFanClub.asm b/data/mapObjects/PokemonFanClub.asm deleted file mode 100755 index e1f175f0..00000000 --- a/data/mapObjects/PokemonFanClub.asm +++ /dev/null @@ -1,22 +0,0 @@ -PokemonFanClub_Object: - db $d ; border block - - db 2 ; warps - warp 2, 7, 1, -1 - warp 3, 7, 1, -1 - - db 2 ; signs - sign 1, 0, 7 ; FanClubText7 - sign 6, 0, 8 ; FanClubText8 - - db 6 ; objects - object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person - object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person - object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person - object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person - object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person - - ; warp-to - warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH - warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm deleted file mode 100755 index 109b5b8e..00000000 --- a/data/mapObjects/PokemonMansion1F.asm +++ /dev/null @@ -1,29 +0,0 @@ -PokemonMansion1F_Object: - db $2e ; border block - - db 8 ; warps - warp 4, 27, 0, -1 - warp 5, 27, 0, -1 - warp 6, 27, 0, -1 - warp 7, 27, 0, -1 - warp 5, 10, 0, POKEMON_MANSION_2F - warp 21, 23, 0, POKEMON_MANSION_B1F - warp 26, 27, 0, -1 - warp 27, 27, 0, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS - - ; warp-to - warp_to 4, 27, POKEMON_MANSION_1F_WIDTH - warp_to 5, 27, POKEMON_MANSION_1F_WIDTH - warp_to 6, 27, POKEMON_MANSION_1F_WIDTH - warp_to 7, 27, POKEMON_MANSION_1F_WIDTH - warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F - warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F - warp_to 26, 27, POKEMON_MANSION_1F_WIDTH - warp_to 27, 27, POKEMON_MANSION_1F_WIDTH diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm deleted file mode 100755 index 6c0cc5f8..00000000 --- a/data/mapObjects/PokemonMansion2F.asm +++ /dev/null @@ -1,22 +0,0 @@ -PokemonMansion2F_Object: - db $1 ; border block - - db 4 ; warps - warp 5, 10, 4, POKEMON_MANSION_1F - warp 7, 10, 0, POKEMON_MANSION_3F - warp 25, 14, 2, POKEMON_MANSION_3F - warp 6, 1, 1, POKEMON_MANSION_3F - - db 0 ; signs - - db 4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 - object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person - - ; warp-to - warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F - warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F - warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F - warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F diff --git a/data/mapObjects/PokemonMansion3F.asm b/data/mapObjects/PokemonMansion3F.asm deleted file mode 100755 index 7c8c9c22..00000000 --- a/data/mapObjects/PokemonMansion3F.asm +++ /dev/null @@ -1,21 +0,0 @@ -PokemonMansion3F_Object: - db $1 ; border block - - db 3 ; warps - warp 7, 10, 1, POKEMON_MANSION_2F - warp 6, 1, 3, POKEMON_MANSION_2F - warp 25, 14, 2, POKEMON_MANSION_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 - object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 - object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION - object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON - object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person - - ; warp-to - warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F - warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F - warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/mapObjects/PokemonMansionB1F.asm deleted file mode 100755 index ac232799..00000000 --- a/data/mapObjects/PokemonMansionB1F.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonMansionB1F_Object: - db $1 ; border block - - db 1 ; warps - warp 23, 22, 5, POKEMON_MANSION_1F - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 - object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY - object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE - object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 - object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 - object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person - object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY - - ; warp-to - warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F diff --git a/data/mapObjects/PokemonTower1F.asm b/data/mapObjects/PokemonTower1F.asm deleted file mode 100755 index cf62836b..00000000 --- a/data/mapObjects/PokemonTower1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -PokemonTower1F_Object: - db $1 ; border block - - db 3 ; warps - warp 10, 17, 1, -1 - warp 11, 17, 1, -1 - warp 18, 9, 1, POKEMON_TOWER_2F - - db 0 ; signs - - db 5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person - object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person - object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person - object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person - - ; warp-to - warp_to 10, 17, POKEMON_TOWER_1F_WIDTH - warp_to 11, 17, POKEMON_TOWER_1F_WIDTH - warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F diff --git a/data/mapObjects/PokemonTower2F.asm b/data/mapObjects/PokemonTower2F.asm deleted file mode 100755 index 5ce437d1..00000000 --- a/data/mapObjects/PokemonTower2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -PokemonTower2F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_3F - warp 18, 9, 2, POKEMON_TOWER_1F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F - warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F diff --git a/data/mapObjects/PokemonTower3F.asm b/data/mapObjects/PokemonTower3F.asm deleted file mode 100755 index 79b83f88..00000000 --- a/data/mapObjects/PokemonTower3F.asm +++ /dev/null @@ -1,18 +0,0 @@ -PokemonTower3F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_2F - warp 18, 9, 1, POKEMON_TOWER_4F - - db 0 ; signs - - db 4 ; objects - object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 - object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 - object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 - object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F - warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F diff --git a/data/mapObjects/PokemonTower4F.asm b/data/mapObjects/PokemonTower4F.asm deleted file mode 100755 index db86c02c..00000000 --- a/data/mapObjects/PokemonTower4F.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonTower4F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_5F - warp 18, 9, 1, POKEMON_TOWER_3F - - db 0 ; signs - - db 6 ; objects - object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 - object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 - object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 - object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER - object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING - object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F - warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F diff --git a/data/mapObjects/PokemonTower5F.asm b/data/mapObjects/PokemonTower5F.asm deleted file mode 100755 index b482871f..00000000 --- a/data/mapObjects/PokemonTower5F.asm +++ /dev/null @@ -1,20 +0,0 @@ -PokemonTower5F_Object: - db $1 ; border block - - db 2 ; warps - warp 3, 9, 0, POKEMON_TOWER_4F - warp 18, 9, 0, POKEMON_TOWER_6F - - db 0 ; signs - - db 6 ; objects - object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 - object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 - object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 - object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 - object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET - - ; warp-to - warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F - warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/PokemonTower6F.asm b/data/mapObjects/PokemonTower6F.asm deleted file mode 100755 index 823fe78a..00000000 --- a/data/mapObjects/PokemonTower6F.asm +++ /dev/null @@ -1,19 +0,0 @@ -PokemonTower6F_Object: - db $1 ; border block - - db 2 ; warps - warp 18, 9, 1, POKEMON_TOWER_5F - warp 9, 16, 0, POKEMON_TOWER_7F - - db 0 ; signs - - db 5 ; objects - object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 - object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 - object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 - object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY - object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY - - ; warp-to - warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F - warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F diff --git a/data/mapObjects/PokemonTower7F.asm b/data/mapObjects/PokemonTower7F.asm deleted file mode 100755 index 79cb5b0d..00000000 --- a/data/mapObjects/PokemonTower7F.asm +++ /dev/null @@ -1,16 +0,0 @@ -PokemonTower7F_Object: - db $1 ; border block - - db 1 ; warps - warp 9, 16, 1, POKEMON_TOWER_6F - - db 0 ; signs - - db 4 ; objects - object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 - object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 - object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 - object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F diff --git a/data/mapObjects/PowerPlant.asm b/data/mapObjects/PowerPlant.asm deleted file mode 100755 index a8548b1c..00000000 --- a/data/mapObjects/PowerPlant.asm +++ /dev/null @@ -1,30 +0,0 @@ -PowerPlant_Object: - db $2e ; border block - - db 3 ; warps - warp 4, 35, 3, -1 - warp 5, 35, 3, -1 - warp 0, 11, 3, -1 - - db 0 ; signs - - db 14 ; objects - object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 - object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 - object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 - object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 - object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 - object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 - object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 - object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 - object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 - object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS - object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP - object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY - object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25 - object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33 - - ; warp-to - warp_to 4, 35, POWER_PLANT_WIDTH - warp_to 5, 35, POWER_PLANT_WIDTH - warp_to 0, 11, POWER_PLANT_WIDTH diff --git a/data/mapObjects/RedsHouse1F.asm b/data/mapObjects/RedsHouse1F.asm deleted file mode 100755 index a54b5411..00000000 --- a/data/mapObjects/RedsHouse1F.asm +++ /dev/null @@ -1,18 +0,0 @@ -RedsHouse1F_Object: - db $a ; border block - - db 3 ; warps - warp 2, 7, 0, -1 ; exit1 - warp 3, 7, 0, -1 ; exit2 - warp 7, 1, 0, REDS_HOUSE_2F ; staircase - - db 1 ; signs - sign 3, 1, 2 ; TV - - db 1 ; objects - object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom - - ; warp-to - warp_to 2, 7, REDS_HOUSE_1F_WIDTH - warp_to 3, 7, REDS_HOUSE_1F_WIDTH - warp_to 7, 1, REDS_HOUSE_1F_WIDTH diff --git a/data/mapObjects/RedsHouse2F.asm b/data/mapObjects/RedsHouse2F.asm deleted file mode 100755 index 98e9c236..00000000 --- a/data/mapObjects/RedsHouse2F.asm +++ /dev/null @@ -1,12 +0,0 @@ -RedsHouse2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 1, 2, REDS_HOUSE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 7, 1, REDS_HOUSE_2F_WIDTH diff --git a/data/mapObjects/RockTunnel1F.asm b/data/mapObjects/RockTunnel1F.asm deleted file mode 100755 index 1cf5a12f..00000000 --- a/data/mapObjects/RockTunnel1F.asm +++ /dev/null @@ -1,34 +0,0 @@ -RockTunnel1F_Object: - db $3 ; border block - - db 8 ; warps - warp 15, 3, 1, -1 - warp 15, 0, 1, -1 - warp 15, 33, 2, -1 - warp 15, 35, 2, -1 - warp 37, 3, 0, ROCK_TUNNEL_B1F - warp 5, 3, 1, ROCK_TUNNEL_B1F - warp 17, 11, 2, ROCK_TUNNEL_B1F - warp 37, 17, 3, ROCK_TUNNEL_B1F - - db 1 ; signs - sign 11, 29, 8 ; RockTunnel1Text8 - - db 7 ; objects - object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 - object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 - object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 - object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 - - ; warp-to - warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH - warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH - warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH - warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH - warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F - warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F - warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F - warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F diff --git a/data/mapObjects/RockTunnelB1F.asm b/data/mapObjects/RockTunnelB1F.asm deleted file mode 100755 index f562168e..00000000 --- a/data/mapObjects/RockTunnelB1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -RockTunnelB1F_Object: - db $3 ; border block - - db 4 ; warps - warp 33, 25, 4, ROCK_TUNNEL_1F - warp 27, 3, 5, ROCK_TUNNEL_1F - warp 23, 11, 6, ROCK_TUNNEL_1F - warp 3, 3, 7, ROCK_TUNNEL_1F - - db 0 ; signs - - db 8 ; objects - object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 - object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 - object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 - object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 - object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 - object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 - - ; warp-to - warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F - warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F - warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F - warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F diff --git a/data/mapObjects/RockTunnelPokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm deleted file mode 100755 index a7619f7f..00000000 --- a/data/mapObjects/RockTunnelPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -RockTunnelPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person - object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH - warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/mapObjects/RocketHideoutB1F.asm b/data/mapObjects/RocketHideoutB1F.asm deleted file mode 100755 index 99537510..00000000 --- a/data/mapObjects/RocketHideoutB1F.asm +++ /dev/null @@ -1,27 +0,0 @@ -RocketHideoutB1F_Object: - db $2e ; border block - - db 5 ; warps - warp 23, 2, 0, ROCKET_HIDEOUT_B2F - warp 21, 2, 2, GAME_CORNER - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 24, 3, ROCKET_HIDEOUT_B2F - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 7 ; objects - object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 - object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 - object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 - object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 - object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 - object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE - object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION - - ; warp-to - warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER - warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/mapObjects/RocketHideoutB2F.asm deleted file mode 100755 index 36fe9289..00000000 --- a/data/mapObjects/RocketHideoutB2F.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideoutB2F_Object: - db $2e ; border block - - db 5 ; warps - warp 27, 8, 0, ROCKET_HIDEOUT_B1F - warp 21, 8, 0, ROCKET_HIDEOUT_B3F - warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR - warp 21, 22, 3, ROCKET_HIDEOUT_B1F - warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 - object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE - object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET - object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07 - object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION - - ; warp-to - warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F - warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutB3F.asm b/data/mapObjects/RocketHideoutB3F.asm deleted file mode 100755 index 6169dbed..00000000 --- a/data/mapObjects/RocketHideoutB3F.asm +++ /dev/null @@ -1,18 +0,0 @@ -RocketHideoutB3F_Object: - db $2e ; border block - - db 2 ; warps - warp 25, 6, 1, ROCKET_HIDEOUT_B2F - warp 19, 18, 0, ROCKET_HIDEOUT_B4F - - db 0 ; signs - - db 4 ; objects - object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 - object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 - object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10 - object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY - - ; warp-to - warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F - warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F diff --git a/data/mapObjects/RocketHideoutB4F.asm b/data/mapObjects/RocketHideoutB4F.asm deleted file mode 100755 index be353f25..00000000 --- a/data/mapObjects/RocketHideoutB4F.asm +++ /dev/null @@ -1,25 +0,0 @@ -RocketHideoutB4F_Object: - db $2e ; border block - - db 3 ; warps - warp 19, 10, 1, ROCKET_HIDEOUT_B3F - warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR - warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR - - db 0 ; signs - - db 9 ; objects - object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 - object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 - object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 - object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 - object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP - object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_02 - object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON - object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE - object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY - - ; warp-to - warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F - warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR - warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/mapObjects/RocketHideoutElevator.asm deleted file mode 100755 index bc4fd7ff..00000000 --- a/data/mapObjects/RocketHideoutElevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -RocketHideoutElevator_Object: - db $f ; border block - - db 2 ; warps - warp 2, 1, 2, ROCKET_HIDEOUT_B1F - warp 3, 1, 4, ROCKET_HIDEOUT_B1F - - db 1 ; signs - sign 1, 1, 1 ; RocketHideoutElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F - warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/mapObjects/Route1.asm b/data/mapObjects/Route1.asm deleted file mode 100755 index 0815fe67..00000000 --- a/data/mapObjects/Route1.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route1_Object: - db $b ; border block - - db 0 ; warps - - db 1 ; signs - sign 9, 27, 3 ; Route1Text3 - - db 2 ; objects - object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person - object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person - - ; warp-to (unused) - warp_to 2, 7, 4 diff --git a/data/mapObjects/Route10.asm b/data/mapObjects/Route10.asm deleted file mode 100755 index 12850577..00000000 --- a/data/mapObjects/Route10.asm +++ /dev/null @@ -1,28 +0,0 @@ -Route10_Object: - db $2c ; border block - - db 4 ; warps - warp 11, 19, 0, ROCK_TUNNEL_POKECENTER - warp 8, 17, 0, ROCK_TUNNEL_1F - warp 8, 53, 2, ROCK_TUNNEL_1F - warp 6, 39, 0, POWER_PLANT - - db 4 ; signs - sign 7, 19, 7 ; Route10Text7 - sign 12, 19, 8 ; PokeCenterSignText - sign 9, 55, 9 ; Route10Text9 - sign 5, 41, 10 ; Route10Text10 - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 - object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 - object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 - object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 - object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 - - ; warp-to - warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER - warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F - warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F - warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT diff --git a/data/mapObjects/Route11.asm b/data/mapObjects/Route11.asm deleted file mode 100755 index 5ed232f5..00000000 --- a/data/mapObjects/Route11.asm +++ /dev/null @@ -1,31 +0,0 @@ -Route11_Object: - db $f ; border block - - db 5 ; warps - warp 49, 8, 0, ROUTE_11_GATE_1F - warp 49, 9, 1, ROUTE_11_GATE_1F - warp 58, 8, 2, ROUTE_11_GATE_1F - warp 58, 9, 3, ROUTE_11_GATE_1F - warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 - - db 1 ; signs - sign 1, 5, 11 ; Route11Text11 - - db 10 ; objects - object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 - object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 - object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 - object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 - object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 - object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 - object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 - object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 - - ; warp-to - warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F - warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11 diff --git a/data/mapObjects/Route11Gate1F.asm b/data/mapObjects/Route11Gate1F.asm deleted file mode 100755 index 5c4a120c..00000000 --- a/data/mapObjects/Route11Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route11Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_11_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F diff --git a/data/mapObjects/Route11Gate2F.asm b/data/mapObjects/Route11Gate2F.asm deleted file mode 100755 index bf305bba..00000000 --- a/data/mapObjects/Route11Gate2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route11Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_11_GATE_1F - - db 2 ; signs - sign 1, 2, 3 ; Route11GateUpstairsText3 - sign 6, 2, 4 ; Route11GateUpstairsText4 - - db 2 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person - - ; warp-to - warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/Route12.asm b/data/mapObjects/Route12.asm deleted file mode 100755 index a9d84cf0..00000000 --- a/data/mapObjects/Route12.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route12_Object: - db $43 ; border block - - db 4 ; warps - warp 10, 15, 0, ROUTE_12_GATE_1F - warp 11, 15, 1, ROUTE_12_GATE_1F - warp 10, 21, 2, ROUTE_12_GATE_1F - warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE - - db 2 ; signs - sign 13, 13, 11 ; Route12Text11 - sign 11, 63, 12 ; Route12Text12 - - db 10 ; objects - object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person - object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 - object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 - object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 - object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 - object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 - object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 - object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16 - object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON - - ; warp-to - warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F - warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/mapObjects/Route12Gate1F.asm b/data/mapObjects/Route12Gate1F.asm deleted file mode 100755 index 94f6b91a..00000000 --- a/data/mapObjects/Route12Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route12Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 4, 0, 0, -1 - warp 5, 0, 1, -1 - warp 4, 7, 2, -1 - warp 5, 7, 2, -1 - warp 8, 6, 0, ROUTE_12_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 4, 0, ROUTE_12_GATE_1F_WIDTH - warp_to 5, 0, ROUTE_12_GATE_1F_WIDTH - warp_to 4, 7, ROUTE_12_GATE_1F_WIDTH - warp_to 5, 7, ROUTE_12_GATE_1F_WIDTH - warp_to 8, 6, ROUTE_12_GATE_1F_WIDTH ; ROUTE_12_GATE_2F diff --git a/data/mapObjects/Route12Gate2F.asm b/data/mapObjects/Route12Gate2F.asm deleted file mode 100755 index cc6c1c19..00000000 --- a/data/mapObjects/Route12Gate2F.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route12Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_12_GATE_1F - - db 2 ; signs - sign 1, 2, 2 ; Route12GateUpstairsText2 - sign 6, 2, 3 ; Route12GateUpstairsText3 - - db 1 ; objects - object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person - - ; warp-to - warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/Route12SuperRodHouse.asm b/data/mapObjects/Route12SuperRodHouse.asm deleted file mode 100755 index 458378a2..00000000 --- a/data/mapObjects/Route12SuperRodHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route12SuperRodHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH - warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/Route13.asm b/data/mapObjects/Route13.asm deleted file mode 100755 index 3f460901..00000000 --- a/data/mapObjects/Route13.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route13_Object: - db $43 ; border block - - db 0 ; warps - - db 3 ; signs - sign 15, 13, 11 ; Route13Text11 - sign 33, 5, 12 ; Route13Text12 - sign 31, 11, 13 ; Route13Text13 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 - object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 - object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 - object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 - object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 - object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 - object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 - object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 - object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 diff --git a/data/mapObjects/Route14.asm b/data/mapObjects/Route14.asm deleted file mode 100755 index 565e587f..00000000 --- a/data/mapObjects/Route14.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route14_Object: - db $43 ; border block - - db 0 ; warps - - db 1 ; signs - sign 17, 13, 11 ; Route14Text11 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 - object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 - object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 - object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 - object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 - object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 - object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 diff --git a/data/mapObjects/Route15.asm b/data/mapObjects/Route15.asm deleted file mode 100755 index f52cc1b8..00000000 --- a/data/mapObjects/Route15.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route15_Object: - db $43 ; border block - - db 4 ; warps - warp 7, 8, 0, ROUTE_15_GATE_1F - warp 7, 9, 1, ROUTE_15_GATE_1F - warp 14, 8, 2, ROUTE_15_GATE_1F - warp 14, 9, 3, ROUTE_15_GATE_1F - - db 1 ; signs - sign 39, 9, 12 ; Route15Text12 - - db 11 ; objects - object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 - object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 - object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 - object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 - object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 - object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20 - - ; warp-to - warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/Route15Gate1F.asm b/data/mapObjects/Route15Gate1F.asm deleted file mode 100755 index 23b1f5a7..00000000 --- a/data/mapObjects/Route15Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route15Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_15_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F diff --git a/data/mapObjects/Route15Gate2F.asm b/data/mapObjects/Route15Gate2F.asm deleted file mode 100755 index 162f2b1f..00000000 --- a/data/mapObjects/Route15Gate2F.asm +++ /dev/null @@ -1,14 +0,0 @@ -Route15Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_15_GATE_1F - - db 1 ; signs - sign 6, 2, 2 ; Route15GateUpstairsText2 - - db 1 ; objects - object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1 - - ; warp-to - warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/Route16.asm b/data/mapObjects/Route16.asm deleted file mode 100755 index fb23e6ca..00000000 --- a/data/mapObjects/Route16.asm +++ /dev/null @@ -1,37 +0,0 @@ -Route16_Object: - db $f ; border block - - db 9 ; warps - warp 17, 10, 0, ROUTE_16_GATE_1F - warp 17, 11, 1, ROUTE_16_GATE_1F - warp 24, 10, 2, ROUTE_16_GATE_1F - warp 24, 11, 3, ROUTE_16_GATE_1F - warp 17, 4, 4, ROUTE_16_GATE_1F - warp 17, 5, 5, ROUTE_16_GATE_1F - warp 24, 4, 6, ROUTE_16_GATE_1F - warp 24, 5, 7, ROUTE_16_GATE_1F - warp 7, 5, 0, ROUTE_16_FLY_HOUSE - - db 2 ; signs - sign 27, 11, 8 ; Route16Text8 - sign 5, 17, 9 ; Route16Text9 - - db 7 ; objects - object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 - object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 - object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 - object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 - object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 - object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 - object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F - warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE diff --git a/data/mapObjects/Route16FlyHouse.asm b/data/mapObjects/Route16FlyHouse.asm deleted file mode 100755 index ec493fef..00000000 --- a/data/mapObjects/Route16FlyHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route16FlyHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person - - ; warp-to - warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH - warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH diff --git a/data/mapObjects/Route16Gate1F.asm b/data/mapObjects/Route16Gate1F.asm deleted file mode 100755 index 1d5baa1d..00000000 --- a/data/mapObjects/Route16Gate1F.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route16Gate1F_Object: - db $a ; border block - - db 9 ; warps - warp 0, 8, 0, -1 - warp 0, 9, 1, -1 - warp 7, 8, 2, -1 - warp 7, 9, 2, -1 - warp 0, 2, 4, -1 - warp 0, 3, 5, -1 - warp 7, 2, 6, -1 - warp 7, 3, 7, -1 - warp 6, 12, 0, ROUTE_16_GATE_2F - - db 0 ; signs - - db 2 ; objects - object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person - object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person - - ; warp-to - warp_to 0, 8, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 9, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 8, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 9, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 2, ROUTE_16_GATE_1F_WIDTH - warp_to 0, 3, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 2, ROUTE_16_GATE_1F_WIDTH - warp_to 7, 3, ROUTE_16_GATE_1F_WIDTH - warp_to 6, 12, ROUTE_16_GATE_1F_WIDTH ; ROUTE_16_GATE_2F diff --git a/data/mapObjects/Route16Gate2F.asm b/data/mapObjects/Route16Gate2F.asm deleted file mode 100755 index 5914f854..00000000 --- a/data/mapObjects/Route16Gate2F.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route16Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 8, ROUTE_16_GATE_1F - - db 2 ; signs - sign 1, 2, 3 ; Route16GateUpstairsText3 - sign 6, 2, 4 ; Route16GateUpstairsText4 - - db 2 ; objects - object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person - - ; warp-to - warp_to 7, 7, ROUTE_16_GATE_2F_WIDTH ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/Route17.asm b/data/mapObjects/Route17.asm deleted file mode 100755 index f5bc4307..00000000 --- a/data/mapObjects/Route17.asm +++ /dev/null @@ -1,24 +0,0 @@ -Route17_Object: - db $43 ; border block - - db 0 ; warps - - db 6 ; signs - sign 9, 51, 11 ; Route17Text11 - sign 9, 63, 12 ; Route17Text12 - sign 9, 75, 13 ; Route17Text13 - sign 9, 87, 14 ; Route17Text14 - sign 9, 111, 15 ; Route17Text15 - sign 9, 141, 16 ; Route17Text16 - - db 10 ; objects - object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 - object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 - object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 - object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 - object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 - object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 - object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 - object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 - object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 - object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 diff --git a/data/mapObjects/Route18.asm b/data/mapObjects/Route18.asm deleted file mode 100755 index 8bacd6c0..00000000 --- a/data/mapObjects/Route18.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route18_Object: - db $43 ; border block - - db 4 ; warps - warp 33, 8, 0, ROUTE_18_GATE_1F - warp 33, 9, 1, ROUTE_18_GATE_1F - warp 40, 8, 2, ROUTE_18_GATE_1F - warp 40, 9, 3, ROUTE_18_GATE_1F - - db 2 ; signs - sign 43, 7, 4 ; Route18Text4 - sign 33, 5, 5 ; Route18Text5 - - db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 - object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 - object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 - - ; warp-to - warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F - warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route18Gate1F.asm b/data/mapObjects/Route18Gate1F.asm deleted file mode 100755 index 83cb386a..00000000 --- a/data/mapObjects/Route18Gate1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route18Gate1F_Object: - db $a ; border block - - db 5 ; warps - warp 0, 4, 0, -1 - warp 0, 5, 1, -1 - warp 7, 4, 2, -1 - warp 7, 5, 3, -1 - warp 6, 8, 0, ROUTE_18_GATE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 4, ROUTE_18_GATE_1F_WIDTH - warp_to 0, 5, ROUTE_18_GATE_1F_WIDTH - warp_to 7, 4, ROUTE_18_GATE_1F_WIDTH - warp_to 7, 5, ROUTE_18_GATE_1F_WIDTH - warp_to 6, 8, ROUTE_18_GATE_1F_WIDTH ; ROUTE_18_GATE_2F diff --git a/data/mapObjects/Route18Gate2F.asm b/data/mapObjects/Route18Gate2F.asm deleted file mode 100755 index e48ec3b8..00000000 --- a/data/mapObjects/Route18Gate2F.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route18Gate2F_Object: - db $a ; border block - - db 1 ; warps - warp 7, 7, 4, ROUTE_18_GATE_1F - - db 2 ; signs - sign 1, 2, 2 ; Route18GateUpstairsText2 - sign 6, 2, 3 ; Route18GateUpstairsText3 - - db 1 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person - - ; warp-to - warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/Route19.asm b/data/mapObjects/Route19.asm deleted file mode 100755 index 9b39618e..00000000 --- a/data/mapObjects/Route19.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route19_Object: - db $43 ; border block - - db 0 ; warps - - db 1 ; signs - sign 11, 9, 11 ; Route19Text11 - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 - object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 - object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 - object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 - object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 - object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 - object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 - object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 - - ; warp-to diff --git a/data/mapObjects/Route2.asm b/data/mapObjects/Route2.asm deleted file mode 100755 index b27ad199..00000000 --- a/data/mapObjects/Route2.asm +++ /dev/null @@ -1,33 +0,0 @@ -Route2_Object: - db $f ; border block - - db 6 ; warps - warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 - warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE - warp 15, 19, 0, ROUTE_2_TRADE_HOUSE - warp 16, 35, 1, ROUTE_2_GATE - warp 15, 39, 2, ROUTE_2_GATE - warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE - - db 2 ; signs - sign 5, 65, 3 ; Route2Text3 - sign 11, 11, 4 ; Route2Text4 - - db 2 ; objects - object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE - object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP - - ; warp-to - warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 - warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE - warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE - warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - - ; unused - warp_to 2, 7, 4 - db $12, $c7, $9, $7 - warp_to 2, 7, 4 - warp_to 2, 7, 4 - warp_to 2, 7, 4 diff --git a/data/mapObjects/Route20.asm b/data/mapObjects/Route20.asm deleted file mode 100755 index 7bceef97..00000000 --- a/data/mapObjects/Route20.asm +++ /dev/null @@ -1,26 +0,0 @@ -Route20_Object: - db $43 ; border block - - db 2 ; warps - warp 48, 5, 0, SEAFOAM_ISLANDS_1F - warp 58, 9, 2, SEAFOAM_ISLANDS_1F - - db 2 ; signs - sign 51, 7, 11 ; Route20Text11 - sign 57, 11, 12 ; Route20Text12 - - db 10 ; objects - object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 - object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 - object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 - object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 - object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 - object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 - object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 - object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 - object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 - object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 - - ; warp-to - warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/Route21.asm b/data/mapObjects/Route21.asm deleted file mode 100755 index b7759b59..00000000 --- a/data/mapObjects/Route21.asm +++ /dev/null @@ -1,17 +0,0 @@ -Route21_Object: - db $43 ; border block - - db 0 ; warps - - db 0 ; signs - - db 9 ; objects - object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 - object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 - object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 - object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 - object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 - object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 - object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 - object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 - object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/mapObjects/Route22.asm b/data/mapObjects/Route22.asm deleted file mode 100755 index 56e759fd..00000000 --- a/data/mapObjects/Route22.asm +++ /dev/null @@ -1,15 +0,0 @@ -Route22_Object: - db $2c ; border block - - db 1 ; warps - warp 8, 5, 0, ROUTE_22_GATE - - db 1 ; signs - sign 7, 11, 3 ; Route22FrontGateText - - db 2 ; objects - object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person - object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 8, 5, ROUTE_22_WIDTH ; ROUTE_22_GATE diff --git a/data/mapObjects/Route22Gate.asm b/data/mapObjects/Route22Gate.asm deleted file mode 100755 index 3f693c7f..00000000 --- a/data/mapObjects/Route22Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route22Gate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 7, 0, -1 - warp 5, 7, 0, -1 - warp 4, 0, 0, -1 - warp 5, 0, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 4, 7, ROUTE_22_GATE_WIDTH - warp_to 5, 7, ROUTE_22_GATE_WIDTH - warp_to 4, 0, ROUTE_22_GATE_WIDTH - warp_to 5, 0, ROUTE_22_GATE_WIDTH diff --git a/data/mapObjects/Route23.asm b/data/mapObjects/Route23.asm deleted file mode 100755 index b510c285..00000000 --- a/data/mapObjects/Route23.asm +++ /dev/null @@ -1,26 +0,0 @@ -Route23_Object: - db $f ; border block - - db 4 ; warps - warp 7, 139, 2, ROUTE_22_GATE - warp 8, 139, 3, ROUTE_22_GATE - warp 4, 31, 0, VICTORY_ROAD_1F - warp 14, 31, 1, VICTORY_ROAD_2F - - db 1 ; signs - sign 3, 33, 8 ; Route23Text8 - - db 7 ; objects - object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person - object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person - object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person - object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person - object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person - object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person - object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person - - ; warp-to - warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F - warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/Route24.asm b/data/mapObjects/Route24.asm deleted file mode 100755 index 8ef0d2b9..00000000 --- a/data/mapObjects/Route24.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route24_Object: - db $2c ; border block - - db 0 ; warps - - db 0 ; signs - - db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 - object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 - object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 - object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 - object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 - object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 - object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_45 diff --git a/data/mapObjects/Route25.asm b/data/mapObjects/Route25.asm deleted file mode 100755 index a85f85ca..00000000 --- a/data/mapObjects/Route25.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route25_Object: - db $2c ; border block - - db 1 ; warps - warp 45, 3, 0, BILLS_HOUSE - - db 1 ; signs - sign 43, 3, 11 ; Route25Text11 - - db 10 ; objects - object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 - object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 - object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 - object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 - object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 - object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 - object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 - object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 - object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19 - - ; warp-to - warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/mapObjects/Route2Gate.asm b/data/mapObjects/Route2Gate.asm deleted file mode 100755 index a7feb780..00000000 --- a/data/mapObjects/Route2Gate.asm +++ /dev/null @@ -1,20 +0,0 @@ -Route2Gate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 0, 3, -1 - warp 5, 0, 3, -1 - warp 4, 7, 4, -1 - warp 5, 7, 4, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person - - ; warp-to - warp_to 4, 0, ROUTE_2_GATE_WIDTH - warp_to 5, 0, ROUTE_2_GATE_WIDTH - warp_to 4, 7, ROUTE_2_GATE_WIDTH - warp_to 5, 7, ROUTE_2_GATE_WIDTH diff --git a/data/mapObjects/Route2TradeHouse.asm b/data/mapObjects/Route2TradeHouse.asm deleted file mode 100755 index 89ece3ea..00000000 --- a/data/mapObjects/Route2TradeHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -Route2TradeHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person - - ; warp-to - warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH - warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/Route3.asm b/data/mapObjects/Route3.asm deleted file mode 100755 index 372ea6cf..00000000 --- a/data/mapObjects/Route3.asm +++ /dev/null @@ -1,18 +0,0 @@ -Route3_Object: - db $2c ; border block - - db 0 ; warps - - db 1 ; signs - sign 59, 9, 10 ; Route3Text10 - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 - object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 - object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 - object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3 diff --git a/data/mapObjects/Route4.asm b/data/mapObjects/Route4.asm deleted file mode 100755 index 4ab88f8f..00000000 --- a/data/mapObjects/Route4.asm +++ /dev/null @@ -1,22 +0,0 @@ -Route4_Object: - db $2c ; border block - - db 3 ; warps - warp 11, 5, 0, MT_MOON_POKECENTER - warp 18, 5, 0, MT_MOON_1F - warp 24, 5, 7, MT_MOON_B1F - - db 3 ; signs - sign 12, 5, 4 ; PokeCenterSignText - sign 17, 7, 5 ; Route4Text5 - sign 27, 7, 6 ; Route4Text6 - - db 3 ; objects - object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person - object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 - object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_04 - - ; warp-to - warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER - warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F - warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F diff --git a/data/mapObjects/Route5.asm b/data/mapObjects/Route5.asm deleted file mode 100755 index df2c8c03..00000000 --- a/data/mapObjects/Route5.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route5_Object: - db $a ; border block - - db 5 ; warps - warp 10, 29, 3, ROUTE_5_GATE - warp 9, 29, 2, ROUTE_5_GATE - warp 10, 33, 0, ROUTE_5_GATE - warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 - warp 10, 21, 0, DAYCARE - - db 1 ; signs - sign 17, 29, 1 ; Route5Text1 - - db 0 ; objects - - ; warp-to - warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE - warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5 - warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE diff --git a/data/mapObjects/Route5Gate.asm b/data/mapObjects/Route5Gate.asm deleted file mode 100755 index e0e06a1d..00000000 --- a/data/mapObjects/Route5Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route5Gate_Object: - db $a ; border block - - db 4 ; warps - warp 3, 5, 2, -1 - warp 4, 5, 2, -1 - warp 3, 0, 1, -1 - warp 4, 0, 0, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 3, 5, ROUTE_5_GATE_WIDTH - warp_to 4, 5, ROUTE_5_GATE_WIDTH - warp_to 3, 0, ROUTE_5_GATE_WIDTH - warp_to 4, 0, ROUTE_5_GATE_WIDTH diff --git a/data/mapObjects/Route6.asm b/data/mapObjects/Route6.asm deleted file mode 100755 index fc2d7e24..00000000 --- a/data/mapObjects/Route6.asm +++ /dev/null @@ -1,25 +0,0 @@ -Route6_Object: - db $f ; border block - - db 4 ; warps - warp 9, 1, 2, ROUTE_6_GATE - warp 10, 1, 2, ROUTE_6_GATE - warp 10, 7, 0, ROUTE_6_GATE - warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 - - db 1 ; signs - sign 19, 15, 7 ; Route6Text7 - - db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 - object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 - - ; warp-to - warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE - warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/Route6Gate.asm b/data/mapObjects/Route6Gate.asm deleted file mode 100755 index 8ed96d04..00000000 --- a/data/mapObjects/Route6Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route6Gate_Object: - db $a ; border block - - db 4 ; warps - warp 3, 5, 2, -1 - warp 4, 5, 2, -1 - warp 3, 0, 1, -1 - warp 4, 0, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person - - ; warp-to - warp_to 3, 5, ROUTE_6_GATE_WIDTH - warp_to 4, 5, ROUTE_6_GATE_WIDTH - warp_to 3, 0, ROUTE_6_GATE_WIDTH - warp_to 4, 0, ROUTE_6_GATE_WIDTH diff --git a/data/mapObjects/Route7.asm b/data/mapObjects/Route7.asm deleted file mode 100755 index 182904ef..00000000 --- a/data/mapObjects/Route7.asm +++ /dev/null @@ -1,21 +0,0 @@ -Route7_Object: - db $f ; border block - - db 5 ; warps - warp 18, 9, 2, ROUTE_7_GATE - warp 18, 10, 3, ROUTE_7_GATE - warp 11, 9, 0, ROUTE_7_GATE - warp 11, 10, 1, ROUTE_7_GATE - warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 - - db 1 ; signs - sign 3, 13, 1 ; Route7Text1 - - db 0 ; objects - - ; warp-to - warp_to 18, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE - warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7 diff --git a/data/mapObjects/Route7Gate.asm b/data/mapObjects/Route7Gate.asm deleted file mode 100755 index 7f1afe0a..00000000 --- a/data/mapObjects/Route7Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route7Gate_Object: - db $a ; border block - - db 4 ; warps - warp 0, 3, 3, -1 - warp 0, 4, 3, -1 - warp 5, 3, 0, -1 - warp 5, 4, 1, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 3, ROUTE_7_GATE_WIDTH - warp_to 0, 4, ROUTE_7_GATE_WIDTH - warp_to 5, 3, ROUTE_7_GATE_WIDTH - warp_to 5, 4, ROUTE_7_GATE_WIDTH diff --git a/data/mapObjects/Route8.asm b/data/mapObjects/Route8.asm deleted file mode 100755 index 137d70a0..00000000 --- a/data/mapObjects/Route8.asm +++ /dev/null @@ -1,30 +0,0 @@ -Route8_Object: - db $2c ; border block - - db 5 ; warps - warp 1, 9, 0, ROUTE_8_GATE - warp 1, 10, 1, ROUTE_8_GATE - warp 8, 9, 2, ROUTE_8_GATE - warp 8, 10, 3, ROUTE_8_GATE - warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 - - db 1 ; signs - sign 17, 3, 10 ; Route8Text10 - - db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 - object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 - object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 - object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 - object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 - object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 - object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 - - ; warp-to - warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE - warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/Route8Gate.asm b/data/mapObjects/Route8Gate.asm deleted file mode 100755 index 3bba95a0..00000000 --- a/data/mapObjects/Route8Gate.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route8Gate_Object: - db $a ; border block - - db 4 ; warps - warp 0, 3, 0, -1 - warp 0, 4, 1, -1 - warp 5, 3, 2, -1 - warp 5, 4, 3, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 0, 3, ROUTE_8_GATE_WIDTH - warp_to 0, 4, ROUTE_8_GATE_WIDTH - warp_to 5, 3, ROUTE_8_GATE_WIDTH - warp_to 5, 4, ROUTE_8_GATE_WIDTH diff --git a/data/mapObjects/Route9.asm b/data/mapObjects/Route9.asm deleted file mode 100755 index a991c0c7..00000000 --- a/data/mapObjects/Route9.asm +++ /dev/null @@ -1,19 +0,0 @@ -Route9_Object: - db $2c ; border block - - db 0 ; warps - - db 1 ; signs - sign 25, 7, 11 ; Route9Text11 - - db 10 ; objects - object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 - object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 - object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 - object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 - object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 - object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 - object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 - object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 - object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_30 diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm deleted file mode 100755 index 3e454f06..00000000 --- a/data/mapObjects/SSAnne1F.asm +++ /dev/null @@ -1,34 +0,0 @@ -SSAnne1F_Object: - db $c ; border block - - db 11 ; warps - warp 26, 0, 1, VERMILION_DOCK - warp 27, 0, 1, VERMILION_DOCK - warp 31, 8, 0, SS_ANNE_1F_ROOMS - warp 23, 8, 1, SS_ANNE_1F_ROOMS - warp 19, 8, 2, SS_ANNE_1F_ROOMS - warp 15, 8, 3, SS_ANNE_1F_ROOMS - warp 11, 8, 4, SS_ANNE_1F_ROOMS - warp 7, 8, 5, SS_ANNE_1F_ROOMS - warp 2, 6, 6, SS_ANNE_2F - warp 37, 15, 5, SS_ANNE_B1F - warp 3, 16, 0, SS_ANNE_KITCHEN - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person - object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK - warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK - warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F - warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F - warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN diff --git a/data/mapObjects/SSAnne1FRooms.asm b/data/mapObjects/SSAnne1FRooms.asm deleted file mode 100755 index 617d2a55..00000000 --- a/data/mapObjects/SSAnne1FRooms.asm +++ /dev/null @@ -1,33 +0,0 @@ -SSAnne1FRooms_Object: - db $c ; border block - - db 6 ; warps - warp 0, 0, 2, SS_ANNE_1F - warp 10, 0, 3, SS_ANNE_1F - warp 20, 0, 4, SS_ANNE_1F - warp 0, 10, 5, SS_ANNE_1F - warp 10, 10, 6, SS_ANNE_1F - warp 20, 10, 7, SS_ANNE_1F - - db 0 ; signs - - db 11 ; objects - object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 - object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 - object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 - object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 - object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person - object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person - object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person - object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person - object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_08 - object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person - - ; warp-to - warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F - warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm deleted file mode 100755 index 6abd5ac4..00000000 --- a/data/mapObjects/SSAnne2F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SSAnne2F_Object: - db $c ; border block - - db 9 ; warps - warp 9, 11, 0, SS_ANNE_2F_ROOMS - warp 13, 11, 2, SS_ANNE_2F_ROOMS - warp 17, 11, 4, SS_ANNE_2F_ROOMS - warp 21, 11, 6, SS_ANNE_2F_ROOMS - warp 25, 11, 8, SS_ANNE_2F_ROOMS - warp 29, 11, 10, SS_ANNE_2F_ROOMS - warp 2, 4, 8, SS_ANNE_1F - warp 2, 12, 1, SS_ANNE_3F - warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM - - db 0 ; signs - - db 2 ; objects - object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person - object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 - - ; warp-to - warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F - warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F - warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/mapObjects/SSAnne2FRooms.asm deleted file mode 100755 index ebb053a8..00000000 --- a/data/mapObjects/SSAnne2FRooms.asm +++ /dev/null @@ -1,47 +0,0 @@ -SSAnne2FRooms_Object: - db $c ; border block - - db 12 ; warps - warp 2, 5, 0, SS_ANNE_2F - warp 3, 5, 0, SS_ANNE_2F - warp 12, 5, 1, SS_ANNE_2F - warp 13, 5, 1, SS_ANNE_2F - warp 22, 5, 2, SS_ANNE_2F - warp 23, 5, 2, SS_ANNE_2F - warp 2, 15, 3, SS_ANNE_2F - warp 3, 15, 3, SS_ANNE_2F - warp 12, 15, 4, SS_ANNE_2F - warp 13, 15, 4, SS_ANNE_2F - warp 22, 15, 5, SS_ANNE_2F - warp 23, 15, 5, SS_ANNE_2F - - db 0 ; signs - - db 13 ; objects - object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 - object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 - object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER - object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY - object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person - object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person - - ; warp-to - warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnne3F.asm b/data/mapObjects/SSAnne3F.asm deleted file mode 100755 index f0bfc17b..00000000 --- a/data/mapObjects/SSAnne3F.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnne3F_Object: - db $c ; border block - - db 2 ; warps - warp 0, 3, 0, SS_ANNE_BOW - warp 19, 3, 7, SS_ANNE_2F - - db 0 ; signs - - db 1 ; objects - object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person - - ; warp-to - warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW - warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneB1F.asm b/data/mapObjects/SSAnneB1F.asm deleted file mode 100755 index fe54ea24..00000000 --- a/data/mapObjects/SSAnneB1F.asm +++ /dev/null @@ -1,22 +0,0 @@ -SSAnneB1F_Object: - db $c ; border block - - db 6 ; warps - warp 23, 3, 8, SS_ANNE_B1F_ROOMS - warp 19, 3, 6, SS_ANNE_B1F_ROOMS - warp 15, 3, 4, SS_ANNE_B1F_ROOMS - warp 11, 3, 2, SS_ANNE_B1F_ROOMS - warp 7, 3, 0, SS_ANNE_B1F_ROOMS - warp 27, 5, 9, SS_ANNE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS - warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm deleted file mode 100755 index 1d31b89c..00000000 --- a/data/mapObjects/SSAnneB1FRooms.asm +++ /dev/null @@ -1,41 +0,0 @@ -SSAnneB1FRooms_Object: - db $c ; border block - - db 10 ; warps - warp 2, 5, 4, SS_ANNE_B1F - warp 3, 5, 4, SS_ANNE_B1F - warp 12, 5, 3, SS_ANNE_B1F - warp 13, 5, 3, SS_ANNE_B1F - warp 22, 5, 2, SS_ANNE_B1F - warp 23, 5, 2, SS_ANNE_B1F - warp 2, 15, 1, SS_ANNE_B1F - warp 3, 15, 1, SS_ANNE_B1F - warp 12, 15, 0, SS_ANNE_B1F - warp 13, 15, 0, SS_ANNE_B1F - - db 0 ; signs - - db 11 ; objects - object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 - object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 - object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 - object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 - object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 - object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 - object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person - object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person - object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER - object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44 - object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION - - ; warp-to - warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F - warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F diff --git a/data/mapObjects/SSAnneBow.asm b/data/mapObjects/SSAnneBow.asm deleted file mode 100755 index 8873c8f8..00000000 --- a/data/mapObjects/SSAnneBow.asm +++ /dev/null @@ -1,19 +0,0 @@ -SSAnneBow_Object: - db $23 ; border block - - db 2 ; warps - warp 13, 6, 0, SS_ANNE_3F - warp 13, 7, 0, SS_ANNE_3F - - db 0 ; signs - - db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person - object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person - object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 - object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 - - ; warp-to - warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F - warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F diff --git a/data/mapObjects/SSAnneCaptainsRoom.asm b/data/mapObjects/SSAnneCaptainsRoom.asm deleted file mode 100755 index 545656cc..00000000 --- a/data/mapObjects/SSAnneCaptainsRoom.asm +++ /dev/null @@ -1,15 +0,0 @@ -SSAnneCaptainsRoom_Object: - db $c ; border block - - db 1 ; warps - warp 0, 7, 8, SS_ANNE_2F - - db 2 ; signs - sign 4, 1, 2 ; SSAnne7Text2 - sign 1, 2, 3 ; SSAnne7Text3 - - db 1 ; objects - object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person - - ; warp-to - warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F diff --git a/data/mapObjects/SSAnneKitchen.asm b/data/mapObjects/SSAnneKitchen.asm deleted file mode 100755 index b5771e68..00000000 --- a/data/mapObjects/SSAnneKitchen.asm +++ /dev/null @@ -1,19 +0,0 @@ -SSAnneKitchen_Object: - db $c ; border block - - db 1 ; warps - warp 6, 0, 10, SS_ANNE_1F - - db 0 ; signs - - db 7 ; objects - object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person - object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person - object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person - object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person - object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person - object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person - object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person - - ; warp-to - warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/SafariZoneCenter.asm b/data/mapObjects/SafariZoneCenter.asm deleted file mode 100755 index e54cec74..00000000 --- a/data/mapObjects/SafariZoneCenter.asm +++ /dev/null @@ -1,31 +0,0 @@ -SafariZoneCenter_Object: - db $0 ; border block - - db 9 ; warps - warp 14, 25, 2, SAFARI_ZONE_GATE - warp 15, 25, 3, SAFARI_ZONE_GATE - warp 0, 10, 4, SAFARI_ZONE_WEST - warp 0, 11, 5, SAFARI_ZONE_WEST - warp 14, 0, 4, SAFARI_ZONE_NORTH - warp 15, 0, 5, SAFARI_ZONE_NORTH - warp 29, 10, 2, SAFARI_ZONE_EAST - warp 29, 11, 3, SAFARI_ZONE_EAST - warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE - - db 2 ; signs - sign 18, 20, 2 ; SafariZoneCenterText2 - sign 14, 22, 3 ; SafariZoneCenterText3 - - db 1 ; objects - object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET - - ; warp-to - warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE - warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE - warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST - warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST - warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/mapObjects/SafariZoneCenterRestHouse.asm b/data/mapObjects/SafariZoneCenterRestHouse.asm deleted file mode 100755 index 9eda9970..00000000 --- a/data/mapObjects/SafariZoneCenterRestHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -SafariZoneCenterRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, SAFARI_ZONE_CENTER - warp 3, 7, 8, SAFARI_ZONE_CENTER - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/SafariZoneEast.asm b/data/mapObjects/SafariZoneEast.asm deleted file mode 100755 index df612ea9..00000000 --- a/data/mapObjects/SafariZoneEast.asm +++ /dev/null @@ -1,27 +0,0 @@ -SafariZoneEast_Object: - db $0 ; border block - - db 5 ; warps - warp 0, 4, 6, SAFARI_ZONE_NORTH - warp 0, 5, 7, SAFARI_ZONE_NORTH - warp 0, 22, 6, SAFARI_ZONE_CENTER - warp 0, 23, 6, SAFARI_ZONE_CENTER - warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE - - db 3 ; signs - sign 26, 10, 5 ; SafariZoneEastText5 - sign 6, 4, 6 ; SafariZoneEastText6 - sign 5, 23, 7 ; SafariZoneEastText7 - - db 4 ; objects - object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION - object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS - object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_37 - - ; warp-to - warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/mapObjects/SafariZoneEastRestHouse.asm b/data/mapObjects/SafariZoneEastRestHouse.asm deleted file mode 100755 index e7c68343..00000000 --- a/data/mapObjects/SafariZoneEastRestHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneEastRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, SAFARI_ZONE_EAST - warp 3, 7, 4, SAFARI_ZONE_EAST - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person - object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST - warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/SafariZoneGate.asm b/data/mapObjects/SafariZoneGate.asm deleted file mode 100755 index 6749b45b..00000000 --- a/data/mapObjects/SafariZoneGate.asm +++ /dev/null @@ -1,20 +0,0 @@ -SafariZoneGate_Object: - db $a ; border block - - db 4 ; warps - warp 3, 5, 4, -1 - warp 4, 5, 4, -1 - warp 3, 0, 0, SAFARI_ZONE_CENTER - warp 4, 0, 1, SAFARI_ZONE_CENTER - - db 0 ; signs - - db 2 ; objects - object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person - object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person - - ; warp-to - warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH - warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH - warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER - warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/SafariZoneNorth.asm b/data/mapObjects/SafariZoneNorth.asm deleted file mode 100755 index 9eda7b4b..00000000 --- a/data/mapObjects/SafariZoneNorth.asm +++ /dev/null @@ -1,35 +0,0 @@ -SafariZoneNorth_Object: - db $0 ; border block - - db 9 ; warps - warp 2, 35, 0, SAFARI_ZONE_WEST - warp 3, 35, 1, SAFARI_ZONE_WEST - warp 8, 35, 2, SAFARI_ZONE_WEST - warp 9, 35, 3, SAFARI_ZONE_WEST - warp 20, 35, 4, SAFARI_ZONE_CENTER - warp 21, 35, 5, SAFARI_ZONE_CENTER - warp 39, 30, 0, SAFARI_ZONE_EAST - warp 39, 31, 1, SAFARI_ZONE_EAST - warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE - - db 5 ; signs - sign 36, 4, 3 ; SafariZoneNorthText3 - sign 4, 25, 4 ; SafariZoneNorthText4 - sign 13, 31, 5 ; SafariZoneNorthText5 - sign 19, 33, 6 ; SafariZoneNorthText6 - sign 26, 28, 7 ; SafariZoneNorthText7 - - db 2 ; objects - object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN - object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40 - - ; warp-to - warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/mapObjects/SafariZoneNorthRestHouse.asm b/data/mapObjects/SafariZoneNorthRestHouse.asm deleted file mode 100755 index 34b3ab4f..00000000 --- a/data/mapObjects/SafariZoneNorthRestHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneNorthRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, SAFARI_ZONE_NORTH - warp 3, 7, 8, SAFARI_ZONE_NORTH - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person - object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH - warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/SafariZoneSecretHouse.asm b/data/mapObjects/SafariZoneSecretHouse.asm deleted file mode 100755 index 2a5fc22d..00000000 --- a/data/mapObjects/SafariZoneSecretHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -SafariZoneSecretHouse_Object: - db $17 ; border block - - db 2 ; warps - warp 2, 7, 6, SAFARI_ZONE_WEST - warp 3, 7, 6, SAFARI_ZONE_WEST - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/SafariZoneWest.asm b/data/mapObjects/SafariZoneWest.asm deleted file mode 100755 index 7faced72..00000000 --- a/data/mapObjects/SafariZoneWest.asm +++ /dev/null @@ -1,34 +0,0 @@ -SafariZoneWest_Object: - db $0 ; border block - - db 8 ; warps - warp 20, 0, 0, SAFARI_ZONE_NORTH - warp 21, 0, 1, SAFARI_ZONE_NORTH - warp 26, 0, 2, SAFARI_ZONE_NORTH - warp 27, 0, 3, SAFARI_ZONE_NORTH - warp 29, 22, 2, SAFARI_ZONE_CENTER - warp 29, 23, 3, SAFARI_ZONE_CENTER - warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE - warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE - - db 4 ; signs - sign 12, 12, 5 ; SafariZoneWestText5 - sign 17, 3, 6 ; SafariZoneWestText6 - sign 26, 4, 7 ; SafariZoneWestText7 - sign 24, 22, 8 ; SafariZoneWestText8 - - db 4 ; objects - object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION - object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_32 - object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE - object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH - - ; warp-to - warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 21, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 26, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 27, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH - warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER - warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/mapObjects/SafariZoneWestRestHouse.asm b/data/mapObjects/SafariZoneWestRestHouse.asm deleted file mode 100755 index 9f1bc0ed..00000000 --- a/data/mapObjects/SafariZoneWestRestHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -SafariZoneWestRestHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, SAFARI_ZONE_WEST - warp 3, 7, 7, SAFARI_ZONE_WEST - - db 0 ; signs - - db 3 ; objects - object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person - object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person - - ; warp-to - warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/SaffronCity.asm b/data/mapObjects/SaffronCity.asm deleted file mode 100755 index b8d3a9cf..00000000 --- a/data/mapObjects/SaffronCity.asm +++ /dev/null @@ -1,51 +0,0 @@ -SaffronCity_Object: - db $f ; border block - - db 8 ; warps - warp 7, 5, 0, COPYCATS_HOUSE_1F - warp 26, 3, 0, FIGHTING_DOJO - warp 34, 3, 0, SAFFRON_GYM - warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE - warp 25, 11, 0, SAFFRON_MART - warp 18, 21, 0, SILPH_CO_1F - warp 9, 29, 0, SAFFRON_POKECENTER - warp 29, 29, 0, MR_PSYCHICS_HOUSE - - db 10 ; signs - sign 17, 5, 16 ; SaffronCityText16 - sign 27, 5, 17 ; SaffronCityText17 - sign 35, 5, 18 ; SaffronCityText18 - sign 26, 11, 19 ; MartSignText - sign 39, 19, 20 ; SaffronCityText20 - sign 5, 21, 21 ; SaffronCityText21 - sign 15, 21, 22 ; SaffronCityText22 - sign 10, 29, 23 ; PokeCenterSignText - sign 27, 29, 24 ; SaffronCityText24 - sign 1, 19, 25 ; SaffronCityText25 - - db 15 ; objects - object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person - object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person - object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person - object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person - object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person - object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person - object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person - object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person - object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person - object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person - object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person - object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person - object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person - - ; warp-to - warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F - warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO - warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM - warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE - warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART - warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F - warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER - warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE diff --git a/data/mapObjects/SaffronGym.asm b/data/mapObjects/SaffronGym.asm deleted file mode 100755 index 1869421a..00000000 --- a/data/mapObjects/SaffronGym.asm +++ /dev/null @@ -1,83 +0,0 @@ -SaffronGym_Object: - db $2e ; border block - - db 32 ; warps - warp 8, 17, 2, -1 - warp 9, 17, 2, -1 - warp 1, 3, 22, SAFFRON_GYM - warp 5, 3, 15, SAFFRON_GYM - warp 1, 5, 18, SAFFRON_GYM - warp 5, 5, 8, SAFFRON_GYM - warp 1, 9, 27, SAFFRON_GYM - warp 5, 9, 16, SAFFRON_GYM - warp 1, 11, 5, SAFFRON_GYM - warp 5, 11, 13, SAFFRON_GYM - warp 1, 15, 23, SAFFRON_GYM - warp 5, 15, 30, SAFFRON_GYM - warp 1, 17, 17, SAFFRON_GYM - warp 5, 17, 9, SAFFRON_GYM - warp 9, 3, 26, SAFFRON_GYM - warp 11, 3, 3, SAFFRON_GYM - warp 9, 5, 7, SAFFRON_GYM - warp 11, 5, 12, SAFFRON_GYM - warp 11, 11, 4, SAFFRON_GYM - warp 11, 15, 31, SAFFRON_GYM - warp 15, 3, 24, SAFFRON_GYM - warp 19, 3, 28, SAFFRON_GYM - warp 15, 5, 2, SAFFRON_GYM - warp 19, 5, 10, SAFFRON_GYM - warp 15, 9, 20, SAFFRON_GYM - warp 19, 9, 29, SAFFRON_GYM - warp 15, 11, 14, SAFFRON_GYM - warp 19, 11, 6, SAFFRON_GYM - warp 15, 15, 21, SAFFRON_GYM - warp 19, 15, 25, SAFFRON_GYM - warp 15, 17, 11, SAFFRON_GYM - warp 19, 17, 19, SAFFRON_GYM - - db 0 ; signs - - db 9 ; objects - object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 - object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 - object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 - object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 - object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 - object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person - - ; warp-to - warp_to 8, 17, SAFFRON_GYM_WIDTH - warp_to 9, 17, SAFFRON_GYM_WIDTH - warp_to 1, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 1, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 5, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 9, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 9, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 11, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 3, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 5, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 9, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 11, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 15, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 15, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM - warp_to 19, 17, SAFFRON_GYM_WIDTH ; SAFFRON_GYM diff --git a/data/mapObjects/SaffronMart.asm b/data/mapObjects/SaffronMart.asm deleted file mode 100755 index c376f2de..00000000 --- a/data/mapObjects/SaffronMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -SaffronMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person - - ; warp-to - warp_to 3, 7, SAFFRON_MART_WIDTH - warp_to 4, 7, SAFFRON_MART_WIDTH diff --git a/data/mapObjects/SaffronPidgeyHouse.asm b/data/mapObjects/SaffronPidgeyHouse.asm deleted file mode 100755 index 65a851bf..00000000 --- a/data/mapObjects/SaffronPidgeyHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -SaffronPidgeyHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person - object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person - - ; warp-to - warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH - warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/SaffronPokecenter.asm b/data/mapObjects/SaffronPokecenter.asm deleted file mode 100755 index e54fd76b..00000000 --- a/data/mapObjects/SaffronPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -SaffronPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 6, -1 - warp 4, 7, 6, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person - object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, SAFFRON_POKECENTER_WIDTH - warp_to 4, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm deleted file mode 100755 index 8707ee0a..00000000 --- a/data/mapObjects/SeafoamIslands1F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslands1F_Object: - db $7d ; border block - - db 7 ; warps - warp 4, 17, 0, -1 - warp 5, 17, 0, -1 - warp 26, 17, 1, -1 - warp 27, 17, 1, -1 - warp 7, 5, 1, SEAFOAM_ISLANDS_B1F - warp 25, 3, 6, SEAFOAM_ISLANDS_B1F - warp 23, 15, 4, SEAFOAM_ISLANDS_B1F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F - - ; holes - warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH - warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/mapObjects/SeafoamIslandsB1F.asm deleted file mode 100755 index 426ca0c3..00000000 --- a/data/mapObjects/SeafoamIslandsB1F.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslandsB1F_Object: - db $7d ; border block - - db 7 ; warps - warp 4, 2, 0, SEAFOAM_ISLANDS_B2F - warp 7, 5, 4, SEAFOAM_ISLANDS_1F - warp 13, 7, 2, SEAFOAM_ISLANDS_B2F - warp 19, 15, 3, SEAFOAM_ISLANDS_B2F - warp 23, 15, 6, SEAFOAM_ISLANDS_1F - warp 25, 11, 5, SEAFOAM_ISLANDS_B2F - warp 25, 3, 5, SEAFOAM_ISLANDS_1F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F - warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/mapObjects/SeafoamIslandsB2F.asm deleted file mode 100755 index 9c1a7898..00000000 --- a/data/mapObjects/SeafoamIslandsB2F.asm +++ /dev/null @@ -1,26 +0,0 @@ -SeafoamIslandsB2F_Object: - db $7d ; border block - - db 7 ; warps - warp 5, 3, 0, SEAFOAM_ISLANDS_B1F - warp 5, 13, 0, SEAFOAM_ISLANDS_B3F - warp 13, 7, 2, SEAFOAM_ISLANDS_B1F - warp 19, 15, 3, SEAFOAM_ISLANDS_B1F - warp 25, 3, 3, SEAFOAM_ISLANDS_B3F - warp 25, 11, 5, SEAFOAM_ISLANDS_B1F - warp 25, 14, 4, SEAFOAM_ISLANDS_B3F - - db 0 ; signs - - db 2 ; objects - object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - - ; warp-to - warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F - warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/mapObjects/SeafoamIslandsB3F.asm deleted file mode 100755 index d194e1cd..00000000 --- a/data/mapObjects/SeafoamIslandsB3F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SeafoamIslandsB3F_Object: - db $7d ; border block - - db 7 ; warps - warp 5, 12, 1, SEAFOAM_ISLANDS_B2F - warp 8, 6, 2, SEAFOAM_ISLANDS_B4F - warp 25, 4, 3, SEAFOAM_ISLANDS_B4F - warp 25, 3, 4, SEAFOAM_ISLANDS_B2F - warp 25, 14, 6, SEAFOAM_ISLANDS_B2F - warp 20, 17, 0, SEAFOAM_ISLANDS_B4F - warp 21, 17, 1, SEAFOAM_ISLANDS_B4F - - db 0 ; signs - - db 6 ; objects - object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person - object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person - object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person - object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person - object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person - - ; warp-to - warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F - warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F - warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F - warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F - warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/mapObjects/SeafoamIslandsB4F.asm deleted file mode 100755 index 62d88b0c..00000000 --- a/data/mapObjects/SeafoamIslandsB4F.asm +++ /dev/null @@ -1,23 +0,0 @@ -SeafoamIslandsB4F_Object: - db $7d ; border block - - db 4 ; warps - warp 20, 17, 5, SEAFOAM_ISLANDS_B3F - warp 21, 17, 6, SEAFOAM_ISLANDS_B3F - warp 11, 7, 1, SEAFOAM_ISLANDS_B3F - warp 25, 4, 2, SEAFOAM_ISLANDS_B3F - - db 2 ; signs - sign 9, 15, 4 ; SeafoamIslands5Text4 - sign 23, 1, 5 ; SeafoamIslands5Text5 - - db 3 ; objects - object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person - object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person - object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 - - ; warp-to - warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F - warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F diff --git a/data/mapObjects/SilphCo10F.asm b/data/mapObjects/SilphCo10F.asm deleted file mode 100755 index 1c8948d3..00000000 --- a/data/mapObjects/SilphCo10F.asm +++ /dev/null @@ -1,28 +0,0 @@ -SilphCo10F_Object: - db $2e ; border block - - db 6 ; warps - warp 8, 0, 0, SILPH_CO_9F - warp 10, 0, 0, SILPH_CO_11F - warp 12, 0, 0, SILPH_CO_ELEVATOR - warp 9, 11, 3, SILPH_CO_4F - warp 13, 15, 5, SILPH_CO_4F - warp 13, 7, 6, SILPH_CO_4F - - db 0 ; signs - - db 6 ; objects - object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 - object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 - object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person - object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_26 - object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY - object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS - - ; warp-to - warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F - warp_to 10, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_11F - warp_to 12, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 11, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 15, SILPH_CO_10F_WIDTH ; SILPH_CO_4F - warp_to 13, 7, SILPH_CO_10F_WIDTH ; SILPH_CO_4F diff --git a/data/mapObjects/SilphCo11F.asm b/data/mapObjects/SilphCo11F.asm deleted file mode 100755 index 7a1dff73..00000000 --- a/data/mapObjects/SilphCo11F.asm +++ /dev/null @@ -1,23 +0,0 @@ -SilphCo11F_Object: - db $d ; border block - - db 4 ; warps - warp 9, 0, 1, SILPH_CO_10F - warp 13, 0, 0, SILPH_CO_ELEVATOR - warp 5, 5, 9, -1 - warp 3, 2, 3, SILPH_CO_7F - - db 0 ; signs - - db 5 ; objects - object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person - object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 - object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 - object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 - - ; warp-to - warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F - warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 5, SILPH_CO_11F_WIDTH - warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F diff --git a/data/mapObjects/SilphCo1F.asm b/data/mapObjects/SilphCo1F.asm deleted file mode 100755 index fc040091..00000000 --- a/data/mapObjects/SilphCo1F.asm +++ /dev/null @@ -1,21 +0,0 @@ -SilphCo1F_Object: - db $2e ; border block - - db 5 ; warps - warp 10, 17, 5, -1 - warp 11, 17, 5, -1 - warp 26, 0, 0, SILPH_CO_2F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 16, 10, 6, SILPH_CO_3F - - db 0 ; signs - - db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person - - ; warp-to - warp_to 10, 17, SILPH_CO_1F_WIDTH - warp_to 11, 17, SILPH_CO_1F_WIDTH - warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F - warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo2F.asm b/data/mapObjects/SilphCo2F.asm deleted file mode 100755 index bc30d78d..00000000 --- a/data/mapObjects/SilphCo2F.asm +++ /dev/null @@ -1,29 +0,0 @@ -SilphCo2F_Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 2, SILPH_CO_1F - warp 26, 0, 0, SILPH_CO_3F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 3, 3, 6, SILPH_CO_3F - warp 13, 3, 4, SILPH_CO_8F - warp 27, 15, 5, SILPH_CO_8F - warp 9, 15, 4, SILPH_CO_6F - - db 0 ; signs - - db 5 ; objects - object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person - object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 - object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 - object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 - object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 - - ; warp-to - warp_to 24, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_1F - warp_to 26, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to 20, 0, SILPH_CO_2F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_3F - warp_to 13, 3, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to 27, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_8F - warp_to 9, 15, SILPH_CO_2F_WIDTH ; SILPH_CO_6F diff --git a/data/mapObjects/SilphCo3F.asm b/data/mapObjects/SilphCo3F.asm deleted file mode 100755 index f45cdf81..00000000 --- a/data/mapObjects/SilphCo3F.asm +++ /dev/null @@ -1,34 +0,0 @@ -SilphCo3F_Object: - db $2e ; border block - - db 10 ; warps - warp 26, 0, 1, SILPH_CO_2F - warp 24, 0, 0, SILPH_CO_4F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 23, 11, 9, SILPH_CO_3F - warp 3, 3, 5, SILPH_CO_5F - warp 3, 15, 6, SILPH_CO_5F - warp 27, 3, 3, SILPH_CO_2F - warp 3, 11, 3, SILPH_CO_9F - warp 11, 11, 4, SILPH_CO_7F - warp 27, 15, 3, SILPH_CO_3F - - db 0 ; signs - - db 4 ; objects - object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 - object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 - object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION - - ; warp-to - warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to 24, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_4F - warp_to 20, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 23, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_3F - warp_to 3, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to 3, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_5F - warp_to 27, 3, SILPH_CO_3F_WIDTH ; SILPH_CO_2F - warp_to 3, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_9F - warp_to 11, 11, SILPH_CO_3F_WIDTH ; SILPH_CO_7F - warp_to 27, 15, SILPH_CO_3F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo4F.asm b/data/mapObjects/SilphCo4F.asm deleted file mode 100755 index 3d865bbc..00000000 --- a/data/mapObjects/SilphCo4F.asm +++ /dev/null @@ -1,31 +0,0 @@ -SilphCo4F_Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 1, SILPH_CO_3F - warp 26, 0, 1, SILPH_CO_5F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 11, 7, 3, SILPH_CO_10F - warp 17, 3, 3, SILPH_CO_6F - warp 3, 15, 4, SILPH_CO_10F - warp 17, 11, 5, SILPH_CO_10F - - db 0 ; signs - - db 7 ; objects - object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 - object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 - object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 - object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL - object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE - object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE - - ; warp-to - warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F - warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F - warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F - warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F diff --git a/data/mapObjects/SilphCo5F.asm b/data/mapObjects/SilphCo5F.asm deleted file mode 100755 index c10f17c8..00000000 --- a/data/mapObjects/SilphCo5F.asm +++ /dev/null @@ -1,35 +0,0 @@ -SilphCo5F_Object: - db $2e ; border block - - db 7 ; warps - warp 24, 0, 1, SILPH_CO_6F - warp 26, 0, 1, SILPH_CO_4F - warp 20, 0, 0, SILPH_CO_ELEVATOR - warp 27, 3, 5, SILPH_CO_7F - warp 9, 15, 4, SILPH_CO_9F - warp 11, 5, 4, SILPH_CO_3F - warp 3, 15, 5, SILPH_CO_3F - - db 0 ; signs - - db 11 ; objects - object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 - object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 - object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 - object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 - object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_09 - object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN - object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY - object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person - object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person - object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person - - ; warp-to - warp_to 24, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_6F - warp_to 26, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_4F - warp_to 20, 0, SILPH_CO_5F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 27, 3, SILPH_CO_5F_WIDTH ; SILPH_CO_7F - warp_to 9, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_9F - warp_to 11, 5, SILPH_CO_5F_WIDTH ; SILPH_CO_3F - warp_to 3, 15, SILPH_CO_5F_WIDTH ; SILPH_CO_3F diff --git a/data/mapObjects/SilphCo6F.asm b/data/mapObjects/SilphCo6F.asm deleted file mode 100755 index ad2ac32f..00000000 --- a/data/mapObjects/SilphCo6F.asm +++ /dev/null @@ -1,30 +0,0 @@ -SilphCo6F_Object: - db $2e ; border block - - db 5 ; warps - warp 16, 0, 1, SILPH_CO_7F - warp 14, 0, 0, SILPH_CO_5F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 3, 3, 4, SILPH_CO_4F - warp 23, 3, 6, SILPH_CO_2F - - db 0 ; signs - - db 10 ; objects - object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person - object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person - object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person - object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person - object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 - object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 - object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 - object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP - object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY - - ; warp-to - warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F - warp_to 14, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_5F - warp_to 18, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_4F - warp_to 23, 3, SILPH_CO_6F_WIDTH ; SILPH_CO_2F diff --git a/data/mapObjects/SilphCo7F.asm b/data/mapObjects/SilphCo7F.asm deleted file mode 100755 index 255f4b33..00000000 --- a/data/mapObjects/SilphCo7F.asm +++ /dev/null @@ -1,33 +0,0 @@ -SilphCo7F_Object: - db $2e ; border block - - db 6 ; warps - warp 16, 0, 1, SILPH_CO_8F - warp 22, 0, 0, SILPH_CO_6F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 5, 7, 3, SILPH_CO_11F - warp 5, 3, 8, SILPH_CO_3F - warp 21, 15, 3, SILPH_CO_5F - - db 0 ; signs - - db 11 ; objects - object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person - object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person - object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 - object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 - object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 - object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 - object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person - object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM - object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_03 - - ; warp-to - warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F - warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F - warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F - warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F - warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/SilphCo8F.asm b/data/mapObjects/SilphCo8F.asm deleted file mode 100755 index d05c7844..00000000 --- a/data/mapObjects/SilphCo8F.asm +++ /dev/null @@ -1,28 +0,0 @@ -SilphCo8F_Object: - db $2e ; border block - - db 7 ; warps - warp 16, 0, 1, SILPH_CO_9F - warp 14, 0, 0, SILPH_CO_7F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 3, 11, 6, SILPH_CO_8F - warp 3, 15, 4, SILPH_CO_2F - warp 11, 5, 5, SILPH_CO_2F - warp 11, 9, 3, SILPH_CO_8F - - db 0 ; signs - - db 4 ; objects - object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 - object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 - object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 - - ; warp-to - warp_to 16, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_9F - warp_to 14, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_7F - warp_to 18, 0, SILPH_CO_8F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 3, 11, SILPH_CO_8F_WIDTH ; SILPH_CO_8F - warp_to 3, 15, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to 11, 5, SILPH_CO_8F_WIDTH ; SILPH_CO_2F - warp_to 11, 9, SILPH_CO_8F_WIDTH ; SILPH_CO_8F_WIDTH diff --git a/data/mapObjects/SilphCo9F.asm b/data/mapObjects/SilphCo9F.asm deleted file mode 100755 index 28ef5f10..00000000 --- a/data/mapObjects/SilphCo9F.asm +++ /dev/null @@ -1,24 +0,0 @@ -SilphCo9F_Object: - db $2e ; border block - - db 5 ; warps - warp 14, 0, 0, SILPH_CO_10F - warp 16, 0, 0, SILPH_CO_8F - warp 18, 0, 0, SILPH_CO_ELEVATOR - warp 9, 3, 7, SILPH_CO_3F - warp 17, 15, 4, SILPH_CO_5F - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person - object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 - object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 - object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 - - ; warp-to - warp_to 14, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_10F - warp_to 16, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_8F - warp_to 18, 0, SILPH_CO_9F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 9, 3, SILPH_CO_9F_WIDTH ; SILPH_CO_3F - warp_to 17, 15, SILPH_CO_9F_WIDTH ; SILPH_CO_5F diff --git a/data/mapObjects/SilphCoElevator.asm b/data/mapObjects/SilphCoElevator.asm deleted file mode 100755 index 9c4b5a79..00000000 --- a/data/mapObjects/SilphCoElevator.asm +++ /dev/null @@ -1,15 +0,0 @@ -SilphCoElevator_Object: - db $f ; border block - - db 2 ; warps - warp 1, 3, 0, 237 - warp 2, 3, 0, 237 - - db 1 ; signs - sign 3, 0, 1 ; SilphCoElevatorText1 - - db 0 ; objects - - ; warp-to - warp_to 1, 3, SILPH_CO_ELEVATOR_WIDTH - warp_to 2, 3, SILPH_CO_ELEVATOR_WIDTH diff --git a/data/mapObjects/TradeCenter.asm b/data/mapObjects/TradeCenter.asm deleted file mode 100755 index e6df8087..00000000 --- a/data/mapObjects/TradeCenter.asm +++ /dev/null @@ -1,9 +0,0 @@ -TradeCenter_Object: - db $e ; border block - - db 0 ; warps - - db 0 ; signs - - db 1 ; objects - object SPRITE_RED, 2, 2, STAY, 0, 1 ; person diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/mapObjects/UndergroundPathNorthSouth.asm deleted file mode 100755 index 35e21cca..00000000 --- a/data/mapObjects/UndergroundPathNorthSouth.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathNorthSouth_Object: - db $1 ; border block - - db 2 ; warps - warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5 - warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5 - warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6 diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/mapObjects/UndergroundPathRoute5.asm deleted file mode 100755 index af71ebb4..00000000 --- a/data/mapObjects/UndergroundPathRoute5.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute5_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH - - db 0 ; signs - - db 1 ; objects - object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/mapObjects/UndergroundPathRoute6.asm deleted file mode 100755 index 5a40ade2..00000000 --- a/data/mapObjects/UndergroundPathRoute6.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute6_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 3, -1 - warp 4, 7, 3, -1 - warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/mapObjects/UndergroundPathRoute7.asm deleted file mode 100755 index 4666e0c9..00000000 --- a/data/mapObjects/UndergroundPathRoute7.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute7_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST - - db 0 ; signs - - db 1 ; objects - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/mapObjects/UndergroundPathRoute7Copy.asm deleted file mode 100755 index c020646e..00000000 --- a/data/mapObjects/UndergroundPathRoute7Copy.asm +++ /dev/null @@ -1,18 +0,0 @@ -UndergroundPathRoute7Copy_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 5, -1 - warp 4, 7, 5, -1 - warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/mapObjects/UndergroundPathRoute8.asm deleted file mode 100755 index 8be0d474..00000000 --- a/data/mapObjects/UndergroundPathRoute8.asm +++ /dev/null @@ -1,17 +0,0 @@ -UndergroundPathRoute8_Object: - db $a ; border block - - db 3 ; warps - warp 3, 7, 4, -1 - warp 4, 7, 4, -1 - warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST - - db 0 ; signs - - db 1 ; objects - object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person - - ; warp-to - warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH - warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH - warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/mapObjects/UndergroundPathWestEast.asm deleted file mode 100755 index fa064aca..00000000 --- a/data/mapObjects/UndergroundPathWestEast.asm +++ /dev/null @@ -1,14 +0,0 @@ -UndergroundPathWestEast_Object: - db $1 ; border block - - db 2 ; warps - warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7 - warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8 - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7 - warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8 diff --git a/data/mapObjects/VermilionCity.asm b/data/mapObjects/VermilionCity.asm deleted file mode 100755 index b1e1a005..00000000 --- a/data/mapObjects/VermilionCity.asm +++ /dev/null @@ -1,41 +0,0 @@ -VermilionCity_Object: - db $43 ; border block - - db 9 ; warps - warp 11, 3, 0, VERMILION_POKECENTER - warp 9, 13, 0, POKEMON_FAN_CLUB - warp 23, 13, 0, VERMILION_MART - warp 12, 19, 0, VERMILION_GYM - warp 23, 19, 0, VERMILION_PIDGEY_HOUSE - warp 18, 31, 0, VERMILION_DOCK - warp 19, 31, 0, VERMILION_DOCK - warp 15, 13, 0, VERMILION_TRADE_HOUSE - warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE - - db 7 ; signs - sign 27, 3, 7 ; VermilionCityText7 - sign 37, 13, 8 ; VermilionCityText8 - sign 24, 13, 9 ; MartSignText - sign 12, 3, 10 ; PokeCenterSignText - sign 7, 13, 11 ; VermilionCityText11 - sign 7, 19, 12 ; VermilionCityText12 - sign 29, 15, 13 ; VermilionCityText13 - - db 6 ; objects - object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person - object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person - object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person - object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person - object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person - - ; warp-to - warp_to 11, 3, VERMILION_CITY_WIDTH ; VERMILION_POKECENTER - warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB - warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART - warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM - warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE - warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK - warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE - warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE diff --git a/data/mapObjects/VermilionDock.asm b/data/mapObjects/VermilionDock.asm deleted file mode 100755 index 6f07554a..00000000 --- a/data/mapObjects/VermilionDock.asm +++ /dev/null @@ -1,14 +0,0 @@ -VermilionDock_Object: - db $f ; border block - - db 2 ; warps - warp 14, 0, 5, -1 - warp 14, 2, 1, SS_ANNE_1F - - db 0 ; signs - - db 0 ; objects - - ; warp-to - warp_to 14, 0, VERMILION_DOCK_WIDTH - warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F diff --git a/data/mapObjects/VermilionGym.asm b/data/mapObjects/VermilionGym.asm deleted file mode 100755 index 4ace83be..00000000 --- a/data/mapObjects/VermilionGym.asm +++ /dev/null @@ -1,19 +0,0 @@ -VermilionGym_Object: - db $3 ; border block - - db 2 ; warps - warp 4, 17, 3, -1 - warp 5, 17, 3, -1 - - db 0 ; signs - - db 5 ; objects - object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 - object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 - object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 - object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person - - ; warp-to - warp_to 4, 17, VERMILION_GYM_WIDTH - warp_to 5, 17, VERMILION_GYM_WIDTH diff --git a/data/mapObjects/VermilionMart.asm b/data/mapObjects/VermilionMart.asm deleted file mode 100755 index 74bcf35f..00000000 --- a/data/mapObjects/VermilionMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -VermilionMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 2, -1 - warp 4, 7, 2, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person - object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person - - ; warp-to - warp_to 3, 7, VERMILION_MART_WIDTH - warp_to 4, 7, VERMILION_MART_WIDTH diff --git a/data/mapObjects/VermilionOldRodHouse.asm b/data/mapObjects/VermilionOldRodHouse.asm deleted file mode 100755 index f5b4b96a..00000000 --- a/data/mapObjects/VermilionOldRodHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionOldRodHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 8, -1 - warp 3, 7, 8, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person - - ; warp-to - warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH - warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH diff --git a/data/mapObjects/VermilionPidgeyHouse.asm b/data/mapObjects/VermilionPidgeyHouse.asm deleted file mode 100755 index 0e820f86..00000000 --- a/data/mapObjects/VermilionPidgeyHouse.asm +++ /dev/null @@ -1,17 +0,0 @@ -VermilionPidgeyHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 4, -1 - warp 3, 7, 4, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person - object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person - object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person - - ; warp-to - warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH - warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH diff --git a/data/mapObjects/VermilionPokecenter.asm b/data/mapObjects/VermilionPokecenter.asm deleted file mode 100755 index d2142045..00000000 --- a/data/mapObjects/VermilionPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -VermilionPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person - object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, VERMILION_POKECENTER_WIDTH - warp_to 4, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/mapObjects/VermilionTradeHouse.asm b/data/mapObjects/VermilionTradeHouse.asm deleted file mode 100755 index 30212b2a..00000000 --- a/data/mapObjects/VermilionTradeHouse.asm +++ /dev/null @@ -1,15 +0,0 @@ -VermilionTradeHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 7, -1 - warp 3, 7, 7, -1 - - db 0 ; signs - - db 1 ; objects - object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person - - ; warp-to - warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH - warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH diff --git a/data/mapObjects/VictoryRoad1F.asm b/data/mapObjects/VictoryRoad1F.asm deleted file mode 100755 index cc0c47ce..00000000 --- a/data/mapObjects/VictoryRoad1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -VictoryRoad1F_Object: - db $7d ; border block - - db 3 ; warps - warp 8, 17, 2, -1 - warp 9, 17, 2, -1 - warp 1, 1, 0, VICTORY_ROAD_2F - - db 0 ; signs - - db 7 ; objects - object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43 - object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY - object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - - ; warp-to - warp_to 8, 17, VICTORY_ROAD_1F_WIDTH - warp_to 9, 17, VICTORY_ROAD_1F_WIDTH - warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/VictoryRoad2F.asm b/data/mapObjects/VictoryRoad2F.asm deleted file mode 100755 index 55559bca..00000000 --- a/data/mapObjects/VictoryRoad2F.asm +++ /dev/null @@ -1,37 +0,0 @@ -VictoryRoad2F_Object: - db $7d ; border block - - db 7 ; warps - warp 0, 8, 2, VICTORY_ROAD_1F - warp 29, 7, 3, -1 - warp 29, 8, 3, -1 - warp 23, 7, 0, VICTORY_ROAD_3F - warp 25, 14, 2, VICTORY_ROAD_3F - warp 27, 7, 1, VICTORY_ROAD_3F - warp 1, 1, 3, VICTORY_ROAD_3F - - db 0 ; signs - - db 13 ; objects - object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 - object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 - object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 - object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_17 - object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL - object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_05 - object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC - object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person - object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person - - ; warp-to - warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F - warp_to 29, 7, VICTORY_ROAD_2F_WIDTH - warp_to 29, 8, VICTORY_ROAD_2F_WIDTH - warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F - warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F - warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F - warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F diff --git a/data/mapObjects/VictoryRoad3F.asm b/data/mapObjects/VictoryRoad3F.asm deleted file mode 100755 index 2eb42417..00000000 --- a/data/mapObjects/VictoryRoad3F.asm +++ /dev/null @@ -1,28 +0,0 @@ -VictoryRoad3F_Object: - db $7d ; border block - - db 4 ; warps - warp 23, 7, 3, VICTORY_ROAD_2F - warp 26, 8, 5, VICTORY_ROAD_2F - warp 27, 15, 4, VICTORY_ROAD_2F - warp 2, 0, 6, VICTORY_ROAD_2F - - db 0 ; signs - - db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE - object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47 - object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person - object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person - object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person - - ; warp-to - warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F - warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F - warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F - warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F diff --git a/data/mapObjects/ViridianCity.asm b/data/mapObjects/ViridianCity.asm deleted file mode 100755 index 32fe8d3a..00000000 --- a/data/mapObjects/ViridianCity.asm +++ /dev/null @@ -1,33 +0,0 @@ -ViridianCity_Object: - db $f ; border block - - db 5 ; warps - warp 23, 25, 0, VIRIDIAN_POKECENTER - warp 29, 19, 0, VIRIDIAN_MART - warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE - warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE - warp 32, 7, 0, VIRIDIAN_GYM - - db 6 ; signs - sign 17, 17, 8 ; ViridianCityText8 - sign 19, 1, 9 ; ViridianCityText9 - sign 21, 29, 10 ; ViridianCityText10 - sign 30, 19, 11 ; MartSignText - sign 24, 25, 12 ; PokeCenterSignText - sign 27, 7, 13 ; ViridianCityText13 - - db 7 ; objects - object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person - object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person - object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person - object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person - object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person - object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person - object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person - - ; warp-to - warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER - warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART - warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE - warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE - warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM diff --git a/data/mapObjects/ViridianForest.asm b/data/mapObjects/ViridianForest.asm deleted file mode 100755 index cbcb6ff8..00000000 --- a/data/mapObjects/ViridianForest.asm +++ /dev/null @@ -1,36 +0,0 @@ -ViridianForest_Object: - db $3 ; border block - - db 6 ; warps - warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE - warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE - warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE - - db 6 ; signs - sign 24, 40, 9 ; ViridianForestText9 - sign 16, 32, 10 ; ViridianForestText10 - sign 26, 17, 11 ; ViridianForestText11 - sign 4, 24, 12 ; ViridianForestText12 - sign 18, 45, 13 ; ViridianForestText13 - sign 2, 1, 14 ; ViridianForestText14 - - db 8 ; objects - object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 - object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE - object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION - object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL - object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person - - ; warp-to - warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE - warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE - warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/mapObjects/ViridianForestNorthGate.asm b/data/mapObjects/ViridianForestNorthGate.asm deleted file mode 100755 index 81e7fece..00000000 --- a/data/mapObjects/ViridianForestNorthGate.asm +++ /dev/null @@ -1,20 +0,0 @@ -ViridianForestNorthGate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 0, 1, -1 - warp 5, 0, 1, -1 - warp 4, 7, 0, VIRIDIAN_FOREST - warp 5, 7, 0, VIRIDIAN_FOREST - - db 0 ; signs - - db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person - object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person - - ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH - warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH - warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST diff --git a/data/mapObjects/ViridianForestSouthGate.asm b/data/mapObjects/ViridianForestSouthGate.asm deleted file mode 100755 index 76f87e51..00000000 --- a/data/mapObjects/ViridianForestSouthGate.asm +++ /dev/null @@ -1,20 +0,0 @@ -ViridianForestSouthGate_Object: - db $a ; border block - - db 4 ; warps - warp 4, 0, 3, VIRIDIAN_FOREST - warp 5, 0, 4, VIRIDIAN_FOREST - warp 4, 7, 5, -1 - warp 5, 7, 5, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person - - ; warp-to - warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST - warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST - warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH - warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH diff --git a/data/mapObjects/ViridianGym.asm b/data/mapObjects/ViridianGym.asm deleted file mode 100755 index e3fd17bd..00000000 --- a/data/mapObjects/ViridianGym.asm +++ /dev/null @@ -1,25 +0,0 @@ -ViridianGym_Object: - db $3 ; border block - - db 2 ; warps - warp 16, 17, 4, -1 - warp 17, 17, 4, -1 - - db 0 ; signs - - db 11 ; objects - object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 - object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 - object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 - object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 - object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 - object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 - object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 - object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 - object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person - object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE - - ; warp-to - warp_to 16, 17, VIRIDIAN_GYM_WIDTH - warp_to 17, 17, VIRIDIAN_GYM_WIDTH diff --git a/data/mapObjects/ViridianMart.asm b/data/mapObjects/ViridianMart.asm deleted file mode 100755 index b3e7fee5..00000000 --- a/data/mapObjects/ViridianMart.asm +++ /dev/null @@ -1,17 +0,0 @@ -ViridianMart_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 1, -1 - warp 4, 7, 1, -1 - - db 0 ; signs - - db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person - - ; warp-to - warp_to 3, 7, VIRIDIAN_MART_WIDTH - warp_to 4, 7, VIRIDIAN_MART_WIDTH diff --git a/data/mapObjects/ViridianNicknameHouse.asm b/data/mapObjects/ViridianNicknameHouse.asm deleted file mode 100755 index aaf20a91..00000000 --- a/data/mapObjects/ViridianNicknameHouse.asm +++ /dev/null @@ -1,18 +0,0 @@ -ViridianNicknameHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 3, -1 - warp 3, 7, 3, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person - object SPRITE_LITTLE_GIRL, 1, 4, WALK, 1, 2 ; person - object SPRITE_BIRD, 5, 5, WALK, 2, 3 ; person - object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person - - ; warp-to - warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH - warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH diff --git a/data/mapObjects/ViridianPokecenter.asm b/data/mapObjects/ViridianPokecenter.asm deleted file mode 100755 index 43b73e68..00000000 --- a/data/mapObjects/ViridianPokecenter.asm +++ /dev/null @@ -1,18 +0,0 @@ -ViridianPokecenter_Object: - db $0 ; border block - - db 2 ; warps - warp 3, 7, 0, -1 - warp 4, 7, 0, -1 - - db 0 ; signs - - db 4 ; objects - object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person - - ; warp-to - warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH - warp_to 4, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/data/mapObjects/ViridianSchoolHouse.asm b/data/mapObjects/ViridianSchoolHouse.asm deleted file mode 100755 index 01f2465d..00000000 --- a/data/mapObjects/ViridianSchoolHouse.asm +++ /dev/null @@ -1,16 +0,0 @@ -ViridianSchoolHouse_Object: - db $a ; border block - - db 2 ; warps - warp 2, 7, 2, -1 - warp 3, 7, 2, -1 - - db 0 ; signs - - db 2 ; objects - object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person - object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person - - ; warp-to - warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH - warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH diff --git a/data/mapObjects/WardensHouse.asm b/data/mapObjects/WardensHouse.asm deleted file mode 100755 index d8445738..00000000 --- a/data/mapObjects/WardensHouse.asm +++ /dev/null @@ -1,19 +0,0 @@ -WardensHouse_Object: - db $17 ; border block - - db 2 ; warps - warp 4, 7, 3, -1 - warp 5, 7, 3, -1 - - db 2 ; signs - sign 4, 3, 4 ; FuchsiaHouse2Text4 - sign 5, 3, 5 ; FuchsiaHouse2Text5 - - db 3 ; objects - object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY - object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person - - ; warp-to - warp_to 4, 7, WARDENS_HOUSE_WIDTH - warp_to 5, 7, WARDENS_HOUSE_WIDTH diff --git a/data/map_songs.asm b/data/map_songs.asm deleted file mode 100755 index 90fb847e..00000000 --- a/data/map_songs.asm +++ /dev/null @@ -1,249 +0,0 @@ -MapSongBanks: - db MUSIC_PALLET_TOWN, 0 ; PALLET_TOWN - db MUSIC_CITIES1, 0 ; VIRIDIAN_CITY - db MUSIC_CITIES1, 0 ; PEWTER_CITY - db MUSIC_CITIES2, 0 ; CERULEAN_CITY - db MUSIC_LAVENDER, 0 ; LAVENDER_TOWN - db MUSIC_VERMILION, 0 ; VERMILION_CITY - db MUSIC_CELADON, 0 ; CELADON_CITY - db MUSIC_CITIES2, 0 ; FUCHSIA_CITY - db MUSIC_CINNABAR, 0 ; CINNABAR_ISLAND - db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU - db MUSIC_CITIES1, 0 ; SAFFRON_CITY - db MUSIC_CITIES1, 0 ; UNUSED_MAP_0B - db MUSIC_ROUTES1, 0 ; ROUTE_1 - db MUSIC_ROUTES1, 0 ; ROUTE_2 - db MUSIC_ROUTES3, 0 ; ROUTE_3 - db MUSIC_ROUTES3, 0 ; ROUTE_4 - db MUSIC_ROUTES3, 0 ; ROUTE_5 - db MUSIC_ROUTES3, 0 ; ROUTE_6 - db MUSIC_ROUTES3, 0 ; ROUTE_7 - db MUSIC_ROUTES3, 0 ; ROUTE_8 - db MUSIC_ROUTES3, 0 ; ROUTE_9 - db MUSIC_ROUTES3, 0 ; ROUTE_10 - db MUSIC_ROUTES4, 0 ; ROUTE_11 - db MUSIC_ROUTES4, 0 ; ROUTE_12 - db MUSIC_ROUTES4, 0 ; ROUTE_13 - db MUSIC_ROUTES4, 0 ; ROUTE_14 - db MUSIC_ROUTES4, 0 ; ROUTE_15 - db MUSIC_ROUTES3, 0 ; ROUTE_16 - db MUSIC_ROUTES3, 0 ; ROUTE_17 - db MUSIC_ROUTES3, 0 ; ROUTE_18 - db MUSIC_ROUTES3, 0 ; ROUTE_19 - db MUSIC_ROUTES3, 0 ; ROUTE_20 - db MUSIC_ROUTES3, 0 ; ROUTE_21 - db MUSIC_ROUTES3, 0 ; ROUTE_22 - db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23 - db MUSIC_ROUTES2, 0 ; ROUTE_24 - db MUSIC_ROUTES2, 0 ; ROUTE_25 - db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F - db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F - db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE - db MUSIC_OAKS_LAB, 0 ; OAKS_LAB - db MUSIC_POKECENTER, 0 ; VIRIDIAN_POKECENTER - db MUSIC_POKECENTER, 0 ; VIRIDIAN_MART - db MUSIC_CITIES1, 0 ; VIRIDIAN_SCHOOL_HOUSE - db MUSIC_CITIES1, 0 ; VIRIDIAN_NICKNAME_HOUSE - db MUSIC_GYM, 0 ; VIRIDIAN_GYM - db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE_ROUTE_2 - db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_NORTH_GATE - db MUSIC_CITIES1, 0 ; ROUTE_2_TRADE_HOUSE - db MUSIC_CITIES1, 0 ; ROUTE_2_GATE - db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_SOUTH_GATE - db MUSIC_DUNGEON2, 0 ; VIRIDIAN_FOREST - db MUSIC_CITIES1, 0 ; MUSEUM_1F - db MUSIC_CITIES1, 0 ; MUSEUM_2F - db MUSIC_GYM, 0 ; PEWTER_GYM - db MUSIC_CITIES1, 0 ; PEWTER_NIDORAN_HOUSE - db MUSIC_POKECENTER, 0 ; PEWTER_MART - db MUSIC_CITIES1, 0 ; PEWTER_SPEECH_HOUSE - db MUSIC_POKECENTER, 0 ; PEWTER_POKECENTER - db MUSIC_DUNGEON3, 0 ; MT_MOON_1F - db MUSIC_DUNGEON3, 0 ; MT_MOON_B1F - db MUSIC_DUNGEON3, 0 ; MT_MOON_B2F - db MUSIC_CITIES2, 0 ; CERULEAN_TRASHED_HOUSE - db MUSIC_CITIES2, 0 ; CERULEAN_TRADE_HOUSE - db MUSIC_POKECENTER, 0 ; CERULEAN_POKECENTER - db MUSIC_GYM, 0 ; CERULEAN_GYM - db MUSIC_CITIES2, 0 ; BIKE_SHOP - db MUSIC_POKECENTER, 0 ; CERULEAN_MART - db MUSIC_POKECENTER, 0 ; MT_MOON_POKECENTER - db MUSIC_DUNGEON3, 0 ; CERULEAN_TRASHED_HOUSE_COPY - db MUSIC_CITIES1, 0 ; ROUTE_5_GATE - db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_5 - db MUSIC_CITIES1, 0 ; DAYCARE - db MUSIC_CITIES1, 0 ; ROUTE_6_GATE - db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6 - db MUSIC_VERMILION, 0 ; UNDERGROUND_PATH_ROUTE_6_COPY - db MUSIC_CITIES1, 0 ; ROUTE_7_GATE - db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7 - db MUSIC_CELADON, 0 ; UNDERGROUND_PATH_ROUTE_7_COPY - db MUSIC_CITIES1, 0 ; ROUTE_8_GATE - db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8 - db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER - db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_1F - db MUSIC_DUNGEON1, 0 ; POWER_PLANT - db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_1F - db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE_ROUTE_11 - db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_2F - db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_1F - db MUSIC_CITIES2, 0 ; BILLS_HOUSE - db MUSIC_POKECENTER, 0 ; VERMILION_POKECENTER - db MUSIC_VERMILION, 0 ; POKEMON_FAN_CLUB - db MUSIC_POKECENTER, 0 ; VERMILION_MART - db MUSIC_GYM, 0 ; VERMILION_GYM - db MUSIC_VERMILION, 0 ; VERMILION_PIDGEY_HOUSE - db MUSIC_SS_ANNE, 0 ; VERMILION_DOCK - db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F - db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F - db MUSIC_SS_ANNE, 0 ; SS_ANNE_3F - db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F - db MUSIC_SS_ANNE, 0 ; SS_ANNE_BOW - db MUSIC_SS_ANNE, 0 ; SS_ANNE_KITCHEN - db MUSIC_SS_ANNE, 0 ; SS_ANNE_CAPTAINS_ROOM - db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F_ROOMS - db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F_ROOMS - db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F_ROOMS - db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_69 - db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_6A - db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_6B - db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F - db MUSIC_POKEMON_TOWER, 0 ; UNUSED_MAP_6D - db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_6E - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_6F - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_70 - db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM - db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_72 - db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_73 - db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_74 - db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_75 - db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME - db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH - db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM - db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_WEST_EAST - db MUSIC_POKECENTER, 0 ; CELADON_MART_1F - db MUSIC_POKECENTER, 0 ; CELADON_MART_2F - db MUSIC_POKECENTER, 0 ; CELADON_MART_3F - db MUSIC_POKECENTER, 0 ; CELADON_MART_4F - db MUSIC_POKECENTER, 0 ; CELADON_MART_ROOF - db MUSIC_POKECENTER, 0 ; CELADON_MART_ELEVATOR - db MUSIC_CELADON, 0 ; CELADON_MANSION_1F - db MUSIC_CELADON, 0 ; CELADON_MANSION_2F - db MUSIC_CELADON, 0 ; CELADON_MANSION_3F - db MUSIC_CELADON, 0 ; CELADON_MANSION_ROOF - db MUSIC_CELADON, 0 ; CELADON_MANSION_ROOF_HOUSE - db MUSIC_POKECENTER, 0 ; CELADON_POKECENTER - db MUSIC_GYM, 0 ; CELADON_GYM - db MUSIC_GAME_CORNER, 0 ; GAME_CORNER - db MUSIC_POKECENTER, 0 ; CELADON_MART_5F - db MUSIC_CELADON, 0 ; GAME_CORNER_PRIZE_ROOM - db MUSIC_CELADON, 0 ; CELADON_DINER - db MUSIC_CELADON, 0 ; CELADON_CHIEF_HOUSE - db MUSIC_CELADON, 0 ; CELADON_HOTEL - db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_4F - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F - db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F - db MUSIC_LAVENDER, 0 ; MR_FUJIS_HOUSE - db MUSIC_POKECENTER, 0 ; LAVENDER_MART - db MUSIC_LAVENDER, 0 ; LAVENDER_CUBONE_HOUSE - db MUSIC_POKECENTER, 0 ; FUCHSIA_MART - db MUSIC_CITIES2, 0 ; FUCHSIA_BILLS_GRANDPAS_HOUSE - db MUSIC_POKECENTER, 0 ; FUCHSIA_POKECENTER - db MUSIC_CITIES2, 0 ; WARDENS_HOUSE - db MUSIC_CITIES2, 0 ; SAFARI_ZONE_GATE - db MUSIC_GYM, 0 ; FUCHSIA_GYM - db MUSIC_CITIES2, 0 ; FUCHSIA_MEETING_ROOM - db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B1F - db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B2F - db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F - db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F - db MUSIC_CITIES2, 0 ; VERMILION_OLD_ROD_HOUSE - db MUSIC_CITIES2, 0 ; FUCHSIA_GOOD_ROD_HOUSE - db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F - db MUSIC_GYM, 0 ; CINNABAR_GYM - db MUSIC_CINNABAR, 0 ; CINNABAR_LAB - db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_TRADE_ROOM - db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_METRONOME_ROOM - db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM - db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER - db MUSIC_POKECENTER, 0 ; CINNABAR_MART - db MUSIC_CINNABAR, 0 ; CINNABAR_MART_COPY - db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY - db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F - db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F - db MUSIC_CITIES1, 0 ; FIGHTING_DOJO - db MUSIC_GYM, 0 ; SAFFRON_GYM - db MUSIC_CITIES1, 0 ; SAFFRON_PIDGEY_HOUSE - db MUSIC_POKECENTER, 0 ; SAFFRON_MART - db MUSIC_SILPH_CO, 0 ; SILPH_CO_1F - db MUSIC_POKECENTER, 0 ; SAFFRON_POKECENTER - db MUSIC_CITIES1, 0 ; MR_PSYCHICS_HOUSE - db MUSIC_CITIES1, 0 ; ROUTE_15_GATE_1F - db MUSIC_CITIES1, 0 ; ROUTE_15_GATE_2F - db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_1F - db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_2F - db MUSIC_CELADON, 0 ; ROUTE_16_FLY_HOUSE - db MUSIC_CELADON, 0 ; ROUTE_12_SUPER_ROD_HOUSE - db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_1F - db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_2F - db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_1F - db MUSIC_DUNGEON2, 0 ; ROUTE_22_GATE - db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_2F - db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_2F - db MUSIC_VERMILION, 0 ; VERMILION_TRADE_HOUSE - db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE - db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_3F - db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B1F - db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B2F - db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F - db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F - db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR - db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CC - db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CD - db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CE - db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_4F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_6F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F - db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F - db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_3F - db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_EAST - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_NORTH - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_WEST - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_CENTER - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_CENTER_REST_HOUSE - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_SECRET_HOUSE - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_WEST_REST_HOUSE - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_EAST_REST_HOUSE - db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_NORTH_REST_HOUSE - db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_2F - db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_B1F - db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_1F - db MUSIC_CITIES2, 0 ; NAME_RATERS_HOUSE - db MUSIC_CITIES1, 0 ; CERULEAN_BADGE_HOUSE - db MUSIC_CINNABAR, 0 ; UNUSED_MAP_E7 - db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_ED - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_EE - db MUSIC_CELADON, 0 ; TRADE_CENTER - db MUSIC_CELADON, 0 ; COLOSSEUM - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F1 - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F2 - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F3 - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F4 - db MUSIC_GYM, 0 ; LORELEIS_ROOM - db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM - db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM diff --git a/data/maps/badge_maps.asm b/data/maps/badge_maps.asm new file mode 100644 index 00000000..6b68be02 --- /dev/null +++ b/data/maps/badge_maps.asm @@ -0,0 +1,10 @@ +MapBadgeFlags: + db PEWTER_GYM, 1 << BIT_BOULDERBADGE + db CERULEAN_GYM, 1 << BIT_CASCADEBADGE + db VERMILION_GYM, 1 << BIT_THUNDERBADGE + db CELADON_GYM, 1 << BIT_RAINBOWBADGE + db FUCHSIA_GYM, 1 << BIT_SOULBADGE + db SAFFRON_GYM, 1 << BIT_MARSHBADGE + db CINNABAR_GYM, 1 << BIT_VOLCANOBADGE + db VIRIDIAN_GYM, 1 << BIT_EARTHBADGE + db -1 ; end diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm new file mode 100644 index 00000000..d647923c --- /dev/null +++ b/data/maps/dungeon_maps.asm @@ -0,0 +1,27 @@ +; GetBattleTransitionID_IsDungeonMap fails to recognize +; VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, +; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, +; DIGLETTS_CAVE, and SILPH_CO_[9-11]F as dungeon maps + +; GetBattleTransitionID_IsDungeonMap checks if wCurMap +; is equal to one of these maps +DungeonMaps1: + db VIRIDIAN_FOREST + db ROCK_TUNNEL_1F + db SEAFOAM_ISLANDS_1F + db ROCK_TUNNEL_B1F + db -1 ; end + +; GetBattleTransitionID_IsDungeonMap checks if wCurMap +; is in between or equal to each pair of maps +DungeonMaps2: + ; all MT_MOON maps + db MT_MOON_1F, MT_MOON_B2F + ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1F, HALL_OF_FAME + ; all POKEMON_TOWER maps and Lavender Town buildings + db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE + ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and + ; CERULEAN_CAVE maps, except for SILPH_CO_1F + db SILPH_CO_2F, CERULEAN_CAVE_1F + db -1 ; end diff --git a/data/maps/force_bike_surf.asm b/data/maps/force_bike_surf.asm new file mode 100644 index 00000000..74eba325 --- /dev/null +++ b/data/maps/force_bike_surf.asm @@ -0,0 +1,15 @@ +force_bike_surf: MACRO + db \1, \3, \2 +ENDM + +ForcedBikeOrSurfMaps: + ; map id, x, y + force_bike_surf ROUTE_16, 17, 10 + force_bike_surf ROUTE_16, 17, 11 + force_bike_surf ROUTE_18, 33, 8 + force_bike_surf ROUTE_18, 33, 9 + force_bike_surf SEAFOAM_ISLANDS_B3F, 18, 7 + force_bike_surf SEAFOAM_ISLANDS_B3F, 19, 7 + force_bike_surf SEAFOAM_ISLANDS_B4F, 4, 14 + force_bike_surf SEAFOAM_ISLANDS_B4F, 5, 14 + db -1 ; end diff --git a/data/maps/headers/AgathasRoom.asm b/data/maps/headers/AgathasRoom.asm new file mode 100644 index 00000000..d04e0cfd --- /dev/null +++ b/data/maps/headers/AgathasRoom.asm @@ -0,0 +1,3 @@ + + map_header AgathasRoom, AGATHAS_ROOM, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/BikeShop.asm b/data/maps/headers/BikeShop.asm new file mode 100644 index 00000000..b4b520e2 --- /dev/null +++ b/data/maps/headers/BikeShop.asm @@ -0,0 +1,3 @@ + + map_header BikeShop, BIKE_SHOP, CLUB, 0 + end_map_header diff --git a/data/maps/headers/BillsHouse.asm b/data/maps/headers/BillsHouse.asm new file mode 100644 index 00000000..6063175d --- /dev/null +++ b/data/maps/headers/BillsHouse.asm @@ -0,0 +1,3 @@ + + map_header BillsHouse, BILLS_HOUSE, INTERIOR, 0 + end_map_header diff --git a/data/maps/headers/BluesHouse.asm b/data/maps/headers/BluesHouse.asm new file mode 100644 index 00000000..33cee254 --- /dev/null +++ b/data/maps/headers/BluesHouse.asm @@ -0,0 +1,3 @@ + + map_header BluesHouse, BLUES_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/BrunosRoom.asm b/data/maps/headers/BrunosRoom.asm new file mode 100644 index 00000000..a0b2d4fd --- /dev/null +++ b/data/maps/headers/BrunosRoom.asm @@ -0,0 +1,3 @@ + + map_header BrunosRoom, BRUNOS_ROOM, GYM, 0 + end_map_header diff --git a/data/maps/headers/CeladonChiefHouse.asm b/data/maps/headers/CeladonChiefHouse.asm new file mode 100644 index 00000000..34f17273 --- /dev/null +++ b/data/maps/headers/CeladonChiefHouse.asm @@ -0,0 +1,3 @@ + + map_header CeladonChiefHouse, CELADON_CHIEF_HOUSE, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonCity.asm b/data/maps/headers/CeladonCity.asm new file mode 100644 index 00000000..6faa6f48 --- /dev/null +++ b/data/maps/headers/CeladonCity.asm @@ -0,0 +1,5 @@ + + map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST + connection west, Route16, ROUTE_16, 4 + connection east, Route7, ROUTE_7, 4 + end_map_header diff --git a/data/maps/headers/CeladonDiner.asm b/data/maps/headers/CeladonDiner.asm new file mode 100644 index 00000000..b18d9633 --- /dev/null +++ b/data/maps/headers/CeladonDiner.asm @@ -0,0 +1,3 @@ + + map_header CeladonDiner, CELADON_DINER, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonGym.asm b/data/maps/headers/CeladonGym.asm new file mode 100644 index 00000000..2302c65a --- /dev/null +++ b/data/maps/headers/CeladonGym.asm @@ -0,0 +1,3 @@ + + map_header CeladonGym, CELADON_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/CeladonHotel.asm b/data/maps/headers/CeladonHotel.asm new file mode 100644 index 00000000..2339c14d --- /dev/null +++ b/data/maps/headers/CeladonHotel.asm @@ -0,0 +1,3 @@ + + map_header CeladonHotel, CELADON_HOTEL, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansion1F.asm b/data/maps/headers/CeladonMansion1F.asm new file mode 100644 index 00000000..45970028 --- /dev/null +++ b/data/maps/headers/CeladonMansion1F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansion1F, CELADON_MANSION_1F, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansion2F.asm b/data/maps/headers/CeladonMansion2F.asm new file mode 100644 index 00000000..d5e3e77b --- /dev/null +++ b/data/maps/headers/CeladonMansion2F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansion2F, CELADON_MANSION_2F, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansion3F.asm b/data/maps/headers/CeladonMansion3F.asm new file mode 100644 index 00000000..7566caad --- /dev/null +++ b/data/maps/headers/CeladonMansion3F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansion3F, CELADON_MANSION_3F, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansionRoof.asm b/data/maps/headers/CeladonMansionRoof.asm new file mode 100644 index 00000000..9cbae6f6 --- /dev/null +++ b/data/maps/headers/CeladonMansionRoof.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansionRoof, CELADON_MANSION_ROOF, MANSION, 0 + end_map_header diff --git a/data/maps/headers/CeladonMansionRoofHouse.asm b/data/maps/headers/CeladonMansionRoofHouse.asm new file mode 100644 index 00000000..cb80fac8 --- /dev/null +++ b/data/maps/headers/CeladonMansionRoofHouse.asm @@ -0,0 +1,3 @@ + + map_header CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart1F.asm b/data/maps/headers/CeladonMart1F.asm new file mode 100644 index 00000000..30bd9ba9 --- /dev/null +++ b/data/maps/headers/CeladonMart1F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart1F, CELADON_MART_1F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart2F.asm b/data/maps/headers/CeladonMart2F.asm new file mode 100644 index 00000000..d78dfe28 --- /dev/null +++ b/data/maps/headers/CeladonMart2F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart2F, CELADON_MART_2F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart3F.asm b/data/maps/headers/CeladonMart3F.asm new file mode 100644 index 00000000..ad415eee --- /dev/null +++ b/data/maps/headers/CeladonMart3F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart3F, CELADON_MART_3F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart4F.asm b/data/maps/headers/CeladonMart4F.asm new file mode 100644 index 00000000..b9ce5b34 --- /dev/null +++ b/data/maps/headers/CeladonMart4F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart4F, CELADON_MART_4F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMart5F.asm b/data/maps/headers/CeladonMart5F.asm new file mode 100644 index 00000000..04d65b2b --- /dev/null +++ b/data/maps/headers/CeladonMart5F.asm @@ -0,0 +1,3 @@ + + map_header CeladonMart5F, CELADON_MART_5F, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMartElevator.asm b/data/maps/headers/CeladonMartElevator.asm new file mode 100644 index 00000000..2a98ccb0 --- /dev/null +++ b/data/maps/headers/CeladonMartElevator.asm @@ -0,0 +1,3 @@ + + map_header CeladonMartElevator, CELADON_MART_ELEVATOR, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonMartRoof.asm b/data/maps/headers/CeladonMartRoof.asm new file mode 100644 index 00000000..823ff25f --- /dev/null +++ b/data/maps/headers/CeladonMartRoof.asm @@ -0,0 +1,3 @@ + + map_header CeladonMartRoof, CELADON_MART_ROOF, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/CeladonPokecenter.asm b/data/maps/headers/CeladonPokecenter.asm new file mode 100644 index 00000000..378a41ec --- /dev/null +++ b/data/maps/headers/CeladonPokecenter.asm @@ -0,0 +1,3 @@ + + map_header CeladonPokecenter, CELADON_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/CeruleanBadgeHouse.asm b/data/maps/headers/CeruleanBadgeHouse.asm new file mode 100644 index 00000000..47a97b14 --- /dev/null +++ b/data/maps/headers/CeruleanBadgeHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanBadgeHouse, CERULEAN_BADGE_HOUSE, SHIP, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCave1F.asm b/data/maps/headers/CeruleanCave1F.asm new file mode 100644 index 00000000..7c80bbeb --- /dev/null +++ b/data/maps/headers/CeruleanCave1F.asm @@ -0,0 +1,3 @@ + + map_header CeruleanCave1F, CERULEAN_CAVE_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCave2F.asm b/data/maps/headers/CeruleanCave2F.asm new file mode 100644 index 00000000..353e265b --- /dev/null +++ b/data/maps/headers/CeruleanCave2F.asm @@ -0,0 +1,3 @@ + + map_header CeruleanCave2F, CERULEAN_CAVE_2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCaveB1F.asm b/data/maps/headers/CeruleanCaveB1F.asm new file mode 100644 index 00000000..d759aa6b --- /dev/null +++ b/data/maps/headers/CeruleanCaveB1F.asm @@ -0,0 +1,3 @@ + + map_header CeruleanCaveB1F, CERULEAN_CAVE_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/CeruleanCity.asm b/data/maps/headers/CeruleanCity.asm new file mode 100644 index 00000000..c925713c --- /dev/null +++ b/data/maps/headers/CeruleanCity.asm @@ -0,0 +1,7 @@ + + map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + connection north, Route24, ROUTE_24, 5 + connection south, Route5, ROUTE_5, 5 + connection west, Route4, ROUTE_4, 4 + connection east, Route9, ROUTE_9, 4 + end_map_header diff --git a/data/maps/headers/CeruleanGym.asm b/data/maps/headers/CeruleanGym.asm new file mode 100644 index 00000000..b1010ac3 --- /dev/null +++ b/data/maps/headers/CeruleanGym.asm @@ -0,0 +1,3 @@ + + map_header CeruleanGym, CERULEAN_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/CeruleanMart.asm b/data/maps/headers/CeruleanMart.asm new file mode 100644 index 00000000..2ee31666 --- /dev/null +++ b/data/maps/headers/CeruleanMart.asm @@ -0,0 +1,3 @@ + + map_header CeruleanMart, CERULEAN_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/CeruleanPokecenter.asm b/data/maps/headers/CeruleanPokecenter.asm new file mode 100644 index 00000000..b79e7aff --- /dev/null +++ b/data/maps/headers/CeruleanPokecenter.asm @@ -0,0 +1,3 @@ + + map_header CeruleanPokecenter, CERULEAN_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm new file mode 100644 index 00000000..20970b77 --- /dev/null +++ b/data/maps/headers/CeruleanTradeHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/CeruleanTrashedHouse.asm b/data/maps/headers/CeruleanTrashedHouse.asm new file mode 100644 index 00000000..192a4195 --- /dev/null +++ b/data/maps/headers/CeruleanTrashedHouse.asm @@ -0,0 +1,3 @@ + + map_header CeruleanTrashedHouse, CERULEAN_TRASHED_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/ChampionsRoom.asm b/data/maps/headers/ChampionsRoom.asm new file mode 100644 index 00000000..aadc70a6 --- /dev/null +++ b/data/maps/headers/ChampionsRoom.asm @@ -0,0 +1,3 @@ + + map_header ChampionsRoom, CHAMPIONS_ROOM, GYM, $0 + end_map_header diff --git a/data/maps/headers/CinnabarGym.asm b/data/maps/headers/CinnabarGym.asm new file mode 100644 index 00000000..cc6dc1d7 --- /dev/null +++ b/data/maps/headers/CinnabarGym.asm @@ -0,0 +1,3 @@ + + map_header CinnabarGym, CINNABAR_GYM, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/CinnabarIsland.asm b/data/maps/headers/CinnabarIsland.asm new file mode 100644 index 00000000..a94498be --- /dev/null +++ b/data/maps/headers/CinnabarIsland.asm @@ -0,0 +1,5 @@ + + map_header CinnabarIsland, CINNABAR_ISLAND, OVERWORLD, NORTH | EAST + connection north, Route21, ROUTE_21, 0 + connection east, Route20, ROUTE_20, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLab.asm b/data/maps/headers/CinnabarLab.asm new file mode 100644 index 00000000..e8081e75 --- /dev/null +++ b/data/maps/headers/CinnabarLab.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLab, CINNABAR_LAB, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm new file mode 100644 index 00000000..3cb88437 --- /dev/null +++ b/data/maps/headers/CinnabarLabFossilRoom.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLabMetronomeRoom.asm b/data/maps/headers/CinnabarLabMetronomeRoom.asm new file mode 100644 index 00000000..d77338c8 --- /dev/null +++ b/data/maps/headers/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLabMetronomeRoom, CINNABAR_LAB_METRONOME_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarLabTradeRoom.asm b/data/maps/headers/CinnabarLabTradeRoom.asm new file mode 100644 index 00000000..c23d9c15 --- /dev/null +++ b/data/maps/headers/CinnabarLabTradeRoom.asm @@ -0,0 +1,3 @@ + + map_header CinnabarLabTradeRoom, CINNABAR_LAB_TRADE_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/CinnabarMart.asm b/data/maps/headers/CinnabarMart.asm new file mode 100644 index 00000000..c68d582a --- /dev/null +++ b/data/maps/headers/CinnabarMart.asm @@ -0,0 +1,3 @@ + + map_header CinnabarMart, CINNABAR_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/CinnabarPokecenter.asm b/data/maps/headers/CinnabarPokecenter.asm new file mode 100644 index 00000000..d910133b --- /dev/null +++ b/data/maps/headers/CinnabarPokecenter.asm @@ -0,0 +1,3 @@ + + map_header CinnabarPokecenter, CINNABAR_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/Colosseum.asm b/data/maps/headers/Colosseum.asm new file mode 100644 index 00000000..faf03eb4 --- /dev/null +++ b/data/maps/headers/Colosseum.asm @@ -0,0 +1,3 @@ + + map_header Colosseum, COLOSSEUM, CLUB, 0 + end_map_header diff --git a/data/maps/headers/CopycatsHouse1F.asm b/data/maps/headers/CopycatsHouse1F.asm new file mode 100644 index 00000000..532cef93 --- /dev/null +++ b/data/maps/headers/CopycatsHouse1F.asm @@ -0,0 +1,3 @@ + + map_header CopycatsHouse1F, COPYCATS_HOUSE_1F, REDS_HOUSE_1, 0 + end_map_header diff --git a/data/maps/headers/CopycatsHouse2F.asm b/data/maps/headers/CopycatsHouse2F.asm new file mode 100644 index 00000000..38b1fbbb --- /dev/null +++ b/data/maps/headers/CopycatsHouse2F.asm @@ -0,0 +1,3 @@ + + map_header CopycatsHouse2F, COPYCATS_HOUSE_2F, REDS_HOUSE_2, 0 + end_map_header diff --git a/data/maps/headers/Daycare.asm b/data/maps/headers/Daycare.asm new file mode 100644 index 00000000..dabeedd9 --- /dev/null +++ b/data/maps/headers/Daycare.asm @@ -0,0 +1,3 @@ + + map_header Daycare, DAYCARE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/DiglettsCave.asm b/data/maps/headers/DiglettsCave.asm new file mode 100644 index 00000000..d3777d31 --- /dev/null +++ b/data/maps/headers/DiglettsCave.asm @@ -0,0 +1,3 @@ + + map_header DiglettsCave, DIGLETTS_CAVE, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/DiglettsCaveRoute11.asm b/data/maps/headers/DiglettsCaveRoute11.asm new file mode 100644 index 00000000..d8bdd704 --- /dev/null +++ b/data/maps/headers/DiglettsCaveRoute11.asm @@ -0,0 +1,3 @@ + + map_header DiglettsCaveRoute11, DIGLETTS_CAVE_ROUTE_11, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/DiglettsCaveRoute2.asm b/data/maps/headers/DiglettsCaveRoute2.asm new file mode 100644 index 00000000..86f5ae35 --- /dev/null +++ b/data/maps/headers/DiglettsCaveRoute2.asm @@ -0,0 +1,3 @@ + + map_header DiglettsCaveRoute2, DIGLETTS_CAVE_ROUTE_2, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/FightingDojo.asm b/data/maps/headers/FightingDojo.asm new file mode 100644 index 00000000..7ecadc57 --- /dev/null +++ b/data/maps/headers/FightingDojo.asm @@ -0,0 +1,3 @@ + + map_header FightingDojo, FIGHTING_DOJO, DOJO, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaBillsGrandpasHouse.asm b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm new file mode 100644 index 00000000..10ba48e9 --- /dev/null +++ b/data/maps/headers/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaBillsGrandpasHouse, FUCHSIA_BILLS_GRANDPAS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaCity.asm b/data/maps/headers/FuchsiaCity.asm new file mode 100644 index 00000000..6028bce0 --- /dev/null +++ b/data/maps/headers/FuchsiaCity.asm @@ -0,0 +1,6 @@ + + map_header FuchsiaCity, FUCHSIA_CITY, OVERWORLD, SOUTH | WEST | EAST + connection south, Route19, ROUTE_19, 5 + connection west, Route18, ROUTE_18, 4 + connection east, Route15, ROUTE_15, 4 + end_map_header diff --git a/data/maps/headers/FuchsiaGoodRodHouse.asm b/data/maps/headers/FuchsiaGoodRodHouse.asm new file mode 100644 index 00000000..d21611c1 --- /dev/null +++ b/data/maps/headers/FuchsiaGoodRodHouse.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaGoodRodHouse, FUCHSIA_GOOD_ROD_HOUSE, SHIP, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaGym.asm b/data/maps/headers/FuchsiaGym.asm new file mode 100644 index 00000000..44be2971 --- /dev/null +++ b/data/maps/headers/FuchsiaGym.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaGym, FUCHSIA_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaMart.asm b/data/maps/headers/FuchsiaMart.asm new file mode 100644 index 00000000..120fe305 --- /dev/null +++ b/data/maps/headers/FuchsiaMart.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaMart, FUCHSIA_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaMeetingRoom.asm b/data/maps/headers/FuchsiaMeetingRoom.asm new file mode 100644 index 00000000..a5ab4f04 --- /dev/null +++ b/data/maps/headers/FuchsiaMeetingRoom.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaMeetingRoom, FUCHSIA_MEETING_ROOM, LAB, 0 + end_map_header diff --git a/data/maps/headers/FuchsiaPokecenter.asm b/data/maps/headers/FuchsiaPokecenter.asm new file mode 100644 index 00000000..c1c683bd --- /dev/null +++ b/data/maps/headers/FuchsiaPokecenter.asm @@ -0,0 +1,3 @@ + + map_header FuchsiaPokecenter, FUCHSIA_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/GameCorner.asm b/data/maps/headers/GameCorner.asm new file mode 100644 index 00000000..ad367b93 --- /dev/null +++ b/data/maps/headers/GameCorner.asm @@ -0,0 +1,3 @@ + + map_header GameCorner, GAME_CORNER, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/GameCornerPrizeRoom.asm b/data/maps/headers/GameCornerPrizeRoom.asm new file mode 100644 index 00000000..4668cbb8 --- /dev/null +++ b/data/maps/headers/GameCornerPrizeRoom.asm @@ -0,0 +1,3 @@ + + map_header GameCornerPrizeRoom, GAME_CORNER_PRIZE_ROOM, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/HallOfFame.asm b/data/maps/headers/HallOfFame.asm new file mode 100644 index 00000000..e2dc3fb3 --- /dev/null +++ b/data/maps/headers/HallOfFame.asm @@ -0,0 +1,3 @@ + + map_header HallOfFame, HALL_OF_FAME, GYM, 0 + end_map_header diff --git a/data/maps/headers/IndigoPlateau.asm b/data/maps/headers/IndigoPlateau.asm new file mode 100644 index 00000000..ff394dfe --- /dev/null +++ b/data/maps/headers/IndigoPlateau.asm @@ -0,0 +1,4 @@ + + map_header IndigoPlateau, INDIGO_PLATEAU, PLATEAU, SOUTH + connection south, Route23, ROUTE_23, 0 + end_map_header diff --git a/data/maps/headers/IndigoPlateauLobby.asm b/data/maps/headers/IndigoPlateauLobby.asm new file mode 100644 index 00000000..b13afa12 --- /dev/null +++ b/data/maps/headers/IndigoPlateauLobby.asm @@ -0,0 +1,3 @@ + + map_header IndigoPlateauLobby, INDIGO_PLATEAU_LOBBY, MART, 0 + end_map_header diff --git a/data/maps/headers/LancesRoom.asm b/data/maps/headers/LancesRoom.asm new file mode 100644 index 00000000..0b69970e --- /dev/null +++ b/data/maps/headers/LancesRoom.asm @@ -0,0 +1,3 @@ + + map_header LancesRoom, LANCES_ROOM, DOJO, 0 + end_map_header diff --git a/data/maps/headers/LavenderCuboneHouse.asm b/data/maps/headers/LavenderCuboneHouse.asm new file mode 100644 index 00000000..dfd38ff1 --- /dev/null +++ b/data/maps/headers/LavenderCuboneHouse.asm @@ -0,0 +1,3 @@ + + map_header LavenderCuboneHouse, LAVENDER_CUBONE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/LavenderMart.asm b/data/maps/headers/LavenderMart.asm new file mode 100644 index 00000000..82c239e6 --- /dev/null +++ b/data/maps/headers/LavenderMart.asm @@ -0,0 +1,3 @@ + + map_header LavenderMart, LAVENDER_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/LavenderPokecenter.asm b/data/maps/headers/LavenderPokecenter.asm new file mode 100644 index 00000000..c0cd0adf --- /dev/null +++ b/data/maps/headers/LavenderPokecenter.asm @@ -0,0 +1,3 @@ + + map_header LavenderPokecenter, LAVENDER_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/LavenderTown.asm b/data/maps/headers/LavenderTown.asm new file mode 100644 index 00000000..7c1c9c46 --- /dev/null +++ b/data/maps/headers/LavenderTown.asm @@ -0,0 +1,6 @@ + + map_header LavenderTown, LAVENDER_TOWN, OVERWORLD, NORTH | SOUTH | WEST + connection north, Route10, ROUTE_10, 0 + connection south, Route12, ROUTE_12, 0 + connection west, Route8, ROUTE_8, 0 + end_map_header diff --git a/data/maps/headers/LoreleisRoom.asm b/data/maps/headers/LoreleisRoom.asm new file mode 100644 index 00000000..feff946c --- /dev/null +++ b/data/maps/headers/LoreleisRoom.asm @@ -0,0 +1,3 @@ + + map_header LoreleisRoom, LORELEIS_ROOM, GYM, 0 + end_map_header diff --git a/data/maps/headers/MrFujisHouse.asm b/data/maps/headers/MrFujisHouse.asm new file mode 100644 index 00000000..023cb501 --- /dev/null +++ b/data/maps/headers/MrFujisHouse.asm @@ -0,0 +1,3 @@ + + map_header MrFujisHouse, MR_FUJIS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/MrPsychicsHouse.asm b/data/maps/headers/MrPsychicsHouse.asm new file mode 100644 index 00000000..628db044 --- /dev/null +++ b/data/maps/headers/MrPsychicsHouse.asm @@ -0,0 +1,3 @@ + + map_header MrPsychicsHouse, MR_PSYCHICS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/MtMoon1F.asm b/data/maps/headers/MtMoon1F.asm new file mode 100644 index 00000000..8de2be3e --- /dev/null +++ b/data/maps/headers/MtMoon1F.asm @@ -0,0 +1,3 @@ + + map_header MtMoon1F, MT_MOON_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/MtMoonB1F.asm b/data/maps/headers/MtMoonB1F.asm new file mode 100644 index 00000000..9c97b5c7 --- /dev/null +++ b/data/maps/headers/MtMoonB1F.asm @@ -0,0 +1,3 @@ + + map_header MtMoonB1F, MT_MOON_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/MtMoonB2F.asm b/data/maps/headers/MtMoonB2F.asm new file mode 100644 index 00000000..0ed1f96e --- /dev/null +++ b/data/maps/headers/MtMoonB2F.asm @@ -0,0 +1,3 @@ + + map_header MtMoonB2F, MT_MOON_B2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/MtMoonPokecenter.asm b/data/maps/headers/MtMoonPokecenter.asm new file mode 100644 index 00000000..0425eae7 --- /dev/null +++ b/data/maps/headers/MtMoonPokecenter.asm @@ -0,0 +1,3 @@ + + map_header MtMoonPokecenter, MT_MOON_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/Museum1F.asm b/data/maps/headers/Museum1F.asm new file mode 100644 index 00000000..d92176d2 --- /dev/null +++ b/data/maps/headers/Museum1F.asm @@ -0,0 +1,3 @@ + + map_header Museum1F, MUSEUM_1F, MUSEUM, 0 + end_map_header diff --git a/data/maps/headers/Museum2F.asm b/data/maps/headers/Museum2F.asm new file mode 100644 index 00000000..d5bf8918 --- /dev/null +++ b/data/maps/headers/Museum2F.asm @@ -0,0 +1,3 @@ + + map_header Museum2F, MUSEUM_2F, MUSEUM, 0 + end_map_header diff --git a/data/maps/headers/NameRatersHouse.asm b/data/maps/headers/NameRatersHouse.asm new file mode 100644 index 00000000..3f9010f0 --- /dev/null +++ b/data/maps/headers/NameRatersHouse.asm @@ -0,0 +1,3 @@ + + map_header NameRatersHouse, NAME_RATERS_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/OaksLab.asm b/data/maps/headers/OaksLab.asm new file mode 100644 index 00000000..42bb76e8 --- /dev/null +++ b/data/maps/headers/OaksLab.asm @@ -0,0 +1,3 @@ + + map_header OaksLab, OAKS_LAB, DOJO, 0 + end_map_header diff --git a/data/maps/headers/PalletTown.asm b/data/maps/headers/PalletTown.asm new file mode 100644 index 00000000..2745bdc1 --- /dev/null +++ b/data/maps/headers/PalletTown.asm @@ -0,0 +1,5 @@ + + map_header PalletTown, PALLET_TOWN, OVERWORLD, NORTH | SOUTH + connection north, Route1, ROUTE_1, 0 + connection south, Route21, ROUTE_21, 0 + end_map_header diff --git a/data/maps/headers/PewterCity.asm b/data/maps/headers/PewterCity.asm new file mode 100644 index 00000000..268adb7a --- /dev/null +++ b/data/maps/headers/PewterCity.asm @@ -0,0 +1,5 @@ + + map_header PewterCity, PEWTER_CITY, OVERWORLD, SOUTH | EAST + connection south, Route2, ROUTE_2, 5 + connection east, Route3, ROUTE_3, 4 + end_map_header diff --git a/data/maps/headers/PewterGym.asm b/data/maps/headers/PewterGym.asm new file mode 100644 index 00000000..a1659e42 --- /dev/null +++ b/data/maps/headers/PewterGym.asm @@ -0,0 +1,3 @@ + + map_header PewterGym, PEWTER_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/PewterMart.asm b/data/maps/headers/PewterMart.asm new file mode 100644 index 00000000..c9b24eb2 --- /dev/null +++ b/data/maps/headers/PewterMart.asm @@ -0,0 +1,3 @@ + + map_header PewterMart, PEWTER_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/PewterNidoranHouse.asm b/data/maps/headers/PewterNidoranHouse.asm new file mode 100644 index 00000000..ee2e46ca --- /dev/null +++ b/data/maps/headers/PewterNidoranHouse.asm @@ -0,0 +1,3 @@ + + map_header PewterNidoranHouse, PEWTER_NIDORAN_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/PewterPokecenter.asm b/data/maps/headers/PewterPokecenter.asm new file mode 100644 index 00000000..4e420bf8 --- /dev/null +++ b/data/maps/headers/PewterPokecenter.asm @@ -0,0 +1,3 @@ + + map_header PewterPokecenter, PEWTER_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/PewterSpeechHouse.asm b/data/maps/headers/PewterSpeechHouse.asm new file mode 100644 index 00000000..a378d61e --- /dev/null +++ b/data/maps/headers/PewterSpeechHouse.asm @@ -0,0 +1,3 @@ + + map_header PewterSpeechHouse, PEWTER_SPEECH_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/PokemonFanClub.asm b/data/maps/headers/PokemonFanClub.asm new file mode 100644 index 00000000..b4ff8e1c --- /dev/null +++ b/data/maps/headers/PokemonFanClub.asm @@ -0,0 +1,3 @@ + + map_header PokemonFanClub, POKEMON_FAN_CLUB, INTERIOR, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansion1F.asm b/data/maps/headers/PokemonMansion1F.asm new file mode 100644 index 00000000..9407f956 --- /dev/null +++ b/data/maps/headers/PokemonMansion1F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansion1F, POKEMON_MANSION_1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansion2F.asm b/data/maps/headers/PokemonMansion2F.asm new file mode 100644 index 00000000..deb7c84f --- /dev/null +++ b/data/maps/headers/PokemonMansion2F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansion2F, POKEMON_MANSION_2F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansion3F.asm b/data/maps/headers/PokemonMansion3F.asm new file mode 100644 index 00000000..e4baa709 --- /dev/null +++ b/data/maps/headers/PokemonMansion3F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansion3F, POKEMON_MANSION_3F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonMansionB1F.asm b/data/maps/headers/PokemonMansionB1F.asm new file mode 100644 index 00000000..0aae67e6 --- /dev/null +++ b/data/maps/headers/PokemonMansionB1F.asm @@ -0,0 +1,3 @@ + + map_header PokemonMansionB1F, POKEMON_MANSION_B1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower1F.asm b/data/maps/headers/PokemonTower1F.asm new file mode 100644 index 00000000..185fd2c0 --- /dev/null +++ b/data/maps/headers/PokemonTower1F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower1F, POKEMON_TOWER_1F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower2F.asm b/data/maps/headers/PokemonTower2F.asm new file mode 100644 index 00000000..5a6046c8 --- /dev/null +++ b/data/maps/headers/PokemonTower2F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower2F, POKEMON_TOWER_2F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower3F.asm b/data/maps/headers/PokemonTower3F.asm new file mode 100644 index 00000000..49ebc4e7 --- /dev/null +++ b/data/maps/headers/PokemonTower3F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower3F, POKEMON_TOWER_3F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower4F.asm b/data/maps/headers/PokemonTower4F.asm new file mode 100644 index 00000000..0eb9a0d6 --- /dev/null +++ b/data/maps/headers/PokemonTower4F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower5F.asm b/data/maps/headers/PokemonTower5F.asm new file mode 100644 index 00000000..e58c63c6 --- /dev/null +++ b/data/maps/headers/PokemonTower5F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower5F, POKEMON_TOWER_5F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower6F.asm b/data/maps/headers/PokemonTower6F.asm new file mode 100644 index 00000000..ba53347b --- /dev/null +++ b/data/maps/headers/PokemonTower6F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower6F, POKEMON_TOWER_6F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PokemonTower7F.asm b/data/maps/headers/PokemonTower7F.asm new file mode 100644 index 00000000..bd9f839b --- /dev/null +++ b/data/maps/headers/PokemonTower7F.asm @@ -0,0 +1,3 @@ + + map_header PokemonTower7F, POKEMON_TOWER_7F, CEMETERY, 0 + end_map_header diff --git a/data/maps/headers/PowerPlant.asm b/data/maps/headers/PowerPlant.asm new file mode 100644 index 00000000..88d82ae2 --- /dev/null +++ b/data/maps/headers/PowerPlant.asm @@ -0,0 +1,3 @@ + + map_header PowerPlant, POWER_PLANT, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RedsHouse1F.asm b/data/maps/headers/RedsHouse1F.asm new file mode 100644 index 00000000..018bdc80 --- /dev/null +++ b/data/maps/headers/RedsHouse1F.asm @@ -0,0 +1,3 @@ + + map_header RedsHouse1F, REDS_HOUSE_1F, REDS_HOUSE_1, 0 + end_map_header diff --git a/data/maps/headers/RedsHouse2F.asm b/data/maps/headers/RedsHouse2F.asm new file mode 100644 index 00000000..10332e2c --- /dev/null +++ b/data/maps/headers/RedsHouse2F.asm @@ -0,0 +1,3 @@ + + map_header RedsHouse2F, REDS_HOUSE_2F, REDS_HOUSE_2, $00 + end_map_header diff --git a/data/maps/headers/RockTunnel1F.asm b/data/maps/headers/RockTunnel1F.asm new file mode 100644 index 00000000..268ee645 --- /dev/null +++ b/data/maps/headers/RockTunnel1F.asm @@ -0,0 +1,3 @@ + + map_header RockTunnel1F, ROCK_TUNNEL_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/RockTunnelB1F.asm b/data/maps/headers/RockTunnelB1F.asm new file mode 100644 index 00000000..7b13f647 --- /dev/null +++ b/data/maps/headers/RockTunnelB1F.asm @@ -0,0 +1,3 @@ + + map_header RockTunnelB1F, ROCK_TUNNEL_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/RockTunnelPokecenter.asm b/data/maps/headers/RockTunnelPokecenter.asm new file mode 100644 index 00000000..a873854b --- /dev/null +++ b/data/maps/headers/RockTunnelPokecenter.asm @@ -0,0 +1,3 @@ + + map_header RockTunnelPokecenter, ROCK_TUNNEL_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB1F.asm b/data/maps/headers/RocketHideoutB1F.asm new file mode 100644 index 00000000..521a6693 --- /dev/null +++ b/data/maps/headers/RocketHideoutB1F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB1F, ROCKET_HIDEOUT_B1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB2F.asm b/data/maps/headers/RocketHideoutB2F.asm new file mode 100644 index 00000000..ab2a965d --- /dev/null +++ b/data/maps/headers/RocketHideoutB2F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB2F, ROCKET_HIDEOUT_B2F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB3F.asm b/data/maps/headers/RocketHideoutB3F.asm new file mode 100644 index 00000000..0a04b00e --- /dev/null +++ b/data/maps/headers/RocketHideoutB3F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB3F, ROCKET_HIDEOUT_B3F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutB4F.asm b/data/maps/headers/RocketHideoutB4F.asm new file mode 100644 index 00000000..11512c01 --- /dev/null +++ b/data/maps/headers/RocketHideoutB4F.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutB4F, ROCKET_HIDEOUT_B4F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/RocketHideoutElevator.asm b/data/maps/headers/RocketHideoutElevator.asm new file mode 100644 index 00000000..90ece237 --- /dev/null +++ b/data/maps/headers/RocketHideoutElevator.asm @@ -0,0 +1,3 @@ + + map_header RocketHideoutElevator, ROCKET_HIDEOUT_ELEVATOR, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/Route1.asm b/data/maps/headers/Route1.asm new file mode 100644 index 00000000..6eeb0347 --- /dev/null +++ b/data/maps/headers/Route1.asm @@ -0,0 +1,5 @@ + + map_header Route1, ROUTE_1, OVERWORLD, NORTH | SOUTH + connection north, ViridianCity, VIRIDIAN_CITY, -5 + connection south, PalletTown, PALLET_TOWN, 0 + end_map_header diff --git a/data/maps/headers/Route10.asm b/data/maps/headers/Route10.asm new file mode 100644 index 00000000..ba498b0a --- /dev/null +++ b/data/maps/headers/Route10.asm @@ -0,0 +1,5 @@ + + map_header Route10, ROUTE_10, OVERWORLD, SOUTH | WEST + connection south, LavenderTown, LAVENDER_TOWN, 0 + connection west, Route9, ROUTE_9, 0 + end_map_header diff --git a/data/maps/headers/Route11.asm b/data/maps/headers/Route11.asm new file mode 100644 index 00000000..d8f2e72f --- /dev/null +++ b/data/maps/headers/Route11.asm @@ -0,0 +1,5 @@ + + map_header Route11, ROUTE_11, OVERWORLD, WEST | EAST + connection west, VermilionCity, VERMILION_CITY, -4 + connection east, Route12, ROUTE_12, -27 + end_map_header diff --git a/data/maps/headers/Route11Gate1F.asm b/data/maps/headers/Route11Gate1F.asm new file mode 100644 index 00000000..aa97b791 --- /dev/null +++ b/data/maps/headers/Route11Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route11Gate1F, ROUTE_11_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route11Gate2F.asm b/data/maps/headers/Route11Gate2F.asm new file mode 100644 index 00000000..560d38db --- /dev/null +++ b/data/maps/headers/Route11Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route11Gate2F, ROUTE_11_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route12.asm b/data/maps/headers/Route12.asm new file mode 100644 index 00000000..931ddf1d --- /dev/null +++ b/data/maps/headers/Route12.asm @@ -0,0 +1,6 @@ + + map_header Route12, ROUTE_12, OVERWORLD, NORTH | SOUTH | WEST + connection north, LavenderTown, LAVENDER_TOWN, 0 + connection south, Route13, ROUTE_13, -20 + connection west, Route11, ROUTE_11, 27 + end_map_header diff --git a/data/maps/headers/Route12Gate1F.asm b/data/maps/headers/Route12Gate1F.asm new file mode 100644 index 00000000..047a670c --- /dev/null +++ b/data/maps/headers/Route12Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route12Gate1F, ROUTE_12_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route12Gate2F.asm b/data/maps/headers/Route12Gate2F.asm new file mode 100644 index 00000000..e1366736 --- /dev/null +++ b/data/maps/headers/Route12Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route12Gate2F, ROUTE_12_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route12SuperRodHouse.asm b/data/maps/headers/Route12SuperRodHouse.asm new file mode 100644 index 00000000..2195a9b1 --- /dev/null +++ b/data/maps/headers/Route12SuperRodHouse.asm @@ -0,0 +1,3 @@ + + map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/Route13.asm b/data/maps/headers/Route13.asm new file mode 100644 index 00000000..242aaa02 --- /dev/null +++ b/data/maps/headers/Route13.asm @@ -0,0 +1,5 @@ + + map_header Route13, ROUTE_13, OVERWORLD, NORTH | WEST + connection north, Route12, ROUTE_12, 20 + connection west, Route14, ROUTE_14, 0 + end_map_header diff --git a/data/maps/headers/Route14.asm b/data/maps/headers/Route14.asm new file mode 100644 index 00000000..c0c39c56 --- /dev/null +++ b/data/maps/headers/Route14.asm @@ -0,0 +1,5 @@ + + map_header Route14, ROUTE_14, OVERWORLD, WEST | EAST + connection west, Route15, ROUTE_15, 18 + connection east, Route13, ROUTE_13, 0 + end_map_header diff --git a/data/maps/headers/Route15.asm b/data/maps/headers/Route15.asm new file mode 100644 index 00000000..28a811d2 --- /dev/null +++ b/data/maps/headers/Route15.asm @@ -0,0 +1,5 @@ + + map_header Route15, ROUTE_15, OVERWORLD, WEST | EAST + connection west, FuchsiaCity, FUCHSIA_CITY, -4 + connection east, Route14, ROUTE_14, -18 + end_map_header diff --git a/data/maps/headers/Route15Gate1F.asm b/data/maps/headers/Route15Gate1F.asm new file mode 100644 index 00000000..a23d15a0 --- /dev/null +++ b/data/maps/headers/Route15Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route15Gate1F, ROUTE_15_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route15Gate2F.asm b/data/maps/headers/Route15Gate2F.asm new file mode 100644 index 00000000..8ca89872 --- /dev/null +++ b/data/maps/headers/Route15Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route15Gate2F, ROUTE_15_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route16.asm b/data/maps/headers/Route16.asm new file mode 100644 index 00000000..423c7af2 --- /dev/null +++ b/data/maps/headers/Route16.asm @@ -0,0 +1,5 @@ + + map_header Route16, ROUTE_16, OVERWORLD, SOUTH | EAST + connection south, Route17, ROUTE_17, 0 + connection east, CeladonCity, CELADON_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route16FlyHouse.asm b/data/maps/headers/Route16FlyHouse.asm new file mode 100644 index 00000000..240b6df4 --- /dev/null +++ b/data/maps/headers/Route16FlyHouse.asm @@ -0,0 +1,3 @@ + + map_header Route16FlyHouse, ROUTE_16_FLY_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/Route16Gate1F.asm b/data/maps/headers/Route16Gate1F.asm new file mode 100644 index 00000000..74fd1b7f --- /dev/null +++ b/data/maps/headers/Route16Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route16Gate1F, ROUTE_16_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route16Gate2F.asm b/data/maps/headers/Route16Gate2F.asm new file mode 100644 index 00000000..ed889f4b --- /dev/null +++ b/data/maps/headers/Route16Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route16Gate2F, ROUTE_16_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route17.asm b/data/maps/headers/Route17.asm new file mode 100644 index 00000000..5e853299 --- /dev/null +++ b/data/maps/headers/Route17.asm @@ -0,0 +1,5 @@ + + map_header Route17, ROUTE_17, OVERWORLD, NORTH | SOUTH + connection north, Route16, ROUTE_16, 0 + connection south, Route18, ROUTE_18, 0 + end_map_header diff --git a/data/maps/headers/Route18.asm b/data/maps/headers/Route18.asm new file mode 100644 index 00000000..34573051 --- /dev/null +++ b/data/maps/headers/Route18.asm @@ -0,0 +1,5 @@ + + map_header Route18, ROUTE_18, OVERWORLD, NORTH | EAST + connection north, Route17, ROUTE_17, 0 + connection east, FuchsiaCity, FUCHSIA_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route18Gate1F.asm b/data/maps/headers/Route18Gate1F.asm new file mode 100644 index 00000000..2847e0e3 --- /dev/null +++ b/data/maps/headers/Route18Gate1F.asm @@ -0,0 +1,3 @@ + + map_header Route18Gate1F, ROUTE_18_GATE_1F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route18Gate2F.asm b/data/maps/headers/Route18Gate2F.asm new file mode 100644 index 00000000..f25fa700 --- /dev/null +++ b/data/maps/headers/Route18Gate2F.asm @@ -0,0 +1,3 @@ + + map_header Route18Gate2F, ROUTE_18_GATE_2F, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route19.asm b/data/maps/headers/Route19.asm new file mode 100644 index 00000000..7f01c804 --- /dev/null +++ b/data/maps/headers/Route19.asm @@ -0,0 +1,5 @@ + + map_header Route19, ROUTE_19, OVERWORLD, NORTH | WEST + connection north, FuchsiaCity, FUCHSIA_CITY, -5 + connection west, Route20, ROUTE_20, 18 + end_map_header diff --git a/data/maps/headers/Route2.asm b/data/maps/headers/Route2.asm new file mode 100644 index 00000000..521eef69 --- /dev/null +++ b/data/maps/headers/Route2.asm @@ -0,0 +1,5 @@ + + map_header Route2, ROUTE_2, OVERWORLD, NORTH | SOUTH + connection north, PewterCity, PEWTER_CITY, -5 + connection south, ViridianCity, VIRIDIAN_CITY, -5 + end_map_header diff --git a/data/maps/headers/Route20.asm b/data/maps/headers/Route20.asm new file mode 100644 index 00000000..3495b785 --- /dev/null +++ b/data/maps/headers/Route20.asm @@ -0,0 +1,5 @@ + + map_header Route20, ROUTE_20, OVERWORLD, WEST | EAST + connection west, CinnabarIsland, CINNABAR_ISLAND, 0 + connection east, Route19, ROUTE_19, -18 + end_map_header diff --git a/data/maps/headers/Route21.asm b/data/maps/headers/Route21.asm new file mode 100644 index 00000000..803bf217 --- /dev/null +++ b/data/maps/headers/Route21.asm @@ -0,0 +1,5 @@ + + map_header Route21, ROUTE_21, OVERWORLD, NORTH | SOUTH + connection north, PalletTown, PALLET_TOWN, 0 + connection south, CinnabarIsland, CINNABAR_ISLAND, 0 + end_map_header diff --git a/data/maps/headers/Route22.asm b/data/maps/headers/Route22.asm new file mode 100644 index 00000000..e235efa1 --- /dev/null +++ b/data/maps/headers/Route22.asm @@ -0,0 +1,5 @@ + + map_header Route22, ROUTE_22, OVERWORLD, NORTH | EAST + connection north, Route23, ROUTE_23, 0 + connection east, ViridianCity, VIRIDIAN_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route22Gate.asm b/data/maps/headers/Route22Gate.asm new file mode 100644 index 00000000..a9d1dd37 --- /dev/null +++ b/data/maps/headers/Route22Gate.asm @@ -0,0 +1,3 @@ + + map_header Route22Gate, ROUTE_22_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route23.asm b/data/maps/headers/Route23.asm new file mode 100644 index 00000000..e1535c9d --- /dev/null +++ b/data/maps/headers/Route23.asm @@ -0,0 +1,5 @@ + + map_header Route23, ROUTE_23, PLATEAU, NORTH | SOUTH + connection north, IndigoPlateau, INDIGO_PLATEAU, 0 + connection south, Route22, ROUTE_22, 0 + end_map_header diff --git a/data/maps/headers/Route24.asm b/data/maps/headers/Route24.asm new file mode 100644 index 00000000..faf53660 --- /dev/null +++ b/data/maps/headers/Route24.asm @@ -0,0 +1,5 @@ + + map_header Route24, ROUTE_24, OVERWORLD, SOUTH | EAST + connection south, CeruleanCity, CERULEAN_CITY, -5 + connection east, Route25, ROUTE_25, 0 + end_map_header diff --git a/data/maps/headers/Route25.asm b/data/maps/headers/Route25.asm new file mode 100644 index 00000000..1873d19b --- /dev/null +++ b/data/maps/headers/Route25.asm @@ -0,0 +1,4 @@ + + map_header Route25, ROUTE_25, OVERWORLD, WEST + connection west, Route24, ROUTE_24, 0 + end_map_header diff --git a/data/maps/headers/Route2Gate.asm b/data/maps/headers/Route2Gate.asm new file mode 100644 index 00000000..730d8f2d --- /dev/null +++ b/data/maps/headers/Route2Gate.asm @@ -0,0 +1,3 @@ + + map_header Route2Gate, ROUTE_2_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route2TradeHouse.asm b/data/maps/headers/Route2TradeHouse.asm new file mode 100644 index 00000000..b9937dad --- /dev/null +++ b/data/maps/headers/Route2TradeHouse.asm @@ -0,0 +1,3 @@ + + map_header Route2TradeHouse, ROUTE_2_TRADE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/Route3.asm b/data/maps/headers/Route3.asm new file mode 100644 index 00000000..ddbd7783 --- /dev/null +++ b/data/maps/headers/Route3.asm @@ -0,0 +1,5 @@ + + map_header Route3, ROUTE_3, OVERWORLD, NORTH | WEST + connection north, Route4, ROUTE_4, 25 + connection west, PewterCity, PEWTER_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route4.asm b/data/maps/headers/Route4.asm new file mode 100644 index 00000000..6c43171a --- /dev/null +++ b/data/maps/headers/Route4.asm @@ -0,0 +1,5 @@ + + map_header Route4, ROUTE_4, OVERWORLD, SOUTH | EAST + connection south, Route3, ROUTE_3, -25 + connection east, CeruleanCity, CERULEAN_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route5.asm b/data/maps/headers/Route5.asm new file mode 100644 index 00000000..ea84090c --- /dev/null +++ b/data/maps/headers/Route5.asm @@ -0,0 +1,5 @@ + + map_header Route5, ROUTE_5, OVERWORLD, NORTH | SOUTH + connection north, CeruleanCity, CERULEAN_CITY, -5 + connection south, SaffronCity, SAFFRON_CITY, -5 + end_map_header diff --git a/data/maps/headers/Route5Gate.asm b/data/maps/headers/Route5Gate.asm new file mode 100644 index 00000000..a0115533 --- /dev/null +++ b/data/maps/headers/Route5Gate.asm @@ -0,0 +1,3 @@ + + map_header Route5Gate, ROUTE_5_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route6.asm b/data/maps/headers/Route6.asm new file mode 100644 index 00000000..956aa4d6 --- /dev/null +++ b/data/maps/headers/Route6.asm @@ -0,0 +1,5 @@ + + map_header Route6, ROUTE_6, OVERWORLD, NORTH | SOUTH + connection north, SaffronCity, SAFFRON_CITY, -5 + connection south, VermilionCity, VERMILION_CITY, -5 + end_map_header diff --git a/data/maps/headers/Route6Gate.asm b/data/maps/headers/Route6Gate.asm new file mode 100644 index 00000000..f80b57c8 --- /dev/null +++ b/data/maps/headers/Route6Gate.asm @@ -0,0 +1,3 @@ + + map_header Route6Gate, ROUTE_6_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route7.asm b/data/maps/headers/Route7.asm new file mode 100644 index 00000000..8368c3fe --- /dev/null +++ b/data/maps/headers/Route7.asm @@ -0,0 +1,5 @@ + + map_header Route7, ROUTE_7, OVERWORLD, WEST | EAST + connection west, CeladonCity, CELADON_CITY, -4 + connection east, SaffronCity, SAFFRON_CITY, -4 + end_map_header diff --git a/data/maps/headers/Route7Gate.asm b/data/maps/headers/Route7Gate.asm new file mode 100644 index 00000000..e9b9b16d --- /dev/null +++ b/data/maps/headers/Route7Gate.asm @@ -0,0 +1,3 @@ + + map_header Route7Gate, ROUTE_7_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route8.asm b/data/maps/headers/Route8.asm new file mode 100644 index 00000000..8df9e023 --- /dev/null +++ b/data/maps/headers/Route8.asm @@ -0,0 +1,5 @@ + + map_header Route8, ROUTE_8, OVERWORLD, WEST | EAST + connection west, SaffronCity, SAFFRON_CITY, -4 + connection east, LavenderTown, LAVENDER_TOWN, 0 + end_map_header diff --git a/data/maps/headers/Route8Gate.asm b/data/maps/headers/Route8Gate.asm new file mode 100644 index 00000000..f6a320a4 --- /dev/null +++ b/data/maps/headers/Route8Gate.asm @@ -0,0 +1,3 @@ + + map_header Route8Gate, ROUTE_8_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/Route9.asm b/data/maps/headers/Route9.asm new file mode 100644 index 00000000..c1ed9225 --- /dev/null +++ b/data/maps/headers/Route9.asm @@ -0,0 +1,5 @@ + + map_header Route9, ROUTE_9, OVERWORLD, WEST | EAST + connection west, CeruleanCity, CERULEAN_CITY, -4 + connection east, Route10, ROUTE_10, 0 + end_map_header diff --git a/data/maps/headers/SSAnne1F.asm b/data/maps/headers/SSAnne1F.asm new file mode 100644 index 00000000..80d25e2d --- /dev/null +++ b/data/maps/headers/SSAnne1F.asm @@ -0,0 +1,3 @@ + + map_header SSAnne1F, SS_ANNE_1F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne1FRooms.asm b/data/maps/headers/SSAnne1FRooms.asm new file mode 100644 index 00000000..8bdd8d00 --- /dev/null +++ b/data/maps/headers/SSAnne1FRooms.asm @@ -0,0 +1,3 @@ + + map_header SSAnne1FRooms, SS_ANNE_1F_ROOMS, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne2F.asm b/data/maps/headers/SSAnne2F.asm new file mode 100644 index 00000000..b2fe14d7 --- /dev/null +++ b/data/maps/headers/SSAnne2F.asm @@ -0,0 +1,3 @@ + + map_header SSAnne2F, SS_ANNE_2F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne2FRooms.asm b/data/maps/headers/SSAnne2FRooms.asm new file mode 100644 index 00000000..2d349e4c --- /dev/null +++ b/data/maps/headers/SSAnne2FRooms.asm @@ -0,0 +1,3 @@ + + map_header SSAnne2FRooms, SS_ANNE_2F_ROOMS, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnne3F.asm b/data/maps/headers/SSAnne3F.asm new file mode 100644 index 00000000..f391a0cd --- /dev/null +++ b/data/maps/headers/SSAnne3F.asm @@ -0,0 +1,3 @@ + + map_header SSAnne3F, SS_ANNE_3F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneB1F.asm b/data/maps/headers/SSAnneB1F.asm new file mode 100644 index 00000000..c21d7cff --- /dev/null +++ b/data/maps/headers/SSAnneB1F.asm @@ -0,0 +1,3 @@ + + map_header SSAnneB1F, SS_ANNE_B1F, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneB1FRooms.asm b/data/maps/headers/SSAnneB1FRooms.asm new file mode 100644 index 00000000..1b8b4620 --- /dev/null +++ b/data/maps/headers/SSAnneB1FRooms.asm @@ -0,0 +1,3 @@ + + map_header SSAnneB1FRooms, SS_ANNE_B1F_ROOMS, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneBow.asm b/data/maps/headers/SSAnneBow.asm new file mode 100644 index 00000000..2195e970 --- /dev/null +++ b/data/maps/headers/SSAnneBow.asm @@ -0,0 +1,3 @@ + + map_header SSAnneBow, SS_ANNE_BOW, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneCaptainsRoom.asm b/data/maps/headers/SSAnneCaptainsRoom.asm new file mode 100644 index 00000000..a24f930d --- /dev/null +++ b/data/maps/headers/SSAnneCaptainsRoom.asm @@ -0,0 +1,3 @@ + + map_header SSAnneCaptainsRoom, SS_ANNE_CAPTAINS_ROOM, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SSAnneKitchen.asm b/data/maps/headers/SSAnneKitchen.asm new file mode 100644 index 00000000..47e84fbe --- /dev/null +++ b/data/maps/headers/SSAnneKitchen.asm @@ -0,0 +1,3 @@ + + map_header SSAnneKitchen, SS_ANNE_KITCHEN, SHIP, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneCenter.asm b/data/maps/headers/SafariZoneCenter.asm new file mode 100644 index 00000000..ccc58ed1 --- /dev/null +++ b/data/maps/headers/SafariZoneCenter.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneCenter, SAFARI_ZONE_CENTER, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneCenterRestHouse.asm b/data/maps/headers/SafariZoneCenterRestHouse.asm new file mode 100644 index 00000000..a866003f --- /dev/null +++ b/data/maps/headers/SafariZoneCenterRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneCenterRestHouse, SAFARI_ZONE_CENTER_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneEast.asm b/data/maps/headers/SafariZoneEast.asm new file mode 100644 index 00000000..c23e9334 --- /dev/null +++ b/data/maps/headers/SafariZoneEast.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneEast, SAFARI_ZONE_EAST, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneEastRestHouse.asm b/data/maps/headers/SafariZoneEastRestHouse.asm new file mode 100644 index 00000000..1f8d76c6 --- /dev/null +++ b/data/maps/headers/SafariZoneEastRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneEastRestHouse, SAFARI_ZONE_EAST_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneGate.asm b/data/maps/headers/SafariZoneGate.asm new file mode 100644 index 00000000..7816460d --- /dev/null +++ b/data/maps/headers/SafariZoneGate.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneGate, SAFARI_ZONE_GATE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneNorth.asm b/data/maps/headers/SafariZoneNorth.asm new file mode 100644 index 00000000..32639d22 --- /dev/null +++ b/data/maps/headers/SafariZoneNorth.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneNorth, SAFARI_ZONE_NORTH, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneNorthRestHouse.asm b/data/maps/headers/SafariZoneNorthRestHouse.asm new file mode 100644 index 00000000..ec083803 --- /dev/null +++ b/data/maps/headers/SafariZoneNorthRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneNorthRestHouse, SAFARI_ZONE_NORTH_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneSecretHouse.asm b/data/maps/headers/SafariZoneSecretHouse.asm new file mode 100644 index 00000000..630577c4 --- /dev/null +++ b/data/maps/headers/SafariZoneSecretHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneSecretHouse, SAFARI_ZONE_SECRET_HOUSE, LAB, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneWest.asm b/data/maps/headers/SafariZoneWest.asm new file mode 100644 index 00000000..a1117d09 --- /dev/null +++ b/data/maps/headers/SafariZoneWest.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneWest, SAFARI_ZONE_WEST, FOREST, 0 + end_map_header diff --git a/data/maps/headers/SafariZoneWestRestHouse.asm b/data/maps/headers/SafariZoneWestRestHouse.asm new file mode 100644 index 00000000..e4618e1d --- /dev/null +++ b/data/maps/headers/SafariZoneWestRestHouse.asm @@ -0,0 +1,3 @@ + + map_header SafariZoneWestRestHouse, SAFARI_ZONE_WEST_REST_HOUSE, GATE, 0 + end_map_header diff --git a/data/maps/headers/SaffronCity.asm b/data/maps/headers/SaffronCity.asm new file mode 100644 index 00000000..ee1f71e4 --- /dev/null +++ b/data/maps/headers/SaffronCity.asm @@ -0,0 +1,7 @@ + + map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + connection north, Route5, ROUTE_5, 5 + connection south, Route6, ROUTE_6, 5 + connection west, Route7, ROUTE_7, 4 + connection east, Route8, ROUTE_8, 4 + end_map_header diff --git a/data/maps/headers/SaffronGym.asm b/data/maps/headers/SaffronGym.asm new file mode 100644 index 00000000..14ee3323 --- /dev/null +++ b/data/maps/headers/SaffronGym.asm @@ -0,0 +1,3 @@ + + map_header SaffronGym, SAFFRON_GYM, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SaffronMart.asm b/data/maps/headers/SaffronMart.asm new file mode 100644 index 00000000..f03132d2 --- /dev/null +++ b/data/maps/headers/SaffronMart.asm @@ -0,0 +1,3 @@ + + map_header SaffronMart, SAFFRON_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/SaffronPidgeyHouse.asm b/data/maps/headers/SaffronPidgeyHouse.asm new file mode 100644 index 00000000..e9f8dde7 --- /dev/null +++ b/data/maps/headers/SaffronPidgeyHouse.asm @@ -0,0 +1,3 @@ + + map_header SaffronPidgeyHouse, SAFFRON_PIDGEY_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/SaffronPokecenter.asm b/data/maps/headers/SaffronPokecenter.asm new file mode 100644 index 00000000..9b250050 --- /dev/null +++ b/data/maps/headers/SaffronPokecenter.asm @@ -0,0 +1,3 @@ + + map_header SaffronPokecenter, SAFFRON_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslands1F.asm b/data/maps/headers/SeafoamIslands1F.asm new file mode 100644 index 00000000..db530549 --- /dev/null +++ b/data/maps/headers/SeafoamIslands1F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslands1F, SEAFOAM_ISLANDS_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB1F.asm b/data/maps/headers/SeafoamIslandsB1F.asm new file mode 100644 index 00000000..589eef93 --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB1F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB1F, SEAFOAM_ISLANDS_B1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB2F.asm b/data/maps/headers/SeafoamIslandsB2F.asm new file mode 100644 index 00000000..f7e624ed --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB2F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB3F.asm b/data/maps/headers/SeafoamIslandsB3F.asm new file mode 100644 index 00000000..b57da3c0 --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB3F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SeafoamIslandsB4F.asm b/data/maps/headers/SeafoamIslandsB4F.asm new file mode 100644 index 00000000..bae1e3a2 --- /dev/null +++ b/data/maps/headers/SeafoamIslandsB4F.asm @@ -0,0 +1,3 @@ + + map_header SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/SilphCo10F.asm b/data/maps/headers/SilphCo10F.asm new file mode 100644 index 00000000..7a6786e7 --- /dev/null +++ b/data/maps/headers/SilphCo10F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo10F, SILPH_CO_10F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo11F.asm b/data/maps/headers/SilphCo11F.asm new file mode 100644 index 00000000..72eaaca2 --- /dev/null +++ b/data/maps/headers/SilphCo11F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo11F, SILPH_CO_11F, INTERIOR, 0 + end_map_header diff --git a/data/maps/headers/SilphCo1F.asm b/data/maps/headers/SilphCo1F.asm new file mode 100644 index 00000000..4c4ac97d --- /dev/null +++ b/data/maps/headers/SilphCo1F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo1F, SILPH_CO_1F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo2F.asm b/data/maps/headers/SilphCo2F.asm new file mode 100644 index 00000000..7dc44a55 --- /dev/null +++ b/data/maps/headers/SilphCo2F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo2F, SILPH_CO_2F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo3F.asm b/data/maps/headers/SilphCo3F.asm new file mode 100644 index 00000000..99e4aa15 --- /dev/null +++ b/data/maps/headers/SilphCo3F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo3F, SILPH_CO_3F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo4F.asm b/data/maps/headers/SilphCo4F.asm new file mode 100644 index 00000000..8eed0f9a --- /dev/null +++ b/data/maps/headers/SilphCo4F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo4F, SILPH_CO_4F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo5F.asm b/data/maps/headers/SilphCo5F.asm new file mode 100644 index 00000000..3b40c360 --- /dev/null +++ b/data/maps/headers/SilphCo5F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo5F, SILPH_CO_5F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo6F.asm b/data/maps/headers/SilphCo6F.asm new file mode 100644 index 00000000..3d2b3b8c --- /dev/null +++ b/data/maps/headers/SilphCo6F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo6F, SILPH_CO_6F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo7F.asm b/data/maps/headers/SilphCo7F.asm new file mode 100644 index 00000000..1591837a --- /dev/null +++ b/data/maps/headers/SilphCo7F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo7F, SILPH_CO_7F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo8F.asm b/data/maps/headers/SilphCo8F.asm new file mode 100644 index 00000000..e676fa86 --- /dev/null +++ b/data/maps/headers/SilphCo8F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo8F, SILPH_CO_8F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCo9F.asm b/data/maps/headers/SilphCo9F.asm new file mode 100644 index 00000000..89f0300a --- /dev/null +++ b/data/maps/headers/SilphCo9F.asm @@ -0,0 +1,3 @@ + + map_header SilphCo9F, SILPH_CO_9F, FACILITY, 0 + end_map_header diff --git a/data/maps/headers/SilphCoElevator.asm b/data/maps/headers/SilphCoElevator.asm new file mode 100644 index 00000000..4dd9cd9f --- /dev/null +++ b/data/maps/headers/SilphCoElevator.asm @@ -0,0 +1,3 @@ + + map_header SilphCoElevator, SILPH_CO_ELEVATOR, LOBBY, 0 + end_map_header diff --git a/data/maps/headers/TradeCenter.asm b/data/maps/headers/TradeCenter.asm new file mode 100644 index 00000000..268d76b2 --- /dev/null +++ b/data/maps/headers/TradeCenter.asm @@ -0,0 +1,3 @@ + + map_header TradeCenter, TRADE_CENTER, CLUB, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathNorthSouth.asm b/data/maps/headers/UndergroundPathNorthSouth.asm new file mode 100644 index 00000000..4bb03c79 --- /dev/null +++ b/data/maps/headers/UndergroundPathNorthSouth.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathNorthSouth, UNDERGROUND_PATH_NORTH_SOUTH, UNDERGROUND, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute5.asm b/data/maps/headers/UndergroundPathRoute5.asm new file mode 100644 index 00000000..18287254 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute5.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute5, UNDERGROUND_PATH_ROUTE_5, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute6.asm b/data/maps/headers/UndergroundPathRoute6.asm new file mode 100644 index 00000000..67772543 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute6.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute6, UNDERGROUND_PATH_ROUTE_6, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute7.asm b/data/maps/headers/UndergroundPathRoute7.asm new file mode 100644 index 00000000..d70548ed --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute7.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute7, UNDERGROUND_PATH_ROUTE_7, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute7Copy.asm b/data/maps/headers/UndergroundPathRoute7Copy.asm new file mode 100644 index 00000000..30bb70a8 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute7Copy.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute7Copy, UNDERGROUND_PATH_ROUTE_7, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathRoute8.asm b/data/maps/headers/UndergroundPathRoute8.asm new file mode 100644 index 00000000..102d8413 --- /dev/null +++ b/data/maps/headers/UndergroundPathRoute8.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathRoute8, UNDERGROUND_PATH_ROUTE_8, GATE, 0 + end_map_header diff --git a/data/maps/headers/UndergroundPathWestEast.asm b/data/maps/headers/UndergroundPathWestEast.asm new file mode 100644 index 00000000..05976e87 --- /dev/null +++ b/data/maps/headers/UndergroundPathWestEast.asm @@ -0,0 +1,3 @@ + + map_header UndergroundPathWestEast, UNDERGROUND_PATH_WEST_EAST, UNDERGROUND, 0 + end_map_header diff --git a/data/maps/headers/VermilionCity.asm b/data/maps/headers/VermilionCity.asm new file mode 100644 index 00000000..e211562c --- /dev/null +++ b/data/maps/headers/VermilionCity.asm @@ -0,0 +1,5 @@ + + map_header VermilionCity, VERMILION_CITY, OVERWORLD, NORTH | EAST + connection north, Route6, ROUTE_6, 5 + connection east, Route11, ROUTE_11, 4 + end_map_header diff --git a/data/maps/headers/VermilionDock.asm b/data/maps/headers/VermilionDock.asm new file mode 100644 index 00000000..9a9b61c2 --- /dev/null +++ b/data/maps/headers/VermilionDock.asm @@ -0,0 +1,3 @@ + + map_header VermilionDock, VERMILION_DOCK, SHIP_PORT, 0 + end_map_header diff --git a/data/maps/headers/VermilionGym.asm b/data/maps/headers/VermilionGym.asm new file mode 100644 index 00000000..ca75b8c1 --- /dev/null +++ b/data/maps/headers/VermilionGym.asm @@ -0,0 +1,3 @@ + + map_header VermilionGym, VERMILION_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/VermilionMart.asm b/data/maps/headers/VermilionMart.asm new file mode 100644 index 00000000..5777db4b --- /dev/null +++ b/data/maps/headers/VermilionMart.asm @@ -0,0 +1,3 @@ + + map_header VermilionMart, VERMILION_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/VermilionOldRodHouse.asm b/data/maps/headers/VermilionOldRodHouse.asm new file mode 100644 index 00000000..f9c890e0 --- /dev/null +++ b/data/maps/headers/VermilionOldRodHouse.asm @@ -0,0 +1,3 @@ + + map_header VermilionOldRodHouse, VERMILION_OLD_ROD_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/VermilionPidgeyHouse.asm b/data/maps/headers/VermilionPidgeyHouse.asm new file mode 100644 index 00000000..afb81784 --- /dev/null +++ b/data/maps/headers/VermilionPidgeyHouse.asm @@ -0,0 +1,3 @@ + + map_header VermilionPidgeyHouse, VERMILION_PIDGEY_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/VermilionPokecenter.asm b/data/maps/headers/VermilionPokecenter.asm new file mode 100644 index 00000000..af9827ac --- /dev/null +++ b/data/maps/headers/VermilionPokecenter.asm @@ -0,0 +1,3 @@ + + map_header VermilionPokecenter, VERMILION_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/VermilionTradeHouse.asm b/data/maps/headers/VermilionTradeHouse.asm new file mode 100644 index 00000000..3cb82c47 --- /dev/null +++ b/data/maps/headers/VermilionTradeHouse.asm @@ -0,0 +1,3 @@ + + map_header VermilionTradeHouse, VERMILION_TRADE_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/VictoryRoad1F.asm b/data/maps/headers/VictoryRoad1F.asm new file mode 100644 index 00000000..dae95f16 --- /dev/null +++ b/data/maps/headers/VictoryRoad1F.asm @@ -0,0 +1,3 @@ + + map_header VictoryRoad1F, VICTORY_ROAD_1F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/VictoryRoad2F.asm b/data/maps/headers/VictoryRoad2F.asm new file mode 100644 index 00000000..99079ad3 --- /dev/null +++ b/data/maps/headers/VictoryRoad2F.asm @@ -0,0 +1,3 @@ + + map_header VictoryRoad2F, VICTORY_ROAD_2F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/VictoryRoad3F.asm b/data/maps/headers/VictoryRoad3F.asm new file mode 100644 index 00000000..bc15cad7 --- /dev/null +++ b/data/maps/headers/VictoryRoad3F.asm @@ -0,0 +1,3 @@ + + map_header VictoryRoad3F, VICTORY_ROAD_3F, CAVERN, 0 + end_map_header diff --git a/data/maps/headers/ViridianCity.asm b/data/maps/headers/ViridianCity.asm new file mode 100644 index 00000000..0771cc81 --- /dev/null +++ b/data/maps/headers/ViridianCity.asm @@ -0,0 +1,6 @@ + + map_header ViridianCity, VIRIDIAN_CITY, OVERWORLD, NORTH | SOUTH | WEST + connection north, Route2, ROUTE_2, 5 + connection south, Route1, ROUTE_1, 5 + connection west, Route22, ROUTE_22, 4 + end_map_header diff --git a/data/maps/headers/ViridianForest.asm b/data/maps/headers/ViridianForest.asm new file mode 100644 index 00000000..d531ec86 --- /dev/null +++ b/data/maps/headers/ViridianForest.asm @@ -0,0 +1,3 @@ + + map_header ViridianForest, VIRIDIAN_FOREST, FOREST, 0 + end_map_header diff --git a/data/maps/headers/ViridianForestNorthGate.asm b/data/maps/headers/ViridianForestNorthGate.asm new file mode 100644 index 00000000..5bfcd6ed --- /dev/null +++ b/data/maps/headers/ViridianForestNorthGate.asm @@ -0,0 +1,3 @@ + + map_header ViridianForestNorthGate, VIRIDIAN_FOREST_NORTH_GATE, FOREST_GATE, 0 + end_map_header diff --git a/data/maps/headers/ViridianForestSouthGate.asm b/data/maps/headers/ViridianForestSouthGate.asm new file mode 100644 index 00000000..87a49284 --- /dev/null +++ b/data/maps/headers/ViridianForestSouthGate.asm @@ -0,0 +1,3 @@ + + map_header ViridianForestSouthGate, VIRIDIAN_FOREST_SOUTH_GATE, FOREST_GATE, 0 + end_map_header diff --git a/data/maps/headers/ViridianGym.asm b/data/maps/headers/ViridianGym.asm new file mode 100644 index 00000000..640a71b6 --- /dev/null +++ b/data/maps/headers/ViridianGym.asm @@ -0,0 +1,3 @@ + + map_header ViridianGym, VIRIDIAN_GYM, GYM, 0 + end_map_header diff --git a/data/maps/headers/ViridianMart.asm b/data/maps/headers/ViridianMart.asm new file mode 100644 index 00000000..817b5265 --- /dev/null +++ b/data/maps/headers/ViridianMart.asm @@ -0,0 +1,3 @@ + + map_header ViridianMart, VIRIDIAN_MART, MART, 0 + end_map_header diff --git a/data/maps/headers/ViridianNicknameHouse.asm b/data/maps/headers/ViridianNicknameHouse.asm new file mode 100644 index 00000000..5a7c272f --- /dev/null +++ b/data/maps/headers/ViridianNicknameHouse.asm @@ -0,0 +1,3 @@ + + map_header ViridianNicknameHouse, VIRIDIAN_NICKNAME_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/ViridianPokecenter.asm b/data/maps/headers/ViridianPokecenter.asm new file mode 100644 index 00000000..daac19f3 --- /dev/null +++ b/data/maps/headers/ViridianPokecenter.asm @@ -0,0 +1,3 @@ + + map_header ViridianPokecenter, VIRIDIAN_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/headers/ViridianSchoolHouse.asm b/data/maps/headers/ViridianSchoolHouse.asm new file mode 100644 index 00000000..f5b77212 --- /dev/null +++ b/data/maps/headers/ViridianSchoolHouse.asm @@ -0,0 +1,3 @@ + + map_header ViridianSchoolHouse, VIRIDIAN_SCHOOL_HOUSE, HOUSE, 0 + end_map_header diff --git a/data/maps/headers/WardensHouse.asm b/data/maps/headers/WardensHouse.asm new file mode 100644 index 00000000..08216f59 --- /dev/null +++ b/data/maps/headers/WardensHouse.asm @@ -0,0 +1,3 @@ + + map_header WardensHouse, WARDENS_HOUSE, LAB, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm new file mode 100644 index 00000000..fa0599f4 --- /dev/null +++ b/data/maps/hide_show_data.asm @@ -0,0 +1,564 @@ +; default hidden/shown objects for each map + +MapHSPointers: +; entries correspond to map ids + dw PalletTownHS + dw ViridianCityHS + dw PewterCityHS + dw CeruleanCityHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SaffronCityHS + dw NoHS + dw NoHS + dw Route2HS + dw NoHS + dw Route4HS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw Route9HS + dw NoHS + dw NoHS + dw Route12HS + dw NoHS + dw NoHS + dw Route15HS + dw Route16HS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw Route22HS + dw NoHS + dw Route24HS + dw Route25HS + dw NoHS + dw NoHS + dw BluesHouseHS + dw OaksLabHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw ViridianGymHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw ViridianForestHS + dw Museum1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw MtMoon1FHS + dw NoHS + dw MtMoonB2FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw PowerPlantHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw BillsHouseHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SSAnne2FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SSAnne1FRoomsHS + dw SSAnne2FRoomsHS + dw SSAnneB1FRoomsHS + dw NoHS + dw NoHS + dw NoHS + dw VictoryRoad1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw ChampionsRoomHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw CeladonMansionRoofHouseHS + dw NoHS + dw NoHS + dw GameCornerHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw PokemonTower2FHS + dw PokemonTower3FHS + dw PokemonTower4FHS + dw PokemonTower5FHS + dw PokemonTower6FHS + dw PokemonTower7FHS + dw MrFujisHouseHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw WardensHouseHS + dw NoHS + dw NoHS + dw NoHS + dw SeafoamIslandsB1FHS + dw SeafoamIslandsB2FHS + dw SeafoamIslandsB3FHS + dw SeafoamIslandsB4FHS + dw NoHS + dw NoHS + dw PokemonMansion1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw FightingDojoHS + dw NoHS + dw NoHS + dw NoHS + dw SilphCo1FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SeafoamIslands1FHS + dw NoHS + dw VictoryRoad2FHS + dw NoHS + dw NoHS + dw NoHS + dw VictoryRoad3FHS + dw RocketHideoutB1FHS + dw RocketHideoutB2FHS + dw RocketHideoutB3FHS + dw RocketHideoutB4FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SilphCo2FHS + dw SilphCo3FHS + dw SilphCo4FHS + dw SilphCo5FHS + dw SilphCo6FHS + dw SilphCo7FHS + dw SilphCo8FHS + dw PokemonMansion2FHS + dw PokemonMansion3FHS + dw PokemonMansionB1FHS + dw SafariZoneEastHS + dw SafariZoneNorthHS + dw SafariZoneWestHS + dw SafariZoneCenterHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw CeruleanCave2FHS + dw CeruleanCaveB1FHS + dw CeruleanCaveHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw SilphCo9FHS + dw SilphCo10FHS + dw SilphCo11FHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw NoHS + dw UnusedMapF4HS + dw NoHS + dw NoHS + dw NoHS + dw -1 ; end + +NoHS: + db $FF, $FF, $FF + +MissableObjects: +; entries correspond to HS_* constants (see constants/hide_show_constants) +; format: map id, object id, HIDE/SHOW + +PalletTownHS: + db PALLET_TOWN, $01, HIDE +ViridianCityHS: + db VIRIDIAN_CITY, $05, SHOW + db VIRIDIAN_CITY, $07, HIDE +PewterCityHS: + db PEWTER_CITY, $03, SHOW + db PEWTER_CITY, $05, SHOW +CeruleanCityHS: + db CERULEAN_CITY, $01, HIDE + db CERULEAN_CITY, $02, SHOW + db CERULEAN_CITY, $06, HIDE + db CERULEAN_CITY, $0A, SHOW + db CERULEAN_CITY, $0B, SHOW +SaffronCityHS: + db SAFFRON_CITY, $01, SHOW + db SAFFRON_CITY, $02, SHOW + db SAFFRON_CITY, $03, SHOW + db SAFFRON_CITY, $04, SHOW + db SAFFRON_CITY, $05, SHOW + db SAFFRON_CITY, $06, SHOW + db SAFFRON_CITY, $07, SHOW + db SAFFRON_CITY, $08, HIDE + db SAFFRON_CITY, $09, HIDE + db SAFFRON_CITY, $0A, HIDE + db SAFFRON_CITY, $0B, HIDE + db SAFFRON_CITY, $0C, HIDE + db SAFFRON_CITY, $0D, HIDE + db SAFFRON_CITY, $0E, SHOW + db SAFFRON_CITY, $0F, HIDE +Route2HS: + db ROUTE_2, $01, SHOW + db ROUTE_2, $02, SHOW +Route4HS: + db ROUTE_4, $03, SHOW +Route9HS: + db ROUTE_9, $0A, SHOW +Route12HS: + db ROUTE_12, $01, SHOW + db ROUTE_12, $09, SHOW + db ROUTE_12, $0A, SHOW +Route15HS: + db ROUTE_15, $0B, SHOW +Route16HS: + db ROUTE_16, $07, SHOW +Route22HS: + db ROUTE_22, $01, HIDE + db ROUTE_22, $02, HIDE +Route24HS: + db ROUTE_24, $01, SHOW + db ROUTE_24, $08, SHOW +Route25HS: + db ROUTE_25, $0A, SHOW +BluesHouseHS: + db BLUES_HOUSE, $01, SHOW + db BLUES_HOUSE, $02, HIDE + db BLUES_HOUSE, $03, SHOW +OaksLabHS: + db OAKS_LAB, $01, SHOW + db OAKS_LAB, $02, SHOW + db OAKS_LAB, $03, SHOW + db OAKS_LAB, $04, SHOW + db OAKS_LAB, $05, HIDE + db OAKS_LAB, $06, SHOW + db OAKS_LAB, $07, SHOW + db OAKS_LAB, $08, HIDE +ViridianGymHS: + db VIRIDIAN_GYM, $01, SHOW + db VIRIDIAN_GYM, $0B, SHOW +Museum1FHS: + db MUSEUM_1F, $05, SHOW +CeruleanCaveHS: + db CERULEAN_CAVE_1F, $01, SHOW + db CERULEAN_CAVE_1F, $02, SHOW + db CERULEAN_CAVE_1F, $03, SHOW +PokemonTower2FHS: + db POKEMON_TOWER_2F, $01, SHOW +PokemonTower3FHS: + db POKEMON_TOWER_3F, $04, SHOW +PokemonTower4FHS: + db POKEMON_TOWER_4F, $04, SHOW + db POKEMON_TOWER_4F, $05, SHOW + db POKEMON_TOWER_4F, $06, SHOW +PokemonTower5FHS: + db POKEMON_TOWER_5F, $06, SHOW +PokemonTower6FHS: + db POKEMON_TOWER_6F, $04, SHOW + db POKEMON_TOWER_6F, $05, SHOW +PokemonTower7FHS: + db POKEMON_TOWER_7F, $01, SHOW + db POKEMON_TOWER_7F, $02, SHOW + db POKEMON_TOWER_7F, $03, SHOW + db POKEMON_TOWER_7F, $04, SHOW +MrFujisHouseHS: + db MR_FUJIS_HOUSE, $05, HIDE +CeladonMansionRoofHouseHS: + db CELADON_MANSION_ROOF_HOUSE, $02, SHOW +GameCornerHS: + db GAME_CORNER, $0B, SHOW +WardensHouseHS: + db WARDENS_HOUSE, $02, SHOW +PokemonMansion1FHS: + db POKEMON_MANSION_1F, $02, SHOW + db POKEMON_MANSION_1F, $03, SHOW +FightingDojoHS: + db FIGHTING_DOJO, $06, SHOW + db FIGHTING_DOJO, $07, SHOW +SilphCo1FHS: + db SILPH_CO_1F, $01, HIDE +PowerPlantHS: + db POWER_PLANT, $01, SHOW + db POWER_PLANT, $02, SHOW + db POWER_PLANT, $03, SHOW + db POWER_PLANT, $04, SHOW + db POWER_PLANT, $05, SHOW + db POWER_PLANT, $06, SHOW + db POWER_PLANT, $07, SHOW + db POWER_PLANT, $08, SHOW + db POWER_PLANT, $09, SHOW + db POWER_PLANT, $0A, SHOW + db POWER_PLANT, $0B, SHOW + db POWER_PLANT, $0C, SHOW + db POWER_PLANT, $0D, SHOW + db POWER_PLANT, $0E, SHOW +VictoryRoad2FHS: + db VICTORY_ROAD_2F, $06, SHOW + db VICTORY_ROAD_2F, $07, SHOW + db VICTORY_ROAD_2F, $08, SHOW + db VICTORY_ROAD_2F, $09, SHOW + db VICTORY_ROAD_2F, $0A, SHOW + db VICTORY_ROAD_2F, $0D, SHOW +BillsHouseHS: + db BILLS_HOUSE, $01, SHOW + db BILLS_HOUSE, $02, HIDE + db BILLS_HOUSE, $03, HIDE +ViridianForestHS: + db VIRIDIAN_FOREST, $05, SHOW + db VIRIDIAN_FOREST, $06, SHOW + db VIRIDIAN_FOREST, $07, SHOW +MtMoon1FHS: + db MT_MOON_1F, $08, SHOW + db MT_MOON_1F, $09, SHOW + db MT_MOON_1F, $0A, SHOW + db MT_MOON_1F, $0B, SHOW + db MT_MOON_1F, $0C, SHOW + db MT_MOON_1F, $0D, SHOW +MtMoonB2FHS: + db MT_MOON_B2F, $06, SHOW + db MT_MOON_B2F, $07, SHOW + db MT_MOON_B2F, $08, SHOW + db MT_MOON_B2F, $09, SHOW +SSAnne2FHS: + db SS_ANNE_2F, $02, HIDE +SSAnne1FRoomsHS: + db SS_ANNE_1F_ROOMS, $0A, SHOW +SSAnne2FRoomsHS: + db SS_ANNE_2F_ROOMS, $06, SHOW + db SS_ANNE_2F_ROOMS, $09, SHOW +SSAnneB1FRoomsHS: + db SS_ANNE_B1F_ROOMS, $09, SHOW + db SS_ANNE_B1F_ROOMS, $0A, SHOW + db SS_ANNE_B1F_ROOMS, $0B, SHOW +VictoryRoad3FHS: + db VICTORY_ROAD_3F, $05, SHOW + db VICTORY_ROAD_3F, $06, SHOW + db VICTORY_ROAD_3F, $0A, SHOW +RocketHideoutB1FHS: + db ROCKET_HIDEOUT_B1F, $06, SHOW + db ROCKET_HIDEOUT_B1F, $07, SHOW +RocketHideoutB2FHS: + db ROCKET_HIDEOUT_B2F, $02, SHOW + db ROCKET_HIDEOUT_B2F, $03, SHOW + db ROCKET_HIDEOUT_B2F, $04, SHOW + db ROCKET_HIDEOUT_B2F, $05, SHOW +RocketHideoutB3FHS: + db ROCKET_HIDEOUT_B3F, $03, SHOW + db ROCKET_HIDEOUT_B3F, $04, SHOW +RocketHideoutB4FHS: + db ROCKET_HIDEOUT_B4F, $01, SHOW + db ROCKET_HIDEOUT_B4F, $05, SHOW + db ROCKET_HIDEOUT_B4F, $06, SHOW + db ROCKET_HIDEOUT_B4F, $07, SHOW + db ROCKET_HIDEOUT_B4F, $08, HIDE + db ROCKET_HIDEOUT_B4F, $09, HIDE +SilphCo2FHS: + db SILPH_CO_2F, $01, SHOW + db SILPH_CO_2F, $02, SHOW + db SILPH_CO_2F, $03, SHOW + db SILPH_CO_2F, $04, SHOW + db SILPH_CO_2F, $05, SHOW +SilphCo3FHS: + db SILPH_CO_3F, $02, SHOW + db SILPH_CO_3F, $03, SHOW + db SILPH_CO_3F, $04, SHOW +SilphCo4FHS: + db SILPH_CO_4F, $02, SHOW + db SILPH_CO_4F, $03, SHOW + db SILPH_CO_4F, $04, SHOW + db SILPH_CO_4F, $05, SHOW + db SILPH_CO_4F, $06, SHOW + db SILPH_CO_4F, $07, SHOW +SilphCo5FHS: + db SILPH_CO_5F, $02, SHOW + db SILPH_CO_5F, $03, SHOW + db SILPH_CO_5F, $04, SHOW + db SILPH_CO_5F, $05, SHOW + db SILPH_CO_5F, $06, SHOW + db SILPH_CO_5F, $07, SHOW + db SILPH_CO_5F, $08, SHOW +SilphCo6FHS: + db SILPH_CO_6F, $06, SHOW + db SILPH_CO_6F, $07, SHOW + db SILPH_CO_6F, $08, SHOW + db SILPH_CO_6F, $09, SHOW + db SILPH_CO_6F, $0A, SHOW +SilphCo7FHS: + db SILPH_CO_7F, $05, SHOW + db SILPH_CO_7F, $06, SHOW + db SILPH_CO_7F, $07, SHOW + db SILPH_CO_7F, $08, SHOW + db SILPH_CO_7F, $09, SHOW + db SILPH_CO_7F, $0A, SHOW + db SILPH_CO_7F, $0B, SHOW + db SILPH_CO_7F, $0C, SHOW +SilphCo8FHS: + db SILPH_CO_8F, $02, SHOW + db SILPH_CO_8F, $03, SHOW + db SILPH_CO_8F, $04, SHOW +SilphCo9FHS: + db SILPH_CO_9F, $02, SHOW + db SILPH_CO_9F, $03, SHOW + db SILPH_CO_9F, $04, SHOW +SilphCo10FHS: + db SILPH_CO_10F, $01, SHOW + db SILPH_CO_10F, $02, SHOW + db SILPH_CO_10F, $03, SHOW + db SILPH_CO_10F, $04, SHOW + db SILPH_CO_10F, $05, SHOW + db SILPH_CO_10F, $06, SHOW +SilphCo11FHS: + db SILPH_CO_11F, $03, SHOW + db SILPH_CO_11F, $04, SHOW + db SILPH_CO_11F, $05, SHOW +UnusedMapF4HS: + db UNUSED_MAP_F4, $02, SHOW +PokemonMansion2FHS: + db POKEMON_MANSION_2F, $02, SHOW +PokemonMansion3FHS: + db POKEMON_MANSION_3F, $03, SHOW + db POKEMON_MANSION_3F, $04, SHOW +PokemonMansionB1FHS: + db POKEMON_MANSION_B1F, $03, SHOW + db POKEMON_MANSION_B1F, $04, SHOW + db POKEMON_MANSION_B1F, $05, SHOW + db POKEMON_MANSION_B1F, $06, SHOW + db POKEMON_MANSION_B1F, $08, SHOW +SafariZoneEastHS: + db SAFARI_ZONE_EAST, $01, SHOW + db SAFARI_ZONE_EAST, $02, SHOW + db SAFARI_ZONE_EAST, $03, SHOW + db SAFARI_ZONE_EAST, $04, SHOW +SafariZoneNorthHS: + db SAFARI_ZONE_NORTH, $01, SHOW + db SAFARI_ZONE_NORTH, $02, SHOW +SafariZoneWestHS: + db SAFARI_ZONE_WEST, $01, SHOW + db SAFARI_ZONE_WEST, $02, SHOW + db SAFARI_ZONE_WEST, $03, SHOW + db SAFARI_ZONE_WEST, $04, SHOW +SafariZoneCenterHS: + db SAFARI_ZONE_CENTER, $01, SHOW +CeruleanCave2FHS: + db CERULEAN_CAVE_2F, $01, SHOW + db CERULEAN_CAVE_2F, $02, SHOW + db CERULEAN_CAVE_2F, $03, SHOW +CeruleanCaveB1FHS: + db CERULEAN_CAVE_B1F, $01, SHOW + db CERULEAN_CAVE_B1F, $02, SHOW + db CERULEAN_CAVE_B1F, $03, SHOW +VictoryRoad1FHS: + db VICTORY_ROAD_1F, $03, SHOW + db VICTORY_ROAD_1F, $04, SHOW +ChampionsRoomHS: + db CHAMPIONS_ROOM, $02, HIDE +SeafoamIslands1FHS: + db SEAFOAM_ISLANDS_1F, $01, SHOW + db SEAFOAM_ISLANDS_1F, $02, SHOW +SeafoamIslandsB1FHS: + db SEAFOAM_ISLANDS_B1F, $01, HIDE + db SEAFOAM_ISLANDS_B1F, $02, HIDE +SeafoamIslandsB2FHS: + db SEAFOAM_ISLANDS_B2F, $01, HIDE + db SEAFOAM_ISLANDS_B2F, $02, HIDE +SeafoamIslandsB3FHS: + db SEAFOAM_ISLANDS_B3F, $02, SHOW + db SEAFOAM_ISLANDS_B3F, $03, SHOW + db SEAFOAM_ISLANDS_B3F, $05, HIDE + db SEAFOAM_ISLANDS_B3F, $06, HIDE +SeafoamIslandsB4FHS: + db SEAFOAM_ISLANDS_B4F, $01, HIDE + db SEAFOAM_ISLANDS_B4F, $02, HIDE + db SEAFOAM_ISLANDS_B4F, $03, SHOW + db $FF, $01, SHOW ; end diff --git a/data/map_header_banks.asm b/data/maps/map_header_banks.asm old mode 100755 new mode 100644 similarity index 99% rename from data/map_header_banks.asm rename to data/maps/map_header_banks.asm index 3dc1988a..d698cfee --- a/data/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -1,5 +1,5 @@ ; see also MapHeaderPointers -MapHeaderBanks: +MapHeaderBanks:: db BANK(PalletTown_h) db BANK(ViridianCity_h) db BANK(PewterCity_h) diff --git a/data/map_header_pointers.asm b/data/maps/map_header_pointers.asm old mode 100755 new mode 100644 similarity index 100% rename from data/map_header_pointers.asm rename to data/maps/map_header_pointers.asm diff --git a/data/maps/names.asm b/data/maps/names.asm new file mode 100644 index 00000000..6bdb66d5 --- /dev/null +++ b/data/maps/names.asm @@ -0,0 +1,54 @@ +MapNames: +PalletTownName: db "PALLET TOWN@" +ViridianCityName: db "VIRIDIAN CITY@" +PewterCityName: db "PEWTER CITY@" +CeruleanCityName: db "CERULEAN CITY@" +LavenderTownName: db "LAVENDER TOWN@" +VermilionCityName: db "VERMILION CITY@" +CeladonCityName: db "CELADON CITY@" +FuchsiaCityName: db "FUCHSIA CITY@" +CinnabarIslandName: db "CINNABAR ISLAND@" +IndigoPlateauName: db "INDIGO PLATEAU@" +SaffronCityName: db "SAFFRON CITY@" +Route1Name: db "ROUTE 1@" +Route2Name: db "ROUTE 2@" +Route3Name: db "ROUTE 3@" +Route4Name: db "ROUTE 4@" +Route5Name: db "ROUTE 5@" +Route6Name: db "ROUTE 6@" +Route7Name: db "ROUTE 7@" +Route8Name: db "ROUTE 8@" +Route9Name: db "ROUTE 9@" +Route10Name: db "ROUTE 10@" +Route11Name: db "ROUTE 11@" +Route12Name: db "ROUTE 12@" +Route13Name: db "ROUTE 13@" +Route14Name: db "ROUTE 14@" +Route15Name: db "ROUTE 15@" +Route16Name: db "ROUTE 16@" +Route17Name: db "ROUTE 17@" +Route18Name: db "ROUTE 18@" +Route19Name: db "SEA ROUTE 19@" +Route20Name: db "SEA ROUTE 20@" +Route21Name: db "SEA ROUTE 21@" +Route22Name: db "ROUTE 22@" +Route23Name: db "ROUTE 23@" +Route24Name: db "ROUTE 24@" +Route25Name: db "ROUTE 25@" +ViridianForestName: db "VIRIDIAN FOREST@" +MountMoonName: db "MT.MOON@" +RockTunnelName: db "ROCK TUNNEL@" +SeaCottageName: db "SEA COTTAGE@" +SSAnneName: db "S.S.ANNE@" +PokemonLeagueName: db "#MON LEAGUE@" +UndergroundPathName: db "UNDERGROUND PATH@" +PokemonTowerName: db "#MON TOWER@" +SeafoamIslandsName: db "SEAFOAM ISLANDS@" +VictoryRoadName: db "VICTORY ROAD@" +DiglettsCaveName: db "DIGLETT's CAVE@" +RocketHQName: db "ROCKET HQ@" +SilphCoName: db "SILPH CO.@" +PokemonMansionName: db " MANSION@" +SafariZoneName: db "SAFARI ZONE@" +CeruleanCaveName: db "CERULEAN CAVE@" +PowerPlantName: db "POWER PLANT@" diff --git a/data/maps/objects/AgathasRoom.asm b/data/maps/objects/AgathasRoom.asm new file mode 100644 index 00000000..0f00ea20 --- /dev/null +++ b/data/maps/objects/AgathasRoom.asm @@ -0,0 +1,15 @@ +AgathasRoom_Object: + db $0 ; border block + + def_warps + warp 4, 11, 2, BRUNOS_ROOM + warp 5, 11, 3, BRUNOS_ROOM + warp 4, 0, 0, LANCES_ROOM + warp 5, 0, 0, LANCES_ROOM + + def_signs + + def_objects + object SPRITE_AGATHA, 5, 2, STAY, DOWN, 1, OPP_AGATHA, 1 + + def_warps_to AGATHAS_ROOM diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm new file mode 100644 index 00000000..6a6fe6d6 --- /dev/null +++ b/data/maps/objects/BikeShop.asm @@ -0,0 +1,15 @@ +BikeShop_Object: + db $e ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, UP_DOWN, 2 ; person + object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person + + def_warps_to BIKE_SHOP diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm new file mode 100644 index 00000000..fad8df05 --- /dev/null +++ b/data/maps/objects/BillsHouse.asm @@ -0,0 +1,15 @@ +BillsHouse_Object: + db $d ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person + + def_warps_to BILLS_HOUSE diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm new file mode 100644 index 00000000..4858b785 --- /dev/null +++ b/data/maps/objects/BluesHouse.asm @@ -0,0 +1,15 @@ +BluesHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map + object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around + object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table + + def_warps_to BLUES_HOUSE diff --git a/data/maps/objects/BrunosRoom.asm b/data/maps/objects/BrunosRoom.asm new file mode 100644 index 00000000..f5399874 --- /dev/null +++ b/data/maps/objects/BrunosRoom.asm @@ -0,0 +1,15 @@ +BrunosRoom_Object: + db $3 ; border block + + def_warps + warp 4, 11, 2, LORELEIS_ROOM + warp 5, 11, 3, LORELEIS_ROOM + warp 4, 0, 0, AGATHAS_ROOM + warp 5, 0, 1, AGATHAS_ROOM + + def_signs + + def_objects + object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 + + def_warps_to BRUNOS_ROOM diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm new file mode 100644 index 00000000..97b9e4c9 --- /dev/null +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -0,0 +1,15 @@ +CeladonChiefHouse_Object: + db $f ; border block + + def_warps + warp 2, 7, 11, LAST_MAP + warp 3, 7, 11, LAST_MAP + + def_signs + + def_objects + object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 1, 4, WALK, ANY_DIR, 2 ; person + object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person + + def_warps_to CELADON_CHIEF_HOUSE diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm new file mode 100644 index 00000000..ddf0afdb --- /dev/null +++ b/data/maps/objects/CeladonCity.asm @@ -0,0 +1,41 @@ +CeladonCity_Object: + db $f ; border block + + def_warps + warp 8, 13, 0, CELADON_MART_1F + warp 10, 13, 2, CELADON_MART_1F + warp 24, 9, 0, CELADON_MANSION_1F + warp 24, 3, 2, CELADON_MANSION_1F + warp 25, 3, 2, CELADON_MANSION_1F + warp 41, 9, 0, CELADON_POKECENTER + warp 12, 27, 0, CELADON_GYM + warp 28, 19, 0, GAME_CORNER + warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used + warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM + warp 31, 27, 0, CELADON_DINER + warp 35, 27, 0, CELADON_CHIEF_HOUSE + warp 43, 27, 0, CELADON_HOTEL + + def_signs + sign 27, 15, 10 ; CeladonCityText10 + sign 19, 15, 11 ; CeladonCityText11 + sign 42, 9, 12 ; PokeCenterSignText + sign 13, 29, 13 ; CeladonCityText13 + sign 21, 9, 14 ; CeladonCityText14 + sign 12, 13, 15 ; CeladonCityText15 + sign 39, 21, 16 ; CeladonCityText16 + sign 33, 21, 17 ; CeladonCityText17 + sign 27, 21, 18 ; CeladonCityText18 + + def_objects + object SPRITE_LITTLE_GIRL, 8, 17, WALK, ANY_DIR, 1 ; person + object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person + object SPRITE_GIRL, 14, 19, WALK, UP_DOWN, 3 ; person + object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person + object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person + object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person + object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person + object SPRITE_ROCKET, 32, 29, WALK, LEFT_RIGHT, 8 ; person + object SPRITE_ROCKET, 42, 14, WALK, LEFT_RIGHT, 9 ; person + + def_warps_to CELADON_CITY diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm new file mode 100644 index 00000000..37c8c876 --- /dev/null +++ b/data/maps/objects/CeladonDiner.asm @@ -0,0 +1,17 @@ +CeladonDiner_Object: + db $f ; border block + + def_warps + warp 3, 7, 10, LAST_MAP + warp 4, 7, 10, LAST_MAP + + def_signs + + def_objects + object SPRITE_COOK, 8, 5, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person + object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person + object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person + + def_warps_to CELADON_DINER diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm new file mode 100644 index 00000000..197a254b --- /dev/null +++ b/data/maps/objects/CeladonGym.asm @@ -0,0 +1,20 @@ +CeladonGym_Object: + db $3 ; border block + + def_warps + warp 4, 17, 6, LAST_MAP + warp 5, 17, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 + + def_warps_to CELADON_GYM diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm new file mode 100644 index 00000000..a516f141 --- /dev/null +++ b/data/maps/objects/CeladonHotel.asm @@ -0,0 +1,15 @@ +CeladonHotel_Object: + db $0 ; border block + + def_warps + warp 3, 7, 12, LAST_MAP + warp 4, 7, 12, LAST_MAP + + def_signs + + def_objects + object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 8, 4, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to CELADON_HOTEL diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm new file mode 100644 index 00000000..63eb686c --- /dev/null +++ b/data/maps/objects/CeladonMansion1F.asm @@ -0,0 +1,20 @@ +CeladonMansion1F_Object: + db $f ; border block + + def_warps + warp 4, 11, 2, LAST_MAP + warp 5, 11, 2, LAST_MAP + warp 4, 0, 4, LAST_MAP + warp 7, 1, 1, CELADON_MANSION_2F + warp 2, 1, 2, CELADON_MANSION_2F + + def_signs + sign 4, 9, 5 ; CeladonMansion1Text5 + + def_objects + object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person + object SPRITE_FAIRY, 1, 8, WALK, LEFT_RIGHT, 3 ; person + object SPRITE_MONSTER, 4, 4, WALK, UP_DOWN, 4 ; person + + def_warps_to CELADON_MANSION_1F diff --git a/data/maps/objects/CeladonMansion2F.asm b/data/maps/objects/CeladonMansion2F.asm new file mode 100644 index 00000000..211abbda --- /dev/null +++ b/data/maps/objects/CeladonMansion2F.asm @@ -0,0 +1,15 @@ +CeladonMansion2F_Object: + db $f ; border block + + def_warps + warp 6, 1, 0, CELADON_MANSION_3F + warp 7, 1, 3, CELADON_MANSION_1F + warp 2, 1, 4, CELADON_MANSION_1F + warp 4, 1, 3, CELADON_MANSION_3F + + def_signs + sign 4, 9, 1 ; CeladonMansion2Text1 + + def_objects + + def_warps_to CELADON_MANSION_2F diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm new file mode 100644 index 00000000..442f3c23 --- /dev/null +++ b/data/maps/objects/CeladonMansion3F.asm @@ -0,0 +1,22 @@ +CeladonMansion3F_Object: + db $f ; border block + + def_warps + warp 6, 1, 0, CELADON_MANSION_2F + warp 7, 1, 0, CELADON_MANSION_ROOF + warp 2, 1, 1, CELADON_MANSION_ROOF + warp 4, 1, 3, CELADON_MANSION_2F + + def_signs + sign 1, 3, 5 ; CeladonMansion3Text5 + sign 4, 3, 6 ; CeladonMansion3Text6 + sign 1, 6, 7 ; CeladonMansion3Text7 + sign 4, 9, 8 ; CeladonMansion3Text8 + + def_objects + object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person + object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person + object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person + object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person + + def_warps_to CELADON_MANSION_3F diff --git a/data/maps/objects/CeladonMansionRoof.asm b/data/maps/objects/CeladonMansionRoof.asm new file mode 100644 index 00000000..e3eb8aa7 --- /dev/null +++ b/data/maps/objects/CeladonMansionRoof.asm @@ -0,0 +1,14 @@ +CeladonMansionRoof_Object: + db $9 ; border block + + def_warps + warp 6, 1, 1, CELADON_MANSION_3F + warp 2, 1, 2, CELADON_MANSION_3F + warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE + + def_signs + sign 3, 7, 1 ; CeladonMansion4Text1 + + def_objects + + def_warps_to CELADON_MANSION_ROOF diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm new file mode 100644 index 00000000..1656bdcf --- /dev/null +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -0,0 +1,14 @@ +CeladonMansionRoofHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, CELADON_MANSION_ROOF + warp 3, 7, 2, CELADON_MANSION_ROOF + + def_signs + + def_objects + object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_POKE_BALL, 4, 3, STAY, NONE, 2 ; person + + def_warps_to CELADON_MANSION_ROOF_HOUSE diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm new file mode 100644 index 00000000..3edcbe3f --- /dev/null +++ b/data/maps/objects/CeladonMart1F.asm @@ -0,0 +1,19 @@ +CeladonMart1F_Object: + db $f ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 16, 7, 1, LAST_MAP + warp 17, 7, 1, LAST_MAP + warp 12, 1, 0, CELADON_MART_2F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 11, 4, 2 ; CeladonMart1Text2 + sign 14, 1, 3 ; CeladonMart1Text3 + + def_objects + object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person + + def_warps_to CELADON_MART_1F diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm new file mode 100644 index 00000000..19b2aa59 --- /dev/null +++ b/data/maps/objects/CeladonMart2F.asm @@ -0,0 +1,18 @@ +CeladonMart2F_Object: + db $f ; border block + + def_warps + warp 12, 1, 4, CELADON_MART_1F + warp 16, 1, 1, CELADON_MART_3F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 14, 1, 5 ; CeladonMart2Text5 + + def_objects + object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person + object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person + + def_warps_to CELADON_MART_2F diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm new file mode 100644 index 00000000..e1e8c8f2 --- /dev/null +++ b/data/maps/objects/CeladonMart3F.asm @@ -0,0 +1,30 @@ +CeladonMart3F_Object: + db $f ; border block + + def_warps + warp 12, 1, 0, CELADON_MART_4F + warp 16, 1, 1, CELADON_MART_2F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 2, 4, 6 ; CeladonMart3Text6 + sign 3, 4, 7 ; CeladonMart3Text7 + sign 5, 4, 8 ; CeladonMart3Text8 + sign 6, 4, 9 ; CeladonMart3Text9 + sign 2, 6, 10 ; CeladonMart3Text10 + sign 3, 6, 11 ; CeladonMart3Text11 + sign 5, 6, 12 ; CeladonMart3Text12 + sign 6, 6, 13 ; CeladonMart3Text13 + sign 14, 1, 14 ; CeladonMart3Text14 + sign 4, 1, 15 ; CeladonMart3Text15 + sign 6, 1, 16 ; CeladonMart3Text16 + sign 10, 1, 17 ; CeladonMart3Text17 + + def_objects + object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person + object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person + object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person + object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person + object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person + + def_warps_to CELADON_MART_3F diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm new file mode 100644 index 00000000..72ed0338 --- /dev/null +++ b/data/maps/objects/CeladonMart4F.asm @@ -0,0 +1,17 @@ +CeladonMart4F_Object: + db $f ; border block + + def_warps + warp 12, 1, 0, CELADON_MART_3F + warp 16, 1, 1, CELADON_MART_5F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 14, 1, 4 ; CeladonMart4Text4 + + def_objects + object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to CELADON_MART_4F diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm new file mode 100644 index 00000000..2583526c --- /dev/null +++ b/data/maps/objects/CeladonMart5F.asm @@ -0,0 +1,18 @@ +CeladonMart5F_Object: + db $f ; border block + + def_warps + warp 12, 1, 0, CELADON_MART_ROOF + warp 16, 1, 1, CELADON_MART_4F + warp 1, 1, 0, CELADON_MART_ELEVATOR + + def_signs + sign 14, 1, 5 ; CeladonMart5Text5 + + def_objects + object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person + object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person + object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person + object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person + + def_warps_to CELADON_MART_5F diff --git a/data/maps/objects/CeladonMartElevator.asm b/data/maps/objects/CeladonMartElevator.asm new file mode 100644 index 00000000..d03984a6 --- /dev/null +++ b/data/maps/objects/CeladonMartElevator.asm @@ -0,0 +1,13 @@ +CeladonMartElevator_Object: + db $f ; border block + + def_warps + warp 1, 3, 5, CELADON_MART_1F + warp 2, 3, 5, CELADON_MART_1F + + def_signs + sign 3, 0, 1 ; CeladonMartElevatorText1 + + def_objects + + def_warps_to CELADON_MART_ELEVATOR diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm new file mode 100644 index 00000000..49b5ab6f --- /dev/null +++ b/data/maps/objects/CeladonMartRoof.asm @@ -0,0 +1,17 @@ +CeladonMartRoof_Object: + db $42 ; border block + + def_warps + warp 15, 2, 0, CELADON_MART_5F + + def_signs + sign 10, 1, 3 ; CeladonMartRoofText3 + sign 11, 1, 4 ; CeladonMartRoofText4 + sign 12, 2, 5 ; CeladonMartRoofText5 + sign 13, 2, 6 ; CeladonMartRoofText6 + + def_objects + object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 5, 5, WALK, ANY_DIR, 2 ; person + + def_warps_to CELADON_MART_ROOF diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm new file mode 100644 index 00000000..65a04a1c --- /dev/null +++ b/data/maps/objects/CeladonPokecenter.asm @@ -0,0 +1,16 @@ +CeladonPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 5, LAST_MAP + warp 4, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_BEAUTY, 10, 5, WALK, ANY_DIR, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to CELADON_POKECENTER diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm new file mode 100644 index 00000000..50d2087a --- /dev/null +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -0,0 +1,14 @@ +CeruleanBadgeHouse_Object: + db $c ; border block + + def_warps + warp 2, 0, 9, LAST_MAP + warp 2, 7, 8, LAST_MAP + warp 3, 7, 8, LAST_MAP + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_MAN, 5, 3, STAY, RIGHT, 1 ; person + + def_warps_to CERULEAN_BADGE_HOUSE diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm new file mode 100644 index 00000000..7e5e8c85 --- /dev/null +++ b/data/maps/objects/CeruleanCave1F.asm @@ -0,0 +1,22 @@ +CeruleanCave1F_Object: + db $7d ; border block + + def_warps + warp 24, 17, 6, LAST_MAP + warp 25, 17, 6, LAST_MAP + warp 27, 1, 0, CERULEAN_CAVE_2F + warp 23, 7, 1, CERULEAN_CAVE_2F + warp 18, 9, 2, CERULEAN_CAVE_2F + warp 7, 1, 3, CERULEAN_CAVE_2F + warp 1, 3, 4, CERULEAN_CAVE_2F + warp 3, 11, 5, CERULEAN_CAVE_2F + warp 0, 6, 0, CERULEAN_CAVE_B1F + + def_signs + + def_objects + object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE + object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER + object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET + + def_warps_to CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm new file mode 100644 index 00000000..6622bb77 --- /dev/null +++ b/data/maps/objects/CeruleanCave2F.asm @@ -0,0 +1,19 @@ +CeruleanCave2F_Object: + db $7d ; border block + + def_warps + warp 29, 1, 2, CERULEAN_CAVE_1F + warp 22, 6, 3, CERULEAN_CAVE_1F + warp 19, 7, 4, CERULEAN_CAVE_1F + warp 9, 1, 5, CERULEAN_CAVE_1F + warp 1, 3, 6, CERULEAN_CAVE_1F + warp 3, 11, 7, CERULEAN_CAVE_1F + + def_signs + + def_objects + object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP + object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL + object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE + + def_warps_to CERULEAN_CAVE_2F diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm new file mode 100644 index 00000000..886238c2 --- /dev/null +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -0,0 +1,14 @@ +CeruleanCaveB1F_Object: + db $7d ; border block + + def_warps + warp 3, 6, 8, CERULEAN_CAVE_1F + + def_signs + + def_objects + object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70 + object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL + object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE + + def_warps_to CERULEAN_CAVE_B1F diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm new file mode 100644 index 00000000..9b15c1c5 --- /dev/null +++ b/data/maps/objects/CeruleanCity.asm @@ -0,0 +1,37 @@ +CeruleanCity_Object: + db $f ; border block + + def_warps + warp 27, 11, 0, CERULEAN_TRASHED_HOUSE + warp 13, 15, 0, CERULEAN_TRADE_HOUSE + warp 19, 17, 0, CERULEAN_POKECENTER + warp 30, 19, 0, CERULEAN_GYM + warp 13, 25, 0, BIKE_SHOP + warp 25, 25, 0, CERULEAN_MART + warp 4, 11, 0, CERULEAN_CAVE_1F + warp 27, 9, 2, CERULEAN_TRASHED_HOUSE + warp 9, 11, 1, CERULEAN_BADGE_HOUSE + warp 9, 9, 0, CERULEAN_BADGE_HOUSE + + def_signs + sign 23, 19, 12 ; CeruleanCityText12 + sign 17, 29, 13 ; CeruleanCityText13 + sign 26, 25, 14 ; MartSignText + sign 20, 17, 15 ; PokeCenterSignText + sign 11, 25, 16 ; CeruleanCityText16 + sign 27, 21, 17 ; CeruleanCityText17 + + def_objects + object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 + object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person + object SPRITE_SUPER_NERD, 15, 18, WALK, UP_DOWN, 4 ; person + object SPRITE_SUPER_NERD, 9, 21, WALK, LEFT_RIGHT, 5 ; person + object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person + object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person + object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person + object SPRITE_COOLTRAINER_F, 9, 27, WALK, LEFT_RIGHT, 9 ; person + object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person + object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person + + def_warps_to CERULEAN_CITY diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm new file mode 100644 index 00000000..26709cae --- /dev/null +++ b/data/maps/objects/CeruleanGym.asm @@ -0,0 +1,16 @@ +CeruleanGym_Object: + db $3 ; border block + + def_warps + warp 4, 13, 3, LAST_MAP + warp 5, 13, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 + object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 + object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 + object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person + + def_warps_to CERULEAN_GYM diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm new file mode 100644 index 00000000..144edd80 --- /dev/null +++ b/data/maps/objects/CeruleanMart.asm @@ -0,0 +1,15 @@ +CeruleanMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 5, LAST_MAP + warp 4, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_COOLTRAINER_M, 3, 4, WALK, UP_DOWN, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 2, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to CERULEAN_MART diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm new file mode 100644 index 00000000..af6c0ac3 --- /dev/null +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -0,0 +1,16 @@ +CeruleanPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 2, LAST_MAP + warp 4, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_SUPER_NERD, 10, 5, WALK, ANY_DIR, 2 ; person + object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm new file mode 100644 index 00000000..04638ded --- /dev/null +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -0,0 +1,14 @@ +CeruleanTradeHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_GRANNY, 5, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person + + def_warps_to CERULEAN_TRADE_HOUSE diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm new file mode 100644 index 00000000..9f502319 --- /dev/null +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -0,0 +1,16 @@ +CeruleanTrashedHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 3, 0, 7, LAST_MAP + + def_signs + sign 3, 0, 3 ; CeruleanHouseTrashedText3 + + def_objects + object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person + object SPRITE_GIRL, 5, 6, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to CERULEAN_TRASHED_HOUSE diff --git a/data/maps/objects/ChampionsRoom.asm b/data/maps/objects/ChampionsRoom.asm new file mode 100644 index 00000000..2380fd04 --- /dev/null +++ b/data/maps/objects/ChampionsRoom.asm @@ -0,0 +1,16 @@ +ChampionsRoom_Object: + db $3 ; border block + + def_warps + warp 3, 7, 1, LANCES_ROOM + warp 4, 7, 2, LANCES_ROOM + warp 3, 0, 0, HALL_OF_FAME + warp 4, 0, 0, HALL_OF_FAME + + def_signs + + def_objects + object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person + + def_warps_to CHAMPIONS_ROOM diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm new file mode 100644 index 00000000..b2dccbd3 --- /dev/null +++ b/data/maps/objects/CinnabarGym.asm @@ -0,0 +1,21 @@ +CinnabarGym_Object: + db $2e ; border block + + def_warps + warp 16, 17, 1, LAST_MAP + warp 17, 17, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 + object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 + object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 + object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 + object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 + object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 + object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 + object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 + object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person + + def_warps_to CINNABAR_GYM diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm new file mode 100644 index 00000000..1dd11a43 --- /dev/null +++ b/data/maps/objects/CinnabarIsland.asm @@ -0,0 +1,22 @@ +CinnabarIsland_Object: + db $43 ; border block + + def_warps + warp 6, 3, 1, POKEMON_MANSION_1F + warp 18, 3, 0, CINNABAR_GYM + warp 6, 9, 0, CINNABAR_LAB + warp 11, 11, 0, CINNABAR_POKECENTER + warp 15, 11, 0, CINNABAR_MART + + def_signs + sign 9, 5, 3 ; CinnabarIslandText3 + sign 16, 11, 4 ; MartSignText + sign 12, 11, 5 ; PokeCenterSignText + sign 9, 11, 6 ; CinnabarIslandText6 + sign 13, 3, 7 ; CinnabarIslandText7 + + def_objects + object SPRITE_GIRL, 12, 5, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + + def_warps_to CINNABAR_ISLAND diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm new file mode 100644 index 00000000..0e007e3a --- /dev/null +++ b/data/maps/objects/CinnabarLab.asm @@ -0,0 +1,20 @@ +CinnabarLab_Object: + db $17 ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM + warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM + warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM + + def_signs + sign 3, 2, 2 ; Lab1Text2 + sign 9, 4, 3 ; Lab1Text3 + sign 13, 4, 4 ; Lab1Text4 + sign 17, 4, 5 ; Lab1Text5 + + def_objects + object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person + + def_warps_to CINNABAR_LAB diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm new file mode 100644 index 00000000..8269eaeb --- /dev/null +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -0,0 +1,14 @@ +CinnabarLabFossilRoom_Object: + db $17 ; border block + + def_warps + warp 2, 7, 4, CINNABAR_LAB + warp 3, 7, 4, CINNABAR_LAB + + def_signs + + def_objects + object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person + + def_warps_to CINNABAR_LAB_FOSSIL_ROOM diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm new file mode 100644 index 00000000..b5969dfa --- /dev/null +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,17 @@ +CinnabarLabMetronomeRoom_Object: + db $17 ; border block + + def_warps + warp 2, 7, 3, CINNABAR_LAB + warp 3, 7, 3, CINNABAR_LAB + + def_signs + sign 0, 4, 3 ; Lab3Text3 + sign 1, 4, 4 ; Lab3Text4 + sign 2, 1, 5 ; Lab3Text5 + + def_objects + object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person + object SPRITE_SCIENTIST, 2, 3, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to CINNABAR_LAB_METRONOME_ROOM diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm new file mode 100644 index 00000000..e23a19cf --- /dev/null +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -0,0 +1,15 @@ +CinnabarLabTradeRoom_Object: + db $17 ; border block + + def_warps + warp 2, 7, 2, CINNABAR_LAB + warp 3, 7, 2, CINNABAR_LAB + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person + object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person + + def_warps_to CINNABAR_LAB_TRADE_ROOM diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm new file mode 100644 index 00000000..2413d993 --- /dev/null +++ b/data/maps/objects/CinnabarMart.asm @@ -0,0 +1,15 @@ +CinnabarMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person + object SPRITE_SCIENTIST, 3, 4, STAY, NONE, 3 ; person + + def_warps_to CINNABAR_MART diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm new file mode 100644 index 00000000..b1d89678 --- /dev/null +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -0,0 +1,16 @@ +CinnabarPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_COOLTRAINER_F, 9, 4, WALK, ANY_DIR, 2 ; person + object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to CINNABAR_POKECENTER diff --git a/data/maps/objects/Colosseum.asm b/data/maps/objects/Colosseum.asm new file mode 100644 index 00000000..dac9bc09 --- /dev/null +++ b/data/maps/objects/Colosseum.asm @@ -0,0 +1,11 @@ +Colosseum_Object: + db $e ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person + + def_warps_to COLOSSEUM diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm new file mode 100644 index 00000000..c1250c91 --- /dev/null +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -0,0 +1,16 @@ +CopycatsHouse1F_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 7, 1, 0, COPYCATS_HOUSE_2F + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person + object SPRITE_FAIRY, 1, 4, WALK, UP_DOWN, 3 ; person + + def_warps_to COPYCATS_HOUSE_1F diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm new file mode 100644 index 00000000..e04edee7 --- /dev/null +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -0,0 +1,18 @@ +CopycatsHouse2F_Object: + db $a ; border block + + def_warps + warp 7, 1, 2, COPYCATS_HOUSE_1F + + def_signs + sign 3, 5, 6 ; CopycatsHouse2FText6 + sign 0, 1, 7 ; CopycatsHouse2FText7 + + def_objects + object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, ANY_DIR, 1 ; person + object SPRITE_BIRD, 4, 6, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person + object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person + + def_warps_to COPYCATS_HOUSE_2F diff --git a/data/maps/objects/Daycare.asm b/data/maps/objects/Daycare.asm new file mode 100644 index 00000000..2feecff3 --- /dev/null +++ b/data/maps/objects/Daycare.asm @@ -0,0 +1,13 @@ +Daycare_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person + + def_warps_to DAYCARE diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm new file mode 100644 index 00000000..dc4889e5 --- /dev/null +++ b/data/maps/objects/DiglettsCave.asm @@ -0,0 +1,12 @@ +DiglettsCave_Object: + db $19 ; border block + + def_warps + warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2 + warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11 + + def_signs + + def_objects + + def_warps_to DIGLETTS_CAVE diff --git a/data/maps/objects/DiglettsCaveRoute11.asm b/data/maps/objects/DiglettsCaveRoute11.asm new file mode 100644 index 00000000..f6c884d9 --- /dev/null +++ b/data/maps/objects/DiglettsCaveRoute11.asm @@ -0,0 +1,14 @@ +DiglettsCaveRoute11_Object: + db $7d ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + warp 4, 4, 1, DIGLETTS_CAVE + + def_signs + + def_objects + object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person + + def_warps_to DIGLETTS_CAVE_ROUTE_11 diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm new file mode 100644 index 00000000..948a82e3 --- /dev/null +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -0,0 +1,14 @@ +DiglettsCaveRoute2_Object: + db $7d ; border block + + def_warps + warp 2, 7, 0, LAST_MAP + warp 3, 7, 0, LAST_MAP + warp 4, 4, 0, DIGLETTS_CAVE + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 3, 3, STAY, NONE, 1 ; person + + def_warps_to DIGLETTS_CAVE_ROUTE_2 diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm new file mode 100644 index 00000000..5345a7aa --- /dev/null +++ b/data/maps/objects/FightingDojo.asm @@ -0,0 +1,19 @@ +FightingDojo_Object: + db $3 ; border block + + def_warps + warp 4, 11, 1, LAST_MAP + warp 5, 11, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1 + object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2 + object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 + object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 + object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 + object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person + object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person + + def_warps_to FIGHTING_DOJO diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm new file mode 100644 index 00000000..30aff6c5 --- /dev/null +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -0,0 +1,15 @@ +FuchsiaBillsGrandpasHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_WOMAN, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person + object SPRITE_YOUNGSTER, 5, 5, STAY, NONE, 3 ; person + + def_warps_to FUCHSIA_BILLS_GRANDPAS_HOUSE diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm new file mode 100644 index 00000000..d0230a01 --- /dev/null +++ b/data/maps/objects/FuchsiaCity.asm @@ -0,0 +1,43 @@ +FuchsiaCity_Object: + db $f ; border block + + def_warps + warp 5, 13, 0, FUCHSIA_MART + warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE + warp 19, 27, 0, FUCHSIA_POKECENTER + warp 27, 27, 0, WARDENS_HOUSE + warp 18, 3, 0, SAFARI_ZONE_GATE + warp 5, 27, 0, FUCHSIA_GYM + warp 22, 13, 0, FUCHSIA_MEETING_ROOM + warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE + warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE + + def_signs + sign 15, 23, 11 ; FuchsiaCityText11 + sign 25, 15, 12 ; FuchsiaCityText12 + sign 17, 5, 13 ; FuchsiaCityText13 + sign 6, 13, 14 ; MartSignText + sign 20, 27, 15 ; PokeCenterSignText + sign 27, 29, 16 ; FuchsiaCityText16 + sign 21, 15, 17 ; FuchsiaCityText17 + sign 5, 29, 18 ; FuchsiaCityText18 + sign 33, 7, 19 ; FuchsiaCityText19 + sign 27, 7, 20 ; FuchsiaCityText20 + sign 13, 7, 21 ; FuchsiaCityText21 + sign 31, 13, 22 ; FuchsiaCityText22 + sign 13, 15, 23 ; FuchsiaCityText23 + sign 7, 7, 24 ; FuchsiaCityText24 + + def_objects + object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person + object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person + object SPRITE_FAIRY, 31, 5, WALK, ANY_DIR, 5 ; person + object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person + object SPRITE_MONSTER, 12, 6, WALK, LEFT_RIGHT, 7 ; person + object SPRITE_MONSTER, 30, 12, WALK, LEFT_RIGHT, 8 ; person + object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person + object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person + + def_warps_to FUCHSIA_CITY diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm new file mode 100644 index 00000000..434cec8b --- /dev/null +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -0,0 +1,14 @@ +FuchsiaGoodRodHouse_Object: + db $c ; border block + + def_warps + warp 2, 0, 8, LAST_MAP + warp 2, 7, 7, LAST_MAP + warp 3, 7, 7, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person + + def_warps_to FUCHSIA_GOOD_ROD_HOUSE diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm new file mode 100644 index 00000000..a48794ff --- /dev/null +++ b/data/maps/objects/FuchsiaGym.asm @@ -0,0 +1,20 @@ +FuchsiaGym_Object: + db $3 ; border block + + def_warps + warp 4, 17, 5, LAST_MAP + warp 5, 17, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 + object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 + object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 + object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 + object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 + object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 + object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person + + def_warps_to FUCHSIA_GYM diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm new file mode 100644 index 00000000..0a238a87 --- /dev/null +++ b/data/maps/objects/FuchsiaMart.asm @@ -0,0 +1,15 @@ +FuchsiaMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, UP_DOWN, 3 ; person + + def_warps_to FUCHSIA_MART diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm new file mode 100644 index 00000000..e4c2a83b --- /dev/null +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -0,0 +1,15 @@ +FuchsiaMeetingRoom_Object: + db $17 ; border block + + def_warps + warp 4, 7, 6, LAST_MAP + warp 5, 7, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_SAFARI_ZONE_WORKER, 4, 1, STAY, DOWN, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 0, 2, STAY, UP, 2 ; person + object SPRITE_SAFARI_ZONE_WORKER, 10, 1, STAY, DOWN, 3 ; person + + def_warps_to FUCHSIA_MEETING_ROOM diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm new file mode 100644 index 00000000..54c5952b --- /dev/null +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -0,0 +1,16 @@ +FuchsiaPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 2, LAST_MAP + warp 4, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, LEFT_RIGHT, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to FUCHSIA_POKECENTER diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm new file mode 100644 index 00000000..90708941 --- /dev/null +++ b/data/maps/objects/GameCorner.asm @@ -0,0 +1,25 @@ +GameCorner_Object: + db $f ; border block + + def_warps + warp 15, 17, 7, LAST_MAP + warp 16, 17, 7, LAST_MAP + warp 17, 4, 1, ROCKET_HIDEOUT_B1F + + def_signs + sign 9, 4, 12 ; CeladonGameCornerText12 + + def_objects + object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person + object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person + object SPRITE_BEAUTY, 2, 13, STAY, LEFT, 4 ; person + object SPRITE_FISHING_GURU, 5, 11, STAY, RIGHT, 5 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 8, 11, STAY, LEFT, 6 ; person + object SPRITE_GYM_GUIDE, 8, 14, STAY, LEFT, 7 ; person + object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person + object SPRITE_CLERK, 14, 11, STAY, LEFT, 9 ; person + object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person + object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 + + def_warps_to GAME_CORNER diff --git a/data/maps/objects/GameCornerPrizeRoom.asm b/data/maps/objects/GameCornerPrizeRoom.asm new file mode 100644 index 00000000..d55decf1 --- /dev/null +++ b/data/maps/objects/GameCornerPrizeRoom.asm @@ -0,0 +1,17 @@ +GameCornerPrizeRoom_Object: + db $f ; border block + + def_warps + warp 4, 7, 9, LAST_MAP + warp 5, 7, 9, LAST_MAP + + def_signs + sign 2, 2, 3 ; CeladonPrizeRoomText3 + sign 4, 2, 4 ; CeladonPrizeRoomText4 + sign 6, 2, 5 ; CeladonPrizeRoomText5 + + def_objects + object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person + object SPRITE_GAMBLER, 7, 3, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to GAME_CORNER_PRIZE_ROOM diff --git a/data/maps/objects/HallOfFame.asm b/data/maps/objects/HallOfFame.asm new file mode 100644 index 00000000..caa55bf6 --- /dev/null +++ b/data/maps/objects/HallOfFame.asm @@ -0,0 +1,13 @@ +HallOfFame_Object: + db $3 ; border block + + def_warps + warp 4, 7, 2, CHAMPIONS_ROOM + warp 5, 7, 3, CHAMPIONS_ROOM + + def_signs + + def_objects + object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person + + def_warps_to HALL_OF_FAME diff --git a/data/maps/objects/IndigoPlateau.asm b/data/maps/objects/IndigoPlateau.asm new file mode 100644 index 00000000..d67c9f8a --- /dev/null +++ b/data/maps/objects/IndigoPlateau.asm @@ -0,0 +1,12 @@ +IndigoPlateau_Object: + db $e ; border block + + def_warps + warp 9, 5, 0, INDIGO_PLATEAU_LOBBY + warp 10, 5, 0, INDIGO_PLATEAU_LOBBY + + def_signs + + def_objects + + def_warps_to INDIGO_PLATEAU diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm new file mode 100644 index 00000000..3244b4ad --- /dev/null +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -0,0 +1,18 @@ +IndigoPlateauLobby_Object: + db $0 ; border block + + def_warps + warp 7, 11, 0, LAST_MAP + warp 8, 11, 1, LAST_MAP + warp 8, 0, 0, LORELEIS_ROOM + + def_signs + + def_objects + object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person + object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person + + def_warps_to INDIGO_PLATEAU_LOBBY diff --git a/data/maps/objects/LancesRoom.asm b/data/maps/objects/LancesRoom.asm new file mode 100644 index 00000000..a8dc4777 --- /dev/null +++ b/data/maps/objects/LancesRoom.asm @@ -0,0 +1,14 @@ +LancesRoom_Object: + db $3 ; border block + + def_warps + warp 24, 16, 2, AGATHAS_ROOM + warp 5, 0, 0, CHAMPIONS_ROOM + warp 6, 0, 0, CHAMPIONS_ROOM + + def_signs + + def_objects + object SPRITE_LANCE, 6, 1, STAY, DOWN, 1, OPP_LANCE, 1 + + def_warps_to LANCES_ROOM diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm new file mode 100644 index 00000000..7e7443e2 --- /dev/null +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -0,0 +1,14 @@ +LavenderCuboneHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_MONSTER, 3, 5, STAY, UP, 1 ; person + object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person + + def_warps_to LAVENDER_CUBONE_HOUSE diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm new file mode 100644 index 00000000..00d5a64b --- /dev/null +++ b/data/maps/objects/LavenderMart.asm @@ -0,0 +1,15 @@ +LavenderMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_M, 7, 2, STAY, NONE, 3 ; person + + def_warps_to LAVENDER_MART diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm new file mode 100644 index 00000000..98975531 --- /dev/null +++ b/data/maps/objects/LavenderPokecenter.asm @@ -0,0 +1,16 @@ +LavenderPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person + object SPRITE_LITTLE_GIRL, 2, 6, WALK, UP_DOWN, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm new file mode 100644 index 00000000..f34659c1 --- /dev/null +++ b/data/maps/objects/LavenderTown.asm @@ -0,0 +1,25 @@ +LavenderTown_Object: + db $2c ; border block + + def_warps + warp 3, 5, 0, LAVENDER_POKECENTER + warp 14, 5, 0, POKEMON_TOWER_1F + warp 7, 9, 0, MR_FUJIS_HOUSE + warp 15, 13, 0, LAVENDER_MART + warp 3, 13, 0, LAVENDER_CUBONE_HOUSE + warp 7, 13, 0, NAME_RATERS_HOUSE + + def_signs + sign 11, 9, 4 ; LavenderTownText4 + sign 9, 3, 5 ; LavenderTownText5 + sign 16, 13, 6 ; MartSignText + sign 4, 5, 7 ; PokeCenterSignText + sign 5, 9, 8 ; LavenderTownText8 + sign 17, 7, 9 ; LavenderTownText9 + + def_objects + object SPRITE_LITTLE_GIRL, 15, 9, WALK, ANY_DIR, 1 ; person + object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 8, 7, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to LAVENDER_TOWN diff --git a/data/maps/objects/LoreleisRoom.asm b/data/maps/objects/LoreleisRoom.asm new file mode 100644 index 00000000..91a306b8 --- /dev/null +++ b/data/maps/objects/LoreleisRoom.asm @@ -0,0 +1,15 @@ +LoreleisRoom_Object: + db $3 ; border block + + def_warps + warp 4, 11, 2, INDIGO_PLATEAU_LOBBY + warp 5, 11, 2, INDIGO_PLATEAU_LOBBY + warp 4, 0, 0, BRUNOS_ROOM + warp 5, 0, 1, BRUNOS_ROOM + + def_signs + + def_objects + object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 + + def_warps_to LORELEIS_ROOM diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm new file mode 100644 index 00000000..6ec762f6 --- /dev/null +++ b/data/maps/objects/MrFujisHouse.asm @@ -0,0 +1,18 @@ +MrFujisHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person + object SPRITE_MONSTER, 1, 3, STAY, NONE, 4 ; person + object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person + object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person + + def_warps_to MR_FUJIS_HOUSE diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm new file mode 100644 index 00000000..44367b20 --- /dev/null +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -0,0 +1,13 @@ +MrPsychicsHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 7, LAST_MAP + warp 3, 7, 7, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 5, 3, STAY, LEFT, 1 ; person + + def_warps_to MR_PSYCHICS_HOUSE diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm new file mode 100644 index 00000000..8b40ac4f --- /dev/null +++ b/data/maps/objects/MtMoon1F.asm @@ -0,0 +1,29 @@ +MtMoon1F_Object: + db $3 ; border block + + def_warps + warp 14, 35, 1, LAST_MAP + warp 15, 35, 1, LAST_MAP + warp 5, 5, 0, MT_MOON_B1F + warp 17, 11, 2, MT_MOON_B1F + warp 25, 15, 3, MT_MOON_B1F + + def_signs + sign 15, 23, 14 ; MtMoon1Text14 + + def_objects + object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 + object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 + object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 + object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 + object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 + object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 + object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 + object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION + object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE + object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY + object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE + object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION + object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN + + def_warps_to MT_MOON_1F diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm new file mode 100644 index 00000000..69fa3c17 --- /dev/null +++ b/data/maps/objects/MtMoonB1F.asm @@ -0,0 +1,18 @@ +MtMoonB1F_Object: + db $3 ; border block + + def_warps + warp 5, 5, 2, MT_MOON_1F + warp 17, 11, 0, MT_MOON_B2F + warp 25, 9, 3, MT_MOON_1F + warp 25, 15, 4, MT_MOON_1F + warp 21, 17, 1, MT_MOON_B2F + warp 13, 27, 2, MT_MOON_B2F + warp 23, 3, 3, MT_MOON_B2F + warp 27, 3, 2, LAST_MAP + + def_signs + + def_objects + + def_warps_to MT_MOON_B1F diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm new file mode 100644 index 00000000..7b2e7e5a --- /dev/null +++ b/data/maps/objects/MtMoonB2F.asm @@ -0,0 +1,23 @@ +MtMoonB2F_Object: + db $3 ; border block + + def_warps + warp 25, 9, 1, MT_MOON_B1F + warp 21, 17, 4, MT_MOON_B1F + warp 15, 27, 5, MT_MOON_B1F + warp 5, 7, 6, MT_MOON_B1F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 + object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 + object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 + object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 + object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person + object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP + object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH + + def_warps_to MT_MOON_B2F diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm new file mode 100644 index 00000000..5648de6e --- /dev/null +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -0,0 +1,18 @@ +MtMoonPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person + object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, LEFT_RIGHT, 4 ; person + object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person + + def_warps_to MT_MOON_POKECENTER diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm new file mode 100644 index 00000000..3628173c --- /dev/null +++ b/data/maps/objects/Museum1F.asm @@ -0,0 +1,20 @@ +Museum1F_Object: + db $a ; border block + + def_warps + warp 10, 7, 0, LAST_MAP + warp 11, 7, 0, LAST_MAP + warp 16, 7, 1, LAST_MAP + warp 17, 7, 1, LAST_MAP + warp 7, 7, 0, MUSEUM_2F + + def_signs + + def_objects + object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person + object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person + object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person + object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person + object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person + + def_warps_to MUSEUM_1F diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm new file mode 100644 index 00000000..72f98f9b --- /dev/null +++ b/data/maps/objects/Museum2F.asm @@ -0,0 +1,18 @@ +Museum2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, MUSEUM_1F + + def_signs + sign 11, 2, 6 ; Museum2FText6 + sign 2, 5, 7 ; Museum2FText7 + + def_objects + object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person + object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person + object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person + object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person + + def_warps_to MUSEUM_2F diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm new file mode 100644 index 00000000..935a6887 --- /dev/null +++ b/data/maps/objects/NameRatersHouse.asm @@ -0,0 +1,13 @@ +NameRatersHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 5, LAST_MAP + warp 3, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_SILPH_PRESIDENT, 5, 3, STAY, LEFT, 1 ; person + + def_warps_to NAME_RATERS_HOUSE diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm new file mode 100644 index 00000000..e7f3701c --- /dev/null +++ b/data/maps/objects/OaksLab.asm @@ -0,0 +1,23 @@ +OaksLab_Object: + db $3 ; border block + + def_warps + warp 4, 11, 2, LAST_MAP + warp 5, 11, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1 + object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person + object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person + object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person + object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person + object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person + object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person + object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person + object SPRITE_GIRL, 1, 9, WALK, UP_DOWN, 9 ; person + object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person + object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person + + def_warps_to OAKS_LAB diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm new file mode 100644 index 00000000..d362b2c9 --- /dev/null +++ b/data/maps/objects/PalletTown.asm @@ -0,0 +1,20 @@ +PalletTown_Object: + db $b ; border block + + def_warps + warp 5, 5, 0, REDS_HOUSE_1F + warp 13, 5, 0, BLUES_HOUSE + warp 12, 11, 1, OAKS_LAB + + def_signs + sign 13, 13, 4 ; PalletTownText4 + sign 7, 9, 5 ; PalletTownText5 + sign 3, 5, 6 ; PalletTownText6 + sign 11, 5, 7 ; PalletTownText7 + + def_objects + object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person + object SPRITE_GIRL, 3, 8, WALK, ANY_DIR, 2 ; person + object SPRITE_FISHER, 11, 14, WALK, ANY_DIR, 3 ; person + + def_warps_to PALLET_TOWN diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm new file mode 100644 index 00000000..13d228f2 --- /dev/null +++ b/data/maps/objects/PewterCity.asm @@ -0,0 +1,29 @@ +PewterCity_Object: + db $a ; border block + + def_warps + warp 14, 7, 0, MUSEUM_1F + warp 19, 5, 2, MUSEUM_1F + warp 16, 17, 0, PEWTER_GYM + warp 29, 13, 0, PEWTER_NIDORAN_HOUSE + warp 23, 17, 0, PEWTER_MART + warp 7, 29, 0, PEWTER_SPEECH_HOUSE + warp 13, 25, 0, PEWTER_POKECENTER + + def_signs + sign 19, 29, 6 ; PewterCityText6 + sign 33, 19, 7 ; PewterCityText7 + sign 24, 17, 8 ; MartSignText + sign 14, 25, 9 ; PokeCenterSignText + sign 15, 9, 10 ; PewterCityText10 + sign 11, 17, 11 ; PewterCityText11 + sign 25, 23, 12 ; PewterCityText12 + + def_objects + object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person + object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person + object SPRITE_SUPER_NERD, 26, 25, WALK, LEFT_RIGHT, 4 ; person + object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person + + def_warps_to PEWTER_CITY diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm new file mode 100644 index 00000000..9c21701a --- /dev/null +++ b/data/maps/objects/PewterGym.asm @@ -0,0 +1,15 @@ +PewterGym_Object: + db $3 ; border block + + def_warps + warp 4, 13, 2, LAST_MAP + warp 5, 13, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 + object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person + + def_warps_to PEWTER_GYM diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm new file mode 100644 index 00000000..9685d5c7 --- /dev/null +++ b/data/maps/objects/PewterMart.asm @@ -0,0 +1,15 @@ +PewterMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 3, 3, WALK, UP_DOWN, 2 ; person + object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person + + def_warps_to PEWTER_MART diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm new file mode 100644 index 00000000..b1fd0a74 --- /dev/null +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -0,0 +1,15 @@ +PewterNidoranHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_MONSTER, 4, 5, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_BOY, 3, 5, STAY, RIGHT, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 1, 2, STAY, NONE, 3 ; person + + def_warps_to PEWTER_NIDORAN_HOUSE diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm new file mode 100644 index 00000000..8d41a155 --- /dev/null +++ b/data/maps/objects/PewterPokecenter.asm @@ -0,0 +1,16 @@ +PewterPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 6, LAST_MAP + warp 4, 7, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person + object SPRITE_FAIRY, 1, 3, STAY, DOWN, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to PEWTER_POKECENTER diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm new file mode 100644 index 00000000..4dafb7be --- /dev/null +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -0,0 +1,14 @@ +PewterSpeechHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 5, LAST_MAP + warp 3, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 4, 5, STAY, NONE, 2 ; person + + def_warps_to PEWTER_SPEECH_HOUSE diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm new file mode 100644 index 00000000..19fbb129 --- /dev/null +++ b/data/maps/objects/PokemonFanClub.asm @@ -0,0 +1,20 @@ +PokemonFanClub_Object: + db $d ; border block + + def_warps + warp 2, 7, 1, LAST_MAP + warp 3, 7, 1, LAST_MAP + + def_signs + sign 1, 0, 7 ; FanClubText7 + sign 6, 0, 8 ; FanClubText8 + + def_objects + object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person + object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person + object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person + object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person + object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person + object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person + + def_warps_to POKEMON_FAN_CLUB diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm new file mode 100644 index 00000000..70eef1a1 --- /dev/null +++ b/data/maps/objects/PokemonMansion1F.asm @@ -0,0 +1,21 @@ +PokemonMansion1F_Object: + db $2e ; border block + + def_warps + warp 4, 27, 0, LAST_MAP + warp 5, 27, 0, LAST_MAP + warp 6, 27, 0, LAST_MAP + warp 7, 27, 0, LAST_MAP + warp 5, 10, 0, POKEMON_MANSION_2F + warp 21, 23, 0, POKEMON_MANSION_B1F + warp 26, 27, 0, LAST_MAP + warp 27, 27, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS + + def_warps_to POKEMON_MANSION_1F diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm new file mode 100644 index 00000000..8d504eef --- /dev/null +++ b/data/maps/objects/PokemonMansion2F.asm @@ -0,0 +1,18 @@ +PokemonMansion2F_Object: + db $1 ; border block + + def_warps + warp 5, 10, 4, POKEMON_MANSION_1F + warp 7, 10, 0, POKEMON_MANSION_3F + warp 25, 14, 2, POKEMON_MANSION_3F + warp 6, 1, 1, POKEMON_MANSION_3F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 17, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 7 + object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person + + def_warps_to POKEMON_MANSION_2F diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm new file mode 100644 index 00000000..fdf16a8d --- /dev/null +++ b/data/maps/objects/PokemonMansion3F.asm @@ -0,0 +1,18 @@ +PokemonMansion3F_Object: + db $1 ; border block + + def_warps + warp 7, 10, 1, POKEMON_MANSION_2F + warp 6, 1, 3, POKEMON_MANSION_2F + warp 25, 14, 2, POKEMON_MANSION_2F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 5, 11, WALK, LEFT_RIGHT, 1, OPP_BURGLAR, 8 + object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 + object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION + object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON + object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person + + def_warps_to POKEMON_MANSION_3F diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm new file mode 100644 index 00000000..bf0ea0a4 --- /dev/null +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -0,0 +1,19 @@ +PokemonMansionB1F_Object: + db $1 ; border block + + def_warps + warp 23, 22, 5, POKEMON_MANSION_1F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 + object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY + object SPRITE_POKE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE + object SPRITE_POKE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD + object SPRITE_POKE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM + object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY + + def_warps_to POKEMON_MANSION_B1F diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm new file mode 100644 index 00000000..b73c7562 --- /dev/null +++ b/data/maps/objects/PokemonTower1F.asm @@ -0,0 +1,18 @@ +PokemonTower1F_Object: + db $1 ; border block + + def_warps + warp 10, 17, 1, LAST_MAP + warp 11, 17, 1, LAST_MAP + warp 18, 9, 1, POKEMON_TOWER_2F + + def_signs + + def_objects + object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person + object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person + object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person + object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person + + def_warps_to POKEMON_TOWER_1F diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm new file mode 100644 index 00000000..27bd2f1b --- /dev/null +++ b/data/maps/objects/PokemonTower2F.asm @@ -0,0 +1,14 @@ +PokemonTower2F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_3F + warp 18, 9, 2, POKEMON_TOWER_1F + + def_signs + + def_objects + object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person + object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person + + def_warps_to POKEMON_TOWER_2F diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm new file mode 100644 index 00000000..af1b17dc --- /dev/null +++ b/data/maps/objects/PokemonTower3F.asm @@ -0,0 +1,16 @@ +PokemonTower3F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_2F + warp 18, 9, 1, POKEMON_TOWER_4F + + def_signs + + def_objects + object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 + object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 + object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE + + def_warps_to POKEMON_TOWER_3F diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm new file mode 100644 index 00000000..64801e23 --- /dev/null +++ b/data/maps/objects/PokemonTower4F.asm @@ -0,0 +1,18 @@ +PokemonTower4F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_5F + warp 18, 9, 1, POKEMON_TOWER_3F + + def_signs + + def_objects + object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 + object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 + object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 + object SPRITE_POKE_BALL, 12, 10, STAY, NONE, 4, ELIXER + object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING + object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP + + def_warps_to POKEMON_TOWER_4F diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm new file mode 100644 index 00000000..33482ed5 --- /dev/null +++ b/data/maps/objects/PokemonTower5F.asm @@ -0,0 +1,18 @@ +PokemonTower5F_Object: + db $1 ; border block + + def_warps + warp 3, 9, 0, POKEMON_TOWER_4F + warp 18, 9, 0, POKEMON_TOWER_6F + + def_signs + + def_objects + object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person + object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 + object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 + object SPRITE_CHANNELER, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 + object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 + object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET + + def_warps_to POKEMON_TOWER_5F diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm new file mode 100644 index 00000000..8e7b276c --- /dev/null +++ b/data/maps/objects/PokemonTower6F.asm @@ -0,0 +1,17 @@ +PokemonTower6F_Object: + db $1 ; border block + + def_warps + warp 18, 9, 1, POKEMON_TOWER_5F + warp 9, 16, 0, POKEMON_TOWER_7F + + def_signs + + def_objects + object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 + object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 + object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY + object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY + + def_warps_to POKEMON_TOWER_6F diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm new file mode 100644 index 00000000..6d258f0d --- /dev/null +++ b/data/maps/objects/PokemonTower7F.asm @@ -0,0 +1,15 @@ +PokemonTower7F_Object: + db $1 ; border block + + def_warps + warp 9, 16, 1, POKEMON_TOWER_6F + + def_signs + + def_objects + object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19 + object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20 + object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21 + object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person + + def_warps_to POKEMON_TOWER_7F diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm new file mode 100644 index 00000000..6802ce4f --- /dev/null +++ b/data/maps/objects/PowerPlant.asm @@ -0,0 +1,27 @@ +PowerPlant_Object: + db $2e ; border block + + def_warps + warp 4, 35, 3, LAST_MAP + warp 5, 35, 3, LAST_MAP + warp 0, 11, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 + object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 + object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 + object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 + object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 + object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 + object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 + object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 + object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 + object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS + object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP + object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY + object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER + object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT + + def_warps_to POWER_PLANT diff --git a/data/maps/objects/RedsHouse1F.asm b/data/maps/objects/RedsHouse1F.asm new file mode 100644 index 00000000..f7cd0819 --- /dev/null +++ b/data/maps/objects/RedsHouse1F.asm @@ -0,0 +1,15 @@ +RedsHouse1F_Object: + db $a ; border block + + def_warps + warp 2, 7, 0, LAST_MAP ; exit1 + warp 3, 7, 0, LAST_MAP ; exit2 + warp 7, 1, 0, REDS_HOUSE_2F ; staircase + + def_signs + sign 3, 1, 2 ; TV + + def_objects + object SPRITE_MOM, 5, 4, STAY, LEFT, 1 ; Mom + + def_warps_to REDS_HOUSE_1F diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm new file mode 100644 index 00000000..826e68fd --- /dev/null +++ b/data/maps/objects/RedsHouse2F.asm @@ -0,0 +1,11 @@ +RedsHouse2F_Object: + db $a ; border block + + def_warps + warp 7, 1, 2, REDS_HOUSE_1F + + def_signs + + def_objects + + def_warps_to REDS_HOUSE_2F diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm new file mode 100644 index 00000000..b3d4da48 --- /dev/null +++ b/data/maps/objects/RockTunnel1F.asm @@ -0,0 +1,26 @@ +RockTunnel1F_Object: + db $3 ; border block + + def_warps + warp 15, 3, 1, LAST_MAP + warp 15, 0, 1, LAST_MAP + warp 15, 33, 2, LAST_MAP + warp 15, 35, 2, LAST_MAP + warp 37, 3, 0, ROCK_TUNNEL_B1F + warp 5, 3, 1, ROCK_TUNNEL_B1F + warp 17, 11, 2, ROCK_TUNNEL_B1F + warp 37, 17, 3, ROCK_TUNNEL_B1F + + def_signs + sign 11, 29, 8 ; RockTunnel1Text8 + + def_objects + object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 + object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 + object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 + object SPRITE_SUPER_NERD, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 + object SPRITE_COOLTRAINER_F, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 + object SPRITE_COOLTRAINER_F, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 + object SPRITE_COOLTRAINER_F, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + + def_warps_to ROCK_TUNNEL_1F diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm new file mode 100644 index 00000000..3fadaa5b --- /dev/null +++ b/data/maps/objects/RockTunnelB1F.asm @@ -0,0 +1,22 @@ +RockTunnelB1F_Object: + db $3 ; border block + + def_warps + warp 33, 25, 4, ROCK_TUNNEL_1F + warp 27, 3, 5, ROCK_TUNNEL_1F + warp 23, 11, 6, ROCK_TUNNEL_1F + warp 3, 3, 7, ROCK_TUNNEL_1F + + def_signs + + def_objects + object SPRITE_COOLTRAINER_F, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 + object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 + object SPRITE_SUPER_NERD, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 + object SPRITE_SUPER_NERD, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 + object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 + object SPRITE_COOLTRAINER_F, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 + object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 + object SPRITE_SUPER_NERD, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 + + def_warps_to ROCK_TUNNEL_B1F diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm new file mode 100644 index 00000000..4f5a1906 --- /dev/null +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -0,0 +1,16 @@ +RockTunnelPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_FISHER, 2, 5, STAY, NONE, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to ROCK_TUNNEL_POKECENTER diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm new file mode 100644 index 00000000..81049d63 --- /dev/null +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -0,0 +1,22 @@ +RocketHideoutB1F_Object: + db $2e ; border block + + def_warps + warp 23, 2, 0, ROCKET_HIDEOUT_B2F + warp 21, 2, 2, GAME_CORNER + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 24, 3, ROCKET_HIDEOUT_B2F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + def_signs + + def_objects + object SPRITE_ROCKET, 26, 8, STAY, LEFT, 1, OPP_ROCKET, 8 + object SPRITE_ROCKET, 12, 6, STAY, RIGHT, 2, OPP_ROCKET, 9 + object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 + object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 + object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 + object SPRITE_POKE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE + object SPRITE_POKE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION + + def_warps_to ROCKET_HIDEOUT_B1F diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm new file mode 100644 index 00000000..f6ce5113 --- /dev/null +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -0,0 +1,20 @@ +RocketHideoutB2F_Object: + db $2e ; border block + + def_warps + warp 27, 8, 0, ROCKET_HIDEOUT_B1F + warp 21, 8, 0, ROCKET_HIDEOUT_B3F + warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR + warp 21, 22, 3, ROCKET_HIDEOUT_B1F + warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR + + def_signs + + def_objects + object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 + object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE + object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET + object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL + object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION + + def_warps_to ROCKET_HIDEOUT_B2F diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm new file mode 100644 index 00000000..4cba5422 --- /dev/null +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -0,0 +1,16 @@ +RocketHideoutB3F_Object: + db $2e ; border block + + def_warps + warp 25, 6, 1, ROCKET_HIDEOUT_B2F + warp 19, 18, 0, ROCKET_HIDEOUT_B4F + + def_signs + + def_objects + object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 + object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 + object SPRITE_POKE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE + object SPRITE_POKE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY + + def_warps_to ROCKET_HIDEOUT_B3F diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm new file mode 100644 index 00000000..5dcf107f --- /dev/null +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -0,0 +1,22 @@ +RocketHideoutB4F_Object: + db $2e ; border block + + def_warps + warp 19, 10, 1, ROCKET_HIDEOUT_B3F + warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR + warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR + + def_signs + + def_objects + object SPRITE_GIOVANNI, 25, 3, STAY, DOWN, 1, OPP_GIOVANNI, 1 + object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 + object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 + object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 + object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP + object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND + object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON + object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY + + def_warps_to ROCKET_HIDEOUT_B4F diff --git a/data/maps/objects/RocketHideoutElevator.asm b/data/maps/objects/RocketHideoutElevator.asm new file mode 100644 index 00000000..20ab4956 --- /dev/null +++ b/data/maps/objects/RocketHideoutElevator.asm @@ -0,0 +1,13 @@ +RocketHideoutElevator_Object: + db $f ; border block + + def_warps + warp 2, 1, 2, ROCKET_HIDEOUT_B1F + warp 3, 1, 4, ROCKET_HIDEOUT_B1F + + def_signs + sign 1, 1, 1 ; RocketHideoutElevatorText1 + + def_objects + + def_warps_to ROCKET_HIDEOUT_ELEVATOR diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm new file mode 100644 index 00000000..ee1b03a5 --- /dev/null +++ b/data/maps/objects/Route1.asm @@ -0,0 +1,16 @@ +Route1_Object: + db $b ; border block + + def_warps + + def_signs + sign 9, 27, 3 ; Route1Text3 + + def_objects + object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person + object SPRITE_YOUNGSTER, 15, 13, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to ROUTE_1 + + ; unused + warp_to 2, 7, 4 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm new file mode 100644 index 00000000..54a0936e --- /dev/null +++ b/data/maps/objects/Route10.asm @@ -0,0 +1,24 @@ +Route10_Object: + db $2c ; border block + + def_warps + warp 11, 19, 0, ROCK_TUNNEL_POKECENTER + warp 8, 17, 0, ROCK_TUNNEL_1F + warp 8, 53, 2, ROCK_TUNNEL_1F + warp 6, 39, 0, POWER_PLANT + + def_signs + sign 7, 19, 7 ; Route10Text7 + sign 12, 19, 8 ; PokeCenterSignText + sign 9, 55, 9 ; Route10Text9 + sign 5, 41, 10 ; Route10Text10 + + def_objects + object SPRITE_SUPER_NERD, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 + object SPRITE_SUPER_NERD, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 + object SPRITE_COOLTRAINER_F, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 + object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 + object SPRITE_COOLTRAINER_F, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + + def_warps_to ROUTE_10 diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm new file mode 100644 index 00000000..ce7d3490 --- /dev/null +++ b/data/maps/objects/Route11.asm @@ -0,0 +1,26 @@ +Route11_Object: + db $f ; border block + + def_warps + warp 49, 8, 0, ROUTE_11_GATE_1F + warp 49, 9, 1, ROUTE_11_GATE_1F + warp 58, 8, 2, ROUTE_11_GATE_1F + warp 58, 9, 3, ROUTE_11_GATE_1F + warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11 + + def_signs + sign 1, 5, 11 ; Route11Text11 + + def_objects + object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 + object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 + object SPRITE_YOUNGSTER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object SPRITE_SUPER_NERD, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 + object SPRITE_YOUNGSTER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 + object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 + object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 + object SPRITE_YOUNGSTER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object SPRITE_SUPER_NERD, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 + object SPRITE_YOUNGSTER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 + + def_warps_to ROUTE_11 diff --git a/data/maps/objects/Route11Gate1F.asm b/data/maps/objects/Route11Gate1F.asm new file mode 100644 index 00000000..d0c9c461 --- /dev/null +++ b/data/maps/objects/Route11Gate1F.asm @@ -0,0 +1,16 @@ +Route11Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 4, 0, LAST_MAP + warp 0, 5, 1, LAST_MAP + warp 7, 4, 2, LAST_MAP + warp 7, 5, 3, LAST_MAP + warp 6, 8, 0, ROUTE_11_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + + def_warps_to ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm new file mode 100644 index 00000000..fa48409c --- /dev/null +++ b/data/maps/objects/Route11Gate2F.asm @@ -0,0 +1,15 @@ +Route11Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_11_GATE_1F + + def_signs + sign 1, 2, 3 ; Route11GateUpstairsText3 + sign 6, 2, 4 ; Route11GateUpstairsText4 + + def_objects + object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SCIENTIST, 2, 6, STAY, NONE, 2 ; person + + def_warps_to ROUTE_11_GATE_2F diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm new file mode 100644 index 00000000..22ac15e8 --- /dev/null +++ b/data/maps/objects/Route12.asm @@ -0,0 +1,26 @@ +Route12_Object: + db $43 ; border block + + def_warps + warp 10, 15, 0, ROUTE_12_GATE_1F + warp 11, 15, 1, ROUTE_12_GATE_1F + warp 10, 21, 2, ROUTE_12_GATE_1F + warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE + + def_signs + sign 13, 13, 11 ; Route12Text11 + sign 11, 63, 12 ; Route12Text12 + + def_objects + object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person + object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 + object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4 + object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 + object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 + object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 + object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 + object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 + object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY + object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON + + def_warps_to ROUTE_12 diff --git a/data/maps/objects/Route12Gate1F.asm b/data/maps/objects/Route12Gate1F.asm new file mode 100644 index 00000000..356bf67a --- /dev/null +++ b/data/maps/objects/Route12Gate1F.asm @@ -0,0 +1,16 @@ +Route12Gate1F_Object: + db $a ; border block + + def_warps + warp 4, 0, 0, LAST_MAP + warp 5, 0, 1, LAST_MAP + warp 4, 7, 2, LAST_MAP + warp 5, 7, 2, LAST_MAP + warp 8, 6, 0, ROUTE_12_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 1, 3, STAY, NONE, 1 ; person + + def_warps_to ROUTE_12_GATE_1F diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm new file mode 100644 index 00000000..413adf25 --- /dev/null +++ b/data/maps/objects/Route12Gate2F.asm @@ -0,0 +1,14 @@ +Route12Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_12_GATE_1F + + def_signs + sign 1, 2, 2 ; Route12GateUpstairsText2 + sign 6, 2, 3 ; Route12GateUpstairsText3 + + def_objects + object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, UP_DOWN, 1 ; person + + def_warps_to ROUTE_12_GATE_2F diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm new file mode 100644 index 00000000..4cd43639 --- /dev/null +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -0,0 +1,13 @@ +Route12SuperRodHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person + + def_warps_to ROUTE_12_SUPER_ROD_HOUSE diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm new file mode 100644 index 00000000..365eea7d --- /dev/null +++ b/data/maps/objects/Route13.asm @@ -0,0 +1,23 @@ +Route13_Object: + db $43 ; border block + + def_warps + + def_signs + sign 15, 13, 11 ; Route13Text11 + sign 33, 5, 12 ; Route13Text12 + sign 31, 11, 13 ; Route13Text13 + + def_objects + object SPRITE_COOLTRAINER_M, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 + object SPRITE_COOLTRAINER_F, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 + object SPRITE_COOLTRAINER_F, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 + object SPRITE_COOLTRAINER_F, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 + object SPRITE_COOLTRAINER_F, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 + object SPRITE_COOLTRAINER_M, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 + object SPRITE_BEAUTY, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 + object SPRITE_BEAUTY, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 + object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 + object SPRITE_COOLTRAINER_M, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 + + def_warps_to ROUTE_13 diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm new file mode 100644 index 00000000..4a2240e6 --- /dev/null +++ b/data/maps/objects/Route14.asm @@ -0,0 +1,21 @@ +Route14_Object: + db $43 ; border block + + def_warps + + def_signs + sign 17, 13, 11 ; Route14Text11 + + def_objects + object SPRITE_COOLTRAINER_M, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object SPRITE_COOLTRAINER_M, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object SPRITE_COOLTRAINER_M, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 + object SPRITE_COOLTRAINER_M, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 + object SPRITE_COOLTRAINER_M, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 + object SPRITE_COOLTRAINER_M, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 + object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 + object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 + object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 + + def_warps_to ROUTE_14 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm new file mode 100644 index 00000000..d145dbfb --- /dev/null +++ b/data/maps/objects/Route15.asm @@ -0,0 +1,26 @@ +Route15_Object: + db $43 ; border block + + def_warps + warp 7, 8, 0, ROUTE_15_GATE_1F + warp 7, 9, 1, ROUTE_15_GATE_1F + warp 14, 8, 2, ROUTE_15_GATE_1F + warp 14, 9, 3, ROUTE_15_GATE_1F + + def_signs + sign 39, 9, 12 ; Route15Text12 + + def_objects + object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object SPRITE_COOLTRAINER_M, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object SPRITE_BEAUTY, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 + object SPRITE_BEAUTY, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 + object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 + object SPRITE_COOLTRAINER_F, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE + + def_warps_to ROUTE_15 diff --git a/data/maps/objects/Route15Gate1F.asm b/data/maps/objects/Route15Gate1F.asm new file mode 100644 index 00000000..e611e98b --- /dev/null +++ b/data/maps/objects/Route15Gate1F.asm @@ -0,0 +1,16 @@ +Route15Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 4, 0, LAST_MAP + warp 0, 5, 1, LAST_MAP + warp 7, 4, 2, LAST_MAP + warp 7, 5, 3, LAST_MAP + warp 6, 8, 0, ROUTE_15_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person + + def_warps_to ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm new file mode 100644 index 00000000..608b69e5 --- /dev/null +++ b/data/maps/objects/Route15Gate2F.asm @@ -0,0 +1,13 @@ +Route15Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_15_GATE_1F + + def_signs + sign 6, 2, 2 ; Route15GateUpstairsText2 + + def_objects + object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1 + + def_warps_to ROUTE_15_GATE_2F diff --git a/data/maps/objects/Route16.asm b/data/maps/objects/Route16.asm new file mode 100644 index 00000000..44e2de01 --- /dev/null +++ b/data/maps/objects/Route16.asm @@ -0,0 +1,28 @@ +Route16_Object: + db $f ; border block + + def_warps + warp 17, 10, 0, ROUTE_16_GATE_1F + warp 17, 11, 1, ROUTE_16_GATE_1F + warp 24, 10, 2, ROUTE_16_GATE_1F + warp 24, 11, 3, ROUTE_16_GATE_1F + warp 17, 4, 4, ROUTE_16_GATE_1F + warp 17, 5, 5, ROUTE_16_GATE_1F + warp 24, 4, 6, ROUTE_16_GATE_1F + warp 24, 5, 7, ROUTE_16_GATE_1F + warp 7, 5, 0, ROUTE_16_FLY_HOUSE + + def_signs + sign 27, 11, 8 ; Route16Text8 + sign 5, 17, 9 ; Route16Text9 + + def_objects + object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5 + object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1 + object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2 + object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6 + object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3 + object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7 + object SPRITE_SNORLAX, 26, 10, STAY, DOWN, 7 ; person + + def_warps_to ROUTE_16 diff --git a/data/maps/objects/Route16FlyHouse.asm b/data/maps/objects/Route16FlyHouse.asm new file mode 100644 index 00000000..be6cdc61 --- /dev/null +++ b/data/maps/objects/Route16FlyHouse.asm @@ -0,0 +1,14 @@ +Route16FlyHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, LAST_MAP + warp 3, 7, 8, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 6, 4, WALK, ANY_DIR, 2 ; person + + def_warps_to ROUTE_16_FLY_HOUSE diff --git a/data/maps/objects/Route16Gate1F.asm b/data/maps/objects/Route16Gate1F.asm new file mode 100644 index 00000000..4f876e7f --- /dev/null +++ b/data/maps/objects/Route16Gate1F.asm @@ -0,0 +1,21 @@ +Route16Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 8, 0, LAST_MAP + warp 0, 9, 1, LAST_MAP + warp 7, 8, 2, LAST_MAP + warp 7, 9, 2, LAST_MAP + warp 0, 2, 4, LAST_MAP + warp 0, 3, 5, LAST_MAP + warp 7, 2, 6, LAST_MAP + warp 7, 3, 7, LAST_MAP + warp 6, 12, 0, ROUTE_16_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 5, STAY, DOWN, 1 ; person + object SPRITE_GAMBLER, 4, 3, STAY, NONE, 2 ; person + + def_warps_to ROUTE_16_GATE_1F diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm new file mode 100644 index 00000000..53511ae5 --- /dev/null +++ b/data/maps/objects/Route16Gate2F.asm @@ -0,0 +1,15 @@ +Route16Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 8, ROUTE_16_GATE_1F + + def_signs + sign 1, 2, 3 ; Route16GateUpstairsText3 + sign 6, 2, 4 ; Route16GateUpstairsText4 + + def_objects + object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 5, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to ROUTE_16_GATE_2F diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm new file mode 100644 index 00000000..f170b695 --- /dev/null +++ b/data/maps/objects/Route17.asm @@ -0,0 +1,26 @@ +Route17_Object: + db $43 ; border block + + def_warps + + def_signs + sign 9, 51, 11 ; Route17Text11 + sign 9, 63, 12 ; Route17Text12 + sign 9, 75, 13 ; Route17Text13 + sign 9, 87, 14 ; Route17Text14 + sign 9, 111, 15 ; Route17Text15 + sign 9, 141, 16 ; Route17Text16 + + def_objects + object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 + object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 + object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 + object SPRITE_BIKER, 7, 32, STAY, LEFT, 4, OPP_BIKER, 9 + object SPRITE_BIKER, 14, 34, STAY, RIGHT, 5, OPP_BIKER, 10 + object SPRITE_BIKER, 17, 58, STAY, LEFT, 6, OPP_CUE_BALL, 6 + object SPRITE_BIKER, 2, 68, STAY, RIGHT, 7, OPP_CUE_BALL, 7 + object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 + object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 + object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 + + def_warps_to ROUTE_17 diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm new file mode 100644 index 00000000..eafdf1d0 --- /dev/null +++ b/data/maps/objects/Route18.asm @@ -0,0 +1,19 @@ +Route18_Object: + db $43 ; border block + + def_warps + warp 33, 8, 0, ROUTE_18_GATE_1F + warp 33, 9, 1, ROUTE_18_GATE_1F + warp 40, 8, 2, ROUTE_18_GATE_1F + warp 40, 9, 3, ROUTE_18_GATE_1F + + def_signs + sign 43, 7, 4 ; Route18Text4 + sign 33, 5, 5 ; Route18Text5 + + def_objects + object SPRITE_COOLTRAINER_M, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 + object SPRITE_COOLTRAINER_M, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 + object SPRITE_COOLTRAINER_M, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 + + def_warps_to ROUTE_18 diff --git a/data/maps/objects/Route18Gate1F.asm b/data/maps/objects/Route18Gate1F.asm new file mode 100644 index 00000000..3bfdefaa --- /dev/null +++ b/data/maps/objects/Route18Gate1F.asm @@ -0,0 +1,16 @@ +Route18Gate1F_Object: + db $a ; border block + + def_warps + warp 0, 4, 0, LAST_MAP + warp 0, 5, 1, LAST_MAP + warp 7, 4, 2, LAST_MAP + warp 7, 5, 3, LAST_MAP + warp 6, 8, 0, ROUTE_18_GATE_2F + + def_signs + + def_objects + object SPRITE_GUARD, 4, 1, STAY, DOWN, 1 ; person + + def_warps_to ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm new file mode 100644 index 00000000..2fa6fd58 --- /dev/null +++ b/data/maps/objects/Route18Gate2F.asm @@ -0,0 +1,14 @@ +Route18Gate2F_Object: + db $a ; border block + + def_warps + warp 7, 7, 4, ROUTE_18_GATE_1F + + def_signs + sign 1, 2, 2 ; Route18GateUpstairsText2 + sign 6, 2, 3 ; Route18GateUpstairsText3 + + def_objects + object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person + + def_warps_to ROUTE_18_GATE_2F diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm new file mode 100644 index 00000000..224b2cbb --- /dev/null +++ b/data/maps/objects/Route19.asm @@ -0,0 +1,21 @@ +Route19_Object: + db $43 ; border block + + def_warps + + def_signs + sign 11, 9, 11 ; Route19Text11 + + def_objects + object SPRITE_COOLTRAINER_M, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_COOLTRAINER_M, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 + object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 + object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 + object SPRITE_SWIMMER, 9, 11, STAY, DOWN, 6, OPP_SWIMMER, 7 + object SPRITE_SWIMMER, 8, 43, STAY, LEFT, 7, OPP_BEAUTY, 12 + object SPRITE_SWIMMER, 11, 43, STAY, RIGHT, 8, OPP_BEAUTY, 13 + object SPRITE_SWIMMER, 9, 42, STAY, UP, 9, OPP_SWIMMER, 8 + object SPRITE_SWIMMER, 10, 44, STAY, DOWN, 10, OPP_BEAUTY, 14 + + def_warps_to ROUTE_19 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm new file mode 100644 index 00000000..66f9ff1e --- /dev/null +++ b/data/maps/objects/Route2.asm @@ -0,0 +1,27 @@ +Route2_Object: + db $f ; border block + + def_warps + warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 + warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 19, 0, ROUTE_2_TRADE_HOUSE + warp 16, 35, 1, ROUTE_2_GATE + warp 15, 39, 2, ROUTE_2_GATE + warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE + + def_signs + sign 5, 65, 3 ; Route2Text3 + sign 11, 11, 4 ; Route2Text4 + + def_objects + object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE + object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP + + def_warps_to ROUTE_2 + + ; unused + warp_to 2, 7, 4 + db $12, $c7, $9, $7 + warp_to 2, 7, 4 + warp_to 2, 7, 4 + warp_to 2, 7, 4 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm new file mode 100644 index 00000000..19e7cce7 --- /dev/null +++ b/data/maps/objects/Route20.asm @@ -0,0 +1,24 @@ +Route20_Object: + db $43 ; border block + + def_warps + warp 48, 5, 0, SEAFOAM_ISLANDS_1F + warp 58, 9, 2, SEAFOAM_ISLANDS_1F + + def_signs + sign 51, 7, 11 ; Route20Text11 + sign 57, 11, 12 ; Route20Text12 + + def_objects + object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 + object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 + object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 + object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 + object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 + object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 + object SPRITE_COOLTRAINER_M, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 + object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 + object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 + + def_warps_to ROUTE_20 diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm new file mode 100644 index 00000000..71817640 --- /dev/null +++ b/data/maps/objects/Route21.asm @@ -0,0 +1,19 @@ +Route21_Object: + db $43 ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_FISHER, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 + object SPRITE_FISHER, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 + object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 + object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 + object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 + object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 + object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 + object SPRITE_FISHER, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 + object SPRITE_FISHER, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 + + def_warps_to ROUTE_21 diff --git a/data/maps/objects/Route22.asm b/data/maps/objects/Route22.asm new file mode 100644 index 00000000..857b8a86 --- /dev/null +++ b/data/maps/objects/Route22.asm @@ -0,0 +1,14 @@ +Route22_Object: + db $2c ; border block + + def_warps + warp 8, 5, 0, ROUTE_22_GATE + + def_signs + sign 7, 11, 3 ; Route22FrontGateText + + def_objects + object SPRITE_BLUE, 25, 5, STAY, NONE, 1 ; person + object SPRITE_BLUE, 25, 5, STAY, NONE, 2 ; person + + def_warps_to ROUTE_22 diff --git a/data/maps/objects/Route22Gate.asm b/data/maps/objects/Route22Gate.asm new file mode 100644 index 00000000..68593daa --- /dev/null +++ b/data/maps/objects/Route22Gate.asm @@ -0,0 +1,15 @@ +Route22Gate_Object: + db $a ; border block + + def_warps + warp 4, 7, 0, LAST_MAP + warp 5, 7, 0, LAST_MAP + warp 4, 0, 0, LAST_MAP + warp 5, 0, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + + def_warps_to ROUTE_22_GATE diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm new file mode 100644 index 00000000..bd74afb4 --- /dev/null +++ b/data/maps/objects/Route23.asm @@ -0,0 +1,22 @@ +Route23_Object: + db $f ; border block + + def_warps + warp 7, 139, 2, ROUTE_22_GATE + warp 8, 139, 3, ROUTE_22_GATE + warp 4, 31, 0, VICTORY_ROAD_1F + warp 14, 31, 1, VICTORY_ROAD_2F + + def_signs + sign 3, 33, 8 ; Route23Text8 + + def_objects + object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person + object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person + object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person + object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person + object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person + object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person + object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person + + def_warps_to ROUTE_23 diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm new file mode 100644 index 00000000..d621e2b3 --- /dev/null +++ b/data/maps/objects/Route24.asm @@ -0,0 +1,18 @@ +Route24_Object: + db $2c ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_COOLTRAINER_M, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 + object SPRITE_COOLTRAINER_M, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object SPRITE_COOLTRAINER_M, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 + object SPRITE_YOUNGSTER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 + object SPRITE_COOLTRAINER_F, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 + object SPRITE_YOUNGSTER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 + object SPRITE_POKE_BALL, 10, 5, STAY, NONE, 8, TM_THUNDER_WAVE + + def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm new file mode 100644 index 00000000..4f0be4d4 --- /dev/null +++ b/data/maps/objects/Route25.asm @@ -0,0 +1,22 @@ +Route25_Object: + db $2c ; border block + + def_warps + warp 45, 3, 0, BILLS_HOUSE + + def_signs + sign 43, 3, 11 ; Route25Text11 + + def_objects + object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 + object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 + object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 + object SPRITE_YOUNGSTER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 + object SPRITE_COOLTRAINER_F, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 + object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 + object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 + object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 + object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS + + def_warps_to ROUTE_25 diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm new file mode 100644 index 00000000..3151ce79 --- /dev/null +++ b/data/maps/objects/Route2Gate.asm @@ -0,0 +1,16 @@ +Route2Gate_Object: + db $a ; border block + + def_warps + warp 4, 0, 3, LAST_MAP + warp 5, 0, 3, LAST_MAP + warp 4, 7, 4, LAST_MAP + warp 5, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_SCIENTIST, 1, 4, STAY, LEFT, 1 ; person + object SPRITE_YOUNGSTER, 5, 4, WALK, LEFT_RIGHT, 2 ; person + + def_warps_to ROUTE_2_GATE diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm new file mode 100644 index 00000000..d14df485 --- /dev/null +++ b/data/maps/objects/Route2TradeHouse.asm @@ -0,0 +1,14 @@ +Route2TradeHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person + + def_warps_to ROUTE_2_TRADE_HOUSE diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm new file mode 100644 index 00000000..153fa795 --- /dev/null +++ b/data/maps/objects/Route3.asm @@ -0,0 +1,20 @@ +Route3_Object: + db $2c ; border block + + def_warps + + def_signs + sign 59, 9, 10 ; Route3Text10 + + def_objects + object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person + object SPRITE_YOUNGSTER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object SPRITE_YOUNGSTER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object SPRITE_COOLTRAINER_F, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 + object SPRITE_YOUNGSTER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object SPRITE_COOLTRAINER_F, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 + object SPRITE_YOUNGSTER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object SPRITE_YOUNGSTER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object SPRITE_COOLTRAINER_F, 33, 10, STAY, UP, 9, OPP_LASS, 3 + + def_warps_to ROUTE_3 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm new file mode 100644 index 00000000..79e79b79 --- /dev/null +++ b/data/maps/objects/Route4.asm @@ -0,0 +1,19 @@ +Route4_Object: + db $2c ; border block + + def_warps + warp 11, 5, 0, MT_MOON_POKECENTER + warp 18, 5, 0, MT_MOON_1F + warp 24, 5, 7, MT_MOON_B1F + + def_signs + sign 12, 5, 4 ; PokeCenterSignText + sign 17, 7, 5 ; Route4Text5 + sign 27, 7, 6 ; Route4Text6 + + def_objects + object SPRITE_COOLTRAINER_F, 9, 8, WALK, ANY_DIR, 1 ; person + object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 + object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND + + def_warps_to ROUTE_4 diff --git a/data/maps/objects/Route5.asm b/data/maps/objects/Route5.asm new file mode 100644 index 00000000..75f4a629 --- /dev/null +++ b/data/maps/objects/Route5.asm @@ -0,0 +1,16 @@ +Route5_Object: + db $a ; border block + + def_warps + warp 10, 29, 3, ROUTE_5_GATE + warp 9, 29, 2, ROUTE_5_GATE + warp 10, 33, 0, ROUTE_5_GATE + warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5 + warp 10, 21, 0, DAYCARE + + def_signs + sign 17, 29, 1 ; Route5Text1 + + def_objects + + def_warps_to ROUTE_5 diff --git a/data/maps/objects/Route5Gate.asm b/data/maps/objects/Route5Gate.asm new file mode 100644 index 00000000..81c8c43e --- /dev/null +++ b/data/maps/objects/Route5Gate.asm @@ -0,0 +1,15 @@ +Route5Gate_Object: + db $a ; border block + + def_warps + warp 3, 5, 2, LAST_MAP + warp 4, 5, 2, LAST_MAP + warp 3, 0, 1, LAST_MAP + warp 4, 0, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 1, 3, STAY, RIGHT, 1 ; person + + def_warps_to ROUTE_5_GATE diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm new file mode 100644 index 00000000..bafcdf90 --- /dev/null +++ b/data/maps/objects/Route6.asm @@ -0,0 +1,21 @@ +Route6_Object: + db $f ; border block + + def_warps + warp 9, 1, 2, ROUTE_6_GATE + warp 10, 1, 2, ROUTE_6_GATE + warp 10, 7, 0, ROUTE_6_GATE + warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6 + + def_signs + sign 19, 15, 7 ; Route6Text7 + + def_objects + object SPRITE_COOLTRAINER_M, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 + object SPRITE_COOLTRAINER_F, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 + object SPRITE_YOUNGSTER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 + object SPRITE_COOLTRAINER_M, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 + object SPRITE_COOLTRAINER_F, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 + object SPRITE_YOUNGSTER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + + def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route6Gate.asm b/data/maps/objects/Route6Gate.asm new file mode 100644 index 00000000..2ef5a8b5 --- /dev/null +++ b/data/maps/objects/Route6Gate.asm @@ -0,0 +1,15 @@ +Route6Gate_Object: + db $a ; border block + + def_warps + warp 3, 5, 2, LAST_MAP + warp 4, 5, 2, LAST_MAP + warp 3, 0, 1, LAST_MAP + warp 4, 0, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person + + def_warps_to ROUTE_6_GATE diff --git a/data/maps/objects/Route7.asm b/data/maps/objects/Route7.asm new file mode 100644 index 00000000..d2346f2c --- /dev/null +++ b/data/maps/objects/Route7.asm @@ -0,0 +1,16 @@ +Route7_Object: + db $f ; border block + + def_warps + warp 18, 9, 2, ROUTE_7_GATE + warp 18, 10, 3, ROUTE_7_GATE + warp 11, 9, 0, ROUTE_7_GATE + warp 11, 10, 1, ROUTE_7_GATE + warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7 + + def_signs + sign 3, 13, 1 ; Route7Text1 + + def_objects + + def_warps_to ROUTE_7 diff --git a/data/maps/objects/Route7Gate.asm b/data/maps/objects/Route7Gate.asm new file mode 100644 index 00000000..2b165016 --- /dev/null +++ b/data/maps/objects/Route7Gate.asm @@ -0,0 +1,15 @@ +Route7Gate_Object: + db $a ; border block + + def_warps + warp 0, 3, 3, LAST_MAP + warp 0, 4, 3, LAST_MAP + warp 5, 3, 0, LAST_MAP + warp 5, 4, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person + + def_warps_to ROUTE_7_GATE diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm new file mode 100644 index 00000000..d375b23e --- /dev/null +++ b/data/maps/objects/Route8.asm @@ -0,0 +1,25 @@ +Route8_Object: + db $2c ; border block + + def_warps + warp 1, 9, 0, ROUTE_8_GATE + warp 1, 10, 1, ROUTE_8_GATE + warp 8, 9, 2, ROUTE_8_GATE + warp 8, 10, 3, ROUTE_8_GATE + warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8 + + def_signs + sign 17, 3, 10 ; Route8Text10 + + def_objects + object SPRITE_SUPER_NERD, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 + object SPRITE_SUPER_NERD, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 + object SPRITE_COOLTRAINER_F, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 + object SPRITE_SUPER_NERD, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object SPRITE_COOLTRAINER_F, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 + object SPRITE_COOLTRAINER_F, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 + object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 + object SPRITE_COOLTRAINER_F, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 + + def_warps_to ROUTE_8 diff --git a/data/maps/objects/Route8Gate.asm b/data/maps/objects/Route8Gate.asm new file mode 100644 index 00000000..f03530b5 --- /dev/null +++ b/data/maps/objects/Route8Gate.asm @@ -0,0 +1,15 @@ +Route8Gate_Object: + db $a ; border block + + def_warps + warp 0, 3, 0, LAST_MAP + warp 0, 4, 1, LAST_MAP + warp 5, 3, 2, LAST_MAP + warp 5, 4, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_GUARD, 2, 1, STAY, DOWN, 1 ; person + + def_warps_to ROUTE_8_GATE diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm new file mode 100644 index 00000000..8d110629 --- /dev/null +++ b/data/maps/objects/Route9.asm @@ -0,0 +1,21 @@ +Route9_Object: + db $2c ; border block + + def_warps + + def_signs + sign 25, 7, 11 ; Route9Text11 + + def_objects + object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 + object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object SPRITE_COOLTRAINER_M, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 + object SPRITE_COOLTRAINER_F, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 + object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 + object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 + object SPRITE_YOUNGSTER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 + object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 + object SPRITE_YOUNGSTER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 + object SPRITE_POKE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT + + def_warps_to ROUTE_9 diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm new file mode 100644 index 00000000..bf4e7292 --- /dev/null +++ b/data/maps/objects/SSAnne1F.asm @@ -0,0 +1,23 @@ +SSAnne1F_Object: + db $c ; border block + + def_warps + warp 26, 0, 1, VERMILION_DOCK + warp 27, 0, 1, VERMILION_DOCK + warp 31, 8, 0, SS_ANNE_1F_ROOMS + warp 23, 8, 1, SS_ANNE_1F_ROOMS + warp 19, 8, 2, SS_ANNE_1F_ROOMS + warp 15, 8, 3, SS_ANNE_1F_ROOMS + warp 11, 8, 4, SS_ANNE_1F_ROOMS + warp 7, 8, 5, SS_ANNE_1F_ROOMS + warp 2, 6, 6, SS_ANNE_2F + warp 37, 15, 5, SS_ANNE_B1F + warp 3, 16, 0, SS_ANNE_KITCHEN + + def_signs + + def_objects + object SPRITE_WAITER, 12, 6, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person + + def_warps_to SS_ANNE_1F diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm new file mode 100644 index 00000000..3a1fc459 --- /dev/null +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -0,0 +1,27 @@ +SSAnne1FRooms_Object: + db $c ; border block + + def_warps + warp 0, 0, 2, SS_ANNE_1F + warp 10, 0, 3, SS_ANNE_1F + warp 20, 0, 4, SS_ANNE_1F + warp 0, 10, 5, SS_ANNE_1F + warp 10, 10, 6, SS_ANNE_1F + warp 20, 10, 7, SS_ANNE_1F + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 + object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 + object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 + object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 + object SPRITE_GIRL, 22, 3, WALK, UP_DOWN, 5 ; person + object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person + object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person + object SPRITE_FAIRY, 3, 11, STAY, DOWN, 8 ; person + object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person + object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM + object SPRITE_GENTLEMAN, 21, 13, WALK, LEFT_RIGHT, 11 ; person + + def_warps_to SS_ANNE_1F_ROOMS diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm new file mode 100644 index 00000000..dda0fee6 --- /dev/null +++ b/data/maps/objects/SSAnne2F.asm @@ -0,0 +1,21 @@ +SSAnne2F_Object: + db $c ; border block + + def_warps + warp 9, 11, 0, SS_ANNE_2F_ROOMS + warp 13, 11, 2, SS_ANNE_2F_ROOMS + warp 17, 11, 4, SS_ANNE_2F_ROOMS + warp 21, 11, 6, SS_ANNE_2F_ROOMS + warp 25, 11, 8, SS_ANNE_2F_ROOMS + warp 29, 11, 10, SS_ANNE_2F_ROOMS + warp 2, 4, 8, SS_ANNE_1F + warp 2, 12, 1, SS_ANNE_3F + warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM + + def_signs + + def_objects + object SPRITE_WAITER, 3, 7, WALK, UP_DOWN, 1 ; person + object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1 + + def_warps_to SS_ANNE_2F diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm new file mode 100644 index 00000000..78a2dd38 --- /dev/null +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -0,0 +1,35 @@ +SSAnne2FRooms_Object: + db $c ; border block + + def_warps + warp 2, 5, 0, SS_ANNE_2F + warp 3, 5, 0, SS_ANNE_2F + warp 12, 5, 1, SS_ANNE_2F + warp 13, 5, 1, SS_ANNE_2F + warp 22, 5, 2, SS_ANNE_2F + warp 23, 5, 2, SS_ANNE_2F + warp 2, 15, 3, SS_ANNE_2F + warp 3, 15, 3, SS_ANNE_2F + warp 12, 15, 4, SS_ANNE_2F + warp 13, 15, 4, SS_ANNE_2F + warp 22, 15, 5, SS_ANNE_2F + warp 23, 15, 5, SS_ANNE_2F + + def_signs + + def_objects + object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person + object SPRITE_GRAMPS, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_POKE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person + object SPRITE_LITTLE_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person + object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person + + def_warps_to SS_ANNE_2F_ROOMS diff --git a/data/maps/objects/SSAnne3F.asm b/data/maps/objects/SSAnne3F.asm new file mode 100644 index 00000000..f230aeb9 --- /dev/null +++ b/data/maps/objects/SSAnne3F.asm @@ -0,0 +1,13 @@ +SSAnne3F_Object: + db $c ; border block + + def_warps + warp 0, 3, 0, SS_ANNE_BOW + warp 19, 3, 7, SS_ANNE_2F + + def_signs + + def_objects + object SPRITE_SAILOR, 9, 3, WALK, LEFT_RIGHT, 1 ; person + + def_warps_to SS_ANNE_3F diff --git a/data/maps/objects/SSAnneB1F.asm b/data/maps/objects/SSAnneB1F.asm new file mode 100644 index 00000000..619dd33c --- /dev/null +++ b/data/maps/objects/SSAnneB1F.asm @@ -0,0 +1,16 @@ +SSAnneB1F_Object: + db $c ; border block + + def_warps + warp 23, 3, 8, SS_ANNE_B1F_ROOMS + warp 19, 3, 6, SS_ANNE_B1F_ROOMS + warp 15, 3, 4, SS_ANNE_B1F_ROOMS + warp 11, 3, 2, SS_ANNE_B1F_ROOMS + warp 7, 3, 0, SS_ANNE_B1F_ROOMS + warp 27, 5, 9, SS_ANNE_1F + + def_signs + + def_objects + + def_warps_to SS_ANNE_B1F diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm new file mode 100644 index 00000000..c7540482 --- /dev/null +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -0,0 +1,31 @@ +SSAnneB1FRooms_Object: + db $c ; border block + + def_warps + warp 2, 5, 4, SS_ANNE_B1F + warp 3, 5, 4, SS_ANNE_B1F + warp 12, 5, 3, SS_ANNE_B1F + warp 13, 5, 3, SS_ANNE_B1F + warp 22, 5, 2, SS_ANNE_B1F + warp 23, 5, 2, SS_ANNE_B1F + warp 2, 15, 1, SS_ANNE_B1F + warp 3, 15, 1, SS_ANNE_B1F + warp 12, 15, 0, SS_ANNE_B1F + warp 13, 15, 0, SS_ANNE_B1F + + def_signs + + def_objects + object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3 + object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4 + object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 + object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 + object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 + object SPRITE_FISHER, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 + object SPRITE_SUPER_NERD, 10, 13, STAY, RIGHT, 7 ; person + object SPRITE_MONSTER, 11, 12, STAY, NONE, 8 ; person + object SPRITE_POKE_BALL, 20, 2, STAY, NONE, 9, ETHER + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST + object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION + + def_warps_to SS_ANNE_B1F_ROOMS diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm new file mode 100644 index 00000000..080fe623 --- /dev/null +++ b/data/maps/objects/SSAnneBow.asm @@ -0,0 +1,17 @@ +SSAnneBow_Object: + db $23 ; border block + + def_warps + warp 13, 6, 0, SS_ANNE_3F + warp 13, 7, 0, SS_ANNE_3F + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 5, 2, STAY, UP, 1 ; person + object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_M, 7, 11, STAY, NONE, 3 ; person + object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 + object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 + + def_warps_to SS_ANNE_BOW diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm new file mode 100644 index 00000000..c07be59e --- /dev/null +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -0,0 +1,14 @@ +SSAnneCaptainsRoom_Object: + db $c ; border block + + def_warps + warp 0, 7, 8, SS_ANNE_2F + + def_signs + sign 4, 1, 2 ; SSAnne7Text2 + sign 1, 2, 3 ; SSAnne7Text3 + + def_objects + object SPRITE_CAPTAIN, 4, 2, STAY, UP, 1 ; person + + def_warps_to SS_ANNE_CAPTAINS_ROOM diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm new file mode 100644 index 00000000..75fc497f --- /dev/null +++ b/data/maps/objects/SSAnneKitchen.asm @@ -0,0 +1,18 @@ +SSAnneKitchen_Object: + db $c ; border block + + def_warps + warp 6, 0, 10, SS_ANNE_1F + + def_signs + + def_objects + object SPRITE_COOK, 1, 8, WALK, UP_DOWN, 1 ; person + object SPRITE_COOK, 5, 8, WALK, UP_DOWN, 2 ; person + object SPRITE_COOK, 9, 7, WALK, UP_DOWN, 3 ; person + object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person + object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person + object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person + object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person + + def_warps_to SS_ANNE_KITCHEN diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm new file mode 100644 index 00000000..59f4e2a4 --- /dev/null +++ b/data/maps/objects/SafariZoneCenter.asm @@ -0,0 +1,22 @@ +SafariZoneCenter_Object: + db $0 ; border block + + def_warps + warp 14, 25, 2, SAFARI_ZONE_GATE + warp 15, 25, 3, SAFARI_ZONE_GATE + warp 0, 10, 4, SAFARI_ZONE_WEST + warp 0, 11, 5, SAFARI_ZONE_WEST + warp 14, 0, 4, SAFARI_ZONE_NORTH + warp 15, 0, 5, SAFARI_ZONE_NORTH + warp 29, 10, 2, SAFARI_ZONE_EAST + warp 29, 11, 3, SAFARI_ZONE_EAST + warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE + + def_signs + sign 18, 20, 2 ; SafariZoneCenterText2 + sign 14, 22, 3 ; SafariZoneCenterText3 + + def_objects + object SPRITE_POKE_BALL, 14, 10, STAY, NONE, 1, NUGGET + + def_warps_to SAFARI_ZONE_CENTER diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm new file mode 100644 index 00000000..5b256347 --- /dev/null +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -0,0 +1,14 @@ +SafariZoneCenterRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, SAFARI_ZONE_CENTER + warp 3, 7, 8, SAFARI_ZONE_CENTER + + def_signs + + def_objects + object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_SCIENTIST, 1, 4, WALK, UP_DOWN, 2 ; person + + def_warps_to SAFARI_ZONE_CENTER_REST_HOUSE diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm new file mode 100644 index 00000000..999c51b0 --- /dev/null +++ b/data/maps/objects/SafariZoneEast.asm @@ -0,0 +1,22 @@ +SafariZoneEast_Object: + db $0 ; border block + + def_warps + warp 0, 4, 6, SAFARI_ZONE_NORTH + warp 0, 5, 7, SAFARI_ZONE_NORTH + warp 0, 22, 6, SAFARI_ZONE_CENTER + warp 0, 23, 6, SAFARI_ZONE_CENTER + warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE + + def_signs + sign 26, 10, 5 ; SafariZoneEastText5 + sign 6, 4, 6 ; SafariZoneEastText6 + sign 5, 23, 7 ; SafariZoneEastText7 + + def_objects + object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE + object SPRITE_POKE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION + object SPRITE_POKE_BALL, 20, 13, STAY, NONE, 3, CARBOS + object SPRITE_POKE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB + + def_warps_to SAFARI_ZONE_EAST diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm new file mode 100644 index 00000000..31940542 --- /dev/null +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -0,0 +1,15 @@ +SafariZoneEastRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, SAFARI_ZONE_EAST + warp 3, 7, 4, SAFARI_ZONE_EAST + + def_signs + + def_objects + object SPRITE_SCIENTIST, 1, 3, WALK, UP_DOWN, 1 ; person + object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person + object SPRITE_SILPH_WORKER, 5, 2, STAY, NONE, 3 ; person + + def_warps_to SAFARI_ZONE_EAST_REST_HOUSE diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm new file mode 100644 index 00000000..2423ae8a --- /dev/null +++ b/data/maps/objects/SafariZoneGate.asm @@ -0,0 +1,16 @@ +SafariZoneGate_Object: + db $a ; border block + + def_warps + warp 3, 5, 4, LAST_MAP + warp 4, 5, 4, LAST_MAP + warp 3, 0, 0, SAFARI_ZONE_CENTER + warp 4, 0, 1, SAFARI_ZONE_CENTER + + def_signs + + def_objects + object SPRITE_SAFARI_ZONE_WORKER, 6, 2, STAY, LEFT, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 1, 4, STAY, RIGHT, 2 ; person + + def_warps_to SAFARI_ZONE_GATE diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm new file mode 100644 index 00000000..2094e742 --- /dev/null +++ b/data/maps/objects/SafariZoneNorth.asm @@ -0,0 +1,26 @@ +SafariZoneNorth_Object: + db $0 ; border block + + def_warps + warp 2, 35, 0, SAFARI_ZONE_WEST + warp 3, 35, 1, SAFARI_ZONE_WEST + warp 8, 35, 2, SAFARI_ZONE_WEST + warp 9, 35, 3, SAFARI_ZONE_WEST + warp 20, 35, 4, SAFARI_ZONE_CENTER + warp 21, 35, 5, SAFARI_ZONE_CENTER + warp 39, 30, 0, SAFARI_ZONE_EAST + warp 39, 31, 1, SAFARI_ZONE_EAST + warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE + + def_signs + sign 36, 4, 3 ; SafariZoneNorthText3 + sign 4, 25, 4 ; SafariZoneNorthText4 + sign 13, 31, 5 ; SafariZoneNorthText5 + sign 19, 33, 6 ; SafariZoneNorthText6 + sign 26, 28, 7 ; SafariZoneNorthText7 + + def_objects + object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN + object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH + + def_warps_to SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm new file mode 100644 index 00000000..38087622 --- /dev/null +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -0,0 +1,15 @@ +SafariZoneNorthRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, SAFARI_ZONE_NORTH + warp 3, 7, 8, SAFARI_ZONE_NORTH + + def_signs + + def_objects + object SPRITE_SCIENTIST, 6, 3, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 3, 4, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 1, 5, WALK, UP_DOWN, 3 ; person + + def_warps_to SAFARI_ZONE_NORTH_REST_HOUSE diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm new file mode 100644 index 00000000..1431d711 --- /dev/null +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -0,0 +1,13 @@ +SafariZoneSecretHouse_Object: + db $17 ; border block + + def_warps + warp 2, 7, 6, SAFARI_ZONE_WEST + warp 3, 7, 6, SAFARI_ZONE_WEST + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 3, 3, STAY, DOWN, 1 ; person + + def_warps_to SAFARI_ZONE_SECRET_HOUSE diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm new file mode 100644 index 00000000..d53ee37b --- /dev/null +++ b/data/maps/objects/SafariZoneWest.asm @@ -0,0 +1,26 @@ +SafariZoneWest_Object: + db $0 ; border block + + def_warps + warp 20, 0, 0, SAFARI_ZONE_NORTH + warp 21, 0, 1, SAFARI_ZONE_NORTH + warp 26, 0, 2, SAFARI_ZONE_NORTH + warp 27, 0, 3, SAFARI_ZONE_NORTH + warp 29, 22, 2, SAFARI_ZONE_CENTER + warp 29, 23, 3, SAFARI_ZONE_CENTER + warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE + warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE + + def_signs + sign 12, 12, 5 ; SafariZoneWestText5 + sign 17, 3, 6 ; SafariZoneWestText6 + sign 26, 4, 7 ; SafariZoneWestText7 + sign 24, 22, 8 ; SafariZoneWestText8 + + def_objects + object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION + object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM + object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE + object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH + + def_warps_to SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm new file mode 100644 index 00000000..26bb481e --- /dev/null +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -0,0 +1,15 @@ +SafariZoneWestRestHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 7, SAFARI_ZONE_WEST + warp 3, 7, 7, SAFARI_ZONE_WEST + + def_signs + + def_objects + object SPRITE_SCIENTIST, 4, 4, WALK, ANY_DIR, 1 ; person + object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person + object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person + + def_warps_to SAFARI_ZONE_WEST_REST_HOUSE diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm new file mode 100644 index 00000000..f69b3333 --- /dev/null +++ b/data/maps/objects/SaffronCity.asm @@ -0,0 +1,43 @@ +SaffronCity_Object: + db $f ; border block + + def_warps + warp 7, 5, 0, COPYCATS_HOUSE_1F + warp 26, 3, 0, FIGHTING_DOJO + warp 34, 3, 0, SAFFRON_GYM + warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE + warp 25, 11, 0, SAFFRON_MART + warp 18, 21, 0, SILPH_CO_1F + warp 9, 29, 0, SAFFRON_POKECENTER + warp 29, 29, 0, MR_PSYCHICS_HOUSE + + def_signs + sign 17, 5, 16 ; SaffronCityText16 + sign 27, 5, 17 ; SaffronCityText17 + sign 35, 5, 18 ; SaffronCityText18 + sign 26, 11, 19 ; MartSignText + sign 39, 19, 20 ; SaffronCityText20 + sign 5, 21, 21 ; SaffronCityText21 + sign 15, 21, 22 ; SaffronCityText22 + sign 10, 29, 23 ; PokeCenterSignText + sign 27, 29, 24 ; SaffronCityText24 + sign 1, 19, 25 ; SaffronCityText25 + + def_objects + object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 8, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person + object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 11, 25, WALK, LEFT_RIGHT, 5 ; person + object SPRITE_ROCKET, 32, 13, WALK, LEFT_RIGHT, 6 ; person + object SPRITE_ROCKET, 18, 30, WALK, LEFT_RIGHT, 7 ; person + object SPRITE_SCIENTIST, 8, 14, WALK, ANY_DIR, 8 ; person + object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_ERIKA, 17, 30, WALK, LEFT_RIGHT, 10 ; person + object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person + object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person + object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person + object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person + object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person + + def_warps_to SAFFRON_CITY diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm new file mode 100644 index 00000000..9623440a --- /dev/null +++ b/data/maps/objects/SaffronGym.asm @@ -0,0 +1,51 @@ +SaffronGym_Object: + db $2e ; border block + + def_warps + warp 8, 17, 2, LAST_MAP + warp 9, 17, 2, LAST_MAP + warp 1, 3, 22, SAFFRON_GYM + warp 5, 3, 15, SAFFRON_GYM + warp 1, 5, 18, SAFFRON_GYM + warp 5, 5, 8, SAFFRON_GYM + warp 1, 9, 27, SAFFRON_GYM + warp 5, 9, 16, SAFFRON_GYM + warp 1, 11, 5, SAFFRON_GYM + warp 5, 11, 13, SAFFRON_GYM + warp 1, 15, 23, SAFFRON_GYM + warp 5, 15, 30, SAFFRON_GYM + warp 1, 17, 17, SAFFRON_GYM + warp 5, 17, 9, SAFFRON_GYM + warp 9, 3, 26, SAFFRON_GYM + warp 11, 3, 3, SAFFRON_GYM + warp 9, 5, 7, SAFFRON_GYM + warp 11, 5, 12, SAFFRON_GYM + warp 11, 11, 4, SAFFRON_GYM + warp 11, 15, 31, SAFFRON_GYM + warp 15, 3, 24, SAFFRON_GYM + warp 19, 3, 28, SAFFRON_GYM + warp 15, 5, 2, SAFFRON_GYM + warp 19, 5, 10, SAFFRON_GYM + warp 15, 9, 20, SAFFRON_GYM + warp 19, 9, 29, SAFFRON_GYM + warp 15, 11, 14, SAFFRON_GYM + warp 19, 11, 6, SAFFRON_GYM + warp 15, 15, 21, SAFFRON_GYM + warp 19, 15, 25, SAFFRON_GYM + warp 15, 17, 11, SAFFRON_GYM + warp 19, 17, 19, SAFFRON_GYM + + def_signs + + def_objects + object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 + object SPRITE_CHANNELER, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 + object SPRITE_YOUNGSTER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 + object SPRITE_CHANNELER, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 + object SPRITE_YOUNGSTER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object SPRITE_CHANNELER, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 + object SPRITE_YOUNGSTER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 + object SPRITE_YOUNGSTER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object SPRITE_GYM_GUIDE, 10, 15, STAY, DOWN, 9 ; person + + def_warps_to SAFFRON_GYM diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm new file mode 100644 index 00000000..0a9aed7a --- /dev/null +++ b/data/maps/objects/SaffronMart.asm @@ -0,0 +1,15 @@ +SaffronMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_SUPER_NERD, 4, 2, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, ANY_DIR, 3 ; person + + def_warps_to SAFFRON_MART diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm new file mode 100644 index 00000000..59af6fc0 --- /dev/null +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -0,0 +1,16 @@ +SaffronPidgeyHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 0, 4, WALK, UP_DOWN, 2 ; person + object SPRITE_YOUNGSTER, 4, 1, STAY, DOWN, 3 ; person + object SPRITE_PAPER, 3, 3, STAY, NONE, 4 ; person + + def_warps_to SAFFRON_PIDGEY_HOUSE diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm new file mode 100644 index 00000000..aa6161ca --- /dev/null +++ b/data/maps/objects/SaffronPokecenter.asm @@ -0,0 +1,16 @@ +SaffronPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 6, LAST_MAP + warp 4, 7, 6, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BEAUTY, 5, 5, STAY, NONE, 2 ; person + object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to SAFFRON_POKECENTER diff --git a/data/maps/objects/SeafoamIslands1F.asm b/data/maps/objects/SeafoamIslands1F.asm new file mode 100644 index 00000000..3d92f199 --- /dev/null +++ b/data/maps/objects/SeafoamIslands1F.asm @@ -0,0 +1,23 @@ +SeafoamIslands1F_Object: + db $7d ; border block + + def_warps + warp 4, 17, 0, LAST_MAP + warp 5, 17, 0, LAST_MAP + warp 26, 17, 1, LAST_MAP + warp 27, 17, 1, LAST_MAP + warp 7, 5, 1, SEAFOAM_ISLANDS_B1F + warp 25, 3, 6, SEAFOAM_ISLANDS_B1F + warp 23, 15, 4, SEAFOAM_ISLANDS_B1F + + def_signs + + def_objects + object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + def_warps_to SEAFOAM_ISLANDS_1F + + ; holes + warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH + warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH diff --git a/data/maps/objects/SeafoamIslandsB1F.asm b/data/maps/objects/SeafoamIslandsB1F.asm new file mode 100644 index 00000000..c9a4d235 --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB1F.asm @@ -0,0 +1,19 @@ +SeafoamIslandsB1F_Object: + db $7d ; border block + + def_warps + warp 4, 2, 0, SEAFOAM_ISLANDS_B2F + warp 7, 5, 4, SEAFOAM_ISLANDS_1F + warp 13, 7, 2, SEAFOAM_ISLANDS_B2F + warp 19, 15, 3, SEAFOAM_ISLANDS_B2F + warp 23, 15, 6, SEAFOAM_ISLANDS_1F + warp 25, 11, 5, SEAFOAM_ISLANDS_B2F + warp 25, 3, 5, SEAFOAM_ISLANDS_1F + + def_signs + + def_objects + object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + def_warps_to SEAFOAM_ISLANDS_B1F diff --git a/data/maps/objects/SeafoamIslandsB2F.asm b/data/maps/objects/SeafoamIslandsB2F.asm new file mode 100644 index 00000000..ff9e55fd --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB2F.asm @@ -0,0 +1,19 @@ +SeafoamIslandsB2F_Object: + db $7d ; border block + + def_warps + warp 5, 3, 0, SEAFOAM_ISLANDS_B1F + warp 5, 13, 0, SEAFOAM_ISLANDS_B3F + warp 13, 7, 2, SEAFOAM_ISLANDS_B1F + warp 19, 15, 3, SEAFOAM_ISLANDS_B1F + warp 25, 3, 3, SEAFOAM_ISLANDS_B3F + warp 25, 11, 5, SEAFOAM_ISLANDS_B1F + warp 25, 14, 4, SEAFOAM_ISLANDS_B3F + + def_signs + + def_objects + object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + + def_warps_to SEAFOAM_ISLANDS_B2F diff --git a/data/maps/objects/SeafoamIslandsB3F.asm b/data/maps/objects/SeafoamIslandsB3F.asm new file mode 100644 index 00000000..418cdde6 --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB3F.asm @@ -0,0 +1,23 @@ +SeafoamIslandsB3F_Object: + db $7d ; border block + + def_warps + warp 5, 12, 1, SEAFOAM_ISLANDS_B2F + warp 8, 6, 2, SEAFOAM_ISLANDS_B4F + warp 25, 4, 3, SEAFOAM_ISLANDS_B4F + warp 25, 3, 4, SEAFOAM_ISLANDS_B2F + warp 25, 14, 6, SEAFOAM_ISLANDS_B2F + warp 20, 17, 0, SEAFOAM_ISLANDS_B4F + warp 21, 17, 1, SEAFOAM_ISLANDS_B4F + + def_signs + + def_objects + object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person + object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person + object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person + + def_warps_to SEAFOAM_ISLANDS_B3F diff --git a/data/maps/objects/SeafoamIslandsB4F.asm b/data/maps/objects/SeafoamIslandsB4F.asm new file mode 100644 index 00000000..f2d35831 --- /dev/null +++ b/data/maps/objects/SeafoamIslandsB4F.asm @@ -0,0 +1,19 @@ +SeafoamIslandsB4F_Object: + db $7d ; border block + + def_warps + warp 20, 17, 5, SEAFOAM_ISLANDS_B3F + warp 21, 17, 6, SEAFOAM_ISLANDS_B3F + warp 11, 7, 1, SEAFOAM_ISLANDS_B3F + warp 25, 4, 2, SEAFOAM_ISLANDS_B3F + + def_signs + sign 9, 15, 4 ; SeafoamIslands5Text4 + sign 23, 1, 5 ; SeafoamIslands5Text5 + + def_objects + object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person + object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person + object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50 + + def_warps_to SEAFOAM_ISLANDS_B4F diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm new file mode 100644 index 00000000..6840c13a --- /dev/null +++ b/data/maps/objects/SilphCo10F.asm @@ -0,0 +1,22 @@ +SilphCo10F_Object: + db $2e ; border block + + def_warps + warp 8, 0, 0, SILPH_CO_9F + warp 10, 0, 0, SILPH_CO_11F + warp 12, 0, 0, SILPH_CO_ELEVATOR + warp 9, 11, 3, SILPH_CO_4F + warp 13, 15, 5, SILPH_CO_4F + warp 13, 7, 6, SILPH_CO_4F + + def_signs + + def_objects + object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 + object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 + object SPRITE_ERIKA, 9, 15, WALK, ANY_DIR, 3 ; person + object SPRITE_POKE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE + object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY + object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS + + def_warps_to SILPH_CO_10F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm new file mode 100644 index 00000000..fd1167f0 --- /dev/null +++ b/data/maps/objects/SilphCo11F.asm @@ -0,0 +1,19 @@ +SilphCo11F_Object: + db $d ; border block + + def_warps + warp 9, 0, 1, SILPH_CO_10F + warp 13, 0, 0, SILPH_CO_ELEVATOR + warp 5, 5, 9, LAST_MAP + warp 3, 2, 3, SILPH_CO_7F + + def_signs + + def_objects + object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person + object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 + object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 + object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 + + def_warps_to SILPH_CO_11F diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm new file mode 100644 index 00000000..7a9bdb61 --- /dev/null +++ b/data/maps/objects/SilphCo1F.asm @@ -0,0 +1,16 @@ +SilphCo1F_Object: + db $2e ; border block + + def_warps + warp 10, 17, 5, LAST_MAP + warp 11, 17, 5, LAST_MAP + warp 26, 0, 0, SILPH_CO_2F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 16, 10, 6, SILPH_CO_3F + + def_signs + + def_objects + object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person + + def_warps_to SILPH_CO_1F diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm new file mode 100644 index 00000000..186d1581 --- /dev/null +++ b/data/maps/objects/SilphCo2F.asm @@ -0,0 +1,22 @@ +SilphCo2F_Object: + db $2e ; border block + + def_warps + warp 24, 0, 2, SILPH_CO_1F + warp 26, 0, 0, SILPH_CO_3F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 6, SILPH_CO_3F + warp 13, 3, 4, SILPH_CO_8F + warp 27, 15, 5, SILPH_CO_8F + warp 9, 15, 4, SILPH_CO_6F + + def_signs + + def_objects + object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person + object SPRITE_SCIENTIST, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 + object SPRITE_SCIENTIST, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 + object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 + object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 + + def_warps_to SILPH_CO_2F diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm new file mode 100644 index 00000000..e9ea1cce --- /dev/null +++ b/data/maps/objects/SilphCo3F.asm @@ -0,0 +1,24 @@ +SilphCo3F_Object: + db $2e ; border block + + def_warps + warp 26, 0, 1, SILPH_CO_2F + warp 24, 0, 0, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 23, 11, 9, SILPH_CO_3F + warp 3, 3, 5, SILPH_CO_5F + warp 3, 15, 6, SILPH_CO_5F + warp 27, 3, 3, SILPH_CO_2F + warp 3, 11, 3, SILPH_CO_9F + warp 11, 11, 4, SILPH_CO_7F + warp 27, 15, 3, SILPH_CO_3F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 24, 8, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 + object SPRITE_SCIENTIST, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION + + def_warps_to SILPH_CO_3F diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm new file mode 100644 index 00000000..6c30b526 --- /dev/null +++ b/data/maps/objects/SilphCo4F.asm @@ -0,0 +1,24 @@ +SilphCo4F_Object: + db $2e ; border block + + def_warps + warp 24, 0, 1, SILPH_CO_3F + warp 26, 0, 1, SILPH_CO_5F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 11, 7, 3, SILPH_CO_10F + warp 17, 3, 3, SILPH_CO_6F + warp 3, 15, 4, SILPH_CO_10F + warp 17, 11, 5, SILPH_CO_10F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 6, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 + object SPRITE_SCIENTIST, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 + object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 + object SPRITE_POKE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL + object SPRITE_POKE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE + object SPRITE_POKE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE + + def_warps_to SILPH_CO_4F diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm new file mode 100644 index 00000000..553ec0c3 --- /dev/null +++ b/data/maps/objects/SilphCo5F.asm @@ -0,0 +1,28 @@ +SilphCo5F_Object: + db $2e ; border block + + def_warps + warp 24, 0, 1, SILPH_CO_6F + warp 26, 0, 1, SILPH_CO_4F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 27, 3, 5, SILPH_CO_7F + warp 9, 15, 4, SILPH_CO_9F + warp 11, 5, 4, SILPH_CO_3F + warp 3, 15, 5, SILPH_CO_3F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 13, 9, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 + object SPRITE_SCIENTIST, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 + object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 + object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 + object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN + object SPRITE_POKE_BALL, 4, 6, STAY, NONE, 7, PROTEIN + object SPRITE_POKE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY + object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person + object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person + object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person + + def_warps_to SILPH_CO_5F diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm new file mode 100644 index 00000000..3dba7414 --- /dev/null +++ b/data/maps/objects/SilphCo6F.asm @@ -0,0 +1,25 @@ +SilphCo6F_Object: + db $2e ; border block + + def_warps + warp 16, 0, 1, SILPH_CO_7F + warp 14, 0, 0, SILPH_CO_5F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 3, 4, SILPH_CO_4F + warp 23, 3, 6, SILPH_CO_2F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person + object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person + object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person + object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person + object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 + object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 + object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP + object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY + + def_warps_to SILPH_CO_6F diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm new file mode 100644 index 00000000..55f2ade6 --- /dev/null +++ b/data/maps/objects/SilphCo7F.asm @@ -0,0 +1,27 @@ +SilphCo7F_Object: + db $2e ; border block + + def_warps + warp 16, 0, 1, SILPH_CO_8F + warp 22, 0, 0, SILPH_CO_6F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 5, 7, 3, SILPH_CO_11F + warp 5, 3, 8, SILPH_CO_3F + warp 21, 15, 3, SILPH_CO_5F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person + object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person + object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 + object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 + object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 + object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person + object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM + object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE + + def_warps_to SILPH_CO_7F diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm new file mode 100644 index 00000000..1a50df07 --- /dev/null +++ b/data/maps/objects/SilphCo8F.asm @@ -0,0 +1,21 @@ +SilphCo8F_Object: + db $2e ; border block + + def_warps + warp 16, 0, 1, SILPH_CO_9F + warp 14, 0, 0, SILPH_CO_7F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 3, 11, 6, SILPH_CO_8F + warp 3, 15, 4, SILPH_CO_2F + warp 11, 5, 5, SILPH_CO_2F + warp 11, 9, 3, SILPH_CO_8F + + def_signs + + def_objects + object SPRITE_SILPH_WORKER, 4, 2, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 + object SPRITE_SCIENTIST, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 + object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 + + def_warps_to SILPH_CO_8F diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm new file mode 100644 index 00000000..e6de70fd --- /dev/null +++ b/data/maps/objects/SilphCo9F.asm @@ -0,0 +1,19 @@ +SilphCo9F_Object: + db $2e ; border block + + def_warps + warp 14, 0, 0, SILPH_CO_10F + warp 16, 0, 0, SILPH_CO_8F + warp 18, 0, 0, SILPH_CO_ELEVATOR + warp 9, 3, 7, SILPH_CO_3F + warp 17, 15, 4, SILPH_CO_5F + + def_signs + + def_objects + object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person + object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 + object SPRITE_SCIENTIST, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 + object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 + + def_warps_to SILPH_CO_9F diff --git a/data/maps/objects/SilphCoElevator.asm b/data/maps/objects/SilphCoElevator.asm new file mode 100644 index 00000000..d894ba65 --- /dev/null +++ b/data/maps/objects/SilphCoElevator.asm @@ -0,0 +1,13 @@ +SilphCoElevator_Object: + db $f ; border block + + def_warps + warp 1, 3, 0, UNUSED_MAP_ED + warp 2, 3, 0, UNUSED_MAP_ED + + def_signs + sign 3, 0, 1 ; SilphCoElevatorText1 + + def_objects + + def_warps_to SILPH_CO_ELEVATOR diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm new file mode 100644 index 00000000..ff74a4fa --- /dev/null +++ b/data/maps/objects/TradeCenter.asm @@ -0,0 +1,11 @@ +TradeCenter_Object: + db $e ; border block + + def_warps + + def_signs + + def_objects + object SPRITE_RED, 2, 2, STAY, 0, 1 ; person + + def_warps_to TRADE_CENTER diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm new file mode 100644 index 00000000..abf2d715 --- /dev/null +++ b/data/maps/objects/UndergroundPathNorthSouth.asm @@ -0,0 +1,12 @@ +UndergroundPathNorthSouth_Object: + db $1 ; border block + + def_warps + warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5 + warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6 + + def_signs + + def_objects + + def_warps_to UNDERGROUND_PATH_NORTH_SOUTH diff --git a/data/maps/objects/UndergroundPathRoute5.asm b/data/maps/objects/UndergroundPathRoute5.asm new file mode 100644 index 00000000..0e0f64e0 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute5.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute5_Object: + db $a ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH + + def_signs + + def_objects + object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_5 diff --git a/data/maps/objects/UndergroundPathRoute6.asm b/data/maps/objects/UndergroundPathRoute6.asm new file mode 100644 index 00000000..ff4d66b3 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute6.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute6_Object: + db $a ; border block + + def_warps + warp 3, 7, 3, LAST_MAP + warp 4, 7, 3, LAST_MAP + warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH + + def_signs + + def_objects + object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_6 diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm new file mode 100644 index 00000000..2532c380 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute7_Object: + db $a ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + def_signs + + def_objects + object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm new file mode 100644 index 00000000..57e6d093 --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -0,0 +1,15 @@ +UndergroundPathRoute7Copy_Object: + db $a ; border block + + def_warps + warp 3, 7, 5, LAST_MAP + warp 4, 7, 5, LAST_MAP + warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST + + def_signs + + def_objects + object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 2 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_7_COPY diff --git a/data/maps/objects/UndergroundPathRoute8.asm b/data/maps/objects/UndergroundPathRoute8.asm new file mode 100644 index 00000000..d84188ab --- /dev/null +++ b/data/maps/objects/UndergroundPathRoute8.asm @@ -0,0 +1,14 @@ +UndergroundPathRoute8_Object: + db $a ; border block + + def_warps + warp 3, 7, 4, LAST_MAP + warp 4, 7, 4, LAST_MAP + warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST + + def_signs + + def_objects + object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person + + def_warps_to UNDERGROUND_PATH_ROUTE_8 diff --git a/data/maps/objects/UndergroundPathWestEast.asm b/data/maps/objects/UndergroundPathWestEast.asm new file mode 100644 index 00000000..15141e93 --- /dev/null +++ b/data/maps/objects/UndergroundPathWestEast.asm @@ -0,0 +1,12 @@ +UndergroundPathWestEast_Object: + db $1 ; border block + + def_warps + warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7 + warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8 + + def_signs + + def_objects + + def_warps_to UNDERGROUND_PATH_WEST_EAST diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm new file mode 100644 index 00000000..1b989ad7 --- /dev/null +++ b/data/maps/objects/VermilionCity.asm @@ -0,0 +1,32 @@ +VermilionCity_Object: + db $43 ; border block + + def_warps + warp 11, 3, 0, VERMILION_POKECENTER + warp 9, 13, 0, POKEMON_FAN_CLUB + warp 23, 13, 0, VERMILION_MART + warp 12, 19, 0, VERMILION_GYM + warp 23, 19, 0, VERMILION_PIDGEY_HOUSE + warp 18, 31, 0, VERMILION_DOCK + warp 19, 31, 0, VERMILION_DOCK + warp 15, 13, 0, VERMILION_TRADE_HOUSE + warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE + + def_signs + sign 27, 3, 7 ; VermilionCityText7 + sign 37, 13, 8 ; VermilionCityText8 + sign 24, 13, 9 ; MartSignText + sign 12, 3, 10 ; PokeCenterSignText + sign 7, 13, 11 ; VermilionCityText11 + sign 7, 19, 12 ; VermilionCityText12 + sign 29, 15, 13 ; VermilionCityText13 + + def_objects + object SPRITE_BEAUTY, 19, 7, WALK, LEFT_RIGHT, 1 ; person + object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person + object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person + object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person + object SPRITE_MONSTER, 29, 9, WALK, UP_DOWN, 5 ; person + object SPRITE_SAILOR, 25, 27, WALK, LEFT_RIGHT, 6 ; person + + def_warps_to VERMILION_CITY diff --git a/data/maps/objects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm new file mode 100644 index 00000000..f8143aaa --- /dev/null +++ b/data/maps/objects/VermilionDock.asm @@ -0,0 +1,12 @@ +VermilionDock_Object: + db $f ; border block + + def_warps + warp 14, 0, 5, LAST_MAP + warp 14, 2, 1, SS_ANNE_1F + + def_signs + + def_objects + + def_warps_to VERMILION_DOCK diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm new file mode 100644 index 00000000..ce0fd9f0 --- /dev/null +++ b/data/maps/objects/VermilionGym.asm @@ -0,0 +1,17 @@ +VermilionGym_Object: + db $3 ; border block + + def_warps + warp 4, 17, 3, LAST_MAP + warp 5, 17, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 + object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 + object SPRITE_SUPER_NERD, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 + object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 + object SPRITE_GYM_GUIDE, 4, 14, STAY, DOWN, 5 ; person + + def_warps_to VERMILION_GYM diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm new file mode 100644 index 00000000..c473b5d1 --- /dev/null +++ b/data/maps/objects/VermilionMart.asm @@ -0,0 +1,15 @@ +VermilionMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 2, LAST_MAP + warp 4, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_COOLTRAINER_M, 5, 6, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 3, 3, WALK, LEFT_RIGHT, 3 ; person + + def_warps_to VERMILION_MART diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm new file mode 100644 index 00000000..878262f2 --- /dev/null +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -0,0 +1,13 @@ +VermilionOldRodHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 8, LAST_MAP + warp 3, 7, 8, LAST_MAP + + def_signs + + def_objects + object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person + + def_warps_to VERMILION_OLD_ROD_HOUSE diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm new file mode 100644 index 00000000..0a357409 --- /dev/null +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -0,0 +1,15 @@ +VermilionPidgeyHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 4, LAST_MAP + warp 3, 7, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_YOUNGSTER, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_BIRD, 3, 5, WALK, LEFT_RIGHT, 2 ; person + object SPRITE_PAPER, 4, 3, STAY, NONE, 3 ; person + + def_warps_to VERMILION_PIDGEY_HOUSE diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm new file mode 100644 index 00000000..e656b80c --- /dev/null +++ b/data/maps/objects/VermilionPokecenter.asm @@ -0,0 +1,16 @@ +VermilionPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_FISHING_GURU, 10, 5, STAY, NONE, 2 ; person + object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to VERMILION_POKECENTER diff --git a/data/maps/objects/VermilionTradeHouse.asm b/data/maps/objects/VermilionTradeHouse.asm new file mode 100644 index 00000000..ec60415f --- /dev/null +++ b/data/maps/objects/VermilionTradeHouse.asm @@ -0,0 +1,13 @@ +VermilionTradeHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 7, LAST_MAP + warp 3, 7, 7, LAST_MAP + + def_signs + + def_objects + object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person + + def_warps_to VERMILION_TRADE_HOUSE diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm new file mode 100644 index 00000000..e3798128 --- /dev/null +++ b/data/maps/objects/VictoryRoad1F.asm @@ -0,0 +1,20 @@ +VictoryRoad1F_Object: + db $7d ; border block + + def_warps + warp 8, 17, 2, LAST_MAP + warp 9, 17, 2, LAST_MAP + warp 1, 1, 0, VICTORY_ROAD_2F + + def_signs + + def_objects + object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 + object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 + object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK + object SPRITE_POKE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY + object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person + object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + + def_warps_to VICTORY_ROAD_1F diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm new file mode 100644 index 00000000..84a32fa2 --- /dev/null +++ b/data/maps/objects/VictoryRoad2F.asm @@ -0,0 +1,30 @@ +VictoryRoad2F_Object: + db $7d ; border block + + def_warps + warp 0, 8, 2, VICTORY_ROAD_1F + warp 29, 7, 3, LAST_MAP + warp 29, 8, 3, LAST_MAP + warp 23, 7, 0, VICTORY_ROAD_3F + warp 25, 14, 2, VICTORY_ROAD_3F + warp 27, 7, 1, VICTORY_ROAD_3F + warp 1, 1, 3, VICTORY_ROAD_3F + + def_signs + + def_objects + object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 + object SPRITE_SUPER_NERD, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 + object SPRITE_COOLTRAINER_M, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 + object SPRITE_SUPER_NERD, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object SPRITE_SUPER_NERD, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 + object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 + object SPRITE_POKE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION + object SPRITE_POKE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL + object SPRITE_POKE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK + object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC + object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person + + def_warps_to VICTORY_ROAD_2F diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm new file mode 100644 index 00000000..fcab3e74 --- /dev/null +++ b/data/maps/objects/VictoryRoad3F.asm @@ -0,0 +1,24 @@ +VictoryRoad3F_Object: + db $7d ; border block + + def_warps + warp 23, 7, 3, VICTORY_ROAD_2F + warp 26, 8, 5, VICTORY_ROAD_2F + warp 27, 15, 4, VICTORY_ROAD_2F + warp 2, 0, 6, VICTORY_ROAD_2F + + def_signs + + def_objects + object SPRITE_COOLTRAINER_M, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object SPRITE_COOLTRAINER_M, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object SPRITE_POKE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE + object SPRITE_POKE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION + object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person + object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person + object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person + + def_warps_to VICTORY_ROAD_3F diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm new file mode 100644 index 00000000..c4ee9b69 --- /dev/null +++ b/data/maps/objects/ViridianCity.asm @@ -0,0 +1,28 @@ +ViridianCity_Object: + db $f ; border block + + def_warps + warp 23, 25, 0, VIRIDIAN_POKECENTER + warp 29, 19, 0, VIRIDIAN_MART + warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE + warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE + warp 32, 7, 0, VIRIDIAN_GYM + + def_signs + sign 17, 17, 8 ; ViridianCityText8 + sign 19, 1, 9 ; ViridianCityText9 + sign 21, 29, 10 ; ViridianCityText10 + sign 30, 19, 11 ; MartSignText + sign 24, 25, 12 ; PokeCenterSignText + sign 27, 7, 13 ; ViridianCityText13 + + def_objects + object SPRITE_YOUNGSTER, 13, 20, WALK, ANY_DIR, 1 ; person + object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person + object SPRITE_YOUNGSTER, 30, 25, WALK, ANY_DIR, 3 ; person + object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person + object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person + object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person + object SPRITE_GAMBLER, 17, 5, WALK, LEFT_RIGHT, 7 ; person + + def_warps_to VIRIDIAN_CITY diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm new file mode 100644 index 00000000..22d0b67a --- /dev/null +++ b/data/maps/objects/ViridianForest.asm @@ -0,0 +1,30 @@ +ViridianForest_Object: + db $3 ; border block + + def_warps + warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE + warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE + warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE + + def_signs + sign 24, 40, 9 ; ViridianForestText9 + sign 16, 32, 10 ; ViridianForestText10 + sign 26, 17, 11 ; ViridianForestText11 + sign 4, 24, 12 ; ViridianForestText12 + sign 18, 45, 13 ; ViridianForestText13 + sign 2, 1, 14 ; ViridianForestText14 + + def_objects + object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person + object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 + object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 + object SPRITE_YOUNGSTER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE + object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 6, POTION + object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL + object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person + + def_warps_to VIRIDIAN_FOREST diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm new file mode 100644 index 00000000..137b8b3b --- /dev/null +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -0,0 +1,16 @@ +ViridianForestNorthGate_Object: + db $a ; border block + + def_warps + warp 4, 0, 1, LAST_MAP + warp 5, 0, 1, LAST_MAP + warp 4, 7, 0, VIRIDIAN_FOREST + warp 5, 7, 0, VIRIDIAN_FOREST + + def_signs + + def_objects + object SPRITE_SUPER_NERD, 3, 2, STAY, NONE, 1 ; person + object SPRITE_GRAMPS, 2, 5, STAY, NONE, 2 ; person + + def_warps_to VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm new file mode 100644 index 00000000..3693e7ec --- /dev/null +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -0,0 +1,16 @@ +ViridianForestSouthGate_Object: + db $a ; border block + + def_warps + warp 4, 0, 3, VIRIDIAN_FOREST + warp 5, 0, 4, VIRIDIAN_FOREST + warp 4, 7, 5, LAST_MAP + warp 5, 7, 5, LAST_MAP + + def_signs + + def_objects + object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 2, 4, WALK, UP_DOWN, 2 ; person + + def_warps_to VIRIDIAN_FOREST_SOUTH_GATE diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm new file mode 100644 index 00000000..cc158928 --- /dev/null +++ b/data/maps/objects/ViridianGym.asm @@ -0,0 +1,23 @@ +ViridianGym_Object: + db $3 ; border block + + def_warps + warp 16, 17, 4, LAST_MAP + warp 17, 17, 4, LAST_MAP + + def_signs + + def_objects + object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 + object SPRITE_COOLTRAINER_M, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 + object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 + object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 + object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 + object SPRITE_COOLTRAINER_M, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 + object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 + object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 + object SPRITE_COOLTRAINER_M, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 + object SPRITE_GYM_GUIDE, 16, 15, STAY, DOWN, 10 ; person + object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 11, REVIVE + + def_warps_to VIRIDIAN_GYM diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm new file mode 100644 index 00000000..cbb5a4a3 --- /dev/null +++ b/data/maps/objects/ViridianMart.asm @@ -0,0 +1,15 @@ +ViridianMart_Object: + db $0 ; border block + + def_warps + warp 3, 7, 1, LAST_MAP + warp 4, 7, 1, LAST_MAP + + def_signs + + def_objects + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 5, 5, WALK, UP_DOWN, 2 ; person + object SPRITE_COOLTRAINER_M, 3, 3, STAY, NONE, 3 ; person + + def_warps_to VIRIDIAN_MART diff --git a/data/maps/objects/ViridianNicknameHouse.asm b/data/maps/objects/ViridianNicknameHouse.asm new file mode 100644 index 00000000..c2e6b70f --- /dev/null +++ b/data/maps/objects/ViridianNicknameHouse.asm @@ -0,0 +1,16 @@ +ViridianNicknameHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 3, LAST_MAP + warp 3, 7, 3, LAST_MAP + + def_signs + + def_objects + object SPRITE_BALDING_GUY, 5, 3, STAY, NONE, 1 ; person + object SPRITE_LITTLE_GIRL, 1, 4, WALK, UP_DOWN, 2 ; person + object SPRITE_BIRD, 5, 5, WALK, LEFT_RIGHT, 3 ; person + object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person + + def_warps_to VIRIDIAN_NICKNAME_HOUSE diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm new file mode 100644 index 00000000..889281e1 --- /dev/null +++ b/data/maps/objects/ViridianPokecenter.asm @@ -0,0 +1,16 @@ +ViridianPokecenter_Object: + db $0 ; border block + + def_warps + warp 3, 7, 0, LAST_MAP + warp 4, 7, 0, LAST_MAP + + def_signs + + def_objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 10, 5, WALK, UP_DOWN, 2 ; person + object SPRITE_COOLTRAINER_M, 4, 3, STAY, NONE, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person + + def_warps_to VIRIDIAN_POKECENTER diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm new file mode 100644 index 00000000..8f228632 --- /dev/null +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -0,0 +1,14 @@ +ViridianSchoolHouse_Object: + db $a ; border block + + def_warps + warp 2, 7, 2, LAST_MAP + warp 3, 7, 2, LAST_MAP + + def_signs + + def_objects + object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person + object SPRITE_COOLTRAINER_F, 4, 1, STAY, DOWN, 2 ; person + + def_warps_to VIRIDIAN_SCHOOL_HOUSE diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm new file mode 100644 index 00000000..68210d65 --- /dev/null +++ b/data/maps/objects/WardensHouse.asm @@ -0,0 +1,17 @@ +WardensHouse_Object: + db $17 ; border block + + def_warps + warp 4, 7, 3, LAST_MAP + warp 5, 7, 3, LAST_MAP + + def_signs + sign 4, 3, 4 ; FuchsiaHouse2Text4 + sign 5, 3, 5 ; FuchsiaHouse2Text5 + + def_objects + object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person + object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY + object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + + def_warps_to WARDENS_HOUSE diff --git a/data/maps/rest_house_maps.asm b/data/maps/rest_house_maps.asm new file mode 100644 index 00000000..88f0845a --- /dev/null +++ b/data/maps/rest_house_maps.asm @@ -0,0 +1,5 @@ +SafariZoneRestHouses: + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE + db -1 ; end diff --git a/data/maps/songs.asm b/data/maps/songs.asm new file mode 100644 index 00000000..3aa62900 --- /dev/null +++ b/data/maps/songs.asm @@ -0,0 +1,249 @@ +MapSongBanks:: + db MUSIC_PALLET_TOWN, 0 ; PALLET_TOWN + db MUSIC_CITIES1, 0 ; VIRIDIAN_CITY + db MUSIC_CITIES1, 0 ; PEWTER_CITY + db MUSIC_CITIES2, 0 ; CERULEAN_CITY + db MUSIC_LAVENDER, 0 ; LAVENDER_TOWN + db MUSIC_VERMILION, 0 ; VERMILION_CITY + db MUSIC_CELADON, 0 ; CELADON_CITY + db MUSIC_CITIES2, 0 ; FUCHSIA_CITY + db MUSIC_CINNABAR, 0 ; CINNABAR_ISLAND + db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU + db MUSIC_CITIES1, 0 ; SAFFRON_CITY + db MUSIC_CITIES1, 0 ; UNUSED_MAP_0B + db MUSIC_ROUTES1, 0 ; ROUTE_1 + db MUSIC_ROUTES1, 0 ; ROUTE_2 + db MUSIC_ROUTES3, 0 ; ROUTE_3 + db MUSIC_ROUTES3, 0 ; ROUTE_4 + db MUSIC_ROUTES3, 0 ; ROUTE_5 + db MUSIC_ROUTES3, 0 ; ROUTE_6 + db MUSIC_ROUTES3, 0 ; ROUTE_7 + db MUSIC_ROUTES3, 0 ; ROUTE_8 + db MUSIC_ROUTES3, 0 ; ROUTE_9 + db MUSIC_ROUTES3, 0 ; ROUTE_10 + db MUSIC_ROUTES4, 0 ; ROUTE_11 + db MUSIC_ROUTES4, 0 ; ROUTE_12 + db MUSIC_ROUTES4, 0 ; ROUTE_13 + db MUSIC_ROUTES4, 0 ; ROUTE_14 + db MUSIC_ROUTES4, 0 ; ROUTE_15 + db MUSIC_ROUTES3, 0 ; ROUTE_16 + db MUSIC_ROUTES3, 0 ; ROUTE_17 + db MUSIC_ROUTES3, 0 ; ROUTE_18 + db MUSIC_ROUTES3, 0 ; ROUTE_19 + db MUSIC_ROUTES3, 0 ; ROUTE_20 + db MUSIC_ROUTES3, 0 ; ROUTE_21 + db MUSIC_ROUTES3, 0 ; ROUTE_22 + db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23 + db MUSIC_ROUTES2, 0 ; ROUTE_24 + db MUSIC_ROUTES2, 0 ; ROUTE_25 + db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F + db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F + db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE + db MUSIC_OAKS_LAB, 0 ; OAKS_LAB + db MUSIC_POKECENTER, 0 ; VIRIDIAN_POKECENTER + db MUSIC_POKECENTER, 0 ; VIRIDIAN_MART + db MUSIC_CITIES1, 0 ; VIRIDIAN_SCHOOL_HOUSE + db MUSIC_CITIES1, 0 ; VIRIDIAN_NICKNAME_HOUSE + db MUSIC_GYM, 0 ; VIRIDIAN_GYM + db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE_ROUTE_2 + db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_NORTH_GATE + db MUSIC_CITIES1, 0 ; ROUTE_2_TRADE_HOUSE + db MUSIC_CITIES1, 0 ; ROUTE_2_GATE + db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_SOUTH_GATE + db MUSIC_DUNGEON2, 0 ; VIRIDIAN_FOREST + db MUSIC_CITIES1, 0 ; MUSEUM_1F + db MUSIC_CITIES1, 0 ; MUSEUM_2F + db MUSIC_GYM, 0 ; PEWTER_GYM + db MUSIC_CITIES1, 0 ; PEWTER_NIDORAN_HOUSE + db MUSIC_POKECENTER, 0 ; PEWTER_MART + db MUSIC_CITIES1, 0 ; PEWTER_SPEECH_HOUSE + db MUSIC_POKECENTER, 0 ; PEWTER_POKECENTER + db MUSIC_DUNGEON3, 0 ; MT_MOON_1F + db MUSIC_DUNGEON3, 0 ; MT_MOON_B1F + db MUSIC_DUNGEON3, 0 ; MT_MOON_B2F + db MUSIC_CITIES2, 0 ; CERULEAN_TRASHED_HOUSE + db MUSIC_CITIES2, 0 ; CERULEAN_TRADE_HOUSE + db MUSIC_POKECENTER, 0 ; CERULEAN_POKECENTER + db MUSIC_GYM, 0 ; CERULEAN_GYM + db MUSIC_CITIES2, 0 ; BIKE_SHOP + db MUSIC_POKECENTER, 0 ; CERULEAN_MART + db MUSIC_POKECENTER, 0 ; MT_MOON_POKECENTER + db MUSIC_DUNGEON3, 0 ; CERULEAN_TRASHED_HOUSE_COPY + db MUSIC_CITIES1, 0 ; ROUTE_5_GATE + db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_5 + db MUSIC_CITIES1, 0 ; DAYCARE + db MUSIC_CITIES1, 0 ; ROUTE_6_GATE + db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6 + db MUSIC_VERMILION, 0 ; UNDERGROUND_PATH_ROUTE_6_COPY + db MUSIC_CITIES1, 0 ; ROUTE_7_GATE + db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7 + db MUSIC_CELADON, 0 ; UNDERGROUND_PATH_ROUTE_7_COPY + db MUSIC_CITIES1, 0 ; ROUTE_8_GATE + db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8 + db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER + db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_1F + db MUSIC_DUNGEON1, 0 ; POWER_PLANT + db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_1F + db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE_ROUTE_11 + db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_2F + db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_1F + db MUSIC_CITIES2, 0 ; BILLS_HOUSE + db MUSIC_POKECENTER, 0 ; VERMILION_POKECENTER + db MUSIC_VERMILION, 0 ; POKEMON_FAN_CLUB + db MUSIC_POKECENTER, 0 ; VERMILION_MART + db MUSIC_GYM, 0 ; VERMILION_GYM + db MUSIC_VERMILION, 0 ; VERMILION_PIDGEY_HOUSE + db MUSIC_SS_ANNE, 0 ; VERMILION_DOCK + db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F + db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F + db MUSIC_SS_ANNE, 0 ; SS_ANNE_3F + db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F + db MUSIC_SS_ANNE, 0 ; SS_ANNE_BOW + db MUSIC_SS_ANNE, 0 ; SS_ANNE_KITCHEN + db MUSIC_SS_ANNE, 0 ; SS_ANNE_CAPTAINS_ROOM + db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F_ROOMS + db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F_ROOMS + db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F_ROOMS + db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_69 + db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_6A + db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_6B + db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F + db MUSIC_POKEMON_TOWER, 0 ; UNUSED_MAP_6D + db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_6E + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_6F + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_70 + db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM + db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_72 + db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_73 + db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_74 + db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_75 + db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME + db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH + db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM + db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_WEST_EAST + db MUSIC_POKECENTER, 0 ; CELADON_MART_1F + db MUSIC_POKECENTER, 0 ; CELADON_MART_2F + db MUSIC_POKECENTER, 0 ; CELADON_MART_3F + db MUSIC_POKECENTER, 0 ; CELADON_MART_4F + db MUSIC_POKECENTER, 0 ; CELADON_MART_ROOF + db MUSIC_POKECENTER, 0 ; CELADON_MART_ELEVATOR + db MUSIC_CELADON, 0 ; CELADON_MANSION_1F + db MUSIC_CELADON, 0 ; CELADON_MANSION_2F + db MUSIC_CELADON, 0 ; CELADON_MANSION_3F + db MUSIC_CELADON, 0 ; CELADON_MANSION_ROOF + db MUSIC_CELADON, 0 ; CELADON_MANSION_ROOF_HOUSE + db MUSIC_POKECENTER, 0 ; CELADON_POKECENTER + db MUSIC_GYM, 0 ; CELADON_GYM + db MUSIC_GAME_CORNER, 0 ; GAME_CORNER + db MUSIC_POKECENTER, 0 ; CELADON_MART_5F + db MUSIC_CELADON, 0 ; GAME_CORNER_PRIZE_ROOM + db MUSIC_CELADON, 0 ; CELADON_DINER + db MUSIC_CELADON, 0 ; CELADON_CHIEF_HOUSE + db MUSIC_CELADON, 0 ; CELADON_HOTEL + db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_4F + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F + db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F + db MUSIC_LAVENDER, 0 ; MR_FUJIS_HOUSE + db MUSIC_POKECENTER, 0 ; LAVENDER_MART + db MUSIC_LAVENDER, 0 ; LAVENDER_CUBONE_HOUSE + db MUSIC_POKECENTER, 0 ; FUCHSIA_MART + db MUSIC_CITIES2, 0 ; FUCHSIA_BILLS_GRANDPAS_HOUSE + db MUSIC_POKECENTER, 0 ; FUCHSIA_POKECENTER + db MUSIC_CITIES2, 0 ; WARDENS_HOUSE + db MUSIC_CITIES2, 0 ; SAFARI_ZONE_GATE + db MUSIC_GYM, 0 ; FUCHSIA_GYM + db MUSIC_CITIES2, 0 ; FUCHSIA_MEETING_ROOM + db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B1F + db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B2F + db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F + db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F + db MUSIC_CITIES2, 0 ; VERMILION_OLD_ROD_HOUSE + db MUSIC_CITIES2, 0 ; FUCHSIA_GOOD_ROD_HOUSE + db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F + db MUSIC_GYM, 0 ; CINNABAR_GYM + db MUSIC_CINNABAR, 0 ; CINNABAR_LAB + db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_TRADE_ROOM + db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_METRONOME_ROOM + db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM + db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER + db MUSIC_POKECENTER, 0 ; CINNABAR_MART + db MUSIC_CINNABAR, 0 ; CINNABAR_MART_COPY + db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY + db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F + db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F + db MUSIC_CITIES1, 0 ; FIGHTING_DOJO + db MUSIC_GYM, 0 ; SAFFRON_GYM + db MUSIC_CITIES1, 0 ; SAFFRON_PIDGEY_HOUSE + db MUSIC_POKECENTER, 0 ; SAFFRON_MART + db MUSIC_SILPH_CO, 0 ; SILPH_CO_1F + db MUSIC_POKECENTER, 0 ; SAFFRON_POKECENTER + db MUSIC_CITIES1, 0 ; MR_PSYCHICS_HOUSE + db MUSIC_CITIES1, 0 ; ROUTE_15_GATE_1F + db MUSIC_CITIES1, 0 ; ROUTE_15_GATE_2F + db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_1F + db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_2F + db MUSIC_CELADON, 0 ; ROUTE_16_FLY_HOUSE + db MUSIC_CELADON, 0 ; ROUTE_12_SUPER_ROD_HOUSE + db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_1F + db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_2F + db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_1F + db MUSIC_DUNGEON2, 0 ; ROUTE_22_GATE + db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_2F + db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_2F + db MUSIC_VERMILION, 0 ; VERMILION_TRADE_HOUSE + db MUSIC_DUNGEON2, 0 ; DIGLETTS_CAVE + db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_3F + db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B1F + db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B2F + db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F + db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F + db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR + db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CC + db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CD + db MUSIC_DUNGEON1, 0 ; UNUSED_MAP_CE + db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_4F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_6F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F + db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F + db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_3F + db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_EAST + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_NORTH + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_WEST + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_CENTER + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_CENTER_REST_HOUSE + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_SECRET_HOUSE + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_WEST_REST_HOUSE + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_EAST_REST_HOUSE + db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_NORTH_REST_HOUSE + db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_2F + db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_B1F + db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_1F + db MUSIC_CITIES2, 0 ; NAME_RATERS_HOUSE + db MUSIC_CITIES1, 0 ; CERULEAN_BADGE_HOUSE + db MUSIC_CINNABAR, 0 ; UNUSED_MAP_E7 + db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F + db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_ED + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_EE + db MUSIC_CELADON, 0 ; TRADE_CENTER + db MUSIC_CELADON, 0 ; COLOSSEUM + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F1 + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F2 + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F3 + db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F4 + db MUSIC_GYM, 0 ; LORELEIS_ROOM + db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM + db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm new file mode 100644 index 00000000..56dac3a5 --- /dev/null +++ b/data/maps/special_warps.asm @@ -0,0 +1,91 @@ +; Format: (size 2 bytes) +; 00: target map ID +; 01: which dungeon warp in the source map was used +DungeonWarpList: + db SEAFOAM_ISLANDS_B1F, 1 + db SEAFOAM_ISLANDS_B1F, 2 + db SEAFOAM_ISLANDS_B2F, 1 + db SEAFOAM_ISLANDS_B2F, 2 + db SEAFOAM_ISLANDS_B3F, 1 + db SEAFOAM_ISLANDS_B3F, 2 + db SEAFOAM_ISLANDS_B4F, 1 + db SEAFOAM_ISLANDS_B4F, 2 + db VICTORY_ROAD_2F, 2 + db POKEMON_MANSION_1F, 1 + db POKEMON_MANSION_1F, 2 + db POKEMON_MANSION_2F, 3 + db -1 ; end + + +fly_warp: MACRO + event_displacement \1_WIDTH, \2, \3 + db ((\3) & $01) ;sub-block Y + db ((\2) & $01) ;sub-block X +ENDM + +DungeonWarpData: + fly_warp SEAFOAM_ISLANDS_B1F, 18, 7 + fly_warp SEAFOAM_ISLANDS_B1F, 23, 7 + fly_warp SEAFOAM_ISLANDS_B2F, 19, 7 + fly_warp SEAFOAM_ISLANDS_B2F, 22, 7 + fly_warp SEAFOAM_ISLANDS_B3F, 18, 7 + fly_warp SEAFOAM_ISLANDS_B3F, 19, 7 + fly_warp SEAFOAM_ISLANDS_B4F, 4, 14 + fly_warp SEAFOAM_ISLANDS_B4F, 5, 14 + fly_warp VICTORY_ROAD_2F, 22, 16 + fly_warp POKEMON_MANSION_1F, 16, 14 + fly_warp POKEMON_MANSION_1F, 16, 14 + fly_warp POKEMON_MANSION_2F, 18, 14 + + +special_warp_spec: MACRO + db \1 + fly_warp \1, \2, \3 + db \4 +ENDM + +FirstMapSpec: + special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2 +TradeCenterSpec1: + special_warp_spec TRADE_CENTER, 3, 4, CLUB +TradeCenterSpec2: + special_warp_spec TRADE_CENTER, 6, 4, CLUB +ColosseumSpec1: + special_warp_spec COLOSSEUM, 3, 4, CLUB +ColosseumSpec2: + special_warp_spec COLOSSEUM, 6, 4, CLUB + + +fly_warp_spec: MACRO + db \1, 0 + dw \2 +ENDM + +FlyWarpDataPtr: + fly_warp_spec PALLET_TOWN, .PalletTown + fly_warp_spec VIRIDIAN_CITY, .ViridianCity + fly_warp_spec PEWTER_CITY, .PewterCity + fly_warp_spec CERULEAN_CITY, .CeruleanCity + fly_warp_spec LAVENDER_TOWN, .LavenderTown + fly_warp_spec VERMILION_CITY, .VermilionCity + fly_warp_spec CELADON_CITY, .CeladonCity + fly_warp_spec FUCHSIA_CITY, .FuchsiaCity + fly_warp_spec CINNABAR_ISLAND, .CinnabarIsland + fly_warp_spec INDIGO_PLATEAU, .IndigoPlateau + fly_warp_spec SAFFRON_CITY, .SaffronCity + fly_warp_spec ROUTE_4, .Route4 + fly_warp_spec ROUTE_10, .Route10 + +.PalletTown: fly_warp PALLET_TOWN, 5, 6 +.ViridianCity: fly_warp VIRIDIAN_CITY, 23, 26 +.PewterCity: fly_warp PEWTER_CITY, 13, 26 +.CeruleanCity: fly_warp CERULEAN_CITY, 19, 18 +.LavenderTown: fly_warp LAVENDER_TOWN, 3, 6 +.VermilionCity: fly_warp VERMILION_CITY, 11, 4 +.CeladonCity: fly_warp CELADON_CITY, 41, 10 +.FuchsiaCity: fly_warp FUCHSIA_CITY, 19, 28 +.CinnabarIsland: fly_warp CINNABAR_ISLAND, 11, 12 +.IndigoPlateau: fly_warp INDIGO_PLATEAU, 9, 6 +.SaffronCity: fly_warp SAFFRON_CITY, 9, 30 +.Route4: fly_warp ROUTE_4, 11, 6 +.Route10: fly_warp ROUTE_10, 11, 20 diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm new file mode 100644 index 00000000..b2c9371c --- /dev/null +++ b/data/maps/sprite_sets.asm @@ -0,0 +1,191 @@ +MapSpriteSets: + db $01 ; PALLET_TOWN + db $01 ; VIRIDIAN_CITY + db $02 ; PEWTER_CITY + db $02 ; CERULEAN_CITY + db $03 ; LAVENDER_TOWN + db $04 ; VERMILION_CITY + db $05 ; CELADON_CITY + db $0a ; FUCHSIA_CITY + db $01 ; CINNABAR_ISLAND + db $06 ; INDIGO_PLATEAU + db $07 ; SAFFRON_CITY + db $01 ; unused map ID + db $01 ; ROUTE_1 + db $f1 ; ROUTE_2 + db $02 ; ROUTE_3 + db $02 ; ROUTE_4 + db $f9 ; ROUTE_5 + db $fa ; ROUTE_6 + db $fb ; ROUTE_7 + db $fc ; ROUTE_8 + db $02 ; ROUTE_9 + db $f2 ; ROUTE_10 + db $f3 ; ROUTE_11 + db $f4 ; ROUTE_12 + db $08 ; ROUTE_13 + db $08 ; ROUTE_14 + db $f5 ; ROUTE_15 + db $f6 ; ROUTE_16 + db $09 ; ROUTE_17 + db $f7 ; ROUTE_18 + db $0a ; ROUTE_19 + db $f8 ; ROUTE_20 + db $01 ; ROUTE_21 + db $01 ; ROUTE_22 + db $06 ; ROUTE_23 + db $02 ; ROUTE_24 + db $02 ; ROUTE_25 + +EAST_WEST EQU 1 +NORTH_SOUTH EQU 2 + +; Format: +; 00: determines whether the map is split EAST_WEST or NORTH_SOUTH +; 01: coordinate of dividing line +; 02: sprite set ID if in the West or North side +; 03: sprite set ID if in the East or South side +SplitMapSpriteSets: + db NORTH_SOUTH, 37, $02, $01 ; $f1 + db NORTH_SOUTH, 50, $02, $03 ; $f2 + db EAST_WEST, 57, $04, $08 ; $f3 + db NORTH_SOUTH, 21, $03, $08 ; $f4 + db EAST_WEST, 8, $0A, $08 ; $f5 + db EAST_WEST, 24, $09, $05 ; $f6 + db EAST_WEST, 34, $09, $0A ; $f7 + db EAST_WEST, 53, $01, $0A ; $f8 + db NORTH_SOUTH, 33, $02, $07 ; $f9 + db NORTH_SOUTH, 2, $07, $04 ; $fa + db EAST_WEST, 17, $05, $07 ; $fb + db EAST_WEST, 3, $07, $03 ; $fc + +SpriteSets: +; sprite set $01 + db SPRITE_BLUE + db SPRITE_YOUNGSTER + db SPRITE_GIRL + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M + db SPRITE_GAMBLER + db SPRITE_SEEL + db SPRITE_OAK + db SPRITE_SWIMMER + db SPRITE_POKE_BALL + db SPRITE_GAMBLER_ASLEEP + +; sprite set $02 + db SPRITE_YOUNGSTER + db SPRITE_ROCKET + db SPRITE_SUPER_NERD + db SPRITE_HIKER + db SPRITE_MONSTER + db SPRITE_BLUE + db SPRITE_GUARD + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $03 + db SPRITE_LITTLE_GIRL + db SPRITE_GIRL + db SPRITE_SUPER_NERD + db SPRITE_HIKER + db SPRITE_GAMBLER + db SPRITE_MONSTER + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_GUARD + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $04 + db SPRITE_BEAUTY + db SPRITE_SUPER_NERD + db SPRITE_YOUNGSTER + db SPRITE_GAMBLER + db SPRITE_MONSTER + db SPRITE_GUARD + db SPRITE_SAILOR + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $05 + db SPRITE_LITTLE_GIRL + db SPRITE_LITTLE_BOY + db SPRITE_GIRL + db SPRITE_FISHER + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_GRAMPS + db SPRITE_MONSTER + db SPRITE_GUARD + db SPRITE_ROCKET + db SPRITE_POKE_BALL + db SPRITE_SNORLAX + +; sprite set $06 + db SPRITE_YOUNGSTER + db SPRITE_GYM_GUIDE + db SPRITE_MONSTER + db SPRITE_BLUE + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_SWIMMER + db SPRITE_GUARD + db SPRITE_GAMBLER + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $07 + db SPRITE_ROCKET + db SPRITE_SCIENTIST + db SPRITE_SILPH_WORKER + db SPRITE_ERIKA + db SPRITE_GENTLEMAN + db SPRITE_BIRD + db SPRITE_ROCKER + db SPRITE_COOLTRAINER_M + db SPRITE_MONSTER + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 + +; sprite set $08 + db SPRITE_BIKER + db SPRITE_SUPER_NERD + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_BEAUTY + db SPRITE_FISHER + db SPRITE_ROCKER + db SPRITE_MONSTER + db SPRITE_POKE_BALL + db SPRITE_SNORLAX + +; sprite set $09 + db SPRITE_BIKER + db SPRITE_COOLTRAINER_M + db SPRITE_SILPH_WORKER + db SPRITE_FISHER + db SPRITE_ROCKER + db SPRITE_HIKER + db SPRITE_GAMBLER + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_SUPER_NERD + db SPRITE_POKE_BALL + db SPRITE_SNORLAX + +; sprite set $0a + db SPRITE_BIRD + db SPRITE_COOLTRAINER_M + db SPRITE_FAIRY + db SPRITE_FISHER + db SPRITE_GAMBLER + db SPRITE_MONSTER + db SPRITE_SEEL + db SPRITE_SWIMMER + db SPRITE_YOUNGSTER + db SPRITE_POKE_BALL + db SPRITE_FOSSIL diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm new file mode 100644 index 00000000..9b0cde26 --- /dev/null +++ b/data/maps/town_map_entries.asm @@ -0,0 +1,117 @@ +external_map: MACRO + dn \2, \1 + dw \3 +ENDM + +; the appearance of towns and routes in the town map +ExternalMapEntries: + ; x, y, name + external_map 2, 11, PalletTownName + external_map 2, 8, ViridianCityName + external_map 2, 3, PewterCityName + external_map 10, 2, CeruleanCityName + external_map 14, 5, LavenderTownName + external_map 10, 9, VermilionCityName + external_map 7, 5, CeladonCityName + external_map 8, 13, FuchsiaCityName + external_map 2, 15, CinnabarIslandName + external_map 0, 2, IndigoPlateauName + external_map 10, 5, SaffronCityName + external_map 0, 0, PalletTownName ; unused + external_map 2, 10, Route1Name + external_map 2, 6, Route2Name + external_map 4, 3, Route3Name + external_map 8, 2, Route4Name + external_map 10, 3, Route5Name + external_map 10, 8, Route6Name + external_map 8, 5, Route7Name + external_map 13, 5, Route8Name + external_map 13, 2, Route9Name + external_map 14, 4, Route10Name + external_map 12, 9, Route11Name + external_map 14, 9, Route12Name + external_map 13, 11, Route13Name + external_map 11, 12, Route14Name + external_map 10, 13, Route15Name + external_map 5, 5, Route16Name + external_map 4, 8, Route17Name + external_map 6, 13, Route18Name + external_map 6, 15, Route19Name + external_map 4, 15, Route20Name + external_map 2, 13, Route21Name + external_map 0, 8, Route22Name + external_map 0, 6, Route23Name + external_map 10, 1, Route24Name + external_map 11, 0, Route25Name + + +internal_map: MACRO + db \1 + 1 + dn \3, \2 + dw \4 +ENDM + +; the appearance of buildings and dungeons in the town map +InternalMapEntries: + ; maximum map id subject to this rule, x, y, name + internal_map OAKS_LAB, 2, 11, PalletTownName + internal_map VIRIDIAN_GYM, 2, 8, ViridianCityName + internal_map VIRIDIAN_FOREST_SOUTH_GATE, 2, 6, Route2Name + internal_map VIRIDIAN_FOREST, 2, 4, ViridianForestName + internal_map PEWTER_POKECENTER, 2, 3, PewterCityName + internal_map MT_MOON_B2F, 6, 2, MountMoonName + internal_map CERULEAN_MART, 10, 2, CeruleanCityName + internal_map MT_MOON_POKECENTER, 5, 2, Route4Name + internal_map CERULEAN_TRASHED_HOUSE_COPY, 10, 2, CeruleanCityName + internal_map DAYCARE, 10, 4, Route5Name + internal_map UNDERGROUND_PATH_ROUTE_6_COPY, 10, 6, Route6Name + internal_map UNDERGROUND_PATH_ROUTE_7_COPY, 9, 5, Route7Name + internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name + internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName + internal_map POWER_PLANT, 15, 4, PowerPlantName + internal_map ROUTE_11_GATE_2F, 13, 9, Route11Name + internal_map ROUTE_12_GATE_1F, 14, 7, Route12Name + internal_map BILLS_HOUSE, 12, 0, SeaCottageName + internal_map VERMILION_DOCK, 10, 9, VermilionCityName + internal_map SS_ANNE_B1F_ROOMS, 9, 10, SSAnneName + internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName + internal_map HALL_OF_FAME, 0, 2, PokemonLeagueName + internal_map UNDERGROUND_PATH_NORTH_SOUTH, 10, 5, UndergroundPathName + internal_map CHAMPIONS_ROOM, 0, 2, PokemonLeagueName + internal_map UNDERGROUND_PATH_WEST_EAST, 10, 5, UndergroundPathName + internal_map CELADON_HOTEL, 7, 5, CeladonCityName + internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName + internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName + internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName + internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName + internal_map SAFARI_ZONE_GATE, 8, 12, SafariZoneName + internal_map FUCHSIA_MEETING_ROOM, 8, 13, FuchsiaCityName + internal_map SEAFOAM_ISLANDS_B4F, 5, 15, SeafoamIslandsName + internal_map VERMILION_OLD_ROD_HOUSE, 10, 9, VermilionCityName + internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName + internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName + internal_map CINNABAR_MART_COPY, 2, 15, CinnabarIslandName + internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName + internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName + internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name + internal_map ROUTE_16_FLY_HOUSE, 4, 5, Route16Name + internal_map ROUTE_12_SUPER_ROD_HOUSE, 14, 10, Route12Name + internal_map ROUTE_18_GATE_2F, 7, 13, Route18Name + internal_map SEAFOAM_ISLANDS_1F, 5, 15, SeafoamIslandsName + internal_map ROUTE_22_GATE, 0, 7, Route22Name + internal_map VICTORY_ROAD_2F, 0, 4, VictoryRoadName + internal_map ROUTE_12_GATE_2F, 14, 7, Route12Name + internal_map VERMILION_TRADE_HOUSE, 10, 9, VermilionCityName + internal_map DIGLETTS_CAVE, 3, 4, DiglettsCaveName + internal_map VICTORY_ROAD_3F, 0, 4, VictoryRoadName + internal_map UNUSED_MAP_CE, 7, 5, RocketHQName + internal_map SILPH_CO_8F, 10, 5, SilphCoName + internal_map POKEMON_MANSION_B1F, 2, 15, PokemonMansionName + internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName + internal_map CERULEAN_CAVE_1F, 9, 1, CeruleanCaveName + internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName + internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName + internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName + internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName + internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName + db -1 ; end diff --git a/data/town_map_order.asm b/data/maps/town_map_order.asm old mode 100755 new mode 100644 similarity index 100% rename from data/town_map_order.asm rename to data/maps/town_map_order.asm diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm deleted file mode 100755 index 35ae2e9d..00000000 --- a/data/mart_inventories.asm +++ /dev/null @@ -1,64 +0,0 @@ -; mart inventories are below -; they are texts - -; Viridian -ViridianCashierText:: - TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL - -; Pewter -PewterCashierText:: - TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL - -; Cerulean -CeruleanCashierText:: - TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL - -; Bike shop - TX_MART BICYCLE - -; Vermilion -VermilionCashierText:: - TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL - -; Lavender -LavenderCashierText:: - TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL - -; Celadon Dept. Store 2F (1) -CeladonMart2Clerk1Text:: - TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL - -; Celadon Dept. Store 2F (2) -CeladonMart2Clerk2Text:: - TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17 - -; Celadon Dept. Store 4F -CeladonMart4ClerkText:: - TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE - -; Celadon Dept. Store 5F (1) -CeladonMart5Clerk1Text:: - TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL - -; Celadon Dept. Store 5F (2) -CeladonMart5Clerk2Text:: - TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM - -; Fuchsia -FuchsiaCashierText:: - TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL - -; unused? - TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE - -; Cinnabar -CinnabarCashierText:: - TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE - -; Saffron -SaffronCashierText:: - TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE - -; Indigo -IndigoCashierText:: - TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm deleted file mode 100755 index 987d8d28..00000000 --- a/data/mon_party_sprites.asm +++ /dev/null @@ -1,77 +0,0 @@ -MonPartyData: - dn SPRITE_GRASS, SPRITE_GRASS ;Bulbasaur/Ivysaur - dn SPRITE_GRASS, SPRITE_MON ;Venusaur/Charmander - dn SPRITE_MON, SPRITE_MON ;Charmeleon/Charizard - dn SPRITE_WATER, SPRITE_WATER ;Squirtle/Wartortle - dn SPRITE_WATER, SPRITE_BUG ;Blastoise/Caterpie - dn SPRITE_BUG, SPRITE_BUG ;Metapod/Butterfree - dn SPRITE_BUG, SPRITE_BUG ;Weedle/Kakuna - dn SPRITE_BUG, SPRITE_BIRD_M ;Beedrill/Pidgey - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Pidgeotto/Pidgeot - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Rattata/Raticate - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Spearow/Fearow - dn SPRITE_SNAKE, SPRITE_SNAKE ;Ekans/Arbok - dn SPRITE_FAIRY, SPRITE_FAIRY ;Pikachu/Raichu - dn SPRITE_MON, SPRITE_MON ;Sandshrew/Sandslash - dn SPRITE_MON, SPRITE_MON ;NidoranF/Nidorina - dn SPRITE_MON, SPRITE_MON ;Nidoqueen/NidoranM - dn SPRITE_MON, SPRITE_MON ;Nidorino/Nidoking - dn SPRITE_FAIRY, SPRITE_FAIRY ;Clefairy/Clefable - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Vulpix/Ninetales - dn SPRITE_FAIRY, SPRITE_FAIRY ;Jigglypuff/Wigglytuff - dn SPRITE_MON, SPRITE_MON ;Zubat/Golbat - dn SPRITE_GRASS, SPRITE_GRASS ;Oddish/Gloom - dn SPRITE_GRASS, SPRITE_BUG ;Vileplume/Paras - dn SPRITE_BUG, SPRITE_BUG ;Parasect/Venonat - dn SPRITE_BUG, SPRITE_MON ;Venomoth/Diglett - dn SPRITE_MON, SPRITE_MON ;Dugtrio/Meowth - dn SPRITE_MON, SPRITE_MON ;Persian/Psyduck - dn SPRITE_MON, SPRITE_MON ;Golduck/Mankey - dn SPRITE_MON, SPRITE_QUADRUPED ;Primeape/Growlithe - dn SPRITE_QUADRUPED, SPRITE_MON ;Arcanine/Poliwag - dn SPRITE_MON, SPRITE_MON ;Poliwhirl/Poliwrath - dn SPRITE_MON, SPRITE_MON ;Abra/Kadabra - dn SPRITE_MON, SPRITE_MON ;Alakazam/Machop - dn SPRITE_MON, SPRITE_MON ;Machoke/Machamp - dn SPRITE_GRASS, SPRITE_GRASS ;Bellsprout/Weepinbell - dn SPRITE_GRASS, SPRITE_WATER ;Victreebel/Tentacool - dn SPRITE_WATER, SPRITE_MON ;Tentacruel/Geodude - dn SPRITE_MON, SPRITE_MON ;Graveler/Golem - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Ponyta/Rapidash - dn SPRITE_QUADRUPED, SPRITE_MON ;Slowpoke/Slowbro - dn SPRITE_BALL_M, SPRITE_BALL_M ;Magnemite/Magneton - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Farfetch'd/Doduo - dn SPRITE_BIRD_M, SPRITE_WATER ;Dodrio/Seel - dn SPRITE_WATER, SPRITE_MON ;Dewgong/Grimer - dn SPRITE_MON, SPRITE_HELIX ;Muk/Shellder - dn SPRITE_HELIX, SPRITE_MON ;Cloyster/Gastly - dn SPRITE_MON, SPRITE_MON ;Haunter/Gengar - dn SPRITE_SNAKE, SPRITE_MON ;Onix/Drowzee - dn SPRITE_MON, SPRITE_WATER ;Hypno/Krabby - dn SPRITE_WATER, SPRITE_BALL_M ;Kingler/Voltorb - dn SPRITE_BALL_M, SPRITE_GRASS ;Electrode/Exeggcute - dn SPRITE_GRASS, SPRITE_MON ;Exeggutor/Cubone - dn SPRITE_MON, SPRITE_MON ;Marowak/Hitmonlee - dn SPRITE_MON, SPRITE_MON ;Hitmonchan/Lickitung - dn SPRITE_MON, SPRITE_MON ;Koffing/Weezing - dn SPRITE_QUADRUPED, SPRITE_MON ;Rhyhorn/Rhydon - dn SPRITE_FAIRY, SPRITE_GRASS ;Chansey/Tangela - dn SPRITE_MON, SPRITE_WATER ;Kangaskhan/Horsea - dn SPRITE_WATER, SPRITE_WATER ;Seadra/Goldeen - dn SPRITE_WATER, SPRITE_HELIX ;Seaking/Staryu - dn SPRITE_HELIX, SPRITE_MON ;Starmie/Mr.Mime - dn SPRITE_BUG, SPRITE_MON ;Scyther/Jynx - dn SPRITE_MON, SPRITE_MON ;Electabuzz/Magmar - dn SPRITE_BUG, SPRITE_QUADRUPED ;Pinsir/Tauros - dn SPRITE_WATER, SPRITE_SNAKE ;Magikarp/Gyarados - dn SPRITE_WATER, SPRITE_MON ;Lapras/Ditto - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Eevee/Vaporeon - dn SPRITE_QUADRUPED, SPRITE_QUADRUPED ;Jolteon/Flareon - dn SPRITE_MON, SPRITE_HELIX ;Porygon/Omanyte - dn SPRITE_HELIX, SPRITE_HELIX ;Omastar/Kabuto - dn SPRITE_HELIX, SPRITE_BIRD_M ;Kabutops/Aerodactyl - dn SPRITE_MON, SPRITE_BIRD_M ;Snorlax/Articuno - dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres - dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair - dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo - dn SPRITE_MON, 0 ;Mew/Padding diff --git a/data/moves.asm b/data/moves.asm deleted file mode 100755 index 44859681..00000000 --- a/data/moves.asm +++ /dev/null @@ -1,178 +0,0 @@ -Moves: -; Characteristics of each move. - -move: macro - db \1 ; animation (interchangeable with move id) - db \2 ; effect - db \3 ; power - db \4 ; type - db \5 percent ; accuracy - db \6 ; pp -endm - - move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 -MoveEnd: - move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 - move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 - move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 - move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20 - move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20 - move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15 - move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15 - move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15 - move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 - move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30 - move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5 - move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10 - move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30 - move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30 - move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 - move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 - move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20 - move FLY, FLY_EFFECT, 70, FLYING, 95, 15 - move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20 - move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20 - move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10 - move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20 - move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30 - move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5 - move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25 - move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15 - move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15 - move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15 - move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25 - move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 - move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5 - move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35 - move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15 - move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20 - move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20 - move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20 - move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15 - move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 - move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35 - move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20 - move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20 - move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 - move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25 - move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40 - move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20 - move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15 - move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20 - move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20 - move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20 - move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30 - move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25 - move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15 - move MIST, MIST_EFFECT, 0, ICE, 100, 30 - move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25 - move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5 - move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15 - move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10 - move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5 - move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC, 100, 20 - move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20 - move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20 - move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5 - move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 - move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20 - move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25 - move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20 - move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20 - move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20 - move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15 - move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20 - move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10 - move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10 - move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40 - move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25 - move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10 - move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35 - move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30 - move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15 - move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20 - move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40 - move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10 - move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15 - move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30 - move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15 - move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20 - move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10 - move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15 - move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10 - move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5 - move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10 - move TOXIC, POISON_EFFECT, 0, POISON, 85, 10 - move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC, 100, 25 - move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC, 100, 10 - move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC, 60, 20 - move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC, 100, 40 - move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC, 100, 30 - move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30 - move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20 - move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC, 100, 20 - move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15 - move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 - move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 - move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 - move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 - move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 - move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 - move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 - move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10 - move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40 - move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40 - move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC, 100, 30 - move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC, 100, 30 - move HAZE, HAZE_EFFECT, 0, ICE, 100, 30 - move REFLECT, REFLECT_EFFECT, 0, PSYCHIC, 100, 20 - move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30 - move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10 - move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10 - move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20 - move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5 - move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10 - move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30 - move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20 - move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20 - move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20 - move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5 - move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15 - move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10 - move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20 - move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15 - move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15 - move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35 - move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC, 100, 20 - move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC, 80, 15 - move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 - move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 - move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 - move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC, 100, 15 - move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40 - move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 - move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15 - move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10 - move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5 - move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10 - move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30 - move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10 - move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15 - move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20 - move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC, 80, 15 - move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40 - move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40 - move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10 - move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 - move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 - move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 - move REST, HEAL_EFFECT, 0, PSYCHIC, 100, 10 - move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 - move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 - move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 - move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30 - move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10 - move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10 - move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 - move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 - move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 diff --git a/data/moves/animations.asm b/data/moves/animations.asm new file mode 100644 index 00000000..8249c50d --- /dev/null +++ b/data/moves/animations.asm @@ -0,0 +1,1274 @@ +AttackAnimationPointers: + dw PoundAnim + dw KarateChopAnim + dw DoubleSlapAnim + dw CometPunchAnim + dw MegaPunchAnim + dw PayDayAnim + dw FirePunchAnim + dw IcePunchAnim + dw ThunderPunchAnim + dw ScratchAnim + dw VicegripAnim + dw GuillotineAnim + dw RazorWindAnim + dw SwordsDanceAnim + dw CutAnim + dw GustAnim + dw WingAttackAnim + dw WhirlwindAnim + dw FlyAnim + dw BindAnim + dw SlamAnim + dw VineWhipAnim + dw StompAnim + dw DoubleKickAnim + dw MegaKickAnim + dw JumpKickAnim + dw RollingKickAnim + dw SandAttackAnim + dw HeatButtAnim + dw HornAttackAnim + dw FuryAttackAnim + dw HornDrillAnim + dw TackleAnim + dw BodySlamAnim + dw WrapAnim + dw TakeDownAnim + dw ThrashAnim + dw DoubleEdgeAnim + dw TailWhipAnim + dw PoisonStingAnim + dw TwineedleAnim + dw PinMissileAnim + dw LeerAnim + dw BiteAnim + dw GrowlAnim + dw RoarAnim + dw SingAnim + dw SupersonicAnim + dw SonicBoomAnim + dw DisableAnim + dw AcidAnim + dw EmberAnim + dw FlamethrowerAnim + dw MistAnim + dw WaterGunAnim + dw HydroPumpAnim + dw SurfAnim + dw IceBeamAnim + dw BlizzardAnim + dw PsyBeamAnim + dw BubbleBeamAnim + dw AuroraBeamAnim + dw HyperBeamAnim + dw PeckAnim + dw DrillPeckAnim + dw SubmissionAnim + dw LowKickAnim + dw CounterAnim + dw SeismicTossAnim + dw StrengthAnim + dw AbsorbAnim + dw MegaDrainAnim + dw LeechSeedAnim + dw GrowthAnim + dw RazorLeafAnim + dw SolarBeamAnim + dw PoisonPowderAnim + dw StunSporeAnim + dw SleepPowderAnim + dw PetalDanceAnim + dw StringShotAnim + dw DragonRageAnim + dw FireSpinAnim + dw ThunderShockAnim + dw ThunderBoltAnim + dw ThunderWaveAnim + dw ThunderAnim + dw RockThrowAnim + dw EarthquakeAnim + dw FissureAnim + dw DigAnim + dw ToxicAnim + dw ConfusionAnim + dw PsychicAnim + dw HypnosisAnim + dw MeditateAnim + dw AgilityAnim + dw QuickAttackAnim + dw RageAnim + dw TeleportAnim + dw NightShadeAnim + dw MimicAnim + dw ScreechAnim + dw DoubleTeamAnim + dw RecoverAnim + dw HardenAnim + dw MinimizeAnim + dw SmokeScreenAnim + dw ConfuseRayAnim + dw WithdrawAnim + dw DefenseCurlAnim + dw BarrierAnim + dw LightScreenAnim + dw HazeAnim + dw ReflectAnim + dw FocusEnergyAnim + dw BideAnim + dw MetronomeAnim + dw MirrorMoveAnim + dw SelfdestructAnim + dw EggBombAnim + dw LickAnim + dw SmogAnim + dw SludgeAnim + dw BoneClubAnim + dw FireBlastAnim + dw WaterfallAnim + dw ClampAnim + dw SwiftAnim + dw SkullBashAnim + dw SpikeCannonAnim + dw ConstrictAnim + dw AmnesiaAnim + dw KinesisAnim + dw SoftboiledAnim + dw HiJumpKickAnim + dw GlareAnim + dw DreamEaterAnim + dw PoisonGasAnim + dw BarrageAnim + dw LeechLifeAnim + dw LovelyKissAnim + dw SkyAttackAnim + dw TransformAnim + dw BubbleAnim + dw DizzyPunchAnim + dw SporeAnim + dw FlashAnim + dw PsywaveAnim + dw SplashAnim + dw AcidArmorAnim + dw CrabHammerAnim + dw ExplosionAnim + dw FurySwipesAnim + dw BonemerangAnim + dw RestAnim + dw RockSlideAnim + dw HyperFangAnim + dw SharpenAnim + dw ConversionAnim + dw TriAttackAnim + dw SuperFangAnim + dw SlashAnim + dw SubstituteAnim + dw StruggleAnim + dw ShowPicAnim + dw EnemyFlashAnim + dw PlayerFlashAnim + dw EnemyHUDShakeAnim + dw TradeBallDropAnim + dw TradeBallAppear1Anim + dw TradeBallAppear2Anim + dw TradeBallPoofAnim + dw XStatItemAnim + dw XStatItemAnim + dw ShrinkingSquareAnim + dw ShrinkingSquareAnim + dw XStatItemBlackAnim + dw XStatItemBlackAnim + dw ShrinkingSquareBlackAnim + dw ShrinkingSquareBlackAnim + dw UnusedAnim + dw UnusedAnim + dw ParalyzeAnim + dw ParalyzeAnim + dw PoisonAnim + dw PoisonAnim + dw SleepPlayerAnim + dw SleepEnemyAnim + dw ConfusedPlayerAnim + dw ConfusedEnemyAnim + dw FaintAnim + dw BallTossAnim + dw BallShakeAnim + dw BallPoofAnim + dw BallBlockAnim + dw GreatTossAnim + dw UltraTossAnim + dw ShakeScreenAnim + dw HidePicAnim + dw ThrowRockAnim + dw ThrowBaitAnim + dw ZigZagScreenAnim + +; each animation is a list of subanimations +; and/or special effects, terminated by -1 + +;\1: sound_id +;\2: special_effect_id or subanimation_id +; if \2 is a subanimation_id: +;\3: tileset_id +;\4: delay +battle_anim: MACRO + IF _NARG == 4 + db (\3 << 6) | \4 + db \1 - 1 + db \2 + ELSE + db \2 + db \1 - 1 + ENDC +ENDM + +ZigZagScreenAnim: + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end + +PoundAnim: +StruggleAnim: + battle_anim POUND, SUBANIM_01, 0, 8 + db -1 ; end + +KarateChopAnim: + battle_anim KARATE_CHOP, SUBANIM_03, 0, 8 + db -1 ; end + +DoubleSlapAnim: + battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 + battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 + db -1 ; end + +CometPunchAnim: + battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 + battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 + db -1 ; end + +MegaPunchAnim: + battle_anim MEGA_PUNCH, SUBANIM_04, 1, 6 + db -1 ; end + +PayDayAnim: + battle_anim POUND, SUBANIM_01, 0, 8 + battle_anim PAY_DAY, SUBANIM_52, 0, 4 + db -1 ; end + +FirePunchAnim: + battle_anim FIRE_PUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SUBANIM_11, 1, 6 + db -1 ; end + +IcePunchAnim: + battle_anim ICE_PUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SUBANIM_2F, 0, 16 + db -1 ; end + +ThunderPunchAnim: + battle_anim THUNDERPUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_2B, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ScratchAnim: + battle_anim SCRATCH, SUBANIM_0F, 0, 6 + db -1 ; end + +VicegripAnim: + battle_anim VICEGRIP, SUBANIM_2A, 0, 8 + db -1 ; end + +GuillotineAnim: + battle_anim GUILLOTINE, SUBANIM_2A, 0, 6 + db -1 ; end + +RazorWindAnim: + battle_anim RAZOR_WIND, SUBANIM_16, 0, 4 + db -1 ; end + +SwordsDanceAnim: + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + db -1 ; end + +CutAnim: + battle_anim CUT, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_16, 0, 4 + db -1 ; end + +GustAnim: + battle_anim GUST, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SUBANIM_02, 0, 6 + db -1 ; end + +WingAttackAnim: + battle_anim WING_ATTACK, SUBANIM_04, 1, 6 + db -1 ; end + +WhirlwindAnim: + battle_anim WHIRLWIND, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SE_SLIDE_ENEMY_MON_OFF + db -1 ; end + +FlyAnim: + battle_anim FLY, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +BindAnim: + battle_anim BIND, SUBANIM_23, 0, 4 + battle_anim BIND, SUBANIM_23, 0, 4 + db -1 ; end + +SlamAnim: + battle_anim SLAM, SUBANIM_02, 0, 6 + db -1 ; end + +VineWhipAnim: + battle_anim VINE_WHIP, SUBANIM_16, 0, 1 + battle_anim NO_MOVE, SUBANIM_01, 0, 8 + db -1 ; end + +StompAnim: + battle_anim STOMP, SUBANIM_05, 1, 8 + db -1 ; end + +DoubleKickAnim: + battle_anim DOUBLE_KICK, SUBANIM_01, 0, 8 + battle_anim DOUBLE_KICK, SUBANIM_01, 0, 8 + db -1 ; end + +MegaKickAnim: + battle_anim MEGA_KICK, SUBANIM_04, 1, 6 + db -1 ; end + +JumpKickAnim: + battle_anim JUMP_KICK, SUBANIM_04, 1, 6 + db -1 ; end + +RollingKickAnim: + battle_anim ROLLING_KICK, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + db -1 ; end + +SandAttackAnim: + battle_anim SAND_ATTACK, SUBANIM_28, 1, 6 + db -1 ; end + +HeatButtAnim: + battle_anim HEADBUTT, SUBANIM_05, 1, 6 + db -1 ; end + +HornAttackAnim: + battle_anim HORN_ATTACK, SUBANIM_45, 0, 6 + battle_anim NO_MOVE, SUBANIM_05, 1, 6 + db -1 ; end + +FuryAttackAnim: + battle_anim FURY_ATTACK, SUBANIM_46, 0, 2 + battle_anim NO_MOVE, SUBANIM_46, 0, 2 + db -1 ; end + +HornDrillAnim: + battle_anim HORN_DRILL, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + db -1 ; end + +TackleAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +BodySlamAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +WrapAnim: + battle_anim WRAP, SUBANIM_23, 0, 4 + battle_anim WRAP, SUBANIM_23, 0, 4 + battle_anim WRAP, SUBANIM_23, 0, 4 + db -1 ; end + +TakeDownAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim TAKE_DOWN, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +ThrashAnim: + battle_anim THRASH, SUBANIM_04, 1, 6 + db -1 ; end + +DoubleEdgeAnim: + battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_2D, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_MOVE_MON_HORIZONTALLY + battle_anim DOUBLE_EDGE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end + +TailWhipAnim: + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + db -1 ; end + +PoisonStingAnim: + battle_anim POISON_STING, SUBANIM_00, 0, 6 + db -1 ; end + +TwineedleAnim: + battle_anim TWINEEDLE, SUBANIM_01, 0, 5 + battle_anim TWINEEDLE, SUBANIM_01, 0, 5 + db -1 ; end + +PinMissileAnim: + battle_anim PIN_MISSILE, SUBANIM_01, 0, 3 + db -1 ; end + +LeerAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +BiteAnim: + battle_anim BITE, SUBANIM_02, 0, 8 + db -1 ; end + +GrowlAnim: + battle_anim GROWL, SUBANIM_12, 1, 6 + db -1 ; end + +RoarAnim: + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + db -1 ; end + +SingAnim: + battle_anim SING, SUBANIM_12, 1, 6 + battle_anim NO_MOVE, SUBANIM_40, 1, 16 + battle_anim NO_MOVE, SUBANIM_40, 1, 16 + db -1 ; end + +SupersonicAnim: + battle_anim SUPERSONIC, SUBANIM_31, 0, 6 + db -1 ; end + +SonicBoomAnim: + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim GUST, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SUBANIM_05, 1, 6 + db -1 ; end + +DisableAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +AcidAnim: + battle_anim ACID, SUBANIM_13, 1, 6 + battle_anim ACID, SUBANIM_14, 1, 6 + db -1 ; end + +EmberAnim: + battle_anim EMBER, SUBANIM_11, 1, 6 + db -1 ; end + +FlamethrowerAnim: + battle_anim FLAMETHROWER, SUBANIM_1F, 1, 6 + battle_anim FLAMETHROWER, SUBANIM_0C, 1, 6 + battle_anim FLAMETHROWER, SUBANIM_0D, 1, 6 + db -1 ; end + +MistAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +WaterGunAnim: + battle_anim WATER_GUN, SUBANIM_2C, 0, 6 + db -1 ; end + +HydroPumpAnim: + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + db -1 ; end + +SurfAnim: + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + db -1 ; end + +IceBeamAnim: + battle_anim ICE_BEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SUBANIM_2F, 0, 16 + db -1 ; end + +BlizzardAnim: + battle_anim BLIZZARD, SUBANIM_38, 0, 4 + battle_anim HYDRO_PUMP, SUBANIM_38, 0, 4 + db -1 ; end + +PsyBeamAnim: + battle_anim PSYBEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SE_FLASH_SCREEN_LONG + db -1 ; end + +BubbleBeamAnim: + battle_anim BUBBLEBEAM, SUBANIM_35, 0, 18 + db -1 ; end + +AuroraBeamAnim: + battle_anim AURORA_BEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + db -1 ; end + +HyperBeamAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim HYPER_BEAM, SUBANIM_2E, 0, 2 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim MEGA_PUNCH, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +PeckAnim: + battle_anim PECK, SUBANIM_01, 0, 8 + db -1 ; end + +DrillPeckAnim: + battle_anim DRILL_PECK, SUBANIM_04, 1, 6 + db -1 ; end + +SubmissionAnim: + battle_anim SUBMISSION, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_01, 0, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +LowKickAnim: + battle_anim LOW_KICK, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +CounterAnim: + battle_anim COUNTER, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +SeismicTossAnim: + battle_anim NO_MOVE, SE_BLINK_ENEMY_MON + battle_anim BARRAGE, SUBANIM_4E, 1, 1 + battle_anim NO_MOVE, SE_HIDE_ENEMY_MON_PIC + battle_anim NO_MOVE, SE_SLIDE_MON_OFF + battle_anim SEISMIC_TOSS, SUBANIM_4F, 1, 2 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + battle_anim SEISMIC_TOSS, SUBANIM_50, 1, 1 + battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end + +StrengthAnim: + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_RESET_MON_POSITION + battle_anim FIRE_PUNCH, SUBANIM_04, 1, 6 + db -1 ; end + +AbsorbAnim: + battle_anim ABSORB, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +MegaDrainAnim: + battle_anim MEGA_DRAIN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +LeechSeedAnim: + battle_anim LEECH_SEED, SUBANIM_1B, 1, 6 + battle_anim STUN_SPORE, SUBANIM_1C, 1, 21 + db -1 ; end + +GrowthAnim: + battle_anim GROWTH, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +RazorLeafAnim: + battle_anim RAZOR_LEAF, SE_LEAVES_FALLING + battle_anim SWIFT, SUBANIM_44, 1, 1 + battle_anim RAZOR_WIND, SUBANIM_16, 0, 1 + db -1 ; end + +SolarBeamAnim: + battle_anim SOLARBEAM, SUBANIM_2E, 0, 6 + battle_anim NO_MOVE, SUBANIM_01, 0, 6 + db -1 ; end + +PoisonPowderAnim: + battle_anim POISONPOWDER, SUBANIM_36, 0, 6 + db -1 ; end + +StunSporeAnim: + battle_anim STUN_SPORE, SUBANIM_36, 0, 6 + db -1 ; end + +SleepPowderAnim: + battle_anim SLEEP_POWDER, SUBANIM_36, 0, 6 + db -1 ; end + +PetalDanceAnim: + battle_anim PETAL_DANCE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_PETALS_FALLING + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +StringShotAnim: + battle_anim STRING_SHOT, SUBANIM_37, 0, 8 + db -1 ; end + +DragonRageAnim: + battle_anim DRAGON_RAGE, SUBANIM_1F, 1, 6 + battle_anim NO_MOVE, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + battle_anim NO_MOVE, SUBANIM_0E, 1, 6 + db -1 ; end + +FireSpinAnim: + battle_anim FIRE_SPIN, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + battle_anim NO_MOVE, SUBANIM_0E, 1, 6 + db -1 ; end + +ThunderShockAnim: + battle_anim THUNDERSHOCK, SUBANIM_29, 1, 2 + db -1 ; end + +ThunderBoltAnim: + battle_anim THUNDERBOLT, SUBANIM_29, 1, 1 + battle_anim THUNDERBOLT, SUBANIM_29, 1, 1 + db -1 ; end + +ThunderWaveAnim: + battle_anim THUNDER_WAVE, SUBANIM_29, 1, 2 + battle_anim NO_MOVE, SUBANIM_23, 0, 2 + battle_anim NO_MOVE, SUBANIM_23, 0, 4 + db -1 ; end + +ThunderAnim: + battle_anim THUNDER, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_2B, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim THUNDERBOLT, SUBANIM_29, 1, 2 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +RockThrowAnim: + battle_anim ROCK_THROW, SUBANIM_30, 0, 4 + db -1 ; end + +EarthquakeAnim: + battle_anim EARTHQUAKE, SE_SHAKE_SCREEN + battle_anim EARTHQUAKE, SE_SHAKE_SCREEN + db -1 ; end + +FissureAnim: + battle_anim FISSURE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_SHAKE_SCREEN + battle_anim FISSURE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end + +DigAnim: + battle_anim DIG, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SLIDE_MON_UP + db -1 ; end + +ToxicAnim: + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim TOXIC, SUBANIM_14, 1, 6 + db -1 ; end + +ConfusionAnim: + battle_anim CONFUSION, SE_FLASH_SCREEN_LONG + db -1 ; end + +PsychicAnim: + battle_anim PSYCHIC_M, SE_FLASH_SCREEN_LONG + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end + +HypnosisAnim: + battle_anim HYPNOSIS, SE_FLASH_SCREEN_LONG + db -1 ; end + +MeditateAnim: + battle_anim MEDITATE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +AgilityAnim: + battle_anim AGILITY, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +QuickAttackAnim: + battle_anim QUICK_ATTACK, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +RageAnim: + battle_anim RAGE, SUBANIM_01, 0, 6 + db -1 ; end + +TeleportAnim: + battle_anim TELEPORT, SE_SQUISH_MON_PIC + battle_anim NO_MOVE, SE_SHOOT_BALLS_UPWARD + db -1 ; end + +NightShadeAnim: + battle_anim CONFUSION, SE_FLASH_SCREEN_LONG + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end + +MimicAnim: + battle_anim MIMIC, SUBANIM_21, 1, 6 + battle_anim MIMIC, SUBANIM_22, 1, 6 + db -1 ; end + +ScreechAnim: + battle_anim SCREECH, SUBANIM_12, 1, 6 + db -1 ; end + +DoubleTeamAnim: + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim DOUBLE_TEAM, SE_SHAKE_BACK_AND_FORTH + battle_anim NO_MOVE, SE_SHOW_MON_PIC + battle_anim BARRIER, SUBANIM_33, 1, 6 + db -1 ; end + +RecoverAnim: + battle_anim RECOVER, SE_BLINK_MON + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +HardenAnim: + battle_anim HARDEN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +MinimizeAnim: + battle_anim MINIMIZE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_MINIMIZE_MON + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +SmokeScreenAnim: + battle_anim SMOKESCREEN, SUBANIM_28, 1, 6 + battle_anim NO_MOVE, SUBANIM_0A, 0, 4 + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ConfuseRayAnim: + battle_anim CONFUSE_RAY, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_3E, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +WithdrawAnim: + battle_anim DEFENSE_CURL, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SLIDE_MON_DOWN + battle_anim NO_MOVE, SUBANIM_51, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +DefenseCurlAnim: + battle_anim DEFENSE_CURL, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +BarrierAnim: + battle_anim BARRIER, SUBANIM_33, 1, 6 + battle_anim BARRIER, SUBANIM_33, 1, 6 + db -1 ; end + +LightScreenAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim LIGHT_SCREEN, SUBANIM_33, 1, 6 + battle_anim LIGHT_SCREEN, SUBANIM_33, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +HazeAnim: + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ReflectAnim: + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim REFLECT, SUBANIM_33, 1, 6 + battle_anim REFLECT, SUBANIM_33, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +FocusEnergyAnim: + battle_anim FOCUS_ENERGY, SE_SPIRAL_BALLS_INWARD + db -1 ; end + +BideAnim: + battle_anim BIDE, SUBANIM_04, 1, 6 + db -1 ; end + +MetronomeAnim: + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + db -1 ; end + +MirrorMoveAnim: + battle_anim MIRROR_MOVE, SUBANIM_01, 0, 8 + db -1 ; end + +SelfdestructAnim: + battle_anim SELFDESTRUCT, SUBANIM_34, 1, 3 + db -1 ; end + +EggBombAnim: + battle_anim EGG_BOMB, SUBANIM_41, 1, 4 + battle_anim EGG_BOMB, SUBANIM_42, 1, 4 + db -1 ; end + +LickAnim: + battle_anim SLUDGE, SUBANIM_14, 1, 6 + db -1 ; end + +SmogAnim: + battle_anim LEECH_SEED, SE_DARKEN_MON_PALETTE + battle_anim SMOG, SUBANIM_19, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +SludgeAnim: + battle_anim SLUDGE, SUBANIM_13, 1, 6 + battle_anim SLUDGE, SUBANIM_14, 1, 6 + db -1 ; end + +BoneClubAnim: + battle_anim BONE_CLUB, SUBANIM_02, 0, 8 + db -1 ; end + +FireBlastAnim: + battle_anim FIRE_BLAST, SUBANIM_1F, 1, 6 + battle_anim NO_MOVE, SUBANIM_20, 1, 6 + battle_anim NO_MOVE, SUBANIM_20, 1, 6 + battle_anim NO_MOVE, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + db -1 ; end + +WaterfallAnim: + battle_anim LEECH_SEED, SE_SLIDE_MON_DOWN + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + battle_anim NO_MOVE, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_SLIDE_MON_UP + db -1 ; end + +ClampAnim: + battle_anim CLAMP, SUBANIM_2A, 0, 8 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + db -1 ; end + +SwiftAnim: + battle_anim SWIFT, SUBANIM_3F, 1, 3 + db -1 ; end + +SkullBashAnim: + battle_anim SKULL_BASH, SUBANIM_05, 1, 6 + db -1 ; end + +SpikeCannonAnim: + battle_anim SPIKE_CANNON, SUBANIM_04, 1, 4 + db -1 ; end + +ConstrictAnim: + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + db -1 ; end + +AmnesiaAnim: + battle_anim AMNESIA, SUBANIM_25, 0, 8 + battle_anim AMNESIA, SUBANIM_25, 0, 8 + db -1 ; end + +KinesisAnim: + battle_anim KINESIS, SUBANIM_01, 0, 8 + db -1 ; end + +SoftboiledAnim: + battle_anim LEECH_SEED, SE_SLIDE_MON_HALF_OFF + battle_anim SOFTBOILED, SUBANIM_4C, 0, 8 + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +HiJumpKickAnim: + battle_anim HI_JUMP_KICK, SUBANIM_04, 1, 6 + db -1 ; end + +GlareAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim GLARE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +DreamEaterAnim: + battle_anim DREAM_EATER, SE_FLASH_SCREEN_LONG + battle_anim DREAM_EATER, SE_DARK_SCREEN_PALETTE + battle_anim DREAM_EATER, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +PoisonGasAnim: + battle_anim POISON_GAS, SUBANIM_19, 1, 6 + db -1 ; end + +BarrageAnim: + battle_anim BARRAGE, SUBANIM_41, 1, 3 + battle_anim NO_MOVE, SUBANIM_55, 0, 5 + db -1 ; end + +LeechLifeAnim: + battle_anim LEECH_LIFE, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end + +LovelyKissAnim: + battle_anim LOVELY_KISS, SUBANIM_12, 0, 6 + db -1 ; end + +SkyAttackAnim: + battle_anim SKY_ATTACK, SE_SQUISH_MON_PIC + battle_anim NO_MOVE, SE_SHOOT_BALLS_UPWARD + battle_anim HI_JUMP_KICK, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +TransformAnim: + battle_anim TRANSFORM, SUBANIM_21, 1, 6 + battle_anim TRANSFORM, SUBANIM_22, 1, 4 + battle_anim NO_MOVE, SUBANIM_47, 0, 8 + battle_anim NO_MOVE, SE_TRANSFORM_MON + db -1 ; end + +BubbleAnim: + battle_anim BUBBLE, SUBANIM_35, 0, 22 + db -1 ; end + +DizzyPunchAnim: + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DOUBLESLAP, SUBANIM_02, 0, 6 + db -1 ; end + +SporeAnim: + battle_anim SPORE, SUBANIM_36, 0, 6 + db -1 ; end + +FlashAnim: + battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE + battle_anim GLARE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +PsywaveAnim: + battle_anim SUPERSONIC, SUBANIM_31, 0, 6 + battle_anim CONFUSION, SE_WAVY_SCREEN + db -1 ; end + +SplashAnim: + battle_anim SPLASH, SE_BOUNCE_UP_AND_DOWN + db -1 ; end + +AcidArmorAnim: + battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN_AND_HIDE + db -1 ; end + +CrabHammerAnim: + battle_anim CRABHAMMER, SUBANIM_05, 1, 6 + battle_anim NO_MOVE, SUBANIM_2A, 0, 6 + db -1 ; end + +ExplosionAnim: + battle_anim EXPLOSION, SUBANIM_34, 1, 3 + db -1 ; end + +FurySwipesAnim: + battle_anim FURY_SWIPES, SUBANIM_0F, 0, 4 + db -1 ; end + +BonemerangAnim: + battle_anim BONEMERANG, SUBANIM_02, 0, 6 + db -1 ; end + +RestAnim: + battle_anim REST, SUBANIM_3A, 0, 16 + battle_anim REST, SUBANIM_3A, 0, 16 + db -1 ; end + +RockSlideAnim: + battle_anim ROCK_SLIDE, SUBANIM_1D, 0, 4 + battle_anim ROCK_SLIDE, SUBANIM_1E, 0, 3 + battle_anim HYPER_FANG, SUBANIM_04, 1, 6 + db -1 ; end + +HyperFangAnim: + battle_anim HYPER_FANG, SUBANIM_02, 0, 6 + db -1 ; end + +SharpenAnim: + battle_anim SHARPEN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ConversionAnim: + battle_anim CONVERSION, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 1, 6 + battle_anim NO_MOVE, SUBANIM_22, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end + +TriAttackAnim: + battle_anim TRI_ATTACK, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_4D, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end + +SuperFangAnim: + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim SUPER_FANG, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +SlashAnim: + battle_anim SLASH, SUBANIM_0F, 0, 6 + db -1 ; end + +SubstituteAnim: + battle_anim SUBSTITUTE, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_47, 0, 8 + battle_anim NO_MOVE, SE_SUBSTITUTE_MON + db -1 ; end + +BallTossAnim: + battle_anim NO_MOVE, SUBANIM_06, 0, 3 + db -1 ; end + +GreatTossAnim: + battle_anim NO_MOVE, SUBANIM_07, 0, 3 + db -1 ; end + +UltraTossAnim: + battle_anim NO_MOVE, SUBANIM_08, 0, 2 + db -1 ; end + +BallShakeAnim: + battle_anim NO_MOVE, SUBANIM_09, 0, 4 + db -1 ; end + +BallPoofAnim: + battle_anim NO_MOVE, SUBANIM_0A, 0, 4 + db -1 ; end + +ShowPicAnim: + battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC + db -1 ; end + +HidePicAnim: + battle_anim NO_MOVE, SE_HIDE_ENEMY_MON_PIC + db -1 ; end + +EnemyFlashAnim: + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end + +PlayerFlashAnim: + battle_anim NO_MOVE, SE_FLASH_MON_PIC + db -1 ; end + +EnemyHUDShakeAnim: + battle_anim NO_MOVE, SE_SHAKE_ENEMY_HUD + db -1 ; end + +TradeBallDropAnim: + battle_anim NO_MOVE, SUBANIM_48, 2, 6 + db -1 ; end + +TradeBallAppear1Anim: + battle_anim NO_MOVE, SUBANIM_49, 2, 4 + db -1 ; end + +TradeBallAppear2Anim: + battle_anim NO_MOVE, SUBANIM_4A, 2, 6 + db -1 ; end + +TradeBallPoofAnim: + battle_anim NO_MOVE, SUBANIM_4B, 2, 6 + db -1 ; end + +XStatItemAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ShrinkingSquareAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +XStatItemBlackAnim: + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ShrinkingSquareBlackAnim: + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +UnusedAnim: + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOOT_MANY_BALLS_UPWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end + +ParalyzeAnim: + battle_anim BIND, SUBANIM_24, 0, 4 + battle_anim BIND, SUBANIM_24, 0, 4 + db -1 ; end + +PoisonAnim: + battle_anim BIND, SUBANIM_27, 0, 8 + battle_anim BIND, SUBANIM_27, 0, 8 + db -1 ; end + +SleepPlayerAnim: + battle_anim REST, SUBANIM_3A, 0, 16 + battle_anim REST, SUBANIM_3A, 0, 16 + db -1 ; end + +SleepEnemyAnim: + battle_anim REST, SUBANIM_3B, 0, 16 + battle_anim REST, SUBANIM_3B, 0, 16 + db -1 ; end + +ConfusedPlayerAnim: + battle_anim AMNESIA, SUBANIM_25, 0, 8 + battle_anim AMNESIA, SUBANIM_25, 0, 8 + db -1 ; end + +ConfusedEnemyAnim: + battle_anim AMNESIA, SUBANIM_26, 0, 8 + battle_anim AMNESIA, SUBANIM_26, 0, 8 + db -1 ; end + +BallBlockAnim: + battle_anim NO_MOVE, SUBANIM_0B, 0, 3 + db -1 ; end + +FaintAnim: + battle_anim DIG, SE_SLIDE_MON_DOWN + db -1 ; end + +ShakeScreenAnim: + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end + +ThrowRockAnim: + battle_anim BARRAGE, SUBANIM_53, 0, 3 + db -1 ; end + +ThrowBaitAnim: + battle_anim BARRAGE, SUBANIM_54, 0, 3 + db -1 ; end diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm new file mode 100644 index 00000000..a5e3d852 --- /dev/null +++ b/data/moves/effects_pointers.asm @@ -0,0 +1,88 @@ +MoveEffectPointerTable: +; entries correspond to *_EFFECT constants + dw SleepEffect ; EFFECT_01 + dw PoisonEffect ; POISON_SIDE_EFFECT1 + dw DrainHPEffect ; DRAIN_HP_EFFECT + dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT1 + dw FreezeBurnParalyzeEffect ; FREEZE_SIDE_EFFECT + dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT1 + dw ExplodeEffect ; EXPLODE_EFFECT + dw DrainHPEffect ; DREAM_EATER_EFFECT + dw NULL ; MIRROR_MOVE_EFFECT + dw StatModifierUpEffect ; ATTACK_UP1_EFFECT + dw StatModifierUpEffect ; DEFENSE_UP1_EFFECT + dw StatModifierUpEffect ; SPEED_UP1_EFFECT + dw StatModifierUpEffect ; SPECIAL_UP1_EFFECT + dw StatModifierUpEffect ; ACCURACY_UP1_EFFECT + dw StatModifierUpEffect ; EVASION_UP1_EFFECT + dw PayDayEffect ; PAY_DAY_EFFECT + dw NULL ; SWIFT_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN1_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN1_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN1_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN1_EFFECT + dw StatModifierDownEffect ; ACCURACY_DOWN1_EFFECT + dw StatModifierDownEffect ; EVASION_DOWN1_EFFECT + dw ConversionEffect ; CONVERSION_EFFECT + dw HazeEffect ; HAZE_EFFECT + dw BideEffect ; BIDE_EFFECT + dw ThrashPetalDanceEffect ; THRASH_PETAL_DANCE_EFFECT + dw SwitchAndTeleportEffect ; SWITCH_AND_TELEPORT_EFFECT + dw TwoToFiveAttacksEffect ; TWO_TO_FIVE_ATTACKS_EFFECT + dw TwoToFiveAttacksEffect ; EFFECT_1E + dw FlinchSideEffect ; FLINCH_SIDE_EFFECT1 + dw SleepEffect ; SLEEP_EFFECT + dw PoisonEffect ; POISON_SIDE_EFFECT2 + dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT2 + dw FreezeBurnParalyzeEffect ; unused effect + dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT2 + dw FlinchSideEffect ; FLINCH_SIDE_EFFECT2 + dw OneHitKOEffect ; OHKO_EFFECT + dw ChargeEffect ; CHARGE_EFFECT + dw NULL ; SUPER_FANG_EFFECT + dw NULL ; SPECIAL_DAMAGE_EFFECT + dw TrappingEffect ; TRAPPING_EFFECT + dw ChargeEffect ; FLY_EFFECT + dw TwoToFiveAttacksEffect ; ATTACK_TWICE_EFFECT + dw NULL ; JUMP_KICK_EFFECT + dw MistEffect ; MIST_EFFECT + dw FocusEnergyEffect ; FOCUS_ENERGY_EFFECT + dw RecoilEffect ; RECOIL_EFFECT + dw ConfusionEffect ; CONFUSION_EFFECT + dw StatModifierUpEffect ; ATTACK_UP2_EFFECT + dw StatModifierUpEffect ; DEFENSE_UP2_EFFECT + dw StatModifierUpEffect ; SPEED_UP2_EFFECT + dw StatModifierUpEffect ; SPECIAL_UP2_EFFECT + dw StatModifierUpEffect ; ACCURACY_UP2_EFFECT + dw StatModifierUpEffect ; EVASION_UP2_EFFECT + dw HealEffect ; HEAL_EFFECT + dw TransformEffect ; TRANSFORM_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN2_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN2_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN2_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN2_EFFECT + dw StatModifierDownEffect ; ACCURACY_DOWN2_EFFECT + dw StatModifierDownEffect ; EVASION_DOWN2_EFFECT + dw ReflectLightScreenEffect ; LIGHT_SCREEN_EFFECT + dw ReflectLightScreenEffect ; REFLECT_EFFECT + dw PoisonEffect ; POISON_EFFECT + dw ParalyzeEffect ; PARALYZE_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw ConfusionSideEffect ; CONFUSION_SIDE_EFFECT + dw TwoToFiveAttacksEffect ; TWINEEDLE_EFFECT + dw NULL ; unused effect + dw SubstituteEffect ; SUBSTITUTE_EFFECT + dw HyperBeamEffect ; HYPER_BEAM_EFFECT + dw RageEffect ; RAGE_EFFECT + dw MimicEffect ; MIMIC_EFFECT + dw NULL ; METRONOME_EFFECT + dw LeechSeedEffect ; LEECH_SEED_EFFECT + dw SplashEffect ; SPLASH_EFFECT + dw DisableEffect ; DISABLE_EFFECT diff --git a/data/moves/field_move_names.asm b/data/moves/field_move_names.asm new file mode 100644 index 00000000..b68ed828 --- /dev/null +++ b/data/moves/field_move_names.asm @@ -0,0 +1,10 @@ +FieldMoveNames: + db "CUT@" + db "FLY@" + db "@" + db "SURF@" + db "STRENGTH@" + db "FLASH@" + db "DIG@" + db "TELEPORT@" + db "SOFTBOILED@" diff --git a/data/moves/field_moves.asm b/data/moves/field_moves.asm new file mode 100644 index 00000000..d7e9219b --- /dev/null +++ b/data/moves/field_moves.asm @@ -0,0 +1,14 @@ +FieldMoveDisplayData: + ; move id, FieldMoveNames index, leftmost tile + ; (leftmost tile = -1 + tile column in which the first + ; letter of the move's name should be displayed) + db CUT, 1, $0C + db FLY, 2, $0C + db ANIM_B4, 3, $0C ; unused + db SURF, 4, $0C + db STRENGTH, 5, $0A + db FLASH, 6, $0C + db DIG, 7, $0C + db TELEPORT, 8, $0A + db SOFTBOILED, 9, $08 + db -1 ; end diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm new file mode 100644 index 00000000..bc3d1dc6 --- /dev/null +++ b/data/moves/grammar.asm @@ -0,0 +1,72 @@ +ExclamationPointMoveSets: +; set 0 + db SWORDS_DANCE + db GROWTH + db 0 ; end set + +; set 1 + db RECOVER + db BIDE + db SELFDESTRUCT + db AMNESIA + db 0 ; end set + +; set 2 + db MEDITATE + db AGILITY + db TELEPORT + db MIMIC + db DOUBLE_TEAM + db BARRAGE + db 0 ; end set + +; set 3 + db POUND + db SCRATCH + db VICEGRIP + db WING_ATTACK + db FLY + db BIND + db SLAM + db HORN_ATTACK + db BODY_SLAM + db WRAP + db THRASH + db TAIL_WHIP + db LEER + db BITE + db GROWL + db ROAR + db SING + db PECK + db COUNTER + db STRENGTH + db ABSORB + db STRING_SHOT + db EARTHQUAKE + db FISSURE + db DIG + db TOXIC + db SCREECH + db HARDEN + db MINIMIZE + db WITHDRAW + db DEFENSE_CURL + db METRONOME + db LICK + db CLAMP + db CONSTRICT + db POISON_GAS + db LEECH_LIFE + db BUBBLE + db FLASH + db SPLASH + db ACID_ARMOR + db FURY_SWIPES + db REST + db SHARPEN + db SLASH + db SUBSTITUTE + db 0 ; end set + + db -1 ; end diff --git a/data/moves/hm_moves.asm b/data/moves/hm_moves.asm new file mode 100644 index 00000000..4f14b8df --- /dev/null +++ b/data/moves/hm_moves.asm @@ -0,0 +1,10 @@ +; This file is INCLUDEd twice: +; - for HMMoves in home/names.asm +; - for HMMoveArray in engine/pokemon/bills_pc.asm + + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db -1 ; end diff --git a/data/moves/moves.asm b/data/moves/moves.asm new file mode 100644 index 00000000..85b6dcfc --- /dev/null +++ b/data/moves/moves.asm @@ -0,0 +1,178 @@ +Moves: +; Characteristics of each move. + +move: MACRO + db \1 ; animation (interchangeable with move id) + db \2 ; effect + db \3 ; power + db \4 ; type + db \5 percent ; accuracy + db \6 ; pp +ENDM + + move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 +MoveEnd: + move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 + move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 + move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 + move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20 + move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20 + move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15 + move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15 + move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15 + move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 + move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30 + move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5 + move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10 + move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30 + move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30 + move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 + move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 + move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20 + move FLY, FLY_EFFECT, 70, FLYING, 95, 15 + move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20 + move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20 + move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10 + move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20 + move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30 + move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5 + move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25 + move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15 + move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15 + move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15 + move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25 + move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 + move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5 + move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35 + move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15 + move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20 + move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20 + move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20 + move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15 + move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 + move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35 + move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20 + move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20 + move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 + move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25 + move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40 + move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20 + move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15 + move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20 + move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20 + move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20 + move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30 + move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25 + move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15 + move MIST, MIST_EFFECT, 0, ICE, 100, 30 + move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25 + move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5 + move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15 + move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10 + move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5 + move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC_TYPE, 100, 20 + move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20 + move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20 + move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5 + move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 + move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20 + move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25 + move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20 + move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20 + move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20 + move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15 + move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20 + move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10 + move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10 + move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40 + move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25 + move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10 + move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35 + move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30 + move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15 + move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20 + move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40 + move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10 + move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15 + move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30 + move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15 + move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20 + move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10 + move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15 + move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10 + move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5 + move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10 + move TOXIC, POISON_EFFECT, 0, POISON, 85, 10 + move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC_TYPE, 100, 25 + move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC_TYPE, 100, 10 + move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC_TYPE, 60, 20 + move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC_TYPE, 100, 40 + move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 30 + move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30 + move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20 + move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC_TYPE, 100, 20 + move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15 + move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 + move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 + move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 + move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 + move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 + move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 + move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 + move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10 + move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40 + move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40 + move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 30 + move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC_TYPE, 100, 30 + move HAZE, HAZE_EFFECT, 0, ICE, 100, 30 + move REFLECT, REFLECT_EFFECT, 0, PSYCHIC_TYPE, 100, 20 + move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30 + move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10 + move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10 + move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20 + move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5 + move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10 + move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30 + move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20 + move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20 + move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20 + move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5 + move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15 + move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10 + move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20 + move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15 + move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15 + move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35 + move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 20 + move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC_TYPE, 80, 15 + move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 + move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 + move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 + move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC_TYPE, 100, 15 + move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40 + move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 + move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15 + move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10 + move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5 + move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10 + move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30 + move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10 + move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15 + move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20 + move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC_TYPE, 80, 15 + move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40 + move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40 + move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10 + move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 + move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 + move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 + move REST, HEAL_EFFECT, 0, PSYCHIC_TYPE, 100, 10 + move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 + move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 + move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 + move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30 + move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10 + move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10 + move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 + move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 + move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 diff --git a/data/moves/names.asm b/data/moves/names.asm new file mode 100644 index 00000000..cbb1a322 --- /dev/null +++ b/data/moves/names.asm @@ -0,0 +1,166 @@ +MoveNames:: + db "POUND@" + db "KARATE CHOP@" + db "DOUBLESLAP@" + db "COMET PUNCH@" + db "MEGA PUNCH@" + db "PAY DAY@" + db "FIRE PUNCH@" + db "ICE PUNCH@" + db "THUNDERPUNCH@" + db "SCRATCH@" + db "VICEGRIP@" + db "GUILLOTINE@" + db "RAZOR WIND@" + db "SWORDS DANCE@" + db "CUT@" + db "GUST@" + db "WING ATTACK@" + db "WHIRLWIND@" + db "FLY@" + db "BIND@" + db "SLAM@" + db "VINE WHIP@" + db "STOMP@" + db "DOUBLE KICK@" + db "MEGA KICK@" + db "JUMP KICK@" + db "ROLLING KICK@" + db "SAND-ATTACK@" + db "HEADBUTT@" + db "HORN ATTACK@" + db "FURY ATTACK@" + db "HORN DRILL@" + db "TACKLE@" + db "BODY SLAM@" + db "WRAP@" + db "TAKE DOWN@" + db "THRASH@" + db "DOUBLE-EDGE@" + db "TAIL WHIP@" + db "POISON STING@" + db "TWINEEDLE@" + db "PIN MISSILE@" + db "LEER@" + db "BITE@" + db "GROWL@" + db "ROAR@" + db "SING@" + db "SUPERSONIC@" + db "SONICBOOM@" + db "DISABLE@" + db "ACID@" + db "EMBER@" + db "FLAMETHROWER@" + db "MIST@" + db "WATER GUN@" + db "HYDRO PUMP@" + db "SURF@" + db "ICE BEAM@" + db "BLIZZARD@" + db "PSYBEAM@" + db "BUBBLEBEAM@" + db "AURORA BEAM@" + db "HYPER BEAM@" + db "PECK@" + db "DRILL PECK@" + db "SUBMISSION@" + db "LOW KICK@" + db "COUNTER@" + db "SEISMIC TOSS@" + db "STRENGTH@" + db "ABSORB@" + db "MEGA DRAIN@" + db "LEECH SEED@" + db "GROWTH@" + db "RAZOR LEAF@" + db "SOLARBEAM@" + db "POISONPOWDER@" + db "STUN SPORE@" + db "SLEEP POWDER@" + db "PETAL DANCE@" + db "STRING SHOT@" + db "DRAGON RAGE@" + db "FIRE SPIN@" + db "THUNDERSHOCK@" + db "THUNDERBOLT@" + db "THUNDER WAVE@" + db "THUNDER@" + db "ROCK THROW@" + db "EARTHQUAKE@" + db "FISSURE@" + db "DIG@" + db "TOXIC@" + db "CONFUSION@" + db "PSYCHIC@" + db "HYPNOSIS@" + db "MEDITATE@" + db "AGILITY@" + db "QUICK ATTACK@" + db "RAGE@" + db "TELEPORT@" + db "NIGHT SHADE@" + db "MIMIC@" + db "SCREECH@" + db "DOUBLE TEAM@" + db "RECOVER@" + db "HARDEN@" + db "MINIMIZE@" + db "SMOKESCREEN@" + db "CONFUSE RAY@" + db "WITHDRAW@" + db "DEFENSE CURL@" + db "BARRIER@" + db "LIGHT SCREEN@" + db "HAZE@" + db "REFLECT@" + db "FOCUS ENERGY@" + db "BIDE@" + db "METRONOME@" + db "MIRROR MOVE@" + db "SELFDESTRUCT@" + db "EGG BOMB@" + db "LICK@" + db "SMOG@" + db "SLUDGE@" + db "BONE CLUB@" + db "FIRE BLAST@" + db "WATERFALL@" + db "CLAMP@" + db "SWIFT@" + db "SKULL BASH@" + db "SPIKE CANNON@" + db "CONSTRICT@" + db "AMNESIA@" + db "KINESIS@" + db "SOFTBOILED@" + db "HI JUMP KICK@" + db "GLARE@" + db "DREAM EATER@" + db "POISON GAS@" + db "BARRAGE@" + db "LEECH LIFE@" + db "LOVELY KISS@" + db "SKY ATTACK@" + db "TRANSFORM@" + db "BUBBLE@" + db "DIZZY PUNCH@" + db "SPORE@" + db "FLASH@" + db "PSYWAVE@" + db "SPLASH@" + db "ACID ARMOR@" + db "CRABHAMMER@" + db "EXPLOSION@" + db "FURY SWIPES@" + db "BONEMERANG@" + db "REST@" + db "ROCK SLIDE@" + db "HYPER FANG@" + db "SHARPEN@" + db "CONVERSION@" + db "TRI ATTACK@" + db "SUPER FANG@" + db "SLASH@" + db "SUBSTITUTE@" + db "STRUGGLE@" diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm new file mode 100644 index 00000000..c1f12084 --- /dev/null +++ b/data/moves/sfx.asm @@ -0,0 +1,168 @@ +MoveSoundTable: + ; ID, pitch mod, tempo mod + db SFX_POUND, $00, $80 ; POUND + db SFX_BATTLE_0C, $10, $80 ; KARATE_CHOP + db SFX_DOUBLESLAP, $00, $80 ; DOUBLESLAP + db SFX_BATTLE_0B, $01, $80 ; COMET_PUNCH + db SFX_BATTLE_0D, $00, $40 ; MEGA_PUNCH + db SFX_SILPH_SCOPE, $00, $ff ; PAY_DAY + db SFX_BATTLE_0D, $10, $60 ; FIRE_PUNCH + db SFX_BATTLE_0D, $20, $80 ; ICE_PUNCH + db SFX_BATTLE_0D, $00, $a0 ; THUNDERPUNCH + db SFX_DAMAGE, $00, $80 ; SCRATCH + db SFX_BATTLE_0F, $20, $40 ; VICEGRIP + db SFX_BATTLE_0F, $00, $80 ; GUILLOTINE + db SFX_BATTLE_0E, $00, $a0 ; RAZOR_WIND + db SFX_NOT_VERY_EFFECTIVE, $10, $c0 ; SWORDS_DANCE + db SFX_NOT_VERY_EFFECTIVE, $00, $a0 ; CUT + db SFX_BATTLE_12, $00, $c0 ; GUST + db SFX_BATTLE_12, $10, $a0 ; WING_ATTACK + db SFX_BATTLE_13, $00, $e0 ; WHIRLWIND + db SFX_NOT_VERY_EFFECTIVE, $20, $c0 ; FLY + db SFX_BATTLE_14, $00, $80 ; BIND + db SFX_BATTLE_22, $00, $80 ; SLAM + db SFX_VINE_WHIP, $01, $80 ; VINE_WHIP + db SFX_BATTLE_20, $00, $80 ; STOMP + db SFX_BATTLE_17, $f0, $40 ; DOUBLE_KICK + db SFX_SUPER_EFFECTIVE, $00, $80 ; MEGA_KICK + db SFX_BATTLE_17, $00, $80 ; JUMP_KICK + db SFX_BATTLE_21, $10, $80 ; ROLLING_KICK + db SFX_BATTLE_1B, $01, $a0 ; SAND_ATTACK + db SFX_BATTLE_18, $00, $80 ; HEADBUTT + db SFX_BATTLE_1E, $00, $60 ; HORN_ATTACK + db SFX_BATTLE_1E, $01, $40 ; FURY_ATTACK + db SFX_HORN_DRILL, $00, $a0 ; HORN_DRILL + db SFX_SUPER_EFFECTIVE, $10, $a0 ; TACKLE + db SFX_BATTLE_20, $00, $c0 ; BODY_SLAM + db SFX_BATTLE_14, $10, $60 ; WRAP + db SFX_SUPER_EFFECTIVE, $00, $a0 ; TAKE_DOWN + db SFX_BATTLE_22, $11, $c0 ; THRASH + db SFX_SUPER_EFFECTIVE, $20, $c0 ; DOUBLE_EDGE + db SFX_BATTLE_21, $00, $80 ; TAIL_WHIP + db SFX_BATTLE_1B, $00, $80 ; POISON_STING + db SFX_BATTLE_1B, $20, $c0 ; TWINEEDLE + db SFX_BATTLE_19, $00, $80 ; PIN_MISSILE + db SFX_BATTLE_31, $ff, $40 ; LEER + db SFX_BATTLE_1E, $00, $80 ; BITE + db SFX_BATTLE_0B, $00, $c0 ; GROWL + db SFX_BATTLE_0B, $00, $40 ; ROAR + db SFX_BATTLE_35, $00, $80 ; SING + db SFX_BATTLE_27, $40, $60 ; SUPERSONIC + db SFX_BATTLE_27, $00, $80 ; SONICBOOM + db SFX_BATTLE_27, $ff, $40 ; DISABLE + db SFX_BATTLE_2A, $80, $c0 ; ACID + db SFX_BATTLE_19, $10, $a0 ; EMBER + db SFX_BATTLE_19, $21, $e0 ; FLAMETHROWER + db SFX_BATTLE_29, $00, $80 ; MIST + db SFX_BATTLE_24, $20, $60 ; WATER_GUN + db SFX_BATTLE_2A, $00, $80 ; HYDRO_PUMP + db SFX_BATTLE_2C, $00, $80 ; SURF + db SFX_BATTLE_28, $40, $80 ; ICE_BEAM + db SFX_BATTLE_29, $f0, $e0 ; BLIZZARD + db SFX_PSYBEAM, $00, $80 ; PSYBEAM + db SFX_BATTLE_2A, $f0, $60 ; BUBBLEBEAM + db SFX_BATTLE_28, $00, $80 ; AURORA_BEAM + db SFX_BATTLE_36, $00, $80 ; HYPER_BEAM + db SFX_PECK, $01, $a0 ; PECK + db SFX_BATTLE_13, $f0, $20 ; DRILL_PECK + db SFX_BATTLE_23, $01, $c0 ; SUBMISSION + db SFX_BATTLE_23, $00, $80 ; LOW_KICK + db SFX_SUPER_EFFECTIVE, $00, $e0 ; COUNTER + db SFX_BATTLE_26, $01, $60 ; SEISMIC_TOSS + db SFX_BATTLE_26, $20, $40 ; STRENGTH + db SFX_BATTLE_24, $00, $80 ; ABSORB + db SFX_BATTLE_24, $40, $c0 ; MEGA_DRAIN + db SFX_BATTLE_1B, $03, $60 ; LEECH_SEED + db SFX_BATTLE_25, $11, $e0 ; GROWTH + db SFX_BATTLE_12, $20, $e0 ; RAZOR_LEAF + db SFX_BATTLE_2E, $00, $80 ; SOLARBEAM + db SFX_BATTLE_1C, $00, $80 ; POISONPOWDER + db SFX_BATTLE_1C, $11, $a0 ; STUN_SPORE + db SFX_BATTLE_1C, $01, $c0 ; SLEEP_POWDER + db SFX_BATTLE_13, $14, $c0 ; PETAL_DANCE + db SFX_BATTLE_1B, $02, $a0 ; STRING_SHOT + db SFX_BATTLE_29, $f0, $80 ; DRAGON_RAGE + db SFX_BATTLE_29, $20, $c0 ; FIRE_SPIN + db SFX_BATTLE_2F, $00, $20 ; THUNDERSHOCK + db SFX_BATTLE_2F, $20, $80 ; THUNDERBOLT + db SFX_BATTLE_2E, $12, $60 ; THUNDER_WAVE + db SFX_BATTLE_26, $00, $80 ; THUNDER + db SFX_BATTLE_14, $01, $e0 ; ROCK_THROW + db SFX_BATTLE_29, $0f, $e0 ; EARTHQUAKE + db SFX_BATTLE_29, $11, $20 ; FISSURE + db SFX_DAMAGE, $10, $40 ; DIG + db SFX_BATTLE_0F, $10, $c0 ; TOXIC + db SFX_BATTLE_14, $00, $20 ; CONFUSION + db SFX_PSYCHIC_M, $00, $80 ; PSYCHIC_M + db SFX_BATTLE_35, $11, $18 ; HYPNOSIS + db SFX_BATTLE_09, $20, $c0 ; MEDITATE + db SFX_FAINT_FALL, $20, $c0 ; AGILITY + db SFX_BATTLE_25, $00, $10 ; QUICK_ATTACK + db SFX_BATTLE_26, $f0, $20 ; RAGE + db SFX_BATTLE_33, $f0, $c0 ; TELEPORT + db SFX_NOT_VERY_EFFECTIVE, $f0, $e0 ; NIGHT_SHADE + db SFX_BATTLE_09, $f0, $40 ; MIMIC + db SFX_BATTLE_31, $00, $80 ; SCREECH + db SFX_BATTLE_33, $80, $40 ; DOUBLE_TEAM + db SFX_BATTLE_33, $00, $80 ; RECOVER + db SFX_BATTLE_14, $11, $20 ; HARDEN + db SFX_BATTLE_14, $22, $10 ; MINIMIZE + db SFX_BATTLE_1B, $f1, $ff ; SMOKESCREEN + db SFX_BATTLE_13, $f1, $ff ; CONFUSE_RAY + db SFX_BATTLE_14, $33, $30 ; WITHDRAW + db SFX_BATTLE_32, $40, $c0 ; DEFENSE_CURL + db SFX_BATTLE_0E, $20, $20 ; BARRIER + db SFX_BATTLE_0E, $f0, $10 ; LIGHT_SCREEN + db SFX_BATTLE_0F, $f8, $10 ; HAZE + db SFX_NOT_VERY_EFFECTIVE, $f0, $10 ; REFLECT + db SFX_BATTLE_25, $00, $80 ; FOCUS_ENERGY + db SFX_BATTLE_18, $00, $c0 ; BIDE + db SFX_BATTLE_32, $c0, $ff ; METRONOME + db SFX_BATTLE_09, $f2, $20 ; MIRROR_MOVE + db SFX_BATTLE_34, $00, $80 ; SELFDESTRUCT + db SFX_BATTLE_34, $00, $40 ; EGG_BOMB + db SFX_BATTLE_09, $00, $40 ; LICK + db SFX_NOT_VERY_EFFECTIVE, $10, $ff ; SMOG + db SFX_BATTLE_2A, $20, $20 ; SLUDGE + db SFX_BATTLE_32, $00, $80 ; BONE_CLUB + db SFX_BATTLE_29, $1f, $20 ; FIRE_BLAST + db SFX_BATTLE_25, $2f, $80 ; WATERFALL + db SFX_BATTLE_0F, $1f, $ff ; CLAMP + db SFX_BATTLE_2B, $1f, $60 ; SWIFT + db SFX_BATTLE_26, $1e, $20 ; SKULL_BASH + db SFX_BATTLE_26, $1f, $18 ; SPIKE_CANNON + db SFX_BATTLE_14, $0f, $80 ; CONSTRICT + db SFX_BATTLE_09, $f8, $10 ; AMNESIA + db SFX_FAINT_FALL, $18, $20 ; KINESIS + db SFX_BATTLE_32, $08, $40 ; SOFTBOILED + db SFX_BATTLE_17, $01, $e0 ; HI_JUMP_KICK + db SFX_NOT_VERY_EFFECTIVE, $09, $ff ; GLARE + db SFX_BATTLE_35, $42, $01 ; DREAM_EATER + db SFX_BATTLE_1C, $00, $ff ; POISON_GAS + db SFX_BATTLE_32, $08, $e0 ; BARRAGE + db SFX_BATTLE_24, $00, $80 ; LEECH_LIFE + db SFX_BATTLE_09, $88, $10 ; LOVELY_KISS + db SFX_BATTLE_25, $48, $ff ; SKY_ATTACK + db SFX_FAINT_FALL, $ff, $ff ; TRANSFORM + db SFX_BATTLE_24, $ff, $10 ; BUBBLE + db SFX_FAINT_FALL, $ff, $04 ; DIZZY_PUNCH + db SFX_BATTLE_1C, $01, $ff ; SPORE + db SFX_BATTLE_13, $f8, $ff ; FLASH + db SFX_BATTLE_0C, $f0, $f0 ; PSYWAVE + db SFX_BATTLE_0F, $08, $10 ; SPLASH + db SFX_BATTLE_0D, $f0, $ff ; ACID_ARMOR + db SFX_SUPER_EFFECTIVE, $f0, $ff ; CRABHAMMER + db SFX_BATTLE_34, $10, $ff ; EXPLOSION + db SFX_BATTLE_0E, $f0, $20 ; FURY_SWIPES + db SFX_BATTLE_2B, $f0, $60 ; BONEMERANG + db SFX_BATTLE_21, $12, $10 ; REST + db SFX_BATTLE_36, $f0, $20 ; ROCK_SLIDE + db SFX_BATTLE_1E, $12, $ff ; HYPER_FANG + db SFX_BATTLE_31, $80, $04 ; SHARPEN + db SFX_BATTLE_33, $f0, $10 ; CONVERSION + db SFX_BATTLE_29, $f8, $ff ; TRI_ATTACK + db SFX_BATTLE_26, $f0, $ff ; SUPER_FANG + db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH + db SFX_BATTLE_2C, $d8, $04 ; SUBSTITUTE + db SFX_BATTLE_0B, $00, $80 ; STRUGGLE + db SFX_BATTLE_0B, $00, $80 diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm new file mode 100644 index 00000000..a5b0bfec --- /dev/null +++ b/data/moves/tmhm_moves.asm @@ -0,0 +1,28 @@ +; The add_hm and add_tm macros in constants/item_constants.asm simultaneously +; define constants for the item IDs and for the corresponding move values. + +TechnicalMachines: + +n = 1 +REPT NUM_TMS +IF n < 10 +MOVE_FOR_TM EQUS "TM0{d:n}_MOVE" +ELSE +MOVE_FOR_TM EQUS "TM{d:n}_MOVE" +ENDC + db MOVE_FOR_TM +PURGE MOVE_FOR_TM +n = n + 1 +ENDR + +n = 1 +REPT NUM_HMS +IF n < 10 +MOVE_FOR_HM EQUS "HM0{d:n}_MOVE" +ELSE +MOVE_FOR_HM EQUS "HM{d:n}_MOVE" +ENDC + db MOVE_FOR_HM +PURGE MOVE_FOR_HM +n = n + 1 +ENDR diff --git a/data/player_names.asm b/data/player_names.asm new file mode 100644 index 00000000..f57c9877 --- /dev/null +++ b/data/player_names.asm @@ -0,0 +1,31 @@ +IF DEF(_RED) +DefaultNamesPlayer: + db "NEW NAME" + next "RED" + next "ASH" + next "JACK" + db "@" + +DefaultNamesRival: + db "NEW NAME" + next "BLUE" + next "GARY" + next "JOHN" + db "@" +ENDC + +IF DEF(_BLUE) +DefaultNamesPlayer: + db "NEW NAME" + next "BLUE" + next "GARY" + next "JOHN" + db "@" + +DefaultNamesRival: + db "NEW NAME" + next "RED" + next "ASH" + next "JACK" + db "@" +ENDC diff --git a/data/player_names_list.asm b/data/player_names_list.asm new file mode 100644 index 00000000..56075df0 --- /dev/null +++ b/data/player_names_list.asm @@ -0,0 +1,27 @@ +IF DEF(_RED) +DefaultNamesPlayerList: + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" + +DefaultNamesRivalList: + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" +ENDC + +IF DEF(_BLUE) +DefaultNamesPlayerList: + db "NEW NAME@" + db "BLUE@" + db "GARY@" + db "JOHN@" + +DefaultNamesRivalList: + db "NEW NAME@" + db "RED@" + db "ASH@" + db "JACK@" +ENDC diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm deleted file mode 100755 index 495a8e33..00000000 --- a/data/pokedex_entries.asm +++ /dev/null @@ -1,1259 +0,0 @@ -PokedexEntryPointers: - dw RhydonDexEntry - dw KangaskhanDexEntry - dw NidoranMDexEntry - dw ClefairyDexEntry - dw SpearowDexEntry - dw VoltorbDexEntry - dw NidokingDexEntry - dw SlowbroDexEntry - dw IvysaurDexEntry - dw ExeggutorDexEntry - dw LickitungDexEntry - dw ExeggcuteDexEntry - dw GrimerDexEntry - dw GengarDexEntry - dw NidoranFDexEntry - dw NidoqueenDexEntry - dw CuboneDexEntry - dw RhyhornDexEntry - dw LaprasDexEntry - dw ArcanineDexEntry - dw MewDexEntry - dw GyaradosDexEntry - dw ShellderDexEntry - dw TentacoolDexEntry - dw GastlyDexEntry - dw ScytherDexEntry - dw StaryuDexEntry - dw BlastoiseDexEntry - dw PinsirDexEntry - dw TangelaDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw GrowlitheDexEntry - dw OnixDexEntry - dw FearowDexEntry - dw PidgeyDexEntry - dw SlowpokeDexEntry - dw KadabraDexEntry - dw GravelerDexEntry - dw ChanseyDexEntry - dw MachokeDexEntry - dw MrMimeDexEntry - dw HitmonleeDexEntry - dw HitmonchanDexEntry - dw ArbokDexEntry - dw ParasectDexEntry - dw PsyduckDexEntry - dw DrowzeeDexEntry - dw GolemDexEntry - dw MissingNoDexEntry - dw MagmarDexEntry - dw MissingNoDexEntry - dw ElectabuzzDexEntry - dw MagnetonDexEntry - dw KoffingDexEntry - dw MissingNoDexEntry - dw MankeyDexEntry - dw SeelDexEntry - dw DiglettDexEntry - dw TaurosDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw FarfetchdDexEntry - dw VenonatDexEntry - dw DragoniteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw DoduoDexEntry - dw PoliwagDexEntry - dw JynxDexEntry - dw MoltresDexEntry - dw ArticunoDexEntry - dw ZapdosDexEntry - dw DittoDexEntry - dw MeowthDexEntry - dw KrabbyDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw VulpixDexEntry - dw NinetalesDexEntry - dw PikachuDexEntry - dw RaichuDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw DratiniDexEntry - dw DragonairDexEntry - dw KabutoDexEntry - dw KabutopsDexEntry - dw HorseaDexEntry - dw SeadraDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw SandshrewDexEntry - dw SandslashDexEntry - dw OmanyteDexEntry - dw OmastarDexEntry - dw JigglypuffDexEntry - dw WigglytuffDexEntry - dw EeveeDexEntry - dw FlareonDexEntry - dw JolteonDexEntry - dw VaporeonDexEntry - dw MachopDexEntry - dw ZubatDexEntry - dw EkansDexEntry - dw ParasDexEntry - dw PoliwhirlDexEntry - dw PoliwrathDexEntry - dw WeedleDexEntry - dw KakunaDexEntry - dw BeedrillDexEntry - dw MissingNoDexEntry - dw DodrioDexEntry - dw PrimeapeDexEntry - dw DugtrioDexEntry - dw VenomothDexEntry - dw DewgongDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw CaterpieDexEntry - dw MetapodDexEntry - dw ButterfreeDexEntry - dw MachampDexEntry - dw MissingNoDexEntry - dw GolduckDexEntry - dw HypnoDexEntry - dw GolbatDexEntry - dw MewtwoDexEntry - dw SnorlaxDexEntry - dw MagikarpDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MukDexEntry - dw MissingNoDexEntry - dw KinglerDexEntry - dw CloysterDexEntry - dw MissingNoDexEntry - dw ElectrodeDexEntry - dw ClefableDexEntry - dw WeezingDexEntry - dw PersianDexEntry - dw MarowakDexEntry - dw MissingNoDexEntry - dw HaunterDexEntry - dw AbraDexEntry - dw AlakazamDexEntry - dw PidgeottoDexEntry - dw PidgeotDexEntry - dw StarmieDexEntry - dw BulbasaurDexEntry - dw VenusaurDexEntry - dw TentacruelDexEntry - dw MissingNoDexEntry - dw GoldeenDexEntry - dw SeakingDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw PonytaDexEntry - dw RapidashDexEntry - dw RattataDexEntry - dw RaticateDexEntry - dw NidorinoDexEntry - dw NidorinaDexEntry - dw GeodudeDexEntry - dw PorygonDexEntry - dw AerodactylDexEntry - dw MissingNoDexEntry - dw MagnemiteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw CharmanderDexEntry - dw SquirtleDexEntry - dw CharmeleonDexEntry - dw WartortleDexEntry - dw CharizardDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw OddishDexEntry - dw GloomDexEntry - dw VileplumeDexEntry - dw BellsproutDexEntry - dw WeepinbellDexEntry - dw VictreebelDexEntry - -; string: species name -; height in feet, inches -; weight in pounds -; text entry - -RhydonDexEntry: - db "DRILL@" - db 6,3 - dw 2650 - TX_FAR _RhydonDexEntry - db "@" - -KangaskhanDexEntry: - db "PARENT@" - db 7,3 - dw 1760 - TX_FAR _KangaskhanDexEntry - db "@" - -NidoranMDexEntry: - db "POISON PIN@" - db 1,8 - dw 200 - TX_FAR _NidoranMDexEntry - db "@" - -ClefairyDexEntry: - db "FAIRY@" - db 2,0 - dw 170 - TX_FAR _ClefairyDexEntry - db "@" - -SpearowDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - TX_FAR _SpearowDexEntry - db "@" - -VoltorbDexEntry: - db "BALL@" - db 1,8 - dw 230 - TX_FAR _VoltorbDexEntry - db "@" - -NidokingDexEntry: - db "DRILL@" - db 4,7 - dw 1370 - TX_FAR _NidokingDexEntry - db "@" - -SlowbroDexEntry: - db "HERMITCRAB@" - db 5,3 - dw 1730 - TX_FAR _SlowbroDexEntry - db "@" - -IvysaurDexEntry: - db "SEED@" - db 3,3 - dw 290 - TX_FAR _IvysaurDexEntry - db "@" - -ExeggutorDexEntry: - db "COCONUT@" - db 6,7 - dw 2650 - TX_FAR _ExeggutorDexEntry - db "@" - -LickitungDexEntry: - db "LICKING@" - db 3,11 - dw 1440 - TX_FAR _LickitungDexEntry - db "@" - -ExeggcuteDexEntry: - db "EGG@" - db 1,4 - dw 60 - TX_FAR _ExeggcuteDexEntry - db "@" - -GrimerDexEntry: - db "SLUDGE@" - db 2,11 - dw 660 - TX_FAR _GrimerDexEntry - db "@" - -GengarDexEntry: - db "SHADOW@" - db 4,11 - dw 890 - TX_FAR _GengarDexEntry - db "@" - -NidoranFDexEntry: - db "POISON PIN@" - db 1,4 - dw 150 - TX_FAR _NidoranFDexEntry - db "@" - -NidoqueenDexEntry: - db "DRILL@" - db 4,3 - dw 1320 - TX_FAR _NidoqueenDexEntry - db "@" - -CuboneDexEntry: - db "LONELY@" - db 1,4 - dw 140 - TX_FAR _CuboneDexEntry - db "@" - -RhyhornDexEntry: - db "SPIKES@" - db 3,3 - dw 2540 - TX_FAR _RhyhornDexEntry - db "@" - -LaprasDexEntry: - db "TRANSPORT@" - db 8,2 - dw 4850 - TX_FAR _LaprasDexEntry - db "@" - -ArcanineDexEntry: - db "LEGENDARY@" - db 6,3 - dw 3420 - TX_FAR _ArcanineDexEntry - db "@" - -MewDexEntry: - db "NEW SPECIE@" - db 1,4 - dw 90 - TX_FAR _MewDexEntry - db "@" - -GyaradosDexEntry: - db "ATROCIOUS@" - db 21,4 - dw 5180 - TX_FAR _GyaradosDexEntry - db "@" - -ShellderDexEntry: - db "BIVALVE@" - db 1,0 - dw 90 - TX_FAR _ShellderDexEntry - db "@" - -TentacoolDexEntry: - db "JELLYFISH@" - db 2,11 - dw 1000 - TX_FAR _TentacoolDexEntry - db "@" - -GastlyDexEntry: - db "GAS@" - db 4,3 - dw 2 - TX_FAR _GastlyDexEntry - db "@" - -ScytherDexEntry: - db "MANTIS@" - db 4,11 - dw 1230 - TX_FAR _ScytherDexEntry - db "@" - -StaryuDexEntry: - db "STARSHAPE@" - db 2,7 - dw 760 - TX_FAR _StaryuDexEntry - db "@" - -BlastoiseDexEntry: - db "SHELLFISH@" - db 5,3 - dw 1890 - TX_FAR _BlastoiseDexEntry - db "@" - -PinsirDexEntry: - db "STAGBEETLE@" - db 4,11 - dw 1210 - TX_FAR _PinsirDexEntry - db "@" - -TangelaDexEntry: - db "VINE@" - db 3,3 - dw 770 - TX_FAR _TangelaDexEntry - db "@" - -GrowlitheDexEntry: - db "PUPPY@" - db 2,4 - dw 420 - TX_FAR _GrowlitheDexEntry - db "@" - -OnixDexEntry: - db "ROCK SNAKE@" - db 28,10 - dw 4630 - TX_FAR _OnixDexEntry - db "@" - -FearowDexEntry: - db "BEAK@" - db 3,11 - dw 840 - TX_FAR _FearowDexEntry - db "@" - -PidgeyDexEntry: - db "TINY BIRD@" - db 1,0 - dw 40 - TX_FAR _PidgeyDexEntry - db "@" - -SlowpokeDexEntry: - db "DOPEY@" - db 3,11 - dw 790 - TX_FAR _SlowpokeDexEntry - db "@" - -KadabraDexEntry: - db "PSI@" - db 4,3 - dw 1250 - TX_FAR _KadabraDexEntry - db "@" - -GravelerDexEntry: - db "ROCK@" - db 3,3 - dw 2320 - TX_FAR _GravelerDexEntry - db "@" - -ChanseyDexEntry: - db "EGG@" - db 3,7 - dw 760 - TX_FAR _ChanseyDexEntry - db "@" - -MachokeDexEntry: - db "SUPERPOWER@" - db 4,11 - dw 1550 - TX_FAR _MachokeDexEntry - db "@" - -MrMimeDexEntry: - db "BARRIER@" - db 4,3 - dw 1200 - TX_FAR _MrMimeDexEntry - db "@" - -HitmonleeDexEntry: - db "KICKING@" - db 4,11 - dw 1100 - TX_FAR _HitmonleeDexEntry - db "@" - -HitmonchanDexEntry: - db "PUNCHING@" - db 4,7 - dw 1110 - TX_FAR _HitmonchanDexEntry - db "@" - -ArbokDexEntry: - db "COBRA@" - db 11,6 - dw 1430 - TX_FAR _ArbokDexEntry - db "@" - -ParasectDexEntry: - db "MUSHROOM@" - db 3,3 - dw 650 - TX_FAR _ParasectDexEntry - db "@" - -PsyduckDexEntry: - db "DUCK@" - db 2,7 - dw 430 - TX_FAR _PsyduckDexEntry - db "@" - -DrowzeeDexEntry: - db "HYPNOSIS@" - db 3,3 - dw 710 - TX_FAR _DrowzeeDexEntry - db "@" - -GolemDexEntry: - db "MEGATON@" - db 4,7 - dw 6620 - TX_FAR _GolemDexEntry - db "@" - -MagmarDexEntry: - db "SPITFIRE@" - db 4,3 - dw 980 - TX_FAR _MagmarDexEntry - db "@" - -ElectabuzzDexEntry: - db "ELECTRIC@" - db 3,7 - dw 660 - TX_FAR _ElectabuzzDexEntry - db "@" - -MagnetonDexEntry: - db "MAGNET@" - db 3,3 - dw 1320 - TX_FAR _MagnetonDexEntry - db "@" - -KoffingDexEntry: - db "POISON GAS@" - db 2,0 - dw 20 - TX_FAR _KoffingDexEntry - db "@" - -MankeyDexEntry: - db "PIG MONKEY@" - db 1,8 - dw 620 - TX_FAR _MankeyDexEntry - db "@" - -SeelDexEntry: - db "SEA LION@" - db 3,7 - dw 1980 - TX_FAR _SeelDexEntry - db "@" - -DiglettDexEntry: - db "MOLE@" - db 0,8 - dw 20 - TX_FAR _DiglettDexEntry - db "@" - -TaurosDexEntry: - db "WILD BULL@" - db 4,7 - dw 1950 - TX_FAR _TaurosDexEntry - db "@" - -FarfetchdDexEntry: - db "WILD DUCK@" - db 2,7 - dw 330 - TX_FAR _FarfetchdDexEntry - db "@" - -VenonatDexEntry: - db "INSECT@" - db 3,3 - dw 660 - TX_FAR _VenonatDexEntry - db "@" - -DragoniteDexEntry: - db "DRAGON@" - db 7,3 - dw 4630 - TX_FAR _DragoniteDexEntry - db "@" - -DoduoDexEntry: - db "TWIN BIRD@" - db 4,7 - dw 860 - TX_FAR _DoduoDexEntry - db "@" - -PoliwagDexEntry: - db "TADPOLE@" - db 2,0 - dw 270 - TX_FAR _PoliwagDexEntry - db "@" - -JynxDexEntry: - db "HUMANSHAPE@" - db 4,7 - dw 900 - TX_FAR _JynxDexEntry - db "@" - -MoltresDexEntry: - db "FLAME@" - db 6,7 - dw 1320 - TX_FAR _MoltresDexEntry - db "@" - -ArticunoDexEntry: - db "FREEZE@" - db 5,7 - dw 1220 - TX_FAR _ArticunoDexEntry - db "@" - -ZapdosDexEntry: - db "ELECTRIC@" - db 5,3 - dw 1160 - TX_FAR _ZapdosDexEntry - db "@" - -DittoDexEntry: - db "TRANSFORM@" - db 1,0 - dw 90 - TX_FAR _DittoDexEntry - db "@" - -MeowthDexEntry: - db "SCRATCHCAT@" - db 1,4 - dw 90 - TX_FAR _MeowthDexEntry - db "@" - -KrabbyDexEntry: - db "RIVER CRAB@" - db 1,4 - dw 140 - TX_FAR _KrabbyDexEntry - db "@" - -VulpixDexEntry: - db "FOX@" - db 2,0 - dw 220 - TX_FAR _VulpixDexEntry - db "@" - -NinetalesDexEntry: - db "FOX@" - db 3,7 - dw 440 - TX_FAR _NinetalesDexEntry - db "@" - -PikachuDexEntry: - db "MOUSE@" - db 1,4 - dw 130 - TX_FAR _PikachuDexEntry - db "@" - -RaichuDexEntry: - db "MOUSE@" - db 2,7 - dw 660 - TX_FAR _RaichuDexEntry - db "@" - -DratiniDexEntry: - db "DRAGON@" - db 5,11 - dw 70 - TX_FAR _DratiniDexEntry - db "@" - -DragonairDexEntry: - db "DRAGON@" - db 13,1 - dw 360 - TX_FAR _DragonairDexEntry - db "@" - -KabutoDexEntry: - db "SHELLFISH@" - db 1,8 - dw 250 - TX_FAR _KabutoDexEntry - db "@" - -KabutopsDexEntry: - db "SHELLFISH@" - db 4,3 - dw 890 - TX_FAR _KabutopsDexEntry - db "@" - -HorseaDexEntry: - db "DRAGON@" - db 1,4 - dw 180 - TX_FAR _HorseaDexEntry - db "@" - -SeadraDexEntry: - db "DRAGON@" - db 3,11 - dw 550 - TX_FAR _SeadraDexEntry - db "@" - -SandshrewDexEntry: - db "MOUSE@" - db 2,0 - dw 260 - TX_FAR _SandshrewDexEntry - db "@" - -SandslashDexEntry: - db "MOUSE@" - db 3,3 - dw 650 - TX_FAR _SandslashDexEntry - db "@" - -OmanyteDexEntry: - db "SPIRAL@" - db 1,4 - dw 170 - TX_FAR _OmanyteDexEntry - db "@" - -OmastarDexEntry: - db "SPIRAL@" - db 3,3 - dw 770 - TX_FAR _OmastarDexEntry - db "@" - -JigglypuffDexEntry: - db "BALLOON@" - db 1,8 - dw 120 - TX_FAR _JigglypuffDexEntry - db "@" - -WigglytuffDexEntry: - db "BALLOON@" - db 3,3 - dw 260 - TX_FAR _WigglytuffDexEntry - db "@" - -EeveeDexEntry: - db "EVOLUTION@" - db 1,0 - dw 140 - TX_FAR _EeveeDexEntry - db "@" - -FlareonDexEntry: - db "FLAME@" - db 2,11 - dw 550 - TX_FAR _FlareonDexEntry - db "@" - -JolteonDexEntry: - db "LIGHTNING@" - db 2,7 - dw 540 - TX_FAR _JolteonDexEntry - db "@" - -VaporeonDexEntry: - db "BUBBLE JET@" - db 3,3 - dw 640 - TX_FAR _VaporeonDexEntry - db "@" - -MachopDexEntry: - db "SUPERPOWER@" - db 2,7 - dw 430 - TX_FAR _MachopDexEntry - db "@" - -ZubatDexEntry: - db "BAT@" - db 2,7 - dw 170 - TX_FAR _ZubatDexEntry - db "@" - -EkansDexEntry: - db "SNAKE@" - db 6,7 - dw 150 - TX_FAR _EkansDexEntry - db "@" - -ParasDexEntry: - db "MUSHROOM@" - db 1,0 - dw 120 - TX_FAR _ParasDexEntry - db "@" - -PoliwhirlDexEntry: - db "TADPOLE@" - db 3,3 - dw 440 - TX_FAR _PoliwhirlDexEntry - db "@" - -PoliwrathDexEntry: - db "TADPOLE@" - db 4,3 - dw 1190 - TX_FAR _PoliwrathDexEntry - db "@" - -WeedleDexEntry: - db "HAIRY BUG@" - db 1,0 - dw 70 - TX_FAR _WeedleDexEntry - db "@" - -KakunaDexEntry: - db "COCOON@" - db 2,0 - dw 220 - TX_FAR _KakunaDexEntry - db "@" - -BeedrillDexEntry: - db "POISON BEE@" - db 3,3 - dw 650 - TX_FAR _BeedrillDexEntry - db "@" - -DodrioDexEntry: - db "TRIPLEBIRD@" - db 5,11 - dw 1880 - TX_FAR _DodrioDexEntry - db "@" - -PrimeapeDexEntry: - db "PIG MONKEY@" - db 3,3 - dw 710 - TX_FAR _PrimeapeDexEntry - db "@" - -DugtrioDexEntry: - db "MOLE@" - db 2,4 - dw 730 - TX_FAR _DugtrioDexEntry - db "@" - -VenomothDexEntry: - db "POISONMOTH@" - db 4,11 - dw 280 - TX_FAR _VenomothDexEntry - db "@" - -DewgongDexEntry: - db "SEA LION@" - db 5,7 - dw 2650 - TX_FAR _DewgongDexEntry - db "@" - -CaterpieDexEntry: - db "WORM@" - db 1,0 - dw 60 - TX_FAR _CaterpieDexEntry - db "@" - -MetapodDexEntry: - db "COCOON@" - db 2,4 - dw 220 - TX_FAR _MetapodDexEntry - db "@" - -ButterfreeDexEntry: - db "BUTTERFLY@" - db 3,7 - dw 710 - TX_FAR _ButterfreeDexEntry - db "@" - -MachampDexEntry: - db "SUPERPOWER@" - db 5,3 - dw 2870 - TX_FAR _MachampDexEntry - db "@" - -GolduckDexEntry: - db "DUCK@" - db 5,7 - dw 1690 - TX_FAR _GolduckDexEntry - db "@" - -HypnoDexEntry: - db "HYPNOSIS@" - db 5,3 - dw 1670 - TX_FAR _HypnoDexEntry - db "@" - -GolbatDexEntry: - db "BAT@" - db 5,3 - dw 1210 - TX_FAR _GolbatDexEntry - db "@" - -MewtwoDexEntry: - db "GENETIC@" - db 6,7 - dw 2690 - TX_FAR _MewtwoDexEntry - db "@" - -SnorlaxDexEntry: - db "SLEEPING@" - db 6,11 - dw 10140 - TX_FAR _SnorlaxDexEntry - db "@" - -MagikarpDexEntry: - db "FISH@" - db 2,11 - dw 220 - TX_FAR _MagikarpDexEntry - db "@" - -MukDexEntry: - db "SLUDGE@" - db 3,11 - dw 660 - TX_FAR _MukDexEntry - db "@" - -KinglerDexEntry: - db "PINCER@" - db 4,3 - dw 1320 - TX_FAR _KinglerDexEntry - db "@" - -CloysterDexEntry: - db "BIVALVE@" - db 4,11 - dw 2920 - TX_FAR _CloysterDexEntry - db "@" - -ElectrodeDexEntry: - db "BALL@" - db 3,11 - dw 1470 - TX_FAR _ElectrodeDexEntry - db "@" - -ClefableDexEntry: - db "FAIRY@" - db 4,3 - dw 880 - TX_FAR _ClefableDexEntry - db "@" - -WeezingDexEntry: - db "POISON GAS@" - db 3,11 - dw 210 - TX_FAR _WeezingDexEntry - db "@" - -PersianDexEntry: - db "CLASSY CAT@" - db 3,3 - dw 710 - TX_FAR _PersianDexEntry - db "@" - -MarowakDexEntry: - db "BONEKEEPER@" - db 3,3 - dw 990 - TX_FAR _MarowakDexEntry - db "@" - -HaunterDexEntry: - db "GAS@" - db 5,3 - dw 2 - TX_FAR _HaunterDexEntry - db "@" - -AbraDexEntry: - db "PSI@" - db 2,11 - dw 430 - TX_FAR _AbraDexEntry - db "@" - -AlakazamDexEntry: - db "PSI@" - db 4,11 - dw 1060 - TX_FAR _AlakazamDexEntry - db "@" - -PidgeottoDexEntry: - db "BIRD@" - db 3,7 - dw 660 - TX_FAR _PidgeottoDexEntry - db "@" - -PidgeotDexEntry: - db "BIRD@" - db 4,11 - dw 870 - TX_FAR _PidgeotDexEntry - db "@" - -StarmieDexEntry: - db "MYSTERIOUS@" - db 3,7 - dw 1760 - TX_FAR _StarmieDexEntry - db "@" - -BulbasaurDexEntry: - db "SEED@" - db 2,4 - dw 150 - TX_FAR _BulbasaurDexEntry - db "@" - -VenusaurDexEntry: - db "SEED@" - db 6,7 - dw 2210 - TX_FAR _VenusaurDexEntry - db "@" - -TentacruelDexEntry: - db "JELLYFISH@" - db 5,3 - dw 1210 - TX_FAR _TentacruelDexEntry - db "@" - -GoldeenDexEntry: - db "GOLDFISH@" - db 2,0 - dw 330 - TX_FAR _GoldeenDexEntry - db "@" - -SeakingDexEntry: - db "GOLDFISH@" - db 4,3 - dw 860 - TX_FAR _SeakingDexEntry - db "@" - -PonytaDexEntry: - db "FIRE HORSE@" - db 3,3 - dw 660 - TX_FAR _PonytaDexEntry - db "@" - -RapidashDexEntry: - db "FIRE HORSE@" - db 5,7 - dw 2090 - TX_FAR _RapidashDexEntry - db "@" - -RattataDexEntry: - db "RAT@" - db 1,0 - dw 80 - TX_FAR _RattataDexEntry - db "@" - -RaticateDexEntry: - db "RAT@" - db 2,4 - dw 410 - TX_FAR _RaticateDexEntry - db "@" - -NidorinoDexEntry: - db "POISON PIN@" - db 2,11 - dw 430 - TX_FAR _NidorinoDexEntry - db "@" - -NidorinaDexEntry: - db "POISON PIN@" - db 2,7 - dw 440 - TX_FAR _NidorinaDexEntry - db "@" - -GeodudeDexEntry: - db "ROCK@" - db 1,4 - dw 440 - TX_FAR _GeodudeDexEntry - db "@" - -PorygonDexEntry: - db "VIRTUAL@" - db 2,7 - dw 800 - TX_FAR _PorygonDexEntry - db "@" - -AerodactylDexEntry: - db "FOSSIL@" - db 5,11 - dw 1300 - TX_FAR _AerodactylDexEntry - db "@" - -MagnemiteDexEntry: - db "MAGNET@" - db 1,0 - dw 130 - TX_FAR _MagnemiteDexEntry - db "@" - -CharmanderDexEntry: - db "LIZARD@" - db 2,0 - dw 190 - TX_FAR _CharmanderDexEntry - db "@" - -SquirtleDexEntry: - db "TINYTURTLE@" - db 1,8 - dw 200 - TX_FAR _SquirtleDexEntry - db "@" - -CharmeleonDexEntry: - db "FLAME@" - db 3,7 - dw 420 - TX_FAR _CharmeleonDexEntry - db "@" - -WartortleDexEntry: - db "TURTLE@" - db 3,3 - dw 500 - TX_FAR _WartortleDexEntry - db "@" - -CharizardDexEntry: - db "FLAME@" - db 5,7 - dw 2000 - TX_FAR _CharizardDexEntry - db "@" - -OddishDexEntry: - db "WEED@" - db 1,8 - dw 120 - TX_FAR _OddishDexEntry - db "@" - -GloomDexEntry: - db "WEED@" - db 2,7 - dw 190 - TX_FAR _GloomDexEntry - db "@" - -VileplumeDexEntry: - db "FLOWER@" - db 3,11 - dw 410 - TX_FAR _VileplumeDexEntry - db "@" - -BellsproutDexEntry: - db "FLOWER@" - db 2,4 - dw 90 - TX_FAR _BellsproutDexEntry - db "@" - -WeepinbellDexEntry: - db "FLYCATCHER@" - db 3,3 - dw 140 - TX_FAR _WeepinbellDexEntry - db "@" - -VictreebelDexEntry: - db "FLYCATCHER@" - db 5,7 - dw 340 - TX_FAR _VictreebelDexEntry - db "@" - -MissingNoDexEntry: - db "???@" - db 10 ; 1.0 m - db 100 ; 10.0 kg - text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm new file mode 100644 index 00000000..91ccbe08 --- /dev/null +++ b/data/pokemon/base_stats.asm @@ -0,0 +1,155 @@ +BaseStats:: +MonBaseStats:: +INCLUDE "data/pokemon/base_stats/bulbasaur.asm" +MonBaseStatsEnd:: +INCLUDE "data/pokemon/base_stats/ivysaur.asm" +INCLUDE "data/pokemon/base_stats/venusaur.asm" +INCLUDE "data/pokemon/base_stats/charmander.asm" +INCLUDE "data/pokemon/base_stats/charmeleon.asm" +INCLUDE "data/pokemon/base_stats/charizard.asm" +INCLUDE "data/pokemon/base_stats/squirtle.asm" +INCLUDE "data/pokemon/base_stats/wartortle.asm" +INCLUDE "data/pokemon/base_stats/blastoise.asm" +INCLUDE "data/pokemon/base_stats/caterpie.asm" +INCLUDE "data/pokemon/base_stats/metapod.asm" +INCLUDE "data/pokemon/base_stats/butterfree.asm" +INCLUDE "data/pokemon/base_stats/weedle.asm" +INCLUDE "data/pokemon/base_stats/kakuna.asm" +INCLUDE "data/pokemon/base_stats/beedrill.asm" +INCLUDE "data/pokemon/base_stats/pidgey.asm" +INCLUDE "data/pokemon/base_stats/pidgeotto.asm" +INCLUDE "data/pokemon/base_stats/pidgeot.asm" +INCLUDE "data/pokemon/base_stats/rattata.asm" +INCLUDE "data/pokemon/base_stats/raticate.asm" +INCLUDE "data/pokemon/base_stats/spearow.asm" +INCLUDE "data/pokemon/base_stats/fearow.asm" +INCLUDE "data/pokemon/base_stats/ekans.asm" +INCLUDE "data/pokemon/base_stats/arbok.asm" +INCLUDE "data/pokemon/base_stats/pikachu.asm" +INCLUDE "data/pokemon/base_stats/raichu.asm" +INCLUDE "data/pokemon/base_stats/sandshrew.asm" +INCLUDE "data/pokemon/base_stats/sandslash.asm" +INCLUDE "data/pokemon/base_stats/nidoranf.asm" +INCLUDE "data/pokemon/base_stats/nidorina.asm" +INCLUDE "data/pokemon/base_stats/nidoqueen.asm" +INCLUDE "data/pokemon/base_stats/nidoranm.asm" +INCLUDE "data/pokemon/base_stats/nidorino.asm" +INCLUDE "data/pokemon/base_stats/nidoking.asm" +INCLUDE "data/pokemon/base_stats/clefairy.asm" +INCLUDE "data/pokemon/base_stats/clefable.asm" +INCLUDE "data/pokemon/base_stats/vulpix.asm" +INCLUDE "data/pokemon/base_stats/ninetales.asm" +INCLUDE "data/pokemon/base_stats/jigglypuff.asm" +INCLUDE "data/pokemon/base_stats/wigglytuff.asm" +INCLUDE "data/pokemon/base_stats/zubat.asm" +INCLUDE "data/pokemon/base_stats/golbat.asm" +INCLUDE "data/pokemon/base_stats/oddish.asm" +INCLUDE "data/pokemon/base_stats/gloom.asm" +INCLUDE "data/pokemon/base_stats/vileplume.asm" +INCLUDE "data/pokemon/base_stats/paras.asm" +INCLUDE "data/pokemon/base_stats/parasect.asm" +INCLUDE "data/pokemon/base_stats/venonat.asm" +INCLUDE "data/pokemon/base_stats/venomoth.asm" +INCLUDE "data/pokemon/base_stats/diglett.asm" +INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/meowth.asm" +INCLUDE "data/pokemon/base_stats/persian.asm" +INCLUDE "data/pokemon/base_stats/psyduck.asm" +INCLUDE "data/pokemon/base_stats/golduck.asm" +INCLUDE "data/pokemon/base_stats/mankey.asm" +INCLUDE "data/pokemon/base_stats/primeape.asm" +INCLUDE "data/pokemon/base_stats/growlithe.asm" +INCLUDE "data/pokemon/base_stats/arcanine.asm" +INCLUDE "data/pokemon/base_stats/poliwag.asm" +INCLUDE "data/pokemon/base_stats/poliwhirl.asm" +INCLUDE "data/pokemon/base_stats/poliwrath.asm" +INCLUDE "data/pokemon/base_stats/abra.asm" +INCLUDE "data/pokemon/base_stats/kadabra.asm" +INCLUDE "data/pokemon/base_stats/alakazam.asm" +INCLUDE "data/pokemon/base_stats/machop.asm" +INCLUDE "data/pokemon/base_stats/machoke.asm" +INCLUDE "data/pokemon/base_stats/machamp.asm" +INCLUDE "data/pokemon/base_stats/bellsprout.asm" +INCLUDE "data/pokemon/base_stats/weepinbell.asm" +INCLUDE "data/pokemon/base_stats/victreebel.asm" +INCLUDE "data/pokemon/base_stats/tentacool.asm" +INCLUDE "data/pokemon/base_stats/tentacruel.asm" +INCLUDE "data/pokemon/base_stats/geodude.asm" +INCLUDE "data/pokemon/base_stats/graveler.asm" +INCLUDE "data/pokemon/base_stats/golem.asm" +INCLUDE "data/pokemon/base_stats/ponyta.asm" +INCLUDE "data/pokemon/base_stats/rapidash.asm" +INCLUDE "data/pokemon/base_stats/slowpoke.asm" +INCLUDE "data/pokemon/base_stats/slowbro.asm" +INCLUDE "data/pokemon/base_stats/magnemite.asm" +INCLUDE "data/pokemon/base_stats/magneton.asm" +INCLUDE "data/pokemon/base_stats/farfetchd.asm" +INCLUDE "data/pokemon/base_stats/doduo.asm" +INCLUDE "data/pokemon/base_stats/dodrio.asm" +INCLUDE "data/pokemon/base_stats/seel.asm" +INCLUDE "data/pokemon/base_stats/dewgong.asm" +INCLUDE "data/pokemon/base_stats/grimer.asm" +INCLUDE "data/pokemon/base_stats/muk.asm" +INCLUDE "data/pokemon/base_stats/shellder.asm" +INCLUDE "data/pokemon/base_stats/cloyster.asm" +INCLUDE "data/pokemon/base_stats/gastly.asm" +INCLUDE "data/pokemon/base_stats/haunter.asm" +INCLUDE "data/pokemon/base_stats/gengar.asm" +INCLUDE "data/pokemon/base_stats/onix.asm" +INCLUDE "data/pokemon/base_stats/drowzee.asm" +INCLUDE "data/pokemon/base_stats/hypno.asm" +INCLUDE "data/pokemon/base_stats/krabby.asm" +INCLUDE "data/pokemon/base_stats/kingler.asm" +INCLUDE "data/pokemon/base_stats/voltorb.asm" +INCLUDE "data/pokemon/base_stats/electrode.asm" +INCLUDE "data/pokemon/base_stats/exeggcute.asm" +INCLUDE "data/pokemon/base_stats/exeggutor.asm" +INCLUDE "data/pokemon/base_stats/cubone.asm" +INCLUDE "data/pokemon/base_stats/marowak.asm" +INCLUDE "data/pokemon/base_stats/hitmonlee.asm" +INCLUDE "data/pokemon/base_stats/hitmonchan.asm" +INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/koffing.asm" +INCLUDE "data/pokemon/base_stats/weezing.asm" +INCLUDE "data/pokemon/base_stats/rhyhorn.asm" +INCLUDE "data/pokemon/base_stats/rhydon.asm" +INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/tangela.asm" +INCLUDE "data/pokemon/base_stats/kangaskhan.asm" +INCLUDE "data/pokemon/base_stats/horsea.asm" +INCLUDE "data/pokemon/base_stats/seadra.asm" +INCLUDE "data/pokemon/base_stats/goldeen.asm" +INCLUDE "data/pokemon/base_stats/seaking.asm" +INCLUDE "data/pokemon/base_stats/staryu.asm" +INCLUDE "data/pokemon/base_stats/starmie.asm" +INCLUDE "data/pokemon/base_stats/mrmime.asm" +INCLUDE "data/pokemon/base_stats/scyther.asm" +INCLUDE "data/pokemon/base_stats/jynx.asm" +INCLUDE "data/pokemon/base_stats/electabuzz.asm" +INCLUDE "data/pokemon/base_stats/magmar.asm" +INCLUDE "data/pokemon/base_stats/pinsir.asm" +INCLUDE "data/pokemon/base_stats/tauros.asm" +INCLUDE "data/pokemon/base_stats/magikarp.asm" +INCLUDE "data/pokemon/base_stats/gyarados.asm" +INCLUDE "data/pokemon/base_stats/lapras.asm" +INCLUDE "data/pokemon/base_stats/ditto.asm" +INCLUDE "data/pokemon/base_stats/eevee.asm" +INCLUDE "data/pokemon/base_stats/vaporeon.asm" +INCLUDE "data/pokemon/base_stats/jolteon.asm" +INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/porygon.asm" +INCLUDE "data/pokemon/base_stats/omanyte.asm" +INCLUDE "data/pokemon/base_stats/omastar.asm" +INCLUDE "data/pokemon/base_stats/kabuto.asm" +INCLUDE "data/pokemon/base_stats/kabutops.asm" +INCLUDE "data/pokemon/base_stats/aerodactyl.asm" +INCLUDE "data/pokemon/base_stats/snorlax.asm" +INCLUDE "data/pokemon/base_stats/articuno.asm" +INCLUDE "data/pokemon/base_stats/zapdos.asm" +INCLUDE "data/pokemon/base_stats/moltres.asm" +INCLUDE "data/pokemon/base_stats/dratini.asm" +INCLUDE "data/pokemon/base_stats/dragonair.asm" +INCLUDE "data/pokemon/base_stats/dragonite.asm" +INCLUDE "data/pokemon/base_stats/mewtwo.asm" +BaseStatsEnd:: + assert BaseStatsEnd - BaseStats == (wMonHeaderEnd - wMonHeader) * (NUM_POKEMON - 1) ; discount Mew diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm new file mode 100644 index 00000000..3c69c7c7 --- /dev/null +++ b/data/pokemon/base_stats/abra.asm @@ -0,0 +1,24 @@ + db DEX_ABRA ; pokedex id + + db 25, 20, 15, 90, 105 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 200 ; catch rate + db 73 ; base exp + + INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions + dw AbraPicFront, AbraPicBack + + db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm new file mode 100644 index 00000000..aad1aff5 --- /dev/null +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -0,0 +1,23 @@ + db DEX_AERODACTYL ; pokedex id + + db 80, 105, 65, 130, 60 + ; hp atk def spd spc + + db ROCK, FLYING ; type + db 45 ; catch rate + db 202 ; base exp + + INCBIN "gfx/pokemon/front/aerodactyl.pic", 0, 1 ; sprite dimensions + dw AerodactylPicFront, AerodactylPicBack + + db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, DRAGON_RAGE, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ + REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm new file mode 100644 index 00000000..0064416f --- /dev/null +++ b/data/pokemon/base_stats/alakazam.asm @@ -0,0 +1,25 @@ + db DEX_ALAKAZAM ; pokedex id + + db 55, 50, 45, 120, 135 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 50 ; catch rate + db 186 ; base exp + + INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions + dw AlakazamPicFront, AlakazamPicBack + + db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm new file mode 100644 index 00000000..c34316ce --- /dev/null +++ b/data/pokemon/base_stats/arbok.asm @@ -0,0 +1,23 @@ + db DEX_ARBOK ; pokedex id + + db 60, 85, 69, 80, 65 + ; hp atk def spd spc + + db POISON, POISON ; type + db 90 ; catch rate + db 147 ; base exp + + INCBIN "gfx/pokemon/front/arbok.pic", 0, 1 ; sprite dimensions + dw ArbokPicFront, ArbokPicBack + + db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm new file mode 100644 index 00000000..d21ec31b --- /dev/null +++ b/data/pokemon/base_stats/arcanine.asm @@ -0,0 +1,23 @@ + db DEX_ARCANINE ; pokedex id + + db 90, 110, 80, 95, 80 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 75 ; catch rate + db 213 ; base exp + + INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions + dw ArcaninePicFront, ArcaninePicBack + + db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm new file mode 100644 index 00000000..c40d5326 --- /dev/null +++ b/data/pokemon/base_stats/articuno.asm @@ -0,0 +1,23 @@ + db DEX_ARTICUNO ; pokedex id + + db 90, 85, 100, 85, 125 + ; hp atk def spd spc + + db ICE, FLYING ; type + db 3 ; catch rate + db 215 ; base exp + + INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions + dw ArticunoPicFront, ArticunoPicBack + + db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm new file mode 100644 index 00000000..328538a3 --- /dev/null +++ b/data/pokemon/base_stats/beedrill.asm @@ -0,0 +1,23 @@ + db DEX_BEEDRILL ; pokedex id + + db 65, 80, 40, 75, 45 + ; hp atk def spd spc + + db BUG, POISON ; type + db 45 ; catch rate + db 159 ; base exp + + INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions + dw BeedrillPicFront, BeedrillPicBack + + db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm new file mode 100644 index 00000000..075598db --- /dev/null +++ b/data/pokemon/base_stats/bellsprout.asm @@ -0,0 +1,22 @@ + db DEX_BELLSPROUT ; pokedex id + + db 50, 75, 35, 40, 70 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 255 ; catch rate + db 84 ; base exp + + INCBIN "gfx/pokemon/front/bellsprout.pic", 0, 1 ; sprite dimensions + dw BellsproutPicFront, BellsproutPicBack + + db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm new file mode 100644 index 00000000..512c66a3 --- /dev/null +++ b/data/pokemon/base_stats/blastoise.asm @@ -0,0 +1,25 @@ + db DEX_BLASTOISE ; pokedex id + + db 79, 83, 100, 78, 85 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 210 ; base exp + + INCBIN "gfx/pokemon/front/blastoise.pic", 0, 1 ; sprite dimensions + dw BlastoisePicFront, BlastoisePicBack + + db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm new file mode 100644 index 00000000..e2796f9e --- /dev/null +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -0,0 +1,22 @@ + db DEX_BULBASAUR ; pokedex id + + db 45, 49, 49, 45, 65 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 64 ; base exp + + INCBIN "gfx/pokemon/front/bulbasaur.pic", 0, 1 ; sprite dimensions + dw BulbasaurPicFront, BulbasaurPicBack + + db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm new file mode 100644 index 00000000..f18cf5e9 --- /dev/null +++ b/data/pokemon/base_stats/butterfree.asm @@ -0,0 +1,23 @@ + db DEX_BUTTERFREE ; pokedex id + + db 60, 45, 50, 70, 80 + ; hp atk def spd spc + + db BUG, FLYING ; type + db 45 ; catch rate + db 160 ; base exp + + INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions + dw ButterfreePicFront, ButterfreePicBack + + db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, REST, PSYWAVE, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm new file mode 100644 index 00000000..e9c196ab --- /dev/null +++ b/data/pokemon/base_stats/caterpie.asm @@ -0,0 +1,20 @@ + db DEX_CATERPIE ; pokedex id + + db 45, 30, 35, 45, 20 + ; hp atk def spd spc + + db BUG, BUG ; type + db 255 ; catch rate + db 53 ; base exp + + INCBIN "gfx/pokemon/front/caterpie.pic", 0, 1 ; sprite dimensions + dw CaterpiePicFront, CaterpiePicBack + + db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm new file mode 100644 index 00000000..fc1fcb71 --- /dev/null +++ b/data/pokemon/base_stats/chansey.asm @@ -0,0 +1,27 @@ + db DEX_CHANSEY ; pokedex id + + db 250, 5, 5, 50, 105 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 30 ; catch rate + db 255 ; base exp + + INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions + dw ChanseyPicFront, ChanseyPicBack + + db POUND, DOUBLESLAP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm new file mode 100644 index 00000000..715e0f7f --- /dev/null +++ b/data/pokemon/base_stats/charizard.asm @@ -0,0 +1,25 @@ + db DEX_CHARIZARD ; pokedex id + + db 78, 84, 78, 100, 85 + ; hp atk def spd spc + + db FIRE, FLYING ; type + db 45 ; catch rate + db 209 ; base exp + + INCBIN "gfx/pokemon/front/charizard.pic", 0, 1 ; sprite dimensions + dw CharizardPicFront, CharizardPicBack + + db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm new file mode 100644 index 00000000..acf364ed --- /dev/null +++ b/data/pokemon/base_stats/charmander.asm @@ -0,0 +1,24 @@ + db DEX_CHARMANDER ; pokedex id + + db 39, 52, 43, 65, 50 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 65 ; base exp + + INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions + dw CharmanderPicFront, CharmanderPicBack + + db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm new file mode 100644 index 00000000..0305197e --- /dev/null +++ b/data/pokemon/base_stats/charmeleon.asm @@ -0,0 +1,24 @@ + db DEX_CHARMELEON ; pokedex id + + db 58, 64, 58, 80, 65 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 142 ; base exp + + INCBIN "gfx/pokemon/front/charmeleon.pic", 0, 1 ; sprite dimensions + dw CharmeleonPicFront, CharmeleonPicBack + + db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm new file mode 100644 index 00000000..0aef8405 --- /dev/null +++ b/data/pokemon/base_stats/clefable.asm @@ -0,0 +1,26 @@ + db DEX_CLEFABLE ; pokedex id + + db 95, 70, 73, 60, 85 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 25 ; catch rate + db 129 ; base exp + + INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions + dw ClefablePicFront, ClefablePicBack + + db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset + db GROWTH_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm new file mode 100644 index 00000000..136b30be --- /dev/null +++ b/data/pokemon/base_stats/clefairy.asm @@ -0,0 +1,26 @@ + db DEX_CLEFAIRY ; pokedex id + + db 70, 45, 48, 35, 60 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 150 ; catch rate + db 68 ; base exp + + INCBIN "gfx/pokemon/front/clefairy.pic", 0, 1 ; sprite dimensions + dw ClefairyPicFront, ClefairyPicBack + + db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm new file mode 100644 index 00000000..8b75cb0e --- /dev/null +++ b/data/pokemon/base_stats/cloyster.asm @@ -0,0 +1,24 @@ + db DEX_CLOYSTER ; pokedex id + + db 50, 95, 180, 70, 85 + ; hp atk def spd spc + + db WATER, ICE ; type + db 60 ; catch rate + db 203 ; base exp + + INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions + dw CloysterPicFront, CloysterPicBack + + db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ + SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm new file mode 100644 index 00000000..6a813ab6 --- /dev/null +++ b/data/pokemon/base_stats/cubone.asm @@ -0,0 +1,24 @@ + db DEX_CUBONE ; pokedex id + + db 50, 50, 95, 35, 40 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 190 ; catch rate + db 87 ; base exp + + INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions + dw CubonePicFront, CubonePicBack + + db BONE_CLUB, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm new file mode 100644 index 00000000..822189a9 --- /dev/null +++ b/data/pokemon/base_stats/dewgong.asm @@ -0,0 +1,23 @@ + db DEX_DEWGONG ; pokedex id + + db 90, 70, 80, 70, 95 + ; hp atk def spd spc + + db WATER, ICE ; type + db 75 ; catch rate + db 176 ; base exp + + INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions + dw DewgongPicFront, DewgongPicBack + + db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm new file mode 100644 index 00000000..c8ee014b --- /dev/null +++ b/data/pokemon/base_stats/diglett.asm @@ -0,0 +1,22 @@ + db DEX_DIGLETT ; pokedex id + + db 10, 55, 25, 95, 45 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 255 ; catch rate + db 81 ; base exp + + INCBIN "gfx/pokemon/front/diglett.pic", 0, 1 ; sprite dimensions + dw DiglettPicFront, DiglettPicBack + + db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, REST, ROCK_SLIDE, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm new file mode 100644 index 00000000..a3d919f4 --- /dev/null +++ b/data/pokemon/base_stats/ditto.asm @@ -0,0 +1,20 @@ + db DEX_DITTO ; pokedex id + + db 48, 48, 48, 48, 48 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 35 ; catch rate + db 61 ; base exp + + INCBIN "gfx/pokemon/front/ditto.pic", 0, 1 ; sprite dimensions + dw DittoPicFront, DittoPicBack + + db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm new file mode 100644 index 00000000..a3e95545 --- /dev/null +++ b/data/pokemon/base_stats/dodrio.asm @@ -0,0 +1,23 @@ + db DEX_DODRIO ; pokedex id + + db 60, 110, 70, 100, 60 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 45 ; catch rate + db 158 ; base exp + + INCBIN "gfx/pokemon/front/dodrio.pic", 0, 1 ; sprite dimensions + dw DodrioPicFront, DodrioPicBack + + db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ + SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm new file mode 100644 index 00000000..9803960b --- /dev/null +++ b/data/pokemon/base_stats/doduo.asm @@ -0,0 +1,23 @@ + db DEX_DODUO ; pokedex id + + db 35, 85, 45, 75, 35 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 190 ; catch rate + db 96 ; base exp + + INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions + dw DoduoPicFront, DoduoPicBack + + db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ + FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm new file mode 100644 index 00000000..1178ebcc --- /dev/null +++ b/data/pokemon/base_stats/dragonair.asm @@ -0,0 +1,24 @@ + db DEX_DRAGONAIR ; pokedex id + + db 61, 84, 65, 70, 70 + ; hp atk def spd spc + + db DRAGON, DRAGON ; type + db 45 ; catch rate + db 144 ; base exp + + INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions + dw DragonairPicFront, DragonairPicBack + + db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REST, THUNDER_WAVE, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm new file mode 100644 index 00000000..968d53b6 --- /dev/null +++ b/data/pokemon/base_stats/dragonite.asm @@ -0,0 +1,25 @@ + db DEX_DRAGONITE ; pokedex id + + db 91, 134, 95, 80, 100 + ; hp atk def spd spc + + db DRAGON, FLYING ; type + db 45 ; catch rate + db 218 ; base exp + + INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions + dw DragonitePicFront, DragonitePicBack + + db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm new file mode 100644 index 00000000..42a93822 --- /dev/null +++ b/data/pokemon/base_stats/dratini.asm @@ -0,0 +1,24 @@ + db DEX_DRATINI ; pokedex id + + db 41, 64, 45, 50, 50 + ; hp atk def spd spc + + db DRAGON, DRAGON ; type + db 45 ; catch rate + db 67 ; base exp + + INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions + dw DratiniPicFront, DratiniPicBack + + db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, DRAGON_RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm new file mode 100644 index 00000000..047b9f8e --- /dev/null +++ b/data/pokemon/base_stats/drowzee.asm @@ -0,0 +1,24 @@ + db DEX_DROWZEE ; pokedex id + + db 60, 48, 45, 42, 90 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 190 ; catch rate + db 102 ; base exp + + INCBIN "gfx/pokemon/front/drowzee.pic", 0, 1 ; sprite dimensions + dw DrowzeePicFront, DrowzeePicBack + + db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm new file mode 100644 index 00000000..cffc8750 --- /dev/null +++ b/data/pokemon/base_stats/dugtrio.asm @@ -0,0 +1,22 @@ + db DEX_DUGTRIO ; pokedex id + + db 35, 80, 50, 120, 70 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 50 ; catch rate + db 153 ; base exp + + INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions + dw DugtrioPicFront, DugtrioPicBack + + db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm new file mode 100644 index 00000000..a3a6ed4c --- /dev/null +++ b/data/pokemon/base_stats/eevee.asm @@ -0,0 +1,22 @@ + db DEX_EEVEE ; pokedex id + + db 55, 55, 50, 55, 65 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 92 ; base exp + + INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions + dw EeveePicFront, EeveePicBack + + db TACKLE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm new file mode 100644 index 00000000..878d223f --- /dev/null +++ b/data/pokemon/base_stats/ekans.asm @@ -0,0 +1,23 @@ + db DEX_EKANS ; pokedex id + + db 35, 60, 44, 55, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 255 ; catch rate + db 62 ; base exp + + INCBIN "gfx/pokemon/front/ekans.pic", 0, 1 ; sprite dimensions + dw EkansPicFront, EkansPicBack + + db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ + SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm new file mode 100644 index 00000000..8378cc52 --- /dev/null +++ b/data/pokemon/base_stats/electabuzz.asm @@ -0,0 +1,25 @@ + db DEX_ELECTABUZZ ; pokedex id + + db 65, 83, 57, 105, 85 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 45 ; catch rate + db 156 ; base exp + + INCBIN "gfx/pokemon/front/electabuzz.pic", 0, 1 ; sprite dimensions + dw ElectabuzzPicFront, ElectabuzzPicBack + + db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm new file mode 100644 index 00000000..59f21767 --- /dev/null +++ b/data/pokemon/base_stats/electrode.asm @@ -0,0 +1,23 @@ + db DEX_ELECTRODE ; pokedex id + + db 60, 50, 70, 140, 80 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 60 ; catch rate + db 150 ; base exp + + INCBIN "gfx/pokemon/front/electrode.pic", 0, 1 ; sprite dimensions + dw ElectrodePicFront, ElectrodePicBack + + db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, HYPER_BEAM, RAGE, THUNDERBOLT, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, EXPLOSION, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm new file mode 100644 index 00000000..8eea9e3a --- /dev/null +++ b/data/pokemon/base_stats/exeggcute.asm @@ -0,0 +1,23 @@ + db DEX_EXEGGCUTE ; pokedex id + + db 60, 40, 80, 40, 60 + ; hp atk def spd spc + + db GRASS, PSYCHIC_TYPE ; type + db 90 ; catch rate + db 98 ; base exp + + INCBIN "gfx/pokemon/front/exeggcute.pic", 0, 1 ; sprite dimensions + dw ExeggcutePicFront, ExeggcutePicBack + + db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm new file mode 100644 index 00000000..cb4d3ee6 --- /dev/null +++ b/data/pokemon/base_stats/exeggutor.asm @@ -0,0 +1,23 @@ + db DEX_EXEGGUTOR ; pokedex id + + db 95, 95, 85, 55, 125 + ; hp atk def spd spc + + db GRASS, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 212 ; base exp + + INCBIN "gfx/pokemon/front/exeggutor.pic", 0, 1 ; sprite dimensions + dw ExeggutorPicFront, ExeggutorPicBack + + db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ + REST, PSYWAVE, EXPLOSION, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm new file mode 100644 index 00000000..8e0d79e4 --- /dev/null +++ b/data/pokemon/base_stats/farfetchd.asm @@ -0,0 +1,23 @@ + db DEX_FARFETCHD ; pokedex id + + db 52, 65, 55, 60, 58 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 45 ; catch rate + db 94 ; base exp + + INCBIN "gfx/pokemon/front/farfetchd.pic", 0, 1 ; sprite dimensions + dw FarfetchdPicFront, FarfetchdPicBack + + db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, RAGE, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE, CUT, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm new file mode 100644 index 00000000..33ad5c5a --- /dev/null +++ b/data/pokemon/base_stats/fearow.asm @@ -0,0 +1,22 @@ + db DEX_FEAROW ; pokedex id + + db 65, 90, 65, 100, 61 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 90 ; catch rate + db 162 ; base exp + + INCBIN "gfx/pokemon/front/fearow.pic", 0, 1 ; sprite dimensions + dw FearowPicFront, FearowPicBack + + db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm new file mode 100644 index 00000000..5ccf33ef --- /dev/null +++ b/data/pokemon/base_stats/flareon.asm @@ -0,0 +1,22 @@ + db DEX_FLAREON ; pokedex id + + db 65, 130, 60, 65, 110 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 198 ; base exp + + INCBIN "gfx/pokemon/front/flareon.pic", 0, 1 ; sprite dimensions + dw FlareonPicFront, FlareonPicBack + + db TACKLE, SAND_ATTACK, QUICK_ATTACK, EMBER ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm new file mode 100644 index 00000000..f48b4234 --- /dev/null +++ b/data/pokemon/base_stats/gastly.asm @@ -0,0 +1,22 @@ + db DEX_GASTLY ; pokedex id + + db 30, 35, 30, 80, 100 + ; hp atk def spd spc + + db GHOST, POISON ; type + db 190 ; catch rate + db 95 ; base exp + + INCBIN "gfx/pokemon/front/gastly.pic", 0, 1 ; sprite dimensions + dw GastlyPicFront, GastlyPicBack + + db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm new file mode 100644 index 00000000..3a07a441 --- /dev/null +++ b/data/pokemon/base_stats/gengar.asm @@ -0,0 +1,25 @@ + db DEX_GENGAR ; pokedex id + + db 60, 65, 60, 110, 130 + ; hp atk def spd spc + + db GHOST, POISON ; type + db 45 ; catch rate + db 190 ; base exp + + INCBIN "gfx/pokemon/front/gengar.pic", 0, 1 ; sprite dimensions + dw GengarPicFront, GengarPicBack + + db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ + SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ + SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm new file mode 100644 index 00000000..849e1234 --- /dev/null +++ b/data/pokemon/base_stats/geodude.asm @@ -0,0 +1,24 @@ + db DEX_GEODUDE ; pokedex id + + db 40, 80, 100, 20, 30 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 255 ; catch rate + db 86 ; base exp + + INCBIN "gfx/pokemon/front/geodude.pic", 0, 1 ; sprite dimensions + dw GeodudePicFront, GeodudePicBack + + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm new file mode 100644 index 00000000..7526d5ef --- /dev/null +++ b/data/pokemon/base_stats/gloom.asm @@ -0,0 +1,22 @@ + db DEX_GLOOM ; pokedex id + + db 60, 65, 70, 40, 85 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 120 ; catch rate + db 132 ; base exp + + INCBIN "gfx/pokemon/front/gloom.pic", 0, 1 ; sprite dimensions + dw GloomPicFront, GloomPicBack + + db ABSORB, POISONPOWDER, STUN_SPORE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm new file mode 100644 index 00000000..9c852c91 --- /dev/null +++ b/data/pokemon/base_stats/golbat.asm @@ -0,0 +1,22 @@ + db DEX_GOLBAT ; pokedex id + + db 75, 80, 70, 90, 75 + ; hp atk def spd spc + + db POISON, FLYING ; type + db 90 ; catch rate + db 171 ; base exp + + INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions + dw GolbatPicFront, GolbatPicBack + + db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm new file mode 100644 index 00000000..35ea2418 --- /dev/null +++ b/data/pokemon/base_stats/goldeen.asm @@ -0,0 +1,23 @@ + db DEX_GOLDEEN ; pokedex id + + db 45, 67, 60, 63, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 111 ; base exp + + INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions + dw GoldeenPicFront, GoldeenPicBack + + db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm new file mode 100644 index 00000000..eb79d100 --- /dev/null +++ b/data/pokemon/base_stats/golduck.asm @@ -0,0 +1,25 @@ + db DEX_GOLDUCK ; pokedex id + + db 80, 82, 78, 85, 80 + ; hp atk def spd spc + + db WATER, WATER ; type + db 75 ; catch rate + db 174 ; base exp + + INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions + dw GolduckPicFront, GolduckPicBack + + db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm new file mode 100644 index 00000000..adcefb3f --- /dev/null +++ b/data/pokemon/base_stats/golem.asm @@ -0,0 +1,24 @@ + db DEX_GOLEM ; pokedex id + + db 80, 110, 130, 45, 55 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 45 ; catch rate + db 177 ; base exp + + INCBIN "gfx/pokemon/front/golem.pic", 0, 1 ; sprite dimensions + dw GolemPicFront, GolemPicBack + + db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ + REST, EXPLOSION, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm new file mode 100644 index 00000000..af0b3dcc --- /dev/null +++ b/data/pokemon/base_stats/graveler.asm @@ -0,0 +1,24 @@ + db DEX_GRAVELER ; pokedex id + + db 55, 95, 115, 35, 45 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 120 ; catch rate + db 134 ; base exp + + INCBIN "gfx/pokemon/front/graveler.pic", 0, 1 ; sprite dimensions + dw GravelerPicFront, GravelerPicBack + + db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm new file mode 100644 index 00000000..24e972ce --- /dev/null +++ b/data/pokemon/base_stats/grimer.asm @@ -0,0 +1,22 @@ + db DEX_GRIMER ; pokedex id + + db 80, 80, 50, 25, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 190 ; catch rate + db 90 ; base exp + + INCBIN "gfx/pokemon/front/grimer.pic", 0, 1 ; sprite dimensions + dw GrimerPicFront, GrimerPicBack + + db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, RAGE, MEGA_DRAIN, THUNDERBOLT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm new file mode 100644 index 00000000..efc1059f --- /dev/null +++ b/data/pokemon/base_stats/growlithe.asm @@ -0,0 +1,23 @@ + db DEX_GROWLITHE ; pokedex id + + db 55, 70, 45, 60, 50 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 190 ; catch rate + db 91 ; base exp + + INCBIN "gfx/pokemon/front/growlithe.pic", 0, 1 ; sprite dimensions + dw GrowlithePicFront, GrowlithePicBack + + db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm new file mode 100644 index 00000000..f08d29c9 --- /dev/null +++ b/data/pokemon/base_stats/gyarados.asm @@ -0,0 +1,24 @@ + db DEX_GYARADOS ; pokedex id + + db 95, 125, 79, 81, 100 + ; hp atk def spd spc + + db WATER, FLYING ; type + db 45 ; catch rate + db 214 ; base exp + + INCBIN "gfx/pokemon/front/gyarados.pic", 0, 1 ; sprite dimensions + dw GyaradosPicFront, GyaradosPicBack + + db BITE, DRAGON_RAGE, LEER, HYDRO_PUMP ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm new file mode 100644 index 00000000..71e94347 --- /dev/null +++ b/data/pokemon/base_stats/haunter.asm @@ -0,0 +1,22 @@ + db DEX_HAUNTER ; pokedex id + + db 45, 50, 45, 95, 115 + ; hp atk def spd spc + + db GHOST, POISON ; type + db 90 ; catch rate + db 126 ; base exp + + INCBIN "gfx/pokemon/front/haunter.pic", 0, 1 ; sprite dimensions + dw HaunterPicFront, HaunterPicBack + + db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm new file mode 100644 index 00000000..407e5e32 --- /dev/null +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -0,0 +1,23 @@ + db DEX_HITMONCHAN ; pokedex id + + db 50, 105, 79, 76, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 45 ; catch rate + db 140 ; base exp + + INCBIN "gfx/pokemon/front/hitmonchan.pic", 0, 1 ; sprite dimensions + dw HitmonchanPicFront, HitmonchanPicBack + + db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm new file mode 100644 index 00000000..e39ceecd --- /dev/null +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -0,0 +1,23 @@ + db DEX_HITMONLEE ; pokedex id + + db 50, 120, 53, 87, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 45 ; catch rate + db 139 ; base exp + + INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions + dw HitmonleePicFront, HitmonleePicBack + + db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm new file mode 100644 index 00000000..9520ad59 --- /dev/null +++ b/data/pokemon/base_stats/horsea.asm @@ -0,0 +1,23 @@ + db DEX_HORSEA ; pokedex id + + db 30, 40, 70, 60, 70 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 83 ; base exp + + INCBIN "gfx/pokemon/front/horsea.pic", 0, 1 ; sprite dimensions + dw HorseaPicFront, HorseaPicBack + + db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm new file mode 100644 index 00000000..760276db --- /dev/null +++ b/data/pokemon/base_stats/hypno.asm @@ -0,0 +1,25 @@ + db DEX_HYPNO ; pokedex id + + db 85, 73, 70, 67, 115 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 75 ; catch rate + db 165 ; base exp + + INCBIN "gfx/pokemon/front/hypno.pic", 0, 1 ; sprite dimensions + dw HypnoPicFront, HypnoPicBack + + db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, DREAM_EATER, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm new file mode 100644 index 00000000..3601a924 --- /dev/null +++ b/data/pokemon/base_stats/ivysaur.asm @@ -0,0 +1,22 @@ + db DEX_IVYSAUR ; pokedex id + + db 60, 62, 63, 60, 80 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 141 ; base exp + + INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions + dw IvysaurPicFront, IvysaurPicBack + + db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm new file mode 100644 index 00000000..c249d93d --- /dev/null +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -0,0 +1,26 @@ + db DEX_JIGGLYPUFF ; pokedex id + + db 115, 45, 20, 20, 25 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 170 ; catch rate + db 76 ; base exp + + INCBIN "gfx/pokemon/front/jigglypuff.pic", 0, 1 ; sprite dimensions + dw JigglypuffPicFront, JigglypuffPicBack + + db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm new file mode 100644 index 00000000..cb7e989e --- /dev/null +++ b/data/pokemon/base_stats/jolteon.asm @@ -0,0 +1,23 @@ + db DEX_JOLTEON ; pokedex id + + db 65, 65, 60, 130, 110 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 45 ; catch rate + db 197 ; base exp + + INCBIN "gfx/pokemon/front/jolteon.pic", 0, 1 ; sprite dimensions + dw JolteonPicFront, JolteonPicBack + + db TACKLE, SAND_ATTACK, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm new file mode 100644 index 00000000..1700c890 --- /dev/null +++ b/data/pokemon/base_stats/jynx.asm @@ -0,0 +1,25 @@ + db DEX_JYNX ; pokedex id + + db 65, 50, 35, 95, 95 + ; hp atk def spd spc + + db ICE, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 137 ; base exp + + INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions + dw JynxPicFront, JynxPicBack + + db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm new file mode 100644 index 00000000..407c78f5 --- /dev/null +++ b/data/pokemon/base_stats/kabuto.asm @@ -0,0 +1,23 @@ + db DEX_KABUTO ; pokedex id + + db 30, 80, 90, 55, 45 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 119 ; base exp + + INCBIN "gfx/pokemon/front/kabuto.pic", 0, 1 ; sprite dimensions + dw KabutoPicFront, KabutoPicBack + + db SCRATCH, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm new file mode 100644 index 00000000..62585d70 --- /dev/null +++ b/data/pokemon/base_stats/kabutops.asm @@ -0,0 +1,24 @@ + db DEX_KABUTOPS ; pokedex id + + db 60, 115, 105, 80, 70 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 201 ; base exp + + INCBIN "gfx/pokemon/front/kabutops.pic", 0, 1 ; sprite dimensions + dw KabutopsPicFront, KabutopsPicBack + + db SCRATCH, HARDEN, ABSORB, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm new file mode 100644 index 00000000..51fc6a91 --- /dev/null +++ b/data/pokemon/base_stats/kadabra.asm @@ -0,0 +1,24 @@ + db DEX_KADABRA ; pokedex id + + db 40, 35, 30, 105, 120 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 100 ; catch rate + db 145 ; base exp + + INCBIN "gfx/pokemon/front/kadabra.pic", 0, 1 ; sprite dimensions + dw KadabraPicFront, KadabraPicBack + + db TELEPORT, CONFUSION, DISABLE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + DIG, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm new file mode 100644 index 00000000..c0cfb63c --- /dev/null +++ b/data/pokemon/base_stats/kakuna.asm @@ -0,0 +1,20 @@ + db DEX_KAKUNA ; pokedex id + + db 45, 25, 50, 35, 25 + ; hp atk def spd spc + + db BUG, POISON ; type + db 120 ; catch rate + db 71 ; base exp + + INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions + dw KakunaPicFront, KakunaPicBack + + db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm new file mode 100644 index 00000000..ccd36041 --- /dev/null +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -0,0 +1,25 @@ + db DEX_KANGASKHAN ; pokedex id + + db 105, 95, 80, 90, 40 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 175 ; base exp + + INCBIN "gfx/pokemon/front/kangaskhan.pic", 0, 1 ; sprite dimensions + dw KangaskhanPicFront, KangaskhanPicBack + + db COMET_PUNCH, RAGE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ + DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm new file mode 100644 index 00000000..d3b3b80e --- /dev/null +++ b/data/pokemon/base_stats/kingler.asm @@ -0,0 +1,23 @@ + db DEX_KINGLER ; pokedex id + + db 55, 130, 115, 75, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 60 ; catch rate + db 206 ; base exp + + INCBIN "gfx/pokemon/front/kingler.pic", 0, 1 ; sprite dimensions + dw KinglerPicFront, KinglerPicBack + + db BUBBLE, LEER, VICEGRIP, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ + SUBSTITUTE, CUT, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm new file mode 100644 index 00000000..b9b63812 --- /dev/null +++ b/data/pokemon/base_stats/koffing.asm @@ -0,0 +1,22 @@ + db DEX_KOFFING ; pokedex id + + db 40, 65, 95, 35, 60 + ; hp atk def spd spc + + db POISON, POISON ; type + db 190 ; catch rate + db 114 ; base exp + + INCBIN "gfx/pokemon/front/koffing.pic", 0, 1 ; sprite dimensions + dw KoffingPicFront, KoffingPicBack + + db TACKLE, SMOG, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ + EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm new file mode 100644 index 00000000..6bd1c197 --- /dev/null +++ b/data/pokemon/base_stats/krabby.asm @@ -0,0 +1,23 @@ + db DEX_KRABBY ; pokedex id + + db 30, 105, 90, 50, 25 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 115 ; base exp + + INCBIN "gfx/pokemon/front/krabby.pic", 0, 1 ; sprite dimensions + dw KrabbyPicFront, KrabbyPicBack + + db BUBBLE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ + CUT, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm new file mode 100644 index 00000000..5e31f7f5 --- /dev/null +++ b/data/pokemon/base_stats/lapras.asm @@ -0,0 +1,25 @@ + db DEX_LAPRAS ; pokedex id + + db 130, 85, 80, 60, 95 + ; hp atk def spd spc + + db WATER, ICE ; type + db 45 ; catch rate + db 219 ; base exp + + INCBIN "gfx/pokemon/front/lapras.pic", 0, 1 ; sprite dimensions + dw LaprasPicFront, LaprasPicBack + + db WATER_GUN, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm new file mode 100644 index 00000000..45826b40 --- /dev/null +++ b/data/pokemon/base_stats/lickitung.asm @@ -0,0 +1,25 @@ + db DEX_LICKITUNG ; pokedex id + + db 90, 55, 75, 30, 60 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 127 ; base exp + + INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions + dw LickitungPicFront, LickitungPicBack + + db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm new file mode 100644 index 00000000..f750f9fa --- /dev/null +++ b/data/pokemon/base_stats/machamp.asm @@ -0,0 +1,24 @@ + db DEX_MACHAMP ; pokedex id + + db 90, 130, 80, 55, 65 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 45 ; catch rate + db 193 ; base exp + + INCBIN "gfx/pokemon/front/machamp.pic", 0, 1 ; sprite dimensions + dw MachampPicFront, MachampPicBack + + db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ + REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm new file mode 100644 index 00000000..b52772ef --- /dev/null +++ b/data/pokemon/base_stats/machoke.asm @@ -0,0 +1,24 @@ + db DEX_MACHOKE ; pokedex id + + db 80, 100, 70, 45, 50 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 90 ; catch rate + db 146 ; base exp + + INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions + dw MachokePicFront, MachokePicBack + + db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm new file mode 100644 index 00000000..20fe0e6e --- /dev/null +++ b/data/pokemon/base_stats/machop.asm @@ -0,0 +1,24 @@ + db DEX_MACHOP ; pokedex id + + db 70, 80, 50, 35, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 180 ; catch rate + db 88 ; base exp + + INCBIN "gfx/pokemon/front/machop.pic", 0, 1 ; sprite dimensions + dw MachopPicFront, MachopPicBack + + db KARATE_CHOP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm new file mode 100644 index 00000000..c2c2f8c2 --- /dev/null +++ b/data/pokemon/base_stats/magikarp.asm @@ -0,0 +1,20 @@ + db DEX_MAGIKARP ; pokedex id + + db 20, 10, 55, 80, 20 + ; hp atk def spd spc + + db WATER, WATER ; type + db 255 ; catch rate + db 20 ; base exp + + INCBIN "gfx/pokemon/front/magikarp.pic", 0, 1 ; sprite dimensions + dw MagikarpPicFront, MagikarpPicBack + + db SPLASH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm new file mode 100644 index 00000000..b402cfa3 --- /dev/null +++ b/data/pokemon/base_stats/magmar.asm @@ -0,0 +1,24 @@ + db DEX_MAGMAR ; pokedex id + + db 65, 95, 57, 93, 85 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 45 ; catch rate + db 167 ; base exp + + INCBIN "gfx/pokemon/front/magmar.pic", 0, 1 ; sprite dimensions + dw MagmarPicFront, MagmarPicBack + + db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + PSYWAVE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm new file mode 100644 index 00000000..6242d692 --- /dev/null +++ b/data/pokemon/base_stats/magnemite.asm @@ -0,0 +1,23 @@ + db DEX_MAGNEMITE ; pokedex id + + db 25, 35, 70, 45, 95 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 190 ; catch rate + db 89 ; base exp + + INCBIN "gfx/pokemon/front/magnemite.pic", 0, 1 ; sprite dimensions + dw MagnemitePicFront, MagnemitePicBack + + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm new file mode 100644 index 00000000..13d2e595 --- /dev/null +++ b/data/pokemon/base_stats/magneton.asm @@ -0,0 +1,23 @@ + db DEX_MAGNETON ; pokedex id + + db 50, 60, 95, 70, 120 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 60 ; catch rate + db 161 ; base exp + + INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions + dw MagnetonPicFront, MagnetonPicBack + + db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + THUNDERBOLT, THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm new file mode 100644 index 00000000..ea529243 --- /dev/null +++ b/data/pokemon/base_stats/mankey.asm @@ -0,0 +1,24 @@ + db DEX_MANKEY ; pokedex id + + db 40, 80, 35, 70, 35 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 190 ; catch rate + db 74 ; base exp + + INCBIN "gfx/pokemon/front/mankey.pic", 0, 1 ; sprite dimensions + dw MankeyPicFront, MankeyPicBack + + db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ + REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm new file mode 100644 index 00000000..3d22e68a --- /dev/null +++ b/data/pokemon/base_stats/marowak.asm @@ -0,0 +1,25 @@ + db DEX_MAROWAK ; pokedex id + + db 60, 80, 110, 45, 50 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 75 ; catch rate + db 124 ; base exp + + INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions + dw MarowakPicFront, MarowakPicBack + + db BONE_CLUB, GROWL, LEER, FOCUS_ENERGY ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm new file mode 100644 index 00000000..31a59bd5 --- /dev/null +++ b/data/pokemon/base_stats/meowth.asm @@ -0,0 +1,23 @@ + db DEX_MEOWTH ; pokedex id + + db 40, 45, 35, 90, 40 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 255 ; catch rate + db 69 ; base exp + + INCBIN "gfx/pokemon/front/meowth.pic", 0, 1 ; sprite dimensions + dw MeowthPicFront, MeowthPicBack + + db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm new file mode 100644 index 00000000..e20b08bf --- /dev/null +++ b/data/pokemon/base_stats/metapod.asm @@ -0,0 +1,20 @@ + db DEX_METAPOD ; pokedex id + + db 50, 20, 55, 30, 25 + ; hp atk def spd spc + + db BUG, BUG ; type + db 120 ; catch rate + db 72 ; base exp + + INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions + dw MetapodPicFront, MetapodPicBack + + db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm new file mode 100644 index 00000000..82a7ec47 --- /dev/null +++ b/data/pokemon/base_stats/mew.asm @@ -0,0 +1,31 @@ + db DEX_MEW ; pokedex id + + db 100, 100, 100, 100, 100 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 64 ; base exp + + INCBIN "gfx/pokemon/front/mew.pic", 0, 1 ; sprite dimensions + dw MewPicFront, MewPicBack + + db POUND, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ + TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ + SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ + PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ + CUT, FLY, SURF, STRENGTH, FLASH, \ + UNUSED + ; end + + db %11111111 ; padding diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm new file mode 100644 index 00000000..5b276291 --- /dev/null +++ b/data/pokemon/base_stats/mewtwo.asm @@ -0,0 +1,27 @@ + db DEX_MEWTWO ; pokedex id + + db 106, 110, 90, 130, 154 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 3 ; catch rate + db 220 ; base exp + + INCBIN "gfx/pokemon/front/mewtwo.pic", 0, 1 ; sprite dimensions + dw MewtwoPicFront, MewtwoPicBack + + db CONFUSION, DISABLE, SWIFT, PSYCHIC_M ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm new file mode 100644 index 00000000..58745a29 --- /dev/null +++ b/data/pokemon/base_stats/moltres.asm @@ -0,0 +1,23 @@ + db DEX_MOLTRES ; pokedex id + + db 90, 100, 90, 90, 125 + ; hp atk def spd spc + + db FIRE, FLYING ; type + db 3 ; catch rate + db 217 ; base exp + + INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions + dw MoltresPicFront, MoltresPicBack + + db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ + SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm new file mode 100644 index 00000000..20c96508 --- /dev/null +++ b/data/pokemon/base_stats/mrmime.asm @@ -0,0 +1,25 @@ + db DEX_MR_MIME ; pokedex id + + db 40, 45, 65, 90, 100 + ; hp atk def spd spc + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 136 ; base exp + + INCBIN "gfx/pokemon/front/mr.mime.pic", 0, 1 ; sprite dimensions + dw MrMimePicFront, MrMimePicBack + + db CONFUSION, BARRIER, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm new file mode 100644 index 00000000..901421ec --- /dev/null +++ b/data/pokemon/base_stats/muk.asm @@ -0,0 +1,22 @@ + db DEX_MUK ; pokedex id + + db 105, 105, 75, 50, 65 + ; hp atk def spd spc + + db POISON, POISON ; type + db 75 ; catch rate + db 157 ; base exp + + INCBIN "gfx/pokemon/front/muk.pic", 0, 1 ; sprite dimensions + dw MukPicFront, MukPicBack + + db POUND, DISABLE, POISON_GAS, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ + SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm new file mode 100644 index 00000000..2e0d4177 --- /dev/null +++ b/data/pokemon/base_stats/nidoking.asm @@ -0,0 +1,26 @@ + db DEX_NIDOKING ; pokedex id + + db 81, 92, 77, 85, 75 + ; hp atk def spd spc + + db POISON, GROUND ; type + db 45 ; catch rate + db 195 ; base exp + + INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions + dw NidokingPicFront, NidokingPicBack + + db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm new file mode 100644 index 00000000..9b249f98 --- /dev/null +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -0,0 +1,26 @@ + db DEX_NIDOQUEEN ; pokedex id + + db 90, 82, 87, 76, 75 + ; hp atk def spd spc + + db POISON, GROUND ; type + db 45 ; catch rate + db 194 ; base exp + + INCBIN "gfx/pokemon/front/nidoqueen.pic", 0, 1 ; sprite dimensions + dw NidoqueenPicFront, NidoqueenPicBack + + db TACKLE, SCRATCH, TAIL_WHIP, BODY_SLAM ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm new file mode 100644 index 00000000..8ba4316c --- /dev/null +++ b/data/pokemon/base_stats/nidoranf.asm @@ -0,0 +1,22 @@ + db DEX_NIDORAN_F ; pokedex id + + db 55, 47, 52, 41, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 235 ; catch rate + db 59 ; base exp + + INCBIN "gfx/pokemon/front/nidoranf.pic", 0, 1 ; sprite dimensions + dw NidoranFPicFront, NidoranFPicBack + + db GROWL, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ + RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm new file mode 100644 index 00000000..2b412640 --- /dev/null +++ b/data/pokemon/base_stats/nidoranm.asm @@ -0,0 +1,23 @@ + db DEX_NIDORAN_M ; pokedex id + + db 46, 57, 40, 50, 40 + ; hp atk def spd spc + + db POISON, POISON ; type + db 235 ; catch rate + db 60 ; base exp + + INCBIN "gfx/pokemon/front/nidoranm.pic", 0, 1 ; sprite dimensions + dw NidoranMPicFront, NidoranMPicBack + + db LEER, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm new file mode 100644 index 00000000..4345aeb7 --- /dev/null +++ b/data/pokemon/base_stats/nidorina.asm @@ -0,0 +1,23 @@ + db DEX_NIDORINA ; pokedex id + + db 70, 62, 67, 56, 55 + ; hp atk def spd spc + + db POISON, POISON ; type + db 120 ; catch rate + db 117 ; base exp + + INCBIN "gfx/pokemon/front/nidorina.pic", 0, 1 ; sprite dimensions + dw NidorinaPicFront, NidorinaPicBack + + db GROWL, TACKLE, SCRATCH, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm new file mode 100644 index 00000000..44a11559 --- /dev/null +++ b/data/pokemon/base_stats/nidorino.asm @@ -0,0 +1,23 @@ + db DEX_NIDORINO ; pokedex id + + db 61, 72, 57, 65, 55 + ; hp atk def spd spc + + db POISON, POISON ; type + db 120 ; catch rate + db 118 ; base exp + + INCBIN "gfx/pokemon/front/nidorino.pic", 0, 1 ; sprite dimensions + dw NidorinoPicFront, NidorinoPicBack + + db LEER, TACKLE, HORN_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm new file mode 100644 index 00000000..2c2bc615 --- /dev/null +++ b/data/pokemon/base_stats/ninetales.asm @@ -0,0 +1,23 @@ + db DEX_NINETALES ; pokedex id + + db 73, 76, 75, 100, 100 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 75 ; catch rate + db 178 ; base exp + + INCBIN "gfx/pokemon/front/ninetales.pic", 0, 1 ; sprite dimensions + dw NinetalesPicFront, NinetalesPicBack + + db EMBER, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm new file mode 100644 index 00000000..60172ea4 --- /dev/null +++ b/data/pokemon/base_stats/oddish.asm @@ -0,0 +1,22 @@ + db DEX_ODDISH ; pokedex id + + db 45, 50, 55, 30, 75 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 255 ; catch rate + db 78 ; base exp + + INCBIN "gfx/pokemon/front/oddish.pic", 0, 1 ; sprite dimensions + dw OddishPicFront, OddishPicBack + + db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm new file mode 100644 index 00000000..258b2706 --- /dev/null +++ b/data/pokemon/base_stats/omanyte.asm @@ -0,0 +1,23 @@ + db DEX_OMANYTE ; pokedex id + + db 35, 40, 100, 35, 90 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 120 ; base exp + + INCBIN "gfx/pokemon/front/omanyte.pic", 0, 1 ; sprite dimensions + dw OmanytePicFront, OmanytePicBack + + db WATER_GUN, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm new file mode 100644 index 00000000..8ba4113e --- /dev/null +++ b/data/pokemon/base_stats/omastar.asm @@ -0,0 +1,24 @@ + db DEX_OMASTAR ; pokedex id + + db 70, 60, 125, 55, 115 + ; hp atk def spd spc + + db ROCK, WATER ; type + db 45 ; catch rate + db 199 ; base exp + + INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions + dw OmastarPicFront, OmastarPicBack + + db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm new file mode 100644 index 00000000..29d2f677 --- /dev/null +++ b/data/pokemon/base_stats/onix.asm @@ -0,0 +1,23 @@ + db DEX_ONIX ; pokedex id + + db 35, 45, 160, 70, 30 + ; hp atk def spd spc + + db ROCK, GROUND ; type + db 45 ; catch rate + db 108 ; base exp + + INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions + dw OnixPicFront, OnixPicBack + + db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ + ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm new file mode 100644 index 00000000..0a36e229 --- /dev/null +++ b/data/pokemon/base_stats/paras.asm @@ -0,0 +1,23 @@ + db DEX_PARAS ; pokedex id + + db 35, 70, 55, 25, 55 + ; hp atk def spd spc + + db BUG, GRASS ; type + db 190 ; catch rate + db 70 ; base exp + + INCBIN "gfx/pokemon/front/paras.pic", 0, 1 ; sprite dimensions + dw ParasPicFront, ParasPicBack + + db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm new file mode 100644 index 00000000..5fa09fc9 --- /dev/null +++ b/data/pokemon/base_stats/parasect.asm @@ -0,0 +1,23 @@ + db DEX_PARASECT ; pokedex id + + db 60, 95, 80, 30, 80 + ; hp atk def spd spc + + db BUG, GRASS ; type + db 75 ; catch rate + db 128 ; base exp + + INCBIN "gfx/pokemon/front/parasect.pic", 0, 1 ; sprite dimensions + dw ParasectPicFront, ParasectPicBack + + db SCRATCH, STUN_SPORE, LEECH_LIFE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm new file mode 100644 index 00000000..ec214ead --- /dev/null +++ b/data/pokemon/base_stats/persian.asm @@ -0,0 +1,23 @@ + db DEX_PERSIAN ; pokedex id + + db 65, 70, 60, 115, 65 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 90 ; catch rate + db 148 ; base exp + + INCBIN "gfx/pokemon/front/persian.pic", 0, 1 ; sprite dimensions + dw PersianPicFront, PersianPicBack + + db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, HYPER_BEAM, PAY_DAY, RAGE, THUNDERBOLT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm new file mode 100644 index 00000000..9be82174 --- /dev/null +++ b/data/pokemon/base_stats/pidgeot.asm @@ -0,0 +1,23 @@ + db DEX_PIDGEOT ; pokedex id + + db 83, 80, 75, 91, 70 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 45 ; catch rate + db 172 ; base exp + + INCBIN "gfx/pokemon/front/pidgeot.pic", 0, 1 ; sprite dimensions + dw PidgeotPicFront, PidgeotPicBack + + db GUST, SAND_ATTACK, QUICK_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ + FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm new file mode 100644 index 00000000..2b99e4a6 --- /dev/null +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -0,0 +1,22 @@ + db DEX_PIDGEOTTO ; pokedex id + + db 63, 60, 55, 71, 50 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 120 ; catch rate + db 113 ; base exp + + INCBIN "gfx/pokemon/front/pidgeotto.pic", 0, 1 ; sprite dimensions + dw PidgeottoPicFront, PidgeottoPicBack + + db GUST, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm new file mode 100644 index 00000000..04d23804 --- /dev/null +++ b/data/pokemon/base_stats/pidgey.asm @@ -0,0 +1,22 @@ + db DEX_PIDGEY ; pokedex id + + db 40, 45, 40, 56, 35 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 255 ; catch rate + db 55 ; base exp + + INCBIN "gfx/pokemon/front/pidgey.pic", 0, 1 ; sprite dimensions + dw PidgeyPicFront, PidgeyPicBack + + db GUST, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm new file mode 100644 index 00000000..4a7f5e80 --- /dev/null +++ b/data/pokemon/base_stats/pikachu.asm @@ -0,0 +1,24 @@ + db DEX_PIKACHU ; pokedex id + + db 35, 55, 30, 90, 50 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 190 ; catch rate + db 82 ; base exp + + INCBIN "gfx/pokemon/front/pikachu.pic", 0, 1 ; sprite dimensions + dw PikachuPicFront, PikachuPicBack + + db THUNDERSHOCK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm new file mode 100644 index 00000000..946feaf1 --- /dev/null +++ b/data/pokemon/base_stats/pinsir.asm @@ -0,0 +1,23 @@ + db DEX_PINSIR ; pokedex id + + db 65, 125, 100, 85, 55 + ; hp atk def spd spc + + db BUG, BUG ; type + db 45 ; catch rate + db 200 ; base exp + + INCBIN "gfx/pokemon/front/pinsir.pic", 0, 1 ; sprite dimensions + dw PinsirPicFront, PinsirPicBack + + db VICEGRIP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm new file mode 100644 index 00000000..f13b4c85 --- /dev/null +++ b/data/pokemon/base_stats/poliwag.asm @@ -0,0 +1,23 @@ + db DEX_POLIWAG ; pokedex id + + db 40, 50, 40, 90, 40 + ; hp atk def spd spc + + db WATER, WATER ; type + db 255 ; catch rate + db 77 ; base exp + + INCBIN "gfx/pokemon/front/poliwag.pic", 0, 1 ; sprite dimensions + dw PoliwagPicFront, PoliwagPicBack + + db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + PSYWAVE, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm new file mode 100644 index 00000000..8055d5ff --- /dev/null +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -0,0 +1,25 @@ + db DEX_POLIWHIRL ; pokedex id + + db 65, 65, 65, 90, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 120 ; catch rate + db 131 ; base exp + + INCBIN "gfx/pokemon/front/poliwhirl.pic", 0, 1 ; sprite dimensions + dw PoliwhirlPicFront, PoliwhirlPicBack + + db BUBBLE, HYPNOSIS, WATER_GUN, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm new file mode 100644 index 00000000..cd89c1ed --- /dev/null +++ b/data/pokemon/base_stats/poliwrath.asm @@ -0,0 +1,25 @@ + db DEX_POLIWRATH ; pokedex id + + db 90, 85, 95, 70, 70 + ; hp atk def spd spc + + db WATER, FIGHTING ; type + db 45 ; catch rate + db 185 ; base exp + + INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions + dw PoliwrathPicFront, PoliwrathPicBack + + db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + EARTHQUAKE, FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm new file mode 100644 index 00000000..71d51956 --- /dev/null +++ b/data/pokemon/base_stats/ponyta.asm @@ -0,0 +1,22 @@ + db DEX_PONYTA ; pokedex id + + db 50, 85, 55, 90, 65 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 190 ; catch rate + db 152 ; base exp + + INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions + dw PonytaPicFront, PonytaPicBack + + db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm new file mode 100644 index 00000000..bfec59ef --- /dev/null +++ b/data/pokemon/base_stats/porygon.asm @@ -0,0 +1,24 @@ + db DEX_PORYGON ; pokedex id + + db 65, 60, 70, 40, 75 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 130 ; base exp + + INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions + dw PorygonPicFront, PorygonPicBack + + db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + TRI_ATTACK, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm new file mode 100644 index 00000000..12f8bb01 --- /dev/null +++ b/data/pokemon/base_stats/primeape.asm @@ -0,0 +1,24 @@ + db DEX_PRIMEAPE ; pokedex id + + db 65, 105, 60, 95, 60 + ; hp atk def spd spc + + db FIGHTING, FIGHTING ; type + db 75 ; catch rate + db 149 ; base exp + + INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions + dw PrimeapePicFront, PrimeapePicBack + + db SCRATCH, LEER, KARATE_CHOP, FURY_SWIPES ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm new file mode 100644 index 00000000..b3fb9f41 --- /dev/null +++ b/data/pokemon/base_stats/psyduck.asm @@ -0,0 +1,24 @@ + db DEX_PSYDUCK ; pokedex id + + db 50, 52, 48, 55, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 80 ; base exp + + INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions + dw PsyduckPicFront, PsyduckPicBack + + db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm new file mode 100644 index 00000000..a5c5acea --- /dev/null +++ b/data/pokemon/base_stats/raichu.asm @@ -0,0 +1,24 @@ + db DEX_RAICHU ; pokedex id + + db 60, 90, 55, 100, 90 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 75 ; catch rate + db 122 ; base exp + + INCBIN "gfx/pokemon/front/raichu.pic", 0, 1 ; sprite dimensions + dw RaichuPicFront, RaichuPicBack + + db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm new file mode 100644 index 00000000..dbe16ab0 --- /dev/null +++ b/data/pokemon/base_stats/rapidash.asm @@ -0,0 +1,23 @@ + db DEX_RAPIDASH ; pokedex id + + db 65, 100, 70, 105, 80 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 60 ; catch rate + db 192 ; base exp + + INCBIN "gfx/pokemon/front/rapidash.pic", 0, 1 ; sprite dimensions + dw RapidashPicFront, RapidashPicBack + + db EMBER, TAIL_WHIP, STOMP, GROWL ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm new file mode 100644 index 00000000..b33adf4d --- /dev/null +++ b/data/pokemon/base_stats/raticate.asm @@ -0,0 +1,23 @@ + db DEX_RATICATE ; pokedex id + + db 55, 81, 60, 97, 50 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 90 ; catch rate + db 116 ; base exp + + INCBIN "gfx/pokemon/front/raticate.pic", 0, 1 ; sprite dimensions + dw RaticatePicFront, RaticatePicBack + + db TACKLE, TAIL_WHIP, QUICK_ATTACK, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm new file mode 100644 index 00000000..d6e263a1 --- /dev/null +++ b/data/pokemon/base_stats/rattata.asm @@ -0,0 +1,23 @@ + db DEX_RATTATA ; pokedex id + + db 30, 56, 35, 72, 25 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 255 ; catch rate + db 57 ; base exp + + INCBIN "gfx/pokemon/front/rattata.pic", 0, 1 ; sprite dimensions + dw RattataPicFront, RattataPicBack + + db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm new file mode 100644 index 00000000..c6b17500 --- /dev/null +++ b/data/pokemon/base_stats/rhydon.asm @@ -0,0 +1,26 @@ + db DEX_RHYDON ; pokedex id + + db 105, 130, 120, 40, 45 + ; hp atk def spd spc + + db GROUND, ROCK ; type + db 60 ; catch rate + db 204 ; base exp + + INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions + dw RhydonPicFront, RhydonPicBack + + db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm new file mode 100644 index 00000000..6f4bb31b --- /dev/null +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -0,0 +1,23 @@ + db DEX_RHYHORN ; pokedex id + + db 80, 85, 95, 25, 30 + ; hp atk def spd spc + + db GROUND, ROCK ; type + db 120 ; catch rate + db 135 ; base exp + + INCBIN "gfx/pokemon/front/rhyhorn.pic", 0, 1 ; sprite dimensions + dw RhyhornPicFront, RhyhornPicBack + + db HORN_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm new file mode 100644 index 00000000..a05f516f --- /dev/null +++ b/data/pokemon/base_stats/sandshrew.asm @@ -0,0 +1,24 @@ + db DEX_SANDSHREW ; pokedex id + + db 50, 75, 85, 40, 30 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 255 ; catch rate + db 93 ; base exp + + INCBIN "gfx/pokemon/front/sandshrew.pic", 0, 1 ; sprite dimensions + dw SandshrewPicFront, SandshrewPicBack + + db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm new file mode 100644 index 00000000..5a50dd25 --- /dev/null +++ b/data/pokemon/base_stats/sandslash.asm @@ -0,0 +1,24 @@ + db DEX_SANDSLASH ; pokedex id + + db 75, 100, 110, 65, 55 + ; hp atk def spd spc + + db GROUND, GROUND ; type + db 90 ; catch rate + db 163 ; base exp + + INCBIN "gfx/pokemon/front/sandslash.pic", 0, 1 ; sprite dimensions + dw SandslashPicFront, SandslashPicBack + + db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + CUT, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm new file mode 100644 index 00000000..044a2baf --- /dev/null +++ b/data/pokemon/base_stats/scyther.asm @@ -0,0 +1,22 @@ + db DEX_SCYTHER ; pokedex id + + db 70, 110, 80, 105, 55 + ; hp atk def spd spc + + db BUG, FLYING ; type + db 45 ; catch rate + db 187 ; base exp + + INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions + dw ScytherPicFront, ScytherPicBack + + db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm new file mode 100644 index 00000000..6e3fb7ef --- /dev/null +++ b/data/pokemon/base_stats/seadra.asm @@ -0,0 +1,23 @@ + db DEX_SEADRA ; pokedex id + + db 55, 65, 95, 85, 95 + ; hp atk def spd spc + + db WATER, WATER ; type + db 75 ; catch rate + db 155 ; base exp + + INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions + dw SeadraPicFront, SeadraPicBack + + db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm new file mode 100644 index 00000000..532a4c70 --- /dev/null +++ b/data/pokemon/base_stats/seaking.asm @@ -0,0 +1,23 @@ + db DEX_SEAKING ; pokedex id + + db 80, 92, 65, 68, 80 + ; hp atk def spd spc + + db WATER, WATER ; type + db 60 ; catch rate + db 170 ; base exp + + INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions + dw SeakingPicFront, SeakingPicBack + + db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + REST, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm new file mode 100644 index 00000000..e2fe02ec --- /dev/null +++ b/data/pokemon/base_stats/seel.asm @@ -0,0 +1,23 @@ + db DEX_SEEL ; pokedex id + + db 65, 45, 55, 45, 70 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 100 ; base exp + + INCBIN "gfx/pokemon/front/seel.pic", 0, 1 ; sprite dimensions + dw SeelPicFront, SeelPicBack + + db HEADBUTT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm new file mode 100644 index 00000000..b52f7cb4 --- /dev/null +++ b/data/pokemon/base_stats/shellder.asm @@ -0,0 +1,23 @@ + db DEX_SHELLDER ; pokedex id + + db 30, 65, 100, 40, 45 + ; hp atk def spd spc + + db WATER, WATER ; type + db 190 ; catch rate + db 97 ; base exp + + INCBIN "gfx/pokemon/front/shellder.pic", 0, 1 ; sprite dimensions + dw ShellderPicFront, ShellderPicBack + + db TACKLE, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ + REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm new file mode 100644 index 00000000..77483e91 --- /dev/null +++ b/data/pokemon/base_stats/slowbro.asm @@ -0,0 +1,27 @@ + db DEX_SLOWBRO ; pokedex id + + db 95, 75, 110, 30, 80 + ; hp atk def spd spc + + db WATER, PSYCHIC_TYPE ; type + db 75 ; catch rate + db 164 ; base exp + + INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions + dw SlowbroPicFront, SlowbroPicBack + + db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm new file mode 100644 index 00000000..0ae2ef0a --- /dev/null +++ b/data/pokemon/base_stats/slowpoke.asm @@ -0,0 +1,25 @@ + db DEX_SLOWPOKE ; pokedex id + + db 90, 65, 65, 15, 40 + ; hp atk def spd spc + + db WATER, PSYCHIC_TYPE ; type + db 190 ; catch rate + db 99 ; base exp + + INCBIN "gfx/pokemon/front/slowpoke.pic", 0, 1 ; sprite dimensions + dw SlowpokePicFront, SlowpokePicBack + + db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm new file mode 100644 index 00000000..9b6ccd3e --- /dev/null +++ b/data/pokemon/base_stats/snorlax.asm @@ -0,0 +1,27 @@ + db DEX_SNORLAX ; pokedex id + + db 160, 110, 65, 30, 65 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 25 ; catch rate + db 154 ; base exp + + INCBIN "gfx/pokemon/front/snorlax.pic", 0, 1 ; sprite dimensions + dw SnorlaxPicFront, SnorlaxPicBack + + db HEADBUTT, AMNESIA, REST, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ + REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm new file mode 100644 index 00000000..161f4100 --- /dev/null +++ b/data/pokemon/base_stats/spearow.asm @@ -0,0 +1,22 @@ + db DEX_SPEAROW ; pokedex id + + db 40, 60, 30, 70, 31 + ; hp atk def spd spc + + db NORMAL, FLYING ; type + db 255 ; catch rate + db 58 ; base exp + + INCBIN "gfx/pokemon/front/spearow.pic", 0, 1 ; sprite dimensions + dw SpearowPicFront, SpearowPicBack + + db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKY_ATTACK, REST, SUBSTITUTE, FLY + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm new file mode 100644 index 00000000..e844ac6e --- /dev/null +++ b/data/pokemon/base_stats/squirtle.asm @@ -0,0 +1,24 @@ + db DEX_SQUIRTLE ; pokedex id + + db 44, 48, 65, 43, 50 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 66 ; base exp + + INCBIN "gfx/pokemon/front/squirtle.pic", 0, 1 ; sprite dimensions + dw SquirtlePicFront, SquirtlePicBack + + db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm new file mode 100644 index 00000000..1ec43ca8 --- /dev/null +++ b/data/pokemon/base_stats/starmie.asm @@ -0,0 +1,25 @@ + db DEX_STARMIE ; pokedex id + + db 60, 75, 85, 115, 100 + ; hp atk def spd spc + + db WATER, PSYCHIC_TYPE ; type + db 60 ; catch rate + db 207 ; base exp + + INCBIN "gfx/pokemon/front/starmie.pic", 0, 1 ; sprite dimensions + dw StarmiePicFront, StarmiePicBack + + db TACKLE, WATER_GUN, HARDEN, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ + THUNDER, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ + FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm new file mode 100644 index 00000000..198f552f --- /dev/null +++ b/data/pokemon/base_stats/staryu.asm @@ -0,0 +1,24 @@ + db DEX_STARYU ; pokedex id + + db 30, 45, 55, 85, 70 + ; hp atk def spd spc + + db WATER, WATER ; type + db 225 ; catch rate + db 106 ; base exp + + INCBIN "gfx/pokemon/front/staryu.pic", 0, 1 ; sprite dimensions + dw StaryuPicFront, StaryuPicBack + + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm new file mode 100644 index 00000000..5380a4a7 --- /dev/null +++ b/data/pokemon/base_stats/tangela.asm @@ -0,0 +1,23 @@ + db DEX_TANGELA ; pokedex id + + db 65, 55, 115, 60, 100 + ; hp atk def spd spc + + db GRASS, GRASS ; type + db 45 ; catch rate + db 166 ; base exp + + INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions + dw TangelaPicFront, TangelaPicBack + + db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm new file mode 100644 index 00000000..9aba3e22 --- /dev/null +++ b/data/pokemon/base_stats/tauros.asm @@ -0,0 +1,24 @@ + db DEX_TAUROS ; pokedex id + + db 75, 100, 95, 110, 70 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 211 ; base exp + + INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions + dw TaurosPicFront, TaurosPicBack + + db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ + THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm new file mode 100644 index 00000000..e8296d61 --- /dev/null +++ b/data/pokemon/base_stats/tentacool.asm @@ -0,0 +1,23 @@ + db DEX_TENTACOOL ; pokedex id + + db 40, 40, 35, 70, 100 + ; hp atk def spd spc + + db WATER, POISON ; type + db 190 ; catch rate + db 105 ; base exp + + INCBIN "gfx/pokemon/front/tentacool.pic", 0, 1 ; sprite dimensions + dw TentacoolPicFront, TentacoolPicBack + + db ACID, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, CUT, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm new file mode 100644 index 00000000..ad8f773e --- /dev/null +++ b/data/pokemon/base_stats/tentacruel.asm @@ -0,0 +1,23 @@ + db DEX_TENTACRUEL ; pokedex id + + db 80, 70, 65, 100, 120 + ; hp atk def spd spc + + db WATER, POISON ; type + db 60 ; catch rate + db 205 ; base exp + + INCBIN "gfx/pokemon/front/tentacruel.pic", 0, 1 ; sprite dimensions + dw TentacruelPicFront, TentacruelPicBack + + db ACID, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, SUBSTITUTE, CUT, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm new file mode 100644 index 00000000..ec5c01d2 --- /dev/null +++ b/data/pokemon/base_stats/vaporeon.asm @@ -0,0 +1,23 @@ + db DEX_VAPOREON ; pokedex id + + db 130, 65, 60, 65, 110 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 196 ; base exp + + INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions + dw VaporeonPicFront, VaporeonPicBack + + db TACKLE, SAND_ATTACK, QUICK_ATTACK, WATER_GUN ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + SKULL_BASH, REST, SUBSTITUTE, SURF + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm new file mode 100644 index 00000000..c01ee263 --- /dev/null +++ b/data/pokemon/base_stats/venomoth.asm @@ -0,0 +1,23 @@ + db DEX_VENOMOTH ; pokedex id + + db 70, 65, 60, 90, 90 + ; hp atk def spd spc + + db BUG, POISON ; type + db 75 ; catch rate + db 138 ; base exp + + INCBIN "gfx/pokemon/front/venomoth.pic", 0, 1 ; sprite dimensions + dw VenomothPicFront, VenomothPicBack + + db TACKLE, DISABLE, POISONPOWDER, LEECH_LIFE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, REST, PSYWAVE, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm new file mode 100644 index 00000000..9c9ff071 --- /dev/null +++ b/data/pokemon/base_stats/venonat.asm @@ -0,0 +1,22 @@ + db DEX_VENONAT ; pokedex id + + db 60, 55, 50, 45, 40 + ; hp atk def spd spc + + db BUG, POISON ; type + db 190 ; catch rate + db 75 ; base exp + + INCBIN "gfx/pokemon/front/venonat.pic", 0, 1 ; sprite dimensions + dw VenonatPicFront, VenonatPicBack + + db TACKLE, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ + SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, PSYWAVE, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm new file mode 100644 index 00000000..414590d8 --- /dev/null +++ b/data/pokemon/base_stats/venusaur.asm @@ -0,0 +1,23 @@ + db DEX_VENUSAUR ; pokedex id + + db 80, 82, 83, 80, 100 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 208 ; base exp + + INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions + dw VenusaurPicFront, VenusaurPicBack + + db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm new file mode 100644 index 00000000..5b958297 --- /dev/null +++ b/data/pokemon/base_stats/victreebel.asm @@ -0,0 +1,23 @@ + db DEX_VICTREEBEL ; pokedex id + + db 80, 105, 65, 70, 100 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 191 ; base exp + + INCBIN "gfx/pokemon/front/victreebel.pic", 0, 1 ; sprite dimensions + dw VictreebelPicFront, VictreebelPicBack + + db SLEEP_POWDER, STUN_SPORE, ACID, RAZOR_LEAF ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm new file mode 100644 index 00000000..10ae05da --- /dev/null +++ b/data/pokemon/base_stats/vileplume.asm @@ -0,0 +1,23 @@ + db DEX_VILEPLUME ; pokedex id + + db 75, 80, 85, 50, 100 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 45 ; catch rate + db 184 ; base exp + + INCBIN "gfx/pokemon/front/vileplume.pic", 0, 1 ; sprite dimensions + dw VileplumePicFront, VileplumePicBack + + db STUN_SPORE, SLEEP_POWDER, ACID, PETAL_DANCE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm new file mode 100644 index 00000000..4ad65701 --- /dev/null +++ b/data/pokemon/base_stats/voltorb.asm @@ -0,0 +1,23 @@ + db DEX_VOLTORB ; pokedex id + + db 40, 30, 50, 100, 55 + ; hp atk def spd spc + + db ELECTRIC, ELECTRIC ; type + db 190 ; catch rate + db 103 ; base exp + + INCBIN "gfx/pokemon/front/voltorb.pic", 0, 1 ; sprite dimensions + dw VoltorbPicFront, VoltorbPicBack + + db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ + SUBSTITUTE, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm new file mode 100644 index 00000000..c112b97d --- /dev/null +++ b/data/pokemon/base_stats/vulpix.asm @@ -0,0 +1,22 @@ + db DEX_VULPIX ; pokedex id + + db 38, 41, 40, 65, 65 + ; hp atk def spd spc + + db FIRE, FIRE ; type + db 190 ; catch rate + db 63 ; base exp + + INCBIN "gfx/pokemon/front/vulpix.pic", 0, 1 ; sprite dimensions + dw VulpixPicFront, VulpixPicBack + + db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm new file mode 100644 index 00000000..d430bcdc --- /dev/null +++ b/data/pokemon/base_stats/wartortle.asm @@ -0,0 +1,24 @@ + db DEX_WARTORTLE ; pokedex id + + db 59, 63, 80, 58, 65 + ; hp atk def spd spc + + db WATER, WATER ; type + db 45 ; catch rate + db 143 ; base exp + + INCBIN "gfx/pokemon/front/wartortle.pic", 0, 1 ; sprite dimensions + dw WartortlePicFront, WartortlePicBack + + db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + REST, SUBSTITUTE, SURF, STRENGTH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm new file mode 100644 index 00000000..f6aba236 --- /dev/null +++ b/data/pokemon/base_stats/weedle.asm @@ -0,0 +1,20 @@ + db DEX_WEEDLE ; pokedex id + + db 40, 35, 30, 50, 20 + ; hp atk def spd spc + + db BUG, POISON ; type + db 255 ; catch rate + db 52 ; base exp + + INCBIN "gfx/pokemon/front/weedle.pic", 0, 1 ; sprite dimensions + dw WeedlePicFront, WeedlePicBack + + db POISON_STING, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm new file mode 100644 index 00000000..513de8f8 --- /dev/null +++ b/data/pokemon/base_stats/weepinbell.asm @@ -0,0 +1,22 @@ + db DEX_WEEPINBELL ; pokedex id + + db 65, 90, 50, 55, 85 + ; hp atk def spd spc + + db GRASS, POISON ; type + db 120 ; catch rate + db 151 ; base exp + + INCBIN "gfx/pokemon/front/weepinbell.pic", 0, 1 ; sprite dimensions + dw WeepinbellPicFront, WeepinbellPicBack + + db VINE_WHIP, GROWTH, WRAP, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_SLOW ; growth rate + + ; tm/hm learnset + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, REST, SUBSTITUTE, CUT + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm new file mode 100644 index 00000000..d605f15a --- /dev/null +++ b/data/pokemon/base_stats/weezing.asm @@ -0,0 +1,22 @@ + db DEX_WEEZING ; pokedex id + + db 65, 90, 120, 60, 85 + ; hp atk def spd spc + + db POISON, POISON ; type + db 60 ; catch rate + db 173 ; base exp + + INCBIN "gfx/pokemon/front/weezing.pic", 0, 1 ; sprite dimensions + dw WeezingPicFront, WeezingPicBack + + db TACKLE, SMOG, SLUDGE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ + REST, EXPLOSION, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm new file mode 100644 index 00000000..7249badf --- /dev/null +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -0,0 +1,26 @@ + db DEX_WIGGLYTUFF ; pokedex id + + db 140, 70, 45, 45, 50 + ; hp atk def spd spc + + db NORMAL, NORMAL ; type + db 50 ; catch rate + db 109 ; base exp + + INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions + dw WigglytuffPicFront, WigglytuffPicBack + + db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset + db GROWTH_FAST ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + SUBSTITUTE, STRENGTH, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm new file mode 100644 index 00000000..6571d286 --- /dev/null +++ b/data/pokemon/base_stats/zapdos.asm @@ -0,0 +1,23 @@ + db DEX_ZAPDOS ; pokedex id + + db 90, 90, 85, 100, 125 + ; hp atk def spd spc + + db ELECTRIC, FLYING ; type + db 3 ; catch rate + db 216 ; base exp + + INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions + dw ZapdosPicFront, ZapdosPicBack + + db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ + REST, THUNDER_WAVE, SUBSTITUTE, FLY, FLASH + ; end + + db 0 ; padding diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm new file mode 100644 index 00000000..ddae33cb --- /dev/null +++ b/data/pokemon/base_stats/zubat.asm @@ -0,0 +1,22 @@ + db DEX_ZUBAT ; pokedex id + + db 40, 45, 35, 55, 40 + ; hp atk def spd spc + + db POISON, FLYING ; type + db 255 ; catch rate + db 54 ; base exp + + INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions + dw ZubatPicFront, ZubatPicBack + + db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db GROWTH_MEDIUM_FAST ; growth rate + + ; tm/hm learnset + tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, REST, SUBSTITUTE + ; end + + db 0 ; padding diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm new file mode 100644 index 00000000..f90c1c7b --- /dev/null +++ b/data/pokemon/cries.asm @@ -0,0 +1,198 @@ +mon_cry: MACRO + ;db (\1 - CRY_SFX_START) / 3 + db \1 + db \2, \3 +ENDM + +CryData:: + ; base cry, pitch, length + mon_cry SFX_CRY_11, $00, $80 ; Rhydon + mon_cry SFX_CRY_03, $00, $80 ; Kangaskhan + mon_cry SFX_CRY_00, $00, $80 ; Nidoran♂ + mon_cry SFX_CRY_19, $CC, $01 ; Clefairy + mon_cry SFX_CRY_10, $00, $80 ; Spearow + mon_cry SFX_CRY_06, $ED, $80 ; Voltorb + mon_cry SFX_CRY_09, $00, $80 ; Nidoking + mon_cry SFX_CRY_1F, $00, $80 ; Slowbro + mon_cry SFX_CRY_0F, $20, $80 ; Ivysaur + mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor + mon_cry SFX_CRY_0C, $00, $80 ; Lickitung + mon_cry SFX_CRY_0B, $00, $80 ; Exeggcute + mon_cry SFX_CRY_05, $00, $80 ; Grimer + mon_cry SFX_CRY_07, $00, $FF ; Gengar + mon_cry SFX_CRY_01, $00, $80 ; Nidoran♀ + mon_cry SFX_CRY_0A, $00, $80 ; Nidoqueen + mon_cry SFX_CRY_19, $00, $80 ; Cubone + mon_cry SFX_CRY_04, $00, $80 ; Rhyhorn + mon_cry SFX_CRY_1B, $00, $80 ; Lapras + mon_cry SFX_CRY_15, $00, $80 ; Arcanine + mon_cry SFX_CRY_1E, $EE, $FF ; Mew + mon_cry SFX_CRY_17, $00, $80 ; Gyarados + mon_cry SFX_CRY_18, $00, $80 ; Shellder + mon_cry SFX_CRY_1A, $00, $80 ; Tentacool + mon_cry SFX_CRY_1C, $00, $80 ; Gastly + mon_cry SFX_CRY_16, $00, $80 ; Scyther + mon_cry SFX_CRY_1E, $02, $20 ; Staryu + mon_cry SFX_CRY_13, $00, $80 ; Blastoise + mon_cry SFX_CRY_14, $00, $80 ; Pinsir + mon_cry SFX_CRY_12, $00, $80 ; Tangela + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1F, $20, $40 ; Growlithe + mon_cry SFX_CRY_17, $FF, $C0 ; Onix + mon_cry SFX_CRY_18, $40, $A0 ; Fearow + mon_cry SFX_CRY_0E, $DF, $04 ; Pidgey + mon_cry SFX_CRY_02, $00, $80 ; Slowpoke + mon_cry SFX_CRY_1C, $A8, $C0 ; Kadabra + mon_cry SFX_CRY_24, $00, $80 ; Graveler + mon_cry SFX_CRY_14, $0A, $C0 ; Chansey + mon_cry SFX_CRY_1F, $48, $60 ; Machoke + mon_cry SFX_CRY_20, $08, $40 ; Mr.Mime + mon_cry SFX_CRY_12, $80, $C0 ; Hitmonlee + mon_cry SFX_CRY_0C, $EE, $C0 ; Hitmonchan + mon_cry SFX_CRY_17, $E0, $10 ; Arbok + mon_cry SFX_CRY_1E, $42, $FF ; Parasect + mon_cry SFX_CRY_21, $20, $60 ; Psyduck + mon_cry SFX_CRY_0D, $88, $20 ; Drowzee + mon_cry SFX_CRY_12, $E0, $40 ; Golem + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_04, $FF, $30 ; Magmar + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_06, $8F, $FF ; Electabuzz + mon_cry SFX_CRY_1C, $20, $C0 ; Magneton + mon_cry SFX_CRY_12, $E6, $DD ; Koffing + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0A, $DD, $60 ; Mankey + mon_cry SFX_CRY_0C, $88, $C0 ; Seel + mon_cry SFX_CRY_0B, $AA, $01 ; Diglett + mon_cry SFX_CRY_1D, $11, $40 ; Tauros + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_10, $DD, $01 ; Farfetch'd + mon_cry SFX_CRY_1A, $44, $40 ; Venonat + mon_cry SFX_CRY_0F, $3C, $C0 ; Dragonite + mon_cry SFX_CRY_00, $80, $10 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1D, $E0, $80 ; MissingNo. + mon_cry SFX_CRY_0B, $BB, $01 ; Doduo + mon_cry SFX_CRY_0E, $FF, $FF ; Poliwag + mon_cry SFX_CRY_0D, $FF, $FF ; Jynx + mon_cry SFX_CRY_09, $F8, $40 ; Moltres + mon_cry SFX_CRY_09, $80, $40 ; Articuno + mon_cry SFX_CRY_18, $FF, $80 ; Zapdos + mon_cry SFX_CRY_0E, $FF, $FF ; Ditto + mon_cry SFX_CRY_19, $77, $10 ; Meowth + mon_cry SFX_CRY_20, $20, $E0 ; Krabby + mon_cry SFX_CRY_22, $FF, $40 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0E, $E0, $60 ; MissingNo. + mon_cry SFX_CRY_24, $4F, $10 ; Vulpix + mon_cry SFX_CRY_24, $88, $60 ; Ninetales + mon_cry SFX_CRY_0F, $EE, $01 ; Pikachu + mon_cry SFX_CRY_09, $EE, $08 ; Raichu + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0F, $60, $40 ; Dratini + mon_cry SFX_CRY_0F, $40, $80 ; Dragonair + mon_cry SFX_CRY_16, $BB, $40 ; Kabuto + mon_cry SFX_CRY_18, $EE, $01 ; Kabutops + mon_cry SFX_CRY_19, $99, $10 ; Horsea + mon_cry SFX_CRY_19, $3C, $01 ; Seadra + mon_cry SFX_CRY_0F, $40, $C0 ; MissingNo. + mon_cry SFX_CRY_0F, $20, $C0 ; MissingNo. + mon_cry SFX_CRY_00, $20, $40 ; Sandshrew + mon_cry SFX_CRY_00, $FF, $FF ; Sandslash + mon_cry SFX_CRY_1F, $F0, $01 ; Omanyte + mon_cry SFX_CRY_1F, $FF, $40 ; Omastar + mon_cry SFX_CRY_0E, $FF, $35 ; Jigglypuff + mon_cry SFX_CRY_0E, $68, $60 ; Wigglytuff + mon_cry SFX_CRY_1A, $88, $60 ; Eevee + mon_cry SFX_CRY_1A, $10, $20 ; Flareon + mon_cry SFX_CRY_1A, $3D, $80 ; Jolteon + mon_cry SFX_CRY_1A, $AA, $FF ; Vaporeon + mon_cry SFX_CRY_1F, $EE, $01 ; Machop + mon_cry SFX_CRY_1D, $E0, $80 ; Zubat + mon_cry SFX_CRY_17, $12, $40 ; Ekans + mon_cry SFX_CRY_1E, $20, $E0 ; Paras + mon_cry SFX_CRY_0E, $77, $60 ; Poliwhirl + mon_cry SFX_CRY_0E, $00, $FF ; Poliwrath + mon_cry SFX_CRY_15, $EE, $01 ; Weedle + mon_cry SFX_CRY_13, $FF, $01 ; Kakuna + mon_cry SFX_CRY_13, $60, $80 ; Beedrill + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_0B, $99, $20 ; Dodrio + mon_cry SFX_CRY_0A, $AF, $40 ; Primeape + mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio + mon_cry SFX_CRY_1A, $29, $80 ; Venomoth + mon_cry SFX_CRY_0C, $23, $FF ; Dewgong + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_16, $80, $20 ; Caterpie + mon_cry SFX_CRY_1C, $CC, $01 ; Metapod + mon_cry SFX_CRY_16, $77, $40 ; Butterfree + mon_cry SFX_CRY_1F, $08, $C0 ; Machamp + mon_cry SFX_CRY_11, $20, $10 ; MissingNo. + mon_cry SFX_CRY_21, $FF, $40 ; Golduck + mon_cry SFX_CRY_0D, $EE, $40 ; Hypno + mon_cry SFX_CRY_1D, $FA, $80 ; Golbat + mon_cry SFX_CRY_1E, $99, $FF ; Mewtwo + mon_cry SFX_CRY_05, $55, $01 ; Snorlax + mon_cry SFX_CRY_17, $80, $00 ; Magikarp + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_07, $EF, $FF ; Muk + mon_cry SFX_CRY_0F, $40, $80 ; MissingNo. + mon_cry SFX_CRY_20, $EE, $E0 ; Kingler + mon_cry SFX_CRY_18, $6F, $E0 ; Cloyster + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_06, $A8, $90 ; Electrode + mon_cry SFX_CRY_19, $AA, $20 ; Clefable + mon_cry SFX_CRY_12, $FF, $FF ; Weezing + mon_cry SFX_CRY_19, $99, $FF ; Persian + mon_cry SFX_CRY_08, $4F, $60 ; Marowak + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1C, $30, $40 ; Haunter + mon_cry SFX_CRY_1C, $C0, $01 ; Abra + mon_cry SFX_CRY_1C, $98, $FF ; Alakazam + mon_cry SFX_CRY_14, $28, $C0 ; Pidgeotto + mon_cry SFX_CRY_14, $11, $FF ; Pidgeot + mon_cry SFX_CRY_1E, $00, $80 ; Starmie + mon_cry SFX_CRY_0F, $80, $01 ; Bulbasaur + mon_cry SFX_CRY_0F, $00, $C0 ; Venusaur + mon_cry SFX_CRY_1A, $EE, $FF ; Tentacruel + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_16, $80, $40 ; Goldeen + mon_cry SFX_CRY_16, $10, $FF ; Seaking + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_25, $00, $80 ; Ponyta + mon_cry SFX_CRY_25, $20, $C0 ; Rapidash + mon_cry SFX_CRY_22, $00, $80 ; Rattata + mon_cry SFX_CRY_22, $20, $FF ; Raticate + mon_cry SFX_CRY_00, $2C, $C0 ; Nidorino + mon_cry SFX_CRY_01, $2C, $E0 ; Nidorina + mon_cry SFX_CRY_24, $F0, $10 ; Geodude + mon_cry SFX_CRY_25, $AA, $FF ; Porygon + mon_cry SFX_CRY_23, $20, $F0 ; Aerodactyl + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_1C, $80, $60 ; Magnemite + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_04, $60, $40 ; Charmander + mon_cry SFX_CRY_1D, $60, $40 ; Squirtle + mon_cry SFX_CRY_04, $20, $40 ; Charmeleon + mon_cry SFX_CRY_1D, $20, $40 ; Wartortle + mon_cry SFX_CRY_04, $00, $80 ; Charizard + mon_cry SFX_CRY_1D, $00, $80 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_00, $00, $00 ; MissingNo. + mon_cry SFX_CRY_08, $DD, $01 ; Oddish + mon_cry SFX_CRY_08, $AA, $40 ; Gloom + mon_cry SFX_CRY_23, $22, $FF ; Vileplume + mon_cry SFX_CRY_21, $55, $01 ; Bellsprout + mon_cry SFX_CRY_25, $44, $20 ; Weepinbell + mon_cry SFX_CRY_25, $66, $CC ; Victreebel diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm new file mode 100644 index 00000000..931793df --- /dev/null +++ b/data/pokemon/dex_entries.asm @@ -0,0 +1,1259 @@ +PokedexEntryPointers: + dw RhydonDexEntry + dw KangaskhanDexEntry + dw NidoranMDexEntry + dw ClefairyDexEntry + dw SpearowDexEntry + dw VoltorbDexEntry + dw NidokingDexEntry + dw SlowbroDexEntry + dw IvysaurDexEntry + dw ExeggutorDexEntry + dw LickitungDexEntry + dw ExeggcuteDexEntry + dw GrimerDexEntry + dw GengarDexEntry + dw NidoranFDexEntry + dw NidoqueenDexEntry + dw CuboneDexEntry + dw RhyhornDexEntry + dw LaprasDexEntry + dw ArcanineDexEntry + dw MewDexEntry + dw GyaradosDexEntry + dw ShellderDexEntry + dw TentacoolDexEntry + dw GastlyDexEntry + dw ScytherDexEntry + dw StaryuDexEntry + dw BlastoiseDexEntry + dw PinsirDexEntry + dw TangelaDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw GrowlitheDexEntry + dw OnixDexEntry + dw FearowDexEntry + dw PidgeyDexEntry + dw SlowpokeDexEntry + dw KadabraDexEntry + dw GravelerDexEntry + dw ChanseyDexEntry + dw MachokeDexEntry + dw MrMimeDexEntry + dw HitmonleeDexEntry + dw HitmonchanDexEntry + dw ArbokDexEntry + dw ParasectDexEntry + dw PsyduckDexEntry + dw DrowzeeDexEntry + dw GolemDexEntry + dw MissingNoDexEntry + dw MagmarDexEntry + dw MissingNoDexEntry + dw ElectabuzzDexEntry + dw MagnetonDexEntry + dw KoffingDexEntry + dw MissingNoDexEntry + dw MankeyDexEntry + dw SeelDexEntry + dw DiglettDexEntry + dw TaurosDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw FarfetchdDexEntry + dw VenonatDexEntry + dw DragoniteDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw DoduoDexEntry + dw PoliwagDexEntry + dw JynxDexEntry + dw MoltresDexEntry + dw ArticunoDexEntry + dw ZapdosDexEntry + dw DittoDexEntry + dw MeowthDexEntry + dw KrabbyDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw VulpixDexEntry + dw NinetalesDexEntry + dw PikachuDexEntry + dw RaichuDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw DratiniDexEntry + dw DragonairDexEntry + dw KabutoDexEntry + dw KabutopsDexEntry + dw HorseaDexEntry + dw SeadraDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw SandshrewDexEntry + dw SandslashDexEntry + dw OmanyteDexEntry + dw OmastarDexEntry + dw JigglypuffDexEntry + dw WigglytuffDexEntry + dw EeveeDexEntry + dw FlareonDexEntry + dw JolteonDexEntry + dw VaporeonDexEntry + dw MachopDexEntry + dw ZubatDexEntry + dw EkansDexEntry + dw ParasDexEntry + dw PoliwhirlDexEntry + dw PoliwrathDexEntry + dw WeedleDexEntry + dw KakunaDexEntry + dw BeedrillDexEntry + dw MissingNoDexEntry + dw DodrioDexEntry + dw PrimeapeDexEntry + dw DugtrioDexEntry + dw VenomothDexEntry + dw DewgongDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw CaterpieDexEntry + dw MetapodDexEntry + dw ButterfreeDexEntry + dw MachampDexEntry + dw MissingNoDexEntry + dw GolduckDexEntry + dw HypnoDexEntry + dw GolbatDexEntry + dw MewtwoDexEntry + dw SnorlaxDexEntry + dw MagikarpDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MukDexEntry + dw MissingNoDexEntry + dw KinglerDexEntry + dw CloysterDexEntry + dw MissingNoDexEntry + dw ElectrodeDexEntry + dw ClefableDexEntry + dw WeezingDexEntry + dw PersianDexEntry + dw MarowakDexEntry + dw MissingNoDexEntry + dw HaunterDexEntry + dw AbraDexEntry + dw AlakazamDexEntry + dw PidgeottoDexEntry + dw PidgeotDexEntry + dw StarmieDexEntry + dw BulbasaurDexEntry + dw VenusaurDexEntry + dw TentacruelDexEntry + dw MissingNoDexEntry + dw GoldeenDexEntry + dw SeakingDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw PonytaDexEntry + dw RapidashDexEntry + dw RattataDexEntry + dw RaticateDexEntry + dw NidorinoDexEntry + dw NidorinaDexEntry + dw GeodudeDexEntry + dw PorygonDexEntry + dw AerodactylDexEntry + dw MissingNoDexEntry + dw MagnemiteDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw CharmanderDexEntry + dw SquirtleDexEntry + dw CharmeleonDexEntry + dw WartortleDexEntry + dw CharizardDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw MissingNoDexEntry + dw OddishDexEntry + dw GloomDexEntry + dw VileplumeDexEntry + dw BellsproutDexEntry + dw WeepinbellDexEntry + dw VictreebelDexEntry + +; string: species name +; height in feet, inches +; weight in pounds +; text entry + +RhydonDexEntry: + db "DRILL@" + db 6,3 + dw 2650 + text_far _RhydonDexEntry + text_end + +KangaskhanDexEntry: + db "PARENT@" + db 7,3 + dw 1760 + text_far _KangaskhanDexEntry + text_end + +NidoranMDexEntry: + db "POISON PIN@" + db 1,8 + dw 200 + text_far _NidoranMDexEntry + text_end + +ClefairyDexEntry: + db "FAIRY@" + db 2,0 + dw 170 + text_far _ClefairyDexEntry + text_end + +SpearowDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _SpearowDexEntry + text_end + +VoltorbDexEntry: + db "BALL@" + db 1,8 + dw 230 + text_far _VoltorbDexEntry + text_end + +NidokingDexEntry: + db "DRILL@" + db 4,7 + dw 1370 + text_far _NidokingDexEntry + text_end + +SlowbroDexEntry: + db "HERMITCRAB@" + db 5,3 + dw 1730 + text_far _SlowbroDexEntry + text_end + +IvysaurDexEntry: + db "SEED@" + db 3,3 + dw 290 + text_far _IvysaurDexEntry + text_end + +ExeggutorDexEntry: + db "COCONUT@" + db 6,7 + dw 2650 + text_far _ExeggutorDexEntry + text_end + +LickitungDexEntry: + db "LICKING@" + db 3,11 + dw 1440 + text_far _LickitungDexEntry + text_end + +ExeggcuteDexEntry: + db "EGG@" + db 1,4 + dw 60 + text_far _ExeggcuteDexEntry + text_end + +GrimerDexEntry: + db "SLUDGE@" + db 2,11 + dw 660 + text_far _GrimerDexEntry + text_end + +GengarDexEntry: + db "SHADOW@" + db 4,11 + dw 890 + text_far _GengarDexEntry + text_end + +NidoranFDexEntry: + db "POISON PIN@" + db 1,4 + dw 150 + text_far _NidoranFDexEntry + text_end + +NidoqueenDexEntry: + db "DRILL@" + db 4,3 + dw 1320 + text_far _NidoqueenDexEntry + text_end + +CuboneDexEntry: + db "LONELY@" + db 1,4 + dw 140 + text_far _CuboneDexEntry + text_end + +RhyhornDexEntry: + db "SPIKES@" + db 3,3 + dw 2540 + text_far _RhyhornDexEntry + text_end + +LaprasDexEntry: + db "TRANSPORT@" + db 8,2 + dw 4850 + text_far _LaprasDexEntry + text_end + +ArcanineDexEntry: + db "LEGENDARY@" + db 6,3 + dw 3420 + text_far _ArcanineDexEntry + text_end + +MewDexEntry: + db "NEW SPECIE@" + db 1,4 + dw 90 + text_far _MewDexEntry + text_end + +GyaradosDexEntry: + db "ATROCIOUS@" + db 21,4 + dw 5180 + text_far _GyaradosDexEntry + text_end + +ShellderDexEntry: + db "BIVALVE@" + db 1,0 + dw 90 + text_far _ShellderDexEntry + text_end + +TentacoolDexEntry: + db "JELLYFISH@" + db 2,11 + dw 1000 + text_far _TentacoolDexEntry + text_end + +GastlyDexEntry: + db "GAS@" + db 4,3 + dw 2 + text_far _GastlyDexEntry + text_end + +ScytherDexEntry: + db "MANTIS@" + db 4,11 + dw 1230 + text_far _ScytherDexEntry + text_end + +StaryuDexEntry: + db "STARSHAPE@" + db 2,7 + dw 760 + text_far _StaryuDexEntry + text_end + +BlastoiseDexEntry: + db "SHELLFISH@" + db 5,3 + dw 1890 + text_far _BlastoiseDexEntry + text_end + +PinsirDexEntry: + db "STAGBEETLE@" + db 4,11 + dw 1210 + text_far _PinsirDexEntry + text_end + +TangelaDexEntry: + db "VINE@" + db 3,3 + dw 770 + text_far _TangelaDexEntry + text_end + +GrowlitheDexEntry: + db "PUPPY@" + db 2,4 + dw 420 + text_far _GrowlitheDexEntry + text_end + +OnixDexEntry: + db "ROCK SNAKE@" + db 28,10 + dw 4630 + text_far _OnixDexEntry + text_end + +FearowDexEntry: + db "BEAK@" + db 3,11 + dw 840 + text_far _FearowDexEntry + text_end + +PidgeyDexEntry: + db "TINY BIRD@" + db 1,0 + dw 40 + text_far _PidgeyDexEntry + text_end + +SlowpokeDexEntry: + db "DOPEY@" + db 3,11 + dw 790 + text_far _SlowpokeDexEntry + text_end + +KadabraDexEntry: + db "PSI@" + db 4,3 + dw 1250 + text_far _KadabraDexEntry + text_end + +GravelerDexEntry: + db "ROCK@" + db 3,3 + dw 2320 + text_far _GravelerDexEntry + text_end + +ChanseyDexEntry: + db "EGG@" + db 3,7 + dw 760 + text_far _ChanseyDexEntry + text_end + +MachokeDexEntry: + db "SUPERPOWER@" + db 4,11 + dw 1550 + text_far _MachokeDexEntry + text_end + +MrMimeDexEntry: + db "BARRIER@" + db 4,3 + dw 1200 + text_far _MrMimeDexEntry + text_end + +HitmonleeDexEntry: + db "KICKING@" + db 4,11 + dw 1100 + text_far _HitmonleeDexEntry + text_end + +HitmonchanDexEntry: + db "PUNCHING@" + db 4,7 + dw 1110 + text_far _HitmonchanDexEntry + text_end + +ArbokDexEntry: + db "COBRA@" + db 11,6 + dw 1430 + text_far _ArbokDexEntry + text_end + +ParasectDexEntry: + db "MUSHROOM@" + db 3,3 + dw 650 + text_far _ParasectDexEntry + text_end + +PsyduckDexEntry: + db "DUCK@" + db 2,7 + dw 430 + text_far _PsyduckDexEntry + text_end + +DrowzeeDexEntry: + db "HYPNOSIS@" + db 3,3 + dw 710 + text_far _DrowzeeDexEntry + text_end + +GolemDexEntry: + db "MEGATON@" + db 4,7 + dw 6620 + text_far _GolemDexEntry + text_end + +MagmarDexEntry: + db "SPITFIRE@" + db 4,3 + dw 980 + text_far _MagmarDexEntry + text_end + +ElectabuzzDexEntry: + db "ELECTRIC@" + db 3,7 + dw 660 + text_far _ElectabuzzDexEntry + text_end + +MagnetonDexEntry: + db "MAGNET@" + db 3,3 + dw 1320 + text_far _MagnetonDexEntry + text_end + +KoffingDexEntry: + db "POISON GAS@" + db 2,0 + dw 20 + text_far _KoffingDexEntry + text_end + +MankeyDexEntry: + db "PIG MONKEY@" + db 1,8 + dw 620 + text_far _MankeyDexEntry + text_end + +SeelDexEntry: + db "SEA LION@" + db 3,7 + dw 1980 + text_far _SeelDexEntry + text_end + +DiglettDexEntry: + db "MOLE@" + db 0,8 + dw 20 + text_far _DiglettDexEntry + text_end + +TaurosDexEntry: + db "WILD BULL@" + db 4,7 + dw 1950 + text_far _TaurosDexEntry + text_end + +FarfetchdDexEntry: + db "WILD DUCK@" + db 2,7 + dw 330 + text_far _FarfetchdDexEntry + text_end + +VenonatDexEntry: + db "INSECT@" + db 3,3 + dw 660 + text_far _VenonatDexEntry + text_end + +DragoniteDexEntry: + db "DRAGON@" + db 7,3 + dw 4630 + text_far _DragoniteDexEntry + text_end + +DoduoDexEntry: + db "TWIN BIRD@" + db 4,7 + dw 860 + text_far _DoduoDexEntry + text_end + +PoliwagDexEntry: + db "TADPOLE@" + db 2,0 + dw 270 + text_far _PoliwagDexEntry + text_end + +JynxDexEntry: + db "HUMANSHAPE@" + db 4,7 + dw 900 + text_far _JynxDexEntry + text_end + +MoltresDexEntry: + db "FLAME@" + db 6,7 + dw 1320 + text_far _MoltresDexEntry + text_end + +ArticunoDexEntry: + db "FREEZE@" + db 5,7 + dw 1220 + text_far _ArticunoDexEntry + text_end + +ZapdosDexEntry: + db "ELECTRIC@" + db 5,3 + dw 1160 + text_far _ZapdosDexEntry + text_end + +DittoDexEntry: + db "TRANSFORM@" + db 1,0 + dw 90 + text_far _DittoDexEntry + text_end + +MeowthDexEntry: + db "SCRATCHCAT@" + db 1,4 + dw 90 + text_far _MeowthDexEntry + text_end + +KrabbyDexEntry: + db "RIVER CRAB@" + db 1,4 + dw 140 + text_far _KrabbyDexEntry + text_end + +VulpixDexEntry: + db "FOX@" + db 2,0 + dw 220 + text_far _VulpixDexEntry + text_end + +NinetalesDexEntry: + db "FOX@" + db 3,7 + dw 440 + text_far _NinetalesDexEntry + text_end + +PikachuDexEntry: + db "MOUSE@" + db 1,4 + dw 130 + text_far _PikachuDexEntry + text_end + +RaichuDexEntry: + db "MOUSE@" + db 2,7 + dw 660 + text_far _RaichuDexEntry + text_end + +DratiniDexEntry: + db "DRAGON@" + db 5,11 + dw 70 + text_far _DratiniDexEntry + text_end + +DragonairDexEntry: + db "DRAGON@" + db 13,1 + dw 360 + text_far _DragonairDexEntry + text_end + +KabutoDexEntry: + db "SHELLFISH@" + db 1,8 + dw 250 + text_far _KabutoDexEntry + text_end + +KabutopsDexEntry: + db "SHELLFISH@" + db 4,3 + dw 890 + text_far _KabutopsDexEntry + text_end + +HorseaDexEntry: + db "DRAGON@" + db 1,4 + dw 180 + text_far _HorseaDexEntry + text_end + +SeadraDexEntry: + db "DRAGON@" + db 3,11 + dw 550 + text_far _SeadraDexEntry + text_end + +SandshrewDexEntry: + db "MOUSE@" + db 2,0 + dw 260 + text_far _SandshrewDexEntry + text_end + +SandslashDexEntry: + db "MOUSE@" + db 3,3 + dw 650 + text_far _SandslashDexEntry + text_end + +OmanyteDexEntry: + db "SPIRAL@" + db 1,4 + dw 170 + text_far _OmanyteDexEntry + text_end + +OmastarDexEntry: + db "SPIRAL@" + db 3,3 + dw 770 + text_far _OmastarDexEntry + text_end + +JigglypuffDexEntry: + db "BALLOON@" + db 1,8 + dw 120 + text_far _JigglypuffDexEntry + text_end + +WigglytuffDexEntry: + db "BALLOON@" + db 3,3 + dw 260 + text_far _WigglytuffDexEntry + text_end + +EeveeDexEntry: + db "EVOLUTION@" + db 1,0 + dw 140 + text_far _EeveeDexEntry + text_end + +FlareonDexEntry: + db "FLAME@" + db 2,11 + dw 550 + text_far _FlareonDexEntry + text_end + +JolteonDexEntry: + db "LIGHTNING@" + db 2,7 + dw 540 + text_far _JolteonDexEntry + text_end + +VaporeonDexEntry: + db "BUBBLE JET@" + db 3,3 + dw 640 + text_far _VaporeonDexEntry + text_end + +MachopDexEntry: + db "SUPERPOWER@" + db 2,7 + dw 430 + text_far _MachopDexEntry + text_end + +ZubatDexEntry: + db "BAT@" + db 2,7 + dw 170 + text_far _ZubatDexEntry + text_end + +EkansDexEntry: + db "SNAKE@" + db 6,7 + dw 150 + text_far _EkansDexEntry + text_end + +ParasDexEntry: + db "MUSHROOM@" + db 1,0 + dw 120 + text_far _ParasDexEntry + text_end + +PoliwhirlDexEntry: + db "TADPOLE@" + db 3,3 + dw 440 + text_far _PoliwhirlDexEntry + text_end + +PoliwrathDexEntry: + db "TADPOLE@" + db 4,3 + dw 1190 + text_far _PoliwrathDexEntry + text_end + +WeedleDexEntry: + db "HAIRY BUG@" + db 1,0 + dw 70 + text_far _WeedleDexEntry + text_end + +KakunaDexEntry: + db "COCOON@" + db 2,0 + dw 220 + text_far _KakunaDexEntry + text_end + +BeedrillDexEntry: + db "POISON BEE@" + db 3,3 + dw 650 + text_far _BeedrillDexEntry + text_end + +DodrioDexEntry: + db "TRIPLEBIRD@" + db 5,11 + dw 1880 + text_far _DodrioDexEntry + text_end + +PrimeapeDexEntry: + db "PIG MONKEY@" + db 3,3 + dw 710 + text_far _PrimeapeDexEntry + text_end + +DugtrioDexEntry: + db "MOLE@" + db 2,4 + dw 730 + text_far _DugtrioDexEntry + text_end + +VenomothDexEntry: + db "POISONMOTH@" + db 4,11 + dw 280 + text_far _VenomothDexEntry + text_end + +DewgongDexEntry: + db "SEA LION@" + db 5,7 + dw 2650 + text_far _DewgongDexEntry + text_end + +CaterpieDexEntry: + db "WORM@" + db 1,0 + dw 60 + text_far _CaterpieDexEntry + text_end + +MetapodDexEntry: + db "COCOON@" + db 2,4 + dw 220 + text_far _MetapodDexEntry + text_end + +ButterfreeDexEntry: + db "BUTTERFLY@" + db 3,7 + dw 710 + text_far _ButterfreeDexEntry + text_end + +MachampDexEntry: + db "SUPERPOWER@" + db 5,3 + dw 2870 + text_far _MachampDexEntry + text_end + +GolduckDexEntry: + db "DUCK@" + db 5,7 + dw 1690 + text_far _GolduckDexEntry + text_end + +HypnoDexEntry: + db "HYPNOSIS@" + db 5,3 + dw 1670 + text_far _HypnoDexEntry + text_end + +GolbatDexEntry: + db "BAT@" + db 5,3 + dw 1210 + text_far _GolbatDexEntry + text_end + +MewtwoDexEntry: + db "GENETIC@" + db 6,7 + dw 2690 + text_far _MewtwoDexEntry + text_end + +SnorlaxDexEntry: + db "SLEEPING@" + db 6,11 + dw 10140 + text_far _SnorlaxDexEntry + text_end + +MagikarpDexEntry: + db "FISH@" + db 2,11 + dw 220 + text_far _MagikarpDexEntry + text_end + +MukDexEntry: + db "SLUDGE@" + db 3,11 + dw 660 + text_far _MukDexEntry + text_end + +KinglerDexEntry: + db "PINCER@" + db 4,3 + dw 1320 + text_far _KinglerDexEntry + text_end + +CloysterDexEntry: + db "BIVALVE@" + db 4,11 + dw 2920 + text_far _CloysterDexEntry + text_end + +ElectrodeDexEntry: + db "BALL@" + db 3,11 + dw 1470 + text_far _ElectrodeDexEntry + text_end + +ClefableDexEntry: + db "FAIRY@" + db 4,3 + dw 880 + text_far _ClefableDexEntry + text_end + +WeezingDexEntry: + db "POISON GAS@" + db 3,11 + dw 210 + text_far _WeezingDexEntry + text_end + +PersianDexEntry: + db "CLASSY CAT@" + db 3,3 + dw 710 + text_far _PersianDexEntry + text_end + +MarowakDexEntry: + db "BONEKEEPER@" + db 3,3 + dw 990 + text_far _MarowakDexEntry + text_end + +HaunterDexEntry: + db "GAS@" + db 5,3 + dw 2 + text_far _HaunterDexEntry + text_end + +AbraDexEntry: + db "PSI@" + db 2,11 + dw 430 + text_far _AbraDexEntry + text_end + +AlakazamDexEntry: + db "PSI@" + db 4,11 + dw 1060 + text_far _AlakazamDexEntry + text_end + +PidgeottoDexEntry: + db "BIRD@" + db 3,7 + dw 660 + text_far _PidgeottoDexEntry + text_end + +PidgeotDexEntry: + db "BIRD@" + db 4,11 + dw 870 + text_far _PidgeotDexEntry + text_end + +StarmieDexEntry: + db "MYSTERIOUS@" + db 3,7 + dw 1760 + text_far _StarmieDexEntry + text_end + +BulbasaurDexEntry: + db "SEED@" + db 2,4 + dw 150 + text_far _BulbasaurDexEntry + text_end + +VenusaurDexEntry: + db "SEED@" + db 6,7 + dw 2210 + text_far _VenusaurDexEntry + text_end + +TentacruelDexEntry: + db "JELLYFISH@" + db 5,3 + dw 1210 + text_far _TentacruelDexEntry + text_end + +GoldeenDexEntry: + db "GOLDFISH@" + db 2,0 + dw 330 + text_far _GoldeenDexEntry + text_end + +SeakingDexEntry: + db "GOLDFISH@" + db 4,3 + dw 860 + text_far _SeakingDexEntry + text_end + +PonytaDexEntry: + db "FIRE HORSE@" + db 3,3 + dw 660 + text_far _PonytaDexEntry + text_end + +RapidashDexEntry: + db "FIRE HORSE@" + db 5,7 + dw 2090 + text_far _RapidashDexEntry + text_end + +RattataDexEntry: + db "RAT@" + db 1,0 + dw 80 + text_far _RattataDexEntry + text_end + +RaticateDexEntry: + db "RAT@" + db 2,4 + dw 410 + text_far _RaticateDexEntry + text_end + +NidorinoDexEntry: + db "POISON PIN@" + db 2,11 + dw 430 + text_far _NidorinoDexEntry + text_end + +NidorinaDexEntry: + db "POISON PIN@" + db 2,7 + dw 440 + text_far _NidorinaDexEntry + text_end + +GeodudeDexEntry: + db "ROCK@" + db 1,4 + dw 440 + text_far _GeodudeDexEntry + text_end + +PorygonDexEntry: + db "VIRTUAL@" + db 2,7 + dw 800 + text_far _PorygonDexEntry + text_end + +AerodactylDexEntry: + db "FOSSIL@" + db 5,11 + dw 1300 + text_far _AerodactylDexEntry + text_end + +MagnemiteDexEntry: + db "MAGNET@" + db 1,0 + dw 130 + text_far _MagnemiteDexEntry + text_end + +CharmanderDexEntry: + db "LIZARD@" + db 2,0 + dw 190 + text_far _CharmanderDexEntry + text_end + +SquirtleDexEntry: + db "TINYTURTLE@" + db 1,8 + dw 200 + text_far _SquirtleDexEntry + text_end + +CharmeleonDexEntry: + db "FLAME@" + db 3,7 + dw 420 + text_far _CharmeleonDexEntry + text_end + +WartortleDexEntry: + db "TURTLE@" + db 3,3 + dw 500 + text_far _WartortleDexEntry + text_end + +CharizardDexEntry: + db "FLAME@" + db 5,7 + dw 2000 + text_far _CharizardDexEntry + text_end + +OddishDexEntry: + db "WEED@" + db 1,8 + dw 120 + text_far _OddishDexEntry + text_end + +GloomDexEntry: + db "WEED@" + db 2,7 + dw 190 + text_far _GloomDexEntry + text_end + +VileplumeDexEntry: + db "FLOWER@" + db 3,11 + dw 410 + text_far _VileplumeDexEntry + text_end + +BellsproutDexEntry: + db "FLOWER@" + db 2,4 + dw 90 + text_far _BellsproutDexEntry + text_end + +WeepinbellDexEntry: + db "FLYCATCHER@" + db 3,3 + dw 140 + text_far _WeepinbellDexEntry + text_end + +VictreebelDexEntry: + db "FLYCATCHER@" + db 5,7 + dw 340 + text_far _VictreebelDexEntry + text_end + +MissingNoDexEntry: + db "???@" + db 10 ; 1.0 m + dw 100 ; 10.0 kg + db "コメント　さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/pokedex_order.asm b/data/pokemon/dex_order.asm old mode 100755 new mode 100644 similarity index 100% rename from data/pokedex_order.asm rename to data/pokemon/dex_order.asm diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm new file mode 100644 index 00000000..cdb7e179 --- /dev/null +++ b/data/pokemon/dex_text.asm @@ -0,0 +1,1509 @@ +_RhydonDexEntry:: + text "Protected by an" + next "armor-like hide," + next "it is capable of" + + page "living in molten" + next "lava of 3,600" + next "degrees" + dex + +_KangaskhanDexEntry:: + text "The infant rarely" + next "ventures out of" + next "its mother's" + + page "protective pouch" + next "until it is 3" + next "years old" + dex + +_NidoranMDexEntry:: + text "Stiffens its ears" + next "to sense danger." + next "The larger its" + + page "horns, the more" + next "powerful its" + next "secreted venom" + dex + +_ClefairyDexEntry:: + text "Its magical and" + next "cute appeal has" + next "many admirers." + + page "It is rare and" + next "found only in" + next "certain areas" + dex + +_SpearowDexEntry:: + text "Eats bugs in" + next "grassy areas. It" + next "has to flap its" + + page "short wings at" + next "high speed to" + next "stay airborne" + dex + +_VoltorbDexEntry:: + text "Usually found in" + next "power plants." + next "Easily mistaken" + + page "for a # BALL," + next "they have zapped" + next "many people" + dex + +_NidokingDexEntry:: + text "It uses its" + next "powerful tail in" + next "battle to smash," + + page "constrict, then" + next "break the prey's" + next "bones" + dex + +_SlowbroDexEntry:: + text "The SHELLDER that" + next "is latched onto" + next "SLOWPOKE's tail" + + page "is said to feed" + next "on the host's left" + next "over scraps" + dex + +_IvysaurDexEntry:: + text "When the bulb on" + next "its back grows" + next "large, it appears" + + page "to lose the" + next "ability to stand" + next "on its hind legs" + dex + +_ExeggutorDexEntry:: + text "Legend has it that" + next "on rare occasions," + next "one of its heads" + + page "will drop off and" + next "continue on as an" + next "EXEGGCUTE" + dex + +_LickitungDexEntry:: + text "Its tongue can be" + next "extended like a" + next "chameleon's. It" + + page "leaves a tingling" + next "sensation when it" + next "licks enemies" + dex + +_ExeggcuteDexEntry:: + text "Often mistaken" + next "for eggs." + next "When disturbed," + + page "they quickly" + next "gather and attack" + next "in swarms" + dex + +_GrimerDexEntry:: + text "Appears in filthy" + next "areas. Thrives by" + next "sucking up" + + page "polluted sludge" + next "that is pumped" + next "out of factories" + dex + +_GengarDexEntry:: + text "Under a full moon," + next "this #MON" + next "likes to mimic" + + page "the shadows of" + next "people and laugh" + next "at their fright" + dex + +_NidoranFDexEntry:: + text "Although small," + next "its venomous" + next "barbs render this" + + page "#MON dangerous." + next "The female has" + next "smaller horns" + dex + +_NidoqueenDexEntry:: + text "Its hard scales" + next "provide strong" + next "protection. It" + + page "uses its hefty" + next "bulk to execute" + next "powerful moves" + dex + +_CuboneDexEntry:: + text "Because it never" + next "removes its skull" + next "helmet, no one" + + page "has ever seen" + next "this #MON's" + next "real face" + dex + +_RhyhornDexEntry:: + text "Its massive bones" + next "are 1000 times" + next "harder than human" + + page "bones. It can" + next "easily knock a" + next "trailer flying" + dex + +_LaprasDexEntry:: + text "A #MON that" + next "has been over-" + next "hunted almost to" + + page "extinction. It" + next "can ferry people" + next "across the water" + dex + +_ArcanineDexEntry:: + text "A #MON that" + next "has been admired" + next "since the past" + + page "for its beauty." + next "It runs agilely" + next "as if on wings" + dex + +_MewDexEntry:: + text "So rare that it" + next "is still said to" + next "be a mirage by" + + page "many experts. Only" + next "a few people have" + next "seen it worldwide" + dex + +_GyaradosDexEntry:: + text "Rarely seen in" + next "the wild. Huge" + next "and vicious, it" + + page "is capable of" + next "destroying entire" + next "cities in a rage" + dex + +_ShellderDexEntry:: + text "Its hard shell" + next "repels any kind" + next "of attack." + + page "It is vulnerable" + next "only when its" + next "shell is open" + dex + +_TentacoolDexEntry:: + text "Drifts in shallow" + next "seas. Anglers who" + next "hook them by" + + page "accident are" + next "often punished by" + next "its stinging acid" + dex + +_GastlyDexEntry:: + text "Almost invisible," + next "this gaseous" + next "#MON cloaks" + + page "the target and" + next "puts it to sleep" + next "without notice" + dex + +_ScytherDexEntry:: + text "With ninja-like" + next "agility and speed," + next "it can create the" + + page "illusion that" + next "there is more" + next "than one" + dex + +_StaryuDexEntry:: + text "An enigmatic" + next "#MON that can" + next "effortlessly" + + page "regenerate any" + next "appendage it" + next "loses in battle" + dex + +_BlastoiseDexEntry:: + text "A brutal #MON" + next "with pressurized" + next "water jets on its" + + page "shell. They are" + next "used for high" + next "speed tackles" + dex + +_PinsirDexEntry:: + text "If it fails to" + next "crush the victim" + next "in its pincers," + + page "it will swing it" + next "around and toss" + next "it hard" + dex + +_TangelaDexEntry:: + text "The whole body is" + next "swathed with wide" + next "vines that are" + + page "similar to sea-" + next "weed. Its vines" + next "shake as it walks" + dex + +_GrowlitheDexEntry:: + text "Very protective" + next "of its territory." + next "It will bark and" + + page "bite to repel" + next "intruders from" + next "its space" + dex + +_OnixDexEntry:: + text "As it grows, the" + next "stone portions of" + next "its body harden" + + page "to become similar" + next "to a diamond, but" + next "colored black" + dex + +_FearowDexEntry:: + text "With its huge and" + next "magnificent wings," + next "it can keep aloft" + + page "without ever" + next "having to land" + next "for rest" + dex + +_PidgeyDexEntry:: + text "A common sight in" + next "forests and woods." + next "It flaps its" + + page "wings at ground" + next "level to kick up" + next "blinding sand" + dex + +_SlowpokeDexEntry:: + text "Incredibly slow" + next "and dopey. It" + next "takes 5 seconds" + + page "for it to feel" + next "pain when under" + next "attack" + dex + +_KadabraDexEntry:: + text "It emits special" + next "alpha waves from" + next "its body that" + + page "induce headaches" + next "just by being" + next "close by" + dex + +_GravelerDexEntry:: + text "Rolls down slopes" + next "to move. It rolls" + next "over any obstacle" + + page "without slowing" + next "or changing its" + next "direction" + dex + +_ChanseyDexEntry:: + text "A rare and elusive" + next "#MON that is" + next "said to bring" + + page "happiness to those" + next "who manage to get" + next "it" + dex + +_MachokeDexEntry:: + text "Its muscular body" + next "is so powerful, it" + next "must wear a power" + + page "save belt to be" + next "able to regulate" + next "its motions" + dex + +_MrMimeDexEntry:: + text "If interrupted" + next "while it is" + next "miming, it will" + + page "slap around the" + next "offender with its" + next "broad hands" + dex + +_HitmonleeDexEntry:: + text "When in a hurry," + next "its legs lengthen" + next "progressively." + + page "It runs smoothly" + next "with extra long," + next "loping strides" + dex + +_HitmonchanDexEntry:: + text "While apparently" + next "doing nothing, it" + next "fires punches in" + + page "lightning fast" + next "volleys that are" + next "impossible to see" + dex + +_ArbokDexEntry:: + text "It is rumored that" + next "the ferocious" + next "warning markings" + + page "on its belly" + next "differ from area" + next "to area" + dex + +_ParasectDexEntry:: + text "A host-parasite" + next "pair in which the" + next "parasite mushroom" + + page "has taken over the" + next "host bug. Prefers" + next "damp places" + dex + +_PsyduckDexEntry:: + text "While lulling its" + next "enemies with its" + next "vacant look, this" + + page "wily #MON will" + next "use psychokinetic" + next "powers" + dex + +_DrowzeeDexEntry:: + text "Puts enemies to" + next "sleep then eats" + next "their dreams." + + page "Occasionally gets" + next "sick from eating" + next "bad dreams" + dex + +_GolemDexEntry:: + text "Its boulder-like" + next "body is extremely" + next "hard. It can" + + page "easily withstand" + next "dynamite blasts" + next "without damage" + dex + +_MagmarDexEntry:: + text "Its body always" + next "burns with an" + next "orange glow that" + + page "enables it to" + next "hide perfectly" + next "among flames" + dex + +_ElectabuzzDexEntry:: + text "Normally found" + next "near power plants," + next "they can wander" + + page "away and cause" + next "major blackouts" + next "in cities" + dex + +_MagnetonDexEntry:: + text "Formed by several" + next "MAGNEMITEs linked" + next "together. They" + + page "frequently appear" + next "when sunspots" + next "flare up" + dex + +_KoffingDexEntry:: + text "Because it stores" + next "several kinds of" + next "toxic gases in" + + page "its body, it is" + next "prone to exploding" + next "without warning" + dex + +_MankeyDexEntry:: + text "Extremely quick to" + next "anger. It could" + next "be docile one" + + page "moment then" + next "thrashing away" + next "the next instant" + dex + +_SeelDexEntry:: + text "The protruding" + next "horn on its head" + next "is very hard." + + page "It is used for" + next "bashing through" + next "thick ice" + dex + +_DiglettDexEntry:: + text "Lives about one" + next "yard underground" + next "where it feeds on" + + page "plant roots. It" + next "sometimes appears" + next "above ground" + dex + +_TaurosDexEntry:: + text "When it targets" + next "an enemy, it" + next "charges furiously" + + page "while whipping its" + next "body with its" + next "long tails" + dex + +_FarfetchdDexEntry:: + text "The sprig of" + next "green onions it" + next "holds is its" + + page "weapon. It is" + next "used much like a" + next "metal sword" + dex + +_VenonatDexEntry:: + text "Lives in the" + next "shadows of tall" + next "trees where it" + + page "eats insects. It" + next "is attracted by" + next "light at night" + dex + +_DragoniteDexEntry:: + text "An extremely" + next "rarely seen" + next "marine #MON." + + page "Its intelligence" + next "is said to match" + next "that of humans" + dex + +_DoduoDexEntry:: + text "A bird that makes" + next "up for its poor" + next "flying with its" + + page "fast foot speed." + next "Leaves giant" + next "footprints" + dex + +_PoliwagDexEntry:: + text "Its newly grown" + next "legs prevent it" + next "from running. It" + + page "appears to prefer" + next "swimming than" + next "trying to stand" + dex + +_JynxDexEntry:: + text "It seductively" + next "wiggles its hips" + next "as it walks. It" + + page "can cause people" + next "to dance in" + next "unison with it" + dex + +_MoltresDexEntry:: + text "Known as the" + next "legendary bird of" + next "fire. Every flap" + + page "of its wings" + next "creates a dazzling" + next "flash of flames" + dex + +_ArticunoDexEntry:: + text "A legendary bird" + next "#MON that is" + next "said to appear to" + + page "doomed people who" + next "are lost in icy" + next "mountains" + dex + +_ZapdosDexEntry:: + text "A legendary bird" + next "#MON that is" + next "said to appear" + + page "from clouds while" + next "dropping enormous" + next "lightning bolts" + dex + +_DittoDexEntry:: + text "Capable of copying" + next "an enemy's genetic" + next "code to instantly" + + page "transform itself" + next "into a duplicate" + next "of the enemy" + dex + +_MeowthDexEntry:: + text "Adores circular" + next "objects. Wanders" + next "the streets on a" + + page "nightly basis to" + next "look for dropped" + next "loose change" + dex + +_KrabbyDexEntry:: + text "Its pincers are" + next "not only powerful" + next "weapons, they are" + + page "used for balance" + next "when walking" + next "sideways" + dex + +_VulpixDexEntry:: + text "At the time of" + next "birth, it has" + next "just one tail." + + page "The tail splits" + next "from its tip as" + next "it grows older" + dex + +_NinetalesDexEntry:: + text "Very smart and" + next "very vengeful." + next "Grabbing one of" + + page "its many tails" + next "could result in a" + next "1000-year curse" + dex + +_PikachuDexEntry:: + text "When several of" + next "these #MON" + next "gather, their" + + page "electricity could" + next "build and cause" + next "lightning storms" + dex + +_RaichuDexEntry:: + text "Its long tail" + next "serves as a" + next "ground to protect" + + page "itself from its" + next "own high voltage" + next "power" + dex + +_DratiniDexEntry:: + text "Long considered a" + next "mythical #MON" + next "until recently" + + page "when a small" + next "colony was found" + next "living underwater" + dex + +_DragonairDexEntry:: + text "A mystical #MON" + next "that exudes a" + next "gentle aura." + + page "Has the ability" + next "to change climate" + next "conditions" + dex + +_KabutoDexEntry:: + text "A #MON that" + next "was resurrected" + next "from a fossil" + + page "found in what was" + next "once the ocean" + next "floor eons ago" + dex + +_KabutopsDexEntry:: + text "Its sleek shape is" + next "perfect for swim-" + next "ming. It slashes" + + page "prey with its" + next "claws and drains" + next "the body fluids" + dex + +_HorseaDexEntry:: + text "Known to shoot" + next "down flying bugs" + next "with precision" + + page "blasts of ink" + next "from the surface" + next "of the water" + dex + +_SeadraDexEntry:: + text "Capable of swim-" + next "ming backwards by" + next "rapidly flapping" + + page "its wing-like" + next "pectoral fins and" + next "stout tail" + dex + +_SandshrewDexEntry:: + text "Burrows deep" + next "underground in" + next "arid locations" + + page "far from water." + next "It only emerges" + next "to hunt for food" + dex + +_SandslashDexEntry:: + text "Curls up into a" + next "spiny ball when" + next "threatened. It" + + page "can roll while" + next "curled up to" + next "attack or escape" + dex + +_OmanyteDexEntry:: + text "Although long" + next "extinct, in rare" + next "cases, it can be" + + page "genetically" + next "resurrected from" + next "fossils" + dex + +_OmastarDexEntry:: + text "A prehistoric" + next "#MON that died" + next "out when its" + + page "heavy shell made" + next "it impossible to" + next "catch prey" + dex + +_JigglypuffDexEntry:: + text "When its huge eyes" + next "light up, it sings" + next "a mysteriously" + + page "soothing melody" + next "that lulls its" + next "enemies to sleep" + dex + +_WigglytuffDexEntry:: + text "The body is soft" + next "and rubbery. When" + next "angered, it will" + + page "suck in air and" + next "inflate itself to" + next "an enormous size" + dex + +_EeveeDexEntry:: + text "Its genetic code" + next "is irregular." + next "It may mutate if" + + page "it is exposed to" + next "radiation from" + next "element STONEs" + dex + +_FlareonDexEntry:: + text "When storing" + next "thermal energy in" + next "its body, its" + + page "temperature could" + next "soar to over 1600" + next "degrees" + dex + +_JolteonDexEntry:: + text "It accumulates" + next "negative ions in" + next "the atmosphere to" + + page "blast out 10000-" + next "volt lightning" + next "bolts" + dex + +_VaporeonDexEntry:: + text "Lives close to" + next "water. Its long" + next "tail is ridged" + + page "with a fin which" + next "is often mistaken" + next "for a mermaid's" + dex + +_MachopDexEntry:: + text "Loves to build" + next "its muscles." + next "It trains in all" + + page "styles of martial" + next "arts to become" + next "even stronger" + dex + +_ZubatDexEntry:: + text "Forms colonies in" + next "perpetually dark" + next "places. Uses" + + page "ultrasonic waves" + next "to identify and" + next "approach targets" + dex + +_EkansDexEntry:: + text "Moves silently" + next "and stealthily." + next "Eats the eggs of" + + page "birds, such as" + next "PIDGEY and" + next "SPEAROW, whole" + dex + +_ParasDexEntry:: + text "Burrows to suck" + next "tree roots. The" + next "mushrooms on its" + + page "back grow by draw-" + next "ing nutrients from" + next "the bug host" + dex + +_PoliwhirlDexEntry:: + text "Capable of living" + next "in or out of" + next "water. When out" + + page "of water, it" + next "sweats to keep" + next "its body slimy" + dex + +_PoliwrathDexEntry:: + text "An adept swimmer" + next "at both the front" + next "crawl and breast" + + page "stroke. Easily" + next "overtakes the best" + next "human swimmers" + dex + +_WeedleDexEntry:: + text "Often found in" + next "forests, eating" + next "leaves." + + page "It has a sharp" + next "venomous stinger" + next "on its head" + dex + +_KakunaDexEntry:: + text "Almost incapable" + next "of moving, this" + next "#MON can only" + + page "harden its shell" + next "to protect itself" + next "from predators" + dex + +_BeedrillDexEntry:: + text "Flies at high" + next "speed and attacks" + next "using its large" + + page "venomous stingers" + next "on its forelegs" + next "and tail" + dex + +_DodrioDexEntry:: + text "Uses its three" + next "brains to execute" + next "complex plans." + + page "While two heads" + next "sleep, one head" + next "stays awake" + dex + +_PrimeapeDexEntry:: + text "Always furious" + next "and tenacious to" + next "boot. It will not" + + page "abandon chasing" + next "its quarry until" + next "it is caught" + dex + +_DugtrioDexEntry:: + text "A team of DIGLETT" + next "triplets." + next "It triggers huge" + + page "earthquakes by" + next "burrowing 60 miles" + next "underground" + dex + +_VenomothDexEntry:: + text "The dust-like" + next "scales covering" + next "its wings are" + + page "color coded to" + next "indicate the kinds" + next "of poison it has" + dex + +_DewgongDexEntry:: + text "Stores thermal" + next "energy in its" + next "body. Swims at a" + + page "steady 8 knots" + next "even in intensely" + next "cold waters" + dex + +_CaterpieDexEntry:: + text "Its short feet" + next "are tipped with" + next "suction pads that" + + page "enable it to" + next "tirelessly climb" + next "slopes and walls" + dex + +_MetapodDexEntry:: + text "This #MON is" + next "vulnerable to" + next "attack while its" + + page "shell is soft," + next "exposing its weak" + next "and tender body" + dex + +_ButterfreeDexEntry:: + text "In battle, it" + next "flaps its wings" + next "at high speed to" + + page "release highly" + next "toxic dust into" + next "the air" + dex + +_MachampDexEntry:: + text "Using its heavy" + next "muscles, it throws" + next "powerful punches" + + page "that can send the" + next "victim clear over" + next "the horizon" + dex + +_GolduckDexEntry:: + text "Often seen swim-" + next "ming elegantly by" + next "lake shores. It" + + page "is often mistaken" + next "for the Japanese" + next "monster, Kappa" + dex + +_HypnoDexEntry:: + text "When it locks eyes" + next "with an enemy, it" + next "will use a mix of" + + page "PSI moves such as" + next "HYPNOSIS and" + next "CONFUSION" + dex + +_GolbatDexEntry:: + text "Once it strikes," + next "it will not stop" + next "draining energy" + + page "from the victim" + next "even if it gets" + next "too heavy to fly" + dex + +_MewtwoDexEntry:: + text "It was created by" + next "a scientist after" + next "years of horrific" + + page "gene splicing and" + next "DNA engineering" + next "experiments" + dex + +_SnorlaxDexEntry:: + text "Very lazy. Just" + next "eats and sleeps." + next "As its rotund" + + page "bulk builds, it" + next "becomes steadily" + next "more slothful" + dex + +_MagikarpDexEntry:: + text "In the distant" + next "past, it was" + next "somewhat stronger" + + page "than the horribly" + next "weak descendants" + next "that exist today" + dex + +_MukDexEntry:: + text "Thickly covered" + next "with a filthy," + next "vile sludge. It" + + page "is so toxic, even" + next "its footprints" + next "contain poison" + dex + +_KinglerDexEntry:: + text "The large pincer" + next "has 10000 hp of" + next "crushing power." + + page "However, its huge" + next "size makes it" + next "unwieldy to use" + dex + +_CloysterDexEntry:: + text "When attacked, it" + next "launches its" + next "horns in quick" + + page "volleys. Its" + next "innards have" + next "never been seen" + dex + +_ElectrodeDexEntry:: + text "It stores electric" + next "energy under very" + next "high pressure." + + page "It often explodes" + next "with little or no" + next "provocation" + dex + +_ClefableDexEntry:: + text "A timid fairy" + next "#MON that is" + next "rarely seen. It" + + page "will run and hide" + next "the moment it" + next "senses people" + dex + +_WeezingDexEntry:: + text "Where two kinds" + next "of poison gases" + next "meet, 2 KOFFINGs" + + page "can fuse into a" + next "WEEZING over many" + next "years" + dex + +_PersianDexEntry:: + text "Although its fur" + next "has many admirers," + next "it is tough to" + + page "raise as a pet" + next "because of its" + next "fickle meanness" + dex + +_MarowakDexEntry:: + text "The bone it holds" + next "is its key weapon." + next "It throws the" + + page "bone skillfully" + next "like a boomerang" + next "to KO targets" + dex + +_HaunterDexEntry:: + text "Because of its" + next "ability to slip" + next "through block" + + page "walls, it is said" + next "to be from an-" + next "other dimension" + dex + +_AbraDexEntry:: + text "Using its ability" + next "to read minds, it" + next "will identify" + + page "impending danger" + next "and TELEPORT to" + next "safety" + dex + +_AlakazamDexEntry:: + text "Its brain can out-" + next "perform a super-" + next "computer." + + page "Its intelligence" + next "quotient is said" + next "to be 5,000" + dex + +_PidgeottoDexEntry:: + text "Very protective" + next "of its sprawling" + next "territorial area," + + page "this #MON will" + next "fiercely peck at" + next "any intruder" + dex + +_PidgeotDexEntry:: + text "When hunting, it" + next "skims the surface" + next "of water at high" + + page "speed to pick off" + next "unwary prey such" + next "as MAGIKARP" + dex + +_StarmieDexEntry:: + text "Its central core" + next "glows with the" + next "seven colors of" + + page "the rainbow. Some" + next "people value the" + next "core as a gem" + dex + +_BulbasaurDexEntry:: + text "A strange seed was" + next "planted on its" + next "back at birth." + + page "The plant sprouts" + next "and grows with" + next "this #MON" + dex + +_VenusaurDexEntry:: + text "The plant blooms" + next "when it is" + next "absorbing solar" + + page "energy. It stays" + next "on the move to" + next "seek sunlight" + dex + +_TentacruelDexEntry:: + text "The tentacles are" + next "normally kept" + next "short. On hunts," + + page "they are extended" + next "to ensnare and" + next "immobilize prey" + dex + +_GoldeenDexEntry:: + text "Its tail fin" + next "billows like an" + next "elegant ballroom" + + page "dress, giving it" + next "the nickname of" + next "the Water Queen" + dex + +_SeakingDexEntry:: + text "In the autumn" + next "spawning season," + next "they can be seen" + + page "swimming power-" + next "fully up rivers" + next "and creeks" + dex + +_PonytaDexEntry:: + text "Its hooves are 10" + next "times harder than" + next "diamonds. It can" + + page "trample anything" + next "completely flat" + next "in little time" + dex + +_RapidashDexEntry:: + text "Very competitive," + next "this #MON will" + next "chase anything" + + page "that moves fast" + next "in the hopes of" + next "racing it" + dex + +_RattataDexEntry:: + text "Bites anything" + next "when it attacks." + next "Small and very" + + page "quick, it is a" + next "common sight in" + next "many places" + dex + +_RaticateDexEntry:: + text "It uses its whis-" + next "kers to maintain" + next "its balance." + + page "It apparently" + next "slows down if" + next "they are cut off" + dex + +_NidorinoDexEntry:: + text "An aggressive" + next "#MON that is" + next "quick to attack." + + page "The horn on its" + next "head secretes a" + next "powerful venom" + dex + +_NidorinaDexEntry:: + text "The female's horn" + next "develops slowly." + next "Prefers physical" + + page "attacks such as" + next "clawing and" + next "biting" + dex + +_GeodudeDexEntry:: + text "Found in fields" + next "and mountains." + next "Mistaking them" + + page "for boulders," + next "people often step" + next "or trip on them" + dex + +_PorygonDexEntry:: + text "A #MON that" + next "consists entirely" + next "of programming" + + page "code. Capable of" + next "moving freely in" + next "cyberspace" + dex + +_AerodactylDexEntry:: + text "A ferocious, pre-" + next "historic #MON" + next "that goes for the" + + page "enemy's throat" + next "with its serrated" + next "saw-like fangs" + dex + +_MagnemiteDexEntry:: + text "Uses anti-gravity" + next "to stay suspended." + next "Appears without" + + page "warning and uses" + next "THUNDER WAVE and" + next "similar moves" + dex + +_CharmanderDexEntry:: + text "Obviously prefers" + next "hot places. When" + next "it rains, steam" + + page "is said to spout" + next "from the tip of" + next "its tail" + dex + +_SquirtleDexEntry:: + text "After birth, its" + next "back swells and" + next "hardens into a" + + page "shell. Powerfully" + next "sprays foam from" + next "its mouth" + dex + +_CharmeleonDexEntry:: + text "When it swings" + next "its burning tail," + next "it elevates the" + + page "temperature to" + next "unbearably high" + next "levels" + dex + +_WartortleDexEntry:: + text "Often hides in" + next "water to stalk" + next "unwary prey. For" + + page "swimming fast, it" + next "moves its ears to" + next "maintain balance" + dex + +_CharizardDexEntry:: + text "Spits fire that" + next "is hot enough to" + next "melt boulders." + + page "Known to cause" + next "forest fires" + next "unintentionally" + dex + +_OddishDexEntry:: + text "During the day," + next "it keeps its face" + next "buried in the" + + page "ground. At night," + next "it wanders around" + next "sowing its seeds" + dex + +_GloomDexEntry:: + text "The fluid that" + next "oozes from its" + next "mouth isn't drool." + + page "It is a nectar" + next "that is used to" + next "attract prey" + dex + +_VileplumeDexEntry:: + text "The larger its" + next "petals, the more" + next "toxic pollen it" + + page "contains. Its big" + next "head is heavy and" + next "hard to hold up" + dex + +_BellsproutDexEntry:: + text "A carnivorous" + next "#MON that traps" + next "and eats bugs." + + page "It uses its root" + next "feet to soak up" + next "needed moisture" + dex + +_WeepinbellDexEntry:: + text "It spits out" + next "POISONPOWDER to" + next "immobilize the" + + page "enemy and then" + next "finishes it with" + next "a spray of ACID" + dex + +_VictreebelDexEntry:: + text "Said to live in" + next "huge colonies" + next "deep in jungles," + + page "although no one" + next "has ever returned" + next "from there" + dex diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm new file mode 100644 index 00000000..51f6b244 --- /dev/null +++ b/data/pokemon/evos_moves.asm @@ -0,0 +1,2134 @@ +; See constants/pokemon_data_constants.asm +; The max number of evolutions per monster is MAX_EVOLUTIONS + +EvosMovesPointerTable: + dw RhydonEvosMoves + dw KangaskhanEvosMoves + dw NidoranMEvosMoves + dw ClefairyEvosMoves + dw SpearowEvosMoves + dw VoltorbEvosMoves + dw NidokingEvosMoves + dw SlowbroEvosMoves + dw IvysaurEvosMoves + dw ExeggutorEvosMoves + dw LickitungEvosMoves + dw ExeggcuteEvosMoves + dw GrimerEvosMoves + dw GengarEvosMoves + dw NidoranFEvosMoves + dw NidoqueenEvosMoves + dw CuboneEvosMoves + dw RhyhornEvosMoves + dw LaprasEvosMoves + dw ArcanineEvosMoves + dw MewEvosMoves + dw GyaradosEvosMoves + dw ShellderEvosMoves + dw TentacoolEvosMoves + dw GastlyEvosMoves + dw ScytherEvosMoves + dw StaryuEvosMoves + dw BlastoiseEvosMoves + dw PinsirEvosMoves + dw TangelaEvosMoves + dw MissingNo1FEvosMoves + dw MissingNo20EvosMoves + dw GrowlitheEvosMoves + dw OnixEvosMoves + dw FearowEvosMoves + dw PidgeyEvosMoves + dw SlowpokeEvosMoves + dw KadabraEvosMoves + dw GravelerEvosMoves + dw ChanseyEvosMoves + dw MachokeEvosMoves + dw MrMimeEvosMoves + dw HitmonleeEvosMoves + dw HitmonchanEvosMoves + dw ArbokEvosMoves + dw ParasectEvosMoves + dw PsyduckEvosMoves + dw DrowzeeEvosMoves + dw GolemEvosMoves + dw MissingNo32EvosMoves + dw MagmarEvosMoves + dw MissingNo34EvosMoves + dw ElectabuzzEvosMoves + dw MagnetonEvosMoves + dw KoffingEvosMoves + dw MissingNo38EvosMoves + dw MankeyEvosMoves + dw SeelEvosMoves + dw DiglettEvosMoves + dw TaurosEvosMoves + dw MissingNo3DEvosMoves + dw MissingNo3EEvosMoves + dw MissingNo3FEvosMoves + dw FarfetchdEvosMoves + dw VenonatEvosMoves + dw DragoniteEvosMoves + dw MissingNo43EvosMoves + dw MissingNo44EvosMoves + dw MissingNo45EvosMoves + dw DoduoEvosMoves + dw PoliwagEvosMoves + dw JynxEvosMoves + dw MoltresEvosMoves + dw ArticunoEvosMoves + dw ZapdosEvosMoves + dw DittoEvosMoves + dw MeowthEvosMoves + dw KrabbyEvosMoves + dw MissingNo4FEvosMoves + dw MissingNo50EvosMoves + dw MissingNo51EvosMoves + dw VulpixEvosMoves + dw NinetalesEvosMoves + dw PikachuEvosMoves + dw RaichuEvosMoves + dw MissingNo56EvosMoves + dw MissingNo57EvosMoves + dw DratiniEvosMoves + dw DragonairEvosMoves + dw KabutoEvosMoves + dw KabutopsEvosMoves + dw HorseaEvosMoves + dw SeadraEvosMoves + dw MissingNo5EEvosMoves + dw MissingNo5FEvosMoves + dw SandshrewEvosMoves + dw SandslashEvosMoves + dw OmanyteEvosMoves + dw OmastarEvosMoves + dw JigglypuffEvosMoves + dw WigglytuffEvosMoves + dw EeveeEvosMoves + dw FlareonEvosMoves + dw JolteonEvosMoves + dw VaporeonEvosMoves + dw MachopEvosMoves + dw ZubatEvosMoves + dw EkansEvosMoves + dw ParasEvosMoves + dw PoliwhirlEvosMoves + dw PoliwrathEvosMoves + dw WeedleEvosMoves + dw KakunaEvosMoves + dw BeedrillEvosMoves + dw MissingNo73EvosMoves + dw DodrioEvosMoves + dw PrimeapeEvosMoves + dw DugtrioEvosMoves + dw VenomothEvosMoves + dw DewgongEvosMoves + dw MissingNo79EvosMoves + dw MissingNo7AEvosMoves + dw CaterpieEvosMoves + dw MetapodEvosMoves + dw ButterfreeEvosMoves + dw MachampEvosMoves + dw MissingNo7FEvosMoves + dw GolduckEvosMoves + dw HypnoEvosMoves + dw GolbatEvosMoves + dw MewtwoEvosMoves + dw SnorlaxEvosMoves + dw MagikarpEvosMoves + dw MissingNo86EvosMoves + dw MissingNo87EvosMoves + dw MukEvosMoves + dw MissingNo8AEvosMoves + dw KinglerEvosMoves + dw CloysterEvosMoves + dw MissingNo8CEvosMoves + dw ElectrodeEvosMoves + dw ClefableEvosMoves + dw WeezingEvosMoves + dw PersianEvosMoves + dw MarowakEvosMoves + dw MissingNo92EvosMoves + dw HaunterEvosMoves + dw AbraEvosMoves + dw AlakazamEvosMoves + dw PidgeottoEvosMoves + dw PidgeotEvosMoves + dw StarmieEvosMoves + dw BulbasaurEvosMoves + dw VenusaurEvosMoves + dw TentacruelEvosMoves + dw MissingNo9CEvosMoves + dw GoldeenEvosMoves + dw SeakingEvosMoves + dw MissingNo9FEvosMoves + dw MissingNoA0EvosMoves + dw MissingNoA1EvosMoves + dw MissingNoA2EvosMoves + dw PonytaEvosMoves + dw RapidashEvosMoves + dw RattataEvosMoves + dw RaticateEvosMoves + dw NidorinoEvosMoves + dw NidorinaEvosMoves + dw GeodudeEvosMoves + dw PorygonEvosMoves + dw AerodactylEvosMoves + dw MissingNoACEvosMoves + dw MagnemiteEvosMoves + dw MissingNoAEEvosMoves + dw MissingNoAFEvosMoves + dw CharmanderEvosMoves + dw SquirtleEvosMoves + dw CharmeleonEvosMoves + dw WartortleEvosMoves + dw CharizardEvosMoves + dw MissingNoB5EvosMoves + dw FossilKabutopsEvosMoves + dw FossilAerodactylEvosMoves + dw MonGhostEvosMoves + dw OddishEvosMoves + dw GloomEvosMoves + dw VileplumeEvosMoves + dw BellsproutEvosMoves + dw WeepinbellEvosMoves + dw VictreebelEvosMoves + +RhydonEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 48, HORN_DRILL + db 55, LEER + db 64, TAKE_DOWN + db 0 + +KangaskhanEvosMoves: +; Evolutions + db 0 +; Learnset + db 26, BITE + db 31, TAIL_WHIP + db 36, MEGA_PUNCH + db 41, LEER + db 46, DIZZY_PUNCH + db 0 + +NidoranMEvosMoves: +; Evolutions + db EV_LEVEL, 16, NIDORINO + db 0 +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 21, FOCUS_ENERGY + db 29, FURY_ATTACK + db 36, HORN_DRILL + db 43, DOUBLE_KICK + db 0 + +ClefairyEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, CLEFABLE + db 0 +; Learnset + db 13, SING + db 18, DOUBLESLAP + db 24, MINIMIZE + db 31, METRONOME + db 39, DEFENSE_CURL + db 48, LIGHT_SCREEN + db 0 + +SpearowEvosMoves: +; Evolutions + db EV_LEVEL, 20, FEAROW + db 0 +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 22, MIRROR_MOVE + db 29, DRILL_PECK + db 36, AGILITY + db 0 + +VoltorbEvosMoves: +; Evolutions + db EV_LEVEL, 30, ELECTRODE + db 0 +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 36, SWIFT + db 43, EXPLOSION + db 0 + +NidokingEvosMoves: +; Evolutions + db 0 +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 23, THRASH + db 0 + +SlowbroEvosMoves: +; Evolutions + db 0 +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 37, WITHDRAW + db 44, AMNESIA + db 55, PSYCHIC_M + db 0 + +IvysaurEvosMoves: +; Evolutions + db EV_LEVEL, 32, VENUSAUR + db 0 +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 38, GROWTH + db 46, SLEEP_POWDER + db 54, SOLARBEAM + db 0 + +ExeggutorEvosMoves: +; Evolutions + db 0 +; Learnset + db 28, STOMP + db 0 + +LickitungEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, STOMP + db 15, DISABLE + db 23, DEFENSE_CURL + db 31, SLAM + db 39, SCREECH + db 0 + +ExeggcuteEvosMoves: +; Evolutions + db EV_ITEM, LEAF_STONE, 1, EXEGGUTOR + db 0 +; Learnset + db 25, REFLECT + db 28, LEECH_SEED + db 32, STUN_SPORE + db 37, POISONPOWDER + db 42, SOLARBEAM + db 48, SLEEP_POWDER + db 0 + +GrimerEvosMoves: +; Evolutions + db EV_LEVEL, 38, MUK + db 0 +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 42, HARDEN + db 48, SCREECH + db 55, ACID_ARMOR + db 0 + +GengarEvosMoves: +; Evolutions + db 0 +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER + db 0 + +NidoranFEvosMoves: +; Evolutions + db EV_LEVEL, 16, NIDORINA + db 0 +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 21, TAIL_WHIP + db 29, BITE + db 36, FURY_SWIPES + db 43, DOUBLE_KICK + db 0 + +NidoqueenEvosMoves: +; Evolutions + db 0 +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 23, BODY_SLAM + db 0 + +CuboneEvosMoves: +; Evolutions + db EV_LEVEL, 28, MAROWAK + db 0 +; Learnset + db 25, LEER + db 31, FOCUS_ENERGY + db 38, THRASH + db 43, BONEMERANG + db 46, RAGE + db 0 + +RhyhornEvosMoves: +; Evolutions + db EV_LEVEL, 42, RHYDON + db 0 +; Learnset + db 30, STOMP + db 35, TAIL_WHIP + db 40, FURY_ATTACK + db 45, HORN_DRILL + db 50, LEER + db 55, TAKE_DOWN + db 0 + +LaprasEvosMoves: +; Evolutions + db 0 +; Learnset + db 16, SING + db 20, MIST + db 25, BODY_SLAM + db 31, CONFUSE_RAY + db 38, ICE_BEAM + db 46, HYDRO_PUMP + db 0 + +ArcanineEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MewEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, TRANSFORM + db 20, MEGA_PUNCH + db 30, METRONOME + db 40, PSYCHIC_M + db 0 + +GyaradosEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, BITE + db 25, DRAGON_RAGE + db 32, LEER + db 41, HYDRO_PUMP + db 52, HYPER_BEAM + db 0 + +ShellderEvosMoves: +; Evolutions + db EV_ITEM, WATER_STONE, 1, CLOYSTER + db 0 +; Learnset + db 18, SUPERSONIC + db 23, CLAMP + db 30, AURORA_BEAM + db 39, LEER + db 50, ICE_BEAM + db 0 + +TentacoolEvosMoves: +; Evolutions + db EV_LEVEL, 30, TENTACRUEL + db 0 +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 33, BARRIER + db 40, SCREECH + db 48, HYDRO_PUMP + db 0 + +GastlyEvosMoves: +; Evolutions + db EV_LEVEL, 25, HAUNTER + db 0 +; Learnset + db 27, HYPNOSIS + db 35, DREAM_EATER + db 0 + +ScytherEvosMoves: +; Evolutions + db 0 +; Learnset + db 17, LEER + db 20, FOCUS_ENERGY + db 24, DOUBLE_TEAM + db 29, SLASH + db 35, SWORDS_DANCE + db 42, AGILITY + db 0 + +StaryuEvosMoves: +; Evolutions + db EV_ITEM, WATER_STONE, 1, STARMIE + db 0 +; Learnset + db 17, WATER_GUN + db 22, HARDEN + db 27, RECOVER + db 32, SWIFT + db 37, MINIMIZE + db 42, LIGHT_SCREEN + db 47, HYDRO_PUMP + db 0 + +BlastoiseEvosMoves: +; Evolutions + db 0 +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 42, SKULL_BASH + db 52, HYDRO_PUMP + db 0 + +PinsirEvosMoves: +; Evolutions + db 0 +; Learnset + db 25, SEISMIC_TOSS + db 30, GUILLOTINE + db 36, FOCUS_ENERGY + db 43, HARDEN + db 49, SLASH + db 54, SWORDS_DANCE + db 0 + +TangelaEvosMoves: +; Evolutions + db 0 +; Learnset + db 29, ABSORB + db 32, POISONPOWDER + db 36, STUN_SPORE + db 39, SLEEP_POWDER + db 45, SLAM + db 49, GROWTH + db 0 + +MissingNo1FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo20EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +GrowlitheEvosMoves: +; Evolutions + db EV_ITEM, FIRE_STONE, 1, ARCANINE + db 0 +; Learnset + db 18, EMBER + db 23, LEER + db 30, TAKE_DOWN + db 39, AGILITY + db 50, FLAMETHROWER + db 0 + +OnixEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, BIND + db 19, ROCK_THROW + db 25, RAGE + db 33, SLAM + db 43, HARDEN + db 0 + +FearowEvosMoves: +; Evolutions + db 0 +; Learnset + db 9, LEER + db 15, FURY_ATTACK + db 25, MIRROR_MOVE + db 34, DRILL_PECK + db 43, AGILITY + db 0 + +PidgeyEvosMoves: +; Evolutions + db EV_LEVEL, 18, PIDGEOTTO + db 0 +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 19, WHIRLWIND + db 28, WING_ATTACK + db 36, AGILITY + db 44, MIRROR_MOVE + db 0 + +SlowpokeEvosMoves: +; Evolutions + db EV_LEVEL, 37, SLOWBRO + db 0 +; Learnset + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, WATER_GUN + db 40, AMNESIA + db 48, PSYCHIC_M + db 0 + +KadabraEvosMoves: +; Evolutions + db EV_TRADE, 1, ALAKAZAM + db 0 +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT + db 0 + +GravelerEvosMoves: +; Evolutions + db EV_TRADE, 1, GOLEM + db 0 +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION + db 0 + +ChanseyEvosMoves: +; Evolutions + db 0 +; Learnset + db 24, SING + db 30, GROWL + db 38, MINIMIZE + db 44, DEFENSE_CURL + db 48, LIGHT_SCREEN + db 54, DOUBLE_EDGE + db 0 + +MachokeEvosMoves: +; Evolutions + db EV_TRADE, 1, MACHAMP + db 0 +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION + db 0 + +MrMimeEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, CONFUSION + db 23, LIGHT_SCREEN + db 31, DOUBLESLAP + db 39, MEDITATE + db 47, SUBSTITUTE + db 0 + +HitmonleeEvosMoves: +; Evolutions + db 0 +; Learnset + db 33, ROLLING_KICK + db 38, JUMP_KICK + db 43, FOCUS_ENERGY + db 48, HI_JUMP_KICK + db 53, MEGA_KICK + db 0 + +HitmonchanEvosMoves: +; Evolutions + db 0 +; Learnset + db 33, FIRE_PUNCH + db 38, ICE_PUNCH + db 43, THUNDERPUNCH + db 48, MEGA_PUNCH + db 53, COUNTER + db 0 + +ArbokEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, POISON_STING + db 17, BITE + db 27, GLARE + db 36, SCREECH + db 47, ACID + db 0 + +ParasectEvosMoves: +; Evolutions + db 0 +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 30, SPORE + db 39, SLASH + db 48, GROWTH + db 0 + +PsyduckEvosMoves: +; Evolutions + db EV_LEVEL, 33, GOLDUCK + db 0 +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 36, CONFUSION + db 43, FURY_SWIPES + db 52, HYDRO_PUMP + db 0 + +DrowzeeEvosMoves: +; Evolutions + db EV_LEVEL, 26, HYPNO + db 0 +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 29, POISON_GAS + db 32, PSYCHIC_M + db 37, MEDITATE + db 0 + +GolemEvosMoves: +; Evolutions + db 0 +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 29, HARDEN + db 36, EARTHQUAKE + db 43, EXPLOSION + db 0 + +MissingNo32EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MagmarEvosMoves: +; Evolutions + db 0 +; Learnset + db 36, LEER + db 39, CONFUSE_RAY + db 43, FIRE_PUNCH + db 48, SMOKESCREEN + db 52, SMOG + db 55, FLAMETHROWER + db 0 + +MissingNo34EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +ElectabuzzEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, THUNDERSHOCK + db 37, SCREECH + db 42, THUNDERPUNCH + db 49, LIGHT_SCREEN + db 54, THUNDER + db 0 + +MagnetonEvosMoves: +; Evolutions + db 0 +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 38, THUNDER_WAVE + db 46, SWIFT + db 54, SCREECH + db 0 + +KoffingEvosMoves: +; Evolutions + db EV_LEVEL, 35, WEEZING + db 0 +; Learnset + db 32, SLUDGE + db 37, SMOKESCREEN + db 40, SELFDESTRUCT + db 45, HAZE + db 48, EXPLOSION + db 0 + +MissingNo38EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MankeyEvosMoves: +; Evolutions + db EV_LEVEL, 28, PRIMEAPE + db 0 +; Learnset + db 15, KARATE_CHOP + db 21, FURY_SWIPES + db 27, FOCUS_ENERGY + db 33, SEISMIC_TOSS + db 39, THRASH + db 0 + +SeelEvosMoves: +; Evolutions + db EV_LEVEL, 34, DEWGONG + db 0 +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 40, REST + db 45, TAKE_DOWN + db 50, ICE_BEAM + db 0 + +DiglettEvosMoves: +; Evolutions + db EV_LEVEL, 26, DUGTRIO + db 0 +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 31, SLASH + db 40, EARTHQUAKE + db 0 + +TaurosEvosMoves: +; Evolutions + db 0 +; Learnset + db 21, STOMP + db 28, TAIL_WHIP + db 35, LEER + db 44, RAGE + db 51, TAKE_DOWN + db 0 + +MissingNo3DEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo3EEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo3FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +FarfetchdEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, LEER + db 15, FURY_ATTACK + db 23, SWORDS_DANCE + db 31, AGILITY + db 39, SLASH + db 0 + +VenonatEvosMoves: +; Evolutions + db EV_LEVEL, 31, VENOMOTH + db 0 +; Learnset + db 24, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 35, PSYBEAM + db 38, SLEEP_POWDER + db 43, PSYCHIC_M + db 0 + +DragoniteEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 60, HYPER_BEAM + db 0 + +MissingNo43EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo44EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo45EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +DoduoEvosMoves: +; Evolutions + db EV_LEVEL, 31, DODRIO + db 0 +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 36, RAGE + db 40, TRI_ATTACK + db 44, AGILITY + db 0 + +PoliwagEvosMoves: +; Evolutions + db EV_LEVEL, 25, POLIWHIRL + db 0 +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 25, DOUBLESLAP + db 31, BODY_SLAM + db 38, AMNESIA + db 45, HYDRO_PUMP + db 0 + +JynxEvosMoves: +; Evolutions + db 0 +; Learnset + db 18, LICK + db 23, DOUBLESLAP + db 31, ICE_PUNCH + db 39, BODY_SLAM + db 47, THRASH + db 58, BLIZZARD + db 0 + +MoltresEvosMoves: +; Evolutions + db 0 +; Learnset + db 51, LEER + db 55, AGILITY + db 60, SKY_ATTACK + db 0 + +ArticunoEvosMoves: +; Evolutions + db 0 +; Learnset + db 51, BLIZZARD + db 55, AGILITY + db 60, MIST + db 0 + +ZapdosEvosMoves: +; Evolutions + db 0 +; Learnset + db 51, THUNDER + db 55, AGILITY + db 60, LIGHT_SCREEN + db 0 + +DittoEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MeowthEvosMoves: +; Evolutions + db EV_LEVEL, 28, PERSIAN + db 0 +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 33, FURY_SWIPES + db 44, SLASH + db 0 + +KrabbyEvosMoves: +; Evolutions + db EV_LEVEL, 28, KINGLER + db 0 +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 30, STOMP + db 35, CRABHAMMER + db 40, HARDEN + db 0 + +MissingNo4FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo50EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo51EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +VulpixEvosMoves: +; Evolutions + db EV_ITEM, FIRE_STONE, 1, NINETALES + db 0 +; Learnset + db 16, QUICK_ATTACK + db 21, ROAR + db 28, CONFUSE_RAY + db 35, FLAMETHROWER + db 42, FIRE_SPIN + db 0 + +NinetalesEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +PikachuEvosMoves: +; Evolutions + db EV_ITEM, THUNDER_STONE, 1, RAICHU + db 0 +; Learnset + db 9, THUNDER_WAVE + db 16, QUICK_ATTACK + db 26, SWIFT + db 33, AGILITY + db 43, THUNDER + db 0 + +RaichuEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo56EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo57EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +DratiniEvosMoves: +; Evolutions + db EV_LEVEL, 30, DRAGONAIR + db 0 +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 30, SLAM + db 40, DRAGON_RAGE + db 50, HYPER_BEAM + db 0 + +DragonairEvosMoves: +; Evolutions + db EV_LEVEL, 55, DRAGONITE + db 0 +; Learnset + db 10, THUNDER_WAVE + db 20, AGILITY + db 35, SLAM + db 45, DRAGON_RAGE + db 55, HYPER_BEAM + db 0 + +KabutoEvosMoves: +; Evolutions + db EV_LEVEL, 40, KABUTOPS + db 0 +; Learnset + db 34, ABSORB + db 39, SLASH + db 44, LEER + db 49, HYDRO_PUMP + db 0 + +KabutopsEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, ABSORB + db 39, SLASH + db 46, LEER + db 53, HYDRO_PUMP + db 0 + +HorseaEvosMoves: +; Evolutions + db EV_LEVEL, 32, SEADRA + db 0 +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 37, AGILITY + db 45, HYDRO_PUMP + db 0 + +SeadraEvosMoves: +; Evolutions + db 0 +; Learnset + db 19, SMOKESCREEN + db 24, LEER + db 30, WATER_GUN + db 41, AGILITY + db 52, HYDRO_PUMP + db 0 + +MissingNo5EEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo5FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +SandshrewEvosMoves: +; Evolutions + db EV_LEVEL, 22, SANDSLASH + db 0 +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 24, POISON_STING + db 31, SWIFT + db 38, FURY_SWIPES + db 0 + +SandslashEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, SAND_ATTACK + db 17, SLASH + db 27, POISON_STING + db 36, SWIFT + db 47, FURY_SWIPES + db 0 + +OmanyteEvosMoves: +; Evolutions + db EV_LEVEL, 40, OMASTAR + db 0 +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 46, SPIKE_CANNON + db 53, HYDRO_PUMP + db 0 + +OmastarEvosMoves: +; Evolutions + db 0 +; Learnset + db 34, HORN_ATTACK + db 39, LEER + db 44, SPIKE_CANNON + db 49, HYDRO_PUMP + db 0 + +JigglypuffEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF + db 0 +; Learnset + db 9, POUND + db 14, DISABLE + db 19, DEFENSE_CURL + db 24, DOUBLESLAP + db 29, REST + db 34, BODY_SLAM + db 39, DOUBLE_EDGE + db 0 + +WigglytuffEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +EeveeEvosMoves: +; Evolutions + db EV_ITEM, FIRE_STONE, 1, FLAREON + db EV_ITEM, THUNDER_STONE, 1, JOLTEON + db EV_ITEM, WATER_STONE, 1, VAPOREON + db 0 +; Learnset + db 27, QUICK_ATTACK + db 31, TAIL_WHIP + db 37, BITE + db 45, TAKE_DOWN + db 0 + +FlareonEvosMoves: +; Evolutions + db 0 +; Learnset + db 27, QUICK_ATTACK + db 31, EMBER + db 37, TAIL_WHIP + db 40, BITE + db 42, LEER + db 44, FIRE_SPIN + db 48, RAGE + db 54, FLAMETHROWER + db 0 + +JolteonEvosMoves: +; Evolutions + db 0 +; Learnset + db 27, QUICK_ATTACK + db 31, THUNDERSHOCK + db 37, TAIL_WHIP + db 40, THUNDER_WAVE + db 42, DOUBLE_KICK + db 44, AGILITY + db 48, PIN_MISSILE + db 54, THUNDER + db 0 + +VaporeonEvosMoves: +; Evolutions + db 0 +; Learnset + db 27, QUICK_ATTACK + db 31, WATER_GUN + db 37, TAIL_WHIP + db 40, BITE + db 42, ACID_ARMOR + db 44, HAZE + db 48, MIST + db 54, HYDRO_PUMP + db 0 + +MachopEvosMoves: +; Evolutions + db EV_LEVEL, 28, MACHOKE + db 0 +; Learnset + db 20, LOW_KICK + db 25, LEER + db 32, FOCUS_ENERGY + db 39, SEISMIC_TOSS + db 46, SUBMISSION + db 0 + +ZubatEvosMoves: +; Evolutions + db EV_LEVEL, 22, GOLBAT + db 0 +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 28, WING_ATTACK + db 36, HAZE + db 0 + +EkansEvosMoves: +; Evolutions + db EV_LEVEL, 22, ARBOK + db 0 +; Learnset + db 10, POISON_STING + db 17, BITE + db 24, GLARE + db 31, SCREECH + db 38, ACID + db 0 + +ParasEvosMoves: +; Evolutions + db EV_LEVEL, 24, PARASECT + db 0 +; Learnset + db 13, STUN_SPORE + db 20, LEECH_LIFE + db 27, SPORE + db 34, SLASH + db 41, GROWTH + db 0 + +PoliwhirlEvosMoves: +; Evolutions + db EV_ITEM, WATER_STONE, 1, POLIWRATH + db 0 +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 26, DOUBLESLAP + db 33, BODY_SLAM + db 41, AMNESIA + db 49, HYDRO_PUMP + db 0 + +PoliwrathEvosMoves: +; Evolutions + db 0 +; Learnset + db 16, HYPNOSIS + db 19, WATER_GUN + db 0 + +WeedleEvosMoves: +; Evolutions + db EV_LEVEL, 7, KAKUNA + db 0 +; Learnset + db 0 + +KakunaEvosMoves: +; Evolutions + db EV_LEVEL, 10, BEEDRILL + db 0 +; Learnset + db 0 + +BeedrillEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, FURY_ATTACK + db 16, FOCUS_ENERGY + db 20, TWINEEDLE + db 25, RAGE + db 30, PIN_MISSILE + db 35, AGILITY + db 0 + +MissingNo73EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +DodrioEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, GROWL + db 24, FURY_ATTACK + db 30, DRILL_PECK + db 39, RAGE + db 45, TRI_ATTACK + db 51, AGILITY + db 0 + +PrimeapeEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, KARATE_CHOP + db 21, FURY_SWIPES + db 27, FOCUS_ENERGY + db 37, SEISMIC_TOSS + db 46, THRASH + db 0 + +DugtrioEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 35, SLASH + db 47, EARTHQUAKE + db 0 + +VenomothEvosMoves: +; Evolutions + db 0 +; Learnset + db 24, POISONPOWDER + db 27, LEECH_LIFE + db 30, STUN_SPORE + db 38, PSYBEAM + db 43, SLEEP_POWDER + db 50, PSYCHIC_M + db 0 + +DewgongEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, GROWL + db 35, AURORA_BEAM + db 44, REST + db 50, TAKE_DOWN + db 56, ICE_BEAM + db 0 + +MissingNo79EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo7AEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +CaterpieEvosMoves: +; Evolutions + db EV_LEVEL, 7, METAPOD + db 0 +; Learnset + db 0 + +MetapodEvosMoves: +; Evolutions + db EV_LEVEL, 10, BUTTERFREE + db 0 +; Learnset + db 0 + +ButterfreeEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, CONFUSION + db 15, POISONPOWDER + db 16, STUN_SPORE + db 17, SLEEP_POWDER + db 21, SUPERSONIC + db 26, WHIRLWIND + db 32, PSYBEAM + db 0 + +MachampEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, LOW_KICK + db 25, LEER + db 36, FOCUS_ENERGY + db 44, SEISMIC_TOSS + db 52, SUBMISSION + db 0 + +MissingNo7FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +GolduckEvosMoves: +; Evolutions + db 0 +; Learnset + db 28, TAIL_WHIP + db 31, DISABLE + db 39, CONFUSION + db 48, FURY_SWIPES + db 59, HYDRO_PUMP + db 0 + +HypnoEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, DISABLE + db 17, CONFUSION + db 24, HEADBUTT + db 33, POISON_GAS + db 37, PSYCHIC_M + db 43, MEDITATE + db 0 + +GolbatEvosMoves: +; Evolutions + db 0 +; Learnset + db 10, SUPERSONIC + db 15, BITE + db 21, CONFUSE_RAY + db 32, WING_ATTACK + db 43, HAZE + db 0 + +MewtwoEvosMoves: +; Evolutions + db 0 +; Learnset + db 63, BARRIER + db 66, PSYCHIC_M + db 70, RECOVER + db 75, MIST + db 81, AMNESIA + db 0 + +SnorlaxEvosMoves: +; Evolutions + db 0 +; Learnset + db 35, BODY_SLAM + db 41, HARDEN + db 48, DOUBLE_EDGE + db 56, HYPER_BEAM + db 0 + +MagikarpEvosMoves: +; Evolutions + db EV_LEVEL, 20, GYARADOS + db 0 +; Learnset + db 15, TACKLE + db 0 + +MissingNo86EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNo87EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MukEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, POISON_GAS + db 33, MINIMIZE + db 37, SLUDGE + db 45, HARDEN + db 53, SCREECH + db 60, ACID_ARMOR + db 0 + +MissingNo8AEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +KinglerEvosMoves: +; Evolutions + db 0 +; Learnset + db 20, VICEGRIP + db 25, GUILLOTINE + db 34, STOMP + db 42, CRABHAMMER + db 49, HARDEN + db 0 + +CloysterEvosMoves: +; Evolutions + db 0 +; Learnset + db 50, SPIKE_CANNON + db 0 + +MissingNo8CEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +ElectrodeEvosMoves: +; Evolutions + db 0 +; Learnset + db 17, SONICBOOM + db 22, SELFDESTRUCT + db 29, LIGHT_SCREEN + db 40, SWIFT + db 50, EXPLOSION + db 0 + +ClefableEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +WeezingEvosMoves: +; Evolutions + db 0 +; Learnset + db 32, SLUDGE + db 39, SMOKESCREEN + db 43, SELFDESTRUCT + db 49, HAZE + db 53, EXPLOSION + db 0 + +PersianEvosMoves: +; Evolutions + db 0 +; Learnset + db 12, BITE + db 17, PAY_DAY + db 24, SCREECH + db 37, FURY_SWIPES + db 51, SLASH + db 0 + +MarowakEvosMoves: +; Evolutions + db 0 +; Learnset + db 25, LEER + db 33, FOCUS_ENERGY + db 41, THRASH + db 48, BONEMERANG + db 55, RAGE + db 0 + +MissingNo92EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +HaunterEvosMoves: +; Evolutions + db EV_TRADE, 1, GENGAR + db 0 +; Learnset + db 29, HYPNOSIS + db 38, DREAM_EATER + db 0 + +AbraEvosMoves: +; Evolutions + db EV_LEVEL, 16, KADABRA + db 0 +; Learnset + db 0 + +AlakazamEvosMoves: +; Evolutions + db 0 +; Learnset + db 16, CONFUSION + db 20, DISABLE + db 27, PSYBEAM + db 31, RECOVER + db 38, PSYCHIC_M + db 42, REFLECT + db 0 + +PidgeottoEvosMoves: +; Evolutions + db EV_LEVEL, 36, PIDGEOT + db 0 +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 40, AGILITY + db 49, MIRROR_MOVE + db 0 + +PidgeotEvosMoves: +; Evolutions + db 0 +; Learnset + db 5, SAND_ATTACK + db 12, QUICK_ATTACK + db 21, WHIRLWIND + db 31, WING_ATTACK + db 44, AGILITY + db 54, MIRROR_MOVE + db 0 + +StarmieEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +BulbasaurEvosMoves: +; Evolutions + db EV_LEVEL, 16, IVYSAUR + db 0 +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 20, POISONPOWDER + db 27, RAZOR_LEAF + db 34, GROWTH + db 41, SLEEP_POWDER + db 48, SOLARBEAM + db 0 + +VenusaurEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, LEECH_SEED + db 13, VINE_WHIP + db 22, POISONPOWDER + db 30, RAZOR_LEAF + db 43, GROWTH + db 55, SLEEP_POWDER + db 65, SOLARBEAM + db 0 + +TentacruelEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, SUPERSONIC + db 13, WRAP + db 18, POISON_STING + db 22, WATER_GUN + db 27, CONSTRICT + db 35, BARRIER + db 43, SCREECH + db 50, HYDRO_PUMP + db 0 + +MissingNo9CEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +GoldeenEvosMoves: +; Evolutions + db EV_LEVEL, 33, SEAKING + db 0 +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 37, WATERFALL + db 45, HORN_DRILL + db 54, AGILITY + db 0 + +SeakingEvosMoves: +; Evolutions + db 0 +; Learnset + db 19, SUPERSONIC + db 24, HORN_ATTACK + db 30, FURY_ATTACK + db 39, WATERFALL + db 48, HORN_DRILL + db 54, AGILITY + db 0 + +MissingNo9FEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoA0EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoA1EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoA2EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +PonytaEvosMoves: +; Evolutions + db EV_LEVEL, 40, RAPIDASH + db 0 +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 43, TAKE_DOWN + db 48, AGILITY + db 0 + +RapidashEvosMoves: +; Evolutions + db 0 +; Learnset + db 30, TAIL_WHIP + db 32, STOMP + db 35, GROWL + db 39, FIRE_SPIN + db 47, TAKE_DOWN + db 55, AGILITY + db 0 + +RattataEvosMoves: +; Evolutions + db EV_LEVEL, 20, RATICATE + db 0 +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 23, FOCUS_ENERGY + db 34, SUPER_FANG + db 0 + +RaticateEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, QUICK_ATTACK + db 14, HYPER_FANG + db 27, FOCUS_ENERGY + db 41, SUPER_FANG + db 0 + +NidorinoEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOKING + db 0 +; Learnset + db 8, HORN_ATTACK + db 14, POISON_STING + db 23, FOCUS_ENERGY + db 32, FURY_ATTACK + db 41, HORN_DRILL + db 50, DOUBLE_KICK + db 0 + +NidorinaEvosMoves: +; Evolutions + db EV_ITEM, MOON_STONE, 1, NIDOQUEEN + db 0 +; Learnset + db 8, SCRATCH + db 14, POISON_STING + db 23, TAIL_WHIP + db 32, BITE + db 41, FURY_SWIPES + db 50, DOUBLE_KICK + db 0 + +GeodudeEvosMoves: +; Evolutions + db EV_LEVEL, 25, GRAVELER + db 0 +; Learnset + db 11, DEFENSE_CURL + db 16, ROCK_THROW + db 21, SELFDESTRUCT + db 26, HARDEN + db 31, EARTHQUAKE + db 36, EXPLOSION + db 0 + +PorygonEvosMoves: +; Evolutions + db 0 +; Learnset + db 23, PSYBEAM + db 28, RECOVER + db 35, AGILITY + db 42, TRI_ATTACK + db 0 + +AerodactylEvosMoves: +; Evolutions + db 0 +; Learnset + db 33, SUPERSONIC + db 38, BITE + db 45, TAKE_DOWN + db 54, HYPER_BEAM + db 0 + +MissingNoACEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MagnemiteEvosMoves: +; Evolutions + db EV_LEVEL, 30, MAGNETON + db 0 +; Learnset + db 21, SONICBOOM + db 25, THUNDERSHOCK + db 29, SUPERSONIC + db 35, THUNDER_WAVE + db 41, SWIFT + db 47, SCREECH + db 0 + +MissingNoAEEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MissingNoAFEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +CharmanderEvosMoves: +; Evolutions + db EV_LEVEL, 16, CHARMELEON + db 0 +; Learnset + db 9, EMBER + db 15, LEER + db 22, RAGE + db 30, SLASH + db 38, FLAMETHROWER + db 46, FIRE_SPIN + db 0 + +SquirtleEvosMoves: +; Evolutions + db EV_LEVEL, 16, WARTORTLE + db 0 +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 22, BITE + db 28, WITHDRAW + db 35, SKULL_BASH + db 42, HYDRO_PUMP + db 0 + +CharmeleonEvosMoves: +; Evolutions + db EV_LEVEL, 36, CHARIZARD + db 0 +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 33, SLASH + db 42, FLAMETHROWER + db 56, FIRE_SPIN + db 0 + +WartortleEvosMoves: +; Evolutions + db EV_LEVEL, 36, BLASTOISE + db 0 +; Learnset + db 8, BUBBLE + db 15, WATER_GUN + db 24, BITE + db 31, WITHDRAW + db 39, SKULL_BASH + db 47, HYDRO_PUMP + db 0 + +CharizardEvosMoves: +; Evolutions + db 0 +; Learnset + db 9, EMBER + db 15, LEER + db 24, RAGE + db 36, SLASH + db 46, FLAMETHROWER + db 55, FIRE_SPIN + db 0 + +MissingNoB5EvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +FossilKabutopsEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +FossilAerodactylEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +MonGhostEvosMoves: +; Evolutions + db 0 +; Learnset + db 0 + +OddishEvosMoves: +; Evolutions + db EV_LEVEL, 21, GLOOM + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 24, ACID + db 33, PETAL_DANCE + db 46, SOLARBEAM + db 0 + +GloomEvosMoves: +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VILEPLUME + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 28, ACID + db 38, PETAL_DANCE + db 52, SOLARBEAM + db 0 + +VileplumeEvosMoves: +; Evolutions + db 0 +; Learnset + db 15, POISONPOWDER + db 17, STUN_SPORE + db 19, SLEEP_POWDER + db 0 + +BellsproutEvosMoves: +; Evolutions + db EV_LEVEL, 21, WEEPINBELL + db 0 +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 21, STUN_SPORE + db 26, ACID + db 33, RAZOR_LEAF + db 42, SLAM + db 0 + +WeepinbellEvosMoves: +; Evolutions + db EV_ITEM, LEAF_STONE, 1, VICTREEBEL + db 0 +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 23, STUN_SPORE + db 29, ACID + db 38, RAZOR_LEAF + db 49, SLAM + db 0 + +VictreebelEvosMoves: +; Evolutions + db 0 +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER + db 0 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm new file mode 100644 index 00000000..471ee846 --- /dev/null +++ b/data/pokemon/menu_icons.asm @@ -0,0 +1,77 @@ +MonPartyData: + dn ICON_GRASS, ICON_GRASS ; Bulbasaur / Ivysaur + dn ICON_GRASS, ICON_MON ; Venusaur / Charmander + dn ICON_MON, ICON_MON ; Charmeleon / Charizard + dn ICON_WATER, ICON_WATER ; Squirtle / Wartortle + dn ICON_WATER, ICON_BUG ; Blastoise / Caterpie + dn ICON_BUG, ICON_BUG ; Metapod / Butterfree + dn ICON_BUG, ICON_BUG ; Weedle / Kakuna + dn ICON_BUG, ICON_BIRD ; Beedrill / Pidgey + dn ICON_BIRD, ICON_BIRD ; Pidgeotto / Pidgeot + dn ICON_QUADRUPED, ICON_QUADRUPED ; Rattata / Raticate + dn ICON_BIRD, ICON_BIRD ; Spearow / Fearow + dn ICON_SNAKE, ICON_SNAKE ; Ekans / Arbok + dn ICON_FAIRY, ICON_FAIRY ; Pikachu / Raichu + dn ICON_MON, ICON_MON ; Sandshrew / Sandslash + dn ICON_MON, ICON_MON ; NidoranF / Nidorina + dn ICON_MON, ICON_MON ; Nidoqueen / NidoranM + dn ICON_MON, ICON_MON ; Nidorino / Nidoking + dn ICON_FAIRY, ICON_FAIRY ; Clefairy / Clefable + dn ICON_QUADRUPED, ICON_QUADRUPED ; Vulpix / Ninetales + dn ICON_FAIRY, ICON_FAIRY ; Jigglypuff / Wigglytuff + dn ICON_MON, ICON_MON ; Zubat / Golbat + dn ICON_GRASS, ICON_GRASS ; Oddish / Gloom + dn ICON_GRASS, ICON_BUG ; Vileplume / Paras + dn ICON_BUG, ICON_BUG ; Parasect / Venonat + dn ICON_BUG, ICON_MON ; Venomoth / Diglett + dn ICON_MON, ICON_MON ; Dugtrio / Meowth + dn ICON_MON, ICON_MON ; Persian / Psyduck + dn ICON_MON, ICON_MON ; Golduck / Mankey + dn ICON_MON, ICON_QUADRUPED ; Primeape / Growlithe + dn ICON_QUADRUPED, ICON_MON ; Arcanine / Poliwag + dn ICON_MON, ICON_MON ; Poliwhirl / Poliwrath + dn ICON_MON, ICON_MON ; Abra / Kadabra + dn ICON_MON, ICON_MON ; Alakazam / Machop + dn ICON_MON, ICON_MON ; Machoke / Machamp + dn ICON_GRASS, ICON_GRASS ; Bellsprout / Weepinbell + dn ICON_GRASS, ICON_WATER ; Victreebel / Tentacool + dn ICON_WATER, ICON_MON ; Tentacruel / Geodude + dn ICON_MON, ICON_MON ; Graveler / Golem + dn ICON_QUADRUPED, ICON_QUADRUPED ; Ponyta / Rapidash + dn ICON_QUADRUPED, ICON_MON ; Slowpoke / Slowbro + dn ICON_BALL, ICON_BALL ; Magnemite / Magneton + dn ICON_BIRD, ICON_BIRD ; Farfetch'd / Doduo + dn ICON_BIRD, ICON_WATER ; Dodrio / Seel + dn ICON_WATER, ICON_MON ; Dewgong / Grimer + dn ICON_MON, ICON_HELIX ; Muk / Shellder + dn ICON_HELIX, ICON_MON ; Cloyster / Gastly + dn ICON_MON, ICON_MON ; Haunter / Gengar + dn ICON_SNAKE, ICON_MON ; Onix / Drowzee + dn ICON_MON, ICON_WATER ; Hypno / Krabby + dn ICON_WATER, ICON_BALL ; Kingler / Voltorb + dn ICON_BALL, ICON_GRASS ; Electrode / Exeggcute + dn ICON_GRASS, ICON_MON ; Exeggutor / Cubone + dn ICON_MON, ICON_MON ; Marowak / Hitmonlee + dn ICON_MON, ICON_MON ; Hitmonchan / Lickitung + dn ICON_MON, ICON_MON ; Koffing / Weezing + dn ICON_QUADRUPED, ICON_MON ; Rhyhorn / Rhydon + dn ICON_FAIRY, ICON_GRASS ; Chansey / Tangela + dn ICON_MON, ICON_WATER ; Kangaskhan / Horsea + dn ICON_WATER, ICON_WATER ; Seadra / Goldeen + dn ICON_WATER, ICON_HELIX ; Seaking / Staryu + dn ICON_HELIX, ICON_MON ; Starmie / Mr.Mime + dn ICON_BUG, ICON_MON ; Scyther / Jynx + dn ICON_MON, ICON_MON ; Electabuzz / Magmar + dn ICON_BUG, ICON_QUADRUPED ; Pinsir / Tauros + dn ICON_WATER, ICON_SNAKE ; Magikarp / Gyarados + dn ICON_WATER, ICON_MON ; Lapras / Ditto + dn ICON_QUADRUPED, ICON_QUADRUPED ; Eevee / Vaporeon + dn ICON_QUADRUPED, ICON_QUADRUPED ; Jolteon / Flareon + dn ICON_MON, ICON_HELIX ; Porygon / Omanyte + dn ICON_HELIX, ICON_HELIX ; Omastar / Kabuto + dn ICON_HELIX, ICON_BIRD ; Kabutops / Aerodactyl + dn ICON_MON, ICON_BIRD ; Snorlax / Articuno + dn ICON_BIRD, ICON_BIRD ; Zapdos / Moltres + dn ICON_SNAKE, ICON_SNAKE ; Dratini / Dragonair + dn ICON_SNAKE, ICON_MON ; Dragonite / Mewtwo + dn ICON_MON, 0 ; Mew / padding diff --git a/data/pokemon/mew.asm b/data/pokemon/mew.asm new file mode 100644 index 00000000..c68867ee --- /dev/null +++ b/data/pokemon/mew.asm @@ -0,0 +1,15 @@ +; Mew's pics and base data are not grouped with the other Pokémon +; because it was a last-minute addition "as a kind of prank". +; Shigeki Morimoto explained in an Iwata Asks interview: +; "We put Mew in right at the very end. The cartridge was really full and +; there wasn't room for much more on there. Then the debug features which +; weren't going to be included in the final version of the game were removed, +; creating a miniscule 300 bytes of free space. So we thought that we could +; slot Mew in there. What we did would be unthinkable nowadays!" +; http://iwataasks.nintendo.com/interviews/#/ds/pokemon/0/0 + +MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" +MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" + +MewBaseStats:: +INCLUDE "data/pokemon/base_stats/mew.asm" diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm new file mode 100644 index 00000000..83a45b77 --- /dev/null +++ b/data/pokemon/names.asm @@ -0,0 +1,191 @@ +MonsterNames:: + db "RHYDON@@@@" + db "KANGASKHAN" + db "NIDORAN♂@@" + db "CLEFAIRY@@" + db "SPEAROW@@@" + db "VOLTORB@@@" + db "NIDOKING@@" + db "SLOWBRO@@@" + db "IVYSAUR@@@" + db "EXEGGUTOR@" + db "LICKITUNG@" + db "EXEGGCUTE@" + db "GRIMER@@@@" + db "GENGAR@@@@" + db "NIDORAN♀@@" + db "NIDOQUEEN@" + db "CUBONE@@@@" + db "RHYHORN@@@" + db "LAPRAS@@@@" + db "ARCANINE@@" + db "MEW@@@@@@@" + db "GYARADOS@@" + db "SHELLDER@@" + db "TENTACOOL@" + db "GASTLY@@@@" + db "SCYTHER@@@" + db "STARYU@@@@" + db "BLASTOISE@" + db "PINSIR@@@@" + db "TANGELA@@@" + db "MISSINGNO." + db "MISSINGNO." + db "GROWLITHE@" + db "ONIX@@@@@@" + db "FEAROW@@@@" + db "PIDGEY@@@@" + db "SLOWPOKE@@" + db "KADABRA@@@" + db "GRAVELER@@" + db "CHANSEY@@@" + db "MACHOKE@@@" + db "MR.MIME@@@" + db "HITMONLEE@" + db "HITMONCHAN" + db "ARBOK@@@@@" + db "PARASECT@@" + db "PSYDUCK@@@" + db "DROWZEE@@@" + db "GOLEM@@@@@" + db "MISSINGNO." + db "MAGMAR@@@@" + db "MISSINGNO." + db "ELECTABUZZ" + db "MAGNETON@@" + db "KOFFING@@@" + db "MISSINGNO." + db "MANKEY@@@@" + db "SEEL@@@@@@" + db "DIGLETT@@@" + db "TAUROS@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "FARFETCH'D" + db "VENONAT@@@" + db "DRAGONITE@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "DODUO@@@@@" + db "POLIWAG@@@" + db "JYNX@@@@@@" + db "MOLTRES@@@" + db "ARTICUNO@@" + db "ZAPDOS@@@@" + db "DITTO@@@@@" + db "MEOWTH@@@@" + db "KRABBY@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "VULPIX@@@@" + db "NINETALES@" + db "PIKACHU@@@" + db "RAICHU@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "DRATINI@@@" + db "DRAGONAIR@" + db "KABUTO@@@@" + db "KABUTOPS@@" + db "HORSEA@@@@" + db "SEADRA@@@@" + db "MISSINGNO." + db "MISSINGNO." + db "SANDSHREW@" + db "SANDSLASH@" + db "OMANYTE@@@" + db "OMASTAR@@@" + db "JIGGLYPUFF" + db "WIGGLYTUFF" + db "EEVEE@@@@@" + db "FLAREON@@@" + db "JOLTEON@@@" + db "VAPOREON@@" + db "MACHOP@@@@" + db "ZUBAT@@@@@" + db "EKANS@@@@@" + db "PARAS@@@@@" + db "POLIWHIRL@" + db "POLIWRATH@" + db "WEEDLE@@@@" + db "KAKUNA@@@@" + db "BEEDRILL@@" + db "MISSINGNO." + db "DODRIO@@@@" + db "PRIMEAPE@@" + db "DUGTRIO@@@" + db "VENOMOTH@@" + db "DEWGONG@@@" + db "MISSINGNO." + db "MISSINGNO." + db "CATERPIE@@" + db "METAPOD@@@" + db "BUTTERFREE" + db "MACHAMP@@@" + db "MISSINGNO." + db "GOLDUCK@@@" + db "HYPNO@@@@@" + db "GOLBAT@@@@" + db "MEWTWO@@@@" + db "SNORLAX@@@" + db "MAGIKARP@@" + db "MISSINGNO." + db "MISSINGNO." + db "MUK@@@@@@@" + db "MISSINGNO." + db "KINGLER@@@" + db "CLOYSTER@@" + db "MISSINGNO." + db "ELECTRODE@" + db "CLEFABLE@@" + db "WEEZING@@@" + db "PERSIAN@@@" + db "MAROWAK@@@" + db "MISSINGNO." + db "HAUNTER@@@" + db "ABRA@@@@@@" + db "ALAKAZAM@@" + db "PIDGEOTTO@" + db "PIDGEOT@@@" + db "STARMIE@@@" + db "BULBASAUR@" + db "VENUSAUR@@" + db "TENTACRUEL" + db "MISSINGNO." + db "GOLDEEN@@@" + db "SEAKING@@@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "PONYTA@@@@" + db "RAPIDASH@@" + db "RATTATA@@@" + db "RATICATE@@" + db "NIDORINO@@" + db "NIDORINA@@" + db "GEODUDE@@@" + db "PORYGON@@@" + db "AERODACTYL" + db "MISSINGNO." + db "MAGNEMITE@" + db "MISSINGNO." + db "MISSINGNO." + db "CHARMANDER" + db "SQUIRTLE@@" + db "CHARMELEON" + db "WARTORTLE@" + db "CHARIZARD@" + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "MISSINGNO." + db "ODDISH@@@@" + db "GLOOM@@@@@" + db "VILEPLUME@" + db "BELLSPROUT" + db "WEEPINBELL" + db "VICTREEBEL" diff --git a/data/mon_palettes.asm b/data/pokemon/palettes.asm old mode 100755 new mode 100644 similarity index 100% rename from data/mon_palettes.asm rename to data/pokemon/palettes.asm diff --git a/data/title_mons.asm b/data/pokemon/title_mons.asm old mode 100755 new mode 100644 similarity index 82% rename from data/title_mons.asm rename to data/pokemon/title_mons.asm index c5d94301..c0acd13a --- a/data/title_mons.asm +++ b/data/pokemon/title_mons.asm @@ -1,9 +1,9 @@ TitleMons: ; mons on the title screen are randomly chosen from here IF DEF(_RED) - db CHARMANDER - db SQUIRTLE - db BULBASAUR + db STARTER1 + db STARTER2 + db STARTER3 db WEEDLE db NIDORAN_M db SCYTHER @@ -19,9 +19,9 @@ IF DEF(_RED) db MAGIKARP ENDC IF DEF(_GREEN) - db BULBASAUR - db CHARMANDER - db SQUIRTLE + db STARTER3 + db STARTER1 + db STARTER2 db CATERPIE db NIDORAN_F db PINSIR @@ -37,9 +37,9 @@ IF DEF(_GREEN) db MAGIKARP ENDC IF DEF(_BLUE) - db SQUIRTLE - db CHARMANDER - db BULBASAUR + db STARTER2 + db STARTER1 + db STARTER3 db MANKEY db HITMONLEE db VULPIX diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm new file mode 100644 index 00000000..99492a9d --- /dev/null +++ b/data/predef_pointers.asm @@ -0,0 +1,111 @@ +add_predef: MACRO +\1Predef:: +IF _NARG == 1 + dba \1 +ELSE + dbw \2, \1 +ENDC +ENDM + +PredefPointers:: +; these are pointers to ASM routines. +; they appear to be used in overworld map scripts. + add_predef DrawPlayerHUDAndHPBar + add_predef CopyUncompressedPicToTilemap + add_predef AnimateSendingOutMon + add_predef ScaleSpriteByTwo + add_predef LoadMonBackPic + add_predef CopyDownscaledMonTiles + add_predef LoadMissableObjects ; add_predef JumpMoveEffect, $03 ; wrong bank + add_predef HealParty + add_predef MoveAnimation + add_predef DivideBCDPredef + add_predef DivideBCDPredef2 + add_predef AddBCDPredef + add_predef SubBCDPredef + add_predef DivideBCDPredef3 + add_predef DivideBCDPredef4 + add_predef InitPlayerData + add_predef FlagActionPredef + add_predef HideObject + add_predef IsObjectHidden + add_predef ApplyOutOfBattlePoisonDamage + add_predef AnyPartyAlive + add_predef ShowObject + add_predef ShowObject2 + add_predef ReplaceTileBlock + add_predef InitPlayerData2 + add_predef LoadTilesetHeader + add_predef LearnMoveFromLevelUp + add_predef LearnMove + add_predef GetQuantityOfItemInBag + add_predef CheckForHiddenObjectOrBookshelfOrCardKeyDoor, $03 ; home bank + add_predef GiveItem, $03 ; home bank + add_predef ChangeBGPalColor0_4Frames + add_predef FindPathToPlayer + add_predef PredefShakeScreenVertically + add_predef CalcPositionOfPlayerRelativeToNPC + add_predef ConvertNPCMovementDirectionsToJoypadMasks + add_predef PredefShakeScreenHorizontally + add_predef UpdateHPBar + add_predef HPBarLength + add_predef Diploma_TextBoxBorder + add_predef DoubleOrHalveSelectedStats + add_predef ShowPokedexMenu + add_predef EvolutionAfterBattle + add_predef SaveSAVtoSRAM0 + add_predef InitOpponent + add_predef CableClub_Run + add_predef DrawBadges + add_predef ExternalClockTradeAnim + add_predef BattleTransition + add_predef CopyTileIDsFromList + add_predef PlayIntro + add_predef GetMoveSoundB + add_predef FlashScreen + add_predef GetTileAndCoordsInFrontOfPlayer + add_predef StatusScreen + add_predef StatusScreen2 + add_predef InternalClockTradeAnim + add_predef TrainerEngage + add_predef IndexToPokedex + add_predef DisplayPicCenteredOrUpperRight + add_predef UsedCut + add_predef ShowPokedexData + add_predef WriteMonMoves + add_predef SaveSAV + add_predef LoadSGB + add_predef MarkTownVisitedAndLoadMissableObjects + add_predef SetPartyMonTypes + add_predef CanLearnTM + add_predef TMToMove + add_predef _RunPaletteCommand + add_predef StarterDex + add_predef _AddPartyMon + add_predef UpdateHPBar2 + add_predef DrawEnemyHUDAndHPBar + add_predef LoadTownMap_Nest + add_predef PrintMonType + add_predef EmotionBubble + add_predef EmptyFunc ; return immediately + add_predef AskName + add_predef PewterGuys + add_predef SaveSAVtoSRAM2 + add_predef LoadSAV2 + add_predef LoadSAV + add_predef SaveSAVtoSRAM1 + add_predef DoInGameTradeDialogue + add_predef HallOfFamePC + add_predef DisplayDexRating + add_predef _LeaveMapAnim, $1E ; wrong bank + add_predef EnterMapAnim, $1E ; wrong bank + add_predef GetTileTwoStepsInFrontOfPlayer + add_predef CheckForCollisionWhenPushingBoulder + add_predef PrintStrengthTxt + add_predef PickUpItem + add_predef PrintMoveType + add_predef LoadMovePPs + add_predef DrawHP + add_predef DrawHP2 + add_predef DisplayElevatorFloorMenu + add_predef OaksAideScript diff --git a/data/prize_mon_levels.asm b/data/prize_mon_levels.asm deleted file mode 100755 index bffa4440..00000000 --- a/data/prize_mon_levels.asm +++ /dev/null @@ -1,19 +0,0 @@ -PrizeMonLevelDictionary: -IF DEF(_RED) - db ABRA,9 - db CLEFAIRY,8 - db NIDORINA,17 - - db DRATINI,18 - db SCYTHER,25 - db PORYGON,26 -ENDC -IF DEF(_BLUE) - db ABRA,6 - db CLEFAIRY,12 - db NIDORINO,17 - - db PINSIR,20 - db DRATINI,24 - db PORYGON,18 -ENDC diff --git a/data/sgb_border.asm b/data/sgb/sgb_border.asm old mode 100755 new mode 100644 similarity index 83% rename from data/sgb_border.asm rename to data/sgb/sgb_border.asm index c2afc193..aa11a326 --- a/data/sgb_border.asm +++ b/data/sgb/sgb_border.asm @@ -1,9 +1,9 @@ BorderPalettes: IF DEF(_RED) - INCBIN "gfx/red/sgbborder.map" + INCBIN "gfx/sgb/red_border.tilemap" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/sgbborder.map" + INCBIN "gfx/sgb/blue_border.tilemap" ENDC ds $100 @@ -55,8 +55,8 @@ ENDC SGBBorderGraphics: IF DEF(_RED) - INCBIN "gfx/red/sgbborder.2bpp" + INCBIN "gfx/sgb/red_border.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/sgbborder.2bpp" + INCBIN "gfx/sgb/blue_border.2bpp" ENDC diff --git a/data/sgb_packets.asm b/data/sgb/sgb_packets.asm old mode 100755 new mode 100644 similarity index 76% rename from data/sgb_packets.asm rename to data/sgb/sgb_packets.asm index cae91883..0b6219e1 --- a/data/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -4,6 +4,7 @@ ATTR_BLK: MACRO db ($4 << 3) + ((\1 * 6) / 16 + 1) db \1 ENDM + ATTR_BLK_DATA: MACRO db \1 ; which regions are affected db \2 + (\3 << 2) + (\4 << 4) ; palette for each region @@ -13,35 +14,35 @@ ENDM PAL_SET: MACRO db ($a << 3) + 1 dw \1, \2, \3, \4 - ds 7 + ds 7, 0 ENDM PAL_TRN: MACRO - db ($b<< 3) + 1 - ds 15 + db ($b << 3) + 1 + ds 15, 0 ENDM MLT_REQ: MACRO db ($11 << 3) + 1 db \1 - 1 - ds 14 + ds 14, 0 ENDM CHR_TRN: MACRO db ($13 << 3) + 1 db \1 + (\2 << 1) - ds 14 + ds 14, 0 ENDM PCT_TRN: MACRO db ($14 << 3) + 1 - ds 15 + ds 15, 0 ENDM MASK_EN: MACRO db ($17 << 3) + 1 db \1 - ds 14 + ds 14, 0 ENDM DATA_SND: MACRO @@ -51,12 +52,15 @@ DATA_SND: MACRO db \3 ; length (1-11) ENDM + BlkPacket_WholeScreen: ATTR_BLK 1 ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 - ds 8 + ds 8, 0 - db $03,$00,$00,$13,$11,$00,$00 +; unused + db $03, 00,00, 19,17, $00 + db $00 BlkPacket_Battle: ATTR_BLK 5 @@ -66,34 +70,39 @@ BlkPacket_Battle: ATTR_BLK_DATA %011, 2,2,0, 00,04, 08,11 ; player mon: pal 2 ATTR_BLK_DATA %011, 3,3,0, 11,00, 19,06 ; enemy mon : pal 3 - db $03,$00,$00,$13,$0b,$00 - db $03,$00,$0c,$13,$11,$02 - db $03,$01,$00,$0a,$03,$01 - db $03,$0a,$08,$13,$0a,$00 - db $03,$00,$04,$08,$0b,$02 - db $03,$0b,$00,$13,$07,$03 +; unused + db $03, 00,00, 19,11, $00 + db $03, 00,12, 19,17, $02 + db $03, 01,00, 10,03, $01 + db $03, 10,08, 19,10, $00 + db $03, 00,04, 08,11, $02 + db $03, 11,00, 19,07, $03 db $00 BlkPacket_StatusScreen: ATTR_BLK 1 ATTR_BLK_DATA %111, 1,1,0, 01,00, 07,06 ; mon: pal 1, HP bar: pal 0 - ds 8 + ds 8, 0 - db $02,$00,$00,$11,$00,$03 - db $01,$00,$07,$06,$01,$03 - db $01,$07,$13,$11,$00,$03 - db $08,$00,$13,$06,$00,$00 +; unused + db $02, 00,00, 17,00 + db $03, 01,00, 07,06, $01 + db $03, 01,07, 19,17, $00 + db $03, 08,00, 19,06, $00 + db $00 BlkPacket_Pokedex: ATTR_BLK 1 ATTR_BLK_DATA %111, 1,1,0, 01,01, 08,08 ; mon: pal 1, everything else: pal 0 - ds 8 + ds 8, 0 - db $02,$00,$00,$11,$00,$01 - db $00,$01,$13,$00,$03,$01 - db $01,$08,$08,$01,$03,$01 - db $09,$08,$11,$00,$03,$09 - db $01,$13,$11,$00,$00 +; unused + db $02, 00,00, 17,00 + db $01, 00,01, 19,00 + db $03, 01,01, 08,08, $01 + db $03, 01,09, 08,17, $00 + db $03, 09,01, 19,17, $00 + db $00 BlkPacket_Slots: ATTR_BLK 5 @@ -103,11 +112,12 @@ BlkPacket_Slots: ATTR_BLK_DATA %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0 ATTR_BLK_DATA %011, 0,0,0, 00,12, 19,17 ; message box: pal 0 - db $03,$00,$00,$13,$0b,$01 - db $03,$00,$04,$13,$09,$02 - db $03,$00,$06,$13,$07,$03 - db $03,$04,$04,$0f,$09,$00 - db $03,$00,$0c,$13,$11,$00 +; unused + db $03, 00,00, 19,11, $01 + db $03, 00,04, 19,09, $02 + db $03, 00,06, 19,07, $03 + db $03, 04,04, 15,09, $00 + db $03, 00,12, 19,17, $00 db $00 BlkPacket_Titlescreen: @@ -115,11 +125,12 @@ BlkPacket_Titlescreen: ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,07 ; pokemon logo: pal 0 ATTR_BLK_DATA %010, 1,1,0, 00,08, 19,09 ; version text: pal 1 ATTR_BLK_DATA %011, 2,2,0, 00,10, 19,17 ; player, mon, copyright text: pal 2 - ds 12 + ds 12, 0 - db $03,$00,$00,$13,$07,$00 - db $03,$00,$08,$13,$09,$01 - db $03,$00,$0a,$13,$11,$02 +; unused + db $03, 00,00, 19,07, $00 + db $03, 00,08, 19,09, $01 + db $03, 00,10, 19,17, $02 db $00 BlkPacket_NidorinoIntro: @@ -127,11 +138,12 @@ BlkPacket_NidorinoIntro: ATTR_BLK_DATA %011, 1,1,0, 00,00, 19,03 ; upper black bar: pal 1 ATTR_BLK_DATA %011, 0,0,0, 00,04, 19,13 ; letterbox: pal 0 ATTR_BLK_DATA %011, 1,1,0, 00,14, 19,17 ; lower black bar: pal 1 - ds 12 + ds 12, 0 - db $03,$00,$00,$13,$03,$01 - db $03,$00,$04,$13,$0d,$00 - db $03,$00,$0e,$13,$11,$01 +; unused + db $03, 00,00, 19,03, $01 + db $03, 00,04, 19,13, $00 + db $03, 00,14, 19,17, $01 db $00 BlkPacket_PartyMenu: @@ -143,18 +155,20 @@ BlkPacket_PartyMenu: ATTR_BLK_DATA %010, 0,0,0, 05,07, 11,07 ; HP bar 3: pal set dynamically ATTR_BLK_DATA %010, 0,0,0, 05,09, 11,09 ; HP bar 4: pal set dynamically ATTR_BLK_DATA %010, 0,0,0, 05,11, 11,11 ; HP bar 5: pal set dynamically - ds 4 + ds 4, 0 - db $02,$00,$00,$11,$01,$03 - db $01,$00,$02,$0c,$00,$03 - db $01,$0d,$02,$11,$01,$03 - db $03,$00,$13,$11,$01,$03 - db $0c,$00,$12,$01,$00,$03 - db $0c,$02,$12,$03,$00,$03 - db $0c,$04,$12,$05,$00,$03 - db $0c,$06,$12,$07,$00,$03 - db $0c,$08,$12,$09,$00,$03 - db $0c,$0a,$12,$0b,$00,$00 +; unused + db $02, 00,00, 17,01 + db $03, 01,00, 02,12, $00 + db $03, 01,13, 02,17, $01 + db $03, 03,00, 19,17, $01 + db $03, 12,00, 18,01, $00 + db $03, 12,02, 18,03, $00 + db $03, 12,04, 18,05, $00 + db $03, 12,06, 18,07, $00 + db $03, 12,08, 18,09, $00 + db $03, 12,10, 18,11, $00 + db $00 BlkPacket_TrainerCard: ATTR_BLK 10 @@ -168,18 +182,19 @@ BlkPacket_TrainerCard: ATTR_BLK_DATA %010, 3,3,0, 07,15, 08,16 ; Marsh Badge ATTR_BLK_DATA %010, 2,2,0, 11,15, 12,16 ; Volcano Badge ATTR_BLK_DATA %010, 1,1,0, 15,15, 16,16 ; Earth Badge - ds 2 + ds 2, 0 - db $03,$03,$0c,$04,$0d,$00 - db $03,$07,$0c,$08,$0d,$01 - db $03,$0b,$0c,$0c,$0d,$03 - db $03,$10,$0b,$11,$0c,$02 - db $03,$0e,$0d,$0f,$0e,$01 - db $03,$10,$0d,$11,$0e,$03 - db $03,$03,$0f,$04,$10,$02 - db $03,$07,$0f,$08,$10,$03 - db $03,$0b,$0f,$0c,$10,$02 - db $03,$0f,$0f,$10,$10,$01 +; unused + db $03, 03,12, 04,13, $00 + db $03, 07,12, 08,13, $01 + db $03, 11,12, 12,13, $03 + db $03, 16,11, 17,12, $02 + db $03, 14,13, 15,14, $01 + db $03, 16,13, 17,14, $03 + db $03, 03,15, 04,16, $02 + db $03, 07,15, 08,16, $03 + db $03, 11,15, 12,16, $02 + db $03, 15,15, 16,16, $01 db $00 BlkPacket_GameFreakIntro: @@ -187,15 +202,16 @@ BlkPacket_GameFreakIntro: ATTR_BLK_DATA %111, 1,1,0, 05,11, 07,13 ; falling stars (left): pal 1, GameFreak logo: pal 0 ATTR_BLK_DATA %010, 2,2,0, 08,11, 09,13 ; falling stars (middle): pal 2 ATTR_BLK_DATA %011, 3,3,0, 12,11, 14,13 ; falling stars (right): pal 3 - ds 12 + ds 12, 0 - db $03,$00,$00,$13,$0a,$00 - db $03,$00,$0b,$04,$0d,$00 - db $03,$05,$0b,$07,$0d,$01 - db $03,$08,$0b,$13,$0d,$00 - db $03,$00,$0e,$13,$11,$00 - db $03,$08,$0b,$09,$0d,$02 - db $03,$0c,$0b,$0e,$0d,$03 +; unused + db $03, 00,00, 19,10, $00 + db $03, 00,11, 04,13, $00 + db $03, 05,11, 07,13, $01 + db $03, 08,11, 19,13, $00 + db $03, 00,14, 19,17, $00 + db $03, 08,11, 09,13, $02 + db $03, 12,11, 14,13, $03 db $00 @@ -225,13 +241,15 @@ MaskEnCancelPacket: MASK_EN 0 ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. -DataSnd_72548: DATA_SND $85d, $0, 11 +DataSnd_72548: + DATA_SND $85d, $0, 11 db $8C ; cpx #$8c (2) db $D0, $F4 ; bne -$0c db $60 ; rts - ds 7 + ds 7, 0 -DataSnd_72558: DATA_SND $852, $0, 11 +DataSnd_72558: + DATA_SND $852, $0, 11 db $A9, $E7 ; lda #$e7 db $9F, $01, $C0, $7E ; sta $7ec001, x db $E8 ; inx @@ -240,7 +258,8 @@ DataSnd_72558: DATA_SND $852, $0, 11 db $E8 ; inx db $E0 ; cpx #$8c (1) -DataSnd_72568: DATA_SND $847, $0, 11 +DataSnd_72568: + DATA_SND $847, $0, 11 db $C4 ; cmp #$c4 (2) db $D0, $16 ; bne +$16 db $A5 ; lda dp @@ -249,7 +268,8 @@ DataSnd_72568: DATA_SND $847, $0, 11 db $D0, $10 ; bne +$10 db $A2, $28 ; ldx #$28 -DataSnd_72578: DATA_SND $83c, $0, 11 +DataSnd_72578: + DATA_SND $83c, $0, 11 db $F0, $12 ; beq +$12 db $A5 ; lda dp db $C9, $C9 ; cmp #$c9 @@ -259,7 +279,8 @@ DataSnd_72578: DATA_SND $83c, $0, 11 db $CA ; dex db $C9 ; cmp #$c4 (1) -DataSnd_72588: DATA_SND $831, $0, 11 +DataSnd_72588: + DATA_SND $831, $0, 11 dbw $0C, $CAA5 ; tsb $caa5 db $C9, $7E ; cmp #$7e db $D0, $06 ; bne +$06 @@ -267,7 +288,8 @@ DataSnd_72588: DATA_SND $831, $0, 11 db $CB ; wai db $C9, $7E ; cmp #$7e -DataSnd_72598: DATA_SND $826, $0, 11 +DataSnd_72598: + DATA_SND $826, $0, 11 db $39 ; bne +$39 (2) dbw $CD, $C48 ; cmp $c48 db $D0, $34 ; bne +$34 @@ -275,7 +297,8 @@ DataSnd_72598: DATA_SND $826, $0, 11 db $C9, $C9 ; cmp #$c9 db $80, $D0 ; bra -$30 -DataSnd_725a8: DATA_SND $81b, $0, 11 +DataSnd_725a8: + DATA_SND $81b, $0, 11 db $EA ; nop db $EA ; nop db $EA ; nop @@ -286,7 +309,8 @@ DataSnd_725a8: DATA_SND $81b, $0, 11 dbw $CD,$C4F ; cmp $c4f db $D0 ; bne +$39 (1) -DataSnd_725b8: DATA_SND $810, $0, 11 +DataSnd_725b8: + DATA_SND $810, $0, 11 dbw $4C, $820 ; jmp $820 db $EA ; nop db $EA ; nop diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm new file mode 100644 index 00000000..7029b4e8 --- /dev/null +++ b/data/sgb/sgb_palettes.asm @@ -0,0 +1,51 @@ +SuperPalettes: +; entries correspond to PAL_* constants + RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE + RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET + RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN + RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER + RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN + RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER + RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION + RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON + RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA + RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR + RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO + RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON + RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP +IF DEF(_RED) + RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1 +ENDC +IF DEF(_BLUE) + RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1 +ENDC + RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2 + RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F + RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON + RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON + RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON + RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON + RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON + RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON + RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON + RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON + RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON + RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON + RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1 +IF DEF(_RED) + RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2 + RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3 + RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4 +ENDC +IF DEF(_BLUE) + RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2 + RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3 + RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4 +ENDC + RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK + RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR + RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR + RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR + RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE + RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE + RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK diff --git a/data/special_warps.asm b/data/special_warps.asm deleted file mode 100755 index 6b536b67..00000000 --- a/data/special_warps.asm +++ /dev/null @@ -1,119 +0,0 @@ -; Format: (size 2 bytes) -; 00: target map ID -; 01: which dungeon warp in the source map was used -DungeonWarpList: - db SEAFOAM_ISLANDS_B1F,$01 - db SEAFOAM_ISLANDS_B1F,$02 - db SEAFOAM_ISLANDS_B2F,$01 - db SEAFOAM_ISLANDS_B2F,$02 - db SEAFOAM_ISLANDS_B3F,$01 - db SEAFOAM_ISLANDS_B3F,$02 - db SEAFOAM_ISLANDS_B4F,$01 - db SEAFOAM_ISLANDS_B4F,$02 - db VICTORY_ROAD_2F,$02 - db POKEMON_MANSION_1F,$01 - db POKEMON_MANSION_1F,$02 - db POKEMON_MANSION_2F,$03 - db $FF - -DungeonWarpData: - FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,23 - FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,22 - FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,18 - FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,19 - FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,4 - FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,5 - FLYWARP_DATA VICTORY_ROAD_2F_WIDTH,16,22 - FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 - FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16 - FLYWARP_DATA POKEMON_MANSION_2F_WIDTH,14,18 - -;Format: -; db Map_id -; FLYWARP_DATA [Map Width][Y-pos][X-pos] -; db Tileset_id -FirstMapSpec: - db REDS_HOUSE_2F - FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 - db REDS_HOUSE_2 - -TradeCenterSpec1: - db TRADE_CENTER - FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 - db CLUB - -TradeCenterSpec2: - db TRADE_CENTER - FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 - db CLUB - -ColosseumSpec1: - db COLOSSEUM - FLYWARP_DATA COLOSSEUM_WIDTH,4,3 - db CLUB - -ColosseumSpec2: - db COLOSSEUM - FLYWARP_DATA COLOSSEUM_WIDTH,4,6 - db CLUB - -FlyWarpDataPtr: - db PALLET_TOWN, 0 - dw PalletTownFlyWarp - db VIRIDIAN_CITY, 0 - dw ViridianCityFlyWarp - db PEWTER_CITY, 0 - dw PewterCityFlyWarp - db CERULEAN_CITY, 0 - dw CeruleanCityFlyWarp - db LAVENDER_TOWN, 0 - dw LavenderTownFlyWarp - db VERMILION_CITY, 0 - dw VermilionCityFlyWarp - db CELADON_CITY, 0 - dw CeladonCityFlyWarp - db FUCHSIA_CITY, 0 - dw FuchsiaCityFlyWarp - db CINNABAR_ISLAND, 0 - dw CinnabarIslandFlyWarp - db INDIGO_PLATEAU, 0 - dw IndigoPlateauFlyWarp - db SAFFRON_CITY, 0 - dw SaffronCityFlyWarp - db ROUTE_4, 0 - dw Route4FlyWarp - db ROUTE_10, 0 - dw Route10FlyWarp - -; Original Format: -; [Event Displacement][Y-block][X-block][Y-sub_block][X-sub_block] -; Macro Format: -; FLYWARP_DATA [Map Width][Y-pos][X-pos] -PalletTownFlyWarp: - FLYWARP_DATA PALLET_TOWN_WIDTH, 6, 5 -ViridianCityFlyWarp: - FLYWARP_DATA VIRIDIAN_CITY_WIDTH, 26, 23 -PewterCityFlyWarp: - FLYWARP_DATA PEWTER_CITY_WIDTH, 26, 13 -CeruleanCityFlyWarp: - FLYWARP_DATA CERULEAN_CITY_WIDTH, 18, 19 -LavenderTownFlyWarp: - FLYWARP_DATA LAVENDER_TOWN_WIDTH, 6, 3 -VermilionCityFlyWarp: - FLYWARP_DATA VERMILION_CITY_WIDTH, 4, 11 -CeladonCityFlyWarp: - FLYWARP_DATA CELADON_CITY_WIDTH, 10, 41 -FuchsiaCityFlyWarp: - FLYWARP_DATA FUCHSIA_CITY_WIDTH, 28, 19 -CinnabarIslandFlyWarp: - FLYWARP_DATA CINNABAR_ISLAND_WIDTH, 12, 11 -IndigoPlateauFlyWarp: - FLYWARP_DATA INDIGO_PLATEAU_WIDTH, 6, 9 -SaffronCityFlyWarp: - FLYWARP_DATA SAFFRON_CITY_WIDTH, 30, 9 -Route4FlyWarp: - FLYWARP_DATA ROUTE_4_WIDTH, 6, 11 -Route10FlyWarp: - FLYWARP_DATA ROUTE_10_WIDTH, 20, 11 diff --git a/data/sprite_sets.asm b/data/sprite_sets.asm deleted file mode 100755 index 5b0e1e00..00000000 --- a/data/sprite_sets.asm +++ /dev/null @@ -1,551 +0,0 @@ -MapSpriteSets: - db $01 ; PALLET_TOWN - db $01 ; VIRIDIAN_CITY - db $02 ; PEWTER_CITY - db $02 ; CERULEAN_CITY - db $03 ; LAVENDER_TOWN - db $04 ; VERMILION_CITY - db $05 ; CELADON_CITY - db $0a ; FUCHSIA_CITY - db $01 ; CINNABAR_ISLAND - db $06 ; INDIGO_PLATEAU - db $07 ; SAFFRON_CITY - db $01 ; unused map ID - db $01 ; ROUTE_1 - db $f1 ; ROUTE_2 - db $02 ; ROUTE_3 - db $02 ; ROUTE_4 - db $f9 ; ROUTE_5 - db $fa ; ROUTE_6 - db $fb ; ROUTE_7 - db $fc ; ROUTE_8 - db $02 ; ROUTE_9 - db $f2 ; ROUTE_10 - db $f3 ; ROUTE_11 - db $f4 ; ROUTE_12 - db $08 ; ROUTE_13 - db $08 ; ROUTE_14 - db $f5 ; ROUTE_15 - db $f6 ; ROUTE_16 - db $09 ; ROUTE_17 - db $f7 ; ROUTE_18 - db $0a ; ROUTE_19 - db $f8 ; ROUTE_20 - db $01 ; ROUTE_21 - db $01 ; ROUTE_22 - db $06 ; ROUTE_23 - db $02 ; ROUTE_24 - db $02 ; ROUTE_25 - -; Format: -; 00: determines whether the map is split East/West or North/South -; $01 = East/West divide -; $02 = North/South divide -; 01: coordinate of dividing line -; 02: sprite set ID if in the West or North side -; 03: sprite set ID if in the East or South side -SplitMapSpriteSets: - db $02,$25,$02,$01 ; $f1 - db $02,$32,$02,$03 ; $f2 - db $01,$39,$04,$08 ; $f3 - db $02,$15,$03,$08 ; $f4 - db $01,$08,$0A,$08 ; $f5 - db $01,$18,$09,$05 ; $f6 - db $01,$22,$09,$0A ; $f7 - db $01,$35,$01,$0A ; $f8 - db $02,$21,$02,$07 ; $f9 - db $02,$02,$07,$04 ; $fa - db $01,$11,$05,$07 ; $fb - db $01,$03,$07,$03 ; $fc - -SpriteSets: -; sprite set $01 - db SPRITE_BLUE - db SPRITE_BUG_CATCHER - db SPRITE_GIRL - db SPRITE_FISHER2 - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_GAMBLER - db SPRITE_SEEL - db SPRITE_OAK - db SPRITE_SWIMMER - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN - -; sprite set $02 - db SPRITE_BUG_CATCHER - db SPRITE_ROCKET - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_HIKER - db SPRITE_SLOWBRO - db SPRITE_BLUE - db SPRITE_GUARD - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $03 - db SPRITE_LITTLE_GIRL - db SPRITE_GIRL - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_HIKER - db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_GUARD - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $04 - db SPRITE_FOULARD_WOMAN - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_BUG_CATCHER - db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_GUARD - db SPRITE_SAILOR - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $05 - db SPRITE_LITTLE_GIRL - db SPRITE_YOUNG_BOY - db SPRITE_GIRL - db SPRITE_FISHER2 - db SPRITE_FAT_BALD_GUY - db SPRITE_OLD_PERSON - db SPRITE_SLOWBRO - db SPRITE_GUARD - db SPRITE_ROCKET - db SPRITE_BALL - db SPRITE_SNORLAX - -; sprite set $06 - db SPRITE_BUG_CATCHER - db SPRITE_GYM_HELPER - db SPRITE_SLOWBRO - db SPRITE_BLUE - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_SWIMMER - db SPRITE_GUARD - db SPRITE_GAMBLER - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $07 - db SPRITE_ROCKET - db SPRITE_OAK_AIDE - db SPRITE_LAPRAS_GIVER - db SPRITE_ERIKA - db SPRITE_GENTLEMAN - db SPRITE_BIRD - db SPRITE_ROCKER - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_SLOWBRO - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 - -; sprite set $08 - db SPRITE_BIKER - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_FAT_BALD_GUY - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_FOULARD_WOMAN - db SPRITE_FISHER2 - db SPRITE_ROCKER - db SPRITE_SLOWBRO - db SPRITE_BALL - db SPRITE_SNORLAX - -; sprite set $09 - db SPRITE_BIKER - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_LAPRAS_GIVER - db SPRITE_FISHER2 - db SPRITE_ROCKER - db SPRITE_HIKER - db SPRITE_GAMBLER - db SPRITE_FAT_BALD_GUY - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_BALL - db SPRITE_SNORLAX - -; sprite set $0a - db SPRITE_BIRD - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_CLEFAIRY - db SPRITE_FISHER2 - db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_SEEL - db SPRITE_SWIMMER - db SPRITE_BUG_CATCHER - db SPRITE_BALL - db SPRITE_OMANYTE - -SpriteSheetPointerTable: - ; SPRITE_RED - dw RedSprite - db $c0 ; byte count - db BANK(RedSprite) - - ; SPRITE_BLUE - dw BlueSprite - db $c0 ; byte count - db BANK(BlueSprite) - - ; SPRITE_OAK - dw OakSprite - db $c0 ; byte count - db BANK(OakSprite) - - ; SPRITE_BUG_CATCHER - dw BugCatcherSprite - db $c0 ; byte count - db BANK(BugCatcherSprite) - - ; SPRITE_SLOWBRO - dw SlowbroSprite - db $c0 ; byte count - db BANK(SlowbroSprite) - - ; SPRITE_LASS - dw LassSprite - db $c0 ; byte count - db BANK(LassSprite) - - ; SPRITE_BLACK_HAIR_BOY_1 - dw BlackHairBoy1Sprite - db $c0 ; byte count - db BANK(BlackHairBoy1Sprite) - - ; SPRITE_LITTLE_GIRL - dw LittleGirlSprite - db $c0 ; byte count - db BANK(LittleGirlSprite) - - ; SPRITE_BIRD - dw BirdSprite - db $c0 ; byte count - db BANK(BirdSprite) - - ; SPRITE_FAT_BALD_GUY - dw FatBaldGuySprite - db $c0 ; byte count - db BANK(FatBaldGuySprite) - - ; SPRITE_GAMBLER - dw GamblerSprite - db $c0 ; byte count - db BANK(GamblerSprite) - - ; SPRITE_BLACK_HAIR_BOY_2 - dw BlackHairBoy2Sprite - db $c0 ; byte count - db BANK(BlackHairBoy2Sprite) - - ; SPRITE_GIRL - dw GirlSprite - db $c0 ; byte count - db BANK(GirlSprite) - - ; SPRITE_HIKER - dw HikerSprite - db $c0 ; byte count - db BANK(HikerSprite) - - ; SPRITE_FOULARD_WOMAN - dw FoulardWomanSprite - db $c0 ; byte count - db BANK(FoulardWomanSprite) - - ; SPRITE_GENTLEMAN - dw GentlemanSprite - db $c0 ; byte count - db BANK(GentlemanSprite) - - ; SPRITE_DAISY - dw DaisySprite - db $c0 ; byte count - db BANK(DaisySprite) - - ; SPRITE_BIKER - dw BikerSprite - db $c0 ; byte count - db BANK(BikerSprite) - - ; SPRITE_SAILOR - dw SailorSprite - db $c0 ; byte count - db BANK(SailorSprite) - - ; SPRITE_COOK - dw CookSprite - db $c0 ; byte count - db BANK(CookSprite) - - ; SPRITE_BIKE_SHOP_GUY - dw BikeShopGuySprite - db $c0 ; byte count - db BANK(BikeShopGuySprite) - - ; SPRITE_MR_FUJI - dw MrFujiSprite - db $c0 ; byte count - db BANK(MrFujiSprite) - - ; SPRITE_GIOVANNI - dw GiovanniSprite - db $c0 ; byte count - db BANK(GiovanniSprite) - - ; SPRITE_ROCKET - dw RocketSprite - db $c0 ; byte count - db BANK(RocketSprite) - - ; SPRITE_MEDIUM - dw MediumSprite - db $c0 ; byte count - db BANK(MediumSprite) - - ; SPRITE_WAITER - dw WaiterSprite - db $c0 ; byte count - db BANK(WaiterSprite) - - ; SPRITE_ERIKA - dw ErikaSprite - db $c0 ; byte count - db BANK(ErikaSprite) - - ; SPRITE_MOM_GEISHA - dw MomGeishaSprite - db $c0 ; byte count - db BANK(MomGeishaSprite) - - ; SPRITE_BRUNETTE_GIRL - dw BrunetteGirlSprite - db $c0 ; byte count - db BANK(BrunetteGirlSprite) - - ; SPRITE_LANCE - dw LanceSprite - db $c0 ; byte count - db BANK(LanceSprite) - - ; SPRITE_OAK_SCIENTIST_AIDE - dw OakAideSprite - db $c0 ; byte count - db BANK(OakAideSprite) - - ; SPRITE_OAK_AIDE - dw OakAideSprite - db $c0 ; byte count - db BANK(OakAideSprite) - - ; SPRITE_ROCKER - dw RockerSprite - db $c0 ; byte count - db BANK(RockerSprite) - - ; SPRITE_SWIMMER - dw SwimmerSprite - db $c0 ; byte count - db BANK(SwimmerSprite) - - ; SPRITE_WHITE_PLAYER - dw WhitePlayerSprite - db $c0 ; byte count - db BANK(WhitePlayerSprite) - - ; SPRITE_GYM_HELPER - dw GymHelperSprite - db $c0 ; byte count - db BANK(GymHelperSprite) - - ; SPRITE_OLD_PERSON - dw OldPersonSprite - db $c0 ; byte count - db BANK(OldPersonSprite) - - ; SPRITE_MART_GUY - dw MartGuySprite - db $c0 ; byte count - db BANK(MartGuySprite) - - ; SPRITE_FISHER - dw FisherSprite - db $c0 ; byte count - db BANK(FisherSprite) - - ; SPRITE_OLD_MEDIUM_WOMAN - dw OldMediumWomanSprite - db $c0 ; byte count - db BANK(OldMediumWomanSprite) - - ; SPRITE_NURSE - dw NurseSprite - db $c0 ; byte count - db BANK(NurseSprite) - - ; SPRITE_CABLE_CLUB_WOMAN - dw CableClubWomanSprite - db $c0 ; byte count - db BANK(CableClubWomanSprite) - - ; SPRITE_MR_MASTERBALL - dw MrMasterballSprite - db $c0 ; byte count - db BANK(MrMasterballSprite) - - ; SPRITE_LAPRAS_GIVER - dw LaprasGiverSprite - db $c0 ; byte count - db BANK(LaprasGiverSprite) - - ; SPRITE_WARDEN - dw WardenSprite - db $c0 ; byte count - db BANK(WardenSprite) - - ; SPRITE_SS_CAPTAIN - dw SsCaptainSprite - db $c0 ; byte count - db BANK(SsCaptainSprite) - - ; SPRITE_FISHER2 - dw Fisher2Sprite - db $c0 ; byte count - db BANK(Fisher2Sprite) - - ; SPRITE_BLACKBELT - dw BlackbeltSprite - db $c0 ; byte count - db BANK(BlackbeltSprite) - - ; SPRITE_GUARD - dw GuardSprite - db $c0 ; byte count - db BANK(GuardSprite) - - ; $32 - dw GuardSprite - db $c0 ; byte count - db BANK(GuardSprite) - - ; SPRITE_MOM - dw MomSprite - db $c0 ; byte count - db BANK(MomSprite) - - ; SPRITE_BALDING_GUY - dw BaldingGuySprite - db $c0 ; byte count - db BANK(BaldingGuySprite) - - ; SPRITE_YOUNG_BOY - dw YoungBoySprite - db $c0 ; byte count - db BANK(YoungBoySprite) - - ; SPRITE_GAMEBOY_KID - dw GameboyKidSprite - db $c0 ; byte count - db BANK(GameboyKidSprite) - - ; SPRITE_GAMEBOY_KID_COPY - dw GameboyKidSprite - db $c0 ; byte count - db BANK(GameboyKidSprite) - - ; SPRITE_CLEFAIRY - dw ClefairySprite - db $c0 ; byte count - db BANK(ClefairySprite) - - ; SPRITE_AGATHA - dw AgathaSprite - db $c0 ; byte count - db BANK(AgathaSprite) - - ; SPRITE_BRUNO - dw BrunoSprite - db $c0 ; byte count - db BANK(BrunoSprite) - - ; SPRITE_LORELEI - dw LoreleiSprite - db $c0 ; byte count - db BANK(LoreleiSprite) - - ; SPRITE_SEEL - dw SeelSprite - db $c0 ; byte count - db BANK(SeelSprite) - - ; SPRITE_BALL - dw BallSprite - db $40 ; byte count - db BANK(BallSprite) - - ; SPRITE_OMANYTE - dw OmanyteSprite - db $40 ; byte count - db BANK(OmanyteSprite) - - ; SPRITE_BOULDER - dw BoulderSprite - db $40 ; byte count - db BANK(BoulderSprite) - - ; SPRITE_PAPER_SHEET - dw PaperSheetSprite - db $40 ; byte count - db BANK(PaperSheetSprite) - - ; SPRITE_BOOK_MAP_DEX - dw BookMapDexSprite - db $40 ; byte count - db BANK(BookMapDexSprite) - - ; SPRITE_CLIPBOARD - dw ClipboardSprite - db $40 ; byte count - db BANK(ClipboardSprite) - - ; SPRITE_SNORLAX - dw SnorlaxSprite - db $40 ; byte count - db BANK(SnorlaxSprite) - - ; SPRITE_OLD_AMBER_COPY - dw OldAmberSprite - db $40 ; byte count - db BANK(OldAmberSprite) - - ; SPRITE_OLD_AMBER - dw OldAmberSprite - db $40 ; byte count - db BANK(OldAmberSprite) - - ; SPRITE_LYING_OLD_MAN_UNUSED_1 - dw LyingOldManSprite - db $40 ; byte count - db BANK(LyingOldManSprite) - - ; SPRITE_LYING_OLD_MAN_UNUSED_2 - dw LyingOldManSprite - db $40 ; byte count - db BANK(LyingOldManSprite) - - ; SPRITE_LYING_OLD_MAN - dw LyingOldManSprite - db $40 ; byte count - db BANK(LyingOldManSprite) diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm new file mode 100644 index 00000000..eb583d53 --- /dev/null +++ b/data/sprites/facings.asm @@ -0,0 +1,59 @@ +SpriteFacingAndAnimationTable: +; This table is used for overworld sprites $1-$9. + dw .StandingDown, .NormalOAM ; facing down, walk animation frame 0 + dw .WalkingDown, .NormalOAM ; facing down, walk animation frame 1 + dw .StandingDown, .NormalOAM ; facing down, walk animation frame 2 + dw .WalkingDown, .FlippedOAM ; facing down, walk animation frame 3 + dw .StandingUp, .NormalOAM ; facing up, walk animation frame 0 + dw .WalkingUp, .NormalOAM ; facing up, walk animation frame 1 + dw .StandingUp, .NormalOAM ; facing up, walk animation frame 2 + dw .WalkingUp, .FlippedOAM ; facing up, walk animation frame 3 + dw .StandingLeft, .NormalOAM ; facing left, walk animation frame 0 + dw .WalkingLeft, .NormalOAM ; facing left, walk animation frame 1 + dw .StandingLeft, .NormalOAM ; facing left, walk animation frame 2 + dw .WalkingLeft, .NormalOAM ; facing left, walk animation frame 3 + dw .StandingLeft, .FlippedOAM ; facing right, walk animation frame 0 + dw .WalkingLeft, .FlippedOAM ; facing right, walk animation frame 1 + dw .StandingLeft, .FlippedOAM ; facing right, walk animation frame 2 + dw .WalkingLeft, .FlippedOAM ; facing right, walk animation frame 3 +; The rest of this table is used for sprites $a and $b. +; All orientation and animation parameters lead to the same result. +; Used for immobile sprites like items on the ground. + dw .StandingDown, .NormalOAM ; facing down, walk animation frame 0 + dw .StandingDown, .NormalOAM ; facing down, walk animation frame 1 + dw .StandingDown, .NormalOAM ; facing down, walk animation frame 2 + dw .StandingDown, .NormalOAM ; facing down, walk animation frame 3 + dw .StandingDown, .NormalOAM ; facing up, walk animation frame 0 + dw .StandingDown, .NormalOAM ; facing up, walk animation frame 1 + dw .StandingDown, .NormalOAM ; facing up, walk animation frame 2 + dw .StandingDown, .NormalOAM ; facing up, walk animation frame 3 + dw .StandingDown, .NormalOAM ; facing left, walk animation frame 0 + dw .StandingDown, .NormalOAM ; facing left, walk animation frame 1 + dw .StandingDown, .NormalOAM ; facing left, walk animation frame 2 + dw .StandingDown, .NormalOAM ; facing left, walk animation frame 3 + dw .StandingDown, .NormalOAM ; facing right, walk animation frame 0 + dw .StandingDown, .NormalOAM ; facing right, walk animation frame 1 + dw .StandingDown, .NormalOAM ; facing right, walk animation frame 2 + dw .StandingDown, .NormalOAM ; facing right, walk animation frame 3 + +; four tile ids compose an overworld sprite +.StandingDown: db $00, $01, $02, $03 +.WalkingDown: db $80, $81, $82, $83 +.StandingUp: db $04, $05, $06, $07 +.WalkingUp: db $84, $85, $86, $87 +.StandingLeft: db $08, $09, $0a, $0b +.WalkingLeft: db $88, $89, $8a, $8b + +.NormalOAM: + ; y, x, attributes + db 0, 0, $00 ; top left + db 0, 8, $00 ; top right + db 8, 0, OAMFLAG_CANBEMASKED ; bottom left + db 8, 8, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right + +.FlippedOAM: + ; y, x, attributes + db 0, 8, OAM_HFLIP ; top left + db 0, 0, OAM_HFLIP ; top right + db 8, 8, OAM_HFLIP | OAMFLAG_CANBEMASKED ; bottom left + db 8, 0, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm new file mode 100644 index 00000000..6b4f2ba0 --- /dev/null +++ b/data/sprites/sprites.asm @@ -0,0 +1,80 @@ +overworld_sprite: MACRO + dw \1 + db \2 tiles + db BANK(\1) +ENDM + +SpriteSheetPointerTable: + ; graphics, tile count + overworld_sprite RedSprite, 12 ; SPRITE_RED + overworld_sprite BlueSprite, 12 ; SPRITE_BLUE + overworld_sprite OakSprite, 12 ; SPRITE_OAK + overworld_sprite YoungsterSprite, 12 ; SPRITE_YOUNGSTER + overworld_sprite MonsterSprite, 12 ; SPRITE_MONSTER + overworld_sprite CooltrainerFSprite, 12 ; SPRITE_COOLTRAINER_F + overworld_sprite CooltrainerMSprite, 12 ; SPRITE_COOLTRAINER_M + overworld_sprite LittleGirlSprite, 12 ; SPRITE_LITTLE_GIRL + overworld_sprite BirdSprite, 12 ; SPRITE_BIRD + overworld_sprite MiddleAgedManSprite, 12 ; SPRITE_MIDDLE_AGED_MAN + overworld_sprite GamblerSprite, 12 ; SPRITE_GAMBLER + overworld_sprite SuperNerdSprite, 12 ; SPRITE_SUPER_NERD + overworld_sprite GirlSprite, 12 ; SPRITE_GIRL + overworld_sprite HikerSprite, 12 ; SPRITE_HIKER + overworld_sprite BeautySprite, 12 ; SPRITE_BEAUTY + overworld_sprite GentlemanSprite, 12 ; SPRITE_GENTLEMAN + overworld_sprite DaisySprite, 12 ; SPRITE_DAISY + overworld_sprite BikerSprite, 12 ; SPRITE_BIKER + overworld_sprite SailorSprite, 12 ; SPRITE_SAILOR + overworld_sprite CookSprite, 12 ; SPRITE_COOK + overworld_sprite BikeShopClerkSprite, 12 ; SPRITE_BIKE_SHOP_CLERK + overworld_sprite MrFujiSprite, 12 ; SPRITE_MR_FUJI + overworld_sprite GiovanniSprite, 12 ; SPRITE_GIOVANNI + overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET + overworld_sprite ChannelerSprite, 12 ; SPRITE_CHANNELER + overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER + overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA + overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN + overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL + overworld_sprite LanceSprite, 12 ; SPRITE_LANCE + overworld_sprite ScientistSprite, 12 ; SPRITE_UNUSED_SCIENTIST + overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST + overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER + overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER + overworld_sprite SafariZoneWorkerSprite, 12 ; SPRITE_SAFARI_ZONE_WORKER + overworld_sprite GymGuideSprite, 12 ; SPRITE_GYM_GUIDE + overworld_sprite GrampsSprite, 12 ; SPRITE_GRAMPS + overworld_sprite ClerkSprite, 12 ; SPRITE_CLERK + overworld_sprite FishingGuruSprite, 12 ; SPRITE_FISHING_GURU + overworld_sprite GrannySprite, 12 ; SPRITE_GRANNY + overworld_sprite NurseSprite, 12 ; SPRITE_NURSE + overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST + overworld_sprite SilphPresidentSprite, 12 ; SPRITE_SILPH_PRESIDENT + overworld_sprite SilphWorkerSprite, 12 ; SPRITE_SILPH_WORKER + overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN + overworld_sprite CaptainSprite, 12 ; SPRITE_CAPTAIN + overworld_sprite FisherSprite, 12 ; SPRITE_FISHER + overworld_sprite KogaSprite, 12 ; SPRITE_KOGA + overworld_sprite GuardSprite, 12 ; SPRITE_GUARD + overworld_sprite GuardSprite, 12 ; SPRITE_UNUSED_GUARD + overworld_sprite MomSprite, 12 ; SPRITE_MOM + overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY + overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY + overworld_sprite GameboyKidSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID + overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID + overworld_sprite FairySprite, 12 ; SPRITE_FAIRY + overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA + overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO + overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI + overworld_sprite SeelSprite, 12 ; SPRITE_SEEL + overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL + overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL + overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER + overworld_sprite PaperSprite, 4 ; SPRITE_PAPER + overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX + overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD + overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX + overworld_sprite OldAmberSprite, 4 ; SPRITE_UNUSED_OLD_AMBER + overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1 + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2 + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP diff --git a/data/super_palettes.asm b/data/super_palettes.asm deleted file mode 100755 index 97f1d8ec..00000000 --- a/data/super_palettes.asm +++ /dev/null @@ -1,174 +0,0 @@ -; palettes for overworlds, title screen, monsters -SuperPalettes: - RGB 31,29,31 ; PAL_ROUTE - RGB 21,28,11 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_PALLET - RGB 25,28,27 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_VIRIDIAN - RGB 17,26,3 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_PEWTER - RGB 23,25,16 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_CERULEAN - RGB 17,20,30 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_LAVENDER - RGB 27,20,27 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_VERMILION - RGB 30,18,0 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_CELADON - RGB 16,30,22 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_FUCHSIA - RGB 31,15,22 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_CINNABAR - RGB 26,10,6 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_INDIGO - RGB 22,14,24 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_SAFFRON - RGB 27,27,3 - RGB 20,26,31 - RGB 3,2,2 - RGB 31,29,31 ; PAL_TOWNMAP - RGB 20,26,31 - RGB 17,23,10 - RGB 3,2,2 -IF DEF(_RED) - RGB 31,29,31 ; PAL_LOGO1 - RGB 30,30,17 - RGB 17,23,10 - RGB 21,0,4 -ENDC -IF DEF(_BLUE) - RGB 31,29,31 ; PAL_LOGO1 - RGB 30,30,17 - RGB 21,0,4 - RGB 14,19,29 -ENDC - RGB 31,29,31 ; PAL_LOGO2 - RGB 30,30,17 - RGB 18,18,24 - RGB 7,7,16 - RGB 31,29,31 ; PAL_0F - RGB 24,20,30 - RGB 11,20,30 - RGB 3,2,2 - RGB 31,29,31 ; PAL_MEWMON - RGB 30,22,17 - RGB 16,14,19 - RGB 3,2,2 - RGB 31,29,31 ; PAL_BLUEMON - RGB 18,20,27 - RGB 11,15,23 - RGB 3,2,2 - RGB 31,29,31 ; PAL_REDMON - RGB 31,20,10 - RGB 26,10,6 - RGB 3,2,2 - RGB 31,29,31 ; PAL_CYANMON - RGB 21,25,29 - RGB 14,19,25 - RGB 3,2,2 - RGB 31,29,31 ; PAL_PURPLEMON - RGB 27,22,24 - RGB 21,15,23 - RGB 3,2,2 - RGB 31,29,31 ; PAL_BROWNMON - RGB 28,20,15 - RGB 21,14,9 - RGB 3,2,2 - RGB 31,29,31 ; PAL_GREENMON - RGB 20,26,16 - RGB 9,20,11 - RGB 3,2,2 - RGB 31,29,31 ; PAL_PINKMON - RGB 30,22,24 - RGB 28,15,21 - RGB 3,2,2 - RGB 31,29,31 ; PAL_YELLOWMON - RGB 31,28,14 - RGB 26,20,0 - RGB 3,2,2 - RGB 31,29,31 ; PAL_GREYMON - RGB 26,21,22 - RGB 15,15,18 - RGB 3,2,2 - RGB 31,29,31 ; PAL_SLOTS1 - RGB 26,21,22 - RGB 27,20,6 - RGB 3,2,2 - RGB 31,29,31 ; PAL_SLOTS2 - RGB 31,31,17 -IF DEF(_RED) - RGB 25,17,21 -ENDC -IF DEF(_BLUE) - RGB 16,19,29 -ENDC - RGB 3,2,2 - RGB 31,29,31 ; PAL_SLOTS3 - RGB 22,31,16 -IF DEF(_RED) - RGB 25,17,21 -ENDC -IF DEF(_BLUE) - RGB 16,19,29 -ENDC - RGB 3,2,2 - RGB 31,29,31 ; PAL_SLOTS4 -IF DEF(_RED) - RGB 16,19,29 - RGB 25,17,21 -ENDC -IF DEF(_BLUE) - RGB 25,17,21 - RGB 16,19,29 -ENDC - RGB 3,2,2 - RGB 31,29,31 ; PAL_BLACK - RGB 7,7,7 - RGB 2,3,3 - RGB 3,2,2 - RGB 31,29,31 ; PAL_GREENBAR - RGB 30,26,15 - RGB 9,20,11 - RGB 3,2,2 - RGB 31,29,31 ; PAL_YELLOWBAR - RGB 30,26,15 - RGB 26,20,0 - RGB 3,2,2 - RGB 31,29,31 ; PAL_REDBAR - RGB 30,26,15 - RGB 26,10,6 - RGB 3,2,2 - RGB 31,29,31 ; PAL_BADGE - RGB 30,22,17 - RGB 11,15,23 - RGB 3,2,2 - RGB 31,29,31 ; PAL_CAVE - RGB 21,14,9 - RGB 18,24,22 - RGB 3,2,2 - RGB 31,29,31 ; PAL_GAMEFREAK - RGB 31,28,14 - RGB 24,20,10 - RGB 3,2,2 diff --git a/data/super_rod.asm b/data/super_rod.asm deleted file mode 100755 index d3d64632..00000000 --- a/data/super_rod.asm +++ /dev/null @@ -1,100 +0,0 @@ -; super rod data -; format: map, pointer to fishing group -SuperRodData: - dbw PALLET_TOWN, FishingGroup1 - dbw VIRIDIAN_CITY, FishingGroup1 - dbw CERULEAN_CITY, FishingGroup3 - dbw VERMILION_CITY, FishingGroup4 - dbw CELADON_CITY, FishingGroup5 - dbw FUCHSIA_CITY, FishingGroup10 - dbw CINNABAR_ISLAND, FishingGroup8 - dbw ROUTE_4, FishingGroup3 - dbw ROUTE_6, FishingGroup4 - dbw ROUTE_10, FishingGroup5 - dbw ROUTE_11, FishingGroup4 - dbw ROUTE_12, FishingGroup7 - dbw ROUTE_13, FishingGroup7 - dbw ROUTE_17, FishingGroup7 - dbw ROUTE_18, FishingGroup7 - dbw ROUTE_19, FishingGroup8 - dbw ROUTE_20, FishingGroup8 - dbw ROUTE_21, FishingGroup8 - dbw ROUTE_22, FishingGroup2 - dbw ROUTE_23, FishingGroup9 - dbw ROUTE_24, FishingGroup3 - dbw ROUTE_25, FishingGroup3 - dbw CERULEAN_GYM, FishingGroup3 - dbw VERMILION_DOCK, FishingGroup4 - dbw SEAFOAM_ISLANDS_B3F, FishingGroup8 - dbw SEAFOAM_ISLANDS_B4F, FishingGroup8 - dbw SAFARI_ZONE_EAST, FishingGroup6 - dbw SAFARI_ZONE_NORTH, FishingGroup6 - dbw SAFARI_ZONE_WEST, FishingGroup6 - dbw SAFARI_ZONE_CENTER, FishingGroup6 - dbw CERULEAN_CAVE_2F, FishingGroup9 - dbw CERULEAN_CAVE_B1F, FishingGroup9 - dbw CERULEAN_CAVE_1F, FishingGroup9 - db $FF - -; fishing groups -; number of monsters, followed by level/monster pairs -FishingGroup1: - db 2 - db 15,TENTACOOL - db 15,POLIWAG - -FishingGroup2: - db 2 - db 15,GOLDEEN - db 15,POLIWAG - -FishingGroup3: - db 3 - db 15,PSYDUCK - db 15,GOLDEEN - db 15,KRABBY - -FishingGroup4: - db 2 - db 15,KRABBY - db 15,SHELLDER - -FishingGroup5: - db 2 - db 23,POLIWHIRL - db 15,SLOWPOKE - -FishingGroup6: - db 4 - db 15,DRATINI - db 15,KRABBY - db 15,PSYDUCK - db 15,SLOWPOKE - -FishingGroup7: - db 4 - db 5,TENTACOOL - db 15,KRABBY - db 15,GOLDEEN - db 15,MAGIKARP - -FishingGroup8: - db 4 - db 15,STARYU - db 15,HORSEA - db 15,SHELLDER - db 15,GOLDEEN - -FishingGroup9: - db 4 - db 23,SLOWBRO - db 23,SEAKING - db 23,KINGLER - db 23,SEADRA - -FishingGroup10: - db 4 - db 23,SEAKING - db 15,KRABBY - db 15,GOLDEEN - db 15,MAGIKARP diff --git a/data/text/alphabets.asm b/data/text/alphabets.asm new file mode 100644 index 00000000..07e6cf96 --- /dev/null +++ b/data/text/alphabets.asm @@ -0,0 +1,15 @@ +LowerCaseAlphabet: + db "abcdefghi" + db "jklmnopqr" + db "stuvwxyz " + db "×():;[]" + db "-?!♂♀/," + db "UPPER CASE@" + +UpperCaseAlphabet: + db "ABCDEFGHI" + db "JKLMNOPQR" + db "STUVWXYZ " + db "×():;[]" + db "-?!♂♀/," + db "lower case@" diff --git a/data/text/dakutens.asm b/data/text/dakutens.asm new file mode 100644 index 00000000..7a53c71f --- /dev/null +++ b/data/text/dakutens.asm @@ -0,0 +1,15 @@ +Dakutens: + db "かが", "きぎ", "くぐ", "けげ", "こご" + db "さざ", "しじ", "すず", "せぜ", "そぞ" + db "ただ", "ちぢ", "つづ", "てで", "とど" + db "はば", "ひび", "ふぶ", "へべ", "ほぼ" + db "カガ", "キギ", "クグ", "ケゲ", "コゴ" + db "サザ", "シジ", "スズ", "セゼ", "ソゾ" + db "タダ", "チヂ", "ツヅ", "テデ", "トド" + db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" + db -1 ; end + +Handakutens: + db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" + db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" + db -1 ; end diff --git a/data/text/text_1.asm b/data/text/text_1.asm new file mode 100644 index 00000000..af1d3827 --- /dev/null +++ b/data/text/text_1.asm @@ -0,0 +1,149 @@ +_CardKeySuccessText1:: + text "Bingo!@" + text_end + +_CardKeySuccessText2:: + text_start + line "The CARD KEY" + cont "opened the door!" + done + +_CardKeyFailText:: + text "Darn! It needs a" + line "CARD KEY!" + done + +_TrainerNameText:: + text_ram wcd6d + text ": @" + text_end + +_NoNibbleText:: + text "Not even a nibble!" + prompt + +_NothingHereText:: + text "Looks like there's" + line "nothing here." + prompt + +_ItsABiteText:: + text "Oh!" + line "It's a bite!" + prompt + +_ExclamationText:: + text "!" + done + +_GroundRoseText:: + text "Ground rose up" + line "somewhere!" + done + +_BoulderText:: + text "This requires" + line "STRENGTH to move!" + done + +_MartSignText:: + text "All your item" + line "needs fulfilled!" + cont "#MON MART" + done + +_PokeCenterSignText:: + text "Heal Your #MON!" + line "#MON CENTER" + done + +_FoundItemText:: + text " found" + line "@" + text_ram wcf4b + text "!@" + text_end + +_NoMoreRoomForItemText:: + text "No more room for" + line "items!" + done + +_OaksAideHiText:: + text "Hi! Remember me?" + line "I'm PROF.OAK's" + cont "AIDE!" + + para "If you caught @" + text_decimal hOaksAideRequirement, 1, 3 + text_start + line "kinds of #MON," + cont "I'm supposed to" + cont "give you an" + cont "@" + text_ram wOaksAideRewardItemName + text "!" + + para "So, ! Have" + line "you caught at" + cont "least @" + text_decimal hOaksAideRequirement, 1, 3 + text " kinds of" + cont "#MON?" + done + +_OaksAideUhOhText:: + text "Let's see..." + line "Uh-oh! You have" + cont "caught only @" + text_decimal hOaksAideNumMonsOwned, 1, 3 + text_start + cont "kinds of #MON!" + + para "You need @" + text_decimal hOaksAideRequirement, 1, 3 + text " kinds" + line "if you want the" + cont "@" + text_ram wOaksAideRewardItemName + text "." + done + +_OaksAideComeBackText:: + text "Oh. I see." + + para "When you get @" + text_decimal hOaksAideRequirement, 1, 3 + text_start + line "kinds, come back" + cont "for @" + text_ram wOaksAideRewardItemName + text "." + done + +_OaksAideHereYouGoText:: + text "Great! You have" + line "caught @" + text_decimal hOaksAideNumMonsOwned, 1, 3 + text " kinds " + cont "of #MON!" + cont "Congratulations!" + + para "Here you go!" + prompt + +_OaksAideGotItemText:: + text " got the" + line "@" + text_ram wOaksAideRewardItemName + text "!@" + text_end + +_OaksAideNoRoomText:: + text "Oh! I see you" + line "don't have any" + cont "room for the" + cont "@" + text_ram wOaksAideRewardItemName + text "." + done diff --git a/data/text/text_2.asm b/data/text/text_2.asm new file mode 100644 index 00000000..230a38f0 --- /dev/null +++ b/data/text/text_2.asm @@ -0,0 +1,1792 @@ +_AIBattleWithdrawText:: + text_ram wTrainerName + text " with-" + line "drew @" + text_ram wEnemyMonNick + text "!" + prompt + +_AIBattleUseItemText:: + text_ram wTrainerName + text_start + line "used @" + text_ram wcd6d + text_start + cont "on @" + text_ram wEnemyMonNick + text "!" + prompt + +_TradeWentToText:: + text_ram wcf4b + text " went" + line "to @" + text_ram wLinkEnemyTrainerName + text "." + done + +_TradeForText:: + text "For 's" + line "@" + text_ram wcf4b + text "," + done + +_TradeSendsText:: + text_ram wLinkEnemyTrainerName + text " sends" + line "@" + text_ram wcd6d + text "." + done + +_TradeWavesFarewellText:: + text_ram wLinkEnemyTrainerName + text " waves" + line "farewell as" + done + +_TradeTransferredText:: + text_ram wcd6d + text " is" + line "transferred." + done + +_TradeTakeCareText:: + text "Take good care of" + line "@" + text_ram wcd6d + text "." + done + +_TradeWillTradeText:: + text_ram wLinkEnemyTrainerName + text " will" + line "trade @" + text_ram wcd6d + text_start + done + +_TradeforText:: + text "for 's" + line "@" + text_ram wcf4b + text "." + done + +_PlaySlotMachineText:: + text "A slot machine!" + line "Want to play?" + done + +_OutOfCoinsSlotMachineText:: + text "Darn!" + line "Ran out of coins!" + done + +_BetHowManySlotMachineText:: + text "Bet how many" + line "coins?" + done + +_StartSlotMachineText:: + text "Start!" + done + +_NotEnoughCoinsSlotMachineText:: + text "Not enough" + line "coins!" + prompt + +_OneMoreGoSlotMachineText:: + text "One more " + line "go?" + done + +_LinedUpText:: + text " lined up!" + line "Scored @" + text_ram wcf4b + text " coins!" + done + +_NotThisTimeText:: + text "Not this time!" + prompt + +_YeahText:: + text "Yeah!@" + text_end + +_DexSeenOwnedText:: + text "#DEX Seen:@" + text_decimal wDexRatingNumMonsSeen, 1, 3 + text_start + line " Owned:@" + text_decimal wDexRatingNumMonsOwned, 1, 3 + text_end + +_DexRatingText:: + text "#DEX Rating" + done + +_GymStatueText1:: + text_ram wGymCityName + text_start + line "#MON GYM" + cont "LEADER: @" + text_ram wGymLeaderName + text_start + + para "WINNING TRAINERS:" + line "" + done + +_GymStatueText2:: + text_ram wGymCityName + text_start + line "#MON GYM" + cont "LEADER: @" + text_ram wGymLeaderName + text_start + + para "WINNING TRAINERS:" + line "" + cont "" + done + +_ViridianCityPokecenterGuyText:: + text "#MON CENTERs" + line "heal your tired," + cont "hurt or fainted" + cont "#MON!" + done + +_PewterCityPokecenterGuyText:: + text "Yawn!" + + para "When JIGGLYPUFF" + line "sings, #MON" + cont "get drowsy..." + + para "...Me too..." + line "Snore..." + done + +_CeruleanPokecenterGuyText:: + text "BILL has lots of" + line "#MON!" + + para "He collects rare" + line "ones too!" + done + +_LavenderPokecenterGuyText:: + text "CUBONEs wear" + line "skulls, right?" + + para "People will pay a" + line "lot for one!" + done + +_MtMoonPokecenterBenchGuyText:: + text "If you have too" + line "many #MON, you" + cont "should store them" + cont "via PC!" + done + +_RockTunnelPokecenterGuyText:: + text "I heard that" + line "GHOSTs haunt" + cont "LAVENDER TOWN!" + done + +_UnusedBenchGuyText1:: + text "I wish I could" + line "catch #MON." + done + +_UnusedBenchGuyText2:: + text "I'm tired from" + line "all the fun..." + done + +_UnusedBenchGuyText3:: + text "SILPH's manager" + line "is hiding in the" + cont "SAFARI ZONE." + done + +_VermilionPokecenterGuyText:: + text "It is true that a" + line "higher level" + cont "#MON will be" + cont "more powerful..." + + para "But, all #MON" + line "will have weak" + cont "points against" + cont "specific types." + + para "So, there is no" + line "universally" + cont "strong #MON." + done + +_CeladonCityPokecenterGuyText:: + text "If I had a BIKE," + line "I would go to" + cont "CYCLING ROAD!" + done + +_FuchsiaCityPokecenterGuyText:: + text "If you're studying " + line "#MON, visit" + cont "the SAFARI ZONE." + + para "It has all sorts" + line "of rare #MON." + done + +_CinnabarPokecenterGuyText:: + text "#MON can still" + line "learn techniques" + cont "after canceling" + cont "evolution." + + para "Evolution can wait" + line "until new moves" + cont "have been learned." + done + +_SaffronCityPokecenterGuyText1:: + text "It would be great" + line "if the ELITE FOUR" + cont "came and stomped" + cont "TEAM ROCKET!" + done + +_SaffronCityPokecenterGuyText2:: + text "TEAM ROCKET took" + line "off! We can go" + cont "out safely again!" + cont "That's great!" + done + +_CeladonCityHotelText:: + text "My sis brought me" + line "on this vacation!" + done + +_BookcaseText:: + text "Crammed full of" + line "#MON books!" + done + +_NewBicycleText:: + text "A shiny new" + line "BICYCLE!" + done + +_PushStartText:: + text "Push START to" + line "open the MENU!" + done + +_SaveOptionText:: + text "The SAVE option is" + line "on the MENU" + cont "screen." + done + +_StrengthsAndWeaknessesText:: + text "All #MON types" + line "have strong and" + cont "weak points" + cont "against others." + done + +_TimesUpText:: + text "PA: Ding-dong!" + + para "Time's up!" + prompt + +_GameOverText:: + text "PA: Your SAFARI" + line "GAME is over!" + done + +_CinnabarGymQuizIntroText:: + text "#MON Quiz!" + + para "Get it right and" + line "the door opens to" + cont "the next room!" + + para "Get it wrong and" + line "face a trainer!" + + para "If you want to" + line "conserve your" + cont "#MON for the" + cont "GYM LEADER..." + + para "Then get it right!" + line "Here we go!" + prompt + +_CinnabarQuizQuestionsText1:: + text "CATERPIE evolves" + line "into BUTTERFREE?" + done + +_CinnabarQuizQuestionsText2:: + text "There are 9" + line "certified #MON" + cont "LEAGUE BADGEs?" + done + +_CinnabarQuizQuestionsText3:: + text "POLIWAG evolves 3" + line "times?" + done + +_CinnabarQuizQuestionsText4:: + text "Are thunder moves" + line "effective against" + cont "ground element-" + cont "type #MON?" + done + +_CinnabarQuizQuestionsText5:: + text "#MON of the" + line "same kind and" + cont "level are not" + cont "identical?" + done + +_CinnabarQuizQuestionsText6:: + text "TM28 contains" + line "TOMBSTONER?" + done + +_CinnabarGymQuizCorrectText:: + text "You're absolutely" + line "correct!" + + para "Go on through!@" + text_end + +_CinnabarGymQuizIncorrectText:: + text "Sorry! Bad call!" + prompt + +_MagazinesText:: + text "#MON magazines!" + + para "#MON notebooks!" + + para "#MON graphs!" + done + +_BillsHouseMonitorText:: + text "TELEPORTER is" + line "displayed on the" + cont "PC monitor." + done + +_BillsHouseInitiatedText:: + text " initiated" + line "TELEPORTER's Cell" + cont "Separator!@" + text_end + +_BillsHousePokemonListText1:: + text "BILL's favorite" + line "#MON list!" + prompt + +_BillsHousePokemonListText2:: + text "Which #MON do" + line "you want to see?" + done + +_OakLabEmailText:: + text "There's an e-mail" + line "message here!" + + para "..." + + para "Calling all" + line "#MON trainers!" + + para "The elite trainers" + line "of #MON LEAGUE" + cont "are ready to take" + cont "on all comers!" + + para "Bring your best" + line "#MON and see" + cont "how you rate as a" + cont "trainer!" + + para "#MON LEAGUE HQ" + line "INDIGO PLATEAU" + + para "PS: PROF.OAK," + line "please visit us!" + cont "..." + done + +_GameCornerCoinCaseText:: + text "A COIN CASE is" + line "required!" + done + +_GameCornerNoCoinsText:: + text "You don't have" + line "any coins!" + done + +_GameCornerOutOfOrderText:: + text "OUT OF ORDER" + line "This is broken." + done + +_GameCornerOutToLunchText:: + text "OUT TO LUNCH" + line "This is reserved." + done + +_GameCornerSomeonesKeysText:: + text "Someone's keys!" + line "They'll be back." + done + +_JustAMomentText:: + text "Just a moment." + done + +TMNotebookText:: + text "It's a pamphlet" + line "on TMs." + + para "..." + + para "There are 50 TMs" + line "in all." + + para "There are also 5" + line "HMs that can be" + cont "used repeatedly." + + para "SILPH CO.@" + text_end + +_TurnPageText:: + text "Turn the page?" + done + +_ViridianSchoolNotebookText5:: + text "GIRL: Hey! Don't" + line "look at my notes!@" + text_end + +_ViridianSchoolNotebookText1:: + text "Looked at the" + line "notebook!" + + para "First page..." + + para "# BALLs are" + line "used to catch" + cont "#MON." + + para "Up to 6 #MON" + line "can be carried." + + para "People who raise" + line "and make #MON" + cont "fight are called" + cont "#MON trainers." + prompt + +_ViridianSchoolNotebookText2:: + text "Second page..." + + para "A healthy #MON" + line "may be hard to" + cont "catch, so weaken" + cont "it first!" + + para "Poison, burns and" + line "other damage are" + cont "effective!" + prompt + +_ViridianSchoolNotebookText3:: + text "Third page..." + + para "#MON trainers" + line "seek others to" + cont "engage in #MON" + cont "fights." + + para "Battles are" + line "constantly fought" + cont "at #MON GYMs." + prompt + +_ViridianSchoolNotebookText4:: + text "Fourth page..." + + para "The goal for" + line "#MON trainers" + cont "is to beat the " + cont "top 8 #MON" + cont "GYM LEADERs." + + para "Do so to earn the" + line "right to face..." + + para "The ELITE FOUR of" + line "#MON LEAGUE!" + prompt + +_EnemiesOnEverySideText:: + text "Enemies on every" + line "side!" + done + +_WhatGoesAroundComesAroundText:: + text "What goes around" + line "comes around!" + done + +_FightingDojoText:: + text "FIGHTING DOJO" + done + +_IndigoPlateauHQText:: + text "INDIGO PLATEAU" + line "#MON LEAGUE HQ" + done + +_RedBedroomSNESText:: + text " is" + line "playing the SNES!" + cont "...Okay!" + cont "It's time to go!" + done + +_Route15UpstairsBinocularsText:: + text "Looked into the" + line "binoculars..." + + para "A large, shining" + line "bird is flying" + cont "toward the sea." + done + +_AerodactylFossilText:: + text "AERODACTYL Fossil" + line "A primitive and" + cont "rare #MON." + done + +_KabutopsFossilText:: + text "KABUTOPS Fossil" + line "A primitive and" + cont "rare #MON." + done + +_LinkCableHelpText1:: + text "TRAINER TIPS" + + para "Using a Game Link" + line "Cable" + prompt + +_LinkCableHelpText2:: + text "Which heading do" + line "you want to read?" + done + +_LinkCableInfoText1:: + text "When you have" + line "linked your GAME" + cont "BOY with another" + cont "GAME BOY, talk to" + cont "the attendant on" + cont "the right in any" + cont "#MON CENTER." + prompt + +_LinkCableInfoText2:: + text "COLOSSEUM lets" + line "you play against" + cont "a friend." + prompt + +_LinkCableInfoText3:: + text "TRADE CENTER is" + line "used for trading" + cont "#MON." + prompt + +_ViridianSchoolBlackboardText1:: + text "The blackboard" + line "describes #MON" + cont "STATUS changes" + cont "during battles." + prompt + +_ViridianSchoolBlackboardText2:: + text "Which heading do" + line "you want to read?" + done + +_ViridianBlackboardSleepText:: + text "A #MON can't" + line "attack if it's" + cont "asleep!" + + para "#MON will stay" + line "asleep even after" + cont "battles." + + para "Use AWAKENING to" + line "wake them up!" + prompt + +_ViridianBlackboardPoisonText:: + text "When poisoned, a" + line "#MON's health" + cont "steadily drops." + + para "Poison lingers" + line "after battles." + + para "Use an ANTIDOTE" + line "to cure poison!" + prompt + +_ViridianBlackboardPrlzText:: + text "Paralysis could" + line "make #MON" + cont "moves misfire!" + + para "Paralysis remains" + line "after battles." + + para "Use PARLYZ HEAL" + line "for treatment!" + prompt + +_ViridianBlackboardBurnText:: + text "A burn reduces" + line "power and speed." + cont "It also causes" + cont "ongoing damage." + + para "Burns remain" + line "after battles." + + para "Use BURN HEAL to" + line "cure a burn!" + prompt + +_ViridianBlackboardFrozenText:: + text "If frozen, a" + line "#MON becomes" + cont "totally immobile!" + + para "It stays frozen" + line "even after the" + cont "battle ends." + + para "Use ICE HEAL to" + line "thaw out #MON!" + prompt + +_VermilionGymTrashText:: + text "Nope, there's" + line "only trash here." + done + +_VermilionGymTrashSuccessText1:: + text "Hey! There's a" + line "switch under the" + cont "trash!" + cont "Turn it on!" + + para "The 1st electric" + line "lock opened!@" + text_end + +_VermilionGymTrashSuccessText2:: + text "Hey! There's" + line "another switch" + cont "under the trash!" + cont "Turn it on!" + prompt + +_VermilionGymTrashSuccessText3:: + text "The 2nd electric" + line "lock opened!" + + para "The motorized door" + line "opened!@" + text_end + +_VermilionGymTrashFailText:: + text "Nope! There's" + line "only trash here." + cont "Hey! The electric" + cont "locks were reset!@" + text_end + +_FoundHiddenItemText:: + text " found" + line "@" + text_ram wcd6d + text "!@" + text_end + +_HiddenItemBagFullText:: + text "But, has" + line "no more room for" + cont "other items!" + done + +_FoundHiddenCoinsText:: + text " found" + line "@" + text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " coins!@" + text_end + +_FoundHiddenCoins2Text:: + text " found" + line "@" + text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " coins!@" + text_end + +_DroppedHiddenCoinsText:: + text_start + para "Oops! Dropped" + line "some coins!" + done + +_IndigoPlateauStatuesText1:: + text "INDIGO PLATEAU" + prompt + +_IndigoPlateauStatuesText2:: + text "The ultimate goal" + line "of trainers!" + cont "#MON LEAGUE HQ" + done + +_IndigoPlateauStatuesText3:: + text "The highest" + line "#MON authority" + cont "#MON LEAGUE HQ" + done + +_PokemonBooksText:: + text "Crammed full of" + line "#MON books!" + done + +_DiglettSculptureText:: + text "It's a sculpture" + line "of DIGLETT." + done + +_ElevatorText:: + text "This is an" + line "elevator." + done + +_TownMapText:: + text "A TOWN MAP.@" + text_end + +_PokemonStuffText:: + text "Wow! Tons of" + line "#MON stuff!" + done + +_OutOfSafariBallsText:: + text "PA: Ding-dong!" + + para "You are out of" + line "SAFARI BALLs!" + prompt + +_WildRanText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "ran!" + prompt + +_EnemyRanText:: + text "Enemy @" + text_ram wEnemyMonNick + text_start + line "ran!" + prompt + +_HurtByPoisonText:: + text "'s" + line "hurt by poison!" + prompt + +_HurtByBurnText:: + text "'s" + line "hurt by the burn!" + prompt + +_HurtByLeechSeedText:: + text "LEECH SEED saps" + line "!" + prompt + +_EnemyMonFaintedText:: + text "Enemy @" + text_ram wEnemyMonNick + text_start + line "fainted!" + prompt + +_MoneyForWinningText:: + text " got ¥@" + text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text_start + line "for winning!" + prompt + +_TrainerDefeatedText:: + text " defeated" + line "@" + text_ram wTrainerName + text "!" + prompt + +_PlayerMonFaintedText:: + text_ram wBattleMonNick + text_start + line "fainted!" + prompt + +_UseNextMonText:: + text "Use next #MON?" + done + +_Rival1WinText:: + text ": Yeah! Am" + line "I great or what?" + prompt + +_PlayerBlackedOutText2:: + text " is out of" + line "useable #MON!" + + para " blacked" + line "out!" + prompt + +_LinkBattleLostText:: + text " lost to" + line "@" + text_ram wTrainerName + text "!" + prompt + +_TrainerAboutToUseText:: + text_ram wTrainerName + text " is" + line "about to use" + cont"@" + text_ram wEnemyMonNick + text "!" + + para "Will " + line "change #MON?" + done + +_TrainerSentOutText:: + text_ram wTrainerName + text " sent" + line "out @" + text_ram wEnemyMonNick + text "!" + done + +_NoWillText:: + text "There's no will" + line "to fight!" + prompt + +_CantEscapeText:: + text "Can't escape!" + prompt + +_NoRunningText:: + text "No! There's no" + line "running from a" + cont "trainer battle!" + prompt + +_GotAwayText:: + text "Got away safely!" + prompt + +_ItemsCantBeUsedHereText:: + text "Items can't be" + line "used here." + prompt + +_AlreadyOutText:: + text_ram wBattleMonNick + text " is" + line "already out!" + prompt + +_MoveNoPPText:: + text "No PP left for" + line "this move!" + prompt + +_MoveDisabledText:: + text "The move is" + line "disabled!" + prompt + +_NoMovesLeftText:: + text_ram wBattleMonNick + text " has no" + line "moves left!" + done + +_MultiHitText:: + text "Hit the enemy" + line "@" + text_decimal wPlayerNumHits, 1, 1 + text " times!" + prompt + +_ScaredText:: + text_ram wBattleMonNick + text " is too" + line "scared to move!" + prompt + +_GetOutText:: + text "GHOST: Get out..." + line "Get out..." + prompt + +_FastAsleepText:: + text "" + line "is fast asleep!" + prompt + +_WokeUpText:: + text "" + line "woke up!" + prompt + +_IsFrozenText:: + text "" + line "is frozen solid!" + prompt + +_FullyParalyzedText:: + text "'s" + line "fully paralyzed!" + prompt + +_FlinchedText:: + text "" + line "flinched!" + prompt + +_MustRechargeText:: + text "" + line "must recharge!" + prompt + +_DisabledNoMoreText:: + text "'s" + line "disabled no more!" + prompt + +_IsConfusedText:: + text "" + line "is confused!" + prompt + +_HurtItselfText:: + text "It hurt itself in" + line "its confusion!" + prompt + +_ConfusedNoMoreText:: + text "'s" + line "confused no more!" + prompt + +_SavingEnergyText:: + text "" + line "is saving energy!" + prompt + +_UnleashedEnergyText:: + text "" + line "unleashed energy!" + prompt + +_ThrashingAboutText:: + text "'s" + line "thrashing about!" + done + +_AttackContinuesText:: + text "'s" + line "attack continues!" + done + +_CantMoveText:: + text "" + line "can't move!" + prompt + +_MoveIsDisabledText:: + text "'s" + line "@" + text_ram wcd6d + text " is" + cont "disabled!" + prompt + +_MonName1Text:: + text "@" + text_end + +_Used1Text:: + text_start + line "used @" + text_end + +_Used2Text:: + text_start + line "used @" + text_end + +_InsteadText:: + text "instead," + cont "@" + text_end + +_CF4BText:: + text_ram wcf4b + text "@" + +_ExclamationPoint1Text:: + text "!" + done + +_ExclamationPoint2Text:: + text "!" + done + +_ExclamationPoint3Text:: + text "!" + done + +_ExclamationPoint4Text:: + text "!" + done + +_ExclamationPoint5Text:: + text "!" + done + +_AttackMissedText:: + text "'s" + line "attack missed!" + prompt + +_KeptGoingAndCrashedText:: + text "" + line "kept going and" + cont "crashed!" + prompt + +_UnaffectedText:: + text "'s" + line "unaffected!" + prompt + +_DoesntAffectMonText:: + text "It doesn't affect" + line "!" + prompt + +_CriticalHitText:: + text "Critical hit!" + prompt + +_OHKOText:: + text "One-hit KO!" + prompt + +_LoafingAroundText:: + text_ram wBattleMonNick + text " is" + line "loafing around." + prompt + +_BeganToNapText:: + text_ram wBattleMonNick + text " began" + line "to nap!" + prompt + +_WontObeyText:: + text_ram wBattleMonNick + text " won't" + line "obey!" + prompt + +_TurnedAwayText:: + text_ram wBattleMonNick + text " turned" + line "away!" + prompt + +_IgnoredOrdersText:: + text_ram wBattleMonNick + text_start + line "ignored orders!" + prompt + +_SubstituteTookDamageText:: + text "The SUBSTITUTE" + line "took damage for" + cont "!" + prompt + +_SubstituteBrokeText:: + text "'s" + line "SUBSTITUTE broke!" + prompt + +_BuildingRageText:: + text "'s" + line "RAGE is building!" + prompt + +_MirrorMoveFailedText:: + text "The MIRROR MOVE" + next "failed!" + prompt + +_HitXTimesText:: + text "Hit @" + text_decimal wEnemyNumHits, 1, 1 + text " times!" + prompt + +_GainedText:: + text_ram wcd6d + text " gained" + line "@" + text_end + +_WithExpAllText:: + text "with EXP.ALL," + cont "@" + text_end + +_BoostedText:: + text "a boosted" + cont "@" + text_end + +_ExpPointsText:: + text_decimal wExpAmountGained, 2, 4 + text " EXP. Points!" + prompt + +_GrewLevelText:: + text_ram wcd6d + text " grew" + line "to level @" + text_decimal wCurEnemyLVL, 1, 3 + text "!@" + text_end + +_WildMonAppearedText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "appeared!" + prompt + +_HookedMonAttackedText:: + text "The hooked" + line "@" + text_ram wEnemyMonNick + text_start + cont "attacked!" + prompt + +_EnemyAppearedText:: + text_ram wEnemyMonNick + text_start + line "appeared!" + prompt + +_TrainerWantsToFightText:: + text_ram wTrainerName + text " wants" + line "to fight!" + prompt + +_UnveiledGhostText:: + text "SILPH SCOPE" + line "unveiled the" + cont "GHOST's identity!" + prompt + +_GhostCantBeIDdText:: + text "Darn! The GHOST" + line "can't be ID'd!" + prompt + +_GoText:: + text "Go! @" + text_end + +_DoItText:: + text "Do it! @" + text_end + +_GetmText:: + text "Get'm! @" + text_end + +_EnemysWeakText:: + text "The enemy's weak!" + line "Get'm! @" + text_end + +_PlayerMon1Text:: + text_ram wBattleMonNick + text "!" + done + +_PlayerMon2Text:: + text_ram wBattleMonNick + text " @" + text_end + +_EnoughText:: + text "enough!@" + text_end + +_OKExclamationText:: + text "OK!@" + text_end + +_GoodText:: + text "good!@" + text_end + +_ComeBackText:: + text_start + line "Come back!" + done + +_SuperEffectiveText:: + text "It's super" + line "effective!" + prompt + +_NotVeryEffectiveText:: + text "It's not very" + line "effective..." + prompt + +_SafariZoneEatingText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "is eating!" + prompt + +_SafariZoneAngryText:: + text "Wild @" + text_ram wEnemyMonNick + text_start + line "is angry!" + prompt + +; money related +_PickUpPayDayMoneyText:: + text " picked up" + line "¥@" + text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text "!" + prompt + +_ClearSaveDataText:: + text "Clear all saved" + line "data?" + done + +_WhichFloorText:: + text "Which floor do" + line "you want? " + done + +_PartyMenuNormalText:: + text "Choose a #MON." + done + +_PartyMenuItemUseText:: + text "Use item on which" + line "#MON?" + done + +_PartyMenuBattleText:: + text "Bring out which" + line "#MON?" + done + +_PartyMenuUseTMText:: + text "Use TM on which" + line "#MON?" + done + +_PartyMenuSwapMonText:: + text "Move #MON" + line "where?" + done + +_PotionText:: + text_ram wcd6d + text_start + line "recovered by @" + text_decimal wHPBarHPDifference, 2, 3 + text "!" + done + +_AntidoteText:: + text_ram wcd6d + text " was" + line "cured of poison!" + done + +_ParlyzHealText:: + text_ram wcd6d + text "'s" + line "rid of paralysis!" + done + +_BurnHealText:: + text_ram wcd6d + text "'s" + line "burn was healed!" + done + +_IceHealText:: + text_ram wcd6d + text " was" + line "defrosted!" + done + +_AwakeningText:: + text_ram wcd6d + text_start + line "woke up!" + done + +_FullHealText:: + text_ram wcd6d + text "'s" + line "health returned!" + done + +_ReviveText:: + text_ram wcd6d + text_start + line "is revitalized!" + done + +_RareCandyText:: + text_ram wcd6d + text " grew" + line "to level @" + text_decimal wCurEnemyLVL, 1, 3 + text "!@" + text_end + +_TurnedOnPC1Text:: + text " turned on" + line "the PC." + prompt + +_AccessedBillsPCText:: + text "Accessed BILL's" + line "PC." + + para "Accessed #MON" + line "Storage System." + prompt + +_AccessedSomeonesPCText:: + text "Accessed someone's" + line "PC." + + para "Accessed #MON" + line "Storage System." + prompt + +_AccessedMyPCText:: + text "Accessed my PC." + + para "Accessed Item" + line "Storage System." + prompt + +_TurnedOnPC2Text:: + text " turned on" + line "the PC." + prompt + +_WhatDoYouWantText:: + text "What do you want" + line "to do?" + done + +_WhatToDepositText:: + text "What do you want" + line "to deposit?" + done + +_DepositHowManyText:: + text "How many?" + done + +_ItemWasStoredText:: + text_ram wcd6d + text " was" + line "stored via PC." + prompt + +_NothingToDepositText:: + text "You have nothing" + line "to deposit." + prompt + +_NoRoomToStoreText:: + text "No room left to" + line "store items." + prompt + +_WhatToWithdrawText:: + text "What do you want" + line "to withdraw?" + done + +_WithdrawHowManyText:: + text "How many?" + done + +_WithdrewItemText:: + text "Withdrew" + line "@" + text_ram wcd6d + text "." + prompt + +_NothingStoredText:: + text "There is nothing" + line "stored." + prompt + +_CantCarryMoreText:: + text "You can't carry" + line "any more items." + prompt + +_WhatToTossText:: + text "What do you want" + line "to toss away?" + done + +_TossHowManyText:: + text "How many?" + done + +_AccessedHoFPCText:: + text "Accessed #MON" + line "LEAGUE's site." + + para "Accessed the HALL" + line "OF FAME List." + prompt + +_SwitchOnText:: + text "Switch on!" + prompt + +_WhatText:: + text "What?" + done + +_DepositWhichMonText:: + text "Deposit which" + line "#MON?" + done + +_MonWasStoredText:: + text_ram wcf4b + text " was" + line "stored in Box @" + text_ram wBoxNumString + text "." + prompt + +_CantDepositLastMonText:: + text "You can't deposit" + line "the last #MON!" + prompt + +_BoxFullText:: + text "Oops! This Box is" + line "full of #MON." + prompt + +_MonIsTakenOutText:: + text_ram wcf4b + text " is" + line "taken out." + cont "Got @" + text_ram wcf4b + text "." + prompt + +_NoMonText:: + text "What? There are" + line "no #MON here!" + prompt + +_CantTakeMonText:: + text "You can't take" + line "any more #MON." + + para "Deposit #MON" + line "first." + prompt + +_ReleaseWhichMonText:: + text "Release which" + line "#MON?" + done + +_OnceReleasedText:: + text "Once released," + line "@" + text_ram wcf4b + text " is" + cont "gone forever. OK?" + done + +_MonWasReleasedText:: + text_ram wcf4b + text " was" + line "released outside." + cont "Bye @" + +_CF4BExclamationText:: + text_ram wcf4b + text "!" + prompt + +_RequireCoinCaseText:: + text "A COIN CASE is" + line "required!@" + text_end + +_ExchangeCoinsForPrizesText:: + text "We exchange your" + line "coins for prizes." + prompt + +_WhichPrizeText:: + text "Which prize do" + line "you want?" + done + +_HereYouGoText:: + text "Here you go!@" + text_end + +_SoYouWantPrizeText:: + text "So, you want" + line "@" + text_ram wcd6d + text "?" + done + +_SorryNeedMoreCoinsText:: + text "Sorry, you need" + line "more coins.@" + text_end + +_OopsYouDontHaveEnoughRoomText:: + text "Oops! You don't" + line "have enough room.@" + text_end + +_OhFineThenText:: + text "Oh, fine then.@" + text_end + +_GetDexRatedText:: + text "Want to get your" + line "#DEX rated?" + done + +_ClosedOaksPCText:: + text "Closed link to" + line "PROF.OAK's PC.@" + text_end + +_AccessedOaksPCText:: + text "Accessed PROF." + line "OAK's PC." + + para "Accessed #DEX" + line "Rating System." + prompt + +_WhereWouldYouLikeText:: + text "Where would you" + line "like to go?" + done + +_PleaseWaitText:: + text "OK, please wait" + line "just a moment." + done + +_LinkCanceledText:: + text "The link was" + line "canceled." + done + +_OakSpeechText1:: + text "Hello there!" + line "Welcome to the" + cont "world of #MON!" + + para "My name is OAK!" + line "People call me" + cont "the #MON PROF!" + prompt + +_OakSpeechText2A:: + text "This world is" + line "inhabited by" + cont "creatures called" + cont "#MON!@" + text_end + +_OakSpeechText2B:: + text_start + + para "For some people," + line "#MON are" + cont "pets. Others use" + cont "them for fights." + + para "Myself..." + + para "I study #MON" + line "as a profession." + prompt + +_IntroducePlayerText:: + text "First, what is" + line "your name?" + prompt + +_IntroduceRivalText:: + text "This is my grand-" + line "son. He's been" + cont "your rival since" + cont "you were a baby." + + para "...Erm, what is" + line "his name again?" + prompt + +_OakSpeechText3:: + text "!" + + para "Your very own" + line "#MON legend is" + cont "about to unfold!" + + para "A world of dreams" + line "and adventures" + cont "with #MON" + cont "awaits! Let's go!" + done + +_DoYouWantToNicknameText:: + text "Do you want to" + line "give a nickname" + cont "to @" + text_ram wcd6d + text "?" + done + +_YourNameIsText:: + text "Right! So your" + line "name is !" + prompt + +_HisNameIsText:: + text "That's right! I" + line "remember now! His" + cont "name is !" + prompt + +_WillBeTradedText:: + text_ram wNameOfPlayerMonToBeTraded + text " and" + line "@" + text_ram wcd6d + text " will" + cont "be traded." + done + +_TextIDErrorText:: + text_decimal hSpriteIndexOrTextID, 1, 2 + text " ERROR." + done + +_ContCharText:: + text "<_CONT>@" + text_end diff --git a/data/text/text_3.asm b/data/text/text_3.asm new file mode 100644 index 00000000..6407dce7 --- /dev/null +++ b/data/text/text_3.asm @@ -0,0 +1,330 @@ +_FileDataDestroyedText:: + text "The file data is" + line "destroyed!" + prompt + +_WouldYouLikeToSaveText:: + text "Would you like to" + line "SAVE the game?" + done + +_GameSavedText:: + text " saved" + line "the game!" + done + +_OlderFileWillBeErasedText:: + text "The older file" + line "will be erased to" + cont "save. Okay?" + done + +_WhenYouChangeBoxText:: + text "When you change a" + line "#MON BOX, data" + cont "will be saved." + + para "Is that okay?" + done + +_ChooseABoxText:: + text "Choose a" + line " BOX.@" + text_end + +_EvolvedText:: + text_ram wcf4b + text " evolved" + done + +_IntoText:: + text_start + line "into @" + text_ram wcd6d + text "!" + done + +_StoppedEvolvingText:: + text "Huh? @" + text_ram wcf4b + text_start + line "stopped evolving!" + prompt + +_IsEvolvingText:: + text "What? @" + text_ram wcf4b + text_start + line "is evolving!" + done + +_FellAsleepText:: + text "" + line "fell asleep!" + prompt + +_AlreadyAsleepText:: + text "'s" + line "already asleep!" + prompt + +_PoisonedText:: + text "" + line "was poisoned!" + prompt + +_BadlyPoisonedText:: + text "'s" + line "badly poisoned!" + prompt + +_BurnedText:: + text "" + line "was burned!" + prompt + +_FrozenText:: + text "" + line "was frozen solid!" + prompt + +_FireDefrostedText:: + text "Fire defrosted" + line "!" + prompt + +_MonsStatsRoseText:: + text "'s" + line "@" + text_ram wcf4b + text "@" + text_end + +_GreatlyRoseText:: + text "greatly@" + text_end + +_RoseText:: + text " rose!" + prompt + +_MonsStatsFellText:: + text "'s" + line "@" + text_ram wcf4b + text "@" + text_end + +_GreatlyFellText:: + text "greatly@" + text_end + +_FellText:: + text " fell!" + prompt + +_RanFromBattleText:: + text "" + line "ran from battle!" + prompt + +_RanAwayScaredText:: + text "" + line "ran away scared!" + prompt + +_WasBlownAwayText:: + text "" + line "was blown away!" + prompt + +_ChargeMoveEffectText:: + text "@" + text_end + +_MadeWhirlwindText:: + text_start + line "made a whirlwind!" + prompt + +_TookInSunlightText:: + text_start + line "took in sunlight!" + prompt + +_LoweredItsHeadText:: + text_start + line "lowered its head!" + prompt + +_SkyAttackGlowingText:: + text_start + line "is glowing!" + prompt + +_FlewUpHighText:: + text_start + line "flew up high!" + prompt + +_DugAHoleText:: + text_start + line "dug a hole!" + prompt + +_BecameConfusedText:: + text "" + line "became confused!" + prompt + +_MimicLearnedMoveText:: + text "" + line "learned" + cont "@" + text_ram wcd6d + text "!" + prompt + +_MoveWasDisabledText:: + text "'s" + line "@" + text_ram wcd6d + text " was" + cont "disabled!" + prompt + +_NothingHappenedText:: + text "Nothing happened!" + prompt + +_NoEffectText:: + text "No effect!" + prompt + +_ButItFailedText:: + text "But, it failed! " + prompt + +_DidntAffectText:: + text "It didn't affect" + line "!" + prompt + +_IsUnaffectedText:: + text "" + line "is unaffected!" + prompt + +_ParalyzedMayNotAttackText:: + text "'s" + line "paralyzed! It may" + cont "not attack!" + prompt + +_SubstituteText:: + text "It created a" + line "SUBSTITUTE!" + prompt + +_HasSubstituteText:: + text "" + line "has a SUBSTITUTE!" + prompt + +_TooWeakSubstituteText:: + text "Too weak to make" + line "a SUBSTITUTE!" + prompt + +_CoinsScatteredText:: + text "Coins scattered" + line "everywhere!" + prompt + +_GettingPumpedText:: + text "'s" + line "getting pumped!" + prompt + +_WasSeededText:: + text "" + line "was seeded!" + prompt + +_EvadedAttackText:: + text "" + line "evaded attack!" + prompt + +_HitWithRecoilText:: + text "'s" + line "hit with recoil!" + prompt + +_ConvertedTypeText:: + text "Converted type to" + line "'s!" + prompt + +_StatusChangesEliminatedText:: + text "All STATUS changes" + line "are eliminated!" + prompt + +_StartedSleepingEffect:: + text "" + line "started sleeping!" + done + +_FellAsleepBecameHealthyText:: + text "" + line "fell asleep and" + cont "became healthy!" + done + +_RegainedHealthText:: + text "" + line "regained health!" + prompt + +_TransformedText:: + text "" + line "transformed into" + cont "@" + text_ram wcd6d + text "!" + prompt + +_LightScreenProtectedText:: + text "'s" + line "protected against" + cont "special attacks!" + prompt + +_ReflectGainedArmorText:: + text "" + line "gained armor!" + prompt + +_ShroudedInMistText:: + text "'s" + line "shrouded in mist!" + prompt + +_SuckedHealthText:: + text "Sucked health from" + line "!" + prompt + +_DreamWasEatenText:: + text "'s" + line "dream was eaten!" + prompt + +_TradeCenterText1:: + text "!" + done + +_ColosseumText1:: + text "!" + done diff --git a/data/text/text_4.asm b/data/text/text_4.asm new file mode 100644 index 00000000..4c01b5f4 --- /dev/null +++ b/data/text/text_4.asm @@ -0,0 +1,221 @@ +_PokemartGreetingText:: + text "Hi there!" + next "May I help you?" + done + +_PokemonFaintedText:: + text_ram wcd6d + text_start + line "fainted!" + done + +_PlayerBlackedOutText:: + text " is out of" + line "useable #MON!" + + para " blacked" + line "out!" + prompt + +_RepelWoreOffText:: + text "REPEL's effect" + line "wore off." + done + +_PokemartBuyingGreetingText:: + text "Take your time." + done + +_PokemartTellBuyPriceText:: + text_ram wcf4b + text "?" + line "That will be" + cont "¥@" + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text ". OK?" + done + +_PokemartBoughtItemText:: + text "Here you are!" + line "Thank you!" + prompt + +_PokemartNotEnoughMoneyText:: + text "You don't have" + line "enough money." + prompt + +_PokemartItemBagFullText:: + text "You can't carry" + line "any more items." + prompt + +_PokemonSellingGreetingText:: + text "What would you" + line "like to sell?" + done + +_PokemartTellSellPriceText:: + text "I can pay you" + line "¥@" + text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN + text " for that." + done + +_PokemartItemBagEmptyText:: + text "You don't have" + line "anything to sell." + prompt + +_PokemartUnsellableItemText:: + text "I can't put a" + line "price on that." + prompt + +_PokemartThankYouText:: + text "Thank you!" + done + +_PokemartAnythingElseText:: + text "Is there anything" + line "else I can do?" + done + +_LearnedMove1Text:: + text_ram wLearnMoveMonName + text " learned" + line "@" + text_ram wcf4b + text "!@" + text_end + +_WhichMoveToForgetText:: + text "Which move should" + next "be forgotten?" + done + +_AbandonLearningText:: + text "Abandon learning" + line "@" + text_ram wcf4b + text "?" + done + +_DidNotLearnText:: + text_ram wLearnMoveMonName + text_start + line "did not learn" + cont "@" + text_ram wcf4b + text "!" + prompt + +_TryingToLearnText:: + text_ram wLearnMoveMonName + text " is" + line "trying to learn" + cont "@" + text_ram wcf4b + text "!" + + para "But, @" + text_ram wLearnMoveMonName + text_start + line "can't learn more" + cont "than 4 moves!" + + para "Delete an older" + line "move to make room" + cont "for @" + text_ram wcf4b + text "?" + done + +_OneTwoAndText:: + text "1, 2 and...@" + text_end + +_PoofText:: + text " Poof!@" + text_end + +_ForgotAndText:: + text_start + para "@" + text_ram wLearnMoveMonName + text " forgot" + line "@" + text_ram wcd6d + text "!" + + para "And..." + prompt + +_HMCantDeleteText:: + text "HM techniques" + line "can't be deleted!" + prompt + +_PokemonCenterWelcomeText:: + text "Welcome to our" + line "#MON CENTER!" + + para "We heal your" + line "#MON back to" + cont "perfect health!" + prompt + +_ShallWeHealYourPokemonText:: + text "Shall we heal your" + line "#MON?" + done + +_NeedYourPokemonText:: + text "OK. We'll need" + line "your #MON." + done + +_PokemonFightingFitText:: + text "Thank you!" + line "Your #MON are" + cont "fighting fit!" + prompt + +_PokemonCenterFarewellText:: + text "We hope to see" + line "you again!" + done + +_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: + text "This area is" + line "reserved for 2" + cont "friends who are" + cont "linked by cable." + done + +_CableClubNPCWelcomeText:: + text "Welcome to the" + line "Cable Club!" + done + +_CableClubNPCPleaseApplyHereHaveToSaveText:: + text "Please apply here." + + para "Before opening" + line "the link, we have" + cont "to save the game." + done + +_CableClubNPCPleaseWaitText:: + text "Please wait.@" + text_end + +_CableClubNPCLinkClosedBecauseOfInactivityText:: + text "The link has been" + line "closed because of" + cont "inactivity." + + para "Please contact" + line "your friend and" + cont "come again!" + done diff --git a/data/text/text_5.asm b/data/text/text_5.asm new file mode 100644 index 00000000..ae7151cc --- /dev/null +++ b/data/text/text_5.asm @@ -0,0 +1,104 @@ +_CableClubNPCPleaseComeAgainText:: + text "Please come again!" + done + +_CableClubNPCMakingPreparationsText:: + text "We're making" + line "preparations." + cont "Please wait." + done + +_UsedStrengthText:: + text_ram wcd6d + text " used" + line "STRENGTH.@" + text_end + +_CanMoveBouldersText:: + text_ram wcd6d + text " can" + line "move boulders." + prompt + +_CurrentTooFastText:: + text "The current is" + line "much too fast!" + prompt + +_CyclingIsFunText:: + text "Cycling is fun!" + line "Forget SURFing!" + prompt + +_FlashLightsAreaText:: + text "A blinding FLASH" + line "lights the area!" + prompt + +_WarpToLastPokemonCenterText:: + text "Warp to the last" + line "#MON CENTER." + done + +_CannotUseTeleportNowText:: + text_ram wcd6d + text " can't" + line "use TELEPORT now." + prompt + +_CannotFlyHereText:: + text_ram wcd6d + text " can't" + line "FLY here." + prompt + +_NotHealthyEnoughText:: + text "Not healthy" + line "enough." + prompt + +_NewBadgeRequiredText:: + text "No! A new BADGE" + line "is required." + prompt + +_CannotUseItemsHereText:: + text "You can't use items" + line "here." + prompt + +_CannotGetOffHereText:: + text "You can't get off" + line "here." + prompt + +_GotMonText:: + text " got" + line "@" + text_ram wcd6d + text "!@" + text_end + +_SentToBoxText:: + text "There's no more" + line "room for #MON!" + cont "@" + text_ram wBoxMonNicks + text " was" + cont "sent to #MON" + cont "BOX @" + text_ram wcf4b + text " on PC!" + done + +_BoxIsFullText:: + text "There's no more" + line "room for #MON!" + + para "The #MON BOX" + line "is full and can't" + cont "accept any more!" + + para "Change the BOX at" + line "a #MON CENTER!" + done diff --git a/data/text/text_6.asm b/data/text/text_6.asm new file mode 100644 index 00000000..39eb22ea --- /dev/null +++ b/data/text/text_6.asm @@ -0,0 +1,231 @@ +_ItemUseBallText00:: + text "It dodged the" + line "thrown BALL!" + + para "This #MON" + line "can't be caught!" + prompt + +_ItemUseBallText01:: + text "You missed the" + line "#MON!" + prompt + +_ItemUseBallText02:: + text "Darn! The #MON" + line "broke free!" + prompt + +_ItemUseBallText03:: + text "Aww! It appeared" + line "to be caught! " + prompt + +_ItemUseBallText04:: + text "Shoot! It was so" + line "close too!" + prompt + +_ItemUseBallText05:: + text "All right!" + line "@" + text_ram wEnemyMonNick + text " was" + cont "caught!@" + text_end + +_ItemUseBallText07:: + text_ram wBoxMonNicks + text " was" + line "transferred to" + cont "BILL's PC!" + prompt + +_ItemUseBallText08:: + text_ram wBoxMonNicks + text " was" + line "transferred to" + cont "someone's PC!" + prompt + +_ItemUseBallText06:: + text "New #DEX data" + line "will be added for" + cont "@" + text_ram wEnemyMonNick + text "!@" + text_end + +_SurfingGotOnText:: + text " got on" + line "@" + text_ram wcd6d + text "!" + prompt + +_SurfingNoPlaceToGetOffText:: + text "There's no place" + line "to get off!" + prompt + +_VitaminStatRoseText:: + text_ram wcd6d + text "'s" + line "@" + text_ram wcf4b + text " rose." + prompt + +_VitaminNoEffectText:: + text "It won't have any" + line "effect." + prompt + +_ThrewBaitText:: + text " threw" + line "some BAIT." + done + +_ThrewRockText:: + text " threw a" + line "ROCK." + done + +_PlayedFluteNoEffectText:: + text "Played the #" + line "FLUTE." + + para "Now, that's a" + line "catchy tune!" + prompt + +_FluteWokeUpText:: + text "All sleeping" + line "#MON woke up." + prompt + +_PlayedFluteHadEffectText:: + text " played the" + line "# FLUTE.@" + text_end + +_CoinCaseNumCoinsText:: + text "Coins" + line "@" + text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN + text " " + prompt + +_ItemfinderFoundItemText:: + text "Yes! ITEMFINDER" + line "indicates there's" + cont "an item nearby." + prompt + +_ItemfinderFoundNothingText:: + text "Nope! ITEMFINDER" + line "isn't responding." + prompt + +_RaisePPWhichTechniqueText:: + text "Raise PP of which" + line "technique?" + done + +_RestorePPWhichTechniqueText:: + text "Restore PP of" + line "which technique?" + done + +_PPMaxedOutText:: + text_ram wcf4b + text "'s PP" + line "is maxed out." + prompt + +_PPIncreasedText:: + text_ram wcf4b + text "'s PP" + line "increased." + prompt + +_PPRestoredText:: + text "PP was restored." + prompt + +_BootedUpTMText:: + text "Booted up a TM!" + prompt + +_BootedUpHMText:: + text "Booted up an HM!" + prompt + +_TeachMachineMoveText:: + text "It contained" + line "@" + text_ram wcf4b + text "!" + + para "Teach @" + text_ram wcf4b + text_start + line "to a #MON?" + done + +_MonCannotLearnMachineMoveText:: + text_ram wcd6d + text " is not" + line "compatible with" + cont "@" + text_ram wcf4b + text "." + + para "It can't learn" + line "@" + text_ram wcf4b + text "." + prompt + +_ItemUseNotTimeText:: + text "OAK: !" + line "This isn't the" + cont "time to use that! " + prompt + +_ItemUseNotYoursToUseText:: + text "This isn't yours" + line "to use!" + prompt + +_ItemUseNoEffectText:: + text "It won't have any" + line "effect." + prompt + +_ThrowBallAtTrainerMonText1:: + text "The trainer" + line "blocked the BALL!" + prompt + +_ThrowBallAtTrainerMonText2:: + text "Don't be a thief!" + prompt + +_NoCyclingAllowedHereText:: + text "No cycling" + next "allowed here." + prompt + +_NoSurfingHereText:: + text "No SURFing on" + line "@" + text_ram wcd6d + text " here!" + prompt + +_BoxFullCannotThrowBallText:: + text "The #MON BOX" + line "is full! Can't" + cont "use that item!" + prompt diff --git a/data/text/text_7.asm b/data/text/text_7.asm new file mode 100644 index 00000000..34f070bd --- /dev/null +++ b/data/text/text_7.asm @@ -0,0 +1,200 @@ +_ItemUseText001:: + text " used@" + text_end + +_ItemUseText002:: + text_ram wcf4b + text "!" + done + +_GotOnBicycleText1:: + text " got on the@" + text_end + +_GotOnBicycleText2:: + text_ram wcf4b + text "!" + prompt + +_GotOffBicycleText1:: + text " got off@" + text_end + +_GotOffBicycleText2:: + text "the @" + text_ram wcf4b + text "." + prompt + +_ThrewAwayItemText:: + text "Threw away" + line "@" + text_ram wcd6d + text "." + prompt + +_IsItOKToTossItemText:: + text "Is it OK to toss" + line "@" + text_ram wcf4b + text "?" + prompt + +_TooImportantToTossText:: + text "That's too impor-" + line "tant to toss!" + prompt + +_AlreadyKnowsText:: + text_ram wcd6d + text " knows" + line "@" + text_ram wcf4b + text "!" + prompt + +_ConnectCableText:: + text "Okay, connect the" + line "cable like so!" + prompt + +_TradedForText:: + text " traded" + line "@" + text_ram wInGameTradeGiveMonName + text " for" + cont "@" + text_ram wInGameTradeReceiveMonName + text "!@" + text_end + +_WannaTrade1Text:: + text "I'm looking for" + line "@" + text_ram wInGameTradeGiveMonName + text "! Wanna" + + para "trade one for" + line "@" + text_ram wInGameTradeReceiveMonName + text "? " + done + +_NoTrade1Text:: + text "Awww!" + line "Oh well..." + done + +_WrongMon1Text:: + text "What? That's not" + line "@" + text_ram wInGameTradeGiveMonName + text "!" + + para "If you get one," + line "come back here!" + done + +_Thanks1Text:: + text "Hey thanks!" + done + +_AfterTrade1Text:: + text "Isn't my old" + line "@" + text_ram wInGameTradeReceiveMonName + text " great?" + done + +_WannaTrade2Text:: + text "Hello there! Do" + line "you want to trade" + + para "your @" + text_ram wInGameTradeGiveMonName + text_start + line "for @" + text_ram wInGameTradeReceiveMonName + text "?" + done + +_NoTrade2Text:: + text "Well, if you" + line "don't want to..." + done + +_WrongMon2Text:: + text "Hmmm? This isn't" + line "@" + text_ram wInGameTradeGiveMonName + text "." + + para "Think of me when" + line "you get one." + done + +_Thanks2Text:: + text "Thanks!" + done + +_AfterTrade2Text:: + text "The @" + text_ram wInGameTradeGiveMonName + text " you" + line "traded to me" + + para "went and evolved!" + done + +_WannaTrade3Text:: + text "Hi! Do you have" + line "@" + text_ram wInGameTradeGiveMonName + text "?" + + para "Want to trade it" + line "for @" + text_ram wInGameTradeReceiveMonName + text "?" + done + +_NoTrade3Text:: + text "That's too bad." + done + +_WrongMon3Text:: + text "...This is no" + line "@" + text_ram wInGameTradeGiveMonName + text "." + + para "If you get one," + line "trade it with me!" + done + +_Thanks3Text:: + text "Thanks pal!" + done + +_AfterTrade3Text:: + text "How is my old" + line "@" + text_ram wInGameTradeReceiveMonName + text "?" + + para "My @" + text_ram wInGameTradeGiveMonName + text " is" + line "doing great!" + done + +_NothingToCutText:: + text "There isn't" + line "anything to CUT!" + prompt + +_UsedCutText:: + text_ram wcd6d + text " hacked" + line "away with CUT!" + prompt diff --git a/data/text/unused_names.asm b/data/text/unused_names.asm new file mode 100644 index 00000000..349a31cf --- /dev/null +++ b/data/text/unused_names.asm @@ -0,0 +1,22 @@ +UnusedBadgeNames:: + db "かみなりバッヂ@" ; THUNDER BADGE + db "かいがらバッヂ@" ; SHELL BADGE + db "おじぞうバッヂ@" ; JIZOU BADGE + db "はやぶさバッヂ@" ; FALCON BADGE + db "ひんやりバッヂ@" ; CHILL BADGE + db "なかよしバッヂ@" ; FRIENDSHIP BADGE + db "バラバッヂ@" ; ROSE BADGE + db "ひのたまバッヂ@" ; FIREBALL BADGE + db "ゴールドバッヂ@" ; GOLD BADGE + +UnusedRankingNames: + db "たまご@" ; EGG + db "ひよこ@" ; CHICK + db "ブロンズ@" ; BRONZE + db "シルバー@" ; SILVER + db "ゴールド@" ; GOLD + db "プチキャプテン@" ; PETIT CAPTAIN + db "キャプテン@" ; CAPTAIN + db "プチマスター@" ; PETIT MASTER + db "マスター@" ; MASTER + db "エクセレント" ; EXCELLENT diff --git a/data/text_boxes.asm b/data/text_boxes.asm new file mode 100644 index 00000000..34e6a414 --- /dev/null +++ b/data/text_boxes.asm @@ -0,0 +1,88 @@ +TextBoxFunctionTable: + ; text box ID, function address + dbw MONEY_BOX, DisplayMoneyBox + dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu + dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu + db -1 ; end + +TextBoxCoordTable: + ; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y + db MESSAGE_BOX, 0, 12, 19, 17 + db MENU_TEMPLATE_03, 0, 0, 19, 14 + db MENU_TEMPLATE_07, 0, 0, 11, 6 + db LIST_MENU_BOX, 4, 2, 19, 12 + db MENU_TEMPLATE_10, 7, 0, 19, 17 + db MON_SPRITE_POPUP, 6, 4, 14, 13 + db -1 ; end + +text_box_text: MACRO + db \1 ; text box ID + db \2, \3, \4, \5 ; text box coordinates + dw \6 ; text pointer + db \7, \8 ; text coordinates +ENDM + +TextBoxTextAndCoordTable: + ; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y, text pointer, text X, text Y + text_box_text JP_MOCHIMONO_MENU_TEMPLATE, 0, 0, 14, 17, JapaneseMochimonoText, 3, 0 + text_box_text USE_TOSS_MENU_TEMPLATE, 13, 10, 19, 14, UseTossText, 15, 11 + text_box_text JP_SAVE_MESSAGE_MENU_TEMPLATE, 0, 0, 7, 5, JapaneseSaveMessageText, 2, 2 + text_box_text JP_SPEED_OPTIONS_MENU_TEMPLATE, 0, 6, 5, 10, JapaneseSpeedOptionsText, 2, 7 + text_box_text BATTLE_MENU_TEMPLATE, 8, 12, 19, 17, BattleMenuText, 10, 14 + text_box_text SAFARI_BATTLE_MENU_TEMPLATE, 0, 12, 19, 17, SafariZoneBattleMenuText, 2, 14 + text_box_text SWITCH_STATS_CANCEL_MENU_TEMPLATE, 11, 11, 19, 17, SwitchStatsCancelText, 13, 12 + text_box_text BUY_SELL_QUIT_MENU_TEMPLATE, 0, 0, 10, 6, BuySellQuitText, 2, 1 + text_box_text MONEY_BOX_TEMPLATE, 11, 0, 19, 2, MoneyText, 13, 0 + text_box_text JP_AH_MENU_TEMPLATE, 7, 6, 11, 10, JapaneseAhText, 8, 8 + text_box_text JP_POKEDEX_MENU_TEMPLATE, 11, 8, 19, 17, JapanesePokedexMenu, 12, 10 + +BuySellQuitText: + db "BUY" + next "SELL" + next "QUIT@" + + db "@" ; unused + +UseTossText: + db "USE" + next "TOSS@" + +JapaneseSaveMessageText: + db "きろく" + next "メッセージ@" + +JapaneseSpeedOptionsText: + db "はやい" + next "おそい@" + +MoneyText: + db "MONEY@" + +JapaneseMochimonoText: + db "もちもの@" + +JapaneseMainMenuText: + db "つづきから" + next "さいしょから@" + +BattleMenuText: + db "FIGHT " + next "ITEM RUN@" + +SafariZoneBattleMenuText: + db "BALL× BAIT" + next "THROW ROCK RUN@" + +SwitchStatsCancelText: + db "SWITCH" + next "STATS" + next "CANCEL@" + +JapaneseAhText: + db "アッ！@" + +JapanesePokedexMenu: + db "データをみる" + next "なきごえ" + next "ぶんぷをみる" + next "キャンセル@" diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm new file mode 100644 index 00000000..8c125fa0 --- /dev/null +++ b/data/text_predef_pointers.asm @@ -0,0 +1,72 @@ +add_tx_pre: MACRO +\1_id:: + dw \1 +ENDM + +TextPredefs:: + add_tx_pre CardKeySuccessText ; 01 + add_tx_pre CardKeyFailText ; 02 + add_tx_pre RedBedroomPCText ; 03 + add_tx_pre RedBedroomSNESText ; 04 + add_tx_pre PushStartText ; 05 + add_tx_pre SaveOptionText ; 06 + add_tx_pre StrengthsAndWeaknessesText ; 07 + add_tx_pre OakLabEmailText ; 08 + add_tx_pre AerodactylFossilText ; 09 + add_tx_pre Route15UpstairsBinocularsText ; 0A + add_tx_pre KabutopsFossilText ; 0B + add_tx_pre GymStatueText1 ; 0C + add_tx_pre GymStatueText2 ; 0D + add_tx_pre BookcaseText ; 0E + add_tx_pre ViridianCityPokecenterBenchGuyText ; 0F + add_tx_pre PewterCityPokecenterBenchGuyText ; 10 + add_tx_pre CeruleanCityPokecenterBenchGuyText ; 11 + add_tx_pre LavenderCityPokecenterBenchGuyText ; 12 + add_tx_pre VermilionCityPokecenterBenchGuyText ; 13 + add_tx_pre CeladonCityPokecenterBenchGuyText ; 14 + add_tx_pre CeladonCityHotelText ; 15 + add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 16 + add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17 + add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 + add_tx_pre MtMoonPokecenterBenchGuyText ; 19 + add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A + add_tx_pre UnusedBenchGuyText1 ; 1B XXX unused + add_tx_pre UnusedBenchGuyText2 ; 1C XXX unused + add_tx_pre UnusedBenchGuyText3 ; 1D XXX unused + add_tx_pre UnusedPredefText ; 1E XXX unused + add_tx_pre PokemonCenterPCText ; 1F + add_tx_pre ViridianSchoolNotebook ; 20 + add_tx_pre ViridianSchoolBlackboard ; 21 + add_tx_pre JustAMomentText ; 22 + add_tx_pre OpenBillsPCText ; 23 + add_tx_pre FoundHiddenItemText ; 24 + add_tx_pre HiddenItemBagFullText ; 25 XXX unused + add_tx_pre VermilionGymTrashText ; 26 + add_tx_pre IndigoPlateauHQText ; 27 + add_tx_pre GameCornerOutOfOrderText ; 28 + add_tx_pre GameCornerOutToLunchText ; 29 + add_tx_pre GameCornerSomeonesKeysText ; 2A + add_tx_pre FoundHiddenCoinsText ; 2B + add_tx_pre DroppedHiddenCoinsText ; 2C + add_tx_pre BillsHouseMonitorText ; 2D + add_tx_pre BillsHouseInitiatedText ; 2E + add_tx_pre BillsHousePokemonList ; 2F + add_tx_pre MagazinesText ; 30 + add_tx_pre CinnabarGymQuiz ; 31 + add_tx_pre GameCornerNoCoinsText ; 32 + add_tx_pre GameCornerCoinCaseText ; 33 + add_tx_pre LinkCableHelp ; 34 + add_tx_pre TMNotebook ; 35 + add_tx_pre FightingDojoText ; 36 + add_tx_pre EnemiesOnEverySideText ; 37 + add_tx_pre WhatGoesAroundComesAroundText ; 38 + add_tx_pre NewBicycleText ; 39 + add_tx_pre IndigoPlateauStatues ; 3A + add_tx_pre VermilionGymTrashSuccessText1 ; 3B + add_tx_pre VermilionGymTrashSuccessText2 ; 3C XXX unused + add_tx_pre VermilionGymTrashSuccessText3 ; 3D + add_tx_pre VermilionGymTrashFailText ; 3E + add_tx_pre TownMapText ; 3F + add_tx_pre BookOrSculptureText ; 40 + add_tx_pre ElevatorText ; 41 + add_tx_pre PokemonStuffText ; 42 diff --git a/data/tilemaps.asm b/data/tilemaps.asm new file mode 100644 index 00000000..97e687fd --- /dev/null +++ b/data/tilemaps.asm @@ -0,0 +1,46 @@ +tile_ids: MACRO + dw \1 + dn \3, \2 +ENDM + +TileIDListPointerTable: +; entries correspond to TILEMAP_* constants (see constants/gfx_constants.asm) + ; tilemap pointer, width, height + tile_ids MonTiles, 7, 7 + tile_ids SlideDownMonTiles_7x5, 7, 5 + tile_ids SlideDownMonTiles_7x3, 7, 3 + tile_ids GengarIntroTiles1, 7, 7 + tile_ids GengarIntroTiles2, 7, 7 + tile_ids GengarIntroTiles3, 7, 7 + tile_ids GameBoyTiles, 6, 8 + tile_ids LinkCableTiles, 12, 3 + +DownscaledMonTiles_5x5: + INCBIN "gfx/pokemon/downscaled_5x5.tilemap" + +DownscaledMonTiles_3x3: + INCBIN "gfx/pokemon/downscaled_3x3.tilemap" + +MonTiles: + INCBIN "gfx/pokemon/front.tilemap" + +SlideDownMonTiles_7x5: + INCBIN "gfx/pokemon/slide_down_7x5.tilemap" + +SlideDownMonTiles_7x3: + INCBIN "gfx/pokemon/slide_down_7x3.tilemap" + +GengarIntroTiles1: + INCBIN "gfx/intro/gengar_1.tilemap" + +GengarIntroTiles2: + INCBIN "gfx/intro/gengar_2.tilemap" + +GengarIntroTiles3: + INCBIN "gfx/intro/gengar_3.tilemap" + +GameBoyTiles: + INCBIN "gfx/trade/game_boy.tilemap" + +LinkCableTiles: + INCBIN "gfx/trade/link_cable.tilemap" diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm deleted file mode 100755 index d8e0d9b4..00000000 --- a/data/tileset_headers.asm +++ /dev/null @@ -1,25 +0,0 @@ -Tilesets: - tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR - tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR - tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE - tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR - tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR - tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR - tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR - tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR - tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR - tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE - tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE - tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR - tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE - tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR - tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR - tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR - tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE - tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE diff --git a/data/tilesets/bike_riding_tilesets.asm b/data/tilesets/bike_riding_tilesets.asm new file mode 100644 index 00000000..b78c7c8c --- /dev/null +++ b/data/tilesets/bike_riding_tilesets.asm @@ -0,0 +1,7 @@ +BikeRidingTilesets:: + db OVERWORLD + db FOREST + db UNDERGROUND + db SHIP_PORT + db CAVERN + db -1 ; end diff --git a/data/tilesets/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm new file mode 100644 index 00000000..55143d73 --- /dev/null +++ b/data/tilesets/bookshelf_tile_ids.asm @@ -0,0 +1,25 @@ +bookshelf_tile: MACRO + db \1, \2 + db_tx_pre \3 +ENDM + +BookshelfTileIDs: + ; tileset id, bookshelf tile id, text id + bookshelf_tile PLATEAU, $30, IndigoPlateauStatues + bookshelf_tile HOUSE, $3D, TownMapText + bookshelf_tile HOUSE, $1E, BookOrSculptureText + bookshelf_tile MANSION, $32, BookOrSculptureText + bookshelf_tile REDS_HOUSE_1, $32, BookOrSculptureText + bookshelf_tile LAB, $28, BookOrSculptureText + bookshelf_tile LOBBY, $16, ElevatorText + bookshelf_tile GYM, $1D, BookOrSculptureText + bookshelf_tile DOJO, $1D, BookOrSculptureText + bookshelf_tile GATE, $22, BookOrSculptureText + bookshelf_tile MART, $54, PokemonStuffText + bookshelf_tile MART, $55, PokemonStuffText + bookshelf_tile POKECENTER, $54, PokemonStuffText + bookshelf_tile POKECENTER, $55, PokemonStuffText + bookshelf_tile LOBBY, $50, PokemonStuffText + bookshelf_tile LOBBY, $52, PokemonStuffText + bookshelf_tile SHIP, $36, BookOrSculptureText + db -1 ; end diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm new file mode 100644 index 00000000..d348d5d5 --- /dev/null +++ b/data/tilesets/collision_tile_ids.asm @@ -0,0 +1,71 @@ +coll_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db -1 ; end +ENDM + +Underground_Coll:: + coll_tiles $0b, $0c, $13, $15, $18 + +Overworld_Coll:: + coll_tiles $00, $10, $1b, $20, $21, $23, $2c, $2d, $2e, $30, $31, $33, $39, $3c, $3e, $52, $54, $58, $5b + +RedsHouse1_Coll:: +RedsHouse2_Coll:: + coll_tiles $01, $02, $03, $11, $12, $13, $14, $1c, $1a + +Mart_Coll:: +Pokecenter_Coll:: + coll_tiles $11, $1a, $1c, $3c, $5e + +Dojo_Coll:: +Gym_Coll:: + coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03 + +Forest_Coll:: + coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f + +House_Coll:: + coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c + +ForestGate_Coll:: +Museum_Coll:: +Gate_Coll:: + coll_tiles $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e + +Ship_Coll:: + coll_tiles $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a + +ShipPort_Coll:: + coll_tiles $0a, $1a, $32, $3b + +Cemetery_Coll:: + coll_tiles $01, $10, $13, $1b, $22, $42, $52 + +Interior_Coll:: + coll_tiles $04, $0f, $15, $1f, $3b, $45, $47, $55, $56 + +Cavern_Coll:: + coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30 + + coll_tiles ; unused + +Lobby_Coll:: + coll_tiles $14, $17, $1a, $1c, $20, $38, $45 + +Mansion_Coll:: + coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 + +Lab_Coll:: + coll_tiles $0c, $26, $16, $1e, $34, $37 + +Club_Coll:: + coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41 + +Facility_Coll:: + coll_tiles $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e + +Plateau_Coll:: + coll_tiles $1b, $23, $2c, $2d, $3b, $45 diff --git a/data/tilesets/cut_tree_blocks.asm b/data/tilesets/cut_tree_blocks.asm new file mode 100644 index 00000000..ddbe28fc --- /dev/null +++ b/data/tilesets/cut_tree_blocks.asm @@ -0,0 +1,13 @@ +CutTreeBlockSwaps: + ; first byte = tileset block containing the cut tree + ; second byte = corresponding tileset block after the cut animation happens + db $32, $6D + db $33, $6C + db $34, $6F + db $35, $4C + db $60, $6E + db $0B, $0A + db $3C, $35 + db $3F, $35 + db $3D, $36 + db -1 ; end diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm new file mode 100644 index 00000000..c371e92b --- /dev/null +++ b/data/tilesets/door_tile_ids.asm @@ -0,0 +1,56 @@ +DoorTileIDPointers: + dbw OVERWORLD, .OverworldDoorTileIDs + dbw FOREST, .ForestDoorTileIDs + dbw MART, .MartDoorTileIDs + dbw HOUSE, .HouseDoorTileIDs + dbw FOREST_GATE, .TilesetMuseumDoorTileIDs + dbw MUSEUM, .TilesetMuseumDoorTileIDs + dbw GATE, .TilesetMuseumDoorTileIDs + dbw SHIP, .ShipDoorTileIDs + dbw LOBBY, .LobbyDoorTileIDs + dbw MANSION, .MansionDoorTileIDs + dbw LAB, .LabDoorTileIDs + dbw FACILITY, .FacilityDoorTileIDs + dbw PLATEAU, .PlateauDoorTileIDs + db -1 ; end + +door_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db 0 ; end +ENDM + +.OverworldDoorTileIDs: + door_tiles $1B, $58 + +.ForestDoorTileIDs: + door_tiles $3a + +.MartDoorTileIDs: + door_tiles $5e + +.HouseDoorTileIDs: + door_tiles $54 + +.TilesetMuseumDoorTileIDs: + door_tiles $3b + +.ShipDoorTileIDs: + door_tiles $1e + +.LobbyDoorTileIDs: + door_tiles $1c, $38, $1a + +.MansionDoorTileIDs: + door_tiles $1a, $1c, $53 + +.LabDoorTileIDs: + door_tiles $34 + +.FacilityDoorTileIDs: + door_tiles $43, $58, $1b + +.PlateauDoorTileIDs: + door_tiles $3b, $1b diff --git a/data/tilesets/dungeon_tilesets.asm b/data/tilesets/dungeon_tilesets.asm new file mode 100644 index 00000000..2af36696 --- /dev/null +++ b/data/tilesets/dungeon_tilesets.asm @@ -0,0 +1,13 @@ +DungeonTilesets: + db FOREST + db MUSEUM + db SHIP + db CAVERN + db LOBBY + db MANSION + db GATE + db LAB + db FACILITY + db CEMETERY + db GYM + db -1 ; end diff --git a/data/tilesets/escape_rope_tilesets.asm b/data/tilesets/escape_rope_tilesets.asm new file mode 100644 index 00000000..6a40089c --- /dev/null +++ b/data/tilesets/escape_rope_tilesets.asm @@ -0,0 +1,7 @@ +EscapeRopeTilesets: + db FOREST + db CEMETERY + db CAVERN + db FACILITY + db INTERIOR + db -1 ; end diff --git a/data/tilesets/ledge_tiles.asm b/data/tilesets/ledge_tiles.asm new file mode 100644 index 00000000..db293800 --- /dev/null +++ b/data/tilesets/ledge_tiles.asm @@ -0,0 +1,11 @@ +LedgeTiles: + ; player direction, tile player standing on, ledge tile, input required + db SPRITE_FACING_DOWN, $2C, $37, D_DOWN + db SPRITE_FACING_DOWN, $39, $36, D_DOWN + db SPRITE_FACING_DOWN, $39, $37, D_DOWN + db SPRITE_FACING_LEFT, $2C, $27, D_LEFT + db SPRITE_FACING_LEFT, $39, $27, D_LEFT + db SPRITE_FACING_RIGHT, $2C, $0D, D_RIGHT + db SPRITE_FACING_RIGHT, $2C, $1D, D_RIGHT + db SPRITE_FACING_RIGHT, $39, $0D, D_RIGHT + db -1 ; end diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm new file mode 100644 index 00000000..84869556 --- /dev/null +++ b/data/tilesets/pair_collision_tile_ids.asm @@ -0,0 +1,24 @@ +; FORMAT: tileset number, tile 1, tile 2 +; terminated by -1 +; these entries indicate that the player may not cross between tile 1 and tile 2 +; it's mainly used to simulate differences in elevation + +TilePairCollisionsLand:: + db CAVERN, $20, $05 + db CAVERN, $41, $05 + db FOREST, $30, $2E + db CAVERN, $2A, $05 + db CAVERN, $05, $21 + db FOREST, $52, $2E + db FOREST, $55, $2E + db FOREST, $56, $2E + db FOREST, $20, $2E + db FOREST, $5E, $2E + db FOREST, $5F, $2E + db -1 ; end + +TilePairCollisionsWater:: + db FOREST, $14, $2E + db FOREST, $48, $2E + db CAVERN, $14, $05 + db -1 ; end diff --git a/data/tilesets/spinner_tiles.asm b/data/tilesets/spinner_tiles.asm new file mode 100644 index 00000000..82506b6d --- /dev/null +++ b/data/tilesets/spinner_tiles.asm @@ -0,0 +1,29 @@ +spinner: MACRO +; \1: source +; \2: offset (BANK() chokes on literals) +; \3: dest + dw \1 tile \2 + db 1 + db BANK(\1) + dw vTileset tile \3 +ENDM + +FacilitySpinnerArrows: + spinner SpinnerArrowAnimTiles, 0, $20 + spinner SpinnerArrowAnimTiles, 1, $21 + spinner SpinnerArrowAnimTiles, 2, $30 + spinner SpinnerArrowAnimTiles, 3, $31 + spinner Facility_GFX, $20, $20 + spinner Facility_GFX, $21, $21 + spinner Facility_GFX, $30, $30 + spinner Facility_GFX, $31, $31 + +GymSpinnerArrows: + spinner SpinnerArrowAnimTiles, 1, $3c + spinner SpinnerArrowAnimTiles, 3, $3d + spinner SpinnerArrowAnimTiles, 0, $4c + spinner SpinnerArrowAnimTiles, 2, $4d + spinner Gym_GFX, $3c, $3c + spinner Gym_GFX, $3d, $3d + spinner Gym_GFX, $4c, $4c + spinner Gym_GFX, $4d, $4d diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm new file mode 100644 index 00000000..65fc4fa9 --- /dev/null +++ b/data/tilesets/tileset_headers.asm @@ -0,0 +1,34 @@ +tileset: MACRO + db BANK(\2) ; BANK(GFX) + dw \1, \2, \3 ; Block, GFX, Coll + db \4, \5, \6 ; counter tiles + db \7 ; grass tile + db \8 ; animations (TILEANIM_* value) +ENDM + +Tilesets: + ; block, gfx, coll, 3 counter tiles, grass tile, animations + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, TILEANIM_WATER_FLOWER + tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, TILEANIM_NONE + tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, TILEANIM_WATER + tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER + tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, TILEANIM_NONE + tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, TILEANIM_WATER_FLOWER + tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE + tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, TILEANIM_NONE + tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, TILEANIM_NONE + tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER + tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER + tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, TILEANIM_NONE + tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, TILEANIM_WATER + tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, TILEANIM_NONE + tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, TILEANIM_NONE + tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, TILEANIM_NONE + tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, TILEANIM_WATER + tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, TILEANIM_WATER diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm new file mode 100644 index 00000000..be327599 --- /dev/null +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -0,0 +1,25 @@ +WarpTileListPointers: + dw .FacingDownWarpTiles + dw .FacingUpWarpTiles + dw .FacingLeftWarpTiles + dw .FacingRightWarpTiles + +warp_carpet_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db -1 ; end +ENDM + +.FacingDownWarpTiles: + warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33 + +.FacingUpWarpTiles: + warp_carpet_tiles $01, $5C + +.FacingLeftWarpTiles: + warp_carpet_tiles $1A, $4B + +.FacingRightWarpTiles: + warp_carpet_tiles $0F, $4E diff --git a/data/tilesets/warp_pad_hole_tile_ids.asm b/data/tilesets/warp_pad_hole_tile_ids.asm new file mode 100644 index 00000000..e12b3735 --- /dev/null +++ b/data/tilesets/warp_pad_hole_tile_ids.asm @@ -0,0 +1,7 @@ +WarpPadAndHoleData: + ; tileset id, tile id, value for [wStandingOnWarpPadOrHole] + db FACILITY, $20, 1 ; warp pad + db FACILITY, $11, 2 ; hole + db CAVERN, $22, 2 ; hole + db INTERIOR, $55, 1 ; warp pad + db -1 ; end diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm new file mode 100644 index 00000000..db005dcf --- /dev/null +++ b/data/tilesets/warp_tile_ids.asm @@ -0,0 +1,93 @@ +WarpTileIDPointers: + dw .OverworldWarpTileIDs + dw .RedsHouse1WarpTileIDs + dw .MartWarpTileIDs + dw .ForestWarpTileIDs + dw .RedsHouse2WarpTileIDs + dw .DojoWarpTileIDs + dw .PokecenterWarpTileIDs + dw .GymWarpTileIDs + dw .HouseWarpTileIDs + dw .ForestGateWarpTileIDs + dw .MuseumWarpTileIDs + dw .UndergroundWarpTileIDs + dw .GateWarpTileIDs + dw .ShipWarpTileIDs + dw .ShipPortWarpTileIDs + dw .CemeteryWarpTileIDs + dw .InteriorWarpTileIDs + dw .CavernWarpTileIDs + dw .LobbyWarpTileIDs + dw .MansionWarpTileIDs + dw .LabWarpTileIDs + dw .ClubWarpTileIDs + dw .FacilityWarpTileIDs + dw .PlateauWarpTileIDs + +warp_tiles: MACRO +REPT _NARG + db \1 + shift +ENDR + db -1 ; end +ENDM + +.OverworldWarpTileIDs: + warp_tiles $1B, $58 + +.ForestGateWarpTileIDs: +.MuseumWarpTileIDs: +.GateWarpTileIDs: + db $3B + ; fallthrough +.RedsHouse1WarpTileIDs: +.RedsHouse2WarpTileIDs: + warp_tiles $1A, $1C + +.MartWarpTileIDs: +.PokecenterWarpTileIDs: + warp_tiles $5E + +.ForestWarpTileIDs: + warp_tiles $5A, $5C, $3A + +.DojoWarpTileIDs: +.GymWarpTileIDs: + warp_tiles $4A + +.HouseWarpTileIDs: + warp_tiles $54, $5C, $32 + +.ShipWarpTileIDs: + warp_tiles $37, $39, $1E, $4A + +.InteriorWarpTileIDs: + warp_tiles $15, $55, $04 + +.CavernWarpTileIDs: + warp_tiles $18, $1A, $22 + +.LobbyWarpTileIDs: + warp_tiles $1A, $1C, $38 + +.MansionWarpTileIDs: + warp_tiles $1A, $1C, $53 + +.LabWarpTileIDs: + warp_tiles $34 + +.FacilityWarpTileIDs: + db $43, $58, $20 + ; fallthrough +.CemeteryWarpTileIDs: + db $1B + ; fallthrough +.UndergroundWarpTileIDs: + warp_tiles $13 + +.PlateauWarpTileIDs: + db $1B, $3B + ; fallthrough +.ShipPortWarpTileIDs: +.ClubWarpTileIDs: + warp_tiles ; end diff --git a/data/tilesets/water_tilesets.asm b/data/tilesets/water_tilesets.asm new file mode 100644 index 00000000..8abdce39 --- /dev/null +++ b/data/tilesets/water_tilesets.asm @@ -0,0 +1,12 @@ +; tilesets with water +WaterTilesets: + db OVERWORLD + db FOREST + db DOJO + db GYM + db SHIP + db SHIP_PORT + db CAVERN + db FACILITY + db PLATEAU + db -1 ; end diff --git a/data/tm_prices.asm b/data/tm_prices.asm deleted file mode 100755 index ccc8be05..00000000 --- a/data/tm_prices.asm +++ /dev/null @@ -1,27 +0,0 @@ -TechnicalMachinePrices: -; In thousands (nybbles). - dn 3, 2 ; TM_01, TM_02 - dn 2, 1 ; TM_03, TM_04 - dn 3, 4 ; TM_05, TM_06 - dn 2, 4 ; TM_07, TM_08 - dn 3, 4 ; TM_09, TM_10 - dn 2, 1 ; TM_11, TM_12 - dn 4, 5 ; TM_13, TM_14 - dn 5, 5 ; TM_15, TM_16 - dn 3, 2 ; TM_17, TM_18 - dn 3, 2 ; TM_19, TM_20 - dn 5, 5 ; TM_21, TM_22 - dn 5, 2 ; TM_23, TM_24 - dn 5, 4 ; TM_25, TM_26 - dn 5, 2 ; TM_27, TM_28 - dn 4, 1 ; TM_29, TM_30 - dn 2, 1 ; TM_31, TM_32 - dn 1, 2 ; TM_33, TM_34 - dn 4, 2 ; TM_35, TM_36 - dn 2, 5 ; TM_37, TM_38 - dn 2, 4 ; TM_39, TM_40 - dn 2, 2 ; TM_41, TM_42 - dn 5, 2 ; TM_43, TM_44 - dn 2, 4 ; TM_45, TM_46 - dn 3, 4 ; TM_47, TM_48 - dn 4, 2 ; TM_49, TM_50 diff --git a/data/tms.asm b/data/tms.asm deleted file mode 100755 index 23c1685e..00000000 --- a/data/tms.asm +++ /dev/null @@ -1,56 +0,0 @@ -TechnicalMachines: - db MEGA_PUNCH - db RAZOR_WIND - db SWORDS_DANCE - db WHIRLWIND - db MEGA_KICK - db TOXIC - db HORN_DRILL - db BODY_SLAM - db TAKE_DOWN - db DOUBLE_EDGE - db BUBBLEBEAM - db WATER_GUN - db ICE_BEAM - db BLIZZARD - db HYPER_BEAM - db PAY_DAY - db SUBMISSION - db COUNTER - db SEISMIC_TOSS - db RAGE - db MEGA_DRAIN - db SOLARBEAM - db DRAGON_RAGE - db THUNDERBOLT - db THUNDER - db EARTHQUAKE - db FISSURE - db DIG - db PSYCHIC_M - db TELEPORT - db MIMIC - db DOUBLE_TEAM - db REFLECT - db BIDE - db METRONOME - db SELFDESTRUCT - db EGG_BOMB - db FIRE_BLAST - db SWIFT - db SKULL_BASH - db SOFTBOILED - db DREAM_EATER - db SKY_ATTACK - db REST - db THUNDER_WAVE - db PSYWAVE - db EXPLOSION - db ROCK_SLIDE - db TRI_ATTACK - db SUBSTITUTE - db CUT - db FLY - db SURF - db STRENGTH - db FLASH diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm deleted file mode 100755 index 63ebd51b..00000000 --- a/data/town_map_entries.asm +++ /dev/null @@ -1,101 +0,0 @@ -ExternalMapEntries: - EMAP $2,$B,PalletTownName - EMAP $2,$8,ViridianCityName - EMAP $2,$3,PewterCityName - EMAP $A,$2,CeruleanCityName - EMAP $E,$5,LavenderTownName - EMAP $A,$9,VermilionCityName - EMAP $7,$5,CeladonCityName - EMAP $8,$D,FuchsiaCityName - EMAP $2,$F,CinnabarIslandName - EMAP $0,$2,IndigoPlateauName - EMAP $A,$5,SaffronCityName - EMAP $0,$0,PalletTownName ; unused - EMAP $2,$A,Route1Name - EMAP $2,$6,Route2Name - EMAP $4,$3,Route3Name - EMAP $8,$2,Route4Name - EMAP $A,$3,Route5Name - EMAP $A,$8,Route6Name - EMAP $8,$5,Route7Name - EMAP $D,$5,Route8Name - EMAP $D,$2,Route9Name - EMAP $E,$4,Route10Name - EMAP $C,$9,Route11Name - EMAP $E,$9,Route12Name - EMAP $D,$B,Route13Name - EMAP $B,$C,Route14Name - EMAP $A,$D,Route15Name - EMAP $5,$5,Route16Name - EMAP $4,$8,Route17Name - EMAP $6,$D,Route18Name - EMAP $6,$F,Route19Name - EMAP $4,$F,Route20Name - EMAP $2,$D,Route21Name - EMAP $0,$8,Route22Name - EMAP $0,$6,Route23Name - EMAP $A,$1,Route24Name - EMAP $B,$0,Route25Name - -InternalMapEntries: - IMAP OAKS_LAB, $2,$B,PalletTownName - IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName - IMAP VIRIDIAN_FOREST_SOUTH_GATE, $2,$6,Route2Name - IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName - IMAP PEWTER_POKECENTER, $2,$3,PewterCityName - IMAP MT_MOON_B2F, $6,$2,MountMoonName - IMAP CERULEAN_MART, $A,$2,CeruleanCityName - IMAP MT_MOON_POKECENTER, $5,$2,Route4Name - IMAP CERULEAN_TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName - IMAP DAYCARE, $A,$4,Route5Name - IMAP UNDERGROUND_PATH_ROUTE_6_COPY, $A,$6,Route6Name - IMAP UNDERGROUND_PATH_ROUTE_7_COPY, $9,$5,Route7Name - IMAP UNDERGROUND_PATH_ROUTE_8, $B,$5,Route8Name - IMAP ROCK_TUNNEL_1F, $E,$3,RockTunnelName - IMAP POWER_PLANT, $F,$4,PowerPlantName - IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name - IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name - IMAP BILLS_HOUSE, $C,$0,SeaCottageName - IMAP VERMILION_DOCK, $A,$9,VermilionCityName - IMAP SS_ANNE_B1F_ROOMS, $9,$A,SSAnneName - IMAP VICTORY_ROAD_1F, $0,$4,VictoryRoadName - IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_NORTH_SOUTH, $A,$5,UndergroundPathName - IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName - IMAP UNDERGROUND_PATH_WEST_EAST, $A,$5,UndergroundPathName - IMAP CELADON_HOTEL, $7,$5,CeladonCityName - IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName - IMAP POKEMON_TOWER_7F, $F,$5,PokemonTowerName - IMAP LAVENDER_CUBONE_HOUSE, $E,$5,LavenderTownName - IMAP WARDENS_HOUSE, $8,$D,FuchsiaCityName - IMAP SAFARI_ZONE_GATE, $8,$C,SafariZoneName - IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName - IMAP SEAFOAM_ISLANDS_B4F, $5,$F,SeafoamIslandsName - IMAP VERMILION_OLD_ROD_HOUSE, $A,$9,VermilionCityName - IMAP FUCHSIA_GOOD_ROD_HOUSE, $8,$D,FuchsiaCityName - IMAP POKEMON_MANSION_1F, $2,$F,PokemonMansionName - IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName - IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName - IMAP MR_PSYCHICS_HOUSE, $A,$5,SaffronCityName - IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name - IMAP ROUTE_16_FLY_HOUSE, $4,$5,Route16Name - IMAP ROUTE_12_SUPER_ROD_HOUSE, $E,$A,Route12Name - IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name - IMAP SEAFOAM_ISLANDS_1F, $5,$F,SeafoamIslandsName - IMAP ROUTE_22_GATE, $0,$7,Route22Name - IMAP VICTORY_ROAD_2F, $0,$4,VictoryRoadName - IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name - IMAP VERMILION_TRADE_HOUSE, $A,$9,VermilionCityName - IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName - IMAP VICTORY_ROAD_3F, $0,$4,VictoryRoadName - IMAP UNUSED_MAP_CE, $7,$5,RocketHQName - IMAP SILPH_CO_8F, $A,$5,SilphCoName - IMAP POKEMON_MANSION_B1F, $2,$F,PokemonMansionName - IMAP SAFARI_ZONE_NORTH_REST_HOUSE, $8,$C,SafariZoneName - IMAP CERULEAN_CAVE_1F, $9,$1,CeruleanCaveName - IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_BADGE_HOUSE, $A,$2,CeruleanCityName - IMAP ROCK_TUNNEL_B1F, $E,$3,RockTunnelName - IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName - IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName - db $FF diff --git a/data/trades.asm b/data/trades.asm deleted file mode 100755 index cf0fcbfd..00000000 --- a/data/trades.asm +++ /dev/null @@ -1,12 +0,0 @@ -TradeMons: -; givemonster, getmonster, textstring, nickname (11 bytes), 14 bytes total - db NIDORINO, NIDORINA, 0,"TERRY@@@@@@" - db ABRA, MR_MIME, 0,"MARCEL@@@@@" - db BUTTERFREE,BEEDRILL, 2,"CHIKUCHIKU@" - db PONYTA, SEEL, 0,"SAILOR@@@@@" - db SPEAROW, FARFETCHD,2,"DUX@@@@@@@@" - db SLOWBRO, LICKITUNG,0,"MARC@@@@@@@" - db POLIWHIRL, JYNX, 1,"LOLA@@@@@@@" - db RAICHU, ELECTRODE,1,"DORIS@@@@@@" - db VENONAT, TANGELA, 2,"CRINKLES@@@" - db NIDORAN_M, NIDORAN_F,2,"SPOT@@@@@@@" diff --git a/data/trainer_moves.asm b/data/trainer_moves.asm deleted file mode 100755 index 2e7b52a5..00000000 --- a/data/trainer_moves.asm +++ /dev/null @@ -1,32 +0,0 @@ -LoneMoves: -; these are used for gym leaders. -; this is not automatic! you have to write the number you want to wLoneAttackNo -; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain, -; the fourth entry in the list. - -; first byte: pokemon in the trainer's party that gets the move -; second byte: move -; unterminated - db 1,BIDE - db 1,BUBBLEBEAM - db 2,THUNDERBOLT - db 2,MEGA_DRAIN - db 3,TOXIC - db 3,PSYWAVE - db 3,FIRE_BLAST - db 4,FISSURE - -TeamMoves: -; these are used for elite four. -; this is automatic, based on trainer class. -; don't be confused by LoneMoves above, the two data structures are - ; _completely_ unrelated. - -; first byte: trainer (all trainers in this class have this move) -; second byte: move -; ff-terminated - db LORELEI,BLIZZARD - db BRUNO,FISSURE - db AGATHA,TOXIC - db LANCE,BARRIER - db $FF diff --git a/data/trainer_parties.asm b/data/trainer_parties.asm deleted file mode 100755 index e448d431..00000000 --- a/data/trainer_parties.asm +++ /dev/null @@ -1,696 +0,0 @@ -TrainerDataPointers: - dw YoungsterData - dw BugCatcherData - dw LassData - dw SailorData - dw JrTrainerMData - dw JrTrainerFData - dw PokemaniacData - dw SuperNerdData - dw HikerData - dw BikerData - dw BurglarData - dw EngineerData - dw Juggler1Data - dw FisherData - dw SwimmerData - dw CueBallData - dw GamblerData - dw BeautyData - dw PsychicData - dw RockerData - dw JugglerData - dw TamerData - dw BirdKeeperData - dw BlackbeltData - dw Green1Data - dw ProfOakData - dw ChiefData - dw ScientistData - dw GiovanniData - dw RocketData - dw CooltrainerMData - dw CooltrainerFData - dw BrunoData - dw BrockData - dw MistyData - dw LtSurgeData - dw ErikaData - dw KogaData - dw BlaineData - dw SabrinaData - dw GentlemanData - dw Green2Data - dw Green3Data - dw LoreleiData - dw ChannelerData - dw AgathaData - dw LanceData - -; if first byte != FF, then - ; first byte is level (of all pokemon on this team) - ; all the next bytes are pokemon species - ; null-terminated -; if first byte == FF, then - ; first byte is FF (obviously) - ; every next two bytes are a level and species - ; null-terminated - -YoungsterData: -; Route 3 - db 11,RATTATA,EKANS,0 - db 14,SPEAROW,0 -; Mt. Moon 1F - db 10,RATTATA,RATTATA,ZUBAT,0 -; Route 24 - db 14,RATTATA,EKANS,ZUBAT,0 -; Route 25 - db 15,RATTATA,SPEAROW,0 - db 17,SLOWPOKE,0 - db 14,EKANS,SANDSHREW,0 -; SS Anne 1F Rooms - db 21,NIDORAN_M,0 -; Route 11 - db 21,EKANS,0 - db 19,SANDSHREW,ZUBAT,0 - db 17,RATTATA,RATTATA,RATICATE,0 - db 18,NIDORAN_M,NIDORINO,0 -; Unused - db 17,SPEAROW,RATTATA,RATTATA,SPEAROW,0 -BugCatcherData: -; Viridian Forest - db 6,WEEDLE,CATERPIE,0 - db 7,WEEDLE,KAKUNA,WEEDLE,0 - db 9,WEEDLE,0 -; Route 3 - db 10,CATERPIE,WEEDLE,CATERPIE,0 - db 9,WEEDLE,KAKUNA,CATERPIE,METAPOD,0 - db 11,CATERPIE,METAPOD,0 -; Mt. Moon 1F - db 11,WEEDLE,KAKUNA,0 - db 10,CATERPIE,METAPOD,CATERPIE,0 -; Route 24 - db 14,CATERPIE,WEEDLE,0 -; Route 6 - db 16,WEEDLE,CATERPIE,WEEDLE,0 - db 20,BUTTERFREE,0 -; Unused - db 18,METAPOD,CATERPIE,VENONAT,0 -; Route 9 - db 19,BEEDRILL,BEEDRILL,0 - db 20,CATERPIE,WEEDLE,VENONAT,0 -LassData: -; Route 3 - db 9,PIDGEY,PIDGEY,0 - db 10,RATTATA,NIDORAN_M,0 - db 14,JIGGLYPUFF,0 -; Route 4 - db 31,PARAS,PARAS,PARASECT,0 -; Mt. Moon 1F - db 11,ODDISH,BELLSPROUT,0 - db 14,CLEFAIRY,0 -; Route 24 - db 16,PIDGEY,NIDORAN_F,0 - db 14,PIDGEY,NIDORAN_F,0 -; Route 25 - db 15,NIDORAN_M,NIDORAN_F,0 - db 13,ODDISH,PIDGEY,ODDISH,0 -; SS Anne 1F Rooms - db 18,PIDGEY,NIDORAN_F,0 -; SS Anne 2F Rooms - db 18,RATTATA,PIKACHU,0 -; Route 8 - db 23,NIDORAN_F,NIDORINA,0 - db 24,MEOWTH,MEOWTH,MEOWTH,0 - db 19,PIDGEY,RATTATA,NIDORAN_M,MEOWTH,PIKACHU,0 - db 22,CLEFAIRY,CLEFAIRY,0 -; Celadon Gym - db 23,BELLSPROUT,WEEPINBELL,0 - db 23,ODDISH,GLOOM,0 -SailorData: -; SS Anne Stern - db 18,MACHOP,SHELLDER,0 - db 17,MACHOP,TENTACOOL,0 -; SS Anne B1F Rooms - db 21,SHELLDER,0 - db 17,HORSEA,SHELLDER,TENTACOOL,0 - db 18,TENTACOOL,STARYU,0 - db 17,HORSEA,HORSEA,HORSEA,0 - db 20,MACHOP,0 -; Vermilion Gym - db 21,PIKACHU,PIKACHU,0 -JrTrainerMData: -; Pewter Gym - db 11,DIGLETT,SANDSHREW,0 -; Route 24/Route 25 - db 14,RATTATA,EKANS,0 -; Route 24 - db 18,MANKEY,0 -; Route 6 - db 20,SQUIRTLE,0 - db 16,SPEAROW,RATICATE,0 -; Unused - db 18,DIGLETT,DIGLETT,SANDSHREW,0 -; Route 9 - db 21,GROWLITHE,CHARMANDER,0 - db 19,RATTATA,DIGLETT,EKANS,SANDSHREW,0 -; Route 12 - db 29,NIDORAN_M,NIDORINO,0 -JrTrainerFData: -; Cerulean Gym - db 19,GOLDEEN,0 -; Route 6 - db 16,RATTATA,PIKACHU,0 - db 16,PIDGEY,PIDGEY,PIDGEY,0 -; Unused - db 22,BULBASAUR,0 -; Route 9 - db 18,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 - db 23,MEOWTH,0 -; Route 10 - db 20,PIKACHU,CLEFAIRY,0 - db 21,PIDGEY,PIDGEOTTO,0 -; Rock Tunnel B1F - db 21,JIGGLYPUFF,PIDGEY,MEOWTH,0 - db 22,ODDISH,BULBASAUR,0 -; Celadon Gym - db 24,BULBASAUR,IVYSAUR,0 -; Route 13 - db 24,PIDGEY,MEOWTH,RATTATA,PIKACHU,MEOWTH,0 - db 30,POLIWAG,POLIWAG,0 - db 27,PIDGEY,MEOWTH,PIDGEY,PIDGEOTTO,0 - db 28,GOLDEEN,POLIWAG,HORSEA,0 -; Route 20 - db 31,GOLDEEN,SEAKING,0 -; Rock Tunnel 1F - db 22,BELLSPROUT,CLEFAIRY,0 - db 20,MEOWTH,ODDISH,PIDGEY,0 - db 19,PIDGEY,RATTATA,RATTATA,BELLSPROUT,0 -; Route 15 - db 28,GLOOM,ODDISH,ODDISH,0 - db 29,PIKACHU,RAICHU,0 - db 33,CLEFAIRY,0 - db 29,BELLSPROUT,ODDISH,TANGELA,0 -; Route 20 - db 30,TENTACOOL,HORSEA,SEEL,0 -PokemaniacData: -; Route 10 - db 30,RHYHORN,LICKITUNG,0 - db 20,CUBONE,SLOWPOKE,0 -; Rock Tunnel B1F - db 20,SLOWPOKE,SLOWPOKE,SLOWPOKE,0 - db 22,CHARMANDER,CUBONE,0 - db 25,SLOWPOKE,0 -; Victory Road 2F - db 40,CHARMELEON,LAPRAS,LICKITUNG,0 -; Rock Tunnel 1F - db 23,CUBONE,SLOWPOKE,0 -SuperNerdData: -; Mt. Moon 1F - db 11,MAGNEMITE,VOLTORB,0 -; Mt. Moon B2F - db 12,GRIMER,VOLTORB,KOFFING,0 -; Route 8 - db 20,VOLTORB,KOFFING,VOLTORB,MAGNEMITE,0 - db 22,GRIMER,MUK,GRIMER,0 - db 26,KOFFING,0 -; Unused - db 22,KOFFING,MAGNEMITE,WEEZING,0 - db 20,MAGNEMITE,MAGNEMITE,KOFFING,MAGNEMITE,0 - db 24,MAGNEMITE,VOLTORB,0 -; Cinnabar Gym - db 36,VULPIX,VULPIX,NINETALES,0 - db 34,PONYTA,CHARMANDER,VULPIX,GROWLITHE,0 - db 41,RAPIDASH,0 - db 37,GROWLITHE,VULPIX,0 -HikerData: -; Mt. Moon 1F - db 10,GEODUDE,GEODUDE,ONIX,0 -; Route 25 - db 15,MACHOP,GEODUDE,0 - db 13,GEODUDE,GEODUDE,MACHOP,GEODUDE,0 - db 17,ONIX,0 -; Route 9 - db 21,GEODUDE,ONIX,0 - db 20,GEODUDE,MACHOP,GEODUDE,0 -; Route 10 - db 21,GEODUDE,ONIX,0 - db 19,ONIX,GRAVELER,0 -; Rock Tunnel B1F - db 21,GEODUDE,GEODUDE,GRAVELER,0 - db 25,GEODUDE,0 -; Route 9/Rock Tunnel B1F - db 20,MACHOP,ONIX,0 -; Rock Tunnel 1F - db 19,GEODUDE,MACHOP,GEODUDE,GEODUDE,0 - db 20,ONIX,ONIX,GEODUDE,0 - db 21,GEODUDE,GRAVELER,0 -BikerData: -; Route 13 - db 28,KOFFING,KOFFING,KOFFING,0 -; Route 14 - db 29,KOFFING,GRIMER,0 -; Route 15 - db 25,KOFFING,KOFFING,WEEZING,KOFFING,GRIMER,0 - db 28,KOFFING,GRIMER,WEEZING,0 -; Route 16 - db 29,GRIMER,KOFFING,0 - db 33,WEEZING,0 - db 26,GRIMER,GRIMER,GRIMER,GRIMER,0 -; Route 17 - ; From https://www.smogon.com/smog/issue27/glitch: - ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. - ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; - ; that's the formula from GetMonHeader for the base stats of mon #000. - ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) - ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. - ; The result is that this data gets interpreted as the base stats - ; for MissingNo: 0,33,MUK,0,29,VOLTORB,VOLTORB,0,...,28,GRIMER,GRIMER. - db 28,WEEZING,KOFFING,WEEZING,0 - db 33,MUK,0 - db 29,VOLTORB,VOLTORB,0 - db 29,WEEZING,MUK,0 - db 25,KOFFING,WEEZING,KOFFING,KOFFING,WEEZING,0 -; Route 14 - db 26,KOFFING,KOFFING,GRIMER,KOFFING,0 - db 28,GRIMER,GRIMER,KOFFING,0 - db 29,KOFFING,MUK,0 -BurglarData: -; Unused - db 29,GROWLITHE,VULPIX,0 - db 33,GROWLITHE,0 - db 28,VULPIX,CHARMANDER,PONYTA,0 -; Cinnabar Gym - db 36,GROWLITHE,VULPIX,NINETALES,0 - db 41,PONYTA,0 - db 37,VULPIX,GROWLITHE,0 -; Mansion 2F - db 34,CHARMANDER,CHARMELEON,0 -; Mansion 3F - db 38,NINETALES,0 -; Mansion B1F - db 34,GROWLITHE,PONYTA,0 -EngineerData: -; Unused - db 21,VOLTORB,MAGNEMITE,0 -; Route 11 - db 21,MAGNEMITE,0 - db 18,MAGNEMITE,MAGNEMITE,MAGNETON,0 -Juggler1Data: -; none -FisherData: -; SS Anne 2F Rooms - db 17,GOLDEEN,TENTACOOL,GOLDEEN,0 -; SS Anne B1F Rooms - db 17,TENTACOOL,STARYU,SHELLDER,0 -; Route 12 - db 22,GOLDEEN,POLIWAG,GOLDEEN,0 - db 24,TENTACOOL,GOLDEEN,0 - db 27,GOLDEEN,0 - db 21,POLIWAG,SHELLDER,GOLDEEN,HORSEA,0 -; Route 21 - db 28,SEAKING,GOLDEEN,SEAKING,SEAKING,0 - db 31,SHELLDER,CLOYSTER,0 - db 27,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,MAGIKARP,0 - db 33,SEAKING,GOLDEEN,0 -; Route 12 - db 24,MAGIKARP,MAGIKARP,0 -SwimmerData: -; Cerulean Gym - db 16,HORSEA,SHELLDER,0 -; Route 19 - db 30,TENTACOOL,SHELLDER,0 - db 29,GOLDEEN,HORSEA,STARYU,0 - db 30,POLIWAG,POLIWHIRL,0 - db 27,HORSEA,TENTACOOL,TENTACOOL,GOLDEEN,0 - db 29,GOLDEEN,SHELLDER,SEAKING,0 - db 30,HORSEA,HORSEA,0 - db 27,TENTACOOL,TENTACOOL,STARYU,HORSEA,TENTACRUEL,0 -; Route 20 - db 31,SHELLDER,CLOYSTER,0 - db 35,STARYU,0 - db 28,HORSEA,HORSEA,SEADRA,HORSEA,0 -; Route 21 - db 33,SEADRA,TENTACRUEL,0 - db 37,STARMIE,0 - db 33,STARYU,WARTORTLE,0 - db 32,POLIWHIRL,TENTACOOL,SEADRA,0 -CueBallData: -; Route 16 - db 28,MACHOP,MANKEY,MACHOP,0 - db 29,MANKEY,MACHOP,0 - db 33,MACHOP,0 -; Route 17 - db 29,MANKEY,PRIMEAPE,0 - db 29,MACHOP,MACHOKE,0 - db 33,MACHOKE,0 - db 26,MANKEY,MANKEY,MACHOKE,MACHOP,0 - db 29,PRIMEAPE,MACHOKE,0 -; Route 21 - db 31,TENTACOOL,TENTACOOL,TENTACRUEL,0 -GamblerData: -; Route 11 - db 18,POLIWAG,HORSEA,0 - db 18,BELLSPROUT,ODDISH,0 - db 18,VOLTORB,MAGNEMITE,0 - db 18,GROWLITHE,VULPIX,0 -; Route 8 - db 22,POLIWAG,POLIWAG,POLIWHIRL,0 -; Unused - db 22,ONIX,GEODUDE,GRAVELER,0 -; Route 8 - db 24,GROWLITHE,VULPIX,0 -BeautyData: -; Celadon Gym - db 21,ODDISH,BELLSPROUT,ODDISH,BELLSPROUT,0 - db 24,BELLSPROUT,BELLSPROUT,0 - db 26,EXEGGCUTE,0 -; Route 13 - db 27,RATTATA,PIKACHU,RATTATA,0 - db 29,CLEFAIRY,MEOWTH,0 -; Route 20 - db 35,SEAKING,0 - db 30,SHELLDER,SHELLDER,CLOYSTER,0 - db 31,POLIWAG,SEAKING,0 -; Route 15 - db 29,PIDGEOTTO,WIGGLYTUFF,0 - db 29,BULBASAUR,IVYSAUR,0 -; Unused - db 33,WEEPINBELL,BELLSPROUT,WEEPINBELL,0 -; Route 19 - db 27,POLIWAG,GOLDEEN,SEAKING,GOLDEEN,POLIWAG,0 - db 30,GOLDEEN,SEAKING,0 - db 29,STARYU,STARYU,STARYU,0 -; Route 20 - db 30,SEADRA,HORSEA,SEADRA,0 -PsychicData: -; Saffron Gym - db 31,KADABRA,SLOWPOKE,MR_MIME,KADABRA,0 - db 34,MR_MIME,KADABRA,0 - db 33,SLOWPOKE,SLOWPOKE,SLOWBRO,0 - db 38,SLOWBRO,0 -RockerData: -; Vermilion Gym - db 20,VOLTORB,MAGNEMITE,VOLTORB,0 -; Route 12 - db 29,VOLTORB,ELECTRODE,0 -JugglerData: -; Silph Co. 5F - db 29,KADABRA,MR_MIME,0 -; Victory Road 2F - db 41,DROWZEE,HYPNO,KADABRA,KADABRA,0 -; Fuchsia Gym - db 31,DROWZEE,DROWZEE,KADABRA,DROWZEE,0 - db 34,DROWZEE,HYPNO,0 -; Victory Road 2F - db 48,MR_MIME,0 -; Unused - db 33,HYPNO,0 -; Fuchsia Gym - db 38,HYPNO,0 - db 34,DROWZEE,KADABRA,0 -TamerData: -; Fuchsia Gym - db 34,SANDSLASH,ARBOK,0 - db 33,ARBOK,SANDSLASH,ARBOK,0 -; Viridian Gym - db 43,RHYHORN,0 - db 39,ARBOK,TAUROS,0 -; Victory Road 2F - db 44,PERSIAN,GOLDUCK,0 -; Unused - db 42,RHYHORN,PRIMEAPE,ARBOK,TAUROS,0 -BirdKeeperData: -; Route 13 - db 29,PIDGEY,PIDGEOTTO,0 - db 25,SPEAROW,PIDGEY,PIDGEY,SPEAROW,SPEAROW,0 - db 26,PIDGEY,PIDGEOTTO,SPEAROW,FEAROW,0 -; Route 14 - db 33,FARFETCHD,0 - db 29,SPEAROW,FEAROW,0 -; Route 15 - db 26,PIDGEOTTO,FARFETCHD,DODUO,PIDGEY,0 - db 28,DODRIO,DODUO,DODUO,0 -; Route 18 - db 29,SPEAROW,FEAROW,0 - db 34,DODRIO,0 - db 26,SPEAROW,SPEAROW,FEAROW,SPEAROW,0 -; Route 20 - db 30,FEAROW,FEAROW,PIDGEOTTO,0 -; Unused - db 39,PIDGEOTTO,PIDGEOTTO,PIDGEY,PIDGEOTTO,0 - db 42,FARFETCHD,FEAROW,0 -; Route 14 - db 28,PIDGEY,DODUO,PIDGEOTTO,0 - db 26,PIDGEY,SPEAROW,PIDGEY,FEAROW,0 - db 29,PIDGEOTTO,FEAROW,0 - db 28,SPEAROW,DODUO,FEAROW,0 -BlackbeltData: -; Fighting Dojo - db 37,HITMONLEE,HITMONCHAN,0 - db 31,MANKEY,MANKEY,PRIMEAPE,0 - db 32,MACHOP,MACHOKE,0 - db 36,PRIMEAPE,0 - db 31,MACHOP,MANKEY,PRIMEAPE,0 -; Viridian Gym - db 40,MACHOP,MACHOKE,0 - db 43,MACHOKE,0 - db 38,MACHOKE,MACHOP,MACHOKE,0 -; Victory Road 2F - db 43,MACHOKE,MACHOP,MACHOKE,0 -Green1Data: - db 5,SQUIRTLE,0 - db 5,BULBASAUR,0 - db 5,CHARMANDER,0 -; Route 22 - db $FF,9,PIDGEY,8,SQUIRTLE,0 - db $FF,9,PIDGEY,8,BULBASAUR,0 - db $FF,9,PIDGEY,8,CHARMANDER,0 -; Cerulean City - db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,SQUIRTLE,0 - db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,BULBASAUR,0 - db $FF,18,PIDGEOTTO,15,ABRA,15,RATTATA,17,CHARMANDER,0 -ProfOakData: -; Unused - db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,BLASTOISE,70,GYARADOS,0 - db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,VENUSAUR,70,GYARADOS,0 - db $FF,66,TAUROS,67,EXEGGUTOR,68,ARCANINE,69,CHARIZARD,70,GYARADOS,0 -ChiefData: -; none -ScientistData: -; Unused - db 34,KOFFING,VOLTORB,0 -; Silph Co. 2F - db 26,GRIMER,WEEZING,KOFFING,WEEZING,0 - db 28,MAGNEMITE,VOLTORB,MAGNETON,0 -; Silph Co. 3F/Mansion 1F - db 29,ELECTRODE,WEEZING,0 -; Silph Co. 4F - db 33,ELECTRODE,0 -; Silph Co. 5F - db 26,MAGNETON,KOFFING,WEEZING,MAGNEMITE,0 -; Silph Co. 6F - db 25,VOLTORB,KOFFING,MAGNETON,MAGNEMITE,KOFFING,0 -; Silph Co. 7F - db 29,ELECTRODE,MUK,0 -; Silph Co. 8F - db 29,GRIMER,ELECTRODE,0 -; Silph Co. 9F - db 28,VOLTORB,KOFFING,MAGNETON,0 -; Silph Co. 10F - db 29,MAGNEMITE,KOFFING,0 -; Mansion 3F - db 33,MAGNEMITE,MAGNETON,VOLTORB,0 -; Mansion B1F - db 34,MAGNEMITE,ELECTRODE,0 -GiovanniData: -; Rocket Hideout B4F - db $FF,25,ONIX,24,RHYHORN,29,KANGASKHAN,0 -; Silph Co. 11F - db $FF,37,NIDORINO,35,KANGASKHAN,37,RHYHORN,41,NIDOQUEEN,0 -; Viridian Gym - db $FF,45,RHYHORN,42,DUGTRIO,44,NIDOQUEEN,45,NIDOKING,50,RHYDON,0 -RocketData: -; Mt. Moon B2F - db 13,RATTATA,ZUBAT,0 - db 11,SANDSHREW,RATTATA,ZUBAT,0 - db 12,ZUBAT,EKANS,0 - db 16,RATICATE,0 -; Cerulean City - db 17,MACHOP,DROWZEE,0 -; Route 24 - db 15,EKANS,ZUBAT,0 -; Game Corner - db 20,RATICATE,ZUBAT,0 -; Rocket Hideout B1F - db 21,DROWZEE,MACHOP,0 - db 21,RATICATE,RATICATE,0 - db 20,GRIMER,KOFFING,KOFFING,0 - db 19,RATTATA,RATICATE,RATICATE,RATTATA,0 - db 22,GRIMER,KOFFING,0 -; Rocket Hideout B2F - db 17,ZUBAT,KOFFING,GRIMER,ZUBAT,RATICATE,0 -; Rocket Hideout B3F - db 20,RATTATA,RATICATE,DROWZEE,0 - db 21,MACHOP,MACHOP,0 -; Rocket Hideout B4F - db 23,SANDSHREW,EKANS,SANDSLASH,0 - db 23,EKANS,SANDSHREW,ARBOK,0 - db 21,KOFFING,ZUBAT,0 -; Pokémon Tower 7F - db 25,ZUBAT,ZUBAT,GOLBAT,0 - db 26,KOFFING,DROWZEE,0 - db 23,ZUBAT,RATTATA,RATICATE,ZUBAT,0 -; Unused - db 26,DROWZEE,KOFFING,0 -; Silph Co. 2F - db 29,CUBONE,ZUBAT,0 - db 25,GOLBAT,ZUBAT,ZUBAT,RATICATE,ZUBAT,0 -; Silph Co. 3F - db 28,RATICATE,HYPNO,RATICATE,0 -; Silph Co. 4F - db 29,MACHOP,DROWZEE,0 - db 28,EKANS,ZUBAT,CUBONE,0 -; Silph Co. 5F - db 33,ARBOK,0 - db 33,HYPNO,0 -; Silph Co. 6F - db 29,MACHOP,MACHOKE,0 - db 28,ZUBAT,ZUBAT,GOLBAT,0 -; Silph Co. 7F - db 26,RATICATE,ARBOK,KOFFING,GOLBAT,0 - db 29,CUBONE,CUBONE,0 - db 29,SANDSHREW,SANDSLASH,0 -; Silph Co. 8F - db 26,RATICATE,ZUBAT,GOLBAT,RATTATA,0 - db 28,WEEZING,GOLBAT,KOFFING,0 -; Silph Co. 9F - db 28,DROWZEE,GRIMER,MACHOP,0 - db 28,GOLBAT,DROWZEE,HYPNO,0 -; Silph Co. 10F - db 33,MACHOKE,0 -; Silph Co. 11F - db 25,RATTATA,RATTATA,ZUBAT,RATTATA,EKANS,0 - db 32,CUBONE,DROWZEE,MAROWAK,0 -CooltrainerMData: -; Viridian Gym - db 39,NIDORINO,NIDOKING,0 -; Victory Road 3F - db 43,EXEGGUTOR,CLOYSTER,ARCANINE,0 - db 43,KINGLER,TENTACRUEL,BLASTOISE,0 -; Unused - db 45,KINGLER,STARMIE,0 -; Victory Road 1F - db 42,IVYSAUR,WARTORTLE,CHARMELEON,CHARIZARD,0 -; Unused - db 44,IVYSAUR,WARTORTLE,CHARMELEON,0 - db 49,NIDOKING,0 - db 44,KINGLER,CLOYSTER,0 -; Viridian Gym - db 39,SANDSLASH,DUGTRIO,0 - db 43,RHYHORN,0 -CooltrainerFData: -; Celadon Gym - db 24,WEEPINBELL,GLOOM,IVYSAUR,0 -; Victory Road 3F - db 43,BELLSPROUT,WEEPINBELL,VICTREEBEL,0 - db 43,PARASECT,DEWGONG,CHANSEY,0 -; Unused - db 46,VILEPLUME,BUTTERFREE,0 -; Victory Road 1F - db 44,PERSIAN,NINETALES,0 -; Unused - db 45,IVYSAUR,VENUSAUR,0 - db 45,NIDORINA,NIDOQUEEN,0 - db 43,PERSIAN,NINETALES,RAICHU,0 -BrunoData: - db $FF,53,ONIX,55,HITMONCHAN,55,HITMONLEE,56,ONIX,58,MACHAMP,0 -BrockData: - db $FF,12,GEODUDE,14,ONIX,0 -MistyData: - db $FF,18,STARYU,21,STARMIE,0 -LtSurgeData: - db $FF,21,VOLTORB,18,PIKACHU,24,RAICHU,0 -ErikaData: - db $FF,29,VICTREEBEL,24,TANGELA,29,VILEPLUME,0 -KogaData: - db $FF,37,KOFFING,39,MUK,37,KOFFING,43,WEEZING,0 -BlaineData: - db $FF,42,GROWLITHE,40,PONYTA,42,RAPIDASH,47,ARCANINE,0 -SabrinaData: - db $FF,38,KADABRA,37,MR_MIME,38,VENOMOTH,43,ALAKAZAM,0 -GentlemanData: -; SS Anne 1F Rooms - db 18,GROWLITHE,GROWLITHE,0 - db 19,NIDORAN_M,NIDORAN_F,0 -; SS Anne 2F Rooms/Vermilion Gym - db 23,PIKACHU,0 -; Unused - db 48,PRIMEAPE,0 -; SS Anne 2F Rooms - db 17,GROWLITHE,PONYTA,0 -Green2Data: -; SS Anne 2F - db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,WARTORTLE,0 - db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,IVYSAUR,0 - db $FF,19,PIDGEOTTO,16,RATICATE,18,KADABRA,20,CHARMELEON,0 -; Pokémon Tower 2F - db $FF,25,PIDGEOTTO,23,GROWLITHE,22,EXEGGCUTE,20,KADABRA,25,WARTORTLE,0 - db $FF,25,PIDGEOTTO,23,GYARADOS,22,GROWLITHE,20,KADABRA,25,IVYSAUR,0 - db $FF,25,PIDGEOTTO,23,EXEGGCUTE,22,GYARADOS,20,KADABRA,25,CHARMELEON,0 -; Silph Co. 7F - db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0 - db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0 - db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0 -; Route 22 - db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0 - db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0 - db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0 -Green3Data: - db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0 - db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0 - db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0 -LoreleiData: - db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0 -ChannelerData: -; Unused - db 22,GASTLY,0 - db 24,GASTLY,0 - db 23,GASTLY,GASTLY,0 - db 24,GASTLY,0 -; Pokémon Tower 3F - db 23,GASTLY,0 - db 24,GASTLY,0 -; Unused - db 24,HAUNTER,0 -; Pokémon Tower 3F - db 22,GASTLY,0 -; Pokémon Tower 4F - db 24,GASTLY,0 - db 23,GASTLY,GASTLY,0 -; Unused - db 24,GASTLY,0 -; Pokémon Tower 4F - db 22,GASTLY,0 -; Unused - db 24,GASTLY,0 -; Pokémon Tower 5F - db 23,HAUNTER,0 -; Unused - db 24,GASTLY,0 -; Pokémon Tower 5F - db 22,GASTLY,0 - db 24,GASTLY,0 - db 22,HAUNTER,0 -; Pokémon Tower 6F - db 22,GASTLY,GASTLY,GASTLY,0 - db 24,GASTLY,0 - db 24,GASTLY,0 -; Saffron Gym - db 34,GASTLY,HAUNTER,0 - db 38,HAUNTER,0 - db 33,GASTLY,GASTLY,HAUNTER,0 -AgathaData: - db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0 -LanceData: - db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0 diff --git a/data/trainer_types.asm b/data/trainer_types.asm deleted file mode 100755 index cc7ca605..00000000 --- a/data/trainer_types.asm +++ /dev/null @@ -1,17 +0,0 @@ -FemaleTrainerList:: - db OPP_LASS - db OPP_JR_TRAINER_F - db OPP_BEAUTY - db OPP_COOLTRAINER_F - db $FF - -EvilTrainerList:: - db OPP_JUGGLER_X - db OPP_GAMBLER - db OPP_ROCKER - db OPP_JUGGLER - db OPP_CHIEF - db OPP_SCIENTIST - db OPP_GIOVANNI - db OPP_ROCKET - db $FF diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm new file mode 100644 index 00000000..a3c7a657 --- /dev/null +++ b/data/trainers/ai_pointers.asm @@ -0,0 +1,52 @@ +TrainerAIPointers: + ; one entry per trainer class + ; first byte, number of times (per Pokémon) it can occur + ; next two bytes, pointer to AI subroutine for trainer class + ; subroutines are defined in engine/battle/trainer_ai.asm + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, JugglerAI ; unused_juggler + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, GenericAI + dbw 3, JugglerAI ; juggler + dbw 3, GenericAI + dbw 3, GenericAI + dbw 2, BlackbeltAI ; blackbelt + dbw 3, GenericAI ; rival1 + dbw 3, GenericAI + dbw 1, GenericAI ; chief + dbw 3, GenericAI + dbw 1, GiovanniAI ; giovanni + dbw 3, GenericAI + dbw 2, CooltrainerMAI ; cooltrainerm + dbw 1, CooltrainerFAI ; cooltrainerf + dbw 2, BrunoAI ; bruno + dbw 5, BrockAI ; brock + dbw 1, MistyAI ; misty + dbw 1, LtSurgeAI ; surge + dbw 1, ErikaAI ; erika + dbw 2, KogaAI ; koga + dbw 2, BlaineAI ; blaine + dbw 1, SabrinaAI ; sabrina + dbw 3, GenericAI + dbw 1, Rival2AI ; rival2 + dbw 1, Rival3AI ; rival3 + dbw 2, LoreleiAI ; lorelei + dbw 3, GenericAI + dbw 2, AgathaAI ; agatha + dbw 1, LanceAI ; lance diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm new file mode 100644 index 00000000..5bca2517 --- /dev/null +++ b/data/trainers/encounter_types.asm @@ -0,0 +1,17 @@ +FemaleTrainerList:: + db OPP_LASS + db OPP_JR_TRAINER_F + db OPP_BEAUTY + db OPP_COOLTRAINER_F + db -1 ; end + +EvilTrainerList:: + db OPP_UNUSED_JUGGLER + db OPP_GAMBLER + db OPP_ROCKER + db OPP_JUGGLER + db OPP_CHIEF + db OPP_SCIENTIST + db OPP_GIOVANNI + db OPP_ROCKET + db -1 ; end diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm new file mode 100644 index 00000000..6e6df63c --- /dev/null +++ b/data/trainers/move_choices.asm @@ -0,0 +1,57 @@ +move_choices: MACRO +REPT _NARG + db \1 + shift +ENDR + db 0 ; end +ENDM + +; move choice modification methods that are applied for each trainer class +TrainerClassMoveChoiceModifications: + move_choices ; YOUNGSTER + move_choices 1 ; BUG CATCHER + move_choices 1 ; LASS + move_choices 1, 3 ; SAILOR + move_choices 1 ; JR_TRAINER_M + move_choices 1 ; JR_TRAINER_F + move_choices 1, 2, 3 ; POKEMANIAC + move_choices 1, 2 ; SUPER_NERD + move_choices 1 ; HIKER + move_choices 1 ; BIKER + move_choices 1, 3 ; BURGLAR + move_choices 1 ; ENGINEER + move_choices 1, 2 ; UNUSED_JUGGLER + move_choices 1, 3 ; FISHER + move_choices 1, 3 ; SWIMMER + move_choices ; CUE_BALL + move_choices 1 ; GAMBLER + move_choices 1, 3 ; BEAUTY + move_choices 1, 2 ; PSYCHIC_TR + move_choices 1, 3 ; ROCKER + move_choices 1 ; JUGGLER + move_choices 1 ; TAMER + move_choices 1 ; BIRD_KEEPER + move_choices 1 ; BLACKBELT + move_choices 1 ; RIVAL1 + move_choices 1, 3 ; PROF_OAK + move_choices 1, 2 ; CHIEF + move_choices 1, 2 ; SCIENTIST + move_choices 1, 3 ; GIOVANNI + move_choices 1 ; ROCKET + move_choices 1, 3 ; COOLTRAINER_M + move_choices 1, 3 ; COOLTRAINER_F + move_choices 1 ; BRUNO + move_choices 1 ; BROCK + move_choices 1, 3 ; MISTY + move_choices 1, 3 ; LT_SURGE + move_choices 1, 3 ; ERIKA + move_choices 1, 3 ; KOGA + move_choices 1, 3 ; BLAINE + move_choices 1, 3 ; SABRINA + move_choices 1, 2 ; GENTLEMAN + move_choices 1, 3 ; RIVAL2 + move_choices 1, 3 ; RIVAL3 + move_choices 1, 2, 3 ; LORELEI + move_choices 1 ; CHANNELER + move_choices 1 ; AGATHA + move_choices 1, 3 ; LANCE diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm new file mode 100644 index 00000000..98e2e406 --- /dev/null +++ b/data/trainers/name_pointers.asm @@ -0,0 +1,71 @@ +TrainerNamePointers: +; what is the point of these? + dw .YoungsterName + dw .BugCatcherName + dw .LassName + dw wTrainerName + dw .JrTrainerMName + dw .JrTrainerFName + dw .PokemaniacName + dw .SuperNerdName + dw wTrainerName + dw wTrainerName + dw .BurglarName + dw .EngineerName + dw .UnusedJugglerName + dw wTrainerName + dw .SwimmerName + dw wTrainerName + dw wTrainerName + dw .BeautyName + dw wTrainerName + dw .RockerName + dw .JugglerName + dw wTrainerName + dw wTrainerName + dw .BlackbeltName + dw wTrainerName + dw .ProfOakName + dw .ChiefName + dw .ScientistName + dw wTrainerName + dw .RocketName + dw .CooltrainerMName + dw .CooltrainerFName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + dw wTrainerName + +.YoungsterName: db "YOUNGSTER@" +.BugCatcherName: db "BUG CATCHER@" +.LassName: db "LASS@" +.JrTrainerMName: db "JR.TRAINER♂@" +.JrTrainerFName: db "JR.TRAINER♀@" +.PokemaniacName: db "POKéMANIAC@" +.SuperNerdName: db "SUPER NERD@" +.BurglarName: db "BURGLAR@" +.EngineerName: db "ENGINEER@" +.UnusedJugglerName: db "JUGGLER@" +.SwimmerName: db "SWIMMER@" +.BeautyName: db "BEAUTY@" +.RockerName: db "ROCKER@" +.JugglerName: db "JUGGLER@" +.BlackbeltName: db "BLACKBELT@" +.ProfOakName: db "PROF.OAK@" +.ChiefName: db "CHIEF@" +.ScientistName: db "SCIENTIST@" +.RocketName: db "ROCKET@" +.CooltrainerMName: db "COOLTRAINER♂@" +.CooltrainerFName: db "COOLTRAINER♀@" diff --git a/data/trainers/names.asm b/data/trainers/names.asm new file mode 100644 index 00000000..d8e1f550 --- /dev/null +++ b/data/trainers/names.asm @@ -0,0 +1,48 @@ +TrainerNames:: + db "YOUNGSTER@" + db "BUG CATCHER@" + db "LASS@" + db "SAILOR@" + db "JR.TRAINER♂@" + db "JR.TRAINER♀@" + db "POKéMANIAC@" + db "SUPER NERD@" + db "HIKER@" + db "BIKER@" + db "BURGLAR@" + db "ENGINEER@" + db "JUGGLER@" + db "FISHERMAN@" + db "SWIMMER@" + db "CUE BALL@" + db "GAMBLER@" + db "BEAUTY@" + db "PSYCHIC@" + db "ROCKER@" + db "JUGGLER@" + db "TAMER@" + db "BIRD KEEPER@" + db "BLACKBELT@" + db "RIVAL1@" + db "PROF.OAK@" + db "CHIEF@" + db "SCIENTIST@" + db "GIOVANNI@" + db "ROCKET@" + db "COOLTRAINER♂@" + db "COOLTRAINER♀@" + db "BRUNO@" + db "BROCK@" + db "MISTY@" + db "LT.SURGE@" + db "ERIKA@" + db "KOGA@" + db "BLAINE@" + db "SABRINA@" + db "GENTLEMAN@" + db "RIVAL2@" + db "RIVAL3@" + db "LORELEI@" + db "CHANNELER@" + db "AGATHA@" + db "LANCE@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm new file mode 100644 index 00000000..005cb1dd --- /dev/null +++ b/data/trainers/parties.asm @@ -0,0 +1,742 @@ +TrainerDataPointers: + dw YoungsterData + dw BugCatcherData + dw LassData + dw SailorData + dw JrTrainerMData + dw JrTrainerFData + dw PokemaniacData + dw SuperNerdData + dw HikerData + dw BikerData + dw BurglarData + dw EngineerData + dw UnusedJugglerData + dw FisherData + dw SwimmerData + dw CueBallData + dw GamblerData + dw BeautyData + dw PsychicData + dw RockerData + dw JugglerData + dw TamerData + dw BirdKeeperData + dw BlackbeltData + dw Green1Data + dw ProfOakData + dw ChiefData + dw ScientistData + dw GiovanniData + dw RocketData + dw CooltrainerMData + dw CooltrainerFData + dw BrunoData + dw BrockData + dw MistyData + dw LtSurgeData + dw ErikaData + dw KogaData + dw BlaineData + dw SabrinaData + dw GentlemanData + dw Green2Data + dw Green3Data + dw LoreleiData + dw ChannelerData + dw AgathaData + dw LanceData + +; if first byte != $FF, then + ; first byte is level (of all pokemon on this team) + ; all the next bytes are pokemon species + ; null-terminated +; if first byte == $FF, then + ; first byte is $FF (obviously) + ; every next two bytes are a level and species + ; null-terminated + +YoungsterData: +; Route 3 + db 11, RATTATA, EKANS, 0 + db 14, SPEAROW, 0 +; Mt. Moon 1F + db 10, RATTATA, RATTATA, ZUBAT, 0 +; Route 24 + db 14, RATTATA, EKANS, ZUBAT, 0 +; Route 25 + db 15, RATTATA, SPEAROW, 0 + db 17, SLOWPOKE, 0 + db 14, EKANS, SANDSHREW, 0 +; SS Anne 1F Rooms + db 21, NIDORAN_M, 0 +; Route 11 + db 21, EKANS, 0 + db 19, SANDSHREW, ZUBAT, 0 + db 17, RATTATA, RATTATA, RATICATE, 0 + db 18, NIDORAN_M, NIDORINO, 0 +; Unused + db 17, SPEAROW, RATTATA, RATTATA, SPEAROW, 0 + +BugCatcherData: +; Viridian Forest + db 6, WEEDLE, CATERPIE, 0 + db 7, WEEDLE, KAKUNA, WEEDLE, 0 + db 9, WEEDLE, 0 +; Route 3 + db 10, CATERPIE, WEEDLE, CATERPIE, 0 + db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0 + db 11, CATERPIE, METAPOD, 0 +; Mt. Moon 1F + db 11, WEEDLE, KAKUNA, 0 + db 10, CATERPIE, METAPOD, CATERPIE, 0 +; Route 24 + db 14, CATERPIE, WEEDLE, 0 +; Route 6 + db 16, WEEDLE, CATERPIE, WEEDLE, 0 + db 20, BUTTERFREE, 0 +; Unused + db 18, METAPOD, CATERPIE, VENONAT, 0 +; Route 9 + db 19, BEEDRILL, BEEDRILL, 0 + db 20, CATERPIE, WEEDLE, VENONAT, 0 + +LassData: +; Route 3 + db 9, PIDGEY, PIDGEY, 0 + db 10, RATTATA, NIDORAN_M, 0 + db 14, JIGGLYPUFF, 0 +; Route 4 + db 31, PARAS, PARAS, PARASECT, 0 +; Mt. Moon 1F + db 11, ODDISH, BELLSPROUT, 0 + db 14, CLEFAIRY, 0 +; Route 24 + db 16, PIDGEY, NIDORAN_F, 0 + db 14, PIDGEY, NIDORAN_F, 0 +; Route 25 + db 15, NIDORAN_M, NIDORAN_F, 0 + db 13, ODDISH, PIDGEY, ODDISH, 0 +; SS Anne 1F Rooms + db 18, PIDGEY, NIDORAN_F, 0 +; SS Anne 2F Rooms + db 18, RATTATA, PIKACHU, 0 +; Route 8 + db 23, NIDORAN_F, NIDORINA, 0 + db 24, MEOWTH, MEOWTH, MEOWTH, 0 + db 19, PIDGEY, RATTATA, NIDORAN_M, MEOWTH, PIKACHU, 0 + db 22, CLEFAIRY, CLEFAIRY, 0 +; Celadon Gym + db 23, BELLSPROUT, WEEPINBELL, 0 + db 23, ODDISH, GLOOM, 0 + +SailorData: +; SS Anne Stern + db 18, MACHOP, SHELLDER, 0 + db 17, MACHOP, TENTACOOL, 0 +; SS Anne B1F Rooms + db 21, SHELLDER, 0 + db 17, HORSEA, SHELLDER, TENTACOOL, 0 + db 18, TENTACOOL, STARYU, 0 + db 17, HORSEA, HORSEA, HORSEA, 0 + db 20, MACHOP, 0 +; Vermilion Gym + db 21, PIKACHU, PIKACHU, 0 + +JrTrainerMData: +; Pewter Gym + db 11, DIGLETT, SANDSHREW, 0 +; Route 24/Route 25 + db 14, RATTATA, EKANS, 0 +; Route 24 + db 18, MANKEY, 0 +; Route 6 + db 20, SQUIRTLE, 0 + db 16, SPEAROW, RATICATE, 0 +; Unused + db 18, DIGLETT, DIGLETT, SANDSHREW, 0 +; Route 9 + db 21, GROWLITHE, CHARMANDER, 0 + db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0 +; Route 12 + db 29, NIDORAN_M, NIDORINO, 0 + +JrTrainerFData: +; Cerulean Gym + db 19, GOLDEEN, 0 +; Route 6 + db 16, RATTATA, PIKACHU, 0 + db 16, PIDGEY, PIDGEY, PIDGEY, 0 +; Unused + db 22, BULBASAUR, 0 +; Route 9 + db 18, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 + db 23, MEOWTH, 0 +; Route 10 + db 20, PIKACHU, CLEFAIRY, 0 + db 21, PIDGEY, PIDGEOTTO, 0 +; Rock Tunnel B1F + db 21, JIGGLYPUFF, PIDGEY, MEOWTH, 0 + db 22, ODDISH, BULBASAUR, 0 +; Celadon Gym + db 24, BULBASAUR, IVYSAUR, 0 +; Route 13 + db 24, PIDGEY, MEOWTH, RATTATA, PIKACHU, MEOWTH, 0 + db 30, POLIWAG, POLIWAG, 0 + db 27, PIDGEY, MEOWTH, PIDGEY, PIDGEOTTO, 0 + db 28, GOLDEEN, POLIWAG, HORSEA, 0 +; Route 20 + db 31, GOLDEEN, SEAKING, 0 +; Rock Tunnel 1F + db 22, BELLSPROUT, CLEFAIRY, 0 + db 20, MEOWTH, ODDISH, PIDGEY, 0 + db 19, PIDGEY, RATTATA, RATTATA, BELLSPROUT, 0 +; Route 15 + db 28, GLOOM, ODDISH, ODDISH, 0 + db 29, PIKACHU, RAICHU, 0 + db 33, CLEFAIRY, 0 + db 29, BELLSPROUT, ODDISH, TANGELA, 0 +; Route 20 + db 30, TENTACOOL, HORSEA, SEEL, 0 + +PokemaniacData: +; Route 10 + db 30, RHYHORN, LICKITUNG, 0 + db 20, CUBONE, SLOWPOKE, 0 +; Rock Tunnel B1F + db 20, SLOWPOKE, SLOWPOKE, SLOWPOKE, 0 + db 22, CHARMANDER, CUBONE, 0 + db 25, SLOWPOKE, 0 +; Victory Road 2F + db 40, CHARMELEON, LAPRAS, LICKITUNG, 0 +; Rock Tunnel 1F + db 23, CUBONE, SLOWPOKE, 0 + +SuperNerdData: +; Mt. Moon 1F + db 11, MAGNEMITE, VOLTORB, 0 +; Mt. Moon B2F + db 12, GRIMER, VOLTORB, KOFFING, 0 +; Route 8 + db 20, VOLTORB, KOFFING, VOLTORB, MAGNEMITE, 0 + db 22, GRIMER, MUK, GRIMER, 0 + db 26, KOFFING, 0 +; Unused + db 22, KOFFING, MAGNEMITE, WEEZING, 0 + db 20, MAGNEMITE, MAGNEMITE, KOFFING, MAGNEMITE, 0 + db 24, MAGNEMITE, VOLTORB, 0 +; Cinnabar Gym + db 36, VULPIX, VULPIX, NINETALES, 0 + db 34, PONYTA, CHARMANDER, VULPIX, GROWLITHE, 0 + db 41, RAPIDASH, 0 + db 37, GROWLITHE, VULPIX, 0 + +HikerData: +; Mt. Moon 1F + db 10, GEODUDE, GEODUDE, ONIX, 0 +; Route 25 + db 15, MACHOP, GEODUDE, 0 + db 13, GEODUDE, GEODUDE, MACHOP, GEODUDE, 0 + db 17, ONIX, 0 +; Route 9 + db 21, GEODUDE, ONIX, 0 + db 20, GEODUDE, MACHOP, GEODUDE, 0 +; Route 10 + db 21, GEODUDE, ONIX, 0 + db 19, ONIX, GRAVELER, 0 +; Rock Tunnel B1F + db 21, GEODUDE, GEODUDE, GRAVELER, 0 + db 25, GEODUDE, 0 +; Route 9/Rock Tunnel B1F + db 20, MACHOP, ONIX, 0 +; Rock Tunnel 1F + db 19, GEODUDE, MACHOP, GEODUDE, GEODUDE, 0 + db 20, ONIX, ONIX, GEODUDE, 0 + db 21, GEODUDE, GRAVELER, 0 + +BikerData: +; Route 13 + db 28, KOFFING, KOFFING, KOFFING, 0 +; Route 14 + db 29, KOFFING, GRIMER, 0 +; Route 15 + db 25, KOFFING, KOFFING, WEEZING, KOFFING, GRIMER, 0 + db 28, KOFFING, GRIMER, WEEZING, 0 +; Route 16 + db 29, GRIMER, KOFFING, 0 + db 33, WEEZING, 0 + db 26, GRIMER, GRIMER, GRIMER, GRIMER, 0 +; Route 17 + ; From https://www.smogon.com/smog/issue27/glitch: + ; 0E:5FC2 is offset of the ending 0 for this first Biker on Route 17. + ; BaseStats + (MonBaseStatsEnd - MonBaseStats) * (000 - 1) = $5FC2; + ; that's the formula from GetMonHeader for the base stats of mon #000. + ; (BaseStats = $43DE and BANK(BaseStats) = $0E.) + ; Finally, PokedexOrder lists 0 as the dex ID for every MissingNo. + ; The result is that this data gets interpreted as the base stats + ; for MissingNo: 0, 33, MUK, 0, 29, VOLTORB, VOLTORB, 0, ..., 28, GRIMER, GRIMER. + db 28, WEEZING, KOFFING, WEEZING, 0 + db 33, MUK, 0 + db 29, VOLTORB, VOLTORB, 0 + db 29, WEEZING, MUK, 0 + db 25, KOFFING, WEEZING, KOFFING, KOFFING, WEEZING, 0 +; Route 14 + db 26, KOFFING, KOFFING, GRIMER, KOFFING, 0 + db 28, GRIMER, GRIMER, KOFFING, 0 + db 29, KOFFING, MUK, 0 + +BurglarData: +; Unused + db 29, GROWLITHE, VULPIX, 0 + db 33, GROWLITHE, 0 + db 28, VULPIX, CHARMANDER, PONYTA, 0 +; Cinnabar Gym + db 36, GROWLITHE, VULPIX, NINETALES, 0 + db 41, PONYTA, 0 + db 37, VULPIX, GROWLITHE, 0 +; Mansion 2F + db 34, CHARMANDER, CHARMELEON, 0 +; Mansion 3F + db 38, NINETALES, 0 +; Mansion B1F + db 34, GROWLITHE, PONYTA, 0 + +EngineerData: +; Unused + db 21, VOLTORB, MAGNEMITE, 0 +; Route 11 + db 21, MAGNEMITE, 0 + db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0 + +UnusedJugglerData: +; none + +FisherData: +; SS Anne 2F Rooms + db 17, GOLDEEN, TENTACOOL, GOLDEEN, 0 +; SS Anne B1F Rooms + db 17, TENTACOOL, STARYU, SHELLDER, 0 +; Route 12 + db 22, GOLDEEN, POLIWAG, GOLDEEN, 0 + db 24, TENTACOOL, GOLDEEN, 0 + db 27, GOLDEEN, 0 + db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0 +; Route 21 + db 28, SEAKING, GOLDEEN, SEAKING, SEAKING, 0 + db 31, SHELLDER, CLOYSTER, 0 + db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0 + db 33, SEAKING, GOLDEEN, 0 +; Route 12 + db 24, MAGIKARP, MAGIKARP, 0 + +SwimmerData: +; Cerulean Gym + db 16, HORSEA, SHELLDER, 0 +; Route 19 + db 30, TENTACOOL, SHELLDER, 0 + db 29, GOLDEEN, HORSEA, STARYU, 0 + db 30, POLIWAG, POLIWHIRL, 0 + db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0 + db 29, GOLDEEN, SHELLDER, SEAKING, 0 + db 30, HORSEA, HORSEA, 0 + db 27, TENTACOOL, TENTACOOL, STARYU, HORSEA, TENTACRUEL, 0 +; Route 20 + db 31, SHELLDER, CLOYSTER, 0 + db 35, STARYU, 0 + db 28, HORSEA, HORSEA, SEADRA, HORSEA, 0 +; Route 21 + db 33, SEADRA, TENTACRUEL, 0 + db 37, STARMIE, 0 + db 33, STARYU, WARTORTLE, 0 + db 32, POLIWHIRL, TENTACOOL, SEADRA, 0 + +CueBallData: +; Route 16 + db 28, MACHOP, MANKEY, MACHOP, 0 + db 29, MANKEY, MACHOP, 0 + db 33, MACHOP, 0 +; Route 17 + db 29, MANKEY, PRIMEAPE, 0 + db 29, MACHOP, MACHOKE, 0 + db 33, MACHOKE, 0 + db 26, MANKEY, MANKEY, MACHOKE, MACHOP, 0 + db 29, PRIMEAPE, MACHOKE, 0 +; Route 21 + db 31, TENTACOOL, TENTACOOL, TENTACRUEL, 0 + +GamblerData: +; Route 11 + db 18, POLIWAG, HORSEA, 0 + db 18, BELLSPROUT, ODDISH, 0 + db 18, VOLTORB, MAGNEMITE, 0 + db 18, GROWLITHE, VULPIX, 0 +; Route 8 + db 22, POLIWAG, POLIWAG, POLIWHIRL, 0 +; Unused + db 22, ONIX, GEODUDE, GRAVELER, 0 +; Route 8 + db 24, GROWLITHE, VULPIX, 0 + +BeautyData: +; Celadon Gym + db 21, ODDISH, BELLSPROUT, ODDISH, BELLSPROUT, 0 + db 24, BELLSPROUT, BELLSPROUT, 0 + db 26, EXEGGCUTE, 0 +; Route 13 + db 27, RATTATA, PIKACHU, RATTATA, 0 + db 29, CLEFAIRY, MEOWTH, 0 +; Route 20 + db 35, SEAKING, 0 + db 30, SHELLDER, SHELLDER, CLOYSTER, 0 + db 31, POLIWAG, SEAKING, 0 +; Route 15 + db 29, PIDGEOTTO, WIGGLYTUFF, 0 + db 29, BULBASAUR, IVYSAUR, 0 +; Unused + db 33, WEEPINBELL, BELLSPROUT, WEEPINBELL, 0 +; Route 19 + db 27, POLIWAG, GOLDEEN, SEAKING, GOLDEEN, POLIWAG, 0 + db 30, GOLDEEN, SEAKING, 0 + db 29, STARYU, STARYU, STARYU, 0 +; Route 20 + db 30, SEADRA, HORSEA, SEADRA, 0 + +PsychicData: +; Saffron Gym + db 31, KADABRA, SLOWPOKE, MR_MIME, KADABRA, 0 + db 34, MR_MIME, KADABRA, 0 + db 33, SLOWPOKE, SLOWPOKE, SLOWBRO, 0 + db 38, SLOWBRO, 0 + +RockerData: +; Vermilion Gym + db 20, VOLTORB, MAGNEMITE, VOLTORB, 0 +; Route 12 + db 29, VOLTORB, ELECTRODE, 0 + +JugglerData: +; Silph Co. 5F + db 29, KADABRA, MR_MIME, 0 +; Victory Road 2F + db 41, DROWZEE, HYPNO, KADABRA, KADABRA, 0 +; Fuchsia Gym + db 31, DROWZEE, DROWZEE, KADABRA, DROWZEE, 0 + db 34, DROWZEE, HYPNO, 0 +; Victory Road 2F + db 48, MR_MIME, 0 +; Unused + db 33, HYPNO, 0 +; Fuchsia Gym + db 38, HYPNO, 0 + db 34, DROWZEE, KADABRA, 0 + +TamerData: +; Fuchsia Gym + db 34, SANDSLASH, ARBOK, 0 + db 33, ARBOK, SANDSLASH, ARBOK, 0 +; Viridian Gym + db 43, RHYHORN, 0 + db 39, ARBOK, TAUROS, 0 +; Victory Road 2F + db 44, PERSIAN, GOLDUCK, 0 +; Unused + db 42, RHYHORN, PRIMEAPE, ARBOK, TAUROS, 0 + +BirdKeeperData: +; Route 13 + db 29, PIDGEY, PIDGEOTTO, 0 + db 25, SPEAROW, PIDGEY, PIDGEY, SPEAROW, SPEAROW, 0 + db 26, PIDGEY, PIDGEOTTO, SPEAROW, FEAROW, 0 +; Route 14 + db 33, FARFETCHD, 0 + db 29, SPEAROW, FEAROW, 0 +; Route 15 + db 26, PIDGEOTTO, FARFETCHD, DODUO, PIDGEY, 0 + db 28, DODRIO, DODUO, DODUO, 0 +; Route 18 + db 29, SPEAROW, FEAROW, 0 + db 34, DODRIO, 0 + db 26, SPEAROW, SPEAROW, FEAROW, SPEAROW, 0 +; Route 20 + db 30, FEAROW, FEAROW, PIDGEOTTO, 0 +; Unused + db 39, PIDGEOTTO, PIDGEOTTO, PIDGEY, PIDGEOTTO, 0 + db 42, FARFETCHD, FEAROW, 0 +; Route 14 + db 28, PIDGEY, DODUO, PIDGEOTTO, 0 + db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0 + db 29, PIDGEOTTO, FEAROW, 0 + db 28, SPEAROW, DODUO, FEAROW, 0 + +BlackbeltData: +; Fighting Dojo + db 37, HITMONLEE, HITMONCHAN, 0 + db 31, MANKEY, MANKEY, PRIMEAPE, 0 + db 32, MACHOP, MACHOKE, 0 + db 36, PRIMEAPE, 0 + db 31, MACHOP, MANKEY, PRIMEAPE, 0 +; Viridian Gym + db 40, MACHOP, MACHOKE, 0 + db 43, MACHOKE, 0 + db 38, MACHOKE, MACHOP, MACHOKE, 0 +; Victory Road 2F + db 43, MACHOKE, MACHOP, MACHOKE, 0 + +Green1Data: + db 5, SQUIRTLE, 0 + db 5, BULBASAUR, 0 + db 5, CHARMANDER, 0 +; Route 22 + db $FF, 9, PIDGEY, 8, SQUIRTLE, 0 + db $FF, 9, PIDGEY, 8, BULBASAUR, 0 + db $FF, 9, PIDGEY, 8, CHARMANDER, 0 +; Cerulean City + db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, SQUIRTLE, 0 + db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, BULBASAUR, 0 + db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMANDER, 0 + +ProfOakData: +; Unused + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, BLASTOISE, 70, GYARADOS, 0 + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, VENUSAUR, 70, GYARADOS, 0 + db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 69, CHARIZARD, 70, GYARADOS, 0 + +ChiefData: +; none + +ScientistData: +; Unused + db 34, KOFFING, VOLTORB, 0 +; Silph Co. 2F + db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0 + db 28, MAGNEMITE, VOLTORB, MAGNETON, 0 +; Silph Co. 3F/Mansion 1F + db 29, ELECTRODE, WEEZING, 0 +; Silph Co. 4F + db 33, ELECTRODE, 0 +; Silph Co. 5F + db 26, MAGNETON, KOFFING, WEEZING, MAGNEMITE, 0 +; Silph Co. 6F + db 25, VOLTORB, KOFFING, MAGNETON, MAGNEMITE, KOFFING, 0 +; Silph Co. 7F + db 29, ELECTRODE, MUK, 0 +; Silph Co. 8F + db 29, GRIMER, ELECTRODE, 0 +; Silph Co. 9F + db 28, VOLTORB, KOFFING, MAGNETON, 0 +; Silph Co. 10F + db 29, MAGNEMITE, KOFFING, 0 +; Mansion 3F + db 33, MAGNEMITE, MAGNETON, VOLTORB, 0 +; Mansion B1F + db 34, MAGNEMITE, ELECTRODE, 0 + +GiovanniData: +; Rocket Hideout B4F + db $FF, 25, ONIX, 24, RHYHORN, 29, KANGASKHAN, 0 +; Silph Co. 11F + db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0 +; Viridian Gym + db $FF, 45, RHYHORN, 42, DUGTRIO, 44, NIDOQUEEN, 45, NIDOKING, 50, RHYDON, 0 + +RocketData: +; Mt. Moon B2F + db 13, RATTATA, ZUBAT, 0 + db 11, SANDSHREW, RATTATA, ZUBAT, 0 + db 12, ZUBAT, EKANS, 0 + db 16, RATICATE, 0 +; Cerulean City + db 17, MACHOP, DROWZEE, 0 +; Route 24 + db 15, EKANS, ZUBAT, 0 +; Game Corner + db 20, RATICATE, ZUBAT, 0 +; Rocket Hideout B1F + db 21, DROWZEE, MACHOP, 0 + db 21, RATICATE, RATICATE, 0 + db 20, GRIMER, KOFFING, KOFFING, 0 + db 19, RATTATA, RATICATE, RATICATE, RATTATA, 0 + db 22, GRIMER, KOFFING, 0 +; Rocket Hideout B2F + db 17, ZUBAT, KOFFING, GRIMER, ZUBAT, RATICATE, 0 +; Rocket Hideout B3F + db 20, RATTATA, RATICATE, DROWZEE, 0 + db 21, MACHOP, MACHOP, 0 +; Rocket Hideout B4F + db 23, SANDSHREW, EKANS, SANDSLASH, 0 + db 23, EKANS, SANDSHREW, ARBOK, 0 + db 21, KOFFING, ZUBAT, 0 +; Pokémon Tower 7F + db 25, ZUBAT, ZUBAT, GOLBAT, 0 + db 26, KOFFING, DROWZEE, 0 + db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0 +; Unused + db 26, DROWZEE, KOFFING, 0 +; Silph Co. 2F + db 29, CUBONE, ZUBAT, 0 + db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0 +; Silph Co. 3F + db 28, RATICATE, HYPNO, RATICATE, 0 +; Silph Co. 4F + db 29, MACHOP, DROWZEE, 0 + db 28, EKANS, ZUBAT, CUBONE, 0 +; Silph Co. 5F + db 33, ARBOK, 0 + db 33, HYPNO, 0 +; Silph Co. 6F + db 29, MACHOP, MACHOKE, 0 + db 28, ZUBAT, ZUBAT, GOLBAT, 0 +; Silph Co. 7F + db 26, RATICATE, ARBOK, KOFFING, GOLBAT, 0 + db 29, CUBONE, CUBONE, 0 + db 29, SANDSHREW, SANDSLASH, 0 +; Silph Co. 8F + db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0 + db 28, WEEZING, GOLBAT, KOFFING, 0 +; Silph Co. 9F + db 28, DROWZEE, GRIMER, MACHOP, 0 + db 28, GOLBAT, DROWZEE, HYPNO, 0 +; Silph Co. 10F + db 33, MACHOKE, 0 +; Silph Co. 11F + db 25, RATTATA, RATTATA, ZUBAT, RATTATA, EKANS, 0 + db 32, CUBONE, DROWZEE, MAROWAK, 0 + +CooltrainerMData: +; Viridian Gym + db 39, NIDORINO, NIDOKING, 0 +; Victory Road 3F + db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0 + db 43, KINGLER, TENTACRUEL, BLASTOISE, 0 +; Unused + db 45, KINGLER, STARMIE, 0 +; Victory Road 1F + db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0 +; Unused + db 44, IVYSAUR, WARTORTLE, CHARMELEON, 0 + db 49, NIDOKING, 0 + db 44, KINGLER, CLOYSTER, 0 +; Viridian Gym + db 39, SANDSLASH, DUGTRIO, 0 + db 43, RHYHORN, 0 + +CooltrainerFData: +; Celadon Gym + db 24, WEEPINBELL, GLOOM, IVYSAUR, 0 +; Victory Road 3F + db 43, BELLSPROUT, WEEPINBELL, VICTREEBEL, 0 + db 43, PARASECT, DEWGONG, CHANSEY, 0 +; Unused + db 46, VILEPLUME, BUTTERFREE, 0 +; Victory Road 1F + db 44, PERSIAN, NINETALES, 0 +; Unused + db 45, IVYSAUR, VENUSAUR, 0 + db 45, NIDORINA, NIDOQUEEN, 0 + db 43, PERSIAN, NINETALES, RAICHU, 0 + +BrunoData: + db $FF, 53, ONIX, 55, HITMONCHAN, 55, HITMONLEE, 56, ONIX, 58, MACHAMP, 0 + +BrockData: + db $FF, 12, GEODUDE, 14, ONIX, 0 + +MistyData: + db $FF, 18, STARYU, 21, STARMIE, 0 + +LtSurgeData: + db $FF, 21, VOLTORB, 18, PIKACHU, 24, RAICHU, 0 + +ErikaData: + db $FF, 29, VICTREEBEL, 24, TANGELA, 29, VILEPLUME, 0 + +KogaData: + db $FF, 37, KOFFING, 39, MUK, 37, KOFFING, 43, WEEZING, 0 + +BlaineData: + db $FF, 42, GROWLITHE, 40, PONYTA, 42, RAPIDASH, 47, ARCANINE, 0 + +SabrinaData: + db $FF, 38, KADABRA, 37, MR_MIME, 38, VENOMOTH, 43, ALAKAZAM, 0 + +GentlemanData: +; SS Anne 1F Rooms + db 18, GROWLITHE, GROWLITHE, 0 + db 19, NIDORAN_M, NIDORAN_F, 0 +; SS Anne 2F Rooms/Vermilion Gym + db 23, PIKACHU, 0 +; Unused + db 48, PRIMEAPE, 0 +; SS Anne 2F Rooms + db 17, GROWLITHE, PONYTA, 0 + +Green2Data: +; SS Anne 2F + db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0 + db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0 + db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, CHARMELEON, 0 +; Pokémon Tower 2F + db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0 + db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0 + db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0 +; Silph Co. 7F + db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, BLASTOISE, 0 + db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 + db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0 +; Route 22 + db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, BLASTOISE, 0 + db $FF, 47, PIDGEOT, 45, RHYHORN, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0 + db $FF, 47, PIDGEOT, 45, RHYHORN, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0 + +Green3Data: + db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, ARCANINE, 63, EXEGGUTOR, 65, BLASTOISE, 0 + db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 + db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYDON, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 + +LoreleiData: + db $FF, 54, DEWGONG, 53, CLOYSTER, 54, SLOWBRO, 56, JYNX, 56, LAPRAS, 0 + +ChannelerData: +; Unused + db 22, GASTLY, 0 + db 24, GASTLY, 0 + db 23, GASTLY, GASTLY, 0 + db 24, GASTLY, 0 +; Pokémon Tower 3F + db 23, GASTLY, 0 + db 24, GASTLY, 0 +; Unused + db 24, HAUNTER, 0 +; Pokémon Tower 3F + db 22, GASTLY, 0 +; Pokémon Tower 4F + db 24, GASTLY, 0 + db 23, GASTLY, GASTLY, 0 +; Unused + db 24, GASTLY, 0 +; Pokémon Tower 4F + db 22, GASTLY, 0 +; Unused + db 24, GASTLY, 0 +; Pokémon Tower 5F + db 23, HAUNTER, 0 +; Unused + db 24, GASTLY, 0 +; Pokémon Tower 5F + db 22, GASTLY, 0 + db 24, GASTLY, 0 + db 22, HAUNTER, 0 +; Pokémon Tower 6F + db 22, GASTLY, GASTLY, GASTLY, 0 + db 24, GASTLY, 0 + db 24, GASTLY, 0 +; Saffron Gym + db 34, GASTLY, HAUNTER, 0 + db 38, HAUNTER, 0 + db 33, GASTLY, GASTLY, HAUNTER, 0 + +AgathaData: + db $FF, 56, GENGAR, 56, GOLBAT, 55, HAUNTER, 58, ARBOK, 60, GENGAR, 0 + +LanceData: + db $FF, 58, GYARADOS, 56, DRAGONAIR, 56, DRAGONAIR, 60, AERODACTYL, 62, DRAGONITE, 0 diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm new file mode 100644 index 00000000..d4007394 --- /dev/null +++ b/data/trainers/pic_pointers_money.asm @@ -0,0 +1,55 @@ +pic_money: MACRO + dw \1 + money \2 +ENDM + +TrainerPicAndMoneyPointers:: + ; pic pointer, base reward money + ; money received after battle = base money × level of highest-level enemy mon + pic_money YoungsterPic, 1500 + pic_money BugCatcherPic, 1000 + pic_money LassPic, 1500 + pic_money SailorPic, 3000 + pic_money JrTrainerMPic, 2000 + pic_money JrTrainerFPic, 2000 + pic_money PokemaniacPic, 5000 + pic_money SuperNerdPic, 2500 + pic_money HikerPic, 3500 + pic_money BikerPic, 2000 + pic_money BurglarPic, 9000 + pic_money EngineerPic, 5000 + pic_money JugglerPic, 3500 + pic_money FisherPic, 3500 + pic_money SwimmerPic, 500 + pic_money CueBallPic, 2500 + pic_money GamblerPic, 7000 + pic_money BeautyPic, 7000 + pic_money PsychicPic, 1000 + pic_money RockerPic, 2500 + pic_money JugglerPic, 3500 + pic_money TamerPic, 4000 + pic_money BirdKeeperPic, 2500 + pic_money BlackbeltPic, 2500 + pic_money Rival1Pic, 3500 + pic_money ProfOakPic, 9900 + pic_money ChiefPic, 3000 + pic_money ScientistPic, 5000 + pic_money GiovanniPic, 9900 + pic_money RocketPic, 3000 + pic_money CooltrainerMPic, 3500 + pic_money CooltrainerFPic, 3500 + pic_money BrunoPic, 9900 + pic_money BrockPic, 9900 + pic_money MistyPic, 9900 + pic_money LtSurgePic, 9900 + pic_money ErikaPic, 9900 + pic_money KogaPic, 9900 + pic_money BlainePic, 9900 + pic_money SabrinaPic, 9900 + pic_money GentlemanPic, 7000 + pic_money Rival2Pic, 6500 + pic_money Rival3Pic, 9900 + pic_money LoreleiPic, 9900 + pic_money ChannelerPic, 3000 + pic_money AgathaPic, 9900 + pic_money LancePic, 9900 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm new file mode 100644 index 00000000..b797d1c7 --- /dev/null +++ b/data/trainers/special_moves.asm @@ -0,0 +1,25 @@ +; unique moves for gym leaders +; this is not automatic! you have to write the index you want to [wLoneAttackNo] +; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain, +; the fourth entry in the list. +LoneMoves: + ; pokemon index, move to give nth pokemon + db 1, BIDE + db 1, BUBBLEBEAM + db 2, THUNDERBOLT + db 2, MEGA_DRAIN + db 3, TOXIC + db 3, PSYWAVE + db 3, FIRE_BLAST + db 4, FISSURE + +; unique moves for elite 4 +; all trainers in this class are given this move automatically +; (unrelated to LoneMoves) +TeamMoves: + ; trainer, move + db LORELEI, BLIZZARD + db BRUNO, FISSURE + db AGATHA, TOXIC + db LANCE, BARRIER + db -1 ; end diff --git a/data/type_effects.asm b/data/type_effects.asm deleted file mode 100755 index 1321a3d9..00000000 --- a/data/type_effects.asm +++ /dev/null @@ -1,89 +0,0 @@ -TypeEffects: -; format: attacking type, defending type, damage multiplier -; the multiplier is a (decimal) fixed-point number: -; 20 is ×2.0 -; 05 is ×0.5 -; 00 is ×0 - db WATER,FIRE,20 - db FIRE,GRASS,20 - db FIRE,ICE,20 - db GRASS,WATER,20 - db ELECTRIC,WATER,20 - db WATER,ROCK,20 - db GROUND,FLYING,00 - db WATER,WATER,05 - db FIRE,FIRE,05 - db ELECTRIC,ELECTRIC,05 - db ICE,ICE,05 - db GRASS,GRASS,05 - db PSYCHIC,PSYCHIC,05 - db FIRE,WATER,05 - db GRASS,FIRE,05 - db WATER,GRASS,05 - db ELECTRIC,GRASS,05 - db NORMAL,ROCK,05 - db NORMAL,GHOST,00 - db GHOST,GHOST,20 - db FIRE,BUG,20 - db FIRE,ROCK,05 - db WATER,GROUND,20 - db ELECTRIC,GROUND,00 - db ELECTRIC,FLYING,20 - db GRASS,GROUND,20 - db GRASS,BUG,05 - db GRASS,POISON,05 - db GRASS,ROCK,20 - db GRASS,FLYING,05 - db ICE,WATER,05 - db ICE,GRASS,20 - db ICE,GROUND,20 - db ICE,FLYING,20 - db FIGHTING,NORMAL,20 - db FIGHTING,POISON,05 - db FIGHTING,FLYING,05 - db FIGHTING,PSYCHIC,05 - db FIGHTING,BUG,05 - db FIGHTING,ROCK,20 - db FIGHTING,ICE,20 - db FIGHTING,GHOST,00 - db POISON,GRASS,20 - db POISON,POISON,05 - db POISON,GROUND,05 - db POISON,BUG,20 - db POISON,ROCK,05 - db POISON,GHOST,05 - db GROUND,FIRE,20 - db GROUND,ELECTRIC,20 - db GROUND,GRASS,05 - db GROUND,BUG,05 - db GROUND,ROCK,20 - db GROUND,POISON,20 - db FLYING,ELECTRIC,05 - db FLYING,FIGHTING,20 - db FLYING,BUG,20 - db FLYING,GRASS,20 - db FLYING,ROCK,05 - db PSYCHIC,FIGHTING,20 - db PSYCHIC,POISON,20 - db BUG,FIRE,05 - db BUG,GRASS,20 - db BUG,FIGHTING,05 - db BUG,FLYING,05 - db BUG,PSYCHIC,20 - db BUG,GHOST,05 - db BUG,POISON,20 - db ROCK,FIRE,20 - db ROCK,FIGHTING,05 - db ROCK,GROUND,05 - db ROCK,FLYING,20 - db ROCK,BUG,20 - db ROCK,ICE,20 - db GHOST,NORMAL,00 - db GHOST,PSYCHIC,00 - db FIRE,DRAGON,05 - db WATER,DRAGON,05 - db ELECTRIC,DRAGON,05 - db GRASS,DRAGON,05 - db ICE,DRAGON,20 - db DRAGON,DRAGON,20 - db $FF diff --git a/data/types/names.asm b/data/types/names.asm new file mode 100644 index 00000000..b1c35f65 --- /dev/null +++ b/data/types/names.asm @@ -0,0 +1,40 @@ +TypeNames: + + dw .Normal + dw .Fighting + dw .Flying + dw .Poison + dw .Ground + dw .Rock + dw .Bird + dw .Bug + dw .Ghost + +REPT FIRE - GHOST - 1 + dw .Normal +ENDR + + dw .Fire + dw .Water + dw .Grass + dw .Electric + dw .Psychic + dw .Ice + dw .Dragon + +.Normal: db "NORMAL@" +.Fighting: db "FIGHTING@" +.Flying: db "FLYING@" +.Poison: db "POISON@" +.Fire: db "FIRE@" +.Water: db "WATER@" +.Grass: db "GRASS@" +.Electric: db "ELECTRIC@" +.Psychic: db "PSYCHIC@" +.Ice: db "ICE@" +.Ground: db "GROUND@" +.Rock: db "ROCK@" +.Bird: db "BIRD@" +.Bug: db "BUG@" +.Ghost: db "GHOST@" +.Dragon: db "DRAGON@" diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm new file mode 100644 index 00000000..52e3d956 --- /dev/null +++ b/data/types/type_matchups.asm @@ -0,0 +1,85 @@ +TypeEffects: + ; attacker, defender, *= + db WATER, FIRE, SUPER_EFFECTIVE + db FIRE, GRASS, SUPER_EFFECTIVE + db FIRE, ICE, SUPER_EFFECTIVE + db GRASS, WATER, SUPER_EFFECTIVE + db ELECTRIC, WATER, SUPER_EFFECTIVE + db WATER, ROCK, SUPER_EFFECTIVE + db GROUND, FLYING, NO_EFFECT + db WATER, WATER, NOT_VERY_EFFECTIVE + db FIRE, FIRE, NOT_VERY_EFFECTIVE + db ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE + db ICE, ICE, NOT_VERY_EFFECTIVE + db GRASS, GRASS, NOT_VERY_EFFECTIVE + db PSYCHIC_TYPE, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE + db FIRE, WATER, NOT_VERY_EFFECTIVE + db GRASS, FIRE, NOT_VERY_EFFECTIVE + db WATER, GRASS, NOT_VERY_EFFECTIVE + db ELECTRIC, GRASS, NOT_VERY_EFFECTIVE + db NORMAL, ROCK, NOT_VERY_EFFECTIVE + db NORMAL, GHOST, NO_EFFECT + db GHOST, GHOST, SUPER_EFFECTIVE + db FIRE, BUG, SUPER_EFFECTIVE + db FIRE, ROCK, NOT_VERY_EFFECTIVE + db WATER, GROUND, SUPER_EFFECTIVE + db ELECTRIC, GROUND, NO_EFFECT + db ELECTRIC, FLYING, SUPER_EFFECTIVE + db GRASS, GROUND, SUPER_EFFECTIVE + db GRASS, BUG, NOT_VERY_EFFECTIVE + db GRASS, POISON, NOT_VERY_EFFECTIVE + db GRASS, ROCK, SUPER_EFFECTIVE + db GRASS, FLYING, NOT_VERY_EFFECTIVE + db ICE, WATER, NOT_VERY_EFFECTIVE + db ICE, GRASS, SUPER_EFFECTIVE + db ICE, GROUND, SUPER_EFFECTIVE + db ICE, FLYING, SUPER_EFFECTIVE + db FIGHTING, NORMAL, SUPER_EFFECTIVE + db FIGHTING, POISON, NOT_VERY_EFFECTIVE + db FIGHTING, FLYING, NOT_VERY_EFFECTIVE + db FIGHTING, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE + db FIGHTING, BUG, NOT_VERY_EFFECTIVE + db FIGHTING, ROCK, SUPER_EFFECTIVE + db FIGHTING, ICE, SUPER_EFFECTIVE + db FIGHTING, GHOST, NO_EFFECT + db POISON, GRASS, SUPER_EFFECTIVE + db POISON, POISON, NOT_VERY_EFFECTIVE + db POISON, GROUND, NOT_VERY_EFFECTIVE + db POISON, BUG, SUPER_EFFECTIVE + db POISON, ROCK, NOT_VERY_EFFECTIVE + db POISON, GHOST, NOT_VERY_EFFECTIVE + db GROUND, FIRE, SUPER_EFFECTIVE + db GROUND, ELECTRIC, SUPER_EFFECTIVE + db GROUND, GRASS, NOT_VERY_EFFECTIVE + db GROUND, BUG, NOT_VERY_EFFECTIVE + db GROUND, ROCK, SUPER_EFFECTIVE + db GROUND, POISON, SUPER_EFFECTIVE + db FLYING, ELECTRIC, NOT_VERY_EFFECTIVE + db FLYING, FIGHTING, SUPER_EFFECTIVE + db FLYING, BUG, SUPER_EFFECTIVE + db FLYING, GRASS, SUPER_EFFECTIVE + db FLYING, ROCK, NOT_VERY_EFFECTIVE + db PSYCHIC_TYPE, FIGHTING, SUPER_EFFECTIVE + db PSYCHIC_TYPE, POISON, SUPER_EFFECTIVE + db BUG, FIRE, NOT_VERY_EFFECTIVE + db BUG, GRASS, SUPER_EFFECTIVE + db BUG, FIGHTING, NOT_VERY_EFFECTIVE + db BUG, FLYING, NOT_VERY_EFFECTIVE + db BUG, PSYCHIC_TYPE, SUPER_EFFECTIVE + db BUG, GHOST, NOT_VERY_EFFECTIVE + db BUG, POISON, SUPER_EFFECTIVE + db ROCK, FIRE, SUPER_EFFECTIVE + db ROCK, FIGHTING, NOT_VERY_EFFECTIVE + db ROCK, GROUND, NOT_VERY_EFFECTIVE + db ROCK, FLYING, SUPER_EFFECTIVE + db ROCK, BUG, SUPER_EFFECTIVE + db ROCK, ICE, SUPER_EFFECTIVE + db GHOST, NORMAL, NO_EFFECT + db GHOST, PSYCHIC_TYPE, NO_EFFECT + db FIRE, DRAGON, NOT_VERY_EFFECTIVE + db WATER, DRAGON, NOT_VERY_EFFECTIVE + db ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE + db GRASS, DRAGON, NOT_VERY_EFFECTIVE + db ICE, DRAGON, SUPER_EFFECTIVE + db DRAGON, DRAGON, SUPER_EFFECTIVE + db -1 ; end diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm deleted file mode 100755 index 6fd326cc..00000000 --- a/data/warp_tile_ids.asm +++ /dev/null @@ -1,85 +0,0 @@ -WarpTileIDPointers: - dw OverworldWarpTileIDs - dw RedsHouse1WarpTileIDs - dw MartWarpTileIDs - dw ForestWarpTileIDs - dw RedsHouse2WarpTileIDs - dw DojoWarpTileIDs - dw PokecenterWarpTileIDs - dw GymWarpTileIDs - dw HouseWarpTileIDs - dw ForestGateWarpTileIDs - dw MuseumWarpTileIDs - dw UndergroundWarpTileIDs - dw GateWarpTileIDs - dw ShipWarpTileIDs - dw ShipPortWarpTileIDs - dw CemeteryWarpTileIDs - dw InteriorWarpTileIDs - dw CavernWarpTileIDs - dw LobbyWarpTileIDs - dw MansionWarpTileIDs - dw LabWarpTileIDs - dw ClubWarpTileIDs - dw FacilityWarpTileIDs - dw PlateauWarpTileIDs - -OverworldWarpTileIDs: - db $1B,$58,$FF - -ForestGateWarpTileIDs: -MuseumWarpTileIDs: -GateWarpTileIDs: - db $3B - -RedsHouse1WarpTileIDs: -RedsHouse2WarpTileIDs: - db $1A,$1C,$FF - -MartWarpTileIDs: -PokecenterWarpTileIDs: - db $5E,$FF - -ForestWarpTileIDs: - db $5A,$5C,$3A,$FF - -DojoWarpTileIDs: -GymWarpTileIDs: - db $4A,$FF - -HouseWarpTileIDs: - db $54,$5C,$32,$FF - -ShipWarpTileIDs: - db $37,$39,$1E,$4A,$FF - -InteriorWarpTileIDs: - db $15,$55,$04,$FF - -CavernWarpTileIDs: - db $18,$1A,$22,$FF - -LobbyWarpTileIDs: - db $1A,$1C,$38,$FF - -MansionWarpTileIDs: - db $1A,$1C,$53,$FF - -LabWarpTileIDs: - db $34,$FF - -FacilityWarpTileIDs: - db $43,$58,$20 - -CemeteryWarpTileIDs: - db $1B - -UndergroundWarpTileIDs: - db $13,$FF - -PlateauWarpTileIDs: - db $1B,$3B - -ShipPortWarpTileIDs: -ClubWarpTileIDs: - db $FF diff --git a/data/wild/good_rod.asm b/data/wild/good_rod.asm new file mode 100644 index 00000000..700a5516 --- /dev/null +++ b/data/wild/good_rod.asm @@ -0,0 +1,5 @@ +; random choice of 2 good rod encounters +GoodRodMons: + ; level, species + db 10, GOLDEEN + db 10, POLIWAG diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm new file mode 100644 index 00000000..56ef25c4 --- /dev/null +++ b/data/wild/grass_water.asm @@ -0,0 +1,321 @@ +WildDataPointers: + dw NoMons ; PALLET_TOWN + dw NoMons ; VIRIDIAN_CITY + dw NoMons ; PEWTER_CITY + dw NoMons ; CERULEAN_CITY + dw NoMons ; LAVENDER_TOWN + dw NoMons ; VERMILION_CITY + dw NoMons ; CELADON_CITY + dw NoMons ; FUCHSIA_CITY + dw NoMons ; CINNABAR_ISLAND + dw NoMons ; INDIGO_PLATEAU + dw NoMons ; SAFFRON_CITY + dw NoMons ; unused + dw Route1Mons ; ROUTE_1 + dw Route2Mons ; ROUTE_2 + dw Route3Mons ; ROUTE_3 + dw Route4Mons ; ROUTE_4 + dw Route5Mons ; ROUTE_5 + dw Route6Mons ; ROUTE_6 + dw Route7Mons ; ROUTE_7 + dw Route8Mons ; ROUTE_8 + dw Route9Mons ; ROUTE_9 + dw Route10Mons ; ROUTE_10 + dw Route11Mons ; ROUTE_11 + dw Route12Mons ; ROUTE_12 + dw Route13Mons ; ROUTE_13 + dw Route14Mons ; ROUTE_14 + dw Route15Mons ; ROUTE_15 + dw Route16Mons ; ROUTE_16 + dw Route17Mons ; ROUTE_17 + dw Route18Mons ; ROUTE_18 + dw WaterMons ; ROUTE_19 + dw WaterMons ; ROUTE_20 + dw Route21Mons ; ROUTE_21 + dw Route22Mons ; ROUTE_22 + dw Route23Mons ; ROUTE_23 + dw Route24Mons ; ROUTE_24 + dw Route25Mons ; ROUTE_25 + dw NoMons ; REDS_HOUSE_1F + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw ForestMons ; ViridianForest + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw MoonMons1 + dw MoonMonsB1 + dw MoonMonsB2 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw TunnelMonsB1 + dw PowerPlantMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw PlateauMons1 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw TowerMons1 + dw TowerMons2 + dw TowerMons3 + dw TowerMons4 + dw TowerMons5 + dw TowerMons6 + dw TowerMons7 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw IslandMonsB1 + dw IslandMonsB2 + dw IslandMonsB3 + dw IslandMonsB4 + dw NoMons + dw NoMons + dw MansionMons1 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw IslandMons1 + dw NoMons + dw PlateauMons2 + dw NoMons + dw NoMons + dw CaveMons + dw PlateauMons3 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw MansionMons2 + dw MansionMons3 + dw MansionMonsB1 + dw ZoneMons1 + dw ZoneMons2 + dw ZoneMons3 + dw ZoneMonsCenter + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw DungeonMons2 + dw DungeonMonsB1 + dw DungeonMons1 + dw NoMons + dw NoMons + dw NoMons + dw TunnelMonsB2 + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw NoMons + dw -1 ; end + +; wild pokemon data is divided into two parts. +; first part: pokemon found in grass +; second part: pokemon found while surfing +; each part goes as follows: + ; if first byte == 0, then + ; no wild pokemon on this map + ; if first byte != 0, then + ; first byte is encounter rate + ; followed by 20 bytes: + ; level, species (ten times) + +INCLUDE "data/wild/maps/nothing.asm" +INCLUDE "data/wild/maps/Route1.asm" +INCLUDE "data/wild/maps/Route2.asm" +INCLUDE "data/wild/maps/Route22.asm" +INCLUDE "data/wild/maps/ViridianForest.asm" +INCLUDE "data/wild/maps/Route3.asm" +INCLUDE "data/wild/maps/MtMoon1F.asm" +INCLUDE "data/wild/maps/MtMoonB1F.asm" +INCLUDE "data/wild/maps/MtMoonB2F.asm" +INCLUDE "data/wild/maps/Route4.asm" +INCLUDE "data/wild/maps/Route24.asm" +INCLUDE "data/wild/maps/Route25.asm" +INCLUDE "data/wild/maps/Route9.asm" +INCLUDE "data/wild/maps/Route5.asm" +INCLUDE "data/wild/maps/Route6.asm" +INCLUDE "data/wild/maps/Route11.asm" +INCLUDE "data/wild/maps/RockTunnel1F.asm" +INCLUDE "data/wild/maps/RockTunnelB1F.asm" +INCLUDE "data/wild/maps/Route10.asm" +INCLUDE "data/wild/maps/Route12.asm" +INCLUDE "data/wild/maps/Route8.asm" +INCLUDE "data/wild/maps/Route7.asm" +INCLUDE "data/wild/maps/PokemonTower1F.asm" +INCLUDE "data/wild/maps/PokemonTower2F.asm" +INCLUDE "data/wild/maps/PokemonTower3F.asm" +INCLUDE "data/wild/maps/PokemonTower4F.asm" +INCLUDE "data/wild/maps/PokemonTower5F.asm" +INCLUDE "data/wild/maps/PokemonTower6F.asm" +INCLUDE "data/wild/maps/PokemonTower7F.asm" +INCLUDE "data/wild/maps/Route13.asm" +INCLUDE "data/wild/maps/Route14.asm" +INCLUDE "data/wild/maps/Route15.asm" +INCLUDE "data/wild/maps/Route16.asm" +INCLUDE "data/wild/maps/Route17.asm" +INCLUDE "data/wild/maps/Route18.asm" +INCLUDE "data/wild/maps/SafariZoneCenter.asm" +INCLUDE "data/wild/maps/SafariZoneEast.asm" +INCLUDE "data/wild/maps/SafariZoneNorth.asm" +INCLUDE "data/wild/maps/SafariZoneWest.asm" +INCLUDE "data/wild/maps/SeaRoutes.asm" +INCLUDE "data/wild/maps/SeafoamIslands1F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB1F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB2F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB3F.asm" +INCLUDE "data/wild/maps/SeafoamIslandsB4F.asm" +INCLUDE "data/wild/maps/PokemonMansion1F.asm" +INCLUDE "data/wild/maps/PokemonMansion2F.asm" +INCLUDE "data/wild/maps/PokemonMansion3F.asm" +INCLUDE "data/wild/maps/PokemonMansionB1F.asm" +INCLUDE "data/wild/maps/Route21.asm" +INCLUDE "data/wild/maps/CeruleanCave1F.asm" +INCLUDE "data/wild/maps/CeruleanCave2F.asm" +INCLUDE "data/wild/maps/CeruleanCaveB1F.asm" +INCLUDE "data/wild/maps/PowerPlant.asm" +INCLUDE "data/wild/maps/Route23.asm" +INCLUDE "data/wild/maps/VictoryRoad2F.asm" +INCLUDE "data/wild/maps/VictoryRoad3F.asm" +INCLUDE "data/wild/maps/VictoryRoad1F.asm" +INCLUDE "data/wild/maps/DiglettsCave.asm" diff --git a/data/wild/maps/CeruleanCave1F.asm b/data/wild/maps/CeruleanCave1F.asm new file mode 100644 index 00000000..eb39c525 --- /dev/null +++ b/data/wild/maps/CeruleanCave1F.asm @@ -0,0 +1,19 @@ +DungeonMons1: + db 10 ; grass encounter rate + db 46, GOLBAT + db 46, HYPNO + db 46, MAGNETON + db 49, DODRIO + db 49, VENOMOTH +IF DEF(_RED) + db 52, ARBOK +ENDC +IF DEF(_BLUE) + db 52, SANDSLASH +ENDC + db 49, KADABRA + db 52, PARASECT + db 53, RAICHU + db 53, DITTO + + db 0 ; water encounter rate diff --git a/data/wild/maps/CeruleanCave2F.asm b/data/wild/maps/CeruleanCave2F.asm new file mode 100644 index 00000000..cbdb2eaf --- /dev/null +++ b/data/wild/maps/CeruleanCave2F.asm @@ -0,0 +1,14 @@ +DungeonMons2: + db 15 ; grass encounter rate + db 51, DODRIO + db 51, VENOMOTH + db 51, KADABRA + db 52, RHYDON + db 52, MAROWAK + db 52, ELECTRODE + db 56, CHANSEY + db 54, WIGGLYTUFF + db 55, DITTO + db 60, DITTO + + db 0 ; water encounter rate diff --git a/data/wild/maps/CeruleanCaveB1F.asm b/data/wild/maps/CeruleanCaveB1F.asm new file mode 100644 index 00000000..86e8fba2 --- /dev/null +++ b/data/wild/maps/CeruleanCaveB1F.asm @@ -0,0 +1,19 @@ +DungeonMonsB1: + db 25 ; grass encounter rate + db 55, RHYDON + db 55, MAROWAK + db 55, ELECTRODE + db 64, CHANSEY + db 64, PARASECT + db 64, RAICHU +IF DEF(_RED) + db 57, ARBOK +ENDC +IF DEF(_BLUE) + db 57, SANDSLASH +ENDC + db 65, DITTO + db 63, DITTO + db 67, DITTO + + db 0 ; water encounter rate diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm new file mode 100644 index 00000000..d1e73af4 --- /dev/null +++ b/data/wild/maps/DiglettsCave.asm @@ -0,0 +1,14 @@ +CaveMons: + db 20 ; grass encounter rate + db 18, DIGLETT + db 19, DIGLETT + db 17, DIGLETT + db 20, DIGLETT + db 16, DIGLETT + db 15, DIGLETT + db 21, DIGLETT + db 22, DIGLETT + db 29, DUGTRIO + db 31, DUGTRIO + + db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm new file mode 100644 index 00000000..d8c9ba1b --- /dev/null +++ b/data/wild/maps/MtMoon1F.asm @@ -0,0 +1,14 @@ +MoonMons1: + db 10 ; grass encounter rate + db 8, ZUBAT + db 7, ZUBAT + db 9, ZUBAT + db 8, GEODUDE + db 6, ZUBAT + db 10, ZUBAT + db 10, GEODUDE + db 8, PARAS + db 11, ZUBAT + db 8, CLEFAIRY + + db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm new file mode 100644 index 00000000..875a7256 --- /dev/null +++ b/data/wild/maps/MtMoonB1F.asm @@ -0,0 +1,14 @@ +MoonMonsB1: + db 10 ; grass encounter rate + db 8, ZUBAT + db 7, ZUBAT + db 7, GEODUDE + db 8, GEODUDE + db 9, ZUBAT + db 10, PARAS + db 10, ZUBAT + db 11, ZUBAT + db 9, CLEFAIRY + db 9, GEODUDE + + db 0 ; water encounter rate diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm new file mode 100644 index 00000000..ae90ed1e --- /dev/null +++ b/data/wild/maps/MtMoonB2F.asm @@ -0,0 +1,14 @@ +MoonMonsB2: + db 10 ; grass encounter rate + db 9, ZUBAT + db 9, GEODUDE + db 10, ZUBAT + db 10, GEODUDE + db 11, ZUBAT + db 10, PARAS + db 12, PARAS + db 10, CLEFAIRY + db 12, ZUBAT + db 12, CLEFAIRY + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion1F.asm b/data/wild/maps/PokemonMansion1F.asm new file mode 100644 index 00000000..3be7fb18 --- /dev/null +++ b/data/wild/maps/PokemonMansion1F.asm @@ -0,0 +1,28 @@ +MansionMons1: + db 10 ; grass encounter rate +IF DEF(_RED) + db 32, KOFFING + db 30, KOFFING + db 34, PONYTA + db 30, PONYTA + db 34, GROWLITHE + db 32, PONYTA + db 30, GRIMER + db 28, PONYTA + db 37, WEEZING + db 39, MUK +ENDC +IF DEF(_BLUE) + db 32, GRIMER + db 30, GRIMER + db 34, PONYTA + db 30, PONYTA + db 34, VULPIX + db 32, PONYTA + db 30, KOFFING + db 28, PONYTA + db 37, MUK + db 39, WEEZING +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion2F.asm b/data/wild/maps/PokemonMansion2F.asm new file mode 100644 index 00000000..494973b2 --- /dev/null +++ b/data/wild/maps/PokemonMansion2F.asm @@ -0,0 +1,28 @@ +MansionMons2: + db 10 ; grass encounter rate +IF DEF(_RED) + db 32, GROWLITHE + db 34, KOFFING + db 34, KOFFING + db 30, PONYTA + db 30, KOFFING + db 32, PONYTA + db 30, GRIMER + db 28, PONYTA + db 39, WEEZING + db 37, MUK +ENDC +IF DEF(_BLUE) + db 32, VULPIX + db 34, GRIMER + db 34, GRIMER + db 30, PONYTA + db 30, GRIMER + db 32, PONYTA + db 30, KOFFING + db 28, PONYTA + db 39, MUK + db 37, WEEZING +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansion3F.asm b/data/wild/maps/PokemonMansion3F.asm new file mode 100644 index 00000000..bbb14213 --- /dev/null +++ b/data/wild/maps/PokemonMansion3F.asm @@ -0,0 +1,28 @@ +MansionMons3: + db 10 ; grass encounter rate +IF DEF(_RED) + db 31, KOFFING + db 33, GROWLITHE + db 35, KOFFING + db 32, PONYTA + db 34, PONYTA + db 40, WEEZING + db 34, GRIMER + db 38, WEEZING + db 36, PONYTA + db 42, MUK +ENDC +IF DEF(_BLUE) + db 31, GRIMER + db 33, VULPIX + db 35, GRIMER + db 32, PONYTA + db 34, MAGMAR + db 40, MUK + db 34, KOFFING + db 38, MUK + db 36, PONYTA + db 42, WEEZING +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonMansionB1F.asm b/data/wild/maps/PokemonMansionB1F.asm new file mode 100644 index 00000000..77f989b2 --- /dev/null +++ b/data/wild/maps/PokemonMansionB1F.asm @@ -0,0 +1,28 @@ +MansionMonsB1: + db 10 ; grass encounter rate +IF DEF(_RED) + db 33, KOFFING + db 31, KOFFING + db 35, GROWLITHE + db 32, PONYTA + db 31, KOFFING + db 40, WEEZING + db 34, PONYTA + db 35, GRIMER + db 42, WEEZING + db 42, MUK +ENDC +IF DEF(_BLUE) + db 33, GRIMER + db 31, GRIMER + db 35, VULPIX + db 32, PONYTA + db 31, GRIMER + db 40, MUK + db 34, PONYTA + db 35, KOFFING + db 38, MAGMAR + db 42, WEEZING +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower1F.asm b/data/wild/maps/PokemonTower1F.asm new file mode 100644 index 00000000..95bef4a3 --- /dev/null +++ b/data/wild/maps/PokemonTower1F.asm @@ -0,0 +1,4 @@ +TowerMons1: + db 0 ; grass encounter rate + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm new file mode 100644 index 00000000..77b7d415 --- /dev/null +++ b/data/wild/maps/PokemonTower2F.asm @@ -0,0 +1,4 @@ +TowerMons2: + db 0 ; grass encounter rate + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm new file mode 100644 index 00000000..177497e9 --- /dev/null +++ b/data/wild/maps/PokemonTower3F.asm @@ -0,0 +1,14 @@ +TowerMons3: + db 10 ; grass encounter rate + db 20, GASTLY + db 21, GASTLY + db 22, GASTLY + db 23, GASTLY + db 19, GASTLY + db 18, GASTLY + db 24, GASTLY + db 20, CUBONE + db 22, CUBONE + db 25, HAUNTER + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm new file mode 100644 index 00000000..b6e82d14 --- /dev/null +++ b/data/wild/maps/PokemonTower4F.asm @@ -0,0 +1,14 @@ +TowerMons4: + db 10 ; grass encounter rate + db 20, GASTLY + db 21, GASTLY + db 22, GASTLY + db 23, GASTLY + db 19, GASTLY + db 18, GASTLY + db 25, HAUNTER + db 20, CUBONE + db 22, CUBONE + db 24, GASTLY + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm new file mode 100644 index 00000000..03c41eba --- /dev/null +++ b/data/wild/maps/PokemonTower5F.asm @@ -0,0 +1,14 @@ +TowerMons5: + db 10 ; grass encounter rate + db 20, GASTLY + db 21, GASTLY + db 22, GASTLY + db 23, GASTLY + db 19, GASTLY + db 18, GASTLY + db 25, HAUNTER + db 20, CUBONE + db 22, CUBONE + db 24, GASTLY + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm new file mode 100644 index 00000000..38898de1 --- /dev/null +++ b/data/wild/maps/PokemonTower6F.asm @@ -0,0 +1,14 @@ +TowerMons6: + db 15 ; grass encounter rate + db 21, GASTLY + db 22, GASTLY + db 23, GASTLY + db 24, GASTLY + db 20, GASTLY + db 19, GASTLY + db 26, HAUNTER + db 22, CUBONE + db 24, CUBONE + db 28, HAUNTER + + db 0 ; water encounter rate diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm new file mode 100644 index 00000000..b2faa100 --- /dev/null +++ b/data/wild/maps/PokemonTower7F.asm @@ -0,0 +1,14 @@ +TowerMons7: + db 15 ; grass encounter rate + db 21, GASTLY + db 22, GASTLY + db 23, GASTLY + db 24, GASTLY + db 20, GASTLY + db 28, HAUNTER + db 22, CUBONE + db 24, CUBONE + db 28, HAUNTER + db 30, HAUNTER + + db 0 ; water encounter rate diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm new file mode 100644 index 00000000..f70dfbcb --- /dev/null +++ b/data/wild/maps/PowerPlant.asm @@ -0,0 +1,20 @@ +PowerPlantMons: + db 10 ; grass encounter rate + db 21, VOLTORB + db 21, MAGNEMITE + db 20, PIKACHU + db 24, PIKACHU + db 23, MAGNEMITE + db 23, VOLTORB + db 32, MAGNETON + db 35, MAGNETON +IF DEF(_RED) + db 33, ELECTABUZZ + db 36, ELECTABUZZ +ENDC +IF DEF(_BLUE) + db 33, RAICHU + db 36, RAICHU +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm new file mode 100644 index 00000000..42a6d58b --- /dev/null +++ b/data/wild/maps/RockTunnel1F.asm @@ -0,0 +1,14 @@ +TunnelMonsB1: + db 15 ; grass encounter rate + db 16, ZUBAT + db 17, ZUBAT + db 17, GEODUDE + db 15, MACHOP + db 16, GEODUDE + db 18, ZUBAT + db 15, ZUBAT + db 17, MACHOP + db 13, ONIX + db 15, ONIX + + db 0 ; water encounter rate diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm new file mode 100644 index 00000000..2f970332 --- /dev/null +++ b/data/wild/maps/RockTunnelB1F.asm @@ -0,0 +1,14 @@ +TunnelMonsB2: + db 15 ; grass encounter rate + db 16, ZUBAT + db 17, ZUBAT + db 17, GEODUDE + db 15, MACHOP + db 16, GEODUDE + db 18, ZUBAT + db 17, MACHOP + db 17, ONIX + db 13, ONIX + db 18, GEODUDE + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm new file mode 100644 index 00000000..e75ded3b --- /dev/null +++ b/data/wild/maps/Route1.asm @@ -0,0 +1,14 @@ +Route1Mons: + db 25 ; grass encounter rate + db 3, PIDGEY + db 3, RATTATA + db 3, RATTATA + db 2, RATTATA + db 2, PIDGEY + db 3, PIDGEY + db 3, PIDGEY + db 4, RATTATA + db 4, PIDGEY + db 5, PIDGEY + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm new file mode 100644 index 00000000..603dc389 --- /dev/null +++ b/data/wild/maps/Route10.asm @@ -0,0 +1,25 @@ +Route10Mons: + db 15 ; grass encounter rate + db 16, VOLTORB + db 16, SPEAROW + db 14, VOLTORB +IF DEF(_RED) + db 11, EKANS + db 13, SPEAROW + db 15, EKANS + db 17, VOLTORB + db 17, SPEAROW + db 13, EKANS + db 17, EKANS +ENDC +IF DEF(_BLUE) + db 11, SANDSHREW + db 13, SPEAROW + db 15, SANDSHREW + db 17, VOLTORB + db 17, SPEAROW + db 13, SANDSHREW + db 17, SANDSHREW +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm new file mode 100644 index 00000000..ea053c07 --- /dev/null +++ b/data/wild/maps/Route11.asm @@ -0,0 +1,25 @@ +Route11Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 14, EKANS + db 15, SPEAROW + db 12, EKANS + db 9, DROWZEE + db 13, SPEAROW + db 13, DROWZEE + db 15, EKANS +ENDC +IF DEF(_BLUE) + db 14, SANDSHREW + db 15, SPEAROW + db 12, SANDSHREW + db 9, DROWZEE + db 13, SPEAROW + db 13, DROWZEE + db 15, SANDSHREW +ENDC + db 17, SPEAROW + db 11, DROWZEE + db 15, DROWZEE + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm new file mode 100644 index 00000000..acdfe6b6 --- /dev/null +++ b/data/wild/maps/Route12.asm @@ -0,0 +1,28 @@ +Route12Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 24, ODDISH + db 25, PIDGEY + db 23, PIDGEY + db 24, VENONAT + db 22, ODDISH + db 26, VENONAT + db 26, ODDISH + db 27, PIDGEY + db 28, GLOOM + db 30, GLOOM +ENDC +IF DEF(_BLUE) + db 24, BELLSPROUT + db 25, PIDGEY + db 23, PIDGEY + db 24, VENONAT + db 22, BELLSPROUT + db 26, VENONAT + db 26, BELLSPROUT + db 27, PIDGEY + db 28, WEEPINBELL + db 30, WEEPINBELL +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm new file mode 100644 index 00000000..4d0c0a46 --- /dev/null +++ b/data/wild/maps/Route13.asm @@ -0,0 +1,28 @@ +Route13Mons: + db 20 ; grass encounter rate +IF DEF(_RED) + db 24, ODDISH + db 25, PIDGEY + db 27, PIDGEY + db 24, VENONAT + db 22, ODDISH + db 26, VENONAT + db 26, ODDISH + db 25, DITTO + db 28, GLOOM + db 30, GLOOM +ENDC +IF DEF(_BLUE) + db 24, BELLSPROUT + db 25, PIDGEY + db 27, PIDGEY + db 24, VENONAT + db 22, BELLSPROUT + db 26, VENONAT + db 26, BELLSPROUT + db 25, DITTO + db 28, WEEPINBELL + db 30, WEEPINBELL +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm new file mode 100644 index 00000000..a91631a8 --- /dev/null +++ b/data/wild/maps/Route14.asm @@ -0,0 +1,26 @@ +Route14Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 24, ODDISH + db 26, PIDGEY + db 23, DITTO + db 24, VENONAT + db 22, ODDISH + db 26, VENONAT + db 26, ODDISH + db 30, GLOOM +ENDC +IF DEF(_BLUE) + db 24, BELLSPROUT + db 26, PIDGEY + db 23, DITTO + db 24, VENONAT + db 22, BELLSPROUT + db 26, VENONAT + db 26, BELLSPROUT + db 30, WEEPINBELL +ENDC + db 28, PIDGEOTTO + db 30, PIDGEOTTO + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm new file mode 100644 index 00000000..13bd7f32 --- /dev/null +++ b/data/wild/maps/Route15.asm @@ -0,0 +1,26 @@ +Route15Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 24, ODDISH + db 26, DITTO + db 23, PIDGEY + db 26, VENONAT + db 22, ODDISH + db 28, VENONAT + db 26, ODDISH + db 30, GLOOM +ENDC +IF DEF(_BLUE) + db 24, BELLSPROUT + db 26, DITTO + db 23, PIDGEY + db 26, VENONAT + db 22, BELLSPROUT + db 28, VENONAT + db 26, BELLSPROUT + db 30, WEEPINBELL +ENDC + db 28, PIDGEOTTO + db 30, PIDGEOTTO + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm new file mode 100644 index 00000000..ecab87c1 --- /dev/null +++ b/data/wild/maps/Route16.asm @@ -0,0 +1,14 @@ +Route16Mons: + db 25 ; grass encounter rate + db 20, SPEAROW + db 22, SPEAROW + db 18, RATTATA + db 20, DODUO + db 20, RATTATA + db 18, DODUO + db 22, DODUO + db 22, RATTATA + db 23, RATICATE + db 25, RATICATE + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm new file mode 100644 index 00000000..762b5449 --- /dev/null +++ b/data/wild/maps/Route17.asm @@ -0,0 +1,14 @@ +Route17Mons: + db 25 ; grass encounter rate + db 20, SPEAROW + db 22, SPEAROW + db 25, RATICATE + db 24, DODUO + db 27, RATICATE + db 26, DODUO + db 28, DODUO + db 29, RATICATE + db 25, FEAROW + db 27, FEAROW + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route18.asm b/data/wild/maps/Route18.asm new file mode 100644 index 00000000..d8123c5e --- /dev/null +++ b/data/wild/maps/Route18.asm @@ -0,0 +1,14 @@ +Route18Mons: + db 25 ; grass encounter rate + db 20, SPEAROW + db 22, SPEAROW + db 25, RATICATE + db 24, DODUO + db 25, FEAROW + db 26, DODUO + db 28, DODUO + db 29, RATICATE + db 27, FEAROW + db 29, FEAROW + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm new file mode 100644 index 00000000..035e5b28 --- /dev/null +++ b/data/wild/maps/Route2.asm @@ -0,0 +1,23 @@ +Route2Mons: + db 25 ; grass encounter rate + db 3, RATTATA + db 3, PIDGEY + db 4, PIDGEY + db 4, RATTATA + db 5, PIDGEY +IF DEF(_RED) + db 3, WEEDLE + db 2, RATTATA + db 5, RATTATA + db 4, WEEDLE + db 5, WEEDLE +ENDC +IF DEF(_BLUE) + db 3, CATERPIE + db 2, RATTATA + db 5, RATTATA + db 4, CATERPIE + db 5, CATERPIE +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm new file mode 100644 index 00000000..13ffe445 --- /dev/null +++ b/data/wild/maps/Route21.asm @@ -0,0 +1,24 @@ +Route21Mons: + db 25 ; grass encounter rate + db 21, RATTATA + db 23, PIDGEY + db 30, RATICATE + db 23, RATTATA + db 21, PIDGEY + db 30, PIDGEOTTO + db 32, PIDGEOTTO + db 28, TANGELA + db 30, TANGELA + db 32, TANGELA + + db 5 ; water encounter rate + db 5, TENTACOOL + db 10, TENTACOOL + db 15, TENTACOOL + db 5, TENTACOOL + db 10, TENTACOOL + db 15, TENTACOOL + db 20, TENTACOOL + db 30, TENTACOOL + db 35, TENTACOOL + db 40, TENTACOOL diff --git a/data/wild/maps/Route22.asm b/data/wild/maps/Route22.asm new file mode 100644 index 00000000..c8f72608 --- /dev/null +++ b/data/wild/maps/Route22.asm @@ -0,0 +1,27 @@ +Route22Mons: + db 25 ; grass encounter rate + db 3, RATTATA +IF DEF(_RED) + db 3, NIDORAN_M + db 4, RATTATA + db 4, NIDORAN_M + db 2, RATTATA + db 2, NIDORAN_M + db 3, SPEAROW + db 5, SPEAROW + db 3, NIDORAN_F + db 4, NIDORAN_F +ENDC +IF DEF(_BLUE) + db 3, NIDORAN_F + db 4, RATTATA + db 4, NIDORAN_F + db 2, RATTATA + db 2, NIDORAN_F + db 3, SPEAROW + db 5, SPEAROW + db 3, NIDORAN_M + db 4, NIDORAN_M +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm new file mode 100644 index 00000000..77f019a3 --- /dev/null +++ b/data/wild/maps/Route23.asm @@ -0,0 +1,24 @@ +Route23Mons: + db 10 ; grass encounter rate +IF DEF(_RED) + db 26, EKANS +ENDC +IF DEF(_BLUE) + db 26, SANDSHREW +ENDC + db 33, DITTO + db 26, SPEAROW + db 38, FEAROW + db 38, DITTO + db 38, FEAROW +IF DEF(_RED) + db 41, ARBOK +ENDC +IF DEF(_BLUE) + db 41, SANDSLASH +ENDC + db 43, DITTO + db 41, FEAROW + db 43, FEAROW + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route24.asm b/data/wild/maps/Route24.asm new file mode 100644 index 00000000..8ba7d232 --- /dev/null +++ b/data/wild/maps/Route24.asm @@ -0,0 +1,25 @@ +Route24Mons: + db 25 ; grass encounter rate +IF DEF(_RED) + db 7, WEEDLE + db 8, KAKUNA + db 12, PIDGEY + db 12, ODDISH + db 13, ODDISH + db 10, ABRA + db 14, ODDISH +ENDC +IF DEF(_BLUE) + db 7, CATERPIE + db 8, METAPOD + db 12, PIDGEY + db 12, BELLSPROUT + db 13, BELLSPROUT + db 10, ABRA + db 14, BELLSPROUT +ENDC + db 13, PIDGEY + db 8, ABRA + db 12, ABRA + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm new file mode 100644 index 00000000..7e0ded65 --- /dev/null +++ b/data/wild/maps/Route25.asm @@ -0,0 +1,28 @@ +Route25Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 8, WEEDLE + db 9, KAKUNA + db 13, PIDGEY + db 12, ODDISH + db 13, ODDISH + db 12, ABRA + db 14, ODDISH + db 10, ABRA + db 7, METAPOD + db 8, CATERPIE +ENDC +IF DEF(_BLUE) + db 8, CATERPIE + db 9, METAPOD + db 13, PIDGEY + db 12, BELLSPROUT + db 13, BELLSPROUT + db 12, ABRA + db 14, BELLSPROUT + db 10, ABRA + db 7, KAKUNA + db 8, WEEDLE +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route3.asm b/data/wild/maps/Route3.asm new file mode 100644 index 00000000..b397b1d1 --- /dev/null +++ b/data/wild/maps/Route3.asm @@ -0,0 +1,14 @@ +Route3Mons: + db 20 ; grass encounter rate + db 6, PIDGEY + db 5, SPEAROW + db 7, PIDGEY + db 6, SPEAROW + db 7, SPEAROW + db 8, PIDGEY + db 8, SPEAROW + db 3, JIGGLYPUFF + db 5, JIGGLYPUFF + db 7, JIGGLYPUFF + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm new file mode 100644 index 00000000..d4f4763b --- /dev/null +++ b/data/wild/maps/Route4.asm @@ -0,0 +1,24 @@ +Route4Mons: + db 20 ; grass encounter rate + db 10, RATTATA + db 10, SPEAROW + db 8, RATTATA +IF DEF(_RED) + db 6, EKANS + db 8, SPEAROW + db 10, EKANS + db 12, RATTATA + db 12, SPEAROW + db 8, EKANS + db 12, EKANS +ENDC +IF DEF(_BLUE) + db 6, SANDSHREW + db 8, SPEAROW + db 10, SANDSHREW + db 12, RATTATA + db 12, SPEAROW + db 8, SANDSHREW + db 12, SANDSHREW +ENDC + db 0 ; water encounter rate diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm new file mode 100644 index 00000000..dd200378 --- /dev/null +++ b/data/wild/maps/Route5.asm @@ -0,0 +1,28 @@ +Route5Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 13, ODDISH + db 13, PIDGEY + db 15, PIDGEY + db 10, MANKEY + db 12, MANKEY + db 15, ODDISH + db 16, ODDISH + db 16, PIDGEY + db 14, MANKEY + db 16, MANKEY +ENDC +IF DEF(_BLUE) + db 13, BELLSPROUT + db 13, PIDGEY + db 15, PIDGEY + db 10, MEOWTH + db 12, MEOWTH + db 15, BELLSPROUT + db 16, BELLSPROUT + db 16, PIDGEY + db 14, MEOWTH + db 16, MEOWTH +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm new file mode 100644 index 00000000..15585ea4 --- /dev/null +++ b/data/wild/maps/Route6.asm @@ -0,0 +1,28 @@ +Route6Mons: + db 15 ; grass encounter rate +IF DEF(_RED) + db 13, ODDISH + db 13, PIDGEY + db 15, PIDGEY + db 10, MANKEY + db 12, MANKEY + db 15, ODDISH + db 16, ODDISH + db 16, PIDGEY + db 14, MANKEY + db 16, MANKEY +ENDC +IF DEF(_BLUE) + db 13, BELLSPROUT + db 13, PIDGEY + db 15, PIDGEY + db 10, MEOWTH + db 12, MEOWTH + db 15, BELLSPROUT + db 16, BELLSPROUT + db 16, PIDGEY + db 14, MEOWTH + db 16, MEOWTH +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm new file mode 100644 index 00000000..39508bf0 --- /dev/null +++ b/data/wild/maps/Route7.asm @@ -0,0 +1,27 @@ +Route7Mons: + db 15 ; grass encounter rate + db 19, PIDGEY +IF DEF(_RED) + db 19, ODDISH + db 17, MANKEY + db 22, ODDISH + db 22, PIDGEY + db 18, MANKEY + db 18, GROWLITHE + db 20, GROWLITHE + db 19, MANKEY + db 20, MANKEY +ENDC +IF DEF(_BLUE) + db 19, BELLSPROUT + db 17, MEOWTH + db 22, BELLSPROUT + db 22, PIDGEY + db 18, MEOWTH + db 18, VULPIX + db 20, VULPIX + db 19, MEOWTH + db 20, MEOWTH +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm new file mode 100644 index 00000000..005ee677 --- /dev/null +++ b/data/wild/maps/Route8.asm @@ -0,0 +1,27 @@ +Route8Mons: + db 15 ; grass encounter rate + db 18, PIDGEY +IF DEF(_RED) + db 18, MANKEY + db 17, EKANS + db 16, GROWLITHE + db 20, PIDGEY + db 20, MANKEY + db 19, EKANS + db 17, GROWLITHE + db 15, GROWLITHE + db 18, GROWLITHE +ENDC +IF DEF(_BLUE) + db 18, MEOWTH + db 17, SANDSHREW + db 16, VULPIX + db 20, PIDGEY + db 20, MEOWTH + db 19, SANDSHREW + db 17, VULPIX + db 15, VULPIX + db 18, VULPIX +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm new file mode 100644 index 00000000..a38fc35f --- /dev/null +++ b/data/wild/maps/Route9.asm @@ -0,0 +1,25 @@ +Route9Mons: + db 15 ; grass encounter rate + db 16, RATTATA + db 16, SPEAROW + db 14, RATTATA +IF DEF(_RED) + db 11, EKANS + db 13, SPEAROW + db 15, EKANS + db 17, RATTATA + db 17, SPEAROW + db 13, EKANS + db 17, EKANS +ENDC +IF DEF(_BLUE) + db 11, SANDSHREW + db 13, SPEAROW + db 15, SANDSHREW + db 17, RATTATA + db 17, SPEAROW + db 13, SANDSHREW + db 17, SANDSHREW +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm new file mode 100644 index 00000000..4661b927 --- /dev/null +++ b/data/wild/maps/SafariZoneCenter.asm @@ -0,0 +1,27 @@ +ZoneMonsCenter: + db 30 ; grass encounter rate +IF DEF(_RED) + db 22, NIDORAN_M + db 25, RHYHORN + db 22, VENONAT + db 24, EXEGGCUTE + db 31, NIDORINO + db 25, EXEGGCUTE + db 31, NIDORINA + db 30, PARASECT + db 23, SCYTHER +ENDC +IF DEF(_BLUE) + db 22, NIDORAN_F + db 25, RHYHORN + db 22, VENONAT + db 24, EXEGGCUTE + db 31, NIDORINA + db 25, EXEGGCUTE + db 31, NIDORINO + db 30, PARASECT + db 23, PINSIR +ENDC + db 23, CHANSEY + + db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm new file mode 100644 index 00000000..9910bf12 --- /dev/null +++ b/data/wild/maps/SafariZoneEast.asm @@ -0,0 +1,28 @@ +ZoneMons1: + db 30 ; grass encounter rate +IF DEF(_RED) + db 24, NIDORAN_M + db 26, DODUO + db 22, PARAS + db 25, EXEGGCUTE + db 33, NIDORINO + db 23, EXEGGCUTE + db 24, NIDORAN_F + db 25, PARASECT + db 25, KANGASKHAN + db 28, SCYTHER +ENDC +IF DEF(_BLUE) + db 24, NIDORAN_F + db 26, DODUO + db 22, PARAS + db 25, EXEGGCUTE + db 33, NIDORINA + db 23, EXEGGCUTE + db 24, NIDORAN_M + db 25, PARASECT + db 25, KANGASKHAN + db 28, PINSIR +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm new file mode 100644 index 00000000..4482571b --- /dev/null +++ b/data/wild/maps/SafariZoneNorth.asm @@ -0,0 +1,25 @@ +ZoneMons2: + db 30 ; grass encounter rate +IF DEF(_RED) + db 22, NIDORAN_M + db 26, RHYHORN + db 23, PARAS + db 25, EXEGGCUTE + db 30, NIDORINO + db 27, EXEGGCUTE + db 30, NIDORINA +ENDC +IF DEF(_BLUE) + db 22, NIDORAN_F + db 26, RHYHORN + db 23, PARAS + db 25, EXEGGCUTE + db 30, NIDORINA + db 27, EXEGGCUTE + db 30, NIDORINO +ENDC + db 32, VENOMOTH + db 26, CHANSEY + db 28, TAUROS + + db 0 ; water encounter rate diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm new file mode 100644 index 00000000..c9989cc9 --- /dev/null +++ b/data/wild/maps/SafariZoneWest.asm @@ -0,0 +1,25 @@ +ZoneMons3: + db 30 ; grass encounter rate +IF DEF(_RED) + db 25, NIDORAN_M + db 26, DODUO + db 23, VENONAT + db 24, EXEGGCUTE + db 33, NIDORINO + db 26, EXEGGCUTE + db 25, NIDORAN_F +ENDC +IF DEF(_BLUE) + db 25, NIDORAN_F + db 26, DODUO + db 23, VENONAT + db 24, EXEGGCUTE + db 33, NIDORINA + db 26, EXEGGCUTE + db 25, NIDORAN_M +ENDC + db 31, VENOMOTH + db 26, TAUROS + db 28, KANGASKHAN + + db 0 ; water encounter rate diff --git a/data/wild/maps/SeaRoutes.asm b/data/wild/maps/SeaRoutes.asm new file mode 100644 index 00000000..72ea781d --- /dev/null +++ b/data/wild/maps/SeaRoutes.asm @@ -0,0 +1,14 @@ +WaterMons: + db 0 ; grass encounter rate + + db 5 ; water encounter rate + db 5, TENTACOOL + db 10, TENTACOOL + db 15, TENTACOOL + db 5, TENTACOOL + db 10, TENTACOOL + db 15, TENTACOOL + db 20, TENTACOOL + db 30, TENTACOOL + db 35, TENTACOOL + db 40, TENTACOOL diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm new file mode 100644 index 00000000..b191de13 --- /dev/null +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -0,0 +1,27 @@ +IslandMons1: + db 15 ; grass encounter rate + db 30, SEEL +IF DEF(_RED) + db 30, SLOWPOKE + db 30, SHELLDER + db 30, HORSEA + db 28, HORSEA + db 21, ZUBAT + db 29, GOLBAT + db 28, PSYDUCK + db 28, SHELLDER + db 38, GOLDUCK +ENDC +IF DEF(_BLUE) + db 30, PSYDUCK + db 30, STARYU + db 30, KRABBY + db 28, KRABBY + db 21, ZUBAT + db 29, GOLBAT + db 28, SLOWPOKE + db 28, STARYU + db 38, SLOWBRO +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm new file mode 100644 index 00000000..79762821 --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -0,0 +1,28 @@ +IslandMonsB1: + db 10 ; grass encounter rate +IF DEF(_RED) + db 30, STARYU + db 30, HORSEA + db 32, SHELLDER + db 32, HORSEA + db 28, SLOWPOKE + db 30, SEEL + db 30, SLOWPOKE + db 28, SEEL + db 38, DEWGONG + db 37, SEADRA +ENDC +IF DEF(_BLUE) + db 30, SHELLDER + db 30, KRABBY + db 32, STARYU + db 32, KRABBY + db 28, PSYDUCK + db 30, SEEL + db 30, PSYDUCK + db 28, SEEL + db 38, DEWGONG + db 37, KINGLER +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm new file mode 100644 index 00000000..e68d71cc --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -0,0 +1,27 @@ +IslandMonsB2: + db 10 ; grass encounter rate + db 30, SEEL +IF DEF(_RED) + db 30, SLOWPOKE + db 32, SEEL + db 32, SLOWPOKE + db 28, HORSEA + db 30, STARYU + db 30, HORSEA + db 28, SHELLDER + db 30, GOLBAT + db 37, SLOWBRO +ENDC +IF DEF(_BLUE) + db 30, PSYDUCK + db 32, SEEL + db 32, PSYDUCK + db 28, KRABBY + db 30, SHELLDER + db 30, KRABBY + db 28, STARYU + db 30, GOLBAT + db 37, GOLDUCK +ENDC + + db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm new file mode 100644 index 00000000..35319df9 --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -0,0 +1,27 @@ +IslandMonsB3: + db 10 ; grass encounter rate +IF DEF(_RED) + db 31, SLOWPOKE + db 31, SEEL + db 33, SLOWPOKE + db 33, SEEL + db 29, HORSEA + db 31, SHELLDER + db 31, HORSEA + db 29, SHELLDER + db 39, SEADRA +ENDC +IF DEF(_BLUE) + db 31, PSYDUCK + db 31, SEEL + db 33, PSYDUCK + db 33, SEEL + db 29, KRABBY + db 31, STARYU + db 31, KRABBY + db 29, STARYU + db 39, KINGLER +ENDC + db 37, DEWGONG + + db 0 ; water encounter rate diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm new file mode 100644 index 00000000..c5e3766b --- /dev/null +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -0,0 +1,27 @@ +IslandMonsB4: + db 10 ; grass encounter rate +IF DEF(_RED) + db 31, HORSEA + db 31, SHELLDER + db 33, HORSEA + db 33, SHELLDER + db 29, SLOWPOKE + db 31, SEEL + db 31, SLOWPOKE + db 29, SEEL + db 39, SLOWBRO +ENDC +IF DEF(_BLUE) + db 31, KRABBY + db 31, STARYU + db 33, KRABBY + db 33, STARYU + db 29, PSYDUCK + db 31, SEEL + db 31, PSYDUCK + db 29, SEEL + db 39, GOLDUCK +ENDC + db 32, GOLBAT + + db 0 ; water encounter rate diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm new file mode 100644 index 00000000..71adde2e --- /dev/null +++ b/data/wild/maps/VictoryRoad1F.asm @@ -0,0 +1,14 @@ +PlateauMons1: + db 15 ; grass encounter rate + db 24, MACHOP + db 26, GEODUDE + db 22, ZUBAT + db 36, ONIX + db 39, ONIX + db 42, ONIX + db 41, GRAVELER + db 41, GOLBAT + db 42, MACHOKE + db 43, MAROWAK + + db 0 ; water encounter rate diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm new file mode 100644 index 00000000..ee660e3a --- /dev/null +++ b/data/wild/maps/VictoryRoad2F.asm @@ -0,0 +1,14 @@ +PlateauMons2: + db 10 ; grass encounter rate + db 22, MACHOP + db 24, GEODUDE + db 26, ZUBAT + db 36, ONIX + db 39, ONIX + db 42, ONIX + db 41, MACHOKE + db 40, GOLBAT + db 40, MAROWAK + db 43, GRAVELER + + db 0 ; water encounter rate diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm new file mode 100644 index 00000000..754557bf --- /dev/null +++ b/data/wild/maps/VictoryRoad3F.asm @@ -0,0 +1,14 @@ +PlateauMons3: + db 15 ; grass encounter rate + db 24, MACHOP + db 26, GEODUDE + db 22, ZUBAT + db 42, ONIX + db 40, VENOMOTH + db 45, ONIX + db 43, GRAVELER + db 41, GOLBAT + db 42, MACHOKE + db 45, MACHOKE + + db 0 ; water encounter rate diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm new file mode 100644 index 00000000..d11fc34e --- /dev/null +++ b/data/wild/maps/ViridianForest.asm @@ -0,0 +1,26 @@ +ForestMons: + db 8 ; grass encounter rate +IF DEF(_RED) + db 4, WEEDLE + db 5, KAKUNA + db 3, WEEDLE + db 5, WEEDLE + db 4, KAKUNA + db 6, KAKUNA + db 4, METAPOD + db 3, CATERPIE +ENDC +IF DEF(_BLUE) + db 4, CATERPIE + db 5, METAPOD + db 3, CATERPIE + db 5, CATERPIE + db 4, METAPOD + db 6, METAPOD + db 4, KAKUNA + db 3, WEEDLE +ENDC + db 3, PIKACHU + db 5, PIKACHU + + db 0 ; water encounter rate diff --git a/data/wild/maps/nothing.asm b/data/wild/maps/nothing.asm new file mode 100644 index 00000000..19570b50 --- /dev/null +++ b/data/wild/maps/nothing.asm @@ -0,0 +1,4 @@ +NoMons: + db 0 ; grass encounter rate + + db 0 ; water encounter rate diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm new file mode 100644 index 00000000..2c56c6b9 --- /dev/null +++ b/data/wild/probabilities.asm @@ -0,0 +1,15 @@ +WildMonEncounterSlotChances: +; There are 10 slots for wild pokemon, and this is the table that defines how common each of +; those 10 slots is. A random number is generated and then the first byte of each pair in this +; table is compared against that random number. If the random number is less than or equal +; to the first byte, then that slot is chosen. The second byte is double the slot number. + db 50, $00 ; 51/256 = 19.9% chance of slot 0 + db 101, $02 ; 51/256 = 19.9% chance of slot 1 + db 140, $04 ; 39/256 = 15.2% chance of slot 2 + db 165, $06 ; 25/256 = 9.8% chance of slot 3 + db 190, $08 ; 25/256 = 9.8% chance of slot 4 + db 215, $0A ; 25/256 = 9.8% chance of slot 5 + db 228, $0C ; 13/256 = 5.1% chance of slot 6 + db 241, $0E ; 13/256 = 5.1% chance of slot 7 + db 252, $10 ; 11/256 = 4.3% chance of slot 8 + db 255, $12 ; 3/256 = 1.2% chance of slot 9 diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm new file mode 100644 index 00000000..20a52a6c --- /dev/null +++ b/data/wild/super_rod.asm @@ -0,0 +1,101 @@ +; super rod encounters +SuperRodData: + ; map, fishing group + dbw PALLET_TOWN, .Group1 + dbw VIRIDIAN_CITY, .Group1 + dbw CERULEAN_CITY, .Group3 + dbw VERMILION_CITY, .Group4 + dbw CELADON_CITY, .Group5 + dbw FUCHSIA_CITY, .Group10 + dbw CINNABAR_ISLAND, .Group8 + dbw ROUTE_4, .Group3 + dbw ROUTE_6, .Group4 + dbw ROUTE_10, .Group5 + dbw ROUTE_11, .Group4 + dbw ROUTE_12, .Group7 + dbw ROUTE_13, .Group7 + dbw ROUTE_17, .Group7 + dbw ROUTE_18, .Group7 + dbw ROUTE_19, .Group8 + dbw ROUTE_20, .Group8 + dbw ROUTE_21, .Group8 + dbw ROUTE_22, .Group2 + dbw ROUTE_23, .Group9 + dbw ROUTE_24, .Group3 + dbw ROUTE_25, .Group3 + dbw CERULEAN_GYM, .Group3 + dbw VERMILION_DOCK, .Group4 + dbw SEAFOAM_ISLANDS_B3F, .Group8 + dbw SEAFOAM_ISLANDS_B4F, .Group8 + dbw SAFARI_ZONE_EAST, .Group6 + dbw SAFARI_ZONE_NORTH, .Group6 + dbw SAFARI_ZONE_WEST, .Group6 + dbw SAFARI_ZONE_CENTER, .Group6 + dbw CERULEAN_CAVE_2F, .Group9 + dbw CERULEAN_CAVE_B1F, .Group9 + dbw CERULEAN_CAVE_1F, .Group9 + db -1 ; end + +; fishing groups +; number of monsters, followed by level/monster pairs + +.Group1: + db 2 + db 15, TENTACOOL + db 15, POLIWAG + +.Group2: + db 2 + db 15, GOLDEEN + db 15, POLIWAG + +.Group3: + db 3 + db 15, PSYDUCK + db 15, GOLDEEN + db 15, KRABBY + +.Group4: + db 2 + db 15, KRABBY + db 15, SHELLDER + +.Group5: + db 2 + db 23, POLIWHIRL + db 15, SLOWPOKE + +.Group6: + db 4 + db 15, DRATINI + db 15, KRABBY + db 15, PSYDUCK + db 15, SLOWPOKE + +.Group7: + db 4 + db 5, TENTACOOL + db 15, KRABBY + db 15, GOLDEEN + db 15, MAGIKARP + +.Group8: + db 4 + db 15, STARYU + db 15, HORSEA + db 15, SHELLDER + db 15, GOLDEEN + +.Group9: + db 4 + db 23, SLOWBRO + db 23, SEAKING + db 23, KINGLER + db 23, SEADRA + +.Group10: + db 4 + db 23, SEAKING + db 15, KRABBY + db 15, GOLDEEN + db 15, MAGIKARP diff --git a/data/wildPokemon/diglettscave.asm b/data/wildPokemon/diglettscave.asm deleted file mode 100755 index 37512687..00000000 --- a/data/wildPokemon/diglettscave.asm +++ /dev/null @@ -1,13 +0,0 @@ -CaveMons: - db $14 - db 18,DIGLETT - db 19,DIGLETT - db 17,DIGLETT - db 20,DIGLETT - db 16,DIGLETT - db 15,DIGLETT - db 21,DIGLETT - db 22,DIGLETT - db 29,DUGTRIO - db 31,DUGTRIO - db $00 diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm deleted file mode 100755 index 22ad032b..00000000 --- a/data/wildPokemon/mansion1.asm +++ /dev/null @@ -1,27 +0,0 @@ -MansionMons1: - db $0A - IF DEF(_RED) - db 32,KOFFING - db 30,KOFFING - db 34,PONYTA - db 30,PONYTA - db 34,GROWLITHE - db 32,PONYTA - db 30,GRIMER - db 28,PONYTA - db 37,WEEZING - db 39,MUK - ENDC - IF DEF(_BLUE) - db 32,GRIMER - db 30,GRIMER - db 34,PONYTA - db 30,PONYTA - db 34,VULPIX - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 37,MUK - db 39,WEEZING - ENDC - db $00 diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm deleted file mode 100755 index 985474fc..00000000 --- a/data/wildPokemon/mansion2.asm +++ /dev/null @@ -1,27 +0,0 @@ -MansionMons2: - db $0A - IF DEF(_RED) - db 32,GROWLITHE - db 34,KOFFING - db 34,KOFFING - db 30,PONYTA - db 30,KOFFING - db 32,PONYTA - db 30,GRIMER - db 28,PONYTA - db 39,WEEZING - db 37,MUK - ENDC - IF DEF(_BLUE) - db 32,VULPIX - db 34,GRIMER - db 34,GRIMER - db 30,PONYTA - db 30,GRIMER - db 32,PONYTA - db 30,KOFFING - db 28,PONYTA - db 39,MUK - db 37,WEEZING - ENDC - db $00 diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm deleted file mode 100755 index 9c5521ae..00000000 --- a/data/wildPokemon/mansion3.asm +++ /dev/null @@ -1,27 +0,0 @@ -MansionMons3: - db $0A - IF DEF(_RED) - db 31,KOFFING - db 33,GROWLITHE - db 35,KOFFING - db 32,PONYTA - db 34,PONYTA - db 40,WEEZING - db 34,GRIMER - db 38,WEEZING - db 36,PONYTA - db 42,MUK - ENDC - IF DEF(_BLUE) - db 31,GRIMER - db 33,VULPIX - db 35,GRIMER - db 32,PONYTA - db 34,MAGMAR - db 40,MUK - db 34,KOFFING - db 38,MUK - db 36,PONYTA - db 42,WEEZING - ENDC - db $00 diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm deleted file mode 100755 index 83266ddd..00000000 --- a/data/wildPokemon/mansionb1.asm +++ /dev/null @@ -1,27 +0,0 @@ -MansionMonsB1: - db $0A - IF DEF(_RED) - db 33,KOFFING - db 31,KOFFING - db 35,GROWLITHE - db 32,PONYTA - db 31,KOFFING - db 40,WEEZING - db 34,PONYTA - db 35,GRIMER - db 42,WEEZING - db 42,MUK - ENDC - IF DEF(_BLUE) - db 33,GRIMER - db 31,GRIMER - db 35,VULPIX - db 32,PONYTA - db 31,GRIMER - db 40,MUK - db 34,PONYTA - db 35,KOFFING - db 38,MAGMAR - db 42,WEEZING - ENDC - db $00 diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm deleted file mode 100755 index 44b34c45..00000000 --- a/data/wildPokemon/mtmoon1.asm +++ /dev/null @@ -1,13 +0,0 @@ -MoonMons1: - db $0A - db 8,ZUBAT - db 7,ZUBAT - db 9,ZUBAT - db 8,GEODUDE - db 6,ZUBAT - db 10,ZUBAT - db 10,GEODUDE - db 8,PARAS - db 11,ZUBAT - db 8,CLEFAIRY - db $00 diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm deleted file mode 100755 index 5c0d8a53..00000000 --- a/data/wildPokemon/mtmoonb1.asm +++ /dev/null @@ -1,13 +0,0 @@ -MoonMonsB1: - db $0A - db 8,ZUBAT - db 7,ZUBAT - db 7,GEODUDE - db 8,GEODUDE - db 9,ZUBAT - db 10,PARAS - db 10,ZUBAT - db 11,ZUBAT - db 9,CLEFAIRY - db 9,GEODUDE - db $00 diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm deleted file mode 100755 index cbf97e7e..00000000 --- a/data/wildPokemon/mtmoonb2.asm +++ /dev/null @@ -1,13 +0,0 @@ -MoonMonsB2: - db $0A - db 9,ZUBAT - db 9,GEODUDE - db 10,ZUBAT - db 10,GEODUDE - db 11,ZUBAT - db 10,PARAS - db 12,PARAS - db 10,CLEFAIRY - db 12,ZUBAT - db 12,CLEFAIRY - db $00 diff --git a/data/wildPokemon/nomons.asm b/data/wildPokemon/nomons.asm deleted file mode 100755 index ce7f7ede..00000000 --- a/data/wildPokemon/nomons.asm +++ /dev/null @@ -1,3 +0,0 @@ -NoMons: - db $00 - db $00 diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm deleted file mode 100755 index df951e70..00000000 --- a/data/wildPokemon/pokemontower1.asm +++ /dev/null @@ -1,3 +0,0 @@ -TowerMons1: - db $00 - db $00 diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm deleted file mode 100755 index dcbe0da0..00000000 --- a/data/wildPokemon/pokemontower2.asm +++ /dev/null @@ -1,3 +0,0 @@ -TowerMons2: - db $00 - db $00 diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm deleted file mode 100755 index 135ed84f..00000000 --- a/data/wildPokemon/pokemontower3.asm +++ /dev/null @@ -1,13 +0,0 @@ -TowerMons3: - db $0A - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 24,GASTLY - db 20,CUBONE - db 22,CUBONE - db 25,HAUNTER - db $00 diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm deleted file mode 100755 index 0c84b0cf..00000000 --- a/data/wildPokemon/pokemontower4.asm +++ /dev/null @@ -1,13 +0,0 @@ -TowerMons4: - db $0A - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - db $00 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm deleted file mode 100755 index 440dbf8d..00000000 --- a/data/wildPokemon/pokemontower5.asm +++ /dev/null @@ -1,13 +0,0 @@ -TowerMons5: - db $0A - db 20,GASTLY - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 19,GASTLY - db 18,GASTLY - db 25,HAUNTER - db 20,CUBONE - db 22,CUBONE - db 24,GASTLY - db $00 diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm deleted file mode 100755 index 553fdb5d..00000000 --- a/data/wildPokemon/pokemontower6.asm +++ /dev/null @@ -1,13 +0,0 @@ -TowerMons6: - db $0F - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 19,GASTLY - db 26,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - db $00 diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm deleted file mode 100755 index 0f7e66e9..00000000 --- a/data/wildPokemon/pokemontower7.asm +++ /dev/null @@ -1,13 +0,0 @@ -TowerMons7: - db $0F - db 21,GASTLY - db 22,GASTLY - db 23,GASTLY - db 24,GASTLY - db 20,GASTLY - db 28,HAUNTER - db 22,CUBONE - db 24,CUBONE - db 28,HAUNTER - db 30,HAUNTER - db $00 diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm deleted file mode 100755 index 35eece95..00000000 --- a/data/wildPokemon/powerplant.asm +++ /dev/null @@ -1,19 +0,0 @@ -PowerPlantMons: - db $0A - db 21,VOLTORB - db 21,MAGNEMITE - db 20,PIKACHU - db 24,PIKACHU - db 23,MAGNEMITE - db 23,VOLTORB - db 32,MAGNETON - db 35,MAGNETON - IF DEF(_RED) - db 33,ELECTABUZZ - db 36,ELECTABUZZ - ENDC - IF DEF(_BLUE) - db 33,RAICHU - db 36,RAICHU - ENDC - db $00 diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm deleted file mode 100755 index a36f2092..00000000 --- a/data/wildPokemon/rocktunnel1.asm +++ /dev/null @@ -1,13 +0,0 @@ -TunnelMonsB1: - db $0F - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - db 18,ZUBAT - db 15,ZUBAT - db 17,MACHOP - db 13,ONIX - db 15,ONIX - db $00 diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm deleted file mode 100755 index 2fc7ef94..00000000 --- a/data/wildPokemon/rocktunnel2.asm +++ /dev/null @@ -1,13 +0,0 @@ -TunnelMonsB2: - db $0F - db 16,ZUBAT - db 17,ZUBAT - db 17,GEODUDE - db 15,MACHOP - db 16,GEODUDE - db 18,ZUBAT - db 17,MACHOP - db 17,ONIX - db 13,ONIX - db 18,GEODUDE - db $00 diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm deleted file mode 100755 index f618c34f..00000000 --- a/data/wildPokemon/route1.asm +++ /dev/null @@ -1,13 +0,0 @@ -Route1Mons: - db $19 - db 3,PIDGEY - db 3,RATTATA - db 3,RATTATA - db 2,RATTATA - db 2,PIDGEY - db 3,PIDGEY - db 3,PIDGEY - db 4,RATTATA - db 4,PIDGEY - db 5,PIDGEY - db $00 diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm deleted file mode 100755 index 34e0b5ee..00000000 --- a/data/wildPokemon/route10.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route10Mons: - db $0F - IF DEF(_RED) - db 16,VOLTORB - db 16,SPEAROW - db 14,VOLTORB - db 11,EKANS - db 13,SPEAROW - db 15,EKANS - db 17,VOLTORB - db 17,SPEAROW - db 13,EKANS - db 17,EKANS - ENDC - IF DEF(_BLUE) - db 16,VOLTORB - db 16,SPEAROW - db 14,VOLTORB - db 11,SANDSHREW - db 13,SPEAROW - db 15,SANDSHREW - db 17,VOLTORB - db 17,SPEAROW - db 13,SANDSHREW - db 17,SANDSHREW - ENDC - db $00 diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm deleted file mode 100755 index 9e4e3644..00000000 --- a/data/wildPokemon/route11.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route11Mons: - db $0F - IF DEF(_RED) - db 14,EKANS - db 15,SPEAROW - db 12,EKANS - db 9,DROWZEE - db 13,SPEAROW - db 13,DROWZEE - db 15,EKANS - db 17,SPEAROW - db 11,DROWZEE - db 15,DROWZEE - ENDC - IF DEF(_BLUE) - db 14,SANDSHREW - db 15,SPEAROW - db 12,SANDSHREW - db 9,DROWZEE - db 13,SPEAROW - db 13,DROWZEE - db 15,SANDSHREW - db 17,SPEAROW - db 11,DROWZEE - db 15,DROWZEE - ENDC - db $00 diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm deleted file mode 100755 index 45dfbc9d..00000000 --- a/data/wildPokemon/route12.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route12Mons: - db $0F - IF DEF(_RED) - db 24,ODDISH - db 25,PIDGEY - db 23,PIDGEY - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 27,PIDGEY - db 28,GLOOM - db 30,GLOOM - ENDC - IF DEF(_BLUE) - db 24,BELLSPROUT - db 25,PIDGEY - db 23,PIDGEY - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 27,PIDGEY - db 28,WEEPINBELL - db 30,WEEPINBELL - ENDC - db $00 diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm deleted file mode 100755 index 2a1a6cb5..00000000 --- a/data/wildPokemon/route13.asm +++ /dev/null @@ -1,28 +0,0 @@ -Route13Mons: - IF DEF(_RED) - db $14 - db 24,ODDISH - db 25,PIDGEY - db 27,PIDGEY - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 25,DITTO - db 28,GLOOM - db 30,GLOOM - ENDC - IF DEF(_BLUE) - db $14 - db 24,BELLSPROUT - db 25,PIDGEY - db 27,PIDGEY - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 25,DITTO - db 28,WEEPINBELL - db 30,WEEPINBELL - ENDC - db $00 diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm deleted file mode 100755 index aad5aa48..00000000 --- a/data/wildPokemon/route14.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route14Mons: - db $0F - IF DEF(_RED) - db 24,ODDISH - db 26,PIDGEY - db 23,DITTO - db 24,VENONAT - db 22,ODDISH - db 26,VENONAT - db 26,ODDISH - db 30,GLOOM - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - IF DEF(_BLUE) - db 24,BELLSPROUT - db 26,PIDGEY - db 23,DITTO - db 24,VENONAT - db 22,BELLSPROUT - db 26,VENONAT - db 26,BELLSPROUT - db 30,WEEPINBELL - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - db $00 diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm deleted file mode 100755 index b4762230..00000000 --- a/data/wildPokemon/route15.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route15Mons: - db $0F - IF DEF(_RED) - db 24,ODDISH - db 26,DITTO - db 23,PIDGEY - db 26,VENONAT - db 22,ODDISH - db 28,VENONAT - db 26,ODDISH - db 30,GLOOM - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - IF DEF(_BLUE) - db 24,BELLSPROUT - db 26,DITTO - db 23,PIDGEY - db 26,VENONAT - db 22,BELLSPROUT - db 28,VENONAT - db 26,BELLSPROUT - db 30,WEEPINBELL - db 28,PIDGEOTTO - db 30,PIDGEOTTO - ENDC - db $00 diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm deleted file mode 100755 index c2421c50..00000000 --- a/data/wildPokemon/route16.asm +++ /dev/null @@ -1,13 +0,0 @@ -Route16Mons: - db $19 - db 20,SPEAROW - db 22,SPEAROW - db 18,RATTATA - db 20,DODUO - db 20,RATTATA - db 18,DODUO - db 22,DODUO - db 22,RATTATA - db 23,RATICATE - db 25,RATICATE - db $00 diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm deleted file mode 100755 index 8dffd9a3..00000000 --- a/data/wildPokemon/route17.asm +++ /dev/null @@ -1,13 +0,0 @@ -Route17Mons: - db $19 - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 27,RATICATE - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 25,FEAROW - db 27,FEAROW - db $00 diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm deleted file mode 100755 index 47bd247d..00000000 --- a/data/wildPokemon/route18.asm +++ /dev/null @@ -1,13 +0,0 @@ -Route18Mons: - db $19 - db 20,SPEAROW - db 22,SPEAROW - db 25,RATICATE - db 24,DODUO - db 25,FEAROW - db 26,DODUO - db 28,DODUO - db 29,RATICATE - db 27,FEAROW - db 29,FEAROW - db $00 diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm deleted file mode 100755 index ad958ea5..00000000 --- a/data/wildPokemon/route2.asm +++ /dev/null @@ -1,24 +0,0 @@ -Route2Mons: - db $19 - db 3,RATTATA - db 3,PIDGEY - db 4,PIDGEY - db 4,RATTATA - db 5,PIDGEY - IF DEF(_RED) - db 3,WEEDLE - ENDC - IF DEF(_BLUE) - db 3,CATERPIE - ENDC - db 2,RATTATA - db 5,RATTATA - IF DEF(_RED) - db 4,WEEDLE - db 5,WEEDLE - ENDC - IF DEF(_BLUE) - db 4,CATERPIE - db 5,CATERPIE - ENDC - db $00 diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm deleted file mode 100755 index 3cc73ba0..00000000 --- a/data/wildPokemon/route21.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route21Mons: - db $19 - db 21,RATTATA - db 23,PIDGEY - db 30,RATICATE - db 23,RATTATA - db 21,PIDGEY - db 30,PIDGEOTTO - db 32,PIDGEOTTO - db 28,TANGELA - db 30,TANGELA - db 32,TANGELA - db $05 - db 5,TENTACOOL - db 10,TENTACOOL - db 15,TENTACOOL - db 5,TENTACOOL - db 10,TENTACOOL - db 15,TENTACOOL - db 20,TENTACOOL - db 30,TENTACOOL - db 35,TENTACOOL - db 40,TENTACOOL diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm deleted file mode 100755 index 750a2f4e..00000000 --- a/data/wildPokemon/route22.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route22Mons: - db $19 - IF DEF(_RED) - db 3,RATTATA - db 3,NIDORAN_M - db 4,RATTATA - db 4,NIDORAN_M - db 2,RATTATA - db 2,NIDORAN_M - db 3,SPEAROW - db 5,SPEAROW - db 3,NIDORAN_F - db 4,NIDORAN_F - ENDC - IF DEF(_BLUE) - db 3,RATTATA - db 3,NIDORAN_F - db 4,RATTATA - db 4,NIDORAN_F - db 2,RATTATA - db 2,NIDORAN_F - db 3,SPEAROW - db 5,SPEAROW - db 3,NIDORAN_M - db 4,NIDORAN_M - ENDC - db $00 diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm deleted file mode 100755 index a057d24d..00000000 --- a/data/wildPokemon/route23.asm +++ /dev/null @@ -1,23 +0,0 @@ -Route23Mons: - db $0A - IF DEF(_RED) - db 26,EKANS - ENDC - IF DEF(_BLUE) - db 26,SANDSHREW - ENDC - db 33,DITTO - db 26,SPEAROW - db 38,FEAROW - db 38,DITTO - db 38,FEAROW - IF DEF(_RED) - db 41,ARBOK - ENDC - IF DEF(_BLUE) - db 41,SANDSLASH - ENDC - db 43,DITTO - db 41,FEAROW - db 43,FEAROW - db $00 diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm deleted file mode 100755 index 3a745f36..00000000 --- a/data/wildPokemon/route24.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route24Mons: - db $19 - IF DEF(_RED) - db 7,WEEDLE - db 8,KAKUNA - db 12,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 10,ABRA - db 14,ODDISH - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - IF DEF(_BLUE) - db 7,CATERPIE - db 8,METAPOD - db 12,PIDGEY - db 12,BELLSPROUT - db 13,BELLSPROUT - db 10,ABRA - db 14,BELLSPROUT - db 13,PIDGEY - db 8,ABRA - db 12,ABRA - ENDC - db $00 diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm deleted file mode 100755 index 4884fa64..00000000 --- a/data/wildPokemon/route25.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route25Mons: - db $0F - IF DEF(_RED) - db 8,WEEDLE - db 9,KAKUNA - db 13,PIDGEY - db 12,ODDISH - db 13,ODDISH - db 12,ABRA - db 14,ODDISH - db 10,ABRA - db 7,METAPOD - db 8,CATERPIE - ENDC - IF DEF(_BLUE) - db 8,CATERPIE - db 9,METAPOD - db 13,PIDGEY - db 12,BELLSPROUT - db 13,BELLSPROUT - db 12,ABRA - db 14,BELLSPROUT - db 10,ABRA - db 7,KAKUNA - db 8,WEEDLE - ENDC - db $00 diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm deleted file mode 100755 index dea820a4..00000000 --- a/data/wildPokemon/route3.asm +++ /dev/null @@ -1,13 +0,0 @@ -Route3Mons: - db $14 - db 6,PIDGEY - db 5,SPEAROW - db 7,PIDGEY - db 6,SPEAROW - db 7,SPEAROW - db 8,PIDGEY - db 8,SPEAROW - db 3,JIGGLYPUFF - db 5,JIGGLYPUFF - db 7,JIGGLYPUFF - db $00 diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm deleted file mode 100755 index 624d58de..00000000 --- a/data/wildPokemon/route4.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route4Mons: - db $14 - IF DEF(_RED) - db 10,RATTATA - db 10,SPEAROW - db 8,RATTATA - db 6,EKANS - db 8,SPEAROW - db 10,EKANS - db 12,RATTATA - db 12,SPEAROW - db 8,EKANS - db 12,EKANS - ENDC - IF DEF(_BLUE) - db 10,RATTATA - db 10,SPEAROW - db 8,RATTATA - db 6,SANDSHREW - db 8,SPEAROW - db 10,SANDSHREW - db 12,RATTATA - db 12,SPEAROW - db 8,SANDSHREW - db 12,SANDSHREW - ENDC - db $00 diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm deleted file mode 100755 index cb8c583b..00000000 --- a/data/wildPokemon/route5.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route5Mons: - db $0F - IF DEF(_RED) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MANKEY - db 12,MANKEY - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MANKEY - db 16,MANKEY - ENDC - IF DEF(_BLUE) - db 13,BELLSPROUT - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,BELLSPROUT - db 16,BELLSPROUT - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - db $00 diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm deleted file mode 100755 index 92512ffb..00000000 --- a/data/wildPokemon/route6.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route6Mons: - db $0F - IF DEF(_RED) - db 13,ODDISH - db 13,PIDGEY - db 15,PIDGEY - db 10,MANKEY - db 12,MANKEY - db 15,ODDISH - db 16,ODDISH - db 16,PIDGEY - db 14,MANKEY - db 16,MANKEY - ENDC - IF DEF(_BLUE) - db 13,BELLSPROUT - db 13,PIDGEY - db 15,PIDGEY - db 10,MEOWTH - db 12,MEOWTH - db 15,BELLSPROUT - db 16,BELLSPROUT - db 16,PIDGEY - db 14,MEOWTH - db 16,MEOWTH - ENDC - db $00 diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm deleted file mode 100755 index 559c98ee..00000000 --- a/data/wildPokemon/route7.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route7Mons: - db $0F - IF DEF(_RED) - db 19,PIDGEY - db 19,ODDISH - db 17,MANKEY - db 22,ODDISH - db 22,PIDGEY - db 18,MANKEY - db 18,GROWLITHE - db 20,GROWLITHE - db 19,MANKEY - db 20,MANKEY - ENDC - IF DEF(_BLUE) - db 19,PIDGEY - db 19,BELLSPROUT - db 17,MEOWTH - db 22,BELLSPROUT - db 22,PIDGEY - db 18,MEOWTH - db 18,VULPIX - db 20,VULPIX - db 19,MEOWTH - db 20,MEOWTH - ENDC - db $00 diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm deleted file mode 100755 index 8a0bfa31..00000000 --- a/data/wildPokemon/route8.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route8Mons: - db $0F - IF DEF(_RED) - db 18,PIDGEY - db 18,MANKEY - db 17,EKANS - db 16,GROWLITHE - db 20,PIDGEY - db 20,MANKEY - db 19,EKANS - db 17,GROWLITHE - db 15,GROWLITHE - db 18,GROWLITHE - ENDC - IF DEF(_BLUE) - db 18,PIDGEY - db 18,MEOWTH - db 17,SANDSHREW - db 16,VULPIX - db 20,PIDGEY - db 20,MEOWTH - db 19,SANDSHREW - db 17,VULPIX - db 15,VULPIX - db 18,VULPIX - ENDC - db $00 diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm deleted file mode 100755 index 716589b0..00000000 --- a/data/wildPokemon/route9.asm +++ /dev/null @@ -1,27 +0,0 @@ -Route9Mons: - db $0F - IF DEF(_RED) - db 16,RATTATA - db 16,SPEAROW - db 14,RATTATA - db 11,EKANS - db 13,SPEAROW - db 15,EKANS - db 17,RATTATA - db 17,SPEAROW - db 13,EKANS - db 17,EKANS - ENDC - IF DEF(_BLUE) - db 16,RATTATA - db 16,SPEAROW - db 14,RATTATA - db 11,SANDSHREW - db 13,SPEAROW - db 15,SANDSHREW - db 17,RATTATA - db 17,SPEAROW - db 13,SANDSHREW - db 17,SANDSHREW - ENDC - db $00 diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm deleted file mode 100755 index 3d77b6fe..00000000 --- a/data/wildPokemon/safarizone1.asm +++ /dev/null @@ -1,27 +0,0 @@ -ZoneMons1: - db $1E - IF DEF(_RED) - db 24,NIDORAN_M - db 26,DODUO - db 22,PARAS - db 25,EXEGGCUTE - db 33,NIDORINO - db 23,EXEGGCUTE - db 24,NIDORAN_F - db 25,PARASECT - db 25,KANGASKHAN - db 28,SCYTHER - ENDC - IF DEF(_BLUE) - db 24,NIDORAN_F - db 26,DODUO - db 22,PARAS - db 25,EXEGGCUTE - db 33,NIDORINA - db 23,EXEGGCUTE - db 24,NIDORAN_M - db 25,PARASECT - db 25,KANGASKHAN - db 28,PINSIR - ENDC - db $00 diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm deleted file mode 100755 index c1b6a547..00000000 --- a/data/wildPokemon/safarizone2.asm +++ /dev/null @@ -1,28 +0,0 @@ -ZoneMons2: - db $1E - IF DEF(_RED) - db 22,NIDORAN_M - ENDC - IF DEF(_BLUE) - db 22,NIDORAN_F - ENDC - db 26,RHYHORN - db 23,PARAS - db 25,EXEGGCUTE - IF DEF(_RED) - db 30,NIDORINO - ENDC - IF DEF(_BLUE) - db 30,NIDORINA - ENDC - db 27,EXEGGCUTE - IF DEF(_RED) - db 30,NIDORINA - ENDC - IF DEF(_BLUE) - db 30,NIDORINO - ENDC - db 32,VENOMOTH - db 26,CHANSEY - db 28,TAUROS - db $00 diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm deleted file mode 100755 index 47b6a102..00000000 --- a/data/wildPokemon/safarizone3.asm +++ /dev/null @@ -1,27 +0,0 @@ -ZoneMons3: - db $1E - IF DEF(_RED) - db 25,NIDORAN_M - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINO - db 26,EXEGGCUTE - db 25,NIDORAN_F - db 31,VENOMOTH - db 26,TAUROS - db 28,KANGASKHAN - ENDC - IF DEF(_BLUE) - db 25,NIDORAN_F - db 26,DODUO - db 23,VENONAT - db 24,EXEGGCUTE - db 33,NIDORINA - db 26,EXEGGCUTE - db 25,NIDORAN_M - db 31,VENOMOTH - db 26,TAUROS - db 28,KANGASKHAN - ENDC - db $00 diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm deleted file mode 100755 index 0cd5323a..00000000 --- a/data/wildPokemon/safarizonecenter.asm +++ /dev/null @@ -1,27 +0,0 @@ -ZoneMonsCenter: - db $1E - IF DEF(_RED) - db 22,NIDORAN_M - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINO - db 25,EXEGGCUTE - db 31,NIDORINA - db 30,PARASECT - db 23,SCYTHER - db 23,CHANSEY - ENDC - IF DEF(_BLUE) - db 22,NIDORAN_F - db 25,RHYHORN - db 22,VENONAT - db 24,EXEGGCUTE - db 31,NIDORINA - db 25,EXEGGCUTE - db 31,NIDORINO - db 30,PARASECT - db 23,PINSIR - db 23,CHANSEY - ENDC - db $00 diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm deleted file mode 100755 index 3c431f9a..00000000 --- a/data/wildPokemon/seafoamisland1.asm +++ /dev/null @@ -1,27 +0,0 @@ -IslandMons1: - db $0F - IF DEF(_RED) - db 30,SEEL - db 30,SLOWPOKE - db 30,SHELLDER - db 30,HORSEA - db 28,HORSEA - db 21,ZUBAT - db 29,GOLBAT - db 28,PSYDUCK - db 28,SHELLDER - db 38,GOLDUCK - ENDC - IF DEF(_BLUE) - db 30,SEEL - db 30,PSYDUCK - db 30,STARYU - db 30,KRABBY - db 28,KRABBY - db 21,ZUBAT - db 29,GOLBAT - db 28,SLOWPOKE - db 28,STARYU - db 38,SLOWBRO - ENDC - db $00 diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm deleted file mode 100755 index 6f96f240..00000000 --- a/data/wildPokemon/seafoamislandb1.asm +++ /dev/null @@ -1,27 +0,0 @@ -IslandMonsB1: - db $0A - IF DEF(_RED) - db 30,STARYU - db 30,HORSEA - db 32,SHELLDER - db 32,HORSEA - db 28,SLOWPOKE - db 30,SEEL - db 30,SLOWPOKE - db 28,SEEL - db 38,DEWGONG - db 37,SEADRA - ENDC - IF DEF(_BLUE) - db 30,SHELLDER - db 30,KRABBY - db 32,STARYU - db 32,KRABBY - db 28,PSYDUCK - db 30,SEEL - db 30,PSYDUCK - db 28,SEEL - db 38,DEWGONG - db 37,KINGLER - ENDC - db $00 diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm deleted file mode 100755 index 7191fea9..00000000 --- a/data/wildPokemon/seafoamislandb2.asm +++ /dev/null @@ -1,27 +0,0 @@ -IslandMonsB2: - db $0A - IF DEF(_RED) - db 30,SEEL - db 30,SLOWPOKE - db 32,SEEL - db 32,SLOWPOKE - db 28,HORSEA - db 30,STARYU - db 30,HORSEA - db 28,SHELLDER - db 30,GOLBAT - db 37,SLOWBRO - ENDC - IF DEF(_BLUE) - db 30,SEEL - db 30,PSYDUCK - db 32,SEEL - db 32,PSYDUCK - db 28,KRABBY - db 30,SHELLDER - db 30,KRABBY - db 28,STARYU - db 30,GOLBAT - db 37,GOLDUCK - ENDC - db $00 diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm deleted file mode 100755 index 9778c0e9..00000000 --- a/data/wildPokemon/seafoamislandb3.asm +++ /dev/null @@ -1,27 +0,0 @@ -IslandMonsB3: - db $0A - IF DEF(_RED) - db 31,SLOWPOKE - db 31,SEEL - db 33,SLOWPOKE - db 33,SEEL - db 29,HORSEA - db 31,SHELLDER - db 31,HORSEA - db 29,SHELLDER - db 39,SEADRA - db 37,DEWGONG - ENDC - IF DEF(_BLUE) - db 31,PSYDUCK - db 31,SEEL - db 33,PSYDUCK - db 33,SEEL - db 29,KRABBY - db 31,STARYU - db 31,KRABBY - db 29,STARYU - db 39,KINGLER - db 37,DEWGONG - ENDC - db $00 diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm deleted file mode 100755 index 3948470b..00000000 --- a/data/wildPokemon/seafoamislandb4.asm +++ /dev/null @@ -1,27 +0,0 @@ -IslandMonsB4: - db $0A - IF DEF(_RED) - db 31,HORSEA - db 31,SHELLDER - db 33,HORSEA - db 33,SHELLDER - db 29,SLOWPOKE - db 31,SEEL - db 31,SLOWPOKE - db 29,SEEL - db 39,SLOWBRO - db 32,GOLBAT - ENDC - IF DEF(_BLUE) - db 31,KRABBY - db 31,STARYU - db 33,KRABBY - db 33,STARYU - db 29,PSYDUCK - db 31,SEEL - db 31,PSYDUCK - db 29,SEEL - db 39,GOLDUCK - db 32,GOLBAT - ENDC - db $00 diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm deleted file mode 100755 index 20e8643a..00000000 --- a/data/wildPokemon/unknowndungeon1.asm +++ /dev/null @@ -1,18 +0,0 @@ -DungeonMons1: - db $0A - db 46,GOLBAT - db 46,HYPNO - db 46,MAGNETON - db 49,DODRIO - db 49,VENOMOTH - IF DEF(_RED) - db 52,ARBOK - ENDC - IF DEF(_BLUE) - db 52,SANDSLASH - ENDC - db 49,KADABRA - db 52,PARASECT - db 53,RAICHU - db 53,DITTO - db $00 diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm deleted file mode 100755 index 5afe55ac..00000000 --- a/data/wildPokemon/unknowndungeon2.asm +++ /dev/null @@ -1,13 +0,0 @@ -DungeonMons2: - db $0F - db 51,DODRIO - db 51,VENOMOTH - db 51,KADABRA - db 52,RHYDON - db 52,MAROWAK - db 52,ELECTRODE - db 56,CHANSEY - db 54,WIGGLYTUFF - db 55,DITTO - db 60,DITTO - db $00 diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm deleted file mode 100755 index 245d5912..00000000 --- a/data/wildPokemon/unknowndungeonb1.asm +++ /dev/null @@ -1,18 +0,0 @@ -DungeonMonsB1: - db $19 - db 55,RHYDON - db 55,MAROWAK - db 55,ELECTRODE - db 64,CHANSEY - db 64,PARASECT - db 64,RAICHU - IF DEF(_RED) - db 57,ARBOK - ENDC - IF DEF(_BLUE) - db 57,SANDSLASH - ENDC - db 65,DITTO - db 63,DITTO - db 67,DITTO - db $00 diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm deleted file mode 100755 index 60aae31a..00000000 --- a/data/wildPokemon/victoryroad1.asm +++ /dev/null @@ -1,13 +0,0 @@ -PlateauMons1: - db $0F - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 43,MAROWAK - db $00 diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm deleted file mode 100755 index 580d644d..00000000 --- a/data/wildPokemon/victoryroad2.asm +++ /dev/null @@ -1,13 +0,0 @@ -PlateauMons2: - db $0A - db 22,MACHOP - db 24,GEODUDE - db 26,ZUBAT - db 36,ONIX - db 39,ONIX - db 42,ONIX - db 41,MACHOKE - db 40,GOLBAT - db 40,MAROWAK - db 43,GRAVELER - db $00 diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm deleted file mode 100755 index 80d7ef3e..00000000 --- a/data/wildPokemon/victoryroad3.asm +++ /dev/null @@ -1,13 +0,0 @@ -PlateauMons3: - db $0F - db 24,MACHOP - db 26,GEODUDE - db 22,ZUBAT - db 42,ONIX - db 40,VENOMOTH - db 45,ONIX - db 43,GRAVELER - db 41,GOLBAT - db 42,MACHOKE - db 45,MACHOKE - db $00 diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm deleted file mode 100755 index ae9a5a70..00000000 --- a/data/wildPokemon/viridianforest.asm +++ /dev/null @@ -1,25 +0,0 @@ -ForestMons: - db $08 - IF DEF(_RED) - db 4,WEEDLE - db 5,KAKUNA - db 3,WEEDLE - db 5,WEEDLE - db 4,KAKUNA - db 6,KAKUNA - db 4,METAPOD - db 3,CATERPIE - ENDC - IF DEF(_BLUE) - db 4,CATERPIE - db 5,METAPOD - db 3,CATERPIE - db 5,CATERPIE - db 4,METAPOD - db 6,METAPOD - db 4,KAKUNA - db 3,WEEDLE - ENDC - db 3,PIKACHU - db 5,PIKACHU - db $00 diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm deleted file mode 100755 index 07c6a187..00000000 --- a/data/wildPokemon/waterpokemon.asm +++ /dev/null @@ -1,13 +0,0 @@ -WaterMons: - db $00 - db $05 - db 5,TENTACOOL - db 10,TENTACOOL - db 15,TENTACOOL - db 5,TENTACOOL - db 10,TENTACOOL - db 15,TENTACOOL - db 20,TENTACOOL - db 30,TENTACOOL - db 35,TENTACOOL - db 40,TENTACOOL diff --git a/data/wild_mons.asm b/data/wild_mons.asm deleted file mode 100755 index a2c9d6b2..00000000 --- a/data/wild_mons.asm +++ /dev/null @@ -1,321 +0,0 @@ -WildDataPointers: - dw NoMons ; PALLET_TOWN - dw NoMons ; VIRIDIAN_CITY - dw NoMons ; PEWTER_CITY - dw NoMons ; CERULEAN_CITY - dw NoMons ; LAVENDER_TOWN - dw NoMons ; VERMILION_CITY - dw NoMons ; CELADON_CITY - dw NoMons ; FUCHSIA_CITY - dw NoMons ; CINNABAR_ISLAND - dw NoMons ; INDIGO_PLATEAU - dw NoMons ; SAFFRON_CITY - dw NoMons ; unused - dw Route1Mons ; ROUTE_1 - dw Route2Mons ; ROUTE_2 - dw Route3Mons ; ROUTE_3 - dw Route4Mons ; ROUTE_4 - dw Route5Mons ; ROUTE_5 - dw Route6Mons ; ROUTE_6 - dw Route7Mons ; ROUTE_7 - dw Route8Mons ; ROUTE_8 - dw Route9Mons ; ROUTE_9 - dw Route10Mons ; ROUTE_10 - dw Route11Mons ; ROUTE_11 - dw Route12Mons ; ROUTE_12 - dw Route13Mons ; ROUTE_13 - dw Route14Mons ; ROUTE_14 - dw Route15Mons ; ROUTE_15 - dw Route16Mons ; ROUTE_16 - dw Route17Mons ; ROUTE_17 - dw Route18Mons ; ROUTE_18 - dw WaterMons ; ROUTE_19 - dw WaterMons ; ROUTE_20 - dw Route21Mons ; ROUTE_21 - dw Route22Mons ; ROUTE_22 - dw Route23Mons ; ROUTE_23 - dw Route24Mons ; ROUTE_24 - dw Route25Mons ; ROUTE_25 - dw NoMons ; REDS_HOUSE_1F - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw ForestMons ; ViridianForest - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw MoonMons1 - dw MoonMonsB1 - dw MoonMonsB2 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw TunnelMonsB1 - dw PowerPlantMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw PlateauMons1 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw TowerMons1 - dw TowerMons2 - dw TowerMons3 - dw TowerMons4 - dw TowerMons5 - dw TowerMons6 - dw TowerMons7 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw IslandMonsB1 - dw IslandMonsB2 - dw IslandMonsB3 - dw IslandMonsB4 - dw NoMons - dw NoMons - dw MansionMons1 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw IslandMons1 - dw NoMons - dw PlateauMons2 - dw NoMons - dw NoMons - dw CaveMons - dw PlateauMons3 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw MansionMons2 - dw MansionMons3 - dw MansionMonsB1 - dw ZoneMons1 - dw ZoneMons2 - dw ZoneMons3 - dw ZoneMonsCenter - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw DungeonMons2 - dw DungeonMonsB1 - dw DungeonMons1 - dw NoMons - dw NoMons - dw NoMons - dw TunnelMonsB2 - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw NoMons - dw $FFFF - -; wild pokemon data is divided into two parts. -; first part: pokemon found in grass -; second part: pokemon found while surfing -; each part goes as follows: - ; if first byte == 00, then - ; no wild pokemon on this map - ; if first byte != 00, then - ; first byte is encounter rate - ; followed by 20 bytes: - ; level, species (ten times) - -INCLUDE "data/wildPokemon/nomons.asm" -INCLUDE "data/wildPokemon/route1.asm" -INCLUDE "data/wildPokemon/route2.asm" -INCLUDE "data/wildPokemon/route22.asm" -INCLUDE "data/wildPokemon/viridianforest.asm" -INCLUDE "data/wildPokemon/route3.asm" -INCLUDE "data/wildPokemon/mtmoon1.asm" -INCLUDE "data/wildPokemon/mtmoonb1.asm" -INCLUDE "data/wildPokemon/mtmoonb2.asm" -INCLUDE "data/wildPokemon/route4.asm" -INCLUDE "data/wildPokemon/route24.asm" -INCLUDE "data/wildPokemon/route25.asm" -INCLUDE "data/wildPokemon/route9.asm" -INCLUDE "data/wildPokemon/route5.asm" -INCLUDE "data/wildPokemon/route6.asm" -INCLUDE "data/wildPokemon/route11.asm" -INCLUDE "data/wildPokemon/rocktunnel1.asm" -INCLUDE "data/wildPokemon/rocktunnel2.asm" -INCLUDE "data/wildPokemon/route10.asm" -INCLUDE "data/wildPokemon/route12.asm" -INCLUDE "data/wildPokemon/route8.asm" -INCLUDE "data/wildPokemon/route7.asm" -INCLUDE "data/wildPokemon/pokemontower1.asm" -INCLUDE "data/wildPokemon/pokemontower2.asm" -INCLUDE "data/wildPokemon/pokemontower3.asm" -INCLUDE "data/wildPokemon/pokemontower4.asm" -INCLUDE "data/wildPokemon/pokemontower5.asm" -INCLUDE "data/wildPokemon/pokemontower6.asm" -INCLUDE "data/wildPokemon/pokemontower7.asm" -INCLUDE "data/wildPokemon/route13.asm" -INCLUDE "data/wildPokemon/route14.asm" -INCLUDE "data/wildPokemon/route15.asm" -INCLUDE "data/wildPokemon/route16.asm" -INCLUDE "data/wildPokemon/route17.asm" -INCLUDE "data/wildPokemon/route18.asm" -INCLUDE "data/wildPokemon/safarizonecenter.asm" -INCLUDE "data/wildPokemon/safarizone1.asm" -INCLUDE "data/wildPokemon/safarizone2.asm" -INCLUDE "data/wildPokemon/safarizone3.asm" -INCLUDE "data/wildPokemon/waterpokemon.asm" -INCLUDE "data/wildPokemon/seafoamisland1.asm" -INCLUDE "data/wildPokemon/seafoamislandb1.asm" -INCLUDE "data/wildPokemon/seafoamislandb2.asm" -INCLUDE "data/wildPokemon/seafoamislandb3.asm" -INCLUDE "data/wildPokemon/seafoamislandb4.asm" -INCLUDE "data/wildPokemon/mansion1.asm" -INCLUDE "data/wildPokemon/mansion2.asm" -INCLUDE "data/wildPokemon/mansion3.asm" -INCLUDE "data/wildPokemon/mansionb1.asm" -INCLUDE "data/wildPokemon/route21.asm" -INCLUDE "data/wildPokemon/unknowndungeon1.asm" -INCLUDE "data/wildPokemon/unknowndungeon2.asm" -INCLUDE "data/wildPokemon/unknowndungeonb1.asm" -INCLUDE "data/wildPokemon/powerplant.asm" -INCLUDE "data/wildPokemon/route23.asm" -INCLUDE "data/wildPokemon/victoryroad2.asm" -INCLUDE "data/wildPokemon/victoryroad3.asm" -INCLUDE "data/wildPokemon/victoryroad1.asm" -INCLUDE "data/wildPokemon/diglettscave.asm" diff --git a/data/yes_no_menu_strings.asm b/data/yes_no_menu_strings.asm new file mode 100644 index 00000000..db2eeb4c --- /dev/null +++ b/data/yes_no_menu_strings.asm @@ -0,0 +1,44 @@ +two_option_menu: MACRO + db \1, \2, \3 + dw \4 +ENDM + +TwoOptionMenuStrings: +; entries correspond to *_MENU constants + ; width, height, blank line before first menu item?, text pointer + two_option_menu 4, 3, FALSE, .YesNoMenu + two_option_menu 6, 3, FALSE, .NorthWestMenu + two_option_menu 6, 3, FALSE, .SouthEastMenu + two_option_menu 6, 3, FALSE, .YesNoMenu + two_option_menu 6, 3, FALSE, .NorthEastMenu + two_option_menu 7, 3, FALSE, .TradeCancelMenu + two_option_menu 7, 4, TRUE, .HealCancelMenu + two_option_menu 4, 3, FALSE, .NoYesMenu + +.NoYesMenu: + db "NO" + next "YES@" + +.YesNoMenu: + db "YES" + next "NO@" + +.NorthWestMenu: + db "NORTH" + next "WEST@" + +.SouthEastMenu: + db "SOUTH" + next "EAST@" + +.NorthEastMenu: + db "NORTH" + next "EAST@" + +.TradeCancelMenu: + db "TRADE" + next "CANCEL@" + +.HealCancelMenu: + db "HEAL" + next "CANCEL@" diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm deleted file mode 100755 index 76ae7744..00000000 --- a/engine/HoF_room_pc.asm +++ /dev/null @@ -1,270 +0,0 @@ -HallOfFamePC: - callba AnimateHallOfFame - call ClearScreen - ld c, 100 - call DelayFrames - call DisableLCD - ld hl, vFont - ld bc, $800 / 2 - call ZeroMemory - ld hl, vChars2 + $600 - ld bc, $200 / 2 - call ZeroMemory - ld hl, vChars2 + $7e0 - ld bc, $10 - ld a, $ff - call FillMemory - coord hl, 0, 0 - call FillFourRowsWithBlack - coord hl, 0, 14 - call FillFourRowsWithBlack - ld a, %11000000 - ld [rBGP], a - call EnableLCD - ld a, $ff - call PlaySoundWaitForCurrent - ld c, 0 ; BANK(Music_Credits) - ld a, MUSIC_CREDITS - call PlayMusic - ld c, 128 - call DelayFrames - xor a - ld [wUnusedCD3D], a ; not read - ld [wNumCreditsMonsDisplayed], a - jp Credits - -FadeInCreditsText: - ld hl, HoFGBPalettes - ld b, 4 -.loop - ld a, [hli] - ld [rBGP], a - ld c, 5 - call DelayFrames - dec b - jr nz, .loop - ret - -DisplayCreditsMon: - xor a - ld [H_AUTOBGTRANSFERENABLED], a - call SaveScreenTilesToBuffer1 - call FillMiddleOfScreenWithWhite - - ; display the next monster from CreditsMons - ld hl, wNumCreditsMonsDisplayed - ld c, [hl] ; how many monsters have we displayed so far? - inc [hl] - ld b, 0 - ld hl, CreditsMons - add hl, bc ; go that far in the list of monsters and get the next one - ld a, [hl] - ld [wcf91], a - ld [wd0b5], a - coord hl, 8, 6 - call GetMonHeader - call LoadFrontSpriteByMonIndex - ld hl, vBGMap0 + $c - call CreditsCopyTileMapToVRAM - xor a - ld [H_AUTOBGTRANSFERENABLED], a - call LoadScreenTilesFromBuffer1 - ld hl, vBGMap0 - call CreditsCopyTileMapToVRAM - ld a, $A7 - ld [rWX], a - ld hl, vBGMap1 - call CreditsCopyTileMapToVRAM - call FillMiddleOfScreenWithWhite - ld a, %11111100 ; make the mon a black silhouette - ld [rBGP], a - -; scroll the mon left by one tile 7 times - ld bc, 7 -.scrollLoop1 - call ScrollCreditsMonLeft - dec c - jr nz, .scrollLoop1 - -; scroll the mon left by one tile 20 times -; This time, we have to move the window left too in order to hide the text that -; is wrapping around to the right side of the screen. - ld c, 20 -.scrollLoop2 - call ScrollCreditsMonLeft - ld a, [rWX] - sub 8 - ld [rWX], a - dec c - jr nz, .scrollLoop2 - - xor a - ld [hWY], a - ld a, %11000000 - ld [rBGP], a - ret - -INCLUDE "data/credit_mons.asm" - -ScrollCreditsMonLeft: - ld h, b - ld l, $20 - call ScrollCreditsMonLeft_SetSCX - ld h, $0 - ld l, $70 - call ScrollCreditsMonLeft_SetSCX - ld a, b - add $8 - ld b, a - ret - -ScrollCreditsMonLeft_SetSCX: - ld a, [rLY] - cp l - jr nz, ScrollCreditsMonLeft_SetSCX - ld a, h - ld [rSCX], a -.loop - ld a, [rLY] - cp h - jr z, .loop - ret - -HoFGBPalettes: - db %11000000 - db %11010000 - db %11100000 - db %11110000 - -CreditsCopyTileMapToVRAM: - ld a, l - ld [H_AUTOBGTRANSFERDEST], a - ld a, h - ld [H_AUTOBGTRANSFERDEST + 1], a - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a - jp Delay3 - -ZeroMemory: -; zero bc bytes at hl - ld [hl], 0 - inc hl - inc hl - dec bc - ld a, b - or c - jr nz, ZeroMemory - ret - -FillFourRowsWithBlack: - ld bc, SCREEN_WIDTH * 4 - ld a, $7e - jp FillMemory - -FillMiddleOfScreenWithWhite: - coord hl, 0, 4 - ld bc, SCREEN_WIDTH * 10 - ld a, " " - jp FillMemory - -Credits: - ld de, CreditsOrder - push de -.nextCreditsScreen - pop de - coord hl, 9, 6 - push hl - call FillMiddleOfScreenWithWhite - pop hl -.nextCreditsCommand - ld a, [de] - inc de - push de - cp $ff - jr z, .fadeInTextAndShowMon - cp $fe - jr z, .showTextAndShowMon - cp $fd - jr z, .fadeInText - cp $fc - jr z, .showText - cp $fb - jr z, .showCopyrightText - cp $fa - jr z, .showTheEnd - push hl - push hl - ld hl, CreditsTextPointers - add a - ld c, a - ld b, 0 - add hl, bc - ld e, [hl] - inc hl - ld d, [hl] - ld a, [de] - inc de - ld c, a - ld b, $ff - pop hl - add hl, bc - call PlaceString - pop hl - ld bc, SCREEN_WIDTH * 2 - add hl, bc - pop de - jr .nextCreditsCommand -.fadeInTextAndShowMon - call FadeInCreditsText - ld c, 90 - jr .next1 -.showTextAndShowMon - ld c, 110 -.next1 - call DelayFrames - call DisplayCreditsMon - jr .nextCreditsScreen -.fadeInText - call FadeInCreditsText - ld c, 120 - jr .next2 -.showText - ld c, 140 -.next2 - call DelayFrames - jr .nextCreditsScreen -.showCopyrightText - push de - callba LoadCopyrightTiles - pop de - pop de - jr .nextCreditsCommand -.showTheEnd - ld c, 16 - call DelayFrames - call FillMiddleOfScreenWithWhite - pop de - ld de, TheEndGfx - ld hl, vChars2 + $600 - lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $10 - call CopyVideoData - coord hl, 4, 8 - ld de, TheEndTextString - call PlaceString - coord hl, 4, 9 - inc de - call PlaceString - jp FadeInCreditsText - -TheEndTextString: -; "T H E E N D" - db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" - db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" - -INCLUDE "data/credits_order.asm" - -INCLUDE "text/credits_text.asm" - -TheEndGfx: - INCBIN "gfx/theend.2bpp" -TheEndGfxEnd: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm old mode 100755 new mode 100644 index c03dbf2c..fa7d92f8 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -17,11 +17,11 @@ DrawFrameBlock: ld [wFBTileCounter], a ld a, [wSubAnimTransform] dec a - jr z, .flipHorizontalAndVertical ; 1 + jr z, .flipHorizontalAndVertical ; SUBANIMTYPE_HVFLIP dec a - jp z, .flipHorizontalTranslateDown ; 2 + jp z, .flipHorizontalTranslateDown ; SUBANIMTYPE_HFLIP dec a - jr z, .flipBaseCoords ; 3 + jr z, .flipBaseCoords ; SUBANIMTYPE_COORDFLIP .noTransformation ld a, [wBaseCoordY] add [hl] @@ -43,7 +43,7 @@ DrawFrameBlock: ld b, a ld a, 168 sub b ; flip X base coordinate -.finishCopying ; finish copying values to OAM (when [wSubAnimTransform] not 1 or 2) +.finishCopying ; finish copying values to OAM (when subanimation not transformed) add [hl] ; X offset ld [de], a ; store X inc hl @@ -132,15 +132,15 @@ DrawFrameBlock: jp nz, .loop ; go back up if there are more tiles to draw .afterDrawingTiles ld a, [wFBMode] - cp 2 - jr z, .advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer + cp FRAMEBLOCKMODE_02 + jr z, .advanceFrameBlockDestAddr ; skip delay and don't clean OAM buffer ld a, [wSubAnimFrameDelay] ld c, a call DelayFrames ld a, [wFBMode] - cp 3 + cp FRAMEBLOCKMODE_03 jr z, .advanceFrameBlockDestAddr ; skip cleaning OAM buffer - cp 4 + cp FRAMEBLOCKMODE_04 jr z, .done ; skip cleaning OAM buffer and don't advance the frame block destination address ld a, [wAnimationID] cp GROWL @@ -163,7 +163,7 @@ DrawFrameBlock: PlayAnimation: xor a - ld [$FF8B], a ; it looks like nothing reads this + ldh [hROMBankTemp], a ; it looks like nothing reads this ld [wSubAnimTransform], a ld a, [wAnimationID] ; get animation number dec a @@ -177,9 +177,9 @@ PlayAnimation: ld l, a .animationLoop ld a, [hli] - cp $FF + cp -1 jr z, .AnimationOver - cp $C0 ; is this subanimation or a special effect? + cp FIRST_SE_ID ; is this subanimation or a special effect? jr c, .playSubanimation .doSpecialEffect ld c, a @@ -194,7 +194,7 @@ PlayAnimation: jr .searchSpecialEffectTableLoop .foundMatch ld a, [hli] - cp $FF ; is there a sound to play? + cp NO_MOVE - 1 ; is there a sound to play? jr z, .skipPlayingSound ld [wAnimSoundID], a ; store sound push hl @@ -241,15 +241,15 @@ PlayAnimation: ld l, c ld h, b push hl - ld a, [rOBP0] + ldh a, [rOBP0] push af ld a, [wAnimPalette] - ld [rOBP0], a + ldh [rOBP0], a call LoadAnimationTileset call LoadSubanimation call PlaySubanimation pop af - ld [rOBP0], a + ldh [rOBP0], a .nextAnimationCommand pop hl jr .animationLoop @@ -276,11 +276,11 @@ LoadSubanimation: ld d, a ; de = address of subanimation ld a, [de] ld b, a - and 31 + and %00011111 ld [wSubAnimCounter], a ; number of frame blocks ld a, b and %11100000 - cp 5 << 5 ; is subanimation type 5? + cp SUBANIMTYPE_ENEMY << 5 jr nz, .isNotType5 .isType5 call GetSubanimationTransform2 @@ -292,7 +292,7 @@ LoadSubanimation: srl a swap a ld [wSubAnimTransform], a - cp 4 ; is the animation reversed? + cp SUBANIMTYPE_REVERSE ld hl, 0 jr nz, .storeSubentryAddr ; if the animation is reversed, then place the initial subentry address at the end of the list of subentries @@ -312,27 +312,27 @@ LoadSubanimation: ld [wSubAnimSubEntryAddr + 1], a ret -; called if the subanimation type is not 5 -; sets the transform to 0 (i.e. no transform) if it's the player's turn +; called if the subanimation type is not SUBANIMTYPE_ENEMY +; sets the transform to SUBANIMTYPE_NORMAL if it's the player's turn ; sets the transform to the subanimation type if it's the enemy's turn GetSubanimationTransform1: ld b, a - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, b ret nz - xor a + xor a ; SUBANIMTYPE_NORMAL << 5 ret -; called if the subanimation type is 5 -; sets the transform to 2 (i.e. horizontal and vertical flip) if it's the player's turn -; sets the transform to 0 (i.e. no transform) if it's the enemy's turn +; called if the subanimation type is SUBANIMTYPE_ENEMY +; sets the transform to SUBANIMTYPE_HFLIP if it's the player's turn +; sets the transform to SUBANIMTYPE_NORMAL if it's the enemy's turn GetSubanimationTransform2: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a - ld a, 2 << 5 + ld a, SUBANIMTYPE_HFLIP << 5 ret z - xor a + xor a ; SUBANIMTYPE_NORMAL << 5 ret ; loads tile patterns for battle animations @@ -350,38 +350,38 @@ LoadAnimationTileset: ld e, a ld a, [hl] ld d, a ; de = address of tileset - ld hl, vSprites + $310 + ld hl, vSprites tile $31 ld b, BANK(AnimationTileset1) ; ROM bank ld a, [wTempTilesetNumTiles] ld c, a ; number of tiles jp CopyVideoData ; load tileset +anim_tileset: MACRO + db \1 + dw \2 + db -1 ; padding +ENDM + AnimationTilesetPointers: - db 79 ; number of tiles - dw AnimationTileset1 - db $FF - - db 79 ; number of tiles - dw AnimationTileset2 - db $FF - - db 64 ; number of tiles - dw AnimationTileset1 - db $FF + ; number of tiles, gfx pointer + anim_tileset 79, AnimationTileset1 + anim_tileset 79, AnimationTileset2 + anim_tileset 64, AnimationTileset1 AnimationTileset1: - INCBIN "gfx/attack_anim_1.2bpp" + INCBIN "gfx/battle/attack_anim_1.2bpp" AnimationTileset2: - INCBIN "gfx/attack_anim_2.2bpp" + INCBIN "gfx/battle/attack_anim_2.2bpp" SlotMachineTiles2: IF DEF(_RED) - INCBIN "gfx/red/slotmachine2.2bpp" + INCBIN "gfx/slots/red_slots_2.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine2.2bpp" + INCBIN "gfx/slots/blue_slots_2.2bpp" ENDC +SlotMachineTiles2End: MoveAnimation: push hl @@ -420,7 +420,7 @@ MoveAnimation: ld [wSubAnimSubEntryAddr], a ld [wUnusedD09B], a ld [wSubAnimTransform], a - dec a + dec a ; NO_MOVE - 1 ld [wAnimSoundID], a pop af pop bc @@ -430,11 +430,11 @@ MoveAnimation: ShareMoveAnimations: ; some moves just reuse animations from status conditions - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ret z - ; opponent’s turn + ; opponent's turn ld a, [wAnimationID] @@ -469,10 +469,10 @@ PlayApplyingAttackAnimation: jp hl AnimationTypePointerTable: - dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect + dw ShakeScreenVertically ; enemy mon has used a damaging move without a side effect dw ShakeScreenHorizontallyHeavy ; enemy mon has used a damaging move with a side effect - dw ShakeScreenHorizontallySlow ; enemy mon has used a non-damaging move - dw BlinkEnemyMonSprite ; player mon has used a damaging move without a side effect + dw ShakeScreenHorizontallySlow ; enemy mon has used a non-damaging move + dw BlinkEnemyMonSprite ; player mon has used a damaging move without a side effect dw ShakeScreenHorizontallyLight ; player mon has used a damaging move with a side effect dw ShakeScreenHorizontallySlow2 ; player mon has used a non-damaging move @@ -506,18 +506,18 @@ AnimationShakeScreenHorizontallySlow: push bc push bc .loop1 - ld a, [rWX] + ldh a, [rWX] inc a - ld [rWX], a + ldh [rWX], a ld c, 2 call DelayFrames dec b jr nz, .loop1 pop bc .loop2 - ld a, [rWX] + ldh a, [rWX] dec a - ld [rWX], a + ldh [rWX], a ld c, 2 call DelayFrames dec b @@ -543,21 +543,21 @@ SetAnimationPalette: ld b, $f0 .next ld a, b - ld [rOBP0], a + ldh [rOBP0], a ld a, $6c - ld [rOBP1], a + ldh [rOBP1], a ret .notSGB ld a, $e4 ld [wAnimPalette], a - ld [rOBP0], a + ldh [rOBP0], a ld a, $6c - ld [rOBP1], a + ldh [rOBP1], a ret PlaySubanimation: ld a, [wAnimSoundID] - cp $FF + cp NO_MOVE - 1 jr z, .skipPlayingSound call GetMoveSound call nc, AnimPlaySFX @@ -609,7 +609,7 @@ PlaySubanimation: ld a, [wSubAnimSubEntryAddr] ld l, a ld a, [wSubAnimTransform] - cp 4 ; is the animation reversed? + cp SUBANIMTYPE_REVERSE ld bc, 3 jr nz, .nextSubanimationSubentry ld bc, -3 @@ -658,90 +658,16 @@ DoSpecialEffectByAnimationId: pop hl ret -; Format: Animation ID (1 byte), Address (2 bytes) -AnimationIdSpecialEffects: - db MEGA_PUNCH - dw AnimationFlashScreen - - db GUILLOTINE - dw AnimationFlashScreen - - db MEGA_KICK - dw AnimationFlashScreen - - db HEADBUTT - dw AnimationFlashScreen - - db TAIL_WHIP - dw TailWhipAnimationUnused - - db GROWL - dw DoGrowlSpecialEffects - - db DISABLE - dw AnimationFlashScreen - - db BLIZZARD - dw DoBlizzardSpecialEffects - - db BUBBLEBEAM - dw AnimationFlashScreen - - db HYPER_BEAM - dw FlashScreenEveryFourFrameBlocks - - db THUNDERBOLT - dw FlashScreenEveryEightFrameBlocks - - db REFLECT - dw AnimationFlashScreen - - db SELFDESTRUCT - dw DoExplodeSpecialEffects - - db SPORE - dw AnimationFlashScreen - - db EXPLOSION - dw DoExplodeSpecialEffects - - db ROCK_SLIDE - dw DoRockSlideSpecialEffects - - db TRADE_BALL_DROP_ANIM - dw TradeHidePokemon - - db TRADE_BALL_SHAKE_ANIM - dw TradeShakePokeball - - db TRADE_BALL_TILT_ANIM - dw TradeJumpPokeball - - db TOSS_ANIM - dw DoBallTossSpecialEffects - - db SHAKE_ANIM - dw DoBallShakeSpecialEffects - - db POOF_ANIM - dw DoPoofSpecialEffects - - db GREATTOSS_ANIM - dw DoBallTossSpecialEffects - - db ULTRATOSS_ANIM - dw DoBallTossSpecialEffects - - db $FF ; terminator +INCLUDE "data/battle_anims/special_effects.asm" DoBallTossSpecialEffects: ld a, [wcf91] cp 3 ; is it a Master Ball or Ultra Ball? jr nc, .skipFlashingEffect .flashingEffect ; do a flashing effect if it's Master Ball or Ultra Ball - ld a, [rOBP0] + ldh a, [rOBP0] xor %00111100 ; complement colors 1 and 2 - ld [rOBP0], a + ldh [rOBP0], a .skipFlashingEffect ld a, [wSubAnimCounter] cp 11 ; is it the beginning of the subanimation? @@ -765,7 +691,7 @@ DoBallTossSpecialEffects: cp 1 ret nz .moveGhostMarowakLeft - coord hl, 17, 0 + hlcoord 17, 0 ld de, 20 lb bc, 7, 7 .loop @@ -778,7 +704,7 @@ DoBallTossSpecialEffects: dec b jr nz, .loop ld a, %00001000 - ld [rNR10], a ; Channel 1 sweep register + ldh [rNR10], a ; Channel 1 sweep register ret .isTrainerBattle ; if it's a trainer battle, shorten the animation by one frame ld a, [wSubAnimCounter] @@ -864,7 +790,7 @@ DoExplodeSpecialEffects: cp 1 ; is it the end of the subanimation? jr nz, FlashScreenEveryFourFrameBlocks ; if it's the end of the subanimation, make the attacking pokemon disappear - coord hl, 1, 5 + hlcoord 1, 5 jp AnimationHideMonPic ; make pokemon disappear ; flashes the screen when subanimation counter is 1 modulo 4 @@ -931,8 +857,8 @@ TradeShakePokeball: jp PlaySound BallMoveDistances1: - db -12,-12,-8 - db $ff ; terminator + db -12, -12, -8 + db -1 ; end ; function to make the pokeball jump up TradeJumpPokeball: @@ -965,15 +891,15 @@ TradeJumpPokeball: ld c, 5 call DelayFrames pop bc - ld a, [hSCX] ; background scroll X + ldh a, [hSCX] ; background scroll X sub 8 ; scroll to the left - ld [hSCX], a + ldh [hSCX], a pop de jr .loop BallMoveDistances2: - db 11,12,-12,-7,7,12,-8,8 - db $ff ; terminator + db 11, 12, -12, -7, 7, 12, -8, 8 + db -1 ; end ; this function copies the current musical note graphic ; so that there are two musical notes flying towards the defending pokemon @@ -994,87 +920,7 @@ TailWhipAnimationUnused: ld c, 20 jp DelayFrames -; Format: Special Effect ID (1 byte), Address (2 bytes) -SpecialEffectPointers: - db SE_DARK_SCREEN_FLASH ; $FE - dw AnimationFlashScreen - db SE_DARK_SCREEN_PALETTE ; $FD - dw AnimationDarkScreenPalette - db SE_RESET_SCREEN_PALETTE ; $FC - dw AnimationResetScreenPalette - db SE_SHAKE_SCREEN ; $FB - dw AnimationShakeScreen - db SE_WATER_DROPLETS_EVERYWHERE ; $FA - dw AnimationWaterDropletsEverywhere - db SE_DARKEN_MON_PALETTE ; $F9 - dw AnimationDarkenMonPalette - db SE_FLASH_SCREEN_LONG ; $F8 - dw AnimationFlashScreenLong - db SE_SLIDE_MON_UP ; $F7 - dw AnimationSlideMonUp - db SE_SLIDE_MON_DOWN ; $F6 - dw AnimationSlideMonDown - db SE_FLASH_MON_PIC ; $F5 - dw AnimationFlashMonPic - db SE_SLIDE_MON_OFF ; $F4 - dw AnimationSlideMonOff - db SE_BLINK_MON ; $F3 - dw AnimationBlinkMon - db SE_MOVE_MON_HORIZONTALLY ; $F2 - dw AnimationMoveMonHorizontally - db SE_RESET_MON_POSITION ; $F1 - dw AnimationResetMonPosition - db SE_LIGHT_SCREEN_PALETTE ; $F0 - dw AnimationLightScreenPalette - db SE_HIDE_MON_PIC ; $EF - dw AnimationHideMonPic - db SE_SQUISH_MON_PIC ; $EE - dw AnimationSquishMonPic - db SE_SHOOT_BALLS_UPWARD ; $ED - dw AnimationShootBallsUpward - db SE_SHOOT_MANY_BALLS_UPWARD ; $EC - dw AnimationShootManyBallsUpward - db SE_BOUNCE_UP_AND_DOWN ; $EB - dw AnimationBoundUpAndDown - db SE_MINIMIZE_MON ; $EA - dw AnimationMinimizeMon - db SE_SLIDE_MON_DOWN_AND_HIDE ; $E9 - dw AnimationSlideMonDownAndHide - db SE_TRANSFORM_MON ; $E8 - dw AnimationTransformMon - db SE_LEAVES_FALLING ; $E7 - dw AnimationLeavesFalling - db SE_PETALS_FALLING ; $E6 - dw AnimationPetalsFalling - db SE_SLIDE_MON_HALF_OFF ; $E5 - dw AnimationSlideMonHalfOff - db SE_SHAKE_ENEMY_HUD ; $E4 - dw AnimationShakeEnemyHUD - db SE_SHAKE_ENEMY_HUD_2 ; unused--same pointer as SE_SHAKE_ENEMY_HUD ($E4) - dw AnimationShakeEnemyHUD - db SE_SPIRAL_BALLS_INWARD ; $E2 - dw AnimationSpiralBallsInward - db SE_DELAY_ANIMATION_10 ; $E1 - dw AnimationDelay10 - db SE_FLASH_ENEMY_MON_PIC ; unused--same as SE_FLASH_MON_PIC ($F5), but for the enemy mon - dw AnimationFlashEnemyMonPic - db SE_HIDE_ENEMY_MON_PIC ; $DF - dw AnimationHideEnemyMonPic - db SE_BLINK_ENEMY_MON ; $DE - dw AnimationBlinkEnemyMon - db SE_SHOW_MON_PIC ; $DD - dw AnimationShowMonPic - db SE_SHOW_ENEMY_MON_PIC ; $DC - dw AnimationShowEnemyMonPic - db SE_SLIDE_ENEMY_MON_OFF ; $DB - dw AnimationSlideEnemyMonOff - db SE_SHAKE_BACK_AND_FORTH ; $DA - dw AnimationShakeBackAndForth - db SE_SUBSTITUTE_MON ; $D9 - dw AnimationSubstitute - db SE_WAVY_SCREEN ; $D8 - dw AnimationWavyScreen - db $FF +INCLUDE "data/battle_anims/special_effect_pointers.asm" AnimationDelay10: ld c, 10 @@ -1083,16 +929,16 @@ AnimationDelay10: ; calls a function with the turn flipped from player to enemy or vice versa ; input - hl - address of function to call CallWithTurnFlipped: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] push af xor 1 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ld de, .returnAddress push de jp hl .returnAddress pop af - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ret ; flashes the screen for an extended period (48 frames) @@ -1110,7 +956,7 @@ AnimationFlashScreenLong: ld a, [hli] cp $01 ; is it the end of the palettes? jr z, .endOfPalettes - ld [rBGP], a + ldh [rBGP], a call FlashScreenLongDelay jr .innerLoop .endOfPalettes @@ -1169,18 +1015,18 @@ FlashScreenLongDelay: jp DelayFrames AnimationFlashScreen: - ld a, [rBGP] + ldh a, [rBGP] push af ; save initial palette ld a, %00011011 ; 0, 1, 2, 3 (inverted colors) - ld [rBGP], a + ldh [rBGP], a ld c, 2 call DelayFrames xor a ; white out background - ld [rBGP], a + ldh [rBGP], a ld c, 2 call DelayFrames pop af - ld [rBGP], a ; restore initial palette + ldh [rBGP], a ; restore initial palette ret AnimationDarkScreenPalette: @@ -1225,7 +1071,7 @@ SetAnimationBGPalette: jr z, .next ld a, c .next - ld [rBGP], a + ldh [rBGP], a ret ld b, $5 @@ -1296,14 +1142,14 @@ _AnimationWaterDroplets: AnimationSlideMonUp: ; Slides the mon's sprite upwards. ld c, 7 - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a - coord hl, 1, 6 - coord de, 1, 5 + hlcoord 1, 6 + decoord 1, 5 ld a, $30 jr z, .next - coord hl, 12, 1 - coord de, 12, 0 + hlcoord 12, 1 + decoord 12, 0 ld a, $ff .next ld [wSlideMonUpBottomRowLeftTile], a @@ -1311,7 +1157,7 @@ AnimationSlideMonUp: AnimationSlideMonDown: ; Slides the mon's sprite down out of the screen. - xor a + xor a ; TILEMAP_MON_PIC call GetTileIDList .loop call GetMonSpriteTileMapPointerFromRowCount @@ -1364,11 +1210,11 @@ _AnimationSlideMonUp: jr nz, .slideLoop ; Fill in the bottom row of the mon pic with the next row's tile IDs. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a - coord hl, 1, 11 + hlcoord 1, 11 jr z, .next - coord hl, 12, 6 + hlcoord 12, 6 .next ld a, [wSlideMonUpBottomRowLeftTile] inc a @@ -1518,7 +1364,7 @@ AnimationFlashEnemyMonPic: jp CallWithTurnFlipped AnimationShowMonPic: - xor a + xor a ; TILEMAP_MON_PIC call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount call CopyPicTiles @@ -1533,16 +1379,16 @@ AnimationShowEnemyMonPic: AnimationShakeBackAndForth: ; Shakes the mon's sprite back and forth rapidly. This is used in Double Team. ; The mon's sprite disappears after this animation. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a - coord hl, 0, 5 - coord de, 2, 5 + hlcoord 0, 5 + decoord 2, 5 jr z, .next - coord hl, 11, 0 - coord de, 13, 0 + hlcoord 11, 0 + decoord 13, 0 .next - xor a + xor a ; TILEMAP_MON_PIC ld c, $10 .loop push af @@ -1581,13 +1427,13 @@ AnimationMoveMonHorizontally: ; Shifts the mon's sprite horizontally to a fixed location. Used by lots of ; animations like Tackle/Body Slam. call AnimationHideMonPic - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a - coord hl, 2, 5 + hlcoord 2, 5 jr z, .next - coord hl, 11, 0 + hlcoord 11, 0 .next - xor a + xor a ; TILEMAP_MON_PIC push hl call GetTileIDList pop hl @@ -1597,7 +1443,7 @@ AnimationMoveMonHorizontally: AnimationResetMonPosition: ; Resets the mon's sprites to be located at the normal coordinates. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, 5 * SCREEN_WIDTH + 2 jr z, .next @@ -1609,7 +1455,7 @@ AnimationResetMonPosition: AnimationSpiralBallsInward: ; Creates an effect that looks like energy balls spiralling into the ; player mon's sprite. Used in Focus Energy, for example. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn ld a, -40 @@ -1685,7 +1531,7 @@ SpiralBallAnimationCoordinates: db $58, $28 db $50, $30 db $50, $28 - db $FF ; list terminator + db -1 ; end AnimationSquishMonPic: ; Squishes the mon's sprite horizontally making it @@ -1693,15 +1539,15 @@ AnimationSquishMonPic: ld c, 4 .loop push bc - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn - coord hl, 16, 0 - coord de, 14, 0 + hlcoord 16, 0 + decoord 14, 0 jr .next .playerTurn - coord hl, 5, 5 - coord de, 3, 5 + hlcoord 5, 5 + decoord 3, 5 .next push de xor a ; left @@ -1746,7 +1592,7 @@ _AnimationSquishMonPic: AnimationShootBallsUpward: ; Shoots one pillar of "energy" balls upwards. Used in Teleport/Sky Attack ; animations. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn lb bc, 0, 16 * 8 @@ -1814,7 +1660,7 @@ _AnimationShootBallsUpward: AnimationShootManyBallsUpward: ; Shoots several pillars of "energy" balls upward. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld hl, UpwardBallsAnimXCoordinatesPlayerTurn ld a, $50 ; y coordinate for "energy" ball pillar @@ -1840,13 +1686,13 @@ UpwardBallsAnimXCoordinatesPlayerTurn: ; List of x coordinates for each pillar of "energy" balls in the ; AnimationShootManyBallsUpward animation. It's unused in the game. db $10, $40, $28, $18, $38, $30 - db $FF ; list terminator + db -1 ; end UpwardBallsAnimXCoordinatesEnemyTurn: ; List of x coordinates for each pillar of "energy" balls in the ; AnimationShootManyBallsUpward animation. It's unused in the game. db $60, $90, $78, $68, $88, $80 - db $FF ; list terminator + db -1 ; end AnimationMinimizeMon: ; Changes the mon's sprite to a mini black sprite. Used by the @@ -1873,13 +1719,13 @@ AnimationMinimizeMon: jp AnimationShowMonPic MinimizedMonSprite: - INCBIN "gfx/minimized_mon_sprite.1bpp" + INCBIN "gfx/battle/minimize.1bpp" MinimizedMonSpriteEnd: AnimationSlideMonDownAndHide: ; Slides the mon's sprite down and disappears. Used in Acid Armor. - ld a, $1 - ld c, $2 + ld a, TILEMAP_SLIDE_DOWN_MON_PIC_7X5 + ld c, 2 .loop push bc push af @@ -1898,7 +1744,7 @@ AnimationSlideMonDownAndHide: jr nz, .loop call AnimationHideMonPic ld hl, wTempPic - ld bc, $0310 + ld bc, 7 * 7 tiles xor a call FillMemory jp CopyTempPicToMonPic @@ -1906,13 +1752,13 @@ AnimationSlideMonDownAndHide: _AnimationSlideMonOff: ; Slides the mon's sprite off the screen horizontally by e tiles and waits ; [wSlideMonDelay] V-blanks each time the pic is slid by one tile. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn - coord hl, 12, 0 + hlcoord 12, 0 jr .next .playerTurn - coord hl, 0, 5 + hlcoord 0, 5 .next ld d, 8 ; d's value is unused .slideLoop ; iterates once for each time the pic slides by one tile @@ -1921,7 +1767,7 @@ _AnimationSlideMonOff: .rowLoop ; iterates once for each row ld c, 8 .tileLoop ; iterates once for each tile in the row - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn2 call .EnemyNextTile @@ -1984,7 +1830,7 @@ AnimationSlideMonHalfOff: jp Delay3 CopyTempPicToMonPic: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld hl, vBackPic ; player turn jr z, .next @@ -2000,18 +1846,18 @@ AnimationWavyScreen: call BattleAnimCopyTileMapToVRAM call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a + ldh [hAutoBGTransferEnabled], a + ld a, SCREEN_HEIGHT_PX + ldh [hWY], a ld d, $80 ; terminator - ld e, SCREEN_HEIGHT_PIXELS - 1 + ld e, SCREEN_HEIGHT_PX - 1 ld c, $ff ld hl, WavyScreenLineOffsets .loop push hl .innerLoop call WavyScreen_SetSCX - ld a, [rLY] + ldh a, [rLY] cp e ; is it the last visible line in the frame? jr nz, .innerLoop ; keep going if not pop hl @@ -2024,11 +1870,11 @@ AnimationWavyScreen: dec c jr nz, .loop xor a - ld [hWY], a + ldh [hWY], a call SaveScreenTilesToBuffer2 call ClearScreen ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 call LoadScreenTilesFromBuffer2 ld hl, vBGMap1 @@ -2036,11 +1882,11 @@ AnimationWavyScreen: ret WavyScreen_SetSCX: - ld a, [rSTAT] + ldh a, [rSTAT] and $3 ; is it H-blank? jr nz, WavyScreen_SetSCX ; wait until it's H-blank ld a, [hl] - ld [rSCX], a + ldh [rSCX], a inc hl ld a, [hl] cp d ; have we reached the end? @@ -2059,48 +1905,48 @@ AnimationSubstitute: ; Changes the pokemon's sprite to the mini sprite ld hl, wTempPic xor a - ld bc, $0310 + ld bc, $310 call FillMemory - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn - ld hl, SlowbroSprite ; facing down sprite + ld hl, MonsterSprite tile 0 ; facing down sprite ld de, wTempPic + $120 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $10 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 1 ld de, wTempPic + $120 + $70 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $20 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 2 ld de, wTempPic + $120 + $10 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $30 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 3 ld de, wTempPic + $120 + $10 + $70 - call CopySlowbroSpriteData + call CopyMonsterSpriteData jr .next .playerTurn - ld hl, SlowbroSprite + $40 ; facing up sprite + ld hl, MonsterSprite tile 4 ; facing up sprite ld de, wTempPic + $120 + $70 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $50 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 5 ld de, wTempPic + $120 + $e0 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $60 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 6 ld de, wTempPic + $120 + $80 - call CopySlowbroSpriteData - ld hl, SlowbroSprite + $70 + call CopyMonsterSpriteData + ld hl, MonsterSprite tile 7 ld de, wTempPic + $120 + $f0 - call CopySlowbroSpriteData + call CopyMonsterSpriteData .next call CopyTempPicToMonPic jp AnimationShowMonPic -CopySlowbroSpriteData: - ld bc, $0010 - ld a, BANK(SlowbroSprite) +CopyMonsterSpriteData: + ld bc, 1 tiles + ld a, BANK(MonsterSprite) jp FarCopyData2 HideSubstituteShowMonAnim: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld hl, wPlayerMonMinimized ld a, [wPlayerBattleStatus2] @@ -2150,7 +1996,7 @@ AnimationTransformMon: ld [wChangeMonPicEnemyTurnSpecies], a ChangeMonPic: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn ld a, [wChangeMonPicEnemyTurnSpecies] @@ -2159,7 +2005,7 @@ ChangeMonPic: xor a ld [wSpriteFlipped], a call GetMonHeader - coord hl, 12, 0 + hlcoord 12, 0 call LoadFrontSpriteByMonIndex jr .done .playerTurn @@ -2170,7 +2016,7 @@ ChangeMonPic: ld [wd0b5], a call GetMonHeader predef LoadMonBackPic - xor a + xor a ; TILEMAP_MON_PIC call GetTileIDList call GetMonSpriteTileMapPointerFromRowCount call CopyPicTiles @@ -2183,11 +2029,11 @@ ChangeMonPic: AnimationHideEnemyMonPic: ; Hides the enemy mon's sprite xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld hl, AnimationHideMonPic call CallWithTurnFlipped ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a jp Delay3 InitMultipleObjectsOAM: @@ -2213,7 +2059,7 @@ InitMultipleObjectsOAM: AnimationHideMonPic: ; Hides the mon's sprite. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn ld a, 12 @@ -2227,7 +2073,7 @@ ClearMonPicFromTileMap: push bc ld e, a ld d, 0 - coord hl, 0, 0 + hlcoord 0, 0 add hl, de lb bc, 7, 7 call ClearScreenArea @@ -2241,7 +2087,7 @@ ClearMonPicFromTileMap: ; in order to show only a portion of the mon sprite. GetMonSpriteTileMapPointerFromRowCount: push de - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr nz, .enemyTurn ld a, 20 * 5 + 1 @@ -2249,7 +2095,7 @@ GetMonSpriteTileMapPointerFromRowCount: .enemyTurn ld a, 12 .next - coord hl, 0, 0 + hlcoord 0, 0 ld e, a ld d, 0 add hl, de @@ -2329,7 +2175,7 @@ GetMoveSound: ld b, a call IsCryMove jr nc, .NotCryMove - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr nz, .next ld a, [wBattleMonSpecies] ; get number of current monster @@ -2381,184 +2227,17 @@ IsCryMove: scf ret -MoveSoundTable: - ; ID, pitch mod, tempo mod - db SFX_POUND, $00,$80 ; POUND - db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP - db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP - db SFX_BATTLE_0B, $01,$80 ; COMET_PUNCH - db SFX_BATTLE_0D, $00,$40 ; MEGA_PUNCH - db SFX_SILPH_SCOPE, $00,$ff ; PAY_DAY - db SFX_BATTLE_0D, $10,$60 ; FIRE_PUNCH - db SFX_BATTLE_0D, $20,$80 ; ICE_PUNCH - db SFX_BATTLE_0D, $00,$a0 ; THUNDERPUNCH - db SFX_DAMAGE, $00,$80 ; SCRATCH - db SFX_BATTLE_0F, $20,$40 ; VICEGRIP - db SFX_BATTLE_0F, $00,$80 ; GUILLOTINE - db SFX_BATTLE_0E, $00,$a0 ; RAZOR_WIND - db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE - db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT - db SFX_BATTLE_12, $00,$c0 ; GUST - db SFX_BATTLE_12, $10,$a0 ; WING_ATTACK - db SFX_BATTLE_13, $00,$e0 ; WHIRLWIND - db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY - db SFX_BATTLE_14, $00,$80 ; BIND - db SFX_BATTLE_22, $00,$80 ; SLAM - db SFX_VINE_WHIP, $01,$80 ; VINE_WHIP - db SFX_BATTLE_20, $00,$80 ; STOMP - db SFX_BATTLE_17, $f0,$40 ; DOUBLE_KICK - db SFX_SUPER_EFFECTIVE, $00,$80 ; MEGA_KICK - db SFX_BATTLE_17, $00,$80 ; JUMP_KICK - db SFX_BATTLE_21, $10,$80 ; ROLLING_KICK - db SFX_BATTLE_1B, $01,$a0 ; SAND_ATTACK - db SFX_BATTLE_18, $00,$80 ; HEADBUTT - db SFX_BATTLE_1E, $00,$60 ; HORN_ATTACK - db SFX_BATTLE_1E, $01,$40 ; FURY_ATTACK - db SFX_HORN_DRILL, $00,$a0 ; HORN_DRILL - db SFX_SUPER_EFFECTIVE, $10,$a0 ; TACKLE - db SFX_BATTLE_20, $00,$c0 ; BODY_SLAM - db SFX_BATTLE_14, $10,$60 ; WRAP - db SFX_SUPER_EFFECTIVE, $00,$a0 ; TAKE_DOWN - db SFX_BATTLE_22, $11,$c0 ; THRASH - db SFX_SUPER_EFFECTIVE, $20,$c0 ; DOUBLE_EDGE - db SFX_BATTLE_21, $00,$80 ; TAIL_WHIP - db SFX_BATTLE_1B, $00,$80 ; POISON_STING - db SFX_BATTLE_1B, $20,$c0 ; TWINEEDLE - db SFX_BATTLE_19, $00,$80 ; PIN_MISSILE - db SFX_BATTLE_31, $ff,$40 ; LEER - db SFX_BATTLE_1E, $00,$80 ; BITE - db SFX_BATTLE_0B, $00,$c0 ; GROWL - db SFX_BATTLE_0B, $00,$40 ; ROAR - db SFX_BATTLE_35, $00,$80 ; SING - db SFX_BATTLE_27, $40,$60 ; SUPERSONIC - db SFX_BATTLE_27, $00,$80 ; SONICBOOM - db SFX_BATTLE_27, $ff,$40 ; DISABLE - db SFX_BATTLE_2A, $80,$c0 ; ACID - db SFX_BATTLE_19, $10,$a0 ; EMBER - db SFX_BATTLE_19, $21,$e0 ; FLAMETHROWER - db SFX_BATTLE_29, $00,$80 ; MIST - db SFX_BATTLE_24, $20,$60 ; WATER_GUN - db SFX_BATTLE_2A, $00,$80 ; HYDRO_PUMP - db SFX_BATTLE_2C, $00,$80 ; SURF - db SFX_BATTLE_28, $40,$80 ; ICE_BEAM - db SFX_BATTLE_29, $f0,$e0 ; BLIZZARD - db SFX_PSYBEAM, $00,$80 ; PSYBEAM - db SFX_BATTLE_2A, $f0,$60 ; BUBBLEBEAM - db SFX_BATTLE_28, $00,$80 ; AURORA_BEAM - db SFX_BATTLE_36, $00,$80 ; HYPER_BEAM - db SFX_PECK,$01, $a0 ; PECK - db SFX_BATTLE_13, $f0,$20 ; DRILL_PECK - db SFX_BATTLE_23, $01,$c0 ; SUBMISSION - db SFX_BATTLE_23, $00,$80 ; LOW_KICK - db SFX_SUPER_EFFECTIVE, $00,$e0 ; COUNTER - db SFX_BATTLE_26, $01,$60 ; SEISMIC_TOSS - db SFX_BATTLE_26, $20,$40 ; STRENGTH - db SFX_BATTLE_24, $00,$80 ; ABSORB - db SFX_BATTLE_24, $40,$c0 ; MEGA_DRAIN - db SFX_BATTLE_1B, $03,$60 ; LEECH_SEED - db SFX_BATTLE_25, $11,$e0 ; GROWTH - db SFX_BATTLE_12, $20,$e0 ; RAZOR_LEAF - db SFX_BATTLE_2E, $00,$80 ; SOLARBEAM - db SFX_BATTLE_1C, $00,$80 ; POISONPOWDER - db SFX_BATTLE_1C, $11,$a0 ; STUN_SPORE - db SFX_BATTLE_1C, $01,$c0 ; SLEEP_POWDER - db SFX_BATTLE_13, $14,$c0 ; PETAL_DANCE - db SFX_BATTLE_1B, $02,$a0 ; STRING_SHOT - db SFX_BATTLE_29, $f0,$80 ; DRAGON_RAGE - db SFX_BATTLE_29, $20,$c0 ; FIRE_SPIN - db SFX_BATTLE_2F, $00,$20 ; THUNDERSHOCK - db SFX_BATTLE_2F, $20,$80 ; THUNDERBOLT - db SFX_BATTLE_2E, $12,$60 ; THUNDER_WAVE - db SFX_BATTLE_26, $00,$80 ; THUNDER - db SFX_BATTLE_14, $01,$e0 ; ROCK_THROW - db SFX_BATTLE_29, $0f,$e0 ; EARTHQUAKE - db SFX_BATTLE_29, $11,$20 ; FISSURE - db SFX_DAMAGE, $10,$40 ; DIG - db SFX_BATTLE_0F, $10,$c0 ; TOXIC - db SFX_BATTLE_14, $00,$20 ; CONFUSION - db SFX_PSYCHIC_M, $00,$80 ; PSYCHIC_M - db SFX_BATTLE_35, $11,$18 ; HYPNOSIS - db SFX_BATTLE_09, $20,$c0 ; MEDITATE - db SFX_FAINT_FALL, $20,$c0 ; AGILITY - db SFX_BATTLE_25, $00,$10 ; QUICK_ATTACK - db SFX_BATTLE_26, $f0,$20 ; RAGE - db SFX_BATTLE_33, $f0,$c0 ; TELEPORT - db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE - db SFX_BATTLE_09, $f0,$40 ; MIMIC - db SFX_BATTLE_31, $00,$80 ; SCREECH - db SFX_BATTLE_33, $80,$40 ; DOUBLE_TEAM - db SFX_BATTLE_33, $00,$80 ; RECOVER - db SFX_BATTLE_14, $11,$20 ; HARDEN - db SFX_BATTLE_14, $22,$10 ; MINIMIZE - db SFX_BATTLE_1B, $f1,$ff ; SMOKESCREEN - db SFX_BATTLE_13, $f1,$ff ; CONFUSE_RAY - db SFX_BATTLE_14, $33,$30 ; WITHDRAW - db SFX_BATTLE_32, $40,$c0 ; DEFENSE_CURL - db SFX_BATTLE_0E, $20,$20 ; BARRIER - db SFX_BATTLE_0E, $f0,$10 ; LIGHT_SCREEN - db SFX_BATTLE_0F, $f8,$10 ; HAZE - db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT - db SFX_BATTLE_25, $00,$80 ; FOCUS_ENERGY - db SFX_BATTLE_18, $00,$c0 ; BIDE - db SFX_BATTLE_32, $c0,$ff ; METRONOME - db SFX_BATTLE_09, $f2,$20 ; MIRROR_MOVE - db SFX_BATTLE_34, $00,$80 ; SELFDESTRUCT - db SFX_BATTLE_34, $00,$40 ; EGG_BOMB - db SFX_BATTLE_09, $00,$40 ; LICK - db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG - db SFX_BATTLE_2A, $20,$20 ; SLUDGE - db SFX_BATTLE_32, $00,$80 ; BONE_CLUB - db SFX_BATTLE_29, $1f,$20 ; FIRE_BLAST - db SFX_BATTLE_25, $2f,$80 ; WATERFALL - db SFX_BATTLE_0F, $1f,$ff ; CLAMP - db SFX_BATTLE_2B, $1f,$60 ; SWIFT - db SFX_BATTLE_26, $1e,$20 ; SKULL_BASH - db SFX_BATTLE_26, $1f,$18 ; SPIKE_CANNON - db SFX_BATTLE_14, $0f,$80 ; CONSTRICT - db SFX_BATTLE_09, $f8,$10 ; AMNESIA - db SFX_FAINT_FALL, $18,$20 ; KINESIS - db SFX_BATTLE_32, $08,$40 ; SOFTBOILED - db SFX_BATTLE_17, $01,$e0 ; HI_JUMP_KICK - db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE - db SFX_BATTLE_35, $42,$01 ; DREAM_EATER - db SFX_BATTLE_1C, $00,$ff ; POISON_GAS - db SFX_BATTLE_32, $08,$e0 ; BARRAGE - db SFX_BATTLE_24, $00,$80 ; LEECH_LIFE - db SFX_BATTLE_09, $88,$10 ; LOVELY_KISS - db SFX_BATTLE_25, $48,$ff ; SKY_ATTACK - db SFX_FAINT_FALL, $ff,$ff ; TRANSFORM - db SFX_BATTLE_24, $ff,$10 ; BUBBLE - db SFX_FAINT_FALL, $ff,$04 ; DIZZY_PUNCH - db SFX_BATTLE_1C, $01,$ff ; SPORE - db SFX_BATTLE_13, $f8,$ff ; FLASH - db SFX_BATTLE_0C, $f0,$f0 ; PSYWAVE - db SFX_BATTLE_0F, $08,$10 ; SPLASH - db SFX_BATTLE_0D, $f0,$ff ; ACID_ARMOR - db SFX_SUPER_EFFECTIVE, $f0,$ff ; CRABHAMMER - db SFX_BATTLE_34, $10,$ff ; EXPLOSION - db SFX_BATTLE_0E, $f0,$20 ; FURY_SWIPES - db SFX_BATTLE_2B, $f0,$60 ; BONEMERANG - db SFX_BATTLE_21, $12,$10 ; REST - db SFX_BATTLE_36, $f0,$20 ; ROCK_SLIDE - db SFX_BATTLE_1E, $12,$ff ; HYPER_FANG - db SFX_BATTLE_31, $80,$04 ; SHARPEN - db SFX_BATTLE_33, $f0,$10 ; CONVERSION - db SFX_BATTLE_29, $f8,$ff ; TRI_ATTACK - db SFX_BATTLE_26, $f0,$ff ; SUPER_FANG - db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH - db SFX_BATTLE_2C, $d8,$04 ; SUBSTITUTE - db SFX_BATTLE_0B, $00,$80 ; STRUGGLE - db SFX_BATTLE_0B, $00,$80 +INCLUDE "data/moves/sfx.asm" CopyPicTiles: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, $31 ; base tile ID of player mon sprite jr z, .next ; enemy turn xor a ; base tile ID of enemy mon sprite .next - ld [hBaseTileID], a + ldh [hBaseTileID], a jr CopyTileIDs_NoBGTransfer ; copy the tiles used when a mon is being sent out of or into a pokeball @@ -2575,7 +2254,7 @@ CopyDownscaledMonTiles: CopyTileIDs_NoBGTransfer: xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ; fall through ; b = number of rows @@ -2585,7 +2264,7 @@ CopyTileIDs: .rowLoop push bc push hl - ld a, [hBaseTileID] + ldh a, [hBaseTileID] ld b, a .columnLoop ld a, [de] @@ -2601,116 +2280,25 @@ CopyTileIDs: dec b jr nz, .rowLoop ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a pop hl ret -TileIDListPointerTable: - dw Unknown_79b24 - dn 7, 7 - dw Unknown_79b55 - dn 5, 7 - dw Unknown_79b78 - dn 3, 7 - dw GengarIntroTiles1 - dn 7, 7 - dw GengarIntroTiles2 - dn 7, 7 - dw GengarIntroTiles3 - dn 7, 7 - dw Unknown_79c20 - dn 8, 6 - dw Unknown_79c50 - dn 3, 12 - -DownscaledMonTiles_5x5: - db $31,$38,$46,$54,$5B - db $32,$39,$47,$55,$5C - db $34,$3B,$49,$57,$5E - db $36,$3D,$4B,$59,$60 - db $37,$3E,$4C,$5A,$61 - -DownscaledMonTiles_3x3: - db $31,$46,$5B - db $34,$49,$5E - db $37,$4C,$61 - -Unknown_79b24: - db $00,$07,$0E,$15,$1C,$23,$2A - db $01,$08,$0F,$16,$1D,$24,$2B - db $02,$09,$10,$17,$1E,$25,$2C - db $03,$0A,$11,$18,$1F,$26,$2D - db $04,$0B,$12,$19,$20,$27,$2E - db $05,$0C,$13,$1A,$21,$28,$2F - db $06,$0D,$14,$1B,$22,$29,$30 - -Unknown_79b55: - db $00,$07,$0E,$15,$1C,$23,$2A - db $01,$08,$0F,$16,$1D,$24,$2B - db $03,$0A,$11,$18,$1F,$26,$2D - db $04,$0B,$12,$19,$20,$27,$2E - db $05,$0C,$13,$1A,$21,$28,$2F - -Unknown_79b78: - db $00,$07,$0E,$15,$1C,$23,$2A - db $02,$09,$10,$17,$1E,$25,$2C - db $04,$0B,$12,$19,$20,$27,$2E - -GengarIntroTiles1: - db $00,$00,$00,$00,$00,$00,$00 - db $00,$00,$00,$00,$00,$19,$00 - db $02,$06,$0B,$10,$14,$1A,$00 - db $00,$07,$0C,$11,$15,$1B,$00 - db $03,$08,$0D,$12,$16,$1C,$00 - db $04,$09,$0E,$13,$17,$1D,$1F - db $05,$0A,$0F,$01,$18,$1E,$20 - -GengarIntroTiles2: - db $00,$00,$00,$30,$00,$37,$00 - db $00,$00,$2B,$31,$34,$38,$3D - db $21,$26,$2C,$01,$35,$39,$3E - db $22,$27,$2D,$32,$36,$01,$00 - db $23,$28,$2E,$33,$01,$3A,$00 - db $24,$29,$2F,$01,$01,$3B,$00 - db $25,$2A,$01,$01,$01,$3C,$00 - -GengarIntroTiles3: - db $00,$00,$00,$00,$00,$00,$00 - db $00,$00,$47,$4D,$00,$00,$00 - db $00,$00,$48,$4E,$52,$56,$5B - db $3F,$43,$49,$4F,$53,$57,$5C - db $40,$44,$4A,$50,$54,$58,$00 - db $41,$45,$4B,$51,$4C,$59,$5D - db $42,$46,$4C,$4C,$55,$5A,$5E - -Unknown_79c20: - db $31,$32,$32,$32,$32,$33 - db $34,$35,$36,$36,$37,$38 - db $34,$39,$3A,$3A,$3B,$38 - db $3C,$3D,$3E,$3E,$3F,$40 - db $41,$42,$43,$43,$44,$45 - db $46,$47,$43,$48,$49,$4A - db $41,$43,$4B,$4C,$4D,$4E - db $4F,$50,$50,$50,$51,$52 - -Unknown_79c50: - db $43,$55,$56,$53,$53,$53,$53,$53,$53,$53,$53,$53 - db $43,$57,$58,$54,$54,$54,$54,$54,$54,$54,$54,$54 - db $43,$59,$5A,$43,$43,$43,$43,$43,$43,$43,$43,$43 +INCLUDE "data/tilemaps.asm" AnimationLeavesFalling: ; Makes leaves float down from the top of the screen. This is used ; in Razor Leaf's animation. - ld a, [rOBP0] + ldh a, [rOBP0] push af ld a, [wAnimPalette] - ld [rOBP0], a + ldh [rOBP0], a ld d, $37 ; leaf tile ld a, 3 ; number of leaves ld [wNumFallingObjects], a call AnimationFallingObjects pop af - ld [rOBP0], a + ldh [rOBP0], a ret AnimationPetalsFalling: @@ -2841,7 +2429,7 @@ FallingObjects_InitXCoords: ret FallingObjects_InitialXCoords: - db $38,$40,$50,$60,$70,$88,$90,$56,$67,$4A,$77,$84,$98,$32,$22,$5C,$6C,$7D,$8E,$99 + db $38, $40, $50, $60, $70, $88, $90, $56, $67, $4A, $77, $84, $98, $32, $22, $5C, $6C, $7D, $8E, $99 FallingObjects_InitMovementData: ld hl, wFallingObjectsMovementData @@ -2857,7 +2445,7 @@ FallingObjects_InitMovementData: ret FallingObjects_InitialMovementData: - db $00,$84,$06,$81,$02,$88,$01,$83,$05,$89,$09,$80,$07,$87,$03,$82,$04,$85,$08,$86 + db $00, $84, $06, $81, $02, $88, $01, $83, $05, $89, $09, $80, $07, $87, $03, $82, $04, $85, $08, $86 AnimationShakeEnemyHUD: ; Shakes the enemy HUD. @@ -2869,7 +2457,7 @@ AnimationShakeEnemyHUD: call CopyVideoData xor a - ld [hSCX], a + ldh [hSCX], a ; Copy wTileMap to BG map 0. The regular BG (not the window) is set to use ; map 0 and can be scrolled with SCX, which allows a shaking effect. @@ -2878,8 +2466,8 @@ AnimationShakeEnemyHUD: ; Now that the regular BG is showing the same thing the window was, move the ; window off the screen so that we can modify its contents below. - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a + ld a, SCREEN_HEIGHT_PX + ldh [hWY], a ; Copy wTileMap to VRAM such that the row below the enemy HUD (in wTileMap) is ; lined up with row 0 of the window. @@ -2891,7 +2479,7 @@ AnimationShakeEnemyHUD: ; covers everything below the enemy HD with a copy that looks just like what ; was there before. ld a, 7 * 8 - ld [hWY], a + ldh [hWY], a ; Write OAM entries so that the copy of the back pic from the top of this ; function shows up on screen. We need this because the back pic's Y coordinates @@ -2915,12 +2503,12 @@ AnimationShakeEnemyHUD: ; Restore the original graphics. call AnimationShowMonPic call ClearSprites - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a + ld a, SCREEN_HEIGHT_PX + ldh [hWY], a ld hl, vBGMap1 call BattleAnimCopyTileMapToVRAM xor a - ld [hWY], a + ldh [hWY], a call SaveScreenTilesToBuffer1 ld hl, vBGMap0 call BattleAnimCopyTileMapToVRAM @@ -2935,7 +2523,7 @@ AnimationShakeEnemyHUD: CopyTileIDsFromList: call GetPredefRegisters ld a, c - ld [hBaseTileID], a + ldh [hBaseTileID], a ld a, b push hl call GetTileIDList @@ -2943,30 +2531,30 @@ CopyTileIDsFromList: jp CopyTileIDs ShakeEnemyHUD_ShakeBG: - ld a, [hSCX] + ldh a, [hSCX] ld [wTempSCX], a .loop ld a, [wTempSCX] add d - ld [hSCX], a + ldh [hSCX], a ld c, 2 call DelayFrames ld a, [wTempSCX] sub d - ld [hSCX], a + ldh [hSCX], a ld c, 2 call DelayFrames dec e jr nz, .loop ld a, [wTempSCX] - ld [hSCX], a + ldh [hSCX], a ret BattleAnimCopyTileMapToVRAM: ld a, h - ld [H_AUTOBGTRANSFERDEST + 1], a + ldh [hAutoBGTransferDest + 1], a ld a, l - ld [H_AUTOBGTRANSFERDEST], a + ldh [hAutoBGTransferDest], a jp Delay3 TossBallAnimation: @@ -3014,7 +2602,7 @@ TossBallAnimation: .PokeBallAnimations: ; sequence of animations that make up the Poké Ball toss - db POOF_ANIM,HIDEPIC_ANIM,SHAKE_ANIM,POOF_ANIM,SHOWPIC_ANIM + db POOF_ANIM, HIDEPIC_ANIM, SHAKE_ANIM, POOF_ANIM, SHOWPIC_ANIM .BlockBall ld a, TOSS_ANIM @@ -3050,4 +2638,4 @@ PlayApplyingAttackSound: ld a, b ld [wTempoModifier], a ld a, c - jp PlaySound + jp PlaySound diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 1967d33b..90e99f98 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -1,17 +1,17 @@ BattleTransition: ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 xor a - ld [hWY], a + ldh [hWY], a dec a ld [wUpdateSpritesEnabled], a call DelayFrame ; Determine which OAM block is being used by the enemy trainer sprite (if there ; is one). - ld hl, wSpriteStateData1 + 2 - ld a, [hSpriteIndexOrTextID] ; enemy trainer sprite index (0 if wild battle) + ld hl, wSpritePlayerStateData1ImageIndex + ldh a, [hSpriteIndexOrTextID] ; enemy trainer sprite index (0 if wild battle) ld c, a ld b, 0 ld de, $10 @@ -82,7 +82,7 @@ BattleTransitions: GetBattleTransitionID_WildOrTrainer: ld a, [wCurOpponent] - cp 200 + cp OPP_ID_OFFSET jr nc, .trainer res 0, c ret @@ -118,9 +118,6 @@ GetBattleTransitionID_CompareLevels: ld [wBattleTransitionSpiralDirection], a ret -; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, -; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE -; and SILPH_CO_[9-11]F as dungeon maps GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] ld e, a @@ -151,51 +148,21 @@ GetBattleTransitionID_IsDungeonMap: res 2, c ret -; GetBattleTransitionID_IsDungeonMap checks if wCurMap -; is equal to one of these maps -DungeonMaps1: - db VIRIDIAN_FOREST - db ROCK_TUNNEL_1F - db SEAFOAM_ISLANDS_1F - db ROCK_TUNNEL_B1F - db $FF - -; GetBattleTransitionID_IsDungeonMap checks if wCurMap -; is in between or equal to each pair of maps -DungeonMaps2: - ; all MT_MOON maps - db MT_MOON_1F - db MT_MOON_B2F - - ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME - db SS_ANNE_1F - db HALL_OF_FAME - - ; all POKEMON_TOWER maps and Lavender Town buildings - db LAVENDER_POKECENTER - db LAVENDER_CUBONE_HOUSE - - ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and - ; CERULEAN_CAVE maps, except for SILPH_CO_1F - db SILPH_CO_2F - db CERULEAN_CAVE_1F - db $FF +INCLUDE "data/maps/dungeon_maps.asm" LoadBattleTransitionTile: - ld hl, vChars1 + $7f0 + ld hl, vChars1 tile $7f ld de, BattleTransitionTile - lb bc, BANK(BattleTransitionTile), (BattleTransitionTileEnd - BattleTransitionTile) / $10 + lb bc, BANK(BattleTransitionTile), 1 jp CopyVideoData -BattleTransitionTile: - INCBIN "gfx/battle_transition.2bpp" -BattleTransitionTileEnd: +BattleTransitionTile: INCBIN "gfx/overworld/battle_transition.2bpp" BattleTransition_BlackScreen: ld a, $ff - ld [rBGP], a - ld [rOBP0], a - ld [rOBP1], a + ldh [rBGP], a + ldh [rOBP0], a + ldh [rOBP1], a ret ; for non-dungeon trainer battles @@ -209,7 +176,7 @@ BattleTransition_Spiral: call BattleTransition_InwardSpiral jr .done .outwardSpiral - coord hl, 10, 10 + hlcoord 10, 10 ld a, $3 ld [wOutwardSpiralCurrentDirection], a ld a, l @@ -238,7 +205,7 @@ BattleTransition_Spiral: BattleTransition_InwardSpiral: ld a, 7 ld [wInwardSpiralUpdateScreenCounter], a - coord hl, 0, 0 + hlcoord 0, 0 ld c, SCREEN_HEIGHT - 1 ld de, SCREEN_WIDTH call BattleTransition_InwardSpiral_ @@ -356,9 +323,9 @@ BattleTransition_FlashScreen_: ld hl, BattleTransition_FlashScreenPalettes .loop ld a, [hli] - cp $1 + cp 1 jr z, .done - ld [rBGP], a + ldh [rBGP], a ld c, 2 call DelayFrames jr .loop @@ -368,8 +335,19 @@ BattleTransition_FlashScreen_: ret BattleTransition_FlashScreenPalettes: - db $F9,$FE,$FF,$FE,$F9,$E4,$90,$40,$00,$40,$90,$E4 - db $01 ; terminator + db %11111001 + db %11111110 + db %11111111 + db %11111110 + db %11111001 + db %11100100 + db %10010000 + db %01000000 + db %00000000 + db %01000000 + db %10010000 + db %11100100 + db 1 ; end ; used for low level trainer dungeon battles BattleTransition_Shrink: @@ -377,25 +355,25 @@ BattleTransition_Shrink: .loop push bc xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 0, 7 - coord de, 0, 8 + ldh [hAutoBGTransferEnabled], a + hlcoord 0, 7 + decoord 0, 8 ld bc, -SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - coord hl, 0, 10 - coord de, 0, 9 + hlcoord 0, 10 + decoord 0, 9 ld bc, SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - coord hl, 8, 0 - coord de, 9, 0 + hlcoord 8, 0 + decoord 9, 0 ld bc, -2 call BattleTransition_CopyTiles2 - coord hl, 11, 0 - coord de, 10, 0 + hlcoord 11, 0 + decoord 10, 0 ld bc, 2 call BattleTransition_CopyTiles2 ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld c, 6 call DelayFrames pop bc @@ -409,23 +387,23 @@ BattleTransition_Shrink: BattleTransition_Split: ld c, SCREEN_HEIGHT / 2 xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a .loop push bc - coord hl, 0, 16 - coord de, 0, 17 + hlcoord 0, 16 + decoord 0, 17 ld bc, -SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - coord hl, 0, 1 - coord de, 0, 0 + hlcoord 0, 1 + decoord 0, 0 ld bc, SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - coord hl, 18, 0 - coord de, 19, 0 + hlcoord 18, 0 + decoord 19, 0 ld bc, -2 call BattleTransition_CopyTiles2 - coord hl, 1, 0 - coord de, 0, 0 + hlcoord 1, 0 + decoord 0, 0 ld bc, 2 call BattleTransition_CopyTiles2 call BattleTransition_TransferDelay3 @@ -521,10 +499,10 @@ BattleTransition_CopyTiles2: ; used for high level wild dungeon battles BattleTransition_VerticalStripes: ld c, SCREEN_HEIGHT - coord hl, 0, 0 - coord de, 1, 17 + hlcoord 0, 0 + decoord 1, 17 xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a .loop push bc push hl @@ -560,10 +538,10 @@ BattleTransition_VerticalStripes_: ; used for low level wild dungeon battles BattleTransition_HorizontalStripes: ld c, SCREEN_WIDTH - coord hl, 0, 0 - coord de, 19, 1 + hlcoord 0, 0 + decoord 19, 1 xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a .loop push bc push hl @@ -610,7 +588,7 @@ BattleTransition_FlashScreen: ld b, $3 call BattleTransition_FlashScreen_ xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret BattleTransition_Circle_Sub1: @@ -629,10 +607,10 @@ BattleTransition_Circle_Sub1: BattleTransition_TransferDelay3: ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret ; used for low level wild non-dungeon battles @@ -679,87 +657,41 @@ BattleTransition_Circle_Sub2: ld l, a jp BattleTransition_Circle_Sub3 +; halves + const_def + const CIRCLE_LEFT + const CIRCLE_RIGHT + +half_circle: MACRO + ; quadrant x, circle data, target coord + db \1 + dw \2 + dwcoord \3, \4 +ENDM + BattleTransition_HalfCircle1: - db $01 - dw BattleTransition_CircleData1 - dwCoord 18, 6 - - db $01 - dw BattleTransition_CircleData2 - dwCoord 19, 3 - - db $01 - dw BattleTransition_CircleData3 - dwCoord 18, 0 - - db $01 - dw BattleTransition_CircleData4 - dwCoord 14, 0 - - db $01 - dw BattleTransition_CircleData5 - dwCoord 10, 0 - - db $00 - dw BattleTransition_CircleData5 - dwCoord 9, 0 - - db $00 - dw BattleTransition_CircleData4 - dwCoord 5, 0 - - db $00 - dw BattleTransition_CircleData3 - dwCoord 1, 0 - - db $00 - dw BattleTransition_CircleData2 - dwCoord 0, 3 - - db $00 - dw BattleTransition_CircleData1 - dwCoord 1, 6 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData1, 18, 6 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData2, 19, 3 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData3, 18, 0 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData4, 14, 0 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData5, 10, 0 + half_circle CIRCLE_LEFT, BattleTransition_CircleData5, 9, 0 + half_circle CIRCLE_LEFT, BattleTransition_CircleData4, 5, 0 + half_circle CIRCLE_LEFT, BattleTransition_CircleData3, 1, 0 + half_circle CIRCLE_LEFT, BattleTransition_CircleData2, 0, 3 + half_circle CIRCLE_LEFT, BattleTransition_CircleData1, 1, 6 BattleTransition_HalfCircle2: - db $00 - dw BattleTransition_CircleData1 - dwCoord 1, 11 - - db $00 - dw BattleTransition_CircleData2 - dwCoord 0, 14 - - db $00 - dw BattleTransition_CircleData3 - dwCoord 1, 17 - - db $00 - dw BattleTransition_CircleData4 - dwCoord 5, 17 - - db $00 - dw BattleTransition_CircleData5 - dwCoord 9, 17 - - db $01 - dw BattleTransition_CircleData5 - dwCoord 10, 17 - - db $01 - dw BattleTransition_CircleData4 - dwCoord 14, 17 - - db $01 - dw BattleTransition_CircleData3 - dwCoord 18, 17 - - db $01 - dw BattleTransition_CircleData2 - dwCoord 19, 14 - - db $01 - dw BattleTransition_CircleData1 - dwCoord 18, 11 + half_circle CIRCLE_LEFT, BattleTransition_CircleData1, 1, 11 + half_circle CIRCLE_LEFT, BattleTransition_CircleData2, 0, 14 + half_circle CIRCLE_LEFT, BattleTransition_CircleData3, 1, 17 + half_circle CIRCLE_LEFT, BattleTransition_CircleData4, 5, 17 + half_circle CIRCLE_LEFT, BattleTransition_CircleData5, 9, 17 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData5, 10, 17 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData4, 14, 17 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData3, 18, 17 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData2, 19, 14 + half_circle CIRCLE_RIGHT, BattleTransition_CircleData1, 18, 11 BattleTransition_Circle_Sub3: push hl @@ -788,7 +720,7 @@ BattleTransition_Circle_Sub3: add hl, bc ld a, [de] inc de - cp $ff + cp -1 ret z and a jr z, BattleTransition_Circle_Sub3 @@ -806,17 +738,8 @@ BattleTransition_Circle_Sub3: jr nz, .loop2 jr BattleTransition_Circle_Sub3 -BattleTransition_CircleData1: - db $02,$03,$05,$04,$09,$FF - -BattleTransition_CircleData2: - db $01,$01,$02,$02,$04,$02,$04,$02,$03,$FF - -BattleTransition_CircleData3: - db $02,$01,$03,$01,$04,$01,$04,$01,$04,$01,$03,$01,$02,$01,$01,$01,$01,$FF - -BattleTransition_CircleData4: - db $04,$01,$04,$00,$03,$01,$03,$00,$02,$01,$02,$00,$01,$FF - -BattleTransition_CircleData5: - db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF +BattleTransition_CircleData1: db 2, 3, 5, 4, 9, -1 +BattleTransition_CircleData2: db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1 +BattleTransition_CircleData3: db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1 +BattleTransition_CircleData4: db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1 +BattleTransition_CircleData5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1 diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 4a138048..0e270424 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -5,7 +5,7 @@ PrintBeginningBattleText: ld a, [wCurMap] cp POKEMON_TOWER_3F jr c, .notPokemonTower - cp MR_FUJIS_HOUSE + cp POKEMON_TOWER_7F + 1 jr c, .pokemonTower .notPokemonTower ld a, [wEnemyMonSpecies2] @@ -24,7 +24,7 @@ PrintBeginningBattleText: ld hl, TrainerWantsToFightText .wildBattle push hl - callab DrawAllPokeballs + callfar DrawAllPokeballs pop hl call PrintText jr .done @@ -33,12 +33,12 @@ PrintBeginningBattleText: call IsItemInBag ld a, [wEnemyMonSpecies2] ld [wcf91], a - cp MAROWAK + cp RESTLESS_SOUL jr z, .isMarowak ld a, b and a jr z, .noSilphScope - callab LoadEnemyMonData + callfar LoadEnemyMonData jr .notPokemonTower .noSilphScope ld hl, EnemyAppearedText @@ -54,8 +54,8 @@ PrintBeginningBattleText: call PrintText ld hl, UnveiledGhostText call PrintText - callab LoadEnemyMonData - callab MarowakAnim + callfar LoadEnemyMonData + callfar MarowakAnim ld hl, WildMonAppearedText call PrintText @@ -71,28 +71,28 @@ PrintBeginningBattleText: ret WildMonAppearedText: - TX_FAR _WildMonAppearedText - db "@" + text_far _WildMonAppearedText + text_end HookedMonAttackedText: - TX_FAR _HookedMonAttackedText - db "@" + text_far _HookedMonAttackedText + text_end EnemyAppearedText: - TX_FAR _EnemyAppearedText - db "@" + text_far _EnemyAppearedText + text_end TrainerWantsToFightText: - TX_FAR _TrainerWantsToFightText - db "@" + text_far _TrainerWantsToFightText + text_end UnveiledGhostText: - TX_FAR _UnveiledGhostText - db "@" + text_far _UnveiledGhostText + text_end GhostCantBeIDdText: - TX_FAR _GhostCantBeIDdText - db "@" + text_far _GhostCantBeIDdText + text_end PrintSendOutMonMessage: ld hl, wEnemyMonHP @@ -101,16 +101,16 @@ PrintSendOutMonMessage: ld hl, GoText jr z, .printText xor a - ld [H_MULTIPLICAND], a + ldh [hMultiplicand], a ld hl, wEnemyMonHP ld a, [hli] ld [wLastSwitchInEnemyMonHP], a - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, [hl] ld [wLastSwitchInEnemyMonHP + 1], a - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a ld a, 25 - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ld hl, wEnemyMonMaxHP ld a, [hli] @@ -121,9 +121,9 @@ PrintSendOutMonMessage: rr b ld a, b ld b, 4 - ld [H_DIVISOR], a ; enemy mon max HP divided by 4 + ldh [hDivisor], a ; enemy mon max HP divided by 4 call Divide - ld a, [H_QUOTIENT + 3] ; a = (enemy mon current HP * 25) / (enemy max HP / 4); this approximates the current percentage of max HP + ldh a, [hQuotient + 3] ; a = (enemy mon current HP * 25) / (enemy max HP / 4); this approximates the current percentage of max HP ld hl, GoText ; 70% or greater cp 70 jr nc, .printText @@ -138,39 +138,39 @@ PrintSendOutMonMessage: jp PrintText GoText: - TX_FAR _GoText - TX_ASM + text_far _GoText + text_asm jr PrintPlayerMon1Text DoItText: - TX_FAR _DoItText - TX_ASM + text_far _DoItText + text_asm jr PrintPlayerMon1Text GetmText: - TX_FAR _GetmText - TX_ASM + text_far _GetmText + text_asm jr PrintPlayerMon1Text EnemysWeakText: - TX_FAR _EnemysWeakText - TX_ASM + text_far _EnemysWeakText + text_asm PrintPlayerMon1Text: ld hl, PlayerMon1Text ret PlayerMon1Text: - TX_FAR _PlayerMon1Text - db "@" + text_far _PlayerMon1Text + text_end RetreatMon: ld hl, PlayerMon2Text jp PrintText PlayerMon2Text: - TX_FAR _PlayerMon2Text - TX_ASM + text_far _PlayerMon2Text + text_asm push de push bc ld hl, wEnemyMonHP + 1 @@ -179,14 +179,14 @@ PlayerMon2Text: dec hl ld a, [de] sub b - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a dec de ld b, [hl] ld a, [de] sbc b - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, 25 - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ld hl, wEnemyMonMaxHP ld a, [hli] @@ -197,11 +197,11 @@ PlayerMon2Text: rr b ld a, b ld b, 4 - ld [H_DIVISOR], a + ldh [hDivisor], a call Divide pop bc pop de - ld a, [H_QUOTIENT + 3] ; a = ((LastSwitchInEnemyMonHP - CurrentEnemyMonHP) / 25) / (EnemyMonMaxHP / 4) + ldh a, [hQuotient + 3] ; a = ((LastSwitchInEnemyMonHP - CurrentEnemyMonHP) / 25) / (EnemyMonMaxHP / 4) ; Assuming that the enemy mon hasn't gained HP since the last switch in, ; a approximates the percentage that the enemy mon's total HP has decreased ; since the last switch in. @@ -220,18 +220,18 @@ PlayerMon2Text: ret EnoughText: - TX_FAR _EnoughText - TX_ASM + text_far _EnoughText + text_asm jr PrintComeBackText OKExclamationText: - TX_FAR _OKExclamationText - TX_ASM + text_far _OKExclamationText + text_asm jr PrintComeBackText GoodText: - TX_FAR _GoodText - TX_ASM + text_far _GoodText + text_asm jr PrintComeBackText PrintComeBackText: @@ -239,5 +239,5 @@ PrintComeBackText: ret ComeBackText: - TX_FAR _ComeBackText - db "@" + text_far _ComeBackText + text_end diff --git a/engine/battle/core.asm b/engine/battle/core.asm old mode 100755 new mode 100644 index 19ac7ddf..375b2f4c --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1,107 +1,17 @@ BattleCore: -; These are move effects (second value from the Moves table in bank $E). -ResidualEffects1: -; most non-side effects - db CONVERSION_EFFECT - db HAZE_EFFECT - db SWITCH_AND_TELEPORT_EFFECT - db MIST_EFFECT - db FOCUS_ENERGY_EFFECT - db CONFUSION_EFFECT - db HEAL_EFFECT - db TRANSFORM_EFFECT - db LIGHT_SCREEN_EFFECT - db REFLECT_EFFECT - db POISON_EFFECT - db PARALYZE_EFFECT - db SUBSTITUTE_EFFECT - db MIMIC_EFFECT - db LEECH_SEED_EFFECT - db SPLASH_EFFECT - db -1 -SetDamageEffects: -; moves that do damage but not through normal calculations -; e.g., Super Fang, Psywave - db SUPER_FANG_EFFECT - db SPECIAL_DAMAGE_EFFECT - db -1 -ResidualEffects2: -; non-side effects not included in ResidualEffects1 -; stat-affecting moves, sleep-inflicting moves, and Bide -; e.g., Meditate, Bide, Hypnosis - db $01 - db ATTACK_UP1_EFFECT - db DEFENSE_UP1_EFFECT - db SPEED_UP1_EFFECT - db SPECIAL_UP1_EFFECT - db ACCURACY_UP1_EFFECT - db EVASION_UP1_EFFECT - db ATTACK_DOWN1_EFFECT - db DEFENSE_DOWN1_EFFECT - db SPEED_DOWN1_EFFECT - db SPECIAL_DOWN1_EFFECT - db ACCURACY_DOWN1_EFFECT - db EVASION_DOWN1_EFFECT - db BIDE_EFFECT - db SLEEP_EFFECT - db ATTACK_UP2_EFFECT - db DEFENSE_UP2_EFFECT - db SPEED_UP2_EFFECT - db SPECIAL_UP2_EFFECT - db ACCURACY_UP2_EFFECT - db EVASION_UP2_EFFECT - db ATTACK_DOWN2_EFFECT - db DEFENSE_DOWN2_EFFECT - db SPEED_DOWN2_EFFECT - db SPECIAL_DOWN2_EFFECT - db ACCURACY_DOWN2_EFFECT - db EVASION_DOWN2_EFFECT - db -1 -AlwaysHappenSideEffects: -; Attacks that aren't finished after they faint the opponent. - db DRAIN_HP_EFFECT - db EXPLODE_EFFECT - db DREAM_EATER_EFFECT - db PAY_DAY_EFFECT - db TWO_TO_FIVE_ATTACKS_EFFECT - db $1E - db ATTACK_TWICE_EFFECT - db RECOIL_EFFECT - db TWINEEDLE_EFFECT - db RAGE_EFFECT - db -1 -SpecialEffects: -; Effects from arrays 2, 4, and 5B, minus Twineedle and Rage. -; Includes all effects that do not need to be called at the end of -; ExecutePlayerMove (or ExecuteEnemyMove), because they have already been handled - db DRAIN_HP_EFFECT - db EXPLODE_EFFECT - db DREAM_EATER_EFFECT - db PAY_DAY_EFFECT - db SWIFT_EFFECT - db TWO_TO_FIVE_ATTACKS_EFFECT - db $1E - db CHARGE_EFFECT - db SUPER_FANG_EFFECT - db SPECIAL_DAMAGE_EFFECT - db FLY_EFFECT - db ATTACK_TWICE_EFFECT - db JUMP_KICK_EFFECT - db RECOIL_EFFECT - ; fallthrough to Next EffectsArray -SpecialEffectsCont: -; damaging moves whose effect is executed prior to damage calculation - db THRASH_PETAL_DANCE_EFFECT - db TRAPPING_EFFECT - db -1 +INCLUDE "data/battle/residual_effects_1.asm" +INCLUDE "data/battle/set_damage_effects.asm" +INCLUDE "data/battle/residual_effects_2.asm" +INCLUDE "data/battle/always_happen_effects.asm" +INCLUDE "data/battle/special_effects.asm" SlidePlayerAndEnemySilhouettesOnScreen: call LoadPlayerBackPic ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen ld [wTextBoxID], a call DisplayTextBoxID - coord hl, 1, 5 + hlcoord 1, 5 lb bc, 3, 7 call ClearScreenArea call DisableLCD @@ -117,7 +27,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: or c jr nz, .clearBackgroundLoop ; copy the work RAM tile map to VRAM - coord hl, 0, 0 + hlcoord 0, 0 ld de, vBGMap0 ld b, 18 ; number of rows .copyRowLoop @@ -138,25 +48,25 @@ SlidePlayerAndEnemySilhouettesOnScreen: jr nz, .copyRowLoop call EnableLCD ld a, $90 - ld [hWY], a - ld [rWY], a + ldh [hWY], a + ldh [rWY], a xor a - ld [hTilesetType], a - ld [hSCY], a + ldh [hTileAnimations], a + ldh [hSCY], a dec a ld [wUpdateSpritesEnabled], a call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld b, $70 ld c, $90 ld a, c - ld [hSCX], a + ldh [hSCX], a call DelayFrame ld a, %11100100 ; inverted palette for silhouette effect - ld [rBGP], a - ld [rOBP0], a - ld [rOBP1], a + ldh [rBGP], a + ldh [rOBP0], a + ldh [rOBP1], a .slideSilhouettesLoop ; slide silhouettes of the player's pic and the enemy's pic onto the screen ld h, b ld l, $40 @@ -168,26 +78,26 @@ SlidePlayerAndEnemySilhouettesOnScreen: call SetScrollXForSlidingPlayerBodyLeft ; end background scrolling on line $60 call SlidePlayerHeadLeft ld a, c - ld [hSCX], a + ldh [hSCX], a dec c dec c jr nz, .slideSilhouettesLoop ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld a, $31 - ld [hStartTileID], a - coord hl, 1, 5 + ldh [hStartTileID], a + hlcoord 1, 5 predef CopyUncompressedPicToTilemap xor a - ld [hWY], a - ld [rWY], a + ldh [hWY], a + ldh [rWY], a inc a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 ld b, SET_PAL_BATTLE call RunPaletteCommand call HideSprites - jpab PrintBeginningBattleText + jpfar PrintBeginningBattleText ; when a battle is starting, silhouettes of the player's pic and the enemy's pic are slid onto the screen ; the lower of the player's pic (his body) is part of the background, but his head is a sprite @@ -208,13 +118,13 @@ SlidePlayerHeadLeft: ret SetScrollXForSlidingPlayerBodyLeft: - ld a, [rLY] + ldh a, [rLY] cp l jr nz, SetScrollXForSlidingPlayerBodyLeft ld a, h - ld [rSCX], a + ldh [rSCX], a .loop - ld a, [rLY] + ldh a, [rLY] cp h jr z, .loop ret @@ -268,7 +178,7 @@ StartBattle: ld hl, .outOfSafariBallsText jp PrintText .notOutOfSafariBalls - callab PrintSafariZoneBattleText + callfar PrintSafariZoneBattleText ld a, [wEnemyMonSpeed + 1] add a ld b, a ; init b (which is later compared with random value) to (enemy speed % 256) * 2 @@ -297,8 +207,8 @@ StartBattle: jr EnemyRan ; if b was greater than the random value, the enemy runs .outOfSafariBallsText - TX_FAR _OutOfSafariBallsText - db "@" + text_far _OutOfSafariBallsText + text_end .playerSendOutFirstMon xor a @@ -322,7 +232,7 @@ StartBattle: ld [wcf91], a ld [wBattleMonSpecies2], a call LoadScreenTilesFromBuffer1 - coord hl, 1, 5 + hlcoord 1, 5 ld a, $9 call SlideTrainerPicOffScreen call SaveScreenTilesToBuffer1 @@ -356,16 +266,16 @@ EnemyRan: ld a, SFX_RUN call PlaySoundWaitForCurrent xor a - ld [H_WHOSETURN], a - jpab AnimationSlideEnemyMonOff + ldh [hWhoseTurn], a + jpfar AnimationSlideEnemyMonOff WildRanText: - TX_FAR _WildRanText - db "@" + text_far _WildRanText + text_end EnemyRanText: - TX_FAR _EnemyRanText - db "@" + text_far _EnemyRanText + text_end MainInBattleLoop: call ReadPlayerMonCurHPAndStatus @@ -455,7 +365,7 @@ MainInBattleLoop: jr nz, .specialMoveNotUsed ld [wPlayerSelectedMove], a .specialMoveNotUsed - callab SwitchEnemyMon + callfar SwitchEnemyMon .noLinkBattle ld a, [wPlayerSelectedMove] cp QUICK_ATTACK @@ -488,7 +398,7 @@ MainInBattleLoop: jr nc, .playerMovesFirst ; if player is faster jr .enemyMovesFirst ; if enemy is faster .speedEqual ; 50/50 chance for both players - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr z, .invertOutcome call BattleRandom @@ -502,8 +412,8 @@ MainInBattleLoop: jr .playerMovesFirst .enemyMovesFirst ld a, $1 - ld [H_WHOSETURN], a - callab TrainerAI + ldh [hWhoseTurn], a + callfar TrainerAI jr c, .AIActionUsedEnemyFirst call ExecuteEnemyMove ld a, [wEscapedFromBattle] @@ -540,8 +450,8 @@ MainInBattleLoop: jp z, HandlePlayerMonFainted call DrawHUDsAndHPBars ld a, $1 - ld [H_WHOSETURN], a - callab TrainerAI + ldh [hWhoseTurn], a + callfar TrainerAI jr c, .AIActionUsedPlayerFirst call ExecuteEnemyMove ld a, [wEscapedFromBattle] @@ -560,7 +470,7 @@ MainInBattleLoop: HandlePoisonBurnLeechSeed: ld hl, wBattleMonHP ld de, wBattleMonStatus - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playersTurn ld hl, wEnemyMonHP @@ -585,7 +495,7 @@ HandlePoisonBurnLeechSeed: call HandlePoisonBurnLeechSeed_DecreaseOwnHP .notBurnedOrPoisoned ld de, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playersTurn2 ld de, wEnemyBattleStatus2 @@ -594,16 +504,16 @@ HandlePoisonBurnLeechSeed: add a jr nc, .notLeechSeeded push hl - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] push af xor $1 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a xor a ld [wAnimationType], a ld a, ABSORB call PlayMoveAnimation ; play leech seed animation (from opposing mon) pop af - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a pop hl call HandlePoisonBurnLeechSeed_DecreaseOwnHP call HandlePoisonBurnLeechSeed_IncreaseEnemyHP @@ -622,16 +532,16 @@ HandlePoisonBurnLeechSeed: ret HurtByPoisonText: - TX_FAR _HurtByPoisonText - db "@" + text_far _HurtByPoisonText + text_end HurtByBurnText: - TX_FAR _HurtByBurnText - db "@" + text_far _HurtByBurnText + text_end HurtByLeechSeedText: - TX_FAR _HurtByLeechSeedText - db "@" + text_far _HurtByLeechSeedText + text_end ; decreases the mon's current HP by 1/16 of the Max HP (multiplied by number of toxic ticks if active) ; note that the toxic ticks are considered even if the damage is not poison (hence the Leech Seed glitch) @@ -661,7 +571,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: .nonZeroDamage ld hl, wPlayerBattleStatus3 ld de, wPlayerToxicCounter - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playersTurn ld hl, wEnemyBattleStatus3 @@ -672,7 +582,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: ld a, [de] ; increment toxic counter inc a ld [de], a - ld hl, $0000 + ld hl, 0 .toxicTicksLoop add hl, bc dec a @@ -708,7 +618,7 @@ HandlePoisonBurnLeechSeed_DecreaseOwnHP: HandlePoisonBurnLeechSeed_IncreaseEnemyHP: push hl ld hl, wEnemyMonMaxHP - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playersTurn ld hl, wBattleMonMaxHP @@ -745,23 +655,23 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ld [hl], a ld [wHPBarNewHP], a .noOverfullHeal - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] xor $1 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a call UpdateCurMonHPBar - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] xor $1 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a pop hl ret UpdateCurMonHPBar: - coord hl, 10, 9 ; tile pointer to player HP bar - ld a, [H_WHOSETURN] + hlcoord 10, 9 ; tile pointer to player HP bar + ldh a, [hWhoseTurn] and a ld a, $1 jr z, .playersTurn - coord hl, 2, 2 ; tile pointer to enemy HP bar + hlcoord 2, 2 ; tile pointer to enemy HP bar xor a .playersTurn push bc @@ -857,10 +767,10 @@ FaintEnemyPokemon: ld hl, wPlayerUsedMove ld [hli], a ld [hl], a - coord hl, 12, 5 - coord de, 12, 6 + hlcoord 12, 5 + decoord 12, 6 call SlideDownFaintedMonPic - coord hl, 0, 0 + hlcoord 0, 0 lb bc, 4, 11 call ClearScreenArea ld a, [wIsInBattle] @@ -872,7 +782,7 @@ FaintEnemyPokemon: ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_FAINT_FALL jr z, .sfxwait ld a, SFX_FAINT_THUD @@ -927,7 +837,7 @@ FaintEnemyPokemon: .giveExpToMonsThatFought xor a ld [wBoostExpByExpAll], a - callab GainExperience + callfar GainExperience pop af ret z ; return if no exp all @@ -945,18 +855,18 @@ FaintEnemyPokemon: jr nz, .gainExpFlagsLoop ld a, b ld [wPartyGainExpFlags], a - jpab GainExperience + jpfar GainExperience EnemyMonFaintedText: - TX_FAR _EnemyMonFaintedText - db "@" + text_far _EnemyMonFaintedText + text_end EndLowHealthAlarm: ; This function is called when the player has the won the battle. It turns off ; the low health alarm and prevents it from reactivating until the next battle. xor a ld [wDanger], a ; turn off low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -983,7 +893,7 @@ ReplaceFaintedEnemyMon: ld hl, wEnemyHPBarColor ld e, $30 call GetBattleHealthBarColor - callab DrawEnemyPokeballs + callfar DrawEnemyPokeballs ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .notLinkBattle @@ -1011,7 +921,7 @@ TrainerBattleVictory: ld b, MUSIC_DEFEATED_TRAINER .gymleader ld a, [wTrainerClass] - cp SONY3 ; final battle against rival + cp RIVAL3 ; final battle against rival jr nz, .notrival ld b, MUSIC_DEFEATED_GYM_LEADER ld hl, wFlags_D733 @@ -1039,16 +949,16 @@ TrainerBattleVictory: predef_jump AddBCDPredef MoneyForWinningText: - TX_FAR _MoneyForWinningText - db "@" + text_far _MoneyForWinningText + text_end TrainerDefeatedText: - TX_FAR _TrainerDefeatedText - db "@" + text_far _TrainerDefeatedText + text_end PlayBattleVictoryMusic: push af - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySoundWaitForCurrent ld c, 0 ; BANK(Music_DefeatedTrainer) @@ -1111,11 +1021,11 @@ RemoveFaintedPlayerMon: ld [hl], a ld [wBattleMonStatus], a call ReadPlayerMonCurHPAndStatus - coord hl, 9, 7 + hlcoord 9, 7 lb bc, 5, 11 call ClearScreenArea - coord hl, 1, 10 - coord de, 1, 11 + hlcoord 1, 10 + decoord 1, 11 call SlideDownFaintedMonPic ld a, $1 ld [wBattleResult], a @@ -1134,8 +1044,8 @@ RemoveFaintedPlayerMon: jp PrintText PlayerMonFaintedText: - TX_FAR _PlayerMonFaintedText - db "@" + text_far _PlayerMonFaintedText + text_end ; asks if you want to use next mon ; stores whether you ran in C flag @@ -1149,7 +1059,7 @@ DoUseNextMonDialogue: ld hl, UseNextMonText call PrintText .displayYesNoBox - coord hl, 13, 9 + hlcoord 13, 9 lb bc, 10, 14 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -1168,8 +1078,8 @@ DoUseNextMonDialogue: jp TryRunningFromBattle UseNextMonText: - TX_FAR _UseNextMonText - db "@" + text_far _UseNextMonText + text_end ; choose next player mon to send out ; stores whether enemy mon has no HP left in Z flag @@ -1188,7 +1098,7 @@ ChooseNextMon: ld a, [wLinkState] cp LINK_STATE_BATTLING jr nz, .notLinkBattle - inc a + inc a ; 1 ld [wActionResultOrTookBattleTurn], a call LinkBattleExchangeData .notLinkBattle @@ -1222,22 +1132,22 @@ ChooseNextMon: HandlePlayerBlackOut: ld a, [wLinkState] cp LINK_STATE_BATTLING - jr z, .notSony1Battle + jr z, .notRival1Battle ld a, [wCurOpponent] - cp OPP_SONY1 - jr nz, .notSony1Battle - coord hl, 0, 0 ; sony 1 battle + cp OPP_RIVAL1 + jr nz, .notRival1Battle + hlcoord 0, 0 ; rival 1 battle lb bc, 8, 21 call ClearScreenArea call ScrollTrainerPicAfterBattle ld c, 40 call DelayFrames - ld hl, Sony1WinText + ld hl, Rival1WinText call PrintText ld a, [wCurMap] cp OAKS_LAB ret z ; starter battle in oak's lab: don't black out -.notSony1Battle +.notRival1Battle ld b, SET_PAL_BATTLE_BLACK call RunPaletteCommand ld hl, PlayerBlackedOutText2 @@ -1254,20 +1164,20 @@ HandlePlayerBlackOut: scf ret -Sony1WinText: - TX_FAR _Sony1WinText - db "@" +Rival1WinText: + text_far _Rival1WinText + text_end PlayerBlackedOutText2: - TX_FAR _PlayerBlackedOutText2 - db "@" + text_far _PlayerBlackedOutText2 + text_end LinkBattleLostText: - TX_FAR _LinkBattleLostText - db "@" + text_far _LinkBattleLostText + text_end ; slides pic of fainted mon downwards until it disappears -; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing +; bug: when this is called, [hAutoBGTransferEnabled] is non-zero, so there is screen tearing SlideDownFaintedMonPic: ld a, [wd730] push af @@ -1320,9 +1230,9 @@ SevenSpacesText: ; slides the player or enemy trainer off screen ; a is the number of tiles to slide it horizontally (always 9 for the player trainer or 8 for the enemy trainer) ; if a is 8, the slide is to the right, else it is to the left -; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing +; bug: when this is called, [hAutoBGTransferEnabled] is non-zero, so there is screen tearing SlideTrainerPicOffScreen: - ld [hSlideAmount], a + ldh [hSlideAmount], a ld c, a .slideStepLoop ; each iteration, the trainer pic is slid one tile left/right push bc @@ -1330,10 +1240,10 @@ SlideTrainerPicOffScreen: ld b, 7 ; number of rows .rowLoop push hl - ld a, [hSlideAmount] + ldh a, [hSlideAmount] ld c, a .columnLoop - ld a, [hSlideAmount] + ldh a, [hSlideAmount] cp 8 jr z, .slideRight .slideLeft ; slide player sprite off screen @@ -1396,7 +1306,7 @@ EnemySendOutFirstMon: ld [wAICount], a ld hl, wPlayerBattleStatus1 res 5, [hl] - coord hl, 18, 0 + hlcoord 18, 0 ld a, 8 call SlideTrainerPicOffScreen call PrintEmptyString @@ -1466,7 +1376,7 @@ EnemySendOutFirstMon: jr nz, .next4 ld hl, TrainerAboutToUseText call PrintText - coord hl, 0, 7 + hlcoord 0, 7 lb bc, 8, 1 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -1501,7 +1411,7 @@ EnemySendOutFirstMon: call LoadScreenTilesFromBuffer1 .next4 call ClearSprites - coord hl, 0, 0 + hlcoord 0, 0 lb bc, 4, 11 call ClearScreenArea ld b, SET_PAL_BATTLE @@ -1516,8 +1426,8 @@ EnemySendOutFirstMon: ld de, vFrontPic call LoadMonFrontSprite ld a, -$31 - ld [hStartTileID], a - coord hl, 15, 6 + ldh [hStartTileID], a + hlcoord 15, 6 predef AnimateSendingOutMon ld a, [wEnemyMonSpecies2] call PlayCry @@ -1532,16 +1442,16 @@ EnemySendOutFirstMon: jp SwitchPlayerMon TrainerAboutToUseText: - TX_FAR _TrainerAboutToUseText - db "@" + text_far _TrainerAboutToUseText + text_end TrainerSentOutText: - TX_FAR _TrainerSentOutText - db "@" + text_far _TrainerSentOutText + text_end ; tests if the player has any pokemon that are not fainted ; sets d = 0 if all fainted, d != 0 if some mons are still alive -AnyPartyAlive: +AnyPartyAlive:: ld a, [wPartyCount] ld e, a xor a @@ -1577,8 +1487,8 @@ HasMonFainted: ret NoWillText: - TX_FAR _NoWillText - db "@" + text_far _NoWillText + text_end ; try to run from battle (hl = player speed, de = enemy speed) ; stores whether the attempt was successful in carry flag @@ -1598,32 +1508,32 @@ TryRunningFromBattle: inc a ld [wNumRunAttempts], a ld a, [hli] - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, [hl] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a ld a, [de] - ld [hEnemySpeed], a + ldh [hEnemySpeed], a inc de ld a, [de] - ld [hEnemySpeed + 1], a + ldh [hEnemySpeed + 1], a call LoadScreenTilesFromBuffer1 - ld de, H_MULTIPLICAND + 1 + ld de, hMultiplicand + 1 ld hl, hEnemySpeed ld c, 2 call StringCmp jr nc, .canEscape ; jump if player speed greater than enemy speed xor a - ld [H_MULTIPLICAND], a + ldh [hMultiplicand], a ld a, 32 - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ; multiply player speed by 32 - ld a, [H_PRODUCT + 2] - ld [H_DIVIDEND], a - ld a, [H_PRODUCT + 3] - ld [H_DIVIDEND + 1], a - ld a, [hEnemySpeed] + ldh a, [hProduct + 2] + ldh [hDividend], a + ldh a, [hProduct + 3] + ldh [hDividend + 1], a + ldh a, [hEnemySpeed] ld b, a - ld a, [hEnemySpeed + 1] + ldh a, [hEnemySpeed + 1] ; divide enemy speed by 4 srl b rr a @@ -1631,10 +1541,10 @@ TryRunningFromBattle: rr a and a jr z, .canEscape ; jump if enemy speed divided by 4, mod 256 is 0 - ld [H_DIVISOR], a ; ((enemy speed / 4) % 256) + ldh [hDivisor], a ; ((enemy speed / 4) % 256) ld b, $2 call Divide ; divide (player speed * 32) by ((enemy speed / 4) % 256) - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] and a ; is the quotient greater than 256? jr nz, .canEscape ; if so, the player can escape ld a, [wNumRunAttempts] @@ -1644,15 +1554,15 @@ TryRunningFromBattle: dec c jr z, .compareWithRandomValue ld b, 30 - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] add b - ld [H_QUOTIENT + 3], a + ldh [hQuotient + 3], a jr c, .canEscape jr .loop .compareWithRandomValue call BattleRandom ld b, a - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] cp b jr nc, .canEscape ; if the random value was less than or equal to the quotient ; plus 30 times the number of attempts, the player can escape @@ -1700,16 +1610,16 @@ TryRunningFromBattle: ret CantEscapeText: - TX_FAR _CantEscapeText - db "@" + text_far _CantEscapeText + text_end NoRunningText: - TX_FAR _NoRunningText - db "@" + text_far _NoRunningText + text_end GotAwayText: - TX_FAR _GotAwayText - db "@" + text_far _GotAwayText + text_end ; copies from party data to battle mon data when sending out a new player mon LoadBattleMonFromParty: @@ -1810,17 +1720,17 @@ LoadEnemyMonFromParty: ret SendOutMon: - callab PrintSendOutMonMessage + callfar PrintSendOutMonMessage ld hl, wEnemyMonHP ld a, [hli] or [hl] ; is enemy mon HP zero? - jp z, .skipDrawingEnemyHUDAndHPBar; if HP is zero, skip drawing the HUD and HP bar + jp z, .skipDrawingEnemyHUDAndHPBar ; if HP is zero, skip drawing the HUD and HP bar call DrawEnemyHUDAndHPBar .skipDrawingEnemyHUDAndHPBar call DrawPlayerHUDAndHPBar predef LoadMonBackPic xor a - ld [hStartTileID], a + ldh [hStartTileID], a ld hl, wBattleAndStartSavedMenuItem ld [hli], a ld [hl], a @@ -1844,10 +1754,10 @@ SendOutMon: ld hl, wEnemyBattleStatus1 res USING_TRAPPING_MOVE, [hl] ld a, $1 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ld a, POOF_ANIM call PlayMoveAnimation - coord hl, 4, 11 + hlcoord 4, 11 predef AnimateSendingOutMon ld a, [wcf91] call PlayCry @@ -1856,31 +1766,31 @@ SendOutMon: ; show 2 stages of the player mon getting smaller before disappearing AnimateRetreatingPlayerMon: - coord hl, 1, 5 + hlcoord 1, 5 lb bc, 7, 7 call ClearScreenArea - coord hl, 3, 7 + hlcoord 3, 7 lb bc, 5, 5 xor a ld [wDownscaledMonSize], a - ld [hBaseTileID], a + ldh [hBaseTileID], a predef CopyDownscaledMonTiles ld c, 4 call DelayFrames call .clearScreenArea - coord hl, 4, 9 + hlcoord 4, 9 lb bc, 3, 3 ld a, 1 ld [wDownscaledMonSize], a xor a - ld [hBaseTileID], a + ldh [hBaseTileID], a predef CopyDownscaledMonTiles call Delay3 call .clearScreenArea ld a, $4c - Coorda 5, 11 + ldcoord_a 5, 11 .clearScreenArea - coord hl, 1, 5 + hlcoord 1, 5 lb bc, 7, 7 jp ClearScreenArea @@ -1902,15 +1812,15 @@ DrawHUDsAndHPBars: DrawPlayerHUDAndHPBar: xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 9, 7 + ldh [hAutoBGTransferEnabled], a + hlcoord 9, 7 lb bc, 5, 11 call ClearScreenArea - callab PlacePlayerHUDTiles - coord hl, 18, 9 + callfar PlacePlayerHUDTiles + hlcoord 18, 9 ld [hl], $73 ld de, wBattleMonNick - coord hl, 10, 7 + hlcoord 10, 7 call CenterMonName call PlaceString ld hl, wBattleMonSpecies @@ -1921,7 +1831,7 @@ DrawPlayerHUDAndHPBar: ld de, wLoadedMonLevel ld bc, wBattleMonPP - wBattleMonLevel call CopyData - coord hl, 14, 8 + hlcoord 14, 8 push hl inc hl ld de, wLoadedMonStatus @@ -1932,10 +1842,10 @@ DrawPlayerHUDAndHPBar: .doNotPrintLevel ld a, [wLoadedMonSpecies] ld [wcf91], a - coord hl, 10, 9 + hlcoord 10, 9 predef DrawHP ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld hl, wPlayerHPBarColor call GetBattleHealthBarColor ld hl, wBattleMonHP @@ -1954,7 +1864,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a ret .setLowHealthAlarm ld hl, wDanger @@ -1963,16 +1873,16 @@ DrawPlayerHUDAndHPBar: DrawEnemyHUDAndHPBar: xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 0, 0 + ldh [hAutoBGTransferEnabled], a + hlcoord 0, 0 lb bc, 4, 12 call ClearScreenArea - callab PlaceEnemyHUDTiles + callfar PlaceEnemyHUDTiles ld de, wEnemyMonNick - coord hl, 1, 0 + hlcoord 1, 0 call CenterMonName call PlaceString - coord hl, 4, 1 + hlcoord 4, 1 push hl inc hl ld de, wEnemyMonStatus @@ -1985,9 +1895,9 @@ DrawEnemyHUDAndHPBar: .skipPrintLevel ld hl, wEnemyMonHP ld a, [hli] - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, [hld] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a or [hl] ; is current HP zero? jr nz, .hpNonzero ; current HP is 0 @@ -1998,45 +1908,45 @@ DrawEnemyHUDAndHPBar: jp .drawHPBar .hpNonzero xor a - ld [H_MULTIPLICAND], a + ldh [hMultiplicand], a ld a, 48 - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ; multiply current HP by 48 ld hl, wEnemyMonMaxHP ld a, [hli] ld b, a ld a, [hl] - ld [H_DIVISOR], a + ldh [hDivisor], a ld a, b and a ; is max HP > 255? jr z, .doDivide ; if max HP > 255, scale both (current HP * 48) and max HP by dividing by 4 so that max HP fits in one byte ; (it needs to be one byte so it can be used as the divisor for the Divide function) - ld a, [H_DIVISOR] + ldh a, [hDivisor] srl b rr a srl b rr a - ld [H_DIVISOR], a - ld a, [H_PRODUCT + 2] + ldh [hDivisor], a + ldh a, [hProduct + 2] ld b, a srl b - ld a, [H_PRODUCT + 3] + ldh a, [hProduct + 3] rr a srl b rr a - ld [H_PRODUCT + 3], a + ldh [hProduct + 3], a ld a, b - ld [H_PRODUCT + 2], a + ldh [hProduct + 2], a .doDivide - ld a, [H_PRODUCT + 2] - ld [H_DIVIDEND], a - ld a, [H_PRODUCT + 3] - ld [H_DIVIDEND + 1], a + ldh a, [hProduct + 2] + ldh [hDividend], a + ldh a, [hProduct + 3] + ldh [hDividend + 1], a ld a, $2 ld b, a call Divide ; divide (current HP * 48) by max HP - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ; set variables for DrawHPBar ld e, a ld a, $6 @@ -2045,10 +1955,10 @@ DrawEnemyHUDAndHPBar: .drawHPBar xor a ld [wHPBarType], a - coord hl, 2, 2 + hlcoord 2, 2 call DrawHPBar ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld hl, wEnemyHPBarColor GetBattleHealthBarColor: @@ -2086,7 +1996,7 @@ CenterMonName: pop de ret -DisplayBattleMenu: +DisplayBattleMenu:: call LoadScreenTilesFromBuffer1 ; restore saved screen ld a, [wBattleType] and a @@ -2103,29 +2013,32 @@ DisplayBattleMenu: .menuselected ld [wTextBoxID], a call DisplayTextBoxID + ; handle menu input if it's not the old man tutorial ld a, [wBattleType] dec a - jp nz, .handleBattleMenuInput ; handle menu input if it's not the old man tutorial + jp nz, .handleBattleMenuInput ; the following happens for the old man tutorial + ; Temporarily save the player name in wLinkEnemyTrainerName. + ; Since wLinkEnemyTrainerName == wGrassRate, this affects wild encounters. + ; The wGrassRate byte and following wGrassMons buffer are supposed + ; to get overwritten when entering a map with wild Pokémon, + ; but an oversight prevents this in Cinnabar and Route 21, + ; so the infamous MissingNo. glitch can show up. ld hl, wPlayerName - ld de, wGrassRate + ld de, wLinkEnemyTrainerName ld bc, NAME_LENGTH - call CopyData ; temporarily save the player name in unused space, - ; which is supposed to get overwritten when entering a - ; map with wild Pokémon. Due to an oversight, the data - ; may not get overwritten (cinnabar) and the infamous - ; Missingno. glitch can show up. + call CopyData ld hl, .oldManName ld de, wPlayerName ld bc, NAME_LENGTH call CopyData ; the following simulates the keystrokes by drawing menus on screen - coord hl, 9, 14 + hlcoord 9, 14 ld [hl], "▶" ld c, 80 call DelayFrames ld [hl], " " - coord hl, 9, 16 + hlcoord 9, 16 ld [hl], "▶" ld c, 50 call DelayFrames @@ -2150,14 +2063,14 @@ DisplayBattleMenu: ld a, " " jr z, .safariLeftColumn ; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle) - Coorda 15, 14 ; clear upper cursor position in right column - Coorda 15, 16 ; clear lower cursor position in right column + ldcoord_a 15, 14 ; clear upper cursor position in right column + ldcoord_a 15, 16 ; clear lower cursor position in right column ld b, $9 ; top menu item X jr .leftColumn_WaitForInput .safariLeftColumn - Coorda 13, 14 - Coorda 13, 16 - coord hl, 7, 14 + ldcoord_a 13, 14 + ldcoord_a 13, 16 + hlcoord 7, 14 ld de, wNumSafariBalls lb bc, 1, 2 call PrintNumber @@ -2183,14 +2096,14 @@ DisplayBattleMenu: ld a, " " jr z, .safariRightColumn ; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle) - Coorda 9, 14 ; clear upper cursor position in left column - Coorda 9, 16 ; clear lower cursor position in left column + ldcoord_a 9, 14 ; clear upper cursor position in left column + ldcoord_a 9, 16 ; clear lower cursor position in left column ld b, $f ; top menu item X jr .rightColumn_WaitForInput .safariRightColumn - Coorda 1, 14 ; clear upper cursor position in left column - Coorda 1, 16 ; clear lower cursor position in left column - coord hl, 7, 14 + ldcoord_a 1, 14 ; clear upper cursor position in left column + ldcoord_a 1, 16 ; clear lower cursor position in left column + hlcoord 7, 14 ld de, wNumSafariBalls lb bc, 1, 2 call PrintNumber @@ -2296,7 +2209,7 @@ BagWasSelected: OldManItemList: db 1 ; # items db POKE_BALL, 50 - db -1 + db -1 ; end DisplayPlayerBag: ; get the pointer to player's bag when in a normal battle @@ -2379,8 +2292,8 @@ UseBagItem: ret ItemsCantBeUsedHereText: - TX_FAR _ItemsCantBeUsedHereText - db "@" + text_far _ItemsCantBeUsedHereText + text_end PartyMenuOrRockOrRun: dec a ; was Run selected? @@ -2411,7 +2324,7 @@ PartyMenuOrRockOrRun: call GBPalNormal jp DisplayBattleMenu .partyMonDeselected - coord hl, 11, 11 + hlcoord 11, 11 ld bc, 6 * SCREEN_WIDTH + 9 ld a, " " call FillMemory @@ -2501,7 +2414,7 @@ PartyMenuOrRockOrRun: ; fall through to SwitchPlayerMon SwitchPlayerMon: - callab RetreatMon + callfar RetreatMon ld c, 50 call DelayFrames call AnimateRetreatingPlayerMon @@ -2524,8 +2437,8 @@ SwitchPlayerMon: ret AlreadyOutText: - TX_FAR _AlreadyOutText - db "@" + text_far _AlreadyOutText + text_end BattleMenu_RunWasSelected: call LoadScreenTilesFromBuffer1 @@ -2554,18 +2467,18 @@ MoveSelectionMenu: ld de, wMoves ld bc, NUM_MOVES call CopyData - callab FormatMovesString + callfar FormatMovesString ret .writemoves ld de, wMovesString - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] set 2, a - ld [hFlags_0xFFF6], a + ldh [hUILayoutFlags], a call PlaceString - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] res 2, a - ld [hFlags_0xFFF6], a + ldh [hUILayoutFlags], a ret .regularmenu @@ -2573,18 +2486,18 @@ MoveSelectionMenu: ret z ld hl, wBattleMonMoves call .loadmoves - coord hl, 4, 12 + hlcoord 4, 12 ld b, 4 ld c, 14 - di ; out of pure coincidence, it is possible for vblank to occur between the di and ei + di ; out of pure coincidence, it is possible for vblank to occur between the di and ei ; so it is necessary to put the di ei block to not cause tearing call TextBoxBorder - coord hl, 4, 12 + hlcoord 4, 12 ld [hl], $7a - coord hl, 10, 12 + hlcoord 10, 12 ld [hl], $7e ei - coord hl, 6, 13 + hlcoord 6, 13 call .writemoves ld b, $5 ld a, $c @@ -2592,11 +2505,11 @@ MoveSelectionMenu: .mimicmenu ld hl, wEnemyMonMoves call .loadmoves - coord hl, 0, 7 + hlcoord 0, 7 ld b, 4 ld c, 14 call TextBoxBorder - coord hl, 2, 8 + hlcoord 2, 8 call .writemoves ld b, $1 ld a, $7 @@ -2607,11 +2520,11 @@ MoveSelectionMenu: ld bc, wPartyMon2 - wPartyMon1 call AddNTimes call .loadmoves - coord hl, 4, 7 + hlcoord 4, 7 ld b, 4 ld c, 14 call TextBoxBorder - coord hl, 6, 8 + hlcoord 6, 8 call .writemoves ld b, $5 ld a, $7 @@ -2667,7 +2580,7 @@ SelectMenuItem: jr z, .battleselect dec a jr nz, .select - coord hl, 1, 14 + hlcoord 1, 14 ld de, WhichTechniqueString call PlaceString jr .select @@ -2679,24 +2592,24 @@ SelectMenuItem: ld a, [wMenuItemToSwap] and a jr z, .select - coord hl, 5, 13 + hlcoord 5, 13 dec a ld bc, SCREEN_WIDTH call AddNTimes ld [hl], "▷" .select - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags res 1, [hl] - bit 6, a - jp nz, SelectMenuItem_CursorUp ; up - bit 7, a - jp nz, SelectMenuItem_CursorDown ; down - bit 2, a - jp nz, SwapMovesInMenu ; select - bit 1, a ; B, but was it reset above? + bit BIT_D_UP, a + jp nz, SelectMenuItem_CursorUp + bit BIT_D_DOWN, a + jp nz, SelectMenuItem_CursorDown + bit BIT_SELECT, a + jp nz, SwapMovesInMenu + bit BIT_B_BUTTON, a push af xor a ld [wMenuItemToSwap], a @@ -2757,12 +2670,12 @@ SelectMenuItem: jp MoveSelectionMenu MoveNoPPText: - TX_FAR _MoveNoPPText - db "@" + text_far _MoveNoPPText + text_end MoveDisabledText: - TX_FAR _MoveDisabledText - db "@" + text_far _MoveDisabledText + text_end WhichTechniqueString: db "WHICH TECHNIQUE?@" @@ -2834,8 +2747,8 @@ AnyMoveToSelect: ret NoMovesLeftText: - TX_FAR _NoMovesLeftText - db "@" + text_far _NoMovesLeftText + text_end SwapMovesInMenu: ld a, [wMenuItemToSwap] @@ -2915,8 +2828,8 @@ SwapMovesInMenu: PrintMenuItem: xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 0, 8 + ldh [hAutoBGTransferEnabled], a + hlcoord 0, 8 ld b, 3 ld c, 9 call TextBoxBorder @@ -2929,7 +2842,7 @@ PrintMenuItem: ld a, [wCurrentMenuItem] cp b jr nz, .notDisabled - coord hl, 1, 10 + hlcoord 1, 10 ld de, DisabledText call PlaceString jr .moveDisabled @@ -2937,7 +2850,7 @@ PrintMenuItem: ld hl, wCurrentMenuItem dec [hl] xor a - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ld hl, wBattleMonMoves ld a, [wCurrentMenuItem] ld c, a @@ -2950,7 +2863,7 @@ PrintMenuItem: ld [wWhichPokemon], a ld a, BATTLE_MON_DATA ld [wMonDataLocation], a - callab GetMaxPP + callfar GetMaxPP ld hl, wCurrentMenuItem ld c, [hl] inc [hl] @@ -2961,27 +2874,27 @@ PrintMenuItem: and $3f ld [wcd6d], a ; print TYPE/ and / - coord hl, 1, 9 + hlcoord 1, 9 ld de, TypeText call PlaceString - coord hl, 7, 11 + hlcoord 7, 11 ld [hl], "/" - coord hl, 5, 9 + hlcoord 5, 9 ld [hl], "/" - coord hl, 5, 11 + hlcoord 5, 11 ld de, wcd6d lb bc, 1, 2 call PrintNumber - coord hl, 8, 11 + hlcoord 8, 11 ld de, wMaxPP lb bc, 1, 2 call PrintNumber call GetCurrentMove - coord hl, 2, 10 + hlcoord 2, 10 predef PrintMoveType .moveDisabled ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a jp Delay3 DisabledText: @@ -3045,7 +2958,7 @@ SelectEnemyMove: ld a, [wIsInBattle] dec a jr z, .chooseRandomMove ; wild encounter - callab AIEnemyTrainerChooseMoves + callfar AIEnemyTrainerChooseMoves .chooseRandomMove push hl call BattleRandom @@ -3110,7 +3023,7 @@ LinkBattleExchangeData: ld a, b .doExchange ld [wSerialExchangeNybbleSendData], a - callab PrintWaitingText + callfar PrintWaitingText .syncLoop1 call Serial_ExchangeNybble call DelayFrame @@ -3133,7 +3046,7 @@ LinkBattleExchangeData: ExecutePlayerMove: xor a - ld [H_WHOSETURN], a ; set player's turn + ldh [hWhoseTurn], a ; set player's turn ld a, [wPlayerSelectedMove] inc a jp z, ExecutePlayerMoveDone ; for selected move = FF, skip most of player's turn @@ -3286,7 +3199,7 @@ MirrorMoveCheck: .moveDidNotMiss call ApplyAttackToEnemyPokemon call PrintCriticalOHKOText - callab DisplayEffectiveness + callfar DisplayEffectiveness ld a, 1 ld [wMoveDidntMiss], a .notDone @@ -3329,8 +3242,8 @@ MirrorMoveCheck: jp ExecutePlayerMoveDone MultiHitText: - TX_FAR _MultiHitText - db "@" + text_far _MultiHitText + text_end ExecutePlayerMoveDone: xor a @@ -3342,29 +3255,29 @@ PrintGhostText: ; print the ghost battle messages call IsGhostBattle ret nz - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr nz, .Ghost - ld a, [wBattleMonStatus] ; player’s turn + ld a, [wBattleMonStatus] ; player's turn and SLP | (1 << FRZ) ret nz ld hl, ScaredText call PrintText xor a ret -.Ghost ; ghost’s turn +.Ghost ; ghost's turn ld hl, GetOutText call PrintText xor a ret ScaredText: - TX_FAR _ScaredText - db "@" + text_far _ScaredText + text_end GetOutText: - TX_FAR _GetOutText - db "@" + text_far _GetOutText + text_end IsGhostBattle: ld a, [wIsInBattle] @@ -3647,69 +3560,69 @@ CheckPlayerStatusConditions: ret FastAsleepText: - TX_FAR _FastAsleepText - db "@" + text_far _FastAsleepText + text_end WokeUpText: - TX_FAR _WokeUpText - db "@" + text_far _WokeUpText + text_end IsFrozenText: - TX_FAR _IsFrozenText - db "@" + text_far _IsFrozenText + text_end FullyParalyzedText: - TX_FAR _FullyParalyzedText - db "@" + text_far _FullyParalyzedText + text_end FlinchedText: - TX_FAR _FlinchedText - db "@" + text_far _FlinchedText + text_end MustRechargeText: - TX_FAR _MustRechargeText - db "@" + text_far _MustRechargeText + text_end DisabledNoMoreText: - TX_FAR _DisabledNoMoreText - db "@" + text_far _DisabledNoMoreText + text_end IsConfusedText: - TX_FAR _IsConfusedText - db "@" + text_far _IsConfusedText + text_end HurtItselfText: - TX_FAR _HurtItselfText - db "@" + text_far _HurtItselfText + text_end ConfusedNoMoreText: - TX_FAR _ConfusedNoMoreText - db "@" + text_far _ConfusedNoMoreText + text_end SavingEnergyText: - TX_FAR _SavingEnergyText - db "@" + text_far _SavingEnergyText + text_end UnleashedEnergyText: - TX_FAR _UnleashedEnergyText - db "@" + text_far _UnleashedEnergyText + text_end ThrashingAboutText: - TX_FAR _ThrashingAboutText - db "@" + text_far _ThrashingAboutText + text_end AttackContinuesText: - TX_FAR _AttackContinuesText - db "@" + text_far _AttackContinuesText + text_end CantMoveText: - TX_FAR _CantMoveText - db "@" + text_far _CantMoveText + text_end PrintMoveIsDisabledText: ld hl, wPlayerSelectedMove ld de, wPlayerBattleStatus1 - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .removeChargingUp inc hl @@ -3725,8 +3638,8 @@ PrintMoveIsDisabledText: jp PrintText MoveIsDisabledText: - TX_FAR _MoveIsDisabledText - db "@" + text_far _MoveIsDisabledText + text_end HandleSelfConfusionDamage: ld hl, HurtItselfText @@ -3765,11 +3678,11 @@ HandleSelfConfusionDamage: xor a ld [wAnimationType], a inc a - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a call PlayMoveAnimation call DrawPlayerHUDAndHPBar xor a - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a jp ApplyDamageToPlayerPokemon PrintMonName1Text: @@ -3782,9 +3695,9 @@ PrintMonName1Text: ; this likely had to do with Japanese grammar that got translated, ; but the functionality didn't get removed MonName1Text: - TX_FAR _MonName1Text - TX_ASM - ld a, [H_WHOSETURN] + text_far _MonName1Text + text_asm + ldh a, [hWhoseTurn] and a ld a, [wPlayerMoveNum] ld hl, wPlayerUsedMove @@ -3807,13 +3720,13 @@ MonName1Text: ret Used1Text: - TX_FAR _Used1Text - TX_ASM + text_far _Used1Text + text_asm jr PrintInsteadText Used2Text: - TX_FAR _Used2Text - TX_ASM + text_far _Used2Text + text_asm ; fall through PrintInsteadText: @@ -3824,8 +3737,8 @@ PrintInsteadText: ret InsteadText: - TX_FAR _InsteadText - TX_ASM + text_far _InsteadText + text_asm ; fall through PrintMoveName: @@ -3833,8 +3746,8 @@ PrintMoveName: ret _PrintMoveName: - TX_FAR _CF4BText - TX_ASM + text_far _CF4BText + text_asm ld hl, ExclamationPointPointerTable ld a, [wd11e] ; exclamation point num add a @@ -3856,24 +3769,24 @@ ExclamationPointPointerTable: dw ExclamationPoint5Text ExclamationPoint1Text: - TX_FAR _ExclamationPoint1Text - db "@" + text_far _ExclamationPoint1Text + text_end ExclamationPoint2Text: - TX_FAR _ExclamationPoint2Text - db "@" + text_far _ExclamationPoint2Text + text_end ExclamationPoint3Text: - TX_FAR _ExclamationPoint3Text - db "@" + text_far _ExclamationPoint3Text + text_end ExclamationPoint4Text: - TX_FAR _ExclamationPoint4Text - db "@" + text_far _ExclamationPoint4Text + text_end ExclamationPoint5Text: - TX_FAR _ExclamationPoint5Text - db "@" + text_far _ExclamationPoint5Text + text_end ; this function does nothing useful ; if the move being used is in set [1-4] from ExclamationPointMoveSets, @@ -3904,24 +3817,11 @@ DetermineExclamationPointTextNum: pop bc ret -ExclamationPointMoveSets: - db SWORDS_DANCE, GROWTH - db $00 - db RECOVER, BIDE, SELFDESTRUCT, AMNESIA - db $00 - db MEDITATE, AGILITY, TELEPORT, MIMIC, DOUBLE_TEAM, BARRAGE - db $00 - db POUND, SCRATCH, VICEGRIP, WING_ATTACK, FLY, BIND, SLAM, HORN_ATTACK, BODY_SLAM - db WRAP, THRASH, TAIL_WHIP, LEER, BITE, GROWL, ROAR, SING, PECK, COUNTER - db STRENGTH, ABSORB, STRING_SHOT, EARTHQUAKE, FISSURE, DIG, TOXIC, SCREECH, HARDEN - db MINIMIZE, WITHDRAW, DEFENSE_CURL, METRONOME, LICK, CLAMP, CONSTRICT, POISON_GAS - db LEECH_LIFE, BUBBLE, FLASH, SPLASH, ACID_ARMOR, FURY_SWIPES, REST, SHARPEN, SLASH, SUBSTITUTE - db $00 - db $FF ; terminator +INCLUDE "data/moves/grammar.asm" PrintMoveFailureText: ld de, wPlayerMoveEffect - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playersTurn ld de, wEnemyMoveEffect @@ -3969,7 +3869,7 @@ PrintMoveFailureText: call PrintText ld b, $4 predef PredefShakeScreenHorizontally - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr nz, .enemyTurn jp ApplyDamageToPlayerPokemon @@ -3977,24 +3877,24 @@ PrintMoveFailureText: jp ApplyDamageToEnemyPokemon AttackMissedText: - TX_FAR _AttackMissedText - db "@" + text_far _AttackMissedText + text_end KeptGoingAndCrashedText: - TX_FAR _KeptGoingAndCrashedText - db "@" + text_far _KeptGoingAndCrashedText + text_end UnaffectedText: - TX_FAR _UnaffectedText - db "@" + text_far _UnaffectedText + text_end PrintDoesntAffectText: ld hl, DoesntAffectMonText jp PrintText DoesntAffectMonText: - TX_FAR _DoesntAffectMonText - db "@" + text_far _DoesntAffectMonText + text_end ; if there was a critical hit or an OHKO was successful, print the corresponding text PrintCriticalOHKOText: @@ -4022,12 +3922,12 @@ CriticalOHKOTextPointers: dw OHKOText CriticalHitText: - TX_FAR _CriticalHitText - db "@" + text_far _CriticalHitText + text_end OHKOText: - TX_FAR _OHKOText - db "@" + text_far _OHKOText + text_end ; checks if a traded mon will disobey due to lack of badges ; stores whether the mon will use a move in Z flag @@ -4057,16 +3957,16 @@ CheckForDisobedience: .monIsTraded ; what level might disobey? ld hl, wObtainedBadges - bit 7, [hl] + bit BIT_EARTHBADGE, [hl] ld a, 101 jr nz, .next - bit 5, [hl] + bit BIT_MARSHBADGE, [hl] ld a, 70 jr nz, .next - bit 3, [hl] + bit BIT_RAINBOWBADGE, [hl] ld a, 50 jr nz, .next - bit 1, [hl] + bit BIT_CASCADEBADGE, [hl] ld a, 30 jr nz, .next ld a, 10 @@ -4204,31 +4104,31 @@ CheckForDisobedience: call GetCurrentMove .canUseMove ld a, $1 - and a; clear Z flag + and a ; clear Z flag ret .cannotUseMove xor a ; set Z flag ret LoafingAroundText: - TX_FAR _LoafingAroundText - db "@" + text_far _LoafingAroundText + text_end BeganToNapText: - TX_FAR _BeganToNapText - db "@" + text_far _BeganToNapText + text_end WontObeyText: - TX_FAR _WontObeyText - db "@" + text_far _WontObeyText + text_end TurnedAwayText: - TX_FAR _TurnedAwayText - db "@" + text_far _TurnedAwayText + text_end IgnoredOrdersText: - TX_FAR _IgnoredOrdersText - db "@" + text_far _IgnoredOrdersText + text_end ; sets b, c, d, and e for the CalculateDamage routine in the case of an attack by the player mon GetDamageVarsForPlayerAttack: @@ -4242,7 +4142,7 @@ GetDamageVarsForPlayerAttack: ld d, a ; d = move power ret z ; return if move power is zero ld a, [hl] ; a = [wPlayerMoveType] - cp FIRE ; types >= FIRE are all special + cp SPECIAL ; types >= SPECIAL are all special jr nc, .specialAttack .physicalAttack ld hl, wEnemyMonDefense @@ -4263,9 +4163,9 @@ GetDamageVarsForPlayerAttack: ; in the case of a critical hit, reset the player's attack and the enemy's defense to their base values ld c, 3 ; defense stat call GetEnemyMonStat - ld a, [H_PRODUCT + 2] + ldh a, [hProduct + 2] ld b, a - ld a, [H_PRODUCT + 3] + ldh a, [hProduct + 3] ld c, a push bc ld hl, wPartyMon1Attack @@ -4285,8 +4185,8 @@ GetDamageVarsForPlayerAttack: ; if the enemy has used Light Screen, double the enemy's special sla c rl b -; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; reflect and light screen boosts do not cap the stat at MAX_STAT_VALUE, so weird things will happen during stats scaling +; if a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wBattleMonSpecial ld a, [wCriticalHitOrOHKO] @@ -4295,9 +4195,9 @@ GetDamageVarsForPlayerAttack: ; in the case of a critical hit, reset the player's and enemy's specials to their base values ld c, 5 ; special stat call GetEnemyMonStat - ld a, [H_PRODUCT + 2] + ldh a, [hProduct + 2] ld b, a - ld a, [H_PRODUCT + 3] + ldh a, [hProduct + 3] ld c, a push bc ld hl, wPartyMon1Special @@ -4355,7 +4255,7 @@ GetDamageVarsForEnemyAttack: and a ret z ; return if move power is zero ld a, [hl] ; a = [wEnemyMoveType] - cp FIRE ; types >= FIRE are all special + cp SPECIAL ; types >= SPECIAL are all special jr nc, .specialAttack .physicalAttack ld hl, wBattleMonDefense @@ -4384,7 +4284,7 @@ GetDamageVarsForEnemyAttack: push bc ld c, 2 ; attack stat call GetEnemyMonStat - ld hl, H_PRODUCT + 2 + ld hl, hProduct + 2 pop bc jr .scaleStats .specialAttack @@ -4398,8 +4298,8 @@ GetDamageVarsForEnemyAttack: ; if the player has used Light Screen, double the player's special sla c rl b -; reflect and light screen boosts do not cap the stat at 999, so weird things will happen during stats scaling if -; a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen +; reflect and light screen boosts do not cap the stat at MAX_STAT_VALUE, so weird things will happen during stats scaling +; if a Pokemon with 512 or more Defense has used Reflect, or if a Pokemon with 512 or more Special has used Light Screen .specialAttackCritCheck ld hl, wEnemyMonSpecial ld a, [wCriticalHitOrOHKO] @@ -4416,7 +4316,7 @@ GetDamageVarsForEnemyAttack: push bc ld c, 5 ; special stat call GetEnemyMonStat - ld hl, H_PRODUCT + 2 + ld hl, hProduct + 2 pop bc ; if either the offensive or defensive stat is too large to store in a byte, scale both stats by dividing them by 4 ; this allows values with up to 10 bits (values up to 1023) to be handled @@ -4474,9 +4374,9 @@ GetEnemyMonStat: ld bc, wEnemyMon2 - wEnemyMon1 call AddNTimes ld a, [hli] - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, [hl] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a pop bc pop de ret @@ -4507,7 +4407,7 @@ CalculateDamage: ; d: base power ; e: level - ld a, [H_WHOSETURN] ; whose turn? + ldh a, [hWhoseTurn] ; whose turn? and a ld a, [wPlayerMoveEffect] jr z, .effect @@ -4539,7 +4439,7 @@ CalculateDamage: .skipbp xor a - ld hl, H_DIVIDEND + ld hl, hDividend ldi [hl], a ldi [hl], a ld [hl], a @@ -4588,76 +4488,82 @@ CalculateDamage: ld b, 4 call Divide +; Update wCurDamage. +; Capped at MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE: 999 - 2 = 997. ld hl, wDamage ld b, [hl] - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] add b - ld [H_QUOTIENT + 3], a - jr nc, .asm_3dfd0 + ldh [hQuotient + 3], a + jr nc, .dont_cap_1 - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] inc a - ld [H_QUOTIENT + 2], a + ldh [hQuotient + 2], a and a - jr z, .asm_3e004 + jr z, .cap -.asm_3dfd0 - ld a, [H_QUOTIENT] +.dont_cap_1 + ldh a, [hQuotient] ld b, a - ld a, [H_QUOTIENT + 1] + ldh a, [hQuotient + 1] or a - jr nz, .asm_3e004 + jr nz, .cap - ld a, [H_QUOTIENT + 2] - cp 998 / $100 - jr c, .asm_3dfe8 - cp 998 / $100 + 1 - jr nc, .asm_3e004 - ld a, [H_QUOTIENT + 3] - cp 998 % $100 - jr nc, .asm_3e004 + ldh a, [hQuotient + 2] + cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + jr c, .dont_cap_2 -.asm_3dfe8 + cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + 1 + jr nc, .cap + + ldh a, [hQuotient + 3] + cp LOW(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + jr nc, .cap + +.dont_cap_2 inc hl - ld a, [H_QUOTIENT + 3] + + ldh a, [hQuotient + 3] ld b, [hl] add b ld [hld], a - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] ld b, [hl] adc b ld [hl], a - jr c, .asm_3e004 + jr c, .cap ld a, [hl] - cp 998 / $100 - jr c, .asm_3e00a - cp 998 / $100 + 1 - jr nc, .asm_3e004 + cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + jr c, .dont_cap_3 + + cp HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + 1 + jr nc, .cap + inc hl ld a, [hld] - cp 998 % $100 - jr c, .asm_3e00a + cp LOW(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE + 1) + jr c, .dont_cap_3 -.asm_3e004 -; cap at 997 - ld a, 997 / $100 +.cap + ld a, HIGH(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE) ld [hli], a - ld a, 997 % $100 + ld a, LOW(MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE) ld [hld], a -.asm_3e00a -; add 2 +.dont_cap_3 +; Add back MIN_NEUTRAL_DAMAGE (capping at 999). inc hl ld a, [hl] - add 2 + add MIN_NEUTRAL_DAMAGE ld [hld], a - jr nc, .done + jr nc, .dont_floor inc [hl] +.dont_floor -.done -; minimum damage is 1 +; Returns nz and nc. ld a, 1 and a ret @@ -4668,21 +4574,15 @@ JumpToOHKOMoveEffect: dec a ret - -UnusedHighCriticalMoves: - db KARATE_CHOP - db RAZOR_LEAF - db CRABHAMMER - db SLASH - db $FF +INCLUDE "data/battle/unused_critical_hit_moves.asm" ; determines if attack is a critical hit -; azure heights claims "the fastest pokémon (who are,not coincidentally, +; Azure Heights claims "the fastest pokémon (who are, not coincidentally, ; among the most popular) tend to CH about 20 to 25% of the time." CriticalHitTest: xor a ld [wCriticalHitOrOHKO], a - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, [wEnemyMonSpecies] jr nz, .handleEnemy @@ -4693,7 +4593,7 @@ CriticalHitTest: ld a, [wMonHBaseSpeed] ld b, a srl b ; (effective (base speed/2)) - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld hl, wPlayerMovePower ld de, wPlayerBattleStatus2 @@ -4745,14 +4645,7 @@ CriticalHitTest: ld [wCriticalHitOrOHKO], a ; set critical hit flag ret -; high critical hit moves -HighCriticalMoves: - db KARATE_CHOP - db RAZOR_LEAF - db CRABHAMMER - db SLASH - db $FF - +INCLUDE "data/battle/critical_hit_moves.asm" ; function to determine if Counter hits and if so, how much damage it does HandleCounterMove: @@ -4762,7 +4655,7 @@ HandleCounterMove: ; the outcome may be affected by the player's actions in the move selection menu prior to switching the Pokemon. ; This might also lead to desync glitches in link battles. - ld a, [H_WHOSETURN] ; whose turn + ldh a, [hWhoseTurn] ; whose turn and a ; player's turn ld hl, wEnemySelectedMove @@ -4932,7 +4825,7 @@ ApplyDamageToEnemyPokemon: ld [wHPBarNewHP+1], a ld a, [hl] ld [wHPBarNewHP], a - coord hl, 2, 2 + hlcoord 2, 2 xor a ld [wHPBarType], a predef UpdateHPBar2 ; animate the HP bar shortening @@ -5050,7 +4943,7 @@ ApplyDamageToPlayerPokemon: ld [wHPBarMaxHP+1], a ld a, [hl] ld [wHPBarMaxHP], a - coord hl, 10, 9 + hlcoord 10, 9 ld a, $01 ld [wHPBarType], a predef UpdateHPBar2 ; animate the HP bar shortening @@ -5070,7 +4963,7 @@ AttackSubstitute: ; values for player turn ld de, wEnemySubstituteHP ld bc, wEnemyBattleStatus2 - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .applyDamageToSubstitute ; values for enemy turn @@ -5095,14 +4988,14 @@ AttackSubstitute: ld hl, SubstituteBrokeText call PrintText ; flip whose turn it is for the next function call - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] xor $01 - ld [H_WHOSETURN], a - callab HideSubstituteShowMonAnim ; animate the substitute breaking + ldh [hWhoseTurn], a + callfar HideSubstituteShowMonAnim ; animate the substitute breaking ; flip the turn back to the way it was - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] xor $01 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ld hl, wPlayerMoveEffect ; value for player's turn and a jr z, .nullifyEffect @@ -5113,12 +5006,12 @@ AttackSubstitute: jp DrawHUDsAndHPBars SubstituteTookDamageText: - TX_FAR _SubstituteTookDamageText - db "@" + text_far _SubstituteTookDamageText + text_end SubstituteBrokeText: - TX_FAR _SubstituteBrokeText - db "@" + text_far _SubstituteBrokeText + text_end ; this function raises the attack modifier of a pokemon using Rage when that pokemon is attacked HandleBuildingRage: @@ -5126,7 +5019,7 @@ HandleBuildingRage: ld hl, wEnemyBattleStatus2 ld de, wEnemyMonStatMods ld bc, wEnemyMoveNum - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .next ; values for the enemy turn @@ -5139,9 +5032,9 @@ HandleBuildingRage: ld a, [de] cp $0d ; maximum stat modifier value ret z ; return if attack modifier is already maxed - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] xor $01 ; flip turn for the stat modifier raising function - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ; temporarily change the target pokemon's move to $00 and the effect to the one ; that causes the attack modifier to go up one stage ld h, b @@ -5158,25 +5051,25 @@ HandleBuildingRage: ldd [hl], a ; null move effect ld a, RAGE ld [hl], a ; restore the target pokemon's move number to Rage - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] xor $01 ; flip turn back to the way it was - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ret BuildingRageText: - TX_FAR _BuildingRageText - db "@" + text_far _BuildingRageText + text_end ; copy last move for Mirror Move ; sets zero flag on failure and unsets zero flag on success MirrorMoveCopyMove: -; Mirror Move makes use of ccf1 (wPlayerUsedMove) and ccf2 (wEnemyUsedMove) addresses, +; Mirror Move makes use of wPlayerUsedMove and wEnemyUsedMove, ; which are mainly used to print the "[Pokemon] used [Move]" text. ; Both are set to 0 whenever a new Pokemon is sent out -; ccf1 is also set to 0 whenever the player is fast asleep or frozen solid. -; ccf2 is also set to 0 whenever the enemy is fast asleep or frozen solid. +; wPlayerUsedMove is also set to 0 whenever the player is fast asleep or frozen solid. +; wEnemyUsedMove is also set to 0 whenever the enemy is fast asleep or frozen solid. - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ; values for player turn ld a, [wEnemyUsedMove] @@ -5200,8 +5093,8 @@ MirrorMoveCopyMove: ret MirrorMoveFailedText: - TX_FAR _MirrorMoveFailedText - db "@" + text_far _MirrorMoveFailedText + text_end ; function used to reload move data for moves like Mirror Move and Metronome ReloadMoveData: @@ -5229,7 +5122,7 @@ MetronomePickMove: ; values for player turn ld de, wPlayerMoveNum ld hl, wPlayerSelectedMove - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .pickMoveLoop ; values for enemy turn @@ -5251,7 +5144,7 @@ MetronomePickMove: ; it's used to prevent moves that run another move within the same turn ; (like Mirror Move and Metronome) from losing 2 PP IncrementMovePP: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ; values for player turn ld hl, wBattleMonPP @@ -5270,7 +5163,7 @@ IncrementMovePP: ld h, d ld l, e add hl, bc - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, [wPlayerMonNumber] ; value for player turn jr z, .updatePP @@ -5294,7 +5187,7 @@ AdjustDamageForMoveType: ld e, [hl] ; e = type 2 of defender ld a, [wPlayerMoveType] ld [wMoveType], a - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .next ; values for enemy turn @@ -5358,25 +5251,25 @@ AdjustDamageForMoveType: and $80 ld b, a ld a, [hl] ; a = damage multiplier - ld [H_MULTIPLIER], a + ldh [hMultiplier], a add b ld [wDamageMultipliers], a xor a - ld [H_MULTIPLICAND], a + ldh [hMultiplicand], a ld hl, wDamage ld a, [hli] - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, [hld] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a call Multiply ld a, 10 - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, $04 call Divide - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] ld [hli], a ld b, a - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld [hl], a or b ; is damage 0? jr nz, .skipTypeImmunity @@ -5433,7 +5326,7 @@ AIGetTypeEffectiveness: ld [wTypeEffectiveness], a ; store damage multiplier ret -INCLUDE "data/type_effects.asm" +INCLUDE "data/types/type_matchups.asm" ; some tests that need to pass for a move to hit MoveHitTest: @@ -5441,7 +5334,7 @@ MoveHitTest: ld hl, wEnemyBattleStatus1 ld de, wPlayerMoveEffect ld bc, wEnemyMonStatus - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .dreamEaterCheck ; enemy's turn @@ -5461,8 +5354,8 @@ MoveHitTest: ret z ; Swift never misses (interestingly, Azure Heights lists this is a myth, but it appears to be true) call CheckTargetSubstitute ; substitute check (note that this overwrites a) jr z, .checkForDigOrFlyStatus -; this code is buggy. it's supposed to prevent HP draining moves from working on substitutes. -; since $7b79 overwrites a with either $00 or $01, it never works. +; This code is buggy. It's supposed to prevent HP draining moves from working on substitutes. +; Since CheckTargetSubstitute overwrites a with either $00 or $01, it never works. cp DRAIN_HP_EFFECT jp z, .moveMissed cp DREAM_EATER_EFFECT @@ -5470,7 +5363,7 @@ MoveHitTest: .checkForDigOrFlyStatus bit INVULNERABLE, [hl] jp nz, .moveMissed - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr nz, .enemyTurn .playerTurn @@ -5524,7 +5417,7 @@ MoveHitTest: call CalcHitChance ; scale the move accuracy according to attacker's accuracy and target's evasion ld a, [wPlayerMoveAccuracy] ld b, a - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .doAccuracyCheck ld a, [wEnemyMoveAccuracy] @@ -5543,7 +5436,7 @@ MoveHitTest: ld [hl], a inc a ld [wMoveMissed], a - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn2 .enemyTurn2 @@ -5558,7 +5451,7 @@ MoveHitTest: ; values for player turn CalcHitChance: ld hl, wPlayerMoveAccuracy - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, [wPlayerMonAccuracyMod] ld b, a @@ -5578,10 +5471,10 @@ CalcHitChance: ; decreases the hit chance instead of increasing the hit chance) ; zero the high bytes of the multiplicand xor a - ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand], a + ldh [hMultiplicand + 1], a ld a, [hl] - ld [H_MULTIPLICAND + 2], a ; set multiplicand to move accuracy + ldh [hMultiplicand + 2], a ; set multiplicand to move accuracy push hl ld d, $02 ; loop has two iterations ; loop to do the calculations, the first iteration multiplies by the accuracy ratio and @@ -5596,29 +5489,29 @@ CalcHitChance: add hl, bc ; hl = address of stat modifier ratio pop bc ld a, [hli] - ld [H_MULTIPLIER], a ; set multiplier to the numerator of the ratio + ldh [hMultiplier], a ; set multiplier to the numerator of the ratio call Multiply ld a, [hl] - ld [H_DIVISOR], a ; set divisor to the the denominator of the ratio + ldh [hDivisor], a ; set divisor to the the denominator of the ratio ; (the dividend is the product of the previous multiplication) ld b, $04 ; number of bytes in the dividend call Divide - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld b, a - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] or b jp nz, .nextCalculation ; make sure the result is always at least one - ld [H_QUOTIENT + 2], a + ldh [hQuotient + 2], a ld a, $01 - ld [H_QUOTIENT + 3], a + ldh [hQuotient + 3], a .nextCalculation ld b, c dec d jr nz, .loop - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] and a ; is the calculated hit chance over 0xFF? - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] jr z, .storeAccuracy ; if calculated hit chance over 0xFF ld a, $ff ; set the hit chance to 0xFF @@ -5638,29 +5531,29 @@ RandomizeDamage: ret c ; return if damage is equal to 0 or 1 .DamageGreaterThanOne xor a - ld [H_MULTIPLICAND], a + ldh [hMultiplicand], a dec hl ld a, [hli] - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a ld a, [hl] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a ; loop until a random number greater than or equal to 217 is generated .loop call BattleRandom rrca cp 217 jr c, .loop - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ; multiply damage by the random number, which is in the range [217, 255] ld a, 255 - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, $4 call Divide ; divide the result by 255 ; store the modified damage - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] ld hl, wDamage ld [hli], a - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld [hl], a ret @@ -5836,7 +5729,7 @@ EnemyCheckIfMirrorMoveEffect: .moveDidNotMiss call ApplyAttackToPlayerPokemon call PrintCriticalOHKOText - callab DisplayEffectiveness + callfar DisplayEffectiveness ld a, 1 ld [wMoveDidntMiss], a .handleExplosionMiss @@ -5875,8 +5768,8 @@ EnemyCheckIfMirrorMoveEffect: jr ExecuteEnemyMoveDone HitXTimesText: - TX_FAR _HitXTimesText - db "@" + text_far _HitXTimesText + text_end ExecuteEnemyMoveDone: ld b, $1 @@ -6016,11 +5909,11 @@ CheckEnemyStatusConditions: ld [hl], a xor a ld [wAnimationType], a - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a ld a, POUND call PlayMoveAnimation ld a, $1 - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a call ApplyDamageToEnemyPokemon jr .monHurtItselfOrFullyParalysed .checkIfTriedToUseDisabledMove @@ -6167,7 +6060,7 @@ CheckEnemyStatusConditions: ret GetCurrentMove: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jp z, .player ld de, wEnemyMoveNum @@ -6214,8 +6107,8 @@ LoadEnemyMonData: ld a, [wIsInBattle] cp $2 ; is it a trainer battle? ; fixed DVs for trainer mon - ld a, $98 - ld b, $88 + ld a, ATKDEFDV_TRAINER + ld b, SPDSPCDV_TRAINER jr z, .storeDVs ; random DVs for wild mon call BattleRandom @@ -6364,25 +6257,25 @@ DoBattleTransitionAndInitBattleVariables: ; link battle xor a ld [wMenuJoypadPollCount], a - callab DisplayLinkBattleVersusTextBox + callfar DisplayLinkBattleVersusTextBox ld a, $1 ld [wUpdateSpritesEnabled], a call ClearScreen .next call DelayFrame predef BattleTransition - callab LoadHudAndHpBarAndStatusTilePatterns + callfar LoadHudAndHpBarAndStatusTilePatterns ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld a, $ff ld [wUpdateSpritesEnabled], a call ClearSprites call ClearScreen xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld [hWY], a - ld [rWY], a - ld [hTilesetType], a + ldh [hAutoBGTransferEnabled], a + ldh [hWY], a + ldh [rWY], a + ldh [hTileAnimations], a ld hl, wPlayerStatsToDouble ld [hli], a ld [hli], a @@ -6412,14 +6305,14 @@ LoadPlayerBackPic: dec a ; is it the old man tutorial? ld de, RedPicBack jr nz, .next - ld de, OldManPic + ld de, OldManPicBack .next ld a, BANK(RedPicBack) call UncompressSpriteFromDE predef ScaleSpriteByTwo ld hl, wOAMBuffer xor a - ld [hOAMTile], a ; initial tile number + ldh [hOAMTile], a ; initial tile number ld b, $7 ; 7 columns ld e, $a0 ; X for the left-most column .loop ; each loop iteration writes 3 OAM entries in a vertical column @@ -6433,16 +6326,16 @@ LoadPlayerBackPic: add d ; increase Y by height of tile ld d, a inc hl - ld a, [hOAMTile] + ldh a, [hOAMTile] ld [hli], a ; OAM tile number inc a ; increment tile number - ld [hOAMTile], a + ldh [hOAMTile], a inc hl dec c jr nz, .innerLoop - ld a, [hOAMTile] + ldh a, [hOAMTile] add $4 ; increase tile number by 4 - ld [hOAMTile], a + ldh [hOAMTile], a ld a, $8 ; width of tile add e ; increase X by width of tile ld e, a @@ -6451,29 +6344,29 @@ LoadPlayerBackPic: ld de, vBackPic call InterlaceMergeSpriteBuffers ld a, $a - ld [$0], a + ld [MBC1SRamEnable], a xor a - ld [$4000], a + ld [MBC1SRamBank], a ld hl, vSprites ld de, sSpriteBuffer1 - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld b, a ld c, 7 * 7 call CopyVideoData xor a - ld [$0], a + ld [MBC1SRamEnable], a ld a, $31 - ld [hStartTileID], a - coord hl, 1, 5 + ldh [hStartTileID], a + hlcoord 1, 5 predef_jump CopyUncompressedPicToTilemap ; does nothing since no stats are ever selected (barring glitches) DoubleOrHalveSelectedStats: - callab DoubleSelectedStats - jpab HalveSelectedStats + callfar DoubleSelectedStats + jpfar HalveSelectedStats ScrollTrainerPicAfterBattle: - jpab _ScrollTrainerPicAfterBattle + jpfar _ScrollTrainerPicAfterBattle ApplyBurnAndParalysisPenaltiesToPlayer: ld a, $1 @@ -6483,12 +6376,12 @@ ApplyBurnAndParalysisPenaltiesToEnemy: xor a ApplyBurnAndParalysisPenalties: - ld [H_WHOSETURN], a + ldh [hWhoseTurn], a call QuarterSpeedDueToParalysis jp HalveAttackDueToBurn QuarterSpeedDueToParalysis: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn .enemyTurn ; quarter the player's speed @@ -6531,7 +6424,7 @@ QuarterSpeedDueToParalysis: ret HalveAttackDueToBurn: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a jr z, .playerTurn .enemyTurn ; halve the player's attack @@ -6621,35 +6514,35 @@ CalculateModifiedStat: ld b, 0 add hl, bc xor a - ld [H_MULTIPLICAND], a + ldh [hMultiplicand], a ld a, [de] - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand + 1], a inc de ld a, [de] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a ld a, [hli] - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ld a, [hl] - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, $4 call Divide pop hl - ld a, [H_DIVIDEND + 3] - sub 999 % $100 - ld a, [H_DIVIDEND + 2] - sbc 999 / $100 + ldh a, [hDividend + 3] + sub LOW(MAX_STAT_VALUE) + ldh a, [hDividend + 2] + sbc HIGH(MAX_STAT_VALUE) jp c, .storeNewStatValue -; cap the stat at 999 - ld a, 999 / $100 - ld [H_DIVIDEND + 2], a - ld a, 999 % $100 - ld [H_DIVIDEND + 3], a +; cap the stat at MAX_STAT_VALUE (999) + ld a, HIGH(MAX_STAT_VALUE) + ldh [hDividend + 2], a + ld a, LOW(MAX_STAT_VALUE) + ldh [hDividend + 3], a .storeNewStatValue - ld a, [H_DIVIDEND + 2] + ldh a, [hDividend + 2] ld [hli], a ld b, a - ld a, [H_DIVIDEND + 3] + ldh a, [hDividend + 3] ld [hl], a or b jr nz, .done @@ -6683,7 +6576,7 @@ ApplyBadgeStatBoosts: ret ; multiply stat at hl by 1.125 -; cap stat at 999 +; cap stat at MAX_STAT_VALUE .applyBoostToStat ld a, [hli] ld d, a @@ -6701,13 +6594,13 @@ ApplyBadgeStatBoosts: adc d ld [hli], a ld a, [hld] - sub 999 % $100 + sub LOW(MAX_STAT_VALUE) ld a, [hl] - sbc 999 / $100 + sbc HIGH(MAX_STAT_VALUE) ret c - ld a, 999 / $100 + ld a, HIGH(MAX_STAT_VALUE) ld [hli], a - ld a, 999 % $100 + ld a, LOW(MAX_STAT_VALUE) ld [hld], a ret @@ -6715,33 +6608,34 @@ LoadHudAndHpBarAndStatusTilePatterns: call LoadHpBarAndStatusTilePatterns LoadHudTilePatterns: - ld a, [rLCDC] + ldh a, [rLCDC] add a ; is LCD disabled? jr c, .lcdEnabled .lcdDisabled ld hl, BattleHudTiles1 - ld de, vChars2 + $6d0 + ld de, vChars2 tile $6d ld bc, BattleHudTiles1End - BattleHudTiles1 ld a, BANK(BattleHudTiles1) call FarCopyDataDouble ld hl, BattleHudTiles2 - ld de, vChars2 + $730 + ld de, vChars2 tile $73 ld bc, BattleHudTiles3End - BattleHudTiles2 ld a, BANK(BattleHudTiles2) jp FarCopyDataDouble .lcdEnabled ld de, BattleHudTiles1 - ld hl, vChars2 + $6d0 + ld hl, vChars2 tile $6d lb bc, BANK(BattleHudTiles1), (BattleHudTiles1End - BattleHudTiles1) / $8 call CopyVideoDataDouble ld de, BattleHudTiles2 - ld hl, vChars2 + $730 + ld hl, vChars2 tile $73 lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / $8 jp CopyVideoDataDouble PrintEmptyString: ld hl, .emptyString jp PrintText + .emptyString db "@" @@ -6799,7 +6693,7 @@ BattleRandom: HandleExplodingAnimation: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld hl, wEnemyMonType1 ld de, wEnemyBattleStatus1 @@ -6834,7 +6728,7 @@ PlayMoveAnimation: call Delay3 predef_jump MoveAnimation -InitBattle: +InitBattle:: ld a, [wCurOpponent] and a jr z, DetermineWildOpponent @@ -6849,14 +6743,14 @@ DetermineWildOpponent: ld a, [wd732] bit 1, a jr z, .asm_3ef2f - ld a, [hJoyHeld] + ldh a, [hJoyHeld] bit 1, a ; B button pressed? ret nz .asm_3ef2f ld a, [wNumberOfNoRandomBattleStepsLeft] and a ret nz - callab TryDoWildEncounter + callfar TryDoWildEncounter ret nz InitBattleCommon: ld a, [wMapPalOffset] @@ -6865,21 +6759,21 @@ InitBattleCommon: ld a, [hl] push af res 1, [hl] - callab InitBattleVariables + callfar InitBattleVariables ld a, [wEnemyMonSpecies2] - sub 200 + sub OPP_ID_OFFSET jp c, InitWildBattle ld [wTrainerClass], a call GetTrainerInformation - callab ReadTrainer + callfar ReadTrainer call DoBattleTransitionAndInitBattleVariables call _LoadTrainerPic xor a ld [wEnemyMonSpecies2], a - ld [hStartTileID], a + ldh [hStartTileID], a dec a ld [wAICount], a - coord hl, 12, 0 + hlcoord 12, 0 predef CopyUncompressedPicToTilemap ld a, $ff ld [wEnemyMonPartyPos], a @@ -6893,7 +6787,7 @@ InitWildBattle: call LoadEnemyMonData call DoBattleTransitionAndInitBattleVariables ld a, [wCurOpponent] - cp MAROWAK + cp RESTLESS_SOUL jr z, .isGhost call IsGhostBattle jr nz, .isNoGhost @@ -6932,8 +6826,8 @@ InitWildBattle: .spriteLoaded xor a ld [wTrainerClass], a - ld [hStartTileID], a - coord hl, 12, 0 + ldh [hStartTileID], a + hlcoord 12, 0 predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles @@ -6942,23 +6836,23 @@ _InitBattleCommon: call RunPaletteCommand call SlidePlayerAndEnemySilhouettesOnScreen xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld hl, .emptyString call PrintText call SaveScreenTilesToBuffer1 call ClearScreen ld a, $98 - ld [H_AUTOBGTRANSFERDEST + 1], a + ldh [hAutoBGTransferDest + 1], a ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 ld a, $9c - ld [H_AUTOBGTRANSFERDEST + 1], a + ldh [hAutoBGTransferDest + 1], a call LoadScreenTilesFromBuffer1 - coord hl, 9, 7 + hlcoord 9, 7 lb bc, 5, 10 call ClearScreenArea - coord hl, 1, 0 + hlcoord 1, 0 lb bc, 4, 10 call ClearScreenArea call ClearSprites @@ -6966,13 +6860,13 @@ _InitBattleCommon: dec a ; is it a wild battle? call z, DrawEnemyHUDAndHPBar ; draw enemy HUD and HP bar if it's a wild battle call StartBattle - callab EndOfBattle + callfar EndOfBattle pop af ld [wLetterPrintingDelayFlags], a pop af ld [wMapPalOffset], a - ld a, [wSavedTilesetType] - ld [hTilesetType], a + ld a, [wSavedTileAnimations] + ldh [hTileAnimations], a scf ret .emptyString @@ -6986,9 +6880,9 @@ _LoadTrainerPic: ld d, a ; de contains pointer to trainer pic ld a, [wLinkState] and a - ld a, Bank(TrainerPics) ; this is where all the trainer pics are (not counting Red's) + ld a, BANK(TrainerPics) ; this is where all the trainer pics are (not counting Red's) jr z, .loadSprite - ld a, Bank(RedPicFront) + ld a, BANK(RedPicFront) .loadSprite call UncompressSpriteFromDE ld de, vFrontPic @@ -7009,8 +6903,8 @@ AnimateSendingOutMon: ld h, a ld a, [wPredefRegisters + 1] ld l, a - ld a, [hStartTileID] - ld [hBaseTileID], a + ldh a, [hStartTileID] + ldh [hBaseTileID], a ld b, $4c ld a, [wIsInBattle] and a @@ -7040,7 +6934,7 @@ AnimateSendingOutMon: ld bc, -(SCREEN_WIDTH * 6 + 3) .next add hl, bc - ld a, [hBaseTileID] + ldh a, [hBaseTileID] add $31 jr CopyUncompressedPicToHL @@ -7049,8 +6943,8 @@ CopyUncompressedPicToTilemap: ld h, a ld a, [wPredefRegisters + 1] ld l, a - ld a, [hStartTileID] -CopyUncompressedPicToHL: + ldh a, [hStartTileID] +CopyUncompressedPicToHL:: lb bc, 7, 7 ld de, SCREEN_WIDTH push af @@ -7102,7 +6996,7 @@ LoadMonBackPic: ; been loaded with GetMonHeader. ld a, [wBattleMonSpecies2] ld [wcf91], a - coord hl, 1, 5 + hlcoord 1, 5 ld b, 7 ld c, 8 call ClearScreenArea @@ -7114,1606 +7008,6 @@ LoadMonBackPic: ld hl, vSprites ld de, vBackPic ld c, (2*SPRITEBUFFERSIZE)/16 ; count of 16-byte chunks to be copied - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld b, a jp CopyVideoData - -JumpMoveEffect: - call _JumpMoveEffect - ld b, $1 - ret - -_JumpMoveEffect: - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveEffect] - jr z, .next1 - ld a, [wEnemyMoveEffect] -.next1 - dec a ; subtract 1, there is no special effect for 00 - add a ; x2, 16bit pointers - ld hl, MoveEffectPointerTable - ld b, 0 - ld c, a - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - jp hl ; jump to special effect handler - -MoveEffectPointerTable: - dw SleepEffect ; unused effect - dw PoisonEffect ; POISON_SIDE_EFFECT1 - dw DrainHPEffect ; DRAIN_HP_EFFECT - dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT1 - dw FreezeBurnParalyzeEffect ; FREEZE_SIDE_EFFECT - dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT1 - dw ExplodeEffect ; EXPLODE_EFFECT - dw DrainHPEffect ; DREAM_EATER_EFFECT - dw $0000 ; MIRROR_MOVE_EFFECT - dw StatModifierUpEffect ; ATTACK_UP1_EFFECT - dw StatModifierUpEffect ; DEFENSE_UP1_EFFECT - dw StatModifierUpEffect ; SPEED_UP1_EFFECT - dw StatModifierUpEffect ; SPECIAL_UP1_EFFECT - dw StatModifierUpEffect ; ACCURACY_UP1_EFFECT - dw StatModifierUpEffect ; EVASION_UP1_EFFECT - dw PayDayEffect ; PAY_DAY_EFFECT - dw $0000 ; SWIFT_EFFECT - dw StatModifierDownEffect ; ATTACK_DOWN1_EFFECT - dw StatModifierDownEffect ; DEFENSE_DOWN1_EFFECT - dw StatModifierDownEffect ; SPEED_DOWN1_EFFECT - dw StatModifierDownEffect ; SPECIAL_DOWN1_EFFECT - dw StatModifierDownEffect ; ACCURACY_DOWN1_EFFECT - dw StatModifierDownEffect ; EVASION_DOWN1_EFFECT - dw ConversionEffect ; CONVERSION_EFFECT - dw HazeEffect ; HAZE_EFFECT - dw BideEffect ; BIDE_EFFECT - dw ThrashPetalDanceEffect ; THRASH_PETAL_DANCE_EFFECT - dw SwitchAndTeleportEffect ; SWITCH_AND_TELEPORT_EFFECT - dw TwoToFiveAttacksEffect ; TWO_TO_FIVE_ATTACKS_EFFECT - dw TwoToFiveAttacksEffect ; unused effect - dw FlinchSideEffect ; FLINCH_SIDE_EFFECT1 - dw SleepEffect ; SLEEP_EFFECT - dw PoisonEffect ; POISON_SIDE_EFFECT2 - dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT2 - dw FreezeBurnParalyzeEffect ; unused effect - dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT2 - dw FlinchSideEffect ; FLINCH_SIDE_EFFECT2 - dw OneHitKOEffect ; OHKO_EFFECT - dw ChargeEffect ; CHARGE_EFFECT - dw $0000 ; SUPER_FANG_EFFECT - dw $0000 ; SPECIAL_DAMAGE_EFFECT - dw TrappingEffect ; TRAPPING_EFFECT - dw ChargeEffect ; FLY_EFFECT - dw TwoToFiveAttacksEffect ; ATTACK_TWICE_EFFECT - dw $0000 ; JUMP_KICK_EFFECT - dw MistEffect ; MIST_EFFECT - dw FocusEnergyEffect ; FOCUS_ENERGY_EFFECT - dw RecoilEffect ; RECOIL_EFFECT - dw ConfusionEffect ; CONFUSION_EFFECT - dw StatModifierUpEffect ; ATTACK_UP2_EFFECT - dw StatModifierUpEffect ; DEFENSE_UP2_EFFECT - dw StatModifierUpEffect ; SPEED_UP2_EFFECT - dw StatModifierUpEffect ; SPECIAL_UP2_EFFECT - dw StatModifierUpEffect ; ACCURACY_UP2_EFFECT - dw StatModifierUpEffect ; EVASION_UP2_EFFECT - dw HealEffect ; HEAL_EFFECT - dw TransformEffect ; TRANSFORM_EFFECT - dw StatModifierDownEffect ; ATTACK_DOWN2_EFFECT - dw StatModifierDownEffect ; DEFENSE_DOWN2_EFFECT - dw StatModifierDownEffect ; SPEED_DOWN2_EFFECT - dw StatModifierDownEffect ; SPECIAL_DOWN2_EFFECT - dw StatModifierDownEffect ; ACCURACY_DOWN2_EFFECT - dw StatModifierDownEffect ; EVASION_DOWN2_EFFECT - dw ReflectLightScreenEffect ; LIGHT_SCREEN_EFFECT - dw ReflectLightScreenEffect ; REFLECT_EFFECT - dw PoisonEffect ; POISON_EFFECT - dw ParalyzeEffect ; PARALYZE_EFFECT - dw StatModifierDownEffect ; ATTACK_DOWN_SIDE_EFFECT - dw StatModifierDownEffect ; DEFENSE_DOWN_SIDE_EFFECT - dw StatModifierDownEffect ; SPEED_DOWN_SIDE_EFFECT - dw StatModifierDownEffect ; SPECIAL_DOWN_SIDE_EFFECT - dw StatModifierDownEffect ; unused effect - dw StatModifierDownEffect ; unused effect - dw StatModifierDownEffect ; unused effect - dw StatModifierDownEffect ; unused effect - dw ConfusionSideEffect ; CONFUSION_SIDE_EFFECT - dw TwoToFiveAttacksEffect ; TWINEEDLE_EFFECT - dw $0000 ; unused effect - dw SubstituteEffect ; SUBSTITUTE_EFFECT - dw HyperBeamEffect ; HYPER_BEAM_EFFECT - dw RageEffect ; RAGE_EFFECT - dw MimicEffect ; MIMIC_EFFECT - dw $0000 ; METRONOME_EFFECT - dw LeechSeedEffect ; LEECH_SEED_EFFECT - dw SplashEffect ; SPLASH_EFFECT - dw DisableEffect ; DISABLE_EFFECT - -SleepEffect: - ld de, wEnemyMonStatus - ld bc, wEnemyBattleStatus2 - ld a, [H_WHOSETURN] - and a - jp z, .sleepEffect - ld de, wBattleMonStatus - ld bc, wPlayerBattleStatus2 - -.sleepEffect - ld a, [bc] - bit NEEDS_TO_RECHARGE, a ; does the target need to recharge? (hyper beam) - res NEEDS_TO_RECHARGE, a ; target no longer needs to recharge - ld [bc], a - jr nz, .setSleepCounter ; if the target had to recharge, all hit tests will be skipped - ; including the event where the target already has another status - ld a, [de] - ld b, a - and $7 - jr z, .notAlreadySleeping ; can't affect a mon that is already asleep - ld hl, AlreadyAsleepText - jp PrintText -.notAlreadySleeping - ld a, b - and a - jr nz, .didntAffect ; can't affect a mon that is already statused - push de - call MoveHitTest ; apply accuracy tests - pop de - ld a, [wMoveMissed] - and a - jr nz, .didntAffect -.setSleepCounter -; set target's sleep counter to a random number between 1 and 7 - call BattleRandom - and $7 - jr z, .setSleepCounter - ld [de], a - call PlayCurrentMoveAnimation2 - ld hl, FellAsleepText - jp PrintText -.didntAffect - jp PrintDidntAffectText - -FellAsleepText: - TX_FAR _FellAsleepText - db "@" - -AlreadyAsleepText: - TX_FAR _AlreadyAsleepText - db "@" - -PoisonEffect: - ld hl, wEnemyMonStatus - ld de, wPlayerMoveEffect - ld a, [H_WHOSETURN] - and a - jr z, .poisonEffect - ld hl, wBattleMonStatus - ld de, wEnemyMoveEffect -.poisonEffect - call CheckTargetSubstitute - jr nz, .noEffect ; can't poison a substitute target - ld a, [hli] - ld b, a - and a - jr nz, .noEffect ; miss if target is already statused - ld a, [hli] - cp POISON ; can't poison a poison-type target - jr z, .noEffect - ld a, [hld] - cp POISON ; can't poison a poison-type target - jr z, .noEffect - ld a, [de] - cp POISON_SIDE_EFFECT1 - ld b, $34 ; ~20% chance of poisoning - jr z, .sideEffectTest - cp POISON_SIDE_EFFECT2 - ld b, $67 ; ~40% chance of poisoning - jr z, .sideEffectTest - push hl - push de - call MoveHitTest ; apply accuracy tests - pop de - pop hl - ld a, [wMoveMissed] - and a - jr nz, .didntAffect - jr .inflictPoison -.sideEffectTest - call BattleRandom - cp b ; was side effect successful? - ret nc -.inflictPoison - dec hl - set 3, [hl] ; mon is now poisoned - push de - dec de - ld a, [H_WHOSETURN] - and a - ld b, ANIM_C7 - ld hl, wPlayerBattleStatus3 - ld a, [de] - ld de, wPlayerToxicCounter - jr nz, .ok - ld b, ANIM_A9 - ld hl, wEnemyBattleStatus3 - ld de, wEnemyToxicCounter -.ok - cp TOXIC - jr nz, .normalPoison ; done if move is not Toxic - set BADLY_POISONED, [hl] ; else set Toxic battstatus - xor a - ld [de], a - ld hl, BadlyPoisonedText - jr .continue -.normalPoison - ld hl, PoisonedText -.continue - pop de - ld a, [de] - cp POISON_EFFECT - jr z, .regularPoisonEffect - ld a, b - call PlayBattleAnimation2 - jp PrintText -.regularPoisonEffect - call PlayCurrentMoveAnimation2 - jp PrintText -.noEffect - ld a, [de] - cp POISON_EFFECT - ret nz -.didntAffect - ld c, 50 - call DelayFrames - jp PrintDidntAffectText - -PoisonedText: - TX_FAR _PoisonedText - db "@" - -BadlyPoisonedText: - TX_FAR _BadlyPoisonedText - db "@" - -DrainHPEffect: - jpab DrainHPEffect_ - -ExplodeEffect: - ld hl, wBattleMonHP - ld de, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .faintUser - ld hl, wEnemyMonHP - ld de, wEnemyBattleStatus2 -.faintUser - xor a - ld [hli], a ; set the mon's HP to 0 - ld [hli], a - inc hl - ld [hl], a ; set mon's status to 0 - ld a, [de] - res SEEDED, a ; clear mon's leech seed status - ld [de], a - ret - -FreezeBurnParalyzeEffect: - xor a - ld [wAnimationType], a - call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag] - ret nz ; return if they have a substitute, can't effect them - ld a, [H_WHOSETURN] - and a - jp nz, opponentAttacker - ld a, [wEnemyMonStatus] - and a - jp nz, CheckDefrost ; can't inflict status if opponent is already statused - ld a, [wPlayerMoveType] - ld b, a - ld a, [wEnemyMonType1] - cp b ; do target type 1 and move type match? - ret z ; return if they match (an ice move can't freeze an ice-type, body slam can't paralyze a normal-type, etc.) - ld a, [wEnemyMonType2] - cp b ; do target type 2 and move type match? - ret z ; return if they match - ld a, [wPlayerMoveEffect] - cp PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those - ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance - jr c, .next1 ; branch ahead if this is a 10% chance effect.. - ld b, $4d ; else use 0x4D/0x100 or 77/256 = 30.1%~ chance - sub $1e ; subtract $1E to map to equivalent 10% chance effects -.next1 - push af - call BattleRandom ; get random 8bit value for probability test - cp b - pop bc - ret nc ; do nothing if random value is >= 1A or 4D [no status applied] - ld a, b ; what type of effect is this? - cp BURN_SIDE_EFFECT1 - jr z, .burn - cp FREEZE_SIDE_EFFECT - jr z, .freeze -; .paralyze - ld a, 1 << PAR - ld [wEnemyMonStatus], a - call QuarterSpeedDueToParalysis ; quarter speed of affected mon - ld a, ANIM_A9 - call PlayBattleAnimation - jp PrintMayNotAttackText ; print paralysis text -.burn - ld a, 1 << BRN - ld [wEnemyMonStatus], a - call HalveAttackDueToBurn ; halve attack of affected mon - ld a, ANIM_A9 - call PlayBattleAnimation - ld hl, BurnedText - jp PrintText -.freeze - call ClearHyperBeam ; resets hyper beam (recharge) condition from target - ld a, 1 << FRZ - ld [wEnemyMonStatus], a - ld a, ANIM_A9 - call PlayBattleAnimation - ld hl, FrozenText - jp PrintText -opponentAttacker: - ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent - and a - jp nz, CheckDefrost - ld a, [wEnemyMoveType] - ld b, a - ld a, [wBattleMonType1] - cp b - ret z - ld a, [wBattleMonType2] - cp b - ret z - ld a, [wEnemyMoveEffect] - cp PARALYZE_SIDE_EFFECT1 + 1 - ld b, $1a - jr c, .next1 - ld b, $4d - sub $1e -.next1 - push af - call BattleRandom - cp b - pop bc - ret nc - ld a, b - cp BURN_SIDE_EFFECT1 - jr z, .burn - cp FREEZE_SIDE_EFFECT - jr z, .freeze - ld a, 1 << PAR - ld [wBattleMonStatus], a - call QuarterSpeedDueToParalysis - jp PrintMayNotAttackText -.burn - ld a, 1 << BRN - ld [wBattleMonStatus], a - call HalveAttackDueToBurn - ld hl, BurnedText - jp PrintText -.freeze -; hyper beam bits aren't reseted for opponent's side - ld a, 1 << FRZ - ld [wBattleMonStatus], a - ld hl, FrozenText - jp PrintText - -BurnedText: - TX_FAR _BurnedText - db "@" - -FrozenText: - TX_FAR _FrozenText - db "@" - -CheckDefrost: -; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target - and 1 << FRZ ; are they frozen? - ret z ; return if so - ld a, [H_WHOSETURN] - and a - jr nz, .opponent - ;player [attacker] - ld a, [wPlayerMoveType] - sub FIRE - ret nz ; return if type of move used isn't fire - ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] - ld hl, wEnemyMon1Status - ld a, [wEnemyMonPartyPos] - ld bc, wEnemyMon2 - wEnemyMon1 - call AddNTimes - xor a - ld [hl], a ; clear status in roster - ld hl, FireDefrostedText - jr .common -.opponent - ld a, [wEnemyMoveType] ; same as above with addresses swapped - sub FIRE - ret nz - ld [wBattleMonStatus], a - ld hl, wPartyMon1Status - ld a, [wPlayerMonNumber] - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - xor a - ld [hl], a - ld hl, FireDefrostedText -.common - jp PrintText - -FireDefrostedText: - TX_FAR _FireDefrostedText - db "@" - -StatModifierUpEffect: - ld hl, wPlayerMonStatMods - ld de, wPlayerMoveEffect - ld a, [H_WHOSETURN] - and a - jr z, .statModifierUpEffect - ld hl, wEnemyMonStatMods - ld de, wEnemyMoveEffect -.statModifierUpEffect - ld a, [de] - sub ATTACK_UP1_EFFECT - cp EVASION_UP1_EFFECT + $3 - ATTACK_UP1_EFFECT ; covers all +1 effects - jr c, .incrementStatMod - sub ATTACK_UP2_EFFECT - ATTACK_UP1_EFFECT ; map +2 effects to equivalent +1 effect -.incrementStatMod - ld c, a - ld b, $0 - add hl, bc - ld b, [hl] - inc b ; increment corresponding stat mod - ld a, $d - cp b ; can't raise stat past +6 ($d or 13) - jp c, PrintNothingHappenedText - ld a, [de] - cp ATTACK_UP1_EFFECT + $8 ; is it a +2 effect? - jr c, .ok - inc b ; if so, increment stat mod again - ld a, $d - cp b ; unless it's already +6 - jr nc, .ok - ld b, a -.ok - ld [hl], b - ld a, c - cp $4 - jr nc, UpdateStatDone ; jump if mod affected is evasion/accuracy - push hl - ld hl, wBattleMonAttack + 1 - ld de, wPlayerMonUnmodifiedAttack - ld a, [H_WHOSETURN] - and a - jr z, .pointToStats - ld hl, wEnemyMonAttack + 1 - ld de, wEnemyMonUnmodifiedAttack -.pointToStats - push bc - sla c - ld b, $0 - add hl, bc ; hl = modified stat - ld a, c - add e - ld e, a - jr nc, .checkIf999 - inc d ; de = unmodified (original) stat -.checkIf999 - pop bc - ld a, [hld] - sub 999 % $100 ; check if stat is already 999 - jr nz, .recalculateStat - ld a, [hl] - sbc 999 / $100 - jp z, RestoreOriginalStatModifier -.recalculateStat ; recalculate affected stat - ; paralysis and burn penalties, as well as badge boosts are ignored - push hl - push bc - ld hl, StatModifierRatios - dec b - sla b - ld c, b - ld b, $0 - add hl, bc - pop bc - xor a - ld [H_MULTIPLICAND], a - ld a, [de] - ld [H_MULTIPLICAND + 1], a - inc de - ld a, [de] - ld [H_MULTIPLICAND + 2], a - ld a, [hli] - ld [H_MULTIPLIER], a - call Multiply - ld a, [hl] - ld [H_DIVISOR], a - ld b, $4 - call Divide - pop hl -; cap at 999 - ld a, [H_PRODUCT + 3] - sub 999 % $100 - ld a, [H_PRODUCT + 2] - sbc 999 / $100 - jp c, UpdateStat - ld a, 999 / $100 - ld [H_MULTIPLICAND + 1], a - ld a, 999 % $100 - ld [H_MULTIPLICAND + 2], a - -UpdateStat: - ld a, [H_PRODUCT + 2] - ld [hli], a - ld a, [H_PRODUCT + 3] - ld [hl], a - pop hl -UpdateStatDone: - ld b, c - inc b - call PrintStatText - ld hl, wPlayerBattleStatus2 - ld de, wPlayerMoveNum - ld bc, wPlayerMonMinimized - ld a, [H_WHOSETURN] - and a - jr z, .asm_3f4e6 - ld hl, wEnemyBattleStatus2 - ld de, wEnemyMoveNum - ld bc, wEnemyMonMinimized -.asm_3f4e6 - ld a, [de] - cp MINIMIZE - jr nz, .asm_3f4f9 - ; if a substitute is up, slide off the substitute and show the mon pic before - ; playing the minimize animation - bit HAS_SUBSTITUTE_UP, [hl] - push af - push bc - ld hl, HideSubstituteShowMonAnim - ld b, BANK(HideSubstituteShowMonAnim) - push de - call nz, Bankswitch - pop de -.asm_3f4f9 - call PlayCurrentMoveAnimation - ld a, [de] - cp MINIMIZE - jr nz, .applyBadgeBoostsAndStatusPenalties - pop bc - ld a, $1 - ld [bc], a - ld hl, ReshowSubstituteAnim - ld b, BANK(ReshowSubstituteAnim) - pop af - call nz, Bankswitch -.applyBadgeBoostsAndStatusPenalties - ld a, [H_WHOSETURN] - and a - call z, ApplyBadgeStatBoosts ; whenever the player uses a stat-up move, badge boosts get reapplied again to every stat, - ; even to those not affected by the stat-up move (will be boosted further) - ld hl, MonsStatsRoseText - call PrintText - -; these shouldn't be here - call QuarterSpeedDueToParalysis ; apply speed penalty to the player whose turn is not, if it's paralyzed - jp HalveAttackDueToBurn ; apply attack penalty to the player whose turn is not, if it's burned - -RestoreOriginalStatModifier: - pop hl - dec [hl] - -PrintNothingHappenedText: - ld hl, NothingHappenedText - jp PrintText - -MonsStatsRoseText: - TX_FAR _MonsStatsRoseText - TX_ASM - ld hl, GreatlyRoseText - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveEffect] - jr z, .playerTurn - ld a, [wEnemyMoveEffect] -.playerTurn - cp ATTACK_DOWN1_EFFECT - ret nc - ld hl, RoseText - ret - -GreatlyRoseText: - TX_DELAY - TX_FAR _GreatlyRoseText -; fallthrough -RoseText: - TX_FAR _RoseText - db "@" - -StatModifierDownEffect: - ld hl, wEnemyMonStatMods - ld de, wPlayerMoveEffect - ld bc, wEnemyBattleStatus1 - ld a, [H_WHOSETURN] - and a - jr z, .statModifierDownEffect - ld hl, wPlayerMonStatMods - ld de, wEnemyMoveEffect - ld bc, wPlayerBattleStatus1 - ld a, [wLinkState] - cp LINK_STATE_BATTLING - jr z, .statModifierDownEffect - call BattleRandom - cp $40 ; 1/4 chance to miss by in regular battle - jp c, MoveMissed -.statModifierDownEffect - call CheckTargetSubstitute ; can't hit through substitute - jp nz, MoveMissed - ld a, [de] - cp ATTACK_DOWN_SIDE_EFFECT - jr c, .nonSideEffect - call BattleRandom - cp $55 ; 85/256 chance for side effects - jp nc, CantLowerAnymore - ld a, [de] - sub ATTACK_DOWN_SIDE_EFFECT ; map each stat to 0-3 - jr .decrementStatMod -.nonSideEffect ; non-side effects only - push hl - push de - push bc - call MoveHitTest ; apply accuracy tests - pop bc - pop de - pop hl - ld a, [wMoveMissed] - and a - jp nz, MoveMissed - ld a, [bc] - bit INVULNERABLE, a ; fly/dig - jp nz, MoveMissed - ld a, [de] - sub ATTACK_DOWN1_EFFECT - cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers all -1 effects - jr c, .decrementStatMod - sub ATTACK_DOWN2_EFFECT - ATTACK_DOWN1_EFFECT ; map -2 effects to corresponding -1 effect -.decrementStatMod - ld c, a - ld b, $0 - add hl, bc - ld b, [hl] - dec b ; dec corresponding stat mod - jp z, CantLowerAnymore ; if stat mod is 1 (-6), can't lower anymore - ld a, [de] - cp ATTACK_DOWN2_EFFECT - $16 ; $24 - jr c, .ok - cp EVASION_DOWN2_EFFECT + $5 ; $44 - jr nc, .ok - dec b ; stat down 2 effects only (dec mod again) - jr nz, .ok - inc b ; increment mod to 1 (-6) if it would become 0 (-7) -.ok - ld [hl], b ; save modified mod - ld a, c - cp $4 - jr nc, UpdateLoweredStatDone ; jump for evasion/accuracy - push hl - push de - ld hl, wEnemyMonAttack + 1 - ld de, wEnemyMonUnmodifiedAttack - ld a, [H_WHOSETURN] - and a - jr z, .pointToStat - ld hl, wBattleMonAttack + 1 - ld de, wPlayerMonUnmodifiedAttack -.pointToStat - push bc - sla c - ld b, $0 - add hl, bc ; hl = modified stat - ld a, c - add e - ld e, a - jr nc, .noCarry - inc d ; de = unmodified stat -.noCarry - pop bc - ld a, [hld] - sub $1 ; can't lower stat below 1 (-6) - jr nz, .recalculateStat - ld a, [hl] - and a - jp z, CantLowerAnymore_Pop -.recalculateStat -; recalculate affected stat -; paralysis and burn penalties, as well as badge boosts are ignored - push hl - push bc - ld hl, StatModifierRatios - dec b - sla b - ld c, b - ld b, $0 - add hl, bc - pop bc - xor a - ld [H_MULTIPLICAND], a - ld a, [de] - ld [H_MULTIPLICAND + 1], a - inc de - ld a, [de] - ld [H_MULTIPLICAND + 2], a - ld a, [hli] - ld [H_MULTIPLIER], a - call Multiply - ld a, [hl] - ld [H_DIVISOR], a - ld b, $4 - call Divide - pop hl - ld a, [H_PRODUCT + 3] - ld b, a - ld a, [H_PRODUCT + 2] - or b - jp nz, UpdateLoweredStat - ld [H_MULTIPLICAND + 1], a - ld a, $1 - ld [H_MULTIPLICAND + 2], a - -UpdateLoweredStat: - ld a, [H_PRODUCT + 2] - ld [hli], a - ld a, [H_PRODUCT + 3] - ld [hl], a - pop de - pop hl -UpdateLoweredStatDone: - ld b, c - inc b - push de - call PrintStatText - pop de - ld a, [de] - cp $44 - jr nc, .ApplyBadgeBoostsAndStatusPenalties - call PlayCurrentMoveAnimation2 -.ApplyBadgeBoostsAndStatusPenalties - ld a, [H_WHOSETURN] - and a - call nz, ApplyBadgeStatBoosts ; whenever the player uses a stat-down move, badge boosts get reapplied again to every stat, - ; even to those not affected by the stat-up move (will be boosted further) - ld hl, MonsStatsFellText - call PrintText - -; These where probably added given that a stat-down move affecting speed or attack will override -; the stat penalties from paralysis and burn respectively. -; But they are always called regardless of the stat affected by the stat-down move. - call QuarterSpeedDueToParalysis - jp HalveAttackDueToBurn - -CantLowerAnymore_Pop: - pop de - pop hl - inc [hl] - -CantLowerAnymore: - ld a, [de] - cp ATTACK_DOWN_SIDE_EFFECT - ret nc - ld hl, NothingHappenedText - jp PrintText - -MoveMissed: - ld a, [de] - cp $44 - ret nc - jp ConditionalPrintButItFailed - -MonsStatsFellText: - TX_FAR _MonsStatsFellText - TX_ASM - ld hl, FellText - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveEffect] - jr z, .playerTurn - ld a, [wEnemyMoveEffect] -.playerTurn -; check if the move's effect decreases a stat by 2 - cp BIDE_EFFECT - ret c - cp ATTACK_DOWN_SIDE_EFFECT - ret nc - ld hl, GreatlyFellText - ret - -GreatlyFellText: - TX_DELAY - TX_FAR _GreatlyFellText -; fallthrough -FellText: - TX_FAR _FellText - db "@" - -PrintStatText: - ld hl, StatsTextStrings - ld c, "@" -.findStatName_outer - dec b - jr z, .foundStatName -.findStatName_inner - ld a, [hli] - cp c - jr z, .findStatName_outer - jr .findStatName_inner -.foundStatName - ld de, wcf4b - ld bc, $a - jp CopyData - -StatsTextStrings: - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" - db "ACCURACY@" - db "EVADE@" - -StatModifierRatios: -; first byte is numerator, second byte is denominator - db 25, 100 ; 0.25 - db 28, 100 ; 0.28 - db 33, 100 ; 0.33 - db 40, 100 ; 0.40 - db 50, 100 ; 0.50 - db 66, 100 ; 0.66 - db 1, 1 ; 1.00 - db 15, 10 ; 1.50 - db 2, 1 ; 2.00 - db 25, 10 ; 2.50 - db 3, 1 ; 3.00 - db 35, 10 ; 3.50 - db 4, 1 ; 4.00 - -BideEffect: - ld hl, wPlayerBattleStatus1 - ld de, wPlayerBideAccumulatedDamage - ld bc, wPlayerNumAttacksLeft - ld a, [H_WHOSETURN] - and a - jr z, .bideEffect - ld hl, wEnemyBattleStatus1 - ld de, wEnemyBideAccumulatedDamage - ld bc, wEnemyNumAttacksLeft -.bideEffect - set STORING_ENERGY, [hl] ; mon is now using bide - xor a - ld [de], a - inc de - ld [de], a - ld [wPlayerMoveEffect], a - ld [wEnemyMoveEffect], a - call BattleRandom - and $1 - inc a - inc a - ld [bc], a ; set Bide counter to 2 or 3 at random - ld a, [H_WHOSETURN] - add XSTATITEM_ANIM - jp PlayBattleAnimation2 - -ThrashPetalDanceEffect: - ld hl, wPlayerBattleStatus1 - ld de, wPlayerNumAttacksLeft - ld a, [H_WHOSETURN] - and a - jr z, .thrashPetalDanceEffect - ld hl, wEnemyBattleStatus1 - ld de, wEnemyNumAttacksLeft -.thrashPetalDanceEffect - set THRASHING_ABOUT, [hl] ; mon is now using thrash/petal dance - call BattleRandom - and $1 - inc a - inc a - ld [de], a ; set thrash/petal dance counter to 2 or 3 at random - ld a, [H_WHOSETURN] - add ANIM_B0 - jp PlayBattleAnimation2 - -SwitchAndTeleportEffect: - ld a, [H_WHOSETURN] - and a - jr nz, .handleEnemy - ld a, [wIsInBattle] - dec a - jr nz, .notWildBattle1 - ld a, [wCurEnemyLVL] - ld b, a - ld a, [wBattleMonLevel] - cp b ; is the player's level greater than the enemy's level? - jr nc, .playerMoveWasSuccessful ; if so, teleport will always succeed - add b - ld c, a - inc c ; c = sum of player level and enemy level -.rejectionSampleLoop1 - call BattleRandom - cp c ; get a random number between 0 and c - jr nc, .rejectionSampleLoop1 - srl b - srl b ; b = enemyLevel / 4 - cp b ; is rand[0, playerLevel + enemyLevel) >= (enemyLevel / 4)? - jr nc, .playerMoveWasSuccessful ; if so, allow teleporting - ld c, 50 - call DelayFrames - ld a, [wPlayerMoveNum] - cp TELEPORT - jp nz, PrintDidntAffectText - jp PrintButItFailedText_ -.playerMoveWasSuccessful - call ReadPlayerMonCurHPAndStatus - xor a - ld [wAnimationType], a - inc a - ld [wEscapedFromBattle], a - ld a, [wPlayerMoveNum] - jr .playAnimAndPrintText -.notWildBattle1 - ld c, 50 - call DelayFrames - ld hl, IsUnaffectedText - ld a, [wPlayerMoveNum] - cp TELEPORT - jp nz, PrintText - jp PrintButItFailedText_ -.handleEnemy - ld a, [wIsInBattle] - dec a - jr nz, .notWildBattle2 - ld a, [wBattleMonLevel] - ld b, a - ld a, [wCurEnemyLVL] - cp b - jr nc, .enemyMoveWasSuccessful - add b - ld c, a - inc c -.rejectionSampleLoop2 - call BattleRandom - cp c - jr nc, .rejectionSampleLoop2 - srl b - srl b - cp b - jr nc, .enemyMoveWasSuccessful - ld c, 50 - call DelayFrames - ld a, [wEnemyMoveNum] - cp TELEPORT - jp nz, PrintDidntAffectText - jp PrintButItFailedText_ -.enemyMoveWasSuccessful - call ReadPlayerMonCurHPAndStatus - xor a - ld [wAnimationType], a - inc a - ld [wEscapedFromBattle], a - ld a, [wEnemyMoveNum] - jr .playAnimAndPrintText -.notWildBattle2 - ld c, 50 - call DelayFrames - ld hl, IsUnaffectedText - ld a, [wEnemyMoveNum] - cp TELEPORT - jp nz, PrintText - jp ConditionalPrintButItFailed -.playAnimAndPrintText - push af - call PlayBattleAnimation - ld c, 20 - call DelayFrames - pop af - ld hl, RanFromBattleText - cp TELEPORT - jr z, .printText - ld hl, RanAwayScaredText - cp ROAR - jr z, .printText - ld hl, WasBlownAwayText -.printText - jp PrintText - -RanFromBattleText: - TX_FAR _RanFromBattleText - db "@" - -RanAwayScaredText: - TX_FAR _RanAwayScaredText - db "@" - -WasBlownAwayText: - TX_FAR _WasBlownAwayText - db "@" - -TwoToFiveAttacksEffect: - ld hl, wPlayerBattleStatus1 - ld de, wPlayerNumAttacksLeft - ld bc, wPlayerNumHits - ld a, [H_WHOSETURN] - and a - jr z, .twoToFiveAttacksEffect - ld hl, wEnemyBattleStatus1 - ld de, wEnemyNumAttacksLeft - ld bc, wEnemyNumHits -.twoToFiveAttacksEffect - bit ATTACKING_MULTIPLE_TIMES, [hl] ; is mon attacking multiple times? - ret nz - set ATTACKING_MULTIPLE_TIMES, [hl] ; mon is now attacking multiple times - ld hl, wPlayerMoveEffect - ld a, [H_WHOSETURN] - and a - jr z, .setNumberOfHits - ld hl, wEnemyMoveEffect -.setNumberOfHits - ld a, [hl] - cp TWINEEDLE_EFFECT - jr z, .twineedle - cp ATTACK_TWICE_EFFECT - ld a, $2 ; number of hits it's always 2 for ATTACK_TWICE_EFFECT - jr z, .saveNumberOfHits -; for TWO_TO_FIVE_ATTACKS_EFFECT 3/8 chance for 2 and 3 hits, and 1/8 chance for 4 and 5 hits - call BattleRandom - and $3 - cp $2 - jr c, .gotNumHits -; if the number of hits was greater than 2, re-roll again for a lower chance - call BattleRandom - and $3 -.gotNumHits - inc a - inc a -.saveNumberOfHits - ld [de], a - ld [bc], a - ret -.twineedle - ld a, POISON_SIDE_EFFECT1 - ld [hl], a ; set Twineedle's effect to poison effect - jr .saveNumberOfHits - -FlinchSideEffect: - call CheckTargetSubstitute - ret nz - ld hl, wEnemyBattleStatus1 - ld de, wPlayerMoveEffect - ld a, [H_WHOSETURN] - and a - jr z, .flinchSideEffect - ld hl, wPlayerBattleStatus1 - ld de, wEnemyMoveEffect -.flinchSideEffect - ld a, [de] - cp FLINCH_SIDE_EFFECT1 - ld b, $1a ; ~10% chance of flinch - jr z, .gotEffectChance - ld b, $4d ; ~30% chance of flinch -.gotEffectChance - call BattleRandom - cp b - ret nc - set FLINCHED, [hl] ; set mon's status to flinching - call ClearHyperBeam - ret - -OneHitKOEffect: - jpab OneHitKOEffect_ - -ChargeEffect: - ld hl, wPlayerBattleStatus1 - ld de, wPlayerMoveEffect - ld a, [H_WHOSETURN] - and a - ld b, XSTATITEM_ANIM - jr z, .chargeEffect - ld hl, wEnemyBattleStatus1 - ld de, wEnemyMoveEffect - ld b, ANIM_AF -.chargeEffect - set CHARGING_UP, [hl] - ld a, [de] - dec de ; de contains enemy or player MOVENUM - cp FLY_EFFECT - jr nz, .notFly - set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) - ld b, TELEPORT ; load Teleport's animation -.notFly - ld a, [de] - cp DIG - jr nz, .notDigOrFly - set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) - ld b, ANIM_C0 -.notDigOrFly - xor a - ld [wAnimationType], a - ld a, b - call PlayBattleAnimation - ld a, [de] - ld [wChargeMoveNum], a - ld hl, ChargeMoveEffectText - jp PrintText - -ChargeMoveEffectText: - TX_FAR _ChargeMoveEffectText - TX_ASM - ld a, [wChargeMoveNum] - cp RAZOR_WIND - ld hl, MadeWhirlwindText - jr z, .gotText - cp SOLARBEAM - ld hl, TookInSunlightText - jr z, .gotText - cp SKULL_BASH - ld hl, LoweredItsHeadText - jr z, .gotText - cp SKY_ATTACK - ld hl, SkyAttackGlowingText - jr z, .gotText - cp FLY - ld hl, FlewUpHighText - jr z, .gotText - cp DIG - ld hl, DugAHoleText -.gotText - ret - -MadeWhirlwindText: - TX_FAR _MadeWhirlwindText - db "@" - -TookInSunlightText: - TX_FAR _TookInSunlightText - db "@" - -LoweredItsHeadText: - TX_FAR _LoweredItsHeadText - db "@" - -SkyAttackGlowingText: - TX_FAR _SkyAttackGlowingText - db "@" - -FlewUpHighText: - TX_FAR _FlewUpHighText - db "@" - -DugAHoleText: - TX_FAR _DugAHoleText - db "@" - -TrappingEffect: - ld hl, wPlayerBattleStatus1 - ld de, wPlayerNumAttacksLeft - ld a, [H_WHOSETURN] - and a - jr z, .trappingEffect - ld hl, wEnemyBattleStatus1 - ld de, wEnemyNumAttacksLeft -.trappingEffect - bit USING_TRAPPING_MOVE, [hl] - ret nz - call ClearHyperBeam ; since this effect is called before testing whether the move will hit, - ; the target won't need to recharge even if the trapping move missed - set USING_TRAPPING_MOVE, [hl] ; mon is now using a trapping move - call BattleRandom ; 3/8 chance for 2 and 3 attacks, and 1/8 chance for 4 and 5 attacks - and $3 - cp $2 - jr c, .setTrappingCounter - call BattleRandom - and $3 -.setTrappingCounter - inc a - ld [de], a - ret - -MistEffect: - jpab MistEffect_ - -FocusEnergyEffect: - jpab FocusEnergyEffect_ - -RecoilEffect: - jpab RecoilEffect_ - -ConfusionSideEffect: - call BattleRandom - cp $19 ; ~10% chance - ret nc - jr ConfusionSideEffectSuccess - -ConfusionEffect: - call CheckTargetSubstitute - jr nz, ConfusionEffectFailed - call MoveHitTest - ld a, [wMoveMissed] - and a - jr nz, ConfusionEffectFailed - -ConfusionSideEffectSuccess: - ld a, [H_WHOSETURN] - and a - ld hl, wEnemyBattleStatus1 - ld bc, wEnemyConfusedCounter - ld a, [wPlayerMoveEffect] - jr z, .confuseTarget - ld hl, wPlayerBattleStatus1 - ld bc, wPlayerConfusedCounter - ld a, [wEnemyMoveEffect] -.confuseTarget - bit CONFUSED, [hl] ; is mon confused? - jr nz, ConfusionEffectFailed - set CONFUSED, [hl] ; mon is now confused - push af - call BattleRandom - and $3 - inc a - inc a - ld [bc], a ; confusion status will last 2-5 turns - pop af - cp CONFUSION_SIDE_EFFECT - call nz, PlayCurrentMoveAnimation2 - ld hl, BecameConfusedText - jp PrintText - -BecameConfusedText: - TX_FAR _BecameConfusedText - db "@" - -ConfusionEffectFailed: - cp CONFUSION_SIDE_EFFECT - ret z - ld c, 50 - call DelayFrames - jp ConditionalPrintButItFailed - -ParalyzeEffect: - jpab ParalyzeEffect_ - -SubstituteEffect: - jpab SubstituteEffect_ - -HyperBeamEffect: - ld hl, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .hyperBeamEffect - ld hl, wEnemyBattleStatus2 -.hyperBeamEffect - set NEEDS_TO_RECHARGE, [hl] ; mon now needs to recharge - ret - -ClearHyperBeam: - push hl - ld hl, wEnemyBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .playerTurn - ld hl, wPlayerBattleStatus2 -.playerTurn - res NEEDS_TO_RECHARGE, [hl] ; mon no longer needs to recharge - pop hl - ret - -RageEffect: - ld hl, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .player - ld hl, wEnemyBattleStatus2 -.player - set USING_RAGE, [hl] ; mon is now in "rage" mode - ret - -MimicEffect: - ld c, 50 - call DelayFrames - call MoveHitTest - ld a, [wMoveMissed] - and a - jr nz, .mimicMissed - ld a, [H_WHOSETURN] - and a - ld hl, wBattleMonMoves - ld a, [wPlayerBattleStatus1] - jr nz, .enemyTurn - ld a, [wLinkState] - cp LINK_STATE_BATTLING - jr nz, .letPlayerChooseMove - ld hl, wEnemyMonMoves - ld a, [wEnemyBattleStatus1] -.enemyTurn - bit INVULNERABLE, a - jr nz, .mimicMissed -.getRandomMove - push hl - call BattleRandom - and $3 - ld c, a - ld b, $0 - add hl, bc - ld a, [hl] - pop hl - and a - jr z, .getRandomMove - ld d, a - ld a, [H_WHOSETURN] - and a - ld hl, wBattleMonMoves - ld a, [wPlayerMoveListIndex] - jr z, .playerTurn - ld hl, wEnemyMonMoves - ld a, [wEnemyMoveListIndex] - jr .playerTurn -.letPlayerChooseMove - ld a, [wEnemyBattleStatus1] - bit INVULNERABLE, a - jr nz, .mimicMissed - ld a, [wCurrentMenuItem] - push af - ld a, $1 - ld [wMoveMenuType], a - call MoveSelectionMenu - call LoadScreenTilesFromBuffer1 - ld hl, wEnemyMonMoves - ld a, [wCurrentMenuItem] - ld c, a - ld b, $0 - add hl, bc - ld d, [hl] - pop af - ld hl, wBattleMonMoves -.playerTurn - ld c, a - ld b, $0 - add hl, bc - ld a, d - ld [hl], a - ld [wd11e], a - call GetMoveName - call PlayCurrentMoveAnimation - ld hl, MimicLearnedMoveText - jp PrintText -.mimicMissed - jp PrintButItFailedText_ - -MimicLearnedMoveText: - TX_FAR _MimicLearnedMoveText - db "@" - -LeechSeedEffect: - jpab LeechSeedEffect_ - -SplashEffect: - call PlayCurrentMoveAnimation - jp PrintNoEffectText - -DisableEffect: - call MoveHitTest - ld a, [wMoveMissed] - and a - jr nz, .moveMissed - ld de, wEnemyDisabledMove - ld hl, wEnemyMonMoves - ld a, [H_WHOSETURN] - and a - jr z, .disableEffect - ld de, wPlayerDisabledMove - ld hl, wBattleMonMoves -.disableEffect -; no effect if target already has a move disabled - ld a, [de] - and a - jr nz, .moveMissed -.pickMoveToDisable - push hl - call BattleRandom - and $3 - ld c, a - ld b, $0 - add hl, bc - ld a, [hl] - pop hl - and a - jr z, .pickMoveToDisable ; loop until a non-00 move slot is found - ld [wd11e], a ; store move number - push hl - ld a, [H_WHOSETURN] - and a - ld hl, wBattleMonPP - jr nz, .enemyTurn - ld a, [wLinkState] - cp LINK_STATE_BATTLING - pop hl ; wEnemyMonMoves - jr nz, .playerTurnNotLinkBattle -; .playerTurnLinkBattle - push hl - ld hl, wEnemyMonPP -.enemyTurn - push hl - ld a, [hli] - or [hl] - inc hl - or [hl] - inc hl - or [hl] - and $3f - pop hl ; wBattleMonPP or wEnemyMonPP - jr z, .moveMissedPopHL ; nothing to do if all moves have no PP left - add hl, bc - ld a, [hl] - pop hl - and a - jr z, .pickMoveToDisable ; pick another move if this one had 0 PP -.playerTurnNotLinkBattle -; non-link battle enemies have unlimited PP so the previous checks aren't needed - call BattleRandom - and $7 - inc a ; 1-8 turns disabled - inc c ; move 1-4 will be disabled - swap c - add c ; map disabled move to high nibble of wEnemyDisabledMove / wPlayerDisabledMove - ld [de], a - call PlayCurrentMoveAnimation2 - ld hl, wPlayerDisabledMoveNumber - ld a, [H_WHOSETURN] - and a - jr nz, .printDisableText - inc hl ; wEnemyDisabledMoveNumber -.printDisableText - ld a, [wd11e] ; move number - ld [hl], a - call GetMoveName - ld hl, MoveWasDisabledText - jp PrintText -.moveMissedPopHL - pop hl -.moveMissed - jp PrintButItFailedText_ - -MoveWasDisabledText: - TX_FAR _MoveWasDisabledText - db "@" - -PayDayEffect: - jpab PayDayEffect_ - -ConversionEffect: - jpab ConversionEffect_ - -HazeEffect: - jpab HazeEffect_ - -HealEffect: - jpab HealEffect_ - -TransformEffect: - jpab TransformEffect_ - -ReflectLightScreenEffect: - jpab ReflectLightScreenEffect_ - -NothingHappenedText: - TX_FAR _NothingHappenedText - db "@" - -PrintNoEffectText: - ld hl, NoEffectText - jp PrintText - -NoEffectText: - TX_FAR _NoEffectText - db "@" - -ConditionalPrintButItFailed: - ld a, [wMoveDidntMiss] - and a - ret nz ; return if the side effect failed, yet the attack was successful - -PrintButItFailedText_: - ld hl, ButItFailedText - jp PrintText - -ButItFailedText: - TX_FAR _ButItFailedText - db "@" - -PrintDidntAffectText: - ld hl, DidntAffectText - jp PrintText - -DidntAffectText: - TX_FAR _DidntAffectText - db "@" - -IsUnaffectedText: - TX_FAR _IsUnaffectedText - db "@" - -PrintMayNotAttackText: - ld hl, ParalyzedMayNotAttackText - jp PrintText - -ParalyzedMayNotAttackText: - TX_FAR _ParalyzedMayNotAttackText - db "@" - -CheckTargetSubstitute: - push hl - ld hl, wEnemyBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .next1 - ld hl, wPlayerBattleStatus2 -.next1 - bit HAS_SUBSTITUTE_UP, [hl] - pop hl - ret - -PlayCurrentMoveAnimation2: -; animation at MOVENUM will be played unless MOVENUM is 0 -; plays wAnimationType 3 or 6 - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveNum] - jr z, .notEnemyTurn - ld a, [wEnemyMoveNum] -.notEnemyTurn - and a - ret z - -PlayBattleAnimation2: -; play animation ID at a and animation type 6 or 3 - ld [wAnimationID], a - ld a, [H_WHOSETURN] - and a - ld a, $6 - jr z, .storeAnimationType - ld a, $3 -.storeAnimationType - ld [wAnimationType], a - jp PlayBattleAnimationGotID - -PlayCurrentMoveAnimation: -; animation at MOVENUM will be played unless MOVENUM is 0 -; resets wAnimationType - xor a - ld [wAnimationType], a - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveNum] - jr z, .notEnemyTurn - ld a, [wEnemyMoveNum] -.notEnemyTurn - and a - ret z - -PlayBattleAnimation: -; play animation ID at a and predefined animation type - ld [wAnimationID], a - -PlayBattleAnimationGotID: -; play animation at wAnimationID - push hl - push de - push bc - predef MoveAnimation - pop bc - pop de - pop hl - ret diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index b7c428f7..441bbb81 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -37,7 +37,7 @@ DecrementPP: ld a, [wPlayerMoveListIndex] ; which move (0, 1, 2, 3) did we use? ld c, a ld b, 0 - add hl ,bc ; calculate the address in memory of the PP we need to decrement + add hl, bc ; calculate the address in memory of the PP we need to decrement ; based on the move chosen. dec [hl] ; Decrement PP ret diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm index 1bf14460..b23695cf 100644 --- a/engine/battle/display_effectiveness.asm +++ b/engine/battle/display_effectiveness.asm @@ -10,9 +10,9 @@ DisplayEffectiveness: jp PrintText SuperEffectiveText: - TX_FAR _SuperEffectiveText - db "@" + text_far _SuperEffectiveText + text_end NotVeryEffectiveText: - TX_FAR _NotVeryEffectiveText - db "@" + text_far _NotVeryEffectiveText + text_end diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 323dd167..097a0fcc 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -12,7 +12,7 @@ DrawEnemyPokeballs: LoadPartyPokeballGfx: ld de, PokeballTileGraphics - ld hl, vSprites + $310 + ld hl, vSprites tile $31 lb bc, BANK(PokeballTileGraphics), (PokeballTileGraphicsEnd - PokeballTileGraphics) / $10 jp CopyVideoData @@ -121,7 +121,7 @@ PlacePlayerHUDTiles: ld de, wHUDGraphicsTiles ld bc, $3 call CopyData - coord hl, 18, 10 + hlcoord 18, 10 ld de, -1 jr PlaceHUDTiles @@ -136,7 +136,7 @@ PlaceEnemyHUDTiles: ld de, wHUDGraphicsTiles ld bc, $3 call CopyData - coord hl, 1, 2 + hlcoord 1, 2 ld de, $1 jr PlaceHUDTiles @@ -188,5 +188,5 @@ SetupPlayerAndEnemyPokeballs: ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon) PokeballTileGraphics:: - INCBIN "gfx/pokeball.2bpp" + INCBIN "gfx/battle/balls.2bpp" PokeballTileGraphicsEnd: diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm new file mode 100644 index 00000000..d9690f27 --- /dev/null +++ b/engine/battle/effects.asm @@ -0,0 +1,1497 @@ +JumpMoveEffect: + call _JumpMoveEffect + ld b, $1 + ret + +_JumpMoveEffect: + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveEffect] + jr z, .next1 + ld a, [wEnemyMoveEffect] +.next1 + dec a ; subtract 1, there is no special effect for 00 + add a ; x2, 16bit pointers + ld hl, MoveEffectPointerTable + ld b, 0 + ld c, a + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + jp hl ; jump to special effect handler + +INCLUDE "data/moves/effects_pointers.asm" + +SleepEffect: + ld de, wEnemyMonStatus + ld bc, wEnemyBattleStatus2 + ldh a, [hWhoseTurn] + and a + jp z, .sleepEffect + ld de, wBattleMonStatus + ld bc, wPlayerBattleStatus2 + +.sleepEffect + ld a, [bc] + bit NEEDS_TO_RECHARGE, a ; does the target need to recharge? (hyper beam) + res NEEDS_TO_RECHARGE, a ; target no longer needs to recharge + ld [bc], a + jr nz, .setSleepCounter ; if the target had to recharge, all hit tests will be skipped + ; including the event where the target already has another status + ld a, [de] + ld b, a + and $7 + jr z, .notAlreadySleeping ; can't affect a mon that is already asleep + ld hl, AlreadyAsleepText + jp PrintText +.notAlreadySleeping + ld a, b + and a + jr nz, .didntAffect ; can't affect a mon that is already statused + push de + call MoveHitTest ; apply accuracy tests + pop de + ld a, [wMoveMissed] + and a + jr nz, .didntAffect +.setSleepCounter +; set target's sleep counter to a random number between 1 and 7 + call BattleRandom + and $7 + jr z, .setSleepCounter + ld [de], a + call PlayCurrentMoveAnimation2 + ld hl, FellAsleepText + jp PrintText +.didntAffect + jp PrintDidntAffectText + +FellAsleepText: + text_far _FellAsleepText + text_end + +AlreadyAsleepText: + text_far _AlreadyAsleepText + text_end + +PoisonEffect: + ld hl, wEnemyMonStatus + ld de, wPlayerMoveEffect + ldh a, [hWhoseTurn] + and a + jr z, .poisonEffect + ld hl, wBattleMonStatus + ld de, wEnemyMoveEffect +.poisonEffect + call CheckTargetSubstitute + jr nz, .noEffect ; can't poison a substitute target + ld a, [hli] + ld b, a + and a + jr nz, .noEffect ; miss if target is already statused + ld a, [hli] + cp POISON ; can't poison a poison-type target + jr z, .noEffect + ld a, [hld] + cp POISON ; can't poison a poison-type target + jr z, .noEffect + ld a, [de] + cp POISON_SIDE_EFFECT1 + ld b, $34 ; ~20% chance of poisoning + jr z, .sideEffectTest + cp POISON_SIDE_EFFECT2 + ld b, $67 ; ~40% chance of poisoning + jr z, .sideEffectTest + push hl + push de + call MoveHitTest ; apply accuracy tests + pop de + pop hl + ld a, [wMoveMissed] + and a + jr nz, .didntAffect + jr .inflictPoison +.sideEffectTest + call BattleRandom + cp b ; was side effect successful? + ret nc +.inflictPoison + dec hl + set 3, [hl] ; mon is now poisoned + push de + dec de + ldh a, [hWhoseTurn] + and a + ld b, ANIM_C7 + ld hl, wPlayerBattleStatus3 + ld a, [de] + ld de, wPlayerToxicCounter + jr nz, .ok + ld b, ANIM_A9 + ld hl, wEnemyBattleStatus3 + ld de, wEnemyToxicCounter +.ok + cp TOXIC + jr nz, .normalPoison ; done if move is not Toxic + set BADLY_POISONED, [hl] ; else set Toxic battstatus + xor a + ld [de], a + ld hl, BadlyPoisonedText + jr .continue +.normalPoison + ld hl, PoisonedText +.continue + pop de + ld a, [de] + cp POISON_EFFECT + jr z, .regularPoisonEffect + ld a, b + call PlayBattleAnimation2 + jp PrintText +.regularPoisonEffect + call PlayCurrentMoveAnimation2 + jp PrintText +.noEffect + ld a, [de] + cp POISON_EFFECT + ret nz +.didntAffect + ld c, 50 + call DelayFrames + jp PrintDidntAffectText + +PoisonedText: + text_far _PoisonedText + text_end + +BadlyPoisonedText: + text_far _BadlyPoisonedText + text_end + +DrainHPEffect: + jpfar DrainHPEffect_ + +ExplodeEffect: + ld hl, wBattleMonHP + ld de, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .faintUser + ld hl, wEnemyMonHP + ld de, wEnemyBattleStatus2 +.faintUser + xor a + ld [hli], a ; set the mon's HP to 0 + ld [hli], a + inc hl + ld [hl], a ; set mon's status to 0 + ld a, [de] + res SEEDED, a ; clear mon's leech seed status + ld [de], a + ret + +FreezeBurnParalyzeEffect: + xor a + ld [wAnimationType], a + call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag] + ret nz ; return if they have a substitute, can't effect them + ldh a, [hWhoseTurn] + and a + jp nz, .opponentAttacker + ld a, [wEnemyMonStatus] + and a + jp nz, CheckDefrost ; can't inflict status if opponent is already statused + ld a, [wPlayerMoveType] + ld b, a + ld a, [wEnemyMonType1] + cp b ; do target type 1 and move type match? + ret z ; return if they match (an ice move can't freeze an ice-type, body slam can't paralyze a normal-type, etc.) + ld a, [wEnemyMonType2] + cp b ; do target type 2 and move type match? + ret z ; return if they match + ld a, [wPlayerMoveEffect] + cp PARALYZE_SIDE_EFFECT1 + 1 + ld b, 10 percent + 1 + jr c, .regular_effectiveness +; extra effectiveness + ld b, 30 percent + 1 + sub BURN_SIDE_EFFECT2 - BURN_SIDE_EFFECT1 ; treat extra effective as regular from now on +.regular_effectiveness + push af + call BattleRandom ; get random 8bit value for probability test + cp b + pop bc + ret nc ; do nothing if random value is >= 1A or 4D [no status applied] + ld a, b ; what type of effect is this? + cp BURN_SIDE_EFFECT1 + jr z, .burn1 + cp FREEZE_SIDE_EFFECT + jr z, .freeze1 +; .paralyze1 + ld a, 1 << PAR + ld [wEnemyMonStatus], a + call QuarterSpeedDueToParalysis ; quarter speed of affected mon + ld a, ANIM_A9 + call PlayBattleAnimation + jp PrintMayNotAttackText ; print paralysis text +.burn1 + ld a, 1 << BRN + ld [wEnemyMonStatus], a + call HalveAttackDueToBurn ; halve attack of affected mon + ld a, ANIM_A9 + call PlayBattleAnimation + ld hl, BurnedText + jp PrintText +.freeze1 + call ClearHyperBeam ; resets hyper beam (recharge) condition from target + ld a, 1 << FRZ + ld [wEnemyMonStatus], a + ld a, ANIM_A9 + call PlayBattleAnimation + ld hl, FrozenText + jp PrintText +.opponentAttacker + ld a, [wBattleMonStatus] ; mostly same as above with addresses swapped for opponent + and a + jp nz, CheckDefrost + ld a, [wEnemyMoveType] + ld b, a + ld a, [wBattleMonType1] + cp b + ret z + ld a, [wBattleMonType2] + cp b + ret z + ld a, [wEnemyMoveEffect] + cp PARALYZE_SIDE_EFFECT1 + 1 + ld b, 10 percent + 1 + jr c, .regular_effectiveness2 +; extra effectiveness + ld b, 30 percent + 1 + sub BURN_SIDE_EFFECT2 - BURN_SIDE_EFFECT1 ; treat extra effective as regular from now on +.regular_effectiveness2 + push af + call BattleRandom + cp b + pop bc + ret nc + ld a, b + cp BURN_SIDE_EFFECT1 + jr z, .burn2 + cp FREEZE_SIDE_EFFECT + jr z, .freeze2 +; .paralyze2 + ld a, 1 << PAR + ld [wBattleMonStatus], a + call QuarterSpeedDueToParalysis + jp PrintMayNotAttackText +.burn2 + ld a, 1 << BRN + ld [wBattleMonStatus], a + call HalveAttackDueToBurn + ld hl, BurnedText + jp PrintText +.freeze2 +; hyper beam bits aren't reseted for opponent's side + ld a, 1 << FRZ + ld [wBattleMonStatus], a + ld hl, FrozenText + jp PrintText + +BurnedText: + text_far _BurnedText + text_end + +FrozenText: + text_far _FrozenText + text_end + +CheckDefrost: +; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target + and 1 << FRZ ; are they frozen? + ret z ; return if so + ldh a, [hWhoseTurn] + and a + jr nz, .opponent + ;player [attacker] + ld a, [wPlayerMoveType] + sub FIRE + ret nz ; return if type of move used isn't fire + ld [wEnemyMonStatus], a ; set opponent status to 00 ["defrost" a frozen monster] + ld hl, wEnemyMon1Status + ld a, [wEnemyMonPartyPos] + ld bc, wEnemyMon2 - wEnemyMon1 + call AddNTimes + xor a + ld [hl], a ; clear status in roster + ld hl, FireDefrostedText + jr .common +.opponent + ld a, [wEnemyMoveType] ; same as above with addresses swapped + sub FIRE + ret nz + ld [wBattleMonStatus], a + ld hl, wPartyMon1Status + ld a, [wPlayerMonNumber] + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + xor a + ld [hl], a + ld hl, FireDefrostedText +.common + jp PrintText + +FireDefrostedText: + text_far _FireDefrostedText + text_end + +StatModifierUpEffect: + ld hl, wPlayerMonStatMods + ld de, wPlayerMoveEffect + ldh a, [hWhoseTurn] + and a + jr z, .statModifierUpEffect + ld hl, wEnemyMonStatMods + ld de, wEnemyMoveEffect +.statModifierUpEffect + ld a, [de] + sub ATTACK_UP1_EFFECT + cp EVASION_UP1_EFFECT + $3 - ATTACK_UP1_EFFECT ; covers all +1 effects + jr c, .incrementStatMod + sub ATTACK_UP2_EFFECT - ATTACK_UP1_EFFECT ; map +2 effects to equivalent +1 effect +.incrementStatMod + ld c, a + ld b, $0 + add hl, bc + ld b, [hl] + inc b ; increment corresponding stat mod + ld a, $d + cp b ; can't raise stat past +6 ($d or 13) + jp c, PrintNothingHappenedText + ld a, [de] + cp ATTACK_UP1_EFFECT + $8 ; is it a +2 effect? + jr c, .ok + inc b ; if so, increment stat mod again + ld a, $d + cp b ; unless it's already +6 + jr nc, .ok + ld b, a +.ok + ld [hl], b + ld a, c + cp $4 + jr nc, UpdateStatDone ; jump if mod affected is evasion/accuracy + push hl + ld hl, wBattleMonAttack + 1 + ld de, wPlayerMonUnmodifiedAttack + ldh a, [hWhoseTurn] + and a + jr z, .pointToStats + ld hl, wEnemyMonAttack + 1 + ld de, wEnemyMonUnmodifiedAttack +.pointToStats + push bc + sla c + ld b, $0 + add hl, bc ; hl = modified stat + ld a, c + add e + ld e, a + jr nc, .checkIf999 + inc d ; de = unmodified (original) stat +.checkIf999 + pop bc + ; check if stat is already 999 + ld a, [hld] + sub LOW(MAX_STAT_VALUE) + jr nz, .recalculateStat + ld a, [hl] + sbc HIGH(MAX_STAT_VALUE) + jp z, RestoreOriginalStatModifier +.recalculateStat ; recalculate affected stat + ; paralysis and burn penalties, as well as badge boosts are ignored + push hl + push bc + ld hl, StatModifierRatios + dec b + sla b + ld c, b + ld b, $0 + add hl, bc + pop bc + xor a + ldh [hMultiplicand], a + ld a, [de] + ldh [hMultiplicand + 1], a + inc de + ld a, [de] + ldh [hMultiplicand + 2], a + ld a, [hli] + ldh [hMultiplier], a + call Multiply + ld a, [hl] + ldh [hDivisor], a + ld b, $4 + call Divide + pop hl +; cap at MAX_STAT_VALUE (999) + ldh a, [hProduct + 3] + sub LOW(MAX_STAT_VALUE) + ldh a, [hProduct + 2] + sbc HIGH(MAX_STAT_VALUE) + jp c, UpdateStat + ld a, HIGH(MAX_STAT_VALUE) + ldh [hMultiplicand + 1], a + ld a, LOW(MAX_STAT_VALUE) + ldh [hMultiplicand + 2], a + +UpdateStat: + ldh a, [hProduct + 2] + ld [hli], a + ldh a, [hProduct + 3] + ld [hl], a + pop hl +UpdateStatDone: + ld b, c + inc b + call PrintStatText + ld hl, wPlayerBattleStatus2 + ld de, wPlayerMoveNum + ld bc, wPlayerMonMinimized + ldh a, [hWhoseTurn] + and a + jr z, .playerTurn + ld hl, wEnemyBattleStatus2 + ld de, wEnemyMoveNum + ld bc, wEnemyMonMinimized +.playerTurn + ld a, [de] + cp MINIMIZE + jr nz, .notMinimize + ; if a substitute is up, slide off the substitute and show the mon pic before + ; playing the minimize animation + bit HAS_SUBSTITUTE_UP, [hl] + push af + push bc + ld hl, HideSubstituteShowMonAnim + ld b, BANK(HideSubstituteShowMonAnim) + push de + call nz, Bankswitch + pop de +.notMinimize + call PlayCurrentMoveAnimation + ld a, [de] + cp MINIMIZE + jr nz, .applyBadgeBoostsAndStatusPenalties + pop bc + ld a, $1 + ld [bc], a + ld hl, ReshowSubstituteAnim + ld b, BANK(ReshowSubstituteAnim) + pop af + call nz, Bankswitch +.applyBadgeBoostsAndStatusPenalties + ldh a, [hWhoseTurn] + and a + call z, ApplyBadgeStatBoosts ; whenever the player uses a stat-up move, badge boosts get reapplied again to every stat, + ; even to those not affected by the stat-up move (will be boosted further) + ld hl, MonsStatsRoseText + call PrintText + +; these shouldn't be here + call QuarterSpeedDueToParalysis ; apply speed penalty to the player whose turn is not, if it's paralyzed + jp HalveAttackDueToBurn ; apply attack penalty to the player whose turn is not, if it's burned + +RestoreOriginalStatModifier: + pop hl + dec [hl] + +PrintNothingHappenedText: + ld hl, NothingHappenedText + jp PrintText + +MonsStatsRoseText: + text_far _MonsStatsRoseText + text_asm + ld hl, GreatlyRoseText + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveEffect] + jr z, .playerTurn + ld a, [wEnemyMoveEffect] +.playerTurn + cp ATTACK_DOWN1_EFFECT + ret nc + ld hl, RoseText + ret + +GreatlyRoseText: + text_pause + text_far _GreatlyRoseText +; fallthrough +RoseText: + text_far _RoseText + text_end + +StatModifierDownEffect: + ld hl, wEnemyMonStatMods + ld de, wPlayerMoveEffect + ld bc, wEnemyBattleStatus1 + ldh a, [hWhoseTurn] + and a + jr z, .statModifierDownEffect + ld hl, wPlayerMonStatMods + ld de, wEnemyMoveEffect + ld bc, wPlayerBattleStatus1 + ld a, [wLinkState] + cp LINK_STATE_BATTLING + jr z, .statModifierDownEffect + call BattleRandom + cp $40 ; 1/4 chance to miss by in regular battle + jp c, MoveMissed +.statModifierDownEffect + call CheckTargetSubstitute ; can't hit through substitute + jp nz, MoveMissed + ld a, [de] + cp ATTACK_DOWN_SIDE_EFFECT + jr c, .nonSideEffect + call BattleRandom + cp $55 ; 85/256 chance for side effects + jp nc, CantLowerAnymore + ld a, [de] + sub ATTACK_DOWN_SIDE_EFFECT ; map each stat to 0-3 + jr .decrementStatMod +.nonSideEffect ; non-side effects only + push hl + push de + push bc + call MoveHitTest ; apply accuracy tests + pop bc + pop de + pop hl + ld a, [wMoveMissed] + and a + jp nz, MoveMissed + ld a, [bc] + bit INVULNERABLE, a ; fly/dig + jp nz, MoveMissed + ld a, [de] + sub ATTACK_DOWN1_EFFECT + cp EVASION_DOWN1_EFFECT + $3 - ATTACK_DOWN1_EFFECT ; covers all -1 effects + jr c, .decrementStatMod + sub ATTACK_DOWN2_EFFECT - ATTACK_DOWN1_EFFECT ; map -2 effects to corresponding -1 effect +.decrementStatMod + ld c, a + ld b, $0 + add hl, bc + ld b, [hl] + dec b ; dec corresponding stat mod + jp z, CantLowerAnymore ; if stat mod is 1 (-6), can't lower anymore + ld a, [de] + cp ATTACK_DOWN2_EFFECT - $16 ; $24 + jr c, .ok + cp EVASION_DOWN2_EFFECT + $5 ; $44 + jr nc, .ok + dec b ; stat down 2 effects only (dec mod again) + jr nz, .ok + inc b ; increment mod to 1 (-6) if it would become 0 (-7) +.ok + ld [hl], b ; save modified mod + ld a, c + cp $4 + jr nc, UpdateLoweredStatDone ; jump for evasion/accuracy + push hl + push de + ld hl, wEnemyMonAttack + 1 + ld de, wEnemyMonUnmodifiedAttack + ldh a, [hWhoseTurn] + and a + jr z, .pointToStat + ld hl, wBattleMonAttack + 1 + ld de, wPlayerMonUnmodifiedAttack +.pointToStat + push bc + sla c + ld b, $0 + add hl, bc ; hl = modified stat + ld a, c + add e + ld e, a + jr nc, .noCarry + inc d ; de = unmodified stat +.noCarry + pop bc + ld a, [hld] + sub $1 ; can't lower stat below 1 (-6) + jr nz, .recalculateStat + ld a, [hl] + and a + jp z, CantLowerAnymore_Pop +.recalculateStat +; recalculate affected stat +; paralysis and burn penalties, as well as badge boosts are ignored + push hl + push bc + ld hl, StatModifierRatios + dec b + sla b + ld c, b + ld b, $0 + add hl, bc + pop bc + xor a + ldh [hMultiplicand], a + ld a, [de] + ldh [hMultiplicand + 1], a + inc de + ld a, [de] + ldh [hMultiplicand + 2], a + ld a, [hli] + ldh [hMultiplier], a + call Multiply + ld a, [hl] + ldh [hDivisor], a + ld b, $4 + call Divide + pop hl + ldh a, [hProduct + 3] + ld b, a + ldh a, [hProduct + 2] + or b + jp nz, UpdateLoweredStat + ldh [hMultiplicand + 1], a + ld a, $1 + ldh [hMultiplicand + 2], a + +UpdateLoweredStat: + ldh a, [hProduct + 2] + ld [hli], a + ldh a, [hProduct + 3] + ld [hl], a + pop de + pop hl +UpdateLoweredStatDone: + ld b, c + inc b + push de + call PrintStatText + pop de + ld a, [de] + cp $44 + jr nc, .ApplyBadgeBoostsAndStatusPenalties + call PlayCurrentMoveAnimation2 +.ApplyBadgeBoostsAndStatusPenalties + ldh a, [hWhoseTurn] + and a + call nz, ApplyBadgeStatBoosts ; whenever the player uses a stat-down move, badge boosts get reapplied again to every stat, + ; even to those not affected by the stat-up move (will be boosted further) + ld hl, MonsStatsFellText + call PrintText + +; These where probably added given that a stat-down move affecting speed or attack will override +; the stat penalties from paralysis and burn respectively. +; But they are always called regardless of the stat affected by the stat-down move. + call QuarterSpeedDueToParalysis + jp HalveAttackDueToBurn + +CantLowerAnymore_Pop: + pop de + pop hl + inc [hl] + +CantLowerAnymore: + ld a, [de] + cp ATTACK_DOWN_SIDE_EFFECT + ret nc + ld hl, NothingHappenedText + jp PrintText + +MoveMissed: + ld a, [de] + cp $44 + ret nc + jp ConditionalPrintButItFailed + +MonsStatsFellText: + text_far _MonsStatsFellText + text_asm + ld hl, FellText + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveEffect] + jr z, .playerTurn + ld a, [wEnemyMoveEffect] +.playerTurn +; check if the move's effect decreases a stat by 2 + cp BIDE_EFFECT + ret c + cp ATTACK_DOWN_SIDE_EFFECT + ret nc + ld hl, GreatlyFellText + ret + +GreatlyFellText: + text_pause + text_far _GreatlyFellText +; fallthrough +FellText: + text_far _FellText + text_end + +PrintStatText: + ld hl, StatsTextStrings + ld c, "@" +.findStatName_outer + dec b + jr z, .foundStatName +.findStatName_inner + ld a, [hli] + cp c + jr z, .findStatName_outer + jr .findStatName_inner +.foundStatName + ld de, wcf4b + ld bc, $a + jp CopyData + +INCLUDE "data/battle/stat_names.asm" + +INCLUDE "data/battle/stat_modifiers.asm" + +BideEffect: + ld hl, wPlayerBattleStatus1 + ld de, wPlayerBideAccumulatedDamage + ld bc, wPlayerNumAttacksLeft + ldh a, [hWhoseTurn] + and a + jr z, .bideEffect + ld hl, wEnemyBattleStatus1 + ld de, wEnemyBideAccumulatedDamage + ld bc, wEnemyNumAttacksLeft +.bideEffect + set STORING_ENERGY, [hl] ; mon is now using bide + xor a + ld [de], a + inc de + ld [de], a + ld [wPlayerMoveEffect], a + ld [wEnemyMoveEffect], a + call BattleRandom + and $1 + inc a + inc a + ld [bc], a ; set Bide counter to 2 or 3 at random + ldh a, [hWhoseTurn] + add XSTATITEM_ANIM + jp PlayBattleAnimation2 + +ThrashPetalDanceEffect: + ld hl, wPlayerBattleStatus1 + ld de, wPlayerNumAttacksLeft + ldh a, [hWhoseTurn] + and a + jr z, .thrashPetalDanceEffect + ld hl, wEnemyBattleStatus1 + ld de, wEnemyNumAttacksLeft +.thrashPetalDanceEffect + set THRASHING_ABOUT, [hl] ; mon is now using thrash/petal dance + call BattleRandom + and $1 + inc a + inc a + ld [de], a ; set thrash/petal dance counter to 2 or 3 at random + ldh a, [hWhoseTurn] + add ANIM_B0 + jp PlayBattleAnimation2 + +SwitchAndTeleportEffect: + ldh a, [hWhoseTurn] + and a + jr nz, .handleEnemy + ld a, [wIsInBattle] + dec a + jr nz, .notWildBattle1 + ld a, [wCurEnemyLVL] + ld b, a + ld a, [wBattleMonLevel] + cp b ; is the player's level greater than the enemy's level? + jr nc, .playerMoveWasSuccessful ; if so, teleport will always succeed + add b + ld c, a + inc c ; c = sum of player level and enemy level +.rejectionSampleLoop1 + call BattleRandom + cp c ; get a random number between 0 and c + jr nc, .rejectionSampleLoop1 + srl b + srl b ; b = enemyLevel / 4 + cp b ; is rand[0, playerLevel + enemyLevel) >= (enemyLevel / 4)? + jr nc, .playerMoveWasSuccessful ; if so, allow teleporting + ld c, 50 + call DelayFrames + ld a, [wPlayerMoveNum] + cp TELEPORT + jp nz, PrintDidntAffectText + jp PrintButItFailedText_ +.playerMoveWasSuccessful + call ReadPlayerMonCurHPAndStatus + xor a + ld [wAnimationType], a + inc a + ld [wEscapedFromBattle], a + ld a, [wPlayerMoveNum] + jr .playAnimAndPrintText +.notWildBattle1 + ld c, 50 + call DelayFrames + ld hl, IsUnaffectedText + ld a, [wPlayerMoveNum] + cp TELEPORT + jp nz, PrintText + jp PrintButItFailedText_ +.handleEnemy + ld a, [wIsInBattle] + dec a + jr nz, .notWildBattle2 + ld a, [wBattleMonLevel] + ld b, a + ld a, [wCurEnemyLVL] + cp b + jr nc, .enemyMoveWasSuccessful + add b + ld c, a + inc c +.rejectionSampleLoop2 + call BattleRandom + cp c + jr nc, .rejectionSampleLoop2 + srl b + srl b + cp b + jr nc, .enemyMoveWasSuccessful + ld c, 50 + call DelayFrames + ld a, [wEnemyMoveNum] + cp TELEPORT + jp nz, PrintDidntAffectText + jp PrintButItFailedText_ +.enemyMoveWasSuccessful + call ReadPlayerMonCurHPAndStatus + xor a + ld [wAnimationType], a + inc a + ld [wEscapedFromBattle], a + ld a, [wEnemyMoveNum] + jr .playAnimAndPrintText +.notWildBattle2 + ld c, 50 + call DelayFrames + ld hl, IsUnaffectedText + ld a, [wEnemyMoveNum] + cp TELEPORT + jp nz, PrintText + jp ConditionalPrintButItFailed +.playAnimAndPrintText + push af + call PlayBattleAnimation + ld c, 20 + call DelayFrames + pop af + ld hl, RanFromBattleText + cp TELEPORT + jr z, .printText + ld hl, RanAwayScaredText + cp ROAR + jr z, .printText + ld hl, WasBlownAwayText +.printText + jp PrintText + +RanFromBattleText: + text_far _RanFromBattleText + text_end + +RanAwayScaredText: + text_far _RanAwayScaredText + text_end + +WasBlownAwayText: + text_far _WasBlownAwayText + text_end + +TwoToFiveAttacksEffect: + ld hl, wPlayerBattleStatus1 + ld de, wPlayerNumAttacksLeft + ld bc, wPlayerNumHits + ldh a, [hWhoseTurn] + and a + jr z, .twoToFiveAttacksEffect + ld hl, wEnemyBattleStatus1 + ld de, wEnemyNumAttacksLeft + ld bc, wEnemyNumHits +.twoToFiveAttacksEffect + bit ATTACKING_MULTIPLE_TIMES, [hl] ; is mon attacking multiple times? + ret nz + set ATTACKING_MULTIPLE_TIMES, [hl] ; mon is now attacking multiple times + ld hl, wPlayerMoveEffect + ldh a, [hWhoseTurn] + and a + jr z, .setNumberOfHits + ld hl, wEnemyMoveEffect +.setNumberOfHits + ld a, [hl] + cp TWINEEDLE_EFFECT + jr z, .twineedle + cp ATTACK_TWICE_EFFECT + ld a, $2 ; number of hits it's always 2 for ATTACK_TWICE_EFFECT + jr z, .saveNumberOfHits +; for TWO_TO_FIVE_ATTACKS_EFFECT 3/8 chance for 2 and 3 hits, and 1/8 chance for 4 and 5 hits + call BattleRandom + and $3 + cp $2 + jr c, .gotNumHits +; if the number of hits was greater than 2, re-roll again for a lower chance + call BattleRandom + and $3 +.gotNumHits + inc a + inc a +.saveNumberOfHits + ld [de], a + ld [bc], a + ret +.twineedle + ld a, POISON_SIDE_EFFECT1 + ld [hl], a ; set Twineedle's effect to poison effect + jr .saveNumberOfHits + +FlinchSideEffect: + call CheckTargetSubstitute + ret nz + ld hl, wEnemyBattleStatus1 + ld de, wPlayerMoveEffect + ldh a, [hWhoseTurn] + and a + jr z, .flinchSideEffect + ld hl, wPlayerBattleStatus1 + ld de, wEnemyMoveEffect +.flinchSideEffect + ld a, [de] + cp FLINCH_SIDE_EFFECT1 + ld b, $1a ; ~10% chance of flinch + jr z, .gotEffectChance + ld b, $4d ; ~30% chance of flinch +.gotEffectChance + call BattleRandom + cp b + ret nc + set FLINCHED, [hl] ; set mon's status to flinching + call ClearHyperBeam + ret + +OneHitKOEffect: + jpfar OneHitKOEffect_ + +ChargeEffect: + ld hl, wPlayerBattleStatus1 + ld de, wPlayerMoveEffect + ldh a, [hWhoseTurn] + and a + ld b, XSTATITEM_ANIM + jr z, .chargeEffect + ld hl, wEnemyBattleStatus1 + ld de, wEnemyMoveEffect + ld b, ANIM_AF +.chargeEffect + set CHARGING_UP, [hl] + ld a, [de] + dec de ; de contains enemy or player MOVENUM + cp FLY_EFFECT + jr nz, .notFly + set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) + ld b, TELEPORT ; load Teleport's animation +.notFly + ld a, [de] + cp DIG + jr nz, .notDigOrFly + set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) + ld b, ANIM_C0 +.notDigOrFly + xor a + ld [wAnimationType], a + ld a, b + call PlayBattleAnimation + ld a, [de] + ld [wChargeMoveNum], a + ld hl, ChargeMoveEffectText + jp PrintText + +ChargeMoveEffectText: + text_far _ChargeMoveEffectText + text_asm + ld a, [wChargeMoveNum] + cp RAZOR_WIND + ld hl, MadeWhirlwindText + jr z, .gotText + cp SOLARBEAM + ld hl, TookInSunlightText + jr z, .gotText + cp SKULL_BASH + ld hl, LoweredItsHeadText + jr z, .gotText + cp SKY_ATTACK + ld hl, SkyAttackGlowingText + jr z, .gotText + cp FLY + ld hl, FlewUpHighText + jr z, .gotText + cp DIG + ld hl, DugAHoleText +.gotText + ret + +MadeWhirlwindText: + text_far _MadeWhirlwindText + text_end + +TookInSunlightText: + text_far _TookInSunlightText + text_end + +LoweredItsHeadText: + text_far _LoweredItsHeadText + text_end + +SkyAttackGlowingText: + text_far _SkyAttackGlowingText + text_end + +FlewUpHighText: + text_far _FlewUpHighText + text_end + +DugAHoleText: + text_far _DugAHoleText + text_end + +TrappingEffect: + ld hl, wPlayerBattleStatus1 + ld de, wPlayerNumAttacksLeft + ldh a, [hWhoseTurn] + and a + jr z, .trappingEffect + ld hl, wEnemyBattleStatus1 + ld de, wEnemyNumAttacksLeft +.trappingEffect + bit USING_TRAPPING_MOVE, [hl] + ret nz + call ClearHyperBeam ; since this effect is called before testing whether the move will hit, + ; the target won't need to recharge even if the trapping move missed + set USING_TRAPPING_MOVE, [hl] ; mon is now using a trapping move + call BattleRandom ; 3/8 chance for 2 and 3 attacks, and 1/8 chance for 4 and 5 attacks + and $3 + cp $2 + jr c, .setTrappingCounter + call BattleRandom + and $3 +.setTrappingCounter + inc a + ld [de], a + ret + +MistEffect: + jpfar MistEffect_ + +FocusEnergyEffect: + jpfar FocusEnergyEffect_ + +RecoilEffect: + jpfar RecoilEffect_ + +ConfusionSideEffect: + call BattleRandom + cp $19 ; ~10% chance + ret nc + jr ConfusionSideEffectSuccess + +ConfusionEffect: + call CheckTargetSubstitute + jr nz, ConfusionEffectFailed + call MoveHitTest + ld a, [wMoveMissed] + and a + jr nz, ConfusionEffectFailed + +ConfusionSideEffectSuccess: + ldh a, [hWhoseTurn] + and a + ld hl, wEnemyBattleStatus1 + ld bc, wEnemyConfusedCounter + ld a, [wPlayerMoveEffect] + jr z, .confuseTarget + ld hl, wPlayerBattleStatus1 + ld bc, wPlayerConfusedCounter + ld a, [wEnemyMoveEffect] +.confuseTarget + bit CONFUSED, [hl] ; is mon confused? + jr nz, ConfusionEffectFailed + set CONFUSED, [hl] ; mon is now confused + push af + call BattleRandom + and $3 + inc a + inc a + ld [bc], a ; confusion status will last 2-5 turns + pop af + cp CONFUSION_SIDE_EFFECT + call nz, PlayCurrentMoveAnimation2 + ld hl, BecameConfusedText + jp PrintText + +BecameConfusedText: + text_far _BecameConfusedText + text_end + +ConfusionEffectFailed: + cp CONFUSION_SIDE_EFFECT + ret z + ld c, 50 + call DelayFrames + jp ConditionalPrintButItFailed + +ParalyzeEffect: + jpfar ParalyzeEffect_ + +SubstituteEffect: + jpfar SubstituteEffect_ + +HyperBeamEffect: + ld hl, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .hyperBeamEffect + ld hl, wEnemyBattleStatus2 +.hyperBeamEffect + set NEEDS_TO_RECHARGE, [hl] ; mon now needs to recharge + ret + +ClearHyperBeam: + push hl + ld hl, wEnemyBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .playerTurn + ld hl, wPlayerBattleStatus2 +.playerTurn + res NEEDS_TO_RECHARGE, [hl] ; mon no longer needs to recharge + pop hl + ret + +RageEffect: + ld hl, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .player + ld hl, wEnemyBattleStatus2 +.player + set USING_RAGE, [hl] ; mon is now in "rage" mode + ret + +MimicEffect: + ld c, 50 + call DelayFrames + call MoveHitTest + ld a, [wMoveMissed] + and a + jr nz, .mimicMissed + ldh a, [hWhoseTurn] + and a + ld hl, wBattleMonMoves + ld a, [wPlayerBattleStatus1] + jr nz, .enemyTurn + ld a, [wLinkState] + cp LINK_STATE_BATTLING + jr nz, .letPlayerChooseMove + ld hl, wEnemyMonMoves + ld a, [wEnemyBattleStatus1] +.enemyTurn + bit INVULNERABLE, a + jr nz, .mimicMissed +.getRandomMove + push hl + call BattleRandom + and $3 + ld c, a + ld b, $0 + add hl, bc + ld a, [hl] + pop hl + and a + jr z, .getRandomMove + ld d, a + ldh a, [hWhoseTurn] + and a + ld hl, wBattleMonMoves + ld a, [wPlayerMoveListIndex] + jr z, .playerTurn + ld hl, wEnemyMonMoves + ld a, [wEnemyMoveListIndex] + jr .playerTurn +.letPlayerChooseMove + ld a, [wEnemyBattleStatus1] + bit INVULNERABLE, a + jr nz, .mimicMissed + ld a, [wCurrentMenuItem] + push af + ld a, $1 + ld [wMoveMenuType], a + call MoveSelectionMenu + call LoadScreenTilesFromBuffer1 + ld hl, wEnemyMonMoves + ld a, [wCurrentMenuItem] + ld c, a + ld b, $0 + add hl, bc + ld d, [hl] + pop af + ld hl, wBattleMonMoves +.playerTurn + ld c, a + ld b, $0 + add hl, bc + ld a, d + ld [hl], a + ld [wd11e], a + call GetMoveName + call PlayCurrentMoveAnimation + ld hl, MimicLearnedMoveText + jp PrintText +.mimicMissed + jp PrintButItFailedText_ + +MimicLearnedMoveText: + text_far _MimicLearnedMoveText + text_end + +LeechSeedEffect: + jpfar LeechSeedEffect_ + +SplashEffect: + call PlayCurrentMoveAnimation + jp PrintNoEffectText + +DisableEffect: + call MoveHitTest + ld a, [wMoveMissed] + and a + jr nz, .moveMissed + ld de, wEnemyDisabledMove + ld hl, wEnemyMonMoves + ldh a, [hWhoseTurn] + and a + jr z, .disableEffect + ld de, wPlayerDisabledMove + ld hl, wBattleMonMoves +.disableEffect +; no effect if target already has a move disabled + ld a, [de] + and a + jr nz, .moveMissed +.pickMoveToDisable + push hl + call BattleRandom + and $3 + ld c, a + ld b, $0 + add hl, bc + ld a, [hl] + pop hl + and a + jr z, .pickMoveToDisable ; loop until a non-00 move slot is found + ld [wd11e], a ; store move number + push hl + ldh a, [hWhoseTurn] + and a + ld hl, wBattleMonPP + jr nz, .enemyTurn + ld a, [wLinkState] + cp LINK_STATE_BATTLING + pop hl ; wEnemyMonMoves + jr nz, .playerTurnNotLinkBattle +; .playerTurnLinkBattle + push hl + ld hl, wEnemyMonPP +.enemyTurn + push hl + ld a, [hli] + or [hl] + inc hl + or [hl] + inc hl + or [hl] + and $3f + pop hl ; wBattleMonPP or wEnemyMonPP + jr z, .moveMissedPopHL ; nothing to do if all moves have no PP left + add hl, bc + ld a, [hl] + pop hl + and a + jr z, .pickMoveToDisable ; pick another move if this one had 0 PP +.playerTurnNotLinkBattle +; non-link battle enemies have unlimited PP so the previous checks aren't needed + call BattleRandom + and $7 + inc a ; 1-8 turns disabled + inc c ; move 1-4 will be disabled + swap c + add c ; map disabled move to high nibble of wEnemyDisabledMove / wPlayerDisabledMove + ld [de], a + call PlayCurrentMoveAnimation2 + ld hl, wPlayerDisabledMoveNumber + ldh a, [hWhoseTurn] + and a + jr nz, .printDisableText + inc hl ; wEnemyDisabledMoveNumber +.printDisableText + ld a, [wd11e] ; move number + ld [hl], a + call GetMoveName + ld hl, MoveWasDisabledText + jp PrintText +.moveMissedPopHL + pop hl +.moveMissed + jp PrintButItFailedText_ + +MoveWasDisabledText: + text_far _MoveWasDisabledText + text_end + +PayDayEffect: + jpfar PayDayEffect_ + +ConversionEffect: + jpfar ConversionEffect_ + +HazeEffect: + jpfar HazeEffect_ + +HealEffect: + jpfar HealEffect_ + +TransformEffect: + jpfar TransformEffect_ + +ReflectLightScreenEffect: + jpfar ReflectLightScreenEffect_ + +NothingHappenedText: + text_far _NothingHappenedText + text_end + +PrintNoEffectText: + ld hl, NoEffectText + jp PrintText + +NoEffectText: + text_far _NoEffectText + text_end + +ConditionalPrintButItFailed: + ld a, [wMoveDidntMiss] + and a + ret nz ; return if the side effect failed, yet the attack was successful + +PrintButItFailedText_: + ld hl, ButItFailedText + jp PrintText + +ButItFailedText: + text_far _ButItFailedText + text_end + +PrintDidntAffectText: + ld hl, DidntAffectText + jp PrintText + +DidntAffectText: + text_far _DidntAffectText + text_end + +IsUnaffectedText: + text_far _IsUnaffectedText + text_end + +PrintMayNotAttackText: + ld hl, ParalyzedMayNotAttackText + jp PrintText + +ParalyzedMayNotAttackText: + text_far _ParalyzedMayNotAttackText + text_end + +CheckTargetSubstitute: + push hl + ld hl, wEnemyBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .next1 + ld hl, wPlayerBattleStatus2 +.next1 + bit HAS_SUBSTITUTE_UP, [hl] + pop hl + ret + +PlayCurrentMoveAnimation2: +; animation at MOVENUM will be played unless MOVENUM is 0 +; plays wAnimationType 3 or 6 + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveNum] + jr z, .notEnemyTurn + ld a, [wEnemyMoveNum] +.notEnemyTurn + and a + ret z + +PlayBattleAnimation2: +; play animation ID at a and animation type 6 or 3 + ld [wAnimationID], a + ldh a, [hWhoseTurn] + and a + ld a, $6 + jr z, .storeAnimationType + ld a, $3 +.storeAnimationType + ld [wAnimationType], a + jp PlayBattleAnimationGotID + +PlayCurrentMoveAnimation: +; animation at MOVENUM will be played unless MOVENUM is 0 +; resets wAnimationType + xor a + ld [wAnimationType], a + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveNum] + jr z, .notEnemyTurn + ld a, [wEnemyMoveNum] +.notEnemyTurn + and a + ret z + +PlayBattleAnimation: +; play animation ID at a and predefined animation type + ld [wAnimationID], a + +PlayBattleAnimationGotID: +; play animation at wAnimationID + push hl + push de + push bc + predef MoveAnimation + pop bc + pop de + pop hl + ret diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm old mode 100755 new mode 100644 index 4635ec1f..39304fe0 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -10,7 +10,7 @@ EndOfBattle: ld a, [wEnemyMonStatus] ld [hl], a call ClearScreen - callab DisplayLinkBattleVersusTextBox + callfar DisplayLinkBattleVersusTextBox ld a, [wBattleResult] cp $1 ld de, YouWinText @@ -19,7 +19,7 @@ EndOfBattle: jr z, .placeWinOrLoseString ld de, DrawText .placeWinOrLoseString - coord hl, 6, 8 + hlcoord 6, 8 call PlaceString ld c, 200 call DelayFrames @@ -46,7 +46,7 @@ EndOfBattle: .resetVariables xor a ld [wDanger], a ;disable low health alarm - ld [wChannelSoundIDs + Ch4], a + ld [wChannelSoundIDs + Ch5], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a @@ -84,5 +84,5 @@ DrawText: db " DRAW@" PickUpPayDayMoneyText: - TX_FAR _PickUpPayDayMoneyText - db "@" + text_far _PickUpPayDayMoneyText + text_end diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 24748338..0eab6e08 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -55,15 +55,15 @@ GainExperience: jr .gainStatExpLoop .statExpDone xor a - ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND + 1], a + ldh [hMultiplicand], a + ldh [hMultiplicand + 1], a ld a, [wEnemyMonBaseExp] - ld [H_MULTIPLICAND + 2], a + ldh [hMultiplicand + 2], a ld a, [wEnemyMonLevel] - ld [H_MULTIPLIER], a + ldh [hMultiplier], a call Multiply ld a, 7 - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, 4 call Divide ld hl, wPartyMon1OTID - (wPartyMon1DVs - 1) @@ -91,12 +91,12 @@ GainExperience: inc hl ; add the gained exp to the party mon's exp ld b, [hl] - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld [wExpAmountGained + 1], a add b ld [hld], a ld b, [hl] - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] ld [wExpAmountGained], a adc b ld [hl], a @@ -117,13 +117,13 @@ GainExperience: ld [wd0b5], a call GetMonHeader ld d, MAX_LEVEL - callab CalcExperience ; get max exp + callfar CalcExperience ; get max exp ; compare max exp with current exp - ld a, [hExperience] + ldh a, [hExperience] ld b, a - ld a, [hExperience + 1] + ldh a, [hExperience + 1] ld c, a - ld a, [hExperience + 2] + ldh a, [hExperience + 2] ld d, a pop hl ld a, [hld] @@ -155,7 +155,7 @@ GainExperience: ld bc, wPartyMon1Level - wPartyMon1Exp add hl, bc push hl - callba CalcLevelFromExperience + farcall CalcLevelFromExperience pop hl ld a, [hl] ; current level cp d @@ -233,11 +233,11 @@ GainExperience: .recalcStatChanges xor a ; battle mon ld [wCalculateWhoseStats], a - callab CalculateModifiedStats - callab ApplyBurnAndParalysisPenaltiesToPlayer - callab ApplyBadgeStatBoosts - callab DrawPlayerHUDAndHPBar - callab PrintEmptyString + callfar CalculateModifiedStats + callfar ApplyBurnAndParalysisPenaltiesToPlayer + callfar ApplyBadgeStatBoosts + callfar DrawPlayerHUDAndHPBar + callfar PrintEmptyString call SaveScreenTilesToBuffer1 .printGrewLevelText ld hl, GrewLevelText @@ -246,7 +246,7 @@ GainExperience: ld [wMonDataLocation], a call LoadMonData ld d, $1 - callab PrintStatsBox + callfar PrintStatsBox call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 xor a ; PLAYER_PARTY_DATA @@ -311,14 +311,14 @@ DivideExpDataByNumMonsGainingExp: ld c, wEnemyMonBaseExp + 1 - wEnemyMonBaseStats .divideLoop xor a - ld [H_DIVIDEND], a + ldh [hDividend], a ld a, [hl] - ld [H_DIVIDEND + 1], a + ldh [hDividend + 1], a ld a, [wd11e] - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, $2 call Divide ; divide value by number of mons gaining exp - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld [hli], a dec c jr nz, .divideLoop @@ -326,22 +326,22 @@ DivideExpDataByNumMonsGainingExp: ; multiplies exp by 1.5 BoostExp: - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] ld b, a - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld c, a srl b rr c add c - ld [H_QUOTIENT + 3], a - ld a, [H_QUOTIENT + 2] + ldh [hQuotient + 3], a + ldh a, [hQuotient + 2] adc b - ld [H_QUOTIENT + 2], a + ldh [hQuotient + 2], a ret GainedText: - TX_FAR _GainedText - TX_ASM + text_far _GainedText + text_asm ld a, [wBoostExpByExpAll] ld hl, WithExpAllText and a @@ -354,19 +354,19 @@ GainedText: ret WithExpAllText: - TX_FAR _WithExpAllText - TX_ASM + text_far _WithExpAllText + text_asm ld hl, ExpPointsText ret BoostedText: - TX_FAR _BoostedText + text_far _BoostedText ExpPointsText: - TX_FAR _ExpPointsText - db "@" + text_far _ExpPointsText + text_end GrewLevelText: - TX_FAR _GrewLevelText - TX_SFX_LEVEL_UP - db "@" + text_far _GrewLevelText + sound_level_up + text_end diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index 36ca019e..b2daebfe 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -1,15 +1,15 @@ -GetTrainerName_: +GetTrainerName_:: ld hl, wGrassRate ld a, [wLinkState] and a jr nz, .foundName ld hl, wRivalName ld a, [wTrainerClass] - cp SONY1 + cp RIVAL1 jr z, .foundName - cp SONY2 + cp RIVAL2 jr z, .foundName - cp SONY3 + cp RIVAL3 jr z, .foundName ld [wd0b5], a ld a, TRAINER_NAME diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 7adb20d8..9c1ad96f 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -1,21 +1,21 @@ MarowakAnim: ; animate the ghost being unveiled as a Marowak ld a, $e4 - ld [rOBP1], a + ldh [rOBP1], a call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap - coord hl, 12, 0 + hlcoord 12, 0 lb bc, 7, 7 call ClearScreenArea call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a ; disable BG transfer so we don't see the Marowak too soon + ldh [hAutoBGTransferEnabled], a ; disable BG transfer so we don't see the Marowak too soon ; replace ghost pic with Marowak in BG - ld a, MAROWAK + ld a, RESTLESS_SOUL ld [wChangeMonPicEnemyTurnSpecies], a ld a, $1 - ld [H_WHOSETURN], a - callab ChangeMonPic + ldh [hWhoseTurn], a + callfar ChangeMonPic ; alternate between black and light grey 8 times. ; this makes the ghost's body appear to flash ld d, $80 @@ -23,10 +23,10 @@ MarowakAnim: .fadeOutGhostLoop ld c, 10 call DelayFrames - ld a, [rOBP1] + ldh a, [rOBP1] sla a sla a - ld [rOBP1], a + ldh [rOBP1], a jr nz, .fadeOutGhostLoop call ClearSprites call CopyMonPicFromBGToSpriteVRAM ; copy Marowak pic from BG to sprite VRAM @@ -34,17 +34,17 @@ MarowakAnim: .fadeInMarowakLoop ld c, 10 call DelayFrames - ld a, [rOBP1] + ldh a, [rOBP1] srl b rra srl b rra - ld [rOBP1], a + ldh [rOBP1], a ld a, b and a jr nz, .fadeInMarowakLoop ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a ; enable BG transfer so the BG Marowak pic will be visible after the sprite one is cleared + ldh [hAutoBGTransferEnabled], a ; enable BG transfer so the BG Marowak pic will be visible after the sprite one is cleared call Delay3 jp ClearSprites @@ -74,7 +74,7 @@ CopyMonPicFromBGToSpriteVRAM: ld [hli], a ld a, d ld [hli], a - ld a, $10 ; use OBP1 + ld a, OAM_OBP1 ld [hli], a inc d dec c diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 7bc912d2..dd9f9714 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,6 +1,6 @@ InitBattleVariables: - ld a, [hTilesetType] - ld [wSavedTilesetType], a + ldh a, [hTileAnimations] + ld [wSavedTileAnimations], a xor a ld [wActionResultOrTookBattleTurn], a ld [wBattleResult], a @@ -35,4 +35,4 @@ InitBattleVariables: ld a, BATTLE_TYPE_SAFARI ld [wBattleType], a .notSafariBattle - jpab PlayBattleMusic + jpfar PlayBattleMusic diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 76559117..29c11356 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -1,23 +1,23 @@ ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names DisplayLinkBattleVersusTextBox: call LoadTextBoxTilePatterns - coord hl, 3, 4 + hlcoord 3, 4 ld b, 7 ld c, 12 call TextBoxBorder - coord hl, 4, 5 + hlcoord 4, 5 ld de, wPlayerName call PlaceString - coord hl, 4, 10 + hlcoord 4, 10 ld de, wLinkEnemyTrainerName call PlaceString ; place bold "VS" tiles between the names - coord hl, 9, 8 + hlcoord 9, 8 ld a, $69 ld [hli], a ld [hl], $6a xor a ld [wUpdateSpritesEnabled], a - callab SetupPlayerAndEnemyPokeballs + callfar SetupPlayerAndEnemyPokeballs ld c, 150 jp DelayFrames diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/misc.asm old mode 100755 new mode 100644 similarity index 100% rename from engine/battle/bank_e_misc.asm rename to engine/battle/misc.asm diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm deleted file mode 100644 index f23c3d70..00000000 --- a/engine/battle/moveEffects/conversion_effect.asm +++ /dev/null @@ -1,35 +0,0 @@ -ConversionEffect_: - ld hl, wEnemyMonType1 - ld de, wBattleMonType1 - ld a, [H_WHOSETURN] - and a - ld a, [wEnemyBattleStatus1] - jr z, .conversionEffect - push hl - ld h, d - ld l, e - pop de - ld a, [wPlayerBattleStatus1] -.conversionEffect - bit INVULNERABLE, a ; is mon immune to typical attacks (dig/fly) - jr nz, PrintButItFailedText -; copy target's types to user - ld a, [hli] - ld [de], a - inc de - ld a, [hl] - ld [de], a - ld hl, PlayCurrentMoveAnimation - call CallBankF - ld hl, ConvertedTypeText - jp PrintText - -ConvertedTypeText: - TX_FAR _ConvertedTypeText - db "@" - -PrintButItFailedText: - ld hl, PrintButItFailedText_ -CallBankF: - ld b, BANK(PrintButItFailedText_) - jp Bankswitch diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm deleted file mode 100644 index e5f4681a..00000000 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ /dev/null @@ -1,104 +0,0 @@ -DrainHPEffect_: - ld hl, wDamage - ld a, [hl] - srl a ; divide damage by 2 - ld [hli], a - ld a, [hl] - rr a - ld [hld], a - or [hl] ; is damage 0? - jr nz, .getAttackerHP -; if damage is 0, increase to 1 so that the attacker gains at least 1 HP - inc hl - inc [hl] -.getAttackerHP - ld hl, wBattleMonHP - ld de, wBattleMonMaxHP - ld a, [H_WHOSETURN] - and a - jp z, .addDamageToAttackerHP - ld hl, wEnemyMonHP - ld de, wEnemyMonMaxHP -.addDamageToAttackerHP - ld bc, wHPBarOldHP+1 -; copy current HP to wHPBarOldHP - ld a, [hli] - ld [bc], a - ld a, [hl] - dec bc - ld [bc], a -; copy max HP to wHPBarMaxHP - ld a, [de] - dec bc - ld [bc], a - inc de - ld a, [de] - dec bc - ld [bc], a -; add damage to attacker's HP and copy new HP to wHPBarNewHP - ld a, [wDamage + 1] - ld b, [hl] - add b - ld [hld], a - ld [wHPBarNewHP], a - ld a, [wDamage] - ld b, [hl] - adc b - ld [hli], a - ld [wHPBarNewHP+1], a - jr c, .capToMaxHP ; if HP > 65,535, cap to max HP -; compare HP with max HP - ld a, [hld] - ld b, a - ld a, [de] - dec de - sub b - ld a, [hli] - ld b, a - ld a, [de] - inc de - sbc b - jr nc, .next -.capToMaxHP - ld a, [de] - ld [hld], a - ld [wHPBarNewHP], a - dec de - ld a, [de] - ld [hli], a - ld [wHPBarNewHP+1], a - inc de -.next - ld a, [H_WHOSETURN] - and a - coord hl, 10, 9 - ld a, $1 - jr z, .next2 - coord hl, 2, 2 - xor a -.next2 - ld [wHPBarType], a - predef UpdateHPBar2 - predef DrawPlayerHUDAndHPBar - predef DrawEnemyHUDAndHPBar - callab ReadPlayerMonCurHPAndStatus - ld hl, SuckedHealthText - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveEffect] - jr z, .next3 - ld a, [wEnemyMoveEffect] -.next3 - cp DREAM_EATER_EFFECT - jr nz, .printText - ld hl, DreamWasEatenText -.printText - jp PrintText - -SuckedHealthText: - TX_FAR _SuckedHealthText - db "@" - -DreamWasEatenText: - TX_FAR _DreamWasEatenText - db "@" diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm deleted file mode 100644 index 16dad7bb..00000000 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ /dev/null @@ -1,22 +0,0 @@ -FocusEnergyEffect_: - ld hl, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .notEnemy - ld hl, wEnemyBattleStatus2 -.notEnemy - bit GETTING_PUMPED, [hl] ; is mon already using focus energy? - jr nz, .alreadyUsing - set GETTING_PUMPED, [hl] ; mon is now using focus energy - callab PlayCurrentMoveAnimation - ld hl, GettingPumpedText - jp PrintText -.alreadyUsing - ld c, 50 - call DelayFrames - jpab PrintButItFailedText_ - -GettingPumpedText: - TX_DELAY - TX_FAR _GettingPumpedText - db "@" diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm deleted file mode 100644 index 47723ba2..00000000 --- a/engine/battle/moveEffects/haze_effect.asm +++ /dev/null @@ -1,81 +0,0 @@ -HazeEffect_: - ld a, $7 -; store 7 on every stat mod - ld hl, wPlayerMonAttackMod - call ResetStatMods - ld hl, wEnemyMonAttackMod - call ResetStatMods -; copy unmodified stats to battle stats - ld hl, wPlayerMonUnmodifiedAttack - ld de, wBattleMonAttack - call ResetStats - ld hl, wEnemyMonUnmodifiedAttack - ld de, wEnemyMonAttack - call ResetStats -; cure non-volatile status, but only for the target - ld hl, wEnemyMonStatus - ld de, wEnemySelectedMove - ld a, [H_WHOSETURN] - and a - jr z, .cureStatuses - ld hl, wBattleMonStatus - dec de ; wPlayerSelectedMove - -.cureStatuses - ld a, [hl] - ld [hl], $0 - and SLP | (1 << FRZ) - jr z, .cureVolatileStatuses -; prevent the Pokemon from executing a move if it was asleep or frozen - ld a, $ff - ld [de], a - -.cureVolatileStatuses - xor a - ld [wPlayerDisabledMove], a - ld [wEnemyDisabledMove], a - ld hl, wPlayerDisabledMoveNumber - ld [hli], a - ld [hl], a - ld hl, wPlayerBattleStatus1 - call CureVolatileStatuses - ld hl, wEnemyBattleStatus1 - call CureVolatileStatuses - ld hl, PlayCurrentMoveAnimation - call CallBankF - ld hl, StatusChangesEliminatedText - jp PrintText - -CureVolatileStatuses: - res CONFUSED, [hl] - inc hl ; BATTSTATUS2 - ld a, [hl] - ; clear USING_X_ACCURACY, PROTECTED_BY_MIST, GETTING_PUMPED, and SEEDED statuses - and $ff ^((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) - ld [hli], a ; BATTSTATUS3 - ld a, [hl] - and %11110000 | (1 << TRANSFORMED) ; clear Bad Poison, Reflect and Light Screen statuses - ld [hl], a - ret - -ResetStatMods: - ld b, $8 -.loop - ld [hli], a - dec b - jr nz, .loop - ret - -ResetStats: - ld b, $8 -.loop - ld a, [hli] - ld [de], a - inc de - dec b - jr nz, .loop - ret - -StatusChangesEliminatedText: - TX_FAR _StatusChangesEliminatedText - db "@" diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm deleted file mode 100644 index 2e68acc0..00000000 --- a/engine/battle/moveEffects/heal_effect.asm +++ /dev/null @@ -1,120 +0,0 @@ -HealEffect_: - ld a, [H_WHOSETURN] - and a - ld de, wBattleMonHP - ld hl, wBattleMonMaxHP - ld a, [wPlayerMoveNum] - jr z, .healEffect - ld de, wEnemyMonHP - ld hl, wEnemyMonMaxHP - ld a, [wEnemyMoveNum] -.healEffect - ld b, a - ld a, [de] - cp [hl] ; most significant bytes comparison is ignored - ; causes the move to miss if max HP is 255 or 511 points higher than the current HP - inc de - inc hl - ld a, [de] - sbc [hl] - jp z, .failed ; no effect if user's HP is already at its maximum - ld a, b - cp REST - jr nz, .healHP - push hl - push de - push af - ld c, 50 - call DelayFrames - ld hl, wBattleMonStatus - ld a, [H_WHOSETURN] - and a - jr z, .restEffect - ld hl, wEnemyMonStatus -.restEffect - ld a, [hl] - and a - ld [hl], 2 ; clear status and set number of turns asleep to 2 - ld hl, StartedSleepingEffect ; if mon didn't have an status - jr z, .printRestText - ld hl, FellAsleepBecameHealthyText ; if mon had an status -.printRestText - call PrintText - pop af - pop de - pop hl -.healHP - ld a, [hld] - ld [wHPBarMaxHP], a - ld c, a - ld a, [hl] - ld [wHPBarMaxHP+1], a - ld b, a - jr z, .gotHPAmountToHeal -; Recover and Softboiled only heal for half the mon's max HP - srl b - rr c -.gotHPAmountToHeal -; update HP - ld a, [de] - ld [wHPBarOldHP], a - add c - ld [de], a - ld [wHPBarNewHP], a - dec de - ld a, [de] - ld [wHPBarOldHP+1], a - adc b - ld [de], a - ld [wHPBarNewHP+1], a - inc hl - inc de - ld a, [de] - dec de - sub [hl] - dec hl - ld a, [de] - sbc [hl] - jr c, .playAnim -; copy max HP to current HP if an overflow occurred - ld a, [hli] - ld [de], a - ld [wHPBarNewHP+1], a - inc de - ld a, [hl] - ld [de], a - ld [wHPBarNewHP], a -.playAnim - ld hl, PlayCurrentMoveAnimation - call BankswitchEtoF - ld a, [H_WHOSETURN] - and a - coord hl, 10, 9 - ld a, $1 - jr z, .updateHPBar - coord hl, 2, 2 - xor a -.updateHPBar - ld [wHPBarType], a - predef UpdateHPBar2 - ld hl, DrawHUDsAndHPBars - call BankswitchEtoF - ld hl, RegainedHealthText - jp PrintText -.failed - ld c, 50 - call DelayFrames - ld hl, PrintButItFailedText_ - jp BankswitchEtoF - -StartedSleepingEffect: - TX_FAR _StartedSleepingEffect - db "@" - -FellAsleepBecameHealthyText: - TX_FAR _FellAsleepBecameHealthyText - db "@" - -RegainedHealthText: - TX_FAR _RegainedHealthText - db "@" diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/moveEffects/leech_seed_effect.asm deleted file mode 100644 index f4d3ee9c..00000000 --- a/engine/battle/moveEffects/leech_seed_effect.asm +++ /dev/null @@ -1,40 +0,0 @@ -LeechSeedEffect_: - callab MoveHitTest - ld a, [wMoveMissed] - and a - jr nz, .moveMissed - ld hl, wEnemyBattleStatus2 - ld de, wEnemyMonType1 - ld a, [H_WHOSETURN] - and a - jr z, .leechSeedEffect - ld hl, wPlayerBattleStatus2 - ld de, wBattleMonType1 -.leechSeedEffect -; miss if the target is grass-type or already seeded - ld a, [de] - cp GRASS - jr z, .moveMissed - inc de - ld a, [de] - cp GRASS - jr z, .moveMissed - bit SEEDED, [hl] - jr nz, .moveMissed - set SEEDED, [hl] - callab PlayCurrentMoveAnimation - ld hl, WasSeededText - jp PrintText -.moveMissed - ld c, 50 - call DelayFrames - ld hl, EvadedAttackText - jp PrintText - -WasSeededText: - TX_FAR _WasSeededText - db "@" - -EvadedAttackText: - TX_FAR _EvadedAttackText - db "@" diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm deleted file mode 100644 index 65070a3e..00000000 --- a/engine/battle/moveEffects/mist_effect.asm +++ /dev/null @@ -1,19 +0,0 @@ -MistEffect_: - ld hl, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .mistEffect - ld hl, wEnemyBattleStatus2 -.mistEffect - bit PROTECTED_BY_MIST, [hl] ; is mon protected by mist? - jr nz, .mistAlreadyInUse - set PROTECTED_BY_MIST, [hl] ; mon is now protected by mist - callab PlayCurrentMoveAnimation - ld hl, ShroudedInMistText - jp PrintText -.mistAlreadyInUse - jpab PrintButItFailedText_ - -ShroudedInMistText: - TX_FAR _ShroudedInMistText - db "@" diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm deleted file mode 100644 index 827e2197..00000000 --- a/engine/battle/moveEffects/one_hit_ko_effect.asm +++ /dev/null @@ -1,38 +0,0 @@ -OneHitKOEffect_: - ld hl, wDamage - xor a - ld [hli], a - ld [hl], a ; set the damage output to zero - dec a - ld [wCriticalHitOrOHKO], a - ld hl, wBattleMonSpeed + 1 - ld de, wEnemyMonSpeed + 1 - ld a, [H_WHOSETURN] - and a - jr z, .compareSpeed - ld hl, wEnemyMonSpeed + 1 - ld de, wBattleMonSpeed + 1 -.compareSpeed -; set damage to 65535 and OHKO flag is the user's current speed is higher than the target's - ld a, [de] - dec de - ld b, a - ld a, [hld] - sub b - ld a, [de] - ld b, a - ld a, [hl] - sbc b - jr c, .userIsSlower - ld hl, wDamage - ld a, $ff - ld [hli], a - ld [hl], a - ld a, $2 - ld [wCriticalHitOrOHKO], a - ret -.userIsSlower -; keep damage at 0 and set move missed flag if target's current speed is higher instead - ld a, $1 - ld [wMoveMissed], a - ret diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm deleted file mode 100644 index 95979ae6..00000000 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ /dev/null @@ -1,47 +0,0 @@ -ParalyzeEffect_: - ld hl, wEnemyMonStatus - ld de, wPlayerMoveType - ld a, [H_WHOSETURN] - and a - jp z, .next - ld hl, wBattleMonStatus - ld de, wEnemyMoveType -.next - ld a, [hl] - and a ; does the target already have a status ailment? - jr nz, .didntAffect -; check if the target is immune due to types - ld a, [de] - cp ELECTRIC - jr nz, .hitTest - ld b, h - ld c, l - inc bc - ld a, [bc] - cp GROUND - jr z, .doesntAffect - inc bc - ld a, [bc] - cp GROUND - jr z, .doesntAffect -.hitTest - push hl - callab MoveHitTest - pop hl - ld a, [wMoveMissed] - and a - jr nz, .didntAffect - set PAR, [hl] - callab QuarterSpeedDueToParalysis - ld c, 30 - call DelayFrames - callab PlayCurrentMoveAnimation - jpab PrintMayNotAttackText -.didntAffect - ld c, 50 - call DelayFrames - jpab PrintDidntAffectText -.doesntAffect - ld c, 50 - call DelayFrames - jpab PrintDoesntAffectText diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm deleted file mode 100644 index e5daf014..00000000 --- a/engine/battle/moveEffects/pay_day_effect.asm +++ /dev/null @@ -1,45 +0,0 @@ -PayDayEffect_: - xor a - ld hl, wcd6d - ld [hli], a - ld a, [H_WHOSETURN] - and a - ld a, [wBattleMonLevel] - jr z, .payDayEffect - ld a, [wEnemyMonLevel] -.payDayEffect -; level * 2 - add a - ld [H_DIVIDEND + 3], a - xor a - ld [H_DIVIDEND], a - ld [H_DIVIDEND + 1], a - ld [H_DIVIDEND + 2], a -; convert to BCD - ld a, 100 - ld [H_DIVISOR], a - ld b, $4 - call Divide - ld a, [H_QUOTIENT + 3] - ld [hli], a - ld a, [H_REMAINDER] - ld [H_DIVIDEND + 3], a - ld a, 10 - ld [H_DIVISOR], a - ld b, $4 - call Divide - ld a, [H_QUOTIENT + 3] - swap a - ld b, a - ld a, [H_REMAINDER] - add b - ld [hl], a - ld de, wTotalPayDayMoney + 2 - ld c, $3 - predef AddBCDPredef - ld hl, CoinsScatteredText - jp PrintText - -CoinsScatteredText: - TX_FAR _CoinsScatteredText - db "@" diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm deleted file mode 100644 index 0f2f087b..00000000 --- a/engine/battle/moveEffects/recoil_effect.asm +++ /dev/null @@ -1,70 +0,0 @@ -RecoilEffect_: - ld a, [H_WHOSETURN] - and a - ld a, [wPlayerMoveNum] - ld hl, wBattleMonMaxHP - jr z, .recoilEffect - ld a, [wEnemyMoveNum] - ld hl, wEnemyMonMaxHP -.recoilEffect - ld d, a - ld a, [wDamage] - ld b, a - ld a, [wDamage + 1] - ld c, a - srl b - rr c - ld a, d - cp STRUGGLE ; struggle deals 50% recoil damage - jr z, .gotRecoilDamage - srl b - rr c -.gotRecoilDamage - ld a, b - or c - jr nz, .updateHP - inc c ; minimum recoil damage is 1 -.updateHP -; subtract HP from user due to the recoil damage - ld a, [hli] - ld [wHPBarMaxHP+1], a - ld a, [hl] - ld [wHPBarMaxHP], a - push bc - ld bc, wBattleMonHP - wBattleMonMaxHP - add hl, bc - pop bc - ld a, [hl] - ld [wHPBarOldHP], a - sub c - ld [hld], a - ld [wHPBarNewHP], a - ld a, [hl] - ld [wHPBarOldHP+1], a - sbc b - ld [hl], a - ld [wHPBarNewHP+1], a - jr nc, .getHPBarCoords -; if recoil damage is higher than the Pokemon's HP, set its HP to 0 - xor a - ld [hli], a - ld [hl], a - ld hl, wHPBarNewHP - ld [hli], a - ld [hl], a -.getHPBarCoords - coord hl, 10, 9 - ld a, [H_WHOSETURN] - and a - ld a, $1 - jr z, .updateHPBar - coord hl, 2, 2 - xor a -.updateHPBar - ld [wHPBarType], a - predef UpdateHPBar2 - ld hl, HitWithRecoilText - jp PrintText -HitWithRecoilText: - TX_FAR _HitWithRecoilText - db "@" diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm deleted file mode 100644 index 2805a969..00000000 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ /dev/null @@ -1,45 +0,0 @@ -ReflectLightScreenEffect_: - ld hl, wPlayerBattleStatus3 - ld de, wPlayerMoveEffect - ld a, [H_WHOSETURN] - and a - jr z, .reflectLightScreenEffect - ld hl, wEnemyBattleStatus3 - ld de, wEnemyMoveEffect -.reflectLightScreenEffect - ld a, [de] - cp LIGHT_SCREEN_EFFECT - jr nz, .reflect - bit HAS_LIGHT_SCREEN_UP, [hl] ; is mon already protected by light screen? - jr nz, .moveFailed - set HAS_LIGHT_SCREEN_UP, [hl] ; mon is now protected by light screen - ld hl, LightScreenProtectedText - jr .playAnim -.reflect - bit HAS_REFLECT_UP, [hl] ; is mon already protected by reflect? - jr nz, .moveFailed - set HAS_REFLECT_UP, [hl] ; mon is now protected by reflect - ld hl, ReflectGainedArmorText -.playAnim - push hl - ld hl, PlayCurrentMoveAnimation - call BankswitchEtoF - pop hl - jp PrintText -.moveFailed - ld c, 50 - call DelayFrames - ld hl, PrintButItFailedText_ - jp BankswitchEtoF - -LightScreenProtectedText: - TX_FAR _LightScreenProtectedText - db "@" - -ReflectGainedArmorText: - TX_FAR _ReflectGainedArmorText - db "@" - -BankswitchEtoF: - ld b, BANK(BattleCore) - jp Bankswitch diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm deleted file mode 100644 index b5d006fc..00000000 --- a/engine/battle/moveEffects/substitute_effect.asm +++ /dev/null @@ -1,77 +0,0 @@ -SubstituteEffect_: - ld c, 50 - call DelayFrames - ld hl, wBattleMonMaxHP - ld de, wPlayerSubstituteHP - ld bc, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .notEnemy - ld hl, wEnemyMonMaxHP - ld de, wEnemySubstituteHP - ld bc, wEnemyBattleStatus2 -.notEnemy - ld a, [bc] - bit HAS_SUBSTITUTE_UP, a ; user already has substitute? - jr nz, .alreadyHasSubstitute -; quarter health to remove from user -; assumes max HP is 1023 or lower - push bc - ld a, [hli] - ld b, [hl] - srl a - rr b - srl a - rr b ; max hp / 4 - push de - ld de, wBattleMonHP - wBattleMonMaxHP - add hl, de ; point hl to current HP low byte - pop de - ld a, b - ld [de], a ; save copy of HP to subtract in ccd7/ccd8 [how much HP substitute has] - ld a, [hld] -; subtract [max hp / 4] to current HP - sub b - ld d, a - ld a, [hl] - sbc 0 - pop bc - jr c, .notEnoughHP ; underflow means user would be left with negative health - ; bug: since it only branches on carry, it will possibly leave user with 0 HP -.userHasZeroOrMoreHP - ldi [hl], a ; save resulting HP after subtraction into current HP - ld [hl], d - ld h, b - ld l, c - set HAS_SUBSTITUTE_UP, [hl] - ld a, [wOptions] - bit 7, a ; battle animation is enabled? - ld hl, PlayCurrentMoveAnimation - ld b, BANK(PlayCurrentMoveAnimation) - jr z, .animationEnabled - ld hl, AnimationSubstitute - ld b, BANK(AnimationSubstitute) -.animationEnabled - call Bankswitch ; jump to routine depending on animation setting - ld hl, SubstituteText - call PrintText - jpab DrawHUDsAndHPBars -.alreadyHasSubstitute - ld hl, HasSubstituteText - jr .printText -.notEnoughHP - ld hl, TooWeakSubstituteText -.printText - jp PrintText - -SubstituteText: - TX_FAR _SubstituteText - db "@" - -HasSubstituteText: - TX_FAR _HasSubstituteText - db "@" - -TooWeakSubstituteText: - TX_FAR _TooWeakSubstituteText - db "@" diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm deleted file mode 100644 index 9a5de9cc..00000000 --- a/engine/battle/moveEffects/transform_effect.asm +++ /dev/null @@ -1,148 +0,0 @@ -TransformEffect_: - ld hl, wBattleMonSpecies - ld de, wEnemyMonSpecies - ld bc, wEnemyBattleStatus3 - ld a, [wEnemyBattleStatus1] - ld a, [H_WHOSETURN] - and a - jr nz, .hitTest - ld hl, wEnemyMonSpecies - ld de, wBattleMonSpecies - ld bc, wPlayerBattleStatus3 - ld [wPlayerMoveListIndex], a - ld a, [wPlayerBattleStatus1] -.hitTest - bit INVULNERABLE, a ; is mon invulnerable to typical attacks? (fly/dig) - jp nz, .failed - push hl - push de - push bc - ld hl, wPlayerBattleStatus2 - ld a, [H_WHOSETURN] - and a - jr z, .transformEffect - ld hl, wEnemyBattleStatus2 -.transformEffect -; animation(s) played are different if target has Substitute up - bit HAS_SUBSTITUTE_UP, [hl] - push af - ld hl, HideSubstituteShowMonAnim - ld b, BANK(HideSubstituteShowMonAnim) - call nz, Bankswitch - ld a, [wOptions] - add a - ld hl, PlayCurrentMoveAnimation - ld b, BANK(PlayCurrentMoveAnimation) - jr nc, .gotAnimToPlay - ld hl, AnimationTransformMon - ld b, BANK(AnimationTransformMon) -.gotAnimToPlay - call Bankswitch - ld hl, ReshowSubstituteAnim - ld b, BANK(ReshowSubstituteAnim) - pop af - call nz, Bankswitch - pop bc - ld a, [bc] - set TRANSFORMED, a ; mon is now transformed - ld [bc], a - pop de - pop hl - push hl -; transform user into opposing Pokemon -; species - ld a, [hl] - ld [de], a -; type 1, type 2, catch rate, and moves - ld bc, $5 - add hl, bc - inc de - inc de - inc de - inc de - inc de - inc bc - inc bc - call CopyData - ld a, [H_WHOSETURN] - and a - jr z, .next -; save enemy mon DVs at wTransformedEnemyMonOriginalDVs - ld a, [de] - ld [wTransformedEnemyMonOriginalDVs], a - inc de - ld a, [de] - ld [wTransformedEnemyMonOriginalDVs + 1], a - dec de -.next -; DVs - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de -; Attack, Defense, Speed, and Special stats - inc hl - inc hl - inc hl - inc de - inc de - inc de - ld bc, $8 - call CopyData - ld bc, wBattleMonMoves - wBattleMonPP - add hl, bc ; ld hl, wBattleMonMoves - ld b, NUM_MOVES -.copyPPLoop -; 5 PP for all moves - ld a, [hli] - and a - jr z, .lessThanFourMoves - ld a, $5 - ld [de], a - inc de - dec b - jr nz, .copyPPLoop - jr .copyStats -.lessThanFourMoves -; 0 PP for blank moves - xor a - ld [de], a - inc de - dec b - jr nz, .lessThanFourMoves -.copyStats -; original (unmodified) stats and stat mods - pop hl - ld a, [hl] - ld [wd11e], a - call GetMonName - ld hl, wEnemyMonUnmodifiedAttack - ld de, wPlayerMonUnmodifiedAttack - call .copyBasedOnTurn ; original (unmodified) stats - ld hl, wEnemyMonStatMods - ld de, wPlayerMonStatMods - call .copyBasedOnTurn ; stat mods - ld hl, TransformedText - jp PrintText - -.copyBasedOnTurn - ld a, [H_WHOSETURN] - and a - jr z, .gotStatsOrModsToCopy - push hl - ld h, d - ld l, e - pop de -.gotStatsOrModsToCopy - ld bc, $8 - jp CopyData - -.failed - ld hl, PrintButItFailedText_ - jp BankswitchEtoF - -TransformedText: - TX_FAR _TransformedText - db "@" diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm new file mode 100644 index 00000000..1f64ec5b --- /dev/null +++ b/engine/battle/move_effects/conversion.asm @@ -0,0 +1,35 @@ +ConversionEffect_: + ld hl, wEnemyMonType1 + ld de, wBattleMonType1 + ldh a, [hWhoseTurn] + and a + ld a, [wEnemyBattleStatus1] + jr z, .conversionEffect + push hl + ld h, d + ld l, e + pop de + ld a, [wPlayerBattleStatus1] +.conversionEffect + bit INVULNERABLE, a ; is mon immune to typical attacks (dig/fly) + jr nz, PrintButItFailedText +; copy target's types to user + ld a, [hli] + ld [de], a + inc de + ld a, [hl] + ld [de], a + ld hl, PlayCurrentMoveAnimation + call CallBankF + ld hl, ConvertedTypeText + jp PrintText + +ConvertedTypeText: + text_far _ConvertedTypeText + text_end + +PrintButItFailedText: + ld hl, PrintButItFailedText_ +CallBankF: + ld b, BANK(PrintButItFailedText_) + jp Bankswitch diff --git a/engine/battle/move_effects/drain_hp.asm b/engine/battle/move_effects/drain_hp.asm new file mode 100644 index 00000000..04a585cc --- /dev/null +++ b/engine/battle/move_effects/drain_hp.asm @@ -0,0 +1,104 @@ +DrainHPEffect_: + ld hl, wDamage + ld a, [hl] + srl a ; divide damage by 2 + ld [hli], a + ld a, [hl] + rr a + ld [hld], a + or [hl] ; is damage 0? + jr nz, .getAttackerHP +; if damage is 0, increase to 1 so that the attacker gains at least 1 HP + inc hl + inc [hl] +.getAttackerHP + ld hl, wBattleMonHP + ld de, wBattleMonMaxHP + ldh a, [hWhoseTurn] + and a + jp z, .addDamageToAttackerHP + ld hl, wEnemyMonHP + ld de, wEnemyMonMaxHP +.addDamageToAttackerHP + ld bc, wHPBarOldHP+1 +; copy current HP to wHPBarOldHP + ld a, [hli] + ld [bc], a + ld a, [hl] + dec bc + ld [bc], a +; copy max HP to wHPBarMaxHP + ld a, [de] + dec bc + ld [bc], a + inc de + ld a, [de] + dec bc + ld [bc], a +; add damage to attacker's HP and copy new HP to wHPBarNewHP + ld a, [wDamage + 1] + ld b, [hl] + add b + ld [hld], a + ld [wHPBarNewHP], a + ld a, [wDamage] + ld b, [hl] + adc b + ld [hli], a + ld [wHPBarNewHP+1], a + jr c, .capToMaxHP ; if HP > 65,535, cap to max HP +; compare HP with max HP + ld a, [hld] + ld b, a + ld a, [de] + dec de + sub b + ld a, [hli] + ld b, a + ld a, [de] + inc de + sbc b + jr nc, .next +.capToMaxHP + ld a, [de] + ld [hld], a + ld [wHPBarNewHP], a + dec de + ld a, [de] + ld [hli], a + ld [wHPBarNewHP+1], a + inc de +.next + ldh a, [hWhoseTurn] + and a + hlcoord 10, 9 + ld a, $1 + jr z, .next2 + hlcoord 2, 2 + xor a +.next2 + ld [wHPBarType], a + predef UpdateHPBar2 + predef DrawPlayerHUDAndHPBar + predef DrawEnemyHUDAndHPBar + callfar ReadPlayerMonCurHPAndStatus + ld hl, SuckedHealthText + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveEffect] + jr z, .next3 + ld a, [wEnemyMoveEffect] +.next3 + cp DREAM_EATER_EFFECT + jr nz, .printText + ld hl, DreamWasEatenText +.printText + jp PrintText + +SuckedHealthText: + text_far _SuckedHealthText + text_end + +DreamWasEatenText: + text_far _DreamWasEatenText + text_end diff --git a/engine/battle/move_effects/focus_energy.asm b/engine/battle/move_effects/focus_energy.asm new file mode 100644 index 00000000..1fafe920 --- /dev/null +++ b/engine/battle/move_effects/focus_energy.asm @@ -0,0 +1,22 @@ +FocusEnergyEffect_: + ld hl, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .notEnemy + ld hl, wEnemyBattleStatus2 +.notEnemy + bit GETTING_PUMPED, [hl] ; is mon already using focus energy? + jr nz, .alreadyUsing + set GETTING_PUMPED, [hl] ; mon is now using focus energy + callfar PlayCurrentMoveAnimation + ld hl, GettingPumpedText + jp PrintText +.alreadyUsing + ld c, 50 + call DelayFrames + jpfar PrintButItFailedText_ + +GettingPumpedText: + text_pause + text_far _GettingPumpedText + text_end diff --git a/engine/battle/move_effects/haze.asm b/engine/battle/move_effects/haze.asm new file mode 100644 index 00000000..915eeed8 --- /dev/null +++ b/engine/battle/move_effects/haze.asm @@ -0,0 +1,81 @@ +HazeEffect_: + ld a, $7 +; store 7 on every stat mod + ld hl, wPlayerMonAttackMod + call ResetStatMods + ld hl, wEnemyMonAttackMod + call ResetStatMods +; copy unmodified stats to battle stats + ld hl, wPlayerMonUnmodifiedAttack + ld de, wBattleMonAttack + call ResetStats + ld hl, wEnemyMonUnmodifiedAttack + ld de, wEnemyMonAttack + call ResetStats +; cure non-volatile status, but only for the target + ld hl, wEnemyMonStatus + ld de, wEnemySelectedMove + ldh a, [hWhoseTurn] + and a + jr z, .cureStatuses + ld hl, wBattleMonStatus + dec de ; wPlayerSelectedMove + +.cureStatuses + ld a, [hl] + ld [hl], $0 + and SLP | (1 << FRZ) + jr z, .cureVolatileStatuses +; prevent the Pokemon from executing a move if it was asleep or frozen + ld a, $ff + ld [de], a + +.cureVolatileStatuses + xor a + ld [wPlayerDisabledMove], a + ld [wEnemyDisabledMove], a + ld hl, wPlayerDisabledMoveNumber + ld [hli], a + ld [hl], a + ld hl, wPlayerBattleStatus1 + call CureVolatileStatuses + ld hl, wEnemyBattleStatus1 + call CureVolatileStatuses + ld hl, PlayCurrentMoveAnimation + call CallBankF + ld hl, StatusChangesEliminatedText + jp PrintText + +CureVolatileStatuses: + res CONFUSED, [hl] + inc hl ; BATTSTATUS2 + ld a, [hl] + ; clear USING_X_ACCURACY, PROTECTED_BY_MIST, GETTING_PUMPED, and SEEDED statuses + and $ff ^((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) + ld [hli], a ; BATTSTATUS3 + ld a, [hl] + and %11110000 | (1 << TRANSFORMED) ; clear Bad Poison, Reflect and Light Screen statuses + ld [hl], a + ret + +ResetStatMods: + ld b, $8 +.loop + ld [hli], a + dec b + jr nz, .loop + ret + +ResetStats: + ld b, $8 +.loop + ld a, [hli] + ld [de], a + inc de + dec b + jr nz, .loop + ret + +StatusChangesEliminatedText: + text_far _StatusChangesEliminatedText + text_end diff --git a/engine/battle/move_effects/heal.asm b/engine/battle/move_effects/heal.asm new file mode 100644 index 00000000..c3ffda65 --- /dev/null +++ b/engine/battle/move_effects/heal.asm @@ -0,0 +1,120 @@ +HealEffect_: + ldh a, [hWhoseTurn] + and a + ld de, wBattleMonHP + ld hl, wBattleMonMaxHP + ld a, [wPlayerMoveNum] + jr z, .healEffect + ld de, wEnemyMonHP + ld hl, wEnemyMonMaxHP + ld a, [wEnemyMoveNum] +.healEffect + ld b, a + ld a, [de] + cp [hl] ; most significant bytes comparison is ignored + ; causes the move to miss if max HP is 255 or 511 points higher than the current HP + inc de + inc hl + ld a, [de] + sbc [hl] + jp z, .failed ; no effect if user's HP is already at its maximum + ld a, b + cp REST + jr nz, .healHP + push hl + push de + push af + ld c, 50 + call DelayFrames + ld hl, wBattleMonStatus + ldh a, [hWhoseTurn] + and a + jr z, .restEffect + ld hl, wEnemyMonStatus +.restEffect + ld a, [hl] + and a + ld [hl], 2 ; clear status and set number of turns asleep to 2 + ld hl, StartedSleepingEffect ; if mon didn't have an status + jr z, .printRestText + ld hl, FellAsleepBecameHealthyText ; if mon had an status +.printRestText + call PrintText + pop af + pop de + pop hl +.healHP + ld a, [hld] + ld [wHPBarMaxHP], a + ld c, a + ld a, [hl] + ld [wHPBarMaxHP+1], a + ld b, a + jr z, .gotHPAmountToHeal +; Recover and Softboiled only heal for half the mon's max HP + srl b + rr c +.gotHPAmountToHeal +; update HP + ld a, [de] + ld [wHPBarOldHP], a + add c + ld [de], a + ld [wHPBarNewHP], a + dec de + ld a, [de] + ld [wHPBarOldHP+1], a + adc b + ld [de], a + ld [wHPBarNewHP+1], a + inc hl + inc de + ld a, [de] + dec de + sub [hl] + dec hl + ld a, [de] + sbc [hl] + jr c, .playAnim +; copy max HP to current HP if an overflow occurred + ld a, [hli] + ld [de], a + ld [wHPBarNewHP+1], a + inc de + ld a, [hl] + ld [de], a + ld [wHPBarNewHP], a +.playAnim + ld hl, PlayCurrentMoveAnimation + call EffectCallBattleCore + ldh a, [hWhoseTurn] + and a + hlcoord 10, 9 + ld a, $1 + jr z, .updateHPBar + hlcoord 2, 2 + xor a +.updateHPBar + ld [wHPBarType], a + predef UpdateHPBar2 + ld hl, DrawHUDsAndHPBars + call EffectCallBattleCore + ld hl, RegainedHealthText + jp PrintText +.failed + ld c, 50 + call DelayFrames + ld hl, PrintButItFailedText_ + jp EffectCallBattleCore + +StartedSleepingEffect: + text_far _StartedSleepingEffect + text_end + +FellAsleepBecameHealthyText: + text_far _FellAsleepBecameHealthyText + text_end + +RegainedHealthText: + text_far _RegainedHealthText + text_end diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm new file mode 100644 index 00000000..61bd982a --- /dev/null +++ b/engine/battle/move_effects/leech_seed.asm @@ -0,0 +1,40 @@ +LeechSeedEffect_: + callfar MoveHitTest + ld a, [wMoveMissed] + and a + jr nz, .moveMissed + ld hl, wEnemyBattleStatus2 + ld de, wEnemyMonType1 + ldh a, [hWhoseTurn] + and a + jr z, .leechSeedEffect + ld hl, wPlayerBattleStatus2 + ld de, wBattleMonType1 +.leechSeedEffect +; miss if the target is grass-type or already seeded + ld a, [de] + cp GRASS + jr z, .moveMissed + inc de + ld a, [de] + cp GRASS + jr z, .moveMissed + bit SEEDED, [hl] + jr nz, .moveMissed + set SEEDED, [hl] + callfar PlayCurrentMoveAnimation + ld hl, WasSeededText + jp PrintText +.moveMissed + ld c, 50 + call DelayFrames + ld hl, EvadedAttackText + jp PrintText + +WasSeededText: + text_far _WasSeededText + text_end + +EvadedAttackText: + text_far _EvadedAttackText + text_end diff --git a/engine/battle/move_effects/mist.asm b/engine/battle/move_effects/mist.asm new file mode 100644 index 00000000..163d386f --- /dev/null +++ b/engine/battle/move_effects/mist.asm @@ -0,0 +1,19 @@ +MistEffect_: + ld hl, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .mistEffect + ld hl, wEnemyBattleStatus2 +.mistEffect + bit PROTECTED_BY_MIST, [hl] ; is mon protected by mist? + jr nz, .mistAlreadyInUse + set PROTECTED_BY_MIST, [hl] ; mon is now protected by mist + callfar PlayCurrentMoveAnimation + ld hl, ShroudedInMistText + jp PrintText +.mistAlreadyInUse + jpfar PrintButItFailedText_ + +ShroudedInMistText: + text_far _ShroudedInMistText + text_end diff --git a/engine/battle/move_effects/one_hit_ko.asm b/engine/battle/move_effects/one_hit_ko.asm new file mode 100644 index 00000000..7e5db0f7 --- /dev/null +++ b/engine/battle/move_effects/one_hit_ko.asm @@ -0,0 +1,38 @@ +OneHitKOEffect_: + ld hl, wDamage + xor a + ld [hli], a + ld [hl], a ; set the damage output to zero + dec a + ld [wCriticalHitOrOHKO], a + ld hl, wBattleMonSpeed + 1 + ld de, wEnemyMonSpeed + 1 + ldh a, [hWhoseTurn] + and a + jr z, .compareSpeed + ld hl, wEnemyMonSpeed + 1 + ld de, wBattleMonSpeed + 1 +.compareSpeed +; set damage to 65535 and OHKO flag is the user's current speed is higher than the target's + ld a, [de] + dec de + ld b, a + ld a, [hld] + sub b + ld a, [de] + ld b, a + ld a, [hl] + sbc b + jr c, .userIsSlower + ld hl, wDamage + ld a, $ff + ld [hli], a + ld [hl], a + ld a, $2 + ld [wCriticalHitOrOHKO], a + ret +.userIsSlower +; keep damage at 0 and set move missed flag if target's current speed is higher instead + ld a, $1 + ld [wMoveMissed], a + ret diff --git a/engine/battle/move_effects/paralyze.asm b/engine/battle/move_effects/paralyze.asm new file mode 100644 index 00000000..dbaa0fb8 --- /dev/null +++ b/engine/battle/move_effects/paralyze.asm @@ -0,0 +1,47 @@ +ParalyzeEffect_: + ld hl, wEnemyMonStatus + ld de, wPlayerMoveType + ldh a, [hWhoseTurn] + and a + jp z, .next + ld hl, wBattleMonStatus + ld de, wEnemyMoveType +.next + ld a, [hl] + and a ; does the target already have a status ailment? + jr nz, .didntAffect +; check if the target is immune due to types + ld a, [de] + cp ELECTRIC + jr nz, .hitTest + ld b, h + ld c, l + inc bc + ld a, [bc] + cp GROUND + jr z, .doesntAffect + inc bc + ld a, [bc] + cp GROUND + jr z, .doesntAffect +.hitTest + push hl + callfar MoveHitTest + pop hl + ld a, [wMoveMissed] + and a + jr nz, .didntAffect + set PAR, [hl] + callfar QuarterSpeedDueToParalysis + ld c, 30 + call DelayFrames + callfar PlayCurrentMoveAnimation + jpfar PrintMayNotAttackText +.didntAffect + ld c, 50 + call DelayFrames + jpfar PrintDidntAffectText +.doesntAffect + ld c, 50 + call DelayFrames + jpfar PrintDoesntAffectText diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm new file mode 100644 index 00000000..fa373038 --- /dev/null +++ b/engine/battle/move_effects/pay_day.asm @@ -0,0 +1,45 @@ +PayDayEffect_: + xor a + ld hl, wcd6d + ld [hli], a + ldh a, [hWhoseTurn] + and a + ld a, [wBattleMonLevel] + jr z, .payDayEffect + ld a, [wEnemyMonLevel] +.payDayEffect +; level * 2 + add a + ldh [hDividend + 3], a + xor a + ldh [hDividend], a + ldh [hDividend + 1], a + ldh [hDividend + 2], a +; convert to BCD + ld a, 100 + ldh [hDivisor], a + ld b, $4 + call Divide + ldh a, [hQuotient + 3] + ld [hli], a + ldh a, [hRemainder] + ldh [hDividend + 3], a + ld a, 10 + ldh [hDivisor], a + ld b, $4 + call Divide + ldh a, [hQuotient + 3] + swap a + ld b, a + ldh a, [hRemainder] + add b + ld [hl], a + ld de, wTotalPayDayMoney + 2 + ld c, $3 + predef AddBCDPredef + ld hl, CoinsScatteredText + jp PrintText + +CoinsScatteredText: + text_far _CoinsScatteredText + text_end diff --git a/engine/battle/move_effects/recoil.asm b/engine/battle/move_effects/recoil.asm new file mode 100644 index 00000000..85110d50 --- /dev/null +++ b/engine/battle/move_effects/recoil.asm @@ -0,0 +1,70 @@ +RecoilEffect_: + ldh a, [hWhoseTurn] + and a + ld a, [wPlayerMoveNum] + ld hl, wBattleMonMaxHP + jr z, .recoilEffect + ld a, [wEnemyMoveNum] + ld hl, wEnemyMonMaxHP +.recoilEffect + ld d, a + ld a, [wDamage] + ld b, a + ld a, [wDamage + 1] + ld c, a + srl b + rr c + ld a, d + cp STRUGGLE ; struggle deals 50% recoil damage + jr z, .gotRecoilDamage + srl b + rr c +.gotRecoilDamage + ld a, b + or c + jr nz, .updateHP + inc c ; minimum recoil damage is 1 +.updateHP +; subtract HP from user due to the recoil damage + ld a, [hli] + ld [wHPBarMaxHP+1], a + ld a, [hl] + ld [wHPBarMaxHP], a + push bc + ld bc, wBattleMonHP - wBattleMonMaxHP + add hl, bc + pop bc + ld a, [hl] + ld [wHPBarOldHP], a + sub c + ld [hld], a + ld [wHPBarNewHP], a + ld a, [hl] + ld [wHPBarOldHP+1], a + sbc b + ld [hl], a + ld [wHPBarNewHP+1], a + jr nc, .getHPBarCoords +; if recoil damage is higher than the Pokemon's HP, set its HP to 0 + xor a + ld [hli], a + ld [hl], a + ld hl, wHPBarNewHP + ld [hli], a + ld [hl], a +.getHPBarCoords + hlcoord 10, 9 + ldh a, [hWhoseTurn] + and a + ld a, $1 + jr z, .updateHPBar + hlcoord 2, 2 + xor a +.updateHPBar + ld [wHPBarType], a + predef UpdateHPBar2 + ld hl, HitWithRecoilText + jp PrintText +HitWithRecoilText: + text_far _HitWithRecoilText + text_end diff --git a/engine/battle/move_effects/reflect_light_screen.asm b/engine/battle/move_effects/reflect_light_screen.asm new file mode 100644 index 00000000..46c299e9 --- /dev/null +++ b/engine/battle/move_effects/reflect_light_screen.asm @@ -0,0 +1,45 @@ +ReflectLightScreenEffect_: + ld hl, wPlayerBattleStatus3 + ld de, wPlayerMoveEffect + ldh a, [hWhoseTurn] + and a + jr z, .reflectLightScreenEffect + ld hl, wEnemyBattleStatus3 + ld de, wEnemyMoveEffect +.reflectLightScreenEffect + ld a, [de] + cp LIGHT_SCREEN_EFFECT + jr nz, .reflect + bit HAS_LIGHT_SCREEN_UP, [hl] ; is mon already protected by light screen? + jr nz, .moveFailed + set HAS_LIGHT_SCREEN_UP, [hl] ; mon is now protected by light screen + ld hl, LightScreenProtectedText + jr .playAnim +.reflect + bit HAS_REFLECT_UP, [hl] ; is mon already protected by reflect? + jr nz, .moveFailed + set HAS_REFLECT_UP, [hl] ; mon is now protected by reflect + ld hl, ReflectGainedArmorText +.playAnim + push hl + ld hl, PlayCurrentMoveAnimation + call EffectCallBattleCore + pop hl + jp PrintText +.moveFailed + ld c, 50 + call DelayFrames + ld hl, PrintButItFailedText_ + jp EffectCallBattleCore + +LightScreenProtectedText: + text_far _LightScreenProtectedText + text_end + +ReflectGainedArmorText: + text_far _ReflectGainedArmorText + text_end + +EffectCallBattleCore: + ld b, BANK(BattleCore) + jp Bankswitch diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm new file mode 100644 index 00000000..860b76b6 --- /dev/null +++ b/engine/battle/move_effects/substitute.asm @@ -0,0 +1,77 @@ +SubstituteEffect_: + ld c, 50 + call DelayFrames + ld hl, wBattleMonMaxHP + ld de, wPlayerSubstituteHP + ld bc, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .notEnemy + ld hl, wEnemyMonMaxHP + ld de, wEnemySubstituteHP + ld bc, wEnemyBattleStatus2 +.notEnemy + ld a, [bc] + bit HAS_SUBSTITUTE_UP, a ; user already has substitute? + jr nz, .alreadyHasSubstitute +; quarter health to remove from user +; assumes max HP is 1023 or lower + push bc + ld a, [hli] + ld b, [hl] + srl a + rr b + srl a + rr b ; max hp / 4 + push de + ld de, wBattleMonHP - wBattleMonMaxHP + add hl, de ; point hl to current HP low byte + pop de + ld a, b + ld [de], a ; save copy of HP to subtract in wPlayerSubstituteHP/wEnemySubstituteHP + ld a, [hld] +; subtract [max hp / 4] to current HP + sub b + ld d, a + ld a, [hl] + sbc 0 + pop bc + jr c, .notEnoughHP ; underflow means user would be left with negative health + ; bug: since it only branches on carry, it will possibly leave user with 0 HP +.userHasZeroOrMoreHP + ldi [hl], a ; save resulting HP after subtraction into current HP + ld [hl], d + ld h, b + ld l, c + set HAS_SUBSTITUTE_UP, [hl] + ld a, [wOptions] + bit 7, a ; battle animation is enabled? + ld hl, PlayCurrentMoveAnimation + ld b, BANK(PlayCurrentMoveAnimation) + jr z, .animationEnabled + ld hl, AnimationSubstitute + ld b, BANK(AnimationSubstitute) +.animationEnabled + call Bankswitch ; jump to routine depending on animation setting + ld hl, SubstituteText + call PrintText + jpfar DrawHUDsAndHPBars +.alreadyHasSubstitute + ld hl, HasSubstituteText + jr .printText +.notEnoughHP + ld hl, TooWeakSubstituteText +.printText + jp PrintText + +SubstituteText: + text_far _SubstituteText + text_end + +HasSubstituteText: + text_far _HasSubstituteText + text_end + +TooWeakSubstituteText: + text_far _TooWeakSubstituteText + text_end diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm new file mode 100644 index 00000000..56dda7f4 --- /dev/null +++ b/engine/battle/move_effects/transform.asm @@ -0,0 +1,148 @@ +TransformEffect_: + ld hl, wBattleMonSpecies + ld de, wEnemyMonSpecies + ld bc, wEnemyBattleStatus3 + ld a, [wEnemyBattleStatus1] + ldh a, [hWhoseTurn] + and a + jr nz, .hitTest + ld hl, wEnemyMonSpecies + ld de, wBattleMonSpecies + ld bc, wPlayerBattleStatus3 + ld [wPlayerMoveListIndex], a + ld a, [wPlayerBattleStatus1] +.hitTest + bit INVULNERABLE, a ; is mon invulnerable to typical attacks? (fly/dig) + jp nz, .failed + push hl + push de + push bc + ld hl, wPlayerBattleStatus2 + ldh a, [hWhoseTurn] + and a + jr z, .transformEffect + ld hl, wEnemyBattleStatus2 +.transformEffect +; animation(s) played are different if target has Substitute up + bit HAS_SUBSTITUTE_UP, [hl] + push af + ld hl, HideSubstituteShowMonAnim + ld b, BANK(HideSubstituteShowMonAnim) + call nz, Bankswitch + ld a, [wOptions] + add a + ld hl, PlayCurrentMoveAnimation + ld b, BANK(PlayCurrentMoveAnimation) + jr nc, .gotAnimToPlay + ld hl, AnimationTransformMon + ld b, BANK(AnimationTransformMon) +.gotAnimToPlay + call Bankswitch + ld hl, ReshowSubstituteAnim + ld b, BANK(ReshowSubstituteAnim) + pop af + call nz, Bankswitch + pop bc + ld a, [bc] + set TRANSFORMED, a ; mon is now transformed + ld [bc], a + pop de + pop hl + push hl +; transform user into opposing Pokemon +; species + ld a, [hl] + ld [de], a +; type 1, type 2, catch rate, and moves + ld bc, $5 + add hl, bc + inc de + inc de + inc de + inc de + inc de + inc bc + inc bc + call CopyData + ldh a, [hWhoseTurn] + and a + jr z, .next +; save enemy mon DVs at wTransformedEnemyMonOriginalDVs + ld a, [de] + ld [wTransformedEnemyMonOriginalDVs], a + inc de + ld a, [de] + ld [wTransformedEnemyMonOriginalDVs + 1], a + dec de +.next +; DVs + ld a, [hli] + ld [de], a + inc de + ld a, [hli] + ld [de], a + inc de +; Attack, Defense, Speed, and Special stats + inc hl + inc hl + inc hl + inc de + inc de + inc de + ld bc, $8 + call CopyData + ld bc, wBattleMonMoves - wBattleMonPP + add hl, bc ; ld hl, wBattleMonMoves + ld b, NUM_MOVES +.copyPPLoop +; 5 PP for all moves + ld a, [hli] + and a + jr z, .lessThanFourMoves + ld a, $5 + ld [de], a + inc de + dec b + jr nz, .copyPPLoop + jr .copyStats +.lessThanFourMoves +; 0 PP for blank moves + xor a + ld [de], a + inc de + dec b + jr nz, .lessThanFourMoves +.copyStats +; original (unmodified) stats and stat mods + pop hl + ld a, [hl] + ld [wd11e], a + call GetMonName + ld hl, wEnemyMonUnmodifiedAttack + ld de, wPlayerMonUnmodifiedAttack + call .copyBasedOnTurn ; original (unmodified) stats + ld hl, wEnemyMonStatMods + ld de, wPlayerMonStatMods + call .copyBasedOnTurn ; stat mods + ld hl, TransformedText + jp PrintText + +.copyBasedOnTurn + ldh a, [hWhoseTurn] + and a + jr z, .gotStatsOrModsToCopy + push hl + ld h, d + ld l, e + pop de +.gotStatsOrModsToCopy + ld bc, $8 + jp CopyData + +.failed + ld hl, PrintButItFailedText_ + jp EffectCallBattleCore + +TransformedText: + text_far _TransformedText + text_end diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm index f717f871..7da0dc8c 100644 --- a/engine/battle/print_type.asm +++ b/engine/battle/print_type.asm @@ -49,4 +49,4 @@ PrintType_: pop hl jp PlaceString -INCLUDE "text/type_names.asm" +INCLUDE "data/types/names.asm" diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm old mode 100755 new mode 100644 index ba00083b..a0132a4f --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -16,7 +16,7 @@ ReadTrainer: ; get the pointer to trainer data for this class ld a, [wCurOpponent] - sub $C9 ; convert value from pokemon to trainer + sub OPP_ID_OFFSET + 1 ; convert value from pokemon to trainer add a ld hl, TrainerDataPointers ld c, a @@ -79,7 +79,7 @@ ReadTrainer: pop hl jr .SpecialTrainer .AddLoneMove -; does the trainer have a single monster with a different move +; does the trainer have a single monster with a different move? ld a, [wLoneAttackNo] ; Brock is 01, Misty is 02, Erika is 04, etc and a jr z, .AddTeamMove @@ -101,7 +101,7 @@ ReadTrainer: ; get trainer class number ld a, [wCurOpponent] - sub 200 + sub OPP_ID_OFFSET ld b, a ld hl, TeamMoves @@ -116,7 +116,7 @@ ReadTrainer: ; no matches found. is this trainer champion rival? ld a, b - cp SONY3 + cp RIVAL3 jr z, .ChampionRival jr .FinishUp ; nope .GiveTeamMoves diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm old mode 100755 new mode 100644 index 4672892d..a61f402f --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -2,18 +2,18 @@ PrintSafariZoneBattleText: ld hl, wSafariBaitFactor ld a, [hl] and a - jr z, .asm_4284 + jr z, .no_bait dec [hl] ld hl, SafariZoneEatingText - jr .asm_429f -.asm_4284 + jr .done +.no_bait dec hl ld a, [hl] and a ret z dec [hl] ld hl, SafariZoneAngryText - jr nz, .asm_429f + jr nz, .done push hl ld a, [wEnemyMonSpecies] ld [wd0b5], a @@ -21,16 +21,16 @@ PrintSafariZoneBattleText: ld a, [wMonHCatchRate] ld [wEnemyMonActualCatchRate], a pop hl -.asm_429f +.done push hl call LoadScreenTilesFromBuffer1 pop hl jp PrintText SafariZoneEatingText: - TX_FAR _SafariZoneEatingText - db "@" + text_far _SafariZoneEatingText + text_end SafariZoneAngryText: - TX_FAR _SafariZoneAngryText - db "@" + text_far _SafariZoneAngryText + text_end diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index 49d0429f..4d40fd82 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -1,4 +1,4 @@ -SaveTrainerName: +SaveTrainerName:: ld hl, TrainerNamePointers ld a, [wTrainerClass] dec a @@ -18,95 +18,4 @@ SaveTrainerName: jr nz, .CopyCharacter ret -TrainerNamePointers: -; what is the point of these? - dw YoungsterName - dw BugCatcherName - dw LassName - dw wTrainerName - dw JrTrainerMName - dw JrTrainerFName - dw PokemaniacName - dw SuperNerdName - dw wTrainerName - dw wTrainerName - dw BurglarName - dw EngineerName - dw JugglerXName - dw wTrainerName - dw SwimmerName - dw wTrainerName - dw wTrainerName - dw BeautyName - dw wTrainerName - dw RockerName - dw JugglerName - dw wTrainerName - dw wTrainerName - dw BlackbeltName - dw wTrainerName - dw ProfOakName - dw ChiefName - dw ScientistName - dw wTrainerName - dw RocketName - dw CooltrainerMName - dw CooltrainerFName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - dw wTrainerName - -YoungsterName: - db "YOUNGSTER@" -BugCatcherName: - db "BUG CATCHER@" -LassName: - db "LASS@" -JrTrainerMName: - db "JR.TRAINER♂@" -JrTrainerFName: - db "JR.TRAINER♀@" -PokemaniacName: - db "POKéMANIAC@" -SuperNerdName: - db "SUPER NERD@" -BurglarName: - db "BURGLAR@" -EngineerName: - db "ENGINEER@" -JugglerXName: - db "JUGGLER@" -SwimmerName: - db "SWIMMER@" -BeautyName: - db "BEAUTY@" -RockerName: - db "ROCKER@" -JugglerName: - db "JUGGLER@" -BlackbeltName: - db "BLACKBELT@" -ProfOakName: - db "PROF.OAK@" -ChiefName: - db "CHIEF@" -ScientistName: - db "SCIENTIST@" -RocketName: - db "ROCKET@" -CooltrainerMName: - db "COOLTRAINER♂@" -CooltrainerFName: - db "COOLTRAINER♀@" +INCLUDE "data/trainers/name_pointers.asm" diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index 98521528..8b8942e6 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -4,11 +4,11 @@ ScaleSpriteByTwo: ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer - call ScaleLastSpriteColumnByTwo ; last tile column is special case - call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns + call ScaleLastSpriteColumnByTwo ; last tile column is special case + call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns ld de, sSpriteBuffer2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer - call ScaleLastSpriteColumnByTwo ; last tile column is special case + call ScaleLastSpriteColumnByTwo ; last tile column is special case ScaleFirstThreeSpriteColumnsByTwo: ld b, $3 ; 3 tile columns @@ -17,7 +17,7 @@ ScaleFirstThreeSpriteColumnsByTwo: .columnInnerLoop push bc ld a, [de] - ld bc, -(7*8)+1 ; $ffc9, scale lower nybble and seek to previous output column + ld bc, -(7*8)+1 ; -$37, scale lower nybble and seek to previous output column call ScalePixelsByTwo ld a, [de] dec de @@ -32,7 +32,7 @@ ScaleFirstThreeSpriteColumnsByTwo: dec de dec de ld a, b - ld bc, -7*8 ; $ffc8, skip one output column (which has already been written along with the current one) + ld bc, -7*8 ; -$38, skip one output column (which has already been written along with the current one) add hl, bc ld b, a dec b @@ -41,16 +41,16 @@ ScaleFirstThreeSpriteColumnsByTwo: ScaleLastSpriteColumnByTwo: ld a, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows - ld [H_SPRITEINTERLACECOUNTER], a + ldh [hSpriteInterlaceCounter], a ld bc, -1 .columnInnerLoop ld a, [de] dec de swap a ; only high nybble contains information call ScalePixelsByTwo - ld a, [H_SPRITEINTERLACECOUNTER] + ldh a, [hSpriteInterlaceCounter] dec a - ld [H_SPRITEINTERLACECOUNTER], a + ldh [hSpriteInterlaceCounter], a jr nz, .columnInnerLoop dec de ; skip last 4 rows of new column dec de @@ -79,7 +79,19 @@ ScalePixelsByTwo: ; repeats each input bit twice DuplicateBitsTable: - db $00, $03, $0c, $0f - db $30, $33, $3c, $3f - db $c0, $c3, $cc, $cf - db $f0, $f3, $fc, $ff + db %00000000 + db %00000011 + db %00001100 + db %00001111 + db %00110000 + db %00110011 + db %00111100 + db %00111111 + db %11000000 + db %11000011 + db %11001100 + db %11001111 + db %11110000 + db %11110011 + db %11111100 + db %11111111 diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm index 98893dcf..e19d681a 100644 --- a/engine/battle/scroll_draw_trainer_pic.asm +++ b/engine/battle/scroll_draw_trainer_pic.asm @@ -5,8 +5,8 @@ _ScrollTrainerPicAfterBattle: ld [wEnemyMonSpecies2], a ld b, SET_PAL_BATTLE call RunPaletteCommand - callab _LoadTrainerPic - coord hl, 19, 0 + callfar _LoadTrainerPic + hlcoord 19, 0 ld c, $0 .scrollLoop inc c diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 6f699b9c..d70f98a1 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -134,7 +134,7 @@ AIMoveChoiceModification1: push de push bc ld hl, StatusAilmentMoveEffects - ld de, $0001 + ld de, 1 call IsInArray pop bc pop de @@ -146,11 +146,11 @@ AIMoveChoiceModification1: jr .nextMove StatusAilmentMoveEffects: - db $01 ; unused sleep effect + db EFFECT_01 ; unused sleep effect db SLEEP_EFFECT db POISON_EFFECT db PARALYZE_EFFECT - db $FF + db -1 ; end ; slightly encourage moves with specific effects. ; in particular, stat-modifying moves and other move effects @@ -204,7 +204,7 @@ AIMoveChoiceModification3: push hl push bc push de - callab AIGetTypeEffectiveness + callfar AIGetTypeEffectiveness pop de pop bc pop hl @@ -273,68 +273,19 @@ ReadMove: pop hl ret -; move choice modification methods that are applied for each trainer class -; 0 is sentinel value -TrainerClassMoveChoiceModifications: - db 0 ; YOUNGSTER - db 1,0 ; BUG CATCHER - db 1,0 ; LASS - db 1,3,0 ; SAILOR - db 1,0 ; JR_TRAINER_M - db 1,0 ; JR_TRAINER_F - db 1,2,3,0; POKEMANIAC - db 1,2,0 ; SUPER_NERD - db 1,0 ; HIKER - db 1,0 ; BIKER - db 1,3,0 ; BURGLAR - db 1,0 ; ENGINEER - db 1,2,0 ; JUGGLER_X - db 1,3,0 ; FISHER - db 1,3,0 ; SWIMMER - db 0 ; CUE_BALL - db 1,0 ; GAMBLER - db 1,3,0 ; BEAUTY - db 1,2,0 ; PSYCHIC_TR - db 1,3,0 ; ROCKER - db 1,0 ; JUGGLER - db 1,0 ; TAMER - db 1,0 ; BIRD_KEEPER - db 1,0 ; BLACKBELT - db 1,0 ; SONY1 - db 1,3,0 ; PROF_OAK - db 1,2,0 ; CHIEF - db 1,2,0 ; SCIENTIST - db 1,3,0 ; GIOVANNI - db 1,0 ; ROCKET - db 1,3,0 ; COOLTRAINER_M - db 1,3,0 ; COOLTRAINER_F - db 1,0 ; BRUNO - db 1,0 ; BROCK - db 1,3,0 ; MISTY - db 1,3,0 ; LT_SURGE - db 1,3,0 ; ERIKA - db 1,3,0 ; KOGA - db 1,3,0 ; BLAINE - db 1,3,0 ; SABRINA - db 1,2,0 ; GENTLEMAN - db 1,3,0 ; SONY2 - db 1,3,0 ; SONY3 - db 1,2,3,0; LORELEI - db 1,0 ; CHANNELER - db 1,0 ; AGATHA - db 1,3,0 ; LANCE +INCLUDE "data/trainers/move_choices.asm" -INCLUDE "engine/battle/trainer_pic_money_pointers.asm" +INCLUDE "data/trainers/pic_pointers_money.asm" -INCLUDE "text/trainer_names.asm" +INCLUDE "data/trainers/names.asm" -INCLUDE "engine/battle/bank_e_misc.asm" +INCLUDE "engine/battle/misc.asm" INCLUDE "engine/battle/read_trainer_party.asm" -INCLUDE "data/trainer_moves.asm" +INCLUDE "data/trainers/special_moves.asm" -INCLUDE "data/trainer_parties.asm" +INCLUDE "data/trainers/parties.asm" TrainerAI: and a @@ -343,7 +294,7 @@ TrainerAI: ret z ; if not a trainer, we're done here ld a, [wLinkState] cp LINK_STATE_BATTLING - ret z + ret z ; if in a link battle, we're done as well ld a, [wTrainerClass] ; what trainer class is this? dec a ld c, a @@ -368,81 +319,31 @@ TrainerAI: call Random jp hl -TrainerAIPointers: -; one entry per trainer class -; first byte, number of times (per Pokémon) it can occur -; next two bytes, pointer to AI subroutine for trainer class - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,JugglerAI ; juggler_x - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,GenericAI - dbw 3,JugglerAI ; juggler - dbw 3,GenericAI - dbw 3,GenericAI - dbw 2,BlackbeltAI ; blackbelt - dbw 3,GenericAI - dbw 3,GenericAI - dbw 1,GenericAI ; chief - dbw 3,GenericAI - dbw 1,GiovanniAI ; giovanni - dbw 3,GenericAI - dbw 2,CooltrainerMAI ; cooltrainerm - dbw 1,CooltrainerFAI ; cooltrainerf - dbw 2,BrunoAI ; bruno - dbw 5,BrockAI ; brock - dbw 1,MistyAI ; misty - dbw 1,LtSurgeAI ; surge - dbw 1,ErikaAI ; erika - dbw 2,KogaAI ; koga - dbw 2,BlaineAI ; blaine - dbw 1,SabrinaAI ; sabrina - dbw 3,GenericAI - dbw 1,Sony2AI ; sony2 - dbw 1,Sony3AI ; sony3 - dbw 2,LoreleiAI ; lorelei - dbw 3,GenericAI - dbw 2,AgathaAI ; agatha - dbw 1,LanceAI ; lance +INCLUDE "data/trainers/ai_pointers.asm" JugglerAI: - cp $40 + cp 25 percent + 1 ret nc jp AISwitchIfEnoughMons BlackbeltAI: - cp $20 + cp 13 percent - 1 ret nc jp AIUseXAttack GiovanniAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseGuardSpec CooltrainerMAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXAttack CooltrainerFAI: - cp $40 - ld a, $A + cp 25 percent + 1 + ld a, 10 call AICheckIfHPBelowFraction jp c, AIUseHyperPotion ld a, 5 @@ -458,51 +359,51 @@ BrockAI: jp AIUseFullHeal MistyAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend LtSurgeAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXSpeed ErikaAI: - cp $80 + cp 50 percent + 1 ret nc - ld a, $A + ld a, 10 call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion KogaAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXAttack BlaineAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseSuperPotion SabrinaAI: - cp $40 + cp 25 percent + 1 ret nc - ld a, $A + ld a, 10 call AICheckIfHPBelowFraction ret nc jp AIUseHyperPotion -Sony2AI: - cp $20 +Rival2AI: + cp 13 percent - 1 ret nc ld a, 5 call AICheckIfHPBelowFraction ret nc jp AIUsePotion -Sony3AI: - cp $20 +Rival3AI: + cp 13 percent - 1 ret nc ld a, 5 call AICheckIfHPBelowFraction @@ -510,7 +411,7 @@ Sony3AI: jp AIUseFullRestore LoreleiAI: - cp $80 + cp 50 percent + 1 ret nc ld a, 5 call AICheckIfHPBelowFraction @@ -518,14 +419,14 @@ LoreleiAI: jp AIUseSuperPotion BrunoAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend AgathaAI: - cp $14 + cp 8 percent jp c, AISwitchIfEnoughMons - cp $80 + cp 50 percent + 1 ret nc ld a, 4 call AICheckIfHPBelowFraction @@ -533,7 +434,7 @@ AgathaAI: jp AIUseSuperPotion LanceAI: - cp $80 + cp 50 percent + 1 ret nc ld a, 5 call AICheckIfHPBelowFraction @@ -641,14 +542,14 @@ AIRecoverHP: AIPrintItemUseAndUpdateHPBar: call AIPrintItemUse_ - coord hl, 2, 2 + hlcoord 2, 2 xor a ld [wHPBarType], a predef UpdateHPBar2 jp DecrementAICount AISwitchIfEnoughMons: -; enemy trainer switches if there are 3 or more unfainted mons in party +; enemy trainer switches if there are 2 or more unfainted mons in party ld a, [wEnemyPartyCount] ld c, a ld hl, wEnemyMon1HP @@ -672,7 +573,7 @@ AISwitchIfEnoughMons: jr nz, .loop ld a, d ; how many available monsters are there? - cp 2 ; don't bother if only 1 or 2 + cp 2 ; don't bother if only 1 jp nc, SwitchEnemyMon and a ret @@ -698,7 +599,7 @@ SwitchEnemyMon: ; switching in a new mon in response to this switch. ld a, 1 ld [wFirstMonsNotOutYet], a - callab EnemySendOut + callfar EnemySendOut xor a ld [wFirstMonsNotOutYet], a @@ -709,8 +610,8 @@ SwitchEnemyMon: ret AIBattleWithdrawText: - TX_FAR _AIBattleWithdrawText - db "@" + text_far _AIBattleWithdrawText + text_end AIUseFullHeal: call AIPlayRestoringSFX @@ -754,17 +655,17 @@ AIUseDireHit: ; unused AICheckIfHPBelowFraction: ; return carry if enemy trainer's current HP is below 1 / a of the maximum - ld [H_DIVISOR], a + ldh [hDivisor], a ld hl, wEnemyMonMaxHP ld a, [hli] - ld [H_DIVIDEND], a + ldh [hDividend], a ld a, [hl] - ld [H_DIVIDEND + 1], a + ldh [hDividend + 1], a ld b, 2 call Divide - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] ld c, a - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] ld b, a ld hl, wEnemyMonHP + 1 ld a, [hld] @@ -812,7 +713,7 @@ AIIncreaseStat: ld a, ANIM_AF ld [hli], a ld [hl], b - callab StatModifierUpEffect + callfar StatModifierUpEffect pop hl pop af ld [hli], a @@ -834,5 +735,5 @@ AIPrintItemUse_: jp PrintText AIBattleUseItemText: - TX_FAR _AIBattleUseItemText - db "@" + text_far _AIBattleUseItemText + text_end diff --git a/engine/battle/trainer_pic_money_pointers.asm b/engine/battle/trainer_pic_money_pointers.asm deleted file mode 100755 index 37678e74..00000000 --- a/engine/battle/trainer_pic_money_pointers.asm +++ /dev/null @@ -1,143 +0,0 @@ -TrainerPicAndMoneyPointers: -; trainer pic pointers and base money. -; money received after battle = base money × level of highest-level enemy mon - dw YoungsterPic - money 1500 - - dw BugCatcherPic - money 1000 - - dw LassPic - money 1500 - - dw SailorPic - money 3000 - - dw JrTrainerMPic - money 2000 - - dw JrTrainerFPic - money 2000 - - dw PokemaniacPic - money 5000 - - dw SuperNerdPic - money 2500 - - dw HikerPic - money 3500 - - dw BikerPic - money 2000 - - dw BurglarPic - money 9000 - - dw EngineerPic - money 5000 - - dw JugglerPic - money 3500 - - dw FisherPic - money 3500 - - dw SwimmerPic - money 500 - - dw CueBallPic - money 2500 - - dw GamblerPic - money 7000 - - dw BeautyPic - money 7000 - - dw PsychicPic - money 1000 - - dw RockerPic - money 2500 - - dw JugglerPic - money 3500 - - dw TamerPic - money 4000 - - dw BirdKeeperPic - money 2500 - - dw BlackbeltPic - money 2500 - - dw Rival1Pic - money 3500 - - dw ProfOakPic - money 9900 - - dw ChiefPic - money 3000 - - dw ScientistPic - money 5000 - - dw GiovanniPic - money 9900 - - dw RocketPic - money 3000 - - dw CooltrainerMPic - money 3500 - - dw CooltrainerFPic - money 3500 - - dw BrunoPic - money 9900 - - dw BrockPic - money 9900 - - dw MistyPic - money 9900 - - dw LtSurgePic - money 9900 - - dw ErikaPic - money 9900 - - dw KogaPic - money 9900 - - dw BlainePic - money 9900 - - dw SabrinaPic - money 9900 - - dw GentlemanPic - money 7000 - - dw Rival2Pic - money 6500 - - dw Rival3Pic - money 9900 - - dw LoreleiPic - money 9900 - - dw ChannelerPic - money 3000 - - dw AgathaPic - money 9900 - - dw LancePic - money 9900 diff --git a/engine/battle/unused_stats_functions.asm b/engine/battle/unused_stats_functions.asm index 55f78fd3..5174adf5 100644 --- a/engine/battle/unused_stats_functions.asm +++ b/engine/battle/unused_stats_functions.asm @@ -1,6 +1,6 @@ ; does nothing since no stats are ever selected (barring glitches) DoubleSelectedStats: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, [wPlayerStatsToDouble] ld hl, wBattleMonAttack + 1 @@ -30,7 +30,7 @@ DoubleSelectedStats: ; does nothing since no stats are ever selected (barring glitches) HalveSelectedStats: - ld a, [H_WHOSETURN] + ldh a, [hWhoseTurn] and a ld a, [wPlayerStatsToHalve] ld hl, wBattleMonAttack diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 231c46e7..8c9c1529 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -7,14 +7,14 @@ TryDoWildEncounter: ld a, [wd736] and a ret nz - callab IsPlayerStandingOnDoorTileOrWarpTile + callfar IsPlayerStandingOnDoorTileOrWarpTile jr nc, .notStandingOnDoorOrWarpTile .CantEncounter ld a, $1 and a ret .notStandingOnDoorOrWarpTile - callab IsPlayerJustOutsideMap + callfar IsPlayerJustOutsideMap jr z, .CantEncounter ld a, [wRepelRemainingSteps] and a @@ -25,7 +25,7 @@ TryDoWildEncounter: .next ; determine if wild pokemon can appear in the half-block we're standing in ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile? - coord hl, 9, 9 + hlcoord 9, 9 ld c, [hl] ld a, [wGrassTile] cp c @@ -39,7 +39,7 @@ TryDoWildEncounter: ; so long as the map is "indoor" and has wild pokemon defined. ; ...as long as it's not Viridian Forest or Safari Zone. ld a, [wCurMap] - cp REDS_HOUSE_1F ; is this an indoor map? + cp FIRST_INDOOR_MAP ; is this an indoor map? jr c, .CantEncounter2 ld a, [wCurMapTileset] cp FOREST ; Viridian Forest/Safari Zone @@ -48,10 +48,10 @@ TryDoWildEncounter: .CanEncounter ; compare encounter chance with a random number to determine if there will be an encounter ld b, a - ld a, [hRandomAdd] + ldh a, [hRandomAdd] cp b jr nc, .CantEncounter2 - ld a, [hRandomSub] + ldh a, [hRandomSub] ld b, a ld hl, WildMonEncounterSlotChances .determineEncounterSlot @@ -64,7 +64,7 @@ TryDoWildEncounter: ; determine which wild pokemon (grass or water) can appear in the half-block we're standing in ld c, [hl] ld hl, wGrassMons - aCoord 8, 9 + lda_coord 8, 9 cp $14 ; is the bottom left tile (8,9) of the half-block we're standing in a water tile? jr nz, .gotWildEncounterType ; else, it's treated as a grass tile by default ld hl, wWaterMons @@ -90,7 +90,7 @@ TryDoWildEncounter: .lastRepelStep ld [wRepelRemainingSteps], a ld a, TEXT_REPEL_WORE_OFF - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call EnableAutoTextBoxDrawing call DisplayTextID .CantEncounter2 @@ -101,18 +101,4 @@ TryDoWildEncounter: xor a ret -WildMonEncounterSlotChances: -; There are 10 slots for wild pokemon, and this is the table that defines how common each of -; those 10 slots is. A random number is generated and then the first byte of each pair in this -; table is compared against that random number. If the random number is less than or equal -; to the first byte, then that slot is chosen. The second byte is double the slot number. - db $32, $00 ; 51/256 = 19.9% chance of slot 0 - db $65, $02 ; 51/256 = 19.9% chance of slot 1 - db $8C, $04 ; 39/256 = 15.2% chance of slot 2 - db $A5, $06 ; 25/256 = 9.8% chance of slot 3 - db $BE, $08 ; 25/256 = 9.8% chance of slot 4 - db $D7, $0A ; 25/256 = 9.8% chance of slot 5 - db $E4, $0C ; 13/256 = 5.1% chance of slot 6 - db $F1, $0E ; 13/256 = 5.1% chance of slot 7 - db $FC, $10 ; 11/256 = 4.3% chance of slot 8 - db $FF, $12 ; 3/256 = 1.2% chance of slot 9 +INCLUDE "data/wild/probabilities.asm" diff --git a/engine/bcd.asm b/engine/bcd.asm deleted file mode 100644 index 2d0b43df..00000000 --- a/engine/bcd.asm +++ /dev/null @@ -1,214 +0,0 @@ -DivideBCDPredef:: -DivideBCDPredef2:: -DivideBCDPredef3:: -DivideBCDPredef4:: - call GetPredefRegisters - -DivideBCD:: - xor a - ld [hDivideBCDBuffer], a - ld [hDivideBCDBuffer+1], a - ld [hDivideBCDBuffer+2], a - ld d, $1 -.mulBy10Loop -; multiply the divisor by 10 until the leading digit is nonzero -; to set up the standard long division algorithm - ld a, [hDivideBCDDivisor] - and $f0 - jr nz, .next - inc d - ld a, [hDivideBCDDivisor] - swap a - and $f0 - ld b, a - ld a, [hDivideBCDDivisor+1] - swap a - ld [hDivideBCDDivisor+1], a - and $f - or b - ld [hDivideBCDDivisor], a - ld a, [hDivideBCDDivisor+1] - and $f0 - ld b, a - ld a, [hDivideBCDDivisor+2] - swap a - ld [hDivideBCDDivisor+2], a - and $f - or b - ld [hDivideBCDDivisor+1], a - ld a, [hDivideBCDDivisor+2] - and $f0 - ld [hDivideBCDDivisor+2], a - jr .mulBy10Loop -.next - push de - push de - call DivideBCD_getNextDigit - pop de - ld a, b - swap a - and $f0 - ld [hDivideBCDBuffer], a - dec d - jr z, .next2 - push de - call DivideBCD_divDivisorBy10 - call DivideBCD_getNextDigit - pop de - ld a, [hDivideBCDBuffer] - or b - ld [hDivideBCDBuffer], a - dec d - jr z, .next2 - push de - call DivideBCD_divDivisorBy10 - call DivideBCD_getNextDigit - pop de - ld a, b - swap a - and $f0 - ld [hDivideBCDBuffer+1], a - dec d - jr z, .next2 - push de - call DivideBCD_divDivisorBy10 - call DivideBCD_getNextDigit - pop de - ld a, [hDivideBCDBuffer+1] - or b - ld [hDivideBCDBuffer+1], a - dec d - jr z, .next2 - push de - call DivideBCD_divDivisorBy10 - call DivideBCD_getNextDigit - pop de - ld a, b - swap a - and $f0 - ld [hDivideBCDBuffer+2], a - dec d - jr z, .next2 - push de - call DivideBCD_divDivisorBy10 - call DivideBCD_getNextDigit - pop de - ld a, [hDivideBCDBuffer+2] - or b - ld [hDivideBCDBuffer+2], a -.next2 - ld a, [hDivideBCDBuffer] - ld [hDivideBCDQuotient], a ; the same memory location as hDivideBCDDivisor - ld a, [hDivideBCDBuffer+1] - ld [hDivideBCDQuotient+1], a - ld a, [hDivideBCDBuffer+2] - ld [hDivideBCDQuotient+2], a - pop de - ld a, $6 - sub d - and a - ret z -.divResultBy10loop - push af - call DivideBCD_divDivisorBy10 - pop af - dec a - jr nz, .divResultBy10loop - ret - -DivideBCD_divDivisorBy10: - ld a, [hDivideBCDDivisor+2] - swap a - and $f - ld b, a - ld a, [hDivideBCDDivisor+1] - swap a - ld [hDivideBCDDivisor+1], a - and $f0 - or b - ld [hDivideBCDDivisor+2], a - ld a, [hDivideBCDDivisor+1] - and $f - ld b, a - ld a, [hDivideBCDDivisor] - swap a - ld [hDivideBCDDivisor], a - and $f0 - or b - ld [hDivideBCDDivisor+1], a - ld a, [hDivideBCDDivisor] - and $f - ld [hDivideBCDDivisor], a - ret - -DivideBCD_getNextDigit: - ld bc, $3 -.loop - ld de, hMoney ; the dividend - ld hl, hDivideBCDDivisor - push bc - call StringCmp - pop bc - ret c - inc b - ld de, hMoney+2 ; since SubBCD works starting from the least significant digit - ld hl, hDivideBCDDivisor+2 - push bc - call SubBCD - pop bc - jr .loop - - -AddBCDPredef:: - call GetPredefRegisters - -AddBCD:: - and a - ld b, c -.add - ld a, [de] - adc [hl] - daa - ld [de], a - dec de - dec hl - dec c - jr nz, .add - jr nc, .done - ld a, $99 - inc de -.fill - ld [de], a - inc de - dec b - jr nz, .fill -.done - ret - - -SubBCDPredef:: - call GetPredefRegisters - -SubBCD:: - and a - ld b, c -.sub - ld a, [de] - sbc [hl] - daa - ld [de], a - dec de - dec hl - dec c - jr nz, .sub - jr nc, .done - ld a, $00 - inc de -.fill - ld [de], a - inc de - dec b - jr nz, .fill - scf -.done - ret diff --git a/engine/black_out.asm b/engine/black_out.asm deleted file mode 100644 index 6c358ce3..00000000 --- a/engine/black_out.asm +++ /dev/null @@ -1,46 +0,0 @@ -ResetStatusAndHalveMoneyOnBlackout:: -; Reset player status on blackout. - xor a - ld [wBattleResult], a - ld [wWalkBikeSurfState], a - ld [wIsInBattle], a - ld [wMapPalOffset], a - ld [wNPCMovementScriptFunctionNum], a - ld [hJoyHeld], a - ld [wNPCMovementScriptPointerTableNum], a - ld [wFlags_0xcd60], a - - ld [hMoney], a - ld [hMoney + 1], a - ld [hMoney + 2], a - call HasEnoughMoney - jr c, .lostmoney ; never happens - - ; Halve the player's money. - ld a, [wPlayerMoney] - ld [hMoney], a - ld a, [wPlayerMoney + 1] - ld [hMoney + 1], a - ld a, [wPlayerMoney + 2] - ld [hMoney + 2], a - xor a - ld [hDivideBCDDivisor], a - ld [hDivideBCDDivisor + 1], a - ld a, 2 - ld [hDivideBCDDivisor + 2], a - predef DivideBCDPredef3 - ld a, [hDivideBCDQuotient] - ld [wPlayerMoney], a - ld a, [hDivideBCDQuotient + 1] - ld [wPlayerMoney + 1], a - ld a, [hDivideBCDQuotient + 2] - ld [wPlayerMoney + 2], a - -.lostmoney - ld hl, wd732 - set 2, [hl] - res 3, [hl] - set 6, [hl] - ld a, %11111111 - ld [wJoyIgnore], a - predef_jump HealParty diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm new file mode 100644 index 00000000..02280db0 --- /dev/null +++ b/engine/debug/debug_menu.asm @@ -0,0 +1,115 @@ +DebugMenu: +IF DEF(_DEBUG) + call ClearScreen + + ld hl, DebugPlayerName + ld de, wPlayerName + ld bc, NAME_LENGTH + call CopyData + + ld hl, DebugRivalName + ld de, wRivalName + ld bc, NAME_LENGTH + call CopyData + + call LoadFontTilePatterns + call LoadHpBarAndStatusTilePatterns + call ClearSprites + call RunDefaultPaletteCommand + + hlcoord 5, 6 + ld b, 3 + ld c, 9 + call TextBoxBorder + + hlcoord 7, 7 + ld de, DebugMenuOptions + call PlaceString + + ld a, 3 ; medium speed + ld [wOptions], a + + ld a, A_BUTTON | B_BUTTON | START + ld [wMenuWatchedKeys], a + xor a + ld [wMenuJoypadPollCount], a + inc a + ld [wMaxMenuItem], a + ld a, 7 + ld [wTopMenuItemY], a + dec a + ld [wTopMenuItemX], a + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + + call HandleMenuInput + bit BIT_B_BUTTON, a + jp nz, DisplayTitleScreen + + ld a, [wCurrentMenuItem] + and a ; FIGHT? + jp z, TestBattle + + ; DEBUG + ld hl, wd732 + set 1, [hl] + jp StartNewGameDebug + +DebugPlayerName: + db "Tom@" + +DebugRivalName: + db "Juerry@" + +DebugMenuOptions: + db "FIGHT" + next "DEBUG@" +ELSE + ret +ENDC + +TestBattle: +.loop + call GBPalNormal + + ; Don't mess around + ; with obedience. + ld a, 1 << BIT_EARTHBADGE + ld [wObtainedBadges], a + + ld hl, wFlags_D733 + set BIT_TEST_BATTLE, [hl] + + ; Reset the party. + ld hl, wPartyCount + xor a + ld [hli], a + dec a + ld [hl], a + + ; Give the player a + ; level 20 Rhydon. + ld a, RHYDON + ld [wcf91], a + ld a, 20 + ld [wCurEnemyLVL], a + xor a + ld [wMonDataLocation], a + ld [wCurMap], a + call AddPartyMon + + ; Fight against a + ; level 20 Rhydon. + ld a, RHYDON + ld [wCurOpponent], a + + predef InitOpponent + + ; When the battle ends, + ; do it all again. + ld a, 1 + ld [wUpdateSpritesEnabled], a + ldh [hAutoBGTransferEnabled], a + jr .loop diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm new file mode 100644 index 00000000..17baa7ef --- /dev/null +++ b/engine/debug/debug_party.asm @@ -0,0 +1,159 @@ +; This function is a debugging feature to give the player Tsunekazu Ishihara's +; favorite Pokemon. This is indicated by the overpowered Exeggutor, which +; Ishihara (president of Creatures Inc.) said was his favorite Pokemon in an ABC +; interview on February 8, 2000. +; "Exeggutor is my favorite. That's because I was always using this character +; while I was debugging the program." +; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript + +SetIshiharaTeam: + ld de, IshiharaTeam +.loop + ld a, [de] + cp -1 + ret z + ld [wcf91], a + inc de + ld a, [de] + ld [wCurEnemyLVL], a + inc de + call AddPartyMon + jr .loop + +IshiharaTeam: + db EXEGGUTOR, 90 +IF DEF(_DEBUG) + db MEW, 5 +ELSE + db MEW, 20 +ENDC + db JOLTEON, 56 + db DUGTRIO, 56 + db ARTICUNO, 57 +IF DEF(_DEBUG) + db PIKACHU, 5 +ENDC + db -1 ; end + +DebugStart: +IF DEF(_DEBUG) + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + + ; Fly anywhere. + dec a ; $ff + ld [wTownVisitedFlag], a + ld [wTownVisitedFlag + 1], a + + ; Get all badges except Earth Badge. + ld a, $ff ^ (1 << BIT_EARTHBADGE) + ld [wObtainedBadges], a + + call SetIshiharaTeam + + ; Exeggutor gets four HM moves. + ld hl, wPartyMon1Moves + ld a, FLY + ld [hli], a + ld a, CUT + ld [hli], a + ld a, SURF + ld [hli], a + ld a, STRENGTH + ld [hl], a + ld hl, wPartyMon1PP + ld a, 15 + ld [hli], a + ld a, 30 + ld [hli], a + ld a, 15 + ld [hli], a + ld [hl], a + + ; Jolteon gets Thunderbolt. + ld hl, wPartyMon3Moves + 3 + ld a, THUNDERBOLT + ld [hl], a + ld hl, wPartyMon3PP + 3 + ld a, 15 + ld [hl], a + + ; Articuno gets Fly. + ld hl, wPartyMon5Moves + ld a, FLY + ld [hl], a + ld hl, wPartyMon5PP + ld a, 15 + ld [hl], a + + ; Pikachu gets Surf. + ld hl, wPartyMon6Moves + 2 + ld a, SURF + ld [hl], a + ld hl, wPartyMon6PP + 2 + ld a, 15 + ld [hl], a + + ; Get some debug items. + ld hl, wNumBagItems + ld de, DebugItemsList +.items_loop + ld a, [de] + cp -1 + jr z, .items_end + ld [wcf91], a + inc de + ld a, [de] + inc de + ld [wItemQuantity], a + call AddItemToInventory + jr .items_loop +.items_end + + ; Complete the Pokédex. + ld hl, wPokedexOwned + call DebugSetPokedexEntries + ld hl, wPokedexSeen + call DebugSetPokedexEntries + SetEvent EVENT_GOT_POKEDEX + + ; Rival chose Squirtle, + ; Player chose Charmander. + ld hl, wRivalStarter + ld a, STARTER2 + ld [hli], a + inc hl ; hl = wPlayerStarter + ld a, STARTER1 + ld [hl], a + + ret + +DebugSetPokedexEntries: + ld b, wPokedexOwnedEnd - wPokedexOwned - 1 + ld a, %11111111 +.loop + ld [hli], a + dec b + jr nz, .loop + ld [hl], %01111111 + ret + +DebugItemsList: + db BICYCLE, 1 + db FULL_RESTORE, 99 + db FULL_HEAL, 99 + db ESCAPE_ROPE, 99 + db RARE_CANDY, 99 + db MASTER_BALL, 99 + db TOWN_MAP, 1 + db SECRET_KEY, 1 + db CARD_KEY, 1 + db S_S_TICKET, 1 + db LIFT_KEY, 1 + db -1 ; end + +DebugUnusedList: + db -1 ; end +ELSE + ret +ENDC diff --git a/engine/debug1.asm b/engine/debug1.asm deleted file mode 100644 index a5eb7dde..00000000 --- a/engine/debug1.asm +++ /dev/null @@ -1,33 +0,0 @@ -; This function appears to never be used. -; It is likely a debugging feature to give the player Tsunekazu Ishihara's -; favorite Pokemon. This is indicated by the overpowered Exeggutor, which -; Ishihara (president of Creatures Inc.) said was his favorite Pokemon in an ABC -; interview on February 8, 2000. -; "Exeggutor is my favorite. That's because I was always using this character -; while I was debugging the program." -; http://www.ign.com/articles/2000/02/09/abc-news-pokamon-chat-transcript - -SetIshiharaTeam: - ld de, IshiharaTeam -.loop - ld a, [de] - cp $ff - ret z - ld [wcf91], a - inc de - ld a, [de] - ld [wCurEnemyLVL], a - inc de - call AddPartyMon - jr .loop - -IshiharaTeam: - db EXEGGUTOR,90 - db MEW,20 - db JOLTEON,56 - db DUGTRIO,56 - db ARTICUNO,57 - db $FF - -EmptyFunc: - ret diff --git a/engine/display_text_id_init.asm b/engine/display_text_id_init.asm deleted file mode 100644 index 59b3a5f8..00000000 --- a/engine/display_text_id_init.asm +++ /dev/null @@ -1,78 +0,0 @@ -; function that performs initialization for DisplayTextID -DisplayTextIDInit: - xor a - ld [wListMenuID], a - ld a, [wAutoTextBoxDrawingControl] - bit 0, a - jr nz, .skipDrawingTextBoxBorder - ld a, [hSpriteIndexOrTextID] ; text ID (or sprite ID) - and a - jr nz, .notStartMenu -; if text ID is 0 (i.e. the start menu) -; Note that the start menu text border is also drawn in the function directly -; below this, so this seems unnecessary. - CheckEvent EVENT_GOT_POKEDEX -; start menu with pokedex - coord hl, 10, 0 - ld b, $0e - ld c, $08 - jr nz, .drawTextBoxBorder -; start menu without pokedex - coord hl, 10, 0 - ld b, $0c - ld c, $08 - jr .drawTextBoxBorder -; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box -.notStartMenu - coord hl, 0, 12 - ld b, $04 - ld c, $12 -.drawTextBoxBorder - call TextBoxBorder -.skipDrawingTextBoxBorder - ld hl, wFontLoaded - set 0, [hl] - ld hl, wFlags_0xcd60 - bit 4, [hl] - res 4, [hl] - jr nz, .skipMovingSprites - call UpdateSprites -.skipMovingSprites -; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite -; this is done because when you talk to an NPC, they turn to look your way -; the original direction they were facing must be restored after the dialogue is over - ld hl, wSpriteStateData1 + $19 - ld c, $0f - ld de, $0010 -.spriteFacingDirectionCopyLoop - ld a, [hl] - inc h - ld [hl], a - dec h - add hl, de - dec c - jr nz, .spriteFacingDirectionCopyLoop -; loop to force all the sprites in the middle of animation to stand still -; (so that they don't like they're frozen mid-step during the dialogue) - ld hl, wSpriteStateData1 + 2 - ld de, $0010 - ld c, e -.spriteStandStillLoop - ld a, [hl] - cp $ff ; is the sprite visible? - jr z, .nextSprite -; if it is visible - and $fc - ld [hl], a -.nextSprite - add hl, de - dec c - jr nz, .spriteStandStillLoop - ld b, $9c ; window background address - call CopyScreenTileBufferToVRAM ; transfer background in WRAM to VRAM - xor a - ld [hWY], a ; put the window on the screen - call LoadFontTilePatterns - ld a, $01 - ld [H_AUTOBGTRANSFERENABLED], a ; enable continuous WRAM to VRAM transfer each V-blank - ret diff --git a/engine/events/black_out.asm b/engine/events/black_out.asm new file mode 100644 index 00000000..16d2081f --- /dev/null +++ b/engine/events/black_out.asm @@ -0,0 +1,46 @@ +ResetStatusAndHalveMoneyOnBlackout:: +; Reset player status on blackout. + xor a + ld [wBattleResult], a + ld [wWalkBikeSurfState], a + ld [wIsInBattle], a + ld [wMapPalOffset], a + ld [wNPCMovementScriptFunctionNum], a + ldh [hJoyHeld], a + ld [wNPCMovementScriptPointerTableNum], a + ld [wFlags_0xcd60], a + + ldh [hMoney], a + ldh [hMoney + 1], a + ldh [hMoney + 2], a + call HasEnoughMoney + jr c, .lostmoney ; never happens + + ; Halve the player's money. + ld a, [wPlayerMoney] + ldh [hMoney], a + ld a, [wPlayerMoney + 1] + ldh [hMoney + 1], a + ld a, [wPlayerMoney + 2] + ldh [hMoney + 2], a + xor a + ldh [hDivideBCDDivisor], a + ldh [hDivideBCDDivisor + 1], a + ld a, 2 + ldh [hDivideBCDDivisor + 2], a + predef DivideBCDPredef3 + ldh a, [hDivideBCDQuotient] + ld [wPlayerMoney], a + ldh a, [hDivideBCDQuotient + 1] + ld [wPlayerMoney + 1], a + ldh a, [hDivideBCDQuotient + 2] + ld [wPlayerMoney + 2], a + +.lostmoney + ld hl, wd732 + set 2, [hl] + res 3, [hl] + set 6, [hl] + ld a, %11111111 + ld [wJoyIgnore], a + predef_jump HealParty diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm new file mode 100644 index 00000000..b052d3e2 --- /dev/null +++ b/engine/events/card_key.asm @@ -0,0 +1,101 @@ +PrintCardKeyText: + ld hl, SilphCoMapList + ld a, [wCurMap] + ld b, a +.silphCoMapListLoop + ld a, [hli] + cp -1 + ret z + cp b + jr nz, .silphCoMapListLoop + predef GetTileAndCoordsInFrontOfPlayer + ld a, [wTileInFrontOfPlayer] + cp $18 + jr z, .cardKeyDoorInFrontOfPlayer + cp $24 + jr z, .cardKeyDoorInFrontOfPlayer + ld b, a + ld a, [wCurMap] + cp SILPH_CO_11F + ret nz + ld a, b + cp $5e + ret nz +.cardKeyDoorInFrontOfPlayer + ld b, CARD_KEY + call IsItemInBag + jr z, .noCardKey + call GetCoordsInFrontOfPlayer + push de + tx_pre_id CardKeySuccessText + ldh [hSpriteIndexOrTextID], a + call PrintPredefTextID + pop de + srl d + ld a, d + ld b, a + ld [wCardKeyDoorY], a + srl e + ld a, e + ld c, a + ld [wCardKeyDoorX], a + ld a, [wCurMap] + cp SILPH_CO_11F + jr nz, .notSilphCo11F + ld a, $3 + jr .replaceCardKeyDoorTileBlock +.notSilphCo11F + ld a, $e +.replaceCardKeyDoorTileBlock + ld [wNewTileBlockID], a + predef ReplaceTileBlock + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ld a, SFX_GO_INSIDE + jp PlaySound +.noCardKey + tx_pre_id CardKeyFailText + ldh [hSpriteIndexOrTextID], a + jp PrintPredefTextID + +INCLUDE "data/events/card_key_maps.asm" + +CardKeySuccessText:: + text_far _CardKeySuccessText1 + sound_get_item_1 + text_far _CardKeySuccessText2 + text_end + +CardKeyFailText:: + text_far _CardKeyFailText + text_end + +; d = Y +; e = X +GetCoordsInFrontOfPlayer: + ld a, [wYCoord] + ld d, a + ld a, [wXCoord] + ld e, a + ld a, [wSpritePlayerStateData1FacingDirection] + and a + jr nz, .notFacingDown +; facing down + inc d + ret +.notFacingDown + cp SPRITE_FACING_UP + jr nz, .notFacingUp +; facing up + dec d + ret +.notFacingUp + cp SPRITE_FACING_LEFT + jr nz, .notFacingLeft +; facing left + dec e + ret +.notFacingLeft +; facing right + inc e + ret diff --git a/engine/overworld/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm old mode 100755 new mode 100644 similarity index 84% rename from engine/overworld/cinnabar_lab.asm rename to engine/events/cinnabar_lab.asm index 13313746..bccc95d1 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/events/cinnabar_lab.asm @@ -1,4 +1,4 @@ -GiveFossilToCinnabarLab: +GiveFossilToCinnabarLab:: ld hl, wd730 set 6, [hl] xor a @@ -20,7 +20,7 @@ GiveFossilToCinnabarLab: dec l ld b, l ld c, $d - coord hl, 0, 0 + hlcoord 0, 0 call TextBoxBorder call UpdateSprites call PrintFossilsInBag @@ -35,7 +35,7 @@ GiveFossilToCinnabarLab: ld e, a add hl, de ld a, [hl] - ld [$ffdb], a + ldh [hItemToRemoveID], a cp DOME_FOSSIL jr z, .choseDomeFossil cp HELIX_FOSSIL @@ -61,8 +61,8 @@ GiveFossilToCinnabarLab: ld hl, LabFossil_610b3 call PrintText ld a, [wFossilItem] - ld [hItemToRemoveID], a - callba RemoveItemByID + ldh [hItemToRemoveID], a + farcall RemoveItemByID ld hl, LabFossil_610b8 call PrintText SetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL @@ -73,26 +73,26 @@ GiveFossilToCinnabarLab: ret LabFossil_610ae: - TX_FAR _Lab4Text_610ae - db "@" + text_far _Lab4Text_610ae + text_end LabFossil_610b3: - TX_FAR _Lab4Text_610b3 - db "@" + text_far _Lab4Text_610b3 + text_end LabFossil_610b8: - TX_FAR _Lab4Text_610b8 - db "@" + text_far _Lab4Text_610b8 + text_end LabFossil_610bd: - TX_FAR _Lab4Text_610bd - db "@" + text_far _Lab4Text_610bd + text_end PrintFossilsInBag: ; Prints each fossil in the player's bag on a separate line in the menu. ld hl, wFilteredBagItems xor a - ld [hItemCounter], a + ldh [hItemCounter], a .loop ld a, [hli] cp $ff @@ -100,8 +100,8 @@ PrintFossilsInBag: push hl ld [wd11e], a call GetItemName - coord hl, 2, 2 - ld a, [hItemCounter] + hlcoord 2, 2 + ldh a, [hItemCounter] ld bc, SCREEN_WIDTH * 2 call AddNTimes ld de, wcd6d @@ -112,7 +112,7 @@ PrintFossilsInBag: jr .loop ; loads the names of the fossil item and the resulting mon -LoadFossilItemAndMonName: +LoadFossilItemAndMonName:: ld a, [wFossilMon] ld [wd11e], a call GetMonName diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm new file mode 100644 index 00000000..91541f09 --- /dev/null +++ b/engine/events/diploma.asm @@ -0,0 +1,116 @@ +CIRCLE_TILE_ID EQU $70 + +DisplayDiploma:: + call SaveScreenTilesToBuffer2 + call GBPalWhiteOutWithDelay3 + call ClearScreen + xor a + ld [wUpdateSpritesEnabled], a + ld hl, wd730 + set 6, [hl] + call DisableLCD + ld hl, CircleTile + ld de, vChars2 tile CIRCLE_TILE_ID + ld bc, $10 + ld a, BANK(CircleTile) + call FarCopyData2 + hlcoord 0, 0 + lb bc, 16, 18 + predef Diploma_TextBoxBorder + ld hl, DiplomaTextPointersAndCoords + ld c, $5 +.asm_56715 + push bc + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + push hl + ld h, [hl] + ld l, a + call PlaceString + pop hl + inc hl + pop bc + dec c + jr nz, .asm_56715 + hlcoord 10, 4 + ld de, wPlayerName + call PlaceString + farcall DrawPlayerCharacter + +; Move the player 33 pixels right and set the priority bit so he appears +; behind the background layer. + ld hl, wOAMBuffer + $01 + lb bc, $80, $28 +.adjustPlayerGfxLoop + ld a, [hl] ; X + add 33 + ld [hli], a + inc hl + ld a, b + ld [hli], a ; attributes + inc hl + dec c + jr nz, .adjustPlayerGfxLoop + + call EnableLCD + farcall LoadTrainerInfoTextBoxTiles + ld b, SET_PAL_GENERIC + call RunPaletteCommand + call Delay3 + call GBPalNormal + ld a, $90 + ldh [rOBP0], a + call WaitForTextScrollButtonPress + ld hl, wd730 + res 6, [hl] + call GBPalWhiteOutWithDelay3 + call RestoreScreenTilesAndReloadTilePatterns + call Delay3 + jp GBPalNormal + +UnusedPlayerNameLengthFunc: +; Unused function that does a calculation involving the length of the player's +; name. + ld hl, wPlayerName + lb bc, $ff, $00 +.loop + ld a, [hli] + cp "@" + ret z + dec c + jr .loop + +diploma_text: MACRO + dw \3 + dwcoord \1, \2 +ENDM + +DiplomaTextPointersAndCoords: + ; x, y, text + diploma_text 5, 2, DiplomaText + diploma_text 3, 4, DiplomaPlayer + diploma_text 15, 4, DiplomaEmptyText + diploma_text 2, 6, DiplomaCongrats + diploma_text 9, 16, DiplomaGameFreak + +DiplomaText: + db CIRCLE_TILE_ID, "Diploma", CIRCLE_TILE_ID, "@" + +DiplomaPlayer: + db "Player@" + +DiplomaEmptyText: + db "@" + +DiplomaCongrats: + db "Congrats! This" + next "diploma certifies" + next "that you have" + next "completed your" + next "#DEX.@" + +DiplomaGameFreak: + db "GAME FREAK@" diff --git a/engine/display_pokedex.asm b/engine/events/display_pokedex.asm similarity index 94% rename from engine/display_pokedex.asm rename to engine/events/display_pokedex.asm index 96a2dd6c..d657ea85 100644 --- a/engine/display_pokedex.asm +++ b/engine/events/display_pokedex.asm @@ -1,4 +1,4 @@ -_DisplayPokedex: +_DisplayPokedex:: ld hl, wd730 set 6, [hl] predef ShowPokedexData diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm new file mode 100644 index 00000000..8e871456 --- /dev/null +++ b/engine/events/elevator.asm @@ -0,0 +1,48 @@ +DisplayElevatorFloorMenu: + ld hl, WhichFloorText + call PrintText + ld hl, wItemList + ld a, l + ld [wListPointer], a + ld a, h + ld [wListPointer + 1], a + ld a, [wListScrollOffset] + push af + xor a + ld [wCurrentMenuItem], a + ld [wListScrollOffset], a + ld [wPrintItemPrices], a + ld a, SPECIALLISTMENU + ld [wListMenuID], a + call DisplayListMenuID + pop bc + ld a, b + ld [wListScrollOffset], a + ret c + ld hl, wCurrentMapScriptFlags + set 7, [hl] + ld hl, wElevatorWarpMaps + ld a, [wWhichPokemon] + add a + ld d, 0 + ld e, a + add hl, de + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + ld hl, wWarpEntries + call .UpdateWarp + +.UpdateWarp + inc hl + inc hl + ld a, b + ld [hli], a ; destination warp ID + ld a, c + ld [hli], a ; destination map ID + ret + +WhichFloorText: + text_far _WhichFloorText + text_end diff --git a/engine/evolve_trade.asm b/engine/events/evolve_trade.asm old mode 100755 new mode 100644 similarity index 97% rename from engine/evolve_trade.asm rename to engine/events/evolve_trade.asm index e17fc05c..56069fac --- a/engine/evolve_trade.asm +++ b/engine/events/evolve_trade.asm @@ -38,7 +38,7 @@ EvolveTradeMon: ld [wForceEvolution], a ld a, LINK_STATE_TRADING ld [wLinkState], a - callab TryEvolvingMon + callfar TryEvolvingMon xor a ; LINK_STATE_NONE ld [wLinkState], a jp PlayDefaultMusic diff --git a/engine/give_pokemon.asm b/engine/events/give_pokemon.asm old mode 100755 new mode 100644 similarity index 82% rename from engine/give_pokemon.asm rename to engine/events/give_pokemon.asm index 49596782..ef01ef99 --- a/engine/give_pokemon.asm +++ b/engine/events/give_pokemon.asm @@ -1,4 +1,4 @@ -_GivePokemon: +_GivePokemon:: ; returns success in carry ; and whether the mon was added to the party in [wAddedToParty] call EnableAutoTextBoxDrawing @@ -15,9 +15,9 @@ _GivePokemon: ld [wEnemyBattleStatus3], a ld a, [wcf91] ld [wEnemyMonSpecies2], a - callab LoadEnemyMonData + callfar LoadEnemyMonData call SetPokedexOwnedFlag - callab SendNewMonToBox + callfar SendNewMonToBox ld hl, wcf4b ld a, [wCurrentBoxNum] and $7f @@ -33,7 +33,7 @@ _GivePokemon: .next ld [hli], a ld [hl], "@" - ld hl, SetToBoxText + ld hl, SentToBoxText call PrintText scf ret @@ -69,14 +69,14 @@ SetPokedexOwnedFlag: jp PrintText GotMonText: - TX_FAR _GotMonText - TX_SFX_ITEM_1 - db "@" + text_far _GotMonText + sound_get_item_1 + text_end -SetToBoxText: - TX_FAR _SetToBoxText - db "@" +SentToBoxText: + text_far _SentToBoxText + text_end BoxIsFullText: - TX_FAR _BoxIsFullText - db "@" + text_far _BoxIsFullText + text_end diff --git a/engine/heal_party.asm b/engine/events/heal_party.asm similarity index 100% rename from engine/heal_party.asm rename to engine/events/heal_party.asm diff --git a/engine/overworld/hidden_items.asm b/engine/events/hidden_items.asm old mode 100755 new mode 100644 similarity index 80% rename from engine/overworld/hidden_items.asm rename to engine/events/hidden_items.asm index 32783f83..97bb0b71 --- a/engine/overworld/hidden_items.asm +++ b/engine/events/hidden_items.asm @@ -18,11 +18,11 @@ HiddenItems: call GetItemName tx_pre_jump FoundHiddenItemText -INCLUDE "data/hidden_item_coords.asm" +INCLUDE "data/events/hidden_item_coords.asm" -FoundHiddenItemText: - TX_FAR _FoundHiddenItemText - TX_ASM +FoundHiddenItemText:: + text_far _FoundHiddenItemText + text_asm ld a, [wHiddenObjectFunctionArgument] ; item ID ld b, a ld c, 1 @@ -45,9 +45,9 @@ FoundHiddenItemText: call PrintText jp TextScriptEnd -HiddenItemBagFullText: - TX_FAR _HiddenItemBagFullText - db "@" +HiddenItemBagFullText:: + text_far _HiddenItemBagFullText + text_end HiddenCoins: ld b, COIN_CASE @@ -67,9 +67,9 @@ HiddenCoins: and a ret nz xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a - ld [hCoins + 1], a + ldh [hUnusedCoinsByte], a + ldh [hCoins], a + ldh [hCoins + 1], a ld a, [wHiddenObjectFunctionArgument] sub COIN cp 10 @@ -81,19 +81,19 @@ HiddenCoins: jr .bcd100 .bcd10 ld a, $10 - ld [hCoins + 1], a + ldh [hCoins + 1], a jr .bcdDone .bcd20 ld a, $20 - ld [hCoins + 1], a + ldh [hCoins + 1], a jr .bcdDone .bcd40 ; due to a typo, this is never used ld a, $40 - ld [hCoins + 1], a + ldh [hCoins + 1], a jr .bcdDone .bcd100 ld a, $1 - ld [hCoins], a + ldh [hCoins], a .bcdDone ld de, wPlayerCoins + 1 ld hl, hCoins + 1 @@ -118,18 +118,18 @@ HiddenCoins: .done jp PrintPredefTextID -INCLUDE "data/hidden_coins.asm" +INCLUDE "data/events/hidden_coins.asm" -FoundHiddenCoinsText: - TX_FAR _FoundHiddenCoinsText - TX_SFX_ITEM_2 - db "@" +FoundHiddenCoinsText:: + text_far _FoundHiddenCoinsText + sound_get_item_2 + text_end -DroppedHiddenCoinsText: - TX_FAR _FoundHiddenCoins2Text - TX_SFX_ITEM_2 - TX_FAR _DroppedHiddenCoinsText - db "@" +DroppedHiddenCoinsText:: + text_far _FoundHiddenCoins2Text + sound_get_item_2 + text_far _DroppedHiddenCoinsText + text_end FindHiddenItemOrCoinsIndex: ld a, [wHiddenObjectY] @@ -142,7 +142,7 @@ FindHiddenItemOrCoinsIndex: .loop inc c ld a, [hli] - cp $ff ; end of the list? + cp -1 ; end of the list? ret z ; if so, we're done here cp b jr nz, .next1 diff --git a/engine/events/hidden_objects/bench_guys.asm b/engine/events/hidden_objects/bench_guys.asm new file mode 100644 index 00000000..b41434ad --- /dev/null +++ b/engine/events/hidden_objects/bench_guys.asm @@ -0,0 +1,98 @@ +PrintBenchGuyText: + call EnableAutoTextBoxDrawing + ld hl, BenchGuyTextPointers + ld a, [wCurMap] + ld b, a +.loop + ld a, [hli] + cp -1 + ret z + cp b + jr z, .match + inc hl + inc hl + jr .loop +.match + ld a, [hli] + ld b, a + ld a, [wSpritePlayerStateData1FacingDirection] + cp b + jr nz, .loop ; player isn't facing the bench guy + ld a, [hl] + jp PrintPredefTextID + +INCLUDE "data/events/bench_guys.asm" + +ViridianCityPokecenterBenchGuyText:: + text_far _ViridianCityPokecenterGuyText + text_end + +PewterCityPokecenterBenchGuyText:: + text_far _PewterCityPokecenterGuyText + text_end + +CeruleanCityPokecenterBenchGuyText:: + text_far _CeruleanPokecenterGuyText + text_end + +LavenderCityPokecenterBenchGuyText:: + text_far _LavenderPokecenterGuyText + text_end + +MtMoonPokecenterBenchGuyText:: + text_far _MtMoonPokecenterBenchGuyText + text_end + +RockTunnelPokecenterBenchGuyText:: + text_far _RockTunnelPokecenterGuyText + text_end + +UnusedBenchGuyText1:: + text_far _UnusedBenchGuyText1 + text_end + +UnusedBenchGuyText2:: + text_far _UnusedBenchGuyText2 + text_end + +UnusedBenchGuyText3:: + text_far _UnusedBenchGuyText3 + text_end + +VermilionCityPokecenterBenchGuyText:: + text_far _VermilionPokecenterGuyText + text_end + +CeladonCityPokecenterBenchGuyText:: + text_far _CeladonCityPokecenterGuyText + text_end + +FuchsiaCityPokecenterBenchGuyText:: + text_far _FuchsiaCityPokecenterGuyText + text_end + +CinnabarIslandPokecenterBenchGuyText:: + text_far _CinnabarPokecenterGuyText + text_end + +SaffronCityPokecenterBenchGuyText:: + text_asm + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + ld hl, SaffronCityPokecenterBenchGuyText2 + jr nz, .asm_624f2 + ld hl, SaffronCityPokecenterBenchGuyText1 +.asm_624f2 + call PrintText + jp TextScriptEnd + +SaffronCityPokecenterBenchGuyText1: + text_far _SaffronCityPokecenterGuyText1 + text_end + +SaffronCityPokecenterBenchGuyText2: + text_far _SaffronCityPokecenterGuyText2 + text_end + +CeladonCityHotelText:: + text_far _CeladonCityHotelText + text_end diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm new file mode 100644 index 00000000..a73596b4 --- /dev/null +++ b/engine/events/hidden_objects/bills_house_pc.asm @@ -0,0 +1,134 @@ +BillsHousePC: + call EnableAutoTextBoxDrawing + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING + jr nz, .displayBillsHousePokemonList + CheckEventReuseA EVENT_USED_CELL_SEPARATOR_ON_BILL + jr nz, .displayBillsHouseMonitorText + CheckEventReuseA EVENT_BILL_SAID_USE_CELL_SEPARATOR + jr nz, .doCellSeparator +.displayBillsHouseMonitorText + tx_pre_jump BillsHouseMonitorText +.doCellSeparator + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + tx_pre BillsHouseInitiatedText + ld c, 32 + call DelayFrames + ld a, SFX_TINK + call PlaySound + call WaitForSoundToFinish + ld c, 80 + call DelayFrames + ld a, SFX_SHRINK + call PlaySound + call WaitForSoundToFinish + ld c, 48 + call DelayFrames + ld a, SFX_TINK + call PlaySound + call WaitForSoundToFinish + ld c, 32 + call DelayFrames + ld a, SFX_GET_ITEM_1 + call PlaySound + call WaitForSoundToFinish + call PlayDefaultMusic + SetEvent EVENT_USED_CELL_SEPARATOR_ON_BILL + ret +.displayBillsHousePokemonList + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + tx_pre BillsHousePokemonList + ret + +BillsHouseMonitorText:: + text_far _BillsHouseMonitorText + text_end + +BillsHouseInitiatedText:: + text_far _BillsHouseInitiatedText + text_promptbutton + text_asm + ld a, SFX_STOP_ALL_MUSIC + ld [wNewSoundID], a + call PlaySound + ld c, 16 + call DelayFrames + ld a, SFX_SWITCH + call PlaySound + call WaitForSoundToFinish + ld c, 60 + call DelayFrames + jp TextScriptEnd + +BillsHousePokemonList:: + text_asm + call SaveScreenTilesToBuffer1 + ld hl, BillsHousePokemonListText1 + call PrintText + xor a + ld [wMenuItemOffset], a ; not used + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, 4 + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 1 + ld [wTopMenuItemX], a +.billsPokemonLoop + ld hl, wd730 + set 6, [hl] + hlcoord 0, 0 + ld b, 10 + ld c, 9 + call TextBoxBorder + hlcoord 2, 2 + ld de, BillsMonListText + call PlaceString + ld hl, BillsHousePokemonListText2 + call PrintText + call SaveScreenTilesToBuffer2 + call HandleMenuInput + bit 1, a ; pressed b + jr nz, .cancel + ld a, [wCurrentMenuItem] + add EEVEE + cp EEVEE + jr z, .displayPokedex + cp FLAREON + jr z, .displayPokedex + cp JOLTEON + jr z, .displayPokedex + cp VAPOREON + jr z, .displayPokedex + jr .cancel +.displayPokedex + call DisplayPokedex + call LoadScreenTilesFromBuffer2 + jr .billsPokemonLoop +.cancel + ld hl, wd730 + res 6, [hl] + call LoadScreenTilesFromBuffer2 + jp TextScriptEnd + +BillsHousePokemonListText1: + text_far _BillsHousePokemonListText1 + text_end + +BillsMonListText: + db "EEVEE" + next "FLAREON" + next "JOLTEON" + next "VAPOREON" + next "CANCEL@" + +BillsHousePokemonListText2: + text_far _BillsHousePokemonListText2 + text_end diff --git a/engine/events/hidden_objects/blues_room.asm b/engine/events/hidden_objects/blues_room.asm new file mode 100644 index 00000000..bcbad556 --- /dev/null +++ b/engine/events/hidden_objects/blues_room.asm @@ -0,0 +1,13 @@ + + ret ; unused + +UnusedPredefText:: + db "@" + +PrintBookcaseText: + call EnableAutoTextBoxDrawing + tx_pre_jump BookcaseText + +BookcaseText:: + text_far _BookcaseText + text_end diff --git a/engine/events/hidden_objects/book_or_sculpture.asm b/engine/events/hidden_objects/book_or_sculpture.asm new file mode 100644 index 00000000..e04f4047 --- /dev/null +++ b/engine/events/hidden_objects/book_or_sculpture.asm @@ -0,0 +1,21 @@ +BookOrSculptureText:: + text_asm + ld hl, PokemonBooksText + ld a, [wCurMapTileset] + cp MANSION ; Celadon Mansion tileset + jr nz, .ok + lda_coord 8, 6 + cp $38 + jr nz, .ok + ld hl, DiglettSculptureText +.ok + call PrintText + jp TextScriptEnd + +PokemonBooksText: + text_far _PokemonBooksText + text_end + +DiglettSculptureText: + text_far _DiglettSculptureText + text_end diff --git a/engine/events/hidden_objects/bookshelves.asm b/engine/events/hidden_objects/bookshelves.asm new file mode 100644 index 00000000..b58444af --- /dev/null +++ b/engine/events/hidden_objects/bookshelves.asm @@ -0,0 +1,39 @@ +; prints text for bookshelves in buildings without sign events +PrintBookshelfText:: + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + jr nz, .noMatch +; facing up + ld a, [wCurMapTileset] + ld b, a + lda_coord 8, 7 + ld c, a + ld hl, BookshelfTileIDs +.loop + ld a, [hli] + cp $ff + jr z, .noMatch + cp b + jr nz, .nextBookshelfEntry1 + ld a, [hli] + cp c + jr nz, .nextBookshelfEntry2 + ld a, [hl] + push af + call EnableAutoTextBoxDrawing + pop af + call PrintPredefTextID + xor a + ldh [hFFDB], a + ret +.nextBookshelfEntry1 + inc hl +.nextBookshelfEntry2 + inc hl + jr .loop +.noMatch + ld a, $ff + ldh [hFFDB], a + farjp PrintCardKeyText + +INCLUDE "data/tilesets/bookshelf_tile_ids.asm" diff --git a/engine/events/hidden_objects/cinnabar_gym_quiz.asm b/engine/events/hidden_objects/cinnabar_gym_quiz.asm new file mode 100644 index 00000000..e2ae7fbe --- /dev/null +++ b/engine/events/hidden_objects/cinnabar_gym_quiz.asm @@ -0,0 +1,200 @@ +PrintCinnabarQuiz: + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + call EnableAutoTextBoxDrawing + tx_pre_jump CinnabarGymQuiz + +CinnabarGymQuiz:: + text_asm + xor a + ld [wOpponentAfterWrongAnswer], a + ld a, [wHiddenObjectFunctionArgument] + push af + and $f + ldh [hGymGateIndex], a + pop af + and $f0 + swap a + ldh [hGymGateAnswer], a + ld hl, CinnabarGymQuizIntroText + call PrintText + ldh a, [hGymGateIndex] + dec a + add a + ld d, 0 + ld e, a + ld hl, CinnabarQuizQuestions + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + call CinnabarGymQuiz_1ea92 + jp TextScriptEnd + +CinnabarGymQuizIntroText: + text_far _CinnabarGymQuizIntroText + text_end + +CinnabarQuizQuestions: + dw CinnabarQuizQuestionsText1 + dw CinnabarQuizQuestionsText2 + dw CinnabarQuizQuestionsText3 + dw CinnabarQuizQuestionsText4 + dw CinnabarQuizQuestionsText5 + dw CinnabarQuizQuestionsText6 + +CinnabarQuizQuestionsText1: + text_far _CinnabarQuizQuestionsText1 + text_end + +CinnabarQuizQuestionsText2: + text_far _CinnabarQuizQuestionsText2 + text_end + +CinnabarQuizQuestionsText3: + text_far _CinnabarQuizQuestionsText3 + text_end + +CinnabarQuizQuestionsText4: + text_far _CinnabarQuizQuestionsText4 + text_end + +CinnabarQuizQuestionsText5: + text_far _CinnabarQuizQuestionsText5 + text_end + +CinnabarQuizQuestionsText6: + text_far _CinnabarQuizQuestionsText6 + text_end + +CinnabarGymGateFlagAction: + EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED + predef_jump FlagActionPredef + +CinnabarGymQuiz_1ea92: + call YesNoChoice + ldh a, [hGymGateAnswer] + ld c, a + ld a, [wCurrentMenuItem] + cp c + jr nz, .wrongAnswer + ld hl, wCurrentMapScriptFlags + set 5, [hl] + ldh a, [hGymGateIndex] + ldh [hBackupGymGateIndex], a + ld hl, CinnabarGymQuizCorrectText + call PrintText + ldh a, [hBackupGymGateIndex] + AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 + ld c, a + ld b, FLAG_SET + call CinnabarGymGateFlagAction + jp UpdateCinnabarGymGateTileBlocks_ +.wrongAnswer + call WaitForSoundToFinish + ld a, SFX_DENIED + call PlaySound + call WaitForSoundToFinish + ld hl, CinnabarGymQuizIncorrectText + call PrintText + ldh a, [hGymGateIndex] + add $2 + AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 + ld c, a + ld b, FLAG_TEST + EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0 + predef FlagActionPredef + ld a, c + and a + ret nz + ldh a, [hGymGateIndex] + add $2 + ld [wOpponentAfterWrongAnswer], a + ret + +CinnabarGymQuizCorrectText: + sound_get_item_1 + text_far _CinnabarGymQuizCorrectText + text_promptbutton + text_asm + + ldh a, [hBackupGymGateIndex] + AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 + ld c, a + ld b, FLAG_TEST + call CinnabarGymGateFlagAction + ld a, c + and a + jp nz, TextScriptEnd + call WaitForSoundToFinish + ld a, SFX_GO_INSIDE + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + +CinnabarGymQuizIncorrectText: + text_far _CinnabarGymQuizIncorrectText + text_end + +UpdateCinnabarGymGateTileBlocks_:: +; Update the overworld map with open floor blocks or locked gate blocks +; depending on event flags. + ld a, 6 + ldh [hGymGateIndex], a +.loop + ldh a, [hGymGateIndex] + dec a + add a + add a + ld d, 0 + ld e, a + ld hl, CinnabarGymGateCoords + add hl, de + ld a, [hli] + ld b, [hl] + ld c, a + inc hl + ld a, [hl] + ld [wGymGateTileBlock], a + push bc + ldh a, [hGymGateIndex] + ldh [hBackupGymGateIndex], a + AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 + ld c, a + ld b, FLAG_TEST + call CinnabarGymGateFlagAction + ld a, c + and a + jr nz, .unlocked + ld a, [wGymGateTileBlock] + jr .next +.unlocked + ld a, $e +.next + pop bc + ld [wNewTileBlockID], a + predef ReplaceTileBlock + ld hl, hGymGateIndex + dec [hl] + jr nz, .loop + ret + +gym_gate_coord: MACRO + db \1, \2, \3, 0 +ENDM + +HORIZONTAL_GATE_BLOCK EQU $54 +VERTICAL_GATE_BLOCK EQU $5f + +CinnabarGymGateCoords: + ; x coord, y coord, block id + gym_gate_coord 9, 3, HORIZONTAL_GATE_BLOCK + gym_gate_coord 6, 3, HORIZONTAL_GATE_BLOCK + gym_gate_coord 6, 6, HORIZONTAL_GATE_BLOCK + gym_gate_coord 3, 8, VERTICAL_GATE_BLOCK + gym_gate_coord 2, 6, HORIZONTAL_GATE_BLOCK + gym_gate_coord 2, 3, HORIZONTAL_GATE_BLOCK diff --git a/engine/events/hidden_objects/elevator.asm b/engine/events/hidden_objects/elevator.asm new file mode 100644 index 00000000..ab0f731f --- /dev/null +++ b/engine/events/hidden_objects/elevator.asm @@ -0,0 +1,3 @@ +ElevatorText:: + text_far _ElevatorText + text_end diff --git a/engine/events/hidden_objects/fighting_dojo.asm b/engine/events/hidden_objects/fighting_dojo.asm new file mode 100644 index 00000000..b4f89985 --- /dev/null +++ b/engine/events/hidden_objects/fighting_dojo.asm @@ -0,0 +1,23 @@ +PrintFightingDojoText2: + call EnableAutoTextBoxDrawing + tx_pre_jump EnemiesOnEverySideText + +EnemiesOnEverySideText:: + text_far _EnemiesOnEverySideText + text_end + +PrintFightingDojoText3: + call EnableAutoTextBoxDrawing + tx_pre_jump WhatGoesAroundComesAroundText + +WhatGoesAroundComesAroundText:: + text_far _WhatGoesAroundComesAroundText + text_end + +PrintFightingDojoText: + call EnableAutoTextBoxDrawing + tx_pre_jump FightingDojoText + +FightingDojoText:: + text_far _FightingDojoText + text_end diff --git a/engine/events/hidden_objects/gym_statues.asm b/engine/events/hidden_objects/gym_statues.asm new file mode 100644 index 00000000..1c7eb970 --- /dev/null +++ b/engine/events/hidden_objects/gym_statues.asm @@ -0,0 +1,39 @@ +GymStatues: +; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID +; if in a gym and don't have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID +; else ret + call EnableAutoTextBoxDrawing + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + ld hl, MapBadgeFlags + ld a, [wCurMap] + ld b, a +.loop + ld a, [hli] + cp $ff + ret z + cp b + jr z, .match + inc hl + jr .loop +.match + ld b, [hl] + ld a, [wBeatGymFlags] + and b + cp b + tx_pre_id GymStatueText2 + jr z, .haveBadge + tx_pre_id GymStatueText1 +.haveBadge + jp PrintPredefTextID + +INCLUDE "data/maps/badge_maps.asm" + +GymStatueText1:: + text_far _GymStatueText1 + text_end + +GymStatueText2:: + text_far _GymStatueText2 + text_end diff --git a/engine/events/hidden_objects/indigo_plateau_hq.asm b/engine/events/hidden_objects/indigo_plateau_hq.asm new file mode 100644 index 00000000..e8fd0220 --- /dev/null +++ b/engine/events/hidden_objects/indigo_plateau_hq.asm @@ -0,0 +1,10 @@ +PrintIndigoPlateauHQText: + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + call EnableAutoTextBoxDrawing + tx_pre_jump IndigoPlateauHQText + +IndigoPlateauHQText:: + text_far _IndigoPlateauHQText + text_end diff --git a/engine/events/hidden_objects/indigo_plateau_statues.asm b/engine/events/hidden_objects/indigo_plateau_statues.asm new file mode 100644 index 00000000..23e94fcf --- /dev/null +++ b/engine/events/hidden_objects/indigo_plateau_statues.asm @@ -0,0 +1,24 @@ +IndigoPlateauStatues:: + text_asm + ld hl, IndigoPlateauStatuesText1 + call PrintText + ld a, [wXCoord] + bit 0, a + ld hl, IndigoPlateauStatuesText2 + jr nz, .ok + ld hl, IndigoPlateauStatuesText3 +.ok + call PrintText + jp TextScriptEnd + +IndigoPlateauStatuesText1: + text_far _IndigoPlateauStatuesText1 + text_end + +IndigoPlateauStatuesText2: + text_far _IndigoPlateauStatuesText2 + text_end + +IndigoPlateauStatuesText3: + text_far _IndigoPlateauStatuesText3 + text_end diff --git a/engine/events/hidden_objects/magazines.asm b/engine/events/hidden_objects/magazines.asm new file mode 100644 index 00000000..b58636ff --- /dev/null +++ b/engine/events/hidden_objects/magazines.asm @@ -0,0 +1,8 @@ +PrintMagazinesText: + call EnableAutoTextBoxDrawing + tx_pre MagazinesText + ret + +MagazinesText:: + text_far _MagazinesText + text_end diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_objects/museum_fossils.asm new file mode 100644 index 00000000..27714981 --- /dev/null +++ b/engine/events/hidden_objects/museum_fossils.asm @@ -0,0 +1,52 @@ +AerodactylFossil: + ld a, FOSSIL_AERODACTYL + ld [wcf91], a + call DisplayMonFrontSpriteInBox + call EnableAutoTextBoxDrawing + tx_pre AerodactylFossilText + ret + +AerodactylFossilText:: + text_far _AerodactylFossilText + text_end + +KabutopsFossil: + ld a, FOSSIL_KABUTOPS + ld [wcf91], a + call DisplayMonFrontSpriteInBox + call EnableAutoTextBoxDrawing + tx_pre KabutopsFossilText + ret + +KabutopsFossilText:: + text_far _KabutopsFossilText + text_end + +DisplayMonFrontSpriteInBox: +; Displays a pokemon's front sprite in a pop-up window. +; [wcf91] = pokemon internal id number + ld a, 1 + ldh [hAutoBGTransferEnabled], a + call Delay3 + xor a + ldh [hWY], a + call SaveScreenTilesToBuffer1 + ld a, MON_SPRITE_POPUP + ld [wTextBoxID], a + call DisplayTextBoxID + call UpdateSprites + ld a, [wcf91] + ld [wd0b5], a + call GetMonHeader + ld de, vChars1 tile $31 + call LoadMonFrontSprite + ld a, $80 + ldh [hStartTileID], a + hlcoord 10, 11 + predef AnimateSendingOutMon + call WaitForTextScrollButtonPress + call LoadScreenTilesFromBuffer1 + call Delay3 + ld a, $90 + ldh [hWY], a + ret diff --git a/engine/events/hidden_objects/new_bike.asm b/engine/events/hidden_objects/new_bike.asm new file mode 100644 index 00000000..5bce5937 --- /dev/null +++ b/engine/events/hidden_objects/new_bike.asm @@ -0,0 +1,7 @@ +PrintNewBikeText: + call EnableAutoTextBoxDrawing + tx_pre_jump NewBicycleText + +NewBicycleText:: + text_far _NewBicycleText + text_end diff --git a/engine/events/hidden_objects/oaks_lab_email.asm b/engine/events/hidden_objects/oaks_lab_email.asm new file mode 100644 index 00000000..b66babe0 --- /dev/null +++ b/engine/events/hidden_objects/oaks_lab_email.asm @@ -0,0 +1,10 @@ +DisplayOakLabEmailText: + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + call EnableAutoTextBoxDrawing + tx_pre_jump OakLabEmailText + +OakLabEmailText:: + text_far _OakLabEmailText + text_end diff --git a/engine/events/hidden_objects/oaks_lab_posters.asm b/engine/events/hidden_objects/oaks_lab_posters.asm new file mode 100644 index 00000000..502cf951 --- /dev/null +++ b/engine/events/hidden_objects/oaks_lab_posters.asm @@ -0,0 +1,29 @@ +DisplayOakLabLeftPoster: + call EnableAutoTextBoxDrawing + tx_pre_jump PushStartText + +PushStartText:: + text_far _PushStartText + text_end + +DisplayOakLabRightPoster: + call EnableAutoTextBoxDrawing + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned + call CountSetBits + ld a, [wNumSetBits] + cp 2 + tx_pre_id SaveOptionText + jr c, .ownLessThanTwo + ; own two or more mon + tx_pre_id StrengthsAndWeaknessesText +.ownLessThanTwo + jp PrintPredefTextID + +SaveOptionText:: + text_far _SaveOptionText + text_end + +StrengthsAndWeaknessesText:: + text_far _StrengthsAndWeaknessesText + text_end diff --git a/engine/events/hidden_objects/pokecenter_pc.asm b/engine/events/hidden_objects/pokecenter_pc.asm new file mode 100644 index 00000000..f20f40ed --- /dev/null +++ b/engine/events/hidden_objects/pokecenter_pc.asm @@ -0,0 +1,11 @@ +OpenPokemonCenterPC: + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + call EnableAutoTextBoxDrawing + ld a, TRUE + ld [wAutoTextBoxDrawingControl], a + tx_pre_jump PokemonCenterPCText + +PokemonCenterPCText:: + script_pokecenter_pc diff --git a/engine/events/hidden_objects/pokemon_stuff.asm b/engine/events/hidden_objects/pokemon_stuff.asm new file mode 100644 index 00000000..267a191a --- /dev/null +++ b/engine/events/hidden_objects/pokemon_stuff.asm @@ -0,0 +1,3 @@ +PokemonStuffText:: + text_far _PokemonStuffText + text_end diff --git a/engine/events/hidden_objects/reds_room.asm b/engine/events/hidden_objects/reds_room.asm new file mode 100644 index 00000000..7b8d51a0 --- /dev/null +++ b/engine/events/hidden_objects/reds_room.asm @@ -0,0 +1,14 @@ +PrintRedSNESText: + call EnableAutoTextBoxDrawing + tx_pre_jump RedBedroomSNESText + +RedBedroomSNESText:: + text_far _RedBedroomSNESText + text_end + +OpenRedsPC: + call EnableAutoTextBoxDrawing + tx_pre_jump RedBedroomPCText + +RedBedroomPCText:: + script_players_pc diff --git a/engine/events/hidden_objects/route_15_binoculars.asm b/engine/events/hidden_objects/route_15_binoculars.asm new file mode 100644 index 00000000..ce047c2f --- /dev/null +++ b/engine/events/hidden_objects/route_15_binoculars.asm @@ -0,0 +1,14 @@ +Route15GateLeftBinoculars: + ld a, [wSpritePlayerStateData1FacingDirection] + cp SPRITE_FACING_UP + ret nz + call EnableAutoTextBoxDrawing + tx_pre Route15UpstairsBinocularsText + ld a, ARTICUNO + ld [wcf91], a + call PlayCry + jp DisplayMonFrontSpriteInBox + +Route15UpstairsBinocularsText:: + text_far _Route15UpstairsBinocularsText + text_end diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm new file mode 100644 index 00000000..f49cab97 --- /dev/null +++ b/engine/events/hidden_objects/safari_game.asm @@ -0,0 +1,81 @@ +SafariZoneCheck:: + CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone, + jr z, SafariZoneGameStillGoing ; don't bother printing game over text + ld a, [wNumSafariBalls] + and a + jr z, SafariZoneGameOver + jr SafariZoneGameStillGoing + +SafariZoneCheckSteps:: +IF DEF(_DEBUG) + call DebugPressedOrHeldB + ret nz +ENDC + ld a, [wSafariSteps] + ld b, a + ld a, [wSafariSteps + 1] + ld c, a + or b + jr z, SafariZoneGameOver + dec bc + ld a, b + ld [wSafariSteps], a + ld a, c + ld [wSafariSteps + 1], a +SafariZoneGameStillGoing: + xor a + ld [wSafariZoneGameOver], a + ret + +SafariZoneGameOver: + call EnableAutoTextBoxDrawing + xor a + ld [wAudioFadeOutControl], a + dec a ; SFX_STOP_ALL_MUSIC + call PlaySound + ld c, 0 ; BANK(SFX_Safari_Zone_PA) + ld a, SFX_SAFARI_ZONE_PA + call PlaySound + call WaitForSoundToFinish + + ld a, TEXT_SAFARI_GAME_OVER + ldh [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wPlayerMovingDirection], a + ld a, SAFARI_ZONE_GATE + ldh [hWarpDestinationMap], a + ld a, $3 + ld [wDestinationWarpID], a + ld a, $5 + ld [wSafariZoneGateCurScript], a + SetEvent EVENT_SAFARI_GAME_OVER + ld a, 1 + ld [wSafariZoneGameOver], a + ret + +PrintSafariGameOverText:: + xor a + ld [wJoyIgnore], a + ld hl, SafariGameOverText + jp PrintText + +SafariGameOverText: + text_asm + ld a, [wNumSafariBalls] + and a + jr z, .noMoreSafariBalls + ld hl, TimesUpText + call PrintText +.noMoreSafariBalls + ld hl, GameOverText + call PrintText + jp TextScriptEnd + +TimesUpText: + text_far _TimesUpText + text_end + +GameOverText: + text_far _GameOverText + text_end diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm new file mode 100644 index 00000000..de4700d4 --- /dev/null +++ b/engine/events/hidden_objects/school_blackboard.asm @@ -0,0 +1,224 @@ +PrintBlackboardLinkCableText: + call EnableAutoTextBoxDrawing + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, [wHiddenObjectFunctionArgument] + call PrintPredefTextID + ret + +LinkCableHelp:: + text_asm + call SaveScreenTilesToBuffer1 + ld hl, LinkCableHelpText1 + call PrintText + xor a + ld [wMenuItemOffset], a ; not used + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, 3 + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 1 + ld [wTopMenuItemX], a +.linkHelpLoop + ld hl, wd730 + set 6, [hl] + hlcoord 0, 0 + ld b, 8 + ld c, 13 + call TextBoxBorder + hlcoord 2, 2 + ld de, HowToLinkText + call PlaceString + ld hl, LinkCableHelpText2 + call PrintText + call HandleMenuInput + bit 1, a ; pressed b + jr nz, .exit + ld a, [wCurrentMenuItem] + cp 3 ; pressed a on "STOP READING" + jr z, .exit + ld hl, wd730 + res 6, [hl] + ld hl, LinkCableInfoTexts + add a + ld d, 0 + ld e, a + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText + jp .linkHelpLoop +.exit + ld hl, wd730 + res 6, [hl] + call LoadScreenTilesFromBuffer1 + jp TextScriptEnd + +LinkCableHelpText1: + text_far _LinkCableHelpText1 + text_end + +LinkCableHelpText2: + text_far _LinkCableHelpText2 + text_end + +HowToLinkText: + db "HOW TO LINK" + next "COLOSSEUM" + next "TRADE CENTER" + next "STOP READING@" + +LinkCableInfoTexts: + dw LinkCableInfoText1 + dw LinkCableInfoText2 + dw LinkCableInfoText3 + +LinkCableInfoText1: + text_far _LinkCableInfoText1 + text_end + +LinkCableInfoText2: + text_far _LinkCableInfoText2 + text_end + +LinkCableInfoText3: + text_far _LinkCableInfoText3 + text_end + +ViridianSchoolBlackboard:: + text_asm + call SaveScreenTilesToBuffer1 + ld hl, ViridianSchoolBlackboardText1 + call PrintText + xor a + ld [wMenuItemOffset], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld a, D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, 2 + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 1 + ld [wTopMenuItemX], a +.blackboardLoop + ld hl, wd730 + set 6, [hl] + hlcoord 0, 0 + lb bc, 6, 10 + call TextBoxBorder + hlcoord 1, 2 + ld de, StatusAilmentText1 + call PlaceString + hlcoord 6, 2 + ld de, StatusAilmentText2 + call PlaceString + ld hl, ViridianSchoolBlackboardText2 + call PrintText + call HandleMenuInput ; pressing up and down is handled in here + bit 1, a ; pressed b + jr nz, .exitBlackboard + bit 4, a ; pressed right + jr z, .didNotPressRight + ; move cursor to right column + ld a, 2 + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 6 + ld [wTopMenuItemX], a + ld a, 3 ; in the the right column, use an offset to prevent overlap + ld [wMenuItemOffset], a + jr .blackboardLoop +.didNotPressRight + bit 5, a ; pressed left + jr z, .didNotPressLeftOrRight + ; move cursor to left column + ld a, 2 + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 1 + ld [wTopMenuItemX], a + xor a + ld [wMenuItemOffset], a + jr .blackboardLoop +.didNotPressLeftOrRight + ld a, [wCurrentMenuItem] + ld b, a + ld a, [wMenuItemOffset] + add b + cp 5 ; cursor is pointing to "QUIT" + jr z, .exitBlackboard + ; we must have pressed a on a status condition + ; so print the text + ld hl, wd730 + res 6, [hl] + ld hl, ViridianBlackboardStatusPointers + add a + ld d, 0 + ld e, a + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText + jp .blackboardLoop +.exitBlackboard + ld hl, wd730 + res 6, [hl] + call LoadScreenTilesFromBuffer1 + jp TextScriptEnd + +ViridianSchoolBlackboardText1: + text_far _ViridianSchoolBlackboardText1 + text_end + +ViridianSchoolBlackboardText2: + text_far _ViridianSchoolBlackboardText2 + text_end + +StatusAilmentText1: + db " SLP" + next " PSN" + next " PAR@" + +StatusAilmentText2: + db " BRN" + next " FRZ" + next " QUIT@" + + db "@" ; unused + +ViridianBlackboardStatusPointers: + dw ViridianBlackboardSleepText + dw ViridianBlackboardPoisonText + dw ViridianBlackboardPrlzText + dw ViridianBlackboardBurnText + dw ViridianBlackboardFrozenText + +ViridianBlackboardSleepText: + text_far _ViridianBlackboardSleepText + text_end + +ViridianBlackboardPoisonText: + text_far _ViridianBlackboardPoisonText + text_end + +ViridianBlackboardPrlzText: + text_far _ViridianBlackboardPrlzText + text_end + +ViridianBlackboardBurnText: + text_far _ViridianBlackboardBurnText + text_end + +ViridianBlackboardFrozenText: + text_far _ViridianBlackboardFrozenText + text_end diff --git a/engine/events/hidden_objects/school_notebooks.asm b/engine/events/hidden_objects/school_notebooks.asm new file mode 100644 index 00000000..96a44ab5 --- /dev/null +++ b/engine/events/hidden_objects/school_notebooks.asm @@ -0,0 +1,65 @@ +PrintNotebookText: + call EnableAutoTextBoxDrawing + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, [wHiddenObjectFunctionArgument] + jp PrintPredefTextID + +TMNotebook:: + text_far TMNotebookText + text_waitbutton + text_end + +ViridianSchoolNotebook:: + text_asm + ld hl, ViridianSchoolNotebookText1 + call PrintText + call TurnPageSchoolNotebook + jr nz, .doneReading + ld hl, ViridianSchoolNotebookText2 + call PrintText + call TurnPageSchoolNotebook + jr nz, .doneReading + ld hl, ViridianSchoolNotebookText3 + call PrintText + call TurnPageSchoolNotebook + jr nz, .doneReading + ld hl, ViridianSchoolNotebookText4 + call PrintText + ld hl, ViridianSchoolNotebookText5 + call PrintText +.doneReading + jp TextScriptEnd + +TurnPageSchoolNotebook: + ld hl, TurnPageText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + ret + +TurnPageText: + text_far _TurnPageText + text_end + +ViridianSchoolNotebookText5: + text_far _ViridianSchoolNotebookText5 + text_waitbutton + text_end + +ViridianSchoolNotebookText1: + text_far _ViridianSchoolNotebookText1 + text_end + +ViridianSchoolNotebookText2: + text_far _ViridianSchoolNotebookText2 + text_end + +ViridianSchoolNotebookText3: + text_far _ViridianSchoolNotebookText3 + text_end + +ViridianSchoolNotebookText4: + text_far _ViridianSchoolNotebookText4 + text_end diff --git a/engine/events/hidden_objects/town_map.asm b/engine/events/hidden_objects/town_map.asm new file mode 100644 index 00000000..4284214f --- /dev/null +++ b/engine/events/hidden_objects/town_map.asm @@ -0,0 +1,22 @@ +TownMapText:: + text_far _TownMapText + text_promptbutton + text_asm + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, wd730 + set 6, [hl] + call GBPalWhiteOutWithDelay3 + xor a + ldh [hWY], a + inc a + ldh [hAutoBGTransferEnabled], a + call LoadFontTilePatterns + farcall DisplayTownMap + ld hl, wd730 + res 6, [hl] + ld de, TextScriptEnd + push de + ldh a, [hLoadedROMBank] + push af + jp CloseTextDisplay diff --git a/engine/events/hidden_objects/vermilion_gym_trash.asm b/engine/events/hidden_objects/vermilion_gym_trash.asm new file mode 100644 index 00000000..c99fff01 --- /dev/null +++ b/engine/events/hidden_objects/vermilion_gym_trash.asm @@ -0,0 +1,176 @@ +PrintTrashText: + call EnableAutoTextBoxDrawing + tx_pre_jump VermilionGymTrashText + +VermilionGymTrashText:: + text_far _VermilionGymTrashText + text_end + +GymTrashScript: + call EnableAutoTextBoxDrawing + ld a, [wHiddenObjectFunctionArgument] + ld [wGymTrashCanIndex], a + +; Don't do the trash can puzzle if it's already been done. + CheckEvent EVENT_2ND_LOCK_OPENED + jr z, .ok + + tx_pre_jump VermilionGymTrashText + +.ok + CheckEventReuseA EVENT_1ST_LOCK_OPENED + jr nz, .trySecondLock + + ld a, [wFirstLockTrashCanIndex] + ld b, a + ld a, [wGymTrashCanIndex] + cp b + jr z, .openFirstLock + + tx_pre_id VermilionGymTrashText + jr .done + +.openFirstLock +; Next can is trying for the second switch. + SetEvent EVENT_1ST_LOCK_OPENED + + ld hl, GymTrashCans + ld a, [wGymTrashCanIndex] + ; * 5 + ld b, a + add a + add a + add b + + ld d, 0 + ld e, a + add hl, de + ld a, [hli] + +; There is a bug in this code. It should calculate a value in the range [0, 3] +; but if the mask and random number don't have any 1 bits in common, then +; the result of the AND will be 0. When 1 is subtracted from that, the value +; will become $ff. This will result in 255 being added to hl, which will cause +; hl to point to one of the zero bytes that pad the end of the ROM bank. +; Trash can 0 was intended to be able to have the second lock only when the +; first lock was in trash can 1 or 3. However, due to this bug, trash can 0 can +; have the second lock regardless of which trash can had the first lock. + + ldh [hGymTrashCanRandNumMask], a + push hl + call Random + swap a + ld b, a + ldh a, [hGymTrashCanRandNumMask] + and b + dec a + pop hl + + ld d, 0 + ld e, a + add hl, de + ld a, [hl] + and $f + ld [wSecondLockTrashCanIndex], a + + tx_pre_id VermilionGymTrashSuccessText1 + jr .done + +.trySecondLock + ld a, [wSecondLockTrashCanIndex] + ld b, a + ld a, [wGymTrashCanIndex] + cp b + jr z, .openSecondLock + +; Reset the cans. + ResetEvent EVENT_1ST_LOCK_OPENED + call Random + + and $e + ld [wFirstLockTrashCanIndex], a + + tx_pre_id VermilionGymTrashFailText + jr .done + +.openSecondLock +; Completed the trash can puzzle. + SetEvent EVENT_2ND_LOCK_OPENED + ld hl, wCurrentMapScriptFlags + set 6, [hl] + + tx_pre_id VermilionGymTrashSuccessText3 + +.done + jp PrintPredefTextID + +GymTrashCans: +; byte 0: mask for random number +; bytes 1-4: indices of the trash cans that can have the second lock +; (but see the comment above explaining a bug regarding this) +; Note that the mask is simply the number of valid trash can indices that +; follow. The remaining bytes are filled with 0 to pad the length of each entry +; to 5 bytes. + db 2, 1, 3, 0, 0 ; 0 + db 3, 0, 2, 4, 0 ; 1 + db 2, 1, 5, 0, 0 ; 2 + db 3, 0, 4, 6, 0 ; 3 + db 4, 1, 3, 5, 7 ; 4 + db 3, 2, 4, 8, 0 ; 5 + db 3, 3, 7, 9, 0 ; 6 + db 4, 4, 6, 8, 10 ; 7 + db 3, 5, 7, 11, 0 ; 8 + db 3, 6, 10, 12, 0 ; 9 + db 4, 7, 9, 11, 13 ; 10 + db 3, 8, 10, 14, 0 ; 11 + db 2, 9, 13, 0, 0 ; 12 + db 3, 10, 12, 14, 0 ; 13 + db 2, 11, 13, 0, 0 ; 14 + +VermilionGymTrashSuccessText1:: + text_far _VermilionGymTrashSuccessText1 + text_asm + call WaitForSoundToFinish + ld a, SFX_SWITCH + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + +; unused +VermilionGymTrashSuccessText2:: + text_far _VermilionGymTrashSuccessText2 + text_end + +; unused +VermilionGymTrashSuccesPlaySfx: + text_asm + call WaitForSoundToFinish + ld a, SFX_SWITCH + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + +VermilionGymTrashSuccessText3:: + text_far _VermilionGymTrashSuccessText3 + text_asm + call WaitForSoundToFinish + ld a, SFX_GO_INSIDE + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + +VermilionGymTrashFailText:: + text_far _VermilionGymTrashFailText + text_asm + call WaitForSoundToFinish + ld a, SFX_DENIED + call PlaySound + call WaitForSoundToFinish + jp TextScriptEnd + + ; Trash cans are broken and can read the 255th entry sometimes for + ; the second can. + ; rgblink was placing stuff here, so the behavior was different from + ; original Red. This is the simplest non-code fix: allocate zeroes as + ; far as the broken code could reach. + ds 255 diff --git a/engine/in_game_trades.asm b/engine/events/in_game_trades.asm old mode 100755 new mode 100644 similarity index 87% rename from engine/in_game_trades.asm rename to engine/events/in_game_trades.asm index c01bc3c3..c6951615 --- a/engine/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -84,7 +84,7 @@ InGameTrade_GetMonName: ld bc, NAME_LENGTH jp CopyData -INCLUDE "data/trades.asm" +INCLUDE "data/events/trades.asm" InGameTrade_DoTrade: xor a ; NORMAL_PARTY_MENU @@ -137,10 +137,10 @@ InGameTrade_DoTrade: ld [wMonDataLocation], a call AddPartyMon call InGameTrade_CopyDataToReceivedMon - callab EvolveTradeMon + callfar EvolveTradeMon call ClearScreen call InGameTrade_RestoreScreen - callba RedrawMapView + farcall RedrawMapView and a ld a, $3 jr .tradeSucceeded @@ -159,7 +159,7 @@ InGameTrade_RestoreScreen: call LoadGBPal ld c, 10 call DelayFrames - jpba LoadWildData + farjp LoadWildData InGameTrade_PrepareTradeData: ld hl, wTradedPlayerMonSpecies @@ -230,10 +230,10 @@ InGameTrade_GetReceivedMonPointer: ret InGameTrade_TrainerString: - ; "TRAINER@@@@@@@@@@" - db $5d, "@@@@@@@@@@" + db "@@@@@@@@@@" InGameTradeTextPointers: +; entries correspond to TRADE_DIALOGSET_* constants dw TradeTextPointers1 dw TradeTextPointers2 dw TradeTextPointers3 @@ -260,71 +260,71 @@ TradeTextPointers3: dw AfterTrade3Text ConnectCableText: - TX_FAR _ConnectCableText - db "@" + text_far _ConnectCableText + text_end TradedForText: - TX_FAR _TradedForText - TX_SFX_KEY_ITEM - TX_DELAY - db "@" + text_far _TradedForText + sound_get_key_item + text_pause + text_end WannaTrade1Text: - TX_FAR _WannaTrade1Text - db "@" + text_far _WannaTrade1Text + text_end NoTrade1Text: - TX_FAR _NoTrade1Text - db "@" + text_far _NoTrade1Text + text_end WrongMon1Text: - TX_FAR _WrongMon1Text - db "@" + text_far _WrongMon1Text + text_end Thanks1Text: - TX_FAR _Thanks1Text - db "@" + text_far _Thanks1Text + text_end AfterTrade1Text: - TX_FAR _AfterTrade1Text - db "@" + text_far _AfterTrade1Text + text_end WannaTrade2Text: - TX_FAR _WannaTrade2Text - db "@" + text_far _WannaTrade2Text + text_end NoTrade2Text: - TX_FAR _NoTrade2Text - db "@" + text_far _NoTrade2Text + text_end WrongMon2Text: - TX_FAR _WrongMon2Text - db "@" + text_far _WrongMon2Text + text_end Thanks2Text: - TX_FAR _Thanks2Text - db "@" + text_far _Thanks2Text + text_end AfterTrade2Text: - TX_FAR _AfterTrade2Text - db "@" + text_far _AfterTrade2Text + text_end WannaTrade3Text: - TX_FAR _WannaTrade3Text - db "@" + text_far _WannaTrade3Text + text_end NoTrade3Text: - TX_FAR _NoTrade3Text - db "@" + text_far _NoTrade3Text + text_end WrongMon3Text: - TX_FAR _WrongMon3Text - db "@" + text_far _WrongMon3Text + text_end Thanks3Text: - TX_FAR _Thanks3Text - db "@" + text_far _Thanks3Text + text_end AfterTrade3Text: - TX_FAR _AfterTrade3Text - db "@" + text_far _AfterTrade3Text + text_end diff --git a/engine/events/oaks_aide.asm b/engine/events/oaks_aide.asm new file mode 100644 index 00000000..f1801f5c --- /dev/null +++ b/engine/events/oaks_aide.asm @@ -0,0 +1,71 @@ +OaksAideScript: + ld hl, OaksAideHiText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .choseNo + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned + call CountSetBits + ld a, [wNumSetBits] + ldh [hOaksAideNumMonsOwned], a + ld b, a + ldh a, [hOaksAideRequirement] + cp b + jr z, .giveItem + jr nc, .notEnoughOwnedMons +.giveItem + ld hl, OaksAideHereYouGoText + call PrintText + ldh a, [hOaksAideRewardItem] + ld b, a + ld c, 1 + call GiveItem + jr nc, .bagFull + ld hl, OaksAideGotItemText + call PrintText + ld a, OAKS_AIDE_GOT_ITEM + jr .done +.bagFull + ld hl, OaksAideNoRoomText + call PrintText + xor a ; OAKS_AIDE_BAG_FULL + jr .done +.notEnoughOwnedMons + ld hl, OaksAideUhOhText + call PrintText + ld a, OAKS_AIDE_NOT_ENOUGH_MONS + jr .done +.choseNo + ld hl, OaksAideComeBackText + call PrintText + ld a, OAKS_AIDE_REFUSED +.done + ldh [hOaksAideResult], a + ret + +OaksAideHiText: + text_far _OaksAideHiText + text_end + +OaksAideUhOhText: + text_far _OaksAideUhOhText + text_end + +OaksAideComeBackText: + text_far _OaksAideComeBackText + text_end + +OaksAideHereYouGoText: + text_far _OaksAideHereYouGoText + text_end + +OaksAideGotItemText: + text_far _OaksAideGotItemText + sound_get_item_1 + text_end + +OaksAideNoRoomText: + text_far _OaksAideNoRoomText + text_end diff --git a/engine/overworld/pewter_guys.asm b/engine/events/pewter_guys.asm old mode 100755 new mode 100644 similarity index 100% rename from engine/overworld/pewter_guys.asm rename to engine/events/pewter_guys.asm diff --git a/engine/events/pick_up_item.asm b/engine/events/pick_up_item.asm new file mode 100644 index 00000000..548db5be --- /dev/null +++ b/engine/events/pick_up_item.asm @@ -0,0 +1,54 @@ +PickUpItem: + call EnableAutoTextBoxDrawing + + ldh a, [hSpriteIndexOrTextID] + ld b, a + ld hl, wMissableObjectList +.missableObjectsListLoop + ld a, [hli] + cp $ff + ret z + cp b + jr z, .isMissable + inc hl + jr .missableObjectsListLoop + +.isMissable + ld a, [hl] + ldh [hMissableObjectIndex], a + + ld hl, wMapSpriteExtraData + ldh a, [hSpriteIndexOrTextID] + dec a + add a + ld d, 0 + ld e, a + add hl, de + ld a, [hl] + ld b, a ; item + ld c, 1 ; quantity + call GiveItem + jr nc, .BagFull + + ldh a, [hMissableObjectIndex] + ld [wMissableObjectIndex], a + predef HideObject + ld a, 1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, FoundItemText + jr .print + +.BagFull + ld hl, NoMoreRoomForItemText +.print + call PrintText + ret + +FoundItemText: + text_far _FoundItemText + sound_get_item_1 + text_end + +NoMoreRoomForItemText: + text_far _NoMoreRoomForItemText + text_end diff --git a/engine/overworld/poison.asm b/engine/events/poison.asm similarity index 96% rename from engine/overworld/poison.asm rename to engine/events/poison.asm index 5d8eb9fd..8bb756b5 100644 --- a/engine/overworld/poison.asm +++ b/engine/events/poison.asm @@ -52,7 +52,7 @@ ApplyOutOfBattlePoisonDamage: ld [wJoyIgnore], a call EnableAutoTextBoxDrawing ld a, TEXT_MON_FAINTED - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID pop de pop hl @@ -99,7 +99,7 @@ ApplyOutOfBattlePoisonDamage: jr nz, .noBlackOut call EnableAutoTextBoxDrawing ld a, TEXT_BLACKED_OUT - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72e set 5, [hl] diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm new file mode 100644 index 00000000..a0da8eb3 --- /dev/null +++ b/engine/events/pokecenter.asm @@ -0,0 +1,68 @@ +DisplayPokemonCenterDialogue_:: + call SaveScreenTilesToBuffer1 ; save screen + ld hl, PokemonCenterWelcomeText + call PrintText + ld hl, wd72e + bit 2, [hl] + set 1, [hl] + set 2, [hl] + jr nz, .skipShallWeHealYourPokemon + ld hl, ShallWeHealYourPokemonText + call PrintText +.skipShallWeHealYourPokemon + call YesNoChoicePokeCenter ; yes/no menu + ld a, [wCurrentMenuItem] + and a + jr nz, .declinedHealing ; if the player chose No + call SetLastBlackoutMap + call LoadScreenTilesFromBuffer1 ; restore screen + ld hl, NeedYourPokemonText + call PrintText + ld a, $18 + ld [wSprite01StateData1ImageIndex], a ; make the nurse turn to face the machine + call Delay3 + predef HealParty + farcall AnimateHealingMachine ; do the healing machine animation + xor a + ld [wAudioFadeOutControl], a + ld a, [wAudioSavedROMBank] + ld [wAudioROMBank], a + ld a, [wMapMusicSoundID] + ld [wLastMusicSoundID], a + ld [wNewSoundID], a + call PlayMusic + ld hl, PokemonFightingFitText + call PrintText + ld a, $14 + ld [wSprite01StateData1ImageIndex], a ; make the nurse bow + ld c, a + call DelayFrames + jr .done +.declinedHealing + call LoadScreenTilesFromBuffer1 ; restore screen +.done + ld hl, PokemonCenterFarewellText + call PrintText + jp UpdateSprites + +PokemonCenterWelcomeText: + text_far _PokemonCenterWelcomeText + text_end + +ShallWeHealYourPokemonText: + text_pause + text_far _ShallWeHealYourPokemonText + text_end + +NeedYourPokemonText: + text_far _NeedYourPokemonText + text_end + +PokemonFightingFitText: + text_far _PokemonFightingFitText + text_end + +PokemonCenterFarewellText: + text_pause + text_far _PokemonCenterFarewellText + text_end diff --git a/engine/events/pokedex_rating.asm b/engine/events/pokedex_rating.asm new file mode 100644 index 00000000..c61253b7 --- /dev/null +++ b/engine/events/pokedex_rating.asm @@ -0,0 +1,138 @@ +DisplayDexRating: + ld hl, wPokedexSeen + ld b, wPokedexSeenEnd - wPokedexSeen + call CountSetBits + ld a, [wNumSetBits] + ldh [hDexRatingNumMonsSeen], a + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned + call CountSetBits + ld a, [wNumSetBits] + ldh [hDexRatingNumMonsOwned], a + ld hl, DexRatingsTable +.findRating + ld a, [hli] + ld b, a + ldh a, [hDexRatingNumMonsOwned] + cp b + jr c, .foundRating + inc hl + inc hl + jr .findRating +.foundRating + ld a, [hli] + ld h, [hl] + ld l, a ; load text pointer into hl + CheckAndResetEventA EVENT_HALL_OF_FAME_DEX_RATING + jr nz, .hallOfFame + push hl + ld hl, PokedexRatingText_441cc + call PrintText + pop hl + call PrintText + farcall PlayPokedexRatingSfx + jp WaitForTextScrollButtonPress +.hallOfFame + ld de, wDexRatingNumMonsSeen + ldh a, [hDexRatingNumMonsSeen] + ld [de], a + inc de + ldh a, [hDexRatingNumMonsOwned] + ld [de], a + inc de +.copyRatingTextLoop + ld a, [hli] + cp "@" + jr z, .doneCopying + ld [de], a + inc de + jr .copyRatingTextLoop +.doneCopying + ld [de], a + ret + +PokedexRatingText_441cc: + text_far _OaksLabText_441cc + text_end + +DexRatingsTable: + dbw 10, PokedexRatingText_44201 + dbw 20, PokedexRatingText_44206 + dbw 30, PokedexRatingText_4420b + dbw 40, PokedexRatingText_44210 + dbw 50, PokedexRatingText_44215 + dbw 60, PokedexRatingText_4421a + dbw 70, PokedexRatingText_4421f + dbw 80, PokedexRatingText_44224 + dbw 90, PokedexRatingText_44229 + dbw 100, PokedexRatingText_4422e + dbw 110, PokedexRatingText_44233 + dbw 120, PokedexRatingText_44238 + dbw 130, PokedexRatingText_4423d + dbw 140, PokedexRatingText_44242 + dbw 150, PokedexRatingText_44247 + dbw NUM_POKEMON + 1, PokedexRatingText_4424c + +PokedexRatingText_44201: + text_far _OaksLabText_44201 + text_end + +PokedexRatingText_44206: + text_far _OaksLabText_44206 + text_end + +PokedexRatingText_4420b: + text_far _OaksLabText_4420b + text_end + +PokedexRatingText_44210: + text_far _OaksLabText_44210 + text_end + +PokedexRatingText_44215: + text_far _OaksLabText_44215 + text_end + +PokedexRatingText_4421a: + text_far _OaksLabText_4421a + text_end + +PokedexRatingText_4421f: + text_far _OaksLabText_4421f + text_end + +PokedexRatingText_44224: + text_far _OaksLabText_44224 + text_end + +PokedexRatingText_44229: + text_far _OaksLabText_44229 + text_end + +PokedexRatingText_4422e: + text_far _OaksLabText_4422e + text_end + +PokedexRatingText_44233: + text_far _OaksLabText_44233 + text_end + +PokedexRatingText_44238: + text_far _OaksLabText_44238 + text_end + +PokedexRatingText_4423d: + text_far _OaksLabText_4423d + text_end + +PokedexRatingText_44242: + text_far _OaksLabText_44242 + text_end + +PokedexRatingText_44247: + text_far _OaksLabText_44247 + text_end + +PokedexRatingText_4424c: + text_far _OaksLabText_4424c + text_end diff --git a/engine/overworld/pokemart.asm b/engine/events/pokemart.asm old mode 100755 new mode 100644 similarity index 88% rename from engine/overworld/pokemart.asm rename to engine/events/pokemart.asm index dc5b29b5..c7cb8115 --- a/engine/overworld/pokemart.asm +++ b/engine/events/pokemart.asm @@ -1,4 +1,4 @@ -DisplayPokemartDialogue_: +DisplayPokemartDialogue_:: ld a, [wListScrollOffset] ld [wSavedListScrollOffset], a call UpdateSprites @@ -42,7 +42,7 @@ DisplayPokemartDialogue_: ld [wPrintItemPrices], a ld a, INIT_BAG_ITEM_LIST ld [wInitListType], a - callab InitList + callfar InitList ld a, [wNumBagItems] and a @@ -77,14 +77,14 @@ DisplayPokemartDialogue_: jr c, .unsellableItem ld a, PRICEDITEMLISTMENU ld [wListMenuID], a - ld [hHalveItemPrices], a ; halve prices when selling + ldh [hHalveItemPrices], a ; halve prices when selling call DisplayChooseQuantityMenu inc a jr z, .sellMenuLoop ; if the player closed the choose quantity menu with the B button ld hl, PokemartTellSellPriceText lb bc, 14, 1 ; location that PrintText always prints to, this is useless call PrintText - coord hl, 14, 7 + hlcoord 14, 7 lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -126,7 +126,7 @@ DisplayPokemartDialogue_: ld [wPrintItemPrices], a ld a, INIT_OTHER_ITEM_LIST ld [wInitListType], a - callab InitList + callfar InitList ld hl, PokemartBuyingGreetingText call PrintText @@ -152,7 +152,7 @@ DisplayPokemartDialogue_: ld a, 99 ld [wMaxItemQuantity], a xor a - ld [hHalveItemPrices], a ; don't halve item prices when buying + ldh [hHalveItemPrices], a ; don't halve item prices when buying call DisplayChooseQuantityMenu inc a jr z, .buyMenuLoop ; if the player closed the choose quantity menu with the B button @@ -162,7 +162,7 @@ DisplayPokemartDialogue_: call CopyStringToCF4B ; copy name to wcf4b ld hl, PokemartTellBuyPriceText call PrintText - coord hl, 14, 7 + hlcoord 14, 7 lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -228,45 +228,45 @@ DisplayPokemartDialogue_: ret PokemartBuyingGreetingText: - TX_FAR _PokemartBuyingGreetingText - db "@" + text_far _PokemartBuyingGreetingText + text_end PokemartTellBuyPriceText: - TX_FAR _PokemartTellBuyPriceText - db "@" + text_far _PokemartTellBuyPriceText + text_end PokemartBoughtItemText: - TX_FAR _PokemartBoughtItemText - db "@" + text_far _PokemartBoughtItemText + text_end PokemartNotEnoughMoneyText: - TX_FAR _PokemartNotEnoughMoneyText - db "@" + text_far _PokemartNotEnoughMoneyText + text_end PokemartItemBagFullText: - TX_FAR _PokemartItemBagFullText - db "@" + text_far _PokemartItemBagFullText + text_end PokemonSellingGreetingText: - TX_FAR _PokemonSellingGreetingText - db "@" + text_far _PokemonSellingGreetingText + text_end PokemartTellSellPriceText: - TX_FAR _PokemartTellSellPriceText - db "@" + text_far _PokemartTellSellPriceText + text_end PokemartItemBagEmptyText: - TX_FAR _PokemartItemBagEmptyText - db "@" + text_far _PokemartItemBagEmptyText + text_end PokemartUnsellableItemText: - TX_FAR _PokemartUnsellableItemText - db "@" + text_far _PokemartUnsellableItemText + text_end PokemartThankYouText: - TX_FAR _PokemartThankYouText - db "@" + text_far _PokemartThankYouText + text_end PokemartAnythingElseText: - TX_FAR _PokemartAnythingElseText - db "@" + text_far _PokemartAnythingElseText + text_end diff --git a/engine/menu/prize_menu.asm b/engine/events/prize_menu.asm old mode 100755 new mode 100644 similarity index 83% rename from engine/menu/prize_menu.asm rename to engine/events/prize_menu.asm index bcd0d4ea..d9320fe7 --- a/engine/menu/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -1,4 +1,4 @@ -CeladonPrizeMenu: +CeladonPrizeMenu:: ld b, COIN_CASE call IsItemInBag jr nz, .havingCoinCase @@ -22,7 +22,7 @@ CeladonPrizeMenu: ld a, $01 ld [wTopMenuItemX], a call PrintPrizePrice - coord hl, 0, 2 + hlcoord 0, 2 ld b, 8 ld c, 16 call TextBoxBorder @@ -43,17 +43,17 @@ CeladonPrizeMenu: ret RequireCoinCaseTextPtr: - TX_FAR _RequireCoinCaseText - TX_WAIT - db "@" + text_far _RequireCoinCaseText + text_waitbutton + text_end ExchangeCoinsForPrizesTextPtr: - TX_FAR _ExchangeCoinsForPrizesText - db "@" + text_far _ExchangeCoinsForPrizesText + text_end WhichPrizeTextPtr: - TX_FAR _WhichPrizeText - db "@" + text_far _WhichPrizeText + text_end GetPrizeMenuId: ; determine which one among the three @@ -64,7 +64,7 @@ GetPrizeMenuId: ; display the three prizes' names ; (distinguishing between Pokemon names ; and Items (specifically TMs) names) - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] sub 3 ; prize-texts' id are 3, 4 and 5 ld [wWhichPrizeWindow], a ; prize-texts' id (relative, i.e. 0, 1 or 2) add a @@ -93,73 +93,71 @@ GetPrizeMenuId: ld a, [wPrize1] ld [wd11e], a call GetItemName - coord hl, 2, 4 + hlcoord 2, 4 call PlaceString ld a, [wPrize2] ld [wd11e], a call GetItemName - coord hl, 2, 6 + hlcoord 2, 6 call PlaceString ld a, [wPrize3] ld [wd11e], a call GetItemName - coord hl, 2, 8 + hlcoord 2, 8 call PlaceString jr .putNoThanksText .putMonName ld a, [wPrize1] ld [wd11e], a call GetMonName - coord hl, 2, 4 + hlcoord 2, 4 call PlaceString ld a, [wPrize2] ld [wd11e], a call GetMonName - coord hl, 2, 6 + hlcoord 2, 6 call PlaceString ld a, [wPrize3] ld [wd11e], a call GetMonName - coord hl, 2, 8 + hlcoord 2, 8 call PlaceString .putNoThanksText - coord hl, 2, 10 + hlcoord 2, 10 ld de, NoThanksText call PlaceString ; put prices on the right side of the textbox ld de, wPrize1Price - coord hl, 13, 5 + hlcoord 13, 5 ; reg. c: ; [low nybble] number of bytes -; [bit 765 = %100] space-padding (not zero-padding) +; [bits 765 = %100] space-padding (not zero-padding) ld c, (1 << 7 | 2) -; Function $15CD displays BCD value (same routine -; used by text-command $02) call PrintBCDNumber ld de, wPrize2Price - coord hl, 13, 7 + hlcoord 13, 7 ld c, (1 << 7 | 2) call PrintBCDNumber ld de, wPrize3Price - coord hl, 13, 9 + hlcoord 13, 9 ld c, (1 << 7 | 2) jp PrintBCDNumber -INCLUDE "data/prizes.asm" +INCLUDE "data/events/prizes.asm" PrintPrizePrice: - coord hl, 11, 0 + hlcoord 11, 0 ld b, 1 ld c, 7 call TextBoxBorder call UpdateSprites - coord hl, 12, 0 + hlcoord 12, 0 ld de, .CoinString call PlaceString - coord hl, 13, 1 + hlcoord 13, 1 ld de, .SixSpacesString call PlaceString - coord hl, 13, 1 + hlcoord 13, 1 ld de, wPlayerCoins ld c, %10000010 call PrintBCDNumber @@ -179,11 +177,11 @@ LoadCoinsToSubtract: ld hl, wPrize1Price add hl, de ; get selected prize's price xor a - ld [hUnusedCoinsByte], a + ldh [hUnusedCoinsByte], a ld a, [hli] - ld [hCoins], a + ldh [hCoins], a ld a, [hl] - ld [hCoins + 1], a + ldh [hCoins + 1], a ret HandlePrizeChoice: @@ -265,28 +263,28 @@ UnknownPrizeData: db $00,$01,$00,$01,$00,$01,$00,$00,$01 HereYouGoTextPtr: - TX_FAR _HereYouGoText - TX_WAIT - db "@" + text_far _HereYouGoText + text_waitbutton + text_end SoYouWantPrizeTextPtr: - TX_FAR _SoYouWantPrizeText - db "@" + text_far _SoYouWantPrizeText + text_end SorryNeedMoreCoinsText: - TX_FAR _SorryNeedMoreCoinsText - TX_WAIT - db "@" + text_far _SorryNeedMoreCoinsText + text_waitbutton + text_end PrizeRoomBagIsFullTextPtr: - TX_FAR _OopsYouDontHaveEnoughRoomText - TX_WAIT - db "@" + text_far _OopsYouDontHaveEnoughRoomText + text_waitbutton + text_end OhFineThenTextPtr: - TX_FAR _OhFineThenText - TX_WAIT - db "@" + text_far _OhFineThenText + text_waitbutton + text_end GetPrizeMonLevel: ld a, [wcf91] @@ -303,4 +301,4 @@ GetPrizeMonLevel: ld [wCurEnemyLVL], a ret -INCLUDE "data/prize_mon_levels.asm" +INCLUDE "data/events/prize_mon_levels.asm" diff --git a/engine/events/saffron_guards.asm b/engine/events/saffron_guards.asm new file mode 100644 index 00000000..bf30b8c5 --- /dev/null +++ b/engine/events/saffron_guards.asm @@ -0,0 +1,15 @@ +RemoveGuardDrink:: + ld hl, GuardDrinksList +.drinkLoop + ld a, [hli] + ldh [hItemToRemoveID], a + and a + ret z + push hl + ld b, a + call IsItemInBag + pop hl + jr z, .drinkLoop + farjp RemoveItemByID + +INCLUDE "data/items/guard_drink_items.asm" diff --git a/engine/events/set_blackout_map.asm b/engine/events/set_blackout_map.asm new file mode 100644 index 00000000..e8460240 --- /dev/null +++ b/engine/events/set_blackout_map.asm @@ -0,0 +1,25 @@ +SetLastBlackoutMap: +; Set the map to return to when +; blacking out or using Teleport or Dig. +; Safari rest houses don't count. + + push hl + ld hl, SafariZoneRestHouses + ld a, [wCurMap] + ld b, a +.loop + ld a, [hli] + cp -1 + jr z, .notresthouse + cp b + jr nz, .loop + jr .done + +.notresthouse + ld a, [wLastMap] + ld [wLastBlackoutMap], a +.done + pop hl + ret + +INCLUDE "data/maps/rest_house_maps.asm" diff --git a/engine/events/starter_dex.asm b/engine/events/starter_dex.asm new file mode 100644 index 00000000..7cfe9af2 --- /dev/null +++ b/engine/events/starter_dex.asm @@ -0,0 +1,9 @@ +; this function temporarily makes the starters (and Ivysaur) seen +; so that the full Pokedex information gets displayed in Oak's lab +StarterDex: + ld a, 1 << (DEX_BULBASAUR - 1) | 1 << (DEX_IVYSAUR - 1) | 1 << (DEX_CHARMANDER - 1) | 1 << (DEX_SQUIRTLE - 1) + ld [wPokedexOwned], a + predef ShowPokedexData + xor a + ld [wPokedexOwned], a + ret diff --git a/engine/menu/vending_machine.asm b/engine/events/vending_machine.asm old mode 100755 new mode 100644 similarity index 75% rename from engine/menu/vending_machine.asm rename to engine/events/vending_machine.asm index aab4adf4..a67f1c07 --- a/engine/menu/vending_machine.asm +++ b/engine/events/vending_machine.asm @@ -1,4 +1,4 @@ -VendingMachineMenu: +VendingMachineMenu:: ld hl, VendingMachineText1 call PrintText ld a, MONEY_BOX @@ -17,15 +17,15 @@ VendingMachineMenu: ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] - coord hl, 0, 3 + hlcoord 0, 3 ld b, 8 ld c, 12 call TextBoxBorder call UpdateSprites - coord hl, 2, 5 + hlcoord 2, 5 ld de, DrinkText call PlaceString - coord hl, 9, 6 + hlcoord 9, 6 ld de, DrinkPriceText call PlaceString ld hl, wd730 @@ -37,17 +37,17 @@ VendingMachineMenu: cp 3 ; chose Cancel? jr z, .notThirsty xor a - ld [hMoney], a - ld [hMoney + 2], a + ldh [hMoney], a + ldh [hMoney + 2], a ld a, $2 - ld [hMoney + 1], a + ldh [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney ld hl, VendingMachineText4 jp PrintText .enoughMoney call LoadVendingMachineItem - ld a, [hVendingMachineItem] + ldh a, [hVendingMachineItem] ld b, a ld c, 1 call GiveItem @@ -81,8 +81,8 @@ VendingMachineMenu: jp PrintText VendingMachineText1: - TX_FAR _VendingMachineText1 - db "@" + text_far _VendingMachineText1 + text_end DrinkText: db "FRESH WATER" @@ -97,20 +97,20 @@ DrinkPriceText: next "@" VendingMachineText4: - TX_FAR _VendingMachineText4 - db "@" + text_far _VendingMachineText4 + text_end VendingMachineText5: - TX_FAR _VendingMachineText5 - db "@" + text_far _VendingMachineText5 + text_end VendingMachineText6: - TX_FAR _VendingMachineText6 - db "@" + text_far _VendingMachineText6 + text_end VendingMachineText7: - TX_FAR _VendingMachineText7 - db "@" + text_far _VendingMachineText7 + text_end LoadVendingMachineItem: ld hl, VendingPrices @@ -121,19 +121,13 @@ LoadVendingMachineItem: ld e, a add hl, de ld a, [hli] - ld [hVendingMachineItem], a + ldh [hVendingMachineItem], a ld a, [hli] - ld [hVendingMachinePrice], a + ldh [hVendingMachinePrice], a ld a, [hli] - ld [hVendingMachinePrice + 1], a + ldh [hVendingMachinePrice + 1], a ld a, [hl] - ld [hVendingMachinePrice + 2], a + ldh [hVendingMachinePrice + 2], a ret -VendingPrices: - db FRESH_WATER - money 200 - db SODA_POP - money 300 - db LEMONADE - money 350 +INCLUDE "data/items/vending_prices.asm" diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm deleted file mode 100755 index f50f8081..00000000 --- a/engine/evos_moves.asm +++ /dev/null @@ -1,513 +0,0 @@ -; try to evolve the mon in [wWhichPokemon] -TryEvolvingMon: - ld hl, wCanEvolveFlags - xor a - ld [hl], a - ld a, [wWhichPokemon] - ld c, a - ld b, FLAG_SET - call Evolution_FlagAction - -; this is only called after battle -; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur -EvolutionAfterBattle: - ld a, [hTilesetType] - push af - xor a - ld [wEvolutionOccurred], a - dec a - ld [wWhichPokemon], a - push hl - push bc - push de - ld hl, wPartyCount - push hl - -Evolution_PartyMonLoop: ; loop over party mons - ld hl, wWhichPokemon - inc [hl] - pop hl - inc hl - ld a, [hl] - cp $ff ; have we reached the end of the party? - jp z, .done - ld [wEvoOldSpecies], a - push hl - ld a, [wWhichPokemon] - ld c, a - ld hl, wCanEvolveFlags - ld b, FLAG_TEST - call Evolution_FlagAction - ld a, c - and a ; is the mon's bit set? - jp z, Evolution_PartyMonLoop ; if not, go to the next mon - ld a, [wEvoOldSpecies] - dec a - ld b, 0 - ld hl, EvosMovesPointerTable - add a - rl b - ld c, a - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - push hl - ld a, [wcf91] - push af - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - call LoadMonData - pop af - ld [wcf91], a - pop hl - -.evoEntryLoop ; loop over evolution entries - ld a, [hli] - and a ; have we reached the end of the evolution data? - jr z, Evolution_PartyMonLoop - ld b, a ; evolution type - cp EV_TRADE - jr z, .checkTradeEvo -; not trade evolution - ld a, [wLinkState] - cp LINK_STATE_TRADING - jr z, Evolution_PartyMonLoop ; if trading, go the next mon - ld a, b - cp EV_ITEM - jr z, .checkItemEvo - ld a, [wForceEvolution] - and a - jr nz, Evolution_PartyMonLoop - ld a, b - cp EV_LEVEL - jr z, .checkLevel -.checkTradeEvo - ld a, [wLinkState] - cp LINK_STATE_TRADING - jp nz, .nextEvoEntry1 ; if not trading, go to the next evolution entry - ld a, [hli] ; level requirement - ld b, a - ld a, [wLoadedMonLevel] - cp b ; is the mon's level greater than the evolution requirement? - jp c, Evolution_PartyMonLoop ; if so, go the next mon - jr .doEvolution -.checkItemEvo - ld a, [hli] - ld b, a ; evolution item - ld a, [wcf91] ; this is supposed to be the last item used, but it is also used to hold species numbers - cp b ; was the evolution item in this entry used? - jp nz, .nextEvoEntry1 ; if not, go to the next evolution entry -.checkLevel - ld a, [hli] ; level requirement - ld b, a - ld a, [wLoadedMonLevel] - cp b ; is the mon's level greater than the evolution requirement? - jp c, .nextEvoEntry2 ; if so, go the next evolution entry -.doEvolution - ld [wCurEnemyLVL], a - ld a, 1 - ld [wEvolutionOccurred], a - push hl - ld a, [hl] - ld [wEvoNewSpecies], a - ld a, [wWhichPokemon] - ld hl, wPartyMonNicks - call GetPartyMonName - call CopyStringToCF4B - ld hl, IsEvolvingText - call PrintText - ld c, 50 - call DelayFrames - xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 0, 0 - lb bc, 12, 20 - call ClearScreenArea - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - ld a, $ff - ld [wUpdateSpritesEnabled], a - call ClearSprites - callab EvolveMon - jp c, CancelledEvolution - ld hl, EvolvedText - call PrintText - pop hl - ld a, [hl] - ld [wd0b5], a - ld [wLoadedMonSpecies], a - ld [wEvoNewSpecies], a - ld a, MONSTER_NAME - ld [wNameListType], a - ld a, BANK(TrainerNames) ; bank is not used for monster names - ld [wPredefBank], a - call GetName - push hl - ld hl, IntoText - call PrintText_NoCreatingTextBox - ld a, SFX_GET_ITEM_2 - call PlaySoundWaitForCurrent - call WaitForSoundToFinish - ld c, 40 - call DelayFrames - call ClearScreen - call RenameEvolvedMon - ld a, [wd11e] - push af - ld a, [wd0b5] - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] - dec a - ld hl, BaseStats - ld bc, MonBaseStatsEnd - MonBaseStats - call AddNTimes - ld de, wMonHeader - call CopyData - ld a, [wd0b5] - ld [wMonHIndex], a - pop af - ld [wd11e], a - ld hl, wLoadedMonHPExp - 1 - ld de, wLoadedMonStats - ld b, $1 - call CalcStats - ld a, [wWhichPokemon] - ld hl, wPartyMon1 - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld e, l - ld d, h - push hl - push bc - ld bc, wPartyMon1MaxHP - wPartyMon1 - add hl, bc - ld a, [hli] - ld b, a - ld c, [hl] - ld hl, wLoadedMonMaxHP + 1 - ld a, [hld] - sub c - ld c, a - ld a, [hl] - sbc b - ld b, a - ld hl, wLoadedMonHP + 1 - ld a, [hl] - add c - ld [hld], a - ld a, [hl] - adc b - ld [hl], a - dec hl - pop bc - call CopyData - ld a, [wd0b5] - ld [wd11e], a - xor a - ld [wMonDataLocation], a - call LearnMoveFromLevelUp - pop hl - predef SetPartyMonTypes - ld a, [wIsInBattle] - and a - call z, Evolution_ReloadTilesetTilePatterns - predef IndexToPokedex - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_SET - ld hl, wPokedexOwned - push bc - call Evolution_FlagAction - pop bc - ld hl, wPokedexSeen - call Evolution_FlagAction - pop de - pop hl - ld a, [wLoadedMonSpecies] - ld [hl], a - push hl - ld l, e - ld h, d - jr .nextEvoEntry2 - -.nextEvoEntry1 - inc hl - -.nextEvoEntry2 - inc hl - jp .evoEntryLoop - -.done - pop de - pop bc - pop hl - pop af - ld [hTilesetType], a - ld a, [wLinkState] - cp LINK_STATE_TRADING - ret z - ld a, [wIsInBattle] - and a - ret nz - ld a, [wEvolutionOccurred] - and a - call nz, PlayDefaultMusic - ret - -RenameEvolvedMon: -; Renames the mon to its new, evolved form's standard name unless it had a -; nickname, in which case the nickname is kept. - ld a, [wd0b5] - push af - ld a, [wMonHIndex] - ld [wd0b5], a - call GetName - pop af - ld [wd0b5], a - ld hl, wcd6d - ld de, wcf4b -.compareNamesLoop - ld a, [de] - inc de - cp [hl] - inc hl - ret nz - cp "@" - jr nz, .compareNamesLoop - ld a, [wWhichPokemon] - ld bc, NAME_LENGTH - ld hl, wPartyMonNicks - call AddNTimes - push hl - call GetName - ld hl, wcd6d - pop de - jp CopyData - -CancelledEvolution: - ld hl, StoppedEvolvingText - call PrintText - call ClearScreen - pop hl - call Evolution_ReloadTilesetTilePatterns - jp Evolution_PartyMonLoop - -EvolvedText: - TX_FAR _EvolvedText - db "@" - -IntoText: - TX_FAR _IntoText - db "@" - -StoppedEvolvingText: - TX_FAR _StoppedEvolvingText - db "@" - -IsEvolvingText: - TX_FAR _IsEvolvingText - db "@" - -Evolution_ReloadTilesetTilePatterns: - ld a, [wLinkState] - cp LINK_STATE_TRADING - ret z - jp ReloadTilesetTilePatterns - -LearnMoveFromLevelUp: - ld hl, EvosMovesPointerTable - ld a, [wd11e] ; species - ld [wcf91], a - dec a - ld bc, 0 - ld hl, EvosMovesPointerTable - add a - rl b - ld c, a - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a -.skipEvolutionDataLoop ; loop to skip past the evolution data, which comes before the move data - ld a, [hli] - and a ; have we reached the end of the evolution data? - jr nz, .skipEvolutionDataLoop ; if not, jump back up -.learnSetLoop ; loop over the learn set until we reach a move that is learnt at the current level or the end of the list - ld a, [hli] - and a ; have we reached the end of the learn set? - jr z, .done ; if we've reached the end of the learn set, jump - ld b, a ; level the move is learnt at - ld a, [wCurEnemyLVL] - cp b ; is the move learnt at the mon's current level? - ld a, [hli] ; move ID - jr nz, .learnSetLoop - ld d, a ; ID of move to learn - ld a, [wMonDataLocation] - and a - jr nz, .next -; If [wMonDataLocation] is 0 (PLAYER_PARTY_DATA), get the address of the mon's -; current moves in party data. Every call to this function sets -; [wMonDataLocation] to 0 because other data locations are not supported. -; If it is not 0, this function will not work properly. - ld hl, wPartyMon1Moves - ld a, [wWhichPokemon] - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes -.next - ld b, NUM_MOVES -.checkCurrentMovesLoop ; check if the move to learn is already known - ld a, [hli] - cp d - jr z, .done ; if already known, jump - dec b - jr nz, .checkCurrentMovesLoop - ld a, d - ld [wMoveNum], a - ld [wd11e], a - call GetMoveName - call CopyStringToCF4B - predef LearnMove -.done - ld a, [wcf91] - ld [wd11e], a - ret - -; writes the moves a mon has at level [wCurEnemyLVL] to [de] -; move slots are being filled up sequentially and shifted if all slots are full -WriteMonMoves: - call GetPredefRegisters - push hl - push de - push bc - ld hl, EvosMovesPointerTable - ld b, 0 - ld a, [wcf91] ; cur mon ID - dec a - add a - rl b - ld c, a - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a -.skipEvoEntriesLoop - ld a, [hli] - and a - jr nz, .skipEvoEntriesLoop - jr .firstMove -.nextMove - pop de -.nextMove2 - inc hl -.firstMove - ld a, [hli] ; read level of next move in learnset - and a - jp z, .done ; end of list - ld b, a - ld a, [wCurEnemyLVL] - cp b - jp c, .done ; mon level < move level (assumption: learnset is sorted by level) - ld a, [wLearningMovesFromDayCare] - and a - jr z, .skipMinLevelCheck - ld a, [wDayCareStartLevel] - cp b - jr nc, .nextMove2 ; min level >= move level - -.skipMinLevelCheck - -; check if the move is already known - push de - ld c, NUM_MOVES -.alreadyKnowsCheckLoop - ld a, [de] - inc de - cp [hl] - jr z, .nextMove - dec c - jr nz, .alreadyKnowsCheckLoop - -; try to find an empty move slot - pop de - push de - ld c, NUM_MOVES -.findEmptySlotLoop - ld a, [de] - and a - jr z, .writeMoveToSlot2 - inc de - dec c - jr nz, .findEmptySlotLoop - -; no empty move slots found - pop de - push de - push hl - ld h, d - ld l, e - call WriteMonMoves_ShiftMoveData ; shift all moves one up (deleting move 1) - ld a, [wLearningMovesFromDayCare] - and a - jr z, .writeMoveToSlot - -; shift PP as well if learning moves from day care - push de - ld bc, wPartyMon1PP - (wPartyMon1Moves + 3) - add hl, bc - ld d, h - ld e, l - call WriteMonMoves_ShiftMoveData ; shift all move PP data one up - pop de - -.writeMoveToSlot - pop hl -.writeMoveToSlot2 - ld a, [hl] - ld [de], a - ld a, [wLearningMovesFromDayCare] - and a - jr z, .nextMove - -; write move PP value if learning moves from day care - push hl - ld a, [hl] - ld hl, wPartyMon1PP - wPartyMon1Moves - add hl, de - push hl - dec a - ld hl, Moves - ld bc, MoveEnd - Moves - call AddNTimes - ld de, wBuffer - ld a, BANK(Moves) - call FarCopyData - ld a, [wBuffer + 5] - pop hl - ld [hl], a - pop hl - jr .nextMove - -.done - pop bc - pop de - pop hl - ret - -; shifts all move data one up (freeing 4th move slot) -WriteMonMoves_ShiftMoveData: - ld c, NUM_MOVES - 1 -.loop - inc de - ld a, [de] - ld [hli], a - dec c - jr nz, .loop - ret - -Evolution_FlagAction: - predef_jump FlagActionPredef - -INCLUDE "data/evos_moves.asm" diff --git a/engine/experience.asm b/engine/experience.asm deleted file mode 100755 index 2efc13de..00000000 --- a/engine/experience.asm +++ /dev/null @@ -1,160 +0,0 @@ -; calculates the level a mon should be based on its current exp -CalcLevelFromExperience: - ld a, [wLoadedMonSpecies] - ld [wd0b5], a - call GetMonHeader - ld d, $1 ; init level to 1 -.loop - inc d ; increment level - call CalcExperience - push hl - ld hl, wLoadedMonExp + 2 ; current exp -; compare exp needed for level d with current exp - ld a, [hExperience + 2] - ld c, a - ld a, [hld] - sub c - ld a, [hExperience + 1] - ld c, a - ld a, [hld] - sbc c - ld a, [hExperience] - ld c, a - ld a, [hl] - sbc c - pop hl - jr nc, .loop ; if exp needed for level d is not greater than exp, try the next level - dec d ; since the exp was too high on the last loop iteration, go back to the previous value and return - ret - -; calculates the amount of experience needed for level d -CalcExperience: - ld a, [wMonHGrowthRate] - add a - add a - ld c, a - ld b, 0 - ld hl, GrowthRateTable - add hl, bc - call CalcDSquared - ld a, d - ld [H_MULTIPLIER], a - call Multiply - ld a, [hl] - and $f0 - swap a - ld [H_MULTIPLIER], a - call Multiply - ld a, [hli] - and $f - ld [H_DIVISOR], a - ld b, $4 - call Divide - ld a, [H_QUOTIENT + 1] - push af - ld a, [H_QUOTIENT + 2] - push af - ld a, [H_QUOTIENT + 3] - push af - call CalcDSquared - ld a, [hl] - and $7f - ld [H_MULTIPLIER], a - call Multiply - ld a, [H_PRODUCT + 1] - push af - ld a, [H_PRODUCT + 2] - push af - ld a, [H_PRODUCT + 3] - push af - ld a, [hli] - push af - xor a - ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND + 1], a - ld a, d - ld [H_MULTIPLICAND + 2], a - ld a, [hli] - ld [H_MULTIPLIER], a - call Multiply - ld b, [hl] - ld a, [H_PRODUCT + 3] - sub b - ld [H_PRODUCT + 3], a - ld b, $0 - ld a, [H_PRODUCT + 2] - sbc b - ld [H_PRODUCT + 2], a - ld a, [H_PRODUCT + 1] - sbc b - ld [H_PRODUCT + 1], a -; The difference of the linear term and the constant term consists of 3 bytes -; starting at H_PRODUCT + 1. Below, hExperience (an alias of that address) will -; be used instead for the further work of adding or subtracting the squared -; term and adding the cubed term. - pop af - and $80 - jr nz, .subtractSquaredTerm ; check sign - pop bc - ld a, [hExperience + 2] - add b - ld [hExperience + 2], a - pop bc - ld a, [hExperience + 1] - adc b - ld [hExperience + 1], a - pop bc - ld a, [hExperience] - adc b - ld [hExperience], a - jr .addCubedTerm -.subtractSquaredTerm - pop bc - ld a, [hExperience + 2] - sub b - ld [hExperience + 2], a - pop bc - ld a, [hExperience + 1] - sbc b - ld [hExperience + 1], a - pop bc - ld a, [hExperience] - sbc b - ld [hExperience], a -.addCubedTerm - pop bc - ld a, [hExperience + 2] - add b - ld [hExperience + 2], a - pop bc - ld a, [hExperience + 1] - adc b - ld [hExperience + 1], a - pop bc - ld a, [hExperience] - adc b - ld [hExperience], a - ret - -; calculates d*d -CalcDSquared: - xor a - ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND + 1], a - ld a, d - ld [H_MULTIPLICAND + 2], a - ld [H_MULTIPLIER], a - jp Multiply - -; each entry has the following scheme: -; %AAAABBBB %SCCCCCCC %DDDDDDDD %EEEEEEEE -; resulting in -; (a*n^3)/b + sign*c*n^2 + d*n - e -; where sign = -1 <=> S=1 -GrowthRateTable: - db $11,$00,$00,$00 ; medium fast n^3 - db $34,$0A,$00,$1E ; (unused?) 3/4 n^3 + 10 n^2 - 30 - db $34,$14,$00,$46 ; (unused?) 3/4 n^3 + 20 n^2 - 70 - db $65,$8F,$64,$8C ; medium slow: 6/5 n^3 - 15 n^2 + 100 n - 140 - db $45,$00,$00,$00 ; fast: 4/5 n^3 - db $54,$00,$00,$00 ; slow: 5/4 n^3 diff --git a/engine/game_corner_slots.asm b/engine/game_corner_slots.asm deleted file mode 100755 index 3c5b3a10..00000000 --- a/engine/game_corner_slots.asm +++ /dev/null @@ -1,54 +0,0 @@ -StartSlotMachine: - ld a, [wHiddenObjectFunctionArgument] - cp $fd - jr z, .printOutOfOrder - cp $fe - jr z, .printOutToLunch - cp $ff - jr z, .printSomeonesKeys - callba AbleToPlaySlotsCheck - ld a, [wCanPlaySlots] - and a - ret z - ld a, [wLuckySlotHiddenObjectIndex] - ld b, a - ld a, [wHiddenObjectIndex] - inc a - cp b - jr z, .match - ld a, 253 - jr .next -.match - ld a, 250 -.next - ld [wSlotMachineSevenAndBarModeChance], a - ld a, [H_LOADEDROMBANK] - ld [wSlotMachineSavedROMBank], a - call PromptUserToPlaySlots - ret -.printOutOfOrder - tx_pre_id GameCornerOutOfOrderText - jr .printText -.printOutToLunch - tx_pre_id GameCornerOutToLunchText - jr .printText -.printSomeonesKeys - tx_pre_id GameCornerSomeonesKeysText -.printText - push af - call EnableAutoTextBoxDrawing - pop af - call PrintPredefTextID - ret - -GameCornerOutOfOrderText: - TX_FAR _GameCornerOutOfOrderText - db "@" - -GameCornerOutToLunchText: - TX_FAR _GameCornerOutToLunchText - db "@" - -GameCornerSomeonesKeysText: - TX_FAR _GameCornerSomeonesKeysText - db "@" diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm deleted file mode 100755 index 6bbaf72d..00000000 --- a/engine/game_corner_slots2.asm +++ /dev/null @@ -1,31 +0,0 @@ -AbleToPlaySlotsCheck: - ld a, [wSpriteStateData1 + 2] - and $8 - jr z, .done ; not able - ld b, COIN_CASE - predef GetQuantityOfItemInBag - ld a, b - and a - ld b, (GameCornerCoinCaseText_id - TextPredefs) / 2 + 1 - jr z, .printCoinCaseRequired - ld hl, wPlayerCoins - ld a, [hli] - or [hl] - jr nz, .done ; able to play - ld b, (GameCornerNoCoinsText_id - TextPredefs) / 2 + 1 -.printCoinCaseRequired - call EnableAutoTextBoxDrawing - ld a, b - call PrintPredefTextID - xor a -.done - ld [wCanPlaySlots], a - ret - -GameCornerCoinCaseText: - TX_FAR _GameCornerCoinCaseText - db "@" - -GameCornerNoCoinsText: - TX_FAR _GameCornerNoCoinsText - db "@" diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm deleted file mode 100755 index 5226072b..00000000 --- a/engine/gamefreak.asm +++ /dev/null @@ -1,243 +0,0 @@ -LoadShootingStarGraphics: - ld a, $f9 - ld [rOBP0], a - ld a, $a4 - ld [rOBP1], a - ld de, AnimationTileset2 + $30 ; star tile (top left quadrant) - ld hl, vChars1 + $200 - lb bc, BANK(AnimationTileset2), $01 - call CopyVideoData - ld de, AnimationTileset2 + $130 ; star tile (bottom left quadrant) - ld hl, vChars1 + $210 - lb bc, BANK(AnimationTileset2), $01 - call CopyVideoData - ld de, FallingStar - ld hl, vChars1 + $220 - lb bc, BANK(FallingStar), (FallingStarEnd - FallingStar) / $10 - call CopyVideoData - ld hl, GameFreakLogoOAMData - ld de, wOAMBuffer + $60 - ld bc, GameFreakLogoOAMDataEnd - GameFreakLogoOAMData - call CopyData - ld hl, GameFreakShootingStarOAMData - ld de, wOAMBuffer - ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData - jp CopyData - -AnimateShootingStar: - call LoadShootingStarGraphics - ld a, SFX_SHOOTING_STAR - call PlaySound - -; Move the big star down and left across the screen. - ld hl, wOAMBuffer - lb bc, $a0, $4 -.bigStarLoop - push hl - push bc -.bigStarInnerLoop - ld a, [hl] ; Y - add 4 - ld [hli], a - ld a, [hl] ; X - add -4 - ld [hli], a - inc hl - inc hl - dec c - jr nz, .bigStarInnerLoop - ld c, 1 - call CheckForUserInterruption - pop bc - pop hl - ret c - ld a, [hl] - cp 80 - jr nz, .next - jr .bigStarLoop -.next - cp b - jr nz, .bigStarLoop - -; Clear big star OAM. - ld hl, wOAMBuffer - ld c, 4 - ld de, 4 -.clearOAMLoop - ld [hl], 160 - add hl, de - dec c - jr nz, .clearOAMLoop - -; Make Gamefreak logo flash. - ld b, 3 -.flashLogoLoop - ld hl, rOBP0 - rrc [hl] - rrc [hl] - ld c, 10 - call CheckForUserInterruption - ret c - dec b - jr nz, .flashLogoLoop - -; Copy 24 instances of the small stars OAM data. -; Note that their coordinates put them off-screen. - ld de, wOAMBuffer - ld a, 24 -.initSmallStarsOAMLoop - push af - ld hl, SmallStarsOAM - ld bc, SmallStarsOAMEnd - SmallStarsOAM - call CopyData - pop af - dec a - jr nz, .initSmallStarsOAMLoop - -; Animate the small stars falling from the Gamefreak logo. - xor a - ld [wMoveDownSmallStarsOAMCount], a - ld hl, SmallStarsWaveCoordsPointerTable - ld c, 6 -.smallStarsLoop - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - push bc - push hl - ld hl, wOAMBuffer + $50 - ld c, 4 -.smallStarsInnerLoop ; introduce new wave of 4 small stars OAM entries - ld a, [de] - cp $ff - jr z, .next2 - ld [hli], a ; Y - inc de - ld a, [de] - ld [hli], a ; X - inc de - inc hl - inc hl - dec c - jr nz, .smallStarsInnerLoop - ld a, [wMoveDownSmallStarsOAMCount] - cp 24 - jr z, .next2 - add 6 ; should be 4, but the extra 2 aren't visible on screen - ld [wMoveDownSmallStarsOAMCount], a -.next2 - call MoveDownSmallStars - push af - -; shift the existing OAM entries down to make room for the next wave - ld hl, wOAMBuffer + $10 - ld de, wOAMBuffer - ld bc, $50 - call CopyData - - pop af - pop hl - pop bc - ret c - dec c - jr nz, .smallStarsLoop - and a - ret - -SmallStarsOAM: - db $00,$00,$A2,$90 -SmallStarsOAMEnd: - -SmallStarsWaveCoordsPointerTable: - dw SmallStarsWave1Coords - dw SmallStarsWave2Coords - dw SmallStarsWave3Coords - dw SmallStarsWave4Coords - dw SmallStarsEmptyWave - dw SmallStarsEmptyWave - -; The stars that fall from the Gamefreak logo come in 4 waves of 4 OAM entries. -; These arrays contain the Y and X coordinates of each OAM entry. - -SmallStarsWave1Coords: - db $68,$30 - db $68,$40 - db $68,$58 - db $68,$78 - -SmallStarsWave2Coords: - db $68,$38 - db $68,$48 - db $68,$60 - db $68,$70 - -SmallStarsWave3Coords: - db $68,$34 - db $68,$4C - db $68,$54 - db $68,$64 - -SmallStarsWave4Coords: - db $68,$3C - db $68,$5C - db $68,$6C - db $68,$74 - -SmallStarsEmptyWave: - db $FF - -MoveDownSmallStars: - ld b, 8 -.loop - ld hl, wOAMBuffer + $5c - ld a, [wMoveDownSmallStarsOAMCount] - ld de, -4 - ld c, a -.innerLoop - inc [hl] ; Y - add hl, de - dec c - jr nz, .innerLoop -; Toggle the palette so that the lower star in the small stars tile blinks in -; and out. - ld a, [rOBP1] - xor %10100000 - ld [rOBP1], a - - ld c, 3 - call CheckForUserInterruption - ret c - dec b - jr nz, .loop - ret - -GameFreakLogoOAMData: - db $48,$50,$8D,$00 - db $48,$58,$8E,$00 - db $50,$50,$8F,$00 - db $50,$58,$90,$00 - db $58,$50,$91,$00 - db $58,$58,$92,$00 - db $60,$30,$80,$00 - db $60,$38,$81,$00 - db $60,$40,$82,$00 - db $60,$48,$83,$00 - db $60,$50,$93,$00 - db $60,$58,$84,$00 - db $60,$60,$85,$00 - db $60,$68,$83,$00 - db $60,$70,$81,$00 - db $60,$78,$86,$00 -GameFreakLogoOAMDataEnd: - -GameFreakShootingStarOAMData: - db $00,$A0,$A0,$10 - db $00,$A8,$A0,$30 - db $08,$A0,$A1,$10 - db $08,$A8,$A1,$30 -GameFreakShootingStarOAMDataEnd: - -FallingStar: - INCBIN "gfx/falling_star.2bpp" -FallingStarEnd: diff --git a/engine/hp_bar.asm b/engine/gfx/hp_bar.asm old mode 100755 new mode 100644 similarity index 95% rename from engine/hp_bar.asm rename to engine/gfx/hp_bar.asm index 221bd7a9..e4de0b95 --- a/engine/hp_bar.asm +++ b/engine/gfx/hp_bar.asm @@ -6,7 +6,7 @@ HPBarLength: GetHPBarLength: push hl xor a - ld hl, H_MULTIPLICAND + ld hl, hMultiplicand ld [hli], a ld a, b ld [hli], a @@ -21,22 +21,22 @@ GetHPBarLength: rr e srl d rr e - ld a, [H_MULTIPLICAND+1] + ldh a, [hMultiplicand+1] ld b, a - ld a, [H_MULTIPLICAND+2] + ldh a, [hMultiplicand+2] srl b ; divide multiplication result as well rr a srl b rr a - ld [H_MULTIPLICAND+2], a + ldh [hMultiplicand+2], a ld a, b - ld [H_MULTIPLICAND+1], a + ldh [hMultiplicand+1], a .maxHPSmaller256 ld a, e - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, $4 call Divide - ld a, [H_MULTIPLICAND+2] + ldh a, [hMultiplicand+2] ld e, a ; e = bc * 48 / de (num of pixels of HP bar) pop hl and a @@ -213,7 +213,7 @@ UpdateHPBar_PrintHPNumber: ld a, [wHPBarOldHP + 1] ld [wHPBarTempHP], a push hl - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] bit 0, a jr z, .asm_fb15 ld de, $9 diff --git a/engine/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm old mode 100755 new mode 100644 similarity index 79% rename from engine/load_pokedex_tiles.asm rename to engine/gfx/load_pokedex_tiles.asm index 70bcf04d..a3f69171 --- a/engine/load_pokedex_tiles.asm +++ b/engine/gfx/load_pokedex_tiles.asm @@ -2,10 +2,10 @@ LoadPokedexTilePatterns: call LoadHpBarAndStatusTilePatterns ld de, PokedexTileGraphics - ld hl, vChars2 + $600 + ld hl, vChars2 tile $60 lb bc, BANK(PokedexTileGraphics), (PokedexTileGraphicsEnd - PokedexTileGraphics) / $10 call CopyVideoData ld de, PokeballTileGraphics - ld hl, vChars2 + $720 - lb bc, BANK(PokeballTileGraphics), $01 + ld hl, vChars2 tile $72 + lb bc, BANK(PokeballTileGraphics), 1 jp CopyVideoData ; load pokeball tile for marking caught mons diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm new file mode 100644 index 00000000..16409640 --- /dev/null +++ b/engine/gfx/mon_icons.asm @@ -0,0 +1,295 @@ +AnimatePartyMon_ForceSpeed1: + xor a + ld [wCurrentMenuItem], a + ld b, a + inc a + jr GetAnimationSpeed + +; wPartyMenuHPBarColors contains the party mon's health bar colors +; 0: green +; 1: yellow +; 2: red +AnimatePartyMon:: + ld hl, wPartyMenuHPBarColors + ld a, [wCurrentMenuItem] + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + +GetAnimationSpeed: + ld c, a + ld hl, PartyMonSpeeds + add hl, bc + ld a, [wOnSGB] + xor $1 + add [hl] + ld c, a + add a + ld b, a + ld a, [wAnimCounter] + and a + jr z, .resetSprites + cp c + jr z, .animateSprite +.incTimer + inc a + cp b + jr nz, .skipResetTimer + xor a ; reset timer +.skipResetTimer + ld [wAnimCounter], a + jp DelayFrame +.resetSprites + push bc + ld hl, wMonPartySpritesSavedOAM + ld de, wOAMBuffer + ld bc, $60 + call CopyData + pop bc + xor a + jr .incTimer +.animateSprite + push bc + ld hl, wOAMBuffer + $02 ; OAM tile id + ld bc, $10 + ld a, [wCurrentMenuItem] + call AddNTimes + ld c, ICONOFFSET + ld a, [hl] + cp ICON_BALL << 2 + jr z, .editCoords + cp ICON_HELIX << 2 + jr nz, .editTileIDS +; ICON_BALL and ICON_HELIX only shake up and down +.editCoords + dec hl + dec hl ; dec hl to the OAM y coord + ld c, $1 ; amount to increase the y coord by +; otherwise, load a second sprite frame +.editTileIDS + ld b, $4 + ld de, $4 +.loop + ld a, [hl] + add c + ld [hl], a + add hl, de + dec b + jr nz, .loop + pop bc + ld a, c + jr .incTimer + +; Party mon animations cycle between 2 frames. +; The members of the PartyMonSpeeds array specify the number of V-blanks +; that each frame lasts for green HP, yellow HP, and red HP in order. +; On the naming screen, the yellow HP speed is always used. +PartyMonSpeeds: + db 5, 16, 32 + +LoadMonPartySpriteGfx: +; Load mon party sprite tile patterns into VRAM during V-blank. + ld hl, MonPartySpritePointers + ld a, $1c + +LoadAnimSpriteGfx: +; Load animated sprite tile patterns into VRAM during V-blank. hl is the address +; of an array of structures that contain arguments for CopyVideoData and a is +; the number of structures in the array. + ld bc, $0 +.loop + push af + push bc + push hl + add hl, bc + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld h, [hl] + ld l, a + call CopyVideoData + pop hl + pop bc + ld a, $6 + add c + ld c, a + pop af + dec a + jr nz, .loop + ret + +LoadMonPartySpriteGfxWithLCDDisabled: +; Load mon party sprite tile patterns into VRAM immediately by disabling the +; LCD. + call DisableLCD + ld hl, MonPartySpritePointers + ld a, $1c + ld bc, $0 +.loop + push af + push bc + push hl + add hl, bc + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + push de + ld a, [hli] + ld c, a + swap c + ld b, $0 + ld a, [hli] + ld e, [hl] + inc hl + ld d, [hl] + pop hl + call FarCopyData2 + pop hl + pop bc + ld a, $6 + add c + ld c, a + pop af + dec a + jr nz, .loop + jp EnableLCD + +INCLUDE "data/icon_pointers.asm" + +WriteMonPartySpriteOAMByPartyIndex: +; Write OAM blocks for the party mon in [hPartyMonIndex]. + push hl + push de + push bc + ldh a, [hPartyMonIndex] + ld hl, wPartySpecies + ld e, a + ld d, 0 + add hl, de + ld a, [hl] + call GetPartyMonSpriteID + ld [wOAMBaseTile], a + call WriteMonPartySpriteOAM + pop bc + pop de + pop hl + ret + +WriteMonPartySpriteOAMBySpecies: +; Write OAM blocks for the party sprite of the species in +; [wMonPartySpriteSpecies]. + xor a + ldh [hPartyMonIndex], a + ld a, [wMonPartySpriteSpecies] + call GetPartyMonSpriteID + ld [wOAMBaseTile], a + jr WriteMonPartySpriteOAM + +UnusedPartyMonSpriteFunction: +; This function is unused and doesn't appear to do anything useful. It looks +; like it may have been intended to load the tile patterns and OAM data for +; the mon party sprite associated with the species in [wcf91]. +; However, its calculations are off and it loads garbage data. + ld a, [wcf91] + call GetPartyMonSpriteID + push af + ld hl, vSprites tile $00 + call .LoadTilePatterns + pop af + add $54 + ld hl, vSprites tile $04 + call .LoadTilePatterns + xor a + ld [wMonPartySpriteSpecies], a + jr WriteMonPartySpriteOAMBySpecies + +.LoadTilePatterns + push hl + add a + ld c, a + ld b, 0 + ld hl, MonPartySpritePointers + add hl, bc + add hl, bc + add hl, bc + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + pop hl + jp CopyVideoData + +WriteMonPartySpriteOAM: +; Write the OAM blocks for the first animation frame into the OAM buffer and +; make a copy at wMonPartySpritesSavedOAM. + push af + ld c, $10 + ld h, HIGH(wOAMBuffer) + ldh a, [hPartyMonIndex] + swap a + ld l, a + add $10 + ld b, a + pop af + cp ICON_HELIX << 2 + jr z, .helix + call WriteSymmetricMonPartySpriteOAM + jr .makeCopy +.helix + call WriteAsymmetricMonPartySpriteOAM +; Make a copy of the OAM buffer with the first animation frame written so that +; we can flip back to it from the second frame by copying it back. +.makeCopy + ld hl, wOAMBuffer + ld de, wMonPartySpritesSavedOAM + ld bc, $60 + jp CopyData + +GetPartyMonSpriteID: + ld [wd11e], a + predef IndexToPokedex + ld a, [wd11e] + ld c, a + dec a + srl a + ld hl, MonPartyData + ld e, a + ld d, 0 + add hl, de + ld a, [hl] + bit 0, c + jr nz, .skipSwap + swap a ; use lower nybble if pokedex num is even +.skipSwap + and $f0 + srl a ; value == ICON constant << 2 + srl a + ret + +INCLUDE "data/pokemon/menu_icons.asm" + +INC_FRAME_1 EQUS "0, $20" +INC_FRAME_2 EQUS "$20, $20" + +BugIconFrame1: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_1 +PlantIconFrame1: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_1 +BugIconFrame2: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_2 +PlantIconFrame2: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_2 +SnakeIconFrame1: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_1 +QuadrupedIconFrame1: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_1 +SnakeIconFrame2: INCBIN "gfx/icons/snake.2bpp", INC_FRAME_2 +QuadrupedIconFrame2: INCBIN "gfx/icons/quadruped.2bpp", INC_FRAME_2 + +TradeBubbleIconGFX: INCBIN "gfx/trade/bubble.2bpp" diff --git a/engine/gfx/oam_dma.asm b/engine/gfx/oam_dma.asm new file mode 100644 index 00000000..fe93e90d --- /dev/null +++ b/engine/gfx/oam_dma.asm @@ -0,0 +1,28 @@ +WriteDMACodeToHRAM:: +; Since no other memory is available during OAM DMA, +; DMARoutine is copied to HRAM and executed there. + ld c, LOW(hDMARoutine) + ld b, DMARoutineEnd - DMARoutine + ld hl, DMARoutine +.copy + ld a, [hli] + ldh [c], a + inc c + dec b + jr nz, .copy + ret + +DMARoutine: +LOAD "OAM DMA", HRAM +hDMARoutine:: + ; initiate DMA + ld a, HIGH(wOAMBuffer) + ldh [rDMA], a + ; wait for DMA to finish + ld a, $28 +.wait + dec a + jr nz, .wait + ret +ENDL +DMARoutineEnd: diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm new file mode 100644 index 00000000..a43c66ba --- /dev/null +++ b/engine/gfx/palettes.asm @@ -0,0 +1,640 @@ +_RunPaletteCommand: + call GetPredefRegisters + ld a, b + cp SET_PAL_DEFAULT + jr nz, .not_default + ld a, [wDefaultPaletteCommand] +.not_default + cp SET_PAL_PARTY_MENU_HP_BARS + jp z, UpdatePartyMenuBlkPacket + ld l, a + ld h, 0 + add hl, hl + ld de, SetPalFunctions + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + ld de, SendSGBPackets + push de + jp hl + +SetPal_BattleBlack: + ld hl, PalPacket_Black + ld de, BlkPacket_Battle + ret + +; uses PalPacket_Empty to build a packet based on mon IDs and health color +SetPal_Battle: + ld hl, PalPacket_Empty + ld de, wPalPacket + ld bc, $10 + call CopyData + ld a, [wPlayerBattleStatus3] + ld hl, wBattleMonSpecies + call DeterminePaletteID + ld b, a + ld a, [wEnemyBattleStatus3] + ld hl, wEnemyMonSpecies2 + call DeterminePaletteID + ld c, a + ld hl, wPalPacket + 1 + ld a, [wPlayerHPBarColor] + add PAL_GREENBAR + ld [hli], a + inc hl + ld a, [wEnemyHPBarColor] + add PAL_GREENBAR + ld [hli], a + inc hl + ld a, b + ld [hli], a + inc hl + ld a, c + ld [hl], a + ld hl, wPalPacket + ld de, BlkPacket_Battle + ld a, SET_PAL_BATTLE + ld [wDefaultPaletteCommand], a + ret + +SetPal_TownMap: + ld hl, PalPacket_TownMap + ld de, BlkPacket_WholeScreen + ret + +; uses PalPacket_Empty to build a packet based the mon ID +SetPal_StatusScreen: + ld hl, PalPacket_Empty + ld de, wPalPacket + ld bc, $10 + call CopyData + ld a, [wcf91] + cp NUM_POKEMON_INDEXES + 1 + jr c, .pokemon + ld a, $1 ; not pokemon +.pokemon + call DeterminePaletteIDOutOfBattle + push af + ld hl, wPalPacket + 1 + ld a, [wStatusScreenHPBarColor] + add PAL_GREENBAR + ld [hli], a + inc hl + pop af + ld [hl], a + ld hl, wPalPacket + ld de, BlkPacket_StatusScreen + ret + +SetPal_PartyMenu: + ld hl, PalPacket_PartyMenu + ld de, wPartyMenuBlkPacket + ret + +SetPal_Pokedex: + ld hl, PalPacket_Pokedex + ld de, wPalPacket + ld bc, $10 + call CopyData + ld a, [wcf91] + call DeterminePaletteIDOutOfBattle + ld hl, wPalPacket + 3 + ld [hl], a + ld hl, wPalPacket + ld de, BlkPacket_Pokedex + ret + +SetPal_Slots: + ld hl, PalPacket_Slots + ld de, BlkPacket_Slots + ret + +SetPal_TitleScreen: + ld hl, PalPacket_Titlescreen + ld de, BlkPacket_Titlescreen + ret + +; used mostly for menus and the Oak intro +SetPal_Generic: + ld hl, PalPacket_Generic + ld de, BlkPacket_WholeScreen + ret + +SetPal_NidorinoIntro: + ld hl, PalPacket_NidorinoIntro + ld de, BlkPacket_NidorinoIntro + ret + +SetPal_GameFreakIntro: + ld hl, PalPacket_GameFreakIntro + ld de, BlkPacket_GameFreakIntro + ld a, SET_PAL_GENERIC + ld [wDefaultPaletteCommand], a + ret + +; uses PalPacket_Empty to build a packet based on the current map +SetPal_Overworld: + ld hl, PalPacket_Empty + ld de, wPalPacket + ld bc, $10 + call CopyData + ld a, [wCurMapTileset] + cp CEMETERY + jr z, .PokemonTowerOrAgatha + cp CAVERN + jr z, .caveOrBruno + ld a, [wCurMap] + cp FIRST_INDOOR_MAP + jr c, .townOrRoute + cp CERULEAN_CAVE_2F + jr c, .normalDungeonOrBuilding + cp CERULEAN_CAVE_1F + 1 + jr c, .caveOrBruno + cp LORELEIS_ROOM + jr z, .Lorelei + cp BRUNOS_ROOM + jr z, .caveOrBruno +.normalDungeonOrBuilding + ld a, [wLastMap] ; town or route that current dungeon or building is located +.townOrRoute + cp NUM_CITY_MAPS + jr c, .town + ld a, PAL_ROUTE - 1 +.town + inc a ; a town's palette ID is its map ID + 1 + ld hl, wPalPacket + 1 + ld [hld], a + ld de, BlkPacket_WholeScreen + ld a, SET_PAL_OVERWORLD + ld [wDefaultPaletteCommand], a + ret +.PokemonTowerOrAgatha + ld a, PAL_GREYMON - 1 + jr .town +.caveOrBruno + ld a, PAL_CAVE - 1 + jr .town +.Lorelei + xor a + jr .town + +; used when a Pokemon is the only thing on the screen +; such as evolution, trading and the Hall of Fame +SetPal_PokemonWholeScreen: + push bc + ld hl, PalPacket_Empty + ld de, wPalPacket + ld bc, $10 + call CopyData + pop bc + ld a, c + and a + ld a, PAL_BLACK + jr nz, .next + ld a, [wWholeScreenPaletteMonSpecies] + call DeterminePaletteIDOutOfBattle +.next + ld [wPalPacket + 1], a + ld hl, wPalPacket + ld de, BlkPacket_WholeScreen + ret + +SetPal_TrainerCard: + ld hl, BlkPacket_TrainerCard + ld de, wTrainerCardBlkPacket + ld bc, $40 + call CopyData + ld de, BadgeBlkDataLengths + ld hl, wTrainerCardBlkPacket + 2 + ld a, [wObtainedBadges] + ld c, NUM_BADGES +.badgeLoop + srl a + push af + jr c, .haveBadge +; The player doens't have the badge, so zero the badge's blk data. + push bc + ld a, [de] + ld c, a + xor a +.zeroBadgeDataLoop + ld [hli], a + dec c + jr nz, .zeroBadgeDataLoop + pop bc + jr .nextBadge +.haveBadge +; The player does have the badge, so skip past the badge's blk data. + ld a, [de] +.skipBadgeDataLoop + inc hl + dec a + jr nz, .skipBadgeDataLoop +.nextBadge + pop af + inc de + dec c + jr nz, .badgeLoop + ld hl, PalPacket_TrainerCard + ld de, wTrainerCardBlkPacket + ret + +SetPalFunctions: +; entries correspond to SET_PAL_* constants + dw SetPal_BattleBlack + dw SetPal_Battle + dw SetPal_TownMap + dw SetPal_StatusScreen + dw SetPal_Pokedex + dw SetPal_Slots + dw SetPal_TitleScreen + dw SetPal_NidorinoIntro + dw SetPal_Generic + dw SetPal_Overworld + dw SetPal_PartyMenu + dw SetPal_PokemonWholeScreen + dw SetPal_GameFreakIntro + dw SetPal_TrainerCard + +; The length of the blk data of each badge on the Trainer Card. +; The Rainbow Badge has 3 entries because of its many colors. +BadgeBlkDataLengths: + db 6 ; Boulder Badge + db 6 ; Cascade Badge + db 6 ; Thunder Badge + db 6 * 3 ; Rainbow Badge + db 6 ; Soul Badge + db 6 ; Marsh Badge + db 6 ; Volcano Badge + db 6 ; Earth Badge + +DeterminePaletteID: + bit TRANSFORMED, a ; a is battle status 3 + ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette + ret nz + ld a, [hl] +DeterminePaletteIDOutOfBattle: + ld [wd11e], a + and a ; is the mon index 0? + jr z, .skipDexNumConversion + push bc + predef IndexToPokedex + pop bc + ld a, [wd11e] +.skipDexNumConversion + ld e, a + ld d, 0 + ld hl, MonsterPalettes ; not just for Pokemon, Trainers use it too + add hl, de + ld a, [hl] + ret + +InitPartyMenuBlkPacket: + ld hl, BlkPacket_PartyMenu + ld de, wPartyMenuBlkPacket + ld bc, $30 + jp CopyData + +UpdatePartyMenuBlkPacket: +; Update the blk packet with the palette of the HP bar that is +; specified in [wWhichPartyMenuHPBar]. + ld hl, wPartyMenuHPBarColors + ld a, [wWhichPartyMenuHPBar] + ld e, a + ld d, 0 + add hl, de + ld e, l + ld d, h + ld a, [de] + and a + ld e, (1 << 2) | 1 ; green + jr z, .next + dec a + ld e, (2 << 2) | 2 ; yellow + jr z, .next + ld e, (3 << 2) | 3 ; red +.next + push de + ld hl, wPartyMenuBlkPacket + 8 + 1 + ld bc, 6 + ld a, [wWhichPartyMenuHPBar] + call AddNTimes + pop de + ld [hl], e + ret + +SendSGBPacket: +;check number of packets + ld a, [hl] + and $07 + ret z +; store number of packets in B + ld b, a +.loop2 +; save B for later use + push bc +; disable ReadJoypad to prevent it from interfering with sending the packet + ld a, 1 + ldh [hDisableJoypadPolling], a +; send RESET signal (P14=LOW, P15=LOW) + xor a + ldh [rJOYP], a +; set P14=HIGH, P15=HIGH + ld a, $30 + ldh [rJOYP], a +;load length of packets (16 bytes) + ld b, $10 +.nextByte +;set bit counter (8 bits per byte) + ld e, $08 +; get next byte in the packet + ld a, [hli] + ld d, a +.nextBit0 + bit 0, d +; if 0th bit is not zero set P14=HIGH, P15=LOW (send bit 1) + ld a, $10 + jr nz, .next0 +; else (if 0th bit is zero) set P14=LOW, P15=HIGH (send bit 0) + ld a, $20 +.next0 + ldh [rJOYP], a +; must set P14=HIGH,P15=HIGH between each "pulse" + ld a, $30 + ldh [rJOYP], a +; rotation will put next bit in 0th position (so we can always use command +; "bit 0, d" to fetch the bit that has to be sent) + rr d +; decrease bit counter so we know when we have sent all 8 bits of current byte + dec e + jr nz, .nextBit0 + dec b + jr nz, .nextByte +; send bit 1 as a "stop bit" (end of parameter data) + ld a, $20 + ldh [rJOYP], a +; set P14=HIGH,P15=HIGH + ld a, $30 + ldh [rJOYP], a + xor a + ldh [hDisableJoypadPolling], a +; wait for about 70000 cycles + call Wait7000 +; restore (previously pushed) number of packets + pop bc + dec b +; return if there are no more packets + ret z +; else send 16 more bytes + jr .loop2 + +LoadSGB: + xor a + ld [wOnSGB], a + call CheckSGB + ret nc + ld a, 1 + ld [wOnSGB], a + ld a, [wGBC] + and a + jr z, .notGBC + ret +.notGBC + di + call PrepareSuperNintendoVRAMTransfer + ei + ld a, 1 + ld [wCopyingSGBTileData], a + ld de, ChrTrnPacket + ld hl, SGBBorderGraphics + call CopyGfxToSuperNintendoVRAM + xor a + ld [wCopyingSGBTileData], a + ld de, PctTrnPacket + ld hl, BorderPalettes + call CopyGfxToSuperNintendoVRAM + xor a + ld [wCopyingSGBTileData], a + ld de, PalTrnPacket + ld hl, SuperPalettes + call CopyGfxToSuperNintendoVRAM + call ClearVram + ld hl, MaskEnCancelPacket + jp SendSGBPacket + +PrepareSuperNintendoVRAMTransfer: + ld hl, .packetPointers + ld c, 9 +.loop + push bc + ld a, [hli] + push hl + ld h, [hl] + ld l, a + call SendSGBPacket + pop hl + inc hl + pop bc + dec c + jr nz, .loop + ret + +.packetPointers +; Only the first packet is needed. + dw MaskEnFreezePacket + dw DataSnd_72548 + dw DataSnd_72558 + dw DataSnd_72568 + dw DataSnd_72578 + dw DataSnd_72588 + dw DataSnd_72598 + dw DataSnd_725a8 + dw DataSnd_725b8 + +CheckSGB: +; Returns whether the game is running on an SGB in carry. + ld hl, MltReq2Packet + di + call SendSGBPacket + ld a, 1 + ldh [hDisableJoypadPolling], a + ei + call Wait7000 + ldh a, [rJOYP] + and $3 + cp $3 + jr nz, .isSGB + ld a, $20 + ldh [rJOYP], a + ldh a, [rJOYP] + ldh a, [rJOYP] + call Wait7000 + call Wait7000 + ld a, $30 + ldh [rJOYP], a + call Wait7000 + call Wait7000 + ld a, $10 + ldh [rJOYP], a + ldh a, [rJOYP] + ldh a, [rJOYP] + ldh a, [rJOYP] + ldh a, [rJOYP] + ldh a, [rJOYP] + ldh a, [rJOYP] + call Wait7000 + call Wait7000 + ld a, $30 + ldh [rJOYP], a + ldh a, [rJOYP] + ldh a, [rJOYP] + ldh a, [rJOYP] + call Wait7000 + call Wait7000 + ldh a, [rJOYP] + and $3 + cp $3 + jr nz, .isSGB + call SendMltReq1Packet + and a + ret +.isSGB + call SendMltReq1Packet + scf + ret + +SendMltReq1Packet: + ld hl, MltReq1Packet + call SendSGBPacket + jp Wait7000 + +CopyGfxToSuperNintendoVRAM: + di + push de + call DisableLCD + ld a, $e4 + ldh [rBGP], a + ld de, vChars1 + ld a, [wCopyingSGBTileData] + and a + jr z, .notCopyingTileData + call CopySGBBorderTiles + jr .next +.notCopyingTileData + ld bc, $1000 + call CopyData +.next + ld hl, vBGMap0 + ld de, $c + ld a, $80 + ld c, $d +.loop + ld b, $14 +.innerLoop + ld [hli], a + inc a + dec b + jr nz, .innerLoop + add hl, de + dec c + jr nz, .loop + ld a, $e3 + ldh [rLCDC], a + pop hl + call SendSGBPacket + xor a + ldh [rBGP], a + ei + ret + +Wait7000: +; Each loop takes 9 cycles so this routine actually waits 63000 cycles. + ld de, 7000 +.loop + nop + nop + nop + dec de + ld a, d + or e + jr nz, .loop + ret + +SendSGBPackets: + ld a, [wGBC] + and a + jr z, .notGBC + push de + call InitGBCPalettes + pop hl + call EmptyFunc3 + ret +.notGBC + push de + call SendSGBPacket + pop hl + jp SendSGBPacket + +InitGBCPalettes: + ld a, $80 ; index 0 with auto-increment + ldh [rBGPI], a + inc hl + ld c, $20 +.loop + ld a, [hli] + inc hl + add a + add a + add a + ld de, SuperPalettes + add e + jr nc, .noCarry + inc d +.noCarry + ld a, [de] + ldh [rBGPD], a + dec c + jr nz, .loop + ret + +EmptyFunc3: + ret + +CopySGBBorderTiles: +; SGB tile data is stored in a 4BPP planar format. +; Each tile is 32 bytes. The first 16 bytes contain bit planes 1 and 2, while +; the second 16 bytes contain bit planes 3 and 4. +; This function converts 2BPP planar data into this format by mapping +; 2BPP colors 0-3 to 4BPP colors 0-3. 4BPP colors 4-15 are not used. + ld b, 128 +.tileLoop +; Copy bit planes 1 and 2 of the tile data. + ld c, 16 +.copyLoop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyLoop + +; Zero bit planes 3 and 4. + ld c, 16 + xor a +.zeroLoop + ld [de], a + inc de + dec c + jr nz, .zeroLoop + + dec b + jr nz, .tileLoop + ret + +INCLUDE "data/sgb/sgb_packets.asm" + +INCLUDE "data/pokemon/palettes.asm" + +INCLUDE "data/sgb/sgb_palettes.asm" + +INCLUDE "data/sgb/sgb_border.asm" diff --git a/engine/gfx/screen_effects.asm b/engine/gfx/screen_effects.asm new file mode 100644 index 00000000..c7a68734 --- /dev/null +++ b/engine/gfx/screen_effects.asm @@ -0,0 +1,71 @@ +; b = new color for BG color 0 (usually white) for 4 frames +ChangeBGPalColor0_4Frames: + call GetPredefRegisters + ldh a, [rBGP] + or b + ldh [rBGP], a + ld c, 4 + call DelayFrames + ldh a, [rBGP] + and %11111100 + ldh [rBGP], a + ret + +PredefShakeScreenVertically: +; Moves the window down and then back in a sequence of progressively smaller +; numbers of pixels, starting at b. + call GetPredefRegisters + ld a, 1 + ld [wDisableVBlankWYUpdate], a + xor a +.loop + ldh [hMutateWY], a + call .MutateWY + call .MutateWY + dec b + ld a, b + jr nz, .loop + xor a + ld [wDisableVBlankWYUpdate], a + ret + +.MutateWY + ldh a, [hMutateWY] + xor b + ldh [hMutateWY], a + ldh [rWY], a + ld c, 3 + jp DelayFrames + +PredefShakeScreenHorizontally: +; Moves the window right and then back in a sequence of progressively smaller +; numbers of pixels, starting at b. + call GetPredefRegisters + xor a +.loop + ldh [hMutateWX], a + call .MutateWX + ld c, 1 + call DelayFrames + call .MutateWX + dec b + ld a, b + jr nz, .loop + +; restore normal WX + ld a, 7 + ldh [rWX], a + ret + +.MutateWX + ldh a, [hMutateWX] + xor b + ldh [hMutateWX], a + bit 7, a + jr z, .skipZeroing + xor a ; zero a if it's negative +.skipZeroing + add 7 + ldh [rWX], a + ld c, 4 + jp DelayFrames diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm new file mode 100644 index 00000000..b3c07ecd --- /dev/null +++ b/engine/gfx/sprite_oam.asm @@ -0,0 +1,189 @@ +PrepareOAMData:: +; Determine OAM data for currently visible +; sprites and write it to wOAMBuffer. + + ld a, [wUpdateSpritesEnabled] + dec a + jr z, .updateEnabled + + cp -1 + ret nz + ld [wUpdateSpritesEnabled], a + jp HideSprites + +.updateEnabled + xor a + ldh [hOAMBufferOffset], a + +.spriteLoop + ldh [hSpriteOffset2], a + + ld d, HIGH(wSpriteStateData1) + ldh a, [hSpriteOffset2] + ld e, a + ld a, [de] ; [x#SPRITESTATEDATA1_PICTUREID] + and a + jp z, .nextSprite + + inc e + inc e + ld a, [de] ; [x#SPRITESTATEDATA1_IMAGEINDEX] + ld [wd5cd], a + cp $ff ; off-screen (don't draw) + jr nz, .visible + + call GetSpriteScreenXY + jr .nextSprite + +.visible + cp $a0 ; is the sprite unchanging like an item ball or boulder? + jr c, .usefacing + +; unchanging + and $f + add $10 ; skip to the second half of the table which doesn't account for facing direction + jr .next + +.usefacing + and $f + +.next + ld l, a + +; get sprite priority + push de + inc d + ld a, e + add $5 + ld e, a + ld a, [de] ; [x#SPRITESTATEDATA2_GRASSPRIORITY] + and $80 + ldh [hSpritePriority], a ; temp store sprite priority + pop de + +; read the entry from the table + ld h, 0 + ld bc, SpriteFacingAndAnimationTable + add hl, hl + add hl, hl + add hl, bc + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld h, [hl] + ld l, a + + call GetSpriteScreenXY + + ldh a, [hOAMBufferOffset] + ld e, a + ld d, HIGH(wOAMBuffer) + +.tileLoop + ldh a, [hSpriteScreenY] ; temp for sprite Y position + add $10 ; Y=16 is top of screen (Y=0 is invisible) + add [hl] ; add Y offset from table + ld [de], a ; write new sprite OAM Y position + inc hl + ldh a, [hSpriteScreenX] ; temp for sprite X position + add $8 ; X=8 is left of screen (X=0 is invisible) + add [hl] ; add X offset from table + inc e + ld [de], a ; write new sprite OAM X position + inc e + ld a, [bc] ; read pattern number offset (accommodates orientation (offset 0,4 or 8) and animation (offset 0 or $80)) + inc bc + push bc + ld b, a + + ld a, [wd5cd] ; temp copy of [x#SPRITESTATEDATA1_IMAGEINDEX] + swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs) + and $f + + ; Sprites $a and $b have one face (and therefore 4 tiles instead of 12). + ; As a result, sprite $b's tile offset is less than normal. + cp $b + jr nz, .notFourTileSprite + ld a, $a * 12 + 4 + jr .next2 + +.notFourTileSprite + ; a *= 12 + sla a + sla a + ld c, a + sla a + add c + +.next2 + add b ; add the tile offset from the table (based on frame and facing direction) + pop bc + ld [de], a ; tile id + inc hl + inc e + ld a, [hl] + bit 1, a ; is the tile allowed to set the sprite priority bit? + jr z, .skipPriority + ldh a, [hSpritePriority] + or [hl] +.skipPriority + inc hl + ld [de], a + inc e + bit 0, a ; OAMFLAG_ENDOFDATA + jr z, .tileLoop + + ld a, e + ldh [hOAMBufferOffset], a + +.nextSprite + ldh a, [hSpriteOffset2] + add $10 + cp LOW($100) + jp nz, .spriteLoop + + ; Clear unused OAM. + ldh a, [hOAMBufferOffset] + ld l, a + ld h, HIGH(wOAMBuffer) + ld de, $4 + ld b, $a0 + ld a, [wd736] + bit 6, a ; jumping down ledge or fishing animation? + ld a, $a0 + jr z, .clear + +; Don't clear the last 4 entries because they are used for the shadow in the +; jumping down ledge animation and the rod in the fishing animation. + ld a, $90 + +.clear + cp l + ret z + ld [hl], b + add hl, de + jr .clear + +GetSpriteScreenXY: + inc e + inc e + ld a, [de] ; [x#SPRITESTATEDATA1_YPIXELS] + ldh [hSpriteScreenY], a + inc e + inc e + ld a, [de] ; [x#SPRITESTATEDATA1_XPIXELS] + ldh [hSpriteScreenX], a + ld a, 4 + add e + ld e, a + ldh a, [hSpriteScreenY] + add 4 + and $f0 + ld [de], a ; [x#SPRITESTATEDATA1_YADJUSTED] + inc e + ldh a, [hSpriteScreenX] + and $f0 + ld [de], a ; [x#SPRITESTATEDATA1_XADJUSTED] + ret diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm deleted file mode 100755 index f8cdf44e..00000000 --- a/engine/hidden_object_functions14.asm +++ /dev/null @@ -1,100 +0,0 @@ -PrintNotebookText: - call EnableAutoTextBoxDrawing - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wHiddenObjectFunctionArgument] - jp PrintPredefTextID - -TMNotebook: - TX_FAR TMNotebookText - TX_WAIT - db "@" - -ViridianSchoolNotebook: - TX_ASM - ld hl, ViridianSchoolNotebookText1 - call PrintText - call TurnPageSchoolNotebook - jr nz, .doneReading - ld hl, ViridianSchoolNotebookText2 - call PrintText - call TurnPageSchoolNotebook - jr nz, .doneReading - ld hl, ViridianSchoolNotebookText3 - call PrintText - call TurnPageSchoolNotebook - jr nz, .doneReading - ld hl, ViridianSchoolNotebookText4 - call PrintText - ld hl, ViridianSchoolNotebookText5 - call PrintText -.doneReading - jp TextScriptEnd - -TurnPageSchoolNotebook: - ld hl, TurnPageText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - ret - -TurnPageText: - TX_FAR _TurnPageText - db "@" - -ViridianSchoolNotebookText5: - TX_FAR _ViridianSchoolNotebookText5 - TX_WAIT - db "@" - -ViridianSchoolNotebookText1: - TX_FAR _ViridianSchoolNotebookText1 - db "@" - -ViridianSchoolNotebookText2: - TX_FAR _ViridianSchoolNotebookText2 - db "@" - -ViridianSchoolNotebookText3: - TX_FAR _ViridianSchoolNotebookText3 - db "@" - -ViridianSchoolNotebookText4: - TX_FAR _ViridianSchoolNotebookText4 - db "@" - -PrintFightingDojoText2: - call EnableAutoTextBoxDrawing - tx_pre_jump EnemiesOnEverySideText - -EnemiesOnEverySideText: - TX_FAR _EnemiesOnEverySideText - db "@" - -PrintFightingDojoText3: - call EnableAutoTextBoxDrawing - tx_pre_jump WhatGoesAroundComesAroundText - -WhatGoesAroundComesAroundText: - TX_FAR _WhatGoesAroundComesAroundText - db "@" - -PrintFightingDojoText: - call EnableAutoTextBoxDrawing - tx_pre_jump FightingDojoText - -FightingDojoText: - TX_FAR _FightingDojoText - db "@" - -PrintIndigoPlateauHQText: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - call EnableAutoTextBoxDrawing - tx_pre_jump IndigoPlateauHQText - -IndigoPlateauHQText: - TX_FAR _IndigoPlateauHQText - db "@" diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm deleted file mode 100755 index e5f3d7a4..00000000 --- a/engine/hidden_object_functions17.asm +++ /dev/null @@ -1,482 +0,0 @@ -PrintRedSNESText: - call EnableAutoTextBoxDrawing - tx_pre_jump RedBedroomSNESText - -RedBedroomSNESText: - TX_FAR _RedBedroomSNESText - db "@" - -OpenRedsPC: - call EnableAutoTextBoxDrawing - tx_pre_jump RedBedroomPCText - -RedBedroomPCText: - TX_PLAYERS_PC - -Route15GateLeftBinoculars: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - call EnableAutoTextBoxDrawing - tx_pre Route15UpstairsBinocularsText - ld a, ARTICUNO - ld [wcf91], a - call PlayCry - jp DisplayMonFrontSpriteInBox - -Route15UpstairsBinocularsText: - TX_FAR _Route15UpstairsBinocularsText - db "@" - -AerodactylFossil: - ld a, FOSSIL_AERODACTYL - ld [wcf91], a - call DisplayMonFrontSpriteInBox - call EnableAutoTextBoxDrawing - tx_pre AerodactylFossilText - ret - -AerodactylFossilText: - TX_FAR _AerodactylFossilText - db "@" - -KabutopsFossil: - ld a, FOSSIL_KABUTOPS - ld [wcf91], a - call DisplayMonFrontSpriteInBox - call EnableAutoTextBoxDrawing - tx_pre KabutopsFossilText - ret - -KabutopsFossilText: - TX_FAR _KabutopsFossilText - db "@" - -DisplayMonFrontSpriteInBox: -; Displays a pokemon's front sprite in a pop-up window. -; [wcf91] = pokemon internal id number - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a - call Delay3 - xor a - ld [hWY], a - call SaveScreenTilesToBuffer1 - ld a, MON_SPRITE_POPUP - ld [wTextBoxID], a - call DisplayTextBoxID - call UpdateSprites - ld a, [wcf91] - ld [wd0b5], a - call GetMonHeader - ld de, vChars1 + $310 - call LoadMonFrontSprite - ld a, $80 - ld [hStartTileID], a - coord hl, 10, 11 - predef AnimateSendingOutMon - call WaitForTextScrollButtonPress - call LoadScreenTilesFromBuffer1 - call Delay3 - ld a, $90 - ld [hWY], a - ret - -PrintBlackboardLinkCableText: - call EnableAutoTextBoxDrawing - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wHiddenObjectFunctionArgument] - call PrintPredefTextID - ret - -LinkCableHelp: - TX_ASM - call SaveScreenTilesToBuffer1 - ld hl, LinkCableHelpText1 - call PrintText - xor a - ld [wMenuItemOffset], a ; not used - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, 3 - ld [wMaxMenuItem], a - ld a, 2 - ld [wTopMenuItemY], a - ld a, 1 - ld [wTopMenuItemX], a -.linkHelpLoop - ld hl, wd730 - set 6, [hl] - coord hl, 0, 0 - ld b, 8 - ld c, 13 - call TextBoxBorder - coord hl, 2, 2 - ld de, HowToLinkText - call PlaceString - ld hl, LinkCableHelpText2 - call PrintText - call HandleMenuInput - bit 1, a ; pressed b - jr nz, .exit - ld a, [wCurrentMenuItem] - cp 3 ; pressed a on "STOP READING" - jr z, .exit - ld hl, wd730 - res 6, [hl] - ld hl, LinkCableInfoTexts - add a - ld d, 0 - ld e, a - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - call PrintText - jp .linkHelpLoop -.exit - ld hl, wd730 - res 6, [hl] - call LoadScreenTilesFromBuffer1 - jp TextScriptEnd - -LinkCableHelpText1: - TX_FAR _LinkCableHelpText1 - db "@" - -LinkCableHelpText2: - TX_FAR _LinkCableHelpText2 - db "@" - -HowToLinkText: - db "HOW TO LINK" - next "COLOSSEUM" - next "TRADE CENTER" - next "STOP READING@" - -LinkCableInfoTexts: - dw LinkCableInfoText1 - dw LinkCableInfoText2 - dw LinkCableInfoText3 - -LinkCableInfoText1: - TX_FAR _LinkCableInfoText1 - db "@" - -LinkCableInfoText2: - TX_FAR _LinkCableInfoText2 - db "@" - -LinkCableInfoText3: - TX_FAR _LinkCableInfoText3 - db "@" - -ViridianSchoolBlackboard: - TX_ASM - call SaveScreenTilesToBuffer1 - ld hl, ViridianSchoolBlackboardText1 - call PrintText - xor a - ld [wMenuItemOffset], a - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld a, D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, 2 - ld [wMaxMenuItem], a - ld a, 2 - ld [wTopMenuItemY], a - ld a, 1 - ld [wTopMenuItemX], a -.blackboardLoop - ld hl, wd730 - set 6, [hl] - coord hl, 0, 0 - lb bc, 6, 10 - call TextBoxBorder - coord hl, 1, 2 - ld de, StatusAilmentText1 - call PlaceString - coord hl, 6, 2 - ld de, StatusAilmentText2 - call PlaceString - ld hl, ViridianSchoolBlackboardText2 - call PrintText - call HandleMenuInput ; pressing up and down is handled in here - bit 1, a ; pressed b - jr nz, .exitBlackboard - bit 4, a ; pressed right - jr z, .didNotPressRight - ; move cursor to right column - ld a, 2 - ld [wMaxMenuItem], a - ld a, 2 - ld [wTopMenuItemY], a - ld a, 6 - ld [wTopMenuItemX], a - ld a, 3 ; in the the right column, use an offset to prevent overlap - ld [wMenuItemOffset], a - jr .blackboardLoop -.didNotPressRight - bit 5, a ; pressed left - jr z, .didNotPressLeftOrRight - ; move cursor to left column - ld a, 2 - ld [wMaxMenuItem], a - ld a, 2 - ld [wTopMenuItemY], a - ld a, 1 - ld [wTopMenuItemX], a - xor a - ld [wMenuItemOffset], a - jr .blackboardLoop -.didNotPressLeftOrRight - ld a, [wCurrentMenuItem] - ld b, a - ld a, [wMenuItemOffset] - add b - cp 5 ; cursor is pointing to "QUIT" - jr z, .exitBlackboard - ; we must have pressed a on a status condition - ; so print the text - ld hl, wd730 - res 6, [hl] - ld hl, ViridianBlackboardStatusPointers - add a - ld d, 0 - ld e, a - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - call PrintText - jp .blackboardLoop -.exitBlackboard - ld hl, wd730 - res 6, [hl] - call LoadScreenTilesFromBuffer1 - jp TextScriptEnd - -ViridianSchoolBlackboardText1: - TX_FAR _ViridianSchoolBlackboardText1 - db "@" - -ViridianSchoolBlackboardText2: - TX_FAR _ViridianSchoolBlackboardText2 - db "@" - -StatusAilmentText1: - db " SLP" - next " PSN" - next " PAR@" - -StatusAilmentText2: - db " BRN" - next " FRZ" - next " QUIT@@" - -ViridianBlackboardStatusPointers: - dw ViridianBlackboardSleepText - dw ViridianBlackboardPoisonText - dw ViridianBlackboardPrlzText - dw ViridianBlackboardBurnText - dw ViridianBlackboardFrozenText - -ViridianBlackboardSleepText: - TX_FAR _ViridianBlackboardSleepText - db "@" - -ViridianBlackboardPoisonText: - TX_FAR _ViridianBlackboardPoisonText - db "@" - -ViridianBlackboardPrlzText: - TX_FAR _ViridianBlackboardPrlzText - db "@" - -ViridianBlackboardBurnText: - TX_FAR _ViridianBlackboardBurnText - db "@" - -ViridianBlackboardFrozenText: - TX_FAR _ViridianBlackboardFrozenText - db "@" - -PrintTrashText: - call EnableAutoTextBoxDrawing - tx_pre_jump VermilionGymTrashText - -VermilionGymTrashText: - TX_FAR _VermilionGymTrashText - db "@" - -GymTrashScript: - call EnableAutoTextBoxDrawing - ld a, [wHiddenObjectFunctionArgument] - ld [wGymTrashCanIndex], a - -; Don't do the trash can puzzle if it's already been done. - CheckEvent EVENT_2ND_LOCK_OPENED - jr z, .ok - - tx_pre_jump VermilionGymTrashText - -.ok - CheckEventReuseA EVENT_1ST_LOCK_OPENED - jr nz, .trySecondLock - - ld a, [wFirstLockTrashCanIndex] - ld b, a - ld a, [wGymTrashCanIndex] - cp b - jr z, .openFirstLock - - tx_pre_id VermilionGymTrashText - jr .done - -.openFirstLock -; Next can is trying for the second switch. - SetEvent EVENT_1ST_LOCK_OPENED - - ld hl, GymTrashCans - ld a, [wGymTrashCanIndex] - ; * 5 - ld b, a - add a - add a - add b - - ld d, 0 - ld e, a - add hl, de - ld a, [hli] - -; There is a bug in this code. It should calculate a value in the range [0, 3] -; but if the mask and random number don't have any 1 bits in common, then -; the result of the AND will be 0. When 1 is subtracted from that, the value -; will become $ff. This will result in 255 being added to hl, which will cause -; hl to point to one of the zero bytes that pad the end of the ROM bank. -; Trash can 0 was intended to be able to have the second lock only when the -; first lock was in trash can 1 or 3. However, due to this bug, trash can 0 can -; have the second lock regardless of which trash can had the first lock. - - ld [hGymTrashCanRandNumMask], a - push hl - call Random - swap a - ld b, a - ld a, [hGymTrashCanRandNumMask] - and b - dec a - pop hl - - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - and $f - ld [wSecondLockTrashCanIndex], a - - tx_pre_id VermilionGymTrashSuccessText1 - jr .done - -.trySecondLock - ld a, [wSecondLockTrashCanIndex] - ld b, a - ld a, [wGymTrashCanIndex] - cp b - jr z, .openSecondLock - -; Reset the cans. - ResetEvent EVENT_1ST_LOCK_OPENED - call Random - - and $e - ld [wFirstLockTrashCanIndex], a - - tx_pre_id VermilionGymTrashFailText - jr .done - -.openSecondLock -; Completed the trash can puzzle. - SetEvent EVENT_2ND_LOCK_OPENED - ld hl, wCurrentMapScriptFlags - set 6, [hl] - - tx_pre_id VermilionGymTrashSuccessText3 - -.done - jp PrintPredefTextID - -GymTrashCans: -; byte 0: mask for random number -; bytes 1-4: indices of the trash cans that can have the second lock -; (but see the comment above explaining a bug regarding this) -; Note that the mask is simply the number of valid trash can indices that -; follow. The remaining bytes are filled with 0 to pad the length of each entry -; to 5 bytes. - db 2, 1, 3, 0, 0 ; 0 - db 3, 0, 2, 4, 0 ; 1 - db 2, 1, 5, 0, 0 ; 2 - db 3, 0, 4, 6, 0 ; 3 - db 4, 1, 3, 5, 7 ; 4 - db 3, 2, 4, 8, 0 ; 5 - db 3, 3, 7, 9, 0 ; 6 - db 4, 4, 6, 8, 10 ; 7 - db 3, 5, 7, 11, 0 ; 8 - db 3, 6, 10, 12, 0 ; 9 - db 4, 7, 9, 11, 13 ; 10 - db 3, 8, 10, 14, 0 ; 11 - db 2, 9, 13, 0, 0 ; 12 - db 3, 10, 12, 14, 0 ; 13 - db 2, 11, 13, 0, 0 ; 14 - -VermilionGymTrashSuccessText1: - TX_FAR _VermilionGymTrashSuccessText1 - TX_ASM - call WaitForSoundToFinish - ld a, SFX_SWITCH - call PlaySound - call WaitForSoundToFinish - jp TextScriptEnd - -; unused -VermilionGymTrashSuccessText2: - TX_FAR _VermilionGymTrashSuccessText2 - db "@" - -; unused -VermilionGymTrashSuccesPlaySfx: - TX_ASM - call WaitForSoundToFinish - ld a, SFX_SWITCH - call PlaySound - call WaitForSoundToFinish - jp TextScriptEnd - -VermilionGymTrashSuccessText3: - TX_FAR _VermilionGymTrashSuccessText3 - TX_ASM - call WaitForSoundToFinish - ld a, SFX_GO_INSIDE - call PlaySound - call WaitForSoundToFinish - jp TextScriptEnd - -VermilionGymTrashFailText: - TX_FAR _VermilionGymTrashFailText - TX_ASM - call WaitForSoundToFinish - ld a, SFX_DENIED - call PlaySound - call WaitForSoundToFinish - jp TextScriptEnd - -; Trash cans are broken and can read the 255th entry sometimes for -; the second can. -; rgblink was placing stuff here, so the behavior was different from -; original Red. This is the simplest non-code fix: allocate zeroes as -; far as the broken code could reach. - ds 255 diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm deleted file mode 100755 index c6fb3109..00000000 --- a/engine/hidden_object_functions18.asm +++ /dev/null @@ -1,198 +0,0 @@ -GymStatues: -; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID -; if in a gym and don’t have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID -; else ret - call EnableAutoTextBoxDrawing - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - ld hl, .BadgeFlags - ld a, [wCurMap] - ld b, a -.loop - ld a, [hli] - cp $ff - ret z - cp b - jr z, .match - inc hl - jr .loop -.match - ld b, [hl] - ld a, [wBeatGymFlags] - and b - cp b - tx_pre_id GymStatueText2 - jr z, .haveBadge - tx_pre_id GymStatueText1 -.haveBadge - jp PrintPredefTextID - -.BadgeFlags: - db PEWTER_GYM, %00000001 - db CERULEAN_GYM, %00000010 - db VERMILION_GYM,%00000100 - db CELADON_GYM, %00001000 - db FUCHSIA_GYM, %00010000 - db SAFFRON_GYM, %00100000 - db CINNABAR_GYM, %01000000 - db VIRIDIAN_GYM, %10000000 - db $ff - -GymStatueText1: - TX_FAR _GymStatueText1 - db "@" - -GymStatueText2: - TX_FAR _GymStatueText2 - db "@" - -PrintBenchGuyText: - call EnableAutoTextBoxDrawing - ld hl, BenchGuyTextPointers - ld a, [wCurMap] - ld b, a -.loop - ld a, [hli] - cp $ff - ret z - cp b - jr z, .match - inc hl - inc hl - jr .loop -.match - ld a, [hli] - ld b, a - ld a, [wSpriteStateData1 + 9] - cp b - jr nz, .loop ; player isn't facing left at the bench guy - ld a, [hl] - jp PrintPredefTextID - -; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable -BenchGuyTextPointers: - db VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre ViridianCityPokecenterBenchGuyText - db PEWTER_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre PewterCityPokecenterBenchGuyText - db CERULEAN_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre CeruleanCityPokecenterBenchGuyText - db LAVENDER_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre LavenderCityPokecenterBenchGuyText - db VERMILION_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre VermilionCityPokecenterBenchGuyText - db CELADON_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre CeladonCityPokecenterBenchGuyText - db CELADON_HOTEL, SPRITE_FACING_LEFT - db_tx_pre CeladonCityHotelText - db FUCHSIA_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre FuchsiaCityPokecenterBenchGuyText - db CINNABAR_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre CinnabarIslandPokecenterBenchGuyText - db SAFFRON_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre SaffronCityPokecenterBenchGuyText - db MT_MOON_POKECENTER, SPRITE_FACING_LEFT - db_tx_pre MtMoonPokecenterBenchGuyText - db ROCK_TUNNEL_POKECENTER,SPRITE_FACING_LEFT - db_tx_pre RockTunnelPokecenterBenchGuyText - db $FF - -ViridianCityPokecenterBenchGuyText: - TX_FAR _ViridianCityPokecenterGuyText - db "@" - -PewterCityPokecenterBenchGuyText: - TX_FAR _PewterCityPokecenterGuyText - db "@" - -CeruleanCityPokecenterBenchGuyText: - TX_FAR _CeruleanPokecenterGuyText - db "@" - -LavenderCityPokecenterBenchGuyText: - TX_FAR _LavenderPokecenterGuyText - db "@" - -MtMoonPokecenterBenchGuyText: - TX_FAR _MtMoonPokecenterBenchGuyText - db "@" - -RockTunnelPokecenterBenchGuyText: - TX_FAR _RockTunnelPokecenterGuyText - db "@" - -UnusedBenchGuyText1: - TX_FAR _UnusedBenchGuyText1 - db "@" - -UnusedBenchGuyText2: - TX_FAR _UnusedBenchGuyText2 - db "@" - -UnusedBenchGuyText3: - TX_FAR _UnusedBenchGuyText3 - db "@" - -VermilionCityPokecenterBenchGuyText: - TX_FAR _VermilionPokecenterGuyText - db "@" - -CeladonCityPokecenterBenchGuyText: - TX_FAR _CeladonCityPokecenterGuyText - db "@" - -FuchsiaCityPokecenterBenchGuyText: - TX_FAR _FuchsiaCityPokecenterGuyText - db "@" - -CinnabarIslandPokecenterBenchGuyText: - TX_FAR _CinnabarPokecenterGuyText - db "@" - -SaffronCityPokecenterBenchGuyText: - TX_ASM - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ld hl, SaffronCityPokecenterBenchGuyText2 - jr nz, .asm_624f2 - ld hl, SaffronCityPokecenterBenchGuyText1 -.asm_624f2 - call PrintText - jp TextScriptEnd - -SaffronCityPokecenterBenchGuyText1: - TX_FAR _SaffronCityPokecenterGuyText1 - db "@" - -SaffronCityPokecenterBenchGuyText2: - TX_FAR _SaffronCityPokecenterGuyText2 - db "@" - -CeladonCityHotelText: - TX_FAR _CeladonCityHotelText - db "@" - - ret - -UnusedPredefText: - db "@" - -PrintBookcaseText: - call EnableAutoTextBoxDrawing - tx_pre_jump BookcaseText - -BookcaseText: - TX_FAR _BookcaseText - db "@" - -OpenPokemonCenterPC: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP ; check to see if player is facing up - ret nz - call EnableAutoTextBoxDrawing - ld a, $1 - ld [wAutoTextBoxDrawingControl], a - tx_pre_jump PokemonCenterPCText - -PokemonCenterPCText: - TX_POKECENTER_PC diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm deleted file mode 100755 index aaedcbca..00000000 --- a/engine/hidden_object_functions3.asm +++ /dev/null @@ -1,153 +0,0 @@ -; prints text for bookshelves in buildings without sign events -PrintBookshelfText: - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - cp SPRITE_FACING_UP - jr nz, .noMatch -; facing up - ld a, [wCurMapTileset] - ld b, a - aCoord 8, 7 - ld c, a - ld hl, BookshelfTileIDs -.loop - ld a, [hli] - cp $ff - jr z, .noMatch - cp b - jr nz, .nextBookshelfEntry1 - ld a, [hli] - cp c - jr nz, .nextBookshelfEntry2 - ld a, [hl] - push af - call EnableAutoTextBoxDrawing - pop af - call PrintPredefTextID - xor a - ld [$ffdb], a - ret -.nextBookshelfEntry1 - inc hl -.nextBookshelfEntry2 - inc hl - jr .loop -.noMatch - ld a, $ff - ld [$ffdb], a - jpba PrintCardKeyText - -; format: db tileset id, bookshelf tile id, text id -BookshelfTileIDs: - db PLATEAU, $30 - db_tx_pre IndigoPlateauStatues - db HOUSE, $3D - db_tx_pre TownMapText - db HOUSE, $1E - db_tx_pre BookOrSculptureText - db MANSION, $32 - db_tx_pre BookOrSculptureText - db REDS_HOUSE_1, $32 - db_tx_pre BookOrSculptureText - db LAB, $28 - db_tx_pre BookOrSculptureText - db LOBBY, $16 - db_tx_pre ElevatorText - db GYM, $1D - db_tx_pre BookOrSculptureText - db DOJO, $1D - db_tx_pre BookOrSculptureText - db GATE, $22 - db_tx_pre BookOrSculptureText - db MART, $54 - db_tx_pre PokemonStuffText - db MART, $55 - db_tx_pre PokemonStuffText - db POKECENTER, $54 - db_tx_pre PokemonStuffText - db POKECENTER, $55 - db_tx_pre PokemonStuffText - db LOBBY, $50 - db_tx_pre PokemonStuffText - db LOBBY, $52 - db_tx_pre PokemonStuffText - db SHIP, $36 - db_tx_pre BookOrSculptureText - db $FF - -IndigoPlateauStatues: - TX_ASM - ld hl, IndigoPlateauStatuesText1 - call PrintText - ld a, [wXCoord] - bit 0, a - ld hl, IndigoPlateauStatuesText2 - jr nz, .ok - ld hl, IndigoPlateauStatuesText3 -.ok - call PrintText - jp TextScriptEnd - -IndigoPlateauStatuesText1: - TX_FAR _IndigoPlateauStatuesText1 - db "@" - -IndigoPlateauStatuesText2: - TX_FAR _IndigoPlateauStatuesText2 - db "@" - -IndigoPlateauStatuesText3: - TX_FAR _IndigoPlateauStatuesText3 - db "@" - -BookOrSculptureText: - TX_ASM - ld hl, PokemonBooksText - ld a, [wCurMapTileset] - cp MANSION ; Celadon Mansion tileset - jr nz, .ok - aCoord 8, 6 - cp $38 - jr nz, .ok - ld hl, DiglettSculptureText -.ok - call PrintText - jp TextScriptEnd - -PokemonBooksText: - TX_FAR _PokemonBooksText - db "@" - -DiglettSculptureText: - TX_FAR _DiglettSculptureText - db "@" - -ElevatorText: - TX_FAR _ElevatorText - db "@" - -TownMapText: - TX_FAR _TownMapText - TX_BLINK - TX_ASM - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd730 - set 6, [hl] - call GBPalWhiteOutWithDelay3 - xor a - ld [hWY], a - inc a - ld [H_AUTOBGTRANSFERENABLED], a - call LoadFontTilePatterns - callba DisplayTownMap - ld hl, wd730 - res 6, [hl] - ld de, TextScriptEnd - push de - ld a, [H_LOADEDROMBANK] - push af - jp CloseTextDisplay - -PokemonStuffText: - TX_FAR _PokemonStuffText - db "@" diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm deleted file mode 100755 index 399c6765..00000000 --- a/engine/hidden_object_functions7.asm +++ /dev/null @@ -1,465 +0,0 @@ -PrintNewBikeText: - call EnableAutoTextBoxDrawing - tx_pre_jump NewBicycleText - -NewBicycleText: - TX_FAR _NewBicycleText - db "@" - -DisplayOakLabLeftPoster: - call EnableAutoTextBoxDrawing - tx_pre_jump PushStartText - -PushStartText: - TX_FAR _PushStartText - db "@" - -DisplayOakLabRightPoster: - call EnableAutoTextBoxDrawing - ld hl, wPokedexOwned - ld b, wPokedexOwnedEnd - wPokedexOwned - call CountSetBits - ld a, [wNumSetBits] - cp 2 - tx_pre_id SaveOptionText - jr c, .ownLessThanTwo - ; own two or more mon - tx_pre_id StrengthsAndWeaknessesText -.ownLessThanTwo - jp PrintPredefTextID - -SaveOptionText: - TX_FAR _SaveOptionText - db "@" - -StrengthsAndWeaknessesText: - TX_FAR _StrengthsAndWeaknessesText - db "@" - -SafariZoneCheck: - CheckEventHL EVENT_IN_SAFARI_ZONE ; if we are not in the Safari Zone, - jr z, SafariZoneGameStillGoing ; don't bother printing game over text - ld a, [wNumSafariBalls] - and a - jr z, SafariZoneGameOver - jr SafariZoneGameStillGoing - -SafariZoneCheckSteps: - ld a, [wSafariSteps] - ld b, a - ld a, [wSafariSteps + 1] - ld c, a - or b - jr z, SafariZoneGameOver - dec bc - ld a, b - ld [wSafariSteps], a - ld a, c - ld [wSafariSteps + 1], a -SafariZoneGameStillGoing: - xor a - ld [wSafariZoneGameOver], a - ret - -SafariZoneGameOver: - call EnableAutoTextBoxDrawing - xor a - ld [wAudioFadeOutControl], a - dec a - call PlaySound - ld c, 0 ; BANK(SFX_Safari_Zone_PA) - ld a, SFX_SAFARI_ZONE_PA - call PlaySound - call WaitForSoundToFinish - - ld a, TEXT_SAFARI_GAME_OVER - ld [hSpriteIndexOrTextID], a - call DisplayTextID - xor a - ld [wPlayerMovingDirection], a - ld a, SAFARI_ZONE_GATE - ld [hWarpDestinationMap], a - ld a, $3 - ld [wDestinationWarpID], a - ld a, $5 - ld [wSafariZoneGateCurScript], a - SetEvent EVENT_SAFARI_GAME_OVER - ld a, 1 - ld [wSafariZoneGameOver], a - ret - -PrintSafariGameOverText: - xor a - ld [wJoyIgnore], a - ld hl, SafariGameOverText - jp PrintText - -SafariGameOverText: - TX_ASM - ld a, [wNumSafariBalls] - and a - jr z, .noMoreSafariBalls - ld hl, TimesUpText - call PrintText -.noMoreSafariBalls - ld hl, GameOverText - call PrintText - jp TextScriptEnd - -TimesUpText: - TX_FAR _TimesUpText - db "@" - -GameOverText: - TX_FAR _GameOverText - db "@" - -PrintCinnabarQuiz: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - call EnableAutoTextBoxDrawing - tx_pre_jump CinnabarGymQuiz - -CinnabarGymQuiz: - TX_ASM - xor a - ld [wOpponentAfterWrongAnswer], a - ld a, [wHiddenObjectFunctionArgument] - push af - and $f - ld [hGymGateIndex], a - pop af - and $f0 - swap a - ld [$ffdc], a - ld hl, CinnabarGymQuizIntroText - call PrintText - ld a, [hGymGateIndex] - dec a - add a - ld d, 0 - ld e, a - ld hl, CinnabarQuizQuestions - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - call PrintText - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - call CinnabarGymQuiz_1ea92 - jp TextScriptEnd - -CinnabarGymQuizIntroText: - TX_FAR _CinnabarGymQuizIntroText - db "@" - -CinnabarQuizQuestions: - dw CinnabarQuizQuestionsText1 - dw CinnabarQuizQuestionsText2 - dw CinnabarQuizQuestionsText3 - dw CinnabarQuizQuestionsText4 - dw CinnabarQuizQuestionsText5 - dw CinnabarQuizQuestionsText6 - -CinnabarQuizQuestionsText1: - TX_FAR _CinnabarQuizQuestionsText1 - db "@" - -CinnabarQuizQuestionsText2: - TX_FAR _CinnabarQuizQuestionsText2 - db "@" - -CinnabarQuizQuestionsText3: - TX_FAR _CinnabarQuizQuestionsText3 - db "@" - -CinnabarQuizQuestionsText4: - TX_FAR _CinnabarQuizQuestionsText4 - db "@" - -CinnabarQuizQuestionsText5: - TX_FAR _CinnabarQuizQuestionsText5 - db "@" - -CinnabarQuizQuestionsText6: - TX_FAR _CinnabarQuizQuestionsText6 - db "@" - -CinnabarGymGateFlagAction: - EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED - predef_jump FlagActionPredef - -CinnabarGymQuiz_1ea92: - call YesNoChoice - ld a, [$ffdc] - ld c, a - ld a, [wCurrentMenuItem] - cp c - jr nz, .wrongAnswer - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ld a, [hGymGateIndex] - ld [$ffe0], a - ld hl, CinnabarGymQuizCorrectText - call PrintText - ld a, [$ffe0] - AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 - ld c, a - ld b, FLAG_SET - call CinnabarGymGateFlagAction - jp UpdateCinnabarGymGateTileBlocks_ -.wrongAnswer - call WaitForSoundToFinish - ld a, SFX_DENIED - call PlaySound - call WaitForSoundToFinish - ld hl, CinnabarGymQuizIncorrectText - call PrintText - ld a, [hGymGateIndex] - add $2 - AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 - ld c, a - ld b, FLAG_TEST - EventFlagAddress hl, EVENT_BEAT_CINNABAR_GYM_TRAINER_0 - predef FlagActionPredef - ld a, c - and a - ret nz - ld a, [hGymGateIndex] - add $2 - ld [wOpponentAfterWrongAnswer], a - ret - -CinnabarGymQuizCorrectText: - TX_SFX_ITEM_1 - TX_FAR _CinnabarGymQuizCorrectText - TX_BLINK - TX_ASM - - ld a, [$ffe0] - AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 - ld c, a - ld b, FLAG_TEST - call CinnabarGymGateFlagAction - ld a, c - and a - jp nz, TextScriptEnd - call WaitForSoundToFinish - ld a, SFX_GO_INSIDE - call PlaySound - call WaitForSoundToFinish - jp TextScriptEnd - -CinnabarGymQuizIncorrectText: - TX_FAR _CinnabarGymQuizIncorrectText - db "@" - -UpdateCinnabarGymGateTileBlocks_: -; Update the overworld map with open floor blocks or locked gate blocks -; depending on event flags. - ld a, 6 - ld [hGymGateIndex], a -.loop - ld a, [hGymGateIndex] - dec a - add a - add a - ld d, 0 - ld e, a - ld hl, CinnabarGymGateCoords - add hl, de - ld a, [hli] - ld b, [hl] - ld c, a - inc hl - ld a, [hl] - ld [wGymGateTileBlock], a - push bc - ld a, [hGymGateIndex] - ld [$ffe0], a - AdjustEventBit EVENT_CINNABAR_GYM_GATE0_UNLOCKED, 0 - ld c, a - ld b, FLAG_TEST - call CinnabarGymGateFlagAction - ld a, c - and a - jr nz, .unlocked - ld a, [wGymGateTileBlock] - jr .next -.unlocked - ld a, $e -.next - pop bc - ld [wNewTileBlockID], a - predef ReplaceTileBlock - ld hl, hGymGateIndex - dec [hl] - jr nz, .loop - ret - -CinnabarGymGateCoords: - ; format: x-coord, y-coord, direction, padding - ; direction: $54 = horizontal gate, $5f = vertical gate - db $09,$03,$54,$00 - db $06,$03,$54,$00 - db $06,$06,$54,$00 - db $03,$08,$5f,$00 - db $02,$06,$54,$00 - db $02,$03,$54,$00 - -PrintMagazinesText: - call EnableAutoTextBoxDrawing - tx_pre MagazinesText - ret - -MagazinesText: - TX_FAR _MagazinesText - db "@" - -BillsHousePC: - call EnableAutoTextBoxDrawing - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - CheckEvent EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING - jr nz, .displayBillsHousePokemonList - CheckEventReuseA EVENT_USED_CELL_SEPARATOR_ON_BILL - jr nz, .displayBillsHouseMonitorText - CheckEventReuseA EVENT_BILL_SAID_USE_CELL_SEPARATOR - jr nz, .doCellSeparator -.displayBillsHouseMonitorText - tx_pre_jump BillsHouseMonitorText -.doCellSeparator - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - tx_pre BillsHouseInitiatedText - ld c, 32 - call DelayFrames - ld a, SFX_TINK - call PlaySound - call WaitForSoundToFinish - ld c, 80 - call DelayFrames - ld a, SFX_SHRINK - call PlaySound - call WaitForSoundToFinish - ld c, 48 - call DelayFrames - ld a, SFX_TINK - call PlaySound - call WaitForSoundToFinish - ld c, 32 - call DelayFrames - ld a, SFX_GET_ITEM_1 - call PlaySound - call WaitForSoundToFinish - call PlayDefaultMusic - SetEvent EVENT_USED_CELL_SEPARATOR_ON_BILL - ret -.displayBillsHousePokemonList - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - tx_pre BillsHousePokemonList - ret - -BillsHouseMonitorText: - TX_FAR _BillsHouseMonitorText - db "@" - -BillsHouseInitiatedText: - TX_FAR _BillsHouseInitiatedText - TX_BLINK - TX_ASM - ld a, $ff - ld [wNewSoundID], a - call PlaySound - ld c, 16 - call DelayFrames - ld a, SFX_SWITCH - call PlaySound - call WaitForSoundToFinish - ld c, 60 - call DelayFrames - jp TextScriptEnd - -BillsHousePokemonList: - TX_ASM - call SaveScreenTilesToBuffer1 - ld hl, BillsHousePokemonListText1 - call PrintText - xor a - ld [wMenuItemOffset], a ; not used - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, 4 - ld [wMaxMenuItem], a - ld a, 2 - ld [wTopMenuItemY], a - ld a, 1 - ld [wTopMenuItemX], a -.billsPokemonLoop - ld hl, wd730 - set 6, [hl] - coord hl, 0, 0 - ld b, 10 - ld c, 9 - call TextBoxBorder - coord hl, 2, 2 - ld de, BillsMonListText - call PlaceString - ld hl, BillsHousePokemonListText2 - call PrintText - call SaveScreenTilesToBuffer2 - call HandleMenuInput - bit 1, a ; pressed b - jr nz, .cancel - ld a, [wCurrentMenuItem] - add EEVEE - cp EEVEE - jr z, .displayPokedex - cp FLAREON - jr z, .displayPokedex - cp JOLTEON - jr z, .displayPokedex - cp VAPOREON - jr z, .displayPokedex - jr .cancel -.displayPokedex - call DisplayPokedex - call LoadScreenTilesFromBuffer2 - jr .billsPokemonLoop -.cancel - ld hl, wd730 - res 6, [hl] - call LoadScreenTilesFromBuffer2 - jp TextScriptEnd - -BillsHousePokemonListText1: - TX_FAR _BillsHousePokemonListText1 - db "@" - -BillsMonListText: - db "EEVEE" - next "FLAREON" - next "JOLTEON" - next "VAPOREON" - next "CANCEL@" - -BillsHousePokemonListText2: - TX_FAR _BillsHousePokemonListText2 - db "@" - -DisplayOakLabEmailText: - ld a, [wSpriteStateData1 + 9] - cp SPRITE_FACING_UP - ret nz - call EnableAutoTextBoxDrawing - tx_pre_jump OakLabEmailText - -OakLabEmailText: - TX_FAR _OakLabEmailText - db "@" diff --git a/engine/get_bag_item_quantity.asm b/engine/items/get_bag_item_quantity.asm similarity index 100% rename from engine/get_bag_item_quantity.asm rename to engine/items/get_bag_item_quantity.asm diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index d07f64eb..ec1cfd0f 100644 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -4,7 +4,7 @@ ; [wcf91] = item ID ; [wItemQuantity] = item quantity ; sets carry flag if successful, unsets carry flag if unsuccessful -AddItemToInventory_: +AddItemToInventory_:: ld a, [wItemQuantity] ; a = item quantity push af push bc @@ -12,10 +12,10 @@ AddItemToInventory_: push hl push hl ld d, PC_ITEM_CAPACITY ; how many items the PC can hold - ld a, wNumBagItems & $FF + ld a, LOW(wNumBagItems) cp l jr nz, .checkIfInventoryFull - ld a, wNumBagItems >> 8 + ld a, HIGH(wNumBagItems) cp h jr nz, .checkIfInventoryFull ; if the destination is the bag @@ -27,7 +27,7 @@ AddItemToInventory_: ld a, [hli] and a jr z, .addNewItem -.loop +.notAtEndOfInventory ld a, [hli] ld b, a ; b = ID of current item in table ld a, [wcf91] ; a = ID of item being added @@ -36,7 +36,7 @@ AddItemToInventory_: inc hl ld a, [hl] cp $ff ; is it the end of the table? - jr nz, .loop + jr nz, .notAtEndOfInventory .addNewItem ; add an item not yet in the inventory pop hl ld a, d @@ -73,7 +73,7 @@ AddItemToInventory_: ; if so, store 99 in the current slot and store the rest in a new slot ld a, 99 ld [hli], a - jp .loop + jp .notAtEndOfInventory .increaseItemQuantityFailed pop hl and a @@ -97,7 +97,7 @@ AddItemToInventory_: ; hl = address of inventory (either wNumBagItems or wNumBoxItems) ; [wWhichPokemon] = index (within the inventory) of the item to remove ; [wItemQuantity] = quantity to remove -RemoveItemFromInventory_: +RemoveItemFromInventory_:: push hl inc hl ld a, [wWhichPokemon] ; index (within the inventory) of the item being removed diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm new file mode 100644 index 00000000..a02c47e6 --- /dev/null +++ b/engine/items/item_effects.asm @@ -0,0 +1,2937 @@ +UseItem_:: + ld a, 1 + ld [wActionResultOrTookBattleTurn], a ; initialise to success value + ld a, [wcf91] ;contains item_ID + cp HM01 + jp nc, ItemUseTMHM + ld hl, ItemUsePtrTable + dec a + add a + ld c, a + ld b, 0 + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + jp hl + +ItemUsePtrTable: +; entries correspond to item ids + dw ItemUseBall ; MASTER_BALL + dw ItemUseBall ; ULTRA_BALL + dw ItemUseBall ; GREAT_BALL + dw ItemUseBall ; POKE_BALL + dw ItemUseTownMap ; TOWN_MAP + dw ItemUseBicycle ; BICYCLE + dw ItemUseSurfboard ; out-of-battle Surf effect + dw ItemUseBall ; SAFARI_BALL + dw ItemUsePokedex ; POKEDEX + dw ItemUseEvoStone ; MOON_STONE + dw ItemUseMedicine ; ANTIDOTE + dw ItemUseMedicine ; BURN_HEAL + dw ItemUseMedicine ; ICE_HEAL + dw ItemUseMedicine ; AWAKENING + dw ItemUseMedicine ; PARLYZ_HEAL + dw ItemUseMedicine ; FULL_RESTORE + dw ItemUseMedicine ; MAX_POTION + dw ItemUseMedicine ; HYPER_POTION + dw ItemUseMedicine ; SUPER_POTION + dw ItemUseMedicine ; POTION + dw ItemUseBait ; BOULDERBADGE + dw ItemUseRock ; CASCADEBADGE + dw UnusableItem ; THUNDERBADGE + dw UnusableItem ; RAINBOWBADGE + dw UnusableItem ; SOULBADGE + dw UnusableItem ; MARSHBADGE + dw UnusableItem ; VOLCANOBADGE + dw UnusableItem ; EARTHBADGE + dw ItemUseEscapeRope ; ESCAPE_ROPE + dw ItemUseRepel ; REPEL + dw UnusableItem ; OLD_AMBER + dw ItemUseEvoStone ; FIRE_STONE + dw ItemUseEvoStone ; THUNDER_STONE + dw ItemUseEvoStone ; WATER_STONE + dw ItemUseVitamin ; HP_UP + dw ItemUseVitamin ; PROTEIN + dw ItemUseVitamin ; IRON + dw ItemUseVitamin ; CARBOS + dw ItemUseVitamin ; CALCIUM + dw ItemUseVitamin ; RARE_CANDY + dw UnusableItem ; DOME_FOSSIL + dw UnusableItem ; HELIX_FOSSIL + dw UnusableItem ; SECRET_KEY + dw UnusableItem + dw UnusableItem ; BIKE_VOUCHER + dw ItemUseXAccuracy ; X_ACCURACY + dw ItemUseEvoStone ; LEAF_STONE + dw ItemUseCardKey ; CARD_KEY + dw UnusableItem ; NUGGET + dw UnusableItem ; ??? PP_UP + dw ItemUsePokedoll ; POKE_DOLL + dw ItemUseMedicine ; FULL_HEAL + dw ItemUseMedicine ; REVIVE + dw ItemUseMedicine ; MAX_REVIVE + dw ItemUseGuardSpec ; GUARD_SPEC + dw ItemUseSuperRepel ; SUPER_REPL + dw ItemUseMaxRepel ; MAX_REPEL + dw ItemUseDireHit ; DIRE_HIT + dw UnusableItem ; COIN + dw ItemUseMedicine ; FRESH_WATER + dw ItemUseMedicine ; SODA_POP + dw ItemUseMedicine ; LEMONADE + dw UnusableItem ; S_S_TICKET + dw UnusableItem ; GOLD_TEETH + dw ItemUseXStat ; X_ATTACK + dw ItemUseXStat ; X_DEFEND + dw ItemUseXStat ; X_SPEED + dw ItemUseXStat ; X_SPECIAL + dw ItemUseCoinCase ; COIN_CASE + dw ItemUseOaksParcel ; OAKS_PARCEL + dw ItemUseItemfinder ; ITEMFINDER + dw UnusableItem ; SILPH_SCOPE + dw ItemUsePokeflute ; POKE_FLUTE + dw UnusableItem ; LIFT_KEY + dw UnusableItem ; EXP_ALL + dw ItemUseOldRod ; OLD_ROD + dw ItemUseGoodRod ; GOOD_ROD + dw ItemUseSuperRod ; SUPER_ROD + dw ItemUsePPUp ; PP_UP (real one) + dw ItemUsePPRestore ; ETHER + dw ItemUsePPRestore ; MAX_ETHER + dw ItemUsePPRestore ; ELIXER + dw ItemUsePPRestore ; MAX_ELIXER + +ItemUseBall: + +; Balls can't be used out of battle. + ld a, [wIsInBattle] + and a + jp z, ItemUseNotTime + +; Balls can't catch trainers' Pokémon. + dec a + jp nz, ThrowBallAtTrainerMon + +; If this is for the old man battle, skip checking if the party & box are full. + ld a, [wBattleType] + dec a + jr z, .canUseBall + + ld a, [wPartyCount] ; is party full? + cp PARTY_LENGTH + jr nz, .canUseBall + ld a, [wNumInBox] ; is box full? + cp MONS_PER_BOX + jp z, BoxFullCannotThrowBall + +.canUseBall + xor a + ld [wCapturedMonSpecies], a + + ld a, [wBattleType] + cp BATTLE_TYPE_SAFARI + jr nz, .skipSafariZoneCode + +.safariZone + ld hl, wNumSafariBalls + dec [hl] ; remove a Safari Ball + +.skipSafariZoneCode + call RunDefaultPaletteCommand + + ld a, $43 ; successful capture value + ld [wPokeBallAnimData], a + + call LoadScreenTilesFromBuffer1 + ld hl, ItemUseText00 + call PrintText + +; If the player is fighting an unidentified ghost, set the value that indicates +; the Pokémon can't be caught and skip the capture calculations. + callfar IsGhostBattle + ld b, $10 ; can't be caught value + jp z, .setAnimData + + ld a, [wBattleType] + dec a + jr nz, .notOldManBattle + +.oldManBattle + ld hl, wGrassRate + ld de, wPlayerName + ld bc, NAME_LENGTH + call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno. glitch) + jp .captured + +.notOldManBattle +; If the player is fighting the ghost Marowak, set the value that indicates the +; Pokémon can't be caught and skip the capture calculations. + ld a, [wCurMap] + cp POKEMON_TOWER_6F + jr nz, .loop + ld a, [wEnemyMonSpecies2] + cp RESTLESS_SOUL + ld b, $10 ; can't be caught value + jp z, .setAnimData + +; Get the first random number. Let it be called Rand1. +; Rand1 must be within a certain range according the kind of ball being thrown. +; The ranges are as follows. +; Poké Ball: [0, 255] +; Great Ball: [0, 200] +; Ultra/Safari Ball: [0, 150] +; Loop until an acceptable number is found. + +.loop + call Random + ld b, a + +; Get the item ID. + ld hl, wcf91 + ld a, [hl] + +; The Master Ball always succeeds. + cp MASTER_BALL + jp z, .captured + +; Anything will do for the basic Poké Ball. + cp POKE_BALL + jr z, .checkForAilments + +; If it's a Great/Ultra/Safari Ball and Rand1 is greater than 200, try again. + ld a, 200 + cp b + jr c, .loop + +; Less than or equal to 200 is good enough for a Great Ball. + ld a, [hl] + cp GREAT_BALL + jr z, .checkForAilments + +; If it's an Ultra/Safari Ball and Rand1 is greater than 150, try again. + ld a, 150 + cp b + jr c, .loop + +.checkForAilments +; Pokémon can be caught more easily with a status ailment. +; Depending on the status ailment, a certain value will be subtracted from +; Rand1. Let this value be called Status. +; The larger Status is, the more easily the Pokémon can be caught. +; no status ailment: Status = 0 +; Burn/Paralysis/Poison: Status = 12 +; Freeze/Sleep: Status = 25 +; If Status is greater than Rand1, the Pokémon will be caught for sure. + ld a, [wEnemyMonStatus] + and a + jr z, .skipAilmentValueSubtraction ; no ailments + and 1 << FRZ | SLP + ld c, 12 + jr z, .notFrozenOrAsleep + ld c, 25 +.notFrozenOrAsleep + ld a, b + sub c + jp c, .captured + ld b, a + +.skipAilmentValueSubtraction + push bc ; save (Rand1 - Status) + +; Calculate MaxHP * 255. + xor a + ldh [hMultiplicand], a + ld hl, wEnemyMonMaxHP + ld a, [hli] + ldh [hMultiplicand + 1], a + ld a, [hl] + ldh [hMultiplicand + 2], a + ld a, 255 + ldh [hMultiplier], a + call Multiply + +; Determine BallFactor. It's 8 for Great Balls and 12 for the others. + ld a, [wcf91] + cp GREAT_BALL + ld a, 12 + jr nz, .skip1 + ld a, 8 + +.skip1 +; Note that the results of all division operations are floored. + +; Calculate (MaxHP * 255) / BallFactor. + ldh [hDivisor], a + ld b, 4 ; number of bytes in dividend + call Divide + +; Divide the enemy's current HP by 4. HP is not supposed to exceed 999 so +; the result should fit in a. If the division results in a quotient of 0, +; change it to 1. + ld hl, wEnemyMonHP + ld a, [hli] + ld b, a + ld a, [hl] + srl b + rr a + srl b + rr a + and a + jr nz, .skip2 + inc a + +.skip2 +; Let W = ((MaxHP * 255) / BallFactor) / max(HP / 4, 1). Calculate W. + ldh [hDivisor], a + ld b, 4 + call Divide + +; If W > 255, store 255 in [hQuotient + 3]. +; Let X = min(W, 255) = [hQuotient + 3]. + ldh a, [hQuotient + 2] + and a + jr z, .skip3 + ld a, 255 + ldh [hQuotient + 3], a + +.skip3 + pop bc ; b = Rand1 - Status + +; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. + ld a, [wEnemyMonActualCatchRate] + cp b + jr c, .failedToCapture + +; If W > 255, the ball captures the Pokémon. + ldh a, [hQuotient + 2] + and a + jr nz, .captured + + call Random ; Let this random number be called Rand2. + +; If Rand2 > X, the ball fails to capture the Pokémon. + ld b, a + ldh a, [hQuotient + 3] + cp b + jr c, .failedToCapture + +.captured + jr .skipShakeCalculations + +.failedToCapture + ldh a, [hQuotient + 3] + ld [wPokeBallCaptureCalcTemp], a ; Save X. + +; Calculate CatchRate * 100. + xor a + ldh [hMultiplicand], a + ldh [hMultiplicand + 1], a + ld a, [wEnemyMonActualCatchRate] + ldh [hMultiplicand + 2], a + ld a, 100 + ldh [hMultiplier], a + call Multiply + +; Determine BallFactor2. +; Poké Ball: BallFactor2 = 255 +; Great Ball: BallFactor2 = 200 +; Ultra/Safari Ball: BallFactor2 = 150 + ld a, [wcf91] + ld b, 255 + cp POKE_BALL + jr z, .skip4 + ld b, 200 + cp GREAT_BALL + jr z, .skip4 + ld b, 150 + cp ULTRA_BALL + jr z, .skip4 + +.skip4 +; Let Y = (CatchRate * 100) / BallFactor2. Calculate Y. + ld a, b + ldh [hDivisor], a + ld b, 4 + call Divide + +; If Y > 255, there are 3 shakes. +; Note that this shouldn't be possible. +; The maximum value of Y is (255 * 100) / 150 = 170. + ldh a, [hQuotient + 2] + and a + ld b, $63 ; 3 shakes + jr nz, .setAnimData + +; Calculate X * Y. + ld a, [wPokeBallCaptureCalcTemp] + ldh [hMultiplier], a + call Multiply + +; Calculate (X * Y) / 255. + ld a, 255 + ldh [hDivisor], a + ld b, 4 + call Divide + +; Determine Status2. +; no status ailment: Status2 = 0 +; Burn/Paralysis/Poison: Status2 = 5 +; Freeze/Sleep: Status2 = 10 + ld a, [wEnemyMonStatus] + and a + jr z, .skip5 + and 1 << FRZ | SLP + ld b, 5 + jr z, .addAilmentValue + ld b, 10 + +.addAilmentValue +; If the Pokémon has a status ailment, add Status2. + ldh a, [hQuotient + 3] + add b + ldh [hQuotient + 3], a + +.skip5 +; Finally determine the number of shakes. +; Let Z = ((X * Y) / 255) + Status2 = [hQuotient + 3]. +; The number of shakes depend on the range Z is in. +; 0 ≤ Z < 10: 0 shakes (the ball misses) +; 10 ≤ Z < 30: 1 shake +; 30 ≤ Z < 70: 2 shakes +; 70 ≤ Z: 3 shakes + ldh a, [hQuotient + 3] + cp 10 + ld b, $20 + jr c, .setAnimData + cp 30 + ld b, $61 + jr c, .setAnimData + cp 70 + ld b, $62 + jr c, .setAnimData + ld b, $63 + +.setAnimData + ld a, b + ld [wPokeBallAnimData], a + +.skipShakeCalculations + ld c, 20 + call DelayFrames + +; Do the animation. + ld a, TOSS_ANIM + ld [wAnimationID], a + xor a + ldh [hWhoseTurn], a + ld [wAnimationType], a + ld [wDamageMultipliers], a + ld a, [wWhichPokemon] + push af + ld a, [wcf91] + push af + predef MoveAnimation + pop af + ld [wcf91], a + pop af + ld [wWhichPokemon], a + +; Determine the message to display from the animation. + ld a, [wPokeBallAnimData] + cp $10 + ld hl, ItemUseBallText00 + jp z, .printMessage + cp $20 + ld hl, ItemUseBallText01 + jp z, .printMessage + cp $61 + ld hl, ItemUseBallText02 + jp z, .printMessage + cp $62 + ld hl, ItemUseBallText03 + jp z, .printMessage + cp $63 + ld hl, ItemUseBallText04 + jp z, .printMessage + +; Save current HP. + ld hl, wEnemyMonHP + ld a, [hli] + push af + ld a, [hli] + push af + +; Save status ailment. + inc hl + ld a, [hl] + push af + + push hl + +; If the Pokémon is transformed, the Pokémon is assumed to be a Ditto. +; This is a bug because a wild Pokémon could have used Transform via +; Mirror Move even though the only wild Pokémon that knows Transform is Ditto. + ld hl, wEnemyBattleStatus3 + bit TRANSFORMED, [hl] + jr z, .notTransformed + ld a, DITTO + ld [wEnemyMonSpecies2], a + jr .skip6 + +.notTransformed +; If the Pokémon is not transformed, set the transformed bit and copy the +; DVs to wTransformedEnemyMonOriginalDVs so that LoadEnemyMonData won't generate +; new DVs. + set TRANSFORMED, [hl] + ld hl, wTransformedEnemyMonOriginalDVs + ld a, [wEnemyMonDVs] + ld [hli], a + ld a, [wEnemyMonDVs + 1] + ld [hl], a + +.skip6 + ld a, [wcf91] + push af + ld a, [wEnemyMonSpecies2] + ld [wcf91], a + ld a, [wEnemyMonLevel] + ld [wCurEnemyLVL], a + callfar LoadEnemyMonData + pop af + ld [wcf91], a + pop hl + pop af + ld [hld], a + dec hl + pop af + ld [hld], a + pop af + ld [hl], a + ld a, [wEnemyMonSpecies] + ld [wCapturedMonSpecies], a + ld [wcf91], a + ld [wd11e], a + ld a, [wBattleType] + dec a ; is this the old man battle? + jr z, .oldManCaughtMon ; if so, don't give the player the caught Pokémon + + ld hl, ItemUseBallText05 + call PrintText + +; Add the caught Pokémon to the Pokédex. + predef IndexToPokedex + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_TEST + ld hl, wPokedexOwned + predef FlagActionPredef + ld a, c + push af + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_SET + predef FlagActionPredef + pop af + + and a ; was the Pokémon already in the Pokédex? + jr nz, .skipShowingPokedexData ; if so, don't show the Pokédex data + + ld hl, ItemUseBallText06 + call PrintText + call ClearSprites + ld a, [wEnemyMonSpecies] + ld [wd11e], a + predef ShowPokedexData + +.skipShowingPokedexData + ld a, [wPartyCount] + cp PARTY_LENGTH ; is party full? + jr z, .sendToBox + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + call ClearSprites + call AddPartyMon + jr .done + +.sendToBox + call ClearSprites + call SendNewMonToBox + ld hl, ItemUseBallText07 + CheckEvent EVENT_MET_BILL + jr nz, .printTransferredToPCText + ld hl, ItemUseBallText08 +.printTransferredToPCText + call PrintText + jr .done + +.oldManCaughtMon + ld hl, ItemUseBallText05 + +.printMessage + call PrintText + call ClearSprites + +.done + ld a, [wBattleType] + and a ; is this the old man battle? + ret nz ; if so, don't remove a ball from the bag + +; Remove a ball from the bag. + ld hl, wNumBagItems + inc a + ld [wItemQuantity], a + jp RemoveItemFromInventory + +ItemUseBallText00: +;"It dodged the thrown ball!" +;"This pokemon can't be caught" + text_far _ItemUseBallText00 + text_end +ItemUseBallText01: +;"You missed the pokemon!" + text_far _ItemUseBallText01 + text_end +ItemUseBallText02: +;"Darn! The pokemon broke free!" + text_far _ItemUseBallText02 + text_end +ItemUseBallText03: +;"Aww! It appeared to be caught!" + text_far _ItemUseBallText03 + text_end +ItemUseBallText04: +;"Shoot! It was so close too!" + text_far _ItemUseBallText04 + text_end +ItemUseBallText05: +;"All right! {MonName} was caught!" +;play sound + text_far _ItemUseBallText05 + sound_caught_mon + text_promptbutton + text_end +ItemUseBallText07: +;"X was transferred to Bill's PC" + text_far _ItemUseBallText07 + text_end +ItemUseBallText08: +;"X was transferred to someone's PC" + text_far _ItemUseBallText08 + text_end + +ItemUseBallText06: +;"New DEX data will be added..." +;play sound + text_far _ItemUseBallText06 + sound_dex_page_added + text_promptbutton + text_end + +ItemUseTownMap: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + farjp DisplayTownMap + +ItemUseBicycle: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + ld a, [wWalkBikeSurfState] + ld [wWalkBikeSurfStateCopy], a + cp 2 ; is the player surfing? + jp z, ItemUseNotTime + dec a ; is player already bicycling? + jr nz, .tryToGetOnBike +.getOffBike + call ItemUseReloadOverworldData + xor a + ld [wWalkBikeSurfState], a ; change player state to walking + call PlayDefaultMusic ; play walking music + ld hl, GotOffBicycleText + jr .printText +.tryToGetOnBike + call IsBikeRidingAllowed + jp nc, NoCyclingAllowedHere + call ItemUseReloadOverworldData + xor a ; no keys pressed + ldh [hJoyHeld], a ; current joypad state + inc a + ld [wWalkBikeSurfState], a ; change player state to bicycling + ld hl, GotOnBicycleText + call PlayDefaultMusic ; play bike riding music +.printText + jp PrintText + +; used for Surf out-of-battle effect +ItemUseSurfboard: + ld a, [wWalkBikeSurfState] + ld [wWalkBikeSurfStateCopy], a + cp 2 ; is the player already surfing? + jr z, .tryToStopSurfing +.tryToSurf + call IsNextTileShoreOrWater + jp c, SurfingAttemptFailed + ld hl, TilePairCollisionsWater + call CheckForTilePairCollisions + jp c, SurfingAttemptFailed +.surf + call .makePlayerMoveForward + ld hl, wd730 + set 7, [hl] + ld a, 2 + ld [wWalkBikeSurfState], a ; change player state to surfing + call PlayDefaultMusic ; play surfing music + ld hl, SurfingGotOnText + jp PrintText +.tryToStopSurfing + xor a + ldh [hSpriteIndexOrTextID], a + ld d, 16 ; talking range in pixels (normal range) + call IsSpriteInFrontOfPlayer2 + res 7, [hl] + ldh a, [hSpriteIndexOrTextID] + and a ; is there a sprite in the way? + jr nz, .cannotStopSurfing + ld hl, TilePairCollisionsWater + call CheckForTilePairCollisions + jr c, .cannotStopSurfing + ld hl, wTilesetCollisionPtr ; pointer to list of passable tiles + ld a, [hli] + ld h, [hl] + ld l, a ; hl now points to passable tiles + ld a, [wTileInFrontOfPlayer] ; tile in front of the player + ld b, a +.passableTileLoop + ld a, [hli] + cp b + jr z, .stopSurfing + cp $ff + jr nz, .passableTileLoop +.cannotStopSurfing + ld hl, SurfingNoPlaceToGetOffText + jp PrintText +.stopSurfing + call .makePlayerMoveForward + ld hl, wd730 + set 7, [hl] + xor a + ld [wWalkBikeSurfState], a ; change player state to walking + dec a + ld [wJoyIgnore], a + call PlayDefaultMusic ; play walking music + jp LoadWalkingPlayerSpriteGraphics +; uses a simulated button press to make the player move forward +.makePlayerMoveForward + ld a, [wPlayerDirection] ; direction the player is going + bit PLAYER_DIR_BIT_UP, a + ld b, D_UP + jr nz, .storeSimulatedButtonPress + bit PLAYER_DIR_BIT_DOWN, a + ld b, D_DOWN + jr nz, .storeSimulatedButtonPress + bit PLAYER_DIR_BIT_LEFT, a + ld b, D_LEFT + jr nz, .storeSimulatedButtonPress + ld b, D_RIGHT +.storeSimulatedButtonPress + ld a, b + ld [wSimulatedJoypadStatesEnd], a + xor a + ld [wWastedByteCD39], a + inc a + ld [wSimulatedJoypadStatesIndex], a + ret + +SurfingGotOnText: + text_far _SurfingGotOnText + text_end + +SurfingNoPlaceToGetOffText: + text_far _SurfingNoPlaceToGetOffText + text_end + +ItemUsePokedex: + predef_jump ShowPokedexMenu + +ItemUseEvoStone: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + ld a, [wWhichPokemon] + push af + ld a, [wcf91] + ld [wEvoStoneItemID], a + push af + ld a, EVO_STONE_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a + ld a, $ff + ld [wUpdateSpritesEnabled], a + call DisplayPartyMenu + pop bc + jr c, .canceledItemUse + ld a, b + ld [wcf91], a + ld a, $01 + ld [wForceEvolution], a + ld a, SFX_HEAL_AILMENT + call PlaySoundWaitForCurrent + call WaitForSoundToFinish + callfar TryEvolvingMon ; try to evolve pokemon + ld a, [wEvolutionOccurred] + and a + jr z, .noEffect + pop af + ld [wWhichPokemon], a + ld hl, wNumBagItems + ld a, 1 ; remove 1 stone + ld [wItemQuantity], a + jp RemoveItemFromInventory +.noEffect + call ItemUseNoEffect +.canceledItemUse + xor a + ld [wActionResultOrTookBattleTurn], a ; item not used + pop af + ret + +ItemUseVitamin: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + +ItemUseMedicine: + ld a, [wPartyCount] + and a + jp z, .emptyParty + ld a, [wWhichPokemon] + push af + ld a, [wcf91] + push af + ld a, USE_ITEM_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld a, [wPseudoItemID] + and a ; using Softboiled? + jr z, .notUsingSoftboiled +; if using softboiled + call GoBackToPartyMenu + jr .getPartyMonDataAddress +.emptyParty + ld hl, .emptyPartyText + xor a + ld [wActionResultOrTookBattleTurn], a ; item use failed + jp PrintText +.emptyPartyText + text "You don't have" + line "any #MON!" + prompt +.notUsingSoftboiled + call DisplayPartyMenu +.getPartyMonDataAddress + jp c, .canceledItemUse + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wWhichPokemon] + call AddNTimes + ld a, [wWhichPokemon] + ld [wUsedItemOnWhichPokemon], a + ld d, a + ld a, [wcf91] + ld e, a + ld [wd0b5], a + pop af + ld [wcf91], a + pop af + ld [wWhichPokemon], a + ld a, [wPseudoItemID] + and a ; using Softboiled? + jr z, .checkItemType +; if using softboiled + ld a, [wWhichPokemon] + cp d ; is the pokemon trying to use softboiled on itself? + jr z, ItemUseMedicine ; if so, force another choice +.checkItemType + ld a, [wcf91] + cp REVIVE + jr nc, .healHP ; if it's a Revive or Max Revive + cp FULL_HEAL + jr z, .cureStatusAilment ; if it's a Full Heal + cp HP_UP + jp nc, .useVitamin ; if it's a vitamin or Rare Candy + cp FULL_RESTORE + jr nc, .healHP ; if it's a Full Restore or one of the potions +; fall through if it's one of the status-specific healing items +.cureStatusAilment + ld bc, wPartyMon1Status - wPartyMon1 + add hl, bc ; hl now points to status + ld a, [wcf91] + lb bc, ANTIDOTE_MSG, 1 << PSN + cp ANTIDOTE + jr z, .checkMonStatus + lb bc, BURN_HEAL_MSG, 1 << BRN + cp BURN_HEAL + jr z, .checkMonStatus + lb bc, ICE_HEAL_MSG, 1 << FRZ + cp ICE_HEAL + jr z, .checkMonStatus + lb bc, AWAKENING_MSG, SLP + cp AWAKENING + jr z, .checkMonStatus + lb bc, PARALYZ_HEAL_MSG, 1 << PAR + cp PARLYZ_HEAL + jr z, .checkMonStatus + lb bc, FULL_HEAL_MSG, $ff ; Full Heal +.checkMonStatus + ld a, [hl] ; pokemon's status + and c ; does the pokemon have a status ailment the item can cure? + jp z, .healingItemNoEffect +; if the pokemon has a status the item can heal + xor a + ld [hl], a ; remove the status ailment in the party data + ld a, b + ld [wPartyMenuTypeOrMessageID], a ; the message to display for the item used + ld a, [wPlayerMonNumber] + cp d ; is pokemon the item was used on active in battle? + jp nz, .doneHealing +; if it is active in battle + xor a + ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data + push hl + ld hl, wPlayerBattleStatus3 + res BADLY_POISONED, [hl] ; heal Toxic status + pop hl + ld bc, wPartyMon1Stats - wPartyMon1Status + add hl, bc ; hl now points to party stats + ld de, wBattleMonStats + ld bc, NUM_STATS * 2 + call CopyData ; copy party stats to in-battle stat data + predef DoubleOrHalveSelectedStats + jp .doneHealing +.healHP + inc hl ; hl = address of current HP + ld a, [hli] + ld b, a + ld [wHPBarOldHP+1], a + ld a, [hl] + ld c, a + ld [wHPBarOldHP], a ; current HP stored at wHPBarOldHP (2 bytes, big-endian) + or b + jr nz, .notFainted +.fainted + ld a, [wcf91] + cp REVIVE + jr z, .updateInBattleFaintedData + cp MAX_REVIVE + jr z, .updateInBattleFaintedData + jp .healingItemNoEffect +.updateInBattleFaintedData + ld a, [wIsInBattle] + and a + jr z, .compareCurrentHPToMaxHP + push hl + push de + push bc + ld a, [wUsedItemOnWhichPokemon] + ld c, a + ld hl, wPartyFoughtCurrentEnemyFlags + ld b, FLAG_TEST + predef FlagActionPredef + ld a, c + and a + jr z, .next + ld a, [wUsedItemOnWhichPokemon] + ld c, a + ld hl, wPartyGainExpFlags + ld b, FLAG_SET + predef FlagActionPredef +.next + pop bc + pop de + pop hl + jr .compareCurrentHPToMaxHP +.notFainted + ld a, [wcf91] + cp REVIVE + jp z, .healingItemNoEffect + cp MAX_REVIVE + jp z, .healingItemNoEffect +.compareCurrentHPToMaxHP + push hl + push bc + ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) + add hl, bc ; hl now points to max HP + pop bc + ld a, [hli] + cp b + jr nz, .skipComparingLSB ; no need to compare the LSB's if the MSB's don't match + ld a, [hl] + cp c +.skipComparingLSB + pop hl + jr nz, .notFullHP +.fullHP ; if the pokemon's current HP equals its max HP + ld a, [wcf91] + cp FULL_RESTORE + jp nz, .healingItemNoEffect + inc hl + inc hl + ld a, [hld] ; status ailment + and a ; does the pokemon have a status ailment? + jp z, .healingItemNoEffect + ld a, FULL_HEAL + ld [wcf91], a + dec hl + dec hl + dec hl + jp .cureStatusAilment +.notFullHP ; if the pokemon's current HP doesn't equal its max HP + xor a + ld [wDanger], a ;disable low health alarm + ld [wChannelSoundIDs + Ch5], a + push hl + push de + ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) + add hl, bc ; hl now points to max HP + ld a, [hli] + ld [wHPBarMaxHP+1], a + ld a, [hl] + ld [wHPBarMaxHP], a ; max HP stored at wHPBarMaxHP (2 bytes, big-endian) + ld a, [wPseudoItemID] + and a ; using Softboiled? + jp z, .notUsingSoftboiled2 +; if using softboiled + ld hl, wHPBarMaxHP + ld a, [hli] + push af + ld a, [hli] + push af + ld a, [hli] + push af + ld a, [hl] + push af + ld hl, wPartyMon1MaxHP + ld a, [wWhichPokemon] + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld a, [hli] + ld [wHPBarMaxHP + 1], a + ldh [hDividend], a + ld a, [hl] + ld [wHPBarMaxHP], a + ldh [hDividend + 1], a + ld a, 5 + ldh [hDivisor], a + ld b, 2 ; number of bytes + call Divide ; get 1/5 of max HP of pokemon that used Softboiled + ld bc, (wPartyMon1HP + 1) - (wPartyMon1MaxHP + 1) + add hl, bc ; hl now points to LSB of current HP of pokemon that used Softboiled +; subtract 1/5 of max HP from current HP of pokemon that used Softboiled + ldh a, [hQuotient + 3] + push af + ld b, a + ld a, [hl] + ld [wHPBarOldHP], a + sub b + ld [hld], a + ld [wHPBarNewHP], a + ldh a, [hQuotient + 2] + ld b, a + ld a, [hl] + ld [wHPBarOldHP+1], a + sbc b + ld [hl], a + ld [wHPBarNewHP+1], a + hlcoord 4, 1 + ld a, [wWhichPokemon] + ld bc, 2 * SCREEN_WIDTH + call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled + ld a, SFX_HEAL_HP + call PlaySoundWaitForCurrent + ldh a, [hUILayoutFlags] + set 0, a + ldh [hUILayoutFlags], a + ld a, $02 + ld [wHPBarType], a + predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled + ldh a, [hUILayoutFlags] + res 0, a + ldh [hUILayoutFlags], a + pop af + ld b, a ; store heal amount (1/5 of max HP) + ld hl, wHPBarOldHP + 1 + pop af + ld [hld], a + pop af + ld [hld], a + pop af + ld [hld], a + pop af + ld [hl], a + jr .addHealAmount +.notUsingSoftboiled2 + ld a, [wcf91] + cp SODA_POP + ld b, 60 ; Soda Pop heal amount + jr z, .addHealAmount + ld b, 80 ; Lemonade heal amount + jr nc, .addHealAmount + cp FRESH_WATER + ld b, 50 ; Fresh Water heal amount + jr z, .addHealAmount + cp SUPER_POTION + ld b, 200 ; Hyper Potion heal amount + jr c, .addHealAmount + ld b, 50 ; Super Potion heal amount + jr z, .addHealAmount + ld b, 20 ; Potion heal amount +.addHealAmount + pop de + pop hl + ld a, [hl] + add b + ld [hld], a + ld [wHPBarNewHP], a + ld a, [hl] + ld [wHPBarNewHP+1], a + jr nc, .noCarry + inc [hl] + ld a, [hl] + ld [wHPBarNewHP + 1], a +.noCarry + push de + inc hl + ld d, h + ld e, l ; de now points to current HP + ld hl, (wPartyMon1MaxHP + 1) - (wPartyMon1HP + 1) + add hl, de ; hl now points to max HP + ld a, [wcf91] + cp REVIVE + jr z, .setCurrentHPToHalfMaxHP + ld a, [hld] + ld b, a + ld a, [de] + sub b + dec de + ld b, [hl] + ld a, [de] + sbc b + jr nc, .setCurrentHPToMaxHp ; if current HP exceeds max HP after healing + ld a, [wcf91] + cp HYPER_POTION + jr c, .setCurrentHPToMaxHp ; if using a Full Restore or Max Potion + cp MAX_REVIVE + jr z, .setCurrentHPToMaxHp ; if using a Max Revive + jr .updateInBattleData +.setCurrentHPToHalfMaxHP + dec hl + dec de + ld a, [hli] + srl a + ld [de], a + ld [wHPBarNewHP+1], a + ld a, [hl] + rr a + inc de + ld [de], a + ld [wHPBarNewHP], a + dec de + jr .doneHealingPartyHP +.setCurrentHPToMaxHp + ld a, [hli] + ld [de], a + ld [wHPBarNewHP+1], a + inc de + ld a, [hl] + ld [de], a + ld [wHPBarNewHP], a + dec de +.doneHealingPartyHP ; done updating the pokemon's current HP in the party data structure + ld a, [wcf91] + cp FULL_RESTORE + jr nz, .updateInBattleData + ld bc, wPartyMon1Status - (wPartyMon1MaxHP + 1) + add hl, bc + xor a + ld [hl], a ; remove the status ailment in the party data +.updateInBattleData + ld h, d + ld l, e + pop de + ld a, [wPlayerMonNumber] + cp d ; is pokemon the item was used on active in battle? + jr nz, .calculateHPBarCoords +; copy party HP to in-battle HP + ld a, [hli] + ld [wBattleMonHP], a + ld a, [hld] + ld [wBattleMonHP + 1], a + ld a, [wcf91] + cp FULL_RESTORE + jr nz, .calculateHPBarCoords + xor a + ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data +.calculateHPBarCoords + ld hl, wOAMBuffer + $90 + ld bc, 2 * SCREEN_WIDTH + inc d +.calculateHPBarCoordsLoop + add hl, bc + dec d + jr nz, .calculateHPBarCoordsLoop + jr .doneHealing +.healingItemNoEffect + call ItemUseNoEffect + jp .done +.doneHealing + ld a, [wPseudoItemID] + and a ; using Softboiled? + jr nz, .skipRemovingItem ; no item to remove if using Softboiled + push hl + call RemoveUsedItem + pop hl +.skipRemovingItem + ld a, [wcf91] + cp FULL_RESTORE + jr c, .playStatusAilmentCuringSound + cp FULL_HEAL + jr z, .playStatusAilmentCuringSound + ld a, SFX_HEAL_HP + call PlaySoundWaitForCurrent + ldh a, [hUILayoutFlags] + set 0, a + ldh [hUILayoutFlags], a + ld a, $02 + ld [wHPBarType], a + predef UpdateHPBar2 ; animate the HP bar lengthening + ldh a, [hUILayoutFlags] + res 0, a + ldh [hUILayoutFlags], a + ld a, REVIVE_MSG + ld [wPartyMenuTypeOrMessageID], a + ld a, [wcf91] + cp REVIVE + jr z, .showHealingItemMessage + cp MAX_REVIVE + jr z, .showHealingItemMessage + ld a, POTION_MSG + ld [wPartyMenuTypeOrMessageID], a + jr .showHealingItemMessage +.playStatusAilmentCuringSound + ld a, SFX_HEAL_AILMENT + call PlaySoundWaitForCurrent +.showHealingItemMessage + xor a + ldh [hAutoBGTransferEnabled], a + call ClearScreen + dec a + ld [wUpdateSpritesEnabled], a + call RedrawPartyMenu ; redraws the party menu and displays the message + ld a, 1 + ldh [hAutoBGTransferEnabled], a + ld c, 50 + call DelayFrames + call WaitForTextScrollButtonPress + jr .done +.canceledItemUse + xor a + ld [wActionResultOrTookBattleTurn], a ; item use failed + pop af + pop af +.done + ld a, [wPseudoItemID] + and a ; using Softboiled? + ret nz ; if so, return + call GBPalWhiteOut + call z, RunDefaultPaletteCommand + ld a, [wIsInBattle] + and a + ret nz + jp ReloadMapData +.useVitamin + push hl + ld a, [hl] + ld [wd0b5], a + ld [wd11e], a + ld bc, wPartyMon1Level - wPartyMon1 + add hl, bc ; hl now points to level + ld a, [hl] ; a = level + ld [wCurEnemyLVL], a ; store level + call GetMonHeader + push de + ld a, d + ld hl, wPartyMonNicks + call GetPartyMonName + pop de + pop hl + ld a, [wcf91] + cp RARE_CANDY + jp z, .useRareCandy + push hl + sub HP_UP + add a + ld bc, wPartyMon1HPExp - wPartyMon1 + add hl, bc + add l + ld l, a + jr nc, .noCarry2 + inc h +.noCarry2 + ld a, 10 + ld b, a + ld a, [hl] ; a = MSB of stat experience of the appropriate stat + cp 100 ; is there already at least 25600 (256 * 100) stat experience? + jr nc, .vitaminNoEffect ; if so, vitamins can't add any more + add b ; add 2560 (256 * 10) stat experience + jr nc, .noCarry3 ; a carry should be impossible here, so this will always jump + ld a, 255 +.noCarry3 + ld [hl], a + pop hl + call .recalculateStats + ld hl, VitaminText + ld a, [wcf91] + sub HP_UP - 1 + ld c, a +.statNameLoop ; loop to get the address of the name of the stat the vitamin increases + dec c + jr z, .gotStatName +.statNameInnerLoop + ld a, [hli] + ld b, a + ld a, $50 + cp b + jr nz, .statNameInnerLoop + jr .statNameLoop +.gotStatName + ld de, wcf4b + ld bc, 10 + call CopyData ; copy the stat's name to wcf4b + ld a, SFX_HEAL_AILMENT + call PlaySound + ld hl, VitaminStatRoseText + call PrintText + jp RemoveUsedItem +.vitaminNoEffect + pop hl + ld hl, VitaminNoEffectText + call PrintText + jp GBPalWhiteOut +.recalculateStats + ld bc, wPartyMon1Stats - wPartyMon1 + add hl, bc + ld d, h + ld e, l ; de now points to stats + ld bc, (wPartyMon1Exp + 2) - wPartyMon1Stats + add hl, bc ; hl now points to LSB of experience + ld b, 1 + jp CalcStats ; recalculate stats +.useRareCandy + push hl + ld bc, wPartyMon1Level - wPartyMon1 + add hl, bc ; hl now points to level + ld a, [hl] ; a = level + cp MAX_LEVEL + jr z, .vitaminNoEffect ; can't raise level above 100 + inc a + ld [hl], a ; store incremented level + ld [wCurEnemyLVL], a + push hl + push de + ld d, a + callfar CalcExperience ; calculate experience for next level and store it at hExperience + pop de + pop hl + ld bc, wPartyMon1Exp - wPartyMon1Level + add hl, bc ; hl now points to MSB of experience +; update experience to minimum for new level + ldh a, [hExperience] + ld [hli], a + ldh a, [hExperience + 1] + ld [hli], a + ldh a, [hExperience + 2] + ld [hl], a + pop hl + ld a, [wWhichPokemon] + push af + ld a, [wcf91] + push af + push de + push hl + ld bc, wPartyMon1MaxHP - wPartyMon1 + add hl, bc ; hl now points to MSB of max HP + ld a, [hli] + ld b, a + ld c, [hl] + pop hl + push bc + push hl + call .recalculateStats + pop hl + ld bc, (wPartyMon1MaxHP + 1) - wPartyMon1 + add hl, bc ; hl now points to LSB of max HP + pop bc + ld a, [hld] + sub c + ld c, a + ld a, [hl] + sbc b + ld b, a ; bc = the amount of max HP gained from leveling up +; add the amount gained to the current HP + ld de, (wPartyMon1HP + 1) - wPartyMon1MaxHP + add hl, de ; hl now points to LSB of current HP + ld a, [hl] + add c + ld [hld], a + ld a, [hl] + adc b + ld [hl], a + ld a, RARE_CANDY_MSG + ld [wPartyMenuTypeOrMessageID], a + call RedrawPartyMenu + pop de + ld a, d + ld [wWhichPokemon], a + ld a, e + ld [wd11e], a + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + call LoadMonData + ld d, $01 + callfar PrintStatsBox ; display new stats text box + call WaitForTextScrollButtonPress ; wait for button press + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + predef LearnMoveFromLevelUp ; learn level up move, if any + xor a + ld [wForceEvolution], a + callfar TryEvolvingMon ; evolve pokemon, if appropriate + ld a, $01 + ld [wUpdateSpritesEnabled], a + pop af + ld [wcf91], a + pop af + ld [wWhichPokemon], a + jp RemoveUsedItem + +VitaminStatRoseText: + text_far _VitaminStatRoseText + text_end + +VitaminNoEffectText: + text_far _VitaminNoEffectText + text_end + +VitaminText: + db "HEALTH@" + db "ATTACK@" + db "DEFENSE@" + db "SPEED@" + db "SPECIAL@" + +ItemUseBait: + ld hl, ThrewBaitText + call PrintText + ld hl, wEnemyMonActualCatchRate ; catch rate + srl [hl] ; halve catch rate + ld a, BAIT_ANIM + ld hl, wSafariBaitFactor ; bait factor + ld de, wSafariEscapeFactor ; escape factor + jr BaitRockCommon + +ItemUseRock: + ld hl, ThrewRockText + call PrintText + ld hl, wEnemyMonActualCatchRate ; catch rate + ld a, [hl] + add a ; double catch rate + jr nc, .noCarry + ld a, $ff +.noCarry + ld [hl], a + ld a, ROCK_ANIM + ld hl, wSafariEscapeFactor ; escape factor + ld de, wSafariBaitFactor ; bait factor + +BaitRockCommon: + ld [wAnimationID], a + xor a + ld [wAnimationType], a + ldh [hWhoseTurn], a + ld [de], a ; zero escape factor (for bait), zero bait factor (for rock) +.randomLoop ; loop until a random number less than 5 is generated + call Random + and 7 + cp 5 + jr nc, .randomLoop + inc a ; increment the random number, giving a range from 1 to 5 inclusive + ld b, a + ld a, [hl] + add b ; increase bait factor (for bait), increase escape factor (for rock) + jr nc, .noCarry + ld a, $ff +.noCarry + ld [hl], a + predef MoveAnimation ; do animation + ld c, 70 + jp DelayFrames + +ThrewBaitText: + text_far _ThrewBaitText + text_end + +ThrewRockText: + text_far _ThrewRockText + text_end + +; also used for Dig out-of-battle effect +ItemUseEscapeRope: + ld a, [wIsInBattle] + and a + jr nz, .notUsable + ld a, [wCurMap] + cp AGATHAS_ROOM + jr z, .notUsable + ld a, [wCurMapTileset] + ld b, a + ld hl, EscapeRopeTilesets +.loop + ld a, [hli] + cp $ff + jr z, .notUsable + cp b + jr nz, .loop + ld hl, wd732 + set 3, [hl] + set 6, [hl] + ld hl, wd72e + res 4, [hl] + ResetEvent EVENT_IN_SAFARI_ZONE + xor a + ld [wNumSafariBalls], a + ld [wSafariZoneGateCurScript], a + inc a + ld [wEscapedFromBattle], a + ld [wActionResultOrTookBattleTurn], a ; item used + ld a, [wPseudoItemID] + and a ; using Dig? + ret nz ; if so, return + call ItemUseReloadOverworldData + ld c, 30 + call DelayFrames + jp RemoveUsedItem +.notUsable + jp ItemUseNotTime + +INCLUDE "data/tilesets/escape_rope_tilesets.asm" + +ItemUseRepel: + ld b, 100 + +ItemUseRepelCommon: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + ld a, b + ld [wRepelRemainingSteps], a + jp PrintItemUseTextAndRemoveItem + +; handles X Accuracy item +ItemUseXAccuracy: + ld a, [wIsInBattle] + and a + jp z, ItemUseNotTime + ld hl, wPlayerBattleStatus2 + set USING_X_ACCURACY, [hl] ; X Accuracy bit + jp PrintItemUseTextAndRemoveItem + +; This function is bugged and never works. It always jumps to ItemUseNotTime. +; The Card Key is handled in a different way. +ItemUseCardKey: + xor a + ld [wUnusedD71F], a + call GetTileAndCoordsInFrontOfPlayer + ld a, [GetTileAndCoordsInFrontOfPlayer] + cp $18 + jr nz, .next0 + ld hl, CardKeyTable1 + jr .next1 +.next0 + cp $24 + jr nz, .next2 + ld hl, CardKeyTable2 + jr .next1 +.next2 + cp $5e + jp nz, ItemUseNotTime + ld hl, CardKeyTable3 +.next1 + ld a, [wCurMap] + ld b, a +.loop + ld a, [hli] + cp -1 + jp z, ItemUseNotTime + cp b + jr nz, .nextEntry1 + ld a, [hli] + cp d + jr nz, .nextEntry2 + ld a, [hli] + cp e + jr nz, .nextEntry3 + ld a, [hl] + ld [wUnusedD71F], a + jr .done +.nextEntry1 + inc hl +.nextEntry2 + inc hl +.nextEntry3 + inc hl + jr .loop +.done + ld hl, ItemUseText00 + call PrintText + ld hl, wd728 + set 7, [hl] + ret + +INCLUDE "data/events/card_key_coords.asm" + +ItemUsePokedoll: + ld a, [wIsInBattle] + dec a + jp nz, ItemUseNotTime + ld a, $01 + ld [wEscapedFromBattle], a + jp PrintItemUseTextAndRemoveItem + +ItemUseGuardSpec: + ld a, [wIsInBattle] + and a + jp z, ItemUseNotTime + ld hl, wPlayerBattleStatus2 + set PROTECTED_BY_MIST, [hl] ; Mist bit + jp PrintItemUseTextAndRemoveItem + +ItemUseSuperRepel: + ld b, 200 + jp ItemUseRepelCommon + +ItemUseMaxRepel: + ld b, 250 + jp ItemUseRepelCommon + +ItemUseDireHit: + ld a, [wIsInBattle] + and a + jp z, ItemUseNotTime + ld hl, wPlayerBattleStatus2 + set GETTING_PUMPED, [hl] ; Focus Energy bit + jp PrintItemUseTextAndRemoveItem + +ItemUseXStat: + ld a, [wIsInBattle] + and a + jr nz, .inBattle + call ItemUseNotTime + ld a, 2 + ld [wActionResultOrTookBattleTurn], a ; item not used + ret +.inBattle + ld hl, wPlayerMoveNum + ld a, [hli] + push af ; save [wPlayerMoveNum] + ld a, [hl] + push af ; save [wPlayerMoveEffect] + push hl + ld a, [wcf91] + sub X_ATTACK - ATTACK_UP1_EFFECT + ld [hl], a ; store player move effect + call PrintItemUseTextAndRemoveItem + ld a, XSTATITEM_ANIM ; X stat item animation ID + ld [wPlayerMoveNum], a + call LoadScreenTilesFromBuffer1 ; restore saved screen + call Delay3 + xor a + ldh [hWhoseTurn], a ; set turn to player's turn + farcall StatModifierUpEffect ; do stat increase move + pop hl + pop af + ld [hld], a ; restore [wPlayerMoveEffect] + pop af + ld [hl], a ; restore [wPlayerMoveNum] + ret + +ItemUsePokeflute: + ld a, [wIsInBattle] + and a + jr nz, .inBattle +; if not in battle + call ItemUseReloadOverworldData + ld a, [wCurMap] + cp ROUTE_12 + jr nz, .notRoute12 + CheckEvent EVENT_BEAT_ROUTE12_SNORLAX + jr nz, .noSnorlaxToWakeUp +; if the player hasn't beaten Route 12 Snorlax + ld hl, Route12SnorlaxFluteCoords + call ArePlayerCoordsInArray + jr nc, .noSnorlaxToWakeUp + ld hl, PlayedFluteHadEffectText + call PrintText + SetEvent EVENT_FIGHT_ROUTE12_SNORLAX + ret +.notRoute12 + cp ROUTE_16 + jr nz, .noSnorlaxToWakeUp + CheckEvent EVENT_BEAT_ROUTE16_SNORLAX + jr nz, .noSnorlaxToWakeUp +; if the player hasn't beaten Route 16 Snorlax + ld hl, Route16SnorlaxFluteCoords + call ArePlayerCoordsInArray + jr nc, .noSnorlaxToWakeUp + ld hl, PlayedFluteHadEffectText + call PrintText + SetEvent EVENT_FIGHT_ROUTE16_SNORLAX + ret +.noSnorlaxToWakeUp + ld hl, PlayedFluteNoEffectText + jp PrintText +.inBattle + xor a + ld [wWereAnyMonsAsleep], a + ld b, ~SLP & $ff + ld hl, wPartyMon1Status + call WakeUpEntireParty + ld a, [wIsInBattle] + dec a ; is it a trainer battle? + jr z, .skipWakingUpEnemyParty +; if it's a trainer battle + ld hl, wEnemyMon1Status + call WakeUpEntireParty +.skipWakingUpEnemyParty + ld hl, wBattleMonStatus + ld a, [hl] + and b ; remove Sleep status + ld [hl], a + ld hl, wEnemyMonStatus + ld a, [hl] + and b ; remove Sleep status + ld [hl], a + call LoadScreenTilesFromBuffer2 ; restore saved screen + ld a, [wWereAnyMonsAsleep] + and a ; were any pokemon asleep before playing the flute? + ld hl, PlayedFluteNoEffectText + jp z, PrintText ; if no pokemon were asleep +; if some pokemon were asleep + ld hl, PlayedFluteHadEffectText + call PrintText + ld a, [wDanger] + and $80 + jr nz, .skipMusic + call WaitForSoundToFinish ; wait for sound to end + ;farcall Music_PokeFluteInBattle ; play in-battle pokeflute music ; XXX +.musicWaitLoop ; wait for music to finish playing + ld a, [wChannelSoundIDs + Ch7] + and a ; music off? + jr nz, .musicWaitLoop +.skipMusic + ld hl, FluteWokeUpText + jp PrintText + +; wakes up all party pokemon +; INPUT: +; hl must point to status of first pokemon in party (player's or enemy's) +; b must equal ~SLP +; [wWereAnyMonsAsleep] should be initialized to 0 +; OUTPUT: +; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep +WakeUpEntireParty: + ld de, 44 + ld c, 6 +.loop + ld a, [hl] + push af + and SLP ; is pokemon asleep? + jr z, .notAsleep + ld a, 1 + ld [wWereAnyMonsAsleep], a ; indicate that a pokemon had to be woken up +.notAsleep + pop af + and b ; remove Sleep status + ld [hl], a + add hl, de + dec c + jr nz, .loop + ret + +Route12SnorlaxFluteCoords: + dbmapcoord 9, 62 ; one space West of Snorlax + dbmapcoord 10, 61 ; one space North of Snorlax + dbmapcoord 10, 63 ; one space South of Snorlax + dbmapcoord 11, 62 ; one space East of Snorlax + db -1 ; end + +Route16SnorlaxFluteCoords: + dbmapcoord 27, 10 ; one space East of Snorlax + dbmapcoord 25, 10 ; one space West of Snorlax + db -1 ; end + +PlayedFluteNoEffectText: + text_far _PlayedFluteNoEffectText + text_end + +FluteWokeUpText: + text_far _FluteWokeUpText + text_end + +PlayedFluteHadEffectText: + text_far _PlayedFluteHadEffectText + text_promptbutton + text_asm + ld a, [wIsInBattle] + and a + jr nz, .done +; play out-of-battle pokeflute music + ld a, SFX_STOP_ALL_MUSIC + call PlaySound + ld a, SFX_POKEFLUTE + ld c, 0 ; BANK(SFX_Pokeflute) + call PlaySound + call WaitForSoundToFinish + call PlayDefaultMusic ; start playing normal music again +.done + jp TextScriptEnd ; end text + +ItemUseCoinCase: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + ld hl, CoinCaseNumCoinsText + jp PrintText + +CoinCaseNumCoinsText: + text_far _CoinCaseNumCoinsText + text_end + +ItemUseOldRod: + call FishingInit + jp c, ItemUseNotTime + lb bc, 5, MAGIKARP + ld a, $1 ; set bite + jr RodResponse + +ItemUseGoodRod: + call FishingInit + jp c, ItemUseNotTime +.RandomLoop + call Random + srl a + jr c, .SetBite + and %11 + cp 2 + jr nc, .RandomLoop + ; choose which monster appears + ld hl, GoodRodMons + add a + ld c, a + ld b, 0 + add hl, bc + ld b, [hl] + inc hl + ld c, [hl] + and a +.SetBite + ld a, 0 + rla + xor 1 + jr RodResponse + +INCLUDE "data/wild/good_rod.asm" + +ItemUseSuperRod: + call FishingInit + jp c, ItemUseNotTime + call ReadSuperRodData + ld a, e +RodResponse: + ld [wRodResponse], a + + dec a ; is there a bite? + jr nz, .next + ; if yes, store level and species data + ld a, 1 + ld [wMoveMissed], a + ld a, b ; level + ld [wCurEnemyLVL], a + ld a, c ; species + ld [wCurOpponent], a + +.next + ld hl, wWalkBikeSurfState + ld a, [hl] ; store the value in a + push af + push hl + ld [hl], 0 + farcall FishingAnim + pop hl + pop af + ld [hl], a + ret + +; checks if fishing is possible and if so, runs initialization code common to all rods +; unsets carry if fishing is possible, sets carry if not +FishingInit: + ld a, [wIsInBattle] + and a + jr z, .notInBattle + scf ; can't fish during battle + ret +.notInBattle + call IsNextTileShoreOrWater + ret c + ld a, [wWalkBikeSurfState] + cp 2 ; Surfing? + jr z, .surfing + call ItemUseReloadOverworldData + ld hl, ItemUseText00 + call PrintText + ld a, SFX_HEAL_AILMENT + call PlaySound + ld c, 80 + call DelayFrames + and a + ret +.surfing + scf ; can't fish when surfing + ret + +ItemUseOaksParcel: + jp ItemUseNotYoursToUse + +ItemUseItemfinder: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + call ItemUseReloadOverworldData + farcall HiddenItemNear ; check for hidden items + ld hl, ItemfinderFoundNothingText + jr nc, .printText ; if no hidden items + ld c, 4 +.loop + ld a, SFX_HEALING_MACHINE + call PlaySoundWaitForCurrent + ld a, SFX_PURCHASE + call PlaySoundWaitForCurrent + dec c + jr nz, .loop + ld hl, ItemfinderFoundItemText +.printText + jp PrintText + +ItemfinderFoundItemText: + text_far _ItemfinderFoundItemText + text_end + +ItemfinderFoundNothingText: + text_far _ItemfinderFoundNothingText + text_end + +ItemUsePPUp: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + +ItemUsePPRestore: + ld a, [wWhichPokemon] + push af + ld a, [wcf91] + ld [wPPRestoreItem], a +.chooseMon + xor a + ld [wUpdateSpritesEnabled], a + ld a, USE_ITEM_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a + call DisplayPartyMenu + jr nc, .chooseMove + jp .itemNotUsed +.chooseMove + ld a, [wPPRestoreItem] + cp ELIXER + jp nc, .useElixir ; if Elixir or Max Elixir + ld a, $02 + ld [wMoveMenuType], a + ld hl, RaisePPWhichTechniqueText + ld a, [wPPRestoreItem] + cp ETHER ; is it a PP Up? + jr c, .printWhichTechniqueMessage ; if so, print the raise PP message + ld hl, RestorePPWhichTechniqueText ; otherwise, print the restore PP message +.printWhichTechniqueMessage + call PrintText + xor a + ld [wPlayerMoveListIndex], a + callfar MoveSelectionMenu ; move selection menu + ld a, 0 + ld [wPlayerMoveListIndex], a + jr nz, .chooseMon + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + call GetSelectedMoveOffset + push hl + ld a, [hl] + ld [wd11e], a + call GetMoveName + call CopyStringToCF4B ; copy name to wcf4b + pop hl + ld a, [wPPRestoreItem] + cp ETHER + jr nc, .useEther ; if Ether or Max Ether +.usePPUp + ld bc, wPartyMon1PP - wPartyMon1Moves + add hl, bc + ld a, [hl] ; move PP + cp 3 << 6 ; have 3 PP Ups already been used? + jr c, .PPNotMaxedOut + ld hl, PPMaxedOutText + call PrintText + jr .chooseMove +.PPNotMaxedOut + ld a, [hl] + add 1 << 6 ; increase PP Up count by 1 + ld [hl], a + ld a, 1 ; 1 PP Up used + ld [wd11e], a + call RestoreBonusPP ; add the bonus PP to current PP + ld hl, PPIncreasedText + call PrintText +.done + pop af + ld [wWhichPokemon], a + call GBPalWhiteOut + call RunDefaultPaletteCommand + jp RemoveUsedItem +.afterRestoringPP ; after using a (Max) Ether/Elixir + ld a, [wWhichPokemon] + ld b, a + ld a, [wPlayerMonNumber] + cp b ; is the pokemon whose PP was restored active in battle? + jr nz, .skipUpdatingInBattleData + ld hl, wPartyMon1PP + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld de, wBattleMonPP + ld bc, 4 + call CopyData ; copy party data to in-battle data +.skipUpdatingInBattleData + ld a, SFX_HEAL_AILMENT + call PlaySound + ld hl, PPRestoredText + call PrintText + jr .done +.useEther + call .restorePP + jr nz, .afterRestoringPP + jp .noEffect +; unsets zero flag if PP was restored, sets zero flag if not +; however, this is bugged for Max Ethers and Max Elixirs (see below) +.restorePP + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + call GetMaxPP + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + call GetSelectedMoveOffset + ld bc, wPartyMon1PP - wPartyMon1Moves + add hl, bc ; hl now points to move's PP + ld a, [wMaxPP] + ld b, a + ld a, [wPPRestoreItem] + cp MAX_ETHER + jr z, .fullyRestorePP + ld a, [hl] ; move PP + and %00111111 ; lower 6 bit bits store current PP + cp b ; does current PP equal max PP? + ret z ; if so, return + add 10 ; increase current PP by 10 +; b holds the max PP amount and b will hold the new PP amount. +; So, if the new amount meets or exceeds the max amount, +; cap the amount to the max amount by leaving b unchanged. +; Otherwise, store the new amount in b. + cp b ; does the new amount meet or exceed the maximum? + jr nc, .storeNewAmount + ld b, a +.storeNewAmount + ld a, [hl] ; move PP + and %11000000 ; PP Up counter bits + add b + ld [hl], a + ret +.fullyRestorePP + ld a, [hl] ; move PP +; Note that this code has a bug. It doesn't mask out the upper two bits, which +; are used to count how many PP Ups have been used on the move. So, Max Ethers +; and Max Elixirs will not be detected as having no effect on a move with full +; PP if the move has had any PP Ups used on it. + cp b ; does current PP equal max PP? + ret z + jr .storeNewAmount +.useElixir +; decrement the item ID so that ELIXER becomes ETHER and MAX_ELIXER becomes MAX_ETHER + ld hl, wPPRestoreItem + dec [hl] + dec [hl] + xor a + ld hl, wCurrentMenuItem + ld [hli], a + ld [hl], a ; zero the counter for number of moves that had their PP restored + ld b, 4 +; loop through each move and restore PP +.elixirLoop + push bc + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + call GetSelectedMoveOffset + ld a, [hl] + and a ; does the current slot have a move? + jr z, .nextMove + call .restorePP + jr z, .nextMove +; if some PP was restored + ld hl, wTileBehindCursor ; counter for number of moves that had their PP restored + inc [hl] +.nextMove + ld hl, wCurrentMenuItem + inc [hl] + pop bc + dec b + jr nz, .elixirLoop + ld a, [wTileBehindCursor] + and a ; did any moves have their PP restored? + jp nz, .afterRestoringPP +.noEffect + call ItemUseNoEffect +.itemNotUsed + call GBPalWhiteOut + call RunDefaultPaletteCommand + pop af + xor a + ld [wActionResultOrTookBattleTurn], a ; item use failed + ret + +RaisePPWhichTechniqueText: + text_far _RaisePPWhichTechniqueText + text_end + +RestorePPWhichTechniqueText: + text_far _RestorePPWhichTechniqueText + text_end + +PPMaxedOutText: + text_far _PPMaxedOutText + text_end + +PPIncreasedText: + text_far _PPIncreasedText + text_end + +PPRestoredText: + text_far _PPRestoredText + text_end + +; for items that can't be used from the Item menu +UnusableItem: + jp ItemUseNotTime + +ItemUseTMHM: + ld a, [wIsInBattle] + and a + jp nz, ItemUseNotTime + ld a, [wcf91] + sub TM01 ; underflows below 0 for HM items (before TM items) + push af + jr nc, .skipAdding + add NUM_TMS + NUM_HMS ; adjust HM IDs to come after TM IDs +.skipAdding + inc a + ld [wd11e], a + predef TMToMove ; get move ID from TM/HM ID + ld a, [wd11e] + ld [wMoveNum], a + call GetMoveName + call CopyStringToCF4B ; copy name to wcf4b + pop af + ld hl, BootedUpTMText + jr nc, .printBootedUpMachineText + ld hl, BootedUpHMText +.printBootedUpMachineText + call PrintText + ld hl, TeachMachineMoveText + call PrintText + hlcoord 14, 7 + lb bc, 8, 15 + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a + call DisplayTextBoxID ; yes/no menu + ld a, [wCurrentMenuItem] + and a + jr z, .useMachine + ld a, 2 + ld [wActionResultOrTookBattleTurn], a ; item not used + ret +.useMachine + ld a, [wWhichPokemon] + push af + ld a, [wcf91] + push af +.chooseMon + ld hl, wcf4b + ld de, wTempMoveNameBuffer + ld bc, 14 + call CopyData ; save the move name because DisplayPartyMenu will overwrite it + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld a, TMHM_PARTY_MENU + ld [wPartyMenuTypeOrMessageID], a + call DisplayPartyMenu + push af + ld hl, wTempMoveNameBuffer + ld de, wcf4b + ld bc, 14 + call CopyData + pop af + jr nc, .checkIfAbleToLearnMove +; if the player canceled teaching the move + pop af + pop af + call GBPalWhiteOutWithDelay3 + call ClearSprites + call RunDefaultPaletteCommand + jp LoadScreenTilesFromBuffer1 ; restore saved screen +.checkIfAbleToLearnMove + predef CanLearnTM ; check if the pokemon can learn the move + push bc + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks + call GetPartyMonName + pop bc + ld a, c + and a ; can the pokemon learn the move? + jr nz, .checkIfAlreadyLearnedMove +; if the pokemon can't learn the move + ld a, SFX_DENIED + call PlaySoundWaitForCurrent + ld hl, MonCannotLearnMachineMoveText + call PrintText + jr .chooseMon +.checkIfAlreadyLearnedMove + callfar CheckIfMoveIsKnown ; check if the pokemon already knows the move + jr c, .chooseMon + predef LearnMove ; teach move + pop af + ld [wcf91], a + pop af + ld [wWhichPokemon], a + ld a, b + and a + ret z + ld a, [wcf91] + call IsItemHM + ret c + jp RemoveUsedItem + +BootedUpTMText: + text_far _BootedUpTMText + text_end + +BootedUpHMText: + text_far _BootedUpHMText + text_end + +TeachMachineMoveText: + text_far _TeachMachineMoveText + text_end + +MonCannotLearnMachineMoveText: + text_far _MonCannotLearnMachineMoveText + text_end + +PrintItemUseTextAndRemoveItem: + ld hl, ItemUseText00 + call PrintText + ld a, SFX_HEAL_AILMENT + call PlaySound + call WaitForTextScrollButtonPress ; wait for button press + +RemoveUsedItem: + ld hl, wNumBagItems + ld a, 1 ; one item + ld [wItemQuantity], a + jp RemoveItemFromInventory + +ItemUseNoEffect: + ld hl, ItemUseNoEffectText + jr ItemUseFailed + +ItemUseNotTime: + ld hl, ItemUseNotTimeText + jr ItemUseFailed + +ItemUseNotYoursToUse: + ld hl, ItemUseNotYoursToUseText + jr ItemUseFailed + +ThrowBallAtTrainerMon: + call RunDefaultPaletteCommand + call LoadScreenTilesFromBuffer1 ; restore saved screen + call Delay3 + ld a, TOSS_ANIM + ld [wAnimationID], a + predef MoveAnimation ; do animation + ld hl, ThrowBallAtTrainerMonText1 + call PrintText + ld hl, ThrowBallAtTrainerMonText2 + call PrintText + jr RemoveUsedItem + +NoCyclingAllowedHere: + ld hl, NoCyclingAllowedHereText + jr ItemUseFailed + +BoxFullCannotThrowBall: + ld hl, BoxFullCannotThrowBallText + jr ItemUseFailed + +SurfingAttemptFailed: + ld hl, NoSurfingHereText + +ItemUseFailed: + xor a + ld [wActionResultOrTookBattleTurn], a ; item use failed + jp PrintText + +ItemUseNotTimeText: + text_far _ItemUseNotTimeText + text_end + +ItemUseNotYoursToUseText: + text_far _ItemUseNotYoursToUseText + text_end + +ItemUseNoEffectText: + text_far _ItemUseNoEffectText + text_end + +ThrowBallAtTrainerMonText1: + text_far _ThrowBallAtTrainerMonText1 + text_end + +ThrowBallAtTrainerMonText2: + text_far _ThrowBallAtTrainerMonText2 + text_end + +NoCyclingAllowedHereText: + text_far _NoCyclingAllowedHereText + text_end + +NoSurfingHereText: + text_far _NoSurfingHereText + text_end + +BoxFullCannotThrowBallText: + text_far _BoxFullCannotThrowBallText + text_end + +ItemUseText00: + text_far _ItemUseText001 + text_low + text_far _ItemUseText002 + text_end + +GotOnBicycleText: + text_far _GotOnBicycleText1 + text_low + text_far _GotOnBicycleText2 + text_end + +GotOffBicycleText: + text_far _GotOffBicycleText1 + text_low + text_far _GotOffBicycleText2 + text_end + +; restores bonus PP (from PP Ups) when healing at a pokemon center +; also, when a PP Up is used, it increases the current PP by one PP Up bonus +; INPUT: +; [wWhichPokemon] = index of pokemon in party +; [wCurrentMenuItem] = index of move (when using a PP Up) +RestoreBonusPP: + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wWhichPokemon] + call AddNTimes + push hl + ld de, wNormalMaxPPList - 1 + predef LoadMovePPs ; loads the normal max PP of each of the pokemon's moves to wNormalMaxPPList + pop hl + ld c, wPartyMon1PP - wPartyMon1Moves + ld b, 0 + add hl, bc ; hl now points to move 1 PP + ld de, wNormalMaxPPList + ld b, 0 ; initialize move counter to zero +; loop through the pokemon's moves +.loop + inc b + ld a, b + cp 5 ; reached the end of the pokemon's moves? + ret z ; if so, return + ld a, [wUsingPPUp] + dec a ; using a PP Up? + jr nz, .skipMenuItemIDCheck +; if using a PP Up, check if this is the move it's being used on + ld a, [wCurrentMenuItem] + inc a + cp b + jr nz, .nextMove +.skipMenuItemIDCheck + ld a, [hl] + and %11000000 ; have any PP Ups been used? + call nz, AddBonusPP ; if so, add bonus PP +.nextMove + inc hl + inc de + jr .loop + +; adds bonus PP from PP Ups to current PP +; 1/5 of normal max PP (capped at 7) is added for each PP Up +; INPUT: +; [de] = normal max PP +; [hl] = move PP +AddBonusPP: + push bc + ld a, [de] ; normal max PP of move + ldh [hDividend + 3], a + xor a + ldh [hDividend], a + ldh [hDividend + 1], a + ldh [hDividend + 2], a + ld a, 5 + ldh [hDivisor], a + ld b, 4 + call Divide + ld a, [hl] ; move PP + ld b, a + swap a + and %00001111 + srl a + srl a + ld c, a ; c = number of PP Ups used +.loop + ldh a, [hQuotient + 3] + cp 8 ; is the amount greater than or equal to 8? + jr c, .addAmount + ld a, 7 ; cap the amount at 7 +.addAmount + add b + ld b, a + ld a, [wUsingPPUp] + dec a ; is the player using a PP Up right now? + jr z, .done ; if so, only add the bonus once + dec c + jr nz, .loop +.done + ld [hl], b + pop bc + ret + +; gets max PP of a pokemon's move (including PP from PP Ups) +; INPUT: +; [wWhichPokemon] = index of pokemon within party/box +; [wMonDataLocation] = pokemon source +; 00: player's party +; 01: enemy's party +; 02: current box +; 03: daycare +; 04: player's in-battle pokemon +; [wCurrentMenuItem] = move index +; OUTPUT: +; [wMaxPP] = max PP +GetMaxPP: + ld a, [wMonDataLocation] + and a + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + jr z, .sourceWithMultipleMon + ld hl, wEnemyMon1Moves + dec a + jr z, .sourceWithMultipleMon + ld hl, wBoxMon1Moves + ld bc, wBoxMon2 - wBoxMon1 + dec a + jr z, .sourceWithMultipleMon + ld hl, wDayCareMonMoves + dec a + jr z, .sourceWithOneMon + ld hl, wBattleMonMoves ; player's in-battle pokemon +.sourceWithOneMon + call GetSelectedMoveOffset2 + jr .next +.sourceWithMultipleMon + call GetSelectedMoveOffset +.next + ld a, [hl] + dec a + push hl + ld hl, Moves + ld bc, MoveEnd - Moves + call AddNTimes + ld de, wcd6d + ld a, BANK(Moves) + call FarCopyData + ld de, wcd6d + 5 ; PP is byte 5 of move data + ld a, [de] + ld b, a ; b = normal max PP + pop hl + push bc + ld bc, wPartyMon1PP - wPartyMon1Moves ; PP offset if not player's in-battle pokemon data + ld a, [wMonDataLocation] + cp 4 ; player's in-battle pokemon? + jr nz, .addPPOffset + ld bc, wBattleMonPP - wBattleMonMoves ; PP offset if player's in-battle pokemon data +.addPPOffset + add hl, bc + ld a, [hl] ; a = current PP + and %11000000 ; get PP Up count + pop bc + or b ; place normal max PP in 6 lower bits of a + ld h, d + ld l, e + inc hl ; hl = wcd73 + ld [hl], a + xor a ; add the bonus for the existing PP Up count + ld [wUsingPPUp], a + call AddBonusPP ; add bonus PP from PP Ups + ld a, [hl] + and %00111111 ; mask out the PP Up count + ld [wMaxPP], a ; store max PP + ret + +GetSelectedMoveOffset: + ld a, [wWhichPokemon] + call AddNTimes + +GetSelectedMoveOffset2: + ld a, [wCurrentMenuItem] + ld c, a + ld b, 0 + add hl, bc + ret + +; confirms the item toss and then tosses the item +; INPUT: +; hl = address of inventory (either wNumBagItems or wNumBoxItems) +; [wcf91] = item ID +; [wWhichPokemon] = index of item within inventory +; [wItemQuantity] = quantity to toss +; OUTPUT: +; clears carry flag if the item is tossed, sets carry flag if not +TossItem_:: + push hl + ld a, [wcf91] + call IsItemHM + pop hl + jr c, .tooImportantToToss + push hl + call IsKeyItem_ + ld a, [wIsKeyItem] + pop hl + and a + jr nz, .tooImportantToToss + push hl + ld a, [wcf91] + ld [wd11e], a + call GetItemName + call CopyStringToCF4B ; copy name to wcf4b + ld hl, IsItOKToTossItemText + call PrintText + hlcoord 14, 7 + lb bc, 8, 15 + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a + call DisplayTextBoxID ; yes/no menu + ld a, [wMenuExitMethod] + cp CHOSE_SECOND_ITEM + pop hl + scf + ret z ; return if the player chose No +; if the player chose Yes + push hl + ld a, [wWhichPokemon] + call RemoveItemFromInventory + ld a, [wcf91] + ld [wd11e], a + call GetItemName + call CopyStringToCF4B ; copy name to wcf4b + ld hl, ThrewAwayItemText + call PrintText + pop hl + and a + ret +.tooImportantToToss + push hl + ld hl, TooImportantToTossText + call PrintText + pop hl + scf + ret + +ThrewAwayItemText: + text_far _ThrewAwayItemText + text_end + +IsItOKToTossItemText: + text_far _IsItOKToTossItemText + text_end + +TooImportantToTossText: + text_far _TooImportantToTossText + text_end + +; checks if an item is a key item +; INPUT: +; [wcf91] = item ID +; OUTPUT: +; [wIsKeyItem] = result +; 00: item is not key item +; 01: item is key item +IsKeyItem_:: + ld a, $01 + ld [wIsKeyItem], a + ld a, [wcf91] + cp HM01 ; is the item an HM or TM? + jr nc, .checkIfItemIsHM +; if the item is not an HM or TM + push af + ld hl, KeyItemBitfield + ld de, wBuffer + ld bc, 15 ; only 11 bytes are actually used + call CopyData + pop af + dec a + ld c, a + ld hl, wBuffer + ld b, FLAG_TEST + predef FlagActionPredef + ld a, c + and a + ret nz +.checkIfItemIsHM + ld a, [wcf91] + call IsItemHM + ret c + xor a + ld [wIsKeyItem], a + ret + +INCLUDE "data/items/key_items.asm" + +SendNewMonToBox: + ld de, wNumInBox + ld a, [de] + inc a + ld [de], a + ld a, [wcf91] + ld [wd0b5], a + ld c, a +.asm_e7b1 + inc de + ld a, [de] + ld b, a + ld a, c + ld c, b + ld [de], a + cp $ff + jr nz, .asm_e7b1 + call GetMonHeader + ld hl, wBoxMonOT + ld bc, NAME_LENGTH + ld a, [wNumInBox] + dec a + jr z, .asm_e7ee + dec a + call AddNTimes + push hl + ld bc, NAME_LENGTH + add hl, bc + ld d, h + ld e, l + pop hl + ld a, [wNumInBox] + dec a + ld b, a +.asm_e7db + push bc + push hl + ld bc, NAME_LENGTH + call CopyData + pop hl + ld d, h + ld e, l + ld bc, -NAME_LENGTH + add hl, bc + pop bc + dec b + jr nz, .asm_e7db +.asm_e7ee + ld hl, wPlayerName + ld de, wBoxMonOT + ld bc, NAME_LENGTH + call CopyData + ld a, [wNumInBox] + dec a + jr z, .asm_e82a + ld hl, wBoxMonNicks + ld bc, NAME_LENGTH + dec a + call AddNTimes + push hl + ld bc, NAME_LENGTH + add hl, bc + ld d, h + ld e, l + pop hl + ld a, [wNumInBox] + dec a + ld b, a +.asm_e817 + push bc + push hl + ld bc, NAME_LENGTH + call CopyData + pop hl + ld d, h + ld e, l + ld bc, -NAME_LENGTH + add hl, bc + pop bc + dec b + jr nz, .asm_e817 +.asm_e82a + ld hl, wBoxMonNicks + ld a, NAME_MON_SCREEN + ld [wNamingScreenType], a + predef AskName + ld a, [wNumInBox] + dec a + jr z, .asm_e867 + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 + dec a + call AddNTimes + push hl + ld bc, wBoxMon2 - wBoxMon1 + add hl, bc + ld d, h + ld e, l + pop hl + ld a, [wNumInBox] + dec a + ld b, a +.asm_e854 + push bc + push hl + ld bc, wBoxMon2 - wBoxMon1 + call CopyData + pop hl + ld d, h + ld e, l + ld bc, wBoxMon1 - wBoxMon2 + add hl, bc + pop bc + dec b + jr nz, .asm_e854 +.asm_e867 + ld a, [wEnemyMonLevel] + ld [wEnemyMonBoxLevel], a + ld hl, wEnemyMon + ld de, wBoxMon1 + ld bc, wEnemyMonDVs - wEnemyMon + call CopyData + ld hl, wPlayerID + ld a, [hli] + ld [de], a + inc de + ld a, [hl] + ld [de], a + inc de + push de + ld a, [wCurEnemyLVL] + ld d, a + callfar CalcExperience + pop de + ldh a, [hExperience] + ld [de], a + inc de + ldh a, [hExperience + 1] + ld [de], a + inc de + ldh a, [hExperience + 2] + ld [de], a + inc de + xor a + ld b, NUM_STATS * 2 +.asm_e89f + ld [de], a + inc de + dec b + jr nz, .asm_e89f + ld hl, wEnemyMonDVs + ld a, [hli] + ld [de], a + inc de + ld a, [hli] + ld [de], a + ld hl, wEnemyMonPP + ld b, NUM_MOVES +.asm_e8b1 + ld a, [hli] + inc de + ld [de], a + dec b + jr nz, .asm_e8b1 + ret + +; checks if the tile in front of the player is a shore or water tile +; used for surfing and fishing +; unsets carry if it is, sets carry if not +IsNextTileShoreOrWater: + ld a, [wCurMapTileset] + ld hl, WaterTilesets + ld de, 1 + call IsInArray + jr nc, .notShoreOrWater + ld a, [wCurMapTileset] + cp SHIP_PORT ; Vermilion Dock tileset + ld a, [wTileInFrontOfPlayer] ; tile in front of player + jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset + cp $48 ; eastern shore tile in Safari Zone + jr z, .shoreOrWater + cp $32 ; usual eastern shore tile + jr z, .shoreOrWater +.skipShoreTiles + cp $14 ; water tile + jr z, .shoreOrWater +.notShoreOrWater + scf + ret +.shoreOrWater + and a + ret + +INCLUDE "data/tilesets/water_tilesets.asm" + +ReadSuperRodData: +; return e = 2 if no fish on this map +; return e = 1 if a bite, bc = level,species +; return e = 0 if no bite + ld a, [wCurMap] + ld de, 3 ; each fishing group is three bytes wide + ld hl, SuperRodData + call IsInArray + jr c, .ReadFishingGroup + ld e, $2 ; $2 if no fishing groups found + ret + +.ReadFishingGroup +; hl points to the fishing group entry in the index + inc hl ; skip map id + + ; read fishing group address + ld a, [hli] + ld h, [hl] + ld l, a + + ld b, [hl] ; how many mons in group + inc hl ; point to data + ld e, $0 ; no bite yet + +.RandomLoop + call Random + srl a + ret c ; 50% chance of no battle + + and %11 ; 2-bit random number + cp b + jr nc, .RandomLoop ; if a is greater than the number of mons, regenerate + + ; get the mon + add a + ld c, a + ld b, $0 + add hl, bc + ld b, [hl] ; level + inc hl + ld c, [hl] ; species + ld e, $1 ; $1 if there's a bite + ret + +INCLUDE "data/wild/super_rod.asm" + +; reloads map view and processes sprite data +; for items that cause the overworld to be displayed +ItemUseReloadOverworldData: + call LoadCurrentMapView + jp UpdateSprites + +; creates a list at wBuffer of maps where the mon in [wd11e] can be found. +; this is used by the pokedex to display locations the mon can be found on the map. +FindWildLocationsOfMon: + ld hl, WildDataPointers + ld de, wBuffer + ld c, $0 +.loop + inc hl + ld a, [hld] + inc a + jr z, .done + push hl + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [hli] + and a + call nz, CheckMapForMon ; land + ld a, [hli] + and a + call nz, CheckMapForMon ; water + pop hl + inc hl + inc hl + inc c + jr .loop +.done + ld a, $ff ; list terminator + ld [de], a + ret + +CheckMapForMon: + inc hl + ld b, $a +.loop + ld a, [wd11e] + cp [hl] + jr nz, .nextEntry + ld a, c + ld [de], a + inc de +.nextEntry + inc hl + inc hl + dec b + jr nz, .loop + dec hl + ret diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm old mode 100755 new mode 100644 diff --git a/engine/items/items.asm b/engine/items/items.asm deleted file mode 100755 index 1c1a12b2..00000000 --- a/engine/items/items.asm +++ /dev/null @@ -1,2986 +0,0 @@ -UseItem_: - ld a, 1 - ld [wActionResultOrTookBattleTurn], a ; initialise to success value - ld a, [wcf91] ;contains item_ID - cp HM_01 - jp nc, ItemUseTMHM - ld hl, ItemUsePtrTable - dec a - add a - ld c, a - ld b, 0 - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - jp hl - -ItemUsePtrTable: - dw ItemUseBall ; MASTER_BALL - dw ItemUseBall ; ULTRA_BALL - dw ItemUseBall ; GREAT_BALL - dw ItemUseBall ; POKE_BALL - dw ItemUseTownMap ; TOWN_MAP - dw ItemUseBicycle ; BICYCLE - dw ItemUseSurfboard ; out-of-battle Surf effect - dw ItemUseBall ; SAFARI_BALL - dw ItemUsePokedex ; POKEDEX - dw ItemUseEvoStone ; MOON_STONE - dw ItemUseMedicine ; ANTIDOTE - dw ItemUseMedicine ; BURN_HEAL - dw ItemUseMedicine ; ICE_HEAL - dw ItemUseMedicine ; AWAKENING - dw ItemUseMedicine ; PARLYZ_HEAL - dw ItemUseMedicine ; FULL_RESTORE - dw ItemUseMedicine ; MAX_POTION - dw ItemUseMedicine ; HYPER_POTION - dw ItemUseMedicine ; SUPER_POTION - dw ItemUseMedicine ; POTION - dw ItemUseBait ; BOULDERBADGE - dw ItemUseRock ; CASCADEBADGE - dw UnusableItem ; THUNDERBADGE - dw UnusableItem ; RAINBOWBADGE - dw UnusableItem ; SOULBADGE - dw UnusableItem ; MARSHBADGE - dw UnusableItem ; VOLCANOBADGE - dw UnusableItem ; EARTHBADGE - dw ItemUseEscapeRope ; ESCAPE_ROPE - dw ItemUseRepel ; REPEL - dw UnusableItem ; OLD_AMBER - dw ItemUseEvoStone ; FIRE_STONE - dw ItemUseEvoStone ; THUNDER_STONE - dw ItemUseEvoStone ; WATER_STONE - dw ItemUseVitamin ; HP_UP - dw ItemUseVitamin ; PROTEIN - dw ItemUseVitamin ; IRON - dw ItemUseVitamin ; CARBOS - dw ItemUseVitamin ; CALCIUM - dw ItemUseVitamin ; RARE_CANDY - dw UnusableItem ; DOME_FOSSIL - dw UnusableItem ; HELIX_FOSSIL - dw UnusableItem ; SECRET_KEY - dw UnusableItem - dw UnusableItem ; BIKE_VOUCHER - dw ItemUseXAccuracy ; X_ACCURACY - dw ItemUseEvoStone ; LEAF_STONE - dw ItemUseCardKey ; CARD_KEY - dw UnusableItem ; NUGGET - dw UnusableItem ; ??? PP_UP - dw ItemUsePokedoll ; POKE_DOLL - dw ItemUseMedicine ; FULL_HEAL - dw ItemUseMedicine ; REVIVE - dw ItemUseMedicine ; MAX_REVIVE - dw ItemUseGuardSpec ; GUARD_SPEC - dw ItemUseSuperRepel ; SUPER_REPL - dw ItemUseMaxRepel ; MAX_REPEL - dw ItemUseDireHit ; DIRE_HIT - dw UnusableItem ; COIN - dw ItemUseMedicine ; FRESH_WATER - dw ItemUseMedicine ; SODA_POP - dw ItemUseMedicine ; LEMONADE - dw UnusableItem ; S_S_TICKET - dw UnusableItem ; GOLD_TEETH - dw ItemUseXStat ; X_ATTACK - dw ItemUseXStat ; X_DEFEND - dw ItemUseXStat ; X_SPEED - dw ItemUseXStat ; X_SPECIAL - dw ItemUseCoinCase ; COIN_CASE - dw ItemUseOaksParcel ; OAKS_PARCEL - dw ItemUseItemfinder ; ITEMFINDER - dw UnusableItem ; SILPH_SCOPE - dw ItemUsePokeflute ; POKE_FLUTE - dw UnusableItem ; LIFT_KEY - dw UnusableItem ; EXP_ALL - dw ItemUseOldRod ; OLD_ROD - dw ItemUseGoodRod ; GOOD_ROD - dw ItemUseSuperRod ; SUPER_ROD - dw ItemUsePPUp ; PP_UP (real one) - dw ItemUsePPRestore ; ETHER - dw ItemUsePPRestore ; MAX_ETHER - dw ItemUsePPRestore ; ELIXER - dw ItemUsePPRestore ; MAX_ELIXER - -ItemUseBall: - -; Balls can't be used out of battle. - ld a, [wIsInBattle] - and a - jp z, ItemUseNotTime - -; Balls can't catch trainers' Pokémon. - dec a - jp nz, ThrowBallAtTrainerMon - -; If this is for the old man battle, skip checking if the party & box are full. - ld a, [wBattleType] - dec a - jr z, .canUseBall - - ld a, [wPartyCount] ; is party full? - cp PARTY_LENGTH - jr nz, .canUseBall - ld a, [wNumInBox] ; is box full? - cp MONS_PER_BOX - jp z, BoxFullCannotThrowBall - -.canUseBall - xor a - ld [wCapturedMonSpecies], a - - ld a, [wBattleType] - cp BATTLE_TYPE_SAFARI - jr nz, .skipSafariZoneCode - -.safariZone - ld hl, wNumSafariBalls - dec [hl] ; remove a Safari Ball - -.skipSafariZoneCode - call RunDefaultPaletteCommand - - ld a, $43 ; successful capture value - ld [wPokeBallAnimData], a - - call LoadScreenTilesFromBuffer1 - ld hl, ItemUseText00 - call PrintText - -; If the player is fighting an unidentified ghost, set the value that indicates -; the Pokémon can't be caught and skip the capture calculations. - callab IsGhostBattle - ld b, $10 ; can't be caught value - jp z, .setAnimData - - ld a, [wBattleType] - dec a - jr nz, .notOldManBattle - -.oldManBattle - ld hl, wGrassRate - ld de, wPlayerName - ld bc, NAME_LENGTH - call CopyData ; save the player's name in the Wild Monster data (part of the Cinnabar Island Missingno. glitch) - jp .captured - -.notOldManBattle -; If the player is fighting the ghost Marowak, set the value that indicates the -; Pokémon can't be caught and skip the capture calculations. - ld a, [wCurMap] - cp POKEMON_TOWER_6F - jr nz, .loop - ld a, [wEnemyMonSpecies2] - cp MAROWAK - ld b, $10 ; can't be caught value - jp z, .setAnimData - -; Get the first random number. Let it be called Rand1. -; Rand1 must be within a certain range according the kind of ball being thrown. -; The ranges are as follows. -; Poké Ball: [0, 255] -; Great Ball: [0, 200] -; Ultra/Safari Ball: [0, 150] -; Loop until an acceptable number is found. - -.loop - call Random - ld b, a - -; Get the item ID. - ld hl, wcf91 - ld a, [hl] - -; The Master Ball always succeeds. - cp MASTER_BALL - jp z, .captured - -; Anything will do for the basic Poké Ball. - cp POKE_BALL - jr z, .checkForAilments - -; If it's a Great/Ultra/Safari Ball and Rand1 is greater than 200, try again. - ld a, 200 - cp b - jr c, .loop - -; Less than or equal to 200 is good enough for a Great Ball. - ld a, [hl] - cp GREAT_BALL - jr z, .checkForAilments - -; If it's an Ultra/Safari Ball and Rand1 is greater than 150, try again. - ld a, 150 - cp b - jr c, .loop - -.checkForAilments -; Pokémon can be caught more easily with a status ailment. -; Depending on the status ailment, a certain value will be subtracted from -; Rand1. Let this value be called Status. -; The larger Status is, the more easily the Pokémon can be caught. -; no status ailment: Status = 0 -; Burn/Paralysis/Poison: Status = 12 -; Freeze/Sleep: Status = 25 -; If Status is greater than Rand1, the Pokémon will be caught for sure. - ld a, [wEnemyMonStatus] - and a - jr z, .skipAilmentValueSubtraction ; no ailments - and 1 << FRZ | SLP - ld c, 12 - jr z, .notFrozenOrAsleep - ld c, 25 -.notFrozenOrAsleep - ld a, b - sub c - jp c, .captured - ld b, a - -.skipAilmentValueSubtraction - push bc ; save (Rand1 - Status) - -; Calculate MaxHP * 255. - xor a - ld [H_MULTIPLICAND], a - ld hl, wEnemyMonMaxHP - ld a, [hli] - ld [H_MULTIPLICAND + 1], a - ld a, [hl] - ld [H_MULTIPLICAND + 2], a - ld a, 255 - ld [H_MULTIPLIER], a - call Multiply - -; Determine BallFactor. It's 8 for Great Balls and 12 for the others. - ld a, [wcf91] - cp GREAT_BALL - ld a, 12 - jr nz, .skip1 - ld a, 8 - -.skip1 -; Note that the results of all division operations are floored. - -; Calculate (MaxHP * 255) / BallFactor. - ld [H_DIVISOR], a - ld b, 4 ; number of bytes in dividend - call Divide - -; Divide the enemy's current HP by 4. HP is not supposed to exceed 999 so -; the result should fit in a. If the division results in a quotient of 0, -; change it to 1. - ld hl, wEnemyMonHP - ld a, [hli] - ld b, a - ld a, [hl] - srl b - rr a - srl b - rr a - and a - jr nz, .skip2 - inc a - -.skip2 -; Let W = ((MaxHP * 255) / BallFactor) / max(HP / 4, 1). Calculate W. - ld [H_DIVISOR], a - ld b, 4 - call Divide - -; If W > 255, store 255 in [H_QUOTIENT + 3]. -; Let X = min(W, 255) = [H_QUOTIENT + 3]. - ld a, [H_QUOTIENT + 2] - and a - jr z, .skip3 - ld a, 255 - ld [H_QUOTIENT + 3], a - -.skip3 - pop bc ; b = Rand1 - Status - -; If Rand1 - Status > CatchRate, the ball fails to capture the Pokémon. - ld a, [wEnemyMonActualCatchRate] - cp b - jr c, .failedToCapture - -; If W > 255, the ball captures the Pokémon. - ld a, [H_QUOTIENT + 2] - and a - jr nz, .captured - - call Random ; Let this random number be called Rand2. - -; If Rand2 > X, the ball fails to capture the Pokémon. - ld b, a - ld a, [H_QUOTIENT + 3] - cp b - jr c, .failedToCapture - -.captured - jr .skipShakeCalculations - -.failedToCapture - ld a, [H_QUOTIENT + 3] - ld [wPokeBallCaptureCalcTemp], a ; Save X. - -; Calculate CatchRate * 100. - xor a - ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND + 1], a - ld a, [wEnemyMonActualCatchRate] - ld [H_MULTIPLICAND + 2], a - ld a, 100 - ld [H_MULTIPLIER], a - call Multiply - -; Determine BallFactor2. -; Poké Ball: BallFactor2 = 255 -; Great Ball: BallFactor2 = 200 -; Ultra/Safari Ball: BallFactor2 = 150 - ld a, [wcf91] - ld b, 255 - cp POKE_BALL - jr z, .skip4 - ld b, 200 - cp GREAT_BALL - jr z, .skip4 - ld b, 150 - cp ULTRA_BALL - jr z, .skip4 - -.skip4 -; Let Y = (CatchRate * 100) / BallFactor2. Calculate Y. - ld a, b - ld [H_DIVISOR], a - ld b, 4 - call Divide - -; If Y > 255, there are 3 shakes. -; Note that this shouldn't be possible. -; The maximum value of Y is (255 * 100) / 150 = 170. - ld a, [H_QUOTIENT + 2] - and a - ld b, $63 ; 3 shakes - jr nz, .setAnimData - -; Calculate X * Y. - ld a, [wPokeBallCaptureCalcTemp] - ld [H_MULTIPLIER], a - call Multiply - -; Calculate (X * Y) / 255. - ld a, 255 - ld [H_DIVISOR], a - ld b, 4 - call Divide - -; Determine Status2. -; no status ailment: Status2 = 0 -; Burn/Paralysis/Poison: Status2 = 5 -; Freeze/Sleep: Status2 = 10 - ld a, [wEnemyMonStatus] - and a - jr z, .skip5 - and 1 << FRZ | SLP - ld b, 5 - jr z, .addAilmentValue - ld b, 10 - -.addAilmentValue -; If the Pokémon has a status ailment, add Status2. - ld a, [H_QUOTIENT + 3] - add b - ld [H_QUOTIENT + 3], a - -.skip5 -; Finally determine the number of shakes. -; Let Z = ((X * Y) / 255) + Status2 = [H_QUOTIENT + 3]. -; The number of shakes depend on the range Z is in. -; 0 ≤ Z < 10: 0 shakes (the ball misses) -; 10 ≤ Z < 30: 1 shake -; 30 ≤ Z < 70: 2 shakes -; 70 ≤ Z: 3 shakes - ld a, [H_QUOTIENT + 3] - cp 10 - ld b, $20 - jr c, .setAnimData - cp 30 - ld b, $61 - jr c, .setAnimData - cp 70 - ld b, $62 - jr c, .setAnimData - ld b, $63 - -.setAnimData - ld a, b - ld [wPokeBallAnimData], a - -.skipShakeCalculations - ld c, 20 - call DelayFrames - -; Do the animation. - ld a, TOSS_ANIM - ld [wAnimationID], a - xor a - ld [H_WHOSETURN], a - ld [wAnimationType], a - ld [wDamageMultipliers], a - ld a, [wWhichPokemon] - push af - ld a, [wcf91] - push af - predef MoveAnimation - pop af - ld [wcf91], a - pop af - ld [wWhichPokemon], a - -; Determine the message to display from the animation. - ld a, [wPokeBallAnimData] - cp $10 - ld hl, ItemUseBallText00 - jp z, .printMessage - cp $20 - ld hl, ItemUseBallText01 - jp z, .printMessage - cp $61 - ld hl, ItemUseBallText02 - jp z, .printMessage - cp $62 - ld hl, ItemUseBallText03 - jp z, .printMessage - cp $63 - ld hl, ItemUseBallText04 - jp z, .printMessage - -; Save current HP. - ld hl, wEnemyMonHP - ld a, [hli] - push af - ld a, [hli] - push af - -; Save status ailment. - inc hl - ld a, [hl] - push af - - push hl - -; If the Pokémon is transformed, the Pokémon is assumed to be a Ditto. -; This is a bug because a wild Pokémon could have used Transform via -; Mirror Move even though the only wild Pokémon that knows Transform is Ditto. - ld hl, wEnemyBattleStatus3 - bit TRANSFORMED, [hl] - jr z, .notTransformed - ld a, DITTO - ld [wEnemyMonSpecies2], a - jr .skip6 - -.notTransformed -; If the Pokémon is not transformed, set the transformed bit and copy the -; DVs to wTransformedEnemyMonOriginalDVs so that LoadEnemyMonData won't generate -; new DVs. - set TRANSFORMED, [hl] - ld hl, wTransformedEnemyMonOriginalDVs - ld a, [wEnemyMonDVs] - ld [hli], a - ld a, [wEnemyMonDVs + 1] - ld [hl], a - -.skip6 - ld a, [wcf91] - push af - ld a, [wEnemyMonSpecies2] - ld [wcf91], a - ld a, [wEnemyMonLevel] - ld [wCurEnemyLVL], a - callab LoadEnemyMonData - pop af - ld [wcf91], a - pop hl - pop af - ld [hld], a - dec hl - pop af - ld [hld], a - pop af - ld [hl], a - ld a, [wEnemyMonSpecies] - ld [wCapturedMonSpecies], a - ld [wcf91], a - ld [wd11e], a - ld a, [wBattleType] - dec a ; is this the old man battle? - jr z, .oldManCaughtMon ; if so, don't give the player the caught Pokémon - - ld hl, ItemUseBallText05 - call PrintText - -; Add the caught Pokémon to the Pokédex. - predef IndexToPokedex - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_TEST - ld hl, wPokedexOwned - predef FlagActionPredef - ld a, c - push af - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_SET - predef FlagActionPredef - pop af - - and a ; was the Pokémon already in the Pokédex? - jr nz, .skipShowingPokedexData ; if so, don't show the Pokédex data - - ld hl, ItemUseBallText06 - call PrintText - call ClearSprites - ld a, [wEnemyMonSpecies] - ld [wd11e], a - predef ShowPokedexData - -.skipShowingPokedexData - ld a, [wPartyCount] - cp PARTY_LENGTH ; is party full? - jr z, .sendToBox - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - call ClearSprites - call AddPartyMon - jr .done - -.sendToBox - call ClearSprites - call SendNewMonToBox - ld hl, ItemUseBallText07 - CheckEvent EVENT_MET_BILL - jr nz, .printTransferredToPCText - ld hl, ItemUseBallText08 -.printTransferredToPCText - call PrintText - jr .done - -.oldManCaughtMon - ld hl, ItemUseBallText05 - -.printMessage - call PrintText - call ClearSprites - -.done - ld a, [wBattleType] - and a ; is this the old man battle? - ret nz ; if so, don't remove a ball from the bag - -; Remove a ball from the bag. - ld hl, wNumBagItems - inc a - ld [wItemQuantity], a - jp RemoveItemFromInventory - -ItemUseBallText00: -;"It dodged the thrown ball!" -;"This pokemon can't be caught" - TX_FAR _ItemUseBallText00 - db "@" -ItemUseBallText01: -;"You missed the pokemon!" - TX_FAR _ItemUseBallText01 - db "@" -ItemUseBallText02: -;"Darn! The pokemon broke free!" - TX_FAR _ItemUseBallText02 - db "@" -ItemUseBallText03: -;"Aww! It appeared to be caught!" - TX_FAR _ItemUseBallText03 - db "@" -ItemUseBallText04: -;"Shoot! It was so close too!" - TX_FAR _ItemUseBallText04 - db "@" -ItemUseBallText05: -;"All right! {MonName} was caught!" -;play sound - TX_FAR _ItemUseBallText05 - TX_SFX_CAUGHT_MON - TX_BLINK - db "@" -ItemUseBallText07: -;"X was transferred to Bill's PC" - TX_FAR _ItemUseBallText07 - db "@" -ItemUseBallText08: -;"X was transferred to someone's PC" - TX_FAR _ItemUseBallText08 - db "@" - -ItemUseBallText06: -;"New DEX data will be added..." -;play sound - TX_FAR _ItemUseBallText06 - TX_SFX_DEX_PAGE_ADDED - TX_BLINK - db "@" - -ItemUseTownMap: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - jpba DisplayTownMap - -ItemUseBicycle: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - ld a, [wWalkBikeSurfState] - ld [wWalkBikeSurfStateCopy], a - cp 2 ; is the player surfing? - jp z, ItemUseNotTime - dec a ; is player already bicycling? - jr nz, .tryToGetOnBike -.getOffBike - call ItemUseReloadOverworldData - xor a - ld [wWalkBikeSurfState], a ; change player state to walking - call PlayDefaultMusic ; play walking music - ld hl, GotOffBicycleText - jr .printText -.tryToGetOnBike - call IsBikeRidingAllowed - jp nc, NoCyclingAllowedHere - call ItemUseReloadOverworldData - xor a ; no keys pressed - ld [hJoyHeld], a ; current joypad state - inc a - ld [wWalkBikeSurfState], a ; change player state to bicycling - ld hl, GotOnBicycleText - call PlayDefaultMusic ; play bike riding music -.printText - jp PrintText - -; used for Surf out-of-battle effect -ItemUseSurfboard: - ld a, [wWalkBikeSurfState] - ld [wWalkBikeSurfStateCopy], a - cp 2 ; is the player already surfing? - jr z, .tryToStopSurfing -.tryToSurf - call IsNextTileShoreOrWater - jp c, SurfingAttemptFailed - ld hl, TilePairCollisionsWater - call CheckForTilePairCollisions - jp c, SurfingAttemptFailed -.surf - call .makePlayerMoveForward - ld hl, wd730 - set 7, [hl] - ld a, 2 - ld [wWalkBikeSurfState], a ; change player state to surfing - call PlayDefaultMusic ; play surfing music - ld hl, SurfingGotOnText - jp PrintText -.tryToStopSurfing - xor a - ld [hSpriteIndexOrTextID], a - ld d, 16 ; talking range in pixels (normal range) - call IsSpriteInFrontOfPlayer2 - res 7, [hl] - ld a, [hSpriteIndexOrTextID] - and a ; is there a sprite in the way? - jr nz, .cannotStopSurfing - ld hl, TilePairCollisionsWater - call CheckForTilePairCollisions - jr c, .cannotStopSurfing - ld hl, wTilesetCollisionPtr ; pointer to list of passable tiles - ld a, [hli] - ld h, [hl] - ld l, a ; hl now points to passable tiles - ld a, [wTileInFrontOfPlayer] ; tile in front of the player - ld b, a -.passableTileLoop - ld a, [hli] - cp b - jr z, .stopSurfing - cp $ff - jr nz, .passableTileLoop -.cannotStopSurfing - ld hl, SurfingNoPlaceToGetOffText - jp PrintText -.stopSurfing - call .makePlayerMoveForward - ld hl, wd730 - set 7, [hl] - xor a - ld [wWalkBikeSurfState], a ; change player state to walking - dec a - ld [wJoyIgnore], a - call PlayDefaultMusic ; play walking music - jp LoadWalkingPlayerSpriteGraphics -; uses a simulated button press to make the player move forward -.makePlayerMoveForward - ld a, [wPlayerDirection] ; direction the player is going - bit PLAYER_DIR_BIT_UP, a - ld b, D_UP - jr nz, .storeSimulatedButtonPress - bit PLAYER_DIR_BIT_DOWN, a - ld b, D_DOWN - jr nz, .storeSimulatedButtonPress - bit PLAYER_DIR_BIT_LEFT, a - ld b, D_LEFT - jr nz, .storeSimulatedButtonPress - ld b, D_RIGHT -.storeSimulatedButtonPress - ld a, b - ld [wSimulatedJoypadStatesEnd], a - xor a - ld [wWastedByteCD39], a - inc a - ld [wSimulatedJoypadStatesIndex], a - ret - -SurfingGotOnText: - TX_FAR _SurfingGotOnText - db "@" - -SurfingNoPlaceToGetOffText: - TX_FAR _SurfingNoPlaceToGetOffText - db "@" - -ItemUsePokedex: - predef_jump ShowPokedexMenu - -ItemUseEvoStone: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - ld a, [wWhichPokemon] - push af - ld a, [wcf91] - ld [wEvoStoneItemID], a - push af - ld a, EVO_STONE_PARTY_MENU - ld [wPartyMenuTypeOrMessageID], a - ld a, $ff - ld [wUpdateSpritesEnabled], a - call DisplayPartyMenu - pop bc - jr c, .canceledItemUse - ld a, b - ld [wcf91], a - ld a, $01 - ld [wForceEvolution], a - ld a, SFX_HEAL_AILMENT - call PlaySoundWaitForCurrent - call WaitForSoundToFinish - callab TryEvolvingMon ; try to evolve pokemon - ld a, [wEvolutionOccurred] - and a - jr z, .noEffect - pop af - ld [wWhichPokemon], a - ld hl, wNumBagItems - ld a, 1 ; remove 1 stone - ld [wItemQuantity], a - jp RemoveItemFromInventory -.noEffect - call ItemUseNoEffect -.canceledItemUse - xor a - ld [wActionResultOrTookBattleTurn], a ; item not used - pop af - ret - -ItemUseVitamin: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - -ItemUseMedicine: - ld a, [wPartyCount] - and a - jp z, .emptyParty - ld a, [wWhichPokemon] - push af - ld a, [wcf91] - push af - ld a, USE_ITEM_PARTY_MENU - ld [wPartyMenuTypeOrMessageID], a - ld a, $ff - ld [wUpdateSpritesEnabled], a - ld a, [wPseudoItemID] - and a ; using Softboiled? - jr z, .notUsingSoftboiled -; if using softboiled - call GoBackToPartyMenu - jr .getPartyMonDataAddress -.emptyParty - ld hl, .emptyPartyText - xor a - ld [wActionResultOrTookBattleTurn], a ; item use failed - jp PrintText -.emptyPartyText - text "You don't have" - line "any #MON!" - prompt -.notUsingSoftboiled - call DisplayPartyMenu -.getPartyMonDataAddress - jp c, .canceledItemUse - ld hl, wPartyMons - ld bc, wPartyMon2 - wPartyMon1 - ld a, [wWhichPokemon] - call AddNTimes - ld a, [wWhichPokemon] - ld [wUsedItemOnWhichPokemon], a - ld d, a - ld a, [wcf91] - ld e, a - ld [wd0b5], a - pop af - ld [wcf91], a - pop af - ld [wWhichPokemon], a - ld a, [wPseudoItemID] - and a ; using Softboiled? - jr z, .checkItemType -; if using softboiled - ld a, [wWhichPokemon] - cp d ; is the pokemon trying to use softboiled on itself? - jr z, ItemUseMedicine ; if so, force another choice -.checkItemType - ld a, [wcf91] - cp REVIVE - jr nc, .healHP ; if it's a Revive or Max Revive - cp FULL_HEAL - jr z, .cureStatusAilment ; if it's a Full Heal - cp HP_UP - jp nc, .useVitamin ; if it's a vitamin or Rare Candy - cp FULL_RESTORE - jr nc, .healHP ; if it's a Full Restore or one of the potions -; fall through if it's one of the status-specific healing items -.cureStatusAilment - ld bc, wPartyMon1Status - wPartyMon1 - add hl, bc ; hl now points to status - ld a, [wcf91] - lb bc, ANTIDOTE_MSG, 1 << PSN - cp ANTIDOTE - jr z, .checkMonStatus - lb bc, BURN_HEAL_MSG, 1 << BRN - cp BURN_HEAL - jr z, .checkMonStatus - lb bc, ICE_HEAL_MSG, 1 << FRZ - cp ICE_HEAL - jr z, .checkMonStatus - lb bc, AWAKENING_MSG, SLP - cp AWAKENING - jr z, .checkMonStatus - lb bc, PARALYZ_HEAL_MSG, 1 << PAR - cp PARLYZ_HEAL - jr z, .checkMonStatus - lb bc, FULL_HEAL_MSG, $ff ; Full Heal -.checkMonStatus - ld a, [hl] ; pokemon's status - and c ; does the pokemon have a status ailment the item can cure? - jp z, .healingItemNoEffect -; if the pokemon has a status the item can heal - xor a - ld [hl], a ; remove the status ailment in the party data - ld a, b - ld [wPartyMenuTypeOrMessageID], a ; the message to display for the item used - ld a, [wPlayerMonNumber] - cp d ; is pokemon the item was used on active in battle? - jp nz, .doneHealing -; if it is active in battle - xor a - ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data - push hl - ld hl, wPlayerBattleStatus3 - res BADLY_POISONED, [hl] ; heal Toxic status - pop hl - ld bc, wPartyMon1Stats - wPartyMon1Status - add hl, bc ; hl now points to party stats - ld de, wBattleMonStats - ld bc, NUM_STATS * 2 - call CopyData ; copy party stats to in-battle stat data - predef DoubleOrHalveSelectedStats - jp .doneHealing -.healHP - inc hl ; hl = address of current HP - ld a, [hli] - ld b, a - ld [wHPBarOldHP+1], a - ld a, [hl] - ld c, a - ld [wHPBarOldHP], a ; current HP stored at wHPBarOldHP (2 bytes, big-endian) - or b - jr nz, .notFainted -.fainted - ld a, [wcf91] - cp REVIVE - jr z, .updateInBattleFaintedData - cp MAX_REVIVE - jr z, .updateInBattleFaintedData - jp .healingItemNoEffect -.updateInBattleFaintedData - ld a, [wIsInBattle] - and a - jr z, .compareCurrentHPToMaxHP - push hl - push de - push bc - ld a, [wUsedItemOnWhichPokemon] - ld c, a - ld hl, wPartyFoughtCurrentEnemyFlags - ld b, FLAG_TEST - predef FlagActionPredef - ld a, c - and a - jr z, .next - ld a, [wUsedItemOnWhichPokemon] - ld c, a - ld hl, wPartyGainExpFlags - ld b, FLAG_SET - predef FlagActionPredef -.next - pop bc - pop de - pop hl - jr .compareCurrentHPToMaxHP -.notFainted - ld a, [wcf91] - cp REVIVE - jp z, .healingItemNoEffect - cp MAX_REVIVE - jp z, .healingItemNoEffect -.compareCurrentHPToMaxHP - push hl - push bc - ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) - add hl, bc ; hl now points to max HP - pop bc - ld a, [hli] - cp b - jr nz, .skipComparingLSB ; no need to compare the LSB's if the MSB's don't match - ld a, [hl] - cp c -.skipComparingLSB - pop hl - jr nz, .notFullHP -.fullHP ; if the pokemon's current HP equals its max HP - ld a, [wcf91] - cp FULL_RESTORE - jp nz, .healingItemNoEffect - inc hl - inc hl - ld a, [hld] ; status ailment - and a ; does the pokemon have a status ailment? - jp z, .healingItemNoEffect - ld a, FULL_HEAL - ld [wcf91], a - dec hl - dec hl - dec hl - jp .cureStatusAilment -.notFullHP ; if the pokemon's current HP doesn't equal its max HP - xor a - ld [wDanger], a ;disable low health alarm - ld [wChannelSoundIDs + Ch4], a - push hl - push de - ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) - add hl, bc ; hl now points to max HP - ld a, [hli] - ld [wHPBarMaxHP+1], a - ld a, [hl] - ld [wHPBarMaxHP], a ; max HP stored at wHPBarMaxHP (2 bytes, big-endian) - ld a, [wPseudoItemID] - and a ; using Softboiled? - jp z, .notUsingSoftboiled2 -; if using softboiled - ld hl, wHPBarMaxHP - ld a, [hli] - push af - ld a, [hli] - push af - ld a, [hli] - push af - ld a, [hl] - push af - ld hl, wPartyMon1MaxHP - ld a, [wWhichPokemon] - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld a, [hli] - ld [wHPBarMaxHP + 1], a - ld [H_DIVIDEND], a - ld a, [hl] - ld [wHPBarMaxHP], a - ld [H_DIVIDEND + 1], a - ld a, 5 - ld [H_DIVISOR], a - ld b, 2 ; number of bytes - call Divide ; get 1/5 of max HP of pokemon that used Softboiled - ld bc, (wPartyMon1HP + 1) - (wPartyMon1MaxHP + 1) - add hl, bc ; hl now points to LSB of current HP of pokemon that used Softboiled -; subtract 1/5 of max HP from current HP of pokemon that used Softboiled - ld a, [H_QUOTIENT + 3] - push af - ld b, a - ld a, [hl] - ld [wHPBarOldHP], a - sub b - ld [hld], a - ld [wHPBarNewHP], a - ld a, [H_QUOTIENT + 2] - ld b, a - ld a, [hl] - ld [wHPBarOldHP+1], a - sbc b - ld [hl], a - ld [wHPBarNewHP+1], a - coord hl, 4, 1 - ld a, [wWhichPokemon] - ld bc, 2 * SCREEN_WIDTH - call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled - ld a, SFX_HEAL_HP - call PlaySoundWaitForCurrent - ld a, [hFlags_0xFFF6] - set 0, a - ld [hFlags_0xFFF6], a - ld a, $02 - ld [wHPBarType], a - predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled - ld a, [hFlags_0xFFF6] - res 0, a - ld [hFlags_0xFFF6], a - pop af - ld b, a ; store heal amount (1/5 of max HP) - ld hl, wHPBarOldHP + 1 - pop af - ld [hld], a - pop af - ld [hld], a - pop af - ld [hld], a - pop af - ld [hl], a - jr .addHealAmount -.notUsingSoftboiled2 - ld a, [wcf91] - cp SODA_POP - ld b, 60 ; Soda Pop heal amount - jr z, .addHealAmount - ld b, 80 ; Lemonade heal amount - jr nc, .addHealAmount - cp FRESH_WATER - ld b, 50 ; Fresh Water heal amount - jr z, .addHealAmount - cp SUPER_POTION - ld b, 200 ; Hyper Potion heal amount - jr c, .addHealAmount - ld b, 50 ; Super Potion heal amount - jr z, .addHealAmount - ld b, 20 ; Potion heal amount -.addHealAmount - pop de - pop hl - ld a, [hl] - add b - ld [hld], a - ld [wHPBarNewHP], a - ld a, [hl] - ld [wHPBarNewHP+1], a - jr nc, .noCarry - inc [hl] - ld a, [hl] - ld [wHPBarNewHP + 1], a -.noCarry - push de - inc hl - ld d, h - ld e, l ; de now points to current HP - ld hl, (wPartyMon1MaxHP + 1) - (wPartyMon1HP + 1) - add hl, de ; hl now points to max HP - ld a, [wcf91] - cp REVIVE - jr z, .setCurrentHPToHalfMaxHP - ld a, [hld] - ld b, a - ld a, [de] - sub b - dec de - ld b, [hl] - ld a, [de] - sbc b - jr nc, .setCurrentHPToMaxHp ; if current HP exceeds max HP after healing - ld a, [wcf91] - cp HYPER_POTION - jr c, .setCurrentHPToMaxHp ; if using a Full Restore or Max Potion - cp MAX_REVIVE - jr z, .setCurrentHPToMaxHp ; if using a Max Revive - jr .updateInBattleData -.setCurrentHPToHalfMaxHP - dec hl - dec de - ld a, [hli] - srl a - ld [de], a - ld [wHPBarNewHP+1], a - ld a, [hl] - rr a - inc de - ld [de], a - ld [wHPBarNewHP], a - dec de - jr .doneHealingPartyHP -.setCurrentHPToMaxHp - ld a, [hli] - ld [de], a - ld [wHPBarNewHP+1], a - inc de - ld a, [hl] - ld [de], a - ld [wHPBarNewHP], a - dec de -.doneHealingPartyHP ; done updating the pokemon's current HP in the party data structure - ld a, [wcf91] - cp FULL_RESTORE - jr nz, .updateInBattleData - ld bc, wPartyMon1Status - (wPartyMon1MaxHP + 1) - add hl, bc - xor a - ld [hl], a ; remove the status ailment in the party data -.updateInBattleData - ld h, d - ld l, e - pop de - ld a, [wPlayerMonNumber] - cp d ; is pokemon the item was used on active in battle? - jr nz, .calculateHPBarCoords -; copy party HP to in-battle HP - ld a, [hli] - ld [wBattleMonHP], a - ld a, [hld] - ld [wBattleMonHP + 1], a - ld a, [wcf91] - cp FULL_RESTORE - jr nz, .calculateHPBarCoords - xor a - ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data -.calculateHPBarCoords - ld hl, wOAMBuffer + $90 - ld bc, 2 * SCREEN_WIDTH - inc d -.calculateHPBarCoordsLoop - add hl, bc - dec d - jr nz, .calculateHPBarCoordsLoop - jr .doneHealing -.healingItemNoEffect - call ItemUseNoEffect - jp .done -.doneHealing - ld a, [wPseudoItemID] - and a ; using Softboiled? - jr nz, .skipRemovingItem ; no item to remove if using Softboiled - push hl - call RemoveUsedItem - pop hl -.skipRemovingItem - ld a, [wcf91] - cp FULL_RESTORE - jr c, .playStatusAilmentCuringSound - cp FULL_HEAL - jr z, .playStatusAilmentCuringSound - ld a, SFX_HEAL_HP - call PlaySoundWaitForCurrent - ld a, [hFlags_0xFFF6] - set 0, a - ld [hFlags_0xFFF6], a - ld a, $02 - ld [wHPBarType], a - predef UpdateHPBar2 ; animate the HP bar lengthening - ld a, [hFlags_0xFFF6] - res 0, a - ld [hFlags_0xFFF6], a - ld a, REVIVE_MSG - ld [wPartyMenuTypeOrMessageID], a - ld a, [wcf91] - cp REVIVE - jr z, .showHealingItemMessage - cp MAX_REVIVE - jr z, .showHealingItemMessage - ld a, POTION_MSG - ld [wPartyMenuTypeOrMessageID], a - jr .showHealingItemMessage -.playStatusAilmentCuringSound - ld a, SFX_HEAL_AILMENT - call PlaySoundWaitForCurrent -.showHealingItemMessage - xor a - ld [H_AUTOBGTRANSFERENABLED], a - call ClearScreen - dec a - ld [wUpdateSpritesEnabled], a - call RedrawPartyMenu ; redraws the party menu and displays the message - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a - ld c, 50 - call DelayFrames - call WaitForTextScrollButtonPress - jr .done -.canceledItemUse - xor a - ld [wActionResultOrTookBattleTurn], a ; item use failed - pop af - pop af -.done - ld a, [wPseudoItemID] - and a ; using Softboiled? - ret nz ; if so, return - call GBPalWhiteOut - call z, RunDefaultPaletteCommand - ld a, [wIsInBattle] - and a - ret nz - jp ReloadMapData -.useVitamin - push hl - ld a, [hl] - ld [wd0b5], a - ld [wd11e], a - ld bc, wPartyMon1Level - wPartyMon1 - add hl, bc ; hl now points to level - ld a, [hl] ; a = level - ld [wCurEnemyLVL], a ; store level - call GetMonHeader - push de - ld a, d - ld hl, wPartyMonNicks - call GetPartyMonName - pop de - pop hl - ld a, [wcf91] - cp RARE_CANDY - jp z, .useRareCandy - push hl - sub HP_UP - add a - ld bc, wPartyMon1HPExp - wPartyMon1 - add hl, bc - add l - ld l, a - jr nc, .noCarry2 - inc h -.noCarry2 - ld a, 10 - ld b, a - ld a, [hl] ; a = MSB of stat experience of the appropriate stat - cp 100 ; is there already at least 25600 (256 * 100) stat experience? - jr nc, .vitaminNoEffect ; if so, vitamins can't add any more - add b ; add 2560 (256 * 10) stat experience - jr nc, .noCarry3 ; a carry should be impossible here, so this will always jump - ld a, 255 -.noCarry3 - ld [hl], a - pop hl - call .recalculateStats - ld hl, VitaminText - ld a, [wcf91] - sub HP_UP - 1 - ld c, a -.statNameLoop ; loop to get the address of the name of the stat the vitamin increases - dec c - jr z, .gotStatName -.statNameInnerLoop - ld a, [hli] - ld b, a - ld a, $50 - cp b - jr nz, .statNameInnerLoop - jr .statNameLoop -.gotStatName - ld de, wcf4b - ld bc, 10 - call CopyData ; copy the stat's name to wcf4b - ld a, SFX_HEAL_AILMENT - call PlaySound - ld hl, VitaminStatRoseText - call PrintText - jp RemoveUsedItem -.vitaminNoEffect - pop hl - ld hl, VitaminNoEffectText - call PrintText - jp GBPalWhiteOut -.recalculateStats - ld bc, wPartyMon1Stats - wPartyMon1 - add hl, bc - ld d, h - ld e, l ; de now points to stats - ld bc, (wPartyMon1Exp + 2) - wPartyMon1Stats - add hl, bc ; hl now points to LSB of experience - ld b, 1 - jp CalcStats ; recalculate stats -.useRareCandy - push hl - ld bc, wPartyMon1Level - wPartyMon1 - add hl, bc ; hl now points to level - ld a, [hl] ; a = level - cp MAX_LEVEL - jr z, .vitaminNoEffect ; can't raise level above 100 - inc a - ld [hl], a ; store incremented level - ld [wCurEnemyLVL], a - push hl - push de - ld d, a - callab CalcExperience ; calculate experience for next level and store it at $ff96 - pop de - pop hl - ld bc, wPartyMon1Exp - wPartyMon1Level - add hl, bc ; hl now points to MSB of experience -; update experience to minimum for new level - ld a, [hExperience] - ld [hli], a - ld a, [hExperience + 1] - ld [hli], a - ld a, [hExperience + 2] - ld [hl], a - pop hl - ld a, [wWhichPokemon] - push af - ld a, [wcf91] - push af - push de - push hl - ld bc, wPartyMon1MaxHP - wPartyMon1 - add hl, bc ; hl now points to MSB of max HP - ld a, [hli] - ld b, a - ld c, [hl] - pop hl - push bc - push hl - call .recalculateStats - pop hl - ld bc, (wPartyMon1MaxHP + 1) - wPartyMon1 - add hl, bc ; hl now points to LSB of max HP - pop bc - ld a, [hld] - sub c - ld c, a - ld a, [hl] - sbc b - ld b, a ; bc = the amount of max HP gained from leveling up -; add the amount gained to the current HP - ld de, (wPartyMon1HP + 1) - wPartyMon1MaxHP - add hl, de ; hl now points to LSB of current HP - ld a, [hl] - add c - ld [hld], a - ld a, [hl] - adc b - ld [hl], a - ld a, RARE_CANDY_MSG - ld [wPartyMenuTypeOrMessageID], a - call RedrawPartyMenu - pop de - ld a, d - ld [wWhichPokemon], a - ld a, e - ld [wd11e], a - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - call LoadMonData - ld d, $01 - callab PrintStatsBox ; display new stats text box - call WaitForTextScrollButtonPress ; wait for button press - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - predef LearnMoveFromLevelUp ; learn level up move, if any - xor a - ld [wForceEvolution], a - callab TryEvolvingMon ; evolve pokemon, if appropriate - ld a, $01 - ld [wUpdateSpritesEnabled], a - pop af - ld [wcf91], a - pop af - ld [wWhichPokemon], a - jp RemoveUsedItem - -VitaminStatRoseText: - TX_FAR _VitaminStatRoseText - db "@" - -VitaminNoEffectText: - TX_FAR _VitaminNoEffectText - db "@" - -VitaminText: - db "HEALTH@" - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" - -ItemUseBait: - ld hl, ThrewBaitText - call PrintText - ld hl, wEnemyMonActualCatchRate ; catch rate - srl [hl] ; halve catch rate - ld a, BAIT_ANIM - ld hl, wSafariBaitFactor ; bait factor - ld de, wSafariEscapeFactor ; escape factor - jr BaitRockCommon - -ItemUseRock: - ld hl, ThrewRockText - call PrintText - ld hl, wEnemyMonActualCatchRate ; catch rate - ld a, [hl] - add a ; double catch rate - jr nc, .noCarry - ld a, $ff -.noCarry - ld [hl], a - ld a, ROCK_ANIM - ld hl, wSafariEscapeFactor ; escape factor - ld de, wSafariBaitFactor ; bait factor - -BaitRockCommon: - ld [wAnimationID], a - xor a - ld [wAnimationType], a - ld [H_WHOSETURN], a - ld [de], a ; zero escape factor (for bait), zero bait factor (for rock) -.randomLoop ; loop until a random number less than 5 is generated - call Random - and 7 - cp 5 - jr nc, .randomLoop - inc a ; increment the random number, giving a range from 1 to 5 inclusive - ld b, a - ld a, [hl] - add b ; increase bait factor (for bait), increase escape factor (for rock) - jr nc, .noCarry - ld a, $ff -.noCarry - ld [hl], a - predef MoveAnimation ; do animation - ld c, 70 - jp DelayFrames - -ThrewBaitText: - TX_FAR _ThrewBaitText - db "@" - -ThrewRockText: - TX_FAR _ThrewRockText - db "@" - -; also used for Dig out-of-battle effect -ItemUseEscapeRope: - ld a, [wIsInBattle] - and a - jr nz, .notUsable - ld a, [wCurMap] - cp AGATHAS_ROOM - jr z, .notUsable - ld a, [wCurMapTileset] - ld b, a - ld hl, EscapeRopeTilesets -.loop - ld a, [hli] - cp $ff - jr z, .notUsable - cp b - jr nz, .loop - ld hl, wd732 - set 3, [hl] - set 6, [hl] - ld hl, wd72e - res 4, [hl] - ResetEvent EVENT_IN_SAFARI_ZONE - xor a - ld [wNumSafariBalls], a - ld [wSafariZoneGateCurScript], a - inc a - ld [wEscapedFromBattle], a - ld [wActionResultOrTookBattleTurn], a ; item used - ld a, [wPseudoItemID] - and a ; using Dig? - ret nz ; if so, return - call ItemUseReloadOverworldData - ld c, 30 - call DelayFrames - jp RemoveUsedItem -.notUsable - jp ItemUseNotTime - -EscapeRopeTilesets: - db FOREST, CEMETERY, CAVERN, FACILITY, INTERIOR - db $ff ; terminator - -ItemUseRepel: - ld b, 100 - -ItemUseRepelCommon: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - ld a, b - ld [wRepelRemainingSteps], a - jp PrintItemUseTextAndRemoveItem - -; handles X Accuracy item -ItemUseXAccuracy: - ld a, [wIsInBattle] - and a - jp z, ItemUseNotTime - ld hl, wPlayerBattleStatus2 - set USING_X_ACCURACY, [hl] ; X Accuracy bit - jp PrintItemUseTextAndRemoveItem - -; This function is bugged and never works. It always jumps to ItemUseNotTime. -; The Card Key is handled in a different way. -ItemUseCardKey: - xor a - ld [wUnusedD71F], a - call GetTileAndCoordsInFrontOfPlayer - ld a, [GetTileAndCoordsInFrontOfPlayer] - cp $18 - jr nz, .next0 - ld hl, CardKeyTable1 - jr .next1 -.next0 - cp $24 - jr nz, .next2 - ld hl, CardKeyTable2 - jr .next1 -.next2 - cp $5e - jp nz, ItemUseNotTime - ld hl, CardKeyTable3 -.next1 - ld a, [wCurMap] - ld b, a -.loop - ld a, [hli] - cp $ff - jp z, ItemUseNotTime - cp b - jr nz, .nextEntry1 - ld a, [hli] - cp d - jr nz, .nextEntry2 - ld a, [hli] - cp e - jr nz, .nextEntry3 - ld a, [hl] - ld [wUnusedD71F], a - jr .done -.nextEntry1 - inc hl -.nextEntry2 - inc hl -.nextEntry3 - inc hl - jr .loop -.done - ld hl, ItemUseText00 - call PrintText - ld hl, wd728 - set 7, [hl] - ret - -; These tables are probably supposed to be door locations in Silph Co., -; but they are unused. -; The reason there are 3 tables is unknown. - -; Format: -; 00: Map ID -; 01: Y -; 02: X -; 03: ID? - -CardKeyTable1: - db SILPH_CO_2F,$04,$04,$00 - db SILPH_CO_2F,$04,$05,$01 - db SILPH_CO_4F,$0C,$04,$02 - db SILPH_CO_4F,$0C,$05,$03 - db SILPH_CO_7F,$06,$0A,$04 - db SILPH_CO_7F,$06,$0B,$05 - db SILPH_CO_9F,$04,$12,$06 - db SILPH_CO_9F,$04,$13,$07 - db SILPH_CO_10F,$08,$0A,$08 - db SILPH_CO_10F,$08,$0B,$09 - db $ff - -CardKeyTable2: - db SILPH_CO_3F,$08,$09,$0A - db SILPH_CO_3F,$09,$09,$0B - db SILPH_CO_5F,$04,$07,$0C - db SILPH_CO_5F,$05,$07,$0D - db SILPH_CO_6F,$0C,$05,$0E - db SILPH_CO_6F,$0D,$05,$0F - db SILPH_CO_8F,$08,$07,$10 - db SILPH_CO_8F,$09,$07,$11 - db SILPH_CO_9F,$08,$03,$12 - db SILPH_CO_9F,$09,$03,$13 - db $ff - -CardKeyTable3: - db SILPH_CO_11F,$08,$09,$14 - db SILPH_CO_11F,$09,$09,$15 - db $ff - -ItemUsePokedoll: - ld a, [wIsInBattle] - dec a - jp nz, ItemUseNotTime - ld a, $01 - ld [wEscapedFromBattle], a - jp PrintItemUseTextAndRemoveItem - -ItemUseGuardSpec: - ld a, [wIsInBattle] - and a - jp z, ItemUseNotTime - ld hl, wPlayerBattleStatus2 - set PROTECTED_BY_MIST, [hl] ; Mist bit - jp PrintItemUseTextAndRemoveItem - -ItemUseSuperRepel: - ld b, 200 - jp ItemUseRepelCommon - -ItemUseMaxRepel: - ld b, 250 - jp ItemUseRepelCommon - -ItemUseDireHit: - ld a, [wIsInBattle] - and a - jp z, ItemUseNotTime - ld hl, wPlayerBattleStatus2 - set GETTING_PUMPED, [hl] ; Focus Energy bit - jp PrintItemUseTextAndRemoveItem - -ItemUseXStat: - ld a, [wIsInBattle] - and a - jr nz, .inBattle - call ItemUseNotTime - ld a, 2 - ld [wActionResultOrTookBattleTurn], a ; item not used - ret -.inBattle - ld hl, wPlayerMoveNum - ld a, [hli] - push af ; save [wPlayerMoveNum] - ld a, [hl] - push af ; save [wPlayerMoveEffect] - push hl - ld a, [wcf91] - sub X_ATTACK - ATTACK_UP1_EFFECT - ld [hl], a ; store player move effect - call PrintItemUseTextAndRemoveItem - ld a, XSTATITEM_ANIM ; X stat item animation ID - ld [wPlayerMoveNum], a - call LoadScreenTilesFromBuffer1 ; restore saved screen - call Delay3 - xor a - ld [H_WHOSETURN], a ; set turn to player's turn - callba StatModifierUpEffect ; do stat increase move - pop hl - pop af - ld [hld], a ; restore [wPlayerMoveEffect] - pop af - ld [hl], a ; restore [wPlayerMoveNum] - ret - -ItemUsePokeflute: - ld a, [wIsInBattle] - and a - jr nz, .inBattle -; if not in battle - call ItemUseReloadOverworldData - ld a, [wCurMap] - cp ROUTE_12 - jr nz, .notRoute12 - CheckEvent EVENT_BEAT_ROUTE12_SNORLAX - jr nz, .noSnorlaxToWakeUp -; if the player hasn't beaten Route 12 Snorlax - ld hl, Route12SnorlaxFluteCoords - call ArePlayerCoordsInArray - jr nc, .noSnorlaxToWakeUp - ld hl, PlayedFluteHadEffectText - call PrintText - SetEvent EVENT_FIGHT_ROUTE12_SNORLAX - ret -.notRoute12 - cp ROUTE_16 - jr nz, .noSnorlaxToWakeUp - CheckEvent EVENT_BEAT_ROUTE16_SNORLAX - jr nz, .noSnorlaxToWakeUp -; if the player hasn't beaten Route 16 Snorlax - ld hl, Route16SnorlaxFluteCoords - call ArePlayerCoordsInArray - jr nc, .noSnorlaxToWakeUp - ld hl, PlayedFluteHadEffectText - call PrintText - SetEvent EVENT_FIGHT_ROUTE16_SNORLAX - ret -.noSnorlaxToWakeUp - ld hl, PlayedFluteNoEffectText - jp PrintText -.inBattle - xor a - ld [wWereAnyMonsAsleep], a - ld b, ~SLP & $ff - ld hl, wPartyMon1Status - call WakeUpEntireParty - ld a, [wIsInBattle] - dec a ; is it a trainer battle? - jr z, .skipWakingUpEnemyParty -; if it's a trainer battle - ld hl, wEnemyMon1Status - call WakeUpEntireParty -.skipWakingUpEnemyParty - ld hl, wBattleMonStatus - ld a, [hl] - and b ; remove Sleep status - ld [hl], a - ld hl, wEnemyMonStatus - ld a, [hl] - and b ; remove Sleep status - ld [hl], a - call LoadScreenTilesFromBuffer2 ; restore saved screen - ld a, [wWereAnyMonsAsleep] - and a ; were any pokemon asleep before playing the flute? - ld hl, PlayedFluteNoEffectText - jp z, PrintText ; if no pokemon were asleep -; if some pokemon were asleep - ld hl, PlayedFluteHadEffectText - call PrintText - ld a, [wDanger] - and $80 - jr nz, .skipMusic - call WaitForSoundToFinish ; wait for sound to end - ;callba Music_PokeFluteInBattle ; play in-battle pokeflute music ; XXX -.musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch6] - and a ; music off? - jr nz, .musicWaitLoop -.skipMusic - ld hl, FluteWokeUpText - jp PrintText - -; wakes up all party pokemon -; INPUT: -; hl must point to status of first pokemon in party (player's or enemy's) -; b must equal ~SLP -; [wWereAnyMonsAsleep] should be initialized to 0 -; OUTPUT: -; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep -WakeUpEntireParty: - ld de, 44 - ld c, 6 -.loop - ld a, [hl] - push af - and SLP ; is pokemon asleep? - jr z, .notAsleep - ld a, 1 - ld [wWereAnyMonsAsleep], a ; indicate that a pokemon had to be woken up -.notAsleep - pop af - and b ; remove Sleep status - ld [hl], a - add hl, de - dec c - jr nz, .loop - ret - -; Format: -; 00: Y -; 01: X -Route12SnorlaxFluteCoords: - db 62,9 ; one space West of Snorlax - db 61,10 ; one space North of Snorlax - db 63,10 ; one space South of Snorlax - db 62,11 ; one space East of Snorlax - db $ff ; terminator - -; Format: -; 00: Y -; 01: X -Route16SnorlaxFluteCoords: - db 10,27 ; one space East of Snorlax - db 10,25 ; one space West of Snorlax - db $ff ; terminator - -PlayedFluteNoEffectText: - TX_FAR _PlayedFluteNoEffectText - db "@" - -FluteWokeUpText: - TX_FAR _FluteWokeUpText - db "@" - -PlayedFluteHadEffectText: - TX_FAR _PlayedFluteHadEffectText - TX_BLINK - TX_ASM - ld a, [wIsInBattle] - and a - jr nz, .done -; play out-of-battle pokeflute music - ld a, $ff - call PlaySound ; turn off music - ld a, SFX_POKEFLUTE - ld c, 0 ; BANK(SFX_Pokeflute) - call PlaySound - call WaitForSoundToFinish - call PlayDefaultMusic ; start playing normal music again -.done - jp TextScriptEnd ; end text - -ItemUseCoinCase: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - ld hl, CoinCaseNumCoinsText - jp PrintText - -CoinCaseNumCoinsText: - TX_FAR _CoinCaseNumCoinsText - db "@" - -ItemUseOldRod: - call FishingInit - jp c, ItemUseNotTime - lb bc, 5, MAGIKARP - ld a, $1 ; set bite - jr RodResponse - -ItemUseGoodRod: - call FishingInit - jp c, ItemUseNotTime -.RandomLoop - call Random - srl a - jr c, .SetBite - and %11 - cp 2 - jr nc, .RandomLoop - ; choose which monster appears - ld hl, GoodRodMons - add a - ld c, a - ld b, 0 - add hl, bc - ld b, [hl] - inc hl - ld c, [hl] - and a -.SetBite - ld a, 0 - rla - xor 1 - jr RodResponse - -INCLUDE "data/good_rod.asm" - -ItemUseSuperRod: - call FishingInit - jp c, ItemUseNotTime - call ReadSuperRodData - ld a, e -RodResponse: - ld [wRodResponse], a - - dec a ; is there a bite? - jr nz, .next - ; if yes, store level and species data - ld a, 1 - ld [wMoveMissed], a - ld a, b ; level - ld [wCurEnemyLVL], a - ld a, c ; species - ld [wCurOpponent], a - -.next - ld hl, wWalkBikeSurfState - ld a, [hl] ; store the value in a - push af - push hl - ld [hl], 0 - callba FishingAnim - pop hl - pop af - ld [hl], a - ret - -; checks if fishing is possible and if so, runs initialization code common to all rods -; unsets carry if fishing is possible, sets carry if not -FishingInit: - ld a, [wIsInBattle] - and a - jr z, .notInBattle - scf ; can't fish during battle - ret -.notInBattle - call IsNextTileShoreOrWater - ret c - ld a, [wWalkBikeSurfState] - cp 2 ; Surfing? - jr z, .surfing - call ItemUseReloadOverworldData - ld hl, ItemUseText00 - call PrintText - ld a, SFX_HEAL_AILMENT - call PlaySound - ld c, 80 - call DelayFrames - and a - ret -.surfing - scf ; can't fish when surfing - ret - -ItemUseOaksParcel: - jp ItemUseNotYoursToUse - -ItemUseItemfinder: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - call ItemUseReloadOverworldData - callba HiddenItemNear ; check for hidden items - ld hl, ItemfinderFoundNothingText - jr nc, .printText ; if no hidden items - ld c, 4 -.loop - ld a, SFX_HEALING_MACHINE - call PlaySoundWaitForCurrent - ld a, SFX_PURCHASE - call PlaySoundWaitForCurrent - dec c - jr nz, .loop - ld hl, ItemfinderFoundItemText -.printText - jp PrintText - -ItemfinderFoundItemText: - TX_FAR _ItemfinderFoundItemText - db "@" - -ItemfinderFoundNothingText: - TX_FAR _ItemfinderFoundNothingText - db "@" - -ItemUsePPUp: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - -ItemUsePPRestore: - ld a, [wWhichPokemon] - push af - ld a, [wcf91] - ld [wPPRestoreItem], a -.chooseMon - xor a - ld [wUpdateSpritesEnabled], a - ld a, USE_ITEM_PARTY_MENU - ld [wPartyMenuTypeOrMessageID], a - call DisplayPartyMenu - jr nc, .chooseMove - jp .itemNotUsed -.chooseMove - ld a, [wPPRestoreItem] - cp ELIXER - jp nc, .useElixir ; if Elixir or Max Elixir - ld a, $02 - ld [wMoveMenuType], a - ld hl, RaisePPWhichTechniqueText - ld a, [wPPRestoreItem] - cp ETHER ; is it a PP Up? - jr c, .printWhichTechniqueMessage ; if so, print the raise PP message - ld hl, RestorePPWhichTechniqueText ; otherwise, print the restore PP message -.printWhichTechniqueMessage - call PrintText - xor a - ld [wPlayerMoveListIndex], a - callab MoveSelectionMenu ; move selection menu - ld a, 0 - ld [wPlayerMoveListIndex], a - jr nz, .chooseMon - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - call GetSelectedMoveOffset - push hl - ld a, [hl] - ld [wd11e], a - call GetMoveName - call CopyStringToCF4B ; copy name to wcf4b - pop hl - ld a, [wPPRestoreItem] - cp ETHER - jr nc, .useEther ; if Ether or Max Ether -.usePPUp - ld bc, wPartyMon1PP - wPartyMon1Moves - add hl, bc - ld a, [hl] ; move PP - cp 3 << 6 ; have 3 PP Ups already been used? - jr c, .PPNotMaxedOut - ld hl, PPMaxedOutText - call PrintText - jr .chooseMove -.PPNotMaxedOut - ld a, [hl] - add 1 << 6 ; increase PP Up count by 1 - ld [hl], a - ld a, 1 ; 1 PP Up used - ld [wd11e], a - call RestoreBonusPP ; add the bonus PP to current PP - ld hl, PPIncreasedText - call PrintText -.done - pop af - ld [wWhichPokemon], a - call GBPalWhiteOut - call RunDefaultPaletteCommand - jp RemoveUsedItem -.afterRestoringPP ; after using a (Max) Ether/Elixir - ld a, [wWhichPokemon] - ld b, a - ld a, [wPlayerMonNumber] - cp b ; is the pokemon whose PP was restored active in battle? - jr nz, .skipUpdatingInBattleData - ld hl, wPartyMon1PP - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld de, wBattleMonPP - ld bc, 4 - call CopyData ; copy party data to in-battle data -.skipUpdatingInBattleData - ld a, SFX_HEAL_AILMENT - call PlaySound - ld hl, PPRestoredText - call PrintText - jr .done -.useEther - call .restorePP - jr nz, .afterRestoringPP - jp .noEffect -; unsets zero flag if PP was restored, sets zero flag if not -; however, this is bugged for Max Ethers and Max Elixirs (see below) -.restorePP - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - call GetMaxPP - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - call GetSelectedMoveOffset - ld bc, wPartyMon1PP - wPartyMon1Moves - add hl, bc ; hl now points to move's PP - ld a, [wMaxPP] - ld b, a - ld a, [wPPRestoreItem] - cp MAX_ETHER - jr z, .fullyRestorePP - ld a, [hl] ; move PP - and %00111111 ; lower 6 bit bits store current PP - cp b ; does current PP equal max PP? - ret z ; if so, return - add 10 ; increase current PP by 10 -; b holds the max PP amount and b will hold the new PP amount. -; So, if the new amount meets or exceeds the max amount, -; cap the amount to the max amount by leaving b unchanged. -; Otherwise, store the new amount in b. - cp b ; does the new amount meet or exceed the maximum? - jr nc, .storeNewAmount - ld b, a -.storeNewAmount - ld a, [hl] ; move PP - and %11000000 ; PP Up counter bits - add b - ld [hl], a - ret -.fullyRestorePP - ld a, [hl] ; move PP -; Note that this code has a bug. It doesn't mask out the upper two bits, which -; are used to count how many PP Ups have been used on the move. So, Max Ethers -; and Max Elixirs will not be detected as having no effect on a move with full -; PP if the move has had any PP Ups used on it. - cp b ; does current PP equal max PP? - ret z - jr .storeNewAmount -.useElixir -; decrement the item ID so that ELIXER becomes ETHER and MAX_ELIXER becomes MAX_ETHER - ld hl, wPPRestoreItem - dec [hl] - dec [hl] - xor a - ld hl, wCurrentMenuItem - ld [hli], a - ld [hl], a ; zero the counter for number of moves that had their PP restored - ld b, 4 -; loop through each move and restore PP -.elixirLoop - push bc - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - call GetSelectedMoveOffset - ld a, [hl] - and a ; does the current slot have a move? - jr z, .nextMove - call .restorePP - jr z, .nextMove -; if some PP was restored - ld hl, wTileBehindCursor ; counter for number of moves that had their PP restored - inc [hl] -.nextMove - ld hl, wCurrentMenuItem - inc [hl] - pop bc - dec b - jr nz, .elixirLoop - ld a, [wTileBehindCursor] - and a ; did any moves have their PP restored? - jp nz, .afterRestoringPP -.noEffect - call ItemUseNoEffect -.itemNotUsed - call GBPalWhiteOut - call RunDefaultPaletteCommand - pop af - xor a - ld [wActionResultOrTookBattleTurn], a ; item use failed - ret - -RaisePPWhichTechniqueText: - TX_FAR _RaisePPWhichTechniqueText - db "@" - -RestorePPWhichTechniqueText: - TX_FAR _RestorePPWhichTechniqueText - db "@" - -PPMaxedOutText: - TX_FAR _PPMaxedOutText - db "@" - -PPIncreasedText: - TX_FAR _PPIncreasedText - db "@" - -PPRestoredText: - TX_FAR _PPRestoredText - db "@" - -; for items that can't be used from the Item menu -UnusableItem: - jp ItemUseNotTime - -ItemUseTMHM: - ld a, [wIsInBattle] - and a - jp nz, ItemUseNotTime - ld a, [wcf91] - sub TM_01 - push af - jr nc, .skipAdding - add 55 ; if item is an HM, add 55 -.skipAdding - inc a - ld [wd11e], a - predef TMToMove ; get move ID from TM/HM ID - ld a, [wd11e] - ld [wMoveNum], a - call GetMoveName - call CopyStringToCF4B ; copy name to wcf4b - pop af - ld hl, BootedUpTMText - jr nc, .printBootedUpMachineText - ld hl, BootedUpHMText -.printBootedUpMachineText - call PrintText - ld hl, TeachMachineMoveText - call PrintText - coord hl, 14, 7 - lb bc, 8, 15 - ld a, TWO_OPTION_MENU - ld [wTextBoxID], a - call DisplayTextBoxID ; yes/no menu - ld a, [wCurrentMenuItem] - and a - jr z, .useMachine - ld a, 2 - ld [wActionResultOrTookBattleTurn], a ; item not used - ret -.useMachine - ld a, [wWhichPokemon] - push af - ld a, [wcf91] - push af -.chooseMon - ld hl, wcf4b - ld de, wTempMoveNameBuffer - ld bc, 14 - call CopyData ; save the move name because DisplayPartyMenu will overwrite it - ld a, $ff - ld [wUpdateSpritesEnabled], a - ld a, TMHM_PARTY_MENU - ld [wPartyMenuTypeOrMessageID], a - call DisplayPartyMenu - push af - ld hl, wTempMoveNameBuffer - ld de, wcf4b - ld bc, 14 - call CopyData - pop af - jr nc, .checkIfAbleToLearnMove -; if the player canceled teaching the move - pop af - pop af - call GBPalWhiteOutWithDelay3 - call ClearSprites - call RunDefaultPaletteCommand - jp LoadScreenTilesFromBuffer1 ; restore saved screen -.checkIfAbleToLearnMove - predef CanLearnTM ; check if the pokemon can learn the move - push bc - ld a, [wWhichPokemon] - ld hl, wPartyMonNicks - call GetPartyMonName - pop bc - ld a, c - and a ; can the pokemon learn the move? - jr nz, .checkIfAlreadyLearnedMove -; if the pokemon can't learn the move - ld a, SFX_DENIED - call PlaySoundWaitForCurrent - ld hl, MonCannotLearnMachineMoveText - call PrintText - jr .chooseMon -.checkIfAlreadyLearnedMove - callab CheckIfMoveIsKnown ; check if the pokemon already knows the move - jr c, .chooseMon - predef LearnMove ; teach move - pop af - ld [wcf91], a - pop af - ld [wWhichPokemon], a - ld a, b - and a - ret z - ld a, [wcf91] - call IsItemHM - ret c - jp RemoveUsedItem - -BootedUpTMText: - TX_FAR _BootedUpTMText - db "@" - -BootedUpHMText: - TX_FAR _BootedUpHMText - db "@" - -TeachMachineMoveText: - TX_FAR _TeachMachineMoveText - db "@" - -MonCannotLearnMachineMoveText: - TX_FAR _MonCannotLearnMachineMoveText - db "@" - -PrintItemUseTextAndRemoveItem: - ld hl, ItemUseText00 - call PrintText - ld a, SFX_HEAL_AILMENT - call PlaySound - call WaitForTextScrollButtonPress ; wait for button press - -RemoveUsedItem: - ld hl, wNumBagItems - ld a, 1 ; one item - ld [wItemQuantity], a - jp RemoveItemFromInventory - -ItemUseNoEffect: - ld hl, ItemUseNoEffectText - jr ItemUseFailed - -ItemUseNotTime: - ld hl, ItemUseNotTimeText - jr ItemUseFailed - -ItemUseNotYoursToUse: - ld hl, ItemUseNotYoursToUseText - jr ItemUseFailed - -ThrowBallAtTrainerMon: - call RunDefaultPaletteCommand - call LoadScreenTilesFromBuffer1 ; restore saved screen - call Delay3 - ld a, TOSS_ANIM - ld [wAnimationID], a - predef MoveAnimation ; do animation - ld hl, ThrowBallAtTrainerMonText1 - call PrintText - ld hl, ThrowBallAtTrainerMonText2 - call PrintText - jr RemoveUsedItem - -NoCyclingAllowedHere: - ld hl, NoCyclingAllowedHereText - jr ItemUseFailed - -BoxFullCannotThrowBall: - ld hl, BoxFullCannotThrowBallText - jr ItemUseFailed - -SurfingAttemptFailed: - ld hl, NoSurfingHereText - -ItemUseFailed: - xor a - ld [wActionResultOrTookBattleTurn], a ; item use failed - jp PrintText - -ItemUseNotTimeText: - TX_FAR _ItemUseNotTimeText - db "@" - -ItemUseNotYoursToUseText: - TX_FAR _ItemUseNotYoursToUseText - db "@" - -ItemUseNoEffectText: - TX_FAR _ItemUseNoEffectText - db "@" - -ThrowBallAtTrainerMonText1: - TX_FAR _ThrowBallAtTrainerMonText1 - db "@" - -ThrowBallAtTrainerMonText2: - TX_FAR _ThrowBallAtTrainerMonText2 - db "@" - -NoCyclingAllowedHereText: - TX_FAR _NoCyclingAllowedHereText - db "@" - -NoSurfingHereText: - TX_FAR _NoSurfingHereText - db "@" - -BoxFullCannotThrowBallText: - TX_FAR _BoxFullCannotThrowBallText - db "@" - -ItemUseText00: - TX_FAR _ItemUseText001 - TX_LINE - TX_FAR _ItemUseText002 - db "@" - -GotOnBicycleText: - TX_FAR _GotOnBicycleText1 - TX_LINE - TX_FAR _GotOnBicycleText2 - db "@" - -GotOffBicycleText: - TX_FAR _GotOffBicycleText1 - TX_LINE - TX_FAR _GotOffBicycleText2 - db "@" - -; restores bonus PP (from PP Ups) when healing at a pokemon center -; also, when a PP Up is used, it increases the current PP by one PP Up bonus -; INPUT: -; [wWhichPokemon] = index of pokemon in party -; [wCurrentMenuItem] = index of move (when using a PP Up) -RestoreBonusPP: - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - ld a, [wWhichPokemon] - call AddNTimes - push hl - ld de, wNormalMaxPPList - 1 - predef LoadMovePPs ; loads the normal max PP of each of the pokemon's moves to wNormalMaxPPList - pop hl - ld c, wPartyMon1PP - wPartyMon1Moves - ld b, 0 - add hl, bc ; hl now points to move 1 PP - ld de, wNormalMaxPPList - ld b, 0 ; initialize move counter to zero -; loop through the pokemon's moves -.loop - inc b - ld a, b - cp 5 ; reached the end of the pokemon's moves? - ret z ; if so, return - ld a, [wUsingPPUp] - dec a ; using a PP Up? - jr nz, .skipMenuItemIDCheck -; if using a PP Up, check if this is the move it's being used on - ld a, [wCurrentMenuItem] - inc a - cp b - jr nz, .nextMove -.skipMenuItemIDCheck - ld a, [hl] - and %11000000 ; have any PP Ups been used? - call nz, AddBonusPP ; if so, add bonus PP -.nextMove - inc hl - inc de - jr .loop - -; adds bonus PP from PP Ups to current PP -; 1/5 of normal max PP (capped at 7) is added for each PP Up -; INPUT: -; [de] = normal max PP -; [hl] = move PP -AddBonusPP: - push bc - ld a, [de] ; normal max PP of move - ld [H_DIVIDEND + 3], a - xor a - ld [H_DIVIDEND], a - ld [H_DIVIDEND + 1], a - ld [H_DIVIDEND + 2], a - ld a, 5 - ld [H_DIVISOR], a - ld b, 4 - call Divide - ld a, [hl] ; move PP - ld b, a - swap a - and %00001111 - srl a - srl a - ld c, a ; c = number of PP Ups used -.loop - ld a, [H_QUOTIENT + 3] - cp 8 ; is the amount greater than or equal to 8? - jr c, .addAmount - ld a, 7 ; cap the amount at 7 -.addAmount - add b - ld b, a - ld a, [wUsingPPUp] - dec a ; is the player using a PP Up right now? - jr z, .done ; if so, only add the bonus once - dec c - jr nz, .loop -.done - ld [hl], b - pop bc - ret - -; gets max PP of a pokemon's move (including PP from PP Ups) -; INPUT: -; [wWhichPokemon] = index of pokemon within party/box -; [wMonDataLocation] = pokemon source -; 00: player's party -; 01: enemy's party -; 02: current box -; 03: daycare -; 04: player's in-battle pokemon -; [wCurrentMenuItem] = move index -; OUTPUT: -; [wMaxPP] = max PP -GetMaxPP: - ld a, [wMonDataLocation] - and a - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - jr z, .sourceWithMultipleMon - ld hl, wEnemyMon1Moves - dec a - jr z, .sourceWithMultipleMon - ld hl, wBoxMon1Moves - ld bc, wBoxMon2 - wBoxMon1 - dec a - jr z, .sourceWithMultipleMon - ld hl, wDayCareMonMoves - dec a - jr z, .sourceWithOneMon - ld hl, wBattleMonMoves ; player's in-battle pokemon -.sourceWithOneMon - call GetSelectedMoveOffset2 - jr .next -.sourceWithMultipleMon - call GetSelectedMoveOffset -.next - ld a, [hl] - dec a - push hl - ld hl, Moves - ld bc, MoveEnd - Moves - call AddNTimes - ld de, wcd6d - ld a, BANK(Moves) - call FarCopyData - ld de, wcd6d + 5 ; PP is byte 5 of move data - ld a, [de] - ld b, a ; b = normal max PP - pop hl - push bc - ld bc, wPartyMon1PP - wPartyMon1Moves ; PP offset if not player's in-battle pokemon data - ld a, [wMonDataLocation] - cp 4 ; player's in-battle pokemon? - jr nz, .addPPOffset - ld bc, wBattleMonPP - wBattleMonMoves ; PP offset if player's in-battle pokemon data -.addPPOffset - add hl, bc - ld a, [hl] ; a = current PP - and %11000000 ; get PP Up count - pop bc - or b ; place normal max PP in 6 lower bits of a - ld h, d - ld l, e - inc hl ; hl = wcd73 - ld [hl], a - xor a ; add the bonus for the existing PP Up count - ld [wUsingPPUp], a - call AddBonusPP ; add bonus PP from PP Ups - ld a, [hl] - and %00111111 ; mask out the PP Up count - ld [wMaxPP], a ; store max PP - ret - -GetSelectedMoveOffset: - ld a, [wWhichPokemon] - call AddNTimes - -GetSelectedMoveOffset2: - ld a, [wCurrentMenuItem] - ld c, a - ld b, 0 - add hl, bc - ret - -; confirms the item toss and then tosses the item -; INPUT: -; hl = address of inventory (either wNumBagItems or wNumBoxItems) -; [wcf91] = item ID -; [wWhichPokemon] = index of item within inventory -; [wItemQuantity] = quantity to toss -; OUTPUT: -; clears carry flag if the item is tossed, sets carry flag if not -TossItem_: - push hl - ld a, [wcf91] - call IsItemHM - pop hl - jr c, .tooImportantToToss - push hl - call IsKeyItem_ - ld a, [wIsKeyItem] - pop hl - and a - jr nz, .tooImportantToToss - push hl - ld a, [wcf91] - ld [wd11e], a - call GetItemName - call CopyStringToCF4B ; copy name to wcf4b - ld hl, IsItOKToTossItemText - call PrintText - coord hl, 14, 7 - lb bc, 8, 15 - ld a, TWO_OPTION_MENU - ld [wTextBoxID], a - call DisplayTextBoxID ; yes/no menu - ld a, [wMenuExitMethod] - cp CHOSE_SECOND_ITEM - pop hl - scf - ret z ; return if the player chose No -; if the player chose Yes - push hl - ld a, [wWhichPokemon] - call RemoveItemFromInventory - ld a, [wcf91] - ld [wd11e], a - call GetItemName - call CopyStringToCF4B ; copy name to wcf4b - ld hl, ThrewAwayItemText - call PrintText - pop hl - and a - ret -.tooImportantToToss - push hl - ld hl, TooImportantToTossText - call PrintText - pop hl - scf - ret - -ThrewAwayItemText: - TX_FAR _ThrewAwayItemText - db "@" - -IsItOKToTossItemText: - TX_FAR _IsItOKToTossItemText - db "@" - -TooImportantToTossText: - TX_FAR _TooImportantToTossText - db "@" - -; checks if an item is a key item -; INPUT: -; [wcf91] = item ID -; OUTPUT: -; [wIsKeyItem] = result -; 00: item is not key item -; 01: item is key item -IsKeyItem_: - ld a, $01 - ld [wIsKeyItem], a - ld a, [wcf91] - cp HM_01 ; is the item an HM or TM? - jr nc, .checkIfItemIsHM -; if the item is not an HM or TM - push af - ld hl, KeyItemBitfield - ld de, wBuffer - ld bc, 15 ; only 11 bytes are actually used - call CopyData - pop af - dec a - ld c, a - ld hl, wBuffer - ld b, FLAG_TEST - predef FlagActionPredef - ld a, c - and a - ret nz -.checkIfItemIsHM - ld a, [wcf91] - call IsItemHM - ret c - xor a - ld [wIsKeyItem], a - ret - -INCLUDE "data/key_items.asm" - -SendNewMonToBox: - ld de, wNumInBox - ld a, [de] - inc a - ld [de], a - ld a, [wcf91] - ld [wd0b5], a - ld c, a -.asm_e7b1 - inc de - ld a, [de] - ld b, a - ld a, c - ld c, b - ld [de], a - cp $ff - jr nz, .asm_e7b1 - call GetMonHeader - ld hl, wBoxMonOT - ld bc, NAME_LENGTH - ld a, [wNumInBox] - dec a - jr z, .asm_e7ee - dec a - call AddNTimes - push hl - ld bc, NAME_LENGTH - add hl, bc - ld d, h - ld e, l - pop hl - ld a, [wNumInBox] - dec a - ld b, a -.asm_e7db - push bc - push hl - ld bc, NAME_LENGTH - call CopyData - pop hl - ld d, h - ld e, l - ld bc, -NAME_LENGTH - add hl, bc - pop bc - dec b - jr nz, .asm_e7db -.asm_e7ee - ld hl, wPlayerName - ld de, wBoxMonOT - ld bc, NAME_LENGTH - call CopyData - ld a, [wNumInBox] - dec a - jr z, .asm_e82a - ld hl, wBoxMonNicks - ld bc, NAME_LENGTH - dec a - call AddNTimes - push hl - ld bc, NAME_LENGTH - add hl, bc - ld d, h - ld e, l - pop hl - ld a, [wNumInBox] - dec a - ld b, a -.asm_e817 - push bc - push hl - ld bc, NAME_LENGTH - call CopyData - pop hl - ld d, h - ld e, l - ld bc, -NAME_LENGTH - add hl, bc - pop bc - dec b - jr nz, .asm_e817 -.asm_e82a - ld hl, wBoxMonNicks - ld a, NAME_MON_SCREEN - ld [wNamingScreenType], a - predef AskName - ld a, [wNumInBox] - dec a - jr z, .asm_e867 - ld hl, wBoxMons - ld bc, wBoxMon2 - wBoxMon1 - dec a - call AddNTimes - push hl - ld bc, wBoxMon2 - wBoxMon1 - add hl, bc - ld d, h - ld e, l - pop hl - ld a, [wNumInBox] - dec a - ld b, a -.asm_e854 - push bc - push hl - ld bc, wBoxMon2 - wBoxMon1 - call CopyData - pop hl - ld d, h - ld e, l - ld bc, wBoxMon1 - wBoxMon2 - add hl, bc - pop bc - dec b - jr nz, .asm_e854 -.asm_e867 - ld a, [wEnemyMonLevel] - ld [wEnemyMonBoxLevel], a - ld hl, wEnemyMon - ld de, wBoxMon1 - ld bc, wEnemyMonDVs - wEnemyMon - call CopyData - ld hl, wPlayerID - ld a, [hli] - ld [de], a - inc de - ld a, [hl] - ld [de], a - inc de - push de - ld a, [wCurEnemyLVL] - ld d, a - callab CalcExperience - pop de - ld a, [hExperience] - ld [de], a - inc de - ld a, [hExperience + 1] - ld [de], a - inc de - ld a, [hExperience + 2] - ld [de], a - inc de - xor a - ld b, NUM_STATS * 2 -.asm_e89f - ld [de], a - inc de - dec b - jr nz, .asm_e89f - ld hl, wEnemyMonDVs - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - ld hl, wEnemyMonPP - ld b, NUM_MOVES -.asm_e8b1 - ld a, [hli] - inc de - ld [de], a - dec b - jr nz, .asm_e8b1 - ret - -; checks if the tile in front of the player is a shore or water tile -; used for surfing and fishing -; unsets carry if it is, sets carry if not -IsNextTileShoreOrWater: - ld a, [wCurMapTileset] - ld hl, WaterTilesets - ld de, 1 - call IsInArray - jr nc, .notShoreOrWater - ld a, [wCurMapTileset] - cp SHIP_PORT ; Vermilion Dock tileset - ld a, [wTileInFrontOfPlayer] ; tile in front of player - jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset - cp $48 ; eastern shore tile in Safari Zone - jr z, .shoreOrWater - cp $32 ; usual eastern shore tile - jr z, .shoreOrWater -.skipShoreTiles - cp $14 ; water tile - jr z, .shoreOrWater -.notShoreOrWater - scf - ret -.shoreOrWater - and a - ret - -; tilesets with water -WaterTilesets: - db OVERWORLD, FOREST, DOJO, GYM, SHIP, SHIP_PORT, CAVERN, FACILITY, PLATEAU - db $ff ; terminator - -ReadSuperRodData: -; return e = 2 if no fish on this map -; return e = 1 if a bite, bc = level,species -; return e = 0 if no bite - ld a, [wCurMap] - ld de, 3 ; each fishing group is three bytes wide - ld hl, SuperRodData - call IsInArray - jr c, .ReadFishingGroup - ld e, $2 ; $2 if no fishing groups found - ret - -.ReadFishingGroup -; hl points to the fishing group entry in the index - inc hl ; skip map id - - ; read fishing group address - ld a, [hli] - ld h, [hl] - ld l, a - - ld b, [hl] ; how many mons in group - inc hl ; point to data - ld e, $0 ; no bite yet - -.RandomLoop - call Random - srl a - ret c ; 50% chance of no battle - - and %11 ; 2-bit random number - cp b - jr nc, .RandomLoop ; if a is greater than the number of mons, regenerate - - ; get the mon - add a - ld c, a - ld b, $0 - add hl, bc - ld b, [hl] ; level - inc hl - ld c, [hl] ; species - ld e, $1 ; $1 if there's a bite - ret - -INCLUDE "data/super_rod.asm" - -; reloads map view and processes sprite data -; for items that cause the overworld to be displayed -ItemUseReloadOverworldData: - call LoadCurrentMapView - jp UpdateSprites - -; creates a list at wBuffer of maps where the mon in [wd11e] can be found. -; this is used by the pokedex to display locations the mon can be found on the map. -FindWildLocationsOfMon: - ld hl, WildDataPointers - ld de, wBuffer - ld c, $0 -.loop - inc hl - ld a, [hld] - inc a - jr z, .done - push hl - ld a, [hli] - ld h, [hl] - ld l, a - ld a, [hli] - and a - call nz, CheckMapForMon ; land - ld a, [hli] - and a - call nz, CheckMapForMon ; water - pop hl - inc hl - inc hl - inc c - jr .loop -.done - ld a, $ff ; list terminator - ld [de], a - ret - -CheckMapForMon: - inc hl - ld b, $a -.loop - ld a, [wd11e] - cp [hl] - jr nz, .nextEntry - ld a, c - ld [de], a - inc de -.nextEntry - inc hl - inc hl - dec b - jr nz, .loop - dec hl - ret diff --git a/engine/subtract_paid_money.asm b/engine/items/subtract_paid_money.asm similarity index 80% rename from engine/subtract_paid_money.asm rename to engine/items/subtract_paid_money.asm index a6a6ec2e..fdefe3d6 100644 --- a/engine/subtract_paid_money.asm +++ b/engine/items/subtract_paid_money.asm @@ -1,6 +1,6 @@ ; subtracts the amount the player paid from their money -; sets carry flag if there is enough money and unsets carry flag if not -SubtractAmountPaidFromMoney_: +; OUTPUT: carry = 0(success) or 1(fail because there is not enough money) +SubtractAmountPaidFromMoney_:: ld de, wPlayerMoney ld hl, hMoney ; total price of items ld c, 3 ; length of money in bytes diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm old mode 100755 new mode 100644 index 80e6bf3c..df9761bd --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -1,9 +1,9 @@ -GetMachinePrice: +GetMachinePrice:: ; Input: [wcf91] = Item Id of a TM ; Output: Stores the TM price at hItemPrice ld a, [wcf91] ; a contains TM item id - sub TM_01 - ret c + sub TM01 ; underflows below 0 for HM items (before TM items) + ret c ; HMs are priceless ld d, a ld hl, TechnicalMachinePrices srl a @@ -16,10 +16,10 @@ GetMachinePrice: swap a .highNybbleIsPrice and $f0 - ld [hItemPrice + 1], a + ldh [hItemPrice + 1], a xor a - ld [hItemPrice], a - ld [hItemPrice + 2], a + ldh [hItemPrice], a + ldh [hItemPrice + 2], a ret -INCLUDE "data/tm_prices.asm" +INCLUDE "data/items/tm_prices.asm" diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm old mode 100755 new mode 100644 index 7ccaa232..a11cd736 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -22,5 +22,5 @@ CheckIfMoveIsKnown: ret AlreadyKnowsText: - TX_FAR _AlreadyKnowsText - db "@" + text_far _AlreadyKnowsText + text_end diff --git a/engine/items/tms.asm b/engine/items/tms.asm old mode 100755 new mode 100644 index da1b5e72..ea7fbcad --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -33,4 +33,4 @@ TMToMove: ld [wd11e], a ret -INCLUDE "data/tms.asm" +INCLUDE "data/moves/tmhm_moves.asm" diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm new file mode 100644 index 00000000..42d313d9 --- /dev/null +++ b/engine/items/town_map.asm @@ -0,0 +1,620 @@ +NOT_VISITED EQU $fe + +DisplayTownMap: + call LoadTownMap + ld hl, wUpdateSpritesEnabled + ld a, [hl] + push af + ld [hl], $ff + push hl + ld a, $1 + ldh [hJoy7], a + ld a, [wCurMap] + push af + ld b, $0 + call DrawPlayerOrBirdSprite ; player sprite + hlcoord 1, 0 + ld de, wcd6d + call PlaceString + ld hl, wOAMBuffer + ld de, wTileMapBackup + ld bc, $10 + call CopyData + ld hl, vSprites tile $04 + ld de, TownMapCursor + lb bc, BANK(TownMapCursor), (TownMapCursorEnd - TownMapCursor) / $8 + call CopyVideoDataDouble + xor a + ld [wWhichTownMapLocation], a + pop af + jr .enterLoop + +.townMapLoop + hlcoord 0, 0 + lb bc, 1, 20 + call ClearScreenArea + ld hl, TownMapOrder + ld a, [wWhichTownMapLocation] + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] +.enterLoop + ld de, wTownMapCoords + call LoadTownMapEntry + ld a, [de] + push hl + call TownMapCoordsToOAMCoords + ld a, $4 + ld [wOAMBaseTile], a + ld hl, wOAMBuffer + $10 + call WriteTownMapSpriteOAM ; town map cursor sprite + pop hl + ld de, wcd6d +.copyMapName + ld a, [hli] + ld [de], a + inc de + cp $50 + jr nz, .copyMapName + hlcoord 1, 0 + ld de, wcd6d + call PlaceString + ld hl, wOAMBuffer + $10 + ld de, wTileMapBackup + 16 + ld bc, $10 + call CopyData +.inputLoop + call TownMapSpriteBlinkingAnimation + call JoypadLowSensitivity + ldh a, [hJoy5] + ld b, a + and A_BUTTON | B_BUTTON | D_UP | D_DOWN + jr z, .inputLoop + ld a, SFX_TINK + call PlaySound + bit 6, b + jr nz, .pressedUp + bit 7, b + jr nz, .pressedDown + xor a + ld [wTownMapSpriteBlinkingEnabled], a + ldh [hJoy7], a + ld [wAnimCounter], a + call ExitTownMap + pop hl + pop af + ld [hl], a + ret +.pressedUp + ld a, [wWhichTownMapLocation] + inc a + cp TownMapOrderEnd - TownMapOrder ; number of list items + 1 + jr nz, .noOverflow + xor a +.noOverflow + ld [wWhichTownMapLocation], a + jp .townMapLoop +.pressedDown + ld a, [wWhichTownMapLocation] + dec a + cp -1 + jr nz, .noUnderflow + ld a, TownMapOrderEnd - TownMapOrder - 1 ; number of list items +.noUnderflow + ld [wWhichTownMapLocation], a + jp .townMapLoop + +INCLUDE "data/maps/town_map_order.asm" + +TownMapCursor: + INCBIN "gfx/town_map/town_map_cursor.1bpp" +TownMapCursorEnd: + +LoadTownMap_Nest: + call LoadTownMap + ld hl, wUpdateSpritesEnabled + ld a, [hl] + push af + ld [hl], $ff + push hl + call DisplayWildLocations + call GetMonName + hlcoord 1, 0 + call PlaceString + ld h, b + ld l, c + ld de, MonsNestText + call PlaceString + call WaitForTextScrollButtonPress + call ExitTownMap + pop hl + pop af + ld [hl], a + ret + +MonsNestText: + db "'s NEST@" + +LoadTownMap_Fly:: + call ClearSprites + call LoadTownMap + call LoadPlayerSpriteGraphics + call LoadFontTilePatterns + ld de, BirdSprite + ld hl, vSprites tile $04 + lb bc, BANK(BirdSprite), 12 + call CopyVideoData + ld de, TownMapUpArrow + ld hl, vChars1 tile $6d + lb bc, BANK(TownMapUpArrow), (TownMapUpArrowEnd - TownMapUpArrow) / $8 + call CopyVideoDataDouble + call BuildFlyLocationsList + ld hl, wUpdateSpritesEnabled + ld a, [hl] + push af + ld [hl], $ff + push hl + hlcoord 0, 0 + ld de, ToText + call PlaceString + ld a, [wCurMap] + ld b, $0 + call DrawPlayerOrBirdSprite + ld hl, wFlyLocationsList + decoord 18, 0 +.townMapFlyLoop + ld a, " " + ld [de], a + push hl + push hl + hlcoord 3, 0 + lb bc, 1, 15 + call ClearScreenArea + pop hl + ld a, [hl] + ld b, $4 + call DrawPlayerOrBirdSprite ; draw bird sprite + hlcoord 3, 0 + ld de, wcd6d + call PlaceString + ld c, 15 + call DelayFrames + hlcoord 18, 0 + ld [hl], "▲" + hlcoord 19, 0 + ld [hl], "▼" + pop hl +.inputLoop + push hl + call DelayFrame + call JoypadLowSensitivity + ldh a, [hJoy5] + ld b, a + pop hl + and A_BUTTON | B_BUTTON | D_UP | D_DOWN + jr z, .inputLoop + bit 0, b + jr nz, .pressedA + ld a, SFX_TINK + call PlaySound + bit 6, b + jr nz, .pressedUp + bit 7, b + jr nz, .pressedDown + jr .pressedB +.pressedA + ld a, SFX_HEAL_AILMENT + call PlaySound + ld a, [hl] + ld [wDestinationMap], a + ld hl, wd732 + set 3, [hl] + inc hl + set 7, [hl] +.pressedB + xor a + ld [wTownMapSpriteBlinkingEnabled], a + call GBPalWhiteOutWithDelay3 + pop hl + pop af + ld [hl], a + ret +.pressedUp + decoord 18, 0 + inc hl + ld a, [hl] + cp $ff + jr z, .wrapToStartOfList + cp NOT_VISITED + jr z, .pressedUp ; skip past unvisited towns + jp .townMapFlyLoop +.wrapToStartOfList + ld hl, wFlyLocationsList + jp .townMapFlyLoop +.pressedDown + decoord 19, 0 + dec hl + ld a, [hl] + cp $ff + jr z, .wrapToEndOfList + cp NOT_VISITED + jr z, .pressedDown ; skip past unvisited towns + jp .townMapFlyLoop +.wrapToEndOfList + ld hl, wFlyLocationsList + NUM_CITY_MAPS + jr .pressedDown + +ToText: + db "To@" + +BuildFlyLocationsList: + ld hl, wFlyLocationsList - 1 + ld [hl], $ff + inc hl + ld a, [wTownVisitedFlag] + ld e, a + ld a, [wTownVisitedFlag + 1] + ld d, a + lb bc, 0, NUM_CITY_MAPS +.loop + srl d + rr e + ld a, NOT_VISITED + jr nc, .notVisited + ld a, b ; store the map number of the town if it has been visited +.notVisited + ld [hl], a + inc hl + inc b + dec c + jr nz, .loop + ld [hl], $ff + ret + +TownMapUpArrow: + INCBIN "gfx/town_map/up_arrow.1bpp" +TownMapUpArrowEnd: + +LoadTownMap: + call GBPalWhiteOutWithDelay3 + call ClearScreen + call UpdateSprites + hlcoord 0, 0 + ld b, $12 + ld c, $12 + call TextBoxBorder + call DisableLCD + ld hl, WorldMapTileGraphics + ld de, vChars2 tile $60 + ld bc, WorldMapTileGraphicsEnd - WorldMapTileGraphics + ld a, BANK(WorldMapTileGraphics) + call FarCopyData2 + ld hl, MonNestIcon + ld de, vSprites tile $04 + ld bc, MonNestIconEnd - MonNestIcon + ld a, BANK(MonNestIcon) + call FarCopyDataDouble + hlcoord 0, 0 + ld de, CompressedMap +.nextTile + ld a, [de] + and a + jr z, .done + ld b, a + and $f + ld c, a + ld a, b + swap a + and $f + add $60 +.writeRunLoop + ld [hli], a + dec c + jr nz, .writeRunLoop + inc de + jr .nextTile +.done + call EnableLCD + ld b, SET_PAL_TOWN_MAP + call RunPaletteCommand + call Delay3 + call GBPalNormal + xor a + ld [wAnimCounter], a + inc a + ld [wTownMapSpriteBlinkingEnabled], a + ret + +CompressedMap: + INCBIN "gfx/town_map/town_map.rle" + +ExitTownMap: +; clear town map graphics data and load usual graphics data + xor a + ld [wTownMapSpriteBlinkingEnabled], a + call GBPalWhiteOut + call ClearScreen + call ClearSprites + call LoadPlayerSpriteGraphics + call LoadFontTilePatterns + call UpdateSprites + jp RunDefaultPaletteCommand + +DrawPlayerOrBirdSprite: +; a = map number +; b = OAM base tile + push af + ld a, b + ld [wOAMBaseTile], a + pop af + ld de, wTownMapCoords + call LoadTownMapEntry + ld a, [de] + push hl + call TownMapCoordsToOAMCoords + call WritePlayerOrBirdSpriteOAM + pop hl + ld de, wcd6d +.loop + ld a, [hli] + ld [de], a + inc de + cp "@" + jr nz, .loop + ld hl, wOAMBuffer + ld de, wTileMapBackup + ld bc, $a0 + jp CopyData + +DisplayWildLocations: + farcall FindWildLocationsOfMon + call ZeroOutDuplicatesInList + ld hl, wOAMBuffer + ld de, wTownMapCoords +.loop + ld a, [de] + cp $ff + jr z, .exitLoop + and a + jr z, .nextEntry + push hl + call LoadTownMapEntry + pop hl + ld a, [de] + cp $19 ; Cerulean Cave's coordinates + jr z, .nextEntry ; skip Cerulean Cave + call TownMapCoordsToOAMCoords + ld a, $4 ; nest icon tile no. + ld [hli], a + xor a + ld [hli], a +.nextEntry + inc de + jr .loop +.exitLoop + ld a, l + and a ; were any OAM entries written? + jr nz, .drawPlayerSprite +; if no OAM entries were written, print area unknown text + hlcoord 1, 7 + ld b, 2 + ld c, 15 + call TextBoxBorder + hlcoord 2, 9 + ld de, AreaUnknownText + call PlaceString + jr .done +.drawPlayerSprite + ld a, [wCurMap] + ld b, $0 + call DrawPlayerOrBirdSprite +.done + ld hl, wOAMBuffer + ld de, wTileMapBackup + ld bc, $a0 + jp CopyData + +AreaUnknownText: + db " AREA UNKNOWN@" + +TownMapCoordsToOAMCoords: +; in: lower nybble of a = x, upper nybble of a = y +; out: b and [hl] = (y * 8) + 24, c and [hl+1] = (x * 8) + 24 + push af + and $f0 + srl a + add 24 + ld b, a + ld [hli], a + pop af + and $f + swap a + srl a + add 24 + ld c, a + ld [hli], a + ret + +WritePlayerOrBirdSpriteOAM: + ld a, [wOAMBaseTile] + and a + ld hl, wOAMBuffer + $90 ; for player sprite + jr z, WriteTownMapSpriteOAM + ld hl, wOAMBuffer + $80 ; for bird sprite + +WriteTownMapSpriteOAM: + push hl + +; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c +; is added to b, so the net result is that only 3 is subtracted from b. + lb hl, -4, -4 + add hl, bc + + ld b, h + ld c, l + pop hl + +WriteAsymmetricMonPartySpriteOAM: +; Writes 4 OAM blocks for a helix mon party sprite, since it does not have +; a vertical line of symmetry. + lb de, 2, 2 +.loop + push de + push bc +.innerLoop + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ld a, [wOAMBaseTile] + ld [hli], a + inc a + ld [wOAMBaseTile], a + xor a + ld [hli], a + inc d + ld a, 8 + add c + ld c, a + dec e + jr nz, .innerLoop + pop bc + pop de + ld a, 8 + add b + ld b, a + dec d + jr nz, .loop + ret + +WriteSymmetricMonPartySpriteOAM: +; Writes 4 OAM blocks for a mon party sprite other than a helix. All the +; sprites other than the helix one have a vertical line of symmetry which allows +; the X-flip OAM bit to be used so that only 2 rather than 4 tile patterns are +; needed. + xor a + ld [wSymmetricSpriteOAMAttributes], a + lb de, 2, 2 +.loop + push de + push bc +.innerLoop + ld a, b + ld [hli], a ; Y + ld a, c + ld [hli], a ; X + ld a, [wOAMBaseTile] + ld [hli], a ; tile + ld a, [wSymmetricSpriteOAMAttributes] + ld [hli], a ; attributes + xor (1 << OAM_X_FLIP) + ld [wSymmetricSpriteOAMAttributes], a + inc d + ld a, 8 + add c + ld c, a + dec e + jr nz, .innerLoop + pop bc + pop de + push hl + ld hl, wOAMBaseTile + inc [hl] + inc [hl] + pop hl + ld a, 8 + add b + ld b, a + dec d + jr nz, .loop + ret + +ZeroOutDuplicatesInList: +; replace duplicate bytes in the list of wild pokemon locations with 0 + ld de, wBuffer +.loop + ld a, [de] + inc de + cp $ff + ret z + ld c, a + ld l, e + ld h, d +.zeroDuplicatesLoop + ld a, [hl] + cp $ff + jr z, .loop + cp c + jr nz, .skipZeroing + xor a + ld [hl], a +.skipZeroing + inc hl + jr .zeroDuplicatesLoop + +LoadTownMapEntry: +; in: a = map number +; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name + cp FIRST_INDOOR_MAP + jr c, .external + ld bc, 4 + ld hl, InternalMapEntries +.loop + cp [hl] + jr c, .foundEntry + add hl, bc + jr .loop +.foundEntry + inc hl + jr .readEntry +.external + ld hl, ExternalMapEntries + ld c, a + ld b, 0 + add hl, bc + add hl, bc + add hl, bc +.readEntry + ld a, [hli] + ld [de], a + ld a, [hli] + ld h, [hl] + ld l, a + ret + +INCLUDE "data/maps/town_map_entries.asm" + +INCLUDE "data/maps/names.asm" + +MonNestIcon: + INCBIN "gfx/town_map/mon_nest_icon.1bpp" +MonNestIconEnd: + +TownMapSpriteBlinkingAnimation:: + ld a, [wAnimCounter] + inc a + cp 25 + jr z, .hideSprites + cp 50 + jr nz, .done +; show sprites when the counter reaches 50 + ld hl, wTileMapBackup + ld de, wOAMBuffer + ld bc, $90 + call CopyData + xor a + jr .done +.hideSprites + ld hl, wOAMBuffer + ld b, $24 + ld de, $4 +.hideSpritesLoop + ld [hl], $a0 + add hl, de + dec b + jr nz, .hideSpritesLoop + ld a, 25 +.done + ld [wAnimCounter], a + jp DelayFrame diff --git a/engine/joypad.asm b/engine/joypad.asm index 31e197e2..87f92635 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -2,29 +2,29 @@ _Joypad:: ; hJoyReleased: (hJoyLast ^ hJoyInput) & hJoyLast ; hJoyPressed: (hJoyLast ^ hJoyInput) & hJoyInput - ld a, [hJoyInput] + ldh a, [hJoyInput] cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset jp z, TrySoftReset ld b, a - ld a, [hJoyLast] + ldh a, [hJoyLast] ld e, a xor b ld d, a and e - ld [hJoyReleased], a + ldh [hJoyReleased], a ld a, d and b - ld [hJoyPressed], a + ldh [hJoyPressed], a ld a, b - ld [hJoyLast], a + ldh [hJoyLast], a ld a, [wd730] bit 5, a jr nz, DiscardButtonPresses - ld a, [hJoyLast] - ld [hJoyHeld], a + ldh a, [hJoyLast] + ldh [hJoyHeld], a ld a, [wJoyIgnore] and a @@ -32,19 +32,19 @@ _Joypad:: cpl ld b, a - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and b - ld [hJoyHeld], a - ld a, [hJoyPressed] + ldh [hJoyHeld], a + ldh a, [hJoyPressed] and b - ld [hJoyPressed], a + ldh [hJoyPressed], a ret DiscardButtonPresses: xor a - ld [hJoyHeld], a - ld [hJoyPressed], a - ld [hJoyReleased], a + ldh [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a ret TrySoftReset: @@ -52,7 +52,7 @@ TrySoftReset: ; deselect (redundant) ld a, $30 - ld [rJOYP], a + ldh [rJOYP], a ld hl, hSoftReset dec [hl] diff --git a/engine/cable_club.asm b/engine/link/cable_club.asm old mode 100755 new mode 100644 similarity index 94% rename from engine/cable_club.asm rename to engine/link/cable_club.asm index 2ce923b5..97b917b5 --- a/engine/cable_club.asm +++ b/engine/link/cable_club.asm @@ -9,11 +9,11 @@ CableClub_DoBattleOrTrade: call LoadFontTilePatterns call LoadHpBarAndStatusTilePatterns call LoadTrainerInfoTextBoxTiles - coord hl, 3, 8 + hlcoord 3, 8 ld b, 2 ld c, 12 call CableClub_TextBoxBorder - coord hl, 4, 10 + hlcoord 4, 10 ld de, PleaseWaitString call PlaceString ld hl, wPlayerNumHits @@ -102,25 +102,25 @@ CableClub_DoBattleOrTradeAgain: ld a, SERIAL_PATCH_LIST_PART_TERMINATOR ld [de], a ; end of part 2 call Serial_SyncAndExchangeNybble - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr nz, .skipSendingTwoZeroBytes ; if using internal clock ; send two zero bytes for syncing purposes? call Delay3 xor a - ld [hSerialSendData], a + ldh [hSerialSendData], a ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a call DelayFrame xor a - ld [hSerialSendData], a + ldh [hSerialSendData], a ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a .skipSendingTwoZeroBytes call Delay3 ld a, (1 << SERIAL) - ld [rIE], a + ldh [rIE], a ld hl, wSerialRandomNumberListBlock ld de, wSerialOtherGameboyRandomNumberListBlock ld bc, $11 @@ -138,10 +138,10 @@ CableClub_DoBattleOrTradeAgain: ld bc, $c8 call Serial_ExchangeBytes ld a, (1 << SERIAL) | (1 << TIMER) | (1 << VBLANK) - ld [rIE], a - ld a, $ff + ldh [rIE], a + ld a, SFX_STOP_ALL_MUSIC call PlaySound - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr z, .skipCopyingRandomNumberList ; the list generated by the gameboy clocking the connection is used by both gameboys ld hl, wSerialOtherGameboyRandomNumberListBlock @@ -255,15 +255,15 @@ CableClub_DoBattleOrTradeAgain: ld hl, wEnemyMons + (SERIAL_PREAMBLE_BYTE - 1) dec c jr nz, .unpatchEnemyMonsLoop - ld a, wEnemyMonOT % $100 + ld a, LOW(wEnemyMonOT) ld [wUnusedCF8D], a - ld a, wEnemyMonOT / $100 + ld a, HIGH(wEnemyMonOT) ld [wUnusedCF8D + 1], a xor a ld [wTradeCenterPointerTableIndex], a - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC call PlaySound - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ld c, 66 call z, DelayFrames ; delay if using internal clock @@ -274,7 +274,7 @@ CableClub_DoBattleOrTradeAgain: jr nz, .trading ld a, LINK_STATE_BATTLING ld [wLinkState], a - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a call ClearScreen call Delay3 @@ -338,10 +338,10 @@ TradeCenter_SelectMon: ld a, 1 ld [wTopMenuItemX], a .enemyMonMenu_HandleInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags res 1, [hl] and a jp z, .getNewInput @@ -359,7 +359,7 @@ TradeCenter_SelectMon: .displayEnemyMonStats ld a, INIT_ENEMYOT_LIST ld [wInitListType], a - callab InitList ; the list isn't used + callfar InitList ; the list isn't used ld hl, wEnemyMons call TradeCenter_DisplayStats jp .getNewInput @@ -399,14 +399,14 @@ TradeCenter_SelectMon: ld [wTopMenuItemY], a ld a, 1 ld [wTopMenuItemX], a - coord hl, 1, 1 + hlcoord 1, 1 lb bc, 6, 1 call ClearScreenArea .playerMonMenu_HandleInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags res 1, [hl] and a ; was anything pressed? jr nz, .playerMonMenu_SomethingPressed @@ -418,7 +418,7 @@ TradeCenter_SelectMon: ; unreachable code ld a, INIT_PLAYEROT_LIST ld [wInitListType], a - callab InitList ; the list isn't used + callfar InitList ; the list isn't used call TradeCenter_DisplayStats jp .getNewInput .playerMonMenu_ANotPressed @@ -464,11 +464,11 @@ TradeCenter_SelectMon: dec a .displayStatsTradeMenu push af - coord hl, 0, 14 + hlcoord 0, 14 ld b, 2 ld c, 18 call CableClub_TextBoxBorder - coord hl, 2, 16 + hlcoord 2, 16 ld de, .statsTrade call PlaceString xor a @@ -480,7 +480,7 @@ TradeCenter_SelectMon: ld [wTopMenuItemY], a .selectStatsMenuItem ld a, " " - Coorda 11, 16 + ldcoord_a 11, 16 ld a, D_RIGHT | B_BUTTON | A_BUTTON ld [wMenuWatchedKeys], a ld a, 1 @@ -497,7 +497,7 @@ TradeCenter_SelectMon: jp .playerMonMenu .selectTradeMenuItem ld a, " " - Coorda 1, 16 + ldcoord_a 1, 16 ld a, D_LEFT | B_BUTTON | A_BUTTON ld [wMenuWatchedKeys], a ld a, 11 @@ -513,7 +513,7 @@ TradeCenter_SelectMon: ld [wCurrentMenuItem], a ld a, INIT_PLAYEROT_LIST ld [wInitListType], a - callab InitList ; the list isn't used + callfar InitList ; the list isn't used call TradeCenter_DisplayStats call LoadScreenTilesFromBuffer1 jp .playerMonMenu @@ -548,10 +548,10 @@ TradeCenter_SelectMon: ld [hl], a .cancelMenuItem_Loop ld a, "▶" ; filled arrow cursor - Coorda 1, 16 + ldcoord_a 1, 16 .cancelMenuItem_JoypadLoop call JoypadLowSensitivity - ld a, [hJoy5] + ldh a, [hJoy5] and a ; pressed anything? jr z, .cancelMenuItem_JoypadLoop bit 0, a ; A button pressed? @@ -560,14 +560,14 @@ TradeCenter_SelectMon: jr z, .cancelMenuItem_JoypadLoop ; if Up pressed ld a, " " - Coorda 1, 16 + ldcoord_a 1, 16 ld a, [wPartyCount] dec a ld [wCurrentMenuItem], a jp .playerMonMenu .cancelMenuItem_APressed ld a, "▷" ; unfilled arrow cursor - Coorda 1, 16 + ldcoord_a 1, 16 ld a, $f ld [wSerialExchangeNybbleSendData], a call Serial_PrintWaitingTextAndSyncAndExchangeNybble @@ -588,7 +588,7 @@ ReturnToCableClubRoom: dec a ld [wDestinationWarpID], a call LoadMapData - callba ClearVariablesOnEnterMap + farcall ClearVariablesOnEnterMap pop hl pop af ld [hl], a @@ -596,15 +596,15 @@ ReturnToCableClubRoom: ret TradeCenter_DrawCancelBox: - coord hl, 11, 15 + hlcoord 11, 15 ld a, $7e ld bc, 2 * SCREEN_WIDTH + 9 call FillMemory - coord hl, 0, 15 + hlcoord 0, 15 ld b, 1 ld c, 9 call CableClub_TextBoxBorder - coord hl, 2, 16 + hlcoord 2, 16 ld de, CancelTextString jp PlaceString @@ -613,7 +613,7 @@ CancelTextString: TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] - coord hl, 1, 9 + hlcoord 1, 9 ld bc, SCREEN_WIDTH call AddNTimes ld [hl], "▷" ; cursor @@ -630,24 +630,24 @@ TradeCenter_DisplayStats: jp TradeCenter_DrawCancelBox TradeCenter_DrawPartyLists: - coord hl, 0, 0 + hlcoord 0, 0 ld b, 6 ld c, 18 call CableClub_TextBoxBorder - coord hl, 0, 8 + hlcoord 0, 8 ld b, 6 ld c, 18 call CableClub_TextBoxBorder - coord hl, 5, 0 + hlcoord 5, 0 ld de, wPlayerName call PlaceString - coord hl, 5, 8 + hlcoord 5, 8 ld de, wLinkEnemyTrainerName call PlaceString - coord hl, 2, 1 + hlcoord 2, 1 ld de, wPartySpecies call TradeCenter_PrintPartyListNames - coord hl, 2, 9 + hlcoord 2, 9 ld de, wEnemyPartyMons ; fall through @@ -663,7 +663,7 @@ TradeCenter_PrintPartyListNames: push de push hl ld a, c - ld [$ff95], a + ldh [hPastLeadingZeros], a call GetMonName pop hl call PlaceString @@ -684,7 +684,7 @@ TradeCenter_Trade: ld [wSerialExchangeNybbleReceiveData], a ld [wMenuWatchMovingOutOfBounds], a ld [wMenuJoypadPollCount], a - coord hl, 0, 12 + hlcoord 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder @@ -709,10 +709,10 @@ TradeCenter_Trade: ld [wd11e], a call GetMonName ld hl, WillBeTradedText - coord bc, 1, 14 + bccoord 1, 14 call TextCommandProcessor call SaveScreenTilesToBuffer1 - coord hl, 10, 7 + hlcoord 10, 7 lb bc, 8, 11 ld a, TRADE_CANCEL_MENU ld [wTwoOptionMenuID], a @@ -726,11 +726,11 @@ TradeCenter_Trade: ; if trade cancelled ld a, $1 ld [wSerialExchangeNybbleSendData], a - coord hl, 0, 12 + hlcoord 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - coord hl, 1, 14 + hlcoord 1, 14 ld de, TradeCanceled call PlaceString call Serial_PrintWaitingTextAndSyncAndExchangeNybble @@ -743,11 +743,11 @@ TradeCenter_Trade: dec a ; did the other person cancel? jr nz, .doTrade ; if the other person cancelled - coord hl, 0, 12 + hlcoord 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - coord hl, 1, 14 + hlcoord 1, 14 ld de, TradeCanceled call PlaceString jp .tradeCancelled @@ -826,7 +826,7 @@ TradeCenter_Trade: ld [wTradedEnemyMonSpecies], a ld a, 10 ld [wAudioFadeOutControl], a - ld a, $2 + ld a, 0 ; BANK(Music_SafariZone) ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE ld [wNewSoundID], a @@ -837,7 +837,7 @@ TradeCenter_Trade: call LoadHpBarAndStatusTilePatterns xor a ld [wUnusedCC5B], a - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK jr z, .usingExternalClock predef InternalClockTradeAnim @@ -845,17 +845,17 @@ TradeCenter_Trade: .usingExternalClock predef ExternalClockTradeAnim .tradeCompleted - callab TryEvolvingMon + callfar TryEvolvingMon call ClearScreen call LoadTrainerInfoTextBoxTiles call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld c, 40 call DelayFrames - coord hl, 0, 12 + hlcoord 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - coord hl, 1, 14 + hlcoord 1, 14 ld de, TradeCompleted call PlaceString predef SaveSAVtoSRAM2 @@ -872,8 +872,8 @@ TradeCenter_Trade: jp CallCurrentTradeCenterFunction WillBeTradedText: - TX_FAR _WillBeTradedText - db "@" + text_far _WillBeTradedText + text_end TradeCompleted: db "Trade completed!@" @@ -894,7 +894,7 @@ CableClub_Run: jr z, .doBattleOrTrade cp LINK_STATE_RESET ; this is never used ret nz - predef EmptyFunc3 + predef EmptyFunc jp Init .doBattleOrTrade call CableClub_DoBattleOrTrade @@ -903,7 +903,7 @@ CableClub_Run: ld [wTilesetGfxPtr + 1], a ld a, l ld [wTilesetGfxPtr], a - ld a, Bank(Club_GFX) + ld a, BANK(Club_GFX) ld [wTilesetBank], a ld hl, Club_Coll ld a, h @@ -914,7 +914,7 @@ CableClub_Run: ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a - ld [hJoy5], a + ldh [hJoy5], a ld a, 10 ld [wAudioFadeOutControl], a ld a, 0 ; BANK(Music_Celadon) @@ -923,7 +923,7 @@ CableClub_Run: ld [wNewSoundID], a jp PlayMusic -EmptyFunc3: +EmptyFunc: ret Diploma_TextBoxBorder: @@ -972,6 +972,6 @@ CableClub_DrawHorizontalLine: LoadTrainerInfoTextBoxTiles: ld de, TrainerInfoTextBoxTileGraphics - ld hl, vChars2 + $760 + ld hl, vChars2 tile $76 lb bc, BANK(TrainerInfoTextBoxTileGraphics), (TrainerInfoTextBoxTileGraphicsEnd - TrainerInfoTextBoxTileGraphics) / $10 jp CopyVideoData diff --git a/engine/overworld/cable_club_npc.asm b/engine/link/cable_club_npc.asm old mode 100755 new mode 100644 similarity index 77% rename from engine/overworld/cable_club_npc.asm rename to engine/link/cable_club_npc.asm index 08067412..594adf08 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/link/cable_club_npc.asm @@ -1,4 +1,4 @@ -CableClubNPC: +CableClubNPC:: ld hl, CableClubNPCWelcomeText call PrintText CheckEvent EVENT_GOT_POKEDEX @@ -15,27 +15,27 @@ CableClubNPC: ld a, 90 ld [wLinkTimeoutCounter], a .establishConnectionLoop - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr z, .establishedConnection cp USING_EXTERNAL_CLOCK jr z, .establishedConnection ld a, CONNECTION_NOT_ESTABLISHED - ld [hSerialConnectionStatus], a + ldh [hSerialConnectionStatus], a ld a, ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK - ld [rSB], a + ldh [rSB], a xor a - ld [hSerialReceiveData], a + ldh [hSerialReceiveData], a ld a, START_TRANSFER_EXTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a ld a, [wLinkTimeoutCounter] dec a ld [wLinkTimeoutCounter], a jr z, .failedToEstablishConnection ld a, ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK - ld [rSB], a + ldh [rSB], a ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a call DelayFrame jr .establishConnectionLoop .establishedConnection @@ -54,7 +54,7 @@ CableClubNPC: ld a, [wCurrentMenuItem] and a jr nz, .choseNo - callab SaveSAVtoSRAM + callfar SaveSAVtoSRAM call WaitForSoundToFinish ld a, SFX_SAVE call PlaySoundWaitForCurrent @@ -65,7 +65,7 @@ CableClubNPC: ld [hli], a xor a ld [hl], a - ld [hSerialReceivedNewData], a + ldh [hSerialReceivedNewData], a ld [wSerialExchangeNybbleSendData], a call Serial_SyncAndExchangeNybble ld hl, wUnknownSerialCounter @@ -107,45 +107,45 @@ CableClubNPC: xor a ld [hld], a ld [hl], a - jpab LinkMenu + jpfar LinkMenu CableClubNPCAreaReservedFor2FriendsLinkedByCableText: - TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText - db "@" + text_far _CableClubNPCAreaReservedFor2FriendsLinkedByCableText + text_end CableClubNPCWelcomeText: - TX_FAR _CableClubNPCWelcomeText - db "@" + text_far _CableClubNPCWelcomeText + text_end CableClubNPCPleaseApplyHereHaveToSaveText: - TX_FAR _CableClubNPCPleaseApplyHereHaveToSaveText - db "@" + text_far _CableClubNPCPleaseApplyHereHaveToSaveText + text_end CableClubNPCPleaseWaitText: - TX_FAR _CableClubNPCPleaseWaitText - TX_DELAY - db "@" + text_far _CableClubNPCPleaseWaitText + text_pause + text_end CableClubNPCLinkClosedBecauseOfInactivityText: - TX_FAR _CableClubNPCLinkClosedBecauseOfInactivityText - db "@" + text_far _CableClubNPCLinkClosedBecauseOfInactivityText + text_end CableClubNPCPleaseComeAgainText: - TX_FAR _CableClubNPCPleaseComeAgainText - db "@" + text_far _CableClubNPCPleaseComeAgainText + text_end CableClubNPCMakingPreparationsText: - TX_FAR _CableClubNPCMakingPreparationsText - db "@" + text_far _CableClubNPCMakingPreparationsText + text_end CloseLinkConnection: call Delay3 ld a, CONNECTION_NOT_ESTABLISHED - ld [hSerialConnectionStatus], a + ldh [hSerialConnectionStatus], a ld a, ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK - ld [rSB], a + ldh [rSB], a xor a - ld [hSerialReceiveData], a + ldh [hSerialReceiveData], a ld a, START_TRANSFER_EXTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a ret diff --git a/engine/link/print_waiting_text.asm b/engine/link/print_waiting_text.asm new file mode 100644 index 00000000..1a16e2f2 --- /dev/null +++ b/engine/link/print_waiting_text.asm @@ -0,0 +1,21 @@ +PrintWaitingText:: + hlcoord 3, 10 + ld b, 1 + ld c, 11 + ld a, [wIsInBattle] + and a + jr z, .trade +; battle + call TextBoxBorder + jr .border_done +.trade + call CableClub_TextBoxBorder +.border_done + hlcoord 4, 11 + ld de, WaitingText + call PlaceString + ld c, 50 + jp DelayFrames + +WaitingText: + db "Waiting...!@" diff --git a/engine/math/bcd.asm b/engine/math/bcd.asm new file mode 100644 index 00000000..5747a684 --- /dev/null +++ b/engine/math/bcd.asm @@ -0,0 +1,218 @@ +; divide hMoney by hDivideBCDDivisor +; return output in hDivideBCDQuotient (same as hDivideBCDDivisor) +; used only to halve player money upon losing a fight +DivideBCDPredef:: +DivideBCDPredef2:: +DivideBCDPredef3:: ; only used function +DivideBCDPredef4:: + call GetPredefRegisters + +DivideBCD:: + xor a + ldh [hDivideBCDBuffer], a + ldh [hDivideBCDBuffer+1], a + ldh [hDivideBCDBuffer+2], a + ld d, $1 +.mulBy10Loop +; multiply the divisor by 10 until the leading digit is nonzero +; to set up the standard long division algorithm + ldh a, [hDivideBCDDivisor] + and $f0 + jr nz, .next + inc d + ldh a, [hDivideBCDDivisor] + swap a + and $f0 + ld b, a + ldh a, [hDivideBCDDivisor+1] + swap a + ldh [hDivideBCDDivisor+1], a + and $f + or b + ldh [hDivideBCDDivisor], a + ldh a, [hDivideBCDDivisor+1] + and $f0 + ld b, a + ldh a, [hDivideBCDDivisor+2] + swap a + ldh [hDivideBCDDivisor+2], a + and $f + or b + ldh [hDivideBCDDivisor+1], a + ldh a, [hDivideBCDDivisor+2] + and $f0 + ldh [hDivideBCDDivisor+2], a + jr .mulBy10Loop + +.next + push de + push de + call DivideBCD_getNextDigit + pop de + ld a, b + swap a + and $f0 + ldh [hDivideBCDBuffer], a + dec d + jr z, .next2 + push de + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit + pop de + ldh a, [hDivideBCDBuffer] + or b + ldh [hDivideBCDBuffer], a + dec d + jr z, .next2 + push de + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit + pop de + ld a, b + swap a + and $f0 + ldh [hDivideBCDBuffer+1], a + dec d + jr z, .next2 + push de + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit + pop de + ldh a, [hDivideBCDBuffer+1] + or b + ldh [hDivideBCDBuffer+1], a + dec d + jr z, .next2 + push de + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit + pop de + ld a, b + swap a + and $f0 + ldh [hDivideBCDBuffer+2], a + dec d + jr z, .next2 + push de + call DivideBCD_divDivisorBy10 + call DivideBCD_getNextDigit + pop de + ldh a, [hDivideBCDBuffer+2] + or b + ldh [hDivideBCDBuffer+2], a +.next2 + ldh a, [hDivideBCDBuffer] + ldh [hDivideBCDQuotient], a ; the same memory location as hDivideBCDDivisor + ldh a, [hDivideBCDBuffer+1] + ldh [hDivideBCDQuotient+1], a + ldh a, [hDivideBCDBuffer+2] + ldh [hDivideBCDQuotient+2], a + pop de + ld a, $6 + sub d + and a + ret z +.divResultBy10loop + push af + call DivideBCD_divDivisorBy10 + pop af + dec a + jr nz, .divResultBy10loop + ret + +DivideBCD_divDivisorBy10: + ldh a, [hDivideBCDDivisor+2] + swap a + and $f + ld b, a + ldh a, [hDivideBCDDivisor+1] + swap a + ldh [hDivideBCDDivisor+1], a + and $f0 + or b + ldh [hDivideBCDDivisor+2], a + ldh a, [hDivideBCDDivisor+1] + and $f + ld b, a + ldh a, [hDivideBCDDivisor] + swap a + ldh [hDivideBCDDivisor], a + and $f0 + or b + ldh [hDivideBCDDivisor+1], a + ldh a, [hDivideBCDDivisor] + and $f + ldh [hDivideBCDDivisor], a + ret + +DivideBCD_getNextDigit: + ld bc, $3 +.loop + ld de, hMoney ; the dividend + ld hl, hDivideBCDDivisor + push bc + call StringCmp + pop bc + ret c + inc b + ld de, hMoney + 2 ; since SubBCD works starting from the least significant digit + ld hl, hDivideBCDDivisor + 2 + push bc + call SubBCD + pop bc + jr .loop + + +AddBCDPredef:: + call GetPredefRegisters + +AddBCD:: + and a + ld b, c +.add + ld a, [de] + adc [hl] + daa + ld [de], a + dec de + dec hl + dec c + jr nz, .add + jr nc, .done + ld a, $99 + inc de +.fill + ld [de], a + inc de + dec b + jr nz, .fill +.done + ret + + +SubBCDPredef:: + call GetPredefRegisters + +SubBCD:: + and a + ld b, c +.sub + ld a, [de] + sbc [hl] + daa + ld [de], a + dec de + dec hl + dec c + jr nz, .sub + jr nc, .done + ld a, $00 + inc de +.fill + ld [de], a + inc de + dec b + jr nz, .fill + scf +.done + ret diff --git a/engine/math/multiply_divide.asm b/engine/math/multiply_divide.asm new file mode 100644 index 00000000..2fcda158 --- /dev/null +++ b/engine/math/multiply_divide.asm @@ -0,0 +1,143 @@ +_Multiply:: + ld a, $8 + ld b, a + xor a + ldh [hProduct], a + ldh [hMultiplyBuffer], a + ldh [hMultiplyBuffer+1], a + ldh [hMultiplyBuffer+2], a + ldh [hMultiplyBuffer+3], a +.loop + ldh a, [hMultiplier] + srl a + ldh [hMultiplier], a ; (aliases: hDivisor, hMultiplier, hPowerOf10) + jr nc, .smallMultiplier + ldh a, [hMultiplyBuffer+3] + ld c, a + ldh a, [hMultiplicand+2] + add c + ldh [hMultiplyBuffer+3], a + ldh a, [hMultiplyBuffer+2] + ld c, a + ldh a, [hMultiplicand+1] + adc c + ldh [hMultiplyBuffer+2], a + ldh a, [hMultiplyBuffer+1] + ld c, a + ldh a, [hMultiplicand] ; (aliases: hMultiplicand) + adc c + ldh [hMultiplyBuffer+1], a + ldh a, [hMultiplyBuffer] + ld c, a + ldh a, [hProduct] ; (aliases: hProduct, hPastLeadingZeros, hQuotient) + adc c + ldh [hMultiplyBuffer], a +.smallMultiplier + dec b + jr z, .done + ldh a, [hMultiplicand+2] + sla a + ldh [hMultiplicand+2], a + ldh a, [hMultiplicand+1] + rl a + ldh [hMultiplicand+1], a + ldh a, [hMultiplicand] + rl a + ldh [hMultiplicand], a + ldh a, [hProduct] + rl a + ldh [hProduct], a + jr .loop +.done + ldh a, [hMultiplyBuffer+3] + ldh [hProduct+3], a + ldh a, [hMultiplyBuffer+2] + ldh [hProduct+2], a + ldh a, [hMultiplyBuffer+1] + ldh [hProduct+1], a + ldh a, [hMultiplyBuffer] + ldh [hProduct], a + ret + +_Divide:: + xor a + ldh [hDivideBuffer], a + ldh [hDivideBuffer+1], a + ldh [hDivideBuffer+2], a + ldh [hDivideBuffer+3], a + ldh [hDivideBuffer+4], a + ld a, $9 + ld e, a +.asm_37db3 + ldh a, [hDivideBuffer] + ld c, a + ldh a, [hDividend+1] ; (aliases: hMultiplicand) + sub c + ld d, a + ldh a, [hDivisor] ; (aliases: hDivisor, hMultiplier, hPowerOf10) + ld c, a + ldh a, [hDividend] ; (aliases: hProduct, hPastLeadingZeros, hQuotient) + sbc c + jr c, .asm_37dce + ldh [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient) + ld a, d + ldh [hDividend+1], a ; (aliases: hMultiplicand) + ldh a, [hDivideBuffer+4] + inc a + ldh [hDivideBuffer+4], a + jr .asm_37db3 +.asm_37dce + ld a, b + cp $1 + jr z, .asm_37e18 + ldh a, [hDivideBuffer+4] + sla a + ldh [hDivideBuffer+4], a + ldh a, [hDivideBuffer+3] + rl a + ldh [hDivideBuffer+3], a + ldh a, [hDivideBuffer+2] + rl a + ldh [hDivideBuffer+2], a + ldh a, [hDivideBuffer+1] + rl a + ldh [hDivideBuffer+1], a + dec e + jr nz, .asm_37e04 + ld a, $8 + ld e, a + ldh a, [hDivideBuffer] + ldh [hDivisor], a ; (aliases: hDivisor, hMultiplier, hPowerOf10) + xor a + ldh [hDivideBuffer], a + ldh a, [hDividend+1] ; (aliases: hMultiplicand) + ldh [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient) + ldh a, [hDividend+2] + ldh [hDividend+1], a ; (aliases: hMultiplicand) + ldh a, [hDividend+3] + ldh [hDividend+2], a +.asm_37e04 + ld a, e + cp $1 + jr nz, .asm_37e0a + dec b +.asm_37e0a + ldh a, [hDivisor] ; (aliases: hDivisor, hMultiplier, hPowerOf10) + srl a + ldh [hDivisor], a ; (aliases: hDivisor, hMultiplier, hPowerOf10) + ldh a, [hDivideBuffer] + rr a + ldh [hDivideBuffer], a + jr .asm_37db3 +.asm_37e18 + ldh a, [hDividend+1] ; (aliases: hMultiplicand) + ldh [hRemainder], a ; (aliases: hDivisor, hMultiplier, hPowerOf10) + ldh a, [hDivideBuffer+4] + ldh [hQuotient+3], a + ldh a, [hDivideBuffer+3] + ldh [hQuotient+2], a + ldh a, [hDivideBuffer+2] + ldh [hQuotient+1], a ; (aliases: hMultiplicand) + ldh a, [hDivideBuffer+1] + ldh [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient) + ret diff --git a/engine/math/random.asm b/engine/math/random.asm new file mode 100644 index 00000000..c8760157 --- /dev/null +++ b/engine/math/random.asm @@ -0,0 +1,13 @@ +Random_:: +; Generate a random 16-bit value. + ldh a, [rDIV] + ld b, a + ldh a, [hRandomAdd] + adc b + ldh [hRandomAdd], a + ldh a, [rDIV] + ld b, a + ldh a, [hRandomSub] + sbc b + ldh [hRandomSub], a + ret diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm deleted file mode 100755 index 09ba123e..00000000 --- a/engine/menu/diploma.asm +++ /dev/null @@ -1,113 +0,0 @@ -DisplayDiploma: - call SaveScreenTilesToBuffer2 - call GBPalWhiteOutWithDelay3 - call ClearScreen - xor a - ld [wUpdateSpritesEnabled], a - ld hl, wd730 - set 6, [hl] - call DisableLCD - ld hl, CircleTile - ld de, vChars2 + $700 - ld bc, $0010 - ld a, BANK(CircleTile) - call FarCopyData2 - coord hl, 0, 0 - lb bc, 16, 18 - predef Diploma_TextBoxBorder - ld hl, DiplomaTextPointersAndCoords - ld c, $5 -.asm_56715 - push bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - ld a, [hli] - push hl - ld h, [hl] - ld l, a - call PlaceString - pop hl - inc hl - pop bc - dec c - jr nz, .asm_56715 - coord hl, 10, 4 - ld de, wPlayerName - call PlaceString - callba DrawPlayerCharacter - -; Move the player 33 pixels right and set the priority bit so he appears -; behind the background layer. - ld hl, wOAMBuffer + $01 - lb bc, $80, $28 -.adjustPlayerGfxLoop - ld a, [hl] ; X - add 33 - ld [hli], a - inc hl - ld a, b - ld [hli], a ; attributes - inc hl - dec c - jr nz, .adjustPlayerGfxLoop - - call EnableLCD - callba LoadTrainerInfoTextBoxTiles - ld b, SET_PAL_GENERIC - call RunPaletteCommand - call Delay3 - call GBPalNormal - ld a, $90 - ld [rOBP0], a - call WaitForTextScrollButtonPress - ld hl, wd730 - res 6, [hl] - call GBPalWhiteOutWithDelay3 - call RestoreScreenTilesAndReloadTilePatterns - call Delay3 - jp GBPalNormal - -UnusedPlayerNameLengthFunc: -; Unused function that does a calculation involving the length of the player's -; name. - ld hl, wPlayerName - ld bc, $ff00 -.loop - ld a, [hli] - cp "@" - ret z - dec c - jr .loop - -DiplomaTextPointersAndCoords: - dw DiplomaText - dwCoord 5, 2 - dw DiplomaPlayer - dwCoord 3, 4 - dw DiplomaEmptyText - dwCoord 15, 4 - dw DiplomaCongrats - dwCoord 2, 6 - dw DiplomaGameFreak - dwCoord 9, 16 - -DiplomaText: - db $70,"Diploma",$70,"@" - -DiplomaPlayer: - db "Player@" - -DiplomaEmptyText: - db "@" - -DiplomaCongrats: - db "Congrats! This" - next "diploma certifies" - next "that you have" - next "completed your" - next "#DEX.@" - -DiplomaGameFreak: - db "GAME FREAK@" diff --git a/engine/menu/oaks_pc.asm b/engine/menu/oaks_pc.asm deleted file mode 100755 index 03c9b8f1..00000000 --- a/engine/menu/oaks_pc.asm +++ /dev/null @@ -1,28 +0,0 @@ -OpenOaksPC: - call SaveScreenTilesToBuffer2 - ld hl, AccessedOaksPCText - call PrintText - ld hl, GetDexRatedText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .closePC - predef DisplayDexRating -.closePC - ld hl, ClosedOaksPCText - call PrintText - jp LoadScreenTilesFromBuffer2 - -GetDexRatedText: - TX_FAR _GetDexRatedText - db "@" - -ClosedOaksPCText: - TX_FAR _ClosedOaksPCText - TX_WAIT - db "@" - -AccessedOaksPCText: - TX_FAR _AccessedOaksPCText - db "@" diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm deleted file mode 100755 index 8323d0eb..00000000 --- a/engine/menu/party_menu.asm +++ /dev/null @@ -1,325 +0,0 @@ -; [wPartyMenuTypeOrMessageID] = menu type / message ID -; if less than $F0, it is a menu type -; menu types: -; 00: normal pokemon menu (e.g. Start menu) -; 01: use healing item on pokemon menu -; 02: in-battle switch pokemon menu -; 03: learn TM/HM menu -; 04: swap pokemon positions menu -; 05: use evolution stone on pokemon menu -; otherwise, it is a message ID -; f0: poison healed -; f1: burn healed -; f2: freeze healed -; f3: sleep healed -; f4: paralysis healed -; f5: HP healed -; f6: health returned -; f7: revitalized -; f8: leveled up -DrawPartyMenu_: - xor a - ld [H_AUTOBGTRANSFERENABLED], a - call ClearScreen - call UpdateSprites - callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics - -RedrawPartyMenu_: - ld a, [wPartyMenuTypeOrMessageID] - cp SWAP_MONS_PARTY_MENU - jp z, .printMessage - call ErasePartyMenuCursors - callba InitPartyMenuBlkPacket - coord hl, 3, 0 - ld de, wPartySpecies - xor a - ld c, a - ld [hPartyMonIndex], a - ld [wWhichPartyMenuHPBar], a -.loop - ld a, [de] - cp $FF ; reached the terminator? - jp z, .afterDrawingMonEntries - push bc - push de - push hl - ld a, c - push hl - ld hl, wPartyMonNicks - call GetPartyMonName - pop hl - call PlaceString ; print the pokemon's name - callba WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon - ld a, [hPartyMonIndex] - ld [wWhichPokemon], a - inc a - ld [hPartyMonIndex], a - call LoadMonData - pop hl - push hl - ld a, [wMenuItemToSwap] - and a ; is the player swapping pokemon positions? - jr z, .skipUnfilledRightArrow -; if the player is swapping pokemon positions - dec a - ld b, a - ld a, [wWhichPokemon] - cp b ; is the player swapping the current pokemon in the list? - jr nz, .skipUnfilledRightArrow -; the player is swapping the current pokemon in the list - dec hl - dec hl - dec hl - ld a, "▷" ; unfilled right arrow menu cursor - ld [hli], a ; place the cursor - inc hl - inc hl -.skipUnfilledRightArrow - ld a, [wPartyMenuTypeOrMessageID] ; menu type - cp TMHM_PARTY_MENU - jr z, .teachMoveMenu - cp EVO_STONE_PARTY_MENU - jr z, .evolutionStoneMenu - push hl - ld bc, 14 ; 14 columns to the right - add hl, bc - ld de, wLoadedMonStatus - call PrintStatusCondition - pop hl - push hl - ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column - ld a, [hFlags_0xFFF6] - set 0, a - ld [hFlags_0xFFF6], a - add hl, bc - predef DrawHP2 ; draw HP bar and prints current / max HP - ld a, [hFlags_0xFFF6] - res 0, a - ld [hFlags_0xFFF6], a - call SetPartyMenuHPBarColor ; color the HP bar (on SGB) - pop hl - jr .printLevel -.teachMoveMenu - push hl - predef CanLearnTM ; check if the pokemon can learn the move - pop hl - ld de, .ableToLearnMoveText - ld a, c - and a - jr nz, .placeMoveLearnabilityString - ld de, .notAbleToLearnMoveText -.placeMoveLearnabilityString - ld bc, 20 + 9 ; down 1 row and right 9 columns - push hl - add hl, bc - call PlaceString - pop hl -.printLevel - ld bc, 10 ; move 10 columns to the right - add hl, bc - call PrintLevel - pop hl - pop de - inc de - ld bc, 2 * 20 - add hl, bc - pop bc - inc c - jp .loop -.ableToLearnMoveText - db "ABLE@" -.notAbleToLearnMoveText - db "NOT ABLE@" -.evolutionStoneMenu - push hl - ld hl, EvosMovesPointerTable - ld b, 0 - ld a, [wLoadedMonSpecies] - dec a - add a - rl b - ld c, a - add hl, bc - ld de, wEvosMoves - ld a, BANK(EvosMovesPointerTable) - ld bc, 2 - call FarCopyData - ld hl, wEvosMoves - ld a, [hli] - ld h, [hl] - ld l, a - ld de, wEvosMoves - ld a, BANK(EvosMovesPointerTable) - ld bc, wEvosMoves.end - wEvosMoves - call FarCopyData - ld hl, wEvosMoves - ld de, .notAbleToEvolveText -; loop through the pokemon's evolution entries -.checkEvolutionsLoop - ld a, [hli] - and a ; reached terminator? - jr z, .placeEvolutionStoneString ; if so, place the "NOT ABLE" string - inc hl - inc hl - cp EV_ITEM - jr nz, .checkEvolutionsLoop -; if it's a stone evolution entry - dec hl - dec hl - ld b, [hl] - ld a, [wEvoStoneItemID] ; the stone the player used - inc hl - inc hl - inc hl - cp b ; does the player's stone match this evolution entry's stone? - jr nz, .checkEvolutionsLoop -; if it does match - ld de, .ableToEvolveText -.placeEvolutionStoneString - ld bc, 20 + 9 ; down 1 row and right 9 columns - pop hl - push hl - add hl, bc - call PlaceString - pop hl - jr .printLevel -.ableToEvolveText - db "ABLE@" -.notAbleToEvolveText - db "NOT ABLE@" -.afterDrawingMonEntries - ld b, SET_PAL_PARTY_MENU - call RunPaletteCommand -.printMessage - ld hl, wd730 - ld a, [hl] - push af - push hl - set 6, [hl] ; turn off letter printing delay - ld a, [wPartyMenuTypeOrMessageID] ; message ID - cp $F0 - jr nc, .printItemUseMessage - add a - ld hl, PartyMenuMessagePointers - ld b, 0 - ld c, a - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - call PrintText -.done - pop hl - pop af - ld [hl], a - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a - call Delay3 - jp GBPalNormal -.printItemUseMessage - and $0F - ld hl, PartyMenuItemUseMessagePointers - add a - ld c, a - ld b, 0 - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - push hl - ld a, [wUsedItemOnWhichPokemon] - ld hl, wPartyMonNicks - call GetPartyMonName - pop hl - call PrintText - jr .done - -PartyMenuItemUseMessagePointers: - dw AntidoteText - dw BurnHealText - dw IceHealText - dw AwakeningText - dw ParlyzHealText - dw PotionText - dw FullHealText - dw ReviveText - dw RareCandyText - -PartyMenuMessagePointers: - dw PartyMenuNormalText - dw PartyMenuItemUseText - dw PartyMenuBattleText - dw PartyMenuUseTMText - dw PartyMenuSwapMonText - dw PartyMenuItemUseText - -PartyMenuNormalText: - TX_FAR _PartyMenuNormalText - db "@" - -PartyMenuItemUseText: - TX_FAR _PartyMenuItemUseText - db "@" - -PartyMenuBattleText: - TX_FAR _PartyMenuBattleText - db "@" - -PartyMenuUseTMText: - TX_FAR _PartyMenuUseTMText - db "@" - -PartyMenuSwapMonText: - TX_FAR _PartyMenuSwapMonText - db "@" - -PotionText: - TX_FAR _PotionText - db "@" - -AntidoteText: - TX_FAR _AntidoteText - db "@" - -ParlyzHealText: - TX_FAR _ParlyzHealText - db "@" - -BurnHealText: - TX_FAR _BurnHealText - db "@" - -IceHealText: - TX_FAR _IceHealText - db "@" - -AwakeningText: - TX_FAR _AwakeningText - db "@" - -FullHealText: - TX_FAR _FullHealText - db "@" - -ReviveText: - TX_FAR _ReviveText - db "@" - -RareCandyText: - TX_FAR _RareCandyText - TX_SFX_ITEM_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded - TX_BLINK - db "@" - -SetPartyMenuHPBarColor: - ld hl, wPartyMenuHPBarColors - ld a, [wWhichPartyMenuHPBar] - ld c, a - ld b, 0 - add hl, bc - call GetHealthBarColor - ld b, UPDATE_PARTY_MENU_BLK_PACKET - call RunPaletteCommand - ld hl, wWhichPartyMenuHPBar - inc [hl] - ret diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm deleted file mode 100755 index ada59b68..00000000 --- a/engine/menu/pokedex.asm +++ /dev/null @@ -1,667 +0,0 @@ -ShowPokedexMenu: - call GBPalWhiteOut - call ClearScreen - call UpdateSprites - ld a, [wListScrollOffset] - push af - xor a - ld [wCurrentMenuItem], a - ld [wListScrollOffset], a - ld [wLastMenuItem], a - inc a - ld [wd11e], a - ld [hJoy7], a -.setUpGraphics - ld b, SET_PAL_GENERIC - call RunPaletteCommand - callab LoadPokedexTilePatterns -.doPokemonListMenu - ld hl, wTopMenuItemY - ld a, 3 - ld [hli], a ; top menu item Y - xor a - ld [hli], a ; top menu item X - inc a - ld [wMenuWatchMovingOutOfBounds], a - inc hl - inc hl - ld a, 6 - ld [hli], a ; max menu item ID - ld [hl], D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON - call HandlePokedexListMenu - jr c, .goToSideMenu ; if the player chose a pokemon from the list -.exitPokedex - xor a - ld [wMenuWatchMovingOutOfBounds], a - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld [hJoy7], a - ld [wWastedByteCD3A], a - ld [wOverrideSimulatedJoypadStatesMask], a - pop af - ld [wListScrollOffset], a - call GBPalWhiteOutWithDelay3 - call RunDefaultPaletteCommand - jp ReloadMapData -.goToSideMenu - call HandlePokedexSideMenu - dec b - jr z, .exitPokedex ; if the player chose Quit - dec b - jr z, .doPokemonListMenu ; if pokemon not seen or player pressed B button - jp .setUpGraphics ; if pokemon data or area was shown - -; handles the menu on the lower right in the pokedex screen -; OUTPUT: -; b = reason for exiting menu -; 00: showed pokemon data or area -; 01: the player chose Quit -; 02: the pokemon has not been seen yet or the player pressed the B button -HandlePokedexSideMenu: - call PlaceUnfilledArrowMenuCursor - ld a, [wCurrentMenuItem] - push af - ld b, a - ld a, [wLastMenuItem] - push af - ld a, [wListScrollOffset] - push af - add b - inc a - ld [wd11e], a - ld a, [wd11e] - push af - ld a, [wDexMaxSeenMon] - push af ; this doesn't need to be preserved - ld hl, wPokedexSeen - call IsPokemonBitSet - ld b, 2 - jr z, .exitSideMenu - call PokedexToIndex - ld hl, wTopMenuItemY - ld a, 10 - ld [hli], a ; top menu item Y - ld a, 15 - ld [hli], a ; top menu item X - xor a - ld [hli], a ; current menu item ID - inc hl - ld a, 3 - ld [hli], a ; max menu item ID - ;ld a, A_BUTTON | B_BUTTON - ld [hli], a ; menu watched keys (A button and B button) - xor a - ld [hli], a ; old menu item ID - ld [wMenuWatchMovingOutOfBounds], a -.handleMenuInput - call HandleMenuInput - bit 1, a ; was the B button pressed? - ld b, 2 - jr nz, .buttonBPressed - ld a, [wCurrentMenuItem] - and a - jr z, .choseData - dec a - jr z, .choseCry - dec a - jr z, .choseArea -.choseQuit - ld b, 1 -.exitSideMenu - pop af - ld [wDexMaxSeenMon], a - pop af - ld [wd11e], a - pop af - ld [wListScrollOffset], a - pop af - ld [wLastMenuItem], a - pop af - ld [wCurrentMenuItem], a - push bc - coord hl, 0, 3 - ld de, 20 - lb bc, " ", 13 - call DrawTileLine ; cover up the menu cursor in the pokemon list - pop bc - ret - -.buttonBPressed - push bc - coord hl, 15, 10 - ld de, 20 - lb bc, " ", 7 - call DrawTileLine ; cover up the menu cursor in the side menu - pop bc - jr .exitSideMenu - -.choseData - call ShowPokedexDataInternal - ld b, 0 - jr .exitSideMenu - -; play pokemon cry -.choseCry - ld a, [wd11e] - push af - call PlayCry - pop af - ld [wd11e], a - jr .handleMenuInput - -.choseArea - predef LoadTownMap_Nest ; display pokemon areas - ld b, 0 - jr .exitSideMenu - -; handles the list of pokemon on the left of the pokedex screen -; sets carry flag if player presses A, unsets carry flag if player presses B -HandlePokedexListMenu: - xor a - ld [H_AUTOBGTRANSFERENABLED], a -; draw the horizontal line separating the seen and owned amounts from the menu - coord hl, 15, 8 - ld a, "─" - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hli], a - coord hl, 14, 0 - ld [hl], $71 ; vertical line tile - coord hl, 14, 1 - call DrawPokedexVerticalLine - coord hl, 14, 9 - call DrawPokedexVerticalLine - ld hl, wPokedexSeen - ld b, wPokedexSeenEnd - wPokedexSeen - call CountSetBits - ld de, wNumSetBits - coord hl, 16, 3 - lb bc, 1, 3 - call PrintNumber ; print number of seen pokemon - ld hl, wPokedexOwned - ld b, wPokedexOwnedEnd - wPokedexOwned - call CountSetBits - ld de, wNumSetBits - coord hl, 16, 6 - lb bc, 1, 3 - call PrintNumber ; print number of owned pokemon - coord hl, 16, 2 - ld de, PokedexSeenText - call PlaceString - coord hl, 16, 5 - ld de, PokedexOwnText - call PlaceString - coord hl, 1, 1 - ld de, PokedexContentsText - call PlaceString - coord hl, 16, 10 - ld de, PokedexMenuItemsText - call PlaceString -; find the highest pokedex number among the pokemon the player has seen - ld hl, wPokedexSeenEnd - 1 - ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 -.maxSeenPokemonLoop - ld a, [hld] - ld c, 8 -.maxSeenPokemonInnerLoop - dec b - sla a - jr c, .storeMaxSeenPokemon - dec c - jr nz, .maxSeenPokemonInnerLoop - jr .maxSeenPokemonLoop - -.storeMaxSeenPokemon - ld a, b - ld [wDexMaxSeenMon], a -.loop - xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 4, 2 - lb bc, 14, 10 - call ClearScreenArea - coord hl, 1, 3 - ld a, [wListScrollOffset] - ld [wd11e], a - ld d, 7 - ld a, [wDexMaxSeenMon] - cp 7 - jr nc, .printPokemonLoop - ld d, a - dec a - ld [wMaxMenuItem], a -; loop to print pokemon pokedex numbers and names -; if the player has owned the pokemon, it puts a pokeball beside the name -.printPokemonLoop - ld a, [wd11e] - inc a - ld [wd11e], a - push af - push de - push hl - ld de, -SCREEN_WIDTH - add hl, de - ld de, wd11e - lb bc, LEADING_ZEROES | 1, 3 - call PrintNumber ; print the pokedex number - ld de, SCREEN_WIDTH - add hl, de - dec hl - push hl - ld hl, wPokedexOwned - call IsPokemonBitSet - pop hl - ld a, " " - jr z, .writeTile - ld a, $72 ; pokeball tile -.writeTile - ld [hl], a ; put a pokeball next to pokemon that the player has owned - push hl - ld hl, wPokedexSeen - call IsPokemonBitSet - jr nz, .getPokemonName ; if the player has seen the pokemon - ld de, .dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon - jr .skipGettingName -.dashedLine ; for unseen pokemon in the list - db "----------@" -.getPokemonName - call PokedexToIndex - call GetMonName -.skipGettingName - pop hl - inc hl - call PlaceString - pop hl - ld bc, 2 * SCREEN_WIDTH - add hl, bc - pop de - pop af - ld [wd11e], a - dec d - jr nz, .printPokemonLoop - ld a, 01 - ld [H_AUTOBGTRANSFERENABLED], a - call Delay3 - call GBPalNormal - call HandleMenuInput - bit 1, a ; was the B button pressed? - jp nz, .buttonBPressed -.checkIfUpPressed - bit 6, a ; was Up pressed? - jr z, .checkIfDownPressed -.upPressed ; scroll up one row - ld a, [wListScrollOffset] - and a - jp z, .loop - dec a - ld [wListScrollOffset], a - jp .loop -.checkIfDownPressed - bit 7, a ; was Down pressed? - jr z, .checkIfRightPressed -.downPressed ; scroll down one row - ld a, [wDexMaxSeenMon] - cp 7 - jp c, .loop ; can't if the list is shorter than 7 - sub 7 - ld b, a - ld a, [wListScrollOffset] - cp b - jp z, .loop - inc a - ld [wListScrollOffset], a - jp .loop -.checkIfRightPressed - bit 4, a ; was Right pressed? - jr z, .checkIfLeftPressed -.rightPressed ; scroll down 7 rows - ld a, [wDexMaxSeenMon] - cp 7 - jp c, .loop ; can't if the list is shorter than 7 - sub 6 - ld b, a - ld a, [wListScrollOffset] - add 7 - ld [wListScrollOffset], a - cp b - jp c, .loop - dec b - ld a, b - ld [wListScrollOffset], a - jp .loop -.checkIfLeftPressed ; scroll up 7 rows - bit 5, a ; was Left pressed? - jr z, .buttonAPressed -.leftPressed - ld a, [wListScrollOffset] - sub 7 - ld [wListScrollOffset], a - jp nc, .loop - xor a - ld [wListScrollOffset], a - jp .loop -.buttonAPressed - scf - ret -.buttonBPressed - and a - ret - -DrawPokedexVerticalLine: - ld c, 9 ; height of line - ld de, SCREEN_WIDTH - ld a, $71 ; vertical line tile -.loop - ld [hl], a - add hl, de - xor 1 ; toggle between vertical line tile and box tile - dec c - jr nz, .loop - ret - -PokedexSeenText: - db "SEEN@" - -PokedexOwnText: - db "OWN@" - -PokedexContentsText: - db "CONTENTS@" - -PokedexMenuItemsText: - db "DATA" - next "CRY" - next "AREA" - next "QUIT@" - -; tests if a pokemon's bit is set in the seen or owned pokemon bit fields -; INPUT: -; [wd11e] = pokedex number -; hl = address of bit field -IsPokemonBitSet: - ld a, [wd11e] - dec a - ld c, a - ld b, FLAG_TEST - predef FlagActionPredef - ld a, c - and a - ret - -; function to display pokedex data from outside the pokedex -ShowPokedexData: - call GBPalWhiteOutWithDelay3 - call ClearScreen - call UpdateSprites - callab LoadPokedexTilePatterns ; load pokedex tiles - -; function to display pokedex data from inside the pokedex -ShowPokedexDataInternal: - ld hl, wd72c - set 1, [hl] - ld a, $33 ; 3/7 volume - ld [rNR50], a - call GBPalWhiteOut ; zero all palettes - call ClearScreen - ld a, [wd11e] ; pokemon ID - ld [wcf91], a - push af - ld b, SET_PAL_POKEDEX - call RunPaletteCommand - pop af - ld [wd11e], a - ld a, [hTilesetType] - push af - xor a - ld [hTilesetType], a - - coord hl, 0, 0 - ld de, 1 - lb bc, $64, SCREEN_WIDTH - call DrawTileLine ; draw top border - - coord hl, 0, 17 - ld b, $6f - call DrawTileLine ; draw bottom border - - coord hl, 0, 1 - ld de, 20 - lb bc, $66, $10 - call DrawTileLine ; draw left border - - coord hl, 19, 1 - ld b, $67 - call DrawTileLine ; draw right border - - ld a, $63 ; upper left corner tile - Coorda 0, 0 - ld a, $65 ; upper right corner tile - Coorda 19, 0 - ld a, $6c ; lower left corner tile - Coorda 0, 17 - ld a, $6e ; lower right corner tile - Coorda 19, 17 - - coord hl, 0, 9 - ld de, PokedexDataDividerLine - call PlaceString ; draw horizontal divider line - - coord hl, 9, 6 - ld de, HeightWeightText - call PlaceString - - call GetMonName - coord hl, 9, 2 - call PlaceString - - ld hl, PokedexEntryPointers - ld a, [wd11e] - dec a - ld e, a - ld d, 0 - add hl, de - add hl, de - ld a, [hli] - ld e, a - ld d, [hl] ; de = address of pokedex entry - - coord hl, 9, 4 - call PlaceString ; print species name - - ld h, b - ld l, c - push de - ld a, [wd11e] - push af - call IndexToPokedex - - coord hl, 2, 8 - ld a, "№" - ld [hli], a - ld a, "⠄" - ld [hli], a - ld de, wd11e - lb bc, LEADING_ZEROES | 1, 3 - call PrintNumber ; print pokedex number - - ld hl, wPokedexOwned - call IsPokemonBitSet - pop af - ld [wd11e], a - ld a, [wcf91] - ld [wd0b5], a - pop de - - push af - push bc - push de - push hl - - call Delay3 - call GBPalNormal - call GetMonHeader ; load pokemon picture location - coord hl, 1, 1 - call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture - ld a, [wcf91] - call PlayCry ; play pokemon cry - - pop hl - pop de - pop bc - pop af - - ld a, c - and a - jp z, .waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description - inc de ; de = address of feet (height) - ld a, [de] ; reads feet, but a is overwritten without being used - coord hl, 12, 6 - lb bc, 1, 2 - call PrintNumber ; print feet (height) - ld a, $60 ; feet symbol tile (one tick) - ld [hl], a - inc de - inc de ; de = address of inches (height) - coord hl, 15, 6 - lb bc, LEADING_ZEROES | 1, 2 - call PrintNumber ; print inches (height) - ld a, $61 ; inches symbol tile (two ticks) - ld [hl], a -; now print the weight (note that weight is stored in tenths of pounds internally) - inc de - inc de - inc de ; de = address of upper byte of weight - push de -; put weight in big-endian order at hDexWeight - ld hl, hDexWeight - ld a, [hl] ; save existing value of [hDexWeight] - push af - ld a, [de] ; a = upper byte of weight - ld [hli], a ; store upper byte of weight in [hDexWeight] - ld a, [hl] ; save existing value of [hDexWeight + 1] - push af - dec de - ld a, [de] ; a = lower byte of weight - ld [hl], a ; store lower byte of weight in [hDexWeight + 1] - ld de, hDexWeight - coord hl, 11, 8 - lb bc, 2, 5 ; 2 bytes, 5 digits - call PrintNumber ; print weight - coord hl, 14, 8 - ld a, [hDexWeight + 1] - sub 10 - ld a, [hDexWeight] - sbc 0 - jr nc, .next - ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point -.next - inc hl - ld a, [hli] - ld [hld], a ; make space for the decimal point by moving the last digit forward one tile - ld [hl], "⠄" ; decimal point tile - pop af - ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1] - pop af - ld [hDexWeight], a ; restore original value of [hDexWeight] - pop hl - inc hl ; hl = address of pokedex description text - coord bc, 1, 11 - ld a, 2 - ld [$fff4], a - call TextCommandProcessor ; print pokedex description text - xor a - ld [$fff4], a -.waitForButtonPress - call JoypadLowSensitivity - ld a, [hJoy5] - and A_BUTTON | B_BUTTON - jr z, .waitForButtonPress - pop af - ld [hTilesetType], a - call GBPalWhiteOut - call ClearScreen - call RunDefaultPaletteCommand - call LoadTextBoxTilePatterns - call GBPalNormal - ld hl, wd72c - res 1, [hl] - ld a, $77 ; max volume - ld [rNR50], a - ret - -HeightWeightText: - db "HT ?",$60,"??",$61 - next "WT ???lb@" - -; XXX does anything point to this? -PokeText: - db "#@" - -; horizontal line that divides the pokedex text description from the rest of the data -PokedexDataDividerLine: - db $68,$69,$6B,$69,$6B - db $69,$6B,$69,$6B,$6B - db $6B,$6B,$69,$6B,$69 - db $6B,$69,$6B,$69,$6A - db "@" - -; draws a line of tiles -; INPUT: -; b = tile ID -; c = number of tile ID's to write -; de = amount to destination address after each tile (1 for horizontal, 20 for vertical) -; hl = destination address -DrawTileLine: - push bc - push de -.loop - ld [hl], b - add hl, de - dec c - jr nz, .loop - pop de - pop bc - ret - -INCLUDE "data/pokedex_entries.asm" - -PokedexToIndex: - ; converts the Pokédex number at wd11e to an index - push bc - push hl - ld a, [wd11e] - ld b, a - ld c, 0 - ld hl, PokedexOrder - -.loop ; go through the list until we find an entry with a matching dex number - inc c - ld a, [hli] - cp b - jr nz, .loop - - ld a, c - ld [wd11e], a - pop hl - pop bc - ret - -IndexToPokedex: - ; converts the index number at wd11e to a Pokédex number - push bc - push hl - ld a, [wd11e] - dec a - ld hl, PokedexOrder - ld b, 0 - ld c, a - add hl, bc - ld a, [hl] - ld [wd11e], a - pop hl - pop bc - ret - -INCLUDE "data/pokedex_order.asm" diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm deleted file mode 100644 index b9a36652..00000000 --- a/engine/menu/text_box.asm +++ /dev/null @@ -1,767 +0,0 @@ -; function to draw various text boxes -DisplayTextBoxID_: - ld a, [wTextBoxID] - cp TWO_OPTION_MENU - jp z, DisplayTwoOptionMenu - ld c, a - ld hl, TextBoxFunctionTable - ld de, 3 - call SearchTextBoxTable - jr c, .functionTableMatch - ld hl, TextBoxCoordTable - ld de, 5 - call SearchTextBoxTable - jr c, .coordTableMatch - ld hl, TextBoxTextAndCoordTable - ld de, 9 - call SearchTextBoxTable - jr c, .textAndCoordTableMatch -.done - ret -.functionTableMatch - ld a, [hli] - ld h, [hl] - ld l, a ; hl = address of function - ld de, .done - push de - jp hl ; jump to the function -.coordTableMatch - call GetTextBoxIDCoords - call GetAddressOfScreenCoords - call TextBoxBorder - ret -.textAndCoordTableMatch - call GetTextBoxIDCoords - push hl - call GetAddressOfScreenCoords - call TextBoxBorder - pop hl - call GetTextBoxIDText - ld a, [wd730] - push af - ld a, [wd730] - set 6, a ; no pauses between printing each letter - ld [wd730], a - call PlaceString - pop af - ld [wd730], a - call UpdateSprites - ret - -; function to search a table terminated with $ff for a byte matching c in increments of de -; sets carry flag if a match is found and clears carry flag if not -SearchTextBoxTable: - dec de -.loop - ld a, [hli] - cp $ff - jr z, .notFound - cp c - jr z, .found - add hl, de - jr .loop -.found - scf -.notFound - ret - -; function to load coordinates from the TextBoxCoordTable or the TextBoxTextAndCoordTable -; INPUT: -; hl = address of coordinates -; OUTPUT: -; b = height -; c = width -; d = row of upper left corner -; e = column of upper left corner -GetTextBoxIDCoords: - ld a, [hli] ; column of upper left corner - ld e, a - ld a, [hli] ; row of upper left corner - ld d, a - ld a, [hli] ; column of lower right corner - sub e - dec a - ld c, a ; c = width - ld a, [hli] ; row of lower right corner - sub d - dec a - ld b, a ; b = height - ret - -; function to load a text address and text coordinates from the TextBoxTextAndCoordTable -GetTextBoxIDText: - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a ; de = address of text - push de ; save text address - ld a, [hli] - ld e, a ; column of upper left corner of text - ld a, [hl] - ld d, a ; row of upper left corner of text - call GetAddressOfScreenCoords - pop de ; restore text address - ret - -; function to point hl to the screen coordinates -; INPUT: -; d = row -; e = column -; OUTPUT: -; hl = address of upper left corner of text box -GetAddressOfScreenCoords: - push bc - coord hl, 0, 0 - ld bc, 20 -.loop ; loop to add d rows to the base address - ld a, d - and a - jr z, .addedRows - add hl, bc - dec d - jr .loop -.addedRows - pop bc - add hl, de - ret - -; Format: -; 00: text box ID -; 01-02: function address -TextBoxFunctionTable: - dbw MONEY_BOX, DisplayMoneyBox - dbw BUY_SELL_QUIT_MENU, DoBuySellQuitMenu - dbw FIELD_MOVE_MON_MENU, DisplayFieldMoveMonMenu - db $ff ; terminator - -; Format: -; 00: text box ID -; 01: column of upper left corner -; 02: row of upper left corner -; 03: column of lower right corner -; 04: row of lower right corner -TextBoxCoordTable: - db MESSAGE_BOX, 0, 12, 19, 17 - db $03, 0, 0, 19, 14 - db $07, 0, 0, 11, 6 - db LIST_MENU_BOX, 4, 2, 19, 12 - db $10, 7, 0, 19, 17 - db MON_SPRITE_POPUP, 6, 4, 14, 13 - db $ff ; terminator - -; Format: -; 00: text box ID -; 01: column of upper left corner -; 02: row of upper left corner -; 03: column of lower right corner -; 04: row of lower right corner -; 05-06: address of text -; 07: column of beginning of text -; 08: row of beginning of text -; table of window positions and corresponding text [key, start column, start row, end column, end row, text pointer [2 bytes], text column, text row] -TextBoxTextAndCoordTable: - db JP_MOCHIMONO_MENU_TEMPLATE - db 0,0,14,17 ; text box coordinates - dw JapaneseMochimonoText - db 3,0 ; text coordinates - - db USE_TOSS_MENU_TEMPLATE - db 13,10,19,14 ; text box coordinates - dw UseTossText - db 15,11 ; text coordinates - - db JP_SAVE_MESSAGE_MENU_TEMPLATE - db 0,0,7,5 ; text box coordinates - dw JapaneseSaveMessageText - db 2,2 ; text coordinates - - db JP_SPEED_OPTIONS_MENU_TEMPLATE - db 0,6,5,10 ; text box coordinates - dw JapaneseSpeedOptionsText - db 2,7 ; text coordinates - - db BATTLE_MENU_TEMPLATE - db 8,12,19,17 ; text box coordinates - dw BattleMenuText - db 10,14 ; text coordinates - - db SAFARI_BATTLE_MENU_TEMPLATE - db 0,12,19,17 ; text box coordinates - dw SafariZoneBattleMenuText - db 2,14 ; text coordinates - - db SWITCH_STATS_CANCEL_MENU_TEMPLATE - db 11,11,19,17 ; text box coordinates - dw SwitchStatsCancelText - db 13,12 ; text coordinates - - db BUY_SELL_QUIT_MENU_TEMPLATE - db 0,0,10,6 ; text box coordinates - dw BuySellQuitText - db 2,1 ; text coordinates - - db MONEY_BOX_TEMPLATE - db 11,0,19,2 ; text box coordinates - dw MoneyText - db 13,0 ; text coordinates - - db JP_AH_MENU_TEMPLATE - db 7,6,11,10 ; text box coordinates - dw JapaneseAhText - db 8,8 ; text coordinates - - db JP_POKEDEX_MENU_TEMPLATE - db 11,8,19,17 ; text box coordinates - dw JapanesePokedexMenu - db 12,10 ; text coordinates - -; note that there is no terminator - -BuySellQuitText: - db "BUY" - next "SELL" - next "QUIT@@" - -UseTossText: - db "USE" - next "TOSS@" - -JapaneseSaveMessageText: - db "きろく" - next "メッセージ@" - -JapaneseSpeedOptionsText: - db "はやい" - next "おそい@" - -MoneyText: - db "MONEY@" - -JapaneseMochimonoText: - db "もちもの@" - -JapaneseMainMenuText: - db "つづきから" - next "さいしょから@" - -BattleMenuText: - db "FIGHT ",$E1,$E2 - next "ITEM RUN@" - -SafariZoneBattleMenuText: - db "BALL× BAIT" - next "THROW ROCK RUN@" - -SwitchStatsCancelText: - db "SWITCH" - next "STATS" - next "CANCEL@" - -JapaneseAhText: - db "アッ!@" - -JapanesePokedexMenu: - db "データをみる" - next "なきごえ" - next "ぶんぷをみる" - next "キャンセル@" - -DisplayMoneyBox: - ld hl, wd730 - set 6, [hl] - ld a, MONEY_BOX_TEMPLATE - ld [wTextBoxID], a - call DisplayTextBoxID - coord hl, 13, 1 - ld b, 1 - ld c, 6 - call ClearScreenArea - coord hl, 12, 1 - ld de, wPlayerMoney - ld c, $a3 - call PrintBCDNumber - ld hl, wd730 - res 6, [hl] - ret - -CurrencyString: - db " ¥@" - -DoBuySellQuitMenu: - ld a, [wd730] - set 6, a ; no printing delay - ld [wd730], a - xor a - ld [wChosenMenuItem], a - ld a, BUY_SELL_QUIT_MENU_TEMPLATE - ld [wTextBoxID], a - call DisplayTextBoxID - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, $2 - ld [wMaxMenuItem], a - ld a, $1 - ld [wTopMenuItemY], a - ld a, $1 - ld [wTopMenuItemX], a - xor a - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - ld [wMenuWatchMovingOutOfBounds], a - ld a, [wd730] - res 6, a ; turn on the printing delay - ld [wd730], a - call HandleMenuInput - call PlaceUnfilledArrowMenuCursor - bit 0, a ; was A pressed? - jr nz, .pressedA - bit 1, a ; was B pressed? (always true since only A/B are watched) - jr z, .pressedA - ld a, CANCELLED_MENU - ld [wMenuExitMethod], a - jr .quit -.pressedA - ld a, CHOSE_MENU_ITEM - ld [wMenuExitMethod], a - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - ld b, a - ld a, [wMaxMenuItem] - cp b - jr z, .quit - ret -.quit - ld a, CANCELLED_MENU - ld [wMenuExitMethod], a - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - scf - ret - -; displays a menu with two options to choose from -; b = Y of upper left corner of text region -; c = X of upper left corner of text region -; hl = address where the text box border should be drawn -DisplayTwoOptionMenu: - push hl - ld a, [wd730] - set 6, a ; no printing delay - ld [wd730], a - -; pointless because both values are overwritten before they are read - xor a - ld [wChosenMenuItem], a - ld [wMenuExitMethod], a - - ld a, A_BUTTON | B_BUTTON - ld [wMenuWatchedKeys], a - ld a, $1 - ld [wMaxMenuItem], a - ld a, b - ld [wTopMenuItemY], a - ld a, c - ld [wTopMenuItemX], a - xor a - ld [wLastMenuItem], a - ld [wMenuWatchMovingOutOfBounds], a - push hl - ld hl, wTwoOptionMenuID - bit 7, [hl] ; select second menu item by default? - res 7, [hl] - jr z, .storeCurrentMenuItem - inc a -.storeCurrentMenuItem - ld [wCurrentMenuItem], a - pop hl - push hl - push hl - call TwoOptionMenu_SaveScreenTiles - ld a, [wTwoOptionMenuID] - ld hl, TwoOptionMenuStrings - ld e, a - ld d, $0 - ld a, $5 -.menuStringLoop - add hl, de - dec a - jr nz, .menuStringLoop - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld e, l - ld d, h - pop hl - push de - ld a, [wTwoOptionMenuID] - cp TRADE_CANCEL_MENU - jr nz, .notTradeCancelMenu - call CableClub_TextBoxBorder - jr .afterTextBoxBorder -.notTradeCancelMenu - call TextBoxBorder -.afterTextBoxBorder - call UpdateSprites - pop hl - ld a, [hli] - and a ; put blank line before first menu item? - ld bc, 20 + 2 - jr z, .noBlankLine - ld bc, 2 * 20 + 2 -.noBlankLine - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - pop hl - add hl, bc - call PlaceString - ld hl, wd730 - res 6, [hl] ; turn on the printing delay - ld a, [wTwoOptionMenuID] - cp NO_YES_MENU - jr nz, .notNoYesMenu -; No/Yes menu -; this menu type ignores the B button -; it only seems to be used when confirming the deletion of a save file - xor a - ld [wTwoOptionMenuID], a - ld a, [wFlags_0xcd60] - push af - push hl - ld hl, wFlags_0xcd60 - bit 5, [hl] - set 5, [hl] ; don't play sound when A or B is pressed in menu - pop hl -.noYesMenuInputLoop - call HandleMenuInput - bit 1, a ; A button pressed? - jr nz, .noYesMenuInputLoop ; try again if A was not pressed - pop af - pop hl - ld [wFlags_0xcd60], a - ld a, SFX_PRESS_AB - call PlaySound - jr .pressedAButton -.notNoYesMenu - xor a - ld [wTwoOptionMenuID], a - call HandleMenuInput - pop hl - bit 1, a ; A button pressed? - jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed -.pressedAButton - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - and a - jr nz, .choseSecondMenuItem -; chose first menu item - ld a, CHOSE_FIRST_ITEM - ld [wMenuExitMethod], a - ld c, 15 - call DelayFrames - call TwoOptionMenu_RestoreScreenTiles - and a - ret -.choseSecondMenuItem - ld a, 1 - ld [wCurrentMenuItem], a - ld [wChosenMenuItem], a - ld a, CHOSE_SECOND_ITEM - ld [wMenuExitMethod], a - ld c, 15 - call DelayFrames - call TwoOptionMenu_RestoreScreenTiles - scf - ret - -; Some of the wider/taller two option menus will not have the screen areas -; they cover be fully saved/restored by the two functions below. -; The bottom and right edges of the menu may remain after the function returns. - -TwoOptionMenu_SaveScreenTiles: - ld de, wBuffer - lb bc, 5, 6 -.loop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .loop - push bc - ld bc, SCREEN_WIDTH - 6 - add hl, bc - pop bc - ld c, $6 - dec b - jr nz, .loop - ret - -TwoOptionMenu_RestoreScreenTiles: - ld de, wBuffer - lb bc, 5, 6 -.loop - ld a, [de] - inc de - ld [hli], a - dec c - jr nz, .loop - push bc - ld bc, SCREEN_WIDTH - 6 - add hl, bc - pop bc - ld c, 6 - dec b - jr nz, .loop - call UpdateSprites - ret - -; Format: -; 00: byte width -; 01: byte height -; 02: byte put blank line before first menu item -; 03: word text pointer -TwoOptionMenuStrings: - db 4,3,0 - dw .YesNoMenu - db 6,3,0 - dw .NorthWestMenu - db 6,3,0 - dw .SouthEastMenu - db 6,3,0 - dw .YesNoMenu - db 6,3,0 - dw .NorthEastMenu - db 7,3,0 - dw .TradeCancelMenu - db 7,4,1 - dw .HealCancelMenu - db 4,3,0 - dw .NoYesMenu - -.NoYesMenu - db "NO" - next "YES@" -.YesNoMenu - db "YES" - next "NO@" -.NorthWestMenu - db "NORTH" - next "WEST@" -.SouthEastMenu - db "SOUTH" - next "EAST@" -.NorthEastMenu - db "NORTH" - next "EAST@" -.TradeCancelMenu - db "TRADE" - next "CANCEL@" -.HealCancelMenu - db "HEAL" - next "CANCEL@" - -DisplayFieldMoveMonMenu: - xor a - ld hl, wFieldMoves - ld [hli], a ; wFieldMoves - ld [hli], a ; wFieldMoves + 1 - ld [hli], a ; wFieldMoves + 2 - ld [hli], a ; wFieldMoves + 3 - ld [hli], a ; wNumFieldMoves - ld [hl], 12 ; wFieldMovesLeftmostXCoord - call GetMonFieldMoves - ld a, [wNumFieldMoves] - and a - jr nz, .fieldMovesExist - -; no field moves - coord hl, 11, 11 - ld b, 5 - ld c, 7 - call TextBoxBorder - call UpdateSprites - ld a, 12 - ld [hFieldMoveMonMenuTopMenuItemX], a - coord hl, 13, 12 - ld de, PokemonMenuEntries - jp PlaceString - -.fieldMovesExist - push af - -; Calculate the text box position and dimensions based on the leftmost X coord -; of the field move names before adjusting for the number of field moves. - coord hl, 0, 11 - ld a, [wFieldMovesLeftmostXCoord] - dec a - ld e, a - ld d, 0 - add hl, de - ld b, 5 - ld a, 18 - sub e - ld c, a - pop af - -; For each field move, move the top of the text box up 2 rows while the leaving -; the bottom of the text box at the bottom of the screen. - ld de, -SCREEN_WIDTH * 2 -.textBoxHeightLoop - add hl, de - inc b - inc b - dec a - jr nz, .textBoxHeightLoop - -; Make space for an extra blank row above the top field move. - ld de, -SCREEN_WIDTH - add hl, de - inc b - - call TextBoxBorder - call UpdateSprites - -; Calculate the position of the first field move name to print. - coord hl, 0, 12 - ld a, [wFieldMovesLeftmostXCoord] - inc a - ld e, a - ld d, 0 - add hl, de - ld de, -SCREEN_WIDTH * 2 - ld a, [wNumFieldMoves] -.calcFirstFieldMoveYLoop - add hl, de - dec a - jr nz, .calcFirstFieldMoveYLoop - - xor a - ld [wNumFieldMoves], a - ld de, wFieldMoves -.printNamesLoop - push hl - ld hl, FieldMoveNames - ld a, [de] - and a - jr z, .donePrintingNames - inc de - ld b, a ; index of name -.skipNamesLoop ; skip past names before the name we want - dec b - jr z, .reachedName -.skipNameLoop ; skip past current name - ld a, [hli] - cp "@" - jr nz, .skipNameLoop - jr .skipNamesLoop -.reachedName - ld b, h - ld c, l - pop hl - push de - ld d, b - ld e, c - call PlaceString - ld bc, SCREEN_WIDTH * 2 - add hl, bc - pop de - jr .printNamesLoop - -.donePrintingNames - pop hl - ld a, [wFieldMovesLeftmostXCoord] - ld [hFieldMoveMonMenuTopMenuItemX], a - coord hl, 0, 12 - ld a, [wFieldMovesLeftmostXCoord] - inc a - ld e, a - ld d, 0 - add hl, de - ld de, PokemonMenuEntries - jp PlaceString - -FieldMoveNames: - db "CUT@" - db "FLY@" - db "@" - db "SURF@" - db "STRENGTH@" - db "FLASH@" - db "DIG@" - db "TELEPORT@" - db "SOFTBOILED@" - -PokemonMenuEntries: - db "STATS" - next "SWITCH" - next "CANCEL@" - -GetMonFieldMoves: - ld a, [wWhichPokemon] - ld hl, wPartyMon1Moves - ld bc, wPartyMon2 - wPartyMon1 - call AddNTimes - ld d, h - ld e, l - ld c, NUM_MOVES + 1 - ld hl, wFieldMoves -.loop - push hl -.nextMove - dec c - jr z, .done - ld a, [de] ; move ID - and a - jr z, .done - ld b, a - inc de - ld hl, FieldMoveDisplayData -.fieldMoveLoop - ld a, [hli] - cp $ff - jr z, .nextMove ; if the move is not a field move - cp b - jr z, .foundFieldMove - inc hl - inc hl - jr .fieldMoveLoop -.foundFieldMove - ld a, b - ld [wLastFieldMoveID], a - ld a, [hli] ; field move name index - ld b, [hl] ; field move leftmost X coordinate - pop hl - ld [hli], a ; store name index in wFieldMoves - ld a, [wNumFieldMoves] - inc a - ld [wNumFieldMoves], a - ld a, [wFieldMovesLeftmostXCoord] - cp b - jr c, .skipUpdatingLeftmostXCoord - ld a, b - ld [wFieldMovesLeftmostXCoord], a -.skipUpdatingLeftmostXCoord - ld a, [wLastFieldMoveID] - ld b, a - jr .loop -.done - pop hl - ret - -; Format: [Move id], [name index], [leftmost tile] -; Move id = id of move -; Name index = index of name in FieldMoveNames -; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed -; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C -FieldMoveDisplayData: - db CUT, $01, $0C - db FLY, $02, $0C - db $B4, $03, $0C ; unused field move - db SURF, $04, $0C - db STRENGTH, $05, $0A - db FLASH, $06, $0C - db DIG, $07, $0C - db TELEPORT, $08, $0A - db SOFTBOILED, $09, $08 - db $ff ; list terminator diff --git a/engine/menus/display_text_id_init.asm b/engine/menus/display_text_id_init.asm new file mode 100644 index 00000000..6ce76e7f --- /dev/null +++ b/engine/menus/display_text_id_init.asm @@ -0,0 +1,79 @@ +; function that performs initialization for DisplayTextID +DisplayTextIDInit:: + xor a + ld [wListMenuID], a + ld a, [wAutoTextBoxDrawingControl] + bit 0, a + jr nz, .skipDrawingTextBoxBorder + ldh a, [hSpriteIndexOrTextID] ; text ID (or sprite ID) + and a + jr nz, .notStartMenu +; if text ID is 0 (i.e. the start menu) +; Note that the start menu text border is also drawn in the function directly +; below this, so this seems unnecessary. + CheckEvent EVENT_GOT_POKEDEX +; start menu with pokedex + hlcoord 10, 0 + ld b, $0e + ld c, $08 + jr nz, .drawTextBoxBorder +; start menu without pokedex + hlcoord 10, 0 + ld b, $0c + ld c, $08 + jr .drawTextBoxBorder +; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box +.notStartMenu + hlcoord 0, 12 + ld b, $04 + ld c, $12 +.drawTextBoxBorder + call TextBoxBorder +.skipDrawingTextBoxBorder + ld hl, wFontLoaded + set 0, [hl] + ld hl, wFlags_0xcd60 + bit 4, [hl] + res 4, [hl] + jr nz, .skipMovingSprites + call UpdateSprites +.skipMovingSprites +; loop to copy [x#SPRITESTATEDATA1_FACINGDIRECTION] to +; [x#SPRITESTATEDATA2_ORIGFACINGDIRECTION] for each non-player sprite +; this is done because when you talk to an NPC, they turn to look your way +; the original direction they were facing must be restored after the dialogue is over + ld hl, wSprite01StateData1FacingDirection + ld c, $0f + ld de, $10 +.spriteFacingDirectionCopyLoop + ld a, [hl] ; x#SPRITESTATEDATA1_FACINGDIRECTION + inc h + ld [hl], a ; [x#SPRITESTATEDATA2_ORIGFACINGDIRECTION] + dec h + add hl, de + dec c + jr nz, .spriteFacingDirectionCopyLoop +; loop to force all the sprites in the middle of animation to stand still +; (so that they don't like they're frozen mid-step during the dialogue) + ld hl, wSpritePlayerStateData1ImageIndex + ld de, $10 + ld c, e +.spriteStandStillLoop + ld a, [hl] + cp $ff ; is the sprite visible? + jr z, .nextSprite +; if it is visible + and $fc + ld [hl], a +.nextSprite + add hl, de + dec c + jr nz, .spriteStandStillLoop + ld b, $9c ; window background address + call CopyScreenTileBufferToVRAM ; transfer background in WRAM to VRAM + xor a + ldh [hWY], a ; put the window on the screen + call LoadFontTilePatterns + ld a, $01 + ldh [hAutoBGTransferEnabled], a ; enable continuous WRAM to VRAM transfer each V-blank + ret diff --git a/engine/menu/draw_badges.asm b/engine/menus/draw_badges.asm similarity index 91% rename from engine/menu/draw_badges.asm rename to engine/menus/draw_badges.asm index 9e6262a0..5e00a34e 100644 --- a/engine/menu/draw_badges.asm +++ b/engine/menus/draw_badges.asm @@ -8,12 +8,12 @@ DrawBadges: ; Tile ids for face/badge graphics. ld de, wBadgeOrFaceTiles ld hl, .FaceBadgeTiles - ld bc, 8 + ld bc, NUM_BADGES call CopyData ; Booleans for each badge. ld hl, wTempObtainedBadgesBooleans - ld bc, 8 + ld bc, NUM_BADGES xor a call FillMemory @@ -22,7 +22,7 @@ DrawBadges: ld hl, wBadgeOrFaceTiles ld a, [wObtainedBadges] ld b, a - ld c, 8 + ld c, NUM_BADGES .CheckBadge srl b jr nc, .NextBadge @@ -43,14 +43,13 @@ DrawBadges: ld [hli], a ld [hl], $60 ; First name - coord hl, 2, 11 + hlcoord 2, 11 ld de, wTempObtainedBadgesBooleans call .DrawBadgeRow - coord hl, 2, 14 + hlcoord 2, 14 ld de, wTempObtainedBadgesBooleans + 4 -; call .DrawBadgeRow -; ret + ; fallthrough .DrawBadgeRow ; Draw 4 badges. @@ -92,7 +91,7 @@ DrawBadges: push bc ld hl, wBadgeOrFaceTiles + 1 ld de, wBadgeOrFaceTiles - ld bc, 8 + ld bc, NUM_BADGES call CopyData pop bc @@ -117,4 +116,4 @@ DrawBadges: db $20, $28, $30, $38, $40, $48, $50, $58 GymLeaderFaceAndBadgeTileGraphics: - INCBIN "gfx/badges.2bpp" + INCBIN "gfx/trainer_card/badges.2bpp" diff --git a/engine/menu/draw_start_menu.asm b/engine/menus/draw_start_menu.asm similarity index 96% rename from engine/menu/draw_start_menu.asm rename to engine/menus/draw_start_menu.asm index 11777dc6..00d385bc 100644 --- a/engine/menu/draw_start_menu.asm +++ b/engine/menus/draw_start_menu.asm @@ -1,13 +1,13 @@ ; function that displays the start menu -DrawStartMenu: +DrawStartMenu:: CheckEvent EVENT_GOT_POKEDEX ; menu with pokedex - coord hl, 10, 0 + hlcoord 10, 0 ld b, $0e ld c, $08 jr nz, .drawTextBoxBorder ; shorter menu if the player doesn't have the pokedex - coord hl, 10, 0 + hlcoord 10, 0 ld b, $0c ld c, $08 .drawTextBoxBorder @@ -25,7 +25,7 @@ DrawStartMenu: ld [wMenuWatchMovingOutOfBounds], a ld hl, wd730 set 6, [hl] ; no pauses between printing each letter - coord hl, 12, 2 + hlcoord 12, 2 CheckEvent EVENT_GOT_POKEDEX ; case for not having pokedex ld a, $06 diff --git a/engine/menu/league_pc.asm b/engine/menus/league_pc.asm old mode 100755 new mode 100644 similarity index 88% rename from engine/menu/league_pc.asm rename to engine/menus/league_pc.asm index 170c0ef3..533454ad --- a/engine/menu/league_pc.asm +++ b/engine/menus/league_pc.asm @@ -6,10 +6,10 @@ PKMNLeaguePC: push hl ld a, [wUpdateSpritesEnabled] push af - ld a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ld [hTilesetType], a + ldh [hTileAnimations], a ld [wSpriteFlipped], a ld [wUpdateSpritesEnabled], a ld [wHoFTeamIndex2], a @@ -29,7 +29,7 @@ PKMNLeaguePC: push bc ld a, [wHoFTeamIndex2] ld [wHoFTeamIndex], a - callba LoadHallOfFameTeams + farcall LoadHallOfFameTeams call LeaguePCShowTeam pop bc jr c, .doneShowingTeams @@ -40,7 +40,7 @@ PKMNLeaguePC: jr nz, .loop .doneShowingTeams pop af - ld [hTilesetType], a + ldh [hTileAnimations], a pop af ld [wUpdateSpritesEnabled], a pop hl @@ -56,7 +56,7 @@ LeaguePCShowTeam: push bc call LeaguePCShowMon call WaitForTextScrollButtonPress - ld a, [hJoyHeld] + ldh a, [hJoyHeld] bit 1, a jr nz, .exit ld hl, wHallOfFame + HOF_MON @@ -95,26 +95,26 @@ LeaguePCShowMon: ld b, SET_PAL_POKEMON_WHOLE_SCREEN ld c, 0 call RunPaletteCommand - coord hl, 12, 5 + hlcoord 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex call GBPalNormal - coord hl, 0, 13 + hlcoord 0, 13 ld b, 2 ld c, $12 call TextBoxBorder - coord hl, 1, 15 + hlcoord 1, 15 ld de, HallOfFameNoText call PlaceString - coord hl, 16, 15 + hlcoord 16, 15 ld de, wHoFTeamNo lb bc, 1, 3 call PrintNumber - jpba HoFDisplayMonInfo + farjp HoFDisplayMonInfo HallOfFameNoText: db "HALL OF FAME No @" AccessedHoFPCText: - TX_FAR _AccessedHoFPCText - db "@" + text_far _AccessedHoFPCText + text_end diff --git a/engine/menu/main_menu.asm b/engine/menus/main_menu.asm old mode 100755 new mode 100644 similarity index 91% rename from engine/menu/main_menu.asm rename to engine/menus/main_menu.asm index da2e98e4..95404cce --- a/engine/menu/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -33,20 +33,20 @@ MainMenu: cp 1 jr z, .noSaveFile ; there's a save file - coord hl, 0, 0 + hlcoord 0, 0 ld b, 6 ld c, 13 call TextBoxBorder - coord hl, 2, 2 + hlcoord 2, 2 ld de, ContinueText call PlaceString jr .next2 .noSaveFile - coord hl, 0, 0 + hlcoord 0, 0 ld b, 4 ld c, 13 call TextBoxBorder - coord hl, 2, 2 + hlcoord 2, 2 ld de, NewGameText call PlaceString .next2 @@ -94,11 +94,11 @@ MainMenu: set 5, [hl] .inputLoop xor a - ld [hJoyPressed], a - ld [hJoyReleased], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a + ldh [hJoyHeld], a call Joypad - ld a, [hJoyHeld] + ldh a, [hJoyHeld] bit 0, a jr nz, .pressedA bit 1, a @@ -136,17 +136,17 @@ LinkMenu: ld [wLetterPrintingDelayFlags], a ld hl, wd72e set 6, [hl] - ld hl, TextTerminator_6b20 + ld hl, LinkMenuEmptyText call PrintText call SaveScreenTilesToBuffer1 ld hl, WhereWouldYouLikeText call PrintText - coord hl, 5, 5 + hlcoord 5, 5 ld b, $6 ld c, $d call TextBoxBorder call UpdateSprites - coord hl, 7, 7 + hlcoord 7, 7 ld de, CableClubOptionsText call PlaceString xor a @@ -205,7 +205,7 @@ LinkMenu: jr z, .useEnemyMenuSelection ; if the enemy pressed A or B but the player didn't, use the enemy's selection ; the enemy and the player both pressed A or B ; The gameboy that is clocking the connection wins. - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr z, .doneChoosingMenuSelection .useEnemyMenuSelection @@ -214,17 +214,17 @@ LinkMenu: and $3 ld [wCurrentMenuItem], a .doneChoosingMenuSelection - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr nz, .skipStartingTransfer call DelayFrame call DelayFrame ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a .skipStartingTransfer - ld b, $7f - ld c, $7f - ld d, $ec + ld b, " " + ld c, " " + ld d, "▷" ld a, [wLinkMenuSelectionSendBuffer] and (B_BUTTON << 2) ; was B button pressed? jr nz, .updateCursorPosition @@ -240,11 +240,11 @@ LinkMenu: ld c, d .updateCursorPosition ld a, b - Coorda 6, 7 + ldcoord_a 6, 7 ld a, c - Coorda 6, 9 + ldcoord_a 6, 9 ld a, d - Coorda 6, 11 + ldcoord_a 6, 11 ld c, 40 call DelayFrames call LoadScreenTilesFromBuffer1 @@ -293,30 +293,31 @@ LinkMenu: ret WhereWouldYouLikeText: - TX_FAR _WhereWouldYouLikeText - db "@" + text_far _WhereWouldYouLikeText + text_end PleaseWaitText: - TX_FAR _PleaseWaitText - db "@" + text_far _PleaseWaitText + text_end LinkCanceledText: - TX_FAR _LinkCanceledText - db "@" + text_far _LinkCanceledText + text_end StartNewGame: ld hl, wd732 res 1, [hl] +StartNewGameDebug: call OakSpeech ld c, 20 call DelayFrames ; enter map after using a special warp or loading the game from the main menu -SpecialEnterMap: +SpecialEnterMap:: xor a - ld [hJoyPressed], a - ld [hJoyHeld], a - ld [hJoy5], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a + ldh [hJoy5], a ld [wd72d], a ld hl, wd732 set 0, [hl] ; count play time @@ -329,7 +330,9 @@ SpecialEnterMap: jp EnterMap ContinueText: - db "CONTINUE", $4e + db "CONTINUE" + next "" + ; fallthrough NewGameText: db "NEW GAME" @@ -342,51 +345,51 @@ CableClubOptionsText: DisplayContinueGameInfo: xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 4, 7 + ldh [hAutoBGTransferEnabled], a + hlcoord 4, 7 ld b, 8 ld c, 14 call TextBoxBorder - coord hl, 5, 9 + hlcoord 5, 9 ld de, SaveScreenInfoText call PlaceString - coord hl, 12, 9 + hlcoord 12, 9 ld de, wPlayerName call PlaceString - coord hl, 17, 11 + hlcoord 17, 11 call PrintNumBadges - coord hl, 16, 13 + hlcoord 16, 13 call PrintNumOwnedMons - coord hl, 13, 15 + hlcoord 13, 15 call PrintPlayTime ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld c, 30 jp DelayFrames PrintSaveScreenText: xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 4, 0 + ldh [hAutoBGTransferEnabled], a + hlcoord 4, 0 ld b, $8 ld c, $e call TextBoxBorder call LoadTextBoxTilePatterns call UpdateSprites - coord hl, 5, 2 + hlcoord 5, 2 ld de, SaveScreenInfoText call PlaceString - coord hl, 12, 2 + hlcoord 12, 2 ld de, wPlayerName call PlaceString - coord hl, 17, 4 + hlcoord 17, 4 call PrintNumBadges - coord hl, 16, 6 + hlcoord 16, 6 call PrintNumOwnedMons - coord hl, 13, 8 + hlcoord 13, 8 call PrintPlayTime ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld c, 30 jp DelayFrames @@ -427,28 +430,28 @@ SaveScreenInfoText: next "TIME@" DisplayOptionMenu: - coord hl, 0, 0 + hlcoord 0, 0 ld b, 3 ld c, 18 call TextBoxBorder - coord hl, 0, 5 + hlcoord 0, 5 ld b, 3 ld c, 18 call TextBoxBorder - coord hl, 0, 10 + hlcoord 0, 10 ld b, 3 ld c, 18 call TextBoxBorder - coord hl, 1, 1 + hlcoord 1, 1 ld de, TextSpeedOptionText call PlaceString - coord hl, 1, 6 + hlcoord 1, 6 ld de, BattleAnimationOptionText call PlaceString - coord hl, 1, 11 + hlcoord 1, 11 ld de, BattleStyleOptionText call PlaceString - coord hl, 2, 16 + hlcoord 2, 16 ld de, OptionMenuCancelText call PlaceString xor a @@ -456,21 +459,21 @@ DisplayOptionMenu: ld [wLastMenuItem], a inc a ld [wLetterPrintingDelayFlags], a - ld [wUnusedCD40], a + ld [wOptionsCancelCursorX], a ld a, 3 ; text speed cursor Y coordinate ld [wTopMenuItemY], a call SetCursorPositionsFromOptions ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate ld [wTopMenuItemX], a ld a, $01 - ld [H_AUTOBGTRANSFERENABLED], a ; enable auto background transfer + ldh [hAutoBGTransferEnabled], a ; enable auto background transfer call Delay3 .loop call PlaceMenuCursor call SetOptionsFromCursorPositions .getJoypadStateLoop call JoypadLowSensitivity - ld a, [hJoy5] + ldh a, [hJoy5] ld b, a and A_BUTTON | B_BUTTON | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ; any key besides select pressed? jr z, .getJoypadStateLoop @@ -642,7 +645,7 @@ SetCursorPositionsFromOptions: dec hl ld a, [hl] ld [wOptionsTextSpeedCursorX], a ; text speed cursor X coordinate - coord hl, 0, 3 + hlcoord 0, 3 call .placeUnfilledRightArrow sla c ld a, 1 ; On @@ -650,7 +653,7 @@ SetCursorPositionsFromOptions: ld a, 10 ; Off .storeBattleAnimationCursorX ld [wOptionsBattleAnimCursorX], a ; battle animation cursor X coordinate - coord hl, 0, 8 + hlcoord 0, 8 call .placeUnfilledRightArrow sla c ld a, 1 @@ -658,16 +661,16 @@ SetCursorPositionsFromOptions: ld a, 10 .storeBattleStyleCursorX ld [wOptionsBattleStyleCursorX], a ; battle style cursor X coordinate - coord hl, 0, 13 + hlcoord 0, 13 call .placeUnfilledRightArrow ; cursor in front of Cancel - coord hl, 0, 16 + hlcoord 0, 16 ld a, 1 .placeUnfilledRightArrow ld e, a ld d, 0 add hl, de - ld [hl], $ec ; unfilled right arrow menu cursor + ld [hl], "▷" ret ; table that indicates how the 3 text speed options affect frame delays @@ -675,11 +678,11 @@ SetCursorPositionsFromOptions: ; 00: X coordinate of menu cursor ; 01: delay after printing a letter (in frames) TextSpeedOptionData: - db 14,5 ; Slow - db 7,3 ; Medium - db 1,1 ; Fast + db 14, 5 ; Slow + db 7, 3 ; Medium + db 1, 1 ; Fast db 7 ; default X coordinate (Medium) - db $ff ; terminator + db -1 ; end CheckForPlayerNameInSRAM: ; Check if the player name data in SRAM has a string terminator character diff --git a/engine/menu/naming_screen.asm b/engine/menus/naming_screen.asm old mode 100755 new mode 100644 similarity index 86% rename from engine/menu/naming_screen.asm rename to engine/menus/naming_screen.asm index 64065c4d..9347212e --- a/engine/menu/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -4,7 +4,7 @@ AskName: push hl ld a, [wIsInBattle] dec a - coord hl, 0, 0 + hlcoord 0, 0 ld b, 4 ld c, 11 call z, ClearScreenArea ; only if in wild battle @@ -13,7 +13,7 @@ AskName: call GetMonName ld hl, DoYouWantToNicknameText call PrintText - coord hl, 14, 7 + hlcoord 14, 7 lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -50,10 +50,10 @@ AskName: jp CopyData DoYouWantToNicknameText: - TX_FAR _DoYouWantToNicknameText - db "@" + text_far _DoYouWantToNicknameText + text_end -DisplayNameRaterScreen: +DisplayNameRaterScreen:: ld hl, wBuffer xor a ld [wUpdateSpritesEnabled], a @@ -92,8 +92,8 @@ DisplayNamingScreen: call RunPaletteCommand call LoadHpBarAndStatusTilePatterns call LoadEDTile - callba LoadMonPartySpriteGfx - coord hl, 0, 4 + farcall LoadMonPartySpriteGfx + hlcoord 0, 4 ld b, 9 ld c, 18 call TextBoxBorder @@ -128,11 +128,11 @@ DisplayNamingScreen: .inputLoop ld a, [wCurrentMenuItem] push af - callba AnimatePartyMon_ForceSpeed1 + farcall AnimatePartyMon_ForceSpeed1 pop af ld [wCurrentMenuItem], a call JoypadLowSensitivity - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and a jr z, .inputLoop ld hl, .namingScreenButtonFunctions @@ -172,7 +172,7 @@ DisplayNamingScreen: ld a, [wIsInBattle] and a jp z, LoadTextBoxTilePatterns - jpab LoadHudTilePatterns + jpfar LoadHudTilePatterns .namingScreenButtonFunctions dw .dPadReturnPoint @@ -231,10 +231,10 @@ DisplayNamingScreen: ld [wNamingScreenLetter], a call CalcStringLength ld a, [wNamingScreenLetter] - cp $e5 + cp "ﾞ" ld de, Dakutens jr z, .dakutensAndHandakutens - cp $e4 + cp "ﾟ" ld de, Handakutens jr z, .dakutensAndHandakutens ld a, [wNamingScreenType] @@ -325,26 +325,26 @@ DisplayNamingScreen: LoadEDTile: ld de, ED_Tile - ld hl, vFont + $700 + ld hl, vFont tile $70 ld bc, (ED_TileEnd - ED_Tile) / $8 ; to fix the graphical bug on poor emulators ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 jp CopyVideoDataDouble ED_Tile: - INCBIN "gfx/ED_tile.1bpp" + INCBIN "gfx/font/ED.1bpp" ED_TileEnd: PrintAlphabet: xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld a, [wAlphabetCase] and a ld de, LowerCaseAlphabet jr nz, .lowercase ld de, UpperCaseAlphabet .lowercase - coord hl, 2, 5 + hlcoord 2, 5 lb bc, 5, 9 ; 5 rows, 9 columns .outerLoop push bc @@ -362,26 +362,22 @@ PrintAlphabet: jr nz, .outerLoop call PlaceString ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a jp Delay3 -LowerCaseAlphabet: - db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@" - -UpperCaseAlphabet: - db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@" +INCLUDE "data/text/alphabets.asm" PrintNicknameAndUnderscores: call CalcStringLength ld a, c ld [wNamingScreenNameLength], a - coord hl, 10, 2 + hlcoord 10, 2 lb bc, 1, 10 call ClearScreenArea - coord hl, 10, 2 + hlcoord 10, 2 ld de, wcf4b call PlaceString - coord hl, 10, 3 + hlcoord 10, 3 ld a, [wNamingScreenType] cp NAME_MON_SCREEN jr nc, .pokemon1 @@ -420,7 +416,7 @@ PrintNicknameAndUnderscores: .emptySpacesRemaining ld c, a ld b, $0 - coord hl, 10, 3 + hlcoord 10, 3 add hl, bc ld [hl], $77 ; raised underscore tile id ret @@ -439,21 +435,7 @@ DakutensAndHandakutens: ld [wNamingScreenLetter], a ret -Dakutens: - db "かが", "きぎ", "くぐ", "けげ", "こご" - db "さざ", "しじ", "すず", "せぜ", "そぞ" - db "ただ", "ちぢ", "つづ", "てで", "とど" - db "はば", "ひび", "ふぶ", "へべ", "ほぼ" - db "カガ", "キギ", "クグ", "ケゲ", "コゴ" - db "サザ", "シジ", "スズ", "セゼ", "ソゾ" - db "タダ", "チヂ", "ツヅ", "テデ", "トド" - db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" - db $ff - -Handakutens: - db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" - db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" - db $ff +INCLUDE "data/text/dakutens.asm" ; calculates the length of the string at wcf4b and stores it in c CalcStringLength: @@ -468,7 +450,7 @@ CalcStringLength: jr .loop PrintNamingText: - coord hl, 0, 1 + hlcoord 0, 1 ld a, [wNamingScreenType] ld de, YourTextString and a @@ -479,16 +461,16 @@ PrintNamingText: ld a, [wcf91] ld [wMonPartySpriteSpecies], a push af - callba WriteMonPartySpriteOAMBySpecies + farcall WriteMonPartySpriteOAMBySpecies pop af ld [wd11e], a call GetMonName - coord hl, 4, 1 + hlcoord 4, 1 call PlaceString ld hl, $1 add hl, bc - ld [hl], $c9 - coord hl, 1, 3 + ld [hl], "の" ; leftover from Japanese version; blank tile $c9 in English + hlcoord 1, 3 ld de, NicknameTextString jr .placeString .notNickname diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm new file mode 100644 index 00000000..7743e5df --- /dev/null +++ b/engine/menus/oaks_pc.asm @@ -0,0 +1,28 @@ +OpenOaksPC: + call SaveScreenTilesToBuffer2 + ld hl, AccessedOaksPCText + call PrintText + ld hl, GetDexRatedText + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .closePC + predef DisplayDexRating +.closePC + ld hl, ClosedOaksPCText + call PrintText + jp LoadScreenTilesFromBuffer2 + +GetDexRatedText: + text_far _GetDexRatedText + text_end + +ClosedOaksPCText: + text_far _ClosedOaksPCText + text_waitbutton + text_end + +AccessedOaksPCText: + text_far _AccessedOaksPCText + text_end diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm new file mode 100644 index 00000000..ddb92f75 --- /dev/null +++ b/engine/menus/party_menu.asm @@ -0,0 +1,306 @@ +DrawPartyMenu_:: + xor a + ldh [hAutoBGTransferEnabled], a + call ClearScreen + call UpdateSprites + farcall LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics + +RedrawPartyMenu_:: + ld a, [wPartyMenuTypeOrMessageID] + cp SWAP_MONS_PARTY_MENU + jp z, .printMessage + call ErasePartyMenuCursors + farcall InitPartyMenuBlkPacket + hlcoord 3, 0 + ld de, wPartySpecies + xor a + ld c, a + ldh [hPartyMonIndex], a + ld [wWhichPartyMenuHPBar], a +.loop + ld a, [de] + cp $FF ; reached the terminator? + jp z, .afterDrawingMonEntries + push bc + push de + push hl + ld a, c + push hl + ld hl, wPartyMonNicks + call GetPartyMonName + pop hl + call PlaceString ; print the pokemon's name + farcall WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon + ldh a, [hPartyMonIndex] + ld [wWhichPokemon], a + inc a + ldh [hPartyMonIndex], a + call LoadMonData + pop hl + push hl + ld a, [wMenuItemToSwap] + and a ; is the player swapping pokemon positions? + jr z, .skipUnfilledRightArrow +; if the player is swapping pokemon positions + dec a + ld b, a + ld a, [wWhichPokemon] + cp b ; is the player swapping the current pokemon in the list? + jr nz, .skipUnfilledRightArrow +; the player is swapping the current pokemon in the list + dec hl + dec hl + dec hl + ld a, "▷" ; unfilled right arrow menu cursor + ld [hli], a ; place the cursor + inc hl + inc hl +.skipUnfilledRightArrow + ld a, [wPartyMenuTypeOrMessageID] ; menu type + cp TMHM_PARTY_MENU + jr z, .teachMoveMenu + cp EVO_STONE_PARTY_MENU + jr z, .evolutionStoneMenu + push hl + ld bc, 14 ; 14 columns to the right + add hl, bc + ld de, wLoadedMonStatus + call PrintStatusCondition + pop hl + push hl + ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column + ldh a, [hUILayoutFlags] + set 0, a + ldh [hUILayoutFlags], a + add hl, bc + predef DrawHP2 ; draw HP bar and prints current / max HP + ldh a, [hUILayoutFlags] + res 0, a + ldh [hUILayoutFlags], a + call SetPartyMenuHPBarColor ; color the HP bar (on SGB) + pop hl + jr .printLevel +.teachMoveMenu + push hl + predef CanLearnTM ; check if the pokemon can learn the move + pop hl + ld de, .ableToLearnMoveText + ld a, c + and a + jr nz, .placeMoveLearnabilityString + ld de, .notAbleToLearnMoveText +.placeMoveLearnabilityString + ld bc, 20 + 9 ; down 1 row and right 9 columns + push hl + add hl, bc + call PlaceString + pop hl +.printLevel + ld bc, 10 ; move 10 columns to the right + add hl, bc + call PrintLevel + pop hl + pop de + inc de + ld bc, 2 * 20 + add hl, bc + pop bc + inc c + jp .loop +.ableToLearnMoveText + db "ABLE@" +.notAbleToLearnMoveText + db "NOT ABLE@" +.evolutionStoneMenu + push hl + ld hl, EvosMovesPointerTable + ld b, 0 + ld a, [wLoadedMonSpecies] + dec a + add a + rl b + ld c, a + add hl, bc + ld de, wEvosMoves + ld a, BANK(EvosMovesPointerTable) + ld bc, 2 + call FarCopyData + ld hl, wEvosMoves + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wEvosMoves + ld a, BANK(EvosMovesPointerTable) + ld bc, wEvosMoves.end - wEvosMoves + call FarCopyData + ld hl, wEvosMoves + ld de, .notAbleToEvolveText +; loop through the pokemon's evolution entries +.checkEvolutionsLoop + ld a, [hli] + and a ; reached terminator? + jr z, .placeEvolutionStoneString ; if so, place the "NOT ABLE" string + inc hl + inc hl + cp EV_ITEM + jr nz, .checkEvolutionsLoop +; if it's a stone evolution entry + dec hl + dec hl + ld b, [hl] + ld a, [wEvoStoneItemID] ; the stone the player used + inc hl + inc hl + inc hl + cp b ; does the player's stone match this evolution entry's stone? + jr nz, .checkEvolutionsLoop +; if it does match + ld de, .ableToEvolveText +.placeEvolutionStoneString + ld bc, 20 + 9 ; down 1 row and right 9 columns + pop hl + push hl + add hl, bc + call PlaceString + pop hl + jr .printLevel +.ableToEvolveText + db "ABLE@" +.notAbleToEvolveText + db "NOT ABLE@" +.afterDrawingMonEntries + ld b, SET_PAL_PARTY_MENU + call RunPaletteCommand +.printMessage + ld hl, wd730 + ld a, [hl] + push af + push hl + set 6, [hl] ; turn off letter printing delay + ld a, [wPartyMenuTypeOrMessageID] ; message ID + cp FIRST_PARTY_MENU_TEXT_ID + jr nc, .printItemUseMessage + add a + ld hl, PartyMenuMessagePointers + ld b, 0 + ld c, a + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + call PrintText +.done + pop hl + pop af + ld [hl], a + ld a, 1 + ldh [hAutoBGTransferEnabled], a + call Delay3 + jp GBPalNormal +.printItemUseMessage + and $0F + ld hl, PartyMenuItemUseMessagePointers + add a + ld c, a + ld b, 0 + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + push hl + ld a, [wUsedItemOnWhichPokemon] + ld hl, wPartyMonNicks + call GetPartyMonName + pop hl + call PrintText + jr .done + +PartyMenuItemUseMessagePointers: + dw AntidoteText + dw BurnHealText + dw IceHealText + dw AwakeningText + dw ParlyzHealText + dw PotionText + dw FullHealText + dw ReviveText + dw RareCandyText + +PartyMenuMessagePointers: + dw PartyMenuNormalText + dw PartyMenuItemUseText + dw PartyMenuBattleText + dw PartyMenuUseTMText + dw PartyMenuSwapMonText + dw PartyMenuItemUseText + +PartyMenuNormalText: + text_far _PartyMenuNormalText + text_end + +PartyMenuItemUseText: + text_far _PartyMenuItemUseText + text_end + +PartyMenuBattleText: + text_far _PartyMenuBattleText + text_end + +PartyMenuUseTMText: + text_far _PartyMenuUseTMText + text_end + +PartyMenuSwapMonText: + text_far _PartyMenuSwapMonText + text_end + +PotionText: + text_far _PotionText + text_end + +AntidoteText: + text_far _AntidoteText + text_end + +ParlyzHealText: + text_far _ParlyzHealText + text_end + +BurnHealText: + text_far _BurnHealText + text_end + +IceHealText: + text_far _IceHealText + text_end + +AwakeningText: + text_far _AwakeningText + text_end + +FullHealText: + text_far _FullHealText + text_end + +ReviveText: + text_far _ReviveText + text_end + +RareCandyText: + text_far _RareCandyText + sound_get_item_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded + text_promptbutton + text_end + +SetPartyMenuHPBarColor: + ld hl, wPartyMenuHPBarColors + ld a, [wWhichPartyMenuHPBar] + ld c, a + ld b, 0 + add hl, bc + call GetHealthBarColor + ld b, SET_PAL_PARTY_MENU_HP_BARS + call RunPaletteCommand + ld hl, wWhichPartyMenuHPBar + inc [hl] + ret diff --git a/engine/menu/pc.asm b/engine/menus/pc.asm old mode 100755 new mode 100644 similarity index 86% rename from engine/menu/pc.asm rename to engine/menus/pc.asm index 5639bd99..4c340e7b --- a/engine/menu/pc.asm +++ b/engine/menus/pc.asm @@ -1,4 +1,4 @@ -ActivatePC: +ActivatePC:: call SaveScreenTilesToBuffer2 ld a, SFX_TURN_ON_PC call PlaySound @@ -10,7 +10,7 @@ ActivatePC: call LoadScreenTilesFromBuffer2 call Delay3 PCMainMenu: - callba DisplayPCMainMenu + farcall DisplayPCMainMenu ld hl, wFlags_0xcd60 set 5, [hl] call HandleMenuInput @@ -56,19 +56,19 @@ PCMainMenu: call WaitForSoundToFinish ld hl, AccessedMyPCText call PrintText - callba PlayerPC + farcall PlayerPC jr ReloadMainMenu OaksPC: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish - callba OpenOaksPC + farcall OpenOaksPC jr ReloadMainMenu PKMNLeague: ld a, SFX_ENTER_PC call PlaySound call WaitForSoundToFinish - callba PKMNLeaguePC + farcall PKMNLeaguePC jr ReloadMainMenu BillsPC: ld a, SFX_ENTER_PC @@ -82,7 +82,7 @@ BillsPC: ld hl, AccessedBillsPCText .printText call PrintText - callba BillsPC_ + farcall BillsPC_ ReloadMainMenu: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -99,28 +99,28 @@ LogOff: ret TurnedOnPC1Text: - TX_FAR _TurnedOnPC1Text - db "@" + text_far _TurnedOnPC1Text + text_end AccessedBillsPCText: - TX_FAR _AccessedBillsPCText - db "@" + text_far _AccessedBillsPCText + text_end AccessedSomeonesPCText: - TX_FAR _AccessedSomeonesPCText - db "@" + text_far _AccessedSomeonesPCText + text_end AccessedMyPCText: - TX_FAR _AccessedMyPCText - db "@" + text_far _AccessedMyPCText + text_end ; removes one of the specified item ID [hItemToRemoveID] from bag (if existent) -RemoveItemByID: +RemoveItemByID:: ld hl, wBagItems - ld a, [hItemToRemoveID] + ldh a, [hItemToRemoveID] ld b, a xor a - ld [hItemToRemoveIndex], a + ldh [hItemToRemoveIndex], a .loop ld a, [hli] cp -1 ; reached terminator? @@ -128,14 +128,14 @@ RemoveItemByID: cp b jr z, .foundItem inc hl - ld a, [hItemToRemoveIndex] + ldh a, [hItemToRemoveIndex] inc a - ld [hItemToRemoveIndex], a + ldh [hItemToRemoveIndex], a jr .loop .foundItem ld a, $1 ld [wItemQuantity], a - ld a, [hItemToRemoveIndex] + ldh a, [hItemToRemoveIndex] ld [wWhichPokemon], a ld hl, wNumBagItems jp RemoveItemFromInventory diff --git a/engine/menu/players_pc.asm b/engine/menus/players_pc.asm old mode 100755 new mode 100644 similarity index 89% rename from engine/menu/players_pc.asm rename to engine/menus/players_pc.asm index bc2be4ef..5461be51 --- a/engine/menu/players_pc.asm +++ b/engine/menus/players_pc.asm @@ -1,4 +1,4 @@ -PlayerPC: +PlayerPC:: ld hl, wd730 set 6, [hl] ld a, ITEM_NAME @@ -22,12 +22,12 @@ PlayerPCMenu: ld hl, wFlags_0xcd60 set 5, [hl] call LoadScreenTilesFromBuffer2 - coord hl, 0, 0 + hlcoord 0, 0 ld b, $8 ld c, $e call TextBoxBorder call UpdateSprites - coord hl, 2, 2 + hlcoord 2, 2 ld de, PlayersPCMenuEntries call PlaceString ld hl, wTopMenuItemY @@ -247,57 +247,57 @@ PlayersPCMenuEntries: next "LOG OFF@" TurnedOnPC2Text: - TX_FAR _TurnedOnPC2Text - db "@" + text_far _TurnedOnPC2Text + text_end WhatDoYouWantText: - TX_FAR _WhatDoYouWantText - db "@" + text_far _WhatDoYouWantText + text_end WhatToDepositText: - TX_FAR _WhatToDepositText - db "@" + text_far _WhatToDepositText + text_end DepositHowManyText: - TX_FAR _DepositHowManyText - db "@" + text_far _DepositHowManyText + text_end ItemWasStoredText: - TX_FAR _ItemWasStoredText - db "@" + text_far _ItemWasStoredText + text_end NothingToDepositText: - TX_FAR _NothingToDepositText - db "@" + text_far _NothingToDepositText + text_end NoRoomToStoreText: - TX_FAR _NoRoomToStoreText - db "@" + text_far _NoRoomToStoreText + text_end WhatToWithdrawText: - TX_FAR _WhatToWithdrawText - db "@" + text_far _WhatToWithdrawText + text_end WithdrawHowManyText: - TX_FAR _WithdrawHowManyText - db "@" + text_far _WithdrawHowManyText + text_end WithdrewItemText: - TX_FAR _WithdrewItemText - db "@" + text_far _WithdrewItemText + text_end NothingStoredText: - TX_FAR _NothingStoredText - db "@" + text_far _NothingStoredText + text_end CantCarryMoreText: - TX_FAR _CantCarryMoreText - db "@" + text_far _CantCarryMoreText + text_end WhatToTossText: - TX_FAR _WhatToTossText - db "@" + text_far _WhatToTossText + text_end TossHowManyText: - TX_FAR _TossHowManyText - db "@" + text_far _TossHowManyText + text_end diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm new file mode 100644 index 00000000..651534a2 --- /dev/null +++ b/engine/menus/pokedex.asm @@ -0,0 +1,665 @@ +ShowPokedexMenu: + call GBPalWhiteOut + call ClearScreen + call UpdateSprites + ld a, [wListScrollOffset] + push af + xor a + ld [wCurrentMenuItem], a + ld [wListScrollOffset], a + ld [wLastMenuItem], a + inc a + ld [wd11e], a + ldh [hJoy7], a +.setUpGraphics + ld b, SET_PAL_GENERIC + call RunPaletteCommand + callfar LoadPokedexTilePatterns +.doPokemonListMenu + ld hl, wTopMenuItemY + ld a, 3 + ld [hli], a ; top menu item Y + xor a + ld [hli], a ; top menu item X + inc a + ld [wMenuWatchMovingOutOfBounds], a + inc hl + inc hl + ld a, 6 + ld [hli], a ; max menu item ID + ld [hl], D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON + call HandlePokedexListMenu + jr c, .goToSideMenu ; if the player chose a pokemon from the list +.exitPokedex + xor a + ld [wMenuWatchMovingOutOfBounds], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ldh [hJoy7], a + ld [wWastedByteCD3A], a + ld [wOverrideSimulatedJoypadStatesMask], a + pop af + ld [wListScrollOffset], a + call GBPalWhiteOutWithDelay3 + call RunDefaultPaletteCommand + jp ReloadMapData +.goToSideMenu + call HandlePokedexSideMenu + dec b + jr z, .exitPokedex ; if the player chose Quit + dec b + jr z, .doPokemonListMenu ; if pokemon not seen or player pressed B button + jp .setUpGraphics ; if pokemon data or area was shown + +; handles the menu on the lower right in the pokedex screen +; OUTPUT: +; b = reason for exiting menu +; 00: showed pokemon data or area +; 01: the player chose Quit +; 02: the pokemon has not been seen yet or the player pressed the B button +HandlePokedexSideMenu: + call PlaceUnfilledArrowMenuCursor + ld a, [wCurrentMenuItem] + push af + ld b, a + ld a, [wLastMenuItem] + push af + ld a, [wListScrollOffset] + push af + add b + inc a + ld [wd11e], a + ld a, [wd11e] + push af + ld a, [wDexMaxSeenMon] + push af ; this doesn't need to be preserved + ld hl, wPokedexSeen + call IsPokemonBitSet + ld b, 2 + jr z, .exitSideMenu + call PokedexToIndex + ld hl, wTopMenuItemY + ld a, 10 + ld [hli], a ; top menu item Y + ld a, 15 + ld [hli], a ; top menu item X + xor a + ld [hli], a ; current menu item ID + inc hl + ld a, 3 + ld [hli], a ; max menu item ID + ;ld a, A_BUTTON | B_BUTTON + ld [hli], a ; menu watched keys (A button and B button) + xor a + ld [hli], a ; old menu item ID + ld [wMenuWatchMovingOutOfBounds], a +.handleMenuInput + call HandleMenuInput + bit 1, a ; was the B button pressed? + ld b, 2 + jr nz, .buttonBPressed + ld a, [wCurrentMenuItem] + and a + jr z, .choseData + dec a + jr z, .choseCry + dec a + jr z, .choseArea +.choseQuit + ld b, 1 +.exitSideMenu + pop af + ld [wDexMaxSeenMon], a + pop af + ld [wd11e], a + pop af + ld [wListScrollOffset], a + pop af + ld [wLastMenuItem], a + pop af + ld [wCurrentMenuItem], a + push bc + hlcoord 0, 3 + ld de, 20 + lb bc, " ", 13 + call DrawTileLine ; cover up the menu cursor in the pokemon list + pop bc + ret + +.buttonBPressed + push bc + hlcoord 15, 10 + ld de, 20 + lb bc, " ", 7 + call DrawTileLine ; cover up the menu cursor in the side menu + pop bc + jr .exitSideMenu + +.choseData + call ShowPokedexDataInternal + ld b, 0 + jr .exitSideMenu + +; play pokemon cry +.choseCry + ld a, [wd11e] + push af + call PlayCry + pop af + ld [wd11e], a + jr .handleMenuInput + +.choseArea + predef LoadTownMap_Nest ; display pokemon areas + ld b, 0 + jr .exitSideMenu + +; handles the list of pokemon on the left of the pokedex screen +; sets carry flag if player presses A, unsets carry flag if player presses B +HandlePokedexListMenu: + xor a + ldh [hAutoBGTransferEnabled], a +; draw the horizontal line separating the seen and owned amounts from the menu + hlcoord 15, 8 + ld a, "─" + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + hlcoord 14, 0 + ld [hl], $71 ; vertical line tile + hlcoord 14, 1 + call DrawPokedexVerticalLine + hlcoord 14, 9 + call DrawPokedexVerticalLine + ld hl, wPokedexSeen + ld b, wPokedexSeenEnd - wPokedexSeen + call CountSetBits + ld de, wNumSetBits + hlcoord 16, 3 + lb bc, 1, 3 + call PrintNumber ; print number of seen pokemon + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned + call CountSetBits + ld de, wNumSetBits + hlcoord 16, 6 + lb bc, 1, 3 + call PrintNumber ; print number of owned pokemon + hlcoord 16, 2 + ld de, PokedexSeenText + call PlaceString + hlcoord 16, 5 + ld de, PokedexOwnText + call PlaceString + hlcoord 1, 1 + ld de, PokedexContentsText + call PlaceString + hlcoord 16, 10 + ld de, PokedexMenuItemsText + call PlaceString +; find the highest pokedex number among the pokemon the player has seen + ld hl, wPokedexSeenEnd - 1 + ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 +.maxSeenPokemonLoop + ld a, [hld] + ld c, 8 +.maxSeenPokemonInnerLoop + dec b + sla a + jr c, .storeMaxSeenPokemon + dec c + jr nz, .maxSeenPokemonInnerLoop + jr .maxSeenPokemonLoop + +.storeMaxSeenPokemon + ld a, b + ld [wDexMaxSeenMon], a +.loop + xor a + ldh [hAutoBGTransferEnabled], a + hlcoord 4, 2 + lb bc, 14, 10 + call ClearScreenArea + hlcoord 1, 3 + ld a, [wListScrollOffset] + ld [wd11e], a + ld d, 7 + ld a, [wDexMaxSeenMon] + cp 7 + jr nc, .printPokemonLoop + ld d, a + dec a + ld [wMaxMenuItem], a +; loop to print pokemon pokedex numbers and names +; if the player has owned the pokemon, it puts a pokeball beside the name +.printPokemonLoop + ld a, [wd11e] + inc a + ld [wd11e], a + push af + push de + push hl + ld de, -SCREEN_WIDTH + add hl, de + ld de, wd11e + lb bc, LEADING_ZEROES | 1, 3 + call PrintNumber ; print the pokedex number + ld de, SCREEN_WIDTH + add hl, de + dec hl + push hl + ld hl, wPokedexOwned + call IsPokemonBitSet + pop hl + ld a, " " + jr z, .writeTile + ld a, $72 ; pokeball tile +.writeTile + ld [hl], a ; put a pokeball next to pokemon that the player has owned + push hl + ld hl, wPokedexSeen + call IsPokemonBitSet + jr nz, .getPokemonName ; if the player has seen the pokemon + ld de, .dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon + jr .skipGettingName +.dashedLine ; for unseen pokemon in the list + db "----------@" +.getPokemonName + call PokedexToIndex + call GetMonName +.skipGettingName + pop hl + inc hl + call PlaceString + pop hl + ld bc, 2 * SCREEN_WIDTH + add hl, bc + pop de + pop af + ld [wd11e], a + dec d + jr nz, .printPokemonLoop + ld a, 01 + ldh [hAutoBGTransferEnabled], a + call Delay3 + call GBPalNormal + call HandleMenuInput + bit 1, a ; was the B button pressed? + jp nz, .buttonBPressed +.checkIfUpPressed + bit 6, a ; was Up pressed? + jr z, .checkIfDownPressed +.upPressed ; scroll up one row + ld a, [wListScrollOffset] + and a + jp z, .loop + dec a + ld [wListScrollOffset], a + jp .loop +.checkIfDownPressed + bit 7, a ; was Down pressed? + jr z, .checkIfRightPressed +.downPressed ; scroll down one row + ld a, [wDexMaxSeenMon] + cp 7 + jp c, .loop ; can't if the list is shorter than 7 + sub 7 + ld b, a + ld a, [wListScrollOffset] + cp b + jp z, .loop + inc a + ld [wListScrollOffset], a + jp .loop +.checkIfRightPressed + bit 4, a ; was Right pressed? + jr z, .checkIfLeftPressed +.rightPressed ; scroll down 7 rows + ld a, [wDexMaxSeenMon] + cp 7 + jp c, .loop ; can't if the list is shorter than 7 + sub 6 + ld b, a + ld a, [wListScrollOffset] + add 7 + ld [wListScrollOffset], a + cp b + jp c, .loop + dec b + ld a, b + ld [wListScrollOffset], a + jp .loop +.checkIfLeftPressed ; scroll up 7 rows + bit 5, a ; was Left pressed? + jr z, .buttonAPressed +.leftPressed + ld a, [wListScrollOffset] + sub 7 + ld [wListScrollOffset], a + jp nc, .loop + xor a + ld [wListScrollOffset], a + jp .loop +.buttonAPressed + scf + ret +.buttonBPressed + and a + ret + +DrawPokedexVerticalLine: + ld c, 9 ; height of line + ld de, SCREEN_WIDTH + ld a, $71 ; vertical line tile +.loop + ld [hl], a + add hl, de + xor 1 ; toggle between vertical line tile and box tile + dec c + jr nz, .loop + ret + +PokedexSeenText: + db "SEEN@" + +PokedexOwnText: + db "OWN@" + +PokedexContentsText: + db "CONTENTS@" + +PokedexMenuItemsText: + db "DATA" + next "CRY" + next "AREA" + next "QUIT@" + +; tests if a pokemon's bit is set in the seen or owned pokemon bit fields +; INPUT: +; [wd11e] = pokedex number +; hl = address of bit field +IsPokemonBitSet: + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_TEST + predef FlagActionPredef + ld a, c + and a + ret + +; function to display pokedex data from outside the pokedex +ShowPokedexData: + call GBPalWhiteOutWithDelay3 + call ClearScreen + call UpdateSprites + callfar LoadPokedexTilePatterns ; load pokedex tiles + +; function to display pokedex data from inside the pokedex +ShowPokedexDataInternal: + ld hl, wd72c + set 1, [hl] + ld a, $33 ; 3/7 volume + ldh [rNR50], a + call GBPalWhiteOut ; zero all palettes + call ClearScreen + ld a, [wd11e] ; pokemon ID + ld [wcf91], a + push af + ld b, SET_PAL_POKEDEX + call RunPaletteCommand + pop af + ld [wd11e], a + ldh a, [hTileAnimations] + push af + xor a + ldh [hTileAnimations], a + + hlcoord 0, 0 + ld de, 1 + lb bc, $64, SCREEN_WIDTH + call DrawTileLine ; draw top border + + hlcoord 0, 17 + ld b, $6f + call DrawTileLine ; draw bottom border + + hlcoord 0, 1 + ld de, 20 + lb bc, $66, $10 + call DrawTileLine ; draw left border + + hlcoord 19, 1 + ld b, $67 + call DrawTileLine ; draw right border + + ld a, $63 ; upper left corner tile + ldcoord_a 0, 0 + ld a, $65 ; upper right corner tile + ldcoord_a 19, 0 + ld a, $6c ; lower left corner tile + ldcoord_a 0, 17 + ld a, $6e ; lower right corner tile + ldcoord_a 19, 17 + + hlcoord 0, 9 + ld de, PokedexDataDividerLine + call PlaceString ; draw horizontal divider line + + hlcoord 9, 6 + ld de, HeightWeightText + call PlaceString + + call GetMonName + hlcoord 9, 2 + call PlaceString + + ld hl, PokedexEntryPointers + ld a, [wd11e] + dec a + ld e, a + ld d, 0 + add hl, de + add hl, de + ld a, [hli] + ld e, a + ld d, [hl] ; de = address of pokedex entry + + hlcoord 9, 4 + call PlaceString ; print species name + + ld h, b + ld l, c + push de + ld a, [wd11e] + push af + call IndexToPokedex + + hlcoord 2, 8 + ld a, "№" + ld [hli], a + ld a, "" + ld [hli], a + ld de, wd11e + lb bc, LEADING_ZEROES | 1, 3 + call PrintNumber ; print pokedex number + + ld hl, wPokedexOwned + call IsPokemonBitSet + pop af + ld [wd11e], a + ld a, [wcf91] + ld [wd0b5], a + pop de + + push af + push bc + push de + push hl + + call Delay3 + call GBPalNormal + call GetMonHeader ; load pokemon picture location + hlcoord 1, 1 + call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture + ld a, [wcf91] + call PlayCry ; play pokemon cry + + pop hl + pop de + pop bc + pop af + + ld a, c + and a + jp z, .waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description + inc de ; de = address of feet (height) + ld a, [de] ; reads feet, but a is overwritten without being used + hlcoord 12, 6 + lb bc, 1, 2 + call PrintNumber ; print feet (height) + ld a, "′" + ld [hl], a + inc de + inc de ; de = address of inches (height) + hlcoord 15, 6 + lb bc, LEADING_ZEROES | 1, 2 + call PrintNumber ; print inches (height) + ld a, "″" + ld [hl], a +; now print the weight (note that weight is stored in tenths of pounds internally) + inc de + inc de + inc de ; de = address of upper byte of weight + push de +; put weight in big-endian order at hDexWeight + ld hl, hDexWeight + ld a, [hl] ; save existing value of [hDexWeight] + push af + ld a, [de] ; a = upper byte of weight + ld [hli], a ; store upper byte of weight in [hDexWeight] + ld a, [hl] ; save existing value of [hDexWeight + 1] + push af + dec de + ld a, [de] ; a = lower byte of weight + ld [hl], a ; store lower byte of weight in [hDexWeight + 1] + ld de, hDexWeight + hlcoord 11, 8 + lb bc, 2, 5 ; 2 bytes, 5 digits + call PrintNumber ; print weight + hlcoord 14, 8 + ldh a, [hDexWeight + 1] + sub 10 + ldh a, [hDexWeight] + sbc 0 + jr nc, .next + ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point +.next + inc hl + ld a, [hli] + ld [hld], a ; make space for the decimal point by moving the last digit forward one tile + ld [hl], "" ; decimal point tile + pop af + ldh [hDexWeight + 1], a ; restore original value of [hDexWeight + 1] + pop af + ldh [hDexWeight], a ; restore original value of [hDexWeight] + pop hl + inc hl ; hl = address of pokedex description text + bccoord 1, 11 + ld a, %10 + ldh [hClearLetterPrintingDelayFlags], a + call TextCommandProcessor ; print pokedex description text + xor a + ldh [hClearLetterPrintingDelayFlags], a +.waitForButtonPress + call JoypadLowSensitivity + ldh a, [hJoy5] + and A_BUTTON | B_BUTTON + jr z, .waitForButtonPress + pop af + ldh [hTileAnimations], a + call GBPalWhiteOut + call ClearScreen + call RunDefaultPaletteCommand + call LoadTextBoxTilePatterns + call GBPalNormal + ld hl, wd72c + res 1, [hl] + ld a, $77 ; max volume + ldh [rNR50], a + ret + +HeightWeightText: + db "HT ?′??″" + next "WT ???lb@" + +; XXX does anything point to this? +PokeText: + db "#@" + +; horizontal line that divides the pokedex text description from the rest of the data +PokedexDataDividerLine: + db $68, $69, $6B, $69, $6B, $69, $6B, $69, $6B, $6B + db $6B, $6B, $69, $6B, $69, $6B, $69, $6B, $69, $6A + db "@" + +; draws a line of tiles +; INPUT: +; b = tile ID +; c = number of tile ID's to write +; de = amount to destination address after each tile (1 for horizontal, 20 for vertical) +; hl = destination address +DrawTileLine: + push bc + push de +.loop + ld [hl], b + add hl, de + dec c + jr nz, .loop + pop de + pop bc + ret + +INCLUDE "data/pokemon/dex_entries.asm" + +PokedexToIndex: + ; converts the Pokédex number at wd11e to an index + push bc + push hl + ld a, [wd11e] + ld b, a + ld c, 0 + ld hl, PokedexOrder + +.loop ; go through the list until we find an entry with a matching dex number + inc c + ld a, [hli] + cp b + jr nz, .loop + + ld a, c + ld [wd11e], a + pop hl + pop bc + ret + +IndexToPokedex: + ; converts the index number at wd11e to a Pokédex number + push bc + push hl + ld a, [wd11e] + dec a + ld hl, PokedexOrder + ld b, 0 + ld c, a + add hl, bc + ld a, [hl] + ld [wd11e], a + pop hl + pop bc + ret + +INCLUDE "data/pokemon/dex_order.asm" diff --git a/engine/save.asm b/engine/menus/save.asm old mode 100755 new mode 100644 similarity index 93% rename from engine/save.asm rename to engine/menus/save.asm index ed1048e8..2f8191df --- a/engine/save.asm +++ b/engine/menus/save.asm @@ -35,8 +35,8 @@ LoadSAV: ret FileDataDestroyedText: - TX_FAR _FileDataDestroyedText - db "@" + text_far _FileDataDestroyedText + text_end LoadSAV0: ld a, SRAM_ENABLE @@ -76,8 +76,8 @@ LoadSAV0: ld de, wSpriteDataStart ld bc, wSpriteDataEnd - wSpriteDataStart call CopyData - ld a, [sTilesetType] - ld [hTilesetType], a + ld a, [sTileAnimations] + ldh [hTileAnimations], a ld hl, sCurBoxData ld de, wBoxDataStart ld bc, wBoxDataEnd - wBoxDataStart @@ -145,7 +145,7 @@ LoadSAVIgnoreBadCheckSum: jp LoadSAV2 SaveSAV: - callba PrintSaveScreenText + farcall PrintSaveScreenText ld hl, WouldYouLikeToSaveText call SaveSAVConfirm and a ;|0 = Yes|1 = No| @@ -161,10 +161,10 @@ SaveSAV: ret nz .save call SaveSAVtoSRAM - coord hl, 1, 13 + hlcoord 1, 13 lb bc, 4, 18 call ClearScreenArea - coord hl, 1, 14 + hlcoord 1, 14 ld de, NowSavingString call PlaceString ld c, 120 @@ -182,7 +182,7 @@ NowSavingString: SaveSAVConfirm: call PrintText - coord hl, 0, 7 + hlcoord 0, 7 lb bc, 8, 1 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -191,16 +191,16 @@ SaveSAVConfirm: ret WouldYouLikeToSaveText: - TX_FAR _WouldYouLikeToSaveText - db "@" + text_far _WouldYouLikeToSaveText + text_end GameSavedText: - TX_FAR _GameSavedText - db "@" + text_far _GameSavedText + text_end OlderFileWillBeErasedText: - TX_FAR _OlderFileWillBeErasedText - db "@" + text_far _OlderFileWillBeErasedText + text_end SaveSAVtoSRAM0: ld a, SRAM_ENABLE @@ -224,8 +224,8 @@ SaveSAVtoSRAM0: ld de, sCurBoxData ld bc, wBoxDataEnd - wBoxDataStart call CopyData - ld a, [hTilesetType] - ld [sTilesetType], a + ldh a, [hTileAnimations] + ld [sTileAnimations], a ld hl, sPlayerName ld bc, sMainDataCheckSum - sPlayerName call SAVCheckSum @@ -278,7 +278,7 @@ SaveSAVtoSRAM2: ld [MBC1SRamEnable], a ret -SaveSAVtoSRAM: +SaveSAVtoSRAM:: ld a, $2 ld [wSaveFileStatus], a @@ -367,10 +367,10 @@ ChangeBox:: call z, EmptyAllSRAMBoxes ; if so, empty all boxes in SRAM call DisplayChangeBoxMenu call UpdateSprites - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags res 1, [hl] bit 1, a ; pressed b ret nz @@ -402,8 +402,8 @@ ChangeBox:: ret WhenYouChangeBoxText: - TX_FAR _WhenYouChangeBoxText - db "@" + text_far _WhenYouChangeBoxText + text_end CopyBoxToOrFromSRAM: ; copy an entire box from hl to de with b as the SRAM bank @@ -442,7 +442,7 @@ CopyBoxToOrFromSRAM: DisplayChangeBoxMenu: xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a ld a, 11 @@ -457,41 +457,41 @@ DisplayChangeBoxMenu: and $7f ld [wCurrentMenuItem], a ld [wLastMenuItem], a - coord hl, 0, 0 + hlcoord 0, 0 ld b, 2 ld c, 9 call TextBoxBorder ld hl, ChooseABoxText call PrintText - coord hl, 11, 0 + hlcoord 11, 0 ld b, 12 ld c, 7 call TextBoxBorder - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags set 2, [hl] ld de, BoxNames - coord hl, 13, 1 + hlcoord 13, 1 call PlaceString - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags res 2, [hl] ld a, [wCurrentBoxNum] and $7f cp 9 jr c, .singleDigitBoxNum sub 9 - coord hl, 8, 2 + hlcoord 8, 2 ld [hl], "1" add "0" jr .next .singleDigitBoxNum add "1" .next - Coorda 9, 2 - coord hl, 1, 2 + ldcoord_a 9, 2 + hlcoord 1, 2 ld de, BoxNoText call PlaceString call GetMonCountsForAllBoxes - coord hl, 18, 1 + hlcoord 18, 1 ld de, wBoxMonCounts ld bc, SCREEN_WIDTH ld a, $c @@ -508,12 +508,12 @@ DisplayChangeBoxMenu: dec a jr nz, .loop ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret ChooseABoxText: - TX_FAR _ChooseABoxText - db "@" + text_far _ChooseABoxText + text_end BoxNames: db "BOX 1" @@ -634,9 +634,9 @@ GetMonCountsForBoxesInBank: ret SAVCheckRandomID: -;checks if Sav file is the same by checking player's name 1st letter ($a598) +; checks if Sav file is the same by checking player's name 1st letter ; and the two random numbers generated at game beginning -;(which are stored at wPlayerID)s +; (which are stored at wPlayerID)s ld a, 1 ld [wHaltAudio], a @@ -753,7 +753,7 @@ ClearSAV: PadSRAM_FF: ld [MBC1SRamBank], a - ld hl, $a000 - ld bc, $2000 + ld hl, SRAM_Begin + ld bc, SRAM_End - SRAM_Begin ld a, $ff jp FillMemory diff --git a/engine/menu/start_sub_menus.asm b/engine/menus/start_sub_menus.asm old mode 100755 new mode 100644 similarity index 86% rename from engine/menu/start_sub_menus.asm rename to engine/menus/start_sub_menus.asm index 947837e3..c0448121 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -1,4 +1,4 @@ -StartMenu_Pokedex: +StartMenu_Pokedex:: predef ShowPokedexMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call Delay3 @@ -6,7 +6,7 @@ StartMenu_Pokedex: call UpdateSprites jp RedisplayStartMenu -StartMenu_Pokemon: +StartMenu_Pokemon:: ld a, [wPartyCount] and a jp z, RedisplayStartMenu @@ -50,7 +50,7 @@ StartMenu_Pokemon: ld hl, wTopMenuItemY ld a, c ld [hli], a ; top menu item Y - ld a, [hFieldMoveMonMenuTopMenuItemX] + ldh a, [hFieldMoveMonMenuTopMenuItemX] ld [hli], a ; top menu item X xor a ld [hli], a ; current menu item ID @@ -130,7 +130,7 @@ StartMenu_Pokemon: dw .teleport dw .softboiled .fly - bit 2, a ; does the player have the Thunder Badge? + bit BIT_THUNDERBADGE, a jp z, .newBadgeRequired call CheckIfInOutsideMap jr z, .canFly @@ -150,7 +150,7 @@ StartMenu_Pokemon: set 1, [hl] jp StartMenu_Pokemon .cut - bit 1, a ; does the player have the Cascade Badge? + bit BIT_CASCADEBADGE, a jp z, .newBadgeRequired predef UsedCut ld a, [wActionResultOrTookBattleTurn] @@ -158,9 +158,9 @@ StartMenu_Pokemon: jp z, .loop jp CloseTextDisplay .surf - bit 4, a ; does the player have the Soul Badge? + bit BIT_SOULBADGE, a jp z, .newBadgeRequired - callba IsSurfingAllowed + farcall IsSurfingAllowed ld hl, wd728 bit 1, [hl] res 1, [hl] @@ -175,13 +175,13 @@ StartMenu_Pokemon: call GBPalWhiteOutWithDelay3 jp .goBackToMap .strength - bit 3, a ; does the player have the Rainbow Badge? + bit BIT_RAINBOWBADGE, a jp z, .newBadgeRequired predef PrintStrengthTxt call GBPalWhiteOutWithDelay3 jp .goBackToMap .flash - bit 0, a ; does the player have the Boulder Badge? + bit BIT_BOULDERBADGE, a jp z, .newBadgeRequired xor a ld [wMapPalOffset], a @@ -190,8 +190,8 @@ StartMenu_Pokemon: call GBPalWhiteOutWithDelay3 jp .goBackToMap .flashLightsAreaText - TX_FAR _FlashLightsAreaText - db "@" + text_far _FlashLightsAreaText + text_end .dig ld a, ESCAPE_ROPE ld [wcf91], a @@ -225,35 +225,35 @@ StartMenu_Pokemon: call GBPalWhiteOutWithDelay3 jp .goBackToMap .warpToLastPokemonCenterText - TX_FAR _WarpToLastPokemonCenterText - db "@" + text_far _WarpToLastPokemonCenterText + text_end .cannotUseTeleportNowText - TX_FAR _CannotUseTeleportNowText - db "@" + text_far _CannotUseTeleportNowText + text_end .cannotFlyHereText - TX_FAR _CannotFlyHereText - db "@" + text_far _CannotFlyHereText + text_end .softboiled ld hl, wPartyMon1MaxHP ld a, [wWhichPokemon] ld bc, wPartyMon2 - wPartyMon1 call AddNTimes ld a, [hli] - ld [H_DIVIDEND], a + ldh [hDividend], a ld a, [hl] - ld [H_DIVIDEND + 1], a + ldh [hDividend + 1], a ld a, 5 - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, 2 ; number of bytes call Divide ld bc, wPartyMon1HP - wPartyMon1MaxHP add hl, bc ld a, [hld] ld b, a - ld a, [H_QUOTIENT + 3] + ldh a, [hQuotient + 3] sub b ld b, [hl] - ld a, [H_QUOTIENT + 2] + ldh a, [hQuotient + 2] sbc b jp nc, .notHealthyEnough ld a, [wPartyAndBillsPCSavedMenuItem] @@ -270,8 +270,8 @@ StartMenu_Pokemon: call PrintText jp .loop .notHealthyEnoughText - TX_FAR _NotHealthyEnoughText - db "@" + text_far _NotHealthyEnoughText + text_end .goBackToMap call RestoreScreenTilesAndReloadTilePatterns jp CloseTextDisplay @@ -280,12 +280,12 @@ StartMenu_Pokemon: call PrintText jp .loop .newBadgeRequiredText - TX_FAR _NewBadgeRequiredText - db "@" + text_far _NewBadgeRequiredText + text_end ; writes a blank tile to all possible menu cursor positions on the party menu -ErasePartyMenuCursors: - coord hl, 0, 1 +ErasePartyMenuCursors:: + hlcoord 0, 1 ld bc, 2 * 20 ; menu cursor positions are 2 rows apart ld a, 6 ; 6 menu cursor positions .loop @@ -299,7 +299,7 @@ ItemMenuLoop: call LoadScreenTilesFromBuffer2DisableBGTransfer ; restore saved screen call RunDefaultPaletteCommand -StartMenu_Item: +StartMenu_Item:: ld a, [wLinkState] dec a ; is the player in the Colosseum or Trade Centre? jr nz, .notInCableClubRoom @@ -330,10 +330,10 @@ StartMenu_Item: .choseItem ; erase menu cursor (blank each tile in front of an item name) ld a, " " - Coorda 5, 4 - Coorda 5, 6 - Coorda 5, 8 - Coorda 5, 10 + ldcoord_a 5, 4 + ldcoord_a 5, 6 + ldcoord_a 5, 8 + ldcoord_a 5, 10 call PlaceUnfilledArrowMenuCursor xor a ld [wMenuItemToSwap], a @@ -384,7 +384,7 @@ StartMenu_Item: ; use item ld [wPseudoItemID], a ; a must be 0 due to above conditional jump ld a, [wcf91] - cp HM_01 + cp HM01 jr nc, .useItem_partyMenu ld hl, UsableItems_CloseMenu ld de, 1 @@ -439,71 +439,25 @@ StartMenu_Item: jp ItemMenuLoop CannotUseItemsHereText: - TX_FAR _CannotUseItemsHereText - db "@" + text_far _CannotUseItemsHereText + text_end CannotGetOffHereText: - TX_FAR _CannotGetOffHereText - db "@" + text_far _CannotGetOffHereText + text_end -; items which bring up the party menu when used -UsableItems_PartyMenu: - db MOON_STONE - db ANTIDOTE - db BURN_HEAL - db ICE_HEAL - db AWAKENING - db PARLYZ_HEAL - db FULL_RESTORE - db MAX_POTION - db HYPER_POTION - db SUPER_POTION - db POTION - db FIRE_STONE - db THUNDER_STONE - db WATER_STONE - db HP_UP - db PROTEIN - db IRON - db CARBOS - db CALCIUM - db RARE_CANDY - db LEAF_STONE - db FULL_HEAL - db REVIVE - db MAX_REVIVE - db FRESH_WATER - db SODA_POP - db LEMONADE - db X_ATTACK - db X_DEFEND - db X_SPEED - db X_SPECIAL - db PP_UP - db ETHER - db MAX_ETHER - db ELIXER - db MAX_ELIXER - db $ff +INCLUDE "data/items/use_party.asm" -; items which close the item menu when used -UsableItems_CloseMenu: - db ESCAPE_ROPE - db ITEMFINDER - db POKE_FLUTE - db OLD_ROD - db GOOD_ROD - db SUPER_ROD - db $ff +INCLUDE "data/items/use_overworld.asm" -StartMenu_TrainerInfo: +StartMenu_TrainerInfo:: call GBPalWhiteOut call ClearScreen call UpdateSprites - ld a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ld [hTilesetType], a + ldh [hTileAnimations], a call DrawTrainerInfo predef DrawBadges ; draw badges ld b, SET_PAL_TRAINER_CARD @@ -517,7 +471,7 @@ StartMenu_TrainerInfo: call ReloadMapData call LoadGBPal pop af - ld [hTilesetType], a + ldh [hTileAnimations], a jp RedisplayStartMenu ; loads tile patterns and draws everything except for gym leader faces / badges @@ -526,44 +480,44 @@ DrawTrainerInfo: lb bc, BANK(RedPicFront), $01 predef DisplayPicCenteredOrUpperRight call DisableLCD - coord hl, 0, 2 + hlcoord 0, 2 ld a, " " call TrainerInfo_DrawVerticalLine - coord hl, 1, 2 + hlcoord 1, 2 call TrainerInfo_DrawVerticalLine - ld hl, vChars2 + $70 - ld de, vChars2 - ld bc, $70 * 4 + ld hl, vChars2 tile $07 + ld de, vChars2 tile $00 + ld bc, $1c tiles call CopyData ld hl, TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns - ld de, vChars2 + $770 - ld bc, $0080 + ld de, vChars2 tile $77 + ld bc, 8 tiles push bc call TrainerInfo_FarCopyData ld hl, BlankLeaderNames - ld de, vChars2 + $600 - ld bc, $0170 + ld de, vChars2 tile $60 + ld bc, $17 tiles call TrainerInfo_FarCopyData pop bc ld hl, BadgeNumbersTileGraphics ; badge number tile patterns - ld de, vChars1 + $580 + ld de, vChars1 tile $58 call TrainerInfo_FarCopyData ld hl, GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns - ld de, vChars2 + $200 - ld bc, $0400 - ld a, $03 + ld de, vChars2 tile $20 + ld bc, 8 * 8 tiles + ld a, BANK(GymLeaderFaceAndBadgeTileGraphics) call FarCopyData2 ld hl, TextBoxGraphics - ld de, $00d0 + ld de, 13 tiles add hl, de ; hl = colon tile pattern - ld de, vChars1 + $560 - ld bc, $0010 - ld a, $04 + ld de, vChars1 tile $56 + ld bc, 1 tiles + ld a, BANK(TextBoxGraphics) push bc call FarCopyData2 pop bc - ld hl, TrainerInfoTextBoxTileGraphics + $80 ; background tile pattern - ld de, vChars1 + $570 + ld hl, TrainerInfoTextBoxTileGraphics tile 8 ; background tile pattern + ld de, vChars1 tile $57 call TrainerInfo_FarCopyData call EnableLCD ld hl, wTrainerInfoTextBoxWidthPlus1 @@ -572,7 +526,7 @@ DrawTrainerInfo: dec a ld [hli], a ld [hl], 1 - coord hl, 0, 0 + hlcoord 0, 0 call TrainerInfo_DrawTextBox ld hl, wTrainerInfoTextBoxWidthPlus1 ld a, 16 + 1 @@ -580,27 +534,27 @@ DrawTrainerInfo: dec a ld [hli], a ld [hl], 3 - coord hl, 1, 10 + hlcoord 1, 10 call TrainerInfo_DrawTextBox - coord hl, 0, 10 + hlcoord 0, 10 ld a, $d7 call TrainerInfo_DrawVerticalLine - coord hl, 19, 10 + hlcoord 19, 10 call TrainerInfo_DrawVerticalLine - coord hl, 6, 9 + hlcoord 6, 9 ld de, TrainerInfo_BadgesText call PlaceString - coord hl, 2, 2 + hlcoord 2, 2 ld de, TrainerInfo_NameMoneyTimeText call PlaceString - coord hl, 7, 2 + hlcoord 7, 2 ld de, wPlayerName call PlaceString - coord hl, 8, 4 + hlcoord 8, 4 ld de, wPlayerMoney ld c, $e3 call PrintBCDNumber - coord hl, 9, 6 + hlcoord 9, 6 ld de, wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 call PrintNumber @@ -684,7 +638,7 @@ TrainerInfo_DrawVerticalLine: jr nz, .loop ret -StartMenu_SaveReset: +StartMenu_SaveReset:: ld a, [wd72e] bit 6, a ; is the player using the link feature? jp nz, Init @@ -692,18 +646,18 @@ StartMenu_SaveReset: call LoadScreenTilesFromBuffer2 ; restore saved screen jp HoldTextDisplayOpen -StartMenu_Option: +StartMenu_Option:: xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call ClearScreen call UpdateSprites - callab DisplayOptionMenu + callfar DisplayOptionMenu call LoadScreenTilesFromBuffer2 ; restore saved screen call LoadTextBoxTilePatterns call UpdateSprites jp RedisplayStartMenu -SwitchPartyMon: +SwitchPartyMon:: call SwitchPartyMon_InitVarOrSwapData ; swap data ld a, [wSwappedMenuItem] call SwitchPartyMon_ClearGfx @@ -713,7 +667,7 @@ SwitchPartyMon: SwitchPartyMon_ClearGfx: push af - coord hl, 0, 0 + hlcoord 0, 0 ld bc, SCREEN_WIDTH * 2 call AddNTimes ld c, SCREEN_WIDTH * 2 @@ -783,10 +737,10 @@ SwitchPartyMon_InitVarOrSwapData: inc d .noCarry2 ld a, [hl] - ld [hSwapTemp], a + ldh [hSwapTemp], a ld a, [de] ld [hl], a - ld a, [hSwapTemp] + ldh a, [hSwapTemp] ld [de], a ld hl, wPartyMons ld bc, wPartyMon2 - wPartyMon1 diff --git a/engine/menu/swap_items.asm b/engine/menus/swap_items.asm similarity index 95% rename from engine/menu/swap_items.asm rename to engine/menus/swap_items.asm index 563fc7d5..2d506ce2 100644 --- a/engine/menu/swap_items.asm +++ b/engine/menus/swap_items.asm @@ -1,4 +1,4 @@ -HandleItemListSwapping: +HandleItemListSwapping:: ld a, [wListMenuID] cp ITEMLISTMENU jp nz, DisplayListMenuIDLoop ; only rearrange item list menus @@ -77,18 +77,18 @@ HandleItemListSwapping: cp b jr z, .swapSameItemType .swapDifferentItems - ld [$ff95], a ; [$ff95] = second item ID + ldh [hSwapItemID], a ; save second item ID ld a, [hld] - ld [$ff96], a ; [$ff96] = second item quantity + ldh [hSwapItemQuantity], a ; save second item quantity ld a, [de] ld [hli], a ; put first item ID in second item slot inc de ld a, [de] ld [hl], a ; put first item quantity in second item slot - ld a, [$ff96] + ldh a, [hSwapItemQuantity] ld [de], a ; put second item quantity in first item slot dec de - ld a, [$ff95] + ldh a, [hSwapItemID] ld [de], a ; put second item ID in first item slot xor a ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm new file mode 100644 index 00000000..5253ec48 --- /dev/null +++ b/engine/menus/text_box.asm @@ -0,0 +1,561 @@ +; function to draw various text boxes +DisplayTextBoxID_:: + ld a, [wTextBoxID] + cp TWO_OPTION_MENU + jp z, DisplayTwoOptionMenu + ld c, a + ld hl, TextBoxFunctionTable + ld de, 3 + call SearchTextBoxTable + jr c, .functionTableMatch + ld hl, TextBoxCoordTable + ld de, 5 + call SearchTextBoxTable + jr c, .coordTableMatch + ld hl, TextBoxTextAndCoordTable + ld de, 9 + call SearchTextBoxTable + jr c, .textAndCoordTableMatch +.done + ret +.functionTableMatch + ld a, [hli] + ld h, [hl] + ld l, a ; hl = address of function + ld de, .done + push de + jp hl ; jump to the function +.coordTableMatch + call GetTextBoxIDCoords + call GetAddressOfScreenCoords + call TextBoxBorder + ret +.textAndCoordTableMatch + call GetTextBoxIDCoords + push hl + call GetAddressOfScreenCoords + call TextBoxBorder + pop hl + call GetTextBoxIDText + ld a, [wd730] + push af + ld a, [wd730] + set 6, a ; no pauses between printing each letter + ld [wd730], a + call PlaceString + pop af + ld [wd730], a + call UpdateSprites + ret + +; function to search a table terminated with $ff for a byte matching c in increments of de +; sets carry flag if a match is found and clears carry flag if not +SearchTextBoxTable: + dec de +.loop + ld a, [hli] + cp $ff + jr z, .notFound + cp c + jr z, .found + add hl, de + jr .loop +.found + scf +.notFound + ret + +; function to load coordinates from the TextBoxCoordTable or the TextBoxTextAndCoordTable +; INPUT: +; hl = address of coordinates +; OUTPUT: +; b = height +; c = width +; d = row of upper left corner +; e = column of upper left corner +GetTextBoxIDCoords: + ld a, [hli] ; column of upper left corner + ld e, a + ld a, [hli] ; row of upper left corner + ld d, a + ld a, [hli] ; column of lower right corner + sub e + dec a + ld c, a ; c = width + ld a, [hli] ; row of lower right corner + sub d + dec a + ld b, a ; b = height + ret + +; function to load a text address and text coordinates from the TextBoxTextAndCoordTable +GetTextBoxIDText: + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a ; de = address of text + push de ; save text address + ld a, [hli] + ld e, a ; column of upper left corner of text + ld a, [hl] + ld d, a ; row of upper left corner of text + call GetAddressOfScreenCoords + pop de ; restore text address + ret + +; function to point hl to the screen coordinates +; INPUT: +; d = row +; e = column +; OUTPUT: +; hl = address of upper left corner of text box +GetAddressOfScreenCoords: + push bc + hlcoord 0, 0 + ld bc, 20 +.loop ; loop to add d rows to the base address + ld a, d + and a + jr z, .addedRows + add hl, bc + dec d + jr .loop +.addedRows + pop bc + add hl, de + ret + +INCLUDE "data/text_boxes.asm" + +DisplayMoneyBox: + ld hl, wd730 + set 6, [hl] + ld a, MONEY_BOX_TEMPLATE + ld [wTextBoxID], a + call DisplayTextBoxID + hlcoord 13, 1 + ld b, 1 + ld c, 6 + call ClearScreenArea + hlcoord 12, 1 + ld de, wPlayerMoney + ld c, $a3 + call PrintBCDNumber + ld hl, wd730 + res 6, [hl] + ret + +CurrencyString: + db " ¥@" + +DoBuySellQuitMenu: + ld a, [wd730] + set 6, a ; no printing delay + ld [wd730], a + xor a + ld [wChosenMenuItem], a + ld a, BUY_SELL_QUIT_MENU_TEMPLATE + ld [wTextBoxID], a + call DisplayTextBoxID + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $2 + ld [wMaxMenuItem], a + ld a, $1 + ld [wTopMenuItemY], a + ld a, $1 + ld [wTopMenuItemX], a + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wd730] + res 6, a ; turn on the printing delay + ld [wd730], a + call HandleMenuInput + call PlaceUnfilledArrowMenuCursor + bit 0, a ; was A pressed? + jr nz, .pressedA + bit 1, a ; was B pressed? (always true since only A/B are watched) + jr z, .pressedA + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + jr .quit +.pressedA + ld a, CHOSE_MENU_ITEM + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + ld b, a + ld a, [wMaxMenuItem] + cp b + jr z, .quit + ret +.quit + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + scf + ret + +; displays a menu with two options to choose from +; b = Y of upper left corner of text region +; c = X of upper left corner of text region +; hl = address where the text box border should be drawn +DisplayTwoOptionMenu: + push hl + ld a, [wd730] + set 6, a ; no printing delay + ld [wd730], a + +; pointless because both values are overwritten before they are read + xor a + ld [wChosenMenuItem], a + ld [wMenuExitMethod], a + + ld a, A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, $1 + ld [wMaxMenuItem], a + ld a, b + ld [wTopMenuItemY], a + ld a, c + ld [wTopMenuItemX], a + xor a + ld [wLastMenuItem], a + ld [wMenuWatchMovingOutOfBounds], a + push hl + ld hl, wTwoOptionMenuID + bit 7, [hl] ; select second menu item by default? + res 7, [hl] + jr z, .storeCurrentMenuItem + inc a +.storeCurrentMenuItem + ld [wCurrentMenuItem], a + pop hl + push hl + push hl + call TwoOptionMenu_SaveScreenTiles + ld a, [wTwoOptionMenuID] + ld hl, TwoOptionMenuStrings + ld e, a + ld d, $0 + ld a, $5 +.menuStringLoop + add hl, de + dec a + jr nz, .menuStringLoop + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld e, l + ld d, h + pop hl + push de + ld a, [wTwoOptionMenuID] + cp TRADE_CANCEL_MENU + jr nz, .notTradeCancelMenu + call CableClub_TextBoxBorder + jr .afterTextBoxBorder +.notTradeCancelMenu + call TextBoxBorder +.afterTextBoxBorder + call UpdateSprites + pop hl + ld a, [hli] + and a ; put blank line before first menu item? + ld bc, 20 + 2 + jr z, .noBlankLine + ld bc, 2 * 20 + 2 +.noBlankLine + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + pop hl + add hl, bc + call PlaceString + ld hl, wd730 + res 6, [hl] ; turn on the printing delay + ld a, [wTwoOptionMenuID] + cp NO_YES_MENU + jr nz, .notNoYesMenu +; No/Yes menu +; this menu type ignores the B button +; it only seems to be used when confirming the deletion of a save file + xor a + ld [wTwoOptionMenuID], a + ld a, [wFlags_0xcd60] + push af + push hl + ld hl, wFlags_0xcd60 + bit 5, [hl] + set 5, [hl] ; don't play sound when A or B is pressed in menu + pop hl +.noYesMenuInputLoop + call HandleMenuInput + bit 1, a ; A button pressed? + jr nz, .noYesMenuInputLoop ; try again if A was not pressed + pop af + pop hl + ld [wFlags_0xcd60], a + ld a, SFX_PRESS_AB + call PlaySound + jr .pressedAButton +.notNoYesMenu + xor a + ld [wTwoOptionMenuID], a + call HandleMenuInput + pop hl + bit 1, a ; A button pressed? + jr nz, .choseSecondMenuItem ; automatically choose the second option if B is pressed +.pressedAButton + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + and a + jr nz, .choseSecondMenuItem +; chose first menu item + ld a, CHOSE_FIRST_ITEM + ld [wMenuExitMethod], a + ld c, 15 + call DelayFrames + call TwoOptionMenu_RestoreScreenTiles + and a + ret +.choseSecondMenuItem + ld a, 1 + ld [wCurrentMenuItem], a + ld [wChosenMenuItem], a + ld a, CHOSE_SECOND_ITEM + ld [wMenuExitMethod], a + ld c, 15 + call DelayFrames + call TwoOptionMenu_RestoreScreenTiles + scf + ret + +; Some of the wider/taller two option menus will not have the screen areas +; they cover be fully saved/restored by the two functions below. +; The bottom and right edges of the menu may remain after the function returns. + +TwoOptionMenu_SaveScreenTiles: + ld de, wBuffer + lb bc, 5, 6 +.loop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .loop + push bc + ld bc, SCREEN_WIDTH - 6 + add hl, bc + pop bc + ld c, $6 + dec b + jr nz, .loop + ret + +TwoOptionMenu_RestoreScreenTiles: + ld de, wBuffer + lb bc, 5, 6 +.loop + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .loop + push bc + ld bc, SCREEN_WIDTH - 6 + add hl, bc + pop bc + ld c, 6 + dec b + jr nz, .loop + call UpdateSprites + ret + +INCLUDE "data/yes_no_menu_strings.asm" + +DisplayFieldMoveMonMenu: + xor a + ld hl, wFieldMoves + ld [hli], a ; wFieldMoves + ld [hli], a ; wFieldMoves + 1 + ld [hli], a ; wFieldMoves + 2 + ld [hli], a ; wFieldMoves + 3 + ld [hli], a ; wNumFieldMoves + ld [hl], 12 ; wFieldMovesLeftmostXCoord + call GetMonFieldMoves + ld a, [wNumFieldMoves] + and a + jr nz, .fieldMovesExist + +; no field moves + hlcoord 11, 11 + ld b, 5 + ld c, 7 + call TextBoxBorder + call UpdateSprites + ld a, 12 + ldh [hFieldMoveMonMenuTopMenuItemX], a + hlcoord 13, 12 + ld de, PokemonMenuEntries + jp PlaceString + +.fieldMovesExist + push af + +; Calculate the text box position and dimensions based on the leftmost X coord +; of the field move names before adjusting for the number of field moves. + hlcoord 0, 11 + ld a, [wFieldMovesLeftmostXCoord] + dec a + ld e, a + ld d, 0 + add hl, de + ld b, 5 + ld a, 18 + sub e + ld c, a + pop af + +; For each field move, move the top of the text box up 2 rows while the leaving +; the bottom of the text box at the bottom of the screen. + ld de, -SCREEN_WIDTH * 2 +.textBoxHeightLoop + add hl, de + inc b + inc b + dec a + jr nz, .textBoxHeightLoop + +; Make space for an extra blank row above the top field move. + ld de, -SCREEN_WIDTH + add hl, de + inc b + + call TextBoxBorder + call UpdateSprites + +; Calculate the position of the first field move name to print. + hlcoord 0, 12 + ld a, [wFieldMovesLeftmostXCoord] + inc a + ld e, a + ld d, 0 + add hl, de + ld de, -SCREEN_WIDTH * 2 + ld a, [wNumFieldMoves] +.calcFirstFieldMoveYLoop + add hl, de + dec a + jr nz, .calcFirstFieldMoveYLoop + + xor a + ld [wNumFieldMoves], a + ld de, wFieldMoves +.printNamesLoop + push hl + ld hl, FieldMoveNames + ld a, [de] + and a + jr z, .donePrintingNames + inc de + ld b, a ; index of name +.skipNamesLoop ; skip past names before the name we want + dec b + jr z, .reachedName +.skipNameLoop ; skip past current name + ld a, [hli] + cp "@" + jr nz, .skipNameLoop + jr .skipNamesLoop +.reachedName + ld b, h + ld c, l + pop hl + push de + ld d, b + ld e, c + call PlaceString + ld bc, SCREEN_WIDTH * 2 + add hl, bc + pop de + jr .printNamesLoop + +.donePrintingNames + pop hl + ld a, [wFieldMovesLeftmostXCoord] + ldh [hFieldMoveMonMenuTopMenuItemX], a + hlcoord 0, 12 + ld a, [wFieldMovesLeftmostXCoord] + inc a + ld e, a + ld d, 0 + add hl, de + ld de, PokemonMenuEntries + jp PlaceString + +INCLUDE "data/moves/field_move_names.asm" + +PokemonMenuEntries: + db "STATS" + next "SWITCH" + next "CANCEL@" + +GetMonFieldMoves: + ld a, [wWhichPokemon] + ld hl, wPartyMon1Moves + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld d, h + ld e, l + ld c, NUM_MOVES + 1 + ld hl, wFieldMoves +.loop + push hl +.nextMove + dec c + jr z, .done + ld a, [de] ; move ID + and a + jr z, .done + ld b, a + inc de + ld hl, FieldMoveDisplayData +.fieldMoveLoop + ld a, [hli] + cp $ff + jr z, .nextMove ; if the move is not a field move + cp b + jr z, .foundFieldMove + inc hl + inc hl + jr .fieldMoveLoop +.foundFieldMove + ld a, b + ld [wLastFieldMoveID], a + ld a, [hli] ; field move name index + ld b, [hl] ; field move leftmost X coordinate + pop hl + ld [hli], a ; store name index in wFieldMoves + ld a, [wNumFieldMoves] + inc a + ld [wNumFieldMoves], a + ld a, [wFieldMovesLeftmostXCoord] + cp b + jr c, .skipUpdatingLeftmostXCoord + ld a, b + ld [wFieldMovesLeftmostXCoord], a +.skipUpdatingLeftmostXCoord + ld a, [wLastFieldMoveID] + ld b, a + jr .loop +.done + pop hl + ret + +INCLUDE "data/moves/field_moves.asm" diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm deleted file mode 100755 index 864ac136..00000000 --- a/engine/mon_party_sprites.asm +++ /dev/null @@ -1,423 +0,0 @@ -AnimatePartyMon_ForceSpeed1: - xor a - ld [wCurrentMenuItem], a - ld b, a - inc a - jr GetAnimationSpeed - -; wPartyMenuHPBarColors contains the party mon's health bar colors -; 0: green -; 1: yellow -; 2: red -AnimatePartyMon: - ld hl, wPartyMenuHPBarColors - ld a, [wCurrentMenuItem] - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] - -GetAnimationSpeed: - ld c, a - ld hl, PartyMonSpeeds - add hl, bc - ld a, [wOnSGB] - xor $1 - add [hl] - ld c, a - add a - ld b, a - ld a, [wAnimCounter] - and a - jr z, .resetSprites - cp c - jr z, .animateSprite -.incTimer - inc a - cp b - jr nz, .skipResetTimer - xor a ; reset timer -.skipResetTimer - ld [wAnimCounter], a - jp DelayFrame -.resetSprites - push bc - ld hl, wMonPartySpritesSavedOAM - ld de, wOAMBuffer - ld bc, $60 - call CopyData - pop bc - xor a - jr .incTimer -.animateSprite - push bc - ld hl, wOAMBuffer + $02 ; OAM tile id - ld bc, $10 - ld a, [wCurrentMenuItem] - call AddNTimes - ld c, $40 ; amount to increase the tile id by - ld a, [hl] - cp $4 ; tile ID for SPRITE_BALL_M - jr z, .editCoords - cp $8 ; tile ID for SPRITE_HELIX - jr nz, .editTileIDS -; SPRITE_BALL_M and SPRITE_HELIX only shake up and down -.editCoords - dec hl - dec hl ; dec hl to the OAM y coord - ld c, $1 ; amount to increase the y coord by -; otherwise, load a second sprite frame -.editTileIDS - ld b, $4 - ld de, $4 -.loop - ld a, [hl] - add c - ld [hl], a - add hl, de - dec b - jr nz, .loop - pop bc - ld a, c - jr .incTimer - -; Party mon animations cycle between 2 frames. -; The members of the PartyMonSpeeds array specify the number of V-blanks -; that each frame lasts for green HP, yellow HP, and red HP in order. -; On the naming screen, the yellow HP speed is always used. -PartyMonSpeeds: - db 5, 16, 32 - -LoadMonPartySpriteGfx: -; Load mon party sprite tile patterns into VRAM during V-blank. - ld hl, MonPartySpritePointers - ld a, $1c - -LoadAnimSpriteGfx: -; Load animated sprite tile patterns into VRAM during V-blank. hl is the address -; of an array of structures that contain arguments for CopyVideoData and a is -; the number of structures in the array. - ld bc, $0 -.loop - push af - push bc - push hl - add hl, bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld a, [hli] - ld h, [hl] - ld l, a - call CopyVideoData - pop hl - pop bc - ld a, $6 - add c - ld c, a - pop af - dec a - jr nz, .loop - ret - -LoadMonPartySpriteGfxWithLCDDisabled: -; Load mon party sprite tile patterns into VRAM immediately by disabling the -; LCD. - call DisableLCD - ld hl, MonPartySpritePointers - ld a, $1c - ld bc, $0 -.loop - push af - push bc - push hl - add hl, bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - push de - ld a, [hli] - ld c, a - swap c - ld b, $0 - ld a, [hli] - ld e, [hl] - inc hl - ld d, [hl] - pop hl - call FarCopyData2 - pop hl - pop bc - ld a, $6 - add c - ld c, a - pop af - dec a - jr nz, .loop - jp EnableLCD - -MonPartySpritePointers: - dw SlowbroSprite + $c0 - db $40 / $10 ; 40 bytes - db BANK(SlowbroSprite) - dw vSprites - - dw BallSprite - db $80 / $10 ; $80 bytes - db BANK(BallSprite) - dw vSprites + $40 - - dw ClefairySprite + $c0 - db $40 / $10 ; $40 bytes - db BANK(ClefairySprite) - dw vSprites + $c0 - - dw BirdSprite + $c0 - db $40 / $10 ; $40 bytes - db BANK(BirdSprite) - dw vSprites + $100 - - dw SeelSprite - db $40 / $10 ; $40 bytes - db BANK(SeelSprite) - dw vSprites + $140 - - dw MonPartySprites + $40 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $180 - - dw MonPartySprites + $50 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $1a0 - - dw MonPartySprites + $60 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $1c0 - - dw MonPartySprites + $70 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $1e0 - - dw MonPartySprites + $80 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $200 - - dw MonPartySprites + $90 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $220 - - dw MonPartySprites + $A0 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $240 - - dw MonPartySprites + $B0 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $260 - - dw MonPartySprites + $100 - db $40 / $10 ; $40 bytes - db BANK(MonPartySprites) - dw vSprites + $380 - - dw SlowbroSprite - db $40 / $10 ; $40 bytes - db BANK(SlowbroSprite) - dw vSprites + $400 - - dw BallSprite - db $80 / $10 ; $80 bytes - db BANK(BallSprite) - dw vSprites + $440 - - dw ClefairySprite - db $40 / $10 ; $40 bytes - db BANK(ClefairySprite) - dw vSprites + $4c0 - - dw BirdSprite - db $40 / $10 ; $40 bytes - db BANK(BirdSprite) - dw vSprites + $500 - - dw SeelSprite + $C0 - db $40 / $10 ; $40 bytes - db BANK(SeelSprite) - dw vSprites + $540 - - dw MonPartySprites - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $580 - - dw MonPartySprites + $10 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $5a0 - - dw MonPartySprites + $20 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $5c0 - - dw MonPartySprites + $30 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $5E0 - - dw MonPartySprites + $C0 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $600 - - dw MonPartySprites + $D0 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $620 - - dw MonPartySprites + $E0 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $640 - - dw MonPartySprites + $F0 - db $10 / $10 ; $10 bytes - db BANK(MonPartySprites) - dw vSprites + $660 - - dw MonPartySprites + $140 - db $40 / $10 ; $40 bytes - db BANK(MonPartySprites) - dw vSprites + $780 - -WriteMonPartySpriteOAMByPartyIndex: -; Write OAM blocks for the party mon in [hPartyMonIndex]. - push hl - push de - push bc - ld a, [hPartyMonIndex] - ld hl, wPartySpecies - ld e, a - ld d, 0 - add hl, de - ld a, [hl] - call GetPartyMonSpriteID - ld [wOAMBaseTile], a - call WriteMonPartySpriteOAM - pop bc - pop de - pop hl - ret - -WriteMonPartySpriteOAMBySpecies: -; Write OAM blocks for the party sprite of the species in -; [wMonPartySpriteSpecies]. - xor a - ld [hPartyMonIndex], a - ld a, [wMonPartySpriteSpecies] - call GetPartyMonSpriteID - ld [wOAMBaseTile], a - jr WriteMonPartySpriteOAM - -UnusedPartyMonSpriteFunction: -; This function is unused and doesn't appear to do anything useful. It looks -; like it may have been intended to load the tile patterns and OAM data for -; the mon party sprite associated with the species in [wcf91]. -; However, its calculations are off and it loads garbage data. - ld a, [wcf91] - call GetPartyMonSpriteID - push af - ld hl, vSprites - call .LoadTilePatterns - pop af - add $54 - ld hl, vSprites + $40 - call .LoadTilePatterns - xor a - ld [wMonPartySpriteSpecies], a - jr WriteMonPartySpriteOAMBySpecies - -.LoadTilePatterns - push hl - add a - ld c, a - ld b, 0 - ld hl, MonPartySpritePointers - add hl, bc - add hl, bc - add hl, bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - pop hl - jp CopyVideoData - -WriteMonPartySpriteOAM: -; Write the OAM blocks for the first animation frame into the OAM buffer and -; make a copy at wMonPartySpritesSavedOAM. - push af - ld c, $10 - ld h, wOAMBuffer / $100 - ld a, [hPartyMonIndex] - swap a - ld l, a - add $10 - ld b, a - pop af - cp SPRITE_HELIX << 2 - jr z, .helix - call WriteSymmetricMonPartySpriteOAM - jr .makeCopy -.helix - call WriteAsymmetricMonPartySpriteOAM -; Make a copy of the OAM buffer with the first animation frame written so that -; we can flip back to it from the second frame by copying it back. -.makeCopy - ld hl, wOAMBuffer - ld de, wMonPartySpritesSavedOAM - ld bc, $60 - jp CopyData - -GetPartyMonSpriteID: - ld [wd11e], a - predef IndexToPokedex - ld a, [wd11e] - ld c, a - dec a - srl a - ld hl, MonPartyData - ld e, a - ld d, 0 - add hl, de - ld a, [hl] - bit 0, c - jr nz, .skipSwap - swap a ; use lower nybble if pokedex num is even -.skipSwap - and $f0 - srl a - srl a - ret - -INCLUDE "data/mon_party_sprites.asm" - -MonPartySprites: - INCBIN "gfx/mon_ow_sprites.2bpp" diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm new file mode 100644 index 00000000..bb9211ed --- /dev/null +++ b/engine/movie/credits.asm @@ -0,0 +1,270 @@ +HallOfFamePC: + farcall AnimateHallOfFame + call ClearScreen + ld c, 100 + call DelayFrames + call DisableLCD + ld hl, vFont + ld bc, ($80 tiles) / 2 + call ZeroMemory + ld hl, vChars2 tile $60 + ld bc, ($20 tiles) / 2 + call ZeroMemory + ld hl, vChars2 tile $7e + ld bc, 1 tiles + ld a, $ff ; solid black + call FillMemory + hlcoord 0, 0 + call FillFourRowsWithBlack + hlcoord 0, 14 + call FillFourRowsWithBlack + ld a, %11000000 + ldh [rBGP], a + call EnableLCD + ld a, SFX_STOP_ALL_MUSIC + call PlaySoundWaitForCurrent + ld c, 0 ; BANK(Music_Credits) + ld a, MUSIC_CREDITS + call PlayMusic + ld c, 128 + call DelayFrames + xor a + ld [wUnusedCD3D], a ; not read + ld [wNumCreditsMonsDisplayed], a + jp Credits + +FadeInCreditsText: + ld hl, HoFGBPalettes + ld b, 4 +.loop + ld a, [hli] + ldh [rBGP], a + ld c, 5 + call DelayFrames + dec b + jr nz, .loop + ret + +DisplayCreditsMon: + xor a + ldh [hAutoBGTransferEnabled], a + call SaveScreenTilesToBuffer1 + call FillMiddleOfScreenWithWhite + + ; display the next monster from CreditsMons + ld hl, wNumCreditsMonsDisplayed + ld c, [hl] ; how many monsters have we displayed so far? + inc [hl] + ld b, 0 + ld hl, CreditsMons + add hl, bc ; go that far in the list of monsters and get the next one + ld a, [hl] + ld [wcf91], a + ld [wd0b5], a + hlcoord 8, 6 + call GetMonHeader + call LoadFrontSpriteByMonIndex + ld hl, vBGMap0 + $c + call CreditsCopyTileMapToVRAM + xor a + ldh [hAutoBGTransferEnabled], a + call LoadScreenTilesFromBuffer1 + ld hl, vBGMap0 + call CreditsCopyTileMapToVRAM + ld a, $A7 + ldh [rWX], a + ld hl, vBGMap1 + call CreditsCopyTileMapToVRAM + call FillMiddleOfScreenWithWhite + ld a, %11111100 ; make the mon a black silhouette + ldh [rBGP], a + +; scroll the mon left by one tile 7 times + ld bc, 7 +.scrollLoop1 + call ScrollCreditsMonLeft + dec c + jr nz, .scrollLoop1 + +; scroll the mon left by one tile 20 times +; This time, we have to move the window left too in order to hide the text that +; is wrapping around to the right side of the screen. + ld c, 20 +.scrollLoop2 + call ScrollCreditsMonLeft + ldh a, [rWX] + sub 8 + ldh [rWX], a + dec c + jr nz, .scrollLoop2 + + xor a + ldh [hWY], a + ld a, %11000000 + ldh [rBGP], a + ret + +INCLUDE "data/credits/credits_mons.asm" + +ScrollCreditsMonLeft: + ld h, b + ld l, $20 + call ScrollCreditsMonLeft_SetSCX + ld h, $0 + ld l, $70 + call ScrollCreditsMonLeft_SetSCX + ld a, b + add $8 + ld b, a + ret + +ScrollCreditsMonLeft_SetSCX: + ldh a, [rLY] + cp l + jr nz, ScrollCreditsMonLeft_SetSCX + ld a, h + ldh [rSCX], a +.loop + ldh a, [rLY] + cp h + jr z, .loop + ret + +HoFGBPalettes: + db %11000000 + db %11010000 + db %11100000 + db %11110000 + +CreditsCopyTileMapToVRAM: + ld a, l + ldh [hAutoBGTransferDest], a + ld a, h + ldh [hAutoBGTransferDest + 1], a + ld a, 1 + ldh [hAutoBGTransferEnabled], a + jp Delay3 + +ZeroMemory: +; zero bc bytes at hl + ld [hl], 0 + inc hl + inc hl + dec bc + ld a, b + or c + jr nz, ZeroMemory + ret + +FillFourRowsWithBlack: + ld bc, SCREEN_WIDTH * 4 + ld a, $7e + jp FillMemory + +FillMiddleOfScreenWithWhite: + hlcoord 0, 4 + ld bc, SCREEN_WIDTH * 10 + ld a, " " + jp FillMemory + +Credits: + ld de, CreditsOrder + push de +.nextCreditsScreen + pop de + hlcoord 9, 6 + push hl + call FillMiddleOfScreenWithWhite + pop hl +.nextCreditsCommand + ld a, [de] + inc de + push de + cp CRED_TEXT_FADE_MON + jr z, .fadeInTextAndShowMon + cp CRED_TEXT_MON + jr z, .showTextAndShowMon + cp CRED_TEXT_FADE + jr z, .fadeInText + cp CRED_TEXT + jr z, .showText + cp CRED_COPYRIGHT + jr z, .showCopyrightText + cp CRED_THE_END + jr z, .showTheEnd + push hl + push hl + ld hl, CreditsTextPointers + add a + ld c, a + ld b, 0 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ld a, [de] + inc de + ld c, a + ld b, -1 + pop hl + add hl, bc + call PlaceString + pop hl + ld bc, SCREEN_WIDTH * 2 + add hl, bc + pop de + jr .nextCreditsCommand +.fadeInTextAndShowMon + call FadeInCreditsText + ld c, 90 + jr .next1 +.showTextAndShowMon + ld c, 110 +.next1 + call DelayFrames + call DisplayCreditsMon + jr .nextCreditsScreen +.fadeInText + call FadeInCreditsText + ld c, 120 + jr .next2 +.showText + ld c, 140 +.next2 + call DelayFrames + jr .nextCreditsScreen +.showCopyrightText + push de + farcall LoadCopyrightTiles + pop de + pop de + jr .nextCreditsCommand +.showTheEnd + ld c, 16 + call DelayFrames + call FillMiddleOfScreenWithWhite + pop de + ld de, TheEndGfx + ld hl, vChars2 tile $60 + lb bc, BANK(TheEndGfx), (TheEndGfxEnd - TheEndGfx) / $10 + call CopyVideoData + hlcoord 4, 8 + ld de, TheEndTextString + call PlaceString + hlcoord 4, 9 + inc de + call PlaceString + jp FadeInCreditsText + +TheEndTextString: +; "T H E E N D" + db $60," ",$62," ",$64," ",$64," ",$66," ",$68,"@" + db $61," ",$63," ",$65," ",$65," ",$67," ",$69,"@" + +INCLUDE "data/credits/credits_order.asm" + +INCLUDE "data/credits/credits_text.asm" + +TheEndGfx: + INCBIN "gfx/credits/the_end.2bpp" +TheEndGfxEnd: diff --git a/engine/evolution.asm b/engine/movie/evolution.asm old mode 100755 new mode 100644 similarity index 88% rename from engine/evolution.asm rename to engine/movie/evolution.asm index c7431784..734b1ffc --- a/engine/evolution.asm +++ b/engine/movie/evolution.asm @@ -8,18 +8,18 @@ EvolveMon: push af xor a ld [wDanger], a - ld [wChannelSoundIDs + Ch4], a - dec a + ld [wChannelSoundIDs + Ch5], a + dec a ; SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld a, SFX_TINK call PlaySound call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld [hTilesetType], a + ldh [hAutoBGTransferEnabled], a + ldh [hTileAnimations], a ld a, [wEvoOldSpecies] ld [wWholeScreenPaletteMonSpecies], a ld c, 0 @@ -37,7 +37,7 @@ EvolveMon: ld [wd0b5], a call Evolution_LoadPic ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld a, [wEvoOldSpecies] call PlayCry call WaitForSoundToFinish @@ -67,7 +67,7 @@ EvolveMon: ld a, [wEvoNewSpecies] .done ld [wWholeScreenPaletteMonSpecies], a - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld a, [wWholeScreenPaletteMonSpecies] @@ -99,7 +99,7 @@ EvolutionSetWholeScreenPalette: Evolution_LoadPic: call GetMonHeader - coord hl, 7, 2 + hlcoord 7, 2 jp LoadFlippedFrontSpriteByMonIndex Evolution_BackAndForthAnim: @@ -117,8 +117,8 @@ Evolution_BackAndForthAnim: Evolution_ChangeMonPic: push bc xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 7, 2 + ldh [hAutoBGTransferEnabled], a + hlcoord 7, 2 lb bc, 7, 7 ld de, SCREEN_WIDTH - 7 .loop @@ -134,7 +134,7 @@ Evolution_ChangeMonPic: dec b jr nz, .loop ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 pop bc ret @@ -143,7 +143,7 @@ Evolution_CheckForCancel: call DelayFrame push bc call JoypadLowSensitivity - ld a, [hJoy5] + ldh a, [hJoy5] pop bc and B_BUTTON jr nz, .pressedB diff --git a/engine/hall_of_fame.asm b/engine/movie/hall_of_fame.asm old mode 100755 new mode 100644 similarity index 89% rename from engine/hall_of_fame.asm rename to engine/movie/hall_of_fame.asm index 614b49ba..0f5ea6f1 --- a/engine/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -19,12 +19,12 @@ AnimateHallOfFame: call FillMemory xor a ld [wUpdateSpritesEnabled], a - ld [hTilesetType], a + ldh [hTileAnimations], a ld [wSpriteFlipped], a ld [wLetterPrintingDelayFlags], a ; no delay ld [wHoFMonOrPlayer], a ; mon inc a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld hl, wNumHoFTeams ld a, [hl] inc a @@ -32,7 +32,7 @@ AnimateHallOfFame: inc [hl] .skipInc ld a, $90 - ld [hWY], a + ldh [hWY], a ld c, 0 ; BANK(Music_HallOfFame) ld a, MUSIC_HALL_OF_FAME call PlayMusic @@ -57,11 +57,11 @@ AnimateHallOfFame: call HoFDisplayAndRecordMonInfo ld c, 80 call DelayFrames - coord hl, 2, 13 + hlcoord 2, 13 ld b, 3 ld c, 14 call TextBoxBorder - coord hl, 4, 15 + hlcoord 4, 15 ld de, HallOfFameText call PlaceString ld c, 180 @@ -86,7 +86,7 @@ AnimateHallOfFame: call HoFDisplayPlayerStats call HoFFadeOutScreenAndMusic xor a - ld [hWY], a + ldh [hWY], a ld hl, rLCDC res 3, [hl] ret @@ -97,9 +97,9 @@ HallOfFameText: HoFShowMonOrPlayer: call ClearScreen ld a, $d0 - ld [hSCY], a + ldh [hSCY], a ld a, $c0 - ld [hSCX], a + ldh [hSCX], a ld a, [wHoFMonSpecies] ld [wcf91], a ld [wd0b5], a @@ -112,7 +112,7 @@ HoFShowMonOrPlayer: call HoFLoadPlayerPics jr .next1 .showMon - coord hl, 12, 5 + hlcoord 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex predef LoadMonBackPic @@ -121,7 +121,7 @@ HoFShowMonOrPlayer: ld c, 0 call RunPaletteCommand ld a, %11100100 - ld [rBGP], a + ldh [rBGP], a ld c, $31 ; back pic call HoFLoadMonPlayerPicTileIDs ld d, $a0 @@ -133,7 +133,7 @@ HoFShowMonOrPlayer: .next2 call .ScrollPic ; scroll back pic left xor a - ld [hSCY], a + ldh [hSCY], a ld c, a ; front pic call HoFLoadMonPlayerPicTileIDs ld d, 0 @@ -142,9 +142,9 @@ HoFShowMonOrPlayer: .ScrollPic call DelayFrame - ld a, [hSCX] + ldh a, [hSCX] add e - ld [hSCX], a + ldh [hSCX], a cp d jr nz, .ScrollPic ret @@ -157,22 +157,22 @@ HoFDisplayAndRecordMonInfo: jp HoFRecordMonInfo HoFDisplayMonInfo: - coord hl, 0, 2 + hlcoord 0, 2 ld b, 9 ld c, 10 call TextBoxBorder - coord hl, 2, 6 + hlcoord 2, 6 ld de, HoFMonInfoText call PlaceString - coord hl, 1, 4 + hlcoord 1, 4 ld de, wcd6d call PlaceString ld a, [wHoFMonLevel] - coord hl, 8, 7 + hlcoord 8, 7 call PrintLevelCommon ld a, [wHoFMonSpecies] ld [wd0b5], a - coord hl, 3, 9 + hlcoord 3, 9 predef PrintMonType ld a, [wHoFMonSpecies] jp PlayCry @@ -202,28 +202,28 @@ HoFLoadPlayerPics: HoFLoadMonPlayerPicTileIDs: ; c = base tile ID - ld b, 0 - coord hl, 12, 5 + ld b, TILEMAP_MON_PIC + hlcoord 12, 5 predef_jump CopyTileIDsFromList HoFDisplayPlayerStats: SetEvent EVENT_HALL_OF_FAME_DEX_RATING predef DisplayDexRating - coord hl, 0, 4 + hlcoord 0, 4 ld b, 6 ld c, 10 call TextBoxBorder - coord hl, 5, 0 + hlcoord 5, 0 ld b, 2 ld c, 9 call TextBoxBorder - coord hl, 7, 2 + hlcoord 7, 2 ld de, wPlayerName call PlaceString - coord hl, 1, 6 + hlcoord 1, 6 ld de, HoFPlayTimeText call PlaceString - coord hl, 5, 7 + hlcoord 5, 7 ld de, wPlayTimeHours lb bc, 1, 3 call PrintNumber @@ -232,10 +232,10 @@ HoFDisplayPlayerStats: ld de, wPlayTimeMinutes lb bc, LEADING_ZEROES | 1, 2 call PrintNumber - coord hl, 1, 9 + hlcoord 1, 9 ld de, HoFMoneyText call PlaceString - coord hl, 4, 10 + hlcoord 4, 10 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber @@ -257,12 +257,12 @@ HoFMoneyText: db "MONEY@" DexSeenOwnedText: - TX_FAR _DexSeenOwnedText - db "@" + text_far _DexSeenOwnedText + text_end DexRatingText: - TX_FAR _DexRatingText - db "@" + text_far _DexRatingText + text_end HoFRecordMonInfo: ld hl, wHallOfFame diff --git a/engine/intro.asm b/engine/movie/intro.asm old mode 100755 new mode 100644 similarity index 85% rename from engine/intro.asm rename to engine/movie/intro.asm index 70444427..08487936 --- a/engine/intro.asm +++ b/engine/movie/intro.asm @@ -1,26 +1,21 @@ -const_value = -1 + const_def -1 const MOVE_NIDORINO_RIGHT const MOVE_GENGAR_RIGHT const MOVE_GENGAR_LEFT ANIMATION_END EQU 80 -const_value = 3 - const GENGAR_INTRO_TILES1 - const GENGAR_INTRO_TILES2 - const GENGAR_INTRO_TILES3 - PlayIntro: xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a inc a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call PlayShootingStar call PlayIntroScene call GBFadeOutToWhite xor a - ld [hSCX], a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hSCX], a + ldh [hAutoBGTransferEnabled], a call ClearSprites call DelayFrame ret @@ -28,13 +23,13 @@ PlayIntro: PlayIntroScene: ld b, SET_PAL_NIDORINO_INTRO call RunPaletteCommand - ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE - ld [rBGP], a - ld [rOBP0], a - ld [rOBP1], a + ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE + ldh [rBGP], a + ldh [rOBP0], a + ldh [rOBP1], a xor a - ld [hSCX], a - ld b, GENGAR_INTRO_TILES1 + ldh [hSCX], a + ld b, TILEMAP_GENGAR_INTRO_1 call IntroCopyTiles ld a, 0 ld [wBaseCoordX], a @@ -77,7 +72,7 @@ PlayIntroScene: ret c ; raise - ld b, GENGAR_INTRO_TILES2 + ld b, TILEMAP_GENGAR_INTRO_2 call IntroCopyTiles ld a, SFX_INTRO_RAISE call PlaySound @@ -88,7 +83,7 @@ PlayIntroScene: ret c ; slash - ld b, GENGAR_INTRO_TILES3 + ld b, TILEMAP_GENGAR_INTRO_3 call IntroCopyTiles ld a, SFX_INTRO_CRASH call PlaySound @@ -97,7 +92,7 @@ PlayIntroScene: ; hip ld a, SFX_INTRO_HIP call PlaySound - ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE + ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation3 call AnimateIntroNidorino @@ -107,7 +102,7 @@ PlayIntroScene: lb de, 8 / 2, MOVE_GENGAR_LEFT call IntroMoveMon - ld b, GENGAR_INTRO_TILES1 + ld b, TILEMAP_GENGAR_INTRO_1 call IntroCopyTiles ld c, 60 call CheckForUserInterruption @@ -129,7 +124,7 @@ PlayIntroScene: call CheckForUserInterruption ret c - ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE + ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation6 call AnimateIntroNidorino @@ -140,7 +135,7 @@ PlayIntroScene: ; lunge ld a, SFX_INTRO_LUNGE call PlaySound - ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / BYTES_PER_TILE + ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / LEN_2BPP_TILE ld [wIntroNidorinoBaseTile], a ld de, IntroNidorinoAnimation7 jp AnimateIntroNidorino @@ -217,7 +212,7 @@ IntroClearScreen: IntroClearMiddleOfScreen: ; clear the area of the tile map between the black bars on the top and bottom - coord hl, 0, 4 + hlcoord 0, 4 ld bc, SCREEN_WIDTH * 10 IntroClearCommon: @@ -245,7 +240,7 @@ IntroMoveMon: cp MOVE_GENGAR_LEFT jr z, .moveGengarLeft ; move Gengar right - ld a, [hSCX] + ldh a, [hSCX] dec a dec a jr .next @@ -259,11 +254,11 @@ IntroMoveMon: call UpdateIntroNidorinoOAM pop de .moveGengarLeft - ld a, [hSCX] + ldh a, [hSCX] inc a inc a .next - ld [hSCX], a + ldh [hSCX], a push de ld c, 2 call CheckForUserInterruption @@ -274,7 +269,7 @@ IntroMoveMon: ret IntroCopyTiles: - coord hl, 13, 7 + hlcoord 13, 7 CopyTileIDsFromList_ZeroBaseTileID: ld c, 0 @@ -311,9 +306,9 @@ LoadIntroGraphics: PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand - callba LoadCopyrightAndTextBoxTiles - ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE - ld [rBGP], a + farcall LoadCopyrightAndTextBoxTiles + ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE + ldh [rBGP], a ld c, 180 call DelayFrames call ClearScreen @@ -328,7 +323,7 @@ PlayShootingStar: set 3, [hl] ld c, 64 call DelayFrames - callba AnimateShootingStar + farcall AnimateShootingStar push af pop af jr c, .next ; skip the delay if the user interrupted the animation @@ -348,20 +343,20 @@ PlayShootingStar: IntroDrawBlackBars: ; clear the screen and draw black bars on the top and bottom call IntroClearScreen - coord hl, 0, 0 + hlcoord 0, 0 ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles - coord hl, 0, 14 + hlcoord 0, 14 ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles ld hl, vBGMap1 ld c, BG_MAP_WIDTH * 4 call IntroPlaceBlackTiles - ld hl, vBGMap1 + BG_MAP_WIDTH * 14 + hlbgcoord 0, 14, vBGMap1 ld c, BG_MAP_WIDTH * 4 jp IntroPlaceBlackTiles -EmptyFunc4: +EmptyFunc2: ret IntroNidorinoAnimation0: @@ -438,35 +433,34 @@ IntroNidorinoAnimation7: db ANIMATION_END GameFreakIntro: - INCBIN "gfx/gamefreak_intro.2bpp" - INCBIN "gfx/gamefreak_logo.2bpp" - rept 16 - db $00 ; blank tile - endr + INCBIN "gfx/splash/gamefreak_presents.2bpp" + INCBIN "gfx/splash/gamefreak_logo.2bpp" + ds 16, $00 ; blank tile GameFreakIntroEnd: FightIntroBackMon: - INCBIN "gfx/intro_fight.2bpp" + INCBIN "gfx/intro/gengar.2bpp" + ds 16, $00 ; blank tile FightIntroBackMonEnd: -FightIntroFrontMon: - IF DEF(_RED) - INCBIN "gfx/red/intro_nido_1.2bpp" +FightIntroFrontMon: + INCBIN "gfx/intro/red_nidorino_1.2bpp" FightIntroFrontMon2: - INCBIN "gfx/red/intro_nido_2.2bpp" + INCBIN "gfx/intro/red_nidorino_2.2bpp" FightIntroFrontMon3: - INCBIN "gfx/red/intro_nido_3.2bpp" + INCBIN "gfx/intro/red_nidorino_3.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/intro_purin_1.2bpp" +FightIntroFrontMon: + INCBIN "gfx/intro/blue_jigglypuff_1.2bpp" FightIntroFrontMon2: - INCBIN "gfx/blue/intro_purin_2.2bpp" + INCBIN "gfx/intro/blue_jigglypuff_2.2bpp" FightIntroFrontMon3: - INCBIN "gfx/blue/intro_purin_3.2bpp" + INCBIN "gfx/intro/blue_jigglypuff_3.2bpp" ENDC FightIntroFrontMonEnd: - ds $10 ; blank tile + ds 16, $00 ; blank tile diff --git a/engine/clear_save.asm b/engine/movie/oak_speech/clear_save.asm old mode 100755 new mode 100644 similarity index 83% rename from engine/clear_save.asm rename to engine/movie/oak_speech/clear_save.asm index b47cd6c4..d5c04e6e --- a/engine/clear_save.asm +++ b/engine/movie/oak_speech/clear_save.asm @@ -5,7 +5,7 @@ DoClearSaveDialogue: call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText - coord hl, 14, 7 + hlcoord 14, 7 lb bc, 8, 15 ld a, NO_YES_MENU ld [wTwoOptionMenuID], a @@ -15,9 +15,9 @@ DoClearSaveDialogue: ld a, [wCurrentMenuItem] and a jp z, Init - callba ClearSAV + farcall ClearSAV jp Init ClearSaveDataText: - TX_FAR _ClearSaveDataText - db "@" + text_far _ClearSaveDataText + text_end diff --git a/engine/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm similarity index 89% rename from engine/init_player_data.asm rename to engine/movie/oak_speech/init_player_data.asm index c576e65a..53ca24f3 100644 --- a/engine/init_player_data.asm +++ b/engine/movie/oak_speech/init_player_data.asm @@ -2,11 +2,11 @@ InitPlayerData: InitPlayerData2: call Random - ld a, [hRandomSub] + ldh a, [hRandomSub] ld [wPlayerID], a call Random - ld a, [hRandomAdd] + ldh a, [hRandomAdd] ld [wPlayerID + 1], a ld a, $ff @@ -23,9 +23,9 @@ InitPlayerData2: START_MONEY EQU $3000 ld hl, wPlayerMoney + 1 - ld a, START_MONEY / $100 + ld a, HIGH(START_MONEY) ld [hld], a - xor a + xor a ; LOW(START_MONEY) ld [hli], a inc hl ld [hl], a diff --git a/engine/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm old mode 100755 new mode 100644 similarity index 81% rename from engine/oak_speech.asm rename to engine/movie/oak_speech/oak_speech.asm index 140749c8..a7515a4e --- a/engine/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -9,8 +9,8 @@ SetDefaultNames: ld bc, wBoxDataEnd - wPlayerName xor a call FillMemory - ld hl, wSpriteStateData1 - ld bc, $200 + ld hl, wSpriteDataStart + ld bc, wSpriteDataEnd - wSpriteDataStart xor a call FillMemory pop af @@ -32,8 +32,8 @@ SetDefaultNames: jp CopyData OakSpeech: - ld a, $FF - call PlaySound ; stop music + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld a, 0 ; BANK(Music_Routes2) ld c, a ld a, MUSIC_ROUTES2 @@ -52,12 +52,12 @@ OakSpeech: ld [wDestinationMap], a call SpecialWarpIn xor a - ld [hTilesetType], a + ldh [hTileAnimations], a ld a, [wd732] bit 1, a ; possibly a debug mode bit jp nz, .skipChoosingNames ld de, ProfOakPic - lb bc, Bank(ProfOakPic), $00 + lb bc, BANK(ProfOakPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl, OakSpeechText1 @@ -68,7 +68,7 @@ OakSpeech: ld [wd0b5], a ld [wcf91], a call GetMonHeader - coord hl, 6, 4 + hlcoord 6, 4 call LoadFlippedFrontSpriteByMonIndex call MovePicLeft ld hl, OakSpeechText2 @@ -76,7 +76,7 @@ OakSpeech: call GBFadeOutToWhite call ClearScreen ld de, RedPicFront - lb bc, Bank(RedPicFront), $00 + lb bc, BANK(RedPicFront), $00 call IntroDisplayPicCenteredOrUpperRight call MovePicLeft ld hl, IntroducePlayerText @@ -85,7 +85,7 @@ OakSpeech: call GBFadeOutToWhite call ClearScreen ld de, Rival1Pic - lb bc, Bank(Rival1Pic), $00 + lb bc, BANK(Rival1Pic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl, IntroduceRivalText @@ -95,7 +95,7 @@ OakSpeech: call GBFadeOutToWhite call ClearScreen ld de, RedPicFront - lb bc, Bank(RedPicFront), $00 + lb bc, BANK(RedPicFront), $00 call IntroDisplayPicCenteredOrUpperRight call GBFadeInFromWhite ld a, [wd72d] @@ -104,12 +104,12 @@ OakSpeech: ld hl, OakSpeechText3 call PrintText .next - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, SFX_SHRINK call PlaySound pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld c, 4 call DelayFrames @@ -126,22 +126,22 @@ OakSpeech: lb bc, BANK(ShrinkPic2), $00 call IntroDisplayPicCenteredOrUpperRight call ResetPlayerSpriteData - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, 0 ; BANK(Music_PalletTown) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, 10 ld [wAudioFadeOutControl], a - ld a, $FF + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a - call PlaySound ; stop music + call PlaySound pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld c, 20 call DelayFrames - coord hl, 6, 5 + hlcoord 6, 5 ld b, 7 ld c, 7 call ClearScreenArea @@ -153,29 +153,29 @@ OakSpeech: call GBFadeOutToWhite jp ClearScreen OakSpeechText1: - TX_FAR _OakSpeechText1 - db "@" + text_far _OakSpeechText1 + text_end OakSpeechText2: - TX_FAR _OakSpeechText2A - TX_CRY_NIDORINA - TX_FAR _OakSpeechText2B - db "@" + text_far _OakSpeechText2A + sound_cry_nidorina + text_far _OakSpeechText2B + text_end IntroducePlayerText: - TX_FAR _IntroducePlayerText - db "@" + text_far _IntroducePlayerText + text_end IntroduceRivalText: - TX_FAR _IntroduceRivalText - db "@" + text_far _IntroduceRivalText + text_end OakSpeechText3: - TX_FAR _OakSpeechText3 - db "@" + text_far _OakSpeechText3 + text_end FadeInIntroPic: ld hl, IntroFadePalettes ld b, 6 .next ld a, [hli] - ld [rBGP], a + ldh [rBGP], a ld c, 10 call DelayFrames dec b @@ -192,18 +192,18 @@ IntroFadePalettes: MovePicLeft: ld a, 119 - ld [rWX], a + ldh [rWX], a call DelayFrame ld a, %11100100 - ld [rBGP], a + ldh [rBGP], a .next call DelayFrame - ld a, [rWX] + ldh a, [rWX] sub 8 cp $FF ret z - ld [rWX], a + ldh [rWX], a jr .next DisplayPicCenteredOrUpperRight: @@ -224,10 +224,10 @@ IntroDisplayPicCenteredOrUpperRight: pop bc ld a, c and a - coord hl, 15, 1 + hlcoord 15, 1 jr nz, .next - coord hl, 6, 4 + hlcoord 6, 4 .next xor a - ld [hStartTileID], a + ldh [hStartTileID], a predef_jump CopyUncompressedPicToTilemap diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm new file mode 100644 index 00000000..28208ddc --- /dev/null +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -0,0 +1,219 @@ +ChoosePlayerName: + call OakSpeechSlidePicRight + ld de, DefaultNamesPlayer + call DisplayIntroNameTextBox + ld a, [wCurrentMenuItem] + and a + jr z, .customName + ld hl, DefaultNamesPlayerList + call GetDefaultName + ld de, wPlayerName + call OakSpeechSlidePicLeft + jr .done +.customName + ld hl, wPlayerName + xor a ; NAME_PLAYER_SCREEN + ld [wNamingScreenType], a + call DisplayNamingScreen + ld a, [wcf4b] + cp "@" + jr z, .customName + call ClearScreen + call Delay3 + ld de, RedPicFront + ld b, BANK(RedPicFront) + call IntroDisplayPicCenteredOrUpperRight +.done + ld hl, YourNameIsText + jp PrintText + +YourNameIsText: + text_far _YourNameIsText + text_end + +ChooseRivalName: + call OakSpeechSlidePicRight + ld de, DefaultNamesRival + call DisplayIntroNameTextBox + ld a, [wCurrentMenuItem] + and a + jr z, .customName + ld hl, DefaultNamesRivalList + call GetDefaultName + ld de, wRivalName + call OakSpeechSlidePicLeft + jr .done +.customName + ld hl, wRivalName + ld a, NAME_RIVAL_SCREEN + ld [wNamingScreenType], a + call DisplayNamingScreen + ld a, [wcf4b] + cp "@" + jr z, .customName + call ClearScreen + call Delay3 + ld de, Rival1Pic + ld b, $13 + call IntroDisplayPicCenteredOrUpperRight +.done + ld hl, HisNameIsText + jp PrintText + +HisNameIsText: + text_far _HisNameIsText + text_end + +OakSpeechSlidePicLeft: + push de + hlcoord 0, 0 + lb bc, 12, 11 + call ClearScreenArea ; clear the name list text box + ld c, 10 + call DelayFrames + pop de + ld hl, wcd6d + ld bc, NAME_LENGTH + call CopyData + call Delay3 + hlcoord 12, 4 + lb de, 6, 6 * SCREEN_WIDTH + 5 + ld a, $ff + jr OakSpeechSlidePicCommon + +OakSpeechSlidePicRight: + hlcoord 5, 4 + lb de, 6, 6 * SCREEN_WIDTH + 5 + xor a + +OakSpeechSlidePicCommon: + push hl + push de + push bc + ldh [hSlideDirection], a + ld a, d + ldh [hSlideAmount], a + ld a, e + ldh [hSlidingRegionSize], a + ld c, a + ldh a, [hSlideDirection] + and a + jr nz, .next +; If sliding right, point hl to the end of the pic's tiles. + ld d, 0 + add hl, de +.next + ld d, h + ld e, l +.loop + xor a + ldh [hAutoBGTransferEnabled], a + ldh a, [hSlideDirection] + and a + jr nz, .slideLeft +; sliding right + ld a, [hli] + ld [hld], a + dec hl + jr .next2 +.slideLeft + ld a, [hld] + ld [hli], a + inc hl +.next2 + dec c + jr nz, .loop + ldh a, [hSlideDirection] + and a + jr z, .next3 +; If sliding left, we need to zero the last tile in the pic (there is no need +; to take a corresponding action when sliding right because hl initially points +; to a 0 tile in that case). + xor a + dec hl + ld [hl], a +.next3 + ld a, 1 + ldh [hAutoBGTransferEnabled], a + call Delay3 + ldh a, [hSlidingRegionSize] + ld c, a + ld h, d + ld l, e + ldh a, [hSlideDirection] + and a + jr nz, .slideLeft2 + inc hl + jr .next4 +.slideLeft2 + dec hl +.next4 + ld d, h + ld e, l + ldh a, [hSlideAmount] + dec a + ldh [hSlideAmount], a + jr nz, .loop + pop bc + pop de + pop hl + ret + +DisplayIntroNameTextBox: + push de + hlcoord 0, 0 + ld b, $a + ld c, $9 + call TextBoxBorder + hlcoord 3, 0 + ld de, .namestring + call PlaceString + pop de + hlcoord 2, 2 + call PlaceString + call UpdateSprites + xor a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + inc a + ld [wTopMenuItemX], a + ld [wMenuWatchedKeys], a ; A_BUTTON + inc a + ld [wTopMenuItemY], a + inc a + ld [wMaxMenuItem], a + jp HandleMenuInput + +.namestring + db "NAME@" + +INCLUDE "data/player_names.asm" + +GetDefaultName: +; a = name index +; hl = name list + ld b, a + ld c, 0 +.loop + ld d, h + ld e, l +.innerLoop + ld a, [hli] + cp "@" + jr nz, .innerLoop + ld a, b + cp c + jr z, .foundName + inc c + jr .loop +.foundName + ld h, d + ld l, e + ld de, wcd6d + ld bc, $14 + jp CopyData + +INCLUDE "data/player_names_list.asm" + +LinkMenuEmptyText: + text_end diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm new file mode 100644 index 00000000..eede8ccb --- /dev/null +++ b/engine/movie/splash.asm @@ -0,0 +1,239 @@ +LoadShootingStarGraphics: + ld a, $f9 + ldh [rOBP0], a + ld a, $a4 + ldh [rOBP1], a + ld de, AnimationTileset2 tile 3 ; star tile (top left quadrant) + ld hl, vChars1 tile $20 + lb bc, BANK(AnimationTileset2), 1 + call CopyVideoData + ld de, AnimationTileset2 tile 19 ; star tile (bottom left quadrant) + ld hl, vChars1 tile $21 + lb bc, BANK(AnimationTileset2), 1 + call CopyVideoData + ld de, FallingStar + ld hl, vChars1 tile $22 + lb bc, BANK(FallingStar), (FallingStarEnd - FallingStar) / $10 + call CopyVideoData + ld hl, GameFreakLogoOAMData + ld de, wOAMBuffer + $60 + ld bc, GameFreakLogoOAMDataEnd - GameFreakLogoOAMData + call CopyData + ld hl, GameFreakShootingStarOAMData + ld de, wOAMBuffer + ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData + jp CopyData + +AnimateShootingStar: + call LoadShootingStarGraphics + ld a, SFX_SHOOTING_STAR + call PlaySound + +; Move the big star down and left across the screen. + ld hl, wOAMBuffer + lb bc, $a0, $4 +.bigStarLoop + push hl + push bc +.bigStarInnerLoop + ld a, [hl] ; Y + add 4 + ld [hli], a + ld a, [hl] ; X + add -4 + ld [hli], a + inc hl + inc hl + dec c + jr nz, .bigStarInnerLoop + ld c, 1 + call CheckForUserInterruption + pop bc + pop hl + ret c + ld a, [hl] + cp 80 + jr nz, .next + jr .bigStarLoop +.next + cp b + jr nz, .bigStarLoop + +; Clear big star OAM. + ld hl, wOAMBuffer + ld c, 4 + ld de, 4 +.clearOAMLoop + ld [hl], 160 + add hl, de + dec c + jr nz, .clearOAMLoop + +; Make Gamefreak logo flash. + ld b, 3 +.flashLogoLoop + ld hl, rOBP0 + rrc [hl] + rrc [hl] + ld c, 10 + call CheckForUserInterruption + ret c + dec b + jr nz, .flashLogoLoop + +; Copy 24 instances of the small stars OAM data. +; Note that their coordinates put them off-screen. + ld de, wOAMBuffer + ld a, 24 +.initSmallStarsOAMLoop + push af + ld hl, SmallStarsOAM + ld bc, SmallStarsOAMEnd - SmallStarsOAM + call CopyData + pop af + dec a + jr nz, .initSmallStarsOAMLoop + +; Animate the small stars falling from the Gamefreak logo. + xor a + ld [wMoveDownSmallStarsOAMCount], a + ld hl, SmallStarsWaveCoordsPointerTable + ld c, 6 +.smallStarsLoop + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + push bc + push hl + ld hl, wOAMBuffer + $50 + ld c, 4 +.smallStarsInnerLoop ; introduce new wave of 4 small stars OAM entries + ld a, [de] + cp -1 + jr z, .next2 + ld [hli], a ; Y + inc de + ld a, [de] + ld [hli], a ; X + inc de + inc hl + inc hl + dec c + jr nz, .smallStarsInnerLoop + ld a, [wMoveDownSmallStarsOAMCount] + cp 24 + jr z, .next2 + add 6 ; should be 4, but the extra 2 aren't visible on screen + ld [wMoveDownSmallStarsOAMCount], a +.next2 + call MoveDownSmallStars + push af + +; shift the existing OAM entries down to make room for the next wave + ld hl, wOAMBuffer + $10 + ld de, wOAMBuffer + ld bc, $50 + call CopyData + + pop af + pop hl + pop bc + ret c + dec c + jr nz, .smallStarsLoop + and a + ret + +SmallStarsOAM: + dbsprite 0, 0, 0, 0, $A2, OAM_BEHIND_BG | OAM_OBP1 +SmallStarsOAMEnd: + +SmallStarsWaveCoordsPointerTable: + dw SmallStarsWave1Coords + dw SmallStarsWave2Coords + dw SmallStarsWave3Coords + dw SmallStarsWave4Coords + dw SmallStarsEmptyWave + dw SmallStarsEmptyWave + +; The stars that fall from the Gamefreak logo come in 4 waves of 4 OAM entries. +; These arrays contain the Y and X coordinates of each OAM entry. + +SmallStarsWave1Coords: + db $68, $30 + db $68, $40 + db $68, $58 + db $68, $78 +SmallStarsWave2Coords: + db $68, $38 + db $68, $48 + db $68, $60 + db $68, $70 +SmallStarsWave3Coords: + db $68, $34 + db $68, $4C + db $68, $54 + db $68, $64 +SmallStarsWave4Coords: + db $68, $3C + db $68, $5C + db $68, $6C + db $68, $74 +SmallStarsEmptyWave: + db -1 ; end + +MoveDownSmallStars: + ld b, 8 +.loop + ld hl, wOAMBuffer + $5c + ld a, [wMoveDownSmallStarsOAMCount] + ld de, -4 + ld c, a +.innerLoop + inc [hl] ; Y + add hl, de + dec c + jr nz, .innerLoop +; Toggle the palette so that the lower star in the small stars tile blinks in +; and out. + ldh a, [rOBP1] + xor %10100000 + ldh [rOBP1], a + + ld c, 3 + call CheckForUserInterruption + ret c + dec b + jr nz, .loop + ret + +GameFreakLogoOAMData: + dbsprite 10, 9, 0, 0, $8d, 0 + dbsprite 11, 9, 0, 0, $8e, 0 + dbsprite 10, 10, 0, 0, $8f, 0 + dbsprite 11, 10, 0, 0, $90, 0 + dbsprite 10, 11, 0, 0, $91, 0 + dbsprite 11, 11, 0, 0, $92, 0 + dbsprite 6, 12, 0, 0, $80, 0 + dbsprite 7, 12, 0, 0, $81, 0 + dbsprite 8, 12, 0, 0, $82, 0 + dbsprite 9, 12, 0, 0, $83, 0 + dbsprite 10, 12, 0, 0, $93, 0 + dbsprite 11, 12, 0, 0, $84, 0 + dbsprite 12, 12, 0, 0, $85, 0 + dbsprite 13, 12, 0, 0, $83, 0 + dbsprite 14, 12, 0, 0, $81, 0 + dbsprite 15, 12, 0, 0, $86, 0 +GameFreakLogoOAMDataEnd: + +GameFreakShootingStarOAMData: + dbsprite 20, 0, 0, 0, $a0, OAM_OBP1 + dbsprite 21, 0, 0, 0, $a0, OAM_OBP1 | OAM_HFLIP + dbsprite 20, 1, 0, 0, $a1, OAM_OBP1 + dbsprite 21, 1, 0, 0, $a1, OAM_OBP1 | OAM_HFLIP +GameFreakShootingStarOAMDataEnd: + +FallingStar: + INCBIN "gfx/splash/falling_star.2bpp" +FallingStarEnd: diff --git a/engine/movie/title.asm b/engine/movie/title.asm new file mode 100644 index 00000000..a544895f --- /dev/null +++ b/engine/movie/title.asm @@ -0,0 +1,412 @@ +; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...) +CopyFixedLengthText: + ld bc, NAME_LENGTH + jp CopyData + +SetDefaultNamesBeforeTitlescreen:: + ld hl, NintenText + ld de, wPlayerName + call CopyFixedLengthText + ld hl, SonyText + ld de, wRivalName + call CopyFixedLengthText + xor a + ldh [hWY], a + ld [wLetterPrintingDelayFlags], a + ld hl, wd732 + ld [hli], a + ld [hli], a + ld [hl], a + ld a, 0 ; BANK(Music_TitleScreen) + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a + +DisplayTitleScreen: + call GBPalWhiteOut + ld a, $1 + ldh [hAutoBGTransferEnabled], a + xor a + ldh [hTileAnimations], a + ldh [hSCX], a + ld a, $40 + ldh [hSCY], a + ld a, $90 + ldh [hWY], a + call ClearScreen + call DisableLCD + call LoadFontTilePatterns + ld hl, NintendoCopyrightLogoGraphics + ld de, vTitleLogo2 tile 16 + ld bc, 5 tiles + ld a, BANK(NintendoCopyrightLogoGraphics) + call FarCopyData2 + ld hl, GamefreakLogoGraphics + ld de, vTitleLogo2 tile (16 + 5) + ld bc, 9 tiles + ld a, BANK(GamefreakLogoGraphics) + call FarCopyData2 + ld hl, PokemonLogoGraphics + ld de, vTitleLogo + ld bc, $60 tiles + ld a, BANK(PokemonLogoGraphics) + call FarCopyData2 ; first chunk + ld hl, PokemonLogoGraphics tile $60 + ld de, vTitleLogo2 + ld bc, $10 tiles + ld a, BANK(PokemonLogoGraphics) + call FarCopyData2 ; second chunk + ld hl, Version_GFX + ld de, vChars2 tile $60 + (10 tiles - (Version_GFXEnd - Version_GFX) * 2) / 2 + ld bc, Version_GFXEnd - Version_GFX + ld a, BANK(Version_GFX) + call FarCopyDataDouble + call ClearBothBGMaps + +; place tiles for pokemon logo (except for the last row) + hlcoord 2, 1 + ld a, $80 + ld de, SCREEN_WIDTH + ld c, 6 +.pokemonLogoTileLoop + ld b, $10 + push hl +.pokemonLogoTileRowLoop ; place tiles for one row + ld [hli], a + inc a + dec b + jr nz, .pokemonLogoTileRowLoop + pop hl + add hl, de + dec c + jr nz, .pokemonLogoTileLoop + +; place tiles for the last row of the pokemon logo + hlcoord 2, 7 + ld a, $31 + ld b, $10 +.pokemonLogoLastTileRowLoop + ld [hli], a + inc a + dec b + jr nz, .pokemonLogoLastTileRowLoop + + call DrawPlayerCharacter + +; put a pokeball in the player's hand + ld hl, wOAMBuffer + $28 + ld a, $74 + ld [hl], a + +; place tiles for title screen copyright + hlcoord 2, 17 + ld de, .tileScreenCopyrightTiles + ld b, $10 +.tileScreenCopyrightTilesLoop + ld a, [de] + ld [hli], a + inc de + dec b + jr nz, .tileScreenCopyrightTilesLoop + + jr .next + +.tileScreenCopyrightTiles + db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc. + +.next + call SaveScreenTilesToBuffer2 + call LoadScreenTilesFromBuffer2 + call EnableLCD + +IF DEF(_RED) + ld a, STARTER1 ; which Pokemon to show first on the title screen +ENDC +IF DEF(_BLUE) + ld a, STARTER2 ; which Pokemon to show first on the title screen +ENDC + ld [wTitleMonSpecies], a + call LoadTitleMonSprite + + ld a, HIGH(vBGMap0 + $300) + call TitleScreenCopyTileMapToVRAM + call SaveScreenTilesToBuffer1 + ld a, $40 + ldh [hWY], a + call LoadScreenTilesFromBuffer2 + ld a, HIGH(vBGMap0) + call TitleScreenCopyTileMapToVRAM + ld b, SET_PAL_TITLE_SCREEN + call RunPaletteCommand + call GBPalNormal + ld a, %11100100 + ldh [rOBP0], a + +; make pokemon logo bounce up and down + ld bc, hSCY ; background scroll Y + ld hl, .TitleScreenPokemonLogoYScrolls +.bouncePokemonLogoLoop + ld a, [hli] + and a + jr z, .finishedBouncingPokemonLogo + ld d, a + cp -3 + jr nz, .skipPlayingSound + ld a, SFX_INTRO_CRASH + call PlaySound +.skipPlayingSound + ld a, [hli] + ld e, a + call .ScrollTitleScreenPokemonLogo + jr .bouncePokemonLogoLoop + +.TitleScreenPokemonLogoYScrolls: +; Controls the bouncing effect of the Pokemon logo on the title screen + db -4,16 ; y scroll amount, number of times to scroll + db 3,4 + db -3,4 + db 2,2 + db -2,2 + db 1,2 + db -1,2 + db 0 ; terminate list with 0 + +.ScrollTitleScreenPokemonLogo: +; Scrolls the Pokemon logo on the title screen to create the bouncing effect +; Scrolls d pixels e times + call DelayFrame + ld a, [bc] ; background scroll Y + add d + ld [bc], a + dec e + jr nz, .ScrollTitleScreenPokemonLogo + ret + +.finishedBouncingPokemonLogo + xor a + ldh [hSCY], a + + call LoadScreenTilesFromBuffer1 + ld c, 36 + call DelayFrames + ld a, SFX_INTRO_WHOOSH + call PlaySound + +; scroll game version in from the right + call PrintGameVersionOnTitleScreen + ld a, SCREEN_HEIGHT_PX + ldh [hWY], a + ld d, 144 +.scrollTitleScreenGameVersionLoop + ld h, d + ld l, 64 + call ScrollTitleScreenGameVersion + ld h, 0 + ld l, 80 + call ScrollTitleScreenGameVersion + ld a, d + add 4 + ld d, a + and a + jr nz, .scrollTitleScreenGameVersionLoop + + ld a, HIGH(vBGMap1) + call TitleScreenCopyTileMapToVRAM + call LoadScreenTilesFromBuffer2 + call PrintGameVersionOnTitleScreen + call Delay3 + call WaitForSoundToFinish + ld a, MUSIC_TITLE_SCREEN + ld [wNewSoundID], a + call PlayMusic + xor a + ld [wUnusedCC5B], a + +; Keep scrolling in new mons indefinitely until the user performs input. +.awaitUserInterruptionLoop + ld c, 200 + call CheckForUserInterruption + jr c, .finishedWaiting + call TitleScreenScrollInMon + ld c, 1 + call CheckForUserInterruption + jr c, .finishedWaiting + farcall TitleScreenAnimateBallIfStarterOut + call TitleScreenPickNewMon + jr .awaitUserInterruptionLoop + +.finishedWaiting + ld a, [wTitleMonSpecies] + call PlayCry + call WaitForSoundToFinish + call GBPalWhiteOutWithDelay3 + call ClearSprites + xor a + ldh [hWY], a + inc a + ldh [hAutoBGTransferEnabled], a + call ClearScreen + ld a, HIGH(vBGMap0) + call TitleScreenCopyTileMapToVRAM + ld a, HIGH(vBGMap1) + call TitleScreenCopyTileMapToVRAM + call Delay3 + call LoadGBPal + ldh a, [hJoyHeld] + ld b, a + and D_UP | SELECT | B_BUTTON + cp D_UP | SELECT | B_BUTTON + jp z, .doClearSaveDialogue +IF DEF(_DEBUG) + ld a, b + bit BIT_SELECT, a + jp nz, DebugMenu +ENDC + jp MainMenu + +.doClearSaveDialogue + farjp DoClearSaveDialogue + +TitleScreenPickNewMon: + ld a, HIGH(vBGMap0) + call TitleScreenCopyTileMapToVRAM + +.loop +; Keep looping until a mon different from the current one is picked. + call Random + and $f + ld c, a + ld b, 0 + ld hl, TitleMons + add hl, bc + ld a, [hl] + ld hl, wTitleMonSpecies + +; Can't be the same as before. + cp [hl] + jr z, .loop + + ld [hl], a + call LoadTitleMonSprite + + ld a, $90 + ldh [hWY], a + ld d, 1 ; scroll out + farcall TitleScroll + ret + +TitleScreenScrollInMon: + ld d, 0 ; scroll in + farcall TitleScroll + xor a + ldh [hWY], a + ret + +ScrollTitleScreenGameVersion: +.wait + ldh a, [rLY] + cp l + jr nz, .wait + + ld a, h + ldh [rSCX], a + +.wait2 + ldh a, [rLY] + cp h + jr z, .wait2 + ret + +DrawPlayerCharacter: + ld hl, PlayerCharacterTitleGraphics + ld de, vSprites + ld bc, PlayerCharacterTitleGraphicsEnd - PlayerCharacterTitleGraphics + ld a, BANK(PlayerCharacterTitleGraphics) + call FarCopyData2 + call ClearSprites + xor a + ld [wPlayerCharacterOAMTile], a + ld hl, wOAMBuffer + lb de, $60, $5a + ld b, 7 +.loop + push de + ld c, 5 +.innerLoop + ld a, d + ld [hli], a ; Y + ld a, e + ld [hli], a ; X + add 8 + ld e, a + ld a, [wPlayerCharacterOAMTile] + ld [hli], a ; tile + inc a + ld [wPlayerCharacterOAMTile], a + inc hl + dec c + jr nz, .innerLoop + pop de + ld a, 8 + add d + ld d, a + dec b + jr nz, .loop + ret + +ClearBothBGMaps: + ld hl, vBGMap0 + ld bc, $400 * 2 + ld a, " " + jp FillMemory + +LoadTitleMonSprite: + ld [wcf91], a + ld [wd0b5], a + hlcoord 5, 10 + call GetMonHeader + jp LoadFrontSpriteByMonIndex + +TitleScreenCopyTileMapToVRAM: + ldh [hAutoBGTransferDest + 1], a + jp Delay3 + +LoadCopyrightAndTextBoxTiles: + xor a + ldh [hWY], a + call ClearScreen + call LoadTextBoxTilePatterns + +LoadCopyrightTiles: + ld de, NintendoCopyrightLogoGraphics + ld hl, vChars2 tile $60 + lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10 + call CopyVideoData + hlcoord 2, 7 + ld de, CopyrightTextString + jp PlaceString + +CopyrightTextString: + db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©'95.'96.'98 Nintendo + next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©'95.'96.'98 Creatures inc. + next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc. + db "@" + +INCLUDE "data/pokemon/title_mons.asm" + +; prints version text (red, blue) +PrintGameVersionOnTitleScreen: + hlcoord 7, 8 + ld de, VersionOnTitleScreenText + jp PlaceString + +; these point to special tiles specifically loaded for that purpose and are not usual text +VersionOnTitleScreenText: +IF DEF(_RED) + db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" +ENDC +IF DEF(_BLUE) + db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" +ENDC + +NintenText: db "NINTEN@" +SonyText: db "SONY@" diff --git a/engine/movie/title2.asm b/engine/movie/title2.asm new file mode 100644 index 00000000..315cf6b5 --- /dev/null +++ b/engine/movie/title2.asm @@ -0,0 +1,120 @@ +TitleScroll_WaitBall: +; Wait around for the TitleBall animation to play out. +; hi: speed +; lo: duration + db $05, $05, 0 + +TitleScroll_In: +; Scroll a TitleMon in from the right. +; hi: speed +; lo: duration + db $a2, $94, $84, $63, $52, $31, $11, 0 + +TitleScroll_Out: +; Scroll a TitleMon out to the left. +; hi: speed +; lo: duration + db $12, $22, $32, $42, $52, $62, $83, $93, 0 + +TitleScroll: + ld a, d + + ld bc, TitleScroll_In + ld d, $88 + ld e, 0 ; don't animate titleball + + and a + jr nz, .ok + + ld bc, TitleScroll_Out + ld d, $00 + ld e, 0 ; don't animate titleball +.ok + +_TitleScroll: + ld a, [bc] + and a + ret z + + inc bc + push bc + + ld b, a + and $f + ld c, a + ld a, b + and $f0 + swap a + ld b, a + +.loop + ld h, d + ld l, $48 + call .ScrollBetween + + ld h, $00 + ld l, $88 + call .ScrollBetween + + ld a, d + add b + ld d, a + + call GetTitleBallY + dec c + jr nz, .loop + + pop bc + jr _TitleScroll + +.ScrollBetween: +.wait + ldh a, [rLY] ; rLY + cp l + jr nz, .wait + + ld a, h + ldh [rSCX], a + +.wait2 + ldh a, [rLY] ; rLY + cp h + jr z, .wait2 + ret + +TitleBallYTable: +; OBJ y-positions for the Poke Ball held by Red in the title screen. +; This is really two 0-terminated lists. Initiated with an index of 1. + db 0, $71, $6f, $6e, $6d, $6c, $6d, $6e, $6f, $71, $74, 0 + +TitleScreenAnimateBallIfStarterOut: +; Animate the TitleBall if a starter just got scrolled out. + ld a, [wTitleMonSpecies] + cp STARTER1 + jr z, .ok + cp STARTER2 + jr z, .ok + cp STARTER3 + ret nz +.ok + ld e, 1 ; animate titleball + ld bc, TitleScroll_WaitBall + ld d, 0 + jp _TitleScroll + +GetTitleBallY: +; Get position e from TitleBallYTable + push de + push hl + xor a + ld d, a + ld hl, TitleBallYTable + add hl, de + ld a, [hl] + pop hl + pop de + and a + ret z + ld [wOAMBuffer + $28], a + inc e + ret diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm new file mode 100644 index 00000000..bb06f231 --- /dev/null +++ b/engine/movie/trade.asm @@ -0,0 +1,855 @@ +InternalClockTradeAnim: +; Do the trading animation with the player's gameboy on the left. +; In-game trades and internally clocked link cable trades use this. + ld a, [wTradedPlayerMonSpecies] + ld [wLeftGBMonSpecies], a + ld a, [wTradedEnemyMonSpecies] + ld [wRightGBMonSpecies], a + ld de, InternalClockTradeFuncSequence + jr TradeAnimCommon + +ExternalClockTradeAnim: +; Do the trading animation with the player's gameboy on the right. +; Externally clocked link cable trades use this. + ld a, [wTradedEnemyMonSpecies] + ld [wLeftGBMonSpecies], a + ld a, [wTradedPlayerMonSpecies] + ld [wRightGBMonSpecies], a + ld de, ExternalClockTradeFuncSequence + +TradeAnimCommon: + ld a, [wOptions] + push af + ldh a, [hSCY] + push af + ldh a, [hSCX] + push af + xor a + ld [wOptions], a + ldh [hSCY], a + ldh [hSCX], a + push de +.loop + pop de + ld a, [de] + cp $ff + jr z, .done + inc de + push de + ld hl, TradeFuncPointerTable + add a + ld c, a + ld b, $0 + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, .loop + push de + jp hl ; call trade func, which will return to the top of the loop +.done + pop af + ldh [hSCX], a + pop af + ldh [hSCY], a + pop af + ld [wOptions], a + ret + +addtradefunc: MACRO +\1TradeFunc:: + dw \1 +ENDM + +tradefunc: MACRO + db (\1TradeFunc - TradeFuncPointerTable) / 2 +ENDM + +; The functions in the sequences below are executed in order by TradeFuncCommon. +; They are from opposite perspectives. The external clock one makes use of +; Trade_SwapNames to swap the player and enemy names for some functions. + +InternalClockTradeFuncSequence: + tradefunc LoadTradingGFXAndMonNames + tradefunc Trade_ShowPlayerMon + tradefunc Trade_DrawOpenEndOfLinkCable + tradefunc Trade_AnimateBallEnteringLinkCable + tradefunc Trade_AnimLeftToRight + tradefunc Trade_Delay100 + tradefunc Trade_ShowClearedWindow + tradefunc PrintTradeWentToText + tradefunc PrintTradeForSendsText + tradefunc PrintTradeFarewellText + tradefunc Trade_AnimRightToLeft + tradefunc Trade_ShowClearedWindow + tradefunc Trade_DrawOpenEndOfLinkCable + tradefunc Trade_ShowEnemyMon + tradefunc Trade_Delay100 + tradefunc Trade_Cleanup + db -1 ; end + +ExternalClockTradeFuncSequence: + tradefunc LoadTradingGFXAndMonNames + tradefunc Trade_ShowClearedWindow + tradefunc PrintTradeWillTradeText + tradefunc PrintTradeFarewellText + tradefunc Trade_SwapNames + tradefunc Trade_AnimLeftToRight + tradefunc Trade_SwapNames + tradefunc Trade_ShowClearedWindow + tradefunc Trade_DrawOpenEndOfLinkCable + tradefunc Trade_ShowEnemyMon + tradefunc Trade_SlideTextBoxOffScreen + tradefunc Trade_ShowPlayerMon + tradefunc Trade_DrawOpenEndOfLinkCable + tradefunc Trade_AnimateBallEnteringLinkCable + tradefunc Trade_SwapNames + tradefunc Trade_AnimRightToLeft + tradefunc Trade_SwapNames + tradefunc Trade_Delay100 + tradefunc Trade_ShowClearedWindow + tradefunc PrintTradeWentToText + tradefunc Trade_Cleanup + db -1 ; end + +TradeFuncPointerTable: + addtradefunc LoadTradingGFXAndMonNames + addtradefunc Trade_ShowPlayerMon + addtradefunc Trade_DrawOpenEndOfLinkCable + addtradefunc Trade_AnimateBallEnteringLinkCable + addtradefunc Trade_ShowEnemyMon + addtradefunc Trade_AnimLeftToRight + addtradefunc Trade_AnimRightToLeft + addtradefunc Trade_Delay100 + addtradefunc Trade_ShowClearedWindow + addtradefunc PrintTradeWentToText + addtradefunc PrintTradeForSendsText + addtradefunc PrintTradeFarewellText + addtradefunc PrintTradeTakeCareText + addtradefunc PrintTradeWillTradeText + addtradefunc Trade_Cleanup + addtradefunc Trade_SlideTextBoxOffScreen + addtradefunc Trade_SwapNames + +Trade_Delay100: + ld c, 100 + jp DelayFrames + +Trade_CopyTileMapToVRAM: + ld a, $1 + ldh [hAutoBGTransferEnabled], a + call Delay3 + xor a + ldh [hAutoBGTransferEnabled], a + ret + +Trade_Delay80: + ld c, 80 + jp DelayFrames + +Trade_ClearTileMap: + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + ld a, " " + jp FillMemory + +LoadTradingGFXAndMonNames: + call Trade_ClearTileMap + call DisableLCD + ld hl, TradingAnimationGraphics + ld de, vChars2 tile $31 + ld bc, TradingAnimationGraphicsEnd - TradingAnimationGraphics + ld a, BANK(TradingAnimationGraphics) + call FarCopyData2 + ld hl, TradingAnimationGraphics2 + ld de, vSprites tile $7c + ld bc, TradingAnimationGraphics2End - TradingAnimationGraphics2 + ld a, BANK(TradingAnimationGraphics2) + call FarCopyData2 + ld hl, vBGMap0 + ld bc, $800 + ld a, " " + call FillMemory + call ClearSprites + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld hl, wd730 + set 6, [hl] ; turn on instant text printing + ld a, [wOnSGB] + and a + ld a, $e4 ; non-SGB OBP0 + jr z, .next + ld a, $f0 ; SGB OBP0 +.next + ldh [rOBP0], a + call EnableLCD + xor a + ldh [hAutoBGTransferEnabled], a + ld a, [wTradedPlayerMonSpecies] + ld [wd11e], a + call GetMonName + ld hl, wcd6d + ld de, wcf4b + ld bc, NAME_LENGTH + call CopyData + ld a, [wTradedEnemyMonSpecies] + ld [wd11e], a + jp GetMonName + +Trade_LoadMonPartySpriteGfx: + ld a, %11010000 + ldh [rOBP1], a + farjp LoadMonPartySpriteGfx + +Trade_SwapNames: + ld hl, wPlayerName + ld de, wBuffer + ld bc, NAME_LENGTH + call CopyData + ld hl, wLinkEnemyTrainerName + ld de, wPlayerName + ld bc, NAME_LENGTH + call CopyData + ld hl, wBuffer + ld de, wLinkEnemyTrainerName + ld bc, NAME_LENGTH + jp CopyData + +Trade_Cleanup: + xor a + call LoadGBPal + ld hl, wd730 + res 6, [hl] ; turn off instant text printing + ret + +Trade_ShowPlayerMon: + ld a, %10101011 + ldh [rLCDC], a + ld a, $50 + ldh [hWY], a + ld a, $86 + ldh [rWX], a + ldh [hSCX], a + xor a + ldh [hAutoBGTransferEnabled], a + hlcoord 4, 0 + ld b, 6 + ld c, 10 + call TextBoxBorder + call Trade_PrintPlayerMonInfoText + ld b, HIGH(vBGMap0) + call CopyScreenTileBufferToVRAM + call ClearScreen + ld a, [wTradedPlayerMonSpecies] + call Trade_LoadMonSprite + ld a, $7e +.slideScreenLoop + push af + call DelayFrame + pop af + ldh [rWX], a + ldh [hSCX], a + dec a + dec a + and a + jr nz, .slideScreenLoop + call Trade_Delay80 + ld a, TRADE_BALL_POOF_ANIM + call Trade_ShowAnimation + ld a, TRADE_BALL_DROP_ANIM + call Trade_ShowAnimation ; clears mon pic + ld a, [wTradedPlayerMonSpecies] + call PlayCry + xor a + ldh [hAutoBGTransferEnabled], a + ret + +Trade_DrawOpenEndOfLinkCable: + call Trade_ClearTileMap + ld b, HIGH(vBGMap0) + call CopyScreenTileBufferToVRAM + ld b, SET_PAL_GENERIC + call RunPaletteCommand + +; This function call is pointless. It just copies blank tiles to VRAM that was +; already filled with blank tiles. + ld hl, vBGMap1 + $8c + call Trade_CopyCableTilesOffScreen + + ld a, $a0 + ldh [hSCX], a + call DelayFrame + ld a, %10001011 + ldh [rLCDC], a + hlcoord 6, 2 + ld b, TILEMAP_LINK_CABLE + call CopyTileIDsFromList_ZeroBaseTileID + call Trade_CopyTileMapToVRAM + ld a, SFX_HEAL_HP + call PlaySound + ld c, 20 +.loop + ldh a, [hSCX] + add 4 + ldh [hSCX], a + dec c + jr nz, .loop + ret + +Trade_AnimateBallEnteringLinkCable: + ld a, TRADE_BALL_SHAKE_ANIM + call Trade_ShowAnimation + ld c, 10 + call DelayFrames + ld a, %11100100 + ldh [rOBP0], a + xor a + ld [wLinkCableAnimBulgeToggle], a + lb bc, $20, $60 +.moveBallInsideLinkCableLoop + push bc + xor a + ld de, Trade_BallInsideLinkCableOAM + call WriteOAMBlock + ld a, [wLinkCableAnimBulgeToggle] + xor $1 + ld [wLinkCableAnimBulgeToggle], a + add $7e + ld hl, wOAMBuffer + $02 + ld de, 4 + ld c, e +.cycleLinkCableBulgeTile + ld [hl], a + add hl, de + dec c + jr nz, .cycleLinkCableBulgeTile + call Delay3 + pop bc + ld a, c + add $4 + ld c, a + cp $a0 + jr nc, .ballSpriteReachedEdgeOfScreen + ld a, SFX_TINK + call PlaySound + jr .moveBallInsideLinkCableLoop +.ballSpriteReachedEdgeOfScreen + call ClearSprites + ld a, $1 + ldh [hAutoBGTransferEnabled], a + call ClearScreen + ld b, $98 + call CopyScreenTileBufferToVRAM + call Delay3 + xor a + ldh [hAutoBGTransferEnabled], a + ret + +Trade_BallInsideLinkCableOAM: + dbsprite 0, 15, 0, 6, $7e, OAM_HFLIP + dbsprite 8, 15, 0, 6, $7e, OAM_HFLIP | OAM_VFLIP + +Trade_ShowEnemyMon: + ld a, TRADE_BALL_TILT_ANIM + call Trade_ShowAnimation + call Trade_ShowClearedWindow + hlcoord 4, 10 + ld b, 6 + ld c, 10 + call TextBoxBorder + call Trade_PrintEnemyMonInfoText + call Trade_CopyTileMapToVRAM + ld a, $1 + ldh [hAutoBGTransferEnabled], a + ld a, [wTradedEnemyMonSpecies] + call Trade_LoadMonSprite + ld a, TRADE_BALL_POOF_ANIM + call Trade_ShowAnimation + ld a, $1 + ldh [hAutoBGTransferEnabled], a + ld a, [wTradedEnemyMonSpecies] + call PlayCry + call Trade_Delay100 + hlcoord 4, 10 + lb bc, 8, 12 + call ClearScreenArea + jp PrintTradeTakeCareText + +Trade_AnimLeftToRight: +; Animates the mon moving from the left GB to the right one. + call Trade_InitGameboyTransferGfx + ld a, $1 + ld [wTradedMonMovingRight], a + ld a, %11100100 + ldh [rOBP0], a + ld a, $54 + ld [wBaseCoordX], a + ld a, $1c + ld [wBaseCoordY], a + ld a, [wLeftGBMonSpecies] + ld [wMonPartySpriteSpecies], a + call Trade_WriteCircledMonOAM + call Trade_DrawLeftGameboy + call Trade_CopyTileMapToVRAM + call Trade_DrawCableAcrossScreen + ld hl, vBGMap1 + $8c + call Trade_CopyCableTilesOffScreen + ld b, $6 + call Trade_AnimMonMoveHorizontal + ld a, $1 + ldh [hAutoBGTransferEnabled], a + call Trade_DrawCableAcrossScreen + ld b, $4 + call Trade_AnimMonMoveHorizontal + call Trade_DrawRightGameboy + ld b, $6 + call Trade_AnimMonMoveHorizontal + xor a + ldh [hAutoBGTransferEnabled], a + call Trade_AnimMonMoveVertical + jp ClearSprites + +Trade_AnimRightToLeft: +; Animates the mon moving from the right GB to the left one. + call Trade_InitGameboyTransferGfx + xor a + ld [wTradedMonMovingRight], a + ld a, $64 + ld [wBaseCoordX], a + ld a, $44 + ld [wBaseCoordY], a + ld a, [wRightGBMonSpecies] + ld [wMonPartySpriteSpecies], a + call Trade_WriteCircledMonOAM + call Trade_DrawRightGameboy + call Trade_CopyTileMapToVRAM + call Trade_DrawCableAcrossScreen + ld hl, vBGMap1 + $94 + call Trade_CopyCableTilesOffScreen + call Trade_AnimMonMoveVertical + ld b, $6 + call Trade_AnimMonMoveHorizontal + ld a, $1 + ldh [hAutoBGTransferEnabled], a + call Trade_DrawCableAcrossScreen + ld b, $4 + call Trade_AnimMonMoveHorizontal + call Trade_DrawLeftGameboy + ld b, $6 + call Trade_AnimMonMoveHorizontal + xor a + ldh [hAutoBGTransferEnabled], a + jp ClearSprites + +Trade_InitGameboyTransferGfx: +; Initialises the graphics for showing a mon moving between gameboys. + ld a, $1 + ldh [hAutoBGTransferEnabled], a + call ClearScreen + xor a + ldh [hAutoBGTransferEnabled], a + call Trade_LoadMonPartySpriteGfx + call DelayFrame + ld a, %10101011 + ldh [rLCDC], a + xor a + ldh [hSCX], a + ld a, $90 + ldh [hWY], a + ret + +Trade_DrawLeftGameboy: + call Trade_ClearTileMap + +; draw link cable + hlcoord 11, 4 + ld a, $5d + ld [hli], a + ld a, $5e + ld c, 8 +.loop + ld [hli], a + dec c + jr nz, .loop + +; draw gameboy pic + hlcoord 5, 3 + ld b, TILEMAP_GAME_BOY + call CopyTileIDsFromList_ZeroBaseTileID + +; draw text box with player name below gameboy pic + hlcoord 4, 12 + ld b, 2 + ld c, 7 + call TextBoxBorder + hlcoord 5, 14 + ld de, wPlayerName + call PlaceString + + jp DelayFrame + +Trade_DrawRightGameboy: + call Trade_ClearTileMap + +; draw horizontal segment of link cable + hlcoord 0, 4 + ld a, $5e + ld c, $e +.loop + ld [hli], a + dec c + jr nz, .loop + +; draw vertical segment of link cable + ld a, $5f + ld [hl], a + ld de, SCREEN_WIDTH + add hl, de + ld a, $61 + ld [hl], a + add hl, de + ld [hl], a + add hl, de + ld [hl], a + add hl, de + ld [hl], a + add hl, de + ld a, $60 + ld [hld], a + ld a, $5d + ld [hl], a + +; draw gameboy pic + hlcoord 7, 8 + ld b, TILEMAP_GAME_BOY + call CopyTileIDsFromList_ZeroBaseTileID + +; draw text box with enemy name above link cable + hlcoord 6, 0 + ld b, 2 + ld c, 7 + call TextBoxBorder + hlcoord 7, 2 + ld de, wLinkEnemyTrainerName + call PlaceString + + jp DelayFrame + +Trade_DrawCableAcrossScreen: +; Draws the link cable across the screen. + call Trade_ClearTileMap + hlcoord 0, 4 + ld a, $5e + ld c, SCREEN_WIDTH +.loop + ld [hli], a + dec c + jr nz, .loop + ret + +Trade_CopyCableTilesOffScreen: +; This is used to copy the link cable tiles off screen so that the cable +; continues when the screen is scrolled. + push hl + hlcoord 0, 4 + call CopyToRedrawRowOrColumnSrcTiles + pop hl + ld a, h + ldh [hRedrawRowOrColumnDest + 1], a + ld a, l + ldh [hRedrawRowOrColumnDest], a + ld a, REDRAW_ROW + ldh [hRedrawRowOrColumnMode], a + ld c, 10 + jp DelayFrames + +Trade_AnimMonMoveHorizontal: +; Animates the mon going through the link cable horizontally over a distance of +; b 16-pixel units. + ld a, [wTradedMonMovingRight] + ld e, a + ld d, $8 +.scrollLoop + ld a, e + dec a + jr z, .movingRight +; moving left + ldh a, [hSCX] + sub $2 + jr .next +.movingRight + ldh a, [hSCX] + add $2 +.next + ldh [hSCX], a + call DelayFrame + dec d + jr nz, .scrollLoop + call Trade_AnimCircledMon + dec b + jr nz, Trade_AnimMonMoveHorizontal + ret + +Trade_AnimCircledMon: +; Cycles between the two animation frames of the mon party sprite, cycles +; between a circle and an oval around the mon sprite, and makes the cable flash. + push de + push bc + push hl + ldh a, [rBGP] + xor $3c ; make link cable flash + ldh [rBGP], a + ld hl, wOAMBuffer + $02 + ld de, $4 + ld c, $14 +.loop + ld a, [hl] + xor ICONOFFSET + ld [hl], a + add hl, de + dec c + jr nz, .loop + pop hl + pop bc + pop de + ret + +Trade_WriteCircledMonOAM: + farcall WriteMonPartySpriteOAMBySpecies + call Trade_WriteCircleOAM + +Trade_AddOffsetsToOAMCoords: + ld hl, wOAMBuffer + ld c, $14 +.loop + ld a, [wBaseCoordY] + add [hl] + ld [hli], a + ld a, [wBaseCoordX] + add [hl] + ld [hli], a + inc hl + inc hl + dec c + jr nz, .loop + ret + +Trade_AnimMonMoveVertical: +; Animates the mon going through the link cable vertically as well as +; horizontally for a bit. The last bit of horizontal movement (when moving +; right) or the first bit of horizontal movement (when moving left) are done +; here instead of Trade_AnimMonMoveHorizontal because this function moves the +; sprite itself rather than scrolling the screen around the sprite. Moving the +; sprite itself is necessary because the vertical segment of the link cable is +; to the right of the screen position that the mon sprite has when +; Trade_AnimMonMoveHorizontal is executing. + ld a, [wTradedMonMovingRight] + and a + jr z, .movingLeft +; moving right + lb bc, 4, 0 ; move right + call .doAnim + lb bc, 0, 10 ; move down + jr .doAnim +.movingLeft + lb bc, 0, -10 ; move up + call .doAnim + lb bc, -4, 0 ; move left +.doAnim + ld a, b + ld [wBaseCoordX], a + ld a, c + ld [wBaseCoordY], a + ld d, $4 +.loop + call Trade_AddOffsetsToOAMCoords + call Trade_AnimCircledMon + ld c, 8 + call DelayFrames + dec d + jr nz, .loop + ret + +Trade_WriteCircleOAM: +; Writes the OAM blocks for the circle around the traded mon as it passes +; the link cable. + ld hl, Trade_CircleOAMPointers + ld c, $4 + xor a +.loop + push bc + ld e, [hl] + inc hl + ld d, [hl] + inc hl + ld c, [hl] + inc hl + ld b, [hl] + inc hl + push hl + inc a + push af + call WriteOAMBlock + pop af + pop hl + pop bc + dec c + jr nz, .loop + ret + +trade_circle_oam: MACRO + dw \1 + db \2, \3 +ENDM + +Trade_CircleOAMPointers: + ; oam pointer, upper-left x coord, upper-left y coord + trade_circle_oam Trade_CircleOAM0, $08, $08 + trade_circle_oam Trade_CircleOAM1, $18, $08 + trade_circle_oam Trade_CircleOAM2, $08, $18 + trade_circle_oam Trade_CircleOAM3, $18, $18 + +Trade_CircleOAM0: + dbsprite 2, 7, 0, 0, ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 + dbsprite 2, 7, 0, 2, ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 + +Trade_CircleOAM1: + dbsprite 6, 7, 0, 1, ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP + dbsprite 6, 7, 0, 3, ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP + +Trade_CircleOAM2: + dbsprite 10, 7, 0, 2, ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_VFLIP + dbsprite 10, 7, 0, 0, ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_VFLIP + +Trade_CircleOAM3: + dbsprite 14, 7, 0, 3, ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP + dbsprite 14, 7, 0, 1, ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP + +; a = species +Trade_LoadMonSprite: + ld [wcf91], a + ld [wd0b5], a + ld [wWholeScreenPaletteMonSpecies], a + ld b, SET_PAL_POKEMON_WHOLE_SCREEN + ld c, 0 + call RunPaletteCommand + ldh a, [hAutoBGTransferEnabled] + xor $1 + ldh [hAutoBGTransferEnabled], a + call GetMonHeader + hlcoord 7, 2 + call LoadFlippedFrontSpriteByMonIndex + ld c, 10 + jp DelayFrames + +Trade_ShowClearedWindow: +; clears the window and covers the BG entirely with the window + ld a, $1 + ldh [hAutoBGTransferEnabled], a + call ClearScreen + ld a, %11100011 + ldh [rLCDC], a + ld a, $7 + ldh [rWX], a + xor a + ldh [hWY], a + ld a, $90 + ldh [hSCX], a + ret + +Trade_SlideTextBoxOffScreen: +; Slides the window right until it's off screen. The window usually just has +; a text box at the bottom when this is called. However, when this is called +; after Trade_ShowEnemyMon in the external clock sequence, there is a mon pic +; above the text box and it is also scrolled off the screen. + ld c, 50 + call DelayFrames +.loop + call DelayFrame + ldh a, [rWX] + inc a + inc a + ldh [rWX], a + cp $a1 + jr nz, .loop + call Trade_ClearTileMap + ld c, 10 + call DelayFrames + ld a, $7 + ldh [rWX], a + ret + +PrintTradeWentToText: + ld hl, TradeWentToText + call PrintText + ld c, 200 + call DelayFrames + jp Trade_SlideTextBoxOffScreen + +TradeWentToText: + text_far _TradeWentToText + text_end + +PrintTradeForSendsText: + ld hl, TradeForText + call PrintText + call Trade_Delay80 + ld hl, TradeSendsText + call PrintText + jp Trade_Delay80 + +TradeForText: + text_far _TradeForText + text_end + +TradeSendsText: + text_far _TradeSendsText + text_end + +PrintTradeFarewellText: + ld hl, TradeWavesFarewellText + call PrintText + call Trade_Delay80 + ld hl, TradeTransferredText + call PrintText + call Trade_Delay80 + jp Trade_SlideTextBoxOffScreen + +TradeWavesFarewellText: + text_far _TradeWavesFarewellText + text_end + +TradeTransferredText: + text_far _TradeTransferredText + text_end + +PrintTradeTakeCareText: + ld hl, TradeTakeCareText + call PrintText + jp Trade_Delay80 + +TradeTakeCareText: + text_far _TradeTakeCareText + text_end + +PrintTradeWillTradeText: + ld hl, TradeWillTradeText + call PrintText + call Trade_Delay80 + ld hl, TradeforText + call PrintText + jp Trade_Delay80 + +TradeWillTradeText: + text_far _TradeWillTradeText + text_end + +TradeforText: + text_far _TradeforText + text_end + +Trade_ShowAnimation: + ld [wAnimationID], a + xor a + ld [wAnimationType], a + predef_jump MoveAnimation diff --git a/engine/trade2.asm b/engine/movie/trade2.asm old mode 100755 new mode 100644 similarity index 77% rename from engine/trade2.asm rename to engine/movie/trade2.asm index 2c79e077..f0d91846 --- a/engine/trade2.asm +++ b/engine/movie/trade2.asm @@ -1,48 +1,49 @@ Trade_PrintPlayerMonInfoText: - coord hl, 5, 0 + hlcoord 5, 0 ld de, Trade_MonInfoText call PlaceString ld a, [wTradedPlayerMonSpecies] ld [wd11e], a predef IndexToPokedex - coord hl, 9, 0 + hlcoord 9, 0 ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber - coord hl, 5, 2 + hlcoord 5, 2 ld de, wcf4b call PlaceString - coord hl, 8, 4 + hlcoord 8, 4 ld de, wTradedPlayerMonOT call PlaceString - coord hl, 8, 6 + hlcoord 8, 6 ld de, wTradedPlayerMonOTID lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber Trade_PrintEnemyMonInfoText: - coord hl, 5, 10 + hlcoord 5, 10 ld de, Trade_MonInfoText call PlaceString ld a, [wTradedEnemyMonSpecies] ld [wd11e], a predef IndexToPokedex - coord hl, 9, 10 + hlcoord 9, 10 ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber - coord hl, 5, 12 + hlcoord 5, 12 ld de, wcd6d call PlaceString - coord hl, 8, 14 + hlcoord 8, 14 ld de, wTradedEnemyMonOT call PlaceString - coord hl, 8, 16 + hlcoord 8, 16 ld de, wTradedEnemyMonOTID lb bc, LEADING_ZEROES | 2, 5 jp PrintNumber Trade_MonInfoText: - db "──№⠄",$4E + db "──№" + next "" next "OT/" - next $73,"№⠄","@" + next "№@" diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm deleted file mode 100755 index 52e86b36..00000000 --- a/engine/multiply_divide.asm +++ /dev/null @@ -1,143 +0,0 @@ -_Multiply: - ld a, $8 - ld b, a - xor a - ld [H_PRODUCT], a - ld [H_MULTIPLYBUFFER], a - ld [H_MULTIPLYBUFFER+1], a - ld [H_MULTIPLYBUFFER+2], a - ld [H_MULTIPLYBUFFER+3], a -.loop - ld a, [H_MULTIPLIER] - srl a - ld [H_MULTIPLIER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - jr nc, .smallMultiplier - ld a, [H_MULTIPLYBUFFER+3] - ld c, a - ld a, [H_MULTIPLICAND+2] - add c - ld [H_MULTIPLYBUFFER+3], a - ld a, [H_MULTIPLYBUFFER+2] - ld c, a - ld a, [H_MULTIPLICAND+1] - adc c - ld [H_MULTIPLYBUFFER+2], a - ld a, [H_MULTIPLYBUFFER+1] - ld c, a - ld a, [H_MULTIPLICAND] ; (aliases: H_MULTIPLICAND) - adc c - ld [H_MULTIPLYBUFFER+1], a - ld a, [H_MULTIPLYBUFFER] - ld c, a - ld a, [H_PRODUCT] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - adc c - ld [H_MULTIPLYBUFFER], a -.smallMultiplier - dec b - jr z, .done - ld a, [H_MULTIPLICAND+2] - sla a - ld [H_MULTIPLICAND+2], a - ld a, [H_MULTIPLICAND+1] - rl a - ld [H_MULTIPLICAND+1], a - ld a, [H_MULTIPLICAND] - rl a - ld [H_MULTIPLICAND], a - ld a, [H_PRODUCT] - rl a - ld [H_PRODUCT], a - jr .loop -.done - ld a, [H_MULTIPLYBUFFER+3] - ld [H_PRODUCT+3], a - ld a, [H_MULTIPLYBUFFER+2] - ld [H_PRODUCT+2], a - ld a, [H_MULTIPLYBUFFER+1] - ld [H_PRODUCT+1], a - ld a, [H_MULTIPLYBUFFER] - ld [H_PRODUCT], a - ret - -_Divide: - xor a - ld [H_DIVIDEBUFFER], a - ld [H_DIVIDEBUFFER+1], a - ld [H_DIVIDEBUFFER+2], a - ld [H_DIVIDEBUFFER+3], a - ld [H_DIVIDEBUFFER+4], a - ld a, $9 - ld e, a -.asm_37db3 - ld a, [H_DIVIDEBUFFER] - ld c, a - ld a, [H_DIVIDEND+1] ; (aliases: H_MULTIPLICAND) - sub c - ld d, a - ld a, [H_DIVISOR] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - ld c, a - ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - sbc c - jr c, .asm_37dce - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - ld a, d - ld [H_DIVIDEND+1], a ; (aliases: H_MULTIPLICAND) - ld a, [H_DIVIDEBUFFER+4] - inc a - ld [H_DIVIDEBUFFER+4], a - jr .asm_37db3 -.asm_37dce - ld a, b - cp $1 - jr z, .asm_37e18 - ld a, [H_DIVIDEBUFFER+4] - sla a - ld [H_DIVIDEBUFFER+4], a - ld a, [H_DIVIDEBUFFER+3] - rl a - ld [H_DIVIDEBUFFER+3], a - ld a, [H_DIVIDEBUFFER+2] - rl a - ld [H_DIVIDEBUFFER+2], a - ld a, [H_DIVIDEBUFFER+1] - rl a - ld [H_DIVIDEBUFFER+1], a - dec e - jr nz, .asm_37e04 - ld a, $8 - ld e, a - ld a, [H_DIVIDEBUFFER] - ld [H_DIVISOR], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - xor a - ld [H_DIVIDEBUFFER], a - ld a, [H_DIVIDEND+1] ; (aliases: H_MULTIPLICAND) - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - ld a, [H_DIVIDEND+2] - ld [H_DIVIDEND+1], a ; (aliases: H_MULTIPLICAND) - ld a, [H_DIVIDEND+3] - ld [H_DIVIDEND+2], a -.asm_37e04 - ld a, e - cp $1 - jr nz, .asm_37e0a - dec b -.asm_37e0a - ld a, [H_DIVISOR] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - srl a - ld [H_DIVISOR], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - ld a, [H_DIVIDEBUFFER] - rr a - ld [H_DIVIDEBUFFER], a - jr .asm_37db3 -.asm_37e18 - ld a, [H_DIVIDEND+1] ; (aliases: H_MULTIPLICAND) - ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - ld a, [H_DIVIDEBUFFER+4] - ld [H_QUOTIENT+3], a - ld a, [H_DIVIDEBUFFER+3] - ld [H_QUOTIENT+2], a - ld a, [H_DIVIDEBUFFER+2] - ld [H_QUOTIENT+1], a ; (aliases: H_MULTIPLICAND) - ld a, [H_DIVIDEBUFFER+1] - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - ret diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm deleted file mode 100755 index 1258c59b..00000000 --- a/engine/oak_speech2.asm +++ /dev/null @@ -1,272 +0,0 @@ -ChoosePlayerName: - call OakSpeechSlidePicRight - ld de, DefaultNamesPlayer - call DisplayIntroNameTextBox - ld a, [wCurrentMenuItem] - and a - jr z, .customName - ld hl, DefaultNamesPlayerList - call GetDefaultName - ld de, wPlayerName - call OakSpeechSlidePicLeft - jr .done -.customName - ld hl, wPlayerName - xor a ; NAME_PLAYER_SCREEN - ld [wNamingScreenType], a - call DisplayNamingScreen - ld a, [wcf4b] - cp "@" - jr z, .customName - call ClearScreen - call Delay3 - ld de, RedPicFront - ld b, BANK(RedPicFront) - call IntroDisplayPicCenteredOrUpperRight -.done - ld hl, YourNameIsText - jp PrintText - -YourNameIsText: - TX_FAR _YourNameIsText - db "@" - -ChooseRivalName: - call OakSpeechSlidePicRight - ld de, DefaultNamesRival - call DisplayIntroNameTextBox - ld a, [wCurrentMenuItem] - and a - jr z, .customName - ld hl, DefaultNamesRivalList - call GetDefaultName - ld de, wRivalName - call OakSpeechSlidePicLeft - jr .done -.customName - ld hl, wRivalName - ld a, NAME_RIVAL_SCREEN - ld [wNamingScreenType], a - call DisplayNamingScreen - ld a, [wcf4b] - cp "@" - jr z, .customName - call ClearScreen - call Delay3 - ld de, Rival1Pic - ld b, $13 - call IntroDisplayPicCenteredOrUpperRight -.done - ld hl, HisNameIsText - jp PrintText - -HisNameIsText: - TX_FAR _HisNameIsText - db "@" - -OakSpeechSlidePicLeft: - push de - coord hl, 0, 0 - lb bc, 12, 11 - call ClearScreenArea ; clear the name list text box - ld c, 10 - call DelayFrames - pop de - ld hl, wcd6d - ld bc, NAME_LENGTH - call CopyData - call Delay3 - coord hl, 12, 4 - lb de, 6, 6 * SCREEN_WIDTH + 5 - ld a, $ff - jr OakSpeechSlidePicCommon - -OakSpeechSlidePicRight: - coord hl, 5, 4 - lb de, 6, 6 * SCREEN_WIDTH + 5 - xor a - -OakSpeechSlidePicCommon: - push hl - push de - push bc - ld [hSlideDirection], a - ld a, d - ld [hSlideAmount], a - ld a, e - ld [hSlidingRegionSize], a - ld c, a - ld a, [hSlideDirection] - and a - jr nz, .next -; If sliding right, point hl to the end of the pic's tiles. - ld d, 0 - add hl, de -.next - ld d, h - ld e, l -.loop - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld a, [hSlideDirection] - and a - jr nz, .slideLeft -; sliding right - ld a, [hli] - ld [hld], a - dec hl - jr .next2 -.slideLeft - ld a, [hld] - ld [hli], a - inc hl -.next2 - dec c - jr nz, .loop - ld a, [hSlideDirection] - and a - jr z, .next3 -; If sliding left, we need to zero the last tile in the pic (there is no need -; to take a corresponding action when sliding right because hl initially points -; to a 0 tile in that case). - xor a - dec hl - ld [hl], a -.next3 - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a - call Delay3 - ld a, [hSlidingRegionSize] - ld c, a - ld h, d - ld l, e - ld a, [hSlideDirection] - and a - jr nz, .slideLeft2 - inc hl - jr .next4 -.slideLeft2 - dec hl -.next4 - ld d, h - ld e, l - ld a, [hSlideAmount] - dec a - ld [hSlideAmount], a - jr nz, .loop - pop bc - pop de - pop hl - ret - -DisplayIntroNameTextBox: - push de - coord hl, 0, 0 - ld b, $a - ld c, $9 - call TextBoxBorder - coord hl, 3, 0 - ld de, .namestring - call PlaceString - pop de - coord hl, 2, 2 - call PlaceString - call UpdateSprites - xor a - ld [wCurrentMenuItem], a - ld [wLastMenuItem], a - inc a - ld [wTopMenuItemX], a - ld [wMenuWatchedKeys], a ; A_BUTTON - inc a - ld [wTopMenuItemY], a - inc a - ld [wMaxMenuItem], a - jp HandleMenuInput - -.namestring - db "NAME@" - -IF DEF(_RED) -DefaultNamesPlayer: - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" -ENDC - -IF DEF(_BLUE) -DefaultNamesPlayer: - db "NEW NAME" - next "BLUE" - next "GARY" - next "JOHN" - db "@" - -DefaultNamesRival: - db "NEW NAME" - next "RED" - next "ASH" - next "JACK" - db "@" -ENDC - -GetDefaultName: -; a = name index -; hl = name list - ld b, a - ld c, 0 -.loop - ld d, h - ld e, l -.innerLoop - ld a, [hli] - cp "@" - jr nz, .innerLoop - ld a, b - cp c - jr z, .foundName - inc c - jr .loop -.foundName - ld h, d - ld l, e - ld de, wcd6d - ld bc, $14 - jp CopyData - -IF DEF(_RED) -DefaultNamesPlayerList: - db "NEW NAME@" - db "RED@" - db "ASH@" - db "JACK@" -DefaultNamesRivalList: - db "NEW NAME@" - db "BLUE@" - db "GARY@" - db "JOHN@" -ENDC -IF DEF(_BLUE) -DefaultNamesPlayerList: - db "NEW NAME@" - db "BLUE@" - db "GARY@" - db "JOHN@" -DefaultNamesRivalList: - db "NEW NAME@" - db "RED@" - db "ASH@" - db "JACK@" -ENDC - -TextTerminator_6b20: - db "@" diff --git a/engine/oam_dma.asm b/engine/oam_dma.asm deleted file mode 100644 index 7326445e..00000000 --- a/engine/oam_dma.asm +++ /dev/null @@ -1,26 +0,0 @@ -WriteDMACodeToHRAM: -; Since no other memory is available during OAM DMA, -; DMARoutine is copied to HRAM and executed there. - ld c, $ff80 % $100 - ld b, DMARoutineEnd - DMARoutine - ld hl, DMARoutine -.copy - ld a, [hli] - ld [$ff00+c], a - inc c - dec b - jr nz, .copy - ret - -DMARoutine: - ; initiate DMA - ld a, wOAMBuffer / $100 - ld [rDMA], a - - ; wait for DMA to finish - ld a, $28 -.wait - dec a - jr nz, .wait - ret -DMARoutineEnd: diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm new file mode 100644 index 00000000..0ffaf5d7 --- /dev/null +++ b/engine/overworld/auto_movement.asm @@ -0,0 +1,292 @@ +PlayerStepOutFromDoor:: + ld hl, wd730 + res 1, [hl] + call IsPlayerStandingOnDoorTile + jr nc, .notStandingOnDoor + ld a, $fc + ld [wJoyIgnore], a + ld hl, wd736 + set 1, [hl] + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + xor a + ld [wSpritePlayerStateData1ImageIndex], a + call StartSimulatingJoypadStates + ret +.notStandingOnDoor + xor a + ld [wWastedByteCD3A], a + ld [wSimulatedJoypadStatesIndex], a + ld [wSimulatedJoypadStatesEnd], a + ld hl, wd736 + res 0, [hl] + res 1, [hl] + ld hl, wd730 + res 7, [hl] + ret + +_EndNPCMovementScript:: + ld hl, wd730 + res 7, [hl] + ld hl, wd72e + res 7, [hl] + ld hl, wd736 + res 0, [hl] + res 1, [hl] + xor a + ld [wNPCMovementScriptSpriteOffset], a + ld [wNPCMovementScriptPointerTableNum], a + ld [wNPCMovementScriptFunctionNum], a + ld [wWastedByteCD3A], a + ld [wSimulatedJoypadStatesIndex], a + ld [wSimulatedJoypadStatesEnd], a + ret + +PalletMovementScriptPointerTable:: + dw PalletMovementScript_OakMoveLeft + dw PalletMovementScript_PlayerMoveLeft + dw PalletMovementScript_WaitAndWalkToLab + dw PalletMovementScript_WalkToLab + dw PalletMovementScript_Done + +PalletMovementScript_OakMoveLeft: + ld a, [wXCoord] + sub $a + ld [wNumStepsToTake], a + jr z, .playerOnLeftTile +; The player is on the right tile of the northern path out of Pallet Town and +; Prof. Oak is below. +; Make Prof. Oak step to the left. + ld b, 0 + ld c, a + ld hl, wNPCMovementDirections2 + ld a, NPC_MOVEMENT_LEFT + call FillMemory + ld [hl], $ff + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + ld de, wNPCMovementDirections2 + call MoveSprite + ld a, $1 + ld [wNPCMovementScriptFunctionNum], a + jr .done +; The player is on the left tile of the northern path out of Pallet Town and +; Prof. Oak is below. +; Prof. Oak is already where he needs to be. +.playerOnLeftTile + ld a, $3 + ld [wNPCMovementScriptFunctionNum], a +.done + ld hl, wFlags_D733 + set 1, [hl] + ld a, $fc + ld [wJoyIgnore], a + ret + +PalletMovementScript_PlayerMoveLeft: + ld a, [wd730] + bit 0, a ; is an NPC being moved by a script? + ret nz ; return if Oak is still moving + ld a, [wNumStepsToTake] + ld [wSimulatedJoypadStatesIndex], a + ldh [hNPCMovementDirections2Index], a + predef ConvertNPCMovementDirectionsToJoypadMasks + call StartSimulatingJoypadStates + ld a, $2 + ld [wNPCMovementScriptFunctionNum], a + ret + +PalletMovementScript_WaitAndWalkToLab: + ld a, [wSimulatedJoypadStatesIndex] + and a ; is the player done moving left yet? + ret nz + +PalletMovementScript_WalkToLab: + xor a + ld [wOverrideSimulatedJoypadStatesMask], a + ld a, [wSpriteIndex] + swap a + ld [wNPCMovementScriptSpriteOffset], a + xor a + ld [wSpritePlayerStateData2MovementByte1], a + ld hl, wSimulatedJoypadStatesEnd + ld de, RLEList_PlayerWalkToLab + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + ld hl, wNPCMovementDirections2 + ld de, RLEList_ProfOakWalkToLab + call DecodeRLEList + ld hl, wd72e + res 7, [hl] + ld hl, wd730 + set 7, [hl] + ld a, $4 + ld [wNPCMovementScriptFunctionNum], a + ret + +RLEList_ProfOakWalkToLab: + db NPC_MOVEMENT_DOWN, 5 + db NPC_MOVEMENT_LEFT, 1 + db NPC_MOVEMENT_DOWN, 5 + db NPC_MOVEMENT_RIGHT, 3 + db NPC_MOVEMENT_UP, 1 + db NPC_CHANGE_FACING, 1 + db -1 ; end + +RLEList_PlayerWalkToLab: + db D_UP, 2 + db D_RIGHT, 3 + db D_DOWN, 5 + db D_LEFT, 1 + db D_DOWN, 6 + db -1 ; end + +PalletMovementScript_Done: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld a, HS_PALLET_TOWN_OAK + ld [wMissableObjectIndex], a + predef HideObject + ld hl, wd730 + res 7, [hl] + ld hl, wd72e + res 7, [hl] + jp EndNPCMovementScript + +PewterMuseumGuyMovementScriptPointerTable:: + dw PewterMovementScript_WalkToMuseum + dw PewterMovementScript_Done + +PewterMovementScript_WalkToMuseum: + ld a, 0 ; BANK(Music_MuseumGuy) + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a + ld a, MUSIC_MUSEUM_GUY + ld [wNewSoundID], a + call PlayMusic + ld a, [wSpriteIndex] + swap a + ld [wNPCMovementScriptSpriteOffset], a + call StartSimulatingJoypadStates + ld hl, wSimulatedJoypadStatesEnd + ld de, RLEList_PewterMuseumPlayer + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + xor a + ld [wWhichPewterGuy], a + predef PewterGuys + ld hl, wNPCMovementDirections2 + ld de, RLEList_PewterMuseumGuy + call DecodeRLEList + ld hl, wd72e + res 7, [hl] + ld a, $1 + ld [wNPCMovementScriptFunctionNum], a + ret + +RLEList_PewterMuseumPlayer: + db NO_INPUT, 1 + db D_UP, 3 + db D_LEFT, 13 + db D_UP, 6 + db -1 ; end + +RLEList_PewterMuseumGuy: + db NPC_MOVEMENT_UP, 6 + db NPC_MOVEMENT_LEFT, 13 + db NPC_MOVEMENT_UP, 3 + db NPC_MOVEMENT_LEFT, 1 + db -1 ; end + +PewterMovementScript_Done: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + ld hl, wd730 + res 7, [hl] + ld hl, wd72e + res 7, [hl] + jp EndNPCMovementScript + +PewterGymGuyMovementScriptPointerTable:: + dw PewterMovementScript_WalkToGym + dw PewterMovementScript_Done + +PewterMovementScript_WalkToGym: + ld a, 0 ; BANK(Music_MuseumGuy) + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a + ld a, MUSIC_MUSEUM_GUY + ld [wNewSoundID], a + call PlayMusic + ld a, [wSpriteIndex] + swap a + ld [wNPCMovementScriptSpriteOffset], a + xor a + ld [wSpritePlayerStateData2MovementByte1], a + ld hl, wSimulatedJoypadStatesEnd + ld de, RLEList_PewterGymPlayer + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + ld a, 1 + ld [wWhichPewterGuy], a + predef PewterGuys + ld hl, wNPCMovementDirections2 + ld de, RLEList_PewterGymGuy + call DecodeRLEList + ld hl, wd72e + res 7, [hl] + ld hl, wd730 + set 7, [hl] + ld a, $1 + ld [wNPCMovementScriptFunctionNum], a + ret + +RLEList_PewterGymPlayer: + db NO_INPUT, 1 + db D_RIGHT, 2 + db D_DOWN, 5 + db D_LEFT, 11 + db D_UP, 5 + db D_LEFT, 15 + db -1 ; end + +RLEList_PewterGymGuy: + db NPC_MOVEMENT_DOWN, 2 + db NPC_MOVEMENT_LEFT, 15 + db NPC_MOVEMENT_UP, 5 + db NPC_MOVEMENT_LEFT, 11 + db NPC_MOVEMENT_DOWN, 5 + db NPC_MOVEMENT_RIGHT, 3 + db -1 ; end + +FreezeEnemyTrainerSprite:: + ld a, [wCurMap] + cp POKEMON_TOWER_7F + ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them + ld hl, RivalIDs + ld a, [wEngagedTrainerClass] + ld b, a +.loop + ld a, [hli] + cp -1 + jr z, .notRival + cp b + ret z ; the rival leaves after battling, so don't freeze him + jr .loop +.notRival + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + jp SetSpriteMovementBytesToFF + +RivalIDs: + db OPP_RIVAL1 + db OPP_RIVAL2 + db OPP_RIVAL3 + db -1 ; end diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm deleted file mode 100755 index 35495c82..00000000 --- a/engine/overworld/card_key.asm +++ /dev/null @@ -1,112 +0,0 @@ -PrintCardKeyText: - ld hl, SilphCoMapList - ld a, [wCurMap] - ld b, a -.silphCoMapListLoop - ld a, [hli] - cp $ff - ret z - cp b - jr nz, .silphCoMapListLoop - predef GetTileAndCoordsInFrontOfPlayer - ld a, [wTileInFrontOfPlayer] - cp $18 - jr z, .cardKeyDoorInFrontOfPlayer - cp $24 - jr z, .cardKeyDoorInFrontOfPlayer - ld b, a - ld a, [wCurMap] - cp SILPH_CO_11F - ret nz - ld a, b - cp $5e - ret nz -.cardKeyDoorInFrontOfPlayer - ld b, CARD_KEY - call IsItemInBag - jr z, .noCardKey - call GetCoordsInFrontOfPlayer - push de - tx_pre_id CardKeySuccessText - ld [hSpriteIndexOrTextID], a - call PrintPredefTextID - pop de - srl d - ld a, d - ld b, a - ld [wCardKeyDoorY], a - srl e - ld a, e - ld c, a - ld [wCardKeyDoorX], a - ld a, [wCurMap] - cp SILPH_CO_11F - jr nz, .notSilphCo11F - ld a, $3 - jr .replaceCardKeyDoorTileBlock -.notSilphCo11F - ld a, $e -.replaceCardKeyDoorTileBlock - ld [wNewTileBlockID], a - predef ReplaceTileBlock - ld hl, wCurrentMapScriptFlags - set 5, [hl] - ld a, SFX_GO_INSIDE - jp PlaySound -.noCardKey - tx_pre_id CardKeyFailText - ld [hSpriteIndexOrTextID], a - jp PrintPredefTextID - -SilphCoMapList: - db SILPH_CO_2F - db SILPH_CO_3F - db SILPH_CO_4F - db SILPH_CO_5F - db SILPH_CO_6F - db SILPH_CO_7F - db SILPH_CO_8F - db SILPH_CO_9F - db SILPH_CO_10F - db SILPH_CO_11F - db $FF - -CardKeySuccessText: - TX_FAR _CardKeySuccessText1 - TX_SFX_ITEM_1 - TX_FAR _CardKeySuccessText2 - db "@" - -CardKeyFailText: - TX_FAR _CardKeyFailText - db "@" - -; d = Y -; e = X -GetCoordsInFrontOfPlayer: - ld a, [wYCoord] - ld d, a - ld a, [wXCoord] - ld e, a - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - and a - jr nz, .notFacingDown -; facing down - inc d - ret -.notFacingDown - cp SPRITE_FACING_UP - jr nz, .notFacingUp -; facing up - dec d - ret -.notFacingUp - cp SPRITE_FACING_LEFT - jr nz, .notFacingLeft -; facing left - dec e - ret -.notFacingLeft -; facing right - inc e - ret diff --git a/engine/overworld/clear_variables.asm b/engine/overworld/clear_variables.asm index 9a59cc7c..bbb7c986 100644 --- a/engine/overworld/clear_variables.asm +++ b/engine/overworld/clear_variables.asm @@ -1,14 +1,14 @@ -ClearVariablesOnEnterMap: - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a - ld [rWY], a +ClearVariablesOnEnterMap:: + ld a, SCREEN_HEIGHT_PX + ldh [hWY], a + ldh [rWY], a xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld [wStepCounter], a ld [wLoneAttackNo], a - ld [hJoyPressed], a - ld [hJoyReleased], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a + ldh [hJoyHeld], a ld [wActionResultOrTookBattleTurn], a ld [wUnusedD5A3], a ld hl, wCardKeyDoorY diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm old mode 100755 new mode 100644 index f6ae6468..6a92ccc0 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -22,8 +22,8 @@ UsedCut: jp PrintText .NothingToCutText - TX_FAR _NothingToCutText - db "@" + text_far _NothingToCutText + text_end .canCut ld [wCutTile], a @@ -37,15 +37,15 @@ UsedCut: call GBPalWhiteOutWithDelay3 call ClearSprites call RestoreScreenTilesAndReloadTilePatterns - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a + ld a, SCREEN_HEIGHT_PX + ldh [hWY], a call Delay3 call LoadGBPal call LoadCurrentMapView call SaveScreenTilesToBuffer2 call Delay3 xor a - ld [hWY], a + ldh [hWY], a ld hl, UsedCutText call PrintText call LoadScreenTilesFromBuffer2 @@ -57,46 +57,46 @@ UsedCut: ld de, CutTreeBlockSwaps call ReplaceTreeTileBlock call RedrawMapView - callba AnimCut + farcall AnimCut ld a, $1 ld [wUpdateSpritesEnabled], a ld a, SFX_CUT call PlaySound ld a, $90 - ld [hWY], a + ldh [hWY], a call UpdateSprites jp RedrawMapView UsedCutText: - TX_FAR _UsedCutText - db "@" + text_far _UsedCutText + text_end InitCutAnimOAM: xor a ld [wWhichAnimationOffsets], a ld a, %11100100 - ld [rOBP1], a + ldh [rOBP1], a ld a, [wCutTile] cp $52 jr z, .grass ; tree - ld de, Overworld_GFX + $2d0 ; cuttable tree sprite top row - ld hl, vChars1 + $7c0 - lb bc, BANK(Overworld_GFX), $02 + ld de, Overworld_GFX tile $2d ; cuttable tree sprite top row + ld hl, vChars1 tile $7c + lb bc, BANK(Overworld_GFX), 2 call CopyVideoData - ld de, Overworld_GFX + $3d0 ; cuttable tree sprite bottom row - ld hl, vChars1 + $7e0 - lb bc, BANK(Overworld_GFX), $02 + ld de, Overworld_GFX tile $3d ; cuttable tree sprite bottom row + ld hl, vChars1 tile $7e + lb bc, BANK(Overworld_GFX), 2 call CopyVideoData jr WriteCutOrBoulderDustAnimationOAMBlock .grass - ld hl, vChars1 + $7c0 + ld hl, vChars1 tile $7c call LoadCutGrassAnimationTilePattern - ld hl, vChars1 + $7d0 + ld hl, vChars1 tile $7d call LoadCutGrassAnimationTilePattern - ld hl, vChars1 + $7e0 + ld hl, vChars1 tile $7e call LoadCutGrassAnimationTilePattern - ld hl, vChars1 + $7f0 + ld hl, vChars1 tile $7f call LoadCutGrassAnimationTilePattern call WriteCutOrBoulderDustAnimationOAMBlock ld hl, wOAMBuffer + $93 @@ -112,8 +112,8 @@ InitCutAnimOAM: ret LoadCutGrassAnimationTilePattern: - ld de, AnimationTileset2 + $60 ; tile depicting a leaf - lb bc, BANK(AnimationTileset2), $01 + ld de, AnimationTileset2 tile 6 ; tile depicting a leaf + lb bc, BANK(AnimationTileset2), 1 jp CopyVideoData WriteCutOrBoulderDustAnimationOAMBlock: @@ -123,11 +123,11 @@ WriteCutOrBoulderDustAnimationOAMBlock: jp WriteOAMBlock CutOrBoulderDustAnimationTilesAndAttributes: - db $FC,$10,$FD,$10 - db $FE,$10,$FF,$10 + dbsprite 2, -1, 0, 4, $fd, OAM_OBP1 + dbsprite 2, -1, 0, 6, $ff, OAM_OBP1 GetCutOrBoulderDustAnimationOffsets: - ld hl, wSpriteStateData1 + 4 + ld hl, wSpritePlayerStateData1YPixels ld a, [hli] ; player's sprite screen Y position ld b, a inc hl @@ -187,7 +187,7 @@ ReplaceTreeTileBlock: ld h, [hl] ld l, a add hl, bc - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + ld a, [wSpritePlayerStateData1FacingDirection] and a jr z, .down cp SPRITE_FACING_UP @@ -248,16 +248,4 @@ ReplaceTreeTileBlock: ld [hl], a ret -CutTreeBlockSwaps: -; first byte = tileset block containing the cut tree -; second byte = corresponding tileset block after the cut animation happens - db $32, $6D - db $33, $6C - db $34, $6F - db $35, $4C - db $60, $6E - db $0B, $0A - db $3C, $35 - db $3F, $35 - db $3D, $36 - db $FF ; list terminator +INCLUDE "data/tilesets/cut_tree_blocks.asm" diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm old mode 100755 new mode 100644 index f16fed66..3d4a5905 --- a/engine/overworld/cut2.asm +++ b/engine/overworld/cut2.asm @@ -15,9 +15,9 @@ AnimCut: ld [wCoordAdjustmentAmount], a ld c, 2 call AdjustOAMBlockXPos2 - ld a, [rOBP1] + ldh a, [rOBP1] xor $64 - ld [rOBP1], a + ldh [rOBP1], a call DelayFrame pop bc dec c @@ -65,9 +65,9 @@ AnimCutGrass_UpdateOAMEntries: ld [wCoordAdjustmentAmount], a ld c, 1 call AdjustOAMBlockXPos2 - ld a, [rOBP1] + ldh a, [rOBP1] xor $64 - ld [rOBP1], a + ldh [rOBP1], a call DelayFrame pop bc dec c diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm old mode 100755 new mode 100644 index c39e096d..d38818fa --- a/engine/overworld/doors.asm +++ b/engine/overworld/doors.asm @@ -11,7 +11,7 @@ IsPlayerStandingOnDoorTile: ld a, [hli] ld h, [hl] ld l, a - aCoord 8, 9 ; a = lower left background tile under player's sprite + lda_coord 8, 9 ; a = lower left background tile under player's sprite ld b, a .loop ld a, [hli] @@ -25,51 +25,4 @@ IsPlayerStandingOnDoorTile: and a ret -DoorTileIDPointers: - dbw OVERWORLD, OverworldDoorTileIDs - dbw FOREST, ForestDoorTileIDs - dbw MART, MartDoorTileIDs - dbw HOUSE, HouseDoorTileIDs - dbw FOREST_GATE, TilesetMuseumDoorTileIDs - dbw MUSEUM, TilesetMuseumDoorTileIDs - dbw GATE, TilesetMuseumDoorTileIDs - dbw SHIP, ShipDoorTileIDs - dbw LOBBY, LobbyDoorTileIDs - dbw MANSION, MansionDoorTileIDs - dbw LAB, LabDoorTileIDs - dbw FACILITY, FacilityDoorTileIDs - dbw PLATEAU, PlateauDoorTileIDs - db $ff - -OverworldDoorTileIDs: - db $1B,$58,$00 - -ForestDoorTileIDs: - db $3a,$00 - -MartDoorTileIDs: - db $5e,$00 - -HouseDoorTileIDs: - db $54,$00 - -TilesetMuseumDoorTileIDs: - db $3b,$00 - -ShipDoorTileIDs: - db $1e,$00 - -LobbyDoorTileIDs: - db $1c,$38,$1a,$00 - -MansionDoorTileIDs: - db $1a,$1c,$53,$00 - -LabDoorTileIDs: - db $34,$00 - -FacilityDoorTileIDs: - db $43,$58,$1b,$00 - -PlateauDoorTileIDs: - db $3b,$1b,$00 +INCLUDE "data/tilesets/door_tile_ids.asm" diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm new file mode 100644 index 00000000..a20a0591 --- /dev/null +++ b/engine/overworld/dust_smoke.asm @@ -0,0 +1,93 @@ +AnimateBoulderDust: + ld a, $1 + ld [wWhichAnimationOffsets], a ; select the boulder dust offsets + ld a, [wUpdateSpritesEnabled] + push af + ld a, $ff + ld [wUpdateSpritesEnabled], a + ld a, %11100100 + ldh [rOBP1], a + call LoadSmokeTileFourTimes + farcall WriteCutOrBoulderDustAnimationOAMBlock + ld c, 8 ; number of steps in animation +.loop + push bc + call GetMoveBoulderDustFunctionPointer + ld bc, .returnAddress + push bc + ld c, 4 + jp hl +.returnAddress + ldh a, [rOBP1] + xor %01100100 + ldh [rOBP1], a + call Delay3 + pop bc + dec c + jr nz, .loop + pop af + ld [wUpdateSpritesEnabled], a + jp LoadPlayerSpriteGraphics + +GetMoveBoulderDustFunctionPointer: + ld a, [wSpritePlayerStateData1FacingDirection] + ld hl, MoveBoulderDustFunctionPointerTable + ld c, a + ld b, $0 + add hl, bc + ld a, [hli] + ld [wCoordAdjustmentAmount], a + ld a, [hli] + ld e, a + ld a, [hli] + ld h, [hl] + ld l, a + push hl + ld hl, wOAMBuffer + $90 + ld d, $0 + add hl, de + ld e, l + ld d, h + pop hl + ret + +MoveBoulderDustFunctionPointerTable: +; facing down + db $FF,$00 + dw AdjustOAMBlockYPos + +; facing up + db $01,$00 + dw AdjustOAMBlockYPos + +; facing left + db $01,$01 + dw AdjustOAMBlockXPos + +; facing right + db $FF,$01 + dw AdjustOAMBlockXPos + +LoadSmokeTileFourTimes:: + ld hl, vChars1 tile $7c + ld c, 4 +.loop + push bc + push hl + call LoadSmokeTile + pop hl + ld bc, 1 tiles + add hl, bc + pop bc + dec c + jr nz, .loop + ret + +LoadSmokeTile: + ld de, SSAnneSmokePuffTile + lb bc, BANK(SSAnneSmokePuffTile), (SSAnneSmokePuffTileEnd - SSAnneSmokePuffTile) / $10 + jp CopyVideoData + +SSAnneSmokePuffTile: + INCBIN "gfx/overworld/smoke.2bpp" +SSAnneSmokePuffTileEnd: diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm old mode 100755 new mode 100644 index 3db2ebbd..97cbbd8f --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -1,12 +1,12 @@ -ShakeElevator: +ShakeElevator:: ld de, -$20 call ShakeElevatorRedrawRow ld de, SCREEN_HEIGHT * $20 call ShakeElevatorRedrawRow call Delay3 - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC call PlaySound - ld a, [hSCY] + ldh a, [hSCY] ld d, a ld e, $1 ld b, 100 @@ -15,7 +15,7 @@ ShakeElevator: xor $fe ld e, a add d - ld [hSCY], a + ldh [hSCY], a push bc ld c, 0 ; BANK(SFX_Collision_1) ld a, SFX_COLLISION @@ -26,14 +26,14 @@ ShakeElevator: dec b jr nz, .shakeLoop ld a, d - ld [hSCY], a - ld a, $ff + ldh [hSCY], a + ld a, SFX_STOP_ALL_MUSIC call PlaySound ld c, 0 ; BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlaySound .musicLoop - ld a, [wChannelSoundIDs + Ch4] + ld a, [wChannelSoundIDs + Ch5] cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites @@ -56,7 +56,7 @@ ShakeElevatorRedrawRow: add hl, de ld a, h and $3 - or vBGMap0 / $100 + or HIGH(vBGMap0) ld d, a ld a, l pop hl diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm old mode 100755 new mode 100644 index ac4276bd..5a41c226 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -8,8 +8,8 @@ EmotionBubble: ld e, [hl] inc hl ld d, [hl] - ld hl, vChars1 + $780 - lb bc, BANK(EmotionBubbles), $04 + ld hl, vChars1 tile $78 + lb bc, BANK(EmotionBubbles), 4 call CopyVideoData ld a, [wUpdateSpritesEnabled] push af @@ -38,7 +38,7 @@ EmotionBubble: jr nz, .loop ; get the screen coordinates of the sprite the bubble is to be displayed above - ld hl, wSpriteStateData1 + 4 + ld hl, wSpritePlayerStateData1YPixels ld a, [wEmotionBubbleSpriteIndex] swap a ld c, a @@ -62,13 +62,16 @@ EmotionBubble: jp UpdateSprites EmotionBubblesPointerTable: - dw EmotionBubbles - dw EmotionBubbles + $40 - dw EmotionBubbles + $80 +; entries correspond to *_BUBBLE constants + dw ShockEmote + dw QuestionEmote + dw HappyEmote EmotionBubblesOAM: - db $F8,$00,$F9,$00 - db $FA,$00,$FB,$00 + dbsprite 0, -1, 0, 0, $f9, 0 + dbsprite 0, -1, 0, 2, $fb, 0 EmotionBubbles: - INCBIN "gfx/emotion_bubbles.2bpp" +ShockEmote: INCBIN "gfx/emotes/shock.2bpp" +QuestionEmote: INCBIN "gfx/emotes/question.2bpp" +HappyEmote: INCBIN "gfx/emotes/happy.2bpp" diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm index b1506742..520ef8ad 100644 --- a/engine/overworld/field_move_messages.asm +++ b/engine/overworld/field_move_messages.asm @@ -7,16 +7,16 @@ PrintStrengthTxt: jp PrintText UsedStrengthText: - TX_FAR _UsedStrengthText - TX_ASM + text_far _UsedStrengthText + text_asm ld a, [wcf91] call PlayCry call Delay3 jp TextScriptEnd CanMoveBouldersText: - TX_FAR _CanMoveBouldersText - db "@" + text_far _CanMoveBouldersText + text_end IsSurfingAllowed: ; Returns whether surfing is allowed in bit 1 of wd728. @@ -46,12 +46,13 @@ IsSurfingAllowed: jp PrintText CoordsData_cdf7: - db $0B,$07,$FF + dbmapcoord 7, 11 + db -1 ; end CurrentTooFastText: - TX_FAR _CurrentTooFastText - db "@" + text_far _CurrentTooFastText + text_end CyclingIsFunText: - TX_FAR _CyclingIsFunText - db "@" + text_far _CyclingIsFunText + text_end diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm old mode 100755 new mode 100644 index b03c9186..80dc93c7 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -3,25 +3,25 @@ AnimateHealingMachine: call PlayMusic ld de, PokeCenterFlashingMonitorAndHealBall - ld hl, vChars0 + $7c0 - lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles + ld hl, vChars0 tile $7c + lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), 3 ; should be 2 call CopyVideoData ld hl, wUpdateSpritesEnabled ld a, [hl] push af ld [hl], $ff push hl - ld a, [rOBP1] + ldh a, [rOBP1] push af ld a, $e0 - ld [rOBP1], a + ldh [rOBP1], a ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData call CopyHealingMachineOAM ; ld a, 4 ; ld [wAudioFadeOutControl], a -; ld a, $ff +; ld a, SFX_STOP_ALL_MUSIC ; ld [wNewSoundID], a ; call PlaySound ;.waitLoop @@ -40,10 +40,10 @@ AnimateHealingMachine: dec b jr nz, .partyLoop ld a, [wAudioROMBank] - cp $1f ; 0 ; BANK(Audio3_UpdateMusic) XXXXX + cp $1f ; BANK("Audio Engine 3") ld [wAudioSavedROMBank], a jr nz, .next - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld a, 0 ; BANK(Music_PkmnHealed) @@ -62,33 +62,33 @@ AnimateHealingMachine: ld c, 32 call DelayFrames pop af - ld [rOBP1], a + ldh [rOBP1], a pop hl pop af ld [hl], a - - jp UpdateSprites PokeCenterFlashingMonitorAndHealBall: - INCBIN "gfx/pokecenter_ball.2bpp" + INCBIN "gfx/overworld/heal_machine.2bpp" PokeCenterOAMData: - db $24,$34,$7C,$10 ; heal machine monitor - db $2B,$30,$7D,$10 ; pokeballs 1-6 - db $2B,$38,$7D,$30 - db $30,$30,$7D,$10 - db $30,$38,$7D,$30 - db $35,$30,$7D,$10 - db $35,$38,$7D,$30 + ; heal machine monitor + dbsprite 6, 4, 4, 4, $7c, OAM_OBP1 + ; poke balls 1-6 + dbsprite 6, 5, 0, 3, $7d, OAM_OBP1 + dbsprite 7, 5, 0, 3, $7d, OAM_OBP1 | OAM_HFLIP + dbsprite 6, 6, 0, 0, $7d, OAM_OBP1 + dbsprite 7, 6, 0, 0, $7d, OAM_OBP1 | OAM_HFLIP + dbsprite 6, 6, 0, 5, $7d, OAM_OBP1 + dbsprite 7, 6, 0, 5, $7d, OAM_OBP1 | OAM_HFLIP ; d = value to xor with palette FlashSprite8Times: ld b, 8 .loop - ld a, [rOBP1] + ldh a, [rOBP1] xor d - ld [rOBP1], a + ldh [rOBP1], a ld c, 10 call DelayFrames dec b @@ -97,16 +97,9 @@ FlashSprite8Times: CopyHealingMachineOAM: ; copy one OAM entry and advance the pointers + REPT 4 ld a, [de] inc de ld [hli], a - ld a, [de] - inc de - ld [hli], a - ld a, [de] - inc de - ld [hli], a - ld a, [de] - inc de - ld [hli], a + ENDR ret diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm old mode 100755 new mode 100644 index dcdf8537..855328e7 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -1,4 +1,4 @@ -IsPlayerOnDungeonWarp: +IsPlayerOnDungeonWarp:: xor a ld [wWhichDungeonWarp], a ld a, [wd72d] @@ -14,14 +14,14 @@ IsPlayerOnDungeonWarp: set 4, [hl] ret -; if a hidden object was found, stores $00 in [$ffee], else stores $ff -CheckForHiddenObject: - ld hl, $ffeb +; if a hidden object was found, stores $00 in [hDidntFindAnyHiddenObject], else stores $ff +CheckForHiddenObject:: + ld hl, hItemAlreadyFound xor a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a + ld [hli], a ; [hItemAlreadyFound] + ld [hli], a ; [hSavedMapTextPtr] + ld [hli], a ; [hSavedMapTextPtr + 1] + ld [hl], a ; [hDidntFindAnyHiddenObject] ld de, $0 ld hl, HiddenObjectMaps .hiddenMapLoop @@ -58,7 +58,7 @@ CheckForHiddenObject: ld [wHiddenObjectX], a ld c, a call CheckIfCoordsInFrontOfPlayerMatch - ld a, [hCoordsInFrontOfPlayerMatch] + ldh a, [hCoordsInFrontOfPlayerMatch] and a jr z, .foundMatchingObject inc hl @@ -81,13 +81,13 @@ CheckForHiddenObject: ret .noMatch ld a, $ff - ld [$ffee], a + ldh [hDidntFindAnyHiddenObject], a ret ; checks if the coordinates in front of the player's sprite match Y in b and X in c ; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match CheckIfCoordsInFrontOfPlayerMatch: - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jr z, .facingUp cp SPRITE_FACING_LEFT @@ -127,7 +127,7 @@ CheckIfCoordsInFrontOfPlayerMatch: .didNotMatch ld a, $ff .done - ld [hCoordsInFrontOfPlayerMatch], a + ldh [hCoordsInFrontOfPlayerMatch], a ret -INCLUDE "data/hidden_objects.asm" +INCLUDE "data/events/hidden_objects.asm" diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm deleted file mode 100644 index 9f19100a..00000000 --- a/engine/overworld/item.asm +++ /dev/null @@ -1,54 +0,0 @@ -PickUpItem: - call EnableAutoTextBoxDrawing - - ld a, [hSpriteIndexOrTextID] - ld b, a - ld hl, wMissableObjectList -.missableObjectsListLoop - ld a, [hli] - cp $ff - ret z - cp b - jr z, .isMissable - inc hl - jr .missableObjectsListLoop - -.isMissable - ld a, [hl] - ld [$ffdb], a - - ld hl, wMapSpriteExtraData - ld a, [hSpriteIndexOrTextID] - dec a - add a - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - ld b, a ; item - ld c, 1 ; quantity - call GiveItem - jr nc, .BagFull - - ld a, [$ffdb] - ld [wMissableObjectIndex], a - predef HideObject - ld a, 1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, FoundItemText - jr .print - -.BagFull - ld hl, NoMoreRoomForItemText -.print - call PrintText - ret - -FoundItemText: - TX_FAR _FoundItemText - TX_SFX_ITEM_1 - db "@" - -NoMoreRoomForItemText: - TX_FAR _NoMoreRoomForItemText - db "@" diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm old mode 100755 new mode 100644 index 342540b2..f01ae5ef --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -1,4 +1,4 @@ -HandleLedges: +HandleLedges:: ld a, [wd736] bit 6, a ; already jumping down ledge ret nz @@ -6,9 +6,9 @@ HandleLedges: and a ; OVERWORLD ret nz predef GetTileAndCoordsInFrontOfPlayer - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] ld b, a - aCoord 8, 9 + lda_coord 8, 9 ld c, a ld a, [wTileInFrontOfPlayer] ld d, a @@ -36,7 +36,7 @@ HandleLedges: inc hl jr .loop .foundMatch - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and e ret z ld a, $ff @@ -54,20 +54,10 @@ HandleLedges: call PlaySound ret - ; (player direction) (tile player standing on) (ledge tile) (input required) -LedgeTiles: - db SPRITE_FACING_DOWN, $2C,$37,D_DOWN - db SPRITE_FACING_DOWN, $39,$36,D_DOWN - db SPRITE_FACING_DOWN, $39,$37,D_DOWN - db SPRITE_FACING_LEFT, $2C,$27,D_LEFT - db SPRITE_FACING_LEFT, $39,$27,D_LEFT - db SPRITE_FACING_RIGHT,$2C,$0D,D_RIGHT - db SPRITE_FACING_RIGHT,$2C,$1D,D_RIGHT - db SPRITE_FACING_RIGHT,$39,$0D,D_RIGHT - db $FF +INCLUDE "data/tilesets/ledge_tiles.asm" LoadHoppingShadowOAM: - ld hl, vChars1 + $7f0 + ld hl, vChars1 tile $7f ld de, LedgeHoppingShadow lb bc, BANK(LedgeHoppingShadow), (LedgeHoppingShadowEnd - LedgeHoppingShadow) / $8 call CopyVideoDataDouble @@ -78,9 +68,9 @@ LoadHoppingShadowOAM: ret LedgeHoppingShadow: - INCBIN "gfx/ledge_hopping_shadow.1bpp" + INCBIN "gfx/overworld/shadow.1bpp" LedgeHoppingShadowEnd: LedgeHoppingShadowOAM: - db $FF,$10,$FF,$20 - db $FF,$40,$FF,$60 + dbsprite 2, -1, 0, 7, $ff, OAM_HFLIP + dbsprite 8, -1, 0, 7, $ff, OAM_HFLIP | OAM_VFLIP diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm deleted file mode 100644 index d1a411fa..00000000 --- a/engine/overworld/map_sprite_functions1.asm +++ /dev/null @@ -1,356 +0,0 @@ -_UpdateSprites: - ld h, $c1 - inc h - ld a, $e ; wSpriteStateData2 + $0e -.spriteLoop - ld l, a - sub $e - ld c, a - ld [H_CURRENTSPRITEOFFSET], a - ld a, [hl] - and a - jr z, .skipSprite ; tests $c2Xe - push hl - push de - push bc - call .updateCurrentSprite - pop bc - pop de - pop hl -.skipSprite - ld a, l - add $10 ; move to next sprite - cp $e ; test for overflow (back at $0e) - jr nz, .spriteLoop - ret -.updateCurrentSprite - cp $1 - jp nz, UpdateNonPlayerSprite - jp UpdatePlayerSprite - -UpdateNonPlayerSprite: - dec a - swap a - ld [$ff93], a ; $10 * sprite# - ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset? - ld b, a - ld a, [H_CURRENTSPRITEOFFSET] - cp b - jr nz, .unequal - jp DoScriptedNPCMovement -.unequal - jp UpdateNPCSprite - -; This detects if the current sprite (whose offset is at H_CURRENTSPRITEOFFSET) -; is going to collide with another sprite by looping over the other sprites. -; The current sprite's offset will be labelled with i (e.g. $c1i0). -; The loop sprite's offset will labelled with j (e.g. $c1j0). -; -; Note that the Y coordinate of the sprite (in [$c1k4]) is one of the following -; 9 values when the sprite is aligned with the grid: $fc, $0c, $1c, $2c, ..., $7c. -; The reason that 4 is added below to the coordinate is to make it align with a -; multiple of $10 to make comparisons easier. -DetectCollisionBetweenSprites: - nop - - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add wSpriteStateData1 % $100 - ld l, a - - ld a, [hl] ; a = [$c1i0] (picture) (0 if slot is unused) - and a ; is this sprite slot slot used? - ret z ; return if not used - - ld a, l - add 3 - ld l, a - - ld a, [hli] ; a = [$c1i3] (delta Y) (-1, 0, or 1) - call SetSpriteCollisionValues - - ld a, [hli] ; a = [$C1i4] (Y screen coordinate) - add 4 ; align with multiple of $10 - -; The effect of the following 3 lines is to -; add 7 to a if moving south or -; subtract 7 from a if moving north. - add b - and $f0 - or c - - ld [$ff90], a ; store Y coordinate adjusted for direction of movement - - ld a, [hli] ; a = [$c1i5] (delta X) (-1, 0, or 1) - call SetSpriteCollisionValues - ld a, [hl] ; a = [$C1i6] (X screen coordinate) - -; The effect of the following 3 lines is to -; add 7 to a if moving east or -; subtract 7 from a if moving west. - add b - and $f0 - or c - - ld [$ff91], a ; store X coordinate adjusted for direction of movement - - ld a, l - add 7 - ld l, a - - xor a - ld [hld], a ; zero [$c1id] XXX what's [$c1id] for? - ld [hld], a ; zero [$c1ic] (directions in which collisions occurred) - - ld a, [$ff91] - ld [hld], a ; [$c1ib] = adjusted X coordinate - ld a, [$ff90] - ld [hl], a ; [$c1ia] = adjusted Y coordinate - - xor a ; zero the loop counter - -.loop - ld [$ff8f], a ; store loop counter - swap a - ld e, a - ld a, [H_CURRENTSPRITEOFFSET] - cp e ; does the loop sprite match the current sprite? - jp z, .next ; go to the next sprite if they match - - ld d, h - ld a, [de] ; a = [$c1j0] (picture) (0 if slot is unused) - and a ; is this sprite slot slot used? - jp z, .next ; go the next sprite if not used - - inc e - inc e - ld a, [de] ; a = [$c1j2] ($ff means the sprite is offscreen) - inc a - jp z, .next ; go the next sprite if offscreen - - ld a, [H_CURRENTSPRITEOFFSET] - add 10 - ld l, a - - inc e - ld a, [de] ; a = [$c1j3] (delta Y) - call SetSpriteCollisionValues - - inc e - ld a, [de] ; a = [$C1j4] (Y screen coordinate) - add 4 ; align with multiple of $10 - -; The effect of the following 3 lines is to -; add 7 to a if moving south or -; subtract 7 from a if moving north. - add b - and $f0 - or c - - sub [hl] ; subtract the adjusted Y coordinate of sprite i ([$c1ia]) from that of sprite j - -; calculate the absolute value of the difference to get the distance - jr nc, .noCarry1 - cpl - inc a -.noCarry1 - ld [$ff90], a ; store the distance between the two sprites' adjusted Y values - -; Use the carry flag set by the above subtraction to determine which sprite's -; Y coordinate is larger. This information is used later to set [$c1ic], -; which stores which direction the collision occurred in. -; The following 5 lines set the lowest 2 bits of c, which are later shifted left by 2. -; If sprite i's Y is larger, set lowest 2 bits of c to 10. -; If sprite j's Y is larger or both are equal, set lowest 2 bits of c to 01. - push af - rl c - pop af - ccf - rl c - -; If sprite i's delta Y is 0, then b = 7, else b = 9. - ld b, 7 - ld a, [hl] ; a = [$c1ia] (adjusted Y coordinate) - and $f - jr z, .next1 - ld b, 9 - -.next1 - ld a, [$ff90] ; a = distance between adjusted Y coordinates - sub b - ld [$ff92], a ; store distance adjusted using sprite i's direction - ld a, b - ld [$ff90], a ; store 7 or 9 depending on sprite i's delta Y - jr c, .checkXDistance - -; If sprite j's delta Y is 0, then b = 7, else b = 9. - ld b, 7 - dec e - ld a, [de] ; a = [$c1j3] (delta Y) - inc e - and a - jr z, .next2 - ld b, 9 - -.next2 - ld a, [$ff92] ; a = distance adjusted using sprite i's direction - sub b ; adjust distance using sprite j's direction - jr z, .checkXDistance - jr nc, .next ; go to next sprite if distance is still positive after both adjustments - -.checkXDistance - inc e - inc l - ld a, [de] ; a = [$c1j5] (delta X) - - push bc - - call SetSpriteCollisionValues - inc e - ld a, [de] ; a = [$c1j6] (X screen coordinate) - -; The effect of the following 3 lines is to -; add 7 to a if moving east or -; subtract 7 from a if moving west. - add b - and $f0 - or c - - pop bc - - sub [hl] ; subtract the adjusted X coordinate of sprite i ([$c1ib]) from that of sprite j - -; calculate the absolute value of the difference to get the distance - jr nc, .noCarry2 - cpl - inc a -.noCarry2 - ld [$ff91], a ; store the distance between the two sprites' adjusted X values - -; Use the carry flag set by the above subtraction to determine which sprite's -; X coordinate is larger. This information is used later to set [$c1ic], -; which stores which direction the collision occurred in. -; The following 5 lines set the lowest 2 bits of c. -; If sprite i's X is larger, set lowest 2 bits of c to 10. -; If sprite j's X is larger or both are equal, set lowest 2 bits of c to 01. - push af - rl c - pop af - ccf - rl c - -; If sprite i's delta X is 0, then b = 7, else b = 9. - ld b, 7 - ld a, [hl] ; a = [$c1ib] (adjusted X coordinate) - and $f - jr z, .next3 - ld b, 9 - -.next3 - ld a, [$ff91] ; a = distance between adjusted X coordinates - sub b - ld [$ff92], a ; store distance adjusted using sprite i's direction - ld a, b - ld [$ff91], a ; store 7 or 9 depending on sprite i's delta X - jr c, .collision - -; If sprite j's delta X is 0, then b = 7, else b = 9. - ld b, 7 - dec e - ld a, [de] ; a = [$c1j5] (delta X) - inc e - and a - jr z, .next4 - ld b, 9 - -.next4 - ld a, [$ff92] ; a = distance adjusted using sprite i's direction - sub b ; adjust distance using sprite j's direction - jr z, .collision - jr nc, .next ; go to next sprite if distance is still positive after both adjustments - -.collision - ld a, [$ff91] ; a = 7 or 9 depending on sprite i's delta X - ld b, a - ld a, [$ff90] ; a = 7 or 9 depending on sprite i's delta Y - inc l - -; If delta X isn't 0 and delta Y is 0, then b = %0011, else b = %1100. -; (note that normally if delta X isn't 0, then delta Y must be 0 and vice versa) - cp b - jr c, .next5 - ld b, %1100 - jr .next6 -.next5 - ld b, %0011 - -.next6 - ld a, c ; c has 2 bits set (one of bits 0-1 is set for the X axis and one of bits 2-3 for the Y axis) - and b ; we select either the bit in bits 0-1 or bits 2-3 based on the calculation immediately above - or [hl] ; or with existing collision direction bits in [$c1ic] - ld [hl], a ; store new value - ld a, c ; useless code because a is overwritten before being used again - -; set bit in [$c1ie] or [$c1if] to indicate which sprite the collision occurred with - inc l - inc l - ld a, [$ff8f] ; a = loop counter - ld de, SpriteCollisionBitTable - add a - add e - ld e, a - jr nc, .noCarry3 - inc d -.noCarry3 - ld a, [de] - or [hl] - ld [hli], a - inc de - ld a, [de] - or [hl] - ld [hl], a - -.next - ld a, [$ff8f] ; a = loop counter - inc a - cp $10 - jp nz, .loop - ret - -; takes delta X or delta Y in a -; b = delta X/Y -; c = 0 if delta X/Y is 0 -; c = 7 if delta X/Y is 1 -; c = 9 if delta X/Y is -1 -SetSpriteCollisionValues: - and a - ld b, 0 - ld c, 0 - jr z, .done - ld c, 9 - cp -1 - jr z, .ok - ld c, 7 - ld a, 0 -.ok - ld b, a -.done - ret - -SpriteCollisionBitTable: - db %00000000,%00000001 - db %00000000,%00000010 - db %00000000,%00000100 - db %00000000,%00001000 - db %00000000,%00010000 - db %00000000,%00100000 - db %00000000,%01000000 - db %00000000,%10000000 - db %00000001,%00000000 - db %00000010,%00000000 - db %00000100,%00000000 - db %00001000,%00000000 - db %00010000,%00000000 - db %00100000,%00000000 - db %01000000,%00000000 - db %10000000,%00000000 diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm old mode 100755 new mode 100644 index 8a6057a0..fa3a37dc --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -4,20 +4,21 @@ ; This is also called after displaying text because loading ; text tile patterns overwrites half of the sprite tile pattern data. ; Note on notation: -; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot -; fields, respectively, within loops. The X is the loop index. -; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y* -; denote fields of the sprite slots iterated over in the inner loop. -InitMapSprites: +; x#SPRITESTATEDATA1_* and x#SPRITESTATEDATA2_* are used to denote wSpriteStateData1 and +; wSpriteStateData2 sprite slot, respectively, within loops. The X is the loop index. +; If there is an inner loop, Y is the inner loop index, i.e. y#SPRITESTATEDATA1_* and +; y#SPRITESTATEDATA2_* denote fields of the sprite slots iterated over in the inner loop. +InitMapSprites:: call InitOutsideMapSprites ret c ; return if the map is an outside map (already handled by above call) ; if the map is an inside map (i.e. mapID >= $25) - ld hl, wSpriteStateData1 - ld de, wSpriteStateData2 + $0d -; Loop to copy picture ID's from $C1X0 to $C2XD for LoadMapSpriteTilePatterns. + ld hl, wSpritePlayerStateData1PictureID + ld de, wSpritePlayerStateData2PictureID +; Loop to copy picture IDs from [x#SPRITESTATEDATA1_PICTUREID] +; to [x#SPRITESTATEDATA2_PICTUREID] for LoadMapSpriteTilePatterns. .copyPictureIDLoop - ld a, [hl] ; $C1X0 (picture ID) - ld [de], a ; $C2XD + ld a, [hl] ; a = [x#SPRITESTATEDATA1_PICTUREID] + ld [de], a ; [x#SPRITESTATEDATA2_PICTUREID] = a ld a, $10 add e ld e, a @@ -37,20 +38,22 @@ LoadMapSpriteTilePatterns: .spritesExist ld c, a ; c = [wNumSprites] ld b, $10 ; number of sprite slots - ld hl, wSpriteStateData2 + $0d + ld hl, wSpritePlayerStateData2PictureID xor a - ld [hFourTileSpriteCount], a -.copyPictureIDLoop ; loop to copy picture ID from $C2XD to $C2XE - ld a, [hli] ; $C2XD (sprite picture ID) - ld [hld], a ; $C2XE + ldh [hFourTileSpriteCount], a +; Loop to copy picture IDs from [x#SPRITESTATEDATA2_PICTUREID] +; to [x#SPRITESTATEDATA2_IMAGEBASEOFFSET]. +.copyPictureIDLoop + ld a, [hli] ; a = [x#SPRITESTATEDATA2_PICTUREID] + ld [hld], a ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] = a ld a, l add $10 ld l, a dec b jr nz, .copyPictureIDLoop - ld hl, wSpriteStateData2 + $1e + ld hl, wSprite01StateData2ImageBaseOffset .loadTilePatternLoop - ld de, wSpriteStateData2 + $1d + ld de, wSprite01StateData2PictureID ; Check if the current picture ID has already had its tile patterns loaded. ; This done by looping through the previous sprite slots and seeing if any of ; their picture ID's match that of the current sprite slot. @@ -70,7 +73,7 @@ LoadMapSpriteTilePatterns: ld e, a jr .checkIfAlreadyLoadedLoop .notAlreadyLoaded - ld de, wSpriteStateData2 + $0e + ld de, wSpritePlayerStateData2ImageBaseOffset ld b, $01 ; loop to find the highest tile pattern VRAM slot (among the first 10 slots) used by a previous sprite slot ; this is done in order to find the first free VRAM slot available @@ -81,7 +84,7 @@ LoadMapSpriteTilePatterns: ld a, l cp e ; reached current slot? jr z, .foundNextVRAMSlot - ld a, [de] ; $C2YE (VRAM slot) + ld a, [de] ; y#SPRITESTATEDATA2_IMAGEBASEOFFSET cp 11 ; is it one of the first 10 slots? jr nc, .findNextVRAMSlotLoop cp b ; compare the slot being checked to the current max @@ -93,19 +96,19 @@ LoadMapSpriteTilePatterns: inc b ; increment previous max value to get next VRAM tile pattern slot ld a, b ; a = next VRAM tile pattern slot push af - ld a, [hl] ; $C2XE (sprite picture ID) + ld a, [hl] ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] ld b, a ; b = current sprite picture ID - cp SPRITE_BALL ; is it a 4-tile sprite? + cp FIRST_STILL_SPRITE ; is it a 4-tile sprite? jr c, .notFourTileSprite pop af - ld a, [hFourTileSpriteCount] + ldh a, [hFourTileSpriteCount] add 11 jr .storeVRAMSlot .notFourTileSprite pop af .storeVRAMSlot - ld [hl], a ; store VRAM slot at $C2XE - ld [hVRAMSlot], a ; used to determine if it's 4-tile sprite later + ld [hl], a ; store VRAM slot at [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] + ldh [hVRAMSlot], a ; used to determine if it's 4-tile sprite later ld a, b ; a = current sprite picture ID dec a add a @@ -127,28 +130,27 @@ LoadMapSpriteTilePatterns: push de push bc ld hl, vNPCSprites ; VRAM base address - ld bc, $c0 ; number of bytes per VRAM slot - ld a, [hVRAMSlot] + ld bc, 12 tiles ; number of bytes per VRAM slot + ldh a, [hVRAMSlot] cp 11 ; is it a 4-tile sprite? jr nc, .fourTileSpriteVRAMAddr ld d, a dec d -; Equivalent to multiplying $C0 (number of bytes in 12 tiles) times the VRAM -; slot and adding the result to $8000 (the VRAM base address). +; hl = vSprites + [hVRAMSlot] * 12 tiles .calculateVRAMAddrLoop add hl, bc dec d jr nz, .calculateVRAMAddrLoop jr .loadStillTilePattern .fourTileSpriteVRAMAddr - ld hl, vSprites + $7c0 ; address for second 4-tile sprite - ld a, [hFourTileSpriteCount] + ld hl, vSprites tile $7c ; address for second 4-tile sprite + ldh a, [hFourTileSpriteCount] and a jr nz, .loadStillTilePattern ; if it's the first 4-tile sprite - ld hl, vSprites + $780 ; address for first 4-tile sprite + ld hl, vSprites tile $78 ; address for first 4-tile sprite inc a - ld [hFourTileSpriteCount], a + ldh [hFourTileSpriteCount], a .loadStillTilePattern pop bc pop de @@ -168,7 +170,7 @@ LoadMapSpriteTilePatterns: .skipFirstLoad pop de pop hl - ld a, [hVRAMSlot] + ldh a, [hVRAMSlot] cp 11 ; is it a 4-tile sprite? jr nc, .skipSecondLoad ; if so, there is no second block push de @@ -208,20 +210,21 @@ LoadMapSpriteTilePatterns: jr .nextSpriteSlot .alreadyLoaded ; if the current picture ID has already had its tile patterns loaded inc de - ld a, [de] ; a = VRAM slot for the current picture ID (from $C2YE) - ld [hl], a ; store VRAM slot in current wSpriteStateData2 sprite slot (at $C2XE) + ld a, [de] ; a = [y#SPRITESTATEDATA2_IMAGEBASEOFFSET] + ld [hl], a ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] = a .nextSpriteSlot ld a, l add $10 ld l, a dec c jp nz, .loadTilePatternLoop - ld hl, wSpriteStateData2 + $0d + ld hl, wSpritePlayerStateData2PictureID ld b, $10 -; the pictures ID's stored at $C2XD are no longer needed, so zero them +; the pictures IDs stored at [x#SPRITESTATEDATA2_PICTUREID] are no longer needed, +; so zero them .zeroStoredPictureIDLoop xor a - ld [hl], a ; $C2XD + ld [hl], a ; [x#SPRITESTATEDATA2_PICTUREID] ld a, $10 add l ld l, a @@ -252,7 +255,7 @@ ReadSpriteSheetData: ; sets carry if the map is a city or route, unsets carry if not InitOutsideMapSprites: ld a, [wCurMap] - cp REDS_HOUSE_1F ; is the map a city or a route (map ID less than $25)? + cp FIRST_INDOOR_MAP ; is the map a city or a route? ret nc ; if not, return ld hl, MapSpriteSets add l @@ -288,20 +291,20 @@ InitOutsideMapSprites: jr nc, .noCarry2 inc d .noCarry2 - ld hl, wSpriteStateData2 + $0d + ld hl, wSpritePlayerStateData2PictureID ld a, SPRITE_RED ld [hl], a ld bc, wSpriteSet ; Load the sprite set into RAM. -; This loop also fills $C2XD (sprite picture ID) where X is from $0 to $A -; with picture ID's. This is done so that LoadMapSpriteTilePatterns will +; This loop also fills [x#SPRITESTATEDATA2_PICTUREID] where X is from $0 to $A +; with picture IDs. This is done so that LoadMapSpriteTilePatterns will ; load tile patterns for all sprite pictures in the sprite set. .loadSpriteSetLoop ld a, $10 add l ld l, a ld a, [de] ; sprite picture ID from sprite set - ld [hl], a ; $C2XD (sprite picture ID) + ld [hl], a ; [x#SPRITESTATEDATA2_PICTUREID] ld [bc], a inc de inc bc @@ -314,7 +317,7 @@ InitOutsideMapSprites: add l ld l, a xor a - ld [hl], a ; $C2XD (sprite picture ID) + ld [hl], a ; [x#SPRITESTATEDATA2_PICTUREID] dec b jr nz, .zeroRemainingSlotsLoop ld a, [wNumSprites] @@ -324,21 +327,21 @@ InitOutsideMapSprites: call LoadMapSpriteTilePatterns pop af ld [wNumSprites], a ; restore number of sprites - ld hl, wSpriteStateData2 + $1e + ld hl, wSprite01StateData2ImageBaseOffset ld b, $0f ; The VRAM tile pattern slots that LoadMapSpriteTilePatterns set are in the ; order of the map's sprite set, not the order of the actual sprites loaded ; for the current map. So, they are not needed and are zeroed by this loop. .zeroVRAMSlotsLoop xor a - ld [hl], a ; $C2XE (VRAM slot) + ld [hl], a ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] ld a, $10 add l ld l, a dec b jr nz, .zeroVRAMSlotsLoop .skipLoadingSpriteSet - ld hl, wSpriteStateData1 + $10 + ld hl, wSprite01StateData1 ; This loop stores the correct VRAM tile pattern slots according the sprite ; data from the map's header. Since the VRAM tile pattern slots are filled in ; the order of the sprite set, in order to find the VRAM tile pattern slot @@ -348,7 +351,7 @@ InitOutsideMapSprites: ; VRAM tile pattern slot. .storeVRAMSlotsLoop ld c, 0 - ld a, [hl] ; $C1X0 (picture ID) (zero if sprite slot is not used) + ld a, [hl] ; [x#SPRITESTATEDATA1_PICTUREID] (zero if sprite slot is not used) and a ; is the sprite slot used? jr z, .skipGettingPictureIndex ; if the sprite slot is not used ld b, a ; b = picture ID @@ -368,7 +371,7 @@ InitOutsideMapSprites: add l ld l, a ld a, c ; a = VRAM slot (zero if sprite slot is not used) - ld [hl], a ; $C2XE (VRAM slot) + ld [hl], a ; [x#SPRITESTATEDATA2_IMAGEBASEOFFSET] pop hl ld a, $10 add l @@ -437,4 +440,6 @@ GetSplitMapSpriteSetID: ld a, $01 ret -INCLUDE "data/sprite_sets.asm" +INCLUDE "data/maps/sprite_sets.asm" + +INCLUDE "data/sprites/sprites.asm" diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm index 8587c0f7..31fdc257 100644 --- a/engine/overworld/missable_objects.asm +++ b/engine/overworld/missable_objects.asm @@ -1,6 +1,6 @@ -MarkTownVisitedAndLoadMissableObjects: +MarkTownVisitedAndLoadMissableObjects:: ld a, [wCurMap] - cp ROUTE_1 + cp FIRST_ROUTE_MAP jr nc, .notInTown ld c, a ld b, FLAG_SET @@ -20,7 +20,7 @@ MarkTownVisitedAndLoadMissableObjects: LoadMissableObjects: ld l, a push hl - ld de, MapHS00 ; calculate difference between out pointer and the base pointer + ld de, MissableObjects ; calculate difference between out pointer and the base pointer ld a, l sub e jr nc, .asm_f13c @@ -31,25 +31,25 @@ LoadMissableObjects: sub d ld h, a ld a, h - ld [H_DIVIDEND], a + ldh [hDividend], a ld a, l - ld [H_DIVIDEND+1], a + ldh [hDividend+1], a xor a - ld [H_DIVIDEND+2], a - ld [H_DIVIDEND+3], a + ldh [hDividend+2], a + ldh [hDividend+3], a ld a, $3 - ld [H_DIVISOR], a + ldh [hDivisor], a ld b, $2 call Divide ; divide difference by 3, resulting in the global offset (number of missable items before ours) ld a, [wCurMap] ld b, a - ld a, [H_DIVIDEND+3] + ldh a, [hDividend+3] ld c, a ; store global offset in c ld de, wMissableObjectList pop hl .writeMissableObjectsListLoop ld a, [hli] - cp $ff + cp -1 jr z, .done ; end of list cp b jr nz, .done ; not for current map anymore @@ -63,7 +63,7 @@ LoadMissableObjects: inc de jr .writeMissableObjectsListLoop .done - ld a, $ff + ld a, -1 ld [de], a ; write sentinel ret @@ -72,17 +72,17 @@ InitializeMissableObjectsFlags: ld bc, wMissableObjectFlagsEnd - wMissableObjectFlags xor a call FillMemory ; clear missable objects flags - ld hl, MapHS00 + ld hl, MissableObjects xor a ld [wMissableObjectCounter], a .missableObjectsLoop ld a, [hli] - cp $ff ; end of list + cp -1 ; end of list ret z push hl inc hl ld a, [hl] - cp Hide + cp HIDE jr nz, .skip ld hl, wMissableObjectFlags ld a, [wMissableObjectCounter] @@ -99,13 +99,13 @@ InitializeMissableObjectsFlags: ; tests if current sprite is a missable object that is hidden/has been removed IsObjectHidden: - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] swap a ld b, a ld hl, wMissableObjectList .loop ld a, [hli] - cp $ff + cp -1 jr z, .notHidden ; not missable -> not hidden cp b ld a, [hli] @@ -120,7 +120,7 @@ IsObjectHidden: .notHidden xor a .hidden - ld [$ffe5], a + ldh [hIsHiddenMissableObject], a ret ; adds missable object (items, leg. pokemon, etc.) to the map diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 2b61ea05..19a4ceb3 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,27 +1,29 @@ +MAP_TILESET_SIZE EQU $60 + UpdatePlayerSprite: - ld a, [wSpriteStateData2] + ld a, [wSpritePlayerStateData2WalkAnimationCounter] and a jr z, .checkIfTextBoxInFrontOfSprite cp $ff jr z, .disableSprite dec a - ld [wSpriteStateData2], a + ld [wSpritePlayerStateData2WalkAnimationCounter], a jr .disableSprite ; check if a text box is in front of the sprite by checking if the lower left ; background tile the sprite is standing on is greater than $5F, which is ; the maximum number for map tiles .checkIfTextBoxInFrontOfSprite - aCoord 8, 9 - ld [hTilePlayerStandingOn], a - cp $60 + lda_coord 8, 9 + ldh [hTilePlayerStandingOn], a + cp MAP_TILESET_SIZE jr c, .lowerLeftTileIsMapTile .disableSprite ld a, $ff - ld [wSpriteStateData1 + 2], a + ld [wSpritePlayerStateData1ImageIndex], a ret .lowerLeftTileIsMapTile call DetectCollisionBetweenSprites - ld h, wSpriteStateData1 / $100 + ld h, HIGH(wSpriteStateData1) ld a, [wWalkCounter] and a jr nz, .moving @@ -49,11 +51,11 @@ UpdatePlayerSprite: .notMoving ; zero the animation counters xor a - ld [wSpriteStateData1 + 7], a - ld [wSpriteStateData1 + 8], a + ld [wSpritePlayerStateData1IntraAnimFrameCounter], a + ld [wSpritePlayerStateData1AnimFrameCounter], a jr .calcImageIndex .next - ld [wSpriteStateData1 + 9], a ; facing direction + ld [wSpritePlayerStateData1FacingDirection], a ld a, [wFontLoaded] bit 0, a jr nz, .notMoving @@ -61,7 +63,7 @@ UpdatePlayerSprite: ld a, [wd736] bit 7, a ; is the player sprite spinning due to a spin tile? jr nz, .skipSpriteAnim - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $7 ld l, a ld a, [hl] @@ -77,31 +79,31 @@ UpdatePlayerSprite: and $3 ld [hl], a .calcImageIndex - ld a, [wSpriteStateData1 + 8] + ld a, [wSpritePlayerStateData1AnimFrameCounter] ld b, a - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] add b - ld [wSpriteStateData1 + 2], a + ld [wSpritePlayerStateData1ImageIndex], a .skipSpriteAnim ; If the player is standing on a grass tile, make the player's sprite have ; lower priority than the background so that it's partially obscured by the ; grass. Only the lower half of the sprite is permitted to have the priority ; bit set by later logic. - ld a, [hTilePlayerStandingOn] + ldh a, [hTilePlayerStandingOn] ld c, a ld a, [wGrassTile] cp c - ld a, $0 + ld a, 0 jr nz, .next2 - ld a, $80 + ld a, OAM_BEHIND_BG .next2 - ld [wSpriteStateData2 + 7], a + ld [wSpritePlayerStateData2GrassPriority], a ret UnusedReadSpriteDataFunction: push bc push af - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] ld c, a pop af add c @@ -110,7 +112,7 @@ UnusedReadSpriteDataFunction: ret UpdateNPCSprite: - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] swap a dec a add a @@ -122,20 +124,20 @@ UpdateNPCSprite: .nc ld a, [hl] ; read movement byte 2 ld [wCurSpriteMovement2], a - ld h, $c1 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] ld l, a inc l - ld a, [hl] ; c1x1 + ld a, [hl] ; x#SPRITESTATEDATA1_MOVEMENTSTATUS and a jp z, InitializeSpriteStatus call CheckSpriteAvailability - ret c ; if sprite is invisible, on tile >=$60, in grass or player is currently walking - ld h, $c1 - ld a, [H_CURRENTSPRITEOFFSET] + ret c ; if sprite is invisible, on tile >=MAP_TILESET_SIZE, in grass or player is currently walking + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] ld l, a inc l - ld a, [hl] ; c1x1 + ld a, [hl] ; x#SPRITESTATEDATA1_MOVEMENTSTATUS bit 7, a ; is the face player flag set? jp nz, MakeNPCFacePlayer ld b, a @@ -144,22 +146,22 @@ UpdateNPCSprite: jp nz, notYetMoving ld a, b cp $2 - jp z, UpdateSpriteMovementDelay ; c1x1 == 2 + jp z, UpdateSpriteMovementDelay ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] == 2 cp $3 - jp z, UpdateSpriteInWalkingAnimation ; c1x1 == 3 + jp z, UpdateSpriteInWalkingAnimation ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] == 3 ld a, [wWalkCounter] and a ret nz ; don't do anything yet if player is currently moving (redundant, already tested in CheckSpriteAvailability) call InitializeSpriteScreenPosition - ld h, $c2 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] add $6 ld l, a - ld a, [hl] ; c2x6: movement byte 1 + ld a, [hl] ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 inc a - jr z, .randomMovement ; value $FF + jr z, .randomMovement ; value STAY inc a - jr z, .randomMovement ; value $FE + jr z, .randomMovement ; value WALK ; scripted movement dec a ld [hl], a ; increment movement byte 1 (movement data index) @@ -170,7 +172,7 @@ UpdateNPCSprite: pop hl ld de, wNPCMovementDirections call LoadDEPlusA ; a = [wNPCMovementDirections + movement byte 1] - cp $e0 + cp NPC_CHANGE_FACING jp z, ChangeFacingDirection cp STAY jr nz, .next @@ -185,7 +187,7 @@ UpdateNPCSprite: .next cp WALK jr nz, .determineDirection -; current NPC movement data is $fe. this seems buggy +; current NPC movement data is WALK ($fe). this seems buggy ld [hl], $1 ; set movement byte 1 to $1 ld de, wNPCMovementDirections call LoadDEPlusA ; a = [wNPCMovementDirections + $fe] (?) @@ -196,20 +198,20 @@ UpdateNPCSprite: .determineDirection ld b, a ld a, [wCurSpriteMovement2] - cp $d0 - jr z, .moveDown ; movement byte 2 = $d0 forces down - cp $d1 - jr z, .moveUp ; movement byte 2 = $d1 forces up - cp $d2 - jr z, .moveLeft ; movement byte 2 = $d2 forces left - cp $d3 - jr z, .moveRight ; movement byte 2 = $d3 forces right + cp DOWN + jr z, .moveDown + cp UP + jr z, .moveUp + cp LEFT + jr z, .moveLeft + cp RIGHT + jr z, .moveRight ld a, b - cp $40 ; a < $40: down (or left) + cp NPC_MOVEMENT_UP ; NPC_MOVEMENT_DOWN <= a < NPC_MOVEMENT_UP: down (or left) jr nc, .notDown ld a, [wCurSpriteMovement2] - cp $2 - jr z, .moveLeft ; movement byte 2 = $2 only allows left or right + cp LEFT_RIGHT + jr z, .moveLeft .moveDown ld de, 2*SCREEN_WIDTH add hl, de ; move tile pointer two rows down @@ -217,11 +219,11 @@ UpdateNPCSprite: lb bc, 4, SPRITE_FACING_DOWN jr TryWalking .notDown - cp $80 ; $40 <= a < $80: up (or right) + cp NPC_MOVEMENT_LEFT ; NPC_MOVEMENT_UP <= a < NPC_MOVEMENT_LEFT: up (or right) jr nc, .notUp ld a, [wCurSpriteMovement2] - cp $2 - jr z, .moveRight ; movement byte 2 = $2 only allows left or right + cp LEFT_RIGHT + jr z, .moveRight .moveUp ld de, -2*SCREEN_WIDTH add hl, de ; move tile pointer two rows up @@ -229,21 +231,21 @@ UpdateNPCSprite: lb bc, 8, SPRITE_FACING_UP jr TryWalking .notUp - cp $c0 ; $80 <= a < $c0: left (or up) + cp NPC_MOVEMENT_RIGHT ; NPC_MOVEMENT_LEFT <= a < NPC_MOVEMENT_RIGHT: left (or up) jr nc, .notLeft ld a, [wCurSpriteMovement2] - cp $1 - jr z, .moveUp ; movement byte 2 = $1 only allows up or down + cp UP_DOWN + jr z, .moveUp .moveLeft dec hl dec hl ; move tile pointer two columns left lb de, 0, -1 lb bc, 2, SPRITE_FACING_LEFT jr TryWalking -.notLeft ; $c0 <= a: right (or down) +.notLeft ; NPC_MOVEMENT_RIGHT <= a: right (or down) ld a, [wCurSpriteMovement2] - cp $1 - jr z, .moveDown ; movement byte 2 = $1 only allows up or down + cp UP_DOWN + jr z, .moveDown .moveRight inc hl inc hl ; move tile pointer two columns right @@ -264,143 +266,145 @@ ChangeFacingDirection: ; set carry on failure, clears carry on success TryWalking: push hl - ld h, $c1 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] add $9 ld l, a - ld [hl], c ; c1x9 (update facing direction) - ld a, [H_CURRENTSPRITEOFFSET] + ld [hl], c ; x#SPRITESTATEDATA1_FACINGDIRECTION + ldh a, [hCurrentSpriteOffset] add $3 ld l, a - ld [hl], d ; c1x3 (update Y movement delta) + ld [hl], d ; x#SPRITESTATEDATA1_YSTEPVECTOR inc l inc l - ld [hl], e ; c1x5 (update X movement delta) + ld [hl], e ; x#SPRITESTATEDATA1_XSTEPVECTOR pop hl push de ld c, [hl] ; read tile to walk onto call CanWalkOntoTile pop de ret c ; cannot walk there (reinitialization of delay values already done) - ld h, $c2 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] add $4 ld l, a - ld a, [hl] ; c2x4: Y position + ld a, [hl] ; x#SPRITESTATEDATA2_MAPY add d ld [hli], a ; update Y position - ld a, [hl] ; c2x5: X position + ld a, [hl] ; x#SPRITESTATEDATA2_MAPX add e ld [hl], a ; update X position - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] ld l, a - ld [hl], $10 ; c2x0=16: walk animation counter + ld [hl], $10 ; [x#SPRITESTATEDATA2_WALKANIMATIONCOUNTER] = 16 dec h inc l - ld [hl], $3 ; c1x1: set movement status to walking + ld [hl], $3 ; x#SPRITESTATEDATA1_MOVEMENTSTATUS jp UpdateSpriteImage ; update the walking animation parameters for a sprite that is currently walking UpdateSpriteInWalkingAnimation: - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $7 ld l, a - ld a, [hl] ; c1x7 (counter until next walk animation frame) + ld a, [hl] ; x#SPRITESTATEDATA1_INTRAANIMFRAMECOUNTER inc a - ld [hl], a ; c1x7 += 1 + ld [hl], a ; [x#SPRITESTATEDATA1_INTRAANIMFRAMECOUNTER]++ cp $4 jr nz, .noNextAnimationFrame xor a - ld [hl], a ; c1x7 = 0 + ld [hl], a ; [x#SPRITESTATEDATA1_INTRAANIMFRAMECOUNTER] = 0 inc l - ld a, [hl] ; c1x8 (walk animation frame) + ld a, [hl] ; x#SPRITESTATEDATA1_ANIMFRAMECOUNTER inc a and $3 ld [hl], a ; advance to next animation frame every 4 ticks (16 ticks total for one step) .noNextAnimationFrame - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $3 ld l, a - ld a, [hli] ; c1x3 (movement Y delta) + ld a, [hli] ; x#SPRITESTATEDATA1_YSTEPVECTOR ld b, a - ld a, [hl] ; c1x4 (screen Y position) + ld a, [hl] ; x#SPRITESTATEDATA1_YPIXELS add b - ld [hli], a ; update screen Y position - ld a, [hli] ; c1x5 (movement X delta) + ld [hli], a ; update [x#SPRITESTATEDATA1_YPIXELS] + ld a, [hli] ; x#SPRITESTATEDATA1_XSTEPVECTOR ld b, a - ld a, [hl] ; c1x6 (screen X position) + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS add b - ld [hl], a ; update screen X position - ld a, [H_CURRENTSPRITEOFFSET] + ld [hl], a ; update [x#SPRITESTATEDATA1_XPIXELS] + ldh a, [hCurrentSpriteOffset] ld l, a inc h - ld a, [hl] ; c2x0 (walk animation counter) + ld a, [hl] ; x#SPRITESTATEDATA2_WALKANIMATIONCOUNTER dec a ld [hl], a ; update walk animation counter ret nz ld a, $6 ; walking finished, update state add l ld l, a - ld a, [hl] ; c2x6 (movement byte 1) - cp $fe - jr nc, .initNextMovementCounter ; values $fe and $ff - ld a, [H_CURRENTSPRITEOFFSET] + ld a, [hl] ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 + cp WALK + jr nc, .initNextMovementCounter ; values WALK or STAY + ldh a, [hCurrentSpriteOffset] inc a ld l, a dec h - ld [hl], $1 ; c1x1 = 1 (movement status ready) + ld [hl], $1 ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] = 1 (movement status ready) ret .initNextMovementCounter call Random - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $8 ld l, a - ld a, [hRandomAdd] + ldh a, [hRandomAdd] and $7f - ld [hl], a ; c2x8: set next movement delay to a random value in [0,$7f] - dec h ; note that value 0 actually makes the delay $100 (bug?) - ld a, [H_CURRENTSPRITEOFFSET] + ld [hl], a ; x#SPRITESTATEDATA2_MOVEMENTDELAY: + ; set next movement delay to a random value in [0,$7f] + ; note that value 0 actually makes the delay $100 (bug?) + dec h ; HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] inc a ld l, a - ld [hl], $2 ; c1x1 = 2 (movement status) + ld [hl], $2 ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] = 2 (movement status) inc l inc l xor a - ld b, [hl] ; c1x3 (movement Y delta) - ld [hli], a ; reset movement Y delta + ld b, [hl] ; x#SPRITESTATEDATA1_YSTEPVECTOR + ld [hli], a ; [x#SPRITESTATEDATA1_YSTEPVECTOR] = 0 inc l - ld c, [hl] ; c1x5 (movement X delta) - ld [hl], a ; reset movement X delta + ld c, [hl] ; x#SPRITESTATEDATA1_XSTEPVECTOR + ld [hl], a ; [x#SPRITESTATEDATA1_XSTEPVECTOR] = 0 ret -; update delay value (c2x8) for sprites in the delayed state (c1x1) +; update [x#SPRITESTATEDATA2_MOVEMENTDELAY] for sprites in the delayed state (x#SPRITESTATEDATA1_MOVEMENTSTATUS) UpdateSpriteMovementDelay: - ld h, $c2 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] add $6 ld l, a - ld a, [hl] ; c2x6: movement byte 1 + ld a, [hl] ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 inc l inc l - cp $fe - jr nc, .tickMoveCounter ; values $fe or $ff + cp WALK + jr nc, .tickMoveCounter ; values WALK or STAY ld [hl], $0 jr .moving .tickMoveCounter - dec [hl] ; c2x8: frame counter until next movement + dec [hl] ; x#SPRITESTATEDATA2_MOVEMENTDELAY jr nz, notYetMoving .moving dec h - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] inc a ld l, a - ld [hl], $1 ; c1x1 = 1 (mark as ready to move) + ld [hl], $1 ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] = 1 (mark as ready to move) notYetMoving: - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $8 + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_ANIMFRAMECOUNTER ld l, a - ld [hl], $0 ; c1x8 = 0 (walk animation frame) + ld [hl], $0 ; [x#SPRITESTATEDATA1_ANIMFRAMECOUNTER] = 0 (walk animation frame) jp UpdateSpriteImage MakeNPCFacePlayer: @@ -430,108 +434,108 @@ MakeNPCFacePlayer: .notFacingRight ld c, SPRITE_FACING_LEFT .facingDirectionDetermined - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $9 ld l, a - ld [hl], c ; c1x9: set facing direction + ld [hl], c ; [x#SPRITESTATEDATA1_FACINGDIRECTION]: set facing direction jr notYetMoving InitializeSpriteStatus: - ld [hl], $1 ; $c1x1: set movement status to ready + ld [hl], $1 ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] = ready inc l - ld [hl], $ff ; $c1x2: set sprite image to $ff (invisible/off screen) - inc h - ld a, [H_CURRENTSPRITEOFFSET] + ld [hl], $ff ; [x#SPRITESTATEDATA1_IMAGEINDEX] = invisible/off screen + inc h ; HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] add $2 ld l, a ld a, $8 - ld [hli], a ; $c2x2: set Y displacement to 8 - ld [hl], a ; $c2x3: set X displacement to 8 + ld [hli], a ; [x#SPRITESTATEDATA2_YDISPLACEMENT] = 8 + ld [hl], a ; [x#SPRITESTATEDATA2_XDISPLACEMENT] = 8 ret -; calculates the sprite's screen position form its map position and the player position +; calculates the sprite's screen position from its map position and the player position InitializeSpriteScreenPosition: - ld h, wSpriteStateData2 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $4 + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA2_MAPY ld l, a ld a, [wYCoord] ld b, a - ld a, [hl] ; c2x4 (Y position + 4) + ld a, [hl] ; x#SPRITESTATEDATA2_MAPY sub b ; relative to player position swap a ; * 16 sub $4 ; - 4 dec h - ld [hli], a ; c1x4 (screen Y position) + ld [hli], a ; [x#SPRITESTATEDATA1_YPIXELS] inc h ld a, [wXCoord] ld b, a - ld a, [hli] ; c2x6 (X position + 4) + ld a, [hli] ; x#SPRITESTATEDATA2_MAPX sub b ; relative to player position swap a ; * 16 dec h - ld [hl], a ; c1x6 (screen X position) + ld [hl], a ; [x#SPRITESTATEDATA1_XPIXELS] ret ; tests if sprite is off screen or otherwise unable to do anything CheckSpriteAvailability: predef IsObjectHidden - ld a, [$ffe5] + ldh a, [hIsHiddenMissableObject] and a jp nz, .spriteInvisible - ld h, wSpriteStateData2 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $6 + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA2_MOVEMENTBYTE1 ld l, a - ld a, [hl] ; c2x6: movement byte 1 - cp $fe - jr c, .skipXVisibilityTest ; movement byte 1 < $fe (i.e. the sprite's movement is scripted) - ld a, [H_CURRENTSPRITEOFFSET] - add $4 + ld a, [hl] ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 + cp WALK + jr c, .skipXVisibilityTest ; movement byte 1 < WALK (i.e. the sprite's movement is scripted) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA2_MAPY ld l, a - ld b, [hl] ; c2x4: Y pos (+4) + ld b, [hl] ; x#SPRITESTATEDATA2_MAPY ld a, [wYCoord] cp b jr z, .skipYVisibilityTest jr nc, .spriteInvisible ; above screen region - add $8 ; screen is 9 tiles high + add SCREEN_HEIGHT / 2 - 1 cp b jr c, .spriteInvisible ; below screen region .skipYVisibilityTest inc l - ld b, [hl] ; c2x5: X pos (+4) + ld b, [hl] ; x#SPRITESTATEDATA2_MAPX ld a, [wXCoord] cp b jr z, .skipXVisibilityTest jr nc, .spriteInvisible ; left of screen region - add $9 ; screen is 10 tiles wide + add SCREEN_WIDTH / 2 - 1 cp b jr c, .spriteInvisible ; right of screen region .skipXVisibilityTest ; make the sprite invisible if a text box is in front of it ; $5F is the maximum number for map tiles call GetTileSpriteStandsOn - ld d, $60 + ld d, MAP_TILESET_SIZE ld a, [hli] cp d - jr nc, .spriteInvisible ; standing on tile with ID >=$60 (bottom left tile) + jr nc, .spriteInvisible ; standing on tile with ID >=MAP_TILESET_SIZE (bottom left tile) ld a, [hld] cp d - jr nc, .spriteInvisible ; standing on tile with ID >=$60 (bottom right tile) - ld bc, -20 + jr nc, .spriteInvisible ; standing on tile with ID >=MAP_TILESET_SIZE (bottom right tile) + ld bc, -SCREEN_WIDTH add hl, bc ; go back one row of tiles ld a, [hli] cp d - jr nc, .spriteInvisible ; standing on tile with ID >=$60 (top left tile) + jr nc, .spriteInvisible ; standing on tile with ID >=MAP_TILESET_SIZE (top left tile) ld a, [hl] cp d - jr c, .spriteVisible ; standing on tile with ID >=$60 (top right tile) + jr c, .spriteVisible ; standing on tile with ID >=MAP_TILESET_SIZE (top right tile) .spriteInvisible - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $2 + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_IMAGEINDEX ld l, a - ld [hl], $ff ; c1x2 + ld [hl], $ff ; x#SPRITESTATEDATA1_IMAGEINDEX scf jr .done .spriteVisible @@ -541,37 +545,37 @@ CheckSpriteAvailability: jr nz, .done ; if player is currently walking, we're done call UpdateSpriteImage inc h - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $7 ld l, a ld a, [wGrassTile] cp c - ld a, $0 + ld a, 0 jr nz, .notInGrass - ld a, $80 + ld a, OAM_BEHIND_BG .notInGrass - ld [hl], a ; c2x7 + ld [hl], a ; x#SPRITESTATEDATA2_GRASSPRIORITY and a .done ret UpdateSpriteImage: - ld h, $c1 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] add $8 ld l, a - ld a, [hli] ; c1x8: walk animation frame + ld a, [hli] ; x#SPRITESTATEDATA1_ANIMFRAMECOUNTER ld b, a - ld a, [hl] ; c1x9: facing direction + ld a, [hl] ; x#SPRITESTATEDATA1_FACINGDIRECTION add b ld b, a - ld a, [$ff93] ; current sprite offset + ldh a, [hTilePlayerStandingOn] add b ld b, a - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $2 ld l, a - ld [hl], b ; c1x2: sprite to display + ld [hl], b ; x#SPRITESTATEDATA1_IMAGEINDEX ret ; tests if sprite can walk the specified direction @@ -581,13 +585,13 @@ UpdateSpriteImage: ; e: X movement delta (-1, 0 or 1) ; set carry on failure, clears carry on success CanWalkOntoTile: - ld h, wSpriteStateData2 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $6 + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA2_MOVEMENTBYTE1 ld l, a - ld a, [hl] ; c2x6 (movement byte 1) - cp $fe - jr nc, .notScripted ; values $fe and $ff + ld a, [hl] ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 + cp WALK + jr nc, .notScripted ; values WALK or STAY ; always allow walking if the movement is scripted and a ret @@ -602,24 +606,24 @@ CanWalkOntoTile: jr z, .impassable cp c jr nz, .tilePassableLoop - ld h, $c2 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] add $6 ld l, a - ld a, [hl] ; $c2x6 (movement byte 1) + ld a, [hl] ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 inc a jr z, .impassable ; if $ff, no movement allowed (however, changing direction is) - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $4 + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_YPIXELS ld l, a - ld a, [hli] ; c1x4 (screen Y pos) + ld a, [hli] ; x#SPRITESTATEDATA1_YPIXELS add $4 ; align to blocks (Y pos is always 4 pixels off) add d ; add Y delta cp $80 ; if value is >$80, the destination is off screen (either $81 or $FF underflow) jr nc, .impassable ; don't walk off screen inc l - ld a, [hl] ; c1x6 (screen X pos) + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS add e ; add X delta cp $90 ; if value is >$90, the destination is off screen (either $91 or $FF underflow) jr nc, .impassable ; don't walk off screen @@ -628,30 +632,35 @@ CanWalkOntoTile: call DetectCollisionBetweenSprites pop bc pop de - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] add $c ld l, a - ld a, [hl] ; c1xc (directions in which sprite collision would occur) + ld a, [hl] ; x#SPRITESTATEDATA1_COLLISIONDATA (directions in which sprite collision would occur) and b ; check against chosen direction (1,2,4 or 8) jr nz, .impassable ; collision between sprites, don't go there - ld h, wSpriteStateData2 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $2 + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA2_YDISPLACEMENT ld l, a - ld a, [hli] ; c2x2 (sprite Y displacement, initialized at $8, keep track of where a sprite did go) + ld a, [hli] ; x#SPRITESTATEDATA2_YDISPLACEMENT (initialized at $8, keep track of where a sprite did go) bit 7, d ; check if going upwards (d=$ff) jr nz, .upwards add d + ; bug: these tests against $5 probably were supposed to prevent + ; sprites from walking out too far, but this line makes sprites get + ; stuck whenever they walked upwards 5 steps + ; on the other hand, the amount a sprite can walk out to the + ; right of bottom is not limited (until the counter overflows) cp $5 - jr c, .impassable ; if c2x2+d < 5, don't go ;bug: this tests probably were supposed to prevent sprites - jr .checkHorizontal ; from walking out too far, but this line makes sprites get stuck -.upwards ; whenever they walked upwards 5 steps - sub $1 ; on the other hand, the amount a sprite can walk out to the - jr c, .impassable ; if d2x2 == 0, don't go ; right of bottom is not limited (until the counter overflows) + jr c, .impassable ; if [x#SPRITESTATEDATA2_YDISPLACEMENT]+d < 5, don't go + jr .checkHorizontal +.upwards + sub $1 + jr c, .impassable ; if [x#SPRITESTATEDATA2_YDISPLACEMENT] == 0, don't go .checkHorizontal ld d, a - ld a, [hl] ; c2x3 (sprite X displacement, initialized at $8, keep track of where a sprite did go) + ld a, [hl] ; x#SPRITESTATEDATA2_XDISPLACEMENT (initialized at $8, keep track of where a sprite did go) bit 7, e ; check if going left (e=$ff) jr nz, .left add e @@ -659,32 +668,32 @@ CanWalkOntoTile: jr .passable .left sub $1 - jr c, .impassable ; if d2x3 == 0, don't go + jr c, .impassable ; if [x#SPRITESTATEDATA2_XDISPLACEMENT] == 0, don't go .passable - ld [hld], a ; update c2x3 - ld [hl], d ; update c2x2 + ld [hld], a ; update x#SPRITESTATEDATA2_XDISPLACEMENT + ld [hl], d ; update x#SPRITESTATEDATA2_YDISPLACEMENT and a ; clear carry (marking success) ret .impassable - ld h, $c1 - ld a, [H_CURRENTSPRITEOFFSET] + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] inc a ld l, a - ld [hl], $2 ; c1x1 = 2 (set movement status to delayed) + ld [hl], $2 ; [x#SPRITESTATEDATA1_MOVEMENTSTATUS] = 2 (delayed) inc l inc l xor a - ld [hli], a ; c1x3 = 0 (clear Y movement delta) + ld [hli], a ; [x#SPRITESTATEDATA1_YSTEPVECTOR] = 0 inc l - ld [hl], a ; c1x5 = 0 (clear X movement delta) + ld [hl], a ; [x#SPRITESTATEDATA1_XSTEPVECTOR] = 0 inc h - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $8 ld l, a call Random - ld a, [hRandomAdd] + ldh a, [hRandomAdd] and $7f - ld [hl], a ; c2x8: set next movement delay to a random value in [0,$7f] (again with delay $100 if value is 0) + ld [hl], a ; x#SPRITESTATEDATA2_MOVEMENTDELAY: set to a random value in [0,$7f] (again with delay $100 if value is 0) scf ; set carry (marking failure to walk) ret @@ -692,25 +701,25 @@ CanWalkOntoTile: ; this is always the lower left tile of the 2x2 tile blocks all sprites are snapped to ; hl: output pointer GetTileSpriteStandsOn: - ld h, wSpriteStateData1 / $100 - ld a, [H_CURRENTSPRITEOFFSET] - add $4 + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_YPIXELS ld l, a - ld a, [hli] ; c1x4: screen Y position + ld a, [hli] ; x#SPRITESTATEDATA1_YPIXELS add $4 ; align to 2*2 tile blocks (Y position is always off 4 pixels to the top) and $f0 ; in case object is currently moving srl a ; screen Y tile * 4 ld c, a ld b, $0 inc l - ld a, [hl] ; c1x6: screen Y position + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS srl a srl a srl a ; screen X tile add SCREEN_WIDTH ; screen X tile + 20 ld d, $0 ld e, a - coord hl, 0, 0 + hlcoord 0, 0 add hl, bc add hl, bc add hl, bc @@ -785,7 +794,7 @@ DoScriptedNPCMovement: ld a, [hl] add b ld [hl], a - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $9 ld l, a ld a, c @@ -808,17 +817,17 @@ InitScriptedNPCMovement: jp AnimScriptedNPCMovement GetSpriteScreenYPointer: - ld a, $4 + ld a, SPRITESTATEDATA1_YPIXELS ld b, a jr GetSpriteScreenXYPointerCommon GetSpriteScreenXPointer: - ld a, $6 + ld a, SPRITESTATEDATA1_XPIXELS ld b, a GetSpriteScreenXYPointerCommon: ld hl, wSpriteStateData1 - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add l add b ld l, a @@ -826,16 +835,16 @@ GetSpriteScreenXYPointerCommon: AnimScriptedNPCMovement: ld hl, wSpriteStateData2 - ld a, [H_CURRENTSPRITEOFFSET] - add $e + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA2_IMAGEBASEOFFSET ld l, a ld a, [hl] ; VRAM slot dec a swap a ld b, a ld hl, wSpriteStateData1 - ld a, [H_CURRENTSPRITEOFFSET] - add $9 + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_FACINGDIRECTION ld l, a ld a, [hl] ; facing direction cp SPRITE_FACING_DOWN @@ -850,21 +859,21 @@ AnimScriptedNPCMovement: .anim add b ld b, a - ld [hSpriteVRAMSlotAndFacing], a + ldh [hSpriteVRAMSlotAndFacing], a call AdvanceScriptedNPCAnimFrameCounter ld hl, wSpriteStateData1 - ld a, [H_CURRENTSPRITEOFFSET] - add $2 + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_IMAGEINDEX ld l, a - ld a, [hSpriteVRAMSlotAndFacing] + ldh a, [hSpriteVRAMSlotAndFacing] ld b, a - ld a, [hSpriteAnimFrameCounter] + ldh a, [hSpriteAnimFrameCounter] add b ld [hl], a ret AdvanceScriptedNPCAnimFrameCounter: - ld a, [H_CURRENTSPRITEOFFSET] + ldh a, [hCurrentSpriteOffset] add $7 ld l, a ld a, [hl] ; intra-animation frame counter @@ -879,5 +888,5 @@ AdvanceScriptedNPCAnimFrameCounter: inc a and $3 ld [hl], a - ld [hSpriteAnimFrameCounter], a + ldh [hSpriteAnimFrameCounter], a ret diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm deleted file mode 100755 index 8d9ec0af..00000000 --- a/engine/overworld/npc_movement.asm +++ /dev/null @@ -1,292 +0,0 @@ -PlayerStepOutFromDoor: - ld hl, wd730 - res 1, [hl] - call IsPlayerStandingOnDoorTile - jr nc, .notStandingOnDoor - ld a, $fc - ld [wJoyIgnore], a - ld hl, wd736 - set 1, [hl] - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - xor a - ld [wSpriteStateData1 + 2], a - call StartSimulatingJoypadStates - ret -.notStandingOnDoor - xor a - ld [wWastedByteCD3A], a - ld [wSimulatedJoypadStatesIndex], a - ld [wSimulatedJoypadStatesEnd], a - ld hl, wd736 - res 0, [hl] - res 1, [hl] - ld hl, wd730 - res 7, [hl] - ret - -_EndNPCMovementScript: - ld hl, wd730 - res 7, [hl] - ld hl, wd72e - res 7, [hl] - ld hl, wd736 - res 0, [hl] - res 1, [hl] - xor a - ld [wNPCMovementScriptSpriteOffset], a - ld [wNPCMovementScriptPointerTableNum], a - ld [wNPCMovementScriptFunctionNum], a - ld [wWastedByteCD3A], a - ld [wSimulatedJoypadStatesIndex], a - ld [wSimulatedJoypadStatesEnd], a - ret - -PalletMovementScriptPointerTable: - dw PalletMovementScript_OakMoveLeft - dw PalletMovementScript_PlayerMoveLeft - dw PalletMovementScript_WaitAndWalkToLab - dw PalletMovementScript_WalkToLab - dw PalletMovementScript_Done - -PalletMovementScript_OakMoveLeft: - ld a, [wXCoord] - sub $a - ld [wNumStepsToTake], a - jr z, .playerOnLeftTile -; The player is on the right tile of the northern path out of Pallet Town and -; Prof. Oak is below. -; Make Prof. Oak step to the left. - ld b, 0 - ld c, a - ld hl, wNPCMovementDirections2 - ld a, NPC_MOVEMENT_LEFT - call FillMemory - ld [hl], $ff - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - ld de, wNPCMovementDirections2 - call MoveSprite - ld a, $1 - ld [wNPCMovementScriptFunctionNum], a - jr .done -; The player is on the left tile of the northern path out of Pallet Town and -; Prof. Oak is below. -; Prof. Oak is already where he needs to be. -.playerOnLeftTile - ld a, $3 - ld [wNPCMovementScriptFunctionNum], a -.done - ld hl, wFlags_D733 - set 1, [hl] - ld a, $fc - ld [wJoyIgnore], a - ret - -PalletMovementScript_PlayerMoveLeft: - ld a, [wd730] - bit 0, a ; is an NPC being moved by a script? - ret nz ; return if Oak is still moving - ld a, [wNumStepsToTake] - ld [wSimulatedJoypadStatesIndex], a - ld [hNPCMovementDirections2Index], a - predef ConvertNPCMovementDirectionsToJoypadMasks - call StartSimulatingJoypadStates - ld a, $2 - ld [wNPCMovementScriptFunctionNum], a - ret - -PalletMovementScript_WaitAndWalkToLab: - ld a, [wSimulatedJoypadStatesIndex] - and a ; is the player done moving left yet? - ret nz - -PalletMovementScript_WalkToLab: - xor a - ld [wOverrideSimulatedJoypadStatesMask], a - ld a, [wSpriteIndex] - swap a - ld [wNPCMovementScriptSpriteOffset], a - xor a - ld [wSpriteStateData2 + $06], a - ld hl, wSimulatedJoypadStatesEnd - ld de, RLEList_PlayerWalkToLab - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - ld hl, wNPCMovementDirections2 - ld de, RLEList_ProfOakWalkToLab - call DecodeRLEList - ld hl, wd72e - res 7, [hl] - ld hl, wd730 - set 7, [hl] - ld a, $4 - ld [wNPCMovementScriptFunctionNum], a - ret - -RLEList_ProfOakWalkToLab: - db NPC_MOVEMENT_DOWN, $05 - db NPC_MOVEMENT_LEFT, $01 - db NPC_MOVEMENT_DOWN, $05 - db NPC_MOVEMENT_RIGHT, $03 - db NPC_MOVEMENT_UP, $01 - db $E0, $01 ; stand still - db $FF - -RLEList_PlayerWalkToLab: - db D_UP, $02 - db D_RIGHT, $03 - db D_DOWN, $05 - db D_LEFT, $01 - db D_DOWN, $06 - db $FF - -PalletMovementScript_Done: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld a, HS_PALLET_TOWN_OAK - ld [wMissableObjectIndex], a - predef HideObject - ld hl, wd730 - res 7, [hl] - ld hl, wd72e - res 7, [hl] - jp EndNPCMovementScript - -PewterMuseumGuyMovementScriptPointerTable: - dw PewterMovementScript_WalkToMuseum - dw PewterMovementScript_Done - -PewterMovementScript_WalkToMuseum: - ld a, 0 ; BANK(Music_MuseumGuy) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a - ld a, MUSIC_MUSEUM_GUY - ld [wNewSoundID], a - call PlayMusic - ld a, [wSpriteIndex] - swap a - ld [wNPCMovementScriptSpriteOffset], a - call StartSimulatingJoypadStates - ld hl, wSimulatedJoypadStatesEnd - ld de, RLEList_PewterMuseumPlayer - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - xor a - ld [wWhichPewterGuy], a - predef PewterGuys - ld hl, wNPCMovementDirections2 - ld de, RLEList_PewterMuseumGuy - call DecodeRLEList - ld hl, wd72e - res 7, [hl] - ld a, $1 - ld [wNPCMovementScriptFunctionNum], a - ret - -RLEList_PewterMuseumPlayer: - db 0, $01 - db D_UP, $03 - db D_LEFT, $0D - db D_UP, $06 - db $FF - -RLEList_PewterMuseumGuy: - db NPC_MOVEMENT_UP, $06 - db NPC_MOVEMENT_LEFT, $0D - db NPC_MOVEMENT_UP, $03 - db NPC_MOVEMENT_LEFT, $01 - db $FF - -PewterMovementScript_Done: - ld a, [wSimulatedJoypadStatesIndex] - and a - ret nz - ld hl, wd730 - res 7, [hl] - ld hl, wd72e - res 7, [hl] - jp EndNPCMovementScript - -PewterGymGuyMovementScriptPointerTable: - dw PewterMovementScript_WalkToGym - dw PewterMovementScript_Done - -PewterMovementScript_WalkToGym: - ld a, 0 ; BANK(Music_MuseumGuy) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a - ld a, MUSIC_MUSEUM_GUY - ld [wNewSoundID], a - call PlayMusic - ld a, [wSpriteIndex] - swap a - ld [wNPCMovementScriptSpriteOffset], a - xor a - ld [wSpriteStateData2 + $06], a - ld hl, wSimulatedJoypadStatesEnd - ld de, RLEList_PewterGymPlayer - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - ld a, 1 - ld [wWhichPewterGuy], a - predef PewterGuys - ld hl, wNPCMovementDirections2 - ld de, RLEList_PewterGymGuy - call DecodeRLEList - ld hl, wd72e - res 7, [hl] - ld hl, wd730 - set 7, [hl] - ld a, $1 - ld [wNPCMovementScriptFunctionNum], a - ret - -RLEList_PewterGymPlayer: - db 0, $01 - db D_RIGHT, $02 - db D_DOWN, $05 - db D_LEFT, $0B - db D_UP, $05 - db D_LEFT, $0F - db $FF - -RLEList_PewterGymGuy: - db NPC_MOVEMENT_DOWN, $02 - db NPC_MOVEMENT_LEFT, $0F - db NPC_MOVEMENT_UP, $05 - db NPC_MOVEMENT_LEFT, $0B - db NPC_MOVEMENT_DOWN, $05 - db NPC_MOVEMENT_RIGHT, $03 - db $FF - -FreezeEnemyTrainerSprite: - ld a, [wCurMap] - cp POKEMON_TOWER_7F - ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them - ld hl, RivalIDs - ld a, [wEngagedTrainerClass] - ld b, a -.loop - ld a, [hli] - cp $ff - jr z, .notRival - cp b - ret z ; the rival leaves after battling, so don't freeze him - jr .loop -.notRival - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - jp SetSpriteMovementBytesToFF - -RivalIDs: - db OPP_SONY1 - db OPP_SONY2 - db OPP_SONY3 - db $ff diff --git a/engine/overworld/oaks_aide.asm b/engine/overworld/oaks_aide.asm deleted file mode 100755 index f5068fda..00000000 --- a/engine/overworld/oaks_aide.asm +++ /dev/null @@ -1,71 +0,0 @@ -OaksAideScript: - ld hl, OaksAideHiText - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .choseNo - ld hl, wPokedexOwned - ld b, wPokedexOwnedEnd - wPokedexOwned - call CountSetBits - ld a, [wNumSetBits] - ld [hOaksAideNumMonsOwned], a - ld b, a - ld a, [hOaksAideRequirement] - cp b - jr z, .giveItem - jr nc, .notEnoughOwnedMons -.giveItem - ld hl, OaksAideHereYouGoText - call PrintText - ld a, [hOaksAideRewardItem] - ld b, a - ld c, 1 - call GiveItem - jr nc, .bagFull - ld hl, OaksAideGotItemText - call PrintText - ld a, $1 - jr .done -.bagFull - ld hl, OaksAideNoRoomText - call PrintText - xor a - jr .done -.notEnoughOwnedMons - ld hl, OaksAideUhOhText - call PrintText - ld a, $80 - jr .done -.choseNo - ld hl, OaksAideComeBackText - call PrintText - ld a, $ff -.done - ld [hOaksAideResult], a - ret - -OaksAideHiText: - TX_FAR _OaksAideHiText - db "@" - -OaksAideUhOhText: - TX_FAR _OaksAideUhOhText - db "@" - -OaksAideComeBackText: - TX_FAR _OaksAideComeBackText - db "@" - -OaksAideHereYouGoText: - TX_FAR _OaksAideHereYouGoText - db "@" - -OaksAideGotItemText: - TX_FAR _OaksAideGotItemText - TX_SFX_ITEM_1 - db "@" - -OaksAideNoRoomText: - TX_FAR _OaksAideNoRoomText - db "@" diff --git a/engine/overworld/oam.asm b/engine/overworld/oam.asm deleted file mode 100644 index 2c2a3dff..00000000 --- a/engine/overworld/oam.asm +++ /dev/null @@ -1,189 +0,0 @@ -PrepareOAMData: -; Determine OAM data for currently visible -; sprites and write it to wOAMBuffer. - - ld a, [wUpdateSpritesEnabled] - dec a - jr z, .updateEnabled - - cp -1 - ret nz - ld [wUpdateSpritesEnabled], a - jp HideSprites - -.updateEnabled - xor a - ld [hOAMBufferOffset], a - -.spriteLoop - ld [hSpriteOffset2], a - - ld d, wSpriteStateData1 / $100 - ld a, [hSpriteOffset2] - ld e, a - ld a, [de] ; c1x0 - and a - jp z, .nextSprite - - inc e - inc e - ld a, [de] ; c1x2 (facing/anim) - ld [wd5cd], a - cp $ff ; off-screen (don't draw) - jr nz, .visible - - call GetSpriteScreenXY - jr .nextSprite - -.visible - cp $a0 ; is the sprite unchanging like an item ball or boulder? - jr c, .usefacing - -; unchanging - and $f - add $10 ; skip to the second half of the table which doesn't account for facing direction - jr .next - -.usefacing - and $f - -.next - ld l, a - -; get sprite priority - push de - inc d - ld a, e - add $5 - ld e, a - ld a, [de] ; c2x7 - and $80 - ld [hSpritePriority], a ; temp store sprite priority - pop de - -; read the entry from the table - ld h, 0 - ld bc, SpriteFacingAndAnimationTable - add hl, hl - add hl, hl - add hl, bc - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld a, [hli] - ld h, [hl] - ld l, a - - call GetSpriteScreenXY - - ld a, [hOAMBufferOffset] - ld e, a - ld d, wOAMBuffer / $100 - -.tileLoop - ld a, [hSpriteScreenY] ; temp for sprite Y position - add $10 ; Y=16 is top of screen (Y=0 is invisible) - add [hl] ; add Y offset from table - ld [de], a ; write new sprite OAM Y position - inc hl - ld a, [hSpriteScreenX] ; temp for sprite X position - add $8 ; X=8 is left of screen (X=0 is invisible) - add [hl] ; add X offset from table - inc e - ld [de], a ; write new sprite OAM X position - inc e - ld a, [bc] ; read pattern number offset (accommodates orientation (offset 0,4 or 8) and animation (offset 0 or $80)) - inc bc - push bc - ld b, a - - ld a, [wd5cd] ; temp copy of c1x2 - swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs) - and $f - - ; Sprites $a and $b have one face (and therefore 4 tiles instead of 12). - ; As a result, sprite $b's tile offset is less than normal. - cp $b - jr nz, .notFourTileSprite - ld a, $a * 12 + 4 - jr .next2 - -.notFourTileSprite - ; a *= 12 - sla a - sla a - ld c, a - sla a - add c - -.next2 - add b ; add the tile offset from the table (based on frame and facing direction) - pop bc - ld [de], a ; tile id - inc hl - inc e - ld a, [hl] - bit 1, a ; is the tile allowed to set the sprite priority bit? - jr z, .skipPriority - ld a, [hSpritePriority] - or [hl] -.skipPriority - inc hl - ld [de], a - inc e - bit 0, a ; OAMFLAG_ENDOFDATA - jr z, .tileLoop - - ld a, e - ld [hOAMBufferOffset], a - -.nextSprite - ld a, [hSpriteOffset2] - add $10 - cp $100 % $100 - jp nz, .spriteLoop - - ; Clear unused OAM. - ld a, [hOAMBufferOffset] - ld l, a - ld h, wOAMBuffer / $100 - ld de, $4 - ld b, $a0 - ld a, [wd736] - bit 6, a ; jumping down ledge or fishing animation? - ld a, $a0 - jr z, .clear - -; Don't clear the last 4 entries because they are used for the shadow in the -; jumping down ledge animation and the rod in the fishing animation. - ld a, $90 - -.clear - cp l - ret z - ld [hl], b - add hl, de - jr .clear - -GetSpriteScreenXY: - inc e - inc e - ld a, [de] ; c1x4 - ld [hSpriteScreenY], a - inc e - inc e - ld a, [de] ; c1x6 - ld [hSpriteScreenX], a - ld a, 4 - add e - ld e, a - ld a, [hSpriteScreenY] - add 4 - and $f0 - ld [de], a ; c1xa (y) - inc e - ld a, [hSpriteScreenX] - and $f0 - ld [de], a ; c1xb (x) - ret diff --git a/engine/overworld/pathfinding.asm b/engine/overworld/pathfinding.asm new file mode 100644 index 00000000..1925dbbc --- /dev/null +++ b/engine/overworld/pathfinding.asm @@ -0,0 +1,201 @@ +FindPathToPlayer: + xor a + ld hl, hFindPathNumSteps + ld [hli], a ; hFindPathNumSteps + ld [hli], a ; hFindPathFlags + ld [hli], a ; hFindPathYProgress + ld [hl], a ; hFindPathXProgress + ld hl, wNPCMovementDirections2 + ld de, $0 +.loop + ldh a, [hFindPathYProgress] + ld b, a + ldh a, [hNPCPlayerYDistance] ; Y distance in steps + call CalcDifference + ld d, a + and a + jr nz, .asm_f8da + ldh a, [hFindPathFlags] + set 0, a ; current end of path matches the player's Y coordinate + ldh [hFindPathFlags], a +.asm_f8da + ldh a, [hFindPathXProgress] + ld b, a + ldh a, [hNPCPlayerXDistance] ; X distance in steps + call CalcDifference + ld e, a + and a + jr nz, .asm_f8ec + ldh a, [hFindPathFlags] + set 1, a ; current end of path matches the player's X coordinate + ldh [hFindPathFlags], a +.asm_f8ec + ldh a, [hFindPathFlags] + cp $3 ; has the end of the path reached the player's position? + jr z, .done +; Compare whether the X distance between the player and the current of the path +; is greater or if the Y distance is. Then, try to reduce whichever is greater. + ld a, e + cp d + jr c, .yDistanceGreater +; x distance is greater + ldh a, [hNPCPlayerRelativePosFlags] + bit 1, a + jr nz, .playerIsLeftOfNPC + ld d, NPC_MOVEMENT_RIGHT + jr .next1 +.playerIsLeftOfNPC + ld d, NPC_MOVEMENT_LEFT +.next1 + ldh a, [hFindPathXProgress] + add 1 + ldh [hFindPathXProgress], a + jr .storeDirection +.yDistanceGreater + ldh a, [hNPCPlayerRelativePosFlags] + bit 0, a + jr nz, .playerIsAboveNPC + ld d, NPC_MOVEMENT_DOWN + jr .next2 +.playerIsAboveNPC + ld d, NPC_MOVEMENT_UP +.next2 + ldh a, [hFindPathYProgress] + add 1 + ldh [hFindPathYProgress], a +.storeDirection + ld a, d + ld [hli], a + ldh a, [hFindPathNumSteps] + inc a + ldh [hFindPathNumSteps], a + jp .loop +.done + ld [hl], $ff + ret + +CalcPositionOfPlayerRelativeToNPC: + xor a + ldh [hNPCPlayerRelativePosFlags], a + ld a, [wSpritePlayerStateData1YPixels] + ld d, a + ld a, [wSpritePlayerStateData1XPixels] + ld e, a + ld hl, wSpriteStateData1 + ldh a, [hNPCSpriteOffset] + add l + add SPRITESTATEDATA1_YPIXELS + ld l, a + jr nc, .noCarry + inc h +.noCarry + ld a, d + ld b, a + ld a, [hli] ; NPC sprite screen Y position in pixels + call CalcDifference + jr nc, .NPCSouthOfOrAlignedWithPlayer +.NPCNorthOfPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 0, [hl] + set 0, [hl] + pop hl + jr .divideYDistance +.NPCSouthOfOrAlignedWithPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 0, [hl] + res 0, [hl] + pop hl +.divideYDistance + push hl + ld hl, hDividend2 + ld [hli], a + ld a, 16 + ld [hli], a + call DivideBytes ; divide Y absolute distance by 16 + ld a, [hl] ; quotient + ldh [hNPCPlayerYDistance], a + pop hl + inc hl + ld b, e + ld a, [hl] ; NPC sprite screen X position in pixels + call CalcDifference + jr nc, .NPCEastOfOrAlignedWithPlayer +.NPCWestOfPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 1, [hl] + set 1, [hl] + pop hl + jr .divideXDistance +.NPCEastOfOrAlignedWithPlayer + push hl + ld hl, hNPCPlayerRelativePosFlags + bit 1, [hl] + res 1, [hl] + pop hl +.divideXDistance + ldh [hDividend2], a + ld a, 16 + ldh [hDivisor2], a + call DivideBytes ; divide X absolute distance by 16 + ldh a, [hQuotient2] + ldh [hNPCPlayerXDistance], a + ldh a, [hNPCPlayerRelativePosPerspective] + and a + ret z + ldh a, [hNPCPlayerRelativePosFlags] + cpl + and $3 + ldh [hNPCPlayerRelativePosFlags], a + ret + +ConvertNPCMovementDirectionsToJoypadMasks: + ldh a, [hNPCMovementDirections2Index] + ld [wNPCMovementDirections2Index], a + dec a + ld de, wSimulatedJoypadStatesEnd + ld hl, wNPCMovementDirections2 + add l + ld l, a + jr nc, .loop + inc h +.loop + ld a, [hld] + call ConvertNPCMovementDirectionToJoypadMask + ld [de], a + inc de + ldh a, [hNPCMovementDirections2Index] + dec a + ldh [hNPCMovementDirections2Index], a + jr nz, .loop + ret + +ConvertNPCMovementDirectionToJoypadMask: + push hl + ld b, a + ld hl, NPCMovementDirectionsToJoypadMasksTable +.loop + ld a, [hli] + cp $ff + jr z, .done + cp b + jr z, .loadJoypadMask + inc hl + jr .loop +.loadJoypadMask + ld a, [hl] +.done + pop hl + ret + +NPCMovementDirectionsToJoypadMasksTable: + db NPC_MOVEMENT_UP, D_UP + db NPC_MOVEMENT_DOWN, D_DOWN + db NPC_MOVEMENT_LEFT, D_LEFT + db NPC_MOVEMENT_RIGHT, D_RIGHT + db $ff + +; unreferenced + ret diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm old mode 100755 new mode 100644 index a17e67bd..c458a013 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -1,7 +1,7 @@ -EnterMapAnim: +EnterMapAnim:: call InitFacingDirectionList ld a, $ec - ld [wSpriteStateData1 + 4], a ; player's sprite Y screen position + ld [wSpritePlayerStateData1YPixels], a call Delay3 push hl call GBFadeInFromWhite @@ -90,7 +90,7 @@ PlayerSpinWhileMovingDown: ld [hl], a ; wPlayerSpinWhileMovingUpOrDownAnimFrameDelay jp PlayerSpinWhileMovingUpOrDown -_LeaveMapAnim: +_LeaveMapAnim:: call InitFacingDirectionList call IsPlayerStandingOnWarpPadOrHole ld a, b @@ -227,19 +227,19 @@ DoFlyAnimation: ld a, [wFlyAnimBirdSpriteImageIndex] xor $1 ; make the bird flap its wings ld [wFlyAnimBirdSpriteImageIndex], a - ld [wSpriteStateData1 + 2], a + ld [wSpritePlayerStateData1ImageIndex], a call Delay3 ld a, [wFlyAnimUsingCoordList] cp $ff jr z, .skipCopyingCoords ; if the bird is flapping its wings in place - ld hl, wSpriteStateData1 + 4 + ld hl, wSpritePlayerStateData1YPixels ld a, [de] inc de - ld [hli], a + ld [hli], a ; y inc hl ld a, [de] inc de - ld [hl], a + ld [hl], a ; x .skipCopyingCoords ld a, [wFlyAnimCounter] dec a @@ -250,23 +250,23 @@ DoFlyAnimation: LoadBirdSpriteGraphics: ld de, BirdSprite ld hl, vNPCSprites - lb bc, BANK(BirdSprite), $0c + lb bc, BANK(BirdSprite), 12 call CopyVideoData - ld de, BirdSprite + $c0 ; moving animation sprite + ld de, BirdSprite tile 12 ; moving animation sprite ld hl, vNPCSprites2 - lb bc, BANK(BirdSprite), $0c + lb bc, BANK(BirdSprite), 12 jp CopyVideoData InitFacingDirectionList: - ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction (image index is locked to standing images) + ld a, [wSpritePlayerStateData1ImageIndex] ; (image index is locked to standing images) ld [wSavedPlayerFacingDirection], a - ld a, [wSpriteStateData1 + 4] ; player's sprite Y screen position + ld a, [wSpritePlayerStateData1YPixels] ld [wSavedPlayerScreenY], a ld hl, PlayerSpinningFacingOrder ld de, wFacingDirectionList ld bc, 4 call CopyData - ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction (image index is locked to standing images) + ld a, [wSpritePlayerStateData1ImageIndex] ; (image index is locked to standing images) ld hl, wFacingDirectionList ; find the place in the list that matches the current facing direction .loop @@ -284,7 +284,7 @@ PlayerSpinningFacingOrder: SpinPlayerSprite: ; copy the current value from the list into the sprite data and rotate the list ld a, [hl] - ld [wSpriteStateData1 + 2], a ; player's sprite facing direction (image index is locked to standing images) + ld [wSpritePlayerStateData1ImageIndex], a ; (image index is locked to standing images) push hl ld hl, wFacingDirectionList ld de, wFacingDirectionList - 1 @@ -320,9 +320,9 @@ PlayerSpinWhileMovingUpOrDown: call SpinPlayerSprite ld a, [wPlayerSpinWhileMovingUpOrDownAnimDeltaY] ld c, a - ld a, [wSpriteStateData1 + 4] ; player's sprite Y screen position + ld a, [wSpritePlayerStateData1YPixels] add c - ld [wSpriteStateData1 + 4], a + ld [wSpritePlayerStateData1YPixels], a ld c, a ld a, [wPlayerSpinWhileMovingUpOrDownAnimMaxY] cp c @@ -334,9 +334,9 @@ PlayerSpinWhileMovingUpOrDown: RestoreFacingDirectionAndYScreenPos: ld a, [wSavedPlayerScreenY] - ld [wSpriteStateData1 + 4], a + ld [wSpritePlayerStateData1YPixels], a ld a, [wSavedPlayerFacingDirection] - ld [wSpriteStateData1 + 2], a + ld [wSpritePlayerStateData1ImageIndex], a ; (image index is locked to standing images) ret ; if SGB, 2 frames, else 3 frames @@ -347,9 +347,9 @@ GetPlayerTeleportAnimFrameDelay: inc a ret -IsPlayerStandingOnWarpPadOrHole: +IsPlayerStandingOnWarpPadOrHole:: ld b, 0 - ld hl, .warpPadAndHoleData + ld hl, WarpPadAndHoleData ld a, [wCurMapTileset] ld c, a .loop @@ -358,7 +358,7 @@ IsPlayerStandingOnWarpPadOrHole: jr z, .done cp c jr nz, .nextEntry - aCoord 8, 9 + lda_coord 8, 9 cp [hl] jr z, .foundMatch .nextEntry @@ -373,13 +373,7 @@ IsPlayerStandingOnWarpPadOrHole: ld [wStandingOnWarpPadOrHole], a ret -; format: db tileset id, tile id, value to be put in [wStandingOnWarpPadOrHole] -.warpPadAndHoleData: - db FACILITY, $20, 1 ; warp pad - db FACILITY, $11, 2 ; hole - db CAVERN, $22, 2 ; hole - db INTERIOR, $55, 1 ; warp pad - db $FF +INCLUDE "data/tilesets/warp_pad_hole_tile_ids.asm" FishingAnim: ld c, 10 @@ -387,13 +381,13 @@ FishingAnim: ld hl, wd736 set 6, [hl] ; reserve the last 4 OAM entries ld de, RedSprite - ld hl, vNPCSprites - lb bc, BANK(RedSprite), $c + ld hl, vNPCSprites tile $00 + lb bc, BANK(RedSprite), 12 call CopyVideoData ld a, $4 ld hl, RedFishingTiles call LoadAnimSpriteGfx - ld a, [wSpriteStateData1 + 2] + ld a, [wSpritePlayerStateData1ImageIndex] ld c, a ld b, $0 ld hl, FishingRodOAM @@ -416,7 +410,7 @@ FishingAnim: ; shake the player's sprite vertically ld b, 10 .loop - ld hl, wSpriteStateData1 + 4 ; player's sprite Y screen position + ld hl, wSpritePlayerStateData1YPixels call .ShakePlayerSprite ld hl, wOAMBuffer + $9c call .ShakePlayerSprite @@ -426,7 +420,7 @@ FishingAnim: ; If the player is facing up, hide the fishing rod so it doesn't overlap with ; the exclamation bubble that will be shown next. - ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1ImageIndex] ; (image index is locked to standing images) cp SPRITE_FACING_UP jr nz, .skipHidingFishingRod ld a, $a0 @@ -440,7 +434,7 @@ FishingAnim: predef EmotionBubble ; If the player is facing up, unhide the fishing rod. - ld a, [wSpriteStateData1 + 2] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1ImageIndex] ; (image index is locked to standing images) cp SPRITE_FACING_UP jr nz, .skipUnhidingFishingRod ld a, $44 @@ -463,46 +457,38 @@ FishingAnim: ret NoNibbleText: - TX_FAR _NoNibbleText - db "@" + text_far _NoNibbleText + text_end NothingHereText: - TX_FAR _NothingHereText - db "@" + text_far _NothingHereText + text_end ItsABiteText: - TX_FAR _ItsABiteText - db "@" + text_far _ItsABiteText + text_end FishingRodOAM: ; specifies how the fishing rod should be drawn on the screen -; first byte = screen y coordinate -; second byte = screen x coordinate -; third byte = tile number -; fourth byte = sprite properties - db $5B, $4C, $FD, $00 ; player facing down - db $44, $4C, $FD, $00 ; player facing up - db $50, $40, $FE, $00 ; player facing left - db $50, $58, $FE, $20 ; player facing right ($20 means "horizontally flip the tile") + dbsprite 9, 11, 4, 3, $fd, 0 ; down + dbsprite 9, 8, 4, 4, $fd, 0 ; up + dbsprite 8, 10, 0, 0, $fe, 0 ; left + dbsprite 11, 10, 0, 0, $fe, OAM_HFLIP ; right + +fishing_gfx: MACRO + dw \1 + db \2 + db BANK(\1) + dw vNPCSprites tile \3 +ENDM RedFishingTiles: - dw RedFishingTilesFront - db 2, BANK(RedFishingTilesFront) - dw vNPCSprites + $20 + fishing_gfx RedFishingTilesFront, 2, $02 + fishing_gfx RedFishingTilesBack, 2, $06 + fishing_gfx RedFishingTilesSide, 2, $0a + fishing_gfx RedFishingRodTiles, 3, $fd - dw RedFishingTilesBack - db 2, BANK(RedFishingTilesBack) - dw vNPCSprites + $60 - - dw RedFishingTilesSide - db 2, BANK(RedFishingTilesSide) - dw vNPCSprites + $a0 - - dw RedFishingRodTiles - db 3, BANK(RedFishingRodTiles) - dw vNPCSprites2 + $7d0 - -_HandleMidJump: +_HandleMidJump:: ld a, [wPlayerJumpingYScreenCoordsIndex] ld c, a inc a @@ -513,7 +499,7 @@ _HandleMidJump: ld hl, PlayerJumpingYScreenCoords add hl, bc ld a, [hl] - ld [wSpriteStateData1 + 4], a ; player's sprite y coordinate + ld [wSpritePlayerStateData1YPixels], a ret .finishedJump ld a, [wWalkCounter] @@ -522,9 +508,9 @@ _HandleMidJump: call UpdateSprites call Delay3 xor a - ld [hJoyHeld], a - ld [hJoyPressed], a - ld [hJoyReleased], a + ldh [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a ld [wPlayerJumpingYScreenCoordsIndex], a ld hl, wd736 res 6, [hl] ; not jumping down a ledge any more diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index 73c55da2..70326754 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -1,5 +1,5 @@ ; only used for setting bit 2 of wd736 upon entering a new map -IsPlayerStandingOnWarp: +IsPlayerStandingOnWarp:: ld a, [wNumberOfWarps] and a ret z @@ -17,7 +17,7 @@ IsPlayerStandingOnWarp: ld a, [hli] ; target warp ld [wDestinationWarpID], a ld a, [hl] ; target map - ld [hWarpDestinationMap], a + ldh [hWarpDestinationMap], a ld hl, wd736 set 2, [hl] ; standing on warp flag ret @@ -31,7 +31,7 @@ IsPlayerStandingOnWarp: jr nz, .loop ret -CheckForceBikeOrSurf: +CheckForceBikeOrSurf:: ld hl, wd732 bit 5, [hl] ret nz @@ -82,13 +82,13 @@ CheckForceBikeOrSurf: ld [wWalkBikeSurfStateCopy], a jp ForceBikeOrSurf -INCLUDE "data/force_bike_surf.asm" +INCLUDE "data/maps/force_bike_surf.asm" -IsPlayerFacingEdgeOfMap: +IsPlayerFacingEdgeOfMap:: push hl push de push bc - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + ld a, [wSpritePlayerStateData1FacingDirection] srl a ld c, a ld b, $0 @@ -150,19 +150,19 @@ IsPlayerFacingEdgeOfMap: scf ret -IsWarpTileInFrontOfPlayer: +IsWarpTileInFrontOfPlayer:: push hl push de push bc call _GetTileAndCoordsInFrontOfPlayer ld a, [wCurMap] cp SS_ANNE_BOW - jr z, .ssAnne5 - ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction + jr z, IsSSAnneBowWarpTileInFrontOfPlayer + ld a, [wSpritePlayerStateData1FacingDirection] srl a ld c, a ld b, 0 - ld hl, .warpTileListPointers + ld hl, WarpTileListPointers add hl, bc ld a, [hli] ld h, [hl] @@ -176,39 +176,23 @@ IsWarpTileInFrontOfPlayer: pop hl ret -.warpTileListPointers: - dw .facingDownWarpTiles - dw .facingUpWarpTiles - dw .facingLeftWarpTiles - dw .facingRightWarpTiles +INCLUDE "data/tilesets/warp_carpet_tile_ids.asm" -.facingDownWarpTiles - db $01,$12,$17,$3D,$04,$18,$33,$FF - -.facingUpWarpTiles - db $01,$5C,$FF - -.facingLeftWarpTiles - db $1A,$4B,$FF - -.facingRightWarpTiles - db $0F,$4E,$FF - -.ssAnne5 +IsSSAnneBowWarpTileInFrontOfPlayer: ld a, [wTileInFrontOfPlayer] cp $15 jr nz, .notSSAnne5Warp scf - jr .done + jr IsWarpTileInFrontOfPlayer.done .notSSAnne5Warp and a - jr .done + jr IsWarpTileInFrontOfPlayer.done -IsPlayerStandingOnDoorTileOrWarpTile: +IsPlayerStandingOnDoorTileOrWarpTile:: push hl push de push bc - callba IsPlayerStandingOnDoorTile + farcall IsPlayerStandingOnDoorTile jr c, .done ld a, [wCurMapTileset] add a @@ -220,7 +204,7 @@ IsPlayerStandingOnDoorTileOrWarpTile: ld h, [hl] ld l, a ld de, $1 - aCoord 8, 9 + lda_coord 8, 9 call IsInArray jr nc, .done ld hl, wd736 @@ -231,36 +215,36 @@ IsPlayerStandingOnDoorTileOrWarpTile: pop hl ret -INCLUDE "data/warp_tile_ids.asm" +INCLUDE "data/tilesets/warp_tile_ids.asm" -PrintSafariZoneSteps: +PrintSafariZoneSteps:: ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c cp CERULEAN_CAVE_2F ret nc - coord hl, 0, 0 + hlcoord 0, 0 ld b, 3 ld c, 7 call TextBoxBorder - coord hl, 1, 1 + hlcoord 1, 1 ld de, wSafariSteps lb bc, 2, 3 call PrintNumber - coord hl, 4, 1 + hlcoord 4, 1 ld de, SafariSteps call PlaceString - coord hl, 1, 3 + hlcoord 1, 3 ld de, SafariBallText call PlaceString ld a, [wNumSafariBalls] cp 10 jr nc, .asm_c56d - coord hl, 5, 3 + hlcoord 5, 3 ld a, " " ld [hl], a .asm_c56d - coord hl, 6, 3 + hlcoord 6, 3 ld de, wNumSafariBalls lb bc, 1, 2 jp PrintNumber @@ -279,32 +263,32 @@ _GetTileAndCoordsInFrontOfPlayer: ld d, a ld a, [wXCoord] ld e, a - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN jr nz, .notFacingDown ; facing down - aCoord 8, 11 + lda_coord 8, 11 inc d jr .storeTile .notFacingDown cp SPRITE_FACING_UP jr nz, .notFacingUp ; facing up - aCoord 8, 7 + lda_coord 8, 7 dec d jr .storeTile .notFacingUp cp SPRITE_FACING_LEFT jr nz, .notFacingLeft ; facing left - aCoord 6, 9 + lda_coord 6, 9 dec e jr .storeTile .notFacingLeft cp SPRITE_FACING_RIGHT jr nz, .storeTile ; facing right - aCoord 10, 9 + lda_coord 10, 9 inc e .storeTile ld c, a @@ -313,45 +297,45 @@ _GetTileAndCoordsInFrontOfPlayer: GetTileTwoStepsInFrontOfPlayer: xor a - ld [$ffdb], a + ldh [hPlayerFacing], a ld hl, wYCoord ld a, [hli] ld d, a ld e, [hl] - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN jr nz, .notFacingDown ; facing down - ld hl, $ffdb + ld hl, hPlayerFacing set 0, [hl] - aCoord 8, 13 + lda_coord 8, 13 inc d jr .storeTile .notFacingDown cp SPRITE_FACING_UP jr nz, .notFacingUp ; facing up - ld hl, $ffdb + ld hl, hPlayerFacing set 1, [hl] - aCoord 8, 5 + lda_coord 8, 5 dec d jr .storeTile .notFacingUp cp SPRITE_FACING_LEFT jr nz, .notFacingLeft ; facing left - ld hl, $ffdb + ld hl, hPlayerFacing set 2, [hl] - aCoord 4, 9 + lda_coord 4, 9 dec e jr .storeTile .notFacingLeft cp SPRITE_FACING_RIGHT jr nz, .storeTile ; facing right - ld hl, $ffdb + ld hl, hPlayerFacing set 3, [hl] - aCoord 12, 9 + lda_coord 12, 9 inc e .storeTile ld c, a @@ -391,36 +375,36 @@ CheckForBoulderCollisionWithSprites: swap a ld d, 0 ld e, a - ld hl, wSpriteStateData2 + $14 + ld hl, wSprite01StateData2MapY add hl, de ld a, [hli] ; map Y position - ld [$ffdc], a + ldh [hPlayerYCoord], a ld a, [hl] ; map X position - ld [$ffdd], a + ldh [hPlayerXCoord], a ld a, [wNumSprites] ld c, a ld de, $f - ld hl, wSpriteStateData2 + $14 - ld a, [$ffdb] + ld hl, wSprite01StateData2MapY + ldh a, [hPlayerFacing] and $3 ; facing up or down? jr z, .pushingHorizontallyLoop .pushingVerticallyLoop inc hl - ld a, [$ffdd] + ldh a, [hPlayerXCoord] cp [hl] jr nz, .nextSprite1 ; if X coordinates don't match dec hl ld a, [hli] ld b, a - ld a, [$ffdb] + ldh a, [hPlayerFacing] rrca jr c, .pushingDown ; pushing up - ld a, [$ffdc] + ldh a, [hPlayerYCoord] dec a jr .compareYCoords .pushingDown - ld a, [$ffdc] + ldh a, [hPlayerYCoord] inc a .compareYCoords cp b @@ -433,19 +417,19 @@ CheckForBoulderCollisionWithSprites: .pushingHorizontallyLoop ld a, [hli] ld b, a - ld a, [$ffdc] + ldh a, [hPlayerYCoord] cp b jr nz, .nextSprite2 ld b, [hl] - ld a, [$ffdb] + ldh a, [hPlayerFacing] bit 2, a jr nz, .pushingLeft ; pushing right - ld a, [$ffdd] + ldh a, [hPlayerXCoord] inc a jr .compareXCoords .pushingLeft - ld a, [$ffdd] + ldh a, [hPlayerXCoord] dec a .compareXCoords cp b diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm deleted file mode 100755 index 05ef1e79..00000000 --- a/engine/overworld/pokecenter.asm +++ /dev/null @@ -1,68 +0,0 @@ -DisplayPokemonCenterDialogue_: - call SaveScreenTilesToBuffer1 ; save screen - ld hl, PokemonCenterWelcomeText - call PrintText - ld hl, wd72e - bit 2, [hl] - set 1, [hl] - set 2, [hl] - jr nz, .skipShallWeHealYourPokemon - ld hl, ShallWeHealYourPokemonText - call PrintText -.skipShallWeHealYourPokemon - call YesNoChoicePokeCenter ; yes/no menu - ld a, [wCurrentMenuItem] - and a - jr nz, .declinedHealing ; if the player chose No - call SetLastBlackoutMap - call LoadScreenTilesFromBuffer1 ; restore screen - ld hl, NeedYourPokemonText - call PrintText - ld a, $18 - ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine - call Delay3 - predef HealParty - callba AnimateHealingMachine ; do the healing machine animation - xor a - ld [wAudioFadeOutControl], a - ld a, [wAudioSavedROMBank] - ld [wAudioROMBank], a - ld a, [wMapMusicSoundID] - ld [wLastMusicSoundID], a - ld [wNewSoundID], a - call PlayMusic - ld hl, PokemonFightingFitText - call PrintText - ld a, $14 - ld [wSpriteStateData1 + $12], a ; make the nurse bow - ld c, a - call DelayFrames - jr .done -.declinedHealing - call LoadScreenTilesFromBuffer1 ; restore screen -.done - ld hl, PokemonCenterFarewellText - call PrintText - jp UpdateSprites - -PokemonCenterWelcomeText: - TX_FAR _PokemonCenterWelcomeText - db "@" - -ShallWeHealYourPokemonText: - TX_DELAY - TX_FAR _ShallWeHealYourPokemonText - db "@" - -NeedYourPokemonText: - TX_FAR _NeedYourPokemonText - db "@" - -PokemonFightingFitText: - TX_FAR _PokemonFightingFitText - db "@" - -PokemonCenterFarewellText: - TX_DELAY - TX_FAR _PokemonCenterFarewellText - db "@" diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm index c91605a8..a8e532d3 100644 --- a/engine/overworld/push_boulder.asm +++ b/engine/overworld/push_boulder.asm @@ -1,4 +1,4 @@ -TryPushingBoulder: +TryPushingBoulder:: ld a, [wd728] bit 0, a ; using Strength? ret z @@ -6,15 +6,15 @@ TryPushingBoulder: bit 1, a ; has boulder dust animation from previous push played yet? ret nz xor a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call IsSpriteInFrontOfPlayer - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] ld [wBoulderSpriteIndex], a and a jp z, ResetBoulderPushFlags - ld hl, wSpriteStateData1 + 1 + ld hl, wSpritePlayerStateData1MovementStatus ld d, $0 - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] swap a ld e, a add hl, de @@ -27,16 +27,16 @@ TryPushingBoulder: bit 6, [hl] set 6, [hl] ; indicate that the player has tried pushing ret z ; the player must try pushing twice before the boulder will move - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and D_RIGHT | D_LEFT | D_UP | D_DOWN ret z predef CheckForCollisionWhenPushingBoulder ld a, [wTileInFrontOfBoulderAndBoulderCollisionResult] and a ; was there a collision? jp nz, ResetBoulderPushFlags - ld a, [hJoyHeld] + ldh a, [hJoyHeld] ld b, a - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jr z, .pushBoulderUp cp SPRITE_FACING_LEFT @@ -71,28 +71,32 @@ TryPushingBoulder: ret PushBoulderUpMovementData: - db NPC_MOVEMENT_UP,$FF + db NPC_MOVEMENT_UP + db -1 ; end PushBoulderDownMovementData: - db NPC_MOVEMENT_DOWN,$FF + db NPC_MOVEMENT_DOWN + db -1 ; end PushBoulderLeftMovementData: - db NPC_MOVEMENT_LEFT,$FF + db NPC_MOVEMENT_LEFT + db -1 ; end PushBoulderRightMovementData: - db NPC_MOVEMENT_RIGHT,$FF + db NPC_MOVEMENT_RIGHT + db -1 ; end -DoBoulderDustAnimation: +DoBoulderDustAnimation:: ld a, [wd730] bit 0, a ret nz - callab AnimateBoulderDust + callfar AnimateBoulderDust call DiscardButtonPresses ld [wJoyIgnore], a call ResetBoulderPushFlags set 7, [hl] ld a, [wBoulderSpriteIndex] - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call GetSpriteMovementByte2Pointer ld [hl], $10 ld a, SFX_CUT diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm deleted file mode 100755 index 3b26b6f8..00000000 --- a/engine/overworld/saffron_guards.asm +++ /dev/null @@ -1,16 +0,0 @@ -RemoveGuardDrink: - ld hl, GuardDrinksList -.drinkLoop - ld a, [hli] - ld [$ffdb], a - and a - ret z - push hl - ld b, a - call IsItemInBag - pop hl - jr z, .drinkLoop - jpba RemoveItemByID - -GuardDrinksList: - db FRESH_WATER, SODA_POP, LEMONADE, $00 diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm deleted file mode 100644 index bac2f0ca..00000000 --- a/engine/overworld/set_blackout_map.asm +++ /dev/null @@ -1,29 +0,0 @@ -SetLastBlackoutMap: -; Set the map to return to when -; blacking out or using Teleport or Dig. -; Safari rest houses don't count. - - push hl - ld hl, SafariZoneRestHouses - ld a, [wCurMap] - ld b, a -.loop - ld a, [hli] - cp -1 - jr z, .notresthouse - cp b - jr nz, .loop - jr .done - -.notresthouse - ld a, [wLastMap] - ld [wLastBlackoutMap], a -.done - pop hl - ret - -SafariZoneRestHouses: - db SAFARI_ZONE_WEST_REST_HOUSE - db SAFARI_ZONE_EAST_REST_HOUSE - db SAFARI_ZONE_NORTH_REST_HOUSE - db -1 diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm new file mode 100644 index 00000000..61356a03 --- /dev/null +++ b/engine/overworld/special_warps.asm @@ -0,0 +1,149 @@ +SpecialWarpIn:: + call LoadSpecialWarpData + predef LoadTilesetHeader + ld hl, wd732 + bit 2, [hl] ; dungeon warp or fly warp? + res 2, [hl] + jr z, .next +; if dungeon warp or fly warp + ld a, [wDestinationMap] + jr .next2 +.next + bit 1, [hl] + jr z, .next3 + call DebugStart +.next3 + ld a, 0 +.next2 + ld b, a + ld a, [wd72d] + and a + jr nz, .next4 + ld a, b +.next4 + ld hl, wd732 + bit 4, [hl] ; dungeon warp? + ret nz +; if not dungeon warp + ld [wLastMap], a + ret + +; gets the map ID, tile block map view pointer, tileset, and coordinates +LoadSpecialWarpData: + ld a, [wd72d] + cp TRADE_CENTER + jr nz, .notTradeCenter + ld hl, TradeCenterSpec1 + ldh a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right + jr z, .copyWarpData + ld hl, TradeCenterSpec2 + jr .copyWarpData +.notTradeCenter + cp COLOSSEUM + jr nz, .notColosseum + ld hl, ColosseumSpec1 + ldh a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK + jr z, .copyWarpData + ld hl, ColosseumSpec2 + jr .copyWarpData +.notColosseum + ld a, [wd732] + bit 1, a + jr nz, .notFirstMap + bit 2, a + jr nz, .notFirstMap + ld hl, FirstMapSpec +.copyWarpData + ld de, wCurMap + ld c, $7 +.copyWarpDataLoop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyWarpDataLoop + ld a, [hli] + ld [wCurMapTileset], a + xor a + jr .done +.notFirstMap + ld a, [wLastMap] ; this value is overwritten before it's ever read + ld hl, wd732 + bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? + jr nz, .usedDunegonWarp + bit 6, [hl] ; return to last pokemon center (or player's house)? + res 6, [hl] + jr z, .otherDestination +; return to last pokemon center or player's house + ld a, [wLastBlackoutMap] + jr .usedFlyWarp +.usedDunegonWarp + ld hl, wd72d + res 4, [hl] + ld a, [wDungeonWarpDestinationMap] + ld b, a + ld [wCurMap], a + ld a, [wWhichDungeonWarp] + ld c, a + ld hl, DungeonWarpList + ld de, 0 + ld a, 6 + ld [wDungeonWarpDataEntrySize], a +.dungeonWarpListLoop + ld a, [hli] + cp b + jr z, .matchedDungeonWarpDestinationMap + inc hl + jr .nextDungeonWarp +.matchedDungeonWarpDestinationMap + ld a, [hli] + cp c + jr z, .matchedDungeonWarpID +.nextDungeonWarp + ld a, [wDungeonWarpDataEntrySize] + add e + ld e, a + jr .dungeonWarpListLoop +.matchedDungeonWarpID + ld hl, DungeonWarpData + add hl, de + jr .copyWarpData2 +.otherDestination + ld a, [wDestinationMap] +.usedFlyWarp + ld b, a + ld [wCurMap], a + ld hl, FlyWarpDataPtr +.flyWarpDataPtrLoop + ld a, [hli] + inc hl + cp b + jr z, .foundFlyWarpMatch + inc hl + inc hl + jr .flyWarpDataPtrLoop +.foundFlyWarpMatch + ld a, [hli] + ld h, [hl] + ld l, a +.copyWarpData2 + ld de, wCurrentTileBlockMapViewPointer + ld c, $6 +.copyWarpDataLoop2 + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyWarpDataLoop2 + xor a ; OVERWORLD + ld [wCurMapTileset], a +.done + ld [wYOffsetSinceLastSpecialWarp], a + ld [wXOffsetSinceLastSpecialWarp], a + ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps + ld [wDestinationWarpID], a + ret + +INCLUDE "data/maps/special_warps.asm" diff --git a/engine/overworld/spinners.asm b/engine/overworld/spinners.asm new file mode 100644 index 00000000..0ac6380d --- /dev/null +++ b/engine/overworld/spinners.asm @@ -0,0 +1,65 @@ +LoadSpinnerArrowTiles:: + ld a, [wSpritePlayerStateData1ImageIndex] + srl a + srl a + ld hl, SpinnerPlayerFacingDirections + ld c, a + ld b, $0 + add hl, bc + ld a, [hl] + ld [wSpritePlayerStateData1ImageIndex], a + ld a, [wCurMapTileset] + cp FACILITY + ld hl, FacilitySpinnerArrows + jr z, .asm_44ff6 + ld hl, GymSpinnerArrows +.asm_44ff6 + ld a, [wSimulatedJoypadStatesIndex] + bit 0, a + jr nz, .asm_45001 + ld de, $18 + add hl, de +.asm_45001 + ld a, $4 + ld bc, $0 +.asm_45006 + push af + push hl + push bc + add hl, bc + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld h, [hl] + ld l, a + call CopyVideoData + pop bc + ld a, $6 + add c + ld c, a + pop hl + pop af + dec a + jr nz, .asm_45006 + ret + +INCLUDE "data/tilesets/spinner_tiles.asm" + +SpinnerPlayerFacingDirections: +; This isn't the order of the facing directions. Rather, it's a list of +; the facing directions that come next. For example, when the player is +; facing down (00), the next facing direction is left (08). + db $08 ; down -> left + db $0C ; up -> right + db $04 ; left -> up + db $00 ; right -> down + +; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ +SpinnerArrowAnimTiles: + INCBIN "gfx/overworld/spinners.2bpp" diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm new file mode 100644 index 00000000..dc57d5b9 --- /dev/null +++ b/engine/overworld/sprite_collisions.asm @@ -0,0 +1,358 @@ +_UpdateSprites:: + ld h, $c1 + inc h + ld a, SPRITESTATEDATA2_IMAGEBASEOFFSET +.spriteLoop + ld l, a + sub SPRITESTATEDATA2_IMAGEBASEOFFSET + ld c, a + ldh [hCurrentSpriteOffset], a + ld a, [hl] + and a + jr z, .skipSprite ; tests SPRITESTATEDATA2_IMAGEBASEOFFSET + push hl + push de + push bc + call .updateCurrentSprite + pop bc + pop de + pop hl +.skipSprite + ld a, l + add $10 ; move to next sprite + cp SPRITESTATEDATA2_IMAGEBASEOFFSET ; test for overflow (back at beginning) + jr nz, .spriteLoop + ret +.updateCurrentSprite + cp $1 + jp nz, UpdateNonPlayerSprite + jp UpdatePlayerSprite + +UpdateNonPlayerSprite: + dec a + swap a + ldh [hTilePlayerStandingOn], a ; $10 * sprite# + ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset? + ld b, a + ldh a, [hCurrentSpriteOffset] + cp b + jr nz, .unequal + jp DoScriptedNPCMovement +.unequal + jp UpdateNPCSprite + +; This detects if the current sprite (whose offset is at hCurrentSpriteOffset) +; is going to collide with another sprite by looping over the other sprites. +; The current sprite's offset will be labelled with i (e.g. i#SPRITESTATEDATA1_PICTUREID). +; The loop sprite's offset will labelled with j (e.g. j#SPRITESTATEDATA1_PICTUREID). +; +; Note that the Y coordinate of the sprite (in [k#SPRITESTATEDATA1_YPIXELS]) +; is one of the following 9 values when the sprite is aligned with the grid: +; $fc, $0c, $1c, $2c, ..., $7c. +; The reason that 4 is added below to the coordinate is to make it align with a +; multiple of $10 to make comparisons easier. +DetectCollisionBetweenSprites: + nop + + ld h, HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] + add LOW(wSpriteStateData1) + ld l, a + + ld a, [hl] ; a = [i#SPRITESTATEDATA1_PICTUREID] (0 if slot is unused) + and a ; is this sprite slot slot used? + ret z ; return if not used + + ld a, l + add 3 + ld l, a + + ld a, [hli] ; a = [i#SPRITESTATEDATA1_YSTEPVECTOR] (-1, 0, or 1) + call SetSpriteCollisionValues + + ld a, [hli] ; a = [i#SPRITESTATEDATA1_YPIXELS] + add 4 ; align with multiple of $10 + +; The effect of the following 3 lines is to +; add 7 to a if moving south or +; subtract 7 from a if moving north. + add b + and $f0 + or c + + ldh [hFF90], a ; store Y coordinate adjusted for direction of movement + + ld a, [hli] ; a = [i#SPRITESTATEDATA1_XSTEPVECTOR] (-1, 0, or 1) + call SetSpriteCollisionValues + ld a, [hl] ; a = [i#SPRITESTATEDATA1_XPIXELS] + +; The effect of the following 3 lines is to +; add 7 to a if moving east or +; subtract 7 from a if moving west. + add b + and $f0 + or c + + ldh [hFF91], a ; store X coordinate adjusted for direction of movement + + ld a, l + add 7 + ld l, a + + xor a + ld [hld], a ; zero [i#SPRITESTATEDATA1_0D] XXX what's this for? + ld [hld], a ; zero [i#SPRITESTATEDATA1_COLLISIONDATA] + + ldh a, [hFF91] + ld [hld], a ; [i#SPRITESTATEDATA1_XADJUSTED] + ldh a, [hFF90] + ld [hl], a ; [i#SPRITESTATEDATA1_YADJUSTED] + + xor a ; zero the loop counter + +.loop + ldh [hFF8F], a ; store loop counter + swap a + ld e, a + ldh a, [hCurrentSpriteOffset] + cp e ; does the loop sprite match the current sprite? + jp z, .next ; go to the next sprite if they match + + ld d, h + ld a, [de] ; a = [j#SPRITESTATEDATA1_PICTUREID] (0 if slot is unused) + and a ; is this sprite slot slot used? + jp z, .next ; go the next sprite if not used + + inc e + inc e + ld a, [de] ; a = [j#SPRITESTATEDATA1_IMAGEINDEX] ($ff means the sprite is offscreen) + inc a + jp z, .next ; go the next sprite if offscreen + + ldh a, [hCurrentSpriteOffset] + add 10 + ld l, a + + inc e + ld a, [de] ; a = [j#SPRITESTATEDATA1_YSTEPVECTOR] + call SetSpriteCollisionValues + + inc e + ld a, [de] ; a = [j#SPRITESTATEDATA1_YPIXELS] + add 4 ; align with multiple of $10 + +; The effect of the following 3 lines is to +; add 7 to a if moving south or +; subtract 7 from a if moving north. + add b + and $f0 + or c + + sub [hl] ; subtract [i#SPRITESTATEDATA1_YADJUSTED] from [j#SPRITESTATEDATA1_YADJUSTED] + +; calculate the absolute value of the difference to get the distance + jr nc, .noCarry1 + cpl + inc a +.noCarry1 + ldh [hFF90], a ; store the distance between the two sprites' adjusted Y values + +; Use the carry flag set by the above subtraction to determine which sprite's +; Y coordinate is larger. This information is used later to set +; [i#SPRITESTATEDATA1_COLLISIONDATA]. +; The following 5 lines set the lowest 2 bits of c, which are later shifted left by 2. +; If sprite i's Y is larger, set lowest 2 bits of c to 10. +; If sprite j's Y is larger or both are equal, set lowest 2 bits of c to 01. + push af + rl c + pop af + ccf + rl c + +; If sprite i's delta Y is 0, then b = 7, else b = 9. + ld b, 7 + ld a, [hl] ; a = [i#SPRITESTATEDATA1_YADJUSTED] + and $f + jr z, .next1 + ld b, 9 + +.next1 + ldh a, [hFF90] ; a = distance between adjusted Y coordinates + sub b + ldh [hFF92], a ; store distance adjusted using sprite i's direction + ld a, b + ldh [hFF90], a ; store 7 or 9 depending on sprite i's delta Y + jr c, .checkXDistance + +; If sprite j's delta Y is 0, then b = 7, else b = 9. + ld b, 7 + dec e + ld a, [de] ; a = [j#SPRITESTATEDATA1_YSTEPVECTOR] + inc e + and a + jr z, .next2 + ld b, 9 + +.next2 + ldh a, [hFF92] ; a = distance adjusted using sprite i's direction + sub b ; adjust distance using sprite j's direction + jr z, .checkXDistance + jr nc, .next ; go to next sprite if distance is still positive after both adjustments + +.checkXDistance + inc e + inc l + ld a, [de] ; a = [j#SPRITESTATEDATA1_XSTEPVECTOR] + + push bc + + call SetSpriteCollisionValues + inc e + ld a, [de] ; a = [j#SPRITESTATEDATA1_XPIXELS] + +; The effect of the following 3 lines is to +; add 7 to a if moving east or +; subtract 7 from a if moving west. + add b + and $f0 + or c + + pop bc + + sub [hl] ; subtract [i#SPRITESTATEDATA1_XADJUSTED] from [j#SPRITESTATEDATA1_XADJUSTED] + +; calculate the absolute value of the difference to get the distance + jr nc, .noCarry2 + cpl + inc a +.noCarry2 + ldh [hFF91], a ; store the distance between the two sprites' adjusted X values + +; Use the carry flag set by the above subtraction to determine which sprite's +; X coordinate is larger. This information is used later to set +; [i#SPRITESTATEDATA1_COLLISIONDATA]. +; The following 5 lines set the lowest 2 bits of c. +; If sprite i's X is larger, set lowest 2 bits of c to 10. +; If sprite j's X is larger or both are equal, set lowest 2 bits of c to 01. + push af + rl c + pop af + ccf + rl c + +; If sprite i's delta X is 0, then b = 7, else b = 9. + ld b, 7 + ld a, [hl] ; a = [i#SPRITESTATEDATA1_XADJUSTED] + and $f + jr z, .next3 + ld b, 9 + +.next3 + ldh a, [hFF91] ; a = distance between adjusted X coordinates + sub b + ldh [hFF92], a ; store distance adjusted using sprite i's direction + ld a, b + ldh [hFF91], a ; store 7 or 9 depending on sprite i's delta X + jr c, .collision + +; If sprite j's delta X is 0, then b = 7, else b = 9. + ld b, 7 + dec e + ld a, [de] ; a = [j#SPRITESTATEDATA1_XSTEPVECTOR] + inc e + and a + jr z, .next4 + ld b, 9 + +.next4 + ldh a, [hFF92] ; a = distance adjusted using sprite i's direction + sub b ; adjust distance using sprite j's direction + jr z, .collision + jr nc, .next ; go to next sprite if distance is still positive after both adjustments + +.collision + ldh a, [hFF91] ; a = 7 or 9 depending on sprite i's delta X + ld b, a + ldh a, [hFF90] ; a = 7 or 9 depending on sprite i's delta Y + inc l + +; If delta X isn't 0 and delta Y is 0, then b = %0011, else b = %1100. +; (note that normally if delta X isn't 0, then delta Y must be 0 and vice versa) + cp b + jr c, .next5 + ld b, %1100 + jr .next6 +.next5 + ld b, %0011 + +.next6 + ld a, c ; c has 2 bits set (one of bits 0-1 is set for the X axis and one of bits 2-3 for the Y axis) + and b ; we select either the bit in bits 0-1 or bits 2-3 based on the calculation immediately above + or [hl] ; or with existing collision direction bits in [i#SPRITESTATEDATA1_COLLISIONDATA] + ld [hl], a ; store new value + ld a, c ; useless code because a is overwritten before being used again + +; set bit in [i#SPRITESTATEDATA1_0E] or [i#SPRITESTATEDATA1_0F] +; to indicate which sprite the collision occurred with + inc l + inc l + ldh a, [hFF8F] ; a = loop counter + ld de, SpriteCollisionBitTable + add a + add e + ld e, a + jr nc, .noCarry3 + inc d +.noCarry3 + ld a, [de] + or [hl] + ld [hli], a + inc de + ld a, [de] + or [hl] + ld [hl], a + +.next + ldh a, [hFF8F] ; a = loop counter + inc a + cp $10 + jp nz, .loop + ret + +; takes delta X or delta Y in a +; b = delta X/Y +; c = 0 if delta X/Y is 0 +; c = 7 if delta X/Y is 1 +; c = 9 if delta X/Y is -1 +SetSpriteCollisionValues: + and a + ld b, 0 + ld c, 0 + jr z, .done + ld c, 9 + cp -1 + jr z, .ok + ld c, 7 + ld a, 0 +.ok + ld b, a +.done + ret + +SpriteCollisionBitTable: + db %00000000,%00000001 + db %00000000,%00000010 + db %00000000,%00000100 + db %00000000,%00001000 + db %00000000,%00010000 + db %00000000,%00100000 + db %00000000,%01000000 + db %00000000,%10000000 + db %00000001,%00000000 + db %00000010,%00000000 + db %00000100,%00000000 + db %00001000,%00000000 + db %00010000,%00000000 + db %00100000,%00000000 + db %01000000,%00000000 + db %10000000,%00000000 diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm deleted file mode 100755 index ea4747ce..00000000 --- a/engine/overworld/ssanne.asm +++ /dev/null @@ -1,93 +0,0 @@ -AnimateBoulderDust: - ld a, $1 - ld [wWhichAnimationOffsets], a ; select the boulder dust offsets - ld a, [wUpdateSpritesEnabled] - push af - ld a, $ff - ld [wUpdateSpritesEnabled], a - ld a, %11100100 - ld [rOBP1], a - call LoadSmokeTileFourTimes - callba WriteCutOrBoulderDustAnimationOAMBlock - ld c, 8 ; number of steps in animation -.loop - push bc - call GetMoveBoulderDustFunctionPointer - ld bc, .returnAddress - push bc - ld c, 4 - jp hl -.returnAddress - ld a, [rOBP1] - xor %01100100 - ld [rOBP1], a - call Delay3 - pop bc - dec c - jr nz, .loop - pop af - ld [wUpdateSpritesEnabled], a - jp LoadPlayerSpriteGraphics - -GetMoveBoulderDustFunctionPointer: - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - ld hl, MoveBoulderDustFunctionPointerTable - ld c, a - ld b, $0 - add hl, bc - ld a, [hli] - ld [wCoordAdjustmentAmount], a - ld a, [hli] - ld e, a - ld a, [hli] - ld h, [hl] - ld l, a - push hl - ld hl, wOAMBuffer + $90 - ld d, $0 - add hl, de - ld e, l - ld d, h - pop hl - ret - -MoveBoulderDustFunctionPointerTable: -; facing down - db $FF,$00 - dw AdjustOAMBlockYPos - -; facing up - db $01,$00 - dw AdjustOAMBlockYPos - -; facing left - db $01,$01 - dw AdjustOAMBlockXPos - -; facing right - db $FF,$01 - dw AdjustOAMBlockXPos - -LoadSmokeTileFourTimes: - ld hl, vChars1 + $7c0 - ld c, $4 -.loop - push bc - push hl - call LoadSmokeTile - pop hl - ld bc, $10 - add hl, bc - pop bc - dec c - jr nz, .loop - ret - -LoadSmokeTile: - ld de, SSAnneSmokePuffTile - lb bc, BANK(SSAnneSmokePuffTile), (SSAnneSmokePuffTileEnd - SSAnneSmokePuffTile) / $10 - jp CopyVideoData - -SSAnneSmokePuffTile: - INCBIN "gfx/ss_anne_smoke_puff.2bpp" -SSAnneSmokePuffTileEnd: diff --git a/engine/overworld/tileset_header.asm b/engine/overworld/tileset_header.asm deleted file mode 100644 index 6e33974f..00000000 --- a/engine/overworld/tileset_header.asm +++ /dev/null @@ -1,60 +0,0 @@ -LoadTilesetHeader: - call GetPredefRegisters - push hl - ld d, 0 - ld a, [wCurMapTileset] - add a - add a - ld b, a - add a - add b ; a = tileset * 12 - jr nc, .noCarry - inc d -.noCarry - ld e, a - ld hl, Tilesets - add hl, de - ld de, wTilesetBank - ld c, $b -.copyTilesetHeaderLoop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyTilesetHeaderLoop - ld a, [hl] - ld [hTilesetType], a - xor a - ld [$ffd8], a - pop hl - ld a, [wCurMapTileset] - push hl - push de - ld hl, DungeonTilesets - ld de, $1 - call IsInArray - pop de - pop hl - jr c, .asm_c797 - ld a, [wCurMapTileset] - ld b, a - ld a, [hPreviousTileset] - cp b - jr z, .done -.asm_c797 - ld a, [wDestinationWarpID] - cp $ff - jr z, .done - call LoadDestinationWarpPosition - ld a, [wYCoord] - and $1 - ld [wYBlockCoord], a - ld a, [wXCoord] - and $1 - ld [wXBlockCoord], a -.done - ret - -INCLUDE "data/dungeon_tilesets.asm" - -INCLUDE "data/tileset_headers.asm" diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm new file mode 100644 index 00000000..fa5cf626 --- /dev/null +++ b/engine/overworld/tilesets.asm @@ -0,0 +1,60 @@ +LoadTilesetHeader: + call GetPredefRegisters + push hl + ld d, 0 + ld a, [wCurMapTileset] + add a + add a + ld b, a + add a + add b ; a = tileset * 12 + jr nc, .noCarry + inc d +.noCarry + ld e, a + ld hl, Tilesets + add hl, de + ld de, wTilesetBank + ld c, $b +.copyTilesetHeaderLoop + ld a, [hli] + ld [de], a + inc de + dec c + jr nz, .copyTilesetHeaderLoop + ld a, [hl] + ldh [hTileAnimations], a + xor a + ldh [hMovingBGTilesCounter1], a + pop hl + ld a, [wCurMapTileset] + push hl + push de + ld hl, DungeonTilesets + ld de, $1 + call IsInArray + pop de + pop hl + jr c, .asm_c797 + ld a, [wCurMapTileset] + ld b, a + ldh a, [hPreviousTileset] + cp b + jr z, .done +.asm_c797 + ld a, [wDestinationWarpID] + cp $ff + jr z, .done + call LoadDestinationWarpPosition + ld a, [wYCoord] + and $1 + ld [wYBlockCoord], a + ld a, [wXCoord] + and $1 + ld [wXBlockCoord], a +.done + ret + +INCLUDE "data/tilesets/dungeon_tilesets.asm" + +INCLUDE "data/tilesets/tileset_headers.asm" diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm new file mode 100644 index 00000000..816dea7f --- /dev/null +++ b/engine/overworld/trainer_sight.asm @@ -0,0 +1,349 @@ +_GetSpritePosition1:: + ld hl, wSpriteStateData1 + ld de, SPRITESTATEDATA1_YPIXELS + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + call GetSpriteDataPointer + ld a, [hli] ; x#SPRITESTATEDATA1_YPIXELS + ldh [hSpriteScreenYCoord], a + inc hl + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS + ldh [hSpriteScreenXCoord], a + ld de, wSpritePlayerStateData2MapY - wSpritePlayerStateData1XPixels + add hl, de + ld a, [hli] ; x#SPRITESTATEDATA2_MAPY + ldh [hSpriteMapYCoord], a + ld a, [hl] ; x#SPRITESTATEDATA2_MAPX + ldh [hSpriteMapXCoord], a + ret + +_GetSpritePosition2:: + ld hl, wSpriteStateData1 + ld de, SPRITESTATEDATA1_YPIXELS + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + call GetSpriteDataPointer + ld a, [hli] ; x#SPRITESTATEDATA1_YPIXELS + ld [wSavedSpriteScreenY], a + inc hl + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS + ld [wSavedSpriteScreenX], a + ld de, wSpritePlayerStateData2MapY - wSpritePlayerStateData1XPixels + add hl, de + ld a, [hli] ; x#SPRITESTATEDATA2_MAPY + ld [wSavedSpriteMapY], a + ld a, [hl] ; x#SPRITESTATEDATA2_MAPX + ld [wSavedSpriteMapX], a + ret + +_SetSpritePosition1:: + ld hl, wSpriteStateData1 + ld de, SPRITESTATEDATA1_YPIXELS + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + call GetSpriteDataPointer + ldh a, [hSpriteScreenYCoord] ; x#SPRITESTATEDATA1_YPIXELS + ld [hli], a + inc hl + ldh a, [hSpriteScreenXCoord] ; x#SPRITESTATEDATA1_XPIXELS + ld [hl], a + ld de, wSpritePlayerStateData2MapY - wSpritePlayerStateData1XPixels + add hl, de + ldh a, [hSpriteMapYCoord] ; x#SPRITESTATEDATA2_MAPY + ld [hli], a + ldh a, [hSpriteMapXCoord] ; x#SPRITESTATEDATA2_MAPX + ld [hl], a + ret + +_SetSpritePosition2:: + ld hl, wSpriteStateData1 + ld de, SPRITESTATEDATA1_YPIXELS + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + call GetSpriteDataPointer + ld a, [wSavedSpriteScreenY] + ld [hli], a ; x#SPRITESTATEDATA1_YPIXELS + inc hl + ld a, [wSavedSpriteScreenX] + ld [hl], a ; x#SPRITESTATEDATA1_XPIXELS + ld de, wSpritePlayerStateData2MapY - wSpritePlayerStateData1XPixels + add hl, de + ld a, [wSavedSpriteMapY] + ld [hli], a ; x#SPRITESTATEDATA2_MAPY + ld a, [wSavedSpriteMapX] + ld [hl], a ; x#SPRITESTATEDATA2_MAPX + ret + +TrainerWalkUpToPlayer:: + ld a, [wSpriteIndex] + swap a + ld [wTrainerSpriteOffset], a + call ReadTrainerScreenPosition + ld a, [wTrainerFacingDirection] + and a ; SPRITE_FACING_DOWN + jr z, .facingDown + cp SPRITE_FACING_UP + jr z, .facingUp + cp SPRITE_FACING_LEFT + jr z, .facingLeft + jr .facingRight +.facingDown + ld a, [wTrainerScreenY] + ld b, a + ld a, $3c ; (fixed) player screen Y pos + call CalcDifference + cp $10 ; trainer is right above player + ret z + swap a + dec a + ld c, a ; bc = steps yet to go to reach player + xor a + ld b, a ; a = direction to go to + jr .writeWalkScript +.facingUp + ld a, [wTrainerScreenY] + ld b, a + ld a, $3c ; (fixed) player screen Y pos + call CalcDifference + cp $10 ; trainer is right below player + ret z + swap a + dec a + ld c, a ; bc = steps yet to go to reach player + ld b, $0 + ld a, $40 ; a = direction to go to + jr .writeWalkScript +.facingRight + ld a, [wTrainerScreenX] + ld b, a + ld a, $40 ; (fixed) player screen X pos + call CalcDifference + cp $10 ; trainer is directly left of player + ret z + swap a + dec a + ld c, a ; bc = steps yet to go to reach player + ld b, $0 + ld a, $c0 ; a = direction to go to + jr .writeWalkScript +.facingLeft + ld a, [wTrainerScreenX] + ld b, a + ld a, $40 ; (fixed) player screen X pos + call CalcDifference + cp $10 ; trainer is directly right of player + ret z + swap a + dec a + ld c, a ; bc = steps yet to go to reach player + ld b, $0 + ld a, $80 ; a = direction to go to +.writeWalkScript + ld hl, wNPCMovementDirections2 + ld de, wNPCMovementDirections2 + call FillMemory ; write the necessary steps to reach player + ld [hl], $ff ; write end of list sentinel + ld a, [wSpriteIndex] + ldh [hSpriteIndex], a + jp MoveSprite_ + +; input: de = offset within sprite entry +; output: hl = pointer to sprite data +GetSpriteDataPointer: + push de + add hl, de + ldh a, [hSpriteIndex] + swap a + ld d, $0 + ld e, a + add hl, de + pop de + ret + +; tests if this trainer is in the right position to engage the player and do so if she is. +TrainerEngage: + push hl + push de + ld a, [wTrainerSpriteOffset] + add SPRITESTATEDATA1_IMAGEINDEX + ld d, $0 + ld e, a + ld hl, wSpriteStateData1 + add hl, de + ld a, [hl] ; x#SPRITESTATEDATA1_IMAGEINDEX + sub $ff + jr nz, .spriteOnScreen ; test if sprite is on screen + jp .noEngage +.spriteOnScreen + ld a, [wTrainerSpriteOffset] + add SPRITESTATEDATA1_FACINGDIRECTION + ld d, $0 + ld e, a + ld hl, wSpriteStateData1 + add hl, de + ld a, [hl] ; x#SPRITESTATEDATA1_FACINGDIRECTION + ld [wTrainerFacingDirection], a + call ReadTrainerScreenPosition + ld a, [wTrainerScreenY] ; sprite screen Y pos + ld b, a + ld a, $3c + cp b + jr z, .linedUpY + ld a, [wTrainerScreenX] ; sprite screen X pos + ld b, a + ld a, $40 + cp b + jr z, .linedUpX + xor a + jp .noEngage +.linedUpY + ld a, [wTrainerScreenX] ; sprite screen X pos + ld b, a + ld a, $40 ; (fixed) player X position + call CalcDifference ; calc distance + jr z, .noEngage ; exact same position as player + call CheckSpriteCanSeePlayer + jr c, .engage + xor a + jr .noEngage +.linedUpX + ld a, [wTrainerScreenY] ; sprite screen Y pos + ld b, a + ld a, $3c ; (fixed) player Y position + call CalcDifference ; calc distance + jr z, .noEngage ; exact same position as player + call CheckSpriteCanSeePlayer + jr c, .engage + xor a + jp .noEngage +.engage + call CheckPlayerIsInFrontOfSprite + ld a, [wTrainerSpriteOffset] + and a + jr z, .noEngage + ld hl, wFlags_0xcd60 + set 0, [hl] + call EngageMapTrainer + ld a, $ff +.noEngage + ld [wTrainerSpriteOffset], a + pop de + pop hl + ret + +; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX +ReadTrainerScreenPosition: + ld a, [wTrainerSpriteOffset] + add SPRITESTATEDATA1_YPIXELS + ld d, $0 + ld e, a + ld hl, wSpriteStateData1 + add hl, de + ld a, [hl] ; x#SPRITESTATEDATA1_YPIXELS + ld [wTrainerScreenY], a + ld a, [wTrainerSpriteOffset] + add SPRITESTATEDATA1_XPIXELS + ld d, $0 + ld e, a + ld hl, wSpriteStateData1 + add hl, de + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS + ld [wTrainerScreenX], a + ret + +; checks if the sprite is properly lined up with the player with respect to the direction it's looking. Also checks the distance between player and sprite +; note that this does not necessarily mean the sprite is seeing the player, he could be behind it's back +; a: distance player to sprite +CheckSpriteCanSeePlayer: + ld b, a + ld a, [wTrainerEngageDistance] ; how far the trainer can see + cp b + jr nc, .checkIfLinedUp + jr .notInLine ; player too far away +.checkIfLinedUp + ld a, [wTrainerFacingDirection] ; sprite facing direction + cp SPRITE_FACING_DOWN + jr z, .checkXCoord + cp SPRITE_FACING_UP + jr z, .checkXCoord + cp SPRITE_FACING_LEFT + jr z, .checkYCoord + cp SPRITE_FACING_RIGHT + jr z, .checkYCoord + jr .notInLine +.checkXCoord + ld a, [wTrainerScreenX] ; sprite screen X position + ld b, a + cp $40 + jr z, .inLine + jr .notInLine +.checkYCoord + ld a, [wTrainerScreenY] ; sprite screen Y position + ld b, a + cp $3c + jr nz, .notInLine +.inLine + scf + ret +.notInLine + and a + ret + +; tests if the player is in front of the sprite (rather than behind it) +CheckPlayerIsInFrontOfSprite: + ld a, [wCurMap] + cp POWER_PLANT + jp z, .engage ; bypass this for power plant to get voltorb fake items to work + ld a, [wTrainerSpriteOffset] + add SPRITESTATEDATA1_YPIXELS + ld d, $0 + ld e, a + ld hl, wSpriteStateData1 + add hl, de + ld a, [hl] ; x#SPRITESTATEDATA1_YPIXELS + cp $fc + jr nz, .notOnTopmostTile ; special case if sprite is on topmost tile (Y = $fc (-4)), make it come down a block + ld a, $c +.notOnTopmostTile + ld [wTrainerScreenY], a + ld a, [wTrainerSpriteOffset] + add SPRITESTATEDATA1_XPIXELS + ld d, $0 + ld e, a + ld hl, wSpriteStateData1 + add hl, de + ld a, [hl] ; x#SPRITESTATEDATA1_XPIXELS + ld [wTrainerScreenX], a + ld a, [wTrainerFacingDirection] ; facing direction + cp SPRITE_FACING_DOWN + jr nz, .notFacingDown + ld a, [wTrainerScreenY] ; sprite screen Y pos + cp $3c + jr c, .engage ; sprite above player + jr .noEngage ; sprite below player +.notFacingDown + cp SPRITE_FACING_UP + jr nz, .notFacingUp + ld a, [wTrainerScreenY] ; sprite screen Y pos + cp $3c + jr nc, .engage ; sprite below player + jr .noEngage ; sprite above player +.notFacingUp + cp SPRITE_FACING_LEFT + jr nz, .notFacingLeft + ld a, [wTrainerScreenX] ; sprite screen X pos + cp $40 + jr nc, .engage ; sprite right of player + jr .noEngage ; sprite left of player +.notFacingLeft + ld a, [wTrainerScreenX] ; sprite screen X pos + cp $40 + jr nc, .noEngage ; sprite right of player +.engage + ld a, $ff + jr .done +.noEngage + xor a +.done + ld [wTrainerSpriteOffset], a + ret diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainers.asm deleted file mode 100755 index 655c6b2a..00000000 --- a/engine/overworld/trainers.asm +++ /dev/null @@ -1,349 +0,0 @@ -_GetSpritePosition1: - ld hl, wSpriteStateData1 - ld de, $4 - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - call GetSpriteDataPointer - ld a, [hli] ; c1x4 (screen Y pos) - ld [$ffeb], a - inc hl - ld a, [hl] ; c1x6 (screen X pos) - ld [$ffec], a - ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) - add hl, de - ld a, [hli] ; c2x4 (map Y pos) - ld [$ffed], a - ld a, [hl] ; c2x5 (map X pos) - ld [$ffee], a - ret - -_GetSpritePosition2: - ld hl, wSpriteStateData1 - ld de, $4 - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - call GetSpriteDataPointer - ld a, [hli] ; c1x4 (screen Y pos) - ld [wSavedSpriteScreenY], a - inc hl - ld a, [hl] ; c1x6 (screen X pos) - ld [wSavedSpriteScreenX], a - ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) - add hl, de - ld a, [hli] ; c2x4 (map Y pos) - ld [wSavedSpriteMapY], a - ld a, [hl] ; c2x5 (map X pos) - ld [wSavedSpriteMapX], a - ret - -_SetSpritePosition1: - ld hl, wSpriteStateData1 - ld de, $4 - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - call GetSpriteDataPointer - ld a, [$ffeb] ; c1x4 (screen Y pos) - ld [hli], a - inc hl - ld a, [$ffec] ; c1x6 (screen X pos) - ld [hl], a - ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) - add hl, de - ld a, [$ffed] ; c2x4 (map Y pos) - ld [hli], a - ld a, [$ffee] ; c2x5 (map X pos) - ld [hl], a - ret - -_SetSpritePosition2: - ld hl, wSpriteStateData1 - ld de, 4 - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - call GetSpriteDataPointer - ld a, [wSavedSpriteScreenY] - ld [hli], a ; c1x4 (screen Y pos) - inc hl - ld a, [wSavedSpriteScreenX] - ld [hl], a ; c1x6 (screen X pos) - ld de, (wSpriteStateData2 + $4) - (wSpriteStateData1 + $6) - add hl, de - ld a, [wSavedSpriteMapY] - ld [hli], a ; c2x4 (map Y pos) - ld a, [wSavedSpriteMapX] - ld [hl], a ; c2x5 (map X pos) - ret - -TrainerWalkUpToPlayer: - ld a, [wSpriteIndex] - swap a - ld [wTrainerSpriteOffset], a - call ReadTrainerScreenPosition - ld a, [wTrainerFacingDirection] - and a ; SPRITE_FACING_DOWN - jr z, .facingDown - cp SPRITE_FACING_UP - jr z, .facingUp - cp SPRITE_FACING_LEFT - jr z, .facingLeft - jr .facingRight -.facingDown - ld a, [wTrainerScreenY] - ld b, a - ld a, $3c ; (fixed) player screen Y pos - call CalcDifference - cp $10 ; trainer is right above player - ret z - swap a - dec a - ld c, a ; bc = steps yet to go to reach player - xor a - ld b, a ; a = direction to go to - jr .writeWalkScript -.facingUp - ld a, [wTrainerScreenY] - ld b, a - ld a, $3c ; (fixed) player screen Y pos - call CalcDifference - cp $10 ; trainer is right below player - ret z - swap a - dec a - ld c, a ; bc = steps yet to go to reach player - ld b, $0 - ld a, $40 ; a = direction to go to - jr .writeWalkScript -.facingRight - ld a, [wTrainerScreenX] - ld b, a - ld a, $40 ; (fixed) player screen X pos - call CalcDifference - cp $10 ; trainer is directly left of player - ret z - swap a - dec a - ld c, a ; bc = steps yet to go to reach player - ld b, $0 - ld a, $c0 ; a = direction to go to - jr .writeWalkScript -.facingLeft - ld a, [wTrainerScreenX] - ld b, a - ld a, $40 ; (fixed) player screen X pos - call CalcDifference - cp $10 ; trainer is directly right of player - ret z - swap a - dec a - ld c, a ; bc = steps yet to go to reach player - ld b, $0 - ld a, $80 ; a = direction to go to -.writeWalkScript - ld hl, wNPCMovementDirections2 - ld de, wNPCMovementDirections2 - call FillMemory ; write the necessary steps to reach player - ld [hl], $ff ; write end of list sentinel - ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a - jp MoveSprite_ - -; input: de = offset within sprite entry -; output: hl = pointer to sprite data -GetSpriteDataPointer: - push de - add hl, de - ld a, [H_SPRITEINDEX] - swap a - ld d, $0 - ld e, a - add hl, de - pop de - ret - -; tests if this trainer is in the right position to engage the player and do so if she is. -TrainerEngage: - push hl - push de - ld a, [wTrainerSpriteOffset] - add $2 - ld d, $0 - ld e, a - ld hl, wSpriteStateData1 - add hl, de - ld a, [hl] ; c1x2: sprite image index - sub $ff - jr nz, .spriteOnScreen ; test if sprite is on screen - jp .noEngage -.spriteOnScreen - ld a, [wTrainerSpriteOffset] - add $9 - ld d, $0 - ld e, a - ld hl, wSpriteStateData1 - add hl, de - ld a, [hl] ; c1x9: facing direction - ld [wTrainerFacingDirection], a - call ReadTrainerScreenPosition - ld a, [wTrainerScreenY] ; sprite screen Y pos - ld b, a - ld a, $3c - cp b - jr z, .linedUpY - ld a, [wTrainerScreenX] ; sprite screen X pos - ld b, a - ld a, $40 - cp b - jr z, .linedUpX - xor a - jp .noEngage -.linedUpY - ld a, [wTrainerScreenX] ; sprite screen X pos - ld b, a - ld a, $40 ; (fixed) player X position - call CalcDifference ; calc distance - jr z, .noEngage ; exact same position as player - call CheckSpriteCanSeePlayer - jr c, .engage - xor a - jr .noEngage -.linedUpX - ld a, [wTrainerScreenY] ; sprite screen Y pos - ld b, a - ld a, $3c ; (fixed) player Y position - call CalcDifference ; calc distance - jr z, .noEngage ; exact same position as player - call CheckSpriteCanSeePlayer - jr c, .engage - xor a - jp .noEngage -.engage - call CheckPlayerIsInFrontOfSprite - ld a, [wTrainerSpriteOffset] - and a - jr z, .noEngage - ld hl, wFlags_0xcd60 - set 0, [hl] - call EngageMapTrainer - ld a, $ff -.noEngage - ld [wTrainerSpriteOffset], a - pop de - pop hl - ret - -; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX -ReadTrainerScreenPosition: - ld a, [wTrainerSpriteOffset] - add $4 - ld d, $0 - ld e, a - ld hl, wSpriteStateData1 - add hl, de - ld a, [hl] ; c1x4 (sprite Y pos) - ld [wTrainerScreenY], a - ld a, [wTrainerSpriteOffset] - add $6 - ld d, $0 - ld e, a - ld hl, wSpriteStateData1 - add hl, de - ld a, [hl] ; c1x6 (sprite X pos) - ld [wTrainerScreenX], a - ret - -; checks if the sprite is properly lined up with the player with respect to the direction it's looking. Also checks the distance between player and sprite -; note that this does not necessarily mean the sprite is seeing the player, he could be behind it's back -; a: distance player to sprite -CheckSpriteCanSeePlayer: - ld b, a - ld a, [wTrainerEngageDistance] ; how far the trainer can see - cp b - jr nc, .checkIfLinedUp - jr .notInLine ; player too far away -.checkIfLinedUp - ld a, [wTrainerFacingDirection] ; sprite facing direction - cp SPRITE_FACING_DOWN - jr z, .checkXCoord - cp SPRITE_FACING_UP - jr z, .checkXCoord - cp SPRITE_FACING_LEFT - jr z, .checkYCoord - cp SPRITE_FACING_RIGHT - jr z, .checkYCoord - jr .notInLine -.checkXCoord - ld a, [wTrainerScreenX] ; sprite screen X position - ld b, a - cp $40 - jr z, .inLine - jr .notInLine -.checkYCoord - ld a, [wTrainerScreenY] ; sprite screen Y position - ld b, a - cp $3c - jr nz, .notInLine -.inLine - scf - ret -.notInLine - and a - ret - -; tests if the player is in front of the sprite (rather than behind it) -CheckPlayerIsInFrontOfSprite: - ld a, [wCurMap] - cp POWER_PLANT - jp z, .engage ; bypass this for power plant to get voltorb fake items to work - ld a, [wTrainerSpriteOffset] - add $4 - ld d, $0 - ld e, a - ld hl, wSpriteStateData1 - add hl, de - ld a, [hl] ; c1x4 (sprite screen Y pos) - cp $fc - jr nz, .notOnTopmostTile ; special case if sprite is on topmost tile (Y = $fc (-4)), make it come down a block - ld a, $c -.notOnTopmostTile - ld [wTrainerScreenY], a - ld a, [wTrainerSpriteOffset] - add $6 - ld d, $0 - ld e, a - ld hl, wSpriteStateData1 - add hl, de - ld a, [hl] ; c1x6 (sprite screen X pos) - ld [wTrainerScreenX], a - ld a, [wTrainerFacingDirection] ; facing direction - cp SPRITE_FACING_DOWN - jr nz, .notFacingDown - ld a, [wTrainerScreenY] ; sprite screen Y pos - cp $3c - jr c, .engage ; sprite above player - jr .noEngage ; sprite below player -.notFacingDown - cp SPRITE_FACING_UP - jr nz, .notFacingUp - ld a, [wTrainerScreenY] ; sprite screen Y pos - cp $3c - jr nc, .engage ; sprite below player - jr .noEngage ; sprite above player -.notFacingUp - cp SPRITE_FACING_LEFT - jr nz, .notFacingLeft - ld a, [wTrainerScreenX] ; sprite screen X pos - cp $40 - jr nc, .engage ; sprite right of player - jr .noEngage ; sprite left of player -.notFacingLeft - ld a, [wTrainerScreenX] ; sprite screen X pos - cp $40 - jr nc, .noEngage ; sprite right of player -.engage - ld a, $ff - jr .done -.noEngage - xor a -.done - ld [wTrainerSpriteOffset], a - ret diff --git a/engine/overworld/turn_sprite.asm b/engine/overworld/turn_sprite.asm new file mode 100644 index 00000000..7b34a03a --- /dev/null +++ b/engine/overworld/turn_sprite.asm @@ -0,0 +1,25 @@ +UpdateSpriteFacingOffsetAndDelayMovement:: + ld h, HIGH(wSpriteStateData2) + ldh a, [hCurrentSpriteOffset] + add $8 + ld l, a + ld a, $7f ; maximum movement delay + ld [hl], a ; x#SPRITESTATEDATA2_MOVEMENTDELAY + dec h ; HIGH(wSpriteStateData1) + ldh a, [hCurrentSpriteOffset] + add $9 + ld l, a + ld a, [hld] ; x#SPRITESTATEDATA1_FACINGDIRECTION + ld b, a + xor a + ld [hld], a + ld [hl], a ; x#SPRITESTATEDATA1_ANIMFRAMECOUNTER + ldh a, [hCurrentSpriteOffset] + add SPRITESTATEDATA1_IMAGEINDEX + ld l, a + ld a, [hl] ; x#SPRITESTATEDATA1_IMAGEINDEX + or b ; or in the facing direction + ld [hld], a + ld a, $2 ; delayed movement status + ld [hl], a ; x#SPRITESTATEDATA1_MOVEMENTSTATUS + ret diff --git a/engine/overworld/update_map.asm b/engine/overworld/update_map.asm index 8577b9e7..dbf28dae 100644 --- a/engine/overworld/update_map.asm +++ b/engine/overworld/update_map.asm @@ -50,20 +50,20 @@ RedrawMapView: ld a, [wIsInBattle] inc a ret z - ld a, [H_AUTOBGTRANSFERENABLED] + ldh a, [hAutoBGTransferEnabled] push af - ld a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld [hTilesetType], a ; no flower/water BG tile animations + ldh [hAutoBGTransferEnabled], a + ldh [hTileAnimations], a call LoadCurrentMapView call RunDefaultPaletteCommand ld hl, wMapViewVRAMPointer ld a, [hli] ld h, [hl] ld l, a - ld de, -2 * 32 + ld de, -2 * BG_MAP_WIDTH add hl, de ld a, h and $3 @@ -73,23 +73,23 @@ RedrawMapView: ld a, h ld [wBuffer + 1], a ; this copy of the address is not used ld a, 2 - ld [$ffbe], a - ld c, 9 ; number of rows of 2x2 tiles (this covers the whole screen) + ldh [hRedrawMapViewRowOffset], a + ld c, SCREEN_HEIGHT / 2 ; number of rows of 2x2 tiles (this covers the whole screen) .redrawRowLoop push bc push hl push hl ld hl, wTileMap - 2 * SCREEN_WIDTH ld de, SCREEN_WIDTH - ld a, [$ffbe] + ldh a, [hRedrawMapViewRowOffset] .calcWRAMAddrLoop add hl, de dec a jr nz, .calcWRAMAddrLoop call CopyToRedrawRowOrColumnSrcTiles pop hl - ld de, $20 - ld a, [$ffbe] + ld de, BG_MAP_WIDTH + ldh a, [hRedrawMapViewRowOffset] ld c, a .calcVRAMAddrLoop add hl, de @@ -98,13 +98,13 @@ RedrawMapView: or $98 dec c jr nz, .calcVRAMAddrLoop - ld [hRedrawRowOrColumnDest + 1], a + ldh [hRedrawRowOrColumnDest + 1], a ld a, l - ld [hRedrawRowOrColumnDest], a + ldh [hRedrawRowOrColumnDest], a ld a, REDRAW_ROW - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a call DelayFrame - ld hl, $ffbe + ld hl, hRedrawMapViewRowOffset inc [hl] inc [hl] pop hl @@ -112,9 +112,9 @@ RedrawMapView: dec c jr nz, .redrawRowLoop pop af - ld [hTilesetType], a + ldh [hTileAnimations], a pop af - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret CompareHLWithBC: diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm index dae57f23..2593e0ec 100644 --- a/engine/overworld/wild_mons.asm +++ b/engine/overworld/wild_mons.asm @@ -1,4 +1,4 @@ -LoadWildData: +LoadWildData:: ld hl, WildDataPointers ld a, [wCurMap] @@ -16,10 +16,10 @@ LoadWildData: jr z, .NoGrassData ; if no grass data, skip to surfing data push hl ld de, wGrassMons ; otherwise, load grass data - ld bc, $0014 + ld bc, $14 call CopyData pop hl - ld bc, $0014 + ld bc, $14 add hl, bc .NoGrassData ld a, [hli] @@ -27,7 +27,7 @@ LoadWildData: and a ret z ; if no water data, we're done ld de, wWaterMons ; otherwise, load surfing data - ld bc, $0014 + ld bc, $14 jp CopyData -INCLUDE "data/wild_mons.asm" +INCLUDE "data/wild/grass_water.asm" diff --git a/engine/palettes.asm b/engine/palettes.asm deleted file mode 100755 index 4ab83f36..00000000 --- a/engine/palettes.asm +++ /dev/null @@ -1,641 +0,0 @@ -_RunPaletteCommand: - call GetPredefRegisters - ld a, b - cp $ff - jr nz, .next - ld a, [wDefaultPaletteCommand] ; use default command if command ID is $ff -.next - cp UPDATE_PARTY_MENU_BLK_PACKET - jp z, UpdatePartyMenuBlkPacket - ld l, a - ld h, 0 - add hl, hl - ld de, SetPalFunctions - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - ld de, SendSGBPackets - push de - jp hl - -SetPal_BattleBlack: - ld hl, PalPacket_Black - ld de, BlkPacket_Battle - ret - -; uses PalPacket_Empty to build a packet based on mon IDs and health color -SetPal_Battle: - ld hl, PalPacket_Empty - ld de, wPalPacket - ld bc, $10 - call CopyData - ld a, [wPlayerBattleStatus3] - ld hl, wBattleMonSpecies - call DeterminePaletteID - ld b, a - ld a, [wEnemyBattleStatus3] - ld hl, wEnemyMonSpecies2 - call DeterminePaletteID - ld c, a - ld hl, wPalPacket + 1 - ld a, [wPlayerHPBarColor] - add PAL_GREENBAR - ld [hli], a - inc hl - ld a, [wEnemyHPBarColor] - add PAL_GREENBAR - ld [hli], a - inc hl - ld a, b - ld [hli], a - inc hl - ld a, c - ld [hl], a - ld hl, wPalPacket - ld de, BlkPacket_Battle - ld a, SET_PAL_BATTLE - ld [wDefaultPaletteCommand], a - ret - -SetPal_TownMap: - ld hl, PalPacket_TownMap - ld de, BlkPacket_WholeScreen - ret - -; uses PalPacket_Empty to build a packet based the mon ID -SetPal_StatusScreen: - ld hl, PalPacket_Empty - ld de, wPalPacket - ld bc, $10 - call CopyData - ld a, [wcf91] - cp VICTREEBEL + 1 - jr c, .pokemon - ld a, $1 ; not pokemon -.pokemon - call DeterminePaletteIDOutOfBattle - push af - ld hl, wPalPacket + 1 - ld a, [wStatusScreenHPBarColor] - add PAL_GREENBAR - ld [hli], a - inc hl - pop af - ld [hl], a - ld hl, wPalPacket - ld de, BlkPacket_StatusScreen - ret - -SetPal_PartyMenu: - ld hl, PalPacket_PartyMenu - ld de, wPartyMenuBlkPacket - ret - -SetPal_Pokedex: - ld hl, PalPacket_Pokedex - ld de, wPalPacket - ld bc, $10 - call CopyData - ld a, [wcf91] - call DeterminePaletteIDOutOfBattle - ld hl, wPalPacket + 3 - ld [hl], a - ld hl, wPalPacket - ld de, BlkPacket_Pokedex - ret - -SetPal_Slots: - ld hl, PalPacket_Slots - ld de, BlkPacket_Slots - ret - -SetPal_TitleScreen: - ld hl, PalPacket_Titlescreen - ld de, BlkPacket_Titlescreen - ret - -; used mostly for menus and the Oak intro -SetPal_Generic: - ld hl, PalPacket_Generic - ld de, BlkPacket_WholeScreen - ret - -SetPal_NidorinoIntro: - ld hl, PalPacket_NidorinoIntro - ld de, BlkPacket_NidorinoIntro - ret - -SetPal_GameFreakIntro: - ld hl, PalPacket_GameFreakIntro - ld de, BlkPacket_GameFreakIntro - ld a, SET_PAL_GENERIC - ld [wDefaultPaletteCommand], a - ret - -; uses PalPacket_Empty to build a packet based on the current map -SetPal_Overworld: - ld hl, PalPacket_Empty - ld de, wPalPacket - ld bc, $10 - call CopyData - ld a, [wCurMapTileset] - cp CEMETERY - jr z, .PokemonTowerOrAgatha - cp CAVERN - jr z, .caveOrBruno - ld a, [wCurMap] - cp REDS_HOUSE_1F - jr c, .townOrRoute - cp CERULEAN_CAVE_2F - jr c, .normalDungeonOrBuilding - cp NAME_RATERS_HOUSE - jr c, .caveOrBruno - cp LORELEIS_ROOM - jr z, .Lorelei - cp BRUNOS_ROOM - jr z, .caveOrBruno -.normalDungeonOrBuilding - ld a, [wLastMap] ; town or route that current dungeon or building is located -.townOrRoute - cp SAFFRON_CITY + 1 - jr c, .town - ld a, PAL_ROUTE - 1 -.town - inc a ; a town's palette ID is its map ID + 1 - ld hl, wPalPacket + 1 - ld [hld], a - ld de, BlkPacket_WholeScreen - ld a, SET_PAL_OVERWORLD - ld [wDefaultPaletteCommand], a - ret -.PokemonTowerOrAgatha - ld a, PAL_GREYMON - 1 - jr .town -.caveOrBruno - ld a, PAL_CAVE - 1 - jr .town -.Lorelei - xor a - jr .town - -; used when a Pokemon is the only thing on the screen -; such as evolution, trading and the Hall of Fame -SetPal_PokemonWholeScreen: - push bc - ld hl, PalPacket_Empty - ld de, wPalPacket - ld bc, $10 - call CopyData - pop bc - ld a, c - and a - ld a, PAL_BLACK - jr nz, .next - ld a, [wWholeScreenPaletteMonSpecies] - call DeterminePaletteIDOutOfBattle -.next - ld [wPalPacket + 1], a - ld hl, wPalPacket - ld de, BlkPacket_WholeScreen - ret - -SetPal_TrainerCard: - ld hl, BlkPacket_TrainerCard - ld de, wTrainerCardBlkPacket - ld bc, $40 - call CopyData - ld de, BadgeBlkDataLengths - ld hl, wTrainerCardBlkPacket + 2 - ld a, [wObtainedBadges] - ld c, 8 -.badgeLoop - srl a - push af - jr c, .haveBadge -; The player doens't have the badge, so zero the badge's blk data. - push bc - ld a, [de] - ld c, a - xor a -.zeroBadgeDataLoop - ld [hli], a - dec c - jr nz, .zeroBadgeDataLoop - pop bc - jr .nextBadge -.haveBadge -; The player does have the badge, so skip past the badge's blk data. - ld a, [de] -.skipBadgeDataLoop - inc hl - dec a - jr nz, .skipBadgeDataLoop -.nextBadge - pop af - inc de - dec c - jr nz, .badgeLoop - ld hl, PalPacket_TrainerCard - ld de, wTrainerCardBlkPacket - ret - -SetPalFunctions: - dw SetPal_BattleBlack - dw SetPal_Battle - dw SetPal_TownMap - dw SetPal_StatusScreen - dw SetPal_Pokedex - dw SetPal_Slots - dw SetPal_TitleScreen - dw SetPal_NidorinoIntro - dw SetPal_Generic - dw SetPal_Overworld - dw SetPal_PartyMenu - dw SetPal_PokemonWholeScreen - dw SetPal_GameFreakIntro - dw SetPal_TrainerCard - -; The length of the blk data of each badge on the Trainer Card. -; The Rainbow Badge has 3 entries because of its many colors. -BadgeBlkDataLengths: - db 6 ; Boulder Badge - db 6 ; Cascade Badge - db 6 ; Thunder Badge - db 6 * 3 ; Rainbow Badge - db 6 ; Soul Badge - db 6 ; Marsh Badge - db 6 ; Volcano Badge - db 6 ; Earth Badge - -DeterminePaletteID: - bit TRANSFORMED, a ; a is battle status 3 - ld a, PAL_GREYMON ; if the mon has used Transform, use Ditto's palette - ret nz - ld a, [hl] -DeterminePaletteIDOutOfBattle: - ld [wd11e], a - and a ; is the mon index 0? - jr z, .skipDexNumConversion - push bc - predef IndexToPokedex - pop bc - ld a, [wd11e] -.skipDexNumConversion - ld e, a - ld d, 0 - ld hl, MonsterPalettes ; not just for Pokemon, Trainers use it too - add hl, de - ld a, [hl] - ret - -InitPartyMenuBlkPacket: - ld hl, BlkPacket_PartyMenu - ld de, wPartyMenuBlkPacket - ld bc, $30 - jp CopyData - -UpdatePartyMenuBlkPacket: -; Update the blk packet with the palette of the HP bar that is -; specified in [wWhichPartyMenuHPBar]. - ld hl, wPartyMenuHPBarColors - ld a, [wWhichPartyMenuHPBar] - ld e, a - ld d, 0 - add hl, de - ld e, l - ld d, h - ld a, [de] - and a - ld e, (1 << 2) | 1 ; green - jr z, .next - dec a - ld e, (2 << 2) | 2 ; yellow - jr z, .next - ld e, (3 << 2) | 3 ; red -.next - push de - ld hl, wPartyMenuBlkPacket + 8 + 1 - ld bc, 6 - ld a, [wWhichPartyMenuHPBar] - call AddNTimes - pop de - ld [hl], e - ret - -SendSGBPacket: -;check number of packets - ld a, [hl] - and $07 - ret z -; store number of packets in B - ld b, a -.loop2 -; save B for later use - push bc -; disable ReadJoypad to prevent it from interfering with sending the packet - ld a, 1 - ld [hDisableJoypadPolling], a -; send RESET signal (P14=LOW, P15=LOW) - xor a - ld [rJOYP], a -; set P14=HIGH, P15=HIGH - ld a, $30 - ld [rJOYP], a -;load length of packets (16 bytes) - ld b, $10 -.nextByte -;set bit counter (8 bits per byte) - ld e, $08 -; get next byte in the packet - ld a, [hli] - ld d, a -.nextBit0 - bit 0, d -; if 0th bit is not zero set P14=HIGH,P15=LOW (send bit 1) - ld a, $10 - jr nz, .next0 -; else (if 0th bit is zero) set P14=LOW,P15=HIGH (send bit 0) - ld a, $20 -.next0 - ld [rJOYP], a -; must set P14=HIGH,P15=HIGH between each "pulse" - ld a, $30 - ld [rJOYP], a -; rotation will put next bit in 0th position (so we can always use command -; "bit 0,d" to fetch the bit that has to be sent) - rr d -; decrease bit counter so we know when we have sent all 8 bits of current byte - dec e - jr nz, .nextBit0 - dec b - jr nz, .nextByte -; send bit 1 as a "stop bit" (end of parameter data) - ld a, $20 - ld [rJOYP], a -; set P14=HIGH,P15=HIGH - ld a, $30 - ld [rJOYP], a - xor a - ld [hDisableJoypadPolling], a -; wait for about 70000 cycles - call Wait7000 -; restore (previously pushed) number of packets - pop bc - dec b -; return if there are no more packets - ret z -; else send 16 more bytes - jr .loop2 - -LoadSGB: - xor a - ld [wOnSGB], a - call CheckSGB - ret nc - ld a, 1 - ld [wOnSGB], a - ld a, [wGBC] - and a - jr z, .notGBC - ret -.notGBC - di - call PrepareSuperNintendoVRAMTransfer - ei - ld a, 1 - ld [wCopyingSGBTileData], a - ld de, ChrTrnPacket - ld hl, SGBBorderGraphics - call CopyGfxToSuperNintendoVRAM - xor a - ld [wCopyingSGBTileData], a - ld de, PctTrnPacket - ld hl, BorderPalettes - call CopyGfxToSuperNintendoVRAM - xor a - ld [wCopyingSGBTileData], a - ld de, PalTrnPacket - ld hl, SuperPalettes - call CopyGfxToSuperNintendoVRAM - call ClearVram - ld hl, MaskEnCancelPacket - jp SendSGBPacket - -PrepareSuperNintendoVRAMTransfer: - ld hl, .packetPointers - ld c, 9 -.loop - push bc - ld a, [hli] - push hl - ld h, [hl] - ld l, a - call SendSGBPacket - pop hl - inc hl - pop bc - dec c - jr nz, .loop - ret - -.packetPointers -; Only the first packet is needed. - dw MaskEnFreezePacket - dw DataSnd_72548 - dw DataSnd_72558 - dw DataSnd_72568 - dw DataSnd_72578 - dw DataSnd_72588 - dw DataSnd_72598 - dw DataSnd_725a8 - dw DataSnd_725b8 - -CheckSGB: -; Returns whether the game is running on an SGB in carry. - ld hl, MltReq2Packet - di - call SendSGBPacket - ld a, 1 - ld [hDisableJoypadPolling], a - ei - call Wait7000 - ld a, [rJOYP] - and $3 - cp $3 - jr nz, .isSGB - ld a, $20 - ld [rJOYP], a - ld a, [rJOYP] - ld a, [rJOYP] - call Wait7000 - call Wait7000 - ld a, $30 - ld [rJOYP], a - call Wait7000 - call Wait7000 - ld a, $10 - ld [rJOYP], a - ld a, [rJOYP] - ld a, [rJOYP] - ld a, [rJOYP] - ld a, [rJOYP] - ld a, [rJOYP] - ld a, [rJOYP] - call Wait7000 - call Wait7000 - ld a, $30 - ld [rJOYP], a - ld a, [rJOYP] - ld a, [rJOYP] - ld a, [rJOYP] - call Wait7000 - call Wait7000 - ld a, [rJOYP] - and $3 - cp $3 - jr nz, .isSGB - call SendMltReq1Packet - and a - ret -.isSGB - call SendMltReq1Packet - scf - ret - -SendMltReq1Packet: - ld hl, MltReq1Packet - call SendSGBPacket - jp Wait7000 - -CopyGfxToSuperNintendoVRAM: - di - push de - call DisableLCD - ld a, $e4 - ld [rBGP], a - ld de, vChars1 - ld a, [wCopyingSGBTileData] - and a - jr z, .notCopyingTileData - call CopySGBBorderTiles - jr .next -.notCopyingTileData - ld bc, $1000 - call CopyData -.next - ld hl, vBGMap0 - ld de, $c - ld a, $80 - ld c, $d -.loop - ld b, $14 -.innerLoop - ld [hli], a - inc a - dec b - jr nz, .innerLoop - add hl, de - dec c - jr nz, .loop - ld a, $e3 - ld [rLCDC], a - pop hl - call SendSGBPacket - xor a - ld [rBGP], a - ei - ret - -Wait7000: -; Each loop takes 9 cycles so this routine actually waits 63000 cycles. - ld de, 7000 -.loop - nop - nop - nop - dec de - ld a, d - or e - jr nz, .loop - ret - -SendSGBPackets: - ld a, [wGBC] - and a - jr z, .notGBC - push de - call InitGBCPalettes - pop hl - call EmptyFunc5 - ret -.notGBC - push de - call SendSGBPacket - pop hl - jp SendSGBPacket - -InitGBCPalettes: - ld a, $80 ; index 0 with auto-increment - ld [rBGPI], a - inc hl - ld c, $20 -.loop - ld a, [hli] - inc hl - add a - add a - add a - ld de, SuperPalettes - add e - jr nc, .noCarry - inc d -.noCarry - ld a, [de] - ld [rBGPD], a - dec c - jr nz, .loop - ret - -EmptyFunc5: - ret - -CopySGBBorderTiles: -; SGB tile data is stored in a 4BPP planar format. -; Each tile is 32 bytes. The first 16 bytes contain bit planes 1 and 2, while -; the second 16 bytes contain bit planes 3 and 4. -; This function converts 2BPP planar data into this format by mapping -; 2BPP colors 0-3 to 4BPP colors 0-3. 4BPP colors 4-15 are not used. - ld b, 128 - -.tileLoop - -; Copy bit planes 1 and 2 of the tile data. - ld c, 16 -.copyLoop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyLoop - -; Zero bit planes 3 and 4. - ld c, 16 - xor a -.zeroLoop - ld [de], a - inc de - dec c - jr nz, .zeroLoop - - dec b - jr nz, .tileLoop - ret - -INCLUDE "data/sgb_packets.asm" - -INCLUDE "data/mon_palettes.asm" - -INCLUDE "data/super_palettes.asm" - -INCLUDE "data/sgb_border.asm" diff --git a/engine/pathfinding.asm b/engine/pathfinding.asm deleted file mode 100644 index ba052d38..00000000 --- a/engine/pathfinding.asm +++ /dev/null @@ -1,201 +0,0 @@ -FindPathToPlayer: - xor a - ld hl, hFindPathNumSteps - ld [hli], a ; hFindPathNumSteps - ld [hli], a ; hFindPathFlags - ld [hli], a ; hFindPathYProgress - ld [hl], a ; hFindPathXProgress - ld hl, wNPCMovementDirections2 - ld de, $0 -.loop - ld a, [hFindPathYProgress] - ld b, a - ld a, [hNPCPlayerYDistance] ; Y distance in steps - call CalcDifference - ld d, a - and a - jr nz, .asm_f8da - ld a, [hFindPathFlags] - set 0, a ; current end of path matches the player's Y coordinate - ld [hFindPathFlags], a -.asm_f8da - ld a, [hFindPathXProgress] - ld b, a - ld a, [hNPCPlayerXDistance] ; X distance in steps - call CalcDifference - ld e, a - and a - jr nz, .asm_f8ec - ld a, [hFindPathFlags] - set 1, a ; current end of path matches the player's X coordinate - ld [hFindPathFlags], a -.asm_f8ec - ld a, [hFindPathFlags] - cp $3 ; has the end of the path reached the player's position? - jr z, .done -; Compare whether the X distance between the player and the current of the path -; is greater or if the Y distance is. Then, try to reduce whichever is greater. - ld a, e - cp d - jr c, .yDistanceGreater -; x distance is greater - ld a, [hNPCPlayerRelativePosFlags] - bit 1, a - jr nz, .playerIsLeftOfNPC - ld d, NPC_MOVEMENT_RIGHT - jr .next1 -.playerIsLeftOfNPC - ld d, NPC_MOVEMENT_LEFT -.next1 - ld a, [hFindPathXProgress] - add 1 - ld [hFindPathXProgress], a - jr .storeDirection -.yDistanceGreater - ld a, [hNPCPlayerRelativePosFlags] - bit 0, a - jr nz, .playerIsAboveNPC - ld d, NPC_MOVEMENT_DOWN - jr .next2 -.playerIsAboveNPC - ld d, NPC_MOVEMENT_UP -.next2 - ld a, [hFindPathYProgress] - add 1 - ld [hFindPathYProgress], a -.storeDirection - ld a, d - ld [hli], a - ld a, [hFindPathNumSteps] - inc a - ld [hFindPathNumSteps], a - jp .loop -.done - ld [hl], $ff - ret - -CalcPositionOfPlayerRelativeToNPC: - xor a - ld [hNPCPlayerRelativePosFlags], a - ld a, [wSpriteStateData1 + 4] ; player's sprite screen Y position in pixels - ld d, a - ld a, [wSpriteStateData1 + 6] ; player's sprite screen X position in pixels - ld e, a - ld hl, wSpriteStateData1 - ld a, [hNPCSpriteOffset] - add l - add $4 - ld l, a - jr nc, .noCarry - inc h -.noCarry - ld a, d - ld b, a - ld a, [hli] ; NPC sprite screen Y position in pixels - call CalcDifference - jr nc, .NPCSouthOfOrAlignedWithPlayer -.NPCNorthOfPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 0, [hl] - set 0, [hl] - pop hl - jr .divideYDistance -.NPCSouthOfOrAlignedWithPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 0, [hl] - res 0, [hl] - pop hl -.divideYDistance - push hl - ld hl, hDividend2 - ld [hli], a - ld a, 16 - ld [hli], a - call DivideBytes ; divide Y absolute distance by 16 - ld a, [hl] ; quotient - ld [hNPCPlayerYDistance], a - pop hl - inc hl - ld b, e - ld a, [hl] ; NPC sprite screen X position in pixels - call CalcDifference - jr nc, .NPCEastOfOrAlignedWithPlayer -.NPCWestOfPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 1, [hl] - set 1, [hl] - pop hl - jr .divideXDistance -.NPCEastOfOrAlignedWithPlayer - push hl - ld hl, hNPCPlayerRelativePosFlags - bit 1, [hl] - res 1, [hl] - pop hl -.divideXDistance - ld [hDividend2], a - ld a, 16 - ld [hDivisor2], a - call DivideBytes ; divide X absolute distance by 16 - ld a, [hQuotient2] - ld [hNPCPlayerXDistance], a - ld a, [hNPCPlayerRelativePosPerspective] - and a - ret z - ld a, [hNPCPlayerRelativePosFlags] - cpl - and $3 - ld [hNPCPlayerRelativePosFlags], a - ret - -ConvertNPCMovementDirectionsToJoypadMasks: - ld a, [hNPCMovementDirections2Index] - ld [wNPCMovementDirections2Index], a - dec a - ld de, wSimulatedJoypadStatesEnd - ld hl, wNPCMovementDirections2 - add l - ld l, a - jr nc, .loop - inc h -.loop - ld a, [hld] - call ConvertNPCMovementDirectionToJoypadMask - ld [de], a - inc de - ld a, [hNPCMovementDirections2Index] - dec a - ld [hNPCMovementDirections2Index], a - jr nz, .loop - ret - -ConvertNPCMovementDirectionToJoypadMask: - push hl - ld b, a - ld hl, NPCMovementDirectionsToJoypadMasksTable -.loop - ld a, [hli] - cp $ff - jr z, .done - cp b - jr z, .loadJoypadMask - inc hl - jr .loop -.loadJoypadMask - ld a, [hl] -.done - pop hl - ret - -NPCMovementDirectionsToJoypadMasksTable: - db NPC_MOVEMENT_UP, D_UP - db NPC_MOVEMENT_DOWN, D_DOWN - db NPC_MOVEMENT_LEFT, D_LEFT - db NPC_MOVEMENT_RIGHT, D_RIGHT - db $ff - -; unreferenced - ret diff --git a/engine/play_time.asm b/engine/play_time.asm old mode 100755 new mode 100644 index a5202cc6..29897242 --- a/engine/play_time.asm +++ b/engine/play_time.asm @@ -1,4 +1,4 @@ -TrackPlayTime: +TrackPlayTime:: call CountDownIgnoreInputBitReset ld a, [wd732] bit 0, a @@ -56,6 +56,6 @@ CountDownIgnoreInputBitReset: ld [wd730], a ret z xor a - ld [hJoyPressed], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a ret diff --git a/engine/pokedex_rating.asm b/engine/pokedex_rating.asm deleted file mode 100755 index aff9769e..00000000 --- a/engine/pokedex_rating.asm +++ /dev/null @@ -1,154 +0,0 @@ -DisplayDexRating: - ld hl, wPokedexSeen - ld b, wPokedexSeenEnd - wPokedexSeen - call CountSetBits - ld a, [wNumSetBits] - ld [hDexRatingNumMonsSeen], a - ld hl, wPokedexOwned - ld b, wPokedexOwnedEnd - wPokedexOwned - call CountSetBits - ld a, [wNumSetBits] - ld [hDexRatingNumMonsOwned], a - ld hl, DexRatingsTable -.findRating - ld a, [hli] - ld b, a - ld a, [hDexRatingNumMonsOwned] - cp b - jr c, .foundRating - inc hl - inc hl - jr .findRating -.foundRating - ld a, [hli] - ld h, [hl] - ld l, a ; load text pointer into hl - CheckAndResetEventA EVENT_HALL_OF_FAME_DEX_RATING - jr nz, .hallOfFame - push hl - ld hl, PokedexRatingText_441cc - call PrintText - pop hl - call PrintText - callba PlayPokedexRatingSfx - jp WaitForTextScrollButtonPress -.hallOfFame - ld de, wDexRatingNumMonsSeen - ld a, [hDexRatingNumMonsSeen] - ld [de], a - inc de - ld a, [hDexRatingNumMonsOwned] - ld [de], a - inc de -.copyRatingTextLoop - ld a, [hli] - cp "@" - jr z, .doneCopying - ld [de], a - inc de - jr .copyRatingTextLoop -.doneCopying - ld [de], a - ret - -PokedexRatingText_441cc: - TX_FAR _OaksLabText_441cc - db "@" - -DexRatingsTable: - db 10 - dw PokedexRatingText_44201 - db 20 - dw PokedexRatingText_44206 - db 30 - dw PokedexRatingText_4420b - db 40 - dw PokedexRatingText_44210 - db 50 - dw PokedexRatingText_44215 - db 60 - dw PokedexRatingText_4421a - db 70 - dw PokedexRatingText_4421f - db 80 - dw PokedexRatingText_44224 - db 90 - dw PokedexRatingText_44229 - db 100 - dw PokedexRatingText_4422e - db 110 - dw PokedexRatingText_44233 - db 120 - dw PokedexRatingText_44238 - db 130 - dw PokedexRatingText_4423d - db 140 - dw PokedexRatingText_44242 - db 150 - dw PokedexRatingText_44247 - db 152 - dw PokedexRatingText_4424c - -PokedexRatingText_44201: - TX_FAR _OaksLabText_44201 - db "@" - -PokedexRatingText_44206: - TX_FAR _OaksLabText_44206 - db "@" - -PokedexRatingText_4420b: - TX_FAR _OaksLabText_4420b - db "@" - -PokedexRatingText_44210: - TX_FAR _OaksLabText_44210 - db "@" - -PokedexRatingText_44215: - TX_FAR _OaksLabText_44215 - db "@" - -PokedexRatingText_4421a: - TX_FAR _OaksLabText_4421a - db "@" - -PokedexRatingText_4421f: - TX_FAR _OaksLabText_4421f - db "@" - -PokedexRatingText_44224: - TX_FAR _OaksLabText_44224 - db "@" - -PokedexRatingText_44229: - TX_FAR _OaksLabText_44229 - db "@" - -PokedexRatingText_4422e: - TX_FAR _OaksLabText_4422e - db "@" - -PokedexRatingText_44233: - TX_FAR _OaksLabText_44233 - db "@" - -PokedexRatingText_44238: - TX_FAR _OaksLabText_44238 - db "@" - -PokedexRatingText_4423d: - TX_FAR _OaksLabText_4423d - db "@" - -PokedexRatingText_44242: - TX_FAR _OaksLabText_44242 - db "@" - -PokedexRatingText_44247: - TX_FAR _OaksLabText_44247 - db "@" - -PokedexRatingText_4424c: - TX_FAR _OaksLabText_4424c - db "@" diff --git a/engine/add_mon.asm b/engine/pokemon/add_mon.asm similarity index 95% rename from engine/add_mon.asm rename to engine/pokemon/add_mon.asm index b2feeb12..c49a0a77 100644 --- a/engine/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -1,4 +1,4 @@ -_AddPartyMon: +_AddPartyMon:: ; Adds a new mon to the player's or enemy's party. ; [wMonDataLocation] is used in an unusual way in this function. ; If the lower nybble is 0, the mon is added to the player's party, else the enemy's. @@ -15,7 +15,7 @@ _AddPartyMon: ret nc ; return if the party is already full ld [de], a ld a, [de] - ld [hNewPartyLength], a + ldh [hNewPartyLength], a add e ld e, a jr nc, .noCarry @@ -32,7 +32,7 @@ _AddPartyMon: jr z, .next2 ld hl, wEnemyMonOT .next2 - ld a, [hNewPartyLength] + ldh a, [hNewPartyLength] dec a call SkipFixedLengthTextEntries ld d, h @@ -44,7 +44,7 @@ _AddPartyMon: and a jr nz, .skipNaming ld hl, wPartyMonNicks - ld a, [hNewPartyLength] + ldh a, [hNewPartyLength] dec a call SkipFixedLengthTextEntries ld a, NAME_MON_SCREEN @@ -57,7 +57,7 @@ _AddPartyMon: jr z, .next3 ld hl, wEnemyMons .next3 - ld a, [hNewPartyLength] + ldh a, [hNewPartyLength] dec a ld bc, wPartyMon2 - wPartyMon1 call AddNTimes @@ -75,8 +75,8 @@ _AddPartyMon: push hl ld a, [wMonDataLocation] and $f - ld a, $98 ; set enemy trainer mon IVs to fixed average values - ld b, $88 + ld a, ATKDEFDV_TRAINER ; set enemy trainer mon IVs to fixed average values + ld b, SPDSPCDV_TRAINER jr nz, .next4 ; If the mon is being added to the player's party, update the pokedex. @@ -129,10 +129,10 @@ _AddPartyMon: xor a ld b, a call CalcStat ; calc HP stat (set cur Hp to max HP) - ld a, [H_MULTIPLICAND+1] + ldh a, [hMultiplicand+1] ld [de], a inc de - ld a, [H_MULTIPLICAND+2] + ldh a, [hMultiplicand+2] ld [de], a inc de xor a @@ -201,16 +201,16 @@ _AddPartyMon: push de ld a, [wCurEnemyLVL] ld d, a - callab CalcExperience + callfar CalcExperience pop de inc de - ld a, [hExperience] ; write experience + ldh a, [hExperience] ; write experience ld [de], a inc de - ld a, [hExperience + 1] + ldh a, [hExperience + 1] ld [de], a inc de - ld a, [hExperience + 2] + ldh a, [hExperience + 2] ld [de], a xor a ld b, NUM_STATS * 2 @@ -277,7 +277,7 @@ AddPartyMon_WriteMovePP: ; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party ; used in the cable club trade center -_AddEnemyMonToPlayerParty: +_AddEnemyMonToPlayerParty:: ld hl, wPartyCount ld a, [hl] cp PARTY_LENGTH @@ -338,7 +338,7 @@ _AddEnemyMonToPlayerParty: and a ret ; return success -_MoveMon: +_MoveMon:: ld a, [wMoveMonType] and a ; BOX_TO_PARTY jr z, .checkPartyMonSlots @@ -430,7 +430,7 @@ _MoveMon: cp PARTY_TO_DAYCARE ld de, wDayCareMonOT jr z, .findOTsrc - dec a + dec a ld hl, wPartyMonOT ld a, [wPartyCount] jr nz, .addOToffset @@ -498,7 +498,7 @@ _MoveMon: add $2 ld [wMonDataLocation], a call LoadMonData - callba CalcLevelFromExperience + farcall CalcLevelFromExperience ld a, d ld [wCurEnemyLVL], a pop hl diff --git a/engine/menu/bills_pc.asm b/engine/pokemon/bills_pc.asm similarity index 85% rename from engine/menu/bills_pc.asm rename to engine/pokemon/bills_pc.asm index 98175559..0b8fca3a 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1,6 +1,6 @@ DisplayPCMainMenu:: xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call SaveScreenTilesToBuffer2 ld a, [wNumHoFTeams] and a @@ -10,17 +10,17 @@ DisplayPCMainMenu:: ld a, [wNumHoFTeams] and a jr nz, .leaguePCAvailable - coord hl, 0, 0 + hlcoord 0, 0 ld b, 8 ld c, 14 jr .next .noOaksPC - coord hl, 0, 0 + hlcoord 0, 0 ld b, 6 ld c, 14 jr .next .leaguePCAvailable - coord hl, 0, 0 + hlcoord 0, 0 ld b, 10 ld c, 14 .next @@ -30,15 +30,15 @@ DisplayPCMainMenu:: ld [wMaxMenuItem], a CheckEvent EVENT_MET_BILL jr nz, .metBill - coord hl, 2, 2 + hlcoord 2, 2 ld de, SomeonesPCText jr .next2 .metBill - coord hl, 2, 2 + hlcoord 2, 2 ld de, BillsPCText .next2 call PlaceString - coord hl, 2, 4 + hlcoord 2, 4 ld de, wPlayerName call PlaceString ld l, c @@ -47,7 +47,7 @@ DisplayPCMainMenu:: call PlaceString CheckEvent EVENT_GOT_POKEDEX jr z, .noOaksPC2 - coord hl, 2, 6 + hlcoord 2, 6 ld de, OaksPCText call PlaceString ld a, [wNumHoFTeams] @@ -55,20 +55,20 @@ DisplayPCMainMenu:: jr z, .noLeaguePC ld a, 4 ld [wMaxMenuItem], a - coord hl, 2, 8 + hlcoord 2, 8 ld de, PKMNLeaguePCText call PlaceString - coord hl, 2, 10 + hlcoord 2, 10 ld de, LogOffPCText jr .next3 .noLeaguePC - coord hl, 2, 8 + hlcoord 2, 8 ld de, LogOffPCText jr .next3 .noOaksPC2 ld a, $2 ld [wMaxMenuItem], a - coord hl, 2, 6 + hlcoord 2, 6 ld de, LogOffPCText .next3 call PlaceString @@ -82,14 +82,14 @@ DisplayPCMainMenu:: ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret SomeonesPCText: db "SOMEONE's PC@" BillsPCText: db "BILL's PC@" PlayersPCText: db "'s PC@" OaksPCText: db "PROF.OAK's PC@" -PKMNLeaguePCText: db $4a, "LEAGUE@" +PKMNLeaguePCText: db "LEAGUE@" LogOffPCText: db "LOG OFF@" BillsPC_:: @@ -106,7 +106,7 @@ BillsPC_:: bit 3, a ; accessing Bill's PC through another PC? jr nz, BillsPCMenu ; accessing it directly - ld a, $99 + ld a, SFX_TURN_ON_PC call PlaySound ld hl, SwitchOnText call PrintText @@ -114,16 +114,16 @@ BillsPC_:: BillsPCMenu: ld a, [wParentMenuItem] ld [wCurrentMenuItem], a - ld hl, vChars2 + $780 + ld hl, vChars2 tile $78 ld de, PokeballTileGraphics - lb bc, BANK(PokeballTileGraphics), $01 + lb bc, BANK(PokeballTileGraphics), 1 call CopyVideoData call LoadScreenTilesFromBuffer2DisableBGTransfer - coord hl, 0, 0 + hlcoord 0, 0 ld b, 10 ld c, 12 call TextBoxBorder - coord hl, 2, 2 + hlcoord 2, 2 ld de, BillsPCMenuText call PlaceString ld hl, wTopMenuItemY @@ -146,7 +146,7 @@ BillsPCMenu: ld [wPlayerMonNumber], a ld hl, WhatText call PrintText - coord hl, 9, 14 + hlcoord 9, 14 ld b, 2 ld c, 9 call TextBoxBorder @@ -156,19 +156,19 @@ BillsPCMenu: jr c, .singleDigitBoxNum ; two digit box num sub 9 - coord hl, 17, 16 + hlcoord 17, 16 ld [hl], "1" add "0" jr .next .singleDigitBoxNum add "1" .next - Coorda 18, 16 - coord hl, 10, 16 + ldcoord_a 18, 16 + hlcoord 10, 16 ld de, BoxNoPCText call PlaceString ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 call HandleMenuInput bit 1, a @@ -191,7 +191,7 @@ ExitBillsPC: jr nz, .next ; accessing it directly call LoadTextBoxTilePatterns - ld a, $9a + ld a, SFX_TURN_OFF_PC call PlaySound call WaitForSoundToFinish .next @@ -322,7 +322,7 @@ BillsPCRelease: jp BillsPCMenu BillsPCChangeBox: - callba ChangeBox + farcall ChangeBox jp BillsPCMenu DisplayMonListMenu: @@ -343,9 +343,9 @@ DisplayMonListMenu: ret BillsPCMenuText: - db "WITHDRAW ", $4a - next "DEPOSIT ", $4a - next "RELEASE ", $4a + db "WITHDRAW " + next "DEPOSIT " + next "RELEASE " next "CHANGE BOX" next "SEE YA!" db "@" @@ -381,15 +381,10 @@ KnowsHMMove:: ret HMMoveArray: - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db -1 +INCLUDE "data/moves/hm_moves.asm" DisplayDepositWithdrawMenu: - coord hl, 9, 10 + hlcoord 9, 10 ld b, 6 ld c, 9 call TextBoxBorder @@ -399,9 +394,9 @@ DisplayDepositWithdrawMenu: jr nz, .next ld de, WithdrawPCText .next - coord hl, 11, 12 + hlcoord 11, 12 call PlaceString - coord hl, 11, 14 + hlcoord 11, 14 ld de, StatsCancelPCText call PlaceString ld hl, wTopMenuItemY @@ -462,58 +457,58 @@ StatsCancelPCText: next "CANCEL@" SwitchOnText: - TX_FAR _SwitchOnText - db "@" + text_far _SwitchOnText + text_end WhatText: - TX_FAR _WhatText - db "@" + text_far _WhatText + text_end DepositWhichMonText: - TX_FAR _DepositWhichMonText - db "@" + text_far _DepositWhichMonText + text_end MonWasStoredText: - TX_FAR _MonWasStoredText - db "@" + text_far _MonWasStoredText + text_end CantDepositLastMonText: - TX_FAR _CantDepositLastMonText - db "@" + text_far _CantDepositLastMonText + text_end BoxFullText: - TX_FAR _BoxFullText - db "@" + text_far _BoxFullText + text_end MonIsTakenOutText: - TX_FAR _MonIsTakenOutText - db "@" + text_far _MonIsTakenOutText + text_end NoMonText: - TX_FAR _NoMonText - db "@" + text_far _NoMonText + text_end CantTakeMonText: - TX_FAR _CantTakeMonText - db "@" + text_far _CantTakeMonText + text_end ReleaseWhichMonText: - TX_FAR _ReleaseWhichMonText - db "@" + text_far _ReleaseWhichMonText + text_end OnceReleasedText: - TX_FAR _OnceReleasedText - db "@" + text_far _OnceReleasedText + text_end MonWasReleasedText: - TX_FAR _MonWasReleasedText - db "@" + text_far _MonWasReleasedText + text_end CableClubLeftGameboy:: - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK ret z - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_RIGHT ret nz ld a, [wCurMap] @@ -527,10 +522,10 @@ CableClubLeftGameboy:: tx_pre_jump JustAMomentText CableClubRightGameboy:: - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret z - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_LEFT ret nz ld a, [wCurMap] @@ -544,14 +539,15 @@ CableClubRightGameboy:: tx_pre_jump JustAMomentText JustAMomentText:: - TX_FAR _JustAMomentText - db "@" + text_far _JustAMomentText + text_end - ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump OpenBillsPCText OpenBillsPCText:: - db $FD ; FuncTX_BillsPC + script_bills_pc + diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm new file mode 100644 index 00000000..21b1c9f4 --- /dev/null +++ b/engine/pokemon/evos_moves.asm @@ -0,0 +1,513 @@ +; try to evolve the mon in [wWhichPokemon] +TryEvolvingMon: + ld hl, wCanEvolveFlags + xor a + ld [hl], a + ld a, [wWhichPokemon] + ld c, a + ld b, FLAG_SET + call Evolution_FlagAction + +; this is only called after battle +; it is supposed to do level up evolutions, though there is a bug that allows item evolutions to occur +EvolutionAfterBattle: + ldh a, [hTileAnimations] + push af + xor a + ld [wEvolutionOccurred], a + dec a + ld [wWhichPokemon], a + push hl + push bc + push de + ld hl, wPartyCount + push hl + +Evolution_PartyMonLoop: ; loop over party mons + ld hl, wWhichPokemon + inc [hl] + pop hl + inc hl + ld a, [hl] + cp $ff ; have we reached the end of the party? + jp z, .done + ld [wEvoOldSpecies], a + push hl + ld a, [wWhichPokemon] + ld c, a + ld hl, wCanEvolveFlags + ld b, FLAG_TEST + call Evolution_FlagAction + ld a, c + and a ; is the mon's bit set? + jp z, Evolution_PartyMonLoop ; if not, go to the next mon + ld a, [wEvoOldSpecies] + dec a + ld b, 0 + ld hl, EvosMovesPointerTable + add a + rl b + ld c, a + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + push hl + ld a, [wcf91] + push af + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + call LoadMonData + pop af + ld [wcf91], a + pop hl + +.evoEntryLoop ; loop over evolution entries + ld a, [hli] + and a ; have we reached the end of the evolution data? + jr z, Evolution_PartyMonLoop + ld b, a ; evolution type + cp EV_TRADE + jr z, .checkTradeEvo +; not trade evolution + ld a, [wLinkState] + cp LINK_STATE_TRADING + jr z, Evolution_PartyMonLoop ; if trading, go the next mon + ld a, b + cp EV_ITEM + jr z, .checkItemEvo + ld a, [wForceEvolution] + and a + jr nz, Evolution_PartyMonLoop + ld a, b + cp EV_LEVEL + jr z, .checkLevel +.checkTradeEvo + ld a, [wLinkState] + cp LINK_STATE_TRADING + jp nz, .nextEvoEntry1 ; if not trading, go to the next evolution entry + ld a, [hli] ; level requirement + ld b, a + ld a, [wLoadedMonLevel] + cp b ; is the mon's level greater than the evolution requirement? + jp c, Evolution_PartyMonLoop ; if so, go the next mon + jr .doEvolution +.checkItemEvo + ld a, [hli] + ld b, a ; evolution item + ld a, [wcf91] ; this is supposed to be the last item used, but it is also used to hold species numbers + cp b ; was the evolution item in this entry used? + jp nz, .nextEvoEntry1 ; if not, go to the next evolution entry +.checkLevel + ld a, [hli] ; level requirement + ld b, a + ld a, [wLoadedMonLevel] + cp b ; is the mon's level greater than the evolution requirement? + jp c, .nextEvoEntry2 ; if so, go the next evolution entry +.doEvolution + ld [wCurEnemyLVL], a + ld a, 1 + ld [wEvolutionOccurred], a + push hl + ld a, [hl] + ld [wEvoNewSpecies], a + ld a, [wWhichPokemon] + ld hl, wPartyMonNicks + call GetPartyMonName + call CopyStringToCF4B + ld hl, IsEvolvingText + call PrintText + ld c, 50 + call DelayFrames + xor a + ldh [hAutoBGTransferEnabled], a + hlcoord 0, 0 + lb bc, 12, 20 + call ClearScreenArea + ld a, $1 + ldh [hAutoBGTransferEnabled], a + ld a, $ff + ld [wUpdateSpritesEnabled], a + call ClearSprites + callfar EvolveMon + jp c, CancelledEvolution + ld hl, EvolvedText + call PrintText + pop hl + ld a, [hl] + ld [wd0b5], a + ld [wLoadedMonSpecies], a + ld [wEvoNewSpecies], a + ld a, MONSTER_NAME + ld [wNameListType], a + ld a, BANK(TrainerNames) ; bank is not used for monster names + ld [wPredefBank], a + call GetName + push hl + ld hl, IntoText + call PrintText_NoCreatingTextBox + ld a, SFX_GET_ITEM_2 + call PlaySoundWaitForCurrent + call WaitForSoundToFinish + ld c, 40 + call DelayFrames + call ClearScreen + call RenameEvolvedMon + ld a, [wd11e] + push af + ld a, [wd0b5] + ld [wd11e], a + predef IndexToPokedex + ld a, [wd11e] + dec a + ld hl, BaseStats + ld bc, MonBaseStatsEnd - MonBaseStats + call AddNTimes + ld de, wMonHeader + call CopyData + ld a, [wd0b5] + ld [wMonHIndex], a + pop af + ld [wd11e], a + ld hl, wLoadedMonHPExp - 1 + ld de, wLoadedMonStats + ld b, $1 + call CalcStats + ld a, [wWhichPokemon] + ld hl, wPartyMon1 + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes + ld e, l + ld d, h + push hl + push bc + ld bc, wPartyMon1MaxHP - wPartyMon1 + add hl, bc + ld a, [hli] + ld b, a + ld c, [hl] + ld hl, wLoadedMonMaxHP + 1 + ld a, [hld] + sub c + ld c, a + ld a, [hl] + sbc b + ld b, a + ld hl, wLoadedMonHP + 1 + ld a, [hl] + add c + ld [hld], a + ld a, [hl] + adc b + ld [hl], a + dec hl + pop bc + call CopyData + ld a, [wd0b5] + ld [wd11e], a + xor a + ld [wMonDataLocation], a + call LearnMoveFromLevelUp + pop hl + predef SetPartyMonTypes + ld a, [wIsInBattle] + and a + call z, Evolution_ReloadTilesetTilePatterns + predef IndexToPokedex + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_SET + ld hl, wPokedexOwned + push bc + call Evolution_FlagAction + pop bc + ld hl, wPokedexSeen + call Evolution_FlagAction + pop de + pop hl + ld a, [wLoadedMonSpecies] + ld [hl], a + push hl + ld l, e + ld h, d + jr .nextEvoEntry2 + +.nextEvoEntry1 + inc hl + +.nextEvoEntry2 + inc hl + jp .evoEntryLoop + +.done + pop de + pop bc + pop hl + pop af + ldh [hTileAnimations], a + ld a, [wLinkState] + cp LINK_STATE_TRADING + ret z + ld a, [wIsInBattle] + and a + ret nz + ld a, [wEvolutionOccurred] + and a + call nz, PlayDefaultMusic + ret + +RenameEvolvedMon: +; Renames the mon to its new, evolved form's standard name unless it had a +; nickname, in which case the nickname is kept. + ld a, [wd0b5] + push af + ld a, [wMonHIndex] + ld [wd0b5], a + call GetName + pop af + ld [wd0b5], a + ld hl, wcd6d + ld de, wcf4b +.compareNamesLoop + ld a, [de] + inc de + cp [hl] + inc hl + ret nz + cp "@" + jr nz, .compareNamesLoop + ld a, [wWhichPokemon] + ld bc, NAME_LENGTH + ld hl, wPartyMonNicks + call AddNTimes + push hl + call GetName + ld hl, wcd6d + pop de + jp CopyData + +CancelledEvolution: + ld hl, StoppedEvolvingText + call PrintText + call ClearScreen + pop hl + call Evolution_ReloadTilesetTilePatterns + jp Evolution_PartyMonLoop + +EvolvedText: + text_far _EvolvedText + text_end + +IntoText: + text_far _IntoText + text_end + +StoppedEvolvingText: + text_far _StoppedEvolvingText + text_end + +IsEvolvingText: + text_far _IsEvolvingText + text_end + +Evolution_ReloadTilesetTilePatterns: + ld a, [wLinkState] + cp LINK_STATE_TRADING + ret z + jp ReloadTilesetTilePatterns + +LearnMoveFromLevelUp: + ld hl, EvosMovesPointerTable + ld a, [wd11e] ; species + ld [wcf91], a + dec a + ld bc, 0 + ld hl, EvosMovesPointerTable + add a + rl b + ld c, a + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a +.skipEvolutionDataLoop ; loop to skip past the evolution data, which comes before the move data + ld a, [hli] + and a ; have we reached the end of the evolution data? + jr nz, .skipEvolutionDataLoop ; if not, jump back up +.learnSetLoop ; loop over the learn set until we reach a move that is learnt at the current level or the end of the list + ld a, [hli] + and a ; have we reached the end of the learn set? + jr z, .done ; if we've reached the end of the learn set, jump + ld b, a ; level the move is learnt at + ld a, [wCurEnemyLVL] + cp b ; is the move learnt at the mon's current level? + ld a, [hli] ; move ID + jr nz, .learnSetLoop + ld d, a ; ID of move to learn + ld a, [wMonDataLocation] + and a + jr nz, .next +; If [wMonDataLocation] is 0 (PLAYER_PARTY_DATA), get the address of the mon's +; current moves in party data. Every call to this function sets +; [wMonDataLocation] to 0 because other data locations are not supported. +; If it is not 0, this function will not work properly. + ld hl, wPartyMon1Moves + ld a, [wWhichPokemon] + ld bc, wPartyMon2 - wPartyMon1 + call AddNTimes +.next + ld b, NUM_MOVES +.checkCurrentMovesLoop ; check if the move to learn is already known + ld a, [hli] + cp d + jr z, .done ; if already known, jump + dec b + jr nz, .checkCurrentMovesLoop + ld a, d + ld [wMoveNum], a + ld [wd11e], a + call GetMoveName + call CopyStringToCF4B + predef LearnMove +.done + ld a, [wcf91] + ld [wd11e], a + ret + +; writes the moves a mon has at level [wCurEnemyLVL] to [de] +; move slots are being filled up sequentially and shifted if all slots are full +WriteMonMoves: + call GetPredefRegisters + push hl + push de + push bc + ld hl, EvosMovesPointerTable + ld b, 0 + ld a, [wcf91] ; cur mon ID + dec a + add a + rl b + ld c, a + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a +.skipEvoEntriesLoop + ld a, [hli] + and a + jr nz, .skipEvoEntriesLoop + jr .firstMove +.nextMove + pop de +.nextMove2 + inc hl +.firstMove + ld a, [hli] ; read level of next move in learnset + and a + jp z, .done ; end of list + ld b, a + ld a, [wCurEnemyLVL] + cp b + jp c, .done ; mon level < move level (assumption: learnset is sorted by level) + ld a, [wLearningMovesFromDayCare] + and a + jr z, .skipMinLevelCheck + ld a, [wDayCareStartLevel] + cp b + jr nc, .nextMove2 ; min level >= move level + +.skipMinLevelCheck + +; check if the move is already known + push de + ld c, NUM_MOVES +.alreadyKnowsCheckLoop + ld a, [de] + inc de + cp [hl] + jr z, .nextMove + dec c + jr nz, .alreadyKnowsCheckLoop + +; try to find an empty move slot + pop de + push de + ld c, NUM_MOVES +.findEmptySlotLoop + ld a, [de] + and a + jr z, .writeMoveToSlot2 + inc de + dec c + jr nz, .findEmptySlotLoop + +; no empty move slots found + pop de + push de + push hl + ld h, d + ld l, e + call WriteMonMoves_ShiftMoveData ; shift all moves one up (deleting move 1) + ld a, [wLearningMovesFromDayCare] + and a + jr z, .writeMoveToSlot + +; shift PP as well if learning moves from day care + push de + ld bc, wPartyMon1PP - (wPartyMon1Moves + 3) + add hl, bc + ld d, h + ld e, l + call WriteMonMoves_ShiftMoveData ; shift all move PP data one up + pop de + +.writeMoveToSlot + pop hl +.writeMoveToSlot2 + ld a, [hl] + ld [de], a + ld a, [wLearningMovesFromDayCare] + and a + jr z, .nextMove + +; write move PP value if learning moves from day care + push hl + ld a, [hl] + ld hl, wPartyMon1PP - wPartyMon1Moves + add hl, de + push hl + dec a + ld hl, Moves + ld bc, MoveEnd - Moves + call AddNTimes + ld de, wBuffer + ld a, BANK(Moves) + call FarCopyData + ld a, [wBuffer + 5] + pop hl + ld [hl], a + pop hl + jr .nextMove + +.done + pop bc + pop de + pop hl + ret + +; shifts all move data one up (freeing 4th move slot) +WriteMonMoves_ShiftMoveData: + ld c, NUM_MOVES - 1 +.loop + inc de + ld a, [de] + ld [hli], a + dec c + jr nz, .loop + ret + +Evolution_FlagAction: + predef_jump FlagActionPredef + +INCLUDE "data/pokemon/evos_moves.asm" diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm new file mode 100644 index 00000000..427d2a7f --- /dev/null +++ b/engine/pokemon/experience.asm @@ -0,0 +1,149 @@ +; calculates the level a mon should be based on its current exp +CalcLevelFromExperience:: + ld a, [wLoadedMonSpecies] + ld [wd0b5], a + call GetMonHeader + ld d, $1 ; init level to 1 +.loop + inc d ; increment level + call CalcExperience + push hl + ld hl, wLoadedMonExp + 2 ; current exp +; compare exp needed for level d with current exp + ldh a, [hExperience + 2] + ld c, a + ld a, [hld] + sub c + ldh a, [hExperience + 1] + ld c, a + ld a, [hld] + sbc c + ldh a, [hExperience] + ld c, a + ld a, [hl] + sbc c + pop hl + jr nc, .loop ; if exp needed for level d is not greater than exp, try the next level + dec d ; since the exp was too high on the last loop iteration, go back to the previous value and return + ret + +; calculates the amount of experience needed for level d +CalcExperience:: + ld a, [wMonHGrowthRate] + add a + add a + ld c, a + ld b, 0 + ld hl, GrowthRateTable + add hl, bc + call CalcDSquared + ld a, d + ldh [hMultiplier], a + call Multiply + ld a, [hl] + and $f0 + swap a + ldh [hMultiplier], a + call Multiply + ld a, [hli] + and $f + ldh [hDivisor], a + ld b, $4 + call Divide + ldh a, [hQuotient + 1] + push af + ldh a, [hQuotient + 2] + push af + ldh a, [hQuotient + 3] + push af + call CalcDSquared + ld a, [hl] + and $7f + ldh [hMultiplier], a + call Multiply + ldh a, [hProduct + 1] + push af + ldh a, [hProduct + 2] + push af + ldh a, [hProduct + 3] + push af + ld a, [hli] + push af + xor a + ldh [hMultiplicand], a + ldh [hMultiplicand + 1], a + ld a, d + ldh [hMultiplicand + 2], a + ld a, [hli] + ldh [hMultiplier], a + call Multiply + ld b, [hl] + ldh a, [hProduct + 3] + sub b + ldh [hProduct + 3], a + ld b, $0 + ldh a, [hProduct + 2] + sbc b + ldh [hProduct + 2], a + ldh a, [hProduct + 1] + sbc b + ldh [hProduct + 1], a +; The difference of the linear term and the constant term consists of 3 bytes +; starting at hProduct + 1. Below, hExperience (an alias of that address) will +; be used instead for the further work of adding or subtracting the squared +; term and adding the cubed term. + pop af + and $80 + jr nz, .subtractSquaredTerm ; check sign + pop bc + ldh a, [hExperience + 2] + add b + ldh [hExperience + 2], a + pop bc + ldh a, [hExperience + 1] + adc b + ldh [hExperience + 1], a + pop bc + ldh a, [hExperience] + adc b + ldh [hExperience], a + jr .addCubedTerm +.subtractSquaredTerm + pop bc + ldh a, [hExperience + 2] + sub b + ldh [hExperience + 2], a + pop bc + ldh a, [hExperience + 1] + sbc b + ldh [hExperience + 1], a + pop bc + ldh a, [hExperience] + sbc b + ldh [hExperience], a +.addCubedTerm + pop bc + ldh a, [hExperience + 2] + add b + ldh [hExperience + 2], a + pop bc + ldh a, [hExperience + 1] + adc b + ldh [hExperience + 1], a + pop bc + ldh a, [hExperience] + adc b + ldh [hExperience], a + ret + +; calculates d*d +CalcDSquared: + xor a + ldh [hMultiplicand], a + ldh [hMultiplicand + 1], a + ld a, d + ldh [hMultiplicand + 2], a + ldh [hMultiplier], a + jp Multiply + +INCLUDE "data/growth_rates.asm" diff --git a/engine/learn_move.asm b/engine/pokemon/learn_move.asm old mode 100755 new mode 100644 similarity index 80% rename from engine/learn_move.asm rename to engine/pokemon/learn_move.asm index 53c7f87e..4deb3f0b --- a/engine/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -76,7 +76,7 @@ DontAbandonLearning: AbandonLearning: ld hl, AbandonLearningText call PrintText - coord hl, 14, 7 + hlcoord 14, 7 lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -99,7 +99,7 @@ TryingToLearn: push hl ld hl, TryingToLearnText call PrintText - coord hl, 14, 7 + hlcoord 14, 7 lb bc, 8, 15 ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -114,25 +114,25 @@ TryingToLearn: ld de, wMoves ld bc, NUM_MOVES call CopyData - callab FormatMovesString + callfar FormatMovesString pop hl .loop push hl ld hl, WhichMoveToForgetText call PrintText - coord hl, 4, 7 + hlcoord 4, 7 ld b, 4 ld c, 14 call TextBoxBorder - coord hl, 6, 8 + hlcoord 6, 8 ld de, wMovesString - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] set 2, a - ld [hFlags_0xFFF6], a + ldh [hUILayoutFlags], a call PlaceString - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] res 2, a - ld [hFlags_0xFFF6], a + ldh [hUILayoutFlags], a ld hl, wTopMenuItemY ld a, 8 ld [hli], a ; wTopMenuItemY @@ -146,10 +146,10 @@ TryingToLearn: ld a, A_BUTTON | B_BUTTON ld [hli], a ; wMenuWatchedKeys ld [hl], 0 ; wLastMenuItem - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags set 1, [hl] call HandleMenuInput - ld hl, hFlags_0xFFF6 + ld hl, hUILayoutFlags res 1, [hl] push af call LoadScreenTilesFromBuffer1 @@ -184,43 +184,43 @@ TryingToLearn: ret LearnedMove1Text: - TX_FAR _LearnedMove1Text - TX_SFX_ITEM_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle - TX_BLINK - db "@" + text_far _LearnedMove1Text + sound_get_item_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle + text_promptbutton + text_end WhichMoveToForgetText: - TX_FAR _WhichMoveToForgetText - db "@" + text_far _WhichMoveToForgetText + text_end AbandonLearningText: - TX_FAR _AbandonLearningText - db "@" + text_far _AbandonLearningText + text_end DidNotLearnText: - TX_FAR _DidNotLearnText - db "@" + text_far _DidNotLearnText + text_end TryingToLearnText: - TX_FAR _TryingToLearnText - db "@" + text_far _TryingToLearnText + text_end OneTwoAndText: - TX_FAR _OneTwoAndText - TX_DELAY - TX_ASM + text_far _OneTwoAndText + text_pause + text_asm ld a, SFX_SWAP call PlaySoundWaitForCurrent ld hl, PoofText ret PoofText: - TX_FAR _PoofText - TX_DELAY + text_far _PoofText + text_pause ForgotAndText: - TX_FAR _ForgotAndText - db "@" + text_far _ForgotAndText + text_end HMCantDeleteText: - TX_FAR _HMCantDeleteText - db "@" + text_far _HMCantDeleteText + text_end diff --git a/engine/load_mon_data.asm b/engine/pokemon/load_mon_data.asm similarity index 95% rename from engine/load_mon_data.asm rename to engine/pokemon/load_mon_data.asm index a71a81c5..c5e2041a 100644 --- a/engine/load_mon_data.asm +++ b/engine/pokemon/load_mon_data.asm @@ -1,4 +1,4 @@ -LoadMonData_: +LoadMonData_:: ; Load monster [wWhichPokemon] from list [wMonDataLocation]: ; 0: partymon ; 1: enemymon @@ -15,7 +15,7 @@ LoadMonData_: ld a, [wWhichPokemon] ld e, a - callab GetMonSpecies + callfar GetMonSpecies .GetMonHeader ld a, [wcf91] diff --git a/engine/pokemon/remove_mon.asm b/engine/pokemon/remove_mon.asm new file mode 100644 index 00000000..c85b96bf --- /dev/null +++ b/engine/pokemon/remove_mon.asm @@ -0,0 +1,95 @@ +_RemovePokemon:: + ld hl, wPartyCount + ld a, [wRemoveMonFromBox] + and a + jr z, .usePartyCount + ld hl, wNumInBox +.usePartyCount + ld a, [hl] + dec a + ld [hli], a + ld a, [wWhichPokemon] + ld c, a + ld b, $0 + add hl, bc + ld e, l + ld d, h + inc de +.shiftMonSpeciesLoop + ld a, [de] + inc de + ld [hli], a + inc a ; reached terminator? + jr nz, .shiftMonSpeciesLoop ; if not, continue shifting species + ld hl, wPartyMonOT + ld d, PARTY_LENGTH - 1 ; max number of pokemon to shift + ld a, [wRemoveMonFromBox] + and a + jr z, .usePartyMonOTs + ld hl, wBoxMonOT + ld d, MONS_PER_BOX - 1 +.usePartyMonOTs + ld a, [wWhichPokemon] + call SkipFixedLengthTextEntries + ld a, [wWhichPokemon] + cp d ; are we removing the last pokemon? + jr nz, .notRemovingLastMon ; if not, shift the pokemon below + ld [hl], $ff ; else, write the terminator and return + ret +.notRemovingLastMon + ld d, h + ld e, l + ld bc, NAME_LENGTH + add hl, bc + ld bc, wPartyMonNicks + ld a, [wRemoveMonFromBox] + and a + jr z, .usePartyMonNicks + ld bc, wBoxMonNicks +.usePartyMonNicks + call CopyDataUntil + ld hl, wPartyMons + ld bc, wPartyMon2 - wPartyMon1 + ld a, [wRemoveMonFromBox] + and a + jr z, .usePartyMonStructs + ld hl, wBoxMons + ld bc, wBoxMon2 - wBoxMon1 +.usePartyMonStructs + ld a, [wWhichPokemon] + call AddNTimes ; get address of the pokemon removed + ld d, h ; store in de for CopyDataUntil + ld e, l + ld a, [wRemoveMonFromBox] + and a + jr z, .copyUntilPartyMonOTs + ld bc, wBoxMon2 - wBoxMon1 + add hl, bc ; get address of pokemon after the pokemon removed + ld bc, wBoxMonOT ; address of when to stop copying + jr .continue +.copyUntilPartyMonOTs + ld bc, wPartyMon2 - wPartyMon1 + add hl, bc ; get address of pokemon after the pokemon removed + ld bc, wPartyMonOT ; address of when to stop copying +.continue + call CopyDataUntil ; shift all pokemon data after the removed mon to the removed mon's location + ld hl, wPartyMonNicks + ld a, [wRemoveMonFromBox] + and a + jr z, .usePartyMonNicks2 + ld hl, wBoxMonNicks +.usePartyMonNicks2 + ld bc, NAME_LENGTH + ld a, [wWhichPokemon] + call AddNTimes + ld d, h + ld e, l + ld bc, NAME_LENGTH + add hl, bc + ld bc, wPartyMonNicksEnd + ld a, [wRemoveMonFromBox] + and a + jr z, .copyUntilPartyMonNicksEnd + ld bc, wBoxMonNicksEnd +.copyUntilPartyMonNicksEnd + jp CopyDataUntil diff --git a/engine/predefs17_2.asm b/engine/pokemon/set_types.asm old mode 100755 new mode 100644 similarity index 100% rename from engine/predefs17_2.asm rename to engine/pokemon/set_types.asm diff --git a/engine/status_ailments.asm b/engine/pokemon/status_ailments.asm old mode 100755 new mode 100644 similarity index 95% rename from engine/status_ailments.asm rename to engine/pokemon/status_ailments.asm index 787533c4..3da1fc43 --- a/engine/status_ailments.asm +++ b/engine/pokemon/status_ailments.asm @@ -1,4 +1,4 @@ -PrintStatusAilment: +PrintStatusAilment:: ld a, [de] bit PSN, a jr nz, .psn diff --git a/engine/menu/status_screen.asm b/engine/pokemon/status_screen.asm old mode 100755 new mode 100644 similarity index 81% rename from engine/menu/status_screen.asm rename to engine/pokemon/status_screen.asm index ef94f13c..ac03514a --- a/engine/menu/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -40,7 +40,7 @@ DrawHP_: push hl call DrawHPBar pop hl - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] bit 0, a jr z, .printFractionBelowBar ld bc, $9 ; right of bar @@ -80,87 +80,87 @@ StatusScreen: ld hl, wd72c set 1, [hl] ld a, $33 - ld [rNR50], a ; Reduce the volume + ldh [rNR50], a ; Reduce the volume call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites call LoadHpBarAndStatusTilePatterns ld de, BattleHudTiles1 ; source - ld hl, vChars2 + $6d0 ; dest - lb bc, BANK(BattleHudTiles1), $03 + ld hl, vChars2 tile $6d ; dest + lb bc, BANK(BattleHudTiles1), 3 call CopyVideoDataDouble ; ·│ :L and halfarrow line end ld de, BattleHudTiles2 - ld hl, vChars2 + $780 - lb bc, BANK(BattleHudTiles2), $01 + ld hl, vChars2 tile $78 + lb bc, BANK(BattleHudTiles2), 1 call CopyVideoDataDouble ; │ ld de, BattleHudTiles3 - ld hl, vChars2 + $760 - lb bc, BANK(BattleHudTiles3), $02 - call CopyVideoDataDouble ; ─┘ + ld hl, vChars2 tile $76 + lb bc, BANK(BattleHudTiles3), 2 + call CopyVideoDataDouble ; ─ ┘ ld de, PTile - ld hl, vChars2 + $720 - lb bc, BANK(PTile), (PTileEnd - PTile) / $8 - call CopyVideoDataDouble ; P (for PP), inline - ld a, [hTilesetType] + ld hl, vChars2 tile $72 + lb bc, BANK(PTile), 1 + call CopyVideoDataDouble ; bold P (for PP) + ldh a, [hTileAnimations] push af xor a - ld [hTilesetType], a - coord hl, 19, 1 + ldh [hTileAnimations], a + hlcoord 19, 1 lb bc, 6, 10 call DrawLineBox ; Draws the box around name, HP and status ld de, -6 add hl, de - ld [hl], "⠄" ; . after No ("." is a different one) + ld [hl], "" dec hl ld [hl], "№" - coord hl, 19, 9 + hlcoord 19, 9 lb bc, 8, 6 call DrawLineBox ; Draws the box around types, ID No. and OT - coord hl, 10, 9 + hlcoord 10, 9 ld de, Type1Text call PlaceString ; "TYPE1/" - coord hl, 11, 3 + hlcoord 11, 3 predef DrawHP ld hl, wStatusScreenHPBarColor call GetHealthBarColor ld b, SET_PAL_STATUS_SCREEN call RunPaletteCommand - coord hl, 16, 6 + hlcoord 16, 6 ld de, wLoadedMonStatus call PrintStatusCondition jr nz, .StatusWritten - coord hl, 16, 6 + hlcoord 16, 6 ld de, OKText call PlaceString ; "OK" .StatusWritten - coord hl, 9, 6 + hlcoord 9, 6 ld de, StatusText call PlaceString ; "STATUS/" - coord hl, 14, 2 + hlcoord 14, 2 call PrintLevel ; Pokémon level ld a, [wMonHIndex] ld [wd11e], a ld [wd0b5], a predef IndexToPokedex - coord hl, 3, 7 + hlcoord 3, 7 ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; Pokémon no. - coord hl, 11, 10 + hlcoord 11, 10 predef PrintMonType ld hl, NamePointers2 call .GetStringPointer ld d, h ld e, l - coord hl, 9, 1 + hlcoord 9, 1 call PlaceString ; Pokémon name ld hl, OTPointers call .GetStringPointer ld d, h ld e, l - coord hl, 12, 16 + hlcoord 12, 16 call PlaceString ; OT - coord hl, 12, 14 + hlcoord 12, 14 ld de, wLoadedMonOTID lb bc, LEADING_ZEROES | 2, 5 call PrintNumber ; ID Number @@ -168,13 +168,13 @@ StatusScreen: call PrintStatsBox call Delay3 call GBPalNormal - coord hl, 1, 0 + hlcoord 1, 0 call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture ld a, [wcf91] call PlayCry ; play Pokémon cry call WaitForTextScrollButtonPress ; wait for button pop af - ld [hTilesetType], a + ldh [hTileAnimations], a ret .GetStringPointer @@ -205,14 +205,17 @@ NamePointers2: dw wDayCareMonName Type1Text: - db "TYPE1/", $4e - + db "TYPE1/" + next "" + ; fallthrough Type2Text: - db "TYPE2/", $4e - + db "TYPE2/" + next "" + ; fallthrough IDNoText: - db $73, "№/", $4e - + db "№/" + next "" + ; fallthrough OTText: db "OT/" next "@" @@ -241,28 +244,26 @@ DrawLineBox: ld [hl], $6f ; ← (halfarrow ending) ret -PTile: ; This is a single 1bpp "P" tile - INCBIN "gfx/p_tile.1bpp" -PTileEnd: +PTile: INCBIN "gfx/font/P.1bpp" PrintStatsBox: ld a, d and a ; a is 0 from the status screen jr nz, .DifferentBox - coord hl, 0, 8 + hlcoord 0, 8 ld b, 8 ld c, 8 call TextBoxBorder ; Draws the box - coord hl, 1, 9 ; Start printing stats from here - ld bc, $0019 ; Number offset + hlcoord 1, 9 ; Start printing stats from here + ld bc, $19 ; Number offset jr .PrintStats .DifferentBox - coord hl, 9, 2 + hlcoord 9, 2 ld b, 8 ld c, 9 call TextBoxBorder - coord hl, 11, 3 - ld bc, $0018 + hlcoord 11, 3 + ld bc, $18 .PrintStats push bc push hl @@ -295,11 +296,11 @@ StatsText: next "SPECIAL@" StatusScreen2: - ld a, [hTilesetType] + ldh a, [hTileAnimations] push af xor a - ld [hTilesetType], a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hTileAnimations], a + ldh [hAutoBGTransferEnabled], a ld bc, NUM_MOVES + 1 ld hl, wMoves call FillMemory @@ -307,17 +308,17 @@ StatusScreen2: ld de, wMoves ld bc, NUM_MOVES call CopyData - callab FormatMovesString - coord hl, 9, 2 + callfar FormatMovesString + hlcoord 9, 2 lb bc, 5, 10 call ClearScreenArea ; Clear under name - coord hl, 19, 3 + hlcoord 19, 3 ld [hl], $78 - coord hl, 0, 8 + hlcoord 0, 8 ld b, 8 ld c, 18 call TextBoxBorder ; Draw move container - coord hl, 2, 9 + hlcoord 2, 9 ld de, wMovesString call PlaceString ; Print moves ld a, [wNumMovesMinusOne] @@ -326,9 +327,9 @@ StatusScreen2: ld a, $4 sub c ld b, a ; Number of moves ? - coord hl, 11, 10 + hlcoord 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, $72 ; special P tile id + ld a, "" call StatusScreen_PrintPP ; Print "PP" ld a, b and a @@ -338,7 +339,7 @@ StatusScreen2: call StatusScreen_PrintPP ; Fill the rest with -- .InitPP ld hl, wLoadedMonMoves - coord de, 14, 10 + decoord 14, 10 ld b, 0 .PrintPP ld a, [hli] @@ -353,7 +354,7 @@ StatusScreen2: ld a, b ld [hl], a push hl - callab GetMaxPP + callfar GetMaxPP pop hl pop af ld [hl], a @@ -388,7 +389,7 @@ StatusScreen2: cp $4 jr nz, .PrintPP .PPDone - coord hl, 9, 3 + hlcoord 9, 3 ld de, StatusScreenExpText call PlaceString ld a, [wLoadedMonLevel] @@ -398,41 +399,41 @@ StatusScreen2: inc a ld [wLoadedMonLevel], a ; Increase temporarily if not 100 .Level100 - coord hl, 14, 6 - ld [hl], $70 ; 1-tile "to" + hlcoord 14, 6 + ld [hl], "" inc hl inc hl call PrintLevel pop af ld [wLoadedMonLevel], a ld de, wLoadedMonExp - coord hl, 12, 4 + hlcoord 12, 4 lb bc, 3, 7 call PrintNumber ; exp call CalcExpToLevelUp ld de, wLoadedMonExp - coord hl, 7, 6 + hlcoord 7, 6 lb bc, 3, 7 call PrintNumber ; exp needed to level up - coord hl, 9, 0 + hlcoord 9, 0 call StatusScreen_ClearName - coord hl, 9, 1 + hlcoord 9, 1 call StatusScreen_ClearName ld a, [wMonHIndex] ld [wd11e], a call GetMonName - coord hl, 9, 1 + hlcoord 9, 1 call PlaceString ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 call WaitForTextScrollButtonPress ; wait for button pop af - ld [hTilesetType], a + ldh [hTileAnimations], a ld hl, wd72c res 1, [hl] ld a, $77 - ld [rNR50], a + ldh [rNR50], a call GBPalWhiteOut jp ClearScreen @@ -442,15 +443,15 @@ CalcExpToLevelUp: jr z, .atMaxLevel inc a ld d, a - callab CalcExperience + callfar CalcExperience ld hl, wLoadedMonExp + 2 - ld a, [hExperience + 2] + ldh a, [hExperience + 2] sub [hl] ld [hld], a - ld a, [hExperience + 1] + ldh a, [hExperience + 1] sbc [hl] ld [hld], a - ld a, [hExperience] + ldh a, [hExperience] sbc [hl] ld [hld], a ret diff --git a/engine/predefs.asm b/engine/predefs.asm old mode 100755 new mode 100644 index e701b4e1..a9877739 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -1,4 +1,4 @@ -GetPredefPointer: +GetPredefPointer:: ; Store the contents of the register ; pairs (hl, de, bc) at wPredefRegisters. ; Then put the bank and address of predef @@ -49,105 +49,4 @@ GetPredefPointer: ret -PredefPointers:: -; these are pointers to ASM routines. -; they appear to be used in overworld map scripts. - add_predef DrawPlayerHUDAndHPBar - add_predef CopyUncompressedPicToTilemap - add_predef AnimateSendingOutMon - add_predef ScaleSpriteByTwo - add_predef LoadMonBackPic - add_predef CopyDownscaledMonTiles - add_predef LoadMissableObjects ; dbw $03,JumpMoveEffect ; wrong bank XXXXX - add_predef HealParty - add_predef MoveAnimation - add_predef DivideBCDPredef - add_predef DivideBCDPredef2 - add_predef AddBCDPredef - add_predef SubBCDPredef - add_predef DivideBCDPredef3 - add_predef DivideBCDPredef4 - add_predef InitPlayerData - add_predef FlagActionPredef - add_predef HideObject - add_predef IsObjectHidden - add_predef ApplyOutOfBattlePoisonDamage - add_predef AnyPartyAlive - add_predef ShowObject - add_predef ShowObject2 - add_predef ReplaceTileBlock - add_predef InitPlayerData2 - add_predef LoadTilesetHeader - add_predef LearnMoveFromLevelUp - add_predef LearnMove - add_predef GetQuantityOfItemInBag - dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; home bank - dbw $03,GiveItem ; home bank - add_predef ChangeBGPalColor0_4Frames - add_predef FindPathToPlayer - add_predef PredefShakeScreenVertically - add_predef CalcPositionOfPlayerRelativeToNPC - add_predef ConvertNPCMovementDirectionsToJoypadMasks - add_predef PredefShakeScreenHorizontally - add_predef UpdateHPBar - add_predef HPBarLength - add_predef Diploma_TextBoxBorder - add_predef DoubleOrHalveSelectedStats - add_predef ShowPokedexMenu - add_predef EvolutionAfterBattle - add_predef SaveSAVtoSRAM0 - add_predef InitOpponent - add_predef CableClub_Run - add_predef DrawBadges - add_predef ExternalClockTradeAnim - add_predef BattleTransition - add_predef CopyTileIDsFromList - add_predef PlayIntro - add_predef GetMoveSoundB - add_predef FlashScreen - add_predef GetTileAndCoordsInFrontOfPlayer - add_predef StatusScreen - add_predef StatusScreen2 - add_predef InternalClockTradeAnim - add_predef TrainerEngage - add_predef IndexToPokedex - add_predef DisplayPicCenteredOrUpperRight - add_predef UsedCut - add_predef ShowPokedexData - add_predef WriteMonMoves - add_predef SaveSAV - add_predef LoadSGB - add_predef MarkTownVisitedAndLoadMissableObjects - add_predef SetPartyMonTypes - add_predef CanLearnTM - add_predef TMToMove - add_predef _RunPaletteCommand - add_predef StarterDex - add_predef _AddPartyMon - add_predef UpdateHPBar2 - add_predef DrawEnemyHUDAndHPBar - add_predef LoadTownMap_Nest - add_predef PrintMonType - add_predef EmotionBubble - add_predef EmptyFunc3; return immediately - add_predef AskName - add_predef PewterGuys - add_predef SaveSAVtoSRAM2 - add_predef LoadSAV2 - add_predef LoadSAV - add_predef SaveSAVtoSRAM1 - add_predef DoInGameTradeDialogue - add_predef HallOfFamePC - add_predef DisplayDexRating - dbw $1E, _LeaveMapAnim ; wrong bank - dbw $1E, EnterMapAnim ; wrong bank - add_predef GetTileTwoStepsInFrontOfPlayer - add_predef CheckForCollisionWhenPushingBoulder - add_predef PrintStrengthTxt - add_predef PickUpItem - add_predef PrintMoveType - add_predef LoadMovePPs - add_predef DrawHP - add_predef DrawHP2 - add_predef DisplayElevatorFloorMenu - add_predef OaksAideScript +INCLUDE "data/predef_pointers.asm" diff --git a/engine/predefs12.asm b/engine/predefs12.asm deleted file mode 100755 index 95f0ea25..00000000 --- a/engine/predefs12.asm +++ /dev/null @@ -1,71 +0,0 @@ -; b = new colour for BG colour 0 (usually white) for 4 frames -ChangeBGPalColor0_4Frames: - call GetPredefRegisters - ld a, [rBGP] - or b - ld [rBGP], a - ld c, 4 - call DelayFrames - ld a, [rBGP] - and %11111100 - ld [rBGP], a - ret - -PredefShakeScreenVertically: -; Moves the window down and then back in a sequence of progressively smaller -; numbers of pixels, starting at b. - call GetPredefRegisters - ld a, 1 - ld [wDisableVBlankWYUpdate], a - xor a -.loop - ld [$ff96], a - call .MutateWY - call .MutateWY - dec b - ld a, b - jr nz, .loop - xor a - ld [wDisableVBlankWYUpdate], a - ret - -.MutateWY - ld a, [$ff96] - xor b - ld [$ff96], a - ld [rWY], a - ld c, 3 - jp DelayFrames - -PredefShakeScreenHorizontally: -; Moves the window right and then back in a sequence of progressively smaller -; numbers of pixels, starting at b. - call GetPredefRegisters - xor a -.loop - ld [$ff97], a - call .MutateWX - ld c, 1 - call DelayFrames - call .MutateWX - dec b - ld a, b - jr nz, .loop - -; restore normal WX - ld a, 7 - ld [rWX], a - ret - -.MutateWX - ld a, [$ff97] - xor b - ld [$ff97], a - bit 7, a - jr z, .skipZeroing - xor a ; zero a if it's negative -.skipZeroing - add 7 - ld [rWX], a - ld c, 4 - jp DelayFrames diff --git a/engine/predefs17.asm b/engine/predefs17.asm deleted file mode 100755 index 21289c6a..00000000 --- a/engine/predefs17.asm +++ /dev/null @@ -1,9 +0,0 @@ -; this function temporarily makes the starters (and Ivysaur) seen -; so that the full Pokedex information gets displayed in Oak's lab -StarterDex: - ld a, %01001011 ; set starter flags - ld [wPokedexOwned], a - predef ShowPokedexData - xor a ; unset starter flags - ld [wPokedexOwned], a - ret diff --git a/engine/predefs7.asm b/engine/predefs7.asm deleted file mode 100755 index 752bdd1a..00000000 --- a/engine/predefs7.asm +++ /dev/null @@ -1,48 +0,0 @@ -DisplayElevatorFloorMenu: - ld hl, WhichFloorText - call PrintText - ld hl, wItemList - ld a, l - ld [wListPointer], a - ld a, h - ld [wListPointer + 1], a - ld a, [wListScrollOffset] - push af - xor a - ld [wCurrentMenuItem], a - ld [wListScrollOffset], a - ld [wPrintItemPrices], a - ld a, SPECIALLISTMENU - ld [wListMenuID], a - call DisplayListMenuID - pop bc - ld a, b - ld [wListScrollOffset], a - ret c - ld hl, wCurrentMapScriptFlags - set 7, [hl] - ld hl, wElevatorWarpMaps - ld a, [wWhichPokemon] - add a - ld d, 0 - ld e, a - add hl, de - ld a, [hli] - ld b, a - ld a, [hl] - ld c, a - ld hl, wWarpEntries - call .UpdateWarp - -.UpdateWarp - inc hl - inc hl - ld a, b - ld [hli], a ; destination warp ID - ld a, c - ld [hli], a ; destination map ID - ret - -WhichFloorText: - TX_FAR _WhichFloorText - db "@" diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm deleted file mode 100644 index 7a95da2a..00000000 --- a/engine/print_waiting_text.asm +++ /dev/null @@ -1,20 +0,0 @@ -PrintWaitingText: - coord hl, 3, 10 - ld b, $1 - ld c, $b - ld a, [wIsInBattle] - and a - jr z, .asm_4c17 - call TextBoxBorder - jr .asm_4c1a -.asm_4c17 - call CableClub_TextBoxBorder -.asm_4c1a - coord hl, 4, 11 - ld de, WaitingText - call PlaceString - ld c, 50 - jp DelayFrames - -WaitingText: - db "Waiting...!@" diff --git a/engine/random.asm b/engine/random.asm deleted file mode 100755 index 2fc83f6f..00000000 --- a/engine/random.asm +++ /dev/null @@ -1,13 +0,0 @@ -Random_:: -; Generate a random 16-bit value. - ld a, [rDIV] - ld b, a - ld a, [hRandomAdd] - adc b - ld [hRandomAdd], a - ld a, [rDIV] - ld b, a - ld a, [hRandomSub] - sbc b - ld [hRandomSub], a - ret diff --git a/engine/remove_pokemon.asm b/engine/remove_pokemon.asm deleted file mode 100644 index 1fcb5d09..00000000 --- a/engine/remove_pokemon.asm +++ /dev/null @@ -1,95 +0,0 @@ -_RemovePokemon: - ld hl, wPartyCount - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7b74 - ld hl, wNumInBox -.asm_7b74 - ld a, [hl] - dec a - ld [hli], a - ld a, [wWhichPokemon] - ld c, a - ld b, $0 - add hl, bc - ld e, l - ld d, h - inc de -.asm_7b81 - ld a, [de] - inc de - ld [hli], a - inc a - jr nz, .asm_7b81 - ld hl, wPartyMonOT - ld d, $5 - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7b97 - ld hl, wBoxMonOT - ld d, $13 -.asm_7b97 - ld a, [wWhichPokemon] - call SkipFixedLengthTextEntries - ld a, [wWhichPokemon] - cp d - jr nz, .asm_7ba6 - ld [hl], $ff - ret -.asm_7ba6 - ld d, h - ld e, l - ld bc, NAME_LENGTH - add hl, bc - ld bc, wPartyMonNicks - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7bb8 - ld bc, wBoxMonNicks -.asm_7bb8 - call CopyDataUntil - ld hl, wPartyMons - ld bc, wPartyMon2 - wPartyMon1 - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7bcd - ld hl, wBoxMons - ld bc, wBoxMon2 - wBoxMon1 -.asm_7bcd - ld a, [wWhichPokemon] - call AddNTimes - ld d, h - ld e, l - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7be4 - ld bc, wBoxMon2 - wBoxMon1 - add hl, bc - ld bc, wBoxMonOT - jr .asm_7beb -.asm_7be4 - ld bc, wPartyMon2 - wPartyMon1 - add hl, bc - ld bc, wPartyMonOT -.asm_7beb - call CopyDataUntil - ld hl, wPartyMonNicks - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7bfa - ld hl, wBoxMonNicks -.asm_7bfa - ld bc, NAME_LENGTH - ld a, [wWhichPokemon] - call AddNTimes - ld d, h - ld e, l - ld bc, NAME_LENGTH - add hl, bc - ld bc, wPokedexOwned - ld a, [wRemoveMonFromBox] - and a - jr z, .asm_7c15 - ld bc, wBoxMonNicksEnd -.asm_7c15 - jp CopyDataUntil diff --git a/engine/slots/game_corner_slots.asm b/engine/slots/game_corner_slots.asm new file mode 100644 index 00000000..48321974 --- /dev/null +++ b/engine/slots/game_corner_slots.asm @@ -0,0 +1,54 @@ +StartSlotMachine: + ld a, [wHiddenObjectFunctionArgument] + cp SLOTS_OUTOFORDER + jr z, .printOutOfOrder + cp SLOTS_OUTTOLUNCH + jr z, .printOutToLunch + cp SLOTS_SOMEONESKEYS + jr z, .printSomeonesKeys + farcall AbleToPlaySlotsCheck + ld a, [wCanPlaySlots] + and a + ret z + ld a, [wLuckySlotHiddenObjectIndex] + ld b, a + ld a, [wHiddenObjectIndex] + inc a + cp b + jr z, .match + ld a, 253 + jr .next +.match + ld a, 250 +.next + ld [wSlotMachineSevenAndBarModeChance], a + ldh a, [hLoadedROMBank] + ld [wSlotMachineSavedROMBank], a + call PromptUserToPlaySlots + ret +.printOutOfOrder + tx_pre_id GameCornerOutOfOrderText + jr .printText +.printOutToLunch + tx_pre_id GameCornerOutToLunchText + jr .printText +.printSomeonesKeys + tx_pre_id GameCornerSomeonesKeysText +.printText + push af + call EnableAutoTextBoxDrawing + pop af + call PrintPredefTextID + ret + +GameCornerOutOfOrderText:: + text_far _GameCornerOutOfOrderText + text_end + +GameCornerOutToLunchText:: + text_far _GameCornerOutToLunchText + text_end + +GameCornerSomeonesKeysText:: + text_far _GameCornerSomeonesKeysText + text_end diff --git a/engine/slots/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm new file mode 100644 index 00000000..a4ba4ec1 --- /dev/null +++ b/engine/slots/game_corner_slots2.asm @@ -0,0 +1,31 @@ +AbleToPlaySlotsCheck: + ld a, [wSpritePlayerStateData1ImageIndex] + and $8 + jr z, .done ; not able + ld b, COIN_CASE + predef GetQuantityOfItemInBag + ld a, b + and a + ld b, (GameCornerCoinCaseText_id - TextPredefs) / 2 + 1 + jr z, .printCoinCaseRequired + ld hl, wPlayerCoins + ld a, [hli] + or [hl] + jr nz, .done ; able to play + ld b, (GameCornerNoCoinsText_id - TextPredefs) / 2 + 1 +.printCoinCaseRequired + call EnableAutoTextBoxDrawing + ld a, b + call PrintPredefTextID + xor a +.done + ld [wCanPlaySlots], a + ret + +GameCornerCoinCaseText:: + text_far _GameCornerCoinCaseText + text_end + +GameCornerNoCoinsText:: + text_far _GameCornerNoCoinsText + text_end diff --git a/engine/slot_machine.asm b/engine/slots/slot_machine.asm old mode 100755 new mode 100644 similarity index 92% rename from engine/slot_machine.asm rename to engine/slots/slot_machine.asm index 3a46687f..fe137632 --- a/engine/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -1,6 +1,6 @@ PromptUserToPlaySlots: call SaveScreenTilesToBuffer2 - ld a, BANK(DisplayTextIDInit) + ld a, BANK(DisplayTextIDInit) ; TRUE ld [wAutoTextBoxDrawingControl], a ld b, a ld hl, DisplayTextIDInit @@ -25,13 +25,13 @@ PromptUserToPlaySlots: call RunPaletteCommand call GBPalNormal ld a, $e4 - ld [rOBP0], a + ldh [rOBP0], a ld hl, wd730 set 6, [hl] xor a ld [wSlotMachineAllowMatchesCounter], a ld hl, wStoppingWhichSlotMachineWheel - ld bc, $0014 + ld bc, $14 call FillMemory call MainSlotMachineLoop ld hl, wd730 @@ -53,8 +53,8 @@ PromptUserToPlaySlots: jp CloseTextDisplay PlaySlotMachineText: - TX_FAR _PlaySlotMachineText - db "@" + text_far _PlaySlotMachineText + text_end MainSlotMachineLoop: call SlotMachine_PrintCreditCoins @@ -79,11 +79,11 @@ MainSlotMachineLoop: ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld [wMenuWatchMovingOutOfBounds], a - coord hl, 14, 11 + hlcoord 14, 11 ld b, 5 ld c, 4 call TextBoxBorder - coord hl, 16, 12 + hlcoord 16, 12 ld de, CoinMultiplierSlotMachineText call PlaceString call HandleMenuInput @@ -133,7 +133,7 @@ MainSlotMachineLoop: .skip2 ld hl, OneMoreGoSlotMachineText call PrintText - coord hl, 14, 12 + hlcoord 14, 12 lb bc, 13, 15 xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a @@ -152,24 +152,24 @@ CoinMultiplierSlotMachineText: next "×1@" OutOfCoinsSlotMachineText: - TX_FAR _OutOfCoinsSlotMachineText - db "@" + text_far _OutOfCoinsSlotMachineText + text_end BetHowManySlotMachineText: - TX_FAR _BetHowManySlotMachineText - db "@" + text_far _BetHowManySlotMachineText + text_end StartSlotMachineText: - TX_FAR _StartSlotMachineText - db "@" + text_far _StartSlotMachineText + text_end NotEnoughCoinsSlotMachineText: - TX_FAR _NotEnoughCoinsSlotMachineText - db "@" + text_far _NotEnoughCoinsSlotMachineText + text_end OneMoreGoSlotMachineText: - TX_FAR _OneMoreGoSlotMachineText - db "@" + text_far _OneMoreGoSlotMachineText + text_end SlotMachine_SetFlags: ld hl, wSlotMachineFlags @@ -294,7 +294,7 @@ SlotMachine_StopWheel1Early: ; Stop early if the middle symbol is not a cherry. inc hl ld a, [hl] - cp SLOTSCHERRY >> 8 + cp HIGH(SLOTSCHERRY) jr nz, .stopWheel ret ; It looks like this was intended to make the wheel stop when a 7 symbol was @@ -303,7 +303,7 @@ SlotMachine_StopWheel1Early: ld c, $3 .loop ld a, [hli] - cp SLOTS7 >> 8 + cp HIGH(SLOTS7) jr c, .stopWheel ; condition never true dec c jr nz, .loop @@ -330,7 +330,7 @@ SlotMachine_StopWheel2Early: .sevenAndBarMode call SlotMachine_FindWheel1Wheel2Matches ld a, [de] - cp (SLOTSBAR >> 8) + 1 + cp HIGH(SLOTSBAR) + 1 ret nc .stopWheel xor a @@ -427,7 +427,7 @@ SlotMachine_CheckForMatches: jr nz, .acceptMatch ; if 7/bar matches aren't enabled and the match was a 7/bar symbol, roll wheel ld a, [hl] - cp (SLOTSBAR >> 8) + 1 + cp HIGH(SLOTSBAR) + 1 jr c, .rollWheel3DownByOneSymbol .acceptMatch ld a, [hl] @@ -454,9 +454,9 @@ SlotMachine_CheckForMatches: jp hl .flashScreenLoop - ld a, [rBGP] + ldh a, [rBGP] xor $40 - ld [rBGP], a + ldh [rBGP], a ld c, 5 call DelayFrames dec b @@ -472,11 +472,11 @@ SlotMachine_CheckForMatches: call SlotMachine_PayCoinsToPlayer call SlotMachine_PrintPayoutCoins ld a, $e4 - ld [rOBP0], a + ldh [rOBP0], a jp .done SymbolLinedUpSlotMachineText: - TX_ASM + text_asm push bc call SlotMachine_PrintWinningSymbol ld hl, LinedUpText @@ -488,8 +488,8 @@ SymbolLinedUpSlotMachineText: ret LinedUpText: - TX_FAR _LinedUpText - db "@" + text_far _LinedUpText + text_end SlotRewardPointers: dw SlotReward300Func @@ -518,8 +518,8 @@ SlotReward15Text: db "15@" NotThisTimeText: - TX_FAR _NotThisTimeText - db "@" + text_far _NotThisTimeText + text_end ; compares the slot machine tiles at bc, de, and hl SlotMachine_CheckForMatch: @@ -609,13 +609,13 @@ SlotReward300Func: ret YeahText: - TX_FAR _YeahText - TX_DELAY - db "@" + text_far _YeahText + text_pause + text_end SlotMachine_PrintWinningSymbol: ; prints winning symbol and down arrow in text box - coord hl, 2, 14 + hlcoord 2, 14 ld a, [wSlotMachineWinningSymbol] add $25 ld [hli], a @@ -627,7 +627,7 @@ SlotMachine_PrintWinningSymbol: ld [hli], a inc a ld [hl], a - coord hl, 18, 16 + hlcoord 18, 16 ld [hl], "▼" ret @@ -642,13 +642,13 @@ SlotMachine_SubtractBetFromPlayerCoins: predef SubBCDPredef SlotMachine_PrintCreditCoins: - coord hl, 5, 1 + hlcoord 5, 1 ld de, wPlayerCoins ld c, $2 jp PrintBCDNumber SlotMachine_PrintPayoutCoins: - coord hl, 11, 1 + hlcoord 11, 1 ld de, wPayoutCoins lb bc, LEADING_ZEROES | 2, 4 ; 2 bytes, 4 digits jp PrintNumber @@ -695,14 +695,14 @@ SlotMachine_PayCoinsToPlayer: ld a, [wAnimCounter] dec a jr nz, .skip1 - ld a, [rOBP0] + ldh a, [rOBP0] xor $40 ; make the slot wheel symbols flash - ld [rOBP0], a + ldh [rOBP0], a ld a, 5 .skip1 ld [wAnimCounter], a ld a, [wSlotMachineWinningSymbol] - cp (SLOTSBAR >> 8) + 1 + cp HIGH(SLOTSBAR) + 1 ld c, 8 jr nc, .skip2 srl c ; c = 4 (make the the coins transfer faster if the symbol was 7 or bar) @@ -725,19 +725,19 @@ SlotMachine_LightBalls: jr z, SlotMachine_UpdateTwoCoinBallTiles SlotMachine_UpdateThreeCoinBallTiles: - coord hl, 3, 2 + hlcoord 3, 2 call SlotMachine_UpdateBallTiles - coord hl, 3, 10 + hlcoord 3, 10 call SlotMachine_UpdateBallTiles SlotMachine_UpdateTwoCoinBallTiles: - coord hl, 3, 4 + hlcoord 3, 4 call SlotMachine_UpdateBallTiles - coord hl, 3, 8 + hlcoord 3, 8 call SlotMachine_UpdateBallTiles SlotMachine_UpdateOneCoinBallTiles: - coord hl, 3, 6 + hlcoord 3, 6 SlotMachine_UpdateBallTiles: ld a, [wNewSlotMachineBallTile] @@ -825,7 +825,7 @@ SlotMachine_AnimWheel: SlotMachine_HandleInputWhileWheelsSpin: call DelayFrame call JoypadLowSensitivity - ld a, [hJoy5] + ldh a, [hJoy5] and A_BUTTON ret z ld hl, wStoppingWhichSlotMachineWheel @@ -850,21 +850,21 @@ LoadSlotMachineTiles: call DisableLCD ld hl, SlotMachineTiles2 ld de, vChars0 - ld bc, $1c0 + ld bc, $1c tiles ; should be SlotMachineTiles2End - SlotMachineTiles2, or $18 tiles ld a, BANK(SlotMachineTiles2) call FarCopyData2 ld hl, SlotMachineTiles1 ld de, vChars2 - ld bc, $250 + ld bc, SlotMachineTiles1End - SlotMachineTiles1 ld a, BANK(SlotMachineTiles1) call FarCopyData2 ld hl, SlotMachineTiles2 - ld de, vChars2 + $250 - ld bc, $1c0 + ld de, vChars2 tile $25 + ld bc, $1c tiles ; should be SlotMachineTiles2End - SlotMachineTiles2, or $18 tiles ld a, BANK(SlotMachineTiles2) call FarCopyData2 ld hl, SlotMachineMap - coord de, 0, 0 + decoord 0, 0 ld bc, SlotMachineMapEnd - SlotMachineMap call CopyData call EnableLCD @@ -878,15 +878,16 @@ LoadSlotMachineTiles: jp SlotMachine_AnimWheel3 SlotMachineMap: - INCBIN "gfx/tilemaps/slotmachine.map" + INCBIN "gfx/slots/slots.tilemap" SlotMachineMapEnd: -INCLUDE "data/slot_machine_wheels.asm" +INCLUDE "data/events/slot_machine_wheels.asm" SlotMachineTiles1: IF DEF(_RED) - INCBIN "gfx/red/slotmachine1.2bpp" + INCBIN "gfx/slots/red_slots_1.2bpp" ENDC IF DEF(_BLUE) - INCBIN "gfx/blue/slotmachine1.2bpp" + INCBIN "gfx/slots/blue_slots_1.2bpp" ENDC +SlotMachineTiles1End: diff --git a/engine/special_warps.asm b/engine/special_warps.asm deleted file mode 100644 index 3a8b8b86..00000000 --- a/engine/special_warps.asm +++ /dev/null @@ -1,149 +0,0 @@ -SpecialWarpIn: - call LoadSpecialWarpData - predef LoadTilesetHeader - ld hl, wd732 - bit 2, [hl] ; dungeon warp or fly warp? - res 2, [hl] - jr z, .next -; if dungeon warp or fly warp - ld a, [wDestinationMap] - jr .next2 -.next - bit 1, [hl] - jr z, .next3 - call EmptyFunc -.next3 - ld a, 0 -.next2 - ld b, a - ld a, [wd72d] - and a - jr nz, .next4 - ld a, b -.next4 - ld hl, wd732 - bit 4, [hl] ; dungeon warp? - ret nz -; if not dungeon warp - ld [wLastMap], a - ret - -; gets the map ID, tile block map view pointer, tileset, and coordinates -LoadSpecialWarpData: - ld a, [wd72d] - cp TRADE_CENTER - jr nz, .notTradeCenter - ld hl, TradeCenterSpec1 - ld a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right - jr z, .copyWarpData - ld hl, TradeCenterSpec2 - jr .copyWarpData -.notTradeCenter - cp COLOSSEUM - jr nz, .notColosseum - ld hl, ColosseumSpec1 - ld a, [hSerialConnectionStatus] - cp USING_INTERNAL_CLOCK - jr z, .copyWarpData - ld hl, ColosseumSpec2 - jr .copyWarpData -.notColosseum - ld a, [wd732] - bit 1, a - jr nz, .notFirstMap - bit 2, a - jr nz, .notFirstMap - ld hl, FirstMapSpec -.copyWarpData - ld de, wCurMap - ld c, $7 -.copyWarpDataLoop - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyWarpDataLoop - ld a, [hli] - ld [wCurMapTileset], a - xor a - jr .done -.notFirstMap - ld a, [wLastMap] ; this value is overwritten before it's ever read - ld hl, wd732 - bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)? - jr nz, .usedDunegonWarp - bit 6, [hl] ; return to last pokemon center (or player's house)? - res 6, [hl] - jr z, .otherDestination -; return to last pokemon center or player's house - ld a, [wLastBlackoutMap] - jr .usedFlyWarp -.usedDunegonWarp - ld hl, wd72d - res 4, [hl] - ld a, [wDungeonWarpDestinationMap] - ld b, a - ld [wCurMap], a - ld a, [wWhichDungeonWarp] - ld c, a - ld hl, DungeonWarpList - ld de, 0 - ld a, 6 - ld [wDungeonWarpDataEntrySize], a -.dungeonWarpListLoop - ld a, [hli] - cp b - jr z, .matchedDungeonWarpDestinationMap - inc hl - jr .nextDungeonWarp -.matchedDungeonWarpDestinationMap - ld a, [hli] - cp c - jr z, .matchedDungeonWarpID -.nextDungeonWarp - ld a, [wDungeonWarpDataEntrySize] - add e - ld e, a - jr .dungeonWarpListLoop -.matchedDungeonWarpID - ld hl, DungeonWarpData - add hl, de - jr .copyWarpData2 -.otherDestination - ld a, [wDestinationMap] -.usedFlyWarp - ld b, a - ld [wCurMap], a - ld hl, FlyWarpDataPtr -.flyWarpDataPtrLoop - ld a, [hli] - inc hl - cp b - jr z, .foundFlyWarpMatch - inc hl - inc hl - jr .flyWarpDataPtrLoop -.foundFlyWarpMatch - ld a, [hli] - ld h, [hl] - ld l, a -.copyWarpData2 - ld de, wCurrentTileBlockMapViewPointer - ld c, $6 -.copyWarpDataLoop2 - ld a, [hli] - ld [de], a - inc de - dec c - jr nz, .copyWarpDataLoop2 - xor a ; OVERWORLD - ld [wCurMapTileset], a -.done - ld [wYOffsetSinceLastSpecialWarp], a - ld [wXOffsetSinceLastSpecialWarp], a - ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps - ld [wDestinationWarpID], a - ret - -INCLUDE "data/special_warps.asm" diff --git a/engine/test_battle.asm b/engine/test_battle.asm deleted file mode 100644 index d9dcf1fa..00000000 --- a/engine/test_battle.asm +++ /dev/null @@ -1,45 +0,0 @@ -TestBattle: - ret - -.loop - call GBPalNormal - - ; Don't mess around - ; with obedience. - ld a, %10000000 ; EARTHBADGE - ld [wObtainedBadges], a - - ld hl, wFlags_D733 - set BIT_TEST_BATTLE, [hl] - - ; Reset the party. - ld hl, wPartyCount - xor a - ld [hli], a - dec a - ld [hl], a - - ; Give the player a - ; level 20 Rhydon. - ld a, RHYDON - ld [wcf91], a - ld a, 20 - ld [wCurEnemyLVL], a - xor a - ld [wMonDataLocation], a - ld [wCurMap], a - call AddPartyMon - - ; Fight against a - ; level 20 Rhydon. - ld a, RHYDON - ld [wCurOpponent], a - - predef InitOpponent - - ; When the battle ends, - ; do it all again. - ld a, 1 - ld [wUpdateSpritesEnabled], a - ld [H_AUTOBGTRANSFERENABLED], a - jr .loop diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm deleted file mode 100755 index e27e45a3..00000000 --- a/engine/titlescreen.asm +++ /dev/null @@ -1,406 +0,0 @@ -; copy text of fixed length NAME_LENGTH (like player name, rival name, mon names, ...) -CopyFixedLengthText: - ld bc, NAME_LENGTH - jp CopyData - -SetDefaultNamesBeforeTitlescreen: - ld hl, NintenText - ld de, wPlayerName - call CopyFixedLengthText - ld hl, SonyText - ld de, wRivalName - call CopyFixedLengthText - xor a - ld [hWY], a - ld [wLetterPrintingDelayFlags], a - ld hl, wd732 - ld [hli], a - ld [hli], a - ld [hl], a - ld a, 0 ; BANK(Music_TitleScreen) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a - -DisplayTitleScreen: - call GBPalWhiteOut - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - xor a - ld [hTilesetType], a - ld [hSCX], a - ld a, $40 - ld [hSCY], a - ld a, $90 - ld [hWY], a - call ClearScreen - call DisableLCD - call LoadFontTilePatterns - ld hl, NintendoCopyrightLogoGraphics - ld de, vTitleLogo2 + $100 - ld bc, $50 - ld a, BANK(NintendoCopyrightLogoGraphics) - call FarCopyData2 - ld hl, GamefreakLogoGraphics - ld de, vTitleLogo2 + $100 + $50 - ld bc, $90 - ld a, BANK(GamefreakLogoGraphics) - call FarCopyData2 - ld hl, PokemonLogoGraphics - ld de, vTitleLogo - ld bc, $600 - ld a, BANK(PokemonLogoGraphics) - call FarCopyData2 ; first chunk - ld hl, PokemonLogoGraphics+$600 - ld de, vTitleLogo2 - ld bc, $100 - ld a, BANK(PokemonLogoGraphics) - call FarCopyData2 ; second chunk - ld hl, Version_GFX - ld de, vChars2 + $600 - (Version_GFXEnd - Version_GFX - $50) - ld bc, Version_GFXEnd - Version_GFX - ld a, BANK(Version_GFX) - call FarCopyDataDouble - call ClearBothBGMaps - -; place tiles for pokemon logo (except for the last row) - coord hl, 2, 1 - ld a, $80 - ld de, SCREEN_WIDTH - ld c, 6 -.pokemonLogoTileLoop - ld b, $10 - push hl -.pokemonLogoTileRowLoop ; place tiles for one row - ld [hli], a - inc a - dec b - jr nz, .pokemonLogoTileRowLoop - pop hl - add hl, de - dec c - jr nz, .pokemonLogoTileLoop - -; place tiles for the last row of the pokemon logo - coord hl, 2, 7 - ld a, $31 - ld b, $10 -.pokemonLogoLastTileRowLoop - ld [hli], a - inc a - dec b - jr nz, .pokemonLogoLastTileRowLoop - - call DrawPlayerCharacter - -; put a pokeball in the player's hand - ld hl, wOAMBuffer + $28 - ld a, $74 - ld [hl], a - -; place tiles for title screen copyright - coord hl, 2, 17 - ld de, .tileScreenCopyrightTiles - ld b, $10 -.tileScreenCopyrightTilesLoop - ld a, [de] - ld [hli], a - inc de - dec b - jr nz, .tileScreenCopyrightTilesLoop - - jr .next - -.tileScreenCopyrightTiles - db $41,$42,$43,$42,$44,$42,$45,$46,$47,$48,$49,$4A,$4B,$4C,$4D,$4E ; ©'95.'96.'98 GAME FREAK inc. - -.next - call SaveScreenTilesToBuffer2 - call LoadScreenTilesFromBuffer2 - call EnableLCD -IF DEF(_RED) - ld a, CHARMANDER ; which Pokemon to show first on the title screen -ENDC -IF DEF(_BLUE) - ld a, SQUIRTLE ; which Pokemon to show first on the title screen -ENDC - - ld [wTitleMonSpecies], a - call LoadTitleMonSprite - ld a, (vBGMap0 + $300) / $100 - call TitleScreenCopyTileMapToVRAM - call SaveScreenTilesToBuffer1 - ld a, $40 - ld [hWY], a - call LoadScreenTilesFromBuffer2 - ld a, vBGMap0 / $100 - call TitleScreenCopyTileMapToVRAM - ld b, SET_PAL_TITLE_SCREEN - call RunPaletteCommand - call GBPalNormal - ld a, %11100100 - ld [rOBP0], a - -; make pokemon logo bounce up and down - ld bc, hSCY ; background scroll Y - ld hl, .TitleScreenPokemonLogoYScrolls -.bouncePokemonLogoLoop - ld a, [hli] - and a - jr z, .finishedBouncingPokemonLogo - ld d, a - cp -3 - jr nz, .skipPlayingSound - ld a, SFX_INTRO_CRASH - call PlaySound -.skipPlayingSound - ld a, [hli] - ld e, a - call .ScrollTitleScreenPokemonLogo - jr .bouncePokemonLogoLoop - -.TitleScreenPokemonLogoYScrolls: -; Controls the bouncing effect of the Pokemon logo on the title screen - db -4,16 ; y scroll amount, number of times to scroll - db 3,4 - db -3,4 - db 2,2 - db -2,2 - db 1,2 - db -1,2 - db 0 ; terminate list with 0 - -.ScrollTitleScreenPokemonLogo: -; Scrolls the Pokemon logo on the title screen to create the bouncing effect -; Scrolls d pixels e times - call DelayFrame - ld a, [bc] ; background scroll Y - add d - ld [bc], a - dec e - jr nz, .ScrollTitleScreenPokemonLogo - ret - -.finishedBouncingPokemonLogo - xor a - ld [hSCY], a - - call LoadScreenTilesFromBuffer1 - ld c, 36 - call DelayFrames - ld a, SFX_INTRO_WHOOSH - call PlaySound - -; scroll game version in from the right - call PrintGameVersionOnTitleScreen - ld a, SCREEN_HEIGHT_PIXELS - ld [hWY], a - ld d, 144 -.scrollTitleScreenGameVersionLoop - ld h, d - ld l, 64 - call ScrollTitleScreenGameVersion - ld h, 0 - ld l, 80 - call ScrollTitleScreenGameVersion - ld a, d - add 4 - ld d, a - and a - jr nz, .scrollTitleScreenGameVersionLoop - - ld a, vBGMap1 / $100 - call TitleScreenCopyTileMapToVRAM - call LoadScreenTilesFromBuffer2 - call PrintGameVersionOnTitleScreen - call Delay3 - call WaitForSoundToFinish - ld a, MUSIC_TITLE_SCREEN - ld [wNewSoundID], a - call PlayMusic - xor a - ld [wUnusedCC5B], a - -; Keep scrolling in new mons indefinitely until the user performs input. -.awaitUserInterruptionLoop - ld c, 200 - call CheckForUserInterruption - jr c, .finishedWaiting - call TitleScreenScrollInMon - ld c, 1 - call CheckForUserInterruption - jr c, .finishedWaiting - callba TitleScreenAnimateBallIfStarterOut - call TitleScreenPickNewMon - jr .awaitUserInterruptionLoop - -.finishedWaiting - ld a, [wTitleMonSpecies] - call PlayCry - call WaitForSoundToFinish - call GBPalWhiteOutWithDelay3 - call ClearSprites - xor a - ld [hWY], a - inc a - ld [H_AUTOBGTRANSFERENABLED], a - call ClearScreen - ld a, vBGMap0 / $100 - call TitleScreenCopyTileMapToVRAM - ld a, vBGMap1 / $100 - call TitleScreenCopyTileMapToVRAM - call Delay3 - call LoadGBPal - ld a, [hJoyHeld] - ld b, a - and D_UP | SELECT | B_BUTTON - cp D_UP | SELECT | B_BUTTON - jp z, .doClearSaveDialogue - jp MainMenu - -.doClearSaveDialogue - jpba DoClearSaveDialogue - -TitleScreenPickNewMon: - ld a, vBGMap0 / $100 - call TitleScreenCopyTileMapToVRAM - -.loop -; Keep looping until a mon different from the current one is picked. - call Random - and $f - ld c, a - ld b, 0 - ld hl, TitleMons - add hl, bc - ld a, [hl] - ld hl, wTitleMonSpecies - -; Can't be the same as before. - cp [hl] - jr z, .loop - - ld [hl], a - call LoadTitleMonSprite - - ld a, $90 - ld [hWY], a - ld d, 1 ; scroll out - callba TitleScroll - ret - -TitleScreenScrollInMon: - ld d, 0 ; scroll in - callba TitleScroll - xor a - ld [hWY], a - ret - -ScrollTitleScreenGameVersion: -.wait - ld a, [rLY] - cp l - jr nz, .wait - - ld a, h - ld [rSCX], a - -.wait2 - ld a, [rLY] - cp h - jr z, .wait2 - ret - -DrawPlayerCharacter: - ld hl, PlayerCharacterTitleGraphics - ld de, vSprites - ld bc, PlayerCharacterTitleGraphicsEnd - PlayerCharacterTitleGraphics - ld a, BANK(PlayerCharacterTitleGraphics) - call FarCopyData2 - call ClearSprites - xor a - ld [wPlayerCharacterOAMTile], a - ld hl, wOAMBuffer - ld de, $605a - ld b, 7 -.loop - push de - ld c, 5 -.innerLoop - ld a, d - ld [hli], a ; Y - ld a, e - ld [hli], a ; X - add 8 - ld e, a - ld a, [wPlayerCharacterOAMTile] - ld [hli], a ; tile - inc a - ld [wPlayerCharacterOAMTile], a - inc hl - dec c - jr nz, .innerLoop - pop de - ld a, 8 - add d - ld d, a - dec b - jr nz, .loop - ret - -ClearBothBGMaps: - ld hl, vBGMap0 - ld bc, $400 * 2 - ld a, " " - jp FillMemory - -LoadTitleMonSprite: - ld [wcf91], a - ld [wd0b5], a - coord hl, 5, 10 - call GetMonHeader - jp LoadFrontSpriteByMonIndex - -TitleScreenCopyTileMapToVRAM: - ld [H_AUTOBGTRANSFERDEST + 1], a - jp Delay3 - -LoadCopyrightAndTextBoxTiles: - xor a - ld [hWY], a - call ClearScreen - call LoadTextBoxTilePatterns - -LoadCopyrightTiles: - ld de, NintendoCopyrightLogoGraphics - ld hl, vChars2 + $600 - lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10 - call CopyVideoData - coord hl, 2, 7 - ld de, CopyrightTextString - jp PlaceString - -CopyrightTextString: - db $60,$61,$62,$61,$63,$61,$64,$7F,$65,$66,$67,$68,$69,$6A ; ©'95.'96.'98 Nintendo - next $60,$61,$62,$61,$63,$61,$64,$7F,$6B,$6C,$6D,$6E,$6F,$70,$71,$72 ; ©'95.'96.'98 Creatures inc. - next $60,$61,$62,$61,$63,$61,$64,$7F,$73,$74,$75,$76,$77,$78,$79,$7A,$7B ; ©'95.'96.'98 GAME FREAK inc. - db "@" - -INCLUDE "data/title_mons.asm" - -; prints version text (red, blue) -PrintGameVersionOnTitleScreen: - coord hl, 7, 8 - ld de, VersionOnTitleScreenText - jp PlaceString - -; these point to special tiles specifically loaded for that purpose and are not usual text -VersionOnTitleScreenText: -IF DEF(_RED) - db $60,$61,$7F,$65,$66,$67,$68,$69,"@" ; "Red Version" -ENDC -IF DEF(_BLUE) - db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" -ENDC - -NintenText: db "NINTEN@" -SonyText: db "SONY@" diff --git a/engine/titlescreen2.asm b/engine/titlescreen2.asm deleted file mode 100755 index 2346fcc5..00000000 --- a/engine/titlescreen2.asm +++ /dev/null @@ -1,120 +0,0 @@ -TitleScroll_WaitBall: -; Wait around for the TitleBall animation to play out. -; hi: speed -; lo: duration - db $05, $05, 0 - -TitleScroll_In: -; Scroll a TitleMon in from the right. -; hi: speed -; lo: duration - db $a2, $94, $84, $63, $52, $31, $11, 0 - -TitleScroll_Out: -; Scroll a TitleMon out to the left. -; hi: speed -; lo: duration - db $12, $22, $32, $42, $52, $62, $83, $93, 0 - -TitleScroll: - ld a, d - - ld bc, TitleScroll_In - ld d, $88 - ld e, 0 ; don't animate titleball - - and a - jr nz, .ok - - ld bc, TitleScroll_Out - ld d, $00 - ld e, 0 ; don't animate titleball -.ok - -_TitleScroll: - ld a, [bc] - and a - ret z - - inc bc - push bc - - ld b, a - and $f - ld c, a - ld a, b - and $f0 - swap a - ld b, a - -.loop - ld h, d - ld l, $48 - call .ScrollBetween - - ld h, $00 - ld l, $88 - call .ScrollBetween - - ld a, d - add b - ld d, a - - call GetTitleBallY - dec c - jr nz, .loop - - pop bc - jr _TitleScroll - -.ScrollBetween: -.wait - ld a, [rLY] ; rLY - cp l - jr nz, .wait - - ld a, h - ld [rSCX], a - -.wait2 - ld a, [rLY] ; rLY - cp h - jr z, .wait2 - ret - -TitleBallYTable: -; OBJ y-positions for the Poke Ball held by Red in the title screen. -; This is really two 0-terminated lists. Initiated with an index of 1. - db 0, $71, $6f, $6e, $6d, $6c, $6d, $6e, $6f, $71, $74, 0 - -TitleScreenAnimateBallIfStarterOut: -; Animate the TitleBall if a starter just got scrolled out. - ld a, [wTitleMonSpecies] - cp STARTER1 - jr z, .ok - cp STARTER2 - jr z, .ok - cp STARTER3 - ret nz -.ok - ld e, 1 ; animate titleball - ld bc, TitleScroll_WaitBall - ld d, 0 - jp _TitleScroll - -GetTitleBallY: -; Get position e from TitleBallYTable - push de - push hl - xor a - ld d, a - ld hl, TitleBallYTable - add hl, de - ld a, [hl] - pop hl - pop de - and a - ret z - ld [wOAMBuffer + $28], a - inc e - ret diff --git a/engine/town_map.asm b/engine/town_map.asm deleted file mode 100755 index d417e0a3..00000000 --- a/engine/town_map.asm +++ /dev/null @@ -1,619 +0,0 @@ -DisplayTownMap: - call LoadTownMap - ld hl, wUpdateSpritesEnabled - ld a, [hl] - push af - ld [hl], $ff - push hl - ld a, $1 - ld [hJoy7], a - ld a, [wCurMap] - push af - ld b, $0 - call DrawPlayerOrBirdSprite ; player sprite - coord hl, 1, 0 - ld de, wcd6d - call PlaceString - ld hl, wOAMBuffer - ld de, wTileMapBackup - ld bc, $10 - call CopyData - ld hl, vSprites + $40 - ld de, TownMapCursor - lb bc, BANK(TownMapCursor), (TownMapCursorEnd - TownMapCursor) / $8 - call CopyVideoDataDouble - xor a - ld [wWhichTownMapLocation], a - pop af - jr .enterLoop - -.townMapLoop - coord hl, 0, 0 - lb bc, 1, 20 - call ClearScreenArea - ld hl, TownMapOrder - ld a, [wWhichTownMapLocation] - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] -.enterLoop - ld de, wTownMapCoords - call LoadTownMapEntry - ld a, [de] - push hl - call TownMapCoordsToOAMCoords - ld a, $4 - ld [wOAMBaseTile], a - ld hl, wOAMBuffer + $10 - call WriteTownMapSpriteOAM ; town map cursor sprite - pop hl - ld de, wcd6d -.copyMapName - ld a, [hli] - ld [de], a - inc de - cp $50 - jr nz, .copyMapName - coord hl, 1, 0 - ld de, wcd6d - call PlaceString - ld hl, wOAMBuffer + $10 - ld de, wTileMapBackup + 16 - ld bc, $10 - call CopyData -.inputLoop - call TownMapSpriteBlinkingAnimation - call JoypadLowSensitivity - ld a, [hJoy5] - ld b, a - and A_BUTTON | B_BUTTON | D_UP | D_DOWN - jr z, .inputLoop - ld a, SFX_TINK - call PlaySound - bit 6, b - jr nz, .pressedUp - bit 7, b - jr nz, .pressedDown - xor a - ld [wTownMapSpriteBlinkingEnabled], a - ld [hJoy7], a - ld [wAnimCounter], a - call ExitTownMap - pop hl - pop af - ld [hl], a - ret -.pressedUp - ld a, [wWhichTownMapLocation] - inc a - cp TownMapOrderEnd - TownMapOrder ; number of list items + 1 - jr nz, .noOverflow - xor a -.noOverflow - ld [wWhichTownMapLocation], a - jp .townMapLoop -.pressedDown - ld a, [wWhichTownMapLocation] - dec a - cp -1 - jr nz, .noUnderflow - ld a, TownMapOrderEnd - TownMapOrder - 1 ; number of list items -.noUnderflow - ld [wWhichTownMapLocation], a - jp .townMapLoop - -INCLUDE "data/town_map_order.asm" - -TownMapCursor: - INCBIN "gfx/town_map_cursor.1bpp" -TownMapCursorEnd: - -LoadTownMap_Nest: - call LoadTownMap - ld hl, wUpdateSpritesEnabled - ld a, [hl] - push af - ld [hl], $ff - push hl - call DisplayWildLocations - call GetMonName - coord hl, 1, 0 - call PlaceString - ld h, b - ld l, c - ld de, MonsNestText - call PlaceString - call WaitForTextScrollButtonPress - call ExitTownMap - pop hl - pop af - ld [hl], a - ret - -MonsNestText: - db "'s NEST@" - -LoadTownMap_Fly: - call ClearSprites - call LoadTownMap - call LoadPlayerSpriteGraphics - call LoadFontTilePatterns - ld de, BirdSprite - ld hl, vSprites + $40 - lb bc, BANK(BirdSprite), $c - call CopyVideoData - ld de, TownMapUpArrow - ld hl, vChars1 + $6d0 - lb bc, BANK(TownMapUpArrow), (TownMapUpArrowEnd - TownMapUpArrow) / $8 - call CopyVideoDataDouble - call BuildFlyLocationsList - ld hl, wUpdateSpritesEnabled - ld a, [hl] - push af - ld [hl], $ff - push hl - coord hl, 0, 0 - ld de, ToText - call PlaceString - ld a, [wCurMap] - ld b, $0 - call DrawPlayerOrBirdSprite - ld hl, wFlyLocationsList - coord de, 18, 0 -.townMapFlyLoop - ld a, " " - ld [de], a - push hl - push hl - coord hl, 3, 0 - lb bc, 1, 15 - call ClearScreenArea - pop hl - ld a, [hl] - ld b, $4 - call DrawPlayerOrBirdSprite ; draw bird sprite - coord hl, 3, 0 - ld de, wcd6d - call PlaceString - ld c, 15 - call DelayFrames - coord hl, 18, 0 - ld [hl], "▲" - coord hl, 19, 0 - ld [hl], "▼" - pop hl -.inputLoop - push hl - call DelayFrame - call JoypadLowSensitivity - ld a, [hJoy5] - ld b, a - pop hl - and A_BUTTON | B_BUTTON | D_UP | D_DOWN - jr z, .inputLoop - bit 0, b - jr nz, .pressedA - ld a, SFX_TINK - call PlaySound - bit 6, b - jr nz, .pressedUp - bit 7, b - jr nz, .pressedDown - jr .pressedB -.pressedA - ld a, SFX_HEAL_AILMENT - call PlaySound - ld a, [hl] - ld [wDestinationMap], a - ld hl, wd732 - set 3, [hl] - inc hl - set 7, [hl] -.pressedB - xor a - ld [wTownMapSpriteBlinkingEnabled], a - call GBPalWhiteOutWithDelay3 - pop hl - pop af - ld [hl], a - ret -.pressedUp - coord de, 18, 0 - inc hl - ld a, [hl] - cp $ff - jr z, .wrapToStartOfList - cp $fe - jr z, .pressedUp ; skip past unvisited towns - jp .townMapFlyLoop -.wrapToStartOfList - ld hl, wFlyLocationsList - jp .townMapFlyLoop -.pressedDown - coord de, 19, 0 - dec hl - ld a, [hl] - cp $ff - jr z, .wrapToEndOfList - cp $fe - jr z, .pressedDown ; skip past unvisited towns - jp .townMapFlyLoop -.wrapToEndOfList - ld hl, wFlyLocationsList + 11 - jr .pressedDown - -ToText: - db "To@" - -BuildFlyLocationsList: - ld hl, wFlyLocationsList - 1 - ld [hl], $ff - inc hl - ld a, [wTownVisitedFlag] - ld e, a - ld a, [wTownVisitedFlag + 1] - ld d, a - ld bc, SAFFRON_CITY + 1 -.loop - srl d - rr e - ld a, $fe ; store $fe if the town hasn't been visited - jr nc, .notVisited - ld a, b ; store the map number of the town if it has been visited -.notVisited - ld [hl], a - inc hl - inc b - dec c - jr nz, .loop - ld [hl], $ff - ret - -TownMapUpArrow: - INCBIN "gfx/up_arrow.1bpp" -TownMapUpArrowEnd: - -LoadTownMap: - call GBPalWhiteOutWithDelay3 - call ClearScreen - call UpdateSprites - coord hl, 0, 0 - ld b, $12 - ld c, $12 - call TextBoxBorder - call DisableLCD - ld hl, WorldMapTileGraphics - ld de, vChars2 + $600 - ld bc, WorldMapTileGraphicsEnd - WorldMapTileGraphics - ld a, BANK(WorldMapTileGraphics) - call FarCopyData2 - ld hl, MonNestIcon - ld de, vSprites + $40 - ld bc, MonNestIconEnd - MonNestIcon - ld a, BANK(MonNestIcon) - call FarCopyDataDouble - coord hl, 0, 0 - ld de, CompressedMap -.nextTile - ld a, [de] - and a - jr z, .done - ld b, a - and $f - ld c, a - ld a, b - swap a - and $f - add $60 -.writeRunLoop - ld [hli], a - dec c - jr nz, .writeRunLoop - inc de - jr .nextTile -.done - call EnableLCD - ld b, SET_PAL_TOWN_MAP - call RunPaletteCommand - call Delay3 - call GBPalNormal - xor a - ld [wAnimCounter], a - inc a - ld [wTownMapSpriteBlinkingEnabled], a - ret - -CompressedMap: -; you can decompress this file with the redrle program in the extras/ dir - INCBIN "gfx/town_map.rle" - -ExitTownMap: -; clear town map graphics data and load usual graphics data - xor a - ld [wTownMapSpriteBlinkingEnabled], a - call GBPalWhiteOut - call ClearScreen - call ClearSprites - call LoadPlayerSpriteGraphics - call LoadFontTilePatterns - call UpdateSprites - jp RunDefaultPaletteCommand - -DrawPlayerOrBirdSprite: -; a = map number -; b = OAM base tile - push af - ld a, b - ld [wOAMBaseTile], a - pop af - ld de, wTownMapCoords - call LoadTownMapEntry - ld a, [de] - push hl - call TownMapCoordsToOAMCoords - call WritePlayerOrBirdSpriteOAM - pop hl - ld de, wcd6d -.loop - ld a, [hli] - ld [de], a - inc de - cp "@" - jr nz, .loop - ld hl, wOAMBuffer - ld de, wTileMapBackup - ld bc, $a0 - jp CopyData - -DisplayWildLocations: - callba FindWildLocationsOfMon - call ZeroOutDuplicatesInList - ld hl, wOAMBuffer - ld de, wTownMapCoords -.loop - ld a, [de] - cp $ff - jr z, .exitLoop - and a - jr z, .nextEntry - push hl - call LoadTownMapEntry - pop hl - ld a, [de] - cp $19 ; Cerulean Cave's coordinates - jr z, .nextEntry ; skip Cerulean Cave - call TownMapCoordsToOAMCoords - ld a, $4 ; nest icon tile no. - ld [hli], a - xor a - ld [hli], a -.nextEntry - inc de - jr .loop -.exitLoop - ld a, l - and a ; were any OAM entries written? - jr nz, .drawPlayerSprite -; if no OAM entries were written, print area unknown text - coord hl, 1, 7 - ld b, 2 - ld c, 15 - call TextBoxBorder - coord hl, 2, 9 - ld de, AreaUnknownText - call PlaceString - jr .done -.drawPlayerSprite - ld a, [wCurMap] - ld b, $0 - call DrawPlayerOrBirdSprite -.done - ld hl, wOAMBuffer - ld de, wTileMapBackup - ld bc, $a0 - jp CopyData - -AreaUnknownText: - db " AREA UNKNOWN@" - -TownMapCoordsToOAMCoords: -; in: lower nybble of a = x, upper nybble of a = y -; out: b and [hl] = (y * 8) + 24, c and [hl+1] = (x * 8) + 24 - push af - and $f0 - srl a - add 24 - ld b, a - ld [hli], a - pop af - and $f - swap a - srl a - add 24 - ld c, a - ld [hli], a - ret - -WritePlayerOrBirdSpriteOAM: - ld a, [wOAMBaseTile] - and a - ld hl, wOAMBuffer + $90 ; for player sprite - jr z, WriteTownMapSpriteOAM - ld hl, wOAMBuffer + $80 ; for bird sprite - -WriteTownMapSpriteOAM: - push hl - -; Subtract 4 from c (X coord) and 4 from b (Y coord). However, the carry from c -; is added to b, so the net result is that only 3 is subtracted from b. - lb hl, -4, -4 - add hl, bc - - ld b, h - ld c, l - pop hl - -WriteAsymmetricMonPartySpriteOAM: -; Writes 4 OAM blocks for a helix mon party sprite, since it does not have -; a vertical line of symmetry. - lb de, 2, 2 -.loop - push de - push bc -.innerLoop - ld a, b - ld [hli], a - ld a, c - ld [hli], a - ld a, [wOAMBaseTile] - ld [hli], a - inc a - ld [wOAMBaseTile], a - xor a - ld [hli], a - inc d - ld a, 8 - add c - ld c, a - dec e - jr nz, .innerLoop - pop bc - pop de - ld a, 8 - add b - ld b, a - dec d - jr nz, .loop - ret - -WriteSymmetricMonPartySpriteOAM: -; Writes 4 OAM blocks for a mon party sprite other than a helix. All the -; sprites other than the helix one have a vertical line of symmetry which allows -; the X-flip OAM bit to be used so that only 2 rather than 4 tile patterns are -; needed. - xor a - ld [wSymmetricSpriteOAMAttributes], a - lb de, 2, 2 -.loop - push de - push bc -.innerLoop - ld a, b - ld [hli], a ; Y - ld a, c - ld [hli], a ; X - ld a, [wOAMBaseTile] - ld [hli], a ; tile - ld a, [wSymmetricSpriteOAMAttributes] - ld [hli], a ; attributes - xor (1 << OAM_X_FLIP) - ld [wSymmetricSpriteOAMAttributes], a - inc d - ld a, 8 - add c - ld c, a - dec e - jr nz, .innerLoop - pop bc - pop de - push hl - ld hl, wOAMBaseTile - inc [hl] - inc [hl] - pop hl - ld a, 8 - add b - ld b, a - dec d - jr nz, .loop - ret - -ZeroOutDuplicatesInList: -; replace duplicate bytes in the list of wild pokemon locations with 0 - ld de, wBuffer -.loop - ld a, [de] - inc de - cp $ff - ret z - ld c, a - ld l, e - ld h, d -.zeroDuplicatesLoop - ld a, [hl] - cp $ff - jr z, .loop - cp c - jr nz, .skipZeroing - xor a - ld [hl], a -.skipZeroing - inc hl - jr .zeroDuplicatesLoop - -LoadTownMapEntry: -; in: a = map number -; out: lower nybble of [de] = x, upper nybble of [de] = y, hl = address of name - cp REDS_HOUSE_1F - jr c, .external - ld bc, 4 - ld hl, InternalMapEntries -.loop - cp [hl] - jr c, .foundEntry - add hl, bc - jr .loop -.foundEntry - inc hl - jr .readEntry -.external - ld hl, ExternalMapEntries - ld c, a - ld b, 0 - add hl, bc - add hl, bc - add hl, bc -.readEntry - ld a, [hli] - ld [de], a - ld a, [hli] - ld h, [hl] - ld l, a - ret - -INCLUDE "data/town_map_entries.asm" - -INCLUDE "text/map_names.asm" - -MonNestIcon: - INCBIN "gfx/mon_nest_icon.1bpp" -MonNestIconEnd: - -TownMapSpriteBlinkingAnimation: - ld a, [wAnimCounter] - inc a - cp 25 - jr z, .hideSprites - cp 50 - jr nz, .done -; show sprites when the counter reaches 50 - ld hl, wTileMapBackup - ld de, wOAMBuffer - ld bc, $90 - call CopyData - xor a - jr .done -.hideSprites - ld hl, wOAMBuffer - ld b, $24 - ld de, $4 -.hideSpritesLoop - ld [hl], $a0 - add hl, de - dec b - jr nz, .hideSpritesLoop - ld a, 25 -.done - ld [wAnimCounter], a - jp DelayFrame diff --git a/engine/trade.asm b/engine/trade.asm deleted file mode 100755 index 8bc8e3bc..00000000 --- a/engine/trade.asm +++ /dev/null @@ -1,853 +0,0 @@ -InternalClockTradeAnim: -; Do the trading animation with the player's gameboy on the left. -; In-game trades and internally clocked link cable trades use this. - ld a, [wTradedPlayerMonSpecies] - ld [wLeftGBMonSpecies], a - ld a, [wTradedEnemyMonSpecies] - ld [wRightGBMonSpecies], a - ld de, InternalClockTradeFuncSequence - jr TradeAnimCommon - -ExternalClockTradeAnim: -; Do the trading animation with the player's gameboy on the right. -; Externally clocked link cable trades use this. - ld a, [wTradedEnemyMonSpecies] - ld [wLeftGBMonSpecies], a - ld a, [wTradedPlayerMonSpecies] - ld [wRightGBMonSpecies], a - ld de, ExternalClockTradeFuncSequence - -TradeAnimCommon: - ld a, [wOptions] - push af - ld a, [hSCY] - push af - ld a, [hSCX] - push af - xor a - ld [wOptions], a - ld [hSCY], a - ld [hSCX], a - push de -.loop - pop de - ld a, [de] - cp $ff - jr z, .done - inc de - push de - ld hl, TradeFuncPointerTable - add a - ld c, a - ld b, $0 - add hl, bc - ld a, [hli] - ld h, [hl] - ld l, a - ld de, .loop - push de - jp hl ; call trade func, which will return to the top of the loop -.done - pop af - ld [hSCX], a - pop af - ld [hSCY], a - pop af - ld [wOptions], a - ret - -addtradefunc: MACRO -\1TradeFunc:: - dw \1 - ENDM - -tradefunc: MACRO - db (\1TradeFunc - TradeFuncPointerTable) / 2 - ENDM - -; The functions in the sequences below are executed in order by TradeFuncCommon. -; They are from opposite perspectives. The external clock one makes use of -; Trade_SwapNames to swap the player and enemy names for some functions. - -InternalClockTradeFuncSequence: - tradefunc LoadTradingGFXAndMonNames - tradefunc Trade_ShowPlayerMon - tradefunc Trade_DrawOpenEndOfLinkCable - tradefunc Trade_AnimateBallEnteringLinkCable - tradefunc Trade_AnimLeftToRight - tradefunc Trade_Delay100 - tradefunc Trade_ShowClearedWindow - tradefunc PrintTradeWentToText - tradefunc PrintTradeForSendsText - tradefunc PrintTradeFarewellText - tradefunc Trade_AnimRightToLeft - tradefunc Trade_ShowClearedWindow - tradefunc Trade_DrawOpenEndOfLinkCable - tradefunc Trade_ShowEnemyMon - tradefunc Trade_Delay100 - tradefunc Trade_Cleanup - db $FF - -ExternalClockTradeFuncSequence: - tradefunc LoadTradingGFXAndMonNames - tradefunc Trade_ShowClearedWindow - tradefunc PrintTradeWillTradeText - tradefunc PrintTradeFarewellText - tradefunc Trade_SwapNames - tradefunc Trade_AnimLeftToRight - tradefunc Trade_SwapNames - tradefunc Trade_ShowClearedWindow - tradefunc Trade_DrawOpenEndOfLinkCable - tradefunc Trade_ShowEnemyMon - tradefunc Trade_SlideTextBoxOffScreen - tradefunc Trade_ShowPlayerMon - tradefunc Trade_DrawOpenEndOfLinkCable - tradefunc Trade_AnimateBallEnteringLinkCable - tradefunc Trade_SwapNames - tradefunc Trade_AnimRightToLeft - tradefunc Trade_SwapNames - tradefunc Trade_Delay100 - tradefunc Trade_ShowClearedWindow - tradefunc PrintTradeWentToText - tradefunc Trade_Cleanup - db $FF - -TradeFuncPointerTable: - addtradefunc LoadTradingGFXAndMonNames - addtradefunc Trade_ShowPlayerMon - addtradefunc Trade_DrawOpenEndOfLinkCable - addtradefunc Trade_AnimateBallEnteringLinkCable - addtradefunc Trade_ShowEnemyMon - addtradefunc Trade_AnimLeftToRight - addtradefunc Trade_AnimRightToLeft - addtradefunc Trade_Delay100 - addtradefunc Trade_ShowClearedWindow - addtradefunc PrintTradeWentToText - addtradefunc PrintTradeForSendsText - addtradefunc PrintTradeFarewellText - addtradefunc PrintTradeTakeCareText - addtradefunc PrintTradeWillTradeText - addtradefunc Trade_Cleanup - addtradefunc Trade_SlideTextBoxOffScreen - addtradefunc Trade_SwapNames - -Trade_Delay100: - ld c, 100 - jp DelayFrames - -Trade_CopyTileMapToVRAM: - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - call Delay3 - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ret - -Trade_Delay80: - ld c, 80 - jp DelayFrames - -Trade_ClearTileMap: - coord hl, 0, 0 - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, " " - jp FillMemory - -LoadTradingGFXAndMonNames: - call Trade_ClearTileMap - call DisableLCD - ld hl, TradingAnimationGraphics - ld de, vChars2 + $310 - ld bc, TradingAnimationGraphicsEnd - TradingAnimationGraphics - ld a, BANK(TradingAnimationGraphics) - call FarCopyData2 - ld hl, TradingAnimationGraphics2 - ld de, vSprites + $7c0 - ld bc, TradingAnimationGraphics2End - TradingAnimationGraphics2 - ld a, BANK(TradingAnimationGraphics2) - call FarCopyData2 - ld hl, vBGMap0 - ld bc, $800 - ld a, " " - call FillMemory - call ClearSprites - ld a, $ff - ld [wUpdateSpritesEnabled], a - ld hl, wd730 - set 6, [hl] ; turn on instant text printing - ld a, [wOnSGB] - and a - ld a, $e4 ; non-SGB OBP0 - jr z, .next - ld a, $f0 ; SGB OBP0 -.next - ld [rOBP0], a - call EnableLCD - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ld a, [wTradedPlayerMonSpecies] - ld [wd11e], a - call GetMonName - ld hl, wcd6d - ld de, wcf4b - ld bc, NAME_LENGTH - call CopyData - ld a, [wTradedEnemyMonSpecies] - ld [wd11e], a - jp GetMonName - -Trade_LoadMonPartySpriteGfx: - ld a, %11010000 - ld [rOBP1], a - jpba LoadMonPartySpriteGfx - -Trade_SwapNames: - ld hl, wPlayerName - ld de, wBuffer - ld bc, NAME_LENGTH - call CopyData - ld hl, wLinkEnemyTrainerName - ld de, wPlayerName - ld bc, NAME_LENGTH - call CopyData - ld hl, wBuffer - ld de, wLinkEnemyTrainerName - ld bc, NAME_LENGTH - jp CopyData - -Trade_Cleanup: - xor a - call LoadGBPal - ld hl, wd730 - res 6, [hl] ; turn off instant text printing - ret - -Trade_ShowPlayerMon: - ld a, %10101011 - ld [rLCDC], a - ld a, $50 - ld [hWY], a - ld a, $86 - ld [rWX], a - ld [hSCX], a - xor a - ld [H_AUTOBGTRANSFERENABLED], a - coord hl, 4, 0 - ld b, 6 - ld c, 10 - call TextBoxBorder - call Trade_PrintPlayerMonInfoText - ld b, vBGMap0 / $100 - call CopyScreenTileBufferToVRAM - call ClearScreen - ld a, [wTradedPlayerMonSpecies] - call Trade_LoadMonSprite - ld a, $7e -.slideScreenLoop - push af - call DelayFrame - pop af - ld [rWX], a - ld [hSCX], a - dec a - dec a - and a - jr nz, .slideScreenLoop - call Trade_Delay80 - ld a, TRADE_BALL_POOF_ANIM - call Trade_ShowAnimation - ld a, TRADE_BALL_DROP_ANIM - call Trade_ShowAnimation ; clears mon pic - ld a, [wTradedPlayerMonSpecies] - call PlayCry - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ret - -Trade_DrawOpenEndOfLinkCable: - call Trade_ClearTileMap - ld b, vBGMap0 / $100 - call CopyScreenTileBufferToVRAM - ld b, SET_PAL_GENERIC - call RunPaletteCommand - -; This function call is pointless. It just copies blank tiles to VRAM that was -; already filled with blank tiles. - ld hl, vBGMap1 + $8c - call Trade_CopyCableTilesOffScreen - - ld a, $a0 - ld [hSCX], a - call DelayFrame - ld a, %10001011 - ld [rLCDC], a - coord hl, 6, 2 - ld b, $7 ; open end of link cable tile ID list index - call CopyTileIDsFromList_ZeroBaseTileID - call Trade_CopyTileMapToVRAM - ld a, SFX_HEAL_HP - call PlaySound - ld c, 20 -.loop - ld a, [hSCX] - add 4 - ld [hSCX], a - dec c - jr nz, .loop - ret - -Trade_AnimateBallEnteringLinkCable: - ld a, TRADE_BALL_SHAKE_ANIM - call Trade_ShowAnimation - ld c, 10 - call DelayFrames - ld a, %11100100 - ld [rOBP0], a - xor a - ld [wLinkCableAnimBulgeToggle], a - lb bc, $20, $60 -.moveBallInsideLinkCableLoop - push bc - xor a - ld de, Trade_BallInsideLinkCableOAM - call WriteOAMBlock - ld a, [wLinkCableAnimBulgeToggle] - xor $1 - ld [wLinkCableAnimBulgeToggle], a - add $7e - ld hl, wOAMBuffer + $02 - ld de, 4 - ld c, e -.cycleLinkCableBulgeTile - ld [hl], a - add hl, de - dec c - jr nz, .cycleLinkCableBulgeTile - call Delay3 - pop bc - ld a, c - add $4 - ld c, a - cp $a0 - jr nc, .ballSpriteReachedEdgeOfScreen - ld a, SFX_TINK - call PlaySound - jr .moveBallInsideLinkCableLoop -.ballSpriteReachedEdgeOfScreen - call ClearSprites - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - call ClearScreen - ld b, $98 - call CopyScreenTileBufferToVRAM - call Delay3 - xor a - ld [H_AUTOBGTRANSFERENABLED], a - ret - -Trade_BallInsideLinkCableOAM: - db $7E,$00,$7E,$20 - db $7E,$40,$7E,$60 - -Trade_ShowEnemyMon: - ld a, TRADE_BALL_TILT_ANIM - call Trade_ShowAnimation - call Trade_ShowClearedWindow - coord hl, 4, 10 - ld b, 6 - ld c, 10 - call TextBoxBorder - call Trade_PrintEnemyMonInfoText - call Trade_CopyTileMapToVRAM - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - ld a, [wTradedEnemyMonSpecies] - call Trade_LoadMonSprite - ld a, TRADE_BALL_POOF_ANIM - call Trade_ShowAnimation - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - ld a, [wTradedEnemyMonSpecies] - call PlayCry - call Trade_Delay100 - coord hl, 4, 10 - lb bc, 8, 12 - call ClearScreenArea - jp PrintTradeTakeCareText - -Trade_AnimLeftToRight: -; Animates the mon moving from the left GB to the right one. - call Trade_InitGameboyTransferGfx - ld a, $1 - ld [wTradedMonMovingRight], a - ld a, %11100100 - ld [rOBP0], a - ld a, $54 - ld [wBaseCoordX], a - ld a, $1c - ld [wBaseCoordY], a - ld a, [wLeftGBMonSpecies] - ld [wMonPartySpriteSpecies], a - call Trade_WriteCircledMonOAM - call Trade_DrawLeftGameboy - call Trade_CopyTileMapToVRAM - call Trade_DrawCableAcrossScreen - ld hl, vBGMap1 + $8c - call Trade_CopyCableTilesOffScreen - ld b, $6 - call Trade_AnimMonMoveHorizontal - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - call Trade_DrawCableAcrossScreen - ld b, $4 - call Trade_AnimMonMoveHorizontal - call Trade_DrawRightGameboy - ld b, $6 - call Trade_AnimMonMoveHorizontal - xor a - ld [H_AUTOBGTRANSFERENABLED], a - call Trade_AnimMonMoveVertical - jp ClearSprites - -Trade_AnimRightToLeft: -; Animates the mon moving from the right GB to the left one. - call Trade_InitGameboyTransferGfx - xor a - ld [wTradedMonMovingRight], a - ld a, $64 - ld [wBaseCoordX], a - ld a, $44 - ld [wBaseCoordY], a - ld a, [wRightGBMonSpecies] - ld [wMonPartySpriteSpecies], a - call Trade_WriteCircledMonOAM - call Trade_DrawRightGameboy - call Trade_CopyTileMapToVRAM - call Trade_DrawCableAcrossScreen - ld hl, vBGMap1 + $94 - call Trade_CopyCableTilesOffScreen - call Trade_AnimMonMoveVertical - ld b, $6 - call Trade_AnimMonMoveHorizontal - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - call Trade_DrawCableAcrossScreen - ld b, $4 - call Trade_AnimMonMoveHorizontal - call Trade_DrawLeftGameboy - ld b, $6 - call Trade_AnimMonMoveHorizontal - xor a - ld [H_AUTOBGTRANSFERENABLED], a - jp ClearSprites - -Trade_InitGameboyTransferGfx: -; Initialises the graphics for showing a mon moving between gameboys. - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - call ClearScreen - xor a - ld [H_AUTOBGTRANSFERENABLED], a - call Trade_LoadMonPartySpriteGfx - call DelayFrame - ld a, %10101011 - ld [rLCDC], a - xor a - ld [hSCX], a - ld a, $90 - ld [hWY], a - ret - -Trade_DrawLeftGameboy: - call Trade_ClearTileMap - -; draw link cable - coord hl, 11, 4 - ld a, $5d - ld [hli], a - ld a, $5e - ld c, 8 -.loop - ld [hli], a - dec c - jr nz, .loop - -; draw gameboy pic - coord hl, 5, 3 - ld b, $6 - call CopyTileIDsFromList_ZeroBaseTileID - -; draw text box with player name below gameboy pic - coord hl, 4, 12 - ld b, 2 - ld c, 7 - call TextBoxBorder - coord hl, 5, 14 - ld de, wPlayerName - call PlaceString - - jp DelayFrame - -Trade_DrawRightGameboy: - call Trade_ClearTileMap - -; draw horizontal segment of link cable - coord hl, 0, 4 - ld a, $5e - ld c, $e -.loop - ld [hli], a - dec c - jr nz, .loop - -; draw vertical segment of link cable - ld a, $5f - ld [hl], a - ld de, SCREEN_WIDTH - add hl, de - ld a, $61 - ld [hl], a - add hl, de - ld [hl], a - add hl, de - ld [hl], a - add hl, de - ld [hl], a - add hl, de - ld a, $60 - ld [hld], a - ld a, $5d - ld [hl], a - -; draw gameboy pic - coord hl, 7, 8 - ld b, $6 - call CopyTileIDsFromList_ZeroBaseTileID - -; draw text box with enemy name above link cable - coord hl, 6, 0 - ld b, 2 - ld c, 7 - call TextBoxBorder - coord hl, 7, 2 - ld de, wLinkEnemyTrainerName - call PlaceString - - jp DelayFrame - -Trade_DrawCableAcrossScreen: -; Draws the link cable across the screen. - call Trade_ClearTileMap - coord hl, 0, 4 - ld a, $5e - ld c, SCREEN_WIDTH -.loop - ld [hli], a - dec c - jr nz, .loop - ret - -Trade_CopyCableTilesOffScreen: -; This is used to copy the link cable tiles off screen so that the cable -; continues when the screen is scrolled. - push hl - coord hl, 0, 4 - call CopyToRedrawRowOrColumnSrcTiles - pop hl - ld a, h - ld [hRedrawRowOrColumnDest + 1], a - ld a, l - ld [hRedrawRowOrColumnDest], a - ld a, REDRAW_ROW - ld [hRedrawRowOrColumnMode], a - ld c, 10 - jp DelayFrames - -Trade_AnimMonMoveHorizontal: -; Animates the mon going through the link cable horizontally over a distance of -; b 16-pixel units. - ld a, [wTradedMonMovingRight] - ld e, a - ld d, $8 -.scrollLoop - ld a, e - dec a - jr z, .movingRight -; moving left - ld a, [hSCX] - sub $2 - jr .next -.movingRight - ld a, [hSCX] - add $2 -.next - ld [hSCX], a - call DelayFrame - dec d - jr nz, .scrollLoop - call Trade_AnimCircledMon - dec b - jr nz, Trade_AnimMonMoveHorizontal - ret - -Trade_AnimCircledMon: -; Cycles between the two animation frames of the mon party sprite, cycles -; between a circle and an oval around the mon sprite, and makes the cable flash. - push de - push bc - push hl - ld a, [rBGP] - xor $3c ; make link cable flash - ld [rBGP], a - ld hl, wOAMBuffer + $02 - ld de, $4 - ld c, $14 -.loop - ld a, [hl] - xor $40 - ld [hl], a - add hl, de - dec c - jr nz, .loop - pop hl - pop bc - pop de - ret - -Trade_WriteCircledMonOAM: - callba WriteMonPartySpriteOAMBySpecies - call Trade_WriteCircleOAM - -Trade_AddOffsetsToOAMCoords: - ld hl, wOAMBuffer - ld c, $14 -.loop - ld a, [wBaseCoordY] - add [hl] - ld [hli], a - ld a, [wBaseCoordX] - add [hl] - ld [hli], a - inc hl - inc hl - dec c - jr nz, .loop - ret - -Trade_AnimMonMoveVertical: -; Animates the mon going through the link cable vertically as well as -; horizontally for a bit. The last bit of horizontal movement (when moving -; right) or the first bit of horizontal movement (when moving left) are done -; here instead of Trade_AnimMonMoveHorizontal because this function moves the -; sprite itself rather than scrolling the screen around the sprite. Moving the -; sprite itself is necessary because the vertical segment of the link cable is -; to the right of the screen position that the mon sprite has when -; Trade_AnimMonMoveHorizontal is executing. - ld a, [wTradedMonMovingRight] - and a - jr z, .movingLeft -; moving right - lb bc, 4, 0 ; move right - call .doAnim - lb bc, 0, 10 ; move down - jr .doAnim -.movingLeft - lb bc, 0, -10 ; move up - call .doAnim - lb bc, -4, 0 ; move left -.doAnim - ld a, b - ld [wBaseCoordX], a - ld a, c - ld [wBaseCoordY], a - ld d, $4 -.loop - call Trade_AddOffsetsToOAMCoords - call Trade_AnimCircledMon - ld c, 8 - call DelayFrames - dec d - jr nz, .loop - ret - -Trade_WriteCircleOAM: -; Writes the OAM blocks for the circle around the traded mon as it passes -; the link cable. - ld hl, Trade_CircleOAMPointers - ld c, $4 - xor a -.loop - push bc - ld e, [hl] - inc hl - ld d, [hl] - inc hl - ld c, [hl] - inc hl - ld b, [hl] - inc hl - push hl - inc a - push af - call WriteOAMBlock - pop af - pop hl - pop bc - dec c - jr nz, .loop - ret - -Trade_CircleOAMPointers: - dw Trade_CircleOAM0 - db $08,$08 - dw Trade_CircleOAM1 - db $18,$08 - dw Trade_CircleOAM2 - db $08,$18 - dw Trade_CircleOAM3 - db $18,$18 - -Trade_CircleOAM0: - db $38,$10,$39,$10 - db $3A,$10,$3B,$10 - -Trade_CircleOAM1: - db $39,$30,$38,$30 - db $3B,$30,$3A,$30 - -Trade_CircleOAM2: - db $3A,$50,$3B,$50 - db $38,$50,$39,$50 - -Trade_CircleOAM3: - db $3B,$70,$3A,$70 - db $39,$70,$38,$70 - -; a = species -Trade_LoadMonSprite: - ld [wcf91], a - ld [wd0b5], a - ld [wWholeScreenPaletteMonSpecies], a - ld b, SET_PAL_POKEMON_WHOLE_SCREEN - ld c, 0 - call RunPaletteCommand - ld a, [H_AUTOBGTRANSFERENABLED] - xor $1 - ld [H_AUTOBGTRANSFERENABLED], a - call GetMonHeader - coord hl, 7, 2 - call LoadFlippedFrontSpriteByMonIndex - ld c, 10 - jp DelayFrames - -Trade_ShowClearedWindow: -; clears the window and covers the BG entirely with the window - ld a, $1 - ld [H_AUTOBGTRANSFERENABLED], a - call ClearScreen - ld a, %11100011 - ld [rLCDC], a - ld a, $7 - ld [rWX], a - xor a - ld [hWY], a - ld a, $90 - ld [hSCX], a - ret - -Trade_SlideTextBoxOffScreen: -; Slides the window right until it's off screen. The window usually just has -; a text box at the bottom when this is called. However, when this is called -; after Trade_ShowEnemyMon in the external clock sequence, there is a mon pic -; above the text box and it is also scrolled off the screen. - ld c, 50 - call DelayFrames -.loop - call DelayFrame - ld a, [rWX] - inc a - inc a - ld [rWX], a - cp $a1 - jr nz, .loop - call Trade_ClearTileMap - ld c, 10 - call DelayFrames - ld a, $7 - ld [rWX], a - ret - -PrintTradeWentToText: - ld hl, TradeWentToText - call PrintText - ld c, 200 - call DelayFrames - jp Trade_SlideTextBoxOffScreen - -TradeWentToText: - TX_FAR _TradeWentToText - db "@" - -PrintTradeForSendsText: - ld hl, TradeForText - call PrintText - call Trade_Delay80 - ld hl, TradeSendsText - call PrintText - jp Trade_Delay80 - -TradeForText: - TX_FAR _TradeForText - db "@" - -TradeSendsText: - TX_FAR _TradeSendsText - db "@" - -PrintTradeFarewellText: - ld hl, TradeWavesFarewellText - call PrintText - call Trade_Delay80 - ld hl, TradeTransferredText - call PrintText - call Trade_Delay80 - jp Trade_SlideTextBoxOffScreen - -TradeWavesFarewellText: - TX_FAR _TradeWavesFarewellText - db "@" - -TradeTransferredText: - TX_FAR _TradeTransferredText - db "@" - -PrintTradeTakeCareText: - ld hl, TradeTakeCareText - call PrintText - jp Trade_Delay80 - -TradeTakeCareText: - TX_FAR _TradeTakeCareText - db "@" - -PrintTradeWillTradeText: - ld hl, TradeWillTradeText - call PrintText - call Trade_Delay80 - ld hl, TradeforText - call PrintText - jp Trade_Delay80 - -TradeWillTradeText: - TX_FAR _TradeWillTradeText - db "@" - -TradeforText: - TX_FAR _TradeforText - db "@" - -Trade_ShowAnimation: - ld [wAnimationID], a - xor a - ld [wAnimationType], a - predef_jump MoveAnimation diff --git a/engine/turn_sprite.asm b/engine/turn_sprite.asm deleted file mode 100755 index e8a47a8f..00000000 --- a/engine/turn_sprite.asm +++ /dev/null @@ -1,25 +0,0 @@ -UpdateSpriteFacingOffsetAndDelayMovement: - ld h, $c2 - ld a, [H_CURRENTSPRITEOFFSET] - add $8 - ld l, a - ld a, $7f ; maximum movement delay - ld [hl], a ; c2x8 (movement delay) - dec h - ld a, [H_CURRENTSPRITEOFFSET] - add $9 - ld l, a - ld a, [hld] ; c1x9 (facing direction) - ld b, a - xor a - ld [hld], a - ld [hl], a ; c1x8 (walk animation frame) - ld a, [H_CURRENTSPRITEOFFSET] - add $2 - ld l, a - ld a, [hl] ; c1x2 (facing and animation table offset) - or b ; or in the facing direction - ld [hld], a - ld a, $2 ; delayed movement status - ld [hl], a ; c1x1 (movement status) - ret diff --git a/gfx/attack_anim_1.png b/gfx/attack_anim_1.png deleted file mode 100644 index 12bd7aa2..00000000 Binary files a/gfx/attack_anim_1.png and /dev/null differ diff --git a/gfx/attack_anim_2.png b/gfx/attack_anim_2.png deleted file mode 100644 index 57abbfde..00000000 Binary files a/gfx/attack_anim_2.png and /dev/null differ diff --git a/gfx/battle/attack_anim_1.png b/gfx/battle/attack_anim_1.png new file mode 100644 index 00000000..f3728737 Binary files /dev/null and b/gfx/battle/attack_anim_1.png differ diff --git a/gfx/battle/attack_anim_2.png b/gfx/battle/attack_anim_2.png new file mode 100644 index 00000000..6867d650 Binary files /dev/null and b/gfx/battle/attack_anim_2.png differ diff --git a/gfx/battle/balls.png b/gfx/battle/balls.png new file mode 100644 index 00000000..21bb5e37 Binary files /dev/null and b/gfx/battle/balls.png differ diff --git a/gfx/battle/battle_hud_1.png b/gfx/battle/battle_hud_1.png new file mode 100644 index 00000000..ed9d4a56 Binary files /dev/null and b/gfx/battle/battle_hud_1.png differ diff --git a/gfx/battle/battle_hud_2.png b/gfx/battle/battle_hud_2.png new file mode 100644 index 00000000..0f6954b5 Binary files /dev/null and b/gfx/battle/battle_hud_2.png differ diff --git a/gfx/battle/battle_hud_3.png b/gfx/battle/battle_hud_3.png new file mode 100644 index 00000000..fd1c57f7 Binary files /dev/null and b/gfx/battle/battle_hud_3.png differ diff --git a/pic/other/ghost.png b/gfx/battle/ghost.png similarity index 100% rename from pic/other/ghost.png rename to gfx/battle/ghost.png diff --git a/gfx/minimized_mon_sprite.png b/gfx/battle/minimize.png similarity index 100% rename from gfx/minimized_mon_sprite.png rename to gfx/battle/minimize.png diff --git a/pic/trainer/oldman.png b/gfx/battle/oldmanb.png similarity index 100% rename from pic/trainer/oldman.png rename to gfx/battle/oldmanb.png diff --git a/gfx/battle_hud1.png b/gfx/battle_hud1.png deleted file mode 100644 index 74e6361f..00000000 Binary files a/gfx/battle_hud1.png and /dev/null differ diff --git a/gfx/battle_hud2.png b/gfx/battle_hud2.png deleted file mode 100644 index a5df75c8..00000000 Binary files a/gfx/battle_hud2.png and /dev/null differ diff --git a/gfx/battle_hud3.png b/gfx/battle_hud3.png deleted file mode 100644 index 00643de7..00000000 Binary files a/gfx/battle_hud3.png and /dev/null differ diff --git a/gfx/blocksets/plateau.bst b/gfx/blocksets/plateau.bst index 26435dc8..54c3ffec 100644 Binary files a/gfx/blocksets/plateau.bst and b/gfx/blocksets/plateau.bst differ diff --git a/gfx/blue/slotmachine1.png b/gfx/blue/slotmachine1.png deleted file mode 100644 index 41ebfdea..00000000 Binary files a/gfx/blue/slotmachine1.png and /dev/null differ diff --git a/gfx/theend.png b/gfx/credits/the_end.png similarity index 100% rename from gfx/theend.png rename to gfx/credits/the_end.png diff --git a/gfx/emotes/happy.png b/gfx/emotes/happy.png new file mode 100644 index 00000000..dd65f4d1 Binary files /dev/null and b/gfx/emotes/happy.png differ diff --git a/gfx/emotes/question.png b/gfx/emotes/question.png new file mode 100644 index 00000000..ef1d770b Binary files /dev/null and b/gfx/emotes/question.png differ diff --git a/gfx/emotes/shock.png b/gfx/emotes/shock.png new file mode 100644 index 00000000..f15cf50f Binary files /dev/null and b/gfx/emotes/shock.png differ diff --git a/gfx/emotion_bubbles.png b/gfx/emotion_bubbles.png deleted file mode 100644 index 31deacf4..00000000 Binary files a/gfx/emotion_bubbles.png and /dev/null differ diff --git a/gfx/fishing.asm b/gfx/fishing.asm new file mode 100644 index 00000000..0a040262 --- /dev/null +++ b/gfx/fishing.asm @@ -0,0 +1,4 @@ +RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp" +RedFishingTilesBack: INCBIN "gfx/overworld/red_fish_back.2bpp" +RedFishingTilesSide: INCBIN "gfx/overworld/red_fish_side.2bpp" +RedFishingRodTiles: INCBIN "gfx/overworld/fishing_rod.2bpp" diff --git a/gfx/font.asm b/gfx/font.asm new file mode 100644 index 00000000..fc2aff4f --- /dev/null +++ b/gfx/font.asm @@ -0,0 +1,31 @@ +PokemonLogoGraphics: INCBIN "gfx/title/pokemon_logo.2bpp" +FontGraphics:: INCBIN "gfx/font/font.1bpp" +FontGraphicsEnd:: + +ABTiles: INCBIN "gfx/font/AB.2bpp" + +HpBarAndStatusGraphics:: INCBIN "gfx/font/font_battle_extra.2bpp" +HpBarAndStatusGraphicsEnd:: + +BattleHudTiles1: INCBIN "gfx/battle/battle_hud_1.1bpp" +BattleHudTiles1End: +BattleHudTiles2: INCBIN "gfx/battle/battle_hud_2.1bpp" +BattleHudTiles3: INCBIN "gfx/battle/battle_hud_3.1bpp" +BattleHudTiles3End: + +NintendoCopyrightLogoGraphics: INCBIN "gfx/splash/copyright.2bpp" + +GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" +GamefreakLogoGraphicsEnd: + +TextBoxGraphics:: INCBIN "gfx/font/font_extra.2bpp" +TextBoxGraphicsEnd:: + +PokedexTileGraphics: INCBIN "gfx/pokedex/pokedex.2bpp" +PokedexTileGraphicsEnd: + +WorldMapTileGraphics: INCBIN "gfx/town_map/town_map.2bpp" +WorldMapTileGraphicsEnd: + +PlayerCharacterTitleGraphics: INCBIN "gfx/title/player.2bpp" +PlayerCharacterTitleGraphicsEnd: diff --git a/gfx/AB.png b/gfx/font/AB.png similarity index 100% rename from gfx/AB.png rename to gfx/font/AB.png diff --git a/gfx/ED_tile.png b/gfx/font/ED.png similarity index 100% rename from gfx/ED_tile.png rename to gfx/font/ED.png diff --git a/gfx/p_tile.png b/gfx/font/P.png similarity index 100% rename from gfx/p_tile.png rename to gfx/font/P.png diff --git a/gfx/font.png b/gfx/font/font.png similarity index 100% rename from gfx/font.png rename to gfx/font/font.png diff --git a/gfx/font/font_battle_extra.png b/gfx/font/font_battle_extra.png new file mode 100644 index 00000000..d00ae7bc Binary files /dev/null and b/gfx/font/font_battle_extra.png differ diff --git a/gfx/font/font_extra.png b/gfx/font/font_extra.png new file mode 100644 index 00000000..243acda0 Binary files /dev/null and b/gfx/font/font_extra.png differ diff --git a/gfx/hp_bar_and_status.png b/gfx/hp_bar_and_status.png deleted file mode 100644 index 1a832831..00000000 Binary files a/gfx/hp_bar_and_status.png and /dev/null differ diff --git a/gfx/icons/bug.png b/gfx/icons/bug.png new file mode 100644 index 00000000..40611eb6 Binary files /dev/null and b/gfx/icons/bug.png differ diff --git a/gfx/icons/plant.png b/gfx/icons/plant.png new file mode 100644 index 00000000..41b7aea3 Binary files /dev/null and b/gfx/icons/plant.png differ diff --git a/gfx/icons/quadruped.png b/gfx/icons/quadruped.png new file mode 100644 index 00000000..c9307b10 Binary files /dev/null and b/gfx/icons/quadruped.png differ diff --git a/gfx/icons/snake.png b/gfx/icons/snake.png new file mode 100644 index 00000000..a6076700 Binary files /dev/null and b/gfx/icons/snake.png differ diff --git a/gfx/blue/intro_purin_1.png b/gfx/intro/blue_jigglypuff_1.png similarity index 100% rename from gfx/blue/intro_purin_1.png rename to gfx/intro/blue_jigglypuff_1.png diff --git a/gfx/blue/intro_purin_2.png b/gfx/intro/blue_jigglypuff_2.png similarity index 100% rename from gfx/blue/intro_purin_2.png rename to gfx/intro/blue_jigglypuff_2.png diff --git a/gfx/blue/intro_purin_3.png b/gfx/intro/blue_jigglypuff_3.png similarity index 100% rename from gfx/blue/intro_purin_3.png rename to gfx/intro/blue_jigglypuff_3.png diff --git a/gfx/intro/gengar.png b/gfx/intro/gengar.png new file mode 100644 index 00000000..9558d1a1 Binary files /dev/null and b/gfx/intro/gengar.png differ diff --git a/gfx/intro/gengar_1.tilemap b/gfx/intro/gengar_1.tilemap new file mode 100644 index 00000000..c962326a Binary files /dev/null and b/gfx/intro/gengar_1.tilemap differ diff --git a/gfx/intro/gengar_2.tilemap b/gfx/intro/gengar_2.tilemap new file mode 100644 index 00000000..a909ba5e Binary files /dev/null and b/gfx/intro/gengar_2.tilemap differ diff --git a/gfx/intro/gengar_3.tilemap b/gfx/intro/gengar_3.tilemap new file mode 100644 index 00000000..231106d8 Binary files /dev/null and b/gfx/intro/gengar_3.tilemap differ diff --git a/gfx/red/intro_nido_1.png b/gfx/intro/red_nidorino_1.png similarity index 100% rename from gfx/red/intro_nido_1.png rename to gfx/intro/red_nidorino_1.png diff --git a/gfx/red/intro_nido_2.png b/gfx/intro/red_nidorino_2.png similarity index 100% rename from gfx/red/intro_nido_2.png rename to gfx/intro/red_nidorino_2.png diff --git a/gfx/red/intro_nido_3.png b/gfx/intro/red_nidorino_3.png similarity index 100% rename from gfx/red/intro_nido_3.png rename to gfx/intro/red_nidorino_3.png diff --git a/gfx/intro_fight.png b/gfx/intro_fight.png deleted file mode 100644 index d7774c01..00000000 Binary files a/gfx/intro_fight.png and /dev/null differ diff --git a/gfx/mon_ow_sprites.png b/gfx/mon_ow_sprites.png deleted file mode 100644 index 8402af2d..00000000 Binary files a/gfx/mon_ow_sprites.png and /dev/null differ diff --git a/gfx/battle_transition.png b/gfx/overworld/battle_transition.png similarity index 100% rename from gfx/battle_transition.png rename to gfx/overworld/battle_transition.png diff --git a/gfx/red_fishingrod_tiles.png b/gfx/overworld/fishing_rod.png similarity index 100% rename from gfx/red_fishingrod_tiles.png rename to gfx/overworld/fishing_rod.png diff --git a/gfx/pokecenter_ball.png b/gfx/overworld/heal_machine.png similarity index 100% rename from gfx/pokecenter_ball.png rename to gfx/overworld/heal_machine.png diff --git a/gfx/red_fishing_tile_back.png b/gfx/overworld/red_fish_back.png similarity index 100% rename from gfx/red_fishing_tile_back.png rename to gfx/overworld/red_fish_back.png diff --git a/gfx/red_fishing_tile_front.png b/gfx/overworld/red_fish_front.png similarity index 100% rename from gfx/red_fishing_tile_front.png rename to gfx/overworld/red_fish_front.png diff --git a/gfx/red_fishing_tile_side.png b/gfx/overworld/red_fish_side.png similarity index 100% rename from gfx/red_fishing_tile_side.png rename to gfx/overworld/red_fish_side.png diff --git a/gfx/ledge_hopping_shadow.png b/gfx/overworld/shadow.png similarity index 100% rename from gfx/ledge_hopping_shadow.png rename to gfx/overworld/shadow.png diff --git a/gfx/ss_anne_smoke_puff.png b/gfx/overworld/smoke.png similarity index 100% rename from gfx/ss_anne_smoke_puff.png rename to gfx/overworld/smoke.png diff --git a/gfx/overworld/spinners.png b/gfx/overworld/spinners.png new file mode 100644 index 00000000..534ae610 Binary files /dev/null and b/gfx/overworld/spinners.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm new file mode 100644 index 00000000..94286c9a --- /dev/null +++ b/gfx/pics.asm @@ -0,0 +1,376 @@ +SECTION "Pics 1", ROMX + +RhydonPicFront:: INCBIN "gfx/pokemon/front/rhydon.pic" +RhydonPicBack:: INCBIN "gfx/pokemon/back/rhydonb.pic" +KangaskhanPicFront:: INCBIN "gfx/pokemon/front/kangaskhan.pic" +KangaskhanPicBack:: INCBIN "gfx/pokemon/back/kangaskhanb.pic" +NidoranMPicFront:: INCBIN "gfx/pokemon/front/nidoranm.pic" +NidoranMPicBack:: INCBIN "gfx/pokemon/back/nidoranmb.pic" +ClefairyPicFront:: INCBIN "gfx/pokemon/front/clefairy.pic" +ClefairyPicBack:: INCBIN "gfx/pokemon/back/clefairyb.pic" +SpearowPicFront:: INCBIN "gfx/pokemon/front/spearow.pic" +SpearowPicBack:: INCBIN "gfx/pokemon/back/spearowb.pic" +VoltorbPicFront:: INCBIN "gfx/pokemon/front/voltorb.pic" +VoltorbPicBack:: INCBIN "gfx/pokemon/back/voltorbb.pic" +NidokingPicFront:: INCBIN "gfx/pokemon/front/nidoking.pic" +NidokingPicBack:: INCBIN "gfx/pokemon/back/nidokingb.pic" +SlowbroPicFront:: INCBIN "gfx/pokemon/front/slowbro.pic" +SlowbroPicBack:: INCBIN "gfx/pokemon/back/slowbrob.pic" +IvysaurPicFront:: INCBIN "gfx/pokemon/front/ivysaur.pic" +IvysaurPicBack:: INCBIN "gfx/pokemon/back/ivysaurb.pic" +ExeggutorPicFront:: INCBIN "gfx/pokemon/front/exeggutor.pic" +ExeggutorPicBack:: INCBIN "gfx/pokemon/back/exeggutorb.pic" +LickitungPicFront:: INCBIN "gfx/pokemon/front/lickitung.pic" +LickitungPicBack:: INCBIN "gfx/pokemon/back/lickitungb.pic" +ExeggcutePicFront:: INCBIN "gfx/pokemon/front/exeggcute.pic" +ExeggcutePicBack:: INCBIN "gfx/pokemon/back/exeggcuteb.pic" +GrimerPicFront:: INCBIN "gfx/pokemon/front/grimer.pic" +GrimerPicBack:: INCBIN "gfx/pokemon/back/grimerb.pic" +GengarPicFront:: INCBIN "gfx/pokemon/front/gengar.pic" +GengarPicBack:: INCBIN "gfx/pokemon/back/gengarb.pic" +NidoranFPicFront:: INCBIN "gfx/pokemon/front/nidoranf.pic" +NidoranFPicBack:: INCBIN "gfx/pokemon/back/nidoranfb.pic" +NidoqueenPicFront:: INCBIN "gfx/pokemon/front/nidoqueen.pic" +NidoqueenPicBack:: INCBIN "gfx/pokemon/back/nidoqueenb.pic" +CubonePicFront:: INCBIN "gfx/pokemon/front/cubone.pic" +CubonePicBack:: INCBIN "gfx/pokemon/back/cuboneb.pic" +RhyhornPicFront:: INCBIN "gfx/pokemon/front/rhyhorn.pic" +RhyhornPicBack:: INCBIN "gfx/pokemon/back/rhyhornb.pic" +LaprasPicFront:: INCBIN "gfx/pokemon/front/lapras.pic" +LaprasPicBack:: INCBIN "gfx/pokemon/back/laprasb.pic" +ArcaninePicFront:: INCBIN "gfx/pokemon/front/arcanine.pic" +ArcaninePicBack:: INCBIN "gfx/pokemon/back/arcanineb.pic" +GyaradosPicFront:: INCBIN "gfx/pokemon/front/gyarados.pic" +GyaradosPicBack:: INCBIN "gfx/pokemon/back/gyaradosb.pic" +ShellderPicFront:: INCBIN "gfx/pokemon/front/shellder.pic" +ShellderPicBack:: INCBIN "gfx/pokemon/back/shellderb.pic" +TentacoolPicFront:: INCBIN "gfx/pokemon/front/tentacool.pic" +TentacoolPicBack:: INCBIN "gfx/pokemon/back/tentacoolb.pic" +GastlyPicFront:: INCBIN "gfx/pokemon/front/gastly.pic" +GastlyPicBack:: INCBIN "gfx/pokemon/back/gastlyb.pic" +ScytherPicFront:: INCBIN "gfx/pokemon/front/scyther.pic" +ScytherPicBack:: INCBIN "gfx/pokemon/back/scytherb.pic" +StaryuPicFront:: INCBIN "gfx/pokemon/front/staryu.pic" +StaryuPicBack:: INCBIN "gfx/pokemon/back/staryub.pic" +BlastoisePicFront:: INCBIN "gfx/pokemon/front/blastoise.pic" +BlastoisePicBack:: INCBIN "gfx/pokemon/back/blastoiseb.pic" +PinsirPicFront:: INCBIN "gfx/pokemon/front/pinsir.pic" +PinsirPicBack:: INCBIN "gfx/pokemon/back/pinsirb.pic" +TangelaPicFront:: INCBIN "gfx/pokemon/front/tangela.pic" +TangelaPicBack:: INCBIN "gfx/pokemon/back/tangelab.pic" + + +SECTION "Pics 2", ROMX + +GrowlithePicFront:: INCBIN "gfx/pokemon/front/growlithe.pic" +GrowlithePicBack:: INCBIN "gfx/pokemon/back/growlitheb.pic" +OnixPicFront:: INCBIN "gfx/pokemon/front/onix.pic" +OnixPicBack:: INCBIN "gfx/pokemon/back/onixb.pic" +FearowPicFront:: INCBIN "gfx/pokemon/front/fearow.pic" +FearowPicBack:: INCBIN "gfx/pokemon/back/fearowb.pic" +PidgeyPicFront:: INCBIN "gfx/pokemon/front/pidgey.pic" +PidgeyPicBack:: INCBIN "gfx/pokemon/back/pidgeyb.pic" +SlowpokePicFront:: INCBIN "gfx/pokemon/front/slowpoke.pic" +SlowpokePicBack:: INCBIN "gfx/pokemon/back/slowpokeb.pic" +KadabraPicFront:: INCBIN "gfx/pokemon/front/kadabra.pic" +KadabraPicBack:: INCBIN "gfx/pokemon/back/kadabrab.pic" +GravelerPicFront:: INCBIN "gfx/pokemon/front/graveler.pic" +GravelerPicBack:: INCBIN "gfx/pokemon/back/gravelerb.pic" +ChanseyPicFront:: INCBIN "gfx/pokemon/front/chansey.pic" +ChanseyPicBack:: INCBIN "gfx/pokemon/back/chanseyb.pic" +MachokePicFront:: INCBIN "gfx/pokemon/front/machoke.pic" +MachokePicBack:: INCBIN "gfx/pokemon/back/machokeb.pic" +MrMimePicFront:: INCBIN "gfx/pokemon/front/mr.mime.pic" +MrMimePicBack:: INCBIN "gfx/pokemon/back/mr.mimeb.pic" +HitmonleePicFront:: INCBIN "gfx/pokemon/front/hitmonlee.pic" +HitmonleePicBack:: INCBIN "gfx/pokemon/back/hitmonleeb.pic" +HitmonchanPicFront:: INCBIN "gfx/pokemon/front/hitmonchan.pic" +HitmonchanPicBack:: INCBIN "gfx/pokemon/back/hitmonchanb.pic" +ArbokPicFront:: INCBIN "gfx/pokemon/front/arbok.pic" +ArbokPicBack:: INCBIN "gfx/pokemon/back/arbokb.pic" +ParasectPicFront:: INCBIN "gfx/pokemon/front/parasect.pic" +ParasectPicBack:: INCBIN "gfx/pokemon/back/parasectb.pic" +PsyduckPicFront:: INCBIN "gfx/pokemon/front/psyduck.pic" +PsyduckPicBack:: INCBIN "gfx/pokemon/back/psyduckb.pic" +DrowzeePicFront:: INCBIN "gfx/pokemon/front/drowzee.pic" +DrowzeePicBack:: INCBIN "gfx/pokemon/back/drowzeeb.pic" +GolemPicFront:: INCBIN "gfx/pokemon/front/golem.pic" +GolemPicBack:: INCBIN "gfx/pokemon/back/golemb.pic" +MagmarPicFront:: INCBIN "gfx/pokemon/front/magmar.pic" +MagmarPicBack:: INCBIN "gfx/pokemon/back/magmarb.pic" +ElectabuzzPicFront:: INCBIN "gfx/pokemon/front/electabuzz.pic" +ElectabuzzPicBack:: INCBIN "gfx/pokemon/back/electabuzzb.pic" +MagnetonPicFront:: INCBIN "gfx/pokemon/front/magneton.pic" +MagnetonPicBack:: INCBIN "gfx/pokemon/back/magnetonb.pic" +KoffingPicFront:: INCBIN "gfx/pokemon/front/koffing.pic" +KoffingPicBack:: INCBIN "gfx/pokemon/back/koffingb.pic" +MankeyPicFront:: INCBIN "gfx/pokemon/front/mankey.pic" +MankeyPicBack:: INCBIN "gfx/pokemon/back/mankeyb.pic" +SeelPicFront:: INCBIN "gfx/pokemon/front/seel.pic" +SeelPicBack:: INCBIN "gfx/pokemon/back/seelb.pic" +DiglettPicFront:: INCBIN "gfx/pokemon/front/diglett.pic" +DiglettPicBack:: INCBIN "gfx/pokemon/back/diglettb.pic" +TaurosPicFront:: INCBIN "gfx/pokemon/front/tauros.pic" +TaurosPicBack:: INCBIN "gfx/pokemon/back/taurosb.pic" +FarfetchdPicFront:: INCBIN "gfx/pokemon/front/farfetchd.pic" +FarfetchdPicBack:: INCBIN "gfx/pokemon/back/farfetchdb.pic" +VenonatPicFront:: INCBIN "gfx/pokemon/front/venonat.pic" +VenonatPicBack:: INCBIN "gfx/pokemon/back/venonatb.pic" +DragonitePicFront:: INCBIN "gfx/pokemon/front/dragonite.pic" +DragonitePicBack:: INCBIN "gfx/pokemon/back/dragoniteb.pic" +DoduoPicFront:: INCBIN "gfx/pokemon/front/doduo.pic" +DoduoPicBack:: INCBIN "gfx/pokemon/back/doduob.pic" +PoliwagPicFront:: INCBIN "gfx/pokemon/front/poliwag.pic" +PoliwagPicBack:: INCBIN "gfx/pokemon/back/poliwagb.pic" +JynxPicFront:: INCBIN "gfx/pokemon/front/jynx.pic" +JynxPicBack:: INCBIN "gfx/pokemon/back/jynxb.pic" +MoltresPicFront:: INCBIN "gfx/pokemon/front/moltres.pic" +MoltresPicBack:: INCBIN "gfx/pokemon/back/moltresb.pic" + + +SECTION "Pics 3", ROMX + +ArticunoPicFront:: INCBIN "gfx/pokemon/front/articuno.pic" +ArticunoPicBack:: INCBIN "gfx/pokemon/back/articunob.pic" +ZapdosPicFront:: INCBIN "gfx/pokemon/front/zapdos.pic" +ZapdosPicBack:: INCBIN "gfx/pokemon/back/zapdosb.pic" +DittoPicFront:: INCBIN "gfx/pokemon/front/ditto.pic" +DittoPicBack:: INCBIN "gfx/pokemon/back/dittob.pic" +MeowthPicFront:: INCBIN "gfx/pokemon/front/meowth.pic" +MeowthPicBack:: INCBIN "gfx/pokemon/back/meowthb.pic" +KrabbyPicFront:: INCBIN "gfx/pokemon/front/krabby.pic" +KrabbyPicBack:: INCBIN "gfx/pokemon/back/krabbyb.pic" +VulpixPicFront:: INCBIN "gfx/pokemon/front/vulpix.pic" +VulpixPicBack:: INCBIN "gfx/pokemon/back/vulpixb.pic" +NinetalesPicFront:: INCBIN "gfx/pokemon/front/ninetales.pic" +NinetalesPicBack:: INCBIN "gfx/pokemon/back/ninetalesb.pic" +PikachuPicFront:: INCBIN "gfx/pokemon/front/pikachu.pic" +PikachuPicBack:: INCBIN "gfx/pokemon/back/pikachub.pic" +RaichuPicFront:: INCBIN "gfx/pokemon/front/raichu.pic" +RaichuPicBack:: INCBIN "gfx/pokemon/back/raichub.pic" +DratiniPicFront:: INCBIN "gfx/pokemon/front/dratini.pic" +DratiniPicBack:: INCBIN "gfx/pokemon/back/dratinib.pic" +DragonairPicFront:: INCBIN "gfx/pokemon/front/dragonair.pic" +DragonairPicBack:: INCBIN "gfx/pokemon/back/dragonairb.pic" +KabutoPicFront:: INCBIN "gfx/pokemon/front/kabuto.pic" +KabutoPicBack:: INCBIN "gfx/pokemon/back/kabutob.pic" +KabutopsPicFront:: INCBIN "gfx/pokemon/front/kabutops.pic" +KabutopsPicBack:: INCBIN "gfx/pokemon/back/kabutopsb.pic" +HorseaPicFront:: INCBIN "gfx/pokemon/front/horsea.pic" +HorseaPicBack:: INCBIN "gfx/pokemon/back/horseab.pic" +SeadraPicFront:: INCBIN "gfx/pokemon/front/seadra.pic" +SeadraPicBack:: INCBIN "gfx/pokemon/back/seadrab.pic" +SandshrewPicFront:: INCBIN "gfx/pokemon/front/sandshrew.pic" +SandshrewPicBack:: INCBIN "gfx/pokemon/back/sandshrewb.pic" +SandslashPicFront:: INCBIN "gfx/pokemon/front/sandslash.pic" +SandslashPicBack:: INCBIN "gfx/pokemon/back/sandslashb.pic" +OmanytePicFront:: INCBIN "gfx/pokemon/front/omanyte.pic" +OmanytePicBack:: INCBIN "gfx/pokemon/back/omanyteb.pic" +OmastarPicFront:: INCBIN "gfx/pokemon/front/omastar.pic" +OmastarPicBack:: INCBIN "gfx/pokemon/back/omastarb.pic" +JigglypuffPicFront:: INCBIN "gfx/pokemon/front/jigglypuff.pic" +JigglypuffPicBack:: INCBIN "gfx/pokemon/back/jigglypuffb.pic" +WigglytuffPicFront:: INCBIN "gfx/pokemon/front/wigglytuff.pic" +WigglytuffPicBack:: INCBIN "gfx/pokemon/back/wigglytuffb.pic" +EeveePicFront:: INCBIN "gfx/pokemon/front/eevee.pic" +EeveePicBack:: INCBIN "gfx/pokemon/back/eeveeb.pic" +FlareonPicFront:: INCBIN "gfx/pokemon/front/flareon.pic" +FlareonPicBack:: INCBIN "gfx/pokemon/back/flareonb.pic" +JolteonPicFront:: INCBIN "gfx/pokemon/front/jolteon.pic" +JolteonPicBack:: INCBIN "gfx/pokemon/back/jolteonb.pic" +VaporeonPicFront:: INCBIN "gfx/pokemon/front/vaporeon.pic" +VaporeonPicBack:: INCBIN "gfx/pokemon/back/vaporeonb.pic" +MachopPicFront:: INCBIN "gfx/pokemon/front/machop.pic" +MachopPicBack:: INCBIN "gfx/pokemon/back/machopb.pic" +ZubatPicFront:: INCBIN "gfx/pokemon/front/zubat.pic" +ZubatPicBack:: INCBIN "gfx/pokemon/back/zubatb.pic" +EkansPicFront:: INCBIN "gfx/pokemon/front/ekans.pic" +EkansPicBack:: INCBIN "gfx/pokemon/back/ekansb.pic" +ParasPicFront:: INCBIN "gfx/pokemon/front/paras.pic" +ParasPicBack:: INCBIN "gfx/pokemon/back/parasb.pic" +PoliwhirlPicFront:: INCBIN "gfx/pokemon/front/poliwhirl.pic" +PoliwhirlPicBack:: INCBIN "gfx/pokemon/back/poliwhirlb.pic" +PoliwrathPicFront:: INCBIN "gfx/pokemon/front/poliwrath.pic" +PoliwrathPicBack:: INCBIN "gfx/pokemon/back/poliwrathb.pic" +WeedlePicFront:: INCBIN "gfx/pokemon/front/weedle.pic" +WeedlePicBack:: INCBIN "gfx/pokemon/back/weedleb.pic" +KakunaPicFront:: INCBIN "gfx/pokemon/front/kakuna.pic" +KakunaPicBack:: INCBIN "gfx/pokemon/back/kakunab.pic" +BeedrillPicFront:: INCBIN "gfx/pokemon/front/beedrill.pic" +BeedrillPicBack:: INCBIN "gfx/pokemon/back/beedrillb.pic" + +FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" + + +SECTION "Pics 4", ROMX + +DodrioPicFront:: INCBIN "gfx/pokemon/front/dodrio.pic" +DodrioPicBack:: INCBIN "gfx/pokemon/back/dodriob.pic" +PrimeapePicFront:: INCBIN "gfx/pokemon/front/primeape.pic" +PrimeapePicBack:: INCBIN "gfx/pokemon/back/primeapeb.pic" +DugtrioPicFront:: INCBIN "gfx/pokemon/front/dugtrio.pic" +DugtrioPicBack:: INCBIN "gfx/pokemon/back/dugtriob.pic" +VenomothPicFront:: INCBIN "gfx/pokemon/front/venomoth.pic" +VenomothPicBack:: INCBIN "gfx/pokemon/back/venomothb.pic" +DewgongPicFront:: INCBIN "gfx/pokemon/front/dewgong.pic" +DewgongPicBack:: INCBIN "gfx/pokemon/back/dewgongb.pic" +CaterpiePicFront:: INCBIN "gfx/pokemon/front/caterpie.pic" +CaterpiePicBack:: INCBIN "gfx/pokemon/back/caterpieb.pic" +MetapodPicFront:: INCBIN "gfx/pokemon/front/metapod.pic" +MetapodPicBack:: INCBIN "gfx/pokemon/back/metapodb.pic" +ButterfreePicFront:: INCBIN "gfx/pokemon/front/butterfree.pic" +ButterfreePicBack:: INCBIN "gfx/pokemon/back/butterfreeb.pic" +MachampPicFront:: INCBIN "gfx/pokemon/front/machamp.pic" +MachampPicBack:: INCBIN "gfx/pokemon/back/machampb.pic" +GolduckPicFront:: INCBIN "gfx/pokemon/front/golduck.pic" +GolduckPicBack:: INCBIN "gfx/pokemon/back/golduckb.pic" +HypnoPicFront:: INCBIN "gfx/pokemon/front/hypno.pic" +HypnoPicBack:: INCBIN "gfx/pokemon/back/hypnob.pic" +GolbatPicFront:: INCBIN "gfx/pokemon/front/golbat.pic" +GolbatPicBack:: INCBIN "gfx/pokemon/back/golbatb.pic" +MewtwoPicFront:: INCBIN "gfx/pokemon/front/mewtwo.pic" +MewtwoPicBack:: INCBIN "gfx/pokemon/back/mewtwob.pic" +SnorlaxPicFront:: INCBIN "gfx/pokemon/front/snorlax.pic" +SnorlaxPicBack:: INCBIN "gfx/pokemon/back/snorlaxb.pic" +MagikarpPicFront:: INCBIN "gfx/pokemon/front/magikarp.pic" +MagikarpPicBack:: INCBIN "gfx/pokemon/back/magikarpb.pic" +MukPicFront:: INCBIN "gfx/pokemon/front/muk.pic" +MukPicBack:: INCBIN "gfx/pokemon/back/mukb.pic" +KinglerPicFront:: INCBIN "gfx/pokemon/front/kingler.pic" +KinglerPicBack:: INCBIN "gfx/pokemon/back/kinglerb.pic" +CloysterPicFront:: INCBIN "gfx/pokemon/front/cloyster.pic" +CloysterPicBack:: INCBIN "gfx/pokemon/back/cloysterb.pic" +ElectrodePicFront:: INCBIN "gfx/pokemon/front/electrode.pic" +ElectrodePicBack:: INCBIN "gfx/pokemon/back/electrodeb.pic" +ClefablePicFront:: INCBIN "gfx/pokemon/front/clefable.pic" +ClefablePicBack:: INCBIN "gfx/pokemon/back/clefableb.pic" +WeezingPicFront:: INCBIN "gfx/pokemon/front/weezing.pic" +WeezingPicBack:: INCBIN "gfx/pokemon/back/weezingb.pic" +PersianPicFront:: INCBIN "gfx/pokemon/front/persian.pic" +PersianPicBack:: INCBIN "gfx/pokemon/back/persianb.pic" +MarowakPicFront:: INCBIN "gfx/pokemon/front/marowak.pic" +MarowakPicBack:: INCBIN "gfx/pokemon/back/marowakb.pic" +HaunterPicFront:: INCBIN "gfx/pokemon/front/haunter.pic" +HaunterPicBack:: INCBIN "gfx/pokemon/back/haunterb.pic" +AbraPicFront:: INCBIN "gfx/pokemon/front/abra.pic" +AbraPicBack:: INCBIN "gfx/pokemon/back/abrab.pic" +AlakazamPicFront:: INCBIN "gfx/pokemon/front/alakazam.pic" +AlakazamPicBack:: INCBIN "gfx/pokemon/back/alakazamb.pic" +PidgeottoPicFront:: INCBIN "gfx/pokemon/front/pidgeotto.pic" +PidgeottoPicBack:: INCBIN "gfx/pokemon/back/pidgeottob.pic" +PidgeotPicFront:: INCBIN "gfx/pokemon/front/pidgeot.pic" +PidgeotPicBack:: INCBIN "gfx/pokemon/back/pidgeotb.pic" +StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" +StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" + +RedPicBack:: INCBIN "gfx/player/redb.pic" +OldManPicBack:: INCBIN "gfx/battle/oldmanb.pic" + + +SECTION "Pics 5", ROMX + +BulbasaurPicFront:: INCBIN "gfx/pokemon/front/bulbasaur.pic" +BulbasaurPicBack:: INCBIN "gfx/pokemon/back/bulbasaurb.pic" +VenusaurPicFront:: INCBIN "gfx/pokemon/front/venusaur.pic" +VenusaurPicBack:: INCBIN "gfx/pokemon/back/venusaurb.pic" +TentacruelPicFront:: INCBIN "gfx/pokemon/front/tentacruel.pic" +TentacruelPicBack:: INCBIN "gfx/pokemon/back/tentacruelb.pic" +GoldeenPicFront:: INCBIN "gfx/pokemon/front/goldeen.pic" +GoldeenPicBack:: INCBIN "gfx/pokemon/back/goldeenb.pic" +SeakingPicFront:: INCBIN "gfx/pokemon/front/seaking.pic" +SeakingPicBack:: INCBIN "gfx/pokemon/back/seakingb.pic" +PonytaPicFront:: INCBIN "gfx/pokemon/front/ponyta.pic" +RapidashPicFront:: INCBIN "gfx/pokemon/front/rapidash.pic" +PonytaPicBack:: INCBIN "gfx/pokemon/back/ponytab.pic" +RapidashPicBack:: INCBIN "gfx/pokemon/back/rapidashb.pic" +RattataPicFront:: INCBIN "gfx/pokemon/front/rattata.pic" +RattataPicBack:: INCBIN "gfx/pokemon/back/rattatab.pic" +RaticatePicFront:: INCBIN "gfx/pokemon/front/raticate.pic" +RaticatePicBack:: INCBIN "gfx/pokemon/back/raticateb.pic" +NidorinoPicFront:: INCBIN "gfx/pokemon/front/nidorino.pic" +NidorinoPicBack:: INCBIN "gfx/pokemon/back/nidorinob.pic" +NidorinaPicFront:: INCBIN "gfx/pokemon/front/nidorina.pic" +NidorinaPicBack:: INCBIN "gfx/pokemon/back/nidorinab.pic" +GeodudePicFront:: INCBIN "gfx/pokemon/front/geodude.pic" +GeodudePicBack:: INCBIN "gfx/pokemon/back/geodudeb.pic" +PorygonPicFront:: INCBIN "gfx/pokemon/front/porygon.pic" +PorygonPicBack:: INCBIN "gfx/pokemon/back/porygonb.pic" +AerodactylPicFront:: INCBIN "gfx/pokemon/front/aerodactyl.pic" +AerodactylPicBack:: INCBIN "gfx/pokemon/back/aerodactylb.pic" +MagnemitePicFront:: INCBIN "gfx/pokemon/front/magnemite.pic" +MagnemitePicBack:: INCBIN "gfx/pokemon/back/magnemiteb.pic" +CharmanderPicFront:: INCBIN "gfx/pokemon/front/charmander.pic" +CharmanderPicBack:: INCBIN "gfx/pokemon/back/charmanderb.pic" +SquirtlePicFront:: INCBIN "gfx/pokemon/front/squirtle.pic" +SquirtlePicBack:: INCBIN "gfx/pokemon/back/squirtleb.pic" +CharmeleonPicFront:: INCBIN "gfx/pokemon/front/charmeleon.pic" +CharmeleonPicBack:: INCBIN "gfx/pokemon/back/charmeleonb.pic" +WartortlePicFront:: INCBIN "gfx/pokemon/front/wartortle.pic" +WartortlePicBack:: INCBIN "gfx/pokemon/back/wartortleb.pic" +CharizardPicFront:: INCBIN "gfx/pokemon/front/charizard.pic" +CharizardPicBack:: INCBIN "gfx/pokemon/back/charizardb.pic" +FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" +GhostPic:: INCBIN "gfx/battle/ghost.pic" +OddishPicFront:: INCBIN "gfx/pokemon/front/oddish.pic" +OddishPicBack:: INCBIN "gfx/pokemon/back/oddishb.pic" +GloomPicFront:: INCBIN "gfx/pokemon/front/gloom.pic" +GloomPicBack:: INCBIN "gfx/pokemon/back/gloomb.pic" +VileplumePicFront:: INCBIN "gfx/pokemon/front/vileplume.pic" +VileplumePicBack:: INCBIN "gfx/pokemon/back/vileplumeb.pic" +BellsproutPicFront:: INCBIN "gfx/pokemon/front/bellsprout.pic" +BellsproutPicBack:: INCBIN "gfx/pokemon/back/bellsproutb.pic" +WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic" +WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic" +VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic" +VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" + + +SECTION "Pics 6", ROMX + +TrainerPics:: +YoungsterPic:: INCBIN "gfx/trainers/youngster.pic" +BugCatcherPic:: INCBIN "gfx/trainers/bugcatcher.pic" +LassPic:: INCBIN "gfx/trainers/lass.pic" +SailorPic:: INCBIN "gfx/trainers/sailor.pic" +JrTrainerMPic:: INCBIN "gfx/trainers/jr.trainerm.pic" +JrTrainerFPic:: INCBIN "gfx/trainers/jr.trainerf.pic" +PokemaniacPic:: INCBIN "gfx/trainers/pokemaniac.pic" +SuperNerdPic:: INCBIN "gfx/trainers/supernerd.pic" +HikerPic:: INCBIN "gfx/trainers/hiker.pic" +BikerPic:: INCBIN "gfx/trainers/biker.pic" +BurglarPic:: INCBIN "gfx/trainers/burglar.pic" +EngineerPic:: INCBIN "gfx/trainers/engineer.pic" +FisherPic:: INCBIN "gfx/trainers/fisher.pic" +SwimmerPic:: INCBIN "gfx/trainers/swimmer.pic" +CueBallPic:: INCBIN "gfx/trainers/cueball.pic" +GamblerPic:: INCBIN "gfx/trainers/gambler.pic" +BeautyPic:: INCBIN "gfx/trainers/beauty.pic" +PsychicPic:: INCBIN "gfx/trainers/psychic.pic" +RockerPic:: INCBIN "gfx/trainers/rocker.pic" +JugglerPic:: INCBIN "gfx/trainers/juggler.pic" +TamerPic:: INCBIN "gfx/trainers/tamer.pic" +BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic" +BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic" +Rival1Pic:: INCBIN "gfx/trainers/rival1.pic" +ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic" +ChiefPic:: +ScientistPic:: INCBIN "gfx/trainers/scientist.pic" +GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic" +RocketPic:: INCBIN "gfx/trainers/rocket.pic" +CooltrainerMPic:: INCBIN "gfx/trainers/cooltrainerm.pic" +CooltrainerFPic:: INCBIN "gfx/trainers/cooltrainerf.pic" +BrunoPic:: INCBIN "gfx/trainers/bruno.pic" +BrockPic:: INCBIN "gfx/trainers/brock.pic" +MistyPic:: INCBIN "gfx/trainers/misty.pic" +LtSurgePic:: INCBIN "gfx/trainers/lt.surge.pic" +ErikaPic:: INCBIN "gfx/trainers/erika.pic" +KogaPic:: INCBIN "gfx/trainers/koga.pic" +BlainePic:: INCBIN "gfx/trainers/blaine.pic" +SabrinaPic:: INCBIN "gfx/trainers/sabrina.pic" +GentlemanPic:: INCBIN "gfx/trainers/gentleman.pic" +Rival2Pic:: INCBIN "gfx/trainers/rival2.pic" +Rival3Pic:: INCBIN "gfx/trainers/rival3.pic" +LoreleiPic:: INCBIN "gfx/trainers/lorelei.pic" +ChannelerPic:: INCBIN "gfx/trainers/channeler.pic" +AgathaPic:: INCBIN "gfx/trainers/agatha.pic" +LancePic:: INCBIN "gfx/trainers/lance.pic" diff --git a/gfx/player.asm b/gfx/player.asm new file mode 100644 index 00000000..188daaf2 --- /dev/null +++ b/gfx/player.asm @@ -0,0 +1,3 @@ +RedPicFront:: INCBIN "gfx/player/red.pic" +ShrinkPic1:: INCBIN "gfx/player/shrink1.pic" +ShrinkPic2:: INCBIN "gfx/player/shrink2.pic" diff --git a/pic/trainer/red.png b/gfx/player/red.png similarity index 100% rename from pic/trainer/red.png rename to gfx/player/red.png diff --git a/pic/trainer/redb.png b/gfx/player/redb.png similarity index 100% rename from pic/trainer/redb.png rename to gfx/player/redb.png diff --git a/pic/trainer/shrink1.png b/gfx/player/shrink1.png similarity index 100% rename from pic/trainer/shrink1.png rename to gfx/player/shrink1.png diff --git a/pic/trainer/shrink2.png b/gfx/player/shrink2.png similarity index 100% rename from pic/trainer/shrink2.png rename to gfx/player/shrink2.png diff --git a/gfx/pokeball.png b/gfx/pokeball.png deleted file mode 100644 index 830f72b2..00000000 Binary files a/gfx/pokeball.png and /dev/null differ diff --git a/gfx/pokedex.png b/gfx/pokedex/pokedex.png similarity index 100% rename from gfx/pokedex.png rename to gfx/pokedex/pokedex.png diff --git a/pic/monback/abrab.png b/gfx/pokemon/back/abrab.png similarity index 100% rename from pic/monback/abrab.png rename to gfx/pokemon/back/abrab.png diff --git a/pic/monback/aerodactylb.png b/gfx/pokemon/back/aerodactylb.png similarity index 100% rename from pic/monback/aerodactylb.png rename to gfx/pokemon/back/aerodactylb.png diff --git a/pic/monback/alakazamb.png b/gfx/pokemon/back/alakazamb.png similarity index 100% rename from pic/monback/alakazamb.png rename to gfx/pokemon/back/alakazamb.png diff --git a/pic/monback/arbokb.png b/gfx/pokemon/back/arbokb.png similarity index 100% rename from pic/monback/arbokb.png rename to gfx/pokemon/back/arbokb.png diff --git a/pic/monback/arcanineb.png b/gfx/pokemon/back/arcanineb.png similarity index 100% rename from pic/monback/arcanineb.png rename to gfx/pokemon/back/arcanineb.png diff --git a/pic/monback/articunob.png b/gfx/pokemon/back/articunob.png similarity index 100% rename from pic/monback/articunob.png rename to gfx/pokemon/back/articunob.png diff --git a/pic/monback/beedrillb.png b/gfx/pokemon/back/beedrillb.png similarity index 100% rename from pic/monback/beedrillb.png rename to gfx/pokemon/back/beedrillb.png diff --git a/pic/monback/bellsproutb.png b/gfx/pokemon/back/bellsproutb.png similarity index 100% rename from pic/monback/bellsproutb.png rename to gfx/pokemon/back/bellsproutb.png diff --git a/pic/monback/blastoiseb.png b/gfx/pokemon/back/blastoiseb.png similarity index 100% rename from pic/monback/blastoiseb.png rename to gfx/pokemon/back/blastoiseb.png diff --git a/pic/monback/bulbasaurb.png b/gfx/pokemon/back/bulbasaurb.png similarity index 100% rename from pic/monback/bulbasaurb.png rename to gfx/pokemon/back/bulbasaurb.png diff --git a/pic/monback/butterfreeb.png b/gfx/pokemon/back/butterfreeb.png similarity index 100% rename from pic/monback/butterfreeb.png rename to gfx/pokemon/back/butterfreeb.png diff --git a/pic/monback/caterpieb.png b/gfx/pokemon/back/caterpieb.png similarity index 100% rename from pic/monback/caterpieb.png rename to gfx/pokemon/back/caterpieb.png diff --git a/pic/monback/chanseyb.png b/gfx/pokemon/back/chanseyb.png similarity index 100% rename from pic/monback/chanseyb.png rename to gfx/pokemon/back/chanseyb.png diff --git a/pic/monback/charizardb.png b/gfx/pokemon/back/charizardb.png similarity index 100% rename from pic/monback/charizardb.png rename to gfx/pokemon/back/charizardb.png diff --git a/pic/monback/charmanderb.png b/gfx/pokemon/back/charmanderb.png similarity index 100% rename from pic/monback/charmanderb.png rename to gfx/pokemon/back/charmanderb.png diff --git a/pic/monback/charmeleonb.png b/gfx/pokemon/back/charmeleonb.png similarity index 100% rename from pic/monback/charmeleonb.png rename to gfx/pokemon/back/charmeleonb.png diff --git a/pic/monback/clefableb.png b/gfx/pokemon/back/clefableb.png similarity index 100% rename from pic/monback/clefableb.png rename to gfx/pokemon/back/clefableb.png diff --git a/pic/monback/clefairyb.png b/gfx/pokemon/back/clefairyb.png similarity index 100% rename from pic/monback/clefairyb.png rename to gfx/pokemon/back/clefairyb.png diff --git a/pic/monback/cloysterb.png b/gfx/pokemon/back/cloysterb.png similarity index 100% rename from pic/monback/cloysterb.png rename to gfx/pokemon/back/cloysterb.png diff --git a/pic/monback/cuboneb.png b/gfx/pokemon/back/cuboneb.png similarity index 100% rename from pic/monback/cuboneb.png rename to gfx/pokemon/back/cuboneb.png diff --git a/pic/monback/dewgongb.png b/gfx/pokemon/back/dewgongb.png similarity index 100% rename from pic/monback/dewgongb.png rename to gfx/pokemon/back/dewgongb.png diff --git a/pic/monback/diglettb.png b/gfx/pokemon/back/diglettb.png similarity index 100% rename from pic/monback/diglettb.png rename to gfx/pokemon/back/diglettb.png diff --git a/pic/monback/dittob.png b/gfx/pokemon/back/dittob.png similarity index 100% rename from pic/monback/dittob.png rename to gfx/pokemon/back/dittob.png diff --git a/pic/monback/dodriob.png b/gfx/pokemon/back/dodriob.png similarity index 100% rename from pic/monback/dodriob.png rename to gfx/pokemon/back/dodriob.png diff --git a/pic/monback/doduob.png b/gfx/pokemon/back/doduob.png similarity index 100% rename from pic/monback/doduob.png rename to gfx/pokemon/back/doduob.png diff --git a/pic/monback/dragonairb.png b/gfx/pokemon/back/dragonairb.png similarity index 100% rename from pic/monback/dragonairb.png rename to gfx/pokemon/back/dragonairb.png diff --git a/pic/monback/dragoniteb.png b/gfx/pokemon/back/dragoniteb.png similarity index 100% rename from pic/monback/dragoniteb.png rename to gfx/pokemon/back/dragoniteb.png diff --git a/pic/monback/dratinib.png b/gfx/pokemon/back/dratinib.png similarity index 100% rename from pic/monback/dratinib.png rename to gfx/pokemon/back/dratinib.png diff --git a/pic/monback/drowzeeb.png b/gfx/pokemon/back/drowzeeb.png similarity index 100% rename from pic/monback/drowzeeb.png rename to gfx/pokemon/back/drowzeeb.png diff --git a/pic/monback/dugtriob.png b/gfx/pokemon/back/dugtriob.png similarity index 100% rename from pic/monback/dugtriob.png rename to gfx/pokemon/back/dugtriob.png diff --git a/pic/monback/eeveeb.png b/gfx/pokemon/back/eeveeb.png similarity index 100% rename from pic/monback/eeveeb.png rename to gfx/pokemon/back/eeveeb.png diff --git a/pic/monback/ekansb.png b/gfx/pokemon/back/ekansb.png similarity index 100% rename from pic/monback/ekansb.png rename to gfx/pokemon/back/ekansb.png diff --git a/pic/monback/electabuzzb.png b/gfx/pokemon/back/electabuzzb.png similarity index 100% rename from pic/monback/electabuzzb.png rename to gfx/pokemon/back/electabuzzb.png diff --git a/pic/monback/electrodeb.png b/gfx/pokemon/back/electrodeb.png similarity index 100% rename from pic/monback/electrodeb.png rename to gfx/pokemon/back/electrodeb.png diff --git a/pic/monback/exeggcuteb.png b/gfx/pokemon/back/exeggcuteb.png similarity index 100% rename from pic/monback/exeggcuteb.png rename to gfx/pokemon/back/exeggcuteb.png diff --git a/pic/monback/exeggutorb.png b/gfx/pokemon/back/exeggutorb.png similarity index 100% rename from pic/monback/exeggutorb.png rename to gfx/pokemon/back/exeggutorb.png diff --git a/pic/monback/farfetchdb.png b/gfx/pokemon/back/farfetchdb.png similarity index 100% rename from pic/monback/farfetchdb.png rename to gfx/pokemon/back/farfetchdb.png diff --git a/pic/monback/fearowb.png b/gfx/pokemon/back/fearowb.png similarity index 100% rename from pic/monback/fearowb.png rename to gfx/pokemon/back/fearowb.png diff --git a/pic/monback/flareonb.png b/gfx/pokemon/back/flareonb.png similarity index 100% rename from pic/monback/flareonb.png rename to gfx/pokemon/back/flareonb.png diff --git a/pic/monback/gastlyb.png b/gfx/pokemon/back/gastlyb.png similarity index 100% rename from pic/monback/gastlyb.png rename to gfx/pokemon/back/gastlyb.png diff --git a/pic/monback/gengarb.png b/gfx/pokemon/back/gengarb.png similarity index 100% rename from pic/monback/gengarb.png rename to gfx/pokemon/back/gengarb.png diff --git a/pic/monback/geodudeb.png b/gfx/pokemon/back/geodudeb.png similarity index 100% rename from pic/monback/geodudeb.png rename to gfx/pokemon/back/geodudeb.png diff --git a/pic/monback/gloomb.png b/gfx/pokemon/back/gloomb.png similarity index 100% rename from pic/monback/gloomb.png rename to gfx/pokemon/back/gloomb.png diff --git a/pic/monback/golbatb.png b/gfx/pokemon/back/golbatb.png similarity index 100% rename from pic/monback/golbatb.png rename to gfx/pokemon/back/golbatb.png diff --git a/pic/monback/goldeenb.png b/gfx/pokemon/back/goldeenb.png similarity index 100% rename from pic/monback/goldeenb.png rename to gfx/pokemon/back/goldeenb.png diff --git a/pic/monback/golduckb.png b/gfx/pokemon/back/golduckb.png similarity index 100% rename from pic/monback/golduckb.png rename to gfx/pokemon/back/golduckb.png diff --git a/pic/monback/golemb.png b/gfx/pokemon/back/golemb.png similarity index 100% rename from pic/monback/golemb.png rename to gfx/pokemon/back/golemb.png diff --git a/pic/monback/gravelerb.png b/gfx/pokemon/back/gravelerb.png similarity index 100% rename from pic/monback/gravelerb.png rename to gfx/pokemon/back/gravelerb.png diff --git a/pic/monback/grimerb.png b/gfx/pokemon/back/grimerb.png similarity index 100% rename from pic/monback/grimerb.png rename to gfx/pokemon/back/grimerb.png diff --git a/pic/monback/growlitheb.png b/gfx/pokemon/back/growlitheb.png similarity index 100% rename from pic/monback/growlitheb.png rename to gfx/pokemon/back/growlitheb.png diff --git a/pic/monback/gyaradosb.png b/gfx/pokemon/back/gyaradosb.png similarity index 100% rename from pic/monback/gyaradosb.png rename to gfx/pokemon/back/gyaradosb.png diff --git a/pic/monback/haunterb.png b/gfx/pokemon/back/haunterb.png similarity index 100% rename from pic/monback/haunterb.png rename to gfx/pokemon/back/haunterb.png diff --git a/pic/monback/hitmonchanb.png b/gfx/pokemon/back/hitmonchanb.png similarity index 100% rename from pic/monback/hitmonchanb.png rename to gfx/pokemon/back/hitmonchanb.png diff --git a/pic/monback/hitmonleeb.png b/gfx/pokemon/back/hitmonleeb.png similarity index 100% rename from pic/monback/hitmonleeb.png rename to gfx/pokemon/back/hitmonleeb.png diff --git a/pic/monback/horseab.png b/gfx/pokemon/back/horseab.png similarity index 100% rename from pic/monback/horseab.png rename to gfx/pokemon/back/horseab.png diff --git a/pic/monback/hypnob.png b/gfx/pokemon/back/hypnob.png similarity index 100% rename from pic/monback/hypnob.png rename to gfx/pokemon/back/hypnob.png diff --git a/pic/monback/ivysaurb.png b/gfx/pokemon/back/ivysaurb.png similarity index 100% rename from pic/monback/ivysaurb.png rename to gfx/pokemon/back/ivysaurb.png diff --git a/pic/monback/jigglypuffb.png b/gfx/pokemon/back/jigglypuffb.png similarity index 100% rename from pic/monback/jigglypuffb.png rename to gfx/pokemon/back/jigglypuffb.png diff --git a/pic/monback/jolteonb.png b/gfx/pokemon/back/jolteonb.png similarity index 100% rename from pic/monback/jolteonb.png rename to gfx/pokemon/back/jolteonb.png diff --git a/pic/monback/jynxb.png b/gfx/pokemon/back/jynxb.png similarity index 100% rename from pic/monback/jynxb.png rename to gfx/pokemon/back/jynxb.png diff --git a/pic/monback/kabutob.png b/gfx/pokemon/back/kabutob.png similarity index 100% rename from pic/monback/kabutob.png rename to gfx/pokemon/back/kabutob.png diff --git a/pic/monback/kabutopsb.png b/gfx/pokemon/back/kabutopsb.png similarity index 100% rename from pic/monback/kabutopsb.png rename to gfx/pokemon/back/kabutopsb.png diff --git a/pic/monback/kadabrab.png b/gfx/pokemon/back/kadabrab.png similarity index 100% rename from pic/monback/kadabrab.png rename to gfx/pokemon/back/kadabrab.png diff --git a/pic/monback/kakunab.png b/gfx/pokemon/back/kakunab.png similarity index 100% rename from pic/monback/kakunab.png rename to gfx/pokemon/back/kakunab.png diff --git a/pic/monback/kangaskhanb.png b/gfx/pokemon/back/kangaskhanb.png similarity index 100% rename from pic/monback/kangaskhanb.png rename to gfx/pokemon/back/kangaskhanb.png diff --git a/pic/monback/kinglerb.png b/gfx/pokemon/back/kinglerb.png similarity index 100% rename from pic/monback/kinglerb.png rename to gfx/pokemon/back/kinglerb.png diff --git a/pic/monback/koffingb.png b/gfx/pokemon/back/koffingb.png similarity index 100% rename from pic/monback/koffingb.png rename to gfx/pokemon/back/koffingb.png diff --git a/pic/monback/krabbyb.png b/gfx/pokemon/back/krabbyb.png similarity index 100% rename from pic/monback/krabbyb.png rename to gfx/pokemon/back/krabbyb.png diff --git a/pic/monback/laprasb.png b/gfx/pokemon/back/laprasb.png similarity index 100% rename from pic/monback/laprasb.png rename to gfx/pokemon/back/laprasb.png diff --git a/pic/monback/lickitungb.png b/gfx/pokemon/back/lickitungb.png similarity index 100% rename from pic/monback/lickitungb.png rename to gfx/pokemon/back/lickitungb.png diff --git a/pic/monback/machampb.png b/gfx/pokemon/back/machampb.png similarity index 100% rename from pic/monback/machampb.png rename to gfx/pokemon/back/machampb.png diff --git a/pic/monback/machokeb.png b/gfx/pokemon/back/machokeb.png similarity index 100% rename from pic/monback/machokeb.png rename to gfx/pokemon/back/machokeb.png diff --git a/pic/monback/machopb.png b/gfx/pokemon/back/machopb.png similarity index 100% rename from pic/monback/machopb.png rename to gfx/pokemon/back/machopb.png diff --git a/pic/monback/magikarpb.png b/gfx/pokemon/back/magikarpb.png similarity index 100% rename from pic/monback/magikarpb.png rename to gfx/pokemon/back/magikarpb.png diff --git a/pic/monback/magmarb.png b/gfx/pokemon/back/magmarb.png similarity index 100% rename from pic/monback/magmarb.png rename to gfx/pokemon/back/magmarb.png diff --git a/pic/monback/magnemiteb.png b/gfx/pokemon/back/magnemiteb.png similarity index 100% rename from pic/monback/magnemiteb.png rename to gfx/pokemon/back/magnemiteb.png diff --git a/pic/monback/magnetonb.png b/gfx/pokemon/back/magnetonb.png similarity index 100% rename from pic/monback/magnetonb.png rename to gfx/pokemon/back/magnetonb.png diff --git a/pic/monback/mankeyb.png b/gfx/pokemon/back/mankeyb.png similarity index 100% rename from pic/monback/mankeyb.png rename to gfx/pokemon/back/mankeyb.png diff --git a/pic/monback/marowakb.png b/gfx/pokemon/back/marowakb.png similarity index 100% rename from pic/monback/marowakb.png rename to gfx/pokemon/back/marowakb.png diff --git a/pic/monback/meowthb.png b/gfx/pokemon/back/meowthb.png similarity index 100% rename from pic/monback/meowthb.png rename to gfx/pokemon/back/meowthb.png diff --git a/pic/monback/metapodb.png b/gfx/pokemon/back/metapodb.png similarity index 100% rename from pic/monback/metapodb.png rename to gfx/pokemon/back/metapodb.png diff --git a/pic/monback/mewb.png b/gfx/pokemon/back/mewb.png similarity index 100% rename from pic/monback/mewb.png rename to gfx/pokemon/back/mewb.png diff --git a/pic/monback/mewtwob.png b/gfx/pokemon/back/mewtwob.png similarity index 100% rename from pic/monback/mewtwob.png rename to gfx/pokemon/back/mewtwob.png diff --git a/pic/monback/moltresb.png b/gfx/pokemon/back/moltresb.png similarity index 100% rename from pic/monback/moltresb.png rename to gfx/pokemon/back/moltresb.png diff --git a/pic/monback/mr.mimeb.png b/gfx/pokemon/back/mr.mimeb.png similarity index 100% rename from pic/monback/mr.mimeb.png rename to gfx/pokemon/back/mr.mimeb.png diff --git a/pic/monback/mukb.png b/gfx/pokemon/back/mukb.png similarity index 100% rename from pic/monback/mukb.png rename to gfx/pokemon/back/mukb.png diff --git a/pic/monback/nidokingb.png b/gfx/pokemon/back/nidokingb.png similarity index 100% rename from pic/monback/nidokingb.png rename to gfx/pokemon/back/nidokingb.png diff --git a/pic/monback/nidoqueenb.png b/gfx/pokemon/back/nidoqueenb.png similarity index 100% rename from pic/monback/nidoqueenb.png rename to gfx/pokemon/back/nidoqueenb.png diff --git a/pic/monback/nidoranfb.png b/gfx/pokemon/back/nidoranfb.png similarity index 100% rename from pic/monback/nidoranfb.png rename to gfx/pokemon/back/nidoranfb.png diff --git a/pic/monback/nidoranmb.png b/gfx/pokemon/back/nidoranmb.png similarity index 100% rename from pic/monback/nidoranmb.png rename to gfx/pokemon/back/nidoranmb.png diff --git a/pic/monback/nidorinab.png b/gfx/pokemon/back/nidorinab.png similarity index 100% rename from pic/monback/nidorinab.png rename to gfx/pokemon/back/nidorinab.png diff --git a/pic/monback/nidorinob.png b/gfx/pokemon/back/nidorinob.png similarity index 100% rename from pic/monback/nidorinob.png rename to gfx/pokemon/back/nidorinob.png diff --git a/pic/monback/ninetalesb.png b/gfx/pokemon/back/ninetalesb.png similarity index 100% rename from pic/monback/ninetalesb.png rename to gfx/pokemon/back/ninetalesb.png diff --git a/pic/monback/oddishb.png b/gfx/pokemon/back/oddishb.png similarity index 100% rename from pic/monback/oddishb.png rename to gfx/pokemon/back/oddishb.png diff --git a/pic/monback/omanyteb.png b/gfx/pokemon/back/omanyteb.png similarity index 100% rename from pic/monback/omanyteb.png rename to gfx/pokemon/back/omanyteb.png diff --git a/pic/monback/omastarb.png b/gfx/pokemon/back/omastarb.png similarity index 100% rename from pic/monback/omastarb.png rename to gfx/pokemon/back/omastarb.png diff --git a/pic/monback/onixb.png b/gfx/pokemon/back/onixb.png similarity index 100% rename from pic/monback/onixb.png rename to gfx/pokemon/back/onixb.png diff --git a/pic/monback/parasb.png b/gfx/pokemon/back/parasb.png similarity index 100% rename from pic/monback/parasb.png rename to gfx/pokemon/back/parasb.png diff --git a/pic/monback/parasectb.png b/gfx/pokemon/back/parasectb.png similarity index 100% rename from pic/monback/parasectb.png rename to gfx/pokemon/back/parasectb.png diff --git a/pic/monback/persianb.png b/gfx/pokemon/back/persianb.png similarity index 100% rename from pic/monback/persianb.png rename to gfx/pokemon/back/persianb.png diff --git a/pic/monback/pidgeotb.png b/gfx/pokemon/back/pidgeotb.png similarity index 100% rename from pic/monback/pidgeotb.png rename to gfx/pokemon/back/pidgeotb.png diff --git a/pic/monback/pidgeottob.png b/gfx/pokemon/back/pidgeottob.png similarity index 100% rename from pic/monback/pidgeottob.png rename to gfx/pokemon/back/pidgeottob.png diff --git a/pic/monback/pidgeyb.png b/gfx/pokemon/back/pidgeyb.png similarity index 100% rename from pic/monback/pidgeyb.png rename to gfx/pokemon/back/pidgeyb.png diff --git a/pic/monback/pikachub.png b/gfx/pokemon/back/pikachub.png similarity index 100% rename from pic/monback/pikachub.png rename to gfx/pokemon/back/pikachub.png diff --git a/pic/monback/pinsirb.png b/gfx/pokemon/back/pinsirb.png similarity index 100% rename from pic/monback/pinsirb.png rename to gfx/pokemon/back/pinsirb.png diff --git a/pic/monback/poliwagb.png b/gfx/pokemon/back/poliwagb.png similarity index 100% rename from pic/monback/poliwagb.png rename to gfx/pokemon/back/poliwagb.png diff --git a/pic/monback/poliwhirlb.png b/gfx/pokemon/back/poliwhirlb.png similarity index 100% rename from pic/monback/poliwhirlb.png rename to gfx/pokemon/back/poliwhirlb.png diff --git a/pic/monback/poliwrathb.png b/gfx/pokemon/back/poliwrathb.png similarity index 100% rename from pic/monback/poliwrathb.png rename to gfx/pokemon/back/poliwrathb.png diff --git a/pic/monback/ponytab.png b/gfx/pokemon/back/ponytab.png similarity index 100% rename from pic/monback/ponytab.png rename to gfx/pokemon/back/ponytab.png diff --git a/pic/monback/porygonb.png b/gfx/pokemon/back/porygonb.png similarity index 100% rename from pic/monback/porygonb.png rename to gfx/pokemon/back/porygonb.png diff --git a/pic/monback/primeapeb.png b/gfx/pokemon/back/primeapeb.png similarity index 100% rename from pic/monback/primeapeb.png rename to gfx/pokemon/back/primeapeb.png diff --git a/pic/monback/psyduckb.png b/gfx/pokemon/back/psyduckb.png similarity index 100% rename from pic/monback/psyduckb.png rename to gfx/pokemon/back/psyduckb.png diff --git a/pic/monback/raichub.png b/gfx/pokemon/back/raichub.png similarity index 100% rename from pic/monback/raichub.png rename to gfx/pokemon/back/raichub.png diff --git a/pic/monback/rapidashb.png b/gfx/pokemon/back/rapidashb.png similarity index 100% rename from pic/monback/rapidashb.png rename to gfx/pokemon/back/rapidashb.png diff --git a/pic/monback/raticateb.png b/gfx/pokemon/back/raticateb.png similarity index 100% rename from pic/monback/raticateb.png rename to gfx/pokemon/back/raticateb.png diff --git a/pic/monback/rattatab.png b/gfx/pokemon/back/rattatab.png similarity index 100% rename from pic/monback/rattatab.png rename to gfx/pokemon/back/rattatab.png diff --git a/pic/monback/rhydonb.png b/gfx/pokemon/back/rhydonb.png similarity index 100% rename from pic/monback/rhydonb.png rename to gfx/pokemon/back/rhydonb.png diff --git a/pic/monback/rhyhornb.png b/gfx/pokemon/back/rhyhornb.png similarity index 100% rename from pic/monback/rhyhornb.png rename to gfx/pokemon/back/rhyhornb.png diff --git a/pic/monback/sandshrewb.png b/gfx/pokemon/back/sandshrewb.png similarity index 100% rename from pic/monback/sandshrewb.png rename to gfx/pokemon/back/sandshrewb.png diff --git a/pic/monback/sandslashb.png b/gfx/pokemon/back/sandslashb.png similarity index 100% rename from pic/monback/sandslashb.png rename to gfx/pokemon/back/sandslashb.png diff --git a/pic/monback/scytherb.png b/gfx/pokemon/back/scytherb.png similarity index 100% rename from pic/monback/scytherb.png rename to gfx/pokemon/back/scytherb.png diff --git a/pic/monback/seadrab.png b/gfx/pokemon/back/seadrab.png similarity index 100% rename from pic/monback/seadrab.png rename to gfx/pokemon/back/seadrab.png diff --git a/pic/monback/seakingb.png b/gfx/pokemon/back/seakingb.png similarity index 100% rename from pic/monback/seakingb.png rename to gfx/pokemon/back/seakingb.png diff --git a/pic/monback/seelb.png b/gfx/pokemon/back/seelb.png similarity index 100% rename from pic/monback/seelb.png rename to gfx/pokemon/back/seelb.png diff --git a/pic/monback/shellderb.png b/gfx/pokemon/back/shellderb.png similarity index 100% rename from pic/monback/shellderb.png rename to gfx/pokemon/back/shellderb.png diff --git a/pic/monback/slowbrob.png b/gfx/pokemon/back/slowbrob.png similarity index 100% rename from pic/monback/slowbrob.png rename to gfx/pokemon/back/slowbrob.png diff --git a/pic/monback/slowpokeb.png b/gfx/pokemon/back/slowpokeb.png similarity index 100% rename from pic/monback/slowpokeb.png rename to gfx/pokemon/back/slowpokeb.png diff --git a/pic/monback/snorlaxb.png b/gfx/pokemon/back/snorlaxb.png similarity index 100% rename from pic/monback/snorlaxb.png rename to gfx/pokemon/back/snorlaxb.png diff --git a/pic/monback/spearowb.png b/gfx/pokemon/back/spearowb.png similarity index 100% rename from pic/monback/spearowb.png rename to gfx/pokemon/back/spearowb.png diff --git a/pic/monback/squirtleb.png b/gfx/pokemon/back/squirtleb.png similarity index 100% rename from pic/monback/squirtleb.png rename to gfx/pokemon/back/squirtleb.png diff --git a/pic/monback/starmieb.png b/gfx/pokemon/back/starmieb.png similarity index 100% rename from pic/monback/starmieb.png rename to gfx/pokemon/back/starmieb.png diff --git a/pic/monback/staryub.png b/gfx/pokemon/back/staryub.png similarity index 100% rename from pic/monback/staryub.png rename to gfx/pokemon/back/staryub.png diff --git a/pic/monback/tangelab.png b/gfx/pokemon/back/tangelab.png similarity index 100% rename from pic/monback/tangelab.png rename to gfx/pokemon/back/tangelab.png diff --git a/pic/monback/taurosb.png b/gfx/pokemon/back/taurosb.png similarity index 100% rename from pic/monback/taurosb.png rename to gfx/pokemon/back/taurosb.png diff --git a/pic/monback/tentacoolb.png b/gfx/pokemon/back/tentacoolb.png similarity index 100% rename from pic/monback/tentacoolb.png rename to gfx/pokemon/back/tentacoolb.png diff --git a/pic/monback/tentacruelb.png b/gfx/pokemon/back/tentacruelb.png similarity index 100% rename from pic/monback/tentacruelb.png rename to gfx/pokemon/back/tentacruelb.png diff --git a/pic/monback/vaporeonb.png b/gfx/pokemon/back/vaporeonb.png similarity index 100% rename from pic/monback/vaporeonb.png rename to gfx/pokemon/back/vaporeonb.png diff --git a/pic/monback/venomothb.png b/gfx/pokemon/back/venomothb.png similarity index 100% rename from pic/monback/venomothb.png rename to gfx/pokemon/back/venomothb.png diff --git a/pic/monback/venonatb.png b/gfx/pokemon/back/venonatb.png similarity index 100% rename from pic/monback/venonatb.png rename to gfx/pokemon/back/venonatb.png diff --git a/pic/monback/venusaurb.png b/gfx/pokemon/back/venusaurb.png similarity index 100% rename from pic/monback/venusaurb.png rename to gfx/pokemon/back/venusaurb.png diff --git a/pic/monback/victreebelb.png b/gfx/pokemon/back/victreebelb.png similarity index 100% rename from pic/monback/victreebelb.png rename to gfx/pokemon/back/victreebelb.png diff --git a/pic/monback/vileplumeb.png b/gfx/pokemon/back/vileplumeb.png similarity index 100% rename from pic/monback/vileplumeb.png rename to gfx/pokemon/back/vileplumeb.png diff --git a/pic/monback/voltorbb.png b/gfx/pokemon/back/voltorbb.png similarity index 100% rename from pic/monback/voltorbb.png rename to gfx/pokemon/back/voltorbb.png diff --git a/pic/monback/vulpixb.png b/gfx/pokemon/back/vulpixb.png similarity index 100% rename from pic/monback/vulpixb.png rename to gfx/pokemon/back/vulpixb.png diff --git a/pic/monback/wartortleb.png b/gfx/pokemon/back/wartortleb.png similarity index 100% rename from pic/monback/wartortleb.png rename to gfx/pokemon/back/wartortleb.png diff --git a/pic/monback/weedleb.png b/gfx/pokemon/back/weedleb.png similarity index 100% rename from pic/monback/weedleb.png rename to gfx/pokemon/back/weedleb.png diff --git a/pic/monback/weepinbellb.png b/gfx/pokemon/back/weepinbellb.png similarity index 100% rename from pic/monback/weepinbellb.png rename to gfx/pokemon/back/weepinbellb.png diff --git a/pic/monback/weezingb.png b/gfx/pokemon/back/weezingb.png similarity index 100% rename from pic/monback/weezingb.png rename to gfx/pokemon/back/weezingb.png diff --git a/pic/monback/wigglytuffb.png b/gfx/pokemon/back/wigglytuffb.png similarity index 100% rename from pic/monback/wigglytuffb.png rename to gfx/pokemon/back/wigglytuffb.png diff --git a/pic/monback/zapdosb.png b/gfx/pokemon/back/zapdosb.png similarity index 100% rename from pic/monback/zapdosb.png rename to gfx/pokemon/back/zapdosb.png diff --git a/pic/monback/zubatb.png b/gfx/pokemon/back/zubatb.png similarity index 100% rename from pic/monback/zubatb.png rename to gfx/pokemon/back/zubatb.png diff --git a/gfx/pokemon/downscaled_3x3.tilemap b/gfx/pokemon/downscaled_3x3.tilemap new file mode 100644 index 00000000..885f4a55 --- /dev/null +++ b/gfx/pokemon/downscaled_3x3.tilemap @@ -0,0 +1 @@ +1F[4I^7La \ No newline at end of file diff --git a/gfx/pokemon/downscaled_5x5.tilemap b/gfx/pokemon/downscaled_5x5.tilemap new file mode 100644 index 00000000..bc99ac23 --- /dev/null +++ b/gfx/pokemon/downscaled_5x5.tilemap @@ -0,0 +1 @@ +18FT[29GU\4;IW^6=KY`7>LZa \ No newline at end of file diff --git a/gfx/pokemon/front.tilemap b/gfx/pokemon/front.tilemap new file mode 100644 index 00000000..2f3cb316 Binary files /dev/null and b/gfx/pokemon/front.tilemap differ diff --git a/pic/bmon/abra.png b/gfx/pokemon/front/abra.png similarity index 100% rename from pic/bmon/abra.png rename to gfx/pokemon/front/abra.png diff --git a/pic/bmon/aerodactyl.png b/gfx/pokemon/front/aerodactyl.png similarity index 100% rename from pic/bmon/aerodactyl.png rename to gfx/pokemon/front/aerodactyl.png diff --git a/pic/bmon/alakazam.png b/gfx/pokemon/front/alakazam.png similarity index 100% rename from pic/bmon/alakazam.png rename to gfx/pokemon/front/alakazam.png diff --git a/pic/bmon/arbok.png b/gfx/pokemon/front/arbok.png similarity index 100% rename from pic/bmon/arbok.png rename to gfx/pokemon/front/arbok.png diff --git a/pic/bmon/arcanine.png b/gfx/pokemon/front/arcanine.png similarity index 100% rename from pic/bmon/arcanine.png rename to gfx/pokemon/front/arcanine.png diff --git a/pic/bmon/articuno.png b/gfx/pokemon/front/articuno.png similarity index 100% rename from pic/bmon/articuno.png rename to gfx/pokemon/front/articuno.png diff --git a/pic/bmon/beedrill.png b/gfx/pokemon/front/beedrill.png similarity index 100% rename from pic/bmon/beedrill.png rename to gfx/pokemon/front/beedrill.png diff --git a/pic/bmon/bellsprout.png b/gfx/pokemon/front/bellsprout.png similarity index 100% rename from pic/bmon/bellsprout.png rename to gfx/pokemon/front/bellsprout.png diff --git a/pic/bmon/blastoise.png b/gfx/pokemon/front/blastoise.png similarity index 100% rename from pic/bmon/blastoise.png rename to gfx/pokemon/front/blastoise.png diff --git a/pic/bmon/bulbasaur.png b/gfx/pokemon/front/bulbasaur.png similarity index 100% rename from pic/bmon/bulbasaur.png rename to gfx/pokemon/front/bulbasaur.png diff --git a/pic/bmon/butterfree.png b/gfx/pokemon/front/butterfree.png similarity index 100% rename from pic/bmon/butterfree.png rename to gfx/pokemon/front/butterfree.png diff --git a/pic/bmon/caterpie.png b/gfx/pokemon/front/caterpie.png similarity index 100% rename from pic/bmon/caterpie.png rename to gfx/pokemon/front/caterpie.png diff --git a/pic/bmon/chansey.png b/gfx/pokemon/front/chansey.png similarity index 100% rename from pic/bmon/chansey.png rename to gfx/pokemon/front/chansey.png diff --git a/pic/bmon/charizard.png b/gfx/pokemon/front/charizard.png similarity index 100% rename from pic/bmon/charizard.png rename to gfx/pokemon/front/charizard.png diff --git a/pic/bmon/charmander.png b/gfx/pokemon/front/charmander.png similarity index 100% rename from pic/bmon/charmander.png rename to gfx/pokemon/front/charmander.png diff --git a/pic/bmon/charmeleon.png b/gfx/pokemon/front/charmeleon.png similarity index 100% rename from pic/bmon/charmeleon.png rename to gfx/pokemon/front/charmeleon.png diff --git a/pic/bmon/clefable.png b/gfx/pokemon/front/clefable.png similarity index 100% rename from pic/bmon/clefable.png rename to gfx/pokemon/front/clefable.png diff --git a/pic/bmon/clefairy.png b/gfx/pokemon/front/clefairy.png similarity index 100% rename from pic/bmon/clefairy.png rename to gfx/pokemon/front/clefairy.png diff --git a/pic/bmon/cloyster.png b/gfx/pokemon/front/cloyster.png similarity index 100% rename from pic/bmon/cloyster.png rename to gfx/pokemon/front/cloyster.png diff --git a/pic/bmon/cubone.png b/gfx/pokemon/front/cubone.png similarity index 100% rename from pic/bmon/cubone.png rename to gfx/pokemon/front/cubone.png diff --git a/pic/bmon/dewgong.png b/gfx/pokemon/front/dewgong.png similarity index 100% rename from pic/bmon/dewgong.png rename to gfx/pokemon/front/dewgong.png diff --git a/pic/bmon/diglett.png b/gfx/pokemon/front/diglett.png similarity index 100% rename from pic/bmon/diglett.png rename to gfx/pokemon/front/diglett.png diff --git a/pic/bmon/ditto.png b/gfx/pokemon/front/ditto.png similarity index 100% rename from pic/bmon/ditto.png rename to gfx/pokemon/front/ditto.png diff --git a/pic/bmon/dodrio.png b/gfx/pokemon/front/dodrio.png similarity index 100% rename from pic/bmon/dodrio.png rename to gfx/pokemon/front/dodrio.png diff --git a/pic/bmon/doduo.png b/gfx/pokemon/front/doduo.png similarity index 100% rename from pic/bmon/doduo.png rename to gfx/pokemon/front/doduo.png diff --git a/pic/bmon/dragonair.png b/gfx/pokemon/front/dragonair.png similarity index 100% rename from pic/bmon/dragonair.png rename to gfx/pokemon/front/dragonair.png diff --git a/pic/bmon/dragonite.png b/gfx/pokemon/front/dragonite.png similarity index 100% rename from pic/bmon/dragonite.png rename to gfx/pokemon/front/dragonite.png diff --git a/pic/bmon/dratini.png b/gfx/pokemon/front/dratini.png similarity index 100% rename from pic/bmon/dratini.png rename to gfx/pokemon/front/dratini.png diff --git a/pic/bmon/drowzee.png b/gfx/pokemon/front/drowzee.png similarity index 100% rename from pic/bmon/drowzee.png rename to gfx/pokemon/front/drowzee.png diff --git a/pic/bmon/dugtrio.png b/gfx/pokemon/front/dugtrio.png similarity index 100% rename from pic/bmon/dugtrio.png rename to gfx/pokemon/front/dugtrio.png diff --git a/pic/bmon/eevee.png b/gfx/pokemon/front/eevee.png similarity index 100% rename from pic/bmon/eevee.png rename to gfx/pokemon/front/eevee.png diff --git a/pic/bmon/ekans.png b/gfx/pokemon/front/ekans.png similarity index 100% rename from pic/bmon/ekans.png rename to gfx/pokemon/front/ekans.png diff --git a/pic/bmon/electabuzz.png b/gfx/pokemon/front/electabuzz.png similarity index 100% rename from pic/bmon/electabuzz.png rename to gfx/pokemon/front/electabuzz.png diff --git a/pic/bmon/electrode.png b/gfx/pokemon/front/electrode.png similarity index 100% rename from pic/bmon/electrode.png rename to gfx/pokemon/front/electrode.png diff --git a/pic/bmon/exeggcute.png b/gfx/pokemon/front/exeggcute.png similarity index 100% rename from pic/bmon/exeggcute.png rename to gfx/pokemon/front/exeggcute.png diff --git a/pic/bmon/exeggutor.png b/gfx/pokemon/front/exeggutor.png similarity index 100% rename from pic/bmon/exeggutor.png rename to gfx/pokemon/front/exeggutor.png diff --git a/pic/bmon/farfetchd.png b/gfx/pokemon/front/farfetchd.png similarity index 100% rename from pic/bmon/farfetchd.png rename to gfx/pokemon/front/farfetchd.png diff --git a/pic/bmon/fearow.png b/gfx/pokemon/front/fearow.png similarity index 100% rename from pic/bmon/fearow.png rename to gfx/pokemon/front/fearow.png diff --git a/pic/bmon/flareon.png b/gfx/pokemon/front/flareon.png similarity index 100% rename from pic/bmon/flareon.png rename to gfx/pokemon/front/flareon.png diff --git a/pic/bmon/fossilaerodactyl.png b/gfx/pokemon/front/fossilaerodactyl.png similarity index 100% rename from pic/bmon/fossilaerodactyl.png rename to gfx/pokemon/front/fossilaerodactyl.png diff --git a/pic/bmon/fossilkabutops.png b/gfx/pokemon/front/fossilkabutops.png similarity index 100% rename from pic/bmon/fossilkabutops.png rename to gfx/pokemon/front/fossilkabutops.png diff --git a/pic/bmon/gastly.png b/gfx/pokemon/front/gastly.png similarity index 100% rename from pic/bmon/gastly.png rename to gfx/pokemon/front/gastly.png diff --git a/pic/bmon/gengar.png b/gfx/pokemon/front/gengar.png similarity index 100% rename from pic/bmon/gengar.png rename to gfx/pokemon/front/gengar.png diff --git a/pic/bmon/geodude.png b/gfx/pokemon/front/geodude.png similarity index 100% rename from pic/bmon/geodude.png rename to gfx/pokemon/front/geodude.png diff --git a/pic/bmon/gloom.png b/gfx/pokemon/front/gloom.png similarity index 100% rename from pic/bmon/gloom.png rename to gfx/pokemon/front/gloom.png diff --git a/pic/bmon/golbat.png b/gfx/pokemon/front/golbat.png similarity index 100% rename from pic/bmon/golbat.png rename to gfx/pokemon/front/golbat.png diff --git a/pic/bmon/goldeen.png b/gfx/pokemon/front/goldeen.png similarity index 100% rename from pic/bmon/goldeen.png rename to gfx/pokemon/front/goldeen.png diff --git a/pic/bmon/golduck.png b/gfx/pokemon/front/golduck.png similarity index 100% rename from pic/bmon/golduck.png rename to gfx/pokemon/front/golduck.png diff --git a/pic/bmon/golem.png b/gfx/pokemon/front/golem.png similarity index 100% rename from pic/bmon/golem.png rename to gfx/pokemon/front/golem.png diff --git a/pic/bmon/graveler.png b/gfx/pokemon/front/graveler.png similarity index 100% rename from pic/bmon/graveler.png rename to gfx/pokemon/front/graveler.png diff --git a/pic/bmon/grimer.png b/gfx/pokemon/front/grimer.png similarity index 100% rename from pic/bmon/grimer.png rename to gfx/pokemon/front/grimer.png diff --git a/pic/bmon/growlithe.png b/gfx/pokemon/front/growlithe.png similarity index 100% rename from pic/bmon/growlithe.png rename to gfx/pokemon/front/growlithe.png diff --git a/pic/bmon/gyarados.png b/gfx/pokemon/front/gyarados.png similarity index 100% rename from pic/bmon/gyarados.png rename to gfx/pokemon/front/gyarados.png diff --git a/pic/bmon/haunter.png b/gfx/pokemon/front/haunter.png similarity index 100% rename from pic/bmon/haunter.png rename to gfx/pokemon/front/haunter.png diff --git a/pic/bmon/hitmonchan.png b/gfx/pokemon/front/hitmonchan.png similarity index 100% rename from pic/bmon/hitmonchan.png rename to gfx/pokemon/front/hitmonchan.png diff --git a/pic/bmon/hitmonlee.png b/gfx/pokemon/front/hitmonlee.png similarity index 100% rename from pic/bmon/hitmonlee.png rename to gfx/pokemon/front/hitmonlee.png diff --git a/pic/bmon/horsea.png b/gfx/pokemon/front/horsea.png similarity index 100% rename from pic/bmon/horsea.png rename to gfx/pokemon/front/horsea.png diff --git a/pic/bmon/hypno.png b/gfx/pokemon/front/hypno.png similarity index 100% rename from pic/bmon/hypno.png rename to gfx/pokemon/front/hypno.png diff --git a/pic/bmon/ivysaur.png b/gfx/pokemon/front/ivysaur.png similarity index 100% rename from pic/bmon/ivysaur.png rename to gfx/pokemon/front/ivysaur.png diff --git a/pic/bmon/jigglypuff.png b/gfx/pokemon/front/jigglypuff.png similarity index 100% rename from pic/bmon/jigglypuff.png rename to gfx/pokemon/front/jigglypuff.png diff --git a/pic/bmon/jolteon.png b/gfx/pokemon/front/jolteon.png similarity index 100% rename from pic/bmon/jolteon.png rename to gfx/pokemon/front/jolteon.png diff --git a/pic/bmon/jynx.png b/gfx/pokemon/front/jynx.png similarity index 100% rename from pic/bmon/jynx.png rename to gfx/pokemon/front/jynx.png diff --git a/pic/bmon/kabuto.png b/gfx/pokemon/front/kabuto.png similarity index 100% rename from pic/bmon/kabuto.png rename to gfx/pokemon/front/kabuto.png diff --git a/pic/bmon/kabutops.png b/gfx/pokemon/front/kabutops.png similarity index 100% rename from pic/bmon/kabutops.png rename to gfx/pokemon/front/kabutops.png diff --git a/pic/bmon/kadabra.png b/gfx/pokemon/front/kadabra.png similarity index 100% rename from pic/bmon/kadabra.png rename to gfx/pokemon/front/kadabra.png diff --git a/pic/bmon/kakuna.png b/gfx/pokemon/front/kakuna.png similarity index 100% rename from pic/bmon/kakuna.png rename to gfx/pokemon/front/kakuna.png diff --git a/pic/bmon/kangaskhan.png b/gfx/pokemon/front/kangaskhan.png similarity index 100% rename from pic/bmon/kangaskhan.png rename to gfx/pokemon/front/kangaskhan.png diff --git a/pic/bmon/kingler.png b/gfx/pokemon/front/kingler.png similarity index 100% rename from pic/bmon/kingler.png rename to gfx/pokemon/front/kingler.png diff --git a/pic/bmon/koffing.png b/gfx/pokemon/front/koffing.png similarity index 100% rename from pic/bmon/koffing.png rename to gfx/pokemon/front/koffing.png diff --git a/pic/bmon/krabby.png b/gfx/pokemon/front/krabby.png similarity index 100% rename from pic/bmon/krabby.png rename to gfx/pokemon/front/krabby.png diff --git a/pic/bmon/lapras.png b/gfx/pokemon/front/lapras.png similarity index 100% rename from pic/bmon/lapras.png rename to gfx/pokemon/front/lapras.png diff --git a/pic/bmon/lickitung.png b/gfx/pokemon/front/lickitung.png similarity index 100% rename from pic/bmon/lickitung.png rename to gfx/pokemon/front/lickitung.png diff --git a/pic/bmon/machamp.png b/gfx/pokemon/front/machamp.png similarity index 100% rename from pic/bmon/machamp.png rename to gfx/pokemon/front/machamp.png diff --git a/pic/bmon/machoke.png b/gfx/pokemon/front/machoke.png similarity index 100% rename from pic/bmon/machoke.png rename to gfx/pokemon/front/machoke.png diff --git a/pic/bmon/machop.png b/gfx/pokemon/front/machop.png similarity index 100% rename from pic/bmon/machop.png rename to gfx/pokemon/front/machop.png diff --git a/pic/bmon/magikarp.png b/gfx/pokemon/front/magikarp.png similarity index 100% rename from pic/bmon/magikarp.png rename to gfx/pokemon/front/magikarp.png diff --git a/pic/bmon/magmar.png b/gfx/pokemon/front/magmar.png similarity index 100% rename from pic/bmon/magmar.png rename to gfx/pokemon/front/magmar.png diff --git a/pic/bmon/magnemite.png b/gfx/pokemon/front/magnemite.png similarity index 100% rename from pic/bmon/magnemite.png rename to gfx/pokemon/front/magnemite.png diff --git a/pic/bmon/magneton.png b/gfx/pokemon/front/magneton.png similarity index 100% rename from pic/bmon/magneton.png rename to gfx/pokemon/front/magneton.png diff --git a/pic/bmon/mankey.png b/gfx/pokemon/front/mankey.png similarity index 100% rename from pic/bmon/mankey.png rename to gfx/pokemon/front/mankey.png diff --git a/pic/bmon/marowak.png b/gfx/pokemon/front/marowak.png similarity index 100% rename from pic/bmon/marowak.png rename to gfx/pokemon/front/marowak.png diff --git a/pic/bmon/meowth.png b/gfx/pokemon/front/meowth.png similarity index 100% rename from pic/bmon/meowth.png rename to gfx/pokemon/front/meowth.png diff --git a/pic/bmon/metapod.png b/gfx/pokemon/front/metapod.png similarity index 100% rename from pic/bmon/metapod.png rename to gfx/pokemon/front/metapod.png diff --git a/pic/bmon/mew.png b/gfx/pokemon/front/mew.png similarity index 100% rename from pic/bmon/mew.png rename to gfx/pokemon/front/mew.png diff --git a/pic/bmon/mewtwo.png b/gfx/pokemon/front/mewtwo.png similarity index 100% rename from pic/bmon/mewtwo.png rename to gfx/pokemon/front/mewtwo.png diff --git a/pic/bmon/moltres.png b/gfx/pokemon/front/moltres.png similarity index 100% rename from pic/bmon/moltres.png rename to gfx/pokemon/front/moltres.png diff --git a/pic/bmon/mr.mime.png b/gfx/pokemon/front/mr.mime.png similarity index 100% rename from pic/bmon/mr.mime.png rename to gfx/pokemon/front/mr.mime.png diff --git a/pic/bmon/muk.png b/gfx/pokemon/front/muk.png similarity index 100% rename from pic/bmon/muk.png rename to gfx/pokemon/front/muk.png diff --git a/pic/bmon/nidoking.png b/gfx/pokemon/front/nidoking.png similarity index 100% rename from pic/bmon/nidoking.png rename to gfx/pokemon/front/nidoking.png diff --git a/pic/bmon/nidoqueen.png b/gfx/pokemon/front/nidoqueen.png similarity index 100% rename from pic/bmon/nidoqueen.png rename to gfx/pokemon/front/nidoqueen.png diff --git a/pic/bmon/nidoranf.png b/gfx/pokemon/front/nidoranf.png similarity index 100% rename from pic/bmon/nidoranf.png rename to gfx/pokemon/front/nidoranf.png diff --git a/pic/bmon/nidoranm.png b/gfx/pokemon/front/nidoranm.png similarity index 100% rename from pic/bmon/nidoranm.png rename to gfx/pokemon/front/nidoranm.png diff --git a/pic/bmon/nidorina.png b/gfx/pokemon/front/nidorina.png similarity index 100% rename from pic/bmon/nidorina.png rename to gfx/pokemon/front/nidorina.png diff --git a/pic/bmon/nidorino.png b/gfx/pokemon/front/nidorino.png similarity index 100% rename from pic/bmon/nidorino.png rename to gfx/pokemon/front/nidorino.png diff --git a/pic/bmon/ninetales.png b/gfx/pokemon/front/ninetales.png similarity index 100% rename from pic/bmon/ninetales.png rename to gfx/pokemon/front/ninetales.png diff --git a/pic/bmon/oddish.png b/gfx/pokemon/front/oddish.png similarity index 100% rename from pic/bmon/oddish.png rename to gfx/pokemon/front/oddish.png diff --git a/pic/bmon/omanyte.png b/gfx/pokemon/front/omanyte.png similarity index 100% rename from pic/bmon/omanyte.png rename to gfx/pokemon/front/omanyte.png diff --git a/pic/bmon/omastar.png b/gfx/pokemon/front/omastar.png similarity index 100% rename from pic/bmon/omastar.png rename to gfx/pokemon/front/omastar.png diff --git a/pic/bmon/onix.png b/gfx/pokemon/front/onix.png similarity index 100% rename from pic/bmon/onix.png rename to gfx/pokemon/front/onix.png diff --git a/pic/bmon/paras.png b/gfx/pokemon/front/paras.png similarity index 100% rename from pic/bmon/paras.png rename to gfx/pokemon/front/paras.png diff --git a/pic/bmon/parasect.png b/gfx/pokemon/front/parasect.png similarity index 100% rename from pic/bmon/parasect.png rename to gfx/pokemon/front/parasect.png diff --git a/pic/bmon/persian.png b/gfx/pokemon/front/persian.png similarity index 100% rename from pic/bmon/persian.png rename to gfx/pokemon/front/persian.png diff --git a/pic/bmon/pidgeot.png b/gfx/pokemon/front/pidgeot.png similarity index 100% rename from pic/bmon/pidgeot.png rename to gfx/pokemon/front/pidgeot.png diff --git a/pic/bmon/pidgeotto.png b/gfx/pokemon/front/pidgeotto.png similarity index 100% rename from pic/bmon/pidgeotto.png rename to gfx/pokemon/front/pidgeotto.png diff --git a/pic/bmon/pidgey.png b/gfx/pokemon/front/pidgey.png similarity index 100% rename from pic/bmon/pidgey.png rename to gfx/pokemon/front/pidgey.png diff --git a/pic/bmon/pikachu.png b/gfx/pokemon/front/pikachu.png similarity index 100% rename from pic/bmon/pikachu.png rename to gfx/pokemon/front/pikachu.png diff --git a/pic/bmon/pinsir.png b/gfx/pokemon/front/pinsir.png similarity index 100% rename from pic/bmon/pinsir.png rename to gfx/pokemon/front/pinsir.png diff --git a/pic/bmon/poliwag.png b/gfx/pokemon/front/poliwag.png similarity index 100% rename from pic/bmon/poliwag.png rename to gfx/pokemon/front/poliwag.png diff --git a/pic/bmon/poliwhirl.png b/gfx/pokemon/front/poliwhirl.png similarity index 100% rename from pic/bmon/poliwhirl.png rename to gfx/pokemon/front/poliwhirl.png diff --git a/pic/bmon/poliwrath.png b/gfx/pokemon/front/poliwrath.png similarity index 100% rename from pic/bmon/poliwrath.png rename to gfx/pokemon/front/poliwrath.png diff --git a/pic/bmon/ponyta.png b/gfx/pokemon/front/ponyta.png similarity index 100% rename from pic/bmon/ponyta.png rename to gfx/pokemon/front/ponyta.png diff --git a/pic/bmon/porygon.png b/gfx/pokemon/front/porygon.png similarity index 100% rename from pic/bmon/porygon.png rename to gfx/pokemon/front/porygon.png diff --git a/pic/bmon/primeape.png b/gfx/pokemon/front/primeape.png similarity index 100% rename from pic/bmon/primeape.png rename to gfx/pokemon/front/primeape.png diff --git a/pic/bmon/psyduck.png b/gfx/pokemon/front/psyduck.png similarity index 100% rename from pic/bmon/psyduck.png rename to gfx/pokemon/front/psyduck.png diff --git a/pic/bmon/raichu.png b/gfx/pokemon/front/raichu.png similarity index 100% rename from pic/bmon/raichu.png rename to gfx/pokemon/front/raichu.png diff --git a/pic/bmon/rapidash.png b/gfx/pokemon/front/rapidash.png similarity index 100% rename from pic/bmon/rapidash.png rename to gfx/pokemon/front/rapidash.png diff --git a/pic/bmon/raticate.png b/gfx/pokemon/front/raticate.png similarity index 100% rename from pic/bmon/raticate.png rename to gfx/pokemon/front/raticate.png diff --git a/pic/bmon/rattata.png b/gfx/pokemon/front/rattata.png similarity index 100% rename from pic/bmon/rattata.png rename to gfx/pokemon/front/rattata.png diff --git a/pic/bmon/rhydon.png b/gfx/pokemon/front/rhydon.png similarity index 100% rename from pic/bmon/rhydon.png rename to gfx/pokemon/front/rhydon.png diff --git a/pic/bmon/rhyhorn.png b/gfx/pokemon/front/rhyhorn.png similarity index 100% rename from pic/bmon/rhyhorn.png rename to gfx/pokemon/front/rhyhorn.png diff --git a/pic/bmon/sandshrew.png b/gfx/pokemon/front/sandshrew.png similarity index 100% rename from pic/bmon/sandshrew.png rename to gfx/pokemon/front/sandshrew.png diff --git a/pic/bmon/sandslash.png b/gfx/pokemon/front/sandslash.png similarity index 100% rename from pic/bmon/sandslash.png rename to gfx/pokemon/front/sandslash.png diff --git a/pic/bmon/scyther.png b/gfx/pokemon/front/scyther.png similarity index 100% rename from pic/bmon/scyther.png rename to gfx/pokemon/front/scyther.png diff --git a/pic/bmon/seadra.png b/gfx/pokemon/front/seadra.png similarity index 100% rename from pic/bmon/seadra.png rename to gfx/pokemon/front/seadra.png diff --git a/pic/bmon/seaking.png b/gfx/pokemon/front/seaking.png similarity index 100% rename from pic/bmon/seaking.png rename to gfx/pokemon/front/seaking.png diff --git a/pic/bmon/seel.png b/gfx/pokemon/front/seel.png similarity index 100% rename from pic/bmon/seel.png rename to gfx/pokemon/front/seel.png diff --git a/pic/bmon/shellder.png b/gfx/pokemon/front/shellder.png similarity index 100% rename from pic/bmon/shellder.png rename to gfx/pokemon/front/shellder.png diff --git a/pic/bmon/slowbro.png b/gfx/pokemon/front/slowbro.png similarity index 100% rename from pic/bmon/slowbro.png rename to gfx/pokemon/front/slowbro.png diff --git a/pic/bmon/slowpoke.png b/gfx/pokemon/front/slowpoke.png similarity index 100% rename from pic/bmon/slowpoke.png rename to gfx/pokemon/front/slowpoke.png diff --git a/pic/bmon/snorlax.png b/gfx/pokemon/front/snorlax.png similarity index 100% rename from pic/bmon/snorlax.png rename to gfx/pokemon/front/snorlax.png diff --git a/pic/bmon/spearow.png b/gfx/pokemon/front/spearow.png similarity index 100% rename from pic/bmon/spearow.png rename to gfx/pokemon/front/spearow.png diff --git a/pic/bmon/squirtle.png b/gfx/pokemon/front/squirtle.png similarity index 100% rename from pic/bmon/squirtle.png rename to gfx/pokemon/front/squirtle.png diff --git a/pic/bmon/starmie.png b/gfx/pokemon/front/starmie.png similarity index 100% rename from pic/bmon/starmie.png rename to gfx/pokemon/front/starmie.png diff --git a/pic/bmon/staryu.png b/gfx/pokemon/front/staryu.png similarity index 100% rename from pic/bmon/staryu.png rename to gfx/pokemon/front/staryu.png diff --git a/pic/bmon/tangela.png b/gfx/pokemon/front/tangela.png similarity index 100% rename from pic/bmon/tangela.png rename to gfx/pokemon/front/tangela.png diff --git a/pic/bmon/tauros.png b/gfx/pokemon/front/tauros.png similarity index 100% rename from pic/bmon/tauros.png rename to gfx/pokemon/front/tauros.png diff --git a/pic/bmon/tentacool.png b/gfx/pokemon/front/tentacool.png similarity index 100% rename from pic/bmon/tentacool.png rename to gfx/pokemon/front/tentacool.png diff --git a/pic/bmon/tentacruel.png b/gfx/pokemon/front/tentacruel.png similarity index 100% rename from pic/bmon/tentacruel.png rename to gfx/pokemon/front/tentacruel.png diff --git a/pic/bmon/vaporeon.png b/gfx/pokemon/front/vaporeon.png similarity index 100% rename from pic/bmon/vaporeon.png rename to gfx/pokemon/front/vaporeon.png diff --git a/pic/bmon/venomoth.png b/gfx/pokemon/front/venomoth.png similarity index 100% rename from pic/bmon/venomoth.png rename to gfx/pokemon/front/venomoth.png diff --git a/pic/bmon/venonat.png b/gfx/pokemon/front/venonat.png similarity index 100% rename from pic/bmon/venonat.png rename to gfx/pokemon/front/venonat.png diff --git a/pic/bmon/venusaur.png b/gfx/pokemon/front/venusaur.png similarity index 100% rename from pic/bmon/venusaur.png rename to gfx/pokemon/front/venusaur.png diff --git a/pic/bmon/victreebel.png b/gfx/pokemon/front/victreebel.png similarity index 100% rename from pic/bmon/victreebel.png rename to gfx/pokemon/front/victreebel.png diff --git a/pic/bmon/vileplume.png b/gfx/pokemon/front/vileplume.png similarity index 100% rename from pic/bmon/vileplume.png rename to gfx/pokemon/front/vileplume.png diff --git a/pic/bmon/voltorb.png b/gfx/pokemon/front/voltorb.png similarity index 100% rename from pic/bmon/voltorb.png rename to gfx/pokemon/front/voltorb.png diff --git a/pic/bmon/vulpix.png b/gfx/pokemon/front/vulpix.png similarity index 100% rename from pic/bmon/vulpix.png rename to gfx/pokemon/front/vulpix.png diff --git a/pic/bmon/wartortle.png b/gfx/pokemon/front/wartortle.png similarity index 100% rename from pic/bmon/wartortle.png rename to gfx/pokemon/front/wartortle.png diff --git a/pic/bmon/weedle.png b/gfx/pokemon/front/weedle.png similarity index 100% rename from pic/bmon/weedle.png rename to gfx/pokemon/front/weedle.png diff --git a/pic/bmon/weepinbell.png b/gfx/pokemon/front/weepinbell.png similarity index 100% rename from pic/bmon/weepinbell.png rename to gfx/pokemon/front/weepinbell.png diff --git a/pic/bmon/weezing.png b/gfx/pokemon/front/weezing.png similarity index 100% rename from pic/bmon/weezing.png rename to gfx/pokemon/front/weezing.png diff --git a/pic/bmon/wigglytuff.png b/gfx/pokemon/front/wigglytuff.png similarity index 100% rename from pic/bmon/wigglytuff.png rename to gfx/pokemon/front/wigglytuff.png diff --git a/pic/bmon/zapdos.png b/gfx/pokemon/front/zapdos.png similarity index 100% rename from pic/bmon/zapdos.png rename to gfx/pokemon/front/zapdos.png diff --git a/pic/bmon/zubat.png b/gfx/pokemon/front/zubat.png similarity index 100% rename from pic/bmon/zubat.png rename to gfx/pokemon/front/zubat.png diff --git a/pic/rgmon/abra.png b/gfx/pokemon/front_rg/abra.png similarity index 100% rename from pic/rgmon/abra.png rename to gfx/pokemon/front_rg/abra.png diff --git a/pic/rgmon/aerodactyl.png b/gfx/pokemon/front_rg/aerodactyl.png similarity index 100% rename from pic/rgmon/aerodactyl.png rename to gfx/pokemon/front_rg/aerodactyl.png diff --git a/pic/rgmon/alakazam.png b/gfx/pokemon/front_rg/alakazam.png similarity index 100% rename from pic/rgmon/alakazam.png rename to gfx/pokemon/front_rg/alakazam.png diff --git a/pic/rgmon/arbok.png b/gfx/pokemon/front_rg/arbok.png similarity index 100% rename from pic/rgmon/arbok.png rename to gfx/pokemon/front_rg/arbok.png diff --git a/pic/rgmon/arcanine.png b/gfx/pokemon/front_rg/arcanine.png similarity index 100% rename from pic/rgmon/arcanine.png rename to gfx/pokemon/front_rg/arcanine.png diff --git a/pic/rgmon/articuno.png b/gfx/pokemon/front_rg/articuno.png similarity index 100% rename from pic/rgmon/articuno.png rename to gfx/pokemon/front_rg/articuno.png diff --git a/pic/rgmon/beedrill.png b/gfx/pokemon/front_rg/beedrill.png similarity index 100% rename from pic/rgmon/beedrill.png rename to gfx/pokemon/front_rg/beedrill.png diff --git a/pic/rgmon/bellsprout.png b/gfx/pokemon/front_rg/bellsprout.png similarity index 100% rename from pic/rgmon/bellsprout.png rename to gfx/pokemon/front_rg/bellsprout.png diff --git a/pic/rgmon/blastoise.png b/gfx/pokemon/front_rg/blastoise.png similarity index 100% rename from pic/rgmon/blastoise.png rename to gfx/pokemon/front_rg/blastoise.png diff --git a/pic/rgmon/bulbasaur.png b/gfx/pokemon/front_rg/bulbasaur.png similarity index 100% rename from pic/rgmon/bulbasaur.png rename to gfx/pokemon/front_rg/bulbasaur.png diff --git a/pic/rgmon/butterfree.png b/gfx/pokemon/front_rg/butterfree.png similarity index 100% rename from pic/rgmon/butterfree.png rename to gfx/pokemon/front_rg/butterfree.png diff --git a/pic/rgmon/caterpie.png b/gfx/pokemon/front_rg/caterpie.png similarity index 100% rename from pic/rgmon/caterpie.png rename to gfx/pokemon/front_rg/caterpie.png diff --git a/pic/rgmon/chansey.png b/gfx/pokemon/front_rg/chansey.png similarity index 100% rename from pic/rgmon/chansey.png rename to gfx/pokemon/front_rg/chansey.png diff --git a/pic/rgmon/charizard.png b/gfx/pokemon/front_rg/charizard.png similarity index 100% rename from pic/rgmon/charizard.png rename to gfx/pokemon/front_rg/charizard.png diff --git a/pic/rgmon/charmander.png b/gfx/pokemon/front_rg/charmander.png similarity index 100% rename from pic/rgmon/charmander.png rename to gfx/pokemon/front_rg/charmander.png diff --git a/pic/rgmon/charmeleon.png b/gfx/pokemon/front_rg/charmeleon.png similarity index 100% rename from pic/rgmon/charmeleon.png rename to gfx/pokemon/front_rg/charmeleon.png diff --git a/pic/rgmon/clefable.png b/gfx/pokemon/front_rg/clefable.png similarity index 100% rename from pic/rgmon/clefable.png rename to gfx/pokemon/front_rg/clefable.png diff --git a/pic/rgmon/clefairy.png b/gfx/pokemon/front_rg/clefairy.png similarity index 100% rename from pic/rgmon/clefairy.png rename to gfx/pokemon/front_rg/clefairy.png diff --git a/pic/rgmon/cloyster.png b/gfx/pokemon/front_rg/cloyster.png similarity index 100% rename from pic/rgmon/cloyster.png rename to gfx/pokemon/front_rg/cloyster.png diff --git a/pic/rgmon/cubone.png b/gfx/pokemon/front_rg/cubone.png similarity index 100% rename from pic/rgmon/cubone.png rename to gfx/pokemon/front_rg/cubone.png diff --git a/pic/rgmon/dewgong.png b/gfx/pokemon/front_rg/dewgong.png similarity index 100% rename from pic/rgmon/dewgong.png rename to gfx/pokemon/front_rg/dewgong.png diff --git a/pic/rgmon/diglett.png b/gfx/pokemon/front_rg/diglett.png similarity index 100% rename from pic/rgmon/diglett.png rename to gfx/pokemon/front_rg/diglett.png diff --git a/pic/rgmon/ditto.png b/gfx/pokemon/front_rg/ditto.png similarity index 100% rename from pic/rgmon/ditto.png rename to gfx/pokemon/front_rg/ditto.png diff --git a/pic/rgmon/dodrio.png b/gfx/pokemon/front_rg/dodrio.png similarity index 100% rename from pic/rgmon/dodrio.png rename to gfx/pokemon/front_rg/dodrio.png diff --git a/pic/rgmon/doduo.png b/gfx/pokemon/front_rg/doduo.png similarity index 100% rename from pic/rgmon/doduo.png rename to gfx/pokemon/front_rg/doduo.png diff --git a/pic/rgmon/dragonair.png b/gfx/pokemon/front_rg/dragonair.png similarity index 100% rename from pic/rgmon/dragonair.png rename to gfx/pokemon/front_rg/dragonair.png diff --git a/pic/rgmon/dragonite.png b/gfx/pokemon/front_rg/dragonite.png similarity index 100% rename from pic/rgmon/dragonite.png rename to gfx/pokemon/front_rg/dragonite.png diff --git a/pic/rgmon/dratini.png b/gfx/pokemon/front_rg/dratini.png similarity index 100% rename from pic/rgmon/dratini.png rename to gfx/pokemon/front_rg/dratini.png diff --git a/pic/rgmon/drowzee.png b/gfx/pokemon/front_rg/drowzee.png similarity index 100% rename from pic/rgmon/drowzee.png rename to gfx/pokemon/front_rg/drowzee.png diff --git a/pic/rgmon/dugtrio.png b/gfx/pokemon/front_rg/dugtrio.png similarity index 100% rename from pic/rgmon/dugtrio.png rename to gfx/pokemon/front_rg/dugtrio.png diff --git a/pic/rgmon/eevee.png b/gfx/pokemon/front_rg/eevee.png similarity index 100% rename from pic/rgmon/eevee.png rename to gfx/pokemon/front_rg/eevee.png diff --git a/pic/rgmon/ekans.png b/gfx/pokemon/front_rg/ekans.png similarity index 100% rename from pic/rgmon/ekans.png rename to gfx/pokemon/front_rg/ekans.png diff --git a/pic/rgmon/electabuzz.png b/gfx/pokemon/front_rg/electabuzz.png similarity index 100% rename from pic/rgmon/electabuzz.png rename to gfx/pokemon/front_rg/electabuzz.png diff --git a/pic/rgmon/electrode.png b/gfx/pokemon/front_rg/electrode.png similarity index 100% rename from pic/rgmon/electrode.png rename to gfx/pokemon/front_rg/electrode.png diff --git a/pic/rgmon/exeggcute.png b/gfx/pokemon/front_rg/exeggcute.png similarity index 100% rename from pic/rgmon/exeggcute.png rename to gfx/pokemon/front_rg/exeggcute.png diff --git a/pic/rgmon/exeggutor.png b/gfx/pokemon/front_rg/exeggutor.png similarity index 100% rename from pic/rgmon/exeggutor.png rename to gfx/pokemon/front_rg/exeggutor.png diff --git a/pic/rgmon/farfetchd.png b/gfx/pokemon/front_rg/farfetchd.png similarity index 100% rename from pic/rgmon/farfetchd.png rename to gfx/pokemon/front_rg/farfetchd.png diff --git a/pic/rgmon/fearow.png b/gfx/pokemon/front_rg/fearow.png similarity index 100% rename from pic/rgmon/fearow.png rename to gfx/pokemon/front_rg/fearow.png diff --git a/pic/rgmon/flareon.png b/gfx/pokemon/front_rg/flareon.png similarity index 100% rename from pic/rgmon/flareon.png rename to gfx/pokemon/front_rg/flareon.png diff --git a/pic/rgmon/fossilaerodactyl.png b/gfx/pokemon/front_rg/fossilaerodactyl.png similarity index 100% rename from pic/rgmon/fossilaerodactyl.png rename to gfx/pokemon/front_rg/fossilaerodactyl.png diff --git a/pic/rgmon/fossilkabutops.png b/gfx/pokemon/front_rg/fossilkabutops.png similarity index 100% rename from pic/rgmon/fossilkabutops.png rename to gfx/pokemon/front_rg/fossilkabutops.png diff --git a/pic/rgmon/gastly.png b/gfx/pokemon/front_rg/gastly.png similarity index 100% rename from pic/rgmon/gastly.png rename to gfx/pokemon/front_rg/gastly.png diff --git a/pic/rgmon/gengar.png b/gfx/pokemon/front_rg/gengar.png similarity index 100% rename from pic/rgmon/gengar.png rename to gfx/pokemon/front_rg/gengar.png diff --git a/pic/rgmon/geodude.png b/gfx/pokemon/front_rg/geodude.png similarity index 100% rename from pic/rgmon/geodude.png rename to gfx/pokemon/front_rg/geodude.png diff --git a/pic/rgmon/gloom.png b/gfx/pokemon/front_rg/gloom.png similarity index 100% rename from pic/rgmon/gloom.png rename to gfx/pokemon/front_rg/gloom.png diff --git a/pic/rgmon/golbat.png b/gfx/pokemon/front_rg/golbat.png similarity index 100% rename from pic/rgmon/golbat.png rename to gfx/pokemon/front_rg/golbat.png diff --git a/pic/rgmon/goldeen.png b/gfx/pokemon/front_rg/goldeen.png similarity index 100% rename from pic/rgmon/goldeen.png rename to gfx/pokemon/front_rg/goldeen.png diff --git a/pic/rgmon/golduck.png b/gfx/pokemon/front_rg/golduck.png similarity index 100% rename from pic/rgmon/golduck.png rename to gfx/pokemon/front_rg/golduck.png diff --git a/pic/rgmon/golem.png b/gfx/pokemon/front_rg/golem.png similarity index 100% rename from pic/rgmon/golem.png rename to gfx/pokemon/front_rg/golem.png diff --git a/pic/rgmon/graveler.png b/gfx/pokemon/front_rg/graveler.png similarity index 100% rename from pic/rgmon/graveler.png rename to gfx/pokemon/front_rg/graveler.png diff --git a/pic/rgmon/grimer.png b/gfx/pokemon/front_rg/grimer.png similarity index 100% rename from pic/rgmon/grimer.png rename to gfx/pokemon/front_rg/grimer.png diff --git a/pic/rgmon/growlithe.png b/gfx/pokemon/front_rg/growlithe.png similarity index 100% rename from pic/rgmon/growlithe.png rename to gfx/pokemon/front_rg/growlithe.png diff --git a/pic/rgmon/gyarados.png b/gfx/pokemon/front_rg/gyarados.png similarity index 100% rename from pic/rgmon/gyarados.png rename to gfx/pokemon/front_rg/gyarados.png diff --git a/pic/rgmon/haunter.png b/gfx/pokemon/front_rg/haunter.png similarity index 100% rename from pic/rgmon/haunter.png rename to gfx/pokemon/front_rg/haunter.png diff --git a/pic/rgmon/hitmonchan.png b/gfx/pokemon/front_rg/hitmonchan.png similarity index 100% rename from pic/rgmon/hitmonchan.png rename to gfx/pokemon/front_rg/hitmonchan.png diff --git a/pic/rgmon/hitmonlee.png b/gfx/pokemon/front_rg/hitmonlee.png similarity index 100% rename from pic/rgmon/hitmonlee.png rename to gfx/pokemon/front_rg/hitmonlee.png diff --git a/pic/rgmon/horsea.png b/gfx/pokemon/front_rg/horsea.png similarity index 100% rename from pic/rgmon/horsea.png rename to gfx/pokemon/front_rg/horsea.png diff --git a/pic/rgmon/hypno.png b/gfx/pokemon/front_rg/hypno.png similarity index 100% rename from pic/rgmon/hypno.png rename to gfx/pokemon/front_rg/hypno.png diff --git a/pic/rgmon/ivysaur.png b/gfx/pokemon/front_rg/ivysaur.png similarity index 100% rename from pic/rgmon/ivysaur.png rename to gfx/pokemon/front_rg/ivysaur.png diff --git a/pic/rgmon/jigglypuff.png b/gfx/pokemon/front_rg/jigglypuff.png similarity index 100% rename from pic/rgmon/jigglypuff.png rename to gfx/pokemon/front_rg/jigglypuff.png diff --git a/pic/rgmon/jolteon.png b/gfx/pokemon/front_rg/jolteon.png similarity index 100% rename from pic/rgmon/jolteon.png rename to gfx/pokemon/front_rg/jolteon.png diff --git a/pic/rgmon/jynx.png b/gfx/pokemon/front_rg/jynx.png similarity index 100% rename from pic/rgmon/jynx.png rename to gfx/pokemon/front_rg/jynx.png diff --git a/pic/rgmon/kabuto.png b/gfx/pokemon/front_rg/kabuto.png similarity index 100% rename from pic/rgmon/kabuto.png rename to gfx/pokemon/front_rg/kabuto.png diff --git a/pic/rgmon/kabutops.png b/gfx/pokemon/front_rg/kabutops.png similarity index 100% rename from pic/rgmon/kabutops.png rename to gfx/pokemon/front_rg/kabutops.png diff --git a/pic/rgmon/kadabra.png b/gfx/pokemon/front_rg/kadabra.png similarity index 100% rename from pic/rgmon/kadabra.png rename to gfx/pokemon/front_rg/kadabra.png diff --git a/pic/rgmon/kakuna.png b/gfx/pokemon/front_rg/kakuna.png similarity index 100% rename from pic/rgmon/kakuna.png rename to gfx/pokemon/front_rg/kakuna.png diff --git a/pic/rgmon/kangaskhan.png b/gfx/pokemon/front_rg/kangaskhan.png similarity index 100% rename from pic/rgmon/kangaskhan.png rename to gfx/pokemon/front_rg/kangaskhan.png diff --git a/pic/rgmon/kingler.png b/gfx/pokemon/front_rg/kingler.png similarity index 100% rename from pic/rgmon/kingler.png rename to gfx/pokemon/front_rg/kingler.png diff --git a/pic/rgmon/koffing.png b/gfx/pokemon/front_rg/koffing.png similarity index 100% rename from pic/rgmon/koffing.png rename to gfx/pokemon/front_rg/koffing.png diff --git a/pic/rgmon/krabby.png b/gfx/pokemon/front_rg/krabby.png similarity index 100% rename from pic/rgmon/krabby.png rename to gfx/pokemon/front_rg/krabby.png diff --git a/pic/rgmon/lapras.png b/gfx/pokemon/front_rg/lapras.png similarity index 100% rename from pic/rgmon/lapras.png rename to gfx/pokemon/front_rg/lapras.png diff --git a/pic/rgmon/lickitung.png b/gfx/pokemon/front_rg/lickitung.png similarity index 100% rename from pic/rgmon/lickitung.png rename to gfx/pokemon/front_rg/lickitung.png diff --git a/pic/rgmon/machamp.png b/gfx/pokemon/front_rg/machamp.png similarity index 100% rename from pic/rgmon/machamp.png rename to gfx/pokemon/front_rg/machamp.png diff --git a/pic/rgmon/machoke.png b/gfx/pokemon/front_rg/machoke.png similarity index 100% rename from pic/rgmon/machoke.png rename to gfx/pokemon/front_rg/machoke.png diff --git a/pic/rgmon/machop.png b/gfx/pokemon/front_rg/machop.png similarity index 100% rename from pic/rgmon/machop.png rename to gfx/pokemon/front_rg/machop.png diff --git a/pic/rgmon/magikarp.png b/gfx/pokemon/front_rg/magikarp.png similarity index 100% rename from pic/rgmon/magikarp.png rename to gfx/pokemon/front_rg/magikarp.png diff --git a/pic/rgmon/magmar.png b/gfx/pokemon/front_rg/magmar.png similarity index 100% rename from pic/rgmon/magmar.png rename to gfx/pokemon/front_rg/magmar.png diff --git a/pic/rgmon/magnemite.png b/gfx/pokemon/front_rg/magnemite.png similarity index 100% rename from pic/rgmon/magnemite.png rename to gfx/pokemon/front_rg/magnemite.png diff --git a/pic/rgmon/magneton.png b/gfx/pokemon/front_rg/magneton.png similarity index 100% rename from pic/rgmon/magneton.png rename to gfx/pokemon/front_rg/magneton.png diff --git a/pic/rgmon/mankey.png b/gfx/pokemon/front_rg/mankey.png similarity index 100% rename from pic/rgmon/mankey.png rename to gfx/pokemon/front_rg/mankey.png diff --git a/pic/rgmon/marowak.png b/gfx/pokemon/front_rg/marowak.png similarity index 100% rename from pic/rgmon/marowak.png rename to gfx/pokemon/front_rg/marowak.png diff --git a/pic/rgmon/meowth.png b/gfx/pokemon/front_rg/meowth.png similarity index 100% rename from pic/rgmon/meowth.png rename to gfx/pokemon/front_rg/meowth.png diff --git a/pic/rgmon/metapod.png b/gfx/pokemon/front_rg/metapod.png similarity index 100% rename from pic/rgmon/metapod.png rename to gfx/pokemon/front_rg/metapod.png diff --git a/pic/rgmon/mew.png b/gfx/pokemon/front_rg/mew.png similarity index 100% rename from pic/rgmon/mew.png rename to gfx/pokemon/front_rg/mew.png diff --git a/pic/rgmon/mewtwo.png b/gfx/pokemon/front_rg/mewtwo.png similarity index 100% rename from pic/rgmon/mewtwo.png rename to gfx/pokemon/front_rg/mewtwo.png diff --git a/pic/rgmon/moltres.png b/gfx/pokemon/front_rg/moltres.png similarity index 100% rename from pic/rgmon/moltres.png rename to gfx/pokemon/front_rg/moltres.png diff --git a/pic/rgmon/mr.mime.png b/gfx/pokemon/front_rg/mr.mime.png similarity index 100% rename from pic/rgmon/mr.mime.png rename to gfx/pokemon/front_rg/mr.mime.png diff --git a/pic/rgmon/muk.png b/gfx/pokemon/front_rg/muk.png similarity index 100% rename from pic/rgmon/muk.png rename to gfx/pokemon/front_rg/muk.png diff --git a/pic/rgmon/nidoking.png b/gfx/pokemon/front_rg/nidoking.png similarity index 100% rename from pic/rgmon/nidoking.png rename to gfx/pokemon/front_rg/nidoking.png diff --git a/pic/rgmon/nidoqueen.png b/gfx/pokemon/front_rg/nidoqueen.png similarity index 100% rename from pic/rgmon/nidoqueen.png rename to gfx/pokemon/front_rg/nidoqueen.png diff --git a/pic/rgmon/nidoranf.png b/gfx/pokemon/front_rg/nidoranf.png similarity index 100% rename from pic/rgmon/nidoranf.png rename to gfx/pokemon/front_rg/nidoranf.png diff --git a/pic/rgmon/nidoranm.png b/gfx/pokemon/front_rg/nidoranm.png similarity index 100% rename from pic/rgmon/nidoranm.png rename to gfx/pokemon/front_rg/nidoranm.png diff --git a/pic/rgmon/nidorina.png b/gfx/pokemon/front_rg/nidorina.png similarity index 100% rename from pic/rgmon/nidorina.png rename to gfx/pokemon/front_rg/nidorina.png diff --git a/pic/rgmon/nidorino.png b/gfx/pokemon/front_rg/nidorino.png similarity index 100% rename from pic/rgmon/nidorino.png rename to gfx/pokemon/front_rg/nidorino.png diff --git a/pic/rgmon/ninetales.png b/gfx/pokemon/front_rg/ninetales.png similarity index 100% rename from pic/rgmon/ninetales.png rename to gfx/pokemon/front_rg/ninetales.png diff --git a/pic/rgmon/oddish.png b/gfx/pokemon/front_rg/oddish.png similarity index 100% rename from pic/rgmon/oddish.png rename to gfx/pokemon/front_rg/oddish.png diff --git a/pic/rgmon/omanyte.png b/gfx/pokemon/front_rg/omanyte.png similarity index 100% rename from pic/rgmon/omanyte.png rename to gfx/pokemon/front_rg/omanyte.png diff --git a/pic/rgmon/omastar.png b/gfx/pokemon/front_rg/omastar.png similarity index 100% rename from pic/rgmon/omastar.png rename to gfx/pokemon/front_rg/omastar.png diff --git a/pic/rgmon/onix.png b/gfx/pokemon/front_rg/onix.png similarity index 100% rename from pic/rgmon/onix.png rename to gfx/pokemon/front_rg/onix.png diff --git a/pic/rgmon/paras.png b/gfx/pokemon/front_rg/paras.png similarity index 100% rename from pic/rgmon/paras.png rename to gfx/pokemon/front_rg/paras.png diff --git a/pic/rgmon/parasect.png b/gfx/pokemon/front_rg/parasect.png similarity index 100% rename from pic/rgmon/parasect.png rename to gfx/pokemon/front_rg/parasect.png diff --git a/pic/rgmon/persian.png b/gfx/pokemon/front_rg/persian.png similarity index 100% rename from pic/rgmon/persian.png rename to gfx/pokemon/front_rg/persian.png diff --git a/pic/rgmon/pidgeot.png b/gfx/pokemon/front_rg/pidgeot.png similarity index 100% rename from pic/rgmon/pidgeot.png rename to gfx/pokemon/front_rg/pidgeot.png diff --git a/pic/rgmon/pidgeotto.png b/gfx/pokemon/front_rg/pidgeotto.png similarity index 100% rename from pic/rgmon/pidgeotto.png rename to gfx/pokemon/front_rg/pidgeotto.png diff --git a/pic/rgmon/pidgey.png b/gfx/pokemon/front_rg/pidgey.png similarity index 100% rename from pic/rgmon/pidgey.png rename to gfx/pokemon/front_rg/pidgey.png diff --git a/pic/rgmon/pikachu.png b/gfx/pokemon/front_rg/pikachu.png similarity index 100% rename from pic/rgmon/pikachu.png rename to gfx/pokemon/front_rg/pikachu.png diff --git a/pic/rgmon/pinsir.png b/gfx/pokemon/front_rg/pinsir.png similarity index 100% rename from pic/rgmon/pinsir.png rename to gfx/pokemon/front_rg/pinsir.png diff --git a/pic/rgmon/poliwag.png b/gfx/pokemon/front_rg/poliwag.png similarity index 100% rename from pic/rgmon/poliwag.png rename to gfx/pokemon/front_rg/poliwag.png diff --git a/pic/rgmon/poliwhirl.png b/gfx/pokemon/front_rg/poliwhirl.png similarity index 100% rename from pic/rgmon/poliwhirl.png rename to gfx/pokemon/front_rg/poliwhirl.png diff --git a/pic/rgmon/poliwrath.png b/gfx/pokemon/front_rg/poliwrath.png similarity index 100% rename from pic/rgmon/poliwrath.png rename to gfx/pokemon/front_rg/poliwrath.png diff --git a/pic/rgmon/ponyta.png b/gfx/pokemon/front_rg/ponyta.png similarity index 100% rename from pic/rgmon/ponyta.png rename to gfx/pokemon/front_rg/ponyta.png diff --git a/pic/rgmon/porygon.png b/gfx/pokemon/front_rg/porygon.png similarity index 100% rename from pic/rgmon/porygon.png rename to gfx/pokemon/front_rg/porygon.png diff --git a/pic/rgmon/primeape.png b/gfx/pokemon/front_rg/primeape.png similarity index 100% rename from pic/rgmon/primeape.png rename to gfx/pokemon/front_rg/primeape.png diff --git a/pic/rgmon/psyduck.png b/gfx/pokemon/front_rg/psyduck.png similarity index 100% rename from pic/rgmon/psyduck.png rename to gfx/pokemon/front_rg/psyduck.png diff --git a/pic/rgmon/raichu.png b/gfx/pokemon/front_rg/raichu.png similarity index 100% rename from pic/rgmon/raichu.png rename to gfx/pokemon/front_rg/raichu.png diff --git a/pic/rgmon/rapidash.png b/gfx/pokemon/front_rg/rapidash.png similarity index 100% rename from pic/rgmon/rapidash.png rename to gfx/pokemon/front_rg/rapidash.png diff --git a/pic/rgmon/raticate.png b/gfx/pokemon/front_rg/raticate.png similarity index 100% rename from pic/rgmon/raticate.png rename to gfx/pokemon/front_rg/raticate.png diff --git a/pic/rgmon/rattata.png b/gfx/pokemon/front_rg/rattata.png similarity index 100% rename from pic/rgmon/rattata.png rename to gfx/pokemon/front_rg/rattata.png diff --git a/pic/rgmon/rhydon.png b/gfx/pokemon/front_rg/rhydon.png similarity index 100% rename from pic/rgmon/rhydon.png rename to gfx/pokemon/front_rg/rhydon.png diff --git a/pic/rgmon/rhyhorn.png b/gfx/pokemon/front_rg/rhyhorn.png similarity index 100% rename from pic/rgmon/rhyhorn.png rename to gfx/pokemon/front_rg/rhyhorn.png diff --git a/pic/rgmon/sandshrew.png b/gfx/pokemon/front_rg/sandshrew.png similarity index 100% rename from pic/rgmon/sandshrew.png rename to gfx/pokemon/front_rg/sandshrew.png diff --git a/pic/rgmon/sandslash.png b/gfx/pokemon/front_rg/sandslash.png similarity index 100% rename from pic/rgmon/sandslash.png rename to gfx/pokemon/front_rg/sandslash.png diff --git a/pic/rgmon/scyther.png b/gfx/pokemon/front_rg/scyther.png similarity index 100% rename from pic/rgmon/scyther.png rename to gfx/pokemon/front_rg/scyther.png diff --git a/pic/rgmon/seadra.png b/gfx/pokemon/front_rg/seadra.png similarity index 100% rename from pic/rgmon/seadra.png rename to gfx/pokemon/front_rg/seadra.png diff --git a/pic/rgmon/seaking.png b/gfx/pokemon/front_rg/seaking.png similarity index 100% rename from pic/rgmon/seaking.png rename to gfx/pokemon/front_rg/seaking.png diff --git a/pic/rgmon/seel.png b/gfx/pokemon/front_rg/seel.png similarity index 100% rename from pic/rgmon/seel.png rename to gfx/pokemon/front_rg/seel.png diff --git a/pic/rgmon/shellder.png b/gfx/pokemon/front_rg/shellder.png similarity index 100% rename from pic/rgmon/shellder.png rename to gfx/pokemon/front_rg/shellder.png diff --git a/pic/rgmon/slowbro.png b/gfx/pokemon/front_rg/slowbro.png similarity index 100% rename from pic/rgmon/slowbro.png rename to gfx/pokemon/front_rg/slowbro.png diff --git a/pic/rgmon/slowpoke.png b/gfx/pokemon/front_rg/slowpoke.png similarity index 100% rename from pic/rgmon/slowpoke.png rename to gfx/pokemon/front_rg/slowpoke.png diff --git a/pic/rgmon/snorlax.png b/gfx/pokemon/front_rg/snorlax.png similarity index 100% rename from pic/rgmon/snorlax.png rename to gfx/pokemon/front_rg/snorlax.png diff --git a/pic/rgmon/spearow.png b/gfx/pokemon/front_rg/spearow.png similarity index 100% rename from pic/rgmon/spearow.png rename to gfx/pokemon/front_rg/spearow.png diff --git a/pic/rgmon/squirtle.png b/gfx/pokemon/front_rg/squirtle.png similarity index 100% rename from pic/rgmon/squirtle.png rename to gfx/pokemon/front_rg/squirtle.png diff --git a/pic/rgmon/starmie.png b/gfx/pokemon/front_rg/starmie.png similarity index 100% rename from pic/rgmon/starmie.png rename to gfx/pokemon/front_rg/starmie.png diff --git a/pic/rgmon/staryu.png b/gfx/pokemon/front_rg/staryu.png similarity index 100% rename from pic/rgmon/staryu.png rename to gfx/pokemon/front_rg/staryu.png diff --git a/pic/rgmon/tangela.png b/gfx/pokemon/front_rg/tangela.png similarity index 100% rename from pic/rgmon/tangela.png rename to gfx/pokemon/front_rg/tangela.png diff --git a/pic/rgmon/tauros.png b/gfx/pokemon/front_rg/tauros.png similarity index 100% rename from pic/rgmon/tauros.png rename to gfx/pokemon/front_rg/tauros.png diff --git a/pic/rgmon/tentacool.png b/gfx/pokemon/front_rg/tentacool.png similarity index 100% rename from pic/rgmon/tentacool.png rename to gfx/pokemon/front_rg/tentacool.png diff --git a/pic/rgmon/tentacruel.png b/gfx/pokemon/front_rg/tentacruel.png similarity index 100% rename from pic/rgmon/tentacruel.png rename to gfx/pokemon/front_rg/tentacruel.png diff --git a/pic/rgmon/vaporeon.png b/gfx/pokemon/front_rg/vaporeon.png similarity index 100% rename from pic/rgmon/vaporeon.png rename to gfx/pokemon/front_rg/vaporeon.png diff --git a/pic/rgmon/venomoth.png b/gfx/pokemon/front_rg/venomoth.png similarity index 100% rename from pic/rgmon/venomoth.png rename to gfx/pokemon/front_rg/venomoth.png diff --git a/pic/rgmon/venonat.png b/gfx/pokemon/front_rg/venonat.png similarity index 100% rename from pic/rgmon/venonat.png rename to gfx/pokemon/front_rg/venonat.png diff --git a/pic/rgmon/venusaur.png b/gfx/pokemon/front_rg/venusaur.png similarity index 100% rename from pic/rgmon/venusaur.png rename to gfx/pokemon/front_rg/venusaur.png diff --git a/pic/rgmon/victreebel.png b/gfx/pokemon/front_rg/victreebel.png similarity index 100% rename from pic/rgmon/victreebel.png rename to gfx/pokemon/front_rg/victreebel.png diff --git a/pic/rgmon/vileplume.png b/gfx/pokemon/front_rg/vileplume.png similarity index 100% rename from pic/rgmon/vileplume.png rename to gfx/pokemon/front_rg/vileplume.png diff --git a/pic/rgmon/voltorb.png b/gfx/pokemon/front_rg/voltorb.png similarity index 100% rename from pic/rgmon/voltorb.png rename to gfx/pokemon/front_rg/voltorb.png diff --git a/pic/rgmon/vulpix.png b/gfx/pokemon/front_rg/vulpix.png similarity index 100% rename from pic/rgmon/vulpix.png rename to gfx/pokemon/front_rg/vulpix.png diff --git a/pic/rgmon/wartortle.png b/gfx/pokemon/front_rg/wartortle.png similarity index 100% rename from pic/rgmon/wartortle.png rename to gfx/pokemon/front_rg/wartortle.png diff --git a/pic/rgmon/weedle.png b/gfx/pokemon/front_rg/weedle.png similarity index 100% rename from pic/rgmon/weedle.png rename to gfx/pokemon/front_rg/weedle.png diff --git a/pic/rgmon/weepinbell.png b/gfx/pokemon/front_rg/weepinbell.png similarity index 100% rename from pic/rgmon/weepinbell.png rename to gfx/pokemon/front_rg/weepinbell.png diff --git a/pic/rgmon/weezing.png b/gfx/pokemon/front_rg/weezing.png similarity index 100% rename from pic/rgmon/weezing.png rename to gfx/pokemon/front_rg/weezing.png diff --git a/pic/rgmon/wigglytuff.png b/gfx/pokemon/front_rg/wigglytuff.png similarity index 100% rename from pic/rgmon/wigglytuff.png rename to gfx/pokemon/front_rg/wigglytuff.png diff --git a/pic/rgmon/zapdos.png b/gfx/pokemon/front_rg/zapdos.png similarity index 100% rename from pic/rgmon/zapdos.png rename to gfx/pokemon/front_rg/zapdos.png diff --git a/pic/rgmon/zubat.png b/gfx/pokemon/front_rg/zubat.png similarity index 100% rename from pic/rgmon/zubat.png rename to gfx/pokemon/front_rg/zubat.png diff --git a/gfx/pokemon/slide_down_7x3.tilemap b/gfx/pokemon/slide_down_7x3.tilemap new file mode 100644 index 00000000..9976218b Binary files /dev/null and b/gfx/pokemon/slide_down_7x3.tilemap differ diff --git a/gfx/pokemon/slide_down_7x5.tilemap b/gfx/pokemon/slide_down_7x5.tilemap new file mode 100644 index 00000000..c82337fe Binary files /dev/null and b/gfx/pokemon/slide_down_7x5.tilemap differ diff --git a/gfx/red/slotmachine1.png b/gfx/red/slotmachine1.png deleted file mode 100644 index 785c74f9..00000000 Binary files a/gfx/red/slotmachine1.png and /dev/null differ diff --git a/gfx/blue/sgbborder.png b/gfx/sgb/blue_border.png similarity index 100% rename from gfx/blue/sgbborder.png rename to gfx/sgb/blue_border.png diff --git a/gfx/blue/sgbborder.map b/gfx/sgb/blue_border.tilemap similarity index 100% rename from gfx/blue/sgbborder.map rename to gfx/sgb/blue_border.tilemap diff --git a/gfx/sgb/green_border.png b/gfx/sgb/green_border.png new file mode 100644 index 00000000..939f2240 Binary files /dev/null and b/gfx/sgb/green_border.png differ diff --git a/gfx/sgb/green_border.tilemap b/gfx/sgb/green_border.tilemap new file mode 100644 index 00000000..5381bb17 Binary files /dev/null and b/gfx/sgb/green_border.tilemap differ diff --git a/gfx/red/sgbborder.png b/gfx/sgb/red_border.png similarity index 100% rename from gfx/red/sgbborder.png rename to gfx/sgb/red_border.png diff --git a/gfx/red/sgbborder.map b/gfx/sgb/red_border.tilemap similarity index 100% rename from gfx/red/sgbborder.map rename to gfx/sgb/red_border.tilemap diff --git a/gfx/slots/blue_slots_1.png b/gfx/slots/blue_slots_1.png new file mode 100644 index 00000000..ea4cf0bd Binary files /dev/null and b/gfx/slots/blue_slots_1.png differ diff --git a/gfx/blue/slotmachine2.png b/gfx/slots/blue_slots_2.png similarity index 100% rename from gfx/blue/slotmachine2.png rename to gfx/slots/blue_slots_2.png diff --git a/gfx/slots/green_slots_1.png b/gfx/slots/green_slots_1.png new file mode 100644 index 00000000..dc7bffdd Binary files /dev/null and b/gfx/slots/green_slots_1.png differ diff --git a/gfx/slots/green_slots_2.png b/gfx/slots/green_slots_2.png new file mode 100644 index 00000000..5072b556 Binary files /dev/null and b/gfx/slots/green_slots_2.png differ diff --git a/gfx/slots/red_slots_1.png b/gfx/slots/red_slots_1.png new file mode 100644 index 00000000..b27d5801 Binary files /dev/null and b/gfx/slots/red_slots_1.png differ diff --git a/gfx/red/slotmachine2.png b/gfx/slots/red_slots_2.png similarity index 100% rename from gfx/red/slotmachine2.png rename to gfx/slots/red_slots_2.png diff --git a/gfx/tilemaps/slotmachine.map b/gfx/slots/slots.tilemap similarity index 100% rename from gfx/tilemaps/slotmachine.map rename to gfx/slots/slots.tilemap diff --git a/gfx/spinner_arrow.png b/gfx/spinner_arrow.png deleted file mode 100644 index aea0672b..00000000 Binary files a/gfx/spinner_arrow.png and /dev/null differ diff --git a/gfx/copyright.png b/gfx/splash/copyright.png similarity index 100% rename from gfx/copyright.png rename to gfx/splash/copyright.png diff --git a/gfx/falling_star.png b/gfx/splash/falling_star.png similarity index 100% rename from gfx/falling_star.png rename to gfx/splash/falling_star.png diff --git a/gfx/gamefreak_logo.png b/gfx/splash/gamefreak_logo.png similarity index 100% rename from gfx/gamefreak_logo.png rename to gfx/splash/gamefreak_logo.png diff --git a/gfx/gamefreak_intro.png b/gfx/splash/gamefreak_presents.png similarity index 100% rename from gfx/gamefreak_intro.png rename to gfx/splash/gamefreak_presents.png diff --git a/gfx/sprites.asm b/gfx/sprites.asm new file mode 100644 index 00000000..4bcf678c --- /dev/null +++ b/gfx/sprites.asm @@ -0,0 +1,73 @@ +SECTION "NPC Sprites 1", ROMX + +ScientistSprite:: INCBIN "gfx/sprites/scientist.2bpp" +RockerSprite:: INCBIN "gfx/sprites/rocker.2bpp" +SwimmerSprite:: INCBIN "gfx/sprites/swimmer.2bpp" +SafariZoneWorkerSprite:: INCBIN "gfx/sprites/safari_zone_worker.2bpp" +GymGuideSprite:: INCBIN "gfx/sprites/gym_guide.2bpp" +GrampsSprite:: INCBIN "gfx/sprites/gramps.2bpp" +ClerkSprite:: INCBIN "gfx/sprites/clerk.2bpp" +FishingGuruSprite:: INCBIN "gfx/sprites/fishing_guru.2bpp" +GrannySprite:: INCBIN "gfx/sprites/granny.2bpp" +NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp" +LinkReceptionistSprite:: INCBIN "gfx/sprites/link_receptionist.2bpp" +SilphPresidentSprite:: INCBIN "gfx/sprites/silph_president.2bpp" +SilphWorkerSprite:: INCBIN "gfx/sprites/silph_worker.2bpp" +WardenSprite:: INCBIN "gfx/sprites/warden.2bpp" +CaptainSprite:: INCBIN "gfx/sprites/captain.2bpp" +FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp" +KogaSprite:: INCBIN "gfx/sprites/koga.2bpp" +GuardSprite:: INCBIN "gfx/sprites/guard.2bpp" +PokeBallSprite:: INCBIN "gfx/sprites/poke_ball.2bpp" +FossilSprite:: INCBIN "gfx/sprites/fossil.2bpp" +BoulderSprite:: INCBIN "gfx/sprites/boulder.2bpp" +PaperSprite:: INCBIN "gfx/sprites/paper.2bpp" +PokedexSprite:: INCBIN "gfx/sprites/pokedex.2bpp" +ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp" +SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp" +OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp" +GamblerAsleepSprite:: INCBIN "gfx/sprites/gambler_asleep.2bpp" + + +SECTION "NPC Sprites 2", ROMX + +RedBikeSprite:: INCBIN "gfx/sprites/red_bike.2bpp" +RedSprite:: INCBIN "gfx/sprites/red.2bpp" +BlueSprite:: INCBIN "gfx/sprites/blue.2bpp" +OakSprite:: INCBIN "gfx/sprites/oak.2bpp" +YoungsterSprite:: INCBIN "gfx/sprites/youngster.2bpp" +MonsterSprite:: INCBIN "gfx/sprites/monster.2bpp" +CooltrainerFSprite:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" +CooltrainerMSprite:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" +LittleGirlSprite:: INCBIN "gfx/sprites/little_girl.2bpp" +BirdSprite:: INCBIN "gfx/sprites/bird.2bpp" +MiddleAgedManSprite:: INCBIN "gfx/sprites/middle_aged_man.2bpp" +GamblerSprite:: INCBIN "gfx/sprites/gambler.2bpp" +SuperNerdSprite:: INCBIN "gfx/sprites/super_nerd.2bpp" +GirlSprite:: INCBIN "gfx/sprites/girl.2bpp" +HikerSprite:: INCBIN "gfx/sprites/hiker.2bpp" +BeautySprite:: INCBIN "gfx/sprites/beauty.2bpp" +GentlemanSprite:: INCBIN "gfx/sprites/gentleman.2bpp" +DaisySprite:: INCBIN "gfx/sprites/daisy.2bpp" +BikerSprite:: INCBIN "gfx/sprites/biker.2bpp" +SailorSprite:: INCBIN "gfx/sprites/sailor.2bpp" +CookSprite:: INCBIN "gfx/sprites/cook.2bpp" +BikeShopClerkSprite:: INCBIN "gfx/sprites/bike_shop_clerk.2bpp" +MrFujiSprite:: INCBIN "gfx/sprites/mr_fuji.2bpp" +GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp" +RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp" +ChannelerSprite:: INCBIN "gfx/sprites/channeler.2bpp" +WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp" +ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp" +MiddleAgedWomanSprite:: INCBIN "gfx/sprites/middle_aged_woman.2bpp" +BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp" +LanceSprite:: INCBIN "gfx/sprites/lance.2bpp" +MomSprite:: INCBIN "gfx/sprites/mom.2bpp" +BaldingGuySprite:: INCBIN "gfx/sprites/balding_guy.2bpp" +LittleBoySprite:: INCBIN "gfx/sprites/little_boy.2bpp" +GameboyKidSprite:: INCBIN "gfx/sprites/gameboy_kid.2bpp" +FairySprite:: INCBIN "gfx/sprites/fairy.2bpp" +AgathaSprite:: INCBIN "gfx/sprites/agatha.2bpp" +BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp" +LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp" +SeelSprite:: INCBIN "gfx/sprites/seel.2bpp" diff --git a/gfx/sprites/foulard_woman.png b/gfx/sprites/beauty.png similarity index 100% rename from gfx/sprites/foulard_woman.png rename to gfx/sprites/beauty.png diff --git a/gfx/sprites/bike_shop_guy.png b/gfx/sprites/bike_shop_clerk.png similarity index 100% rename from gfx/sprites/bike_shop_guy.png rename to gfx/sprites/bike_shop_clerk.png diff --git a/gfx/sprites/ss_captain.png b/gfx/sprites/captain.png similarity index 100% rename from gfx/sprites/ss_captain.png rename to gfx/sprites/captain.png diff --git a/gfx/sprites/medium.png b/gfx/sprites/channeler.png similarity index 100% rename from gfx/sprites/medium.png rename to gfx/sprites/channeler.png diff --git a/gfx/sprites/mart_guy.png b/gfx/sprites/clerk.png similarity index 100% rename from gfx/sprites/mart_guy.png rename to gfx/sprites/clerk.png diff --git a/gfx/sprites/lass.png b/gfx/sprites/cooltrainer_f.png similarity index 100% rename from gfx/sprites/lass.png rename to gfx/sprites/cooltrainer_f.png diff --git a/gfx/sprites/black_hair_boy_1.png b/gfx/sprites/cooltrainer_m.png similarity index 100% rename from gfx/sprites/black_hair_boy_1.png rename to gfx/sprites/cooltrainer_m.png diff --git a/gfx/sprites/clefairy.png b/gfx/sprites/fairy.png similarity index 100% rename from gfx/sprites/clefairy.png rename to gfx/sprites/fairy.png diff --git a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png index ef3f864b..a84a2e37 100644 Binary files a/gfx/sprites/fisher.png and b/gfx/sprites/fisher.png differ diff --git a/gfx/sprites/fisher2.png b/gfx/sprites/fisher2.png deleted file mode 100644 index a84a2e37..00000000 Binary files a/gfx/sprites/fisher2.png and /dev/null differ diff --git a/gfx/sprites/fishing_guru.png b/gfx/sprites/fishing_guru.png new file mode 100644 index 00000000..ef3f864b Binary files /dev/null and b/gfx/sprites/fishing_guru.png differ diff --git a/gfx/sprites/omanyte.png b/gfx/sprites/fossil.png similarity index 100% rename from gfx/sprites/omanyte.png rename to gfx/sprites/fossil.png diff --git a/gfx/sprites/lying_old_man.png b/gfx/sprites/gambler_asleep.png similarity index 100% rename from gfx/sprites/lying_old_man.png rename to gfx/sprites/gambler_asleep.png diff --git a/gfx/sprites/old_person.png b/gfx/sprites/gramps.png similarity index 100% rename from gfx/sprites/old_person.png rename to gfx/sprites/gramps.png diff --git a/gfx/sprites/old_medium_woman.png b/gfx/sprites/granny.png similarity index 100% rename from gfx/sprites/old_medium_woman.png rename to gfx/sprites/granny.png diff --git a/gfx/sprites/gym_helper.png b/gfx/sprites/gym_guide.png similarity index 100% rename from gfx/sprites/gym_helper.png rename to gfx/sprites/gym_guide.png diff --git a/gfx/sprites/blackbelt.png b/gfx/sprites/koga.png similarity index 100% rename from gfx/sprites/blackbelt.png rename to gfx/sprites/koga.png diff --git a/gfx/sprites/cable_club_woman.png b/gfx/sprites/link_receptionist.png similarity index 100% rename from gfx/sprites/cable_club_woman.png rename to gfx/sprites/link_receptionist.png diff --git a/gfx/sprites/young_boy.png b/gfx/sprites/little_boy.png similarity index 100% rename from gfx/sprites/young_boy.png rename to gfx/sprites/little_boy.png diff --git a/gfx/sprites/fat_bald_guy.png b/gfx/sprites/middle_aged_man.png similarity index 100% rename from gfx/sprites/fat_bald_guy.png rename to gfx/sprites/middle_aged_man.png diff --git a/gfx/sprites/mom_geisha.png b/gfx/sprites/middle_aged_woman.png similarity index 100% rename from gfx/sprites/mom_geisha.png rename to gfx/sprites/middle_aged_woman.png diff --git a/gfx/sprites/slowbro.png b/gfx/sprites/monster.png similarity index 100% rename from gfx/sprites/slowbro.png rename to gfx/sprites/monster.png diff --git a/gfx/sprites/paper_sheet.png b/gfx/sprites/paper.png similarity index 100% rename from gfx/sprites/paper_sheet.png rename to gfx/sprites/paper.png diff --git a/gfx/sprites/ball.png b/gfx/sprites/poke_ball.png similarity index 100% rename from gfx/sprites/ball.png rename to gfx/sprites/poke_ball.png diff --git a/gfx/sprites/book_map_dex.png b/gfx/sprites/pokedex.png similarity index 100% rename from gfx/sprites/book_map_dex.png rename to gfx/sprites/pokedex.png diff --git a/gfx/sprites/cycling.png b/gfx/sprites/red_bike.png similarity index 100% rename from gfx/sprites/cycling.png rename to gfx/sprites/red_bike.png diff --git a/gfx/sprites/white_player.png b/gfx/sprites/safari_zone_worker.png similarity index 100% rename from gfx/sprites/white_player.png rename to gfx/sprites/safari_zone_worker.png diff --git a/gfx/sprites/oak_aide.png b/gfx/sprites/scientist.png similarity index 100% rename from gfx/sprites/oak_aide.png rename to gfx/sprites/scientist.png diff --git a/gfx/sprites/mr_masterball.png b/gfx/sprites/silph_president.png similarity index 100% rename from gfx/sprites/mr_masterball.png rename to gfx/sprites/silph_president.png diff --git a/gfx/sprites/lapras_giver.png b/gfx/sprites/silph_worker.png similarity index 100% rename from gfx/sprites/lapras_giver.png rename to gfx/sprites/silph_worker.png diff --git a/gfx/sprites/black_hair_boy_2.png b/gfx/sprites/super_nerd.png similarity index 100% rename from gfx/sprites/black_hair_boy_2.png rename to gfx/sprites/super_nerd.png diff --git a/gfx/sprites/bug_catcher.png b/gfx/sprites/youngster.png similarity index 100% rename from gfx/sprites/bug_catcher.png rename to gfx/sprites/youngster.png diff --git a/gfx/text_box.png b/gfx/text_box.png deleted file mode 100644 index 3673e74c..00000000 Binary files a/gfx/text_box.png and /dev/null differ diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm new file mode 100644 index 00000000..f64dc20a --- /dev/null +++ b/gfx/tilesets.asm @@ -0,0 +1,63 @@ +SECTION "Tilesets 1", ROMX + +Overworld_GFX:: INCBIN "gfx/tilesets/overworld.2bpp" +Overworld_Block:: INCBIN "gfx/blocksets/overworld.bst" + +RedsHouse1_GFX:: +RedsHouse2_GFX:: INCBIN "gfx/tilesets/reds_house.2bpp" +RedsHouse1_Block:: +RedsHouse2_Block:: INCBIN "gfx/blocksets/reds_house.bst" + +House_GFX:: INCBIN "gfx/tilesets/house.2bpp" +House_Block:: INCBIN "gfx/blocksets/house.bst" +Mansion_GFX:: INCBIN "gfx/tilesets/mansion.2bpp" +Mansion_Block:: INCBIN "gfx/blocksets/mansion.bst" +ShipPort_GFX:: INCBIN "gfx/tilesets/ship_port.2bpp" +ShipPort_Block:: INCBIN "gfx/blocksets/ship_port.bst" +Interior_GFX:: INCBIN "gfx/tilesets/interior.2bpp" +Interior_Block:: INCBIN "gfx/blocksets/interior.bst" +Plateau_GFX:: INCBIN "gfx/tilesets/plateau.2bpp" +Plateau_Block:: INCBIN "gfx/blocksets/plateau.bst" + + +SECTION "Tilesets 2", ROMX + +Dojo_GFX:: +Gym_GFX:: INCBIN "gfx/tilesets/gym.2bpp" +Dojo_Block:: +Gym_Block:: INCBIN "gfx/blocksets/gym.bst" + +Mart_GFX:: +Pokecenter_GFX:: INCBIN "gfx/tilesets/pokecenter.2bpp" +Mart_Block:: +Pokecenter_Block:: INCBIN "gfx/blocksets/pokecenter.bst" + +ForestGate_GFX:: +Museum_GFX:: +Gate_GFX:: INCBIN "gfx/tilesets/gate.2bpp" +ForestGate_Block:: +Museum_Block:: +Gate_Block:: INCBIN "gfx/blocksets/gate.bst" + +Forest_GFX:: INCBIN "gfx/tilesets/forest.2bpp" +Forest_Block:: INCBIN "gfx/blocksets/forest.bst" +Facility_GFX:: INCBIN "gfx/tilesets/facility.2bpp" +Facility_Block:: INCBIN "gfx/blocksets/facility.bst" + + +SECTION "Tilesets 3", ROMX + +Cemetery_GFX:: INCBIN "gfx/tilesets/cemetery.2bpp" +Cemetery_Block:: INCBIN "gfx/blocksets/cemetery.bst" +Cavern_GFX:: INCBIN "gfx/tilesets/cavern.2bpp" +Cavern_Block:: INCBIN "gfx/blocksets/cavern.bst" +Lobby_GFX:: INCBIN "gfx/tilesets/lobby.2bpp" +Lobby_Block:: INCBIN "gfx/blocksets/lobby.bst" +Ship_GFX:: INCBIN "gfx/tilesets/ship.2bpp" +Ship_Block:: INCBIN "gfx/blocksets/ship.bst" +Lab_GFX:: INCBIN "gfx/tilesets/lab.2bpp" +Lab_Block:: INCBIN "gfx/blocksets/lab.bst" +Club_GFX:: INCBIN "gfx/tilesets/club.2bpp" +Club_Block:: INCBIN "gfx/blocksets/club.bst" +Underground_GFX:: INCBIN "gfx/tilesets/underground.2bpp" +Underground_Block:: INCBIN "gfx/blocksets/underground.bst" diff --git a/gfx/tilesets/cavern.tilecoll b/gfx/tilesets/cavern.tilecoll deleted file mode 100644 index dab3e10f..00000000 --- a/gfx/tilesets/cavern.tilecoll +++ /dev/null @@ -1 +0,0 @@ - !"*-0 \ No newline at end of file diff --git a/gfx/tilesets/cemetery.tilecoll b/gfx/tilesets/cemetery.tilecoll deleted file mode 100644 index f4bee2ee..00000000 --- a/gfx/tilesets/cemetery.tilecoll +++ /dev/null @@ -1 +0,0 @@ -"BR \ No newline at end of file diff --git a/gfx/tilesets/club.tilecoll b/gfx/tilesets/club.tilecoll deleted file mode 100644 index 9bd5f3ba..00000000 --- a/gfx/tilesets/club.tilecoll +++ /dev/null @@ -1 +0,0 @@ -&(),-./A \ No newline at end of file diff --git a/gfx/tilesets/facility.tilecoll b/gfx/tilesets/facility.tilecoll deleted file mode 100644 index d55b119b..00000000 --- a/gfx/tilesets/facility.tilecoll +++ /dev/null @@ -1 +0,0 @@ - !"012BCHRUX^ \ No newline at end of file diff --git a/gfx/tilesets/forest.tilecoll b/gfx/tilesets/forest.tilecoll deleted file mode 100644 index 45bf737e..00000000 --- a/gfx/tilesets/forest.tilecoll +++ /dev/null @@ -1 +0,0 @@ - .0479:@QRZ\^_ \ No newline at end of file diff --git a/gfx/tilesets/gate.tilecoll b/gfx/tilesets/gate.tilecoll deleted file mode 100644 index dd06b044..00000000 --- a/gfx/tilesets/gate.tilecoll +++ /dev/null @@ -1 +0,0 @@ -78;<^ \ No newline at end of file diff --git a/gfx/tilesets/gym.tilecoll b/gfx/tilesets/gym.tilecoll deleted file mode 100644 index 916e2579..00000000 --- a/gfx/tilesets/gym.tilecoll +++ /dev/null @@ -1 +0,0 @@ -+<=?JLM \ No newline at end of file diff --git a/gfx/tilesets/house.tilecoll b/gfx/tilesets/house.tilecoll deleted file mode 100644 index 95497e70..00000000 --- a/gfx/tilesets/house.tilecoll +++ /dev/null @@ -1 +0,0 @@ -(27DT\ \ No newline at end of file diff --git a/gfx/tilesets/interior.tilecoll b/gfx/tilesets/interior.tilecoll deleted file mode 100644 index b5d32687..00000000 --- a/gfx/tilesets/interior.tilecoll +++ /dev/null @@ -1 +0,0 @@ -;EGUV \ No newline at end of file diff --git a/gfx/tilesets/lab.tilecoll b/gfx/tilesets/lab.tilecoll deleted file mode 100644 index c171ba99..00000000 --- a/gfx/tilesets/lab.tilecoll +++ /dev/null @@ -1 +0,0 @@ - &47 \ No newline at end of file diff --git a/gfx/tilesets/lobby.tilecoll b/gfx/tilesets/lobby.tilecoll deleted file mode 100644 index 6388083c..00000000 --- a/gfx/tilesets/lobby.tilecoll +++ /dev/null @@ -1 +0,0 @@ - 8E \ No newline at end of file diff --git a/gfx/tilesets/mansion.tilecoll b/gfx/tilesets/mansion.tilecoll deleted file mode 100644 index e07ea10a..00000000 --- a/gfx/tilesets/mansion.tilecoll +++ /dev/null @@ -1 +0,0 @@ -,S \ No newline at end of file diff --git a/gfx/tilesets/overworld.tilecoll b/gfx/tilesets/overworld.tilecoll deleted file mode 100644 index dae824f1..00000000 Binary files a/gfx/tilesets/overworld.tilecoll and /dev/null differ diff --git a/gfx/tilesets/plateau.tilecoll b/gfx/tilesets/plateau.tilecoll deleted file mode 100644 index 5958688e..00000000 --- a/gfx/tilesets/plateau.tilecoll +++ /dev/null @@ -1 +0,0 @@ -#,-;E \ No newline at end of file diff --git a/gfx/tilesets/pokecenter.tilecoll b/gfx/tilesets/pokecenter.tilecoll deleted file mode 100644 index 928af693..00000000 --- a/gfx/tilesets/pokecenter.tilecoll +++ /dev/null @@ -1 +0,0 @@ -<^ \ No newline at end of file diff --git a/gfx/tilesets/reds_house.tilecoll b/gfx/tilesets/reds_house.tilecoll deleted file mode 100644 index b19db300..00000000 --- a/gfx/tilesets/reds_house.tilecoll +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gfx/tilesets/ship.tilecoll b/gfx/tilesets/ship.tilecoll deleted file mode 100644 index d78bcc45..00000000 --- a/gfx/tilesets/ship.tilecoll +++ /dev/null @@ -1 +0,0 @@ - #479J \ No newline at end of file diff --git a/gfx/tilesets/ship_port.tilecoll b/gfx/tilesets/ship_port.tilecoll deleted file mode 100644 index 2dc99b5c..00000000 --- a/gfx/tilesets/ship_port.tilecoll +++ /dev/null @@ -1,2 +0,0 @@ - -2; \ No newline at end of file diff --git a/gfx/tilesets/tilesets_rg/flower.png b/gfx/tilesets/tilesets_rg/flower.png new file mode 100644 index 00000000..bb54085a Binary files /dev/null and b/gfx/tilesets/tilesets_rg/flower.png differ diff --git a/gfx/tilesets/tilesets_rg/forest.png b/gfx/tilesets/tilesets_rg/forest.png new file mode 100644 index 00000000..bd01b7cf Binary files /dev/null and b/gfx/tilesets/tilesets_rg/forest.png differ diff --git a/gfx/tilesets/tilesets_rg/overworld.png b/gfx/tilesets/tilesets_rg/overworld.png new file mode 100644 index 00000000..009c1359 Binary files /dev/null and b/gfx/tilesets/tilesets_rg/overworld.png differ diff --git a/gfx/tilesets/underground.tilecoll b/gfx/tilesets/underground.tilecoll deleted file mode 100644 index 75efd22b..00000000 --- a/gfx/tilesets/underground.tilecoll +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/gfx/blue/blueversion.png b/gfx/title/blue_version.png similarity index 100% rename from gfx/blue/blueversion.png rename to gfx/title/blue_version.png diff --git a/gfx/gamefreak.png b/gfx/title/gamefreak_inc.png similarity index 100% rename from gfx/gamefreak.png rename to gfx/title/gamefreak_inc.png diff --git a/gfx/player_title.png b/gfx/title/player.png similarity index 100% rename from gfx/player_title.png rename to gfx/title/player.png diff --git a/gfx/pokemon_logo.png b/gfx/title/pokemon_logo.png similarity index 100% rename from gfx/pokemon_logo.png rename to gfx/title/pokemon_logo.png diff --git a/gfx/red/redgreenversion.png b/gfx/title/red_version.png similarity index 100% rename from gfx/red/redgreenversion.png rename to gfx/title/red_version.png diff --git a/gfx/mon_nest_icon.png b/gfx/town_map/mon_nest_icon.png similarity index 100% rename from gfx/mon_nest_icon.png rename to gfx/town_map/mon_nest_icon.png diff --git a/gfx/town_map.png b/gfx/town_map/town_map.png similarity index 100% rename from gfx/town_map.png rename to gfx/town_map/town_map.png diff --git a/gfx/town_map.rle b/gfx/town_map/town_map.rle old mode 100755 new mode 100644 similarity index 100% rename from gfx/town_map.rle rename to gfx/town_map/town_map.rle diff --git a/gfx/town_map_cursor.png b/gfx/town_map/town_map_cursor.png similarity index 100% rename from gfx/town_map_cursor.png rename to gfx/town_map/town_map_cursor.png diff --git a/gfx/up_arrow.png b/gfx/town_map/up_arrow.png similarity index 100% rename from gfx/up_arrow.png rename to gfx/town_map/up_arrow.png diff --git a/gfx/trade.asm b/gfx/trade.asm new file mode 100644 index 00000000..e5d8db05 --- /dev/null +++ b/gfx/trade.asm @@ -0,0 +1,7 @@ +TradingAnimationGraphics: +INCBIN "gfx/trade/game_boy.2bpp" +INCBIN "gfx/trade/link_cable.2bpp" +TradingAnimationGraphicsEnd: + +TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp" +TradingAnimationGraphics2End: diff --git a/gfx/trade/bubble.png b/gfx/trade/bubble.png new file mode 100644 index 00000000..93611a60 Binary files /dev/null and b/gfx/trade/bubble.png differ diff --git a/gfx/trade2.png b/gfx/trade/cable_ball.png similarity index 100% rename from gfx/trade2.png rename to gfx/trade/cable_ball.png diff --git a/gfx/game_boy.png b/gfx/trade/game_boy.png similarity index 100% rename from gfx/game_boy.png rename to gfx/trade/game_boy.png diff --git a/gfx/trade/game_boy.tilemap b/gfx/trade/game_boy.tilemap new file mode 100644 index 00000000..5f772126 --- /dev/null +++ b/gfx/trade/game_boy.tilemap @@ -0,0 +1 @@ +12222345667849::;8<=>>?@ABCCDEFGCHIJACKLMNOPPPQR \ No newline at end of file diff --git a/gfx/link_cable.png b/gfx/trade/link_cable.png similarity index 100% rename from gfx/link_cable.png rename to gfx/trade/link_cable.png diff --git a/gfx/trade/link_cable.tilemap b/gfx/trade/link_cable.tilemap new file mode 100644 index 00000000..3f7e248a --- /dev/null +++ b/gfx/trade/link_cable.tilemap @@ -0,0 +1 @@ +CUVSSSSSSSSSCWXTTTTTTTTTCYZCCCCCCCCC \ No newline at end of file diff --git a/gfx/trainer_card.asm b/gfx/trainer_card.asm new file mode 100644 index 00000000..7484e4ee --- /dev/null +++ b/gfx/trainer_card.asm @@ -0,0 +1,8 @@ +TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_card/trainer_info.2bpp" +TrainerInfoTextBoxTileGraphicsEnd: + +BlankLeaderNames: INCBIN "gfx/trainer_card/blank_leader_names.2bpp" + +CircleTile: INCBIN "gfx/trainer_card/circle_tile.2bpp" + +BadgeNumbersTileGraphics: INCBIN "gfx/trainer_card/badge_numbers.2bpp" diff --git a/gfx/badge_numbers.png b/gfx/trainer_card/badge_numbers.png similarity index 100% rename from gfx/badge_numbers.png rename to gfx/trainer_card/badge_numbers.png diff --git a/gfx/badges.png b/gfx/trainer_card/badges.png similarity index 100% rename from gfx/badges.png rename to gfx/trainer_card/badges.png diff --git a/gfx/blank_leader_names.png b/gfx/trainer_card/blank_leader_names.png similarity index 100% rename from gfx/blank_leader_names.png rename to gfx/trainer_card/blank_leader_names.png diff --git a/gfx/circle_tile.png b/gfx/trainer_card/circle_tile.png similarity index 100% rename from gfx/circle_tile.png rename to gfx/trainer_card/circle_tile.png diff --git a/gfx/trainer_info.png b/gfx/trainer_card/trainer_info.png similarity index 100% rename from gfx/trainer_info.png rename to gfx/trainer_card/trainer_info.png diff --git a/pic/trainer/agatha.png b/gfx/trainers/agatha.png similarity index 100% rename from pic/trainer/agatha.png rename to gfx/trainers/agatha.png diff --git a/pic/trainer/beauty.png b/gfx/trainers/beauty.png similarity index 100% rename from pic/trainer/beauty.png rename to gfx/trainers/beauty.png diff --git a/pic/trainer/biker.png b/gfx/trainers/biker.png similarity index 100% rename from pic/trainer/biker.png rename to gfx/trainers/biker.png diff --git a/pic/trainer/birdkeeper.png b/gfx/trainers/birdkeeper.png similarity index 100% rename from pic/trainer/birdkeeper.png rename to gfx/trainers/birdkeeper.png diff --git a/pic/trainer/blackbelt.png b/gfx/trainers/blackbelt.png similarity index 100% rename from pic/trainer/blackbelt.png rename to gfx/trainers/blackbelt.png diff --git a/pic/trainer/blaine.png b/gfx/trainers/blaine.png similarity index 100% rename from pic/trainer/blaine.png rename to gfx/trainers/blaine.png diff --git a/pic/trainer/brock.png b/gfx/trainers/brock.png similarity index 100% rename from pic/trainer/brock.png rename to gfx/trainers/brock.png diff --git a/pic/trainer/bruno.png b/gfx/trainers/bruno.png similarity index 100% rename from pic/trainer/bruno.png rename to gfx/trainers/bruno.png diff --git a/pic/trainer/bugcatcher.png b/gfx/trainers/bugcatcher.png similarity index 100% rename from pic/trainer/bugcatcher.png rename to gfx/trainers/bugcatcher.png diff --git a/pic/trainer/burglar.png b/gfx/trainers/burglar.png similarity index 100% rename from pic/trainer/burglar.png rename to gfx/trainers/burglar.png diff --git a/pic/trainer/channeler.png b/gfx/trainers/channeler.png similarity index 100% rename from pic/trainer/channeler.png rename to gfx/trainers/channeler.png diff --git a/pic/trainer/cooltrainerf.png b/gfx/trainers/cooltrainerf.png similarity index 100% rename from pic/trainer/cooltrainerf.png rename to gfx/trainers/cooltrainerf.png diff --git a/pic/trainer/cooltrainerm.png b/gfx/trainers/cooltrainerm.png similarity index 100% rename from pic/trainer/cooltrainerm.png rename to gfx/trainers/cooltrainerm.png diff --git a/pic/trainer/cueball.png b/gfx/trainers/cueball.png similarity index 100% rename from pic/trainer/cueball.png rename to gfx/trainers/cueball.png diff --git a/pic/trainer/engineer.png b/gfx/trainers/engineer.png similarity index 100% rename from pic/trainer/engineer.png rename to gfx/trainers/engineer.png diff --git a/pic/trainer/erika.png b/gfx/trainers/erika.png similarity index 100% rename from pic/trainer/erika.png rename to gfx/trainers/erika.png diff --git a/pic/trainer/fisher.png b/gfx/trainers/fisher.png similarity index 100% rename from pic/trainer/fisher.png rename to gfx/trainers/fisher.png diff --git a/pic/trainer/gambler.png b/gfx/trainers/gambler.png similarity index 100% rename from pic/trainer/gambler.png rename to gfx/trainers/gambler.png diff --git a/pic/trainer/gentleman.png b/gfx/trainers/gentleman.png similarity index 100% rename from pic/trainer/gentleman.png rename to gfx/trainers/gentleman.png diff --git a/pic/trainer/giovanni.png b/gfx/trainers/giovanni.png similarity index 100% rename from pic/trainer/giovanni.png rename to gfx/trainers/giovanni.png diff --git a/pic/trainer/hiker.png b/gfx/trainers/hiker.png similarity index 100% rename from pic/trainer/hiker.png rename to gfx/trainers/hiker.png diff --git a/pic/trainer/jr.trainerf.png b/gfx/trainers/jr.trainerf.png similarity index 100% rename from pic/trainer/jr.trainerf.png rename to gfx/trainers/jr.trainerf.png diff --git a/pic/trainer/jr.trainerm.png b/gfx/trainers/jr.trainerm.png similarity index 100% rename from pic/trainer/jr.trainerm.png rename to gfx/trainers/jr.trainerm.png diff --git a/pic/trainer/juggler.png b/gfx/trainers/juggler.png similarity index 100% rename from pic/trainer/juggler.png rename to gfx/trainers/juggler.png diff --git a/pic/trainer/koga.png b/gfx/trainers/koga.png similarity index 100% rename from pic/trainer/koga.png rename to gfx/trainers/koga.png diff --git a/pic/trainer/lance.png b/gfx/trainers/lance.png similarity index 100% rename from pic/trainer/lance.png rename to gfx/trainers/lance.png diff --git a/pic/trainer/lass.png b/gfx/trainers/lass.png similarity index 100% rename from pic/trainer/lass.png rename to gfx/trainers/lass.png diff --git a/pic/trainer/lorelei.png b/gfx/trainers/lorelei.png similarity index 100% rename from pic/trainer/lorelei.png rename to gfx/trainers/lorelei.png diff --git a/pic/trainer/lt.surge.png b/gfx/trainers/lt.surge.png similarity index 100% rename from pic/trainer/lt.surge.png rename to gfx/trainers/lt.surge.png diff --git a/pic/trainer/misty.png b/gfx/trainers/misty.png similarity index 100% rename from pic/trainer/misty.png rename to gfx/trainers/misty.png diff --git a/pic/trainer/pokemaniac.png b/gfx/trainers/pokemaniac.png similarity index 100% rename from pic/trainer/pokemaniac.png rename to gfx/trainers/pokemaniac.png diff --git a/pic/trainer/prof.oak.png b/gfx/trainers/prof.oak.png similarity index 100% rename from pic/trainer/prof.oak.png rename to gfx/trainers/prof.oak.png diff --git a/pic/trainer/psychic.png b/gfx/trainers/psychic.png similarity index 100% rename from pic/trainer/psychic.png rename to gfx/trainers/psychic.png diff --git a/pic/trainer/rival1.png b/gfx/trainers/rival1.png similarity index 100% rename from pic/trainer/rival1.png rename to gfx/trainers/rival1.png diff --git a/pic/trainer/rival2.png b/gfx/trainers/rival2.png similarity index 100% rename from pic/trainer/rival2.png rename to gfx/trainers/rival2.png diff --git a/pic/trainer/rival3.png b/gfx/trainers/rival3.png similarity index 100% rename from pic/trainer/rival3.png rename to gfx/trainers/rival3.png diff --git a/pic/trainer/rocker.png b/gfx/trainers/rocker.png similarity index 100% rename from pic/trainer/rocker.png rename to gfx/trainers/rocker.png diff --git a/pic/trainer/rocket.png b/gfx/trainers/rocket.png similarity index 100% rename from pic/trainer/rocket.png rename to gfx/trainers/rocket.png diff --git a/pic/trainer/sabrina.png b/gfx/trainers/sabrina.png similarity index 100% rename from pic/trainer/sabrina.png rename to gfx/trainers/sabrina.png diff --git a/pic/trainer/sailor.png b/gfx/trainers/sailor.png similarity index 100% rename from pic/trainer/sailor.png rename to gfx/trainers/sailor.png diff --git a/pic/trainer/scientist.png b/gfx/trainers/scientist.png similarity index 100% rename from pic/trainer/scientist.png rename to gfx/trainers/scientist.png diff --git a/pic/trainer/supernerd.png b/gfx/trainers/supernerd.png similarity index 100% rename from pic/trainer/supernerd.png rename to gfx/trainers/supernerd.png diff --git a/pic/trainer/swimmer.png b/gfx/trainers/swimmer.png similarity index 100% rename from pic/trainer/swimmer.png rename to gfx/trainers/swimmer.png diff --git a/pic/trainer/tamer.png b/gfx/trainers/tamer.png similarity index 100% rename from pic/trainer/tamer.png rename to gfx/trainers/tamer.png diff --git a/pic/trainer/youngster.png b/gfx/trainers/youngster.png similarity index 100% rename from pic/trainer/youngster.png rename to gfx/trainers/youngster.png diff --git a/gfx/version.asm b/gfx/version.asm new file mode 100644 index 00000000..6f49bca9 --- /dev/null +++ b/gfx/version.asm @@ -0,0 +1,8 @@ +Version_GFX: +IF DEF(_RED) + INCBIN "gfx/title/red_version.1bpp" ; 10 tiles +ENDC +IF DEF(_BLUE) + INCBIN "gfx/title/blue_version.1bpp" ; 8 tiles +ENDC +Version_GFXEnd: diff --git a/gfx/yellow/slotmachine1.png b/gfx/yellow/slotmachine1.png deleted file mode 100644 index 335ce97c..00000000 Binary files a/gfx/yellow/slotmachine1.png and /dev/null differ diff --git a/gfx/yellow/slotmachine2.png b/gfx/yellow/slotmachine2.png deleted file mode 100644 index b4bdf8a8..00000000 Binary files a/gfx/yellow/slotmachine2.png and /dev/null differ diff --git a/home.asm b/home.asm index 898b7608..ee507c21 100644 --- a/home.asm +++ b/home.asm @@ -1,908 +1,33 @@ -; The rst vectors are unused. -SECTION "rst 00", ROM0 - rst $38 -SECTION "rst 08", ROM0 - rst $38 -SECTION "rst 10", ROM0 - rst $38 -SECTION "rst 18", ROM0 - rst $38 -SECTION "rst 20", ROM0 - rst $38 -SECTION "rst 28", ROM0 - rst $38 -SECTION "rst 30", ROM0 - rst $38 -SECTION "rst 38", ROM0 - rst $38 +INCLUDE "constants.asm" -; Hardware interrupts -SECTION "vblank", ROM0 - jp VBlank -SECTION "hblank", ROM0 - rst $38 -SECTION "timer", ROM0 - jp Timer -SECTION "serial", ROM0 - jp Serial -SECTION "joypad", ROM0 - reti + +SECTION "NULL", ROM0 +NULL:: + +INCLUDE "home/header.asm" + + +SECTION "High Home", ROM0 + +INCLUDE "home/lcd.asm" +INCLUDE "home/clear_sprites.asm" +INCLUDE "home/copy.asm" SECTION "Home", ROM0 -DisableLCD:: - xor a - ld [rIF], a - ld a, [rIE] - ld b, a - res 0, a - ld [rIE], a - -.wait - ld a, [rLY] - cp LY_VBLANK - jr nz, .wait - - ld a, [rLCDC] - and $ff ^ rLCDC_ENABLE_MASK - ld [rLCDC], a - ld a, b - ld [rIE], a - ret - -EnableLCD:: - ld a, [rLCDC] - set rLCDC_ENABLE, a - ld [rLCDC], a - ret - -ClearSprites:: - xor a - ld hl, wOAMBuffer - ld b, 40 * 4 -.loop - ld [hli], a - dec b - jr nz, .loop - ret - -HideSprites:: - ld a, 160 - ld hl, wOAMBuffer - ld de, 4 - ld b, 40 -.loop - ld [hl], a - add hl, de - dec b - jr nz, .loop - ret - -INCLUDE "home/copy.asm" - - -SECTION "Entry", ROM0 - - nop - jp Start - - -SECTION "Header", ROM0 - - ; The header is generated by rgbfix. - ; The space here is allocated to prevent code from being overwritten. - - ds $150 - $104 - - -SECTION "Main", ROM0 - -Start:: - cp GBC - jr z, .gbc - xor a - jr .ok -.gbc - ld a, 0 -.ok - ld [wGBC], a - jp Init - - +INCLUDE "home/start.asm" INCLUDE "home/joypad.asm" -INCLUDE "data/map_header_pointers.asm" + +INCLUDE "data/maps/map_header_pointers.asm" + INCLUDE "home/overworld.asm" +INCLUDE "home/pokemon.asm" +INCLUDE "home/print_bcd.asm" +INCLUDE "home/pics.asm" -CheckForUserInterruption:: -; Return carry if Up+Select+B, Start or A are pressed in c frames. -; Used only in the intro and title screen. - call DelayFrame +INCLUDE "data/tilesets/collision_tile_ids.asm" - push bc - call JoypadLowSensitivity - pop bc - - ld a, [hJoyHeld] - cp D_UP + SELECT + B_BUTTON - jr z, .input - - ld a, [hJoy5] - and START | A_BUTTON - jr nz, .input - - dec c - jr nz, CheckForUserInterruption - - and a - ret - -.input - scf - ret - -; function to load position data for destination warp when switching maps -; INPUT: -; a = ID of destination warp within destination map -LoadDestinationWarpPosition:: - ld b, a - ld a, [H_LOADEDROMBANK] - push af - ld a, [wPredefParentBank] - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ld a, b - add a - add a - ld c, a - ld b, 0 - add hl, bc - ld bc, 4 - ld de, wCurrentTileBlockMapViewPointer - call CopyData - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - - -DrawHPBar:: -; Draw an HP bar d tiles long, and fill it to e pixels. -; If c is nonzero, show at least a sliver regardless. -; The right end of the bar changes with [wHPBarType]. - - push hl - push de - push bc - - ; Left - ld a, $71 ; "HP:" - ld [hli], a - ld a, $62 - ld [hli], a - - push hl - - ; Middle - ld a, $63 ; empty -.draw - ld [hli], a - dec d - jr nz, .draw - - ; Right - ld a, [wHPBarType] - dec a - ld a, $6d ; status screen and battle - jr z, .ok - dec a ; pokemon menu -.ok - ld [hl], a - - pop hl - - ld a, e - and a - jr nz, .fill - - ; If c is nonzero, draw a pixel anyway. - ld a, c - and a - jr z, .done - ld e, 1 - -.fill - ld a, e - sub 8 - jr c, .partial - ld e, a - ld a, $6b ; full - ld [hli], a - ld a, e - and a - jr z, .done - jr .fill - -.partial - ; Fill remaining pixels at the end if necessary. - ld a, $63 ; empty - add e - ld [hl], a -.done - pop bc - pop de - pop hl - ret - - -; loads pokemon data from one of multiple sources to wLoadedMon -; loads base stats to wMonHeader -; INPUT: -; [wWhichPokemon] = index of pokemon within party/box -; [wMonDataLocation] = source -; 00: player's party -; 01: enemy's party -; 02: current box -; 03: daycare -; OUTPUT: -; [wcf91] = pokemon ID -; wLoadedMon = base address of pokemon data -; wMonHeader = base address of base stats -LoadMonData:: - jpab LoadMonData_ - -OverwritewMoves:: -; Write c to [wMoves + b]. Unused. - ld hl, wMoves - ld e, b - ld d, 0 - add hl, de - ld a, c - ld [hl], a - ret - -LoadFlippedFrontSpriteByMonIndex:: - ld a, 1 - ld [wSpriteFlipped], a - -LoadFrontSpriteByMonIndex:: - push hl - ld a, [wd11e] - push af - ld a, [wcf91] - ld [wd11e], a - predef IndexToPokedex - ld hl, wd11e - ld a, [hl] - pop bc - ld [hl], b - and a - pop hl - jr z, .invalidDexNumber ; dex #0 invalid - cp NUM_POKEMON + 1 - jr c, .validDexNumber ; dex >#151 invalid -.invalidDexNumber - ld a, RHYDON ; $1 - ld [wcf91], a - ret -.validDexNumber - push hl - ld de, vFrontPic - call LoadMonFrontSprite - pop hl - ld a, [H_LOADEDROMBANK] - push af - ld a, Bank(CopyUncompressedPicToHL) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - xor a - ld [hStartTileID], a - call CopyUncompressedPicToHL - xor a - ld [wSpriteFlipped], a - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; PlayCry - -GetCryData:: -; Load cry data for monster a. - dec a - ld c, a - ld b, 0 - ld hl, CryData - add hl, bc - add hl, bc - add hl, bc - - ld a, BANK(CryData) - call BankswitchHome - ld a, [hli] - ld b, a ; cry id - ld a, [hli] - ld [wFrequencyModifier], a - ld a, [hl] - ld [wTempoModifier], a - call BankswitchBack - - ; Cry headers have 3 channels, - ; and start from index $14, - ; so add 3 times the cry id. - ld a, b - ld c, $14 - rlca ; * 2 - add b - add c - ret - -DisplayPartyMenu:: - ld a, [hTilesetType] - push af - xor a - ld [hTilesetType], a - call GBPalWhiteOutWithDelay3 - call ClearSprites - call PartyMenuInit - call DrawPartyMenu - jp HandlePartyMenuInput - -GoBackToPartyMenu:: - ld a, [hTilesetType] - push af - xor a - ld [hTilesetType], a - call PartyMenuInit - call RedrawPartyMenu - jp HandlePartyMenuInput - -PartyMenuInit:: - ld a, 1 ; hardcoded bank - call BankswitchHome - call LoadHpBarAndStatusTilePatterns - ld hl, wd730 - set 6, [hl] ; turn off letter printing delay - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - ld [wMenuWatchMovingOutOfBounds], a - ld hl, wTopMenuItemY - inc a - ld [hli], a ; top menu item Y - xor a - ld [hli], a ; top menu item X - ld a, [wPartyAndBillsPCSavedMenuItem] - push af - ld [hli], a ; current menu item ID - inc hl - ld a, [wPartyCount] - and a ; are there more than 0 pokemon in the party? - jr z, .storeMaxMenuItemID - dec a -; if party is not empty, the max menu item ID is ([wPartyCount] - 1) -; otherwise, it is 0 -.storeMaxMenuItemID - ld [hli], a ; max menu item ID - ld a, [wForcePlayerToChooseMon] - and a - ld a, A_BUTTON | B_BUTTON - jr z, .next - xor a - ld [wForcePlayerToChooseMon], a - inc a ; a = A_BUTTON -.next - ld [hli], a ; menu watched keys - pop af - ld [hl], a ; old menu item ID - ret - -HandlePartyMenuInput:: - ld a, 1 - ld [wMenuWrappingEnabled], a - ld a, $40 - ld [wPartyMenuAnimMonEnabled], a - call HandleMenuInput_ - call PlaceUnfilledArrowMenuCursor - ld b, a - xor a - ld [wPartyMenuAnimMonEnabled], a - ld a, [wCurrentMenuItem] - ld [wPartyAndBillsPCSavedMenuItem], a - ld hl, wd730 - res 6, [hl] ; turn on letter printing delay - ld a, [wMenuItemToSwap] - and a - jp nz, .swappingPokemon - pop af - ld [hTilesetType], a - bit 1, b - jr nz, .noPokemonChosen - ld a, [wPartyCount] - and a - jr z, .noPokemonChosen - ld a, [wCurrentMenuItem] - ld [wWhichPokemon], a - ld hl, wPartySpecies - ld b, 0 - ld c, a - add hl, bc - ld a, [hl] - ld [wcf91], a - ld [wBattleMonSpecies2], a - call BankswitchBack - and a - ret -.noPokemonChosen - call BankswitchBack - scf - ret -.swappingPokemon - bit 1, b ; was the B button pressed? - jr z, .handleSwap ; if not, handle swapping the pokemon -.cancelSwap ; if the B button was pressed - callba ErasePartyMenuCursors - xor a - ld [wMenuItemToSwap], a - ld [wPartyMenuTypeOrMessageID], a - call RedrawPartyMenu - jr HandlePartyMenuInput -.handleSwap - ld a, [wCurrentMenuItem] - ld [wWhichPokemon], a - callba SwitchPartyMon - jr HandlePartyMenuInput - -DrawPartyMenu:: - ld hl, DrawPartyMenu_ - jr DrawPartyMenuCommon - -RedrawPartyMenu:: - ld hl, RedrawPartyMenu_ - -DrawPartyMenuCommon:: - ld b, BANK(RedrawPartyMenu_) - jp Bankswitch - -; prints a pokemon's status condition -; INPUT: -; de = address of status condition -; hl = destination address -PrintStatusCondition:: - push de - dec de - dec de ; de = address of current HP - ld a, [de] - ld b, a - dec de - ld a, [de] - or b ; is the pokemon's HP zero? - pop de - jr nz, PrintStatusConditionNotFainted -; if the pokemon's HP is 0, print "FNT" - ld a, "F" - ld [hli], a - ld a, "N" - ld [hli], a - ld [hl], "T" - and a - ret - -PrintStatusConditionNotFainted: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(PrintStatusAilment) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call PrintStatusAilment ; print status condition - pop bc - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; function to print pokemon level, leaving off the ":L" if the level is at least 100 -; INPUT: -; hl = destination address -; [wLoadedMonLevel] = level -PrintLevel:: - ld a, $6e ; ":L" tile ID - ld [hli], a - ld c, 2 ; number of digits - ld a, [wLoadedMonLevel] ; level - cp 100 - jr c, PrintLevelCommon -; if level at least 100, write over the ":L" tile - dec hl - inc c ; increment number of digits to 3 - jr PrintLevelCommon - -; prints the level without leaving off ":L" regardless of level -; INPUT: -; hl = destination address -; [wLoadedMonLevel] = level -PrintLevelFull:: - ld a, $6e ; ":L" tile ID - ld [hli], a - ld c, 3 ; number of digits - ld a, [wLoadedMonLevel] ; level - -PrintLevelCommon:: - ld [wd11e], a - ld de, wd11e - ld b, LEFT_ALIGN | 1 ; 1 byte - jp PrintNumber - -GetwMoves:: -; Unused. Returns the move at index a from wMoves in a - ld hl, wMoves - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] - ret - -; copies the base stat data of a pokemon to wMonHeader -; INPUT: -; [wd0b5] = pokemon ID -GetMonHeader:: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(BaseStats) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - push bc - push de - push hl - ld a, [wd11e] - push af - ld a, [wd0b5] - ld [wd11e], a - ld de, FossilKabutopsPic - ld b, $66 ; size of Kabutops fossil and Ghost sprites - cp FOSSIL_KABUTOPS ; Kabutops fossil - jr z, .specialID - ld de, GhostPic - cp MON_GHOST ; Ghost - jr z, .specialID - ld de, FossilAerodactylPic - ld b, $77 ; size of Aerodactyl fossil sprite - cp FOSSIL_AERODACTYL ; Aerodactyl fossil - jr z, .specialID - cp MEW - jr z, .mew - predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number - ld a, [wd11e] - dec a - ld bc, MonBaseStatsEnd - MonBaseStats - ld hl, BaseStats - call AddNTimes - ld de, wMonHeader - ld bc, MonBaseStatsEnd - MonBaseStats - call CopyData - jr .done -.specialID - ld hl, wMonHSpriteDim - ld [hl], b ; write sprite dimensions - inc hl - ld [hl], e ; write front sprite pointer - inc hl - ld [hl], d - jr .done -.mew - ld hl, MewBaseStats - ld de, wMonHeader - ld bc, MonBaseStatsEnd - MonBaseStats - ld a, BANK(MewBaseStats) - call FarCopyData -.done - ld a, [wd0b5] - ld [wMonHIndex], a - pop af - ld [wd11e], a - pop hl - pop de - pop bc - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; copy party pokemon's name to wcd6d -GetPartyMonName2:: - ld a, [wWhichPokemon] ; index within party - ld hl, wPartyMonNicks - -; this is called more often -GetPartyMonName:: - push hl - push bc - call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times - ld de, wcd6d - push de - ld bc, NAME_LENGTH - call CopyData - pop de - pop bc - pop hl - ret - -; function to print a BCD (Binary-coded decimal) number -; de = address of BCD number -; hl = destination address -; c = flags and length -; bit 7: if set, do not print leading zeroes -; if unset, print leading zeroes -; bit 6: if set, left-align the string (do not pad empty digits with spaces) -; if unset, right-align the string -; bit 5: if set, print currency symbol at the beginning of the string -; if unset, do not print the currency symbol -; bits 0-4: length of BCD number in bytes -; Note that bits 5 and 7 are modified during execution. The above reflects -; their meaning at the beginning of the functions's execution. -PrintBCDNumber:: - ld b, c ; save flags in b - res 7, c - res 6, c - res 5, c ; c now holds the length - bit 5, b - jr z, .loop - bit 7, b - jr nz, .loop - ld [hl], "¥" - inc hl -.loop - ld a, [de] - swap a - call PrintBCDDigit ; print upper digit - ld a, [de] - call PrintBCDDigit ; print lower digit - inc de - dec c - jr nz, .loop - bit 7, b ; were any non-zero digits printed? - jr z, .done ; if so, we are done -.numberEqualsZero ; if every digit of the BCD number is zero - bit 6, b ; left or right alignment? - jr nz, .skipRightAlignmentAdjustment - dec hl ; if the string is right-aligned, it needs to be moved back one space -.skipRightAlignmentAdjustment - bit 5, b - jr z, .skipCurrencySymbol - ld [hl], "¥" - inc hl -.skipCurrencySymbol - ld [hl], "0" - call PrintLetterDelay - inc hl -.done - ret - -PrintBCDDigit:: - and $f - and a - jr z, .zeroDigit -.nonzeroDigit - bit 7, b ; have any non-space characters been printed? - jr z, .outputDigit -; if bit 7 is set, then no numbers have been printed yet - bit 5, b ; print the currency symbol? - jr z, .skipCurrencySymbol - ld [hl], "¥" - inc hl - res 5, b -.skipCurrencySymbol - res 7, b ; unset 7 to indicate that a nonzero digit has been reached -.outputDigit - add "0" - ld [hli], a - jp PrintLetterDelay -.zeroDigit - bit 7, b ; either printing leading zeroes or already reached a nonzero digit? - jr z, .outputDigit ; if so, print a zero digit - bit 6, b ; left or right alignment? - ret nz - inc hl ; if right-aligned, "print" a space by advancing the pointer - ret - -; uncompresses the front or back sprite of the specified mon -; assumes the corresponding mon header is already loaded -; hl contains offset to sprite pointer ($b for front or $d for back) -UncompressMonSprite:: - ld bc, wMonHeader - add hl, bc - ld a, [hli] - ld [wSpriteInputPtr], a ; fetch sprite input pointer - ld a, [hl] - ld [wSpriteInputPtr+1], a -; define (by index number) the bank that a pokemon's image is in -; index = Mew, bank 1 -; index = Kabutops fossil, bank $B -; index < $1F, bank 9 -; $1F ≤ index < $4A, bank $A -; $4A ≤ index < $74, bank $B -; $74 ≤ index < $99, bank $C -; $99 ≤ index, bank $D - ld a, [wcf91] ; XXX name for this ram location - ld b, a - cp MEW - ld a, BANK(MewPicFront) - jr z, .GotBank - ld a, b - cp FOSSIL_KABUTOPS - ld a, BANK(FossilKabutopsPic) - jr z, .GotBank - ld a, b - cp TANGELA + 1 - ld a, BANK(TangelaPicFront) - jr c, .GotBank - ld a, b - cp MOLTRES + 1 - ld a, BANK(MoltresPicFront) - jr c, .GotBank - ld a, b - cp BEEDRILL + 2 - ld a, BANK(BeedrillPicFront) - jr c, .GotBank - ld a, b - cp STARMIE + 1 - ld a, BANK(StarmiePicFront) - jr c, .GotBank - ld a, BANK(VictreebelPicFront) -.GotBank - jp UncompressSpriteData - -; de: destination location -LoadMonFrontSprite:: - push de - ld hl, wMonHFrontSprite - wMonHeader - call UncompressMonSprite - ld hl, wMonHSpriteDim - ld a, [hli] - ld c, a - pop de - ; fall through - -; postprocesses uncompressed sprite chunks to a 2bpp sprite and loads it into video ram -; calculates alignment parameters to place both sprite chunks in the center of the 7*7 tile sprite buffers -; de: destination location -; a,c: sprite dimensions (in tiles of 8x8 each) -LoadUncompressedSpriteData:: - push de - and $f - ld [H_SPRITEWIDTH], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width - ld b, a - ld a, $7 - sub b ; 7-w - inc a ; 8-w - srl a ; (8-w)/2 ; horizontal center (in tiles, rounded up) - ld b, a - add a - add a - add a - sub b ; 7*((8-w)/2) ; skip for horizontal center (in tiles) - ld [H_SPRITEOFFSET], a - ld a, c - swap a - and $f - ld b, a - add a - add a - add a ; 8*tiles is height in bytes - ld [H_SPRITEHEIGHT], a - ld a, $7 - sub b ; 7-h ; skip for vertical center (in tiles, relative to current column) - ld b, a - ld a, [H_SPRITEOFFSET] - add b ; 7*((8-w)/2) + 7-h ; combined overall offset (in tiles) - add a - add a - add a ; 8*(7*((8-w)/2) + 7-h) ; combined overall offset (in bytes) - ld [H_SPRITEOFFSET], a - xor a - ld [$4000], a - ld hl, sSpriteBuffer0 - call ZeroSpriteBuffer ; zero buffer 0 - ld de, sSpriteBuffer1 - ld hl, sSpriteBuffer0 - call AlignSpriteDataCentered ; copy and align buffer 1 to 0 (containing the MSB of the 2bpp sprite) - ld hl, sSpriteBuffer1 - call ZeroSpriteBuffer ; zero buffer 1 - ld de, sSpriteBuffer2 - ld hl, sSpriteBuffer1 - call AlignSpriteDataCentered ; copy and align buffer 2 to 1 (containing the LSB of the 2bpp sprite) - pop de - jp InterlaceMergeSpriteBuffers - -; copies and aligns the sprite data properly inside the sprite buffer -; sprite buffers are 7*7 tiles in size, the loaded sprite is centered within this area -AlignSpriteDataCentered:: - ld a, [H_SPRITEOFFSET] - ld b, $0 - ld c, a - add hl, bc - ld a, [H_SPRITEWIDTH] -.columnLoop - push af - push hl - ld a, [H_SPRITEHEIGHT] - ld c, a -.columnInnerLoop - ld a, [de] - inc de - ld [hli], a - dec c - jr nz, .columnInnerLoop - pop hl - ld bc, 7*8 ; 7 tiles - add hl, bc ; advance one full column - pop af - dec a - jr nz, .columnLoop - ret - -; fills the sprite buffer (pointed to in hl) with zeros -ZeroSpriteBuffer:: - ld bc, SPRITEBUFFERSIZE -.nextByteLoop - xor a - ld [hli], a - dec bc - ld a, b - or c - jr nz, .nextByteLoop - ret - -; combines the (7*7 tiles, 1bpp) sprite chunks in buffer 0 and 1 into a 2bpp sprite located in buffer 1 through 2 -; in the resulting sprite, the rows of the two source sprites are interlaced -; de: output address -InterlaceMergeSpriteBuffers:: - xor a - ld [$4000], a - push de - ld hl, sSpriteBuffer2 + (SPRITEBUFFERSIZE - 1) ; destination: end of buffer 2 - ld de, sSpriteBuffer1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1 - ld bc, sSpriteBuffer0 + (SPRITEBUFFERSIZE - 1) ; source 1: end of buffer 0 - ld a, SPRITEBUFFERSIZE/2 ; $c4 - ld [H_SPRITEINTERLACECOUNTER], a -.interlaceLoop - ld a, [de] - dec de - ld [hld], a ; write byte of source 2 - ld a, [bc] - dec bc - ld [hld], a ; write byte of source 1 - ld a, [de] - dec de - ld [hld], a ; write byte of source 2 - ld a, [bc] - dec bc - ld [hld], a ; write byte of source 1 - ld a, [H_SPRITEINTERLACECOUNTER] - dec a - ld [H_SPRITEINTERLACECOUNTER], a - jr nz, .interlaceLoop - ld a, [wSpriteFlipped] - and a - jr z, .notFlipped - ld bc, 2*SPRITEBUFFERSIZE - ld hl, sSpriteBuffer1 -.swapLoop - swap [hl] ; if flipped swap nybbles in all bytes - inc hl - dec bc - ld a, b - or c - jr nz, .swapLoop -.notFlipped - pop hl - ld de, sSpriteBuffer1 - ld c, (2*SPRITEBUFFERSIZE)/16 ; $31, number of 16 byte chunks to be copied - ld a, [H_LOADEDROMBANK] - ld b, a - jp CopyVideoData - - -INCLUDE "data/collision.asm" INCLUDE "home/copy2.asm" INCLUDE "home/text.asm" INCLUDE "home/vcopy.asm" @@ -912,3777 +37,51 @@ INCLUDE "home/fade.asm" INCLUDE "home/serial.asm" INCLUDE "home/timer.asm" INCLUDE "home/audio.asm" - - -UpdateSprites:: - ld a, [wUpdateSpritesEnabled] - dec a - ret nz - ld a, [H_LOADEDROMBANK] - push af - ld a, Bank(_UpdateSprites) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call _UpdateSprites - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -INCLUDE "data/mart_inventories.asm" - -TextScriptEndingChar:: - db "@" -TextScriptEnd:: - ld hl, TextScriptEndingChar - ret - -ExclamationText:: - TX_FAR _ExclamationText - db "@" - -GroundRoseText:: - TX_FAR _GroundRoseText - db "@" - -BoulderText:: - TX_FAR _BoulderText - db "@" - -MartSignText:: - TX_FAR _MartSignText - db "@" - -PokeCenterSignText:: - TX_FAR _PokeCenterSignText - db "@" - -PickUpItemText:: - TX_ASM - predef PickUpItem - jp TextScriptEnd - - -INCLUDE "home/pic.asm" - - -ResetPlayerSpriteData:: - ld hl, wSpriteStateData1 - call ResetPlayerSpriteData_ClearSpriteData - ld hl, wSpriteStateData2 - call ResetPlayerSpriteData_ClearSpriteData - ld a, $1 - ld [wSpriteStateData1], a - ld [wSpriteStateData2 + $0e], a - ld hl, wSpriteStateData1 + 4 - ld [hl], $3c ; set Y screen pos - inc hl - inc hl - ld [hl], $40 ; set X screen pos - ret - -; overwrites sprite data with zeroes -ResetPlayerSpriteData_ClearSpriteData:: - ld bc, $10 - xor a - jp FillMemory - -FadeOutAudio:: - ld a, [wAudioFadeOutControl] - and a ; currently fading out audio? - jr nz, .fadingOut - ld a, [wd72c] - bit 1, a - ret nz - ld a, $77 - ld [rNR50], a - ret -.fadingOut - ld a, [wAudioFadeOutCounter] - and a - jr z, .counterReachedZero - dec a - ld [wAudioFadeOutCounter], a - ret -.counterReachedZero - ld a, [wAudioFadeOutCounterReloadValue] - ld [wAudioFadeOutCounter], a - ld a, [rNR50] - and a ; has the volume reached 0? - jr z, .fadeOutComplete - ld b, a - and $f - dec a - ld c, a - ld a, b - and $f0 - swap a - dec a - swap a - or c - ld [rNR50], a - ret -.fadeOutComplete - ld a, [wAudioFadeOutControl] - ld b, a - xor a - ld [wAudioFadeOutControl], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound - ld a, [wAudioSavedROMBank] - ld [wAudioROMBank], a - ld a, b - ld [wNewSoundID], a - jp PlaySound - -; this function is used to display sign messages, sprite dialog, etc. -; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID -DisplayTextID:: - ld a, [H_LOADEDROMBANK] - push af - callba DisplayTextIDInit ; initialization - ld hl, wTextPredefFlag - bit 0, [hl] - res 0, [hl] - jr nz, .skipSwitchToMapBank - ld a, [wCurMap] - call SwitchToMapRomBank -.skipSwitchToMapBank - ld a, 30 ; half a second - ld [H_FRAMECOUNTER], a ; used as joypad poll timer - ld hl, wMapTextPtr - ld a, [hli] - ld h, [hl] - ld l, a ; hl = map text pointer - ld d, $00 - ld a, [hSpriteIndexOrTextID] ; text ID - ld [wSpriteIndex], a - and a - jp z, DisplayStartMenu - cp TEXT_SAFARI_GAME_OVER - jp z, DisplaySafariGameOverText - cp TEXT_MON_FAINTED - jp z, DisplayPokemonFaintedText - cp TEXT_BLACKED_OUT - jp z, DisplayPlayerBlackedOutText - cp TEXT_REPEL_WORE_OFF - jp z, DisplayRepelWoreOffText - ld a, [wNumSprites] - ld e, a - ld a, [hSpriteIndexOrTextID] ; sprite ID - cp e - jr z, .spriteHandling - jr nc, .skipSpriteHandling -.spriteHandling -; get the text ID of the sprite - push hl - push de - push bc - callba UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction) - pop bc - pop de - ld hl, wMapSpriteData ; NPC text entries - ld a, [hSpriteIndexOrTextID] - dec a - add a - add l - ld l, a - jr nc, .noCarry - inc h -.noCarry - inc hl - ld a, [hl] ; a = text ID of the sprite - pop hl -.skipSpriteHandling -; look up the address of the text in the map's text entries - dec a - ld e, a - sla e - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a ; hl = address of the text - ld a, [hl] ; a = first byte of text -; check first byte of text for special cases - cp $fe ; Pokemart NPC - jp z, DisplayPokemartDialogue - cp $ff ; Pokemon Center NPC - jp z, DisplayPokemonCenterDialogue - cp $fc ; Item Storage PC - jp z, FuncTX_ItemStoragePC - cp $fd ; Bill's PC - jp z, FuncTX_BillsPC - cp $f9 ; Pokemon Center PC - jp z, FuncTX_PokemonCenterPC - cp $f5 ; Vending Machine - jr nz, .notVendingMachine - callba VendingMachineMenu ; jump banks to vending machine routine - jr AfterDisplayingTextID -.notVendingMachine - cp $f7 ; prize menu - jp z, FuncTX_GameCornerPrizeMenu - cp $f6 ; cable connection NPC in Pokemon Center - jr nz, .notSpecialCase - callab CableClubNPC - jr AfterDisplayingTextID -.notSpecialCase - call PrintText_NoCreatingTextBox ; display the text - ld a, [wDoNotWaitForButtonPressAfterDisplayingText] - and a - jr nz, HoldTextDisplayOpen - -AfterDisplayingTextID:: - ld a, [wEnteringCableClub] - and a - jr nz, HoldTextDisplayOpen - call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text - -; loop to hold the dialogue box open as long as the player keeps holding down the A button -HoldTextDisplayOpen:: - call Joypad - ld a, [hJoyHeld] - bit 0, a ; is the A button being pressed? - jr nz, HoldTextDisplayOpen - -CloseTextDisplay:: - ld a, [wCurMap] - call SwitchToMapRomBank - ld a, $90 - ld [hWY], a ; move the window off the screen - call DelayFrame - call LoadGBPal - xor a - ld [H_AUTOBGTRANSFERENABLED], a ; disable continuous WRAM to VRAM transfer each V-blank -; loop to make sprites face the directions they originally faced before the dialogue - ld hl, wSpriteStateData2 + $19 - ld c, $0f - ld de, $0010 -.restoreSpriteFacingDirectionLoop - ld a, [hl] - dec h - ld [hl], a - inc h - add hl, de - dec c - jr nz, .restoreSpriteFacingDirectionLoop - ld a, BANK(InitMapSprites) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call InitMapSprites ; reload sprite tile pattern data (since it was partially overwritten by text tile patterns) - ld hl, wFontLoaded - res 0, [hl] - ld a, [wd732] - bit 3, a ; used fly warp - call z, LoadPlayerSpriteGraphics - call LoadCurrentMapView - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - jp UpdateSprites - -DisplayPokemartDialogue:: - push hl - ld hl, PokemartGreetingText - call PrintText - pop hl - inc hl - call LoadItemList - ld a, PRICEDITEMLISTMENU - ld [wListMenuID], a - ld a, [H_LOADEDROMBANK] - push af - ld a, Bank(DisplayPokemartDialogue_) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call DisplayPokemartDialogue_ - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - jp AfterDisplayingTextID - -PokemartGreetingText:: - TX_FAR _PokemartGreetingText - db "@" - -LoadItemList:: - ld a, 1 - ld [wUpdateSpritesEnabled], a - ld a, h - ld [wItemListPointer], a - ld a, l - ld [wItemListPointer + 1], a - ld de, wItemList -.loop - ld a, [hli] - ld [de], a - inc de - cp $ff - jr nz, .loop - ret - -DisplayPokemonCenterDialogue:: -; zeroing these doesn't appear to serve any purpose - xor a - ld [$ff8b], a - ld [$ff8c], a - ld [$ff8d], a - - inc hl - ld a, [H_LOADEDROMBANK] - push af - ld a, Bank(DisplayPokemonCenterDialogue_) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call DisplayPokemonCenterDialogue_ - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - jp AfterDisplayingTextID - -DisplaySafariGameOverText:: - callab PrintSafariGameOverText - jp AfterDisplayingTextID - -DisplayPokemonFaintedText:: - ld hl, PokemonFaintedText - call PrintText - jp AfterDisplayingTextID - -PokemonFaintedText:: - TX_FAR _PokemonFaintedText - db "@" - -DisplayPlayerBlackedOutText:: - ld hl, PlayerBlackedOutText - call PrintText - ld a, [wd732] - res 5, a ; reset forced to use bike bit - ld [wd732], a - jp HoldTextDisplayOpen - -PlayerBlackedOutText:: - TX_FAR _PlayerBlackedOutText - db "@" - -DisplayRepelWoreOffText:: - ld hl, RepelWoreOffText - call PrintText - jp AfterDisplayingTextID - -RepelWoreOffText:: - TX_FAR _RepelWoreOffText - db "@" - -INCLUDE "engine/menu/start_menu.asm" - -; function to count how many bits are set in a string of bytes -; INPUT: -; hl = address of string of bytes -; b = length of string of bytes -; OUTPUT: -; [wNumSetBits] = number of set bits -CountSetBits:: - ld c, 0 -.loop - ld a, [hli] - ld e, a - ld d, 8 -.innerLoop ; count how many bits are set in the current byte - srl e - ld a, 0 - adc c - ld c, a - dec d - jr nz, .innerLoop - dec b - jr nz, .loop - ld a, c - ld [wNumSetBits], a - ret - -; subtracts the amount the player paid from their money -; sets carry flag if there is enough money and unsets carry flag if not -SubtractAmountPaidFromMoney:: - jpba SubtractAmountPaidFromMoney_ - -; adds the amount the player sold to their money -AddAmountSoldToMoney:: - ld de, wPlayerMoney + 2 - ld hl, $ffa1 ; total price of items - ld c, 3 ; length of money in bytes - predef AddBCDPredef ; add total price to money - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID ; redraw money text box - ld a, SFX_PURCHASE - call PlaySoundWaitForCurrent - jp WaitForSoundToFinish - -; function to remove an item (in varying quantities) from the player's bag or PC box -; INPUT: -; HL = address of inventory (either wNumBagItems or wNumBoxItems) -; [wWhichPokemon] = index (within the inventory) of the item to remove -; [wItemQuantity] = quantity to remove -RemoveItemFromInventory:: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(RemoveItemFromInventory_) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call RemoveItemFromInventory_ - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; function to add an item (in varying quantities) to the player's bag or PC box -; INPUT: -; HL = address of inventory (either wNumBagItems or wNumBoxItems) -; [wcf91] = item ID -; [wItemQuantity] = item quantity -; sets carry flag if successful, unsets carry flag if unsuccessful -AddItemToInventory:: - push bc - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(AddItemToInventory_) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call AddItemToInventory_ - pop bc - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - pop bc - ret - -; INPUT: -; [wListMenuID] = list menu ID -; [wListPointer] = address of the list (2 bytes) -DisplayListMenuID:: - xor a - ld [H_AUTOBGTRANSFERENABLED], a ; disable auto-transfer - ld a, 1 - ld [hJoy7], a ; joypad state update flag - ld a, [wBattleType] - and a ; is it the Old Man battle? - jr nz, .specialBattleType - ld a, $01 ; hardcoded bank - jr .bankswitch -.specialBattleType ; Old Man battle - ld a, BANK(DisplayBattleMenu) -.bankswitch - call BankswitchHome - ld hl, wd730 - set 6, [hl] ; turn off letter printing delay - xor a - ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped - ld [wListCount], a - ld a, [wListPointer] - ld l, a - ld a, [wListPointer + 1] - ld h, a ; hl = address of the list - ld a, [hl] ; the first byte is the number of entries in the list - ld [wListCount], a - ld a, LIST_MENU_BOX - ld [wTextBoxID], a - call DisplayTextBoxID ; draw the menu text box - call UpdateSprites ; disable sprites behind the text box -; the code up to .skipMovingSprites appears to be useless - coord hl, 4, 2 ; coordinates of upper left corner of menu text box - lb de, 9, 14 ; height and width of menu text box - ld a, [wListMenuID] - and a ; is it a PC pokemon list? - jr nz, .skipMovingSprites - call UpdateSprites -.skipMovingSprites - ld a, 1 ; max menu item ID is 1 if the list has less than 2 entries - ld [wMenuWatchMovingOutOfBounds], a - ld a, [wListCount] - cp 2 ; does the list have less than 2 entries? - jr c, .setMenuVariables - ld a, 2 ; max menu item ID is 2 if the list has at least 2 entries -.setMenuVariables - ld [wMaxMenuItem], a - ld a, 4 - ld [wTopMenuItemY], a - ld a, 5 - ld [wTopMenuItemX], a - ld a, A_BUTTON | B_BUTTON | SELECT - ld [wMenuWatchedKeys], a - ld c, 10 - call DelayFrames - -DisplayListMenuIDLoop:: - xor a - ld [H_AUTOBGTRANSFERENABLED], a ; disable transfer - call PrintListMenuEntries - ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a ; enable transfer - call Delay3 - ld a, [wBattleType] - and a ; is it the Old Man battle? - jr z, .notOldManBattle -.oldManBattle - ld a, "▶" - Coorda 5, 4 ; place menu cursor in front of first menu entry - ld c, 80 - call DelayFrames - xor a - ld [wCurrentMenuItem], a - coord hl, 5, 4 - ld a, l - ld [wMenuCursorLocation], a - ld a, h - ld [wMenuCursorLocation + 1], a - jr .buttonAPressed -.notOldManBattle - call LoadGBPal - call HandleMenuInput - push af - call PlaceMenuCursor - pop af - bit 0, a ; was the A button pressed? - jp z, .checkOtherKeys -.buttonAPressed - ld a, [wCurrentMenuItem] - call PlaceUnfilledArrowMenuCursor - -; pointless because both values are overwritten before they are read - ld a, $01 - ld [wMenuExitMethod], a - ld [wChosenMenuItem], a - - xor a - ld [wMenuWatchMovingOutOfBounds], a - ld a, [wCurrentMenuItem] - ld c, a - ld a, [wListScrollOffset] - add c - ld c, a - ld a, [wListCount] - and a ; is the list empty? - jp z, ExitListMenu ; if so, exit the menu - dec a - cp c ; did the player select Cancel? - jp c, ExitListMenu ; if so, exit the menu - ld a, c - ld [wWhichPokemon], a - ld a, [wListMenuID] - cp ITEMLISTMENU - jr nz, .skipMultiplying -; if it's an item menu - sla c ; item entries are 2 bytes long, so multiply by 2 -.skipMultiplying - ld a, [wListPointer] - ld l, a - ld a, [wListPointer + 1] - ld h, a - inc hl ; hl = beginning of list entries - ld b, 0 - add hl, bc - ld a, [hl] - ld [wcf91], a - ld a, [wListMenuID] - and a ; is it a PC pokemon list? - jr z, .pokemonList - push hl - call GetItemPrice - pop hl - ld a, [wListMenuID] - cp ITEMLISTMENU - jr nz, .skipGettingQuantity -; if it's an item menu - inc hl - ld a, [hl] ; a = item quantity - ld [wMaxItemQuantity], a -.skipGettingQuantity - ld a, [wcf91] - ld [wd0b5], a - ld a, BANK(ItemNames) - ld [wPredefBank], a - call GetName - jr .storeChosenEntry -.pokemonList - ld hl, wPartyCount - ld a, [wListPointer] - cp l ; is it a list of party pokemon or box pokemon? - ld hl, wPartyMonNicks - jr z, .getPokemonName - ld hl, wBoxMonNicks ; box pokemon names -.getPokemonName - ld a, [wWhichPokemon] - call GetPartyMonName -.storeChosenEntry ; store the menu entry that the player chose and return - ld de, wcd6d - call CopyStringToCF4B ; copy name to wcf4b - ld a, CHOSE_MENU_ITEM - ld [wMenuExitMethod], a - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - xor a - ld [hJoy7], a ; joypad state update flag - ld hl, wd730 - res 6, [hl] ; turn on letter printing delay - jp BankswitchBack -.checkOtherKeys ; check B, SELECT, Up, and Down keys - bit 1, a ; was the B button pressed? - jp nz, ExitListMenu ; if so, exit the menu - bit 2, a ; was the select button pressed? - jp nz, HandleItemListSwapping ; if so, allow the player to swap menu entries - ld b, a - bit 7, b ; was Down pressed? - ld hl, wListScrollOffset - jr z, .upPressed -.downPressed - ld a, [hl] - add 3 - ld b, a - ld a, [wListCount] - cp b ; will going down scroll past the Cancel button? - jp c, DisplayListMenuIDLoop - inc [hl] ; if not, go down - jp DisplayListMenuIDLoop -.upPressed - ld a, [hl] - and a - jp z, DisplayListMenuIDLoop - dec [hl] - jp DisplayListMenuIDLoop - -DisplayChooseQuantityMenu:: -; text box dimensions/coordinates for just quantity - coord hl, 15, 9 - ld b, 1 ; height - ld c, 3 ; width - ld a, [wListMenuID] - cp PRICEDITEMLISTMENU - jr nz, .drawTextBox -; text box dimensions/coordinates for quantity and price - coord hl, 7, 9 - ld b, 1 ; height - ld c, 11 ; width -.drawTextBox - call TextBoxBorder - coord hl, 16, 10 - ld a, [wListMenuID] - cp PRICEDITEMLISTMENU - jr nz, .printInitialQuantity - coord hl, 8, 10 -.printInitialQuantity - ld de, InitialQuantityText - call PlaceString - xor a - ld [wItemQuantity], a ; initialize current quantity to 0 - jp .incrementQuantity -.waitForKeyPressLoop - call JoypadLowSensitivity - ld a, [hJoyPressed] ; newly pressed buttons - bit 0, a ; was the A button pressed? - jp nz, .buttonAPressed - bit 1, a ; was the B button pressed? - jp nz, .buttonBPressed - bit 6, a ; was Up pressed? - jr nz, .incrementQuantity - bit 7, a ; was Down pressed? - jr nz, .decrementQuantity - jr .waitForKeyPressLoop -.incrementQuantity - ld a, [wMaxItemQuantity] - inc a - ld b, a - ld hl, wItemQuantity ; current quantity - inc [hl] - ld a, [hl] - cp b - jr nz, .handleNewQuantity -; wrap to 1 if the player goes above the max quantity - ld a, 1 - ld [hl], a - jr .handleNewQuantity -.decrementQuantity - ld hl, wItemQuantity ; current quantity - dec [hl] - jr nz, .handleNewQuantity -; wrap to the max quantity if the player goes below 1 - ld a, [wMaxItemQuantity] - ld [hl], a -.handleNewQuantity - coord hl, 17, 10 - ld a, [wListMenuID] - cp PRICEDITEMLISTMENU - jr nz, .printQuantity -.printPrice - ld c, $03 - ld a, [wItemQuantity] - ld b, a - ld hl, hMoney ; total price -; initialize total price to 0 - xor a - ld [hli], a - ld [hli], a - ld [hl], a -.addLoop ; loop to multiply the individual price by the quantity to get the total price - ld de, hMoney + 2 - ld hl, hItemPrice + 2 - push bc - predef AddBCDPredef ; add the individual price to the current sum - pop bc - dec b - jr nz, .addLoop - ld a, [hHalveItemPrices] - and a ; should the price be halved (for selling items)? - jr z, .skipHalvingPrice - xor a - ld [hDivideBCDDivisor], a - ld [hDivideBCDDivisor + 1], a - ld a, $02 - ld [hDivideBCDDivisor + 2], a - predef DivideBCDPredef3 ; halves the price -; store the halved price - ld a, [hDivideBCDQuotient] - ld [hMoney], a - ld a, [hDivideBCDQuotient + 1] - ld [hMoney + 1], a - ld a, [hDivideBCDQuotient + 2] - ld [hMoney + 2], a -.skipHalvingPrice - coord hl, 12, 10 - ld de, SpacesBetweenQuantityAndPriceText - call PlaceString - ld de, hMoney ; total price - ld c, $a3 - call PrintBCDNumber - coord hl, 9, 10 -.printQuantity - ld de, wItemQuantity ; current quantity - lb bc, LEADING_ZEROES | 1, 2 ; 1 byte, 2 digits - call PrintNumber - jp .waitForKeyPressLoop -.buttonAPressed ; the player chose to make the transaction - xor a - ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped - ret -.buttonBPressed ; the player chose to cancel the transaction - xor a - ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped - ld a, $ff - ret - -InitialQuantityText:: - db "×01@" - -SpacesBetweenQuantityAndPriceText:: - db " @" - -ExitListMenu:: - ld a, [wCurrentMenuItem] - ld [wChosenMenuItem], a - ld a, CANCELLED_MENU - ld [wMenuExitMethod], a - ld [wMenuWatchMovingOutOfBounds], a - xor a - ld [hJoy7], a - ld hl, wd730 - res 6, [hl] - call BankswitchBack - xor a - ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped - scf - ret - -PrintListMenuEntries:: - coord hl, 5, 3 - ld b, 9 - ld c, 14 - call ClearScreenArea - ld a, [wListPointer] - ld e, a - ld a, [wListPointer + 1] - ld d, a - inc de ; de = beginning of list entries - ld a, [wListScrollOffset] - ld c, a - ld a, [wListMenuID] - cp ITEMLISTMENU - ld a, c - jr nz, .skipMultiplying -; if it's an item menu -; item entries are 2 bytes long, so multiply by 2 - sla a - sla c -.skipMultiplying - add e - ld e, a - jr nc, .noCarry - inc d -.noCarry - coord hl, 6, 4 ; coordinates of first list entry name - ld b, 4 ; print 4 names -.loop - ld a, b - ld [wWhichPokemon], a - ld a, [de] - ld [wd11e], a - cp $ff - jp z, .printCancelMenuItem - push bc - push de - push hl - push hl - push de - ld a, [wListMenuID] - and a - jr z, .pokemonPCMenu - cp MOVESLISTMENU - jr z, .movesMenu -.itemMenu - call GetItemName - jr .placeNameString -.pokemonPCMenu - push hl - ld hl, wPartyCount - ld a, [wListPointer] - cp l ; is it a list of party pokemon or box pokemon? - ld hl, wPartyMonNicks - jr z, .getPokemonName - ld hl, wBoxMonNicks ; box pokemon names -.getPokemonName - ld a, [wWhichPokemon] - ld b, a - ld a, 4 - sub b - ld b, a - ld a, [wListScrollOffset] - add b - call GetPartyMonName - pop hl - jr .placeNameString -.movesMenu - call GetMoveName -.placeNameString - call PlaceString - pop de - pop hl - ld a, [wPrintItemPrices] - and a ; should prices be printed? - jr z, .skipPrintingItemPrice -.printItemPrice - push hl - ld a, [de] - ld de, ItemPrices - ld [wcf91], a - call GetItemPrice ; get price - pop hl - ld bc, SCREEN_WIDTH + 5 ; 1 row down and 5 columns right - add hl, bc - ld c, $a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes - call PrintBCDNumber -.skipPrintingItemPrice - ld a, [wListMenuID] - and a - jr nz, .skipPrintingPokemonLevel -.printPokemonLevel - ld a, [wd11e] - push af - push hl - ld hl, wPartyCount - ld a, [wListPointer] - cp l ; is it a list of party pokemon or box pokemon? - ld a, PLAYER_PARTY_DATA - jr z, .next - ld a, BOX_DATA -.next - ld [wMonDataLocation], a - ld hl, wWhichPokemon - ld a, [hl] - ld b, a - ld a, $04 - sub b - ld b, a - ld a, [wListScrollOffset] - add b - ld [hl], a - call LoadMonData - ld a, [wMonDataLocation] - and a ; is it a list of party pokemon or box pokemon? - jr z, .skipCopyingLevel -.copyLevel - ld a, [wLoadedMonBoxLevel] - ld [wLoadedMonLevel], a -.skipCopyingLevel - pop hl - ld bc, $001c - add hl, bc - call PrintLevel - pop af - ld [wd11e], a -.skipPrintingPokemonLevel - pop hl - pop de - inc de - ld a, [wListMenuID] - cp ITEMLISTMENU - jr nz, .nextListEntry -.printItemQuantity - ld a, [wd11e] - ld [wcf91], a - call IsKeyItem ; check if item is unsellable - ld a, [wIsKeyItem] - and a ; is the item unsellable? - jr nz, .skipPrintingItemQuantity ; if so, don't print the quantity - push hl - ld bc, SCREEN_WIDTH + 8 ; 1 row down and 8 columns right - add hl, bc - ld a, "×" - ld [hli], a - ld a, [wd11e] - push af - ld a, [de] - ld [wMaxItemQuantity], a - push de - ld de, wd11e - ld [de], a - lb bc, 1, 2 - call PrintNumber - pop de - pop af - ld [wd11e], a - pop hl -.skipPrintingItemQuantity - inc de - pop bc - inc c - push bc - inc c - ld a, [wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) - and a ; is an item being swapped? - jr z, .nextListEntry - sla a - cp c ; is it this item? - jr nz, .nextListEntry - dec hl - ld a, $ec ; unfilled right arrow menu cursor to indicate an item being swapped - ld [hli], a -.nextListEntry - ld bc, 2 * SCREEN_WIDTH ; 2 rows - add hl, bc - pop bc - inc c - dec b - jp nz, .loop - ld bc, -8 - add hl, bc - ld a, "▼" - ld [hl], a - ret -.printCancelMenuItem - ld de, ListMenuCancelText - jp PlaceString - -ListMenuCancelText:: - db "CANCEL@" - -GetMonName:: - push hl - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(MonsterNames) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ld a, [wd11e] - dec a - ld hl, MonsterNames - ld c, 10 - ld b, 0 - call AddNTimes - ld de, wcd6d - push de - ld bc, 10 - call CopyData - ld hl, wcd6d + 10 - ld [hl], "@" - pop de - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - pop hl - ret - -GetItemName:: -; given an item ID at [wd11e], store the name of the item into a string -; starting at wcd6d - push hl - push bc - ld a, [wd11e] - cp HM_01 ; is this a TM/HM? - jr nc, .Machine - - ld [wd0b5], a - ld a, ITEM_NAME - ld [wNameListType], a - ld a, BANK(ItemNames) - ld [wPredefBank], a - call GetName - jr .Finish - -.Machine - call GetMachineName -.Finish - ld de, wcd6d ; pointer to where item name is stored in RAM - pop bc - pop hl - ret - -GetMachineName:: -; copies the name of the TM/HM in [wd11e] to wcd6d - push hl - push de - push bc - ld a, [wd11e] - push af - cp TM_01 ; is this a TM? [not HM] - jr nc, .WriteTM -; if HM, then write "HM" and add 5 to the item ID, so we can reuse the -; TM printing code - add 5 - ld [wd11e], a - ld hl, HiddenPrefix ; points to "HM" - ld bc, 2 - jr .WriteMachinePrefix -.WriteTM - ld hl, TechnicalPrefix ; points to "TM" - ld bc, 2 -.WriteMachinePrefix - ld de, wcd6d - call CopyData - -; now get the machine number and convert it to text - ld a, [wd11e] - sub TM_01 - 1 - ld b, "0" -.FirstDigit - sub 10 - jr c, .SecondDigit - inc b - jr .FirstDigit -.SecondDigit - add 10 - push af - ld a, b - ld [de], a - inc de - pop af - ld b, "0" - add b - ld [de], a - inc de - ld a, "@" - ld [de], a - pop af - ld [wd11e], a - pop bc - pop de - pop hl - ret - -TechnicalPrefix:: - db "TM" -HiddenPrefix:: - db "HM" - -; sets carry if item is HM, clears carry if item is not HM -; Input: a = item ID -IsItemHM:: - cp HM_01 - jr c, .notHM - cp TM_01 - ret -.notHM - and a - ret - -; sets carry if move is an HM, clears carry if move is not an HM -; Input: a = move ID -IsMoveHM:: - ld hl, HMMoves - ld de, 1 - jp IsInArray - -HMMoves:: - db CUT,FLY,SURF,STRENGTH,FLASH - db $ff ; terminator - -GetMoveName:: - push hl - ld a, MOVE_NAME - ld [wNameListType], a - ld a, [wd11e] - ld [wd0b5], a - ld a, BANK(MoveNames) - ld [wPredefBank], a - call GetName - ld de, wcd6d ; pointer to where move name is stored in RAM - pop hl - ret - -; reloads text box tile patterns, current map view, and tileset tile patterns -ReloadMapData:: - ld a, [H_LOADEDROMBANK] - push af - ld a, [wCurMap] - call SwitchToMapRomBank - call DisableLCD - call LoadTextBoxTilePatterns - call LoadCurrentMapView - call LoadTilesetTilePatternData - call EnableLCD - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; reloads tileset tile patterns -ReloadTilesetTilePatterns:: - ld a, [H_LOADEDROMBANK] - push af - ld a, [wCurMap] - call SwitchToMapRomBank - call DisableLCD - call LoadTilesetTilePatternData - call EnableLCD - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; shows the town map and lets the player choose a destination to fly to -ChooseFlyDestination:: - ld hl, wd72e - res 4, [hl] - jpba LoadTownMap_Fly - -; causes the text box to close without waiting for a button press after displaying text -DisableWaitingAfterTextDisplay:: - ld a, $01 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret - -; uses an item -; UseItem is used with dummy items to perform certain other functions as well -; INPUT: -; [wcf91] = item ID -; OUTPUT: -; [wActionResultOrTookBattleTurn] = success -; 00: unsuccessful -; 01: successful -; 02: not able to be used right now, no extra menu displayed (only certain items use this) -UseItem:: - jpba UseItem_ - -; confirms the item toss and then tosses the item -; INPUT: -; hl = address of inventory (either wNumBagItems or wNumBoxItems) -; [wcf91] = item ID -; [wWhichPokemon] = index of item within inventory -; [wItemQuantity] = quantity to toss -; OUTPUT: -; clears carry flag if the item is tossed, sets carry flag if not -TossItem:: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(TossItem_) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call TossItem_ - pop de - ld a, d - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; checks if an item is a key item -; INPUT: -; [wcf91] = item ID -; OUTPUT: -; [wIsKeyItem] = result -; 00: item is not key item -; 01: item is key item -IsKeyItem:: - push hl - push de - push bc - callba IsKeyItem_ - pop bc - pop de - pop hl - ret - -; function to draw various text boxes -; INPUT: -; [wTextBoxID] = text box ID -; b, c = y, x cursor position (TWO_OPTION_MENU only) -DisplayTextBoxID:: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(DisplayTextBoxID_) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call DisplayTextBoxID_ - pop bc - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; not zero if an NPC movement script is running, the player character is -; automatically stepping down from a door, or joypad states are being simulated -IsPlayerCharacterBeingControlledByGame:: - ld a, [wNPCMovementScriptPointerTableNum] - and a - ret nz - ld a, [wd736] - bit 1, a ; currently stepping down from door bit - ret nz - ld a, [wd730] - and $80 - ret - -RunNPCMovementScript:: - ld hl, wd736 - bit 0, [hl] - res 0, [hl] - jr nz, .playerStepOutFromDoor - ld a, [wNPCMovementScriptPointerTableNum] - and a - ret z - dec a - add a - ld d, 0 - ld e, a - ld hl, .NPCMovementScriptPointerTables - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - ld a, [H_LOADEDROMBANK] - push af - ld a, [wNPCMovementScriptBank] - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ld a, [wNPCMovementScriptFunctionNum] - call CallFunctionInTable - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -.NPCMovementScriptPointerTables - dw PalletMovementScriptPointerTable - dw PewterMuseumGuyMovementScriptPointerTable - dw PewterGymGuyMovementScriptPointerTable -.playerStepOutFromDoor - jpba PlayerStepOutFromDoor - -EndNPCMovementScript:: - jpba _EndNPCMovementScript - -EmptyFunc2:: - ret - -; stores hl in [wTrainerHeaderPtr] -StoreTrainerHeaderPointer:: - ld a, h - ld [wTrainerHeaderPtr], a - ld a, l - ld [wTrainerHeaderPtr+1], a - ret - -; executes the current map script from the function pointer array provided in hl. -; a: map script index to execute (unless overridden by [wd733] bit 4) -ExecuteCurMapScriptInTable:: - push af - push de - call StoreTrainerHeaderPointer - pop hl - pop af - push hl - ld hl, wFlags_D733 - bit 4, [hl] - res 4, [hl] - jr z, .useProvidedIndex ; test if map script index was overridden manually - ld a, [wCurMapScript] -.useProvidedIndex - pop hl - ld [wCurMapScript], a - call CallFunctionInTable - ld a, [wCurMapScript] - ret - -LoadGymLeaderAndCityName:: - push de - ld de, wGymCityName - ld bc, $11 - call CopyData ; load city name - pop hl - ld de, wGymLeaderName - ld bc, NAME_LENGTH - jp CopyData ; load gym leader name - -; reads specific information from trainer header (pointed to at wTrainerHeaderPtr) -; a: offset in header data -; 0 -> flag's bit (into wTrainerHeaderFlagBit) -; 2 -> flag's byte ptr (into hl) -; 4 -> before battle text (into hl) -; 6 -> after battle text (into hl) -; 8 -> end battle text (into hl) -ReadTrainerHeaderInfo:: - push de - push af - ld d, $0 - ld e, a - ld hl, wTrainerHeaderPtr - ld a, [hli] - ld l, [hl] - ld h, a - add hl, de - pop af - and a - jr nz, .nonZeroOffset - ld a, [hl] - ld [wTrainerHeaderFlagBit], a ; store flag's bit - jr .done -.nonZeroOffset - cp $2 - jr z, .readPointer ; read flag's byte ptr - cp $4 - jr z, .readPointer ; read before battle text - cp $6 - jr z, .readPointer ; read after battle text - cp $8 - jr z, .readPointer ; read end battle text - cp $a - jr nz, .done - ld a, [hli] ; read end battle text (2) but override the result afterwards (XXX why, bug?) - ld d, [hl] - ld e, a - jr .done -.readPointer - ld a, [hli] - ld h, [hl] - ld l, a -.done - pop de - ret - -TrainerFlagAction:: - predef_jump FlagActionPredef - -TalkToTrainer:: - call StoreTrainerHeaderPointer - xor a - call ReadTrainerHeaderInfo ; read flag's bit - ld a, $2 - call ReadTrainerHeaderInfo ; read flag's byte ptr - ld a, [wTrainerHeaderFlagBit] - ld c, a - ld b, FLAG_TEST - call TrainerFlagAction ; read trainer's flag - ld a, c - and a - jr z, .trainerNotYetFought ; test trainer's flag - ld a, $6 - call ReadTrainerHeaderInfo ; print after battle text - jp PrintText -.trainerNotYetFought - ld a, $4 - call ReadTrainerHeaderInfo ; print before battle text - call PrintText - ld a, $a - call ReadTrainerHeaderInfo ; (?) does nothing apparently (maybe bug in ReadTrainerHeaderInfo) - push de - ld a, $8 - call ReadTrainerHeaderInfo ; read end battle text - pop de - call SaveEndBattleTextPointers - ld hl, wFlags_D733 - set 4, [hl] ; activate map script index override (index is set below) - ld hl, wFlags_0xcd60 - bit 0, [hl] ; test if player is already engaging the trainer (because the trainer saw the player) - ret nz -; if the player talked to the trainer of his own volition - call EngageMapTrainer - ld hl, wCurMapScript - inc [hl] ; increment map script index before StartTrainerBattle increments it again (next script function is usually EndTrainerBattle) - jp StartTrainerBattle - -; checks if any trainers are seeing the player and wanting to fight -CheckFightingMapTrainers:: - call CheckForEngagingTrainers - ld a, [wSpriteIndex] - cp $ff - jr nz, .trainerEngaging - xor a - ld [wSpriteIndex], a - ld [wTrainerHeaderFlagBit], a - ret -.trainerEngaging - ld hl, wFlags_D733 - set 3, [hl] - ld [wEmotionBubbleSpriteIndex], a - xor a ; EXCLAMATION_BUBBLE - ld [wWhichEmotionBubble], a - predef EmotionBubble - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN - ld [wJoyIgnore], a - xor a - ld [hJoyHeld], a - call TrainerWalkUpToPlayer_Bank0 - ld hl, wCurMapScript - inc [hl] ; increment map script index (next script function is usually DisplayEnemyTrainerTextAndStartBattle) - ret - -; display the before battle text after the enemy trainer has walked up to the player's sprite -DisplayEnemyTrainerTextAndStartBattle:: - ld a, [wd730] - and $1 - ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite - ld [wJoyIgnore], a - ld a, [wSpriteIndex] - ld [hSpriteIndexOrTextID], a - call DisplayTextID - ; fall through - -StartTrainerBattle:: - xor a - ld [wJoyIgnore], a - call InitBattleEnemyParameters - ld hl, wd72d - set 6, [hl] - set 7, [hl] - ld hl, wd72e - set 1, [hl] - ld hl, wCurMapScript - inc [hl] ; increment map script index (next script function is usually EndTrainerBattle) - ret - -EndTrainerBattle:: - ld hl, wCurrentMapScriptFlags - set 5, [hl] - set 6, [hl] - ld hl, wd72d - res 7, [hl] - ld hl, wFlags_0xcd60 - res 0, [hl] ; player is no longer engaged by any trainer - ld a, [wIsInBattle] - cp $ff - jp z, ResetButtonPressedAndMapScript - ld a, $2 - call ReadTrainerHeaderInfo - ld a, [wTrainerHeaderFlagBit] - ld c, a - ld b, FLAG_SET - call TrainerFlagAction ; flag trainer as fought - ld a, [wEnemyMonOrTrainerClass] - cp 200 - jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) - ld hl, wMissableObjectList - ld de, $2 - ld a, [wSpriteIndex] - call IsInArray ; search for sprite ID - inc hl - ld a, [hl] - ld [wMissableObjectIndex], a ; load corresponding missable object index and remove it - predef HideObject -.skipRemoveSprite - ld hl, wd730 - bit 4, [hl] - res 4, [hl] - ret nz - -ResetButtonPressedAndMapScript:: - xor a - ld [wJoyIgnore], a - ld [hJoyHeld], a - ld [hJoyPressed], a - ld [hJoyReleased], a - ld [wCurMapScript], a ; reset battle status - ret - -; calls TrainerWalkUpToPlayer -TrainerWalkUpToPlayer_Bank0:: - jpba TrainerWalkUpToPlayer - -; sets opponent type and mon set/lvl based on the engaging trainer data -InitBattleEnemyParameters:: - ld a, [wEngagedTrainerClass] - ld [wCurOpponent], a - ld [wEnemyMonOrTrainerClass], a - cp 200 - ld a, [wEngagedTrainerSet] - jr c, .noTrainer - ld [wTrainerNo], a - ret -.noTrainer - ld [wCurEnemyLVL], a - ret - -GetSpritePosition1:: - ld hl, _GetSpritePosition1 - jr SpritePositionBankswitch - -GetSpritePosition2:: - ld hl, _GetSpritePosition2 - jr SpritePositionBankswitch - -SetSpritePosition1:: - ld hl, _SetSpritePosition1 - jr SpritePositionBankswitch - -SetSpritePosition2:: - ld hl, _SetSpritePosition2 -SpritePositionBankswitch:: - ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2) - jp Bankswitch ; indirect jump to one of the four functions - -CheckForEngagingTrainers:: - xor a - call ReadTrainerHeaderInfo ; read trainer flag's bit (unused) - ld d, h ; store trainer header address in de - ld e, l -.trainerLoop - call StoreTrainerHeaderPointer ; set trainer header pointer to current trainer - ld a, [de] - ld [wSpriteIndex], a ; store trainer flag's bit - ld [wTrainerHeaderFlagBit], a - cp $ff - ret z - ld a, $2 - call ReadTrainerHeaderInfo ; read trainer flag's byte ptr - ld b, FLAG_TEST - ld a, [wTrainerHeaderFlagBit] - ld c, a - call TrainerFlagAction ; read trainer flag - ld a, c - and a ; has the trainer already been defeated? - jr nz, .continue - push hl - push de - push hl - xor a - call ReadTrainerHeaderInfo ; get trainer header pointer - inc hl - ld a, [hl] ; read trainer engage distance - pop hl - ld [wTrainerEngageDistance], a - ld a, [wSpriteIndex] - swap a - ld [wTrainerSpriteOffset], a - predef TrainerEngage - pop de - pop hl - ld a, [wTrainerSpriteOffset] - and a - ret nz ; break if the trainer is engaging -.continue - ld hl, $c - add hl, de - ld d, h - ld e, l - jr .trainerLoop - -; hl = text if the player wins -; de = text if the player loses -SaveEndBattleTextPointers:: - ld a, [H_LOADEDROMBANK] - ld [wEndBattleTextRomBank], a - ld a, h - ld [wEndBattleWinTextPointer], a - ld a, l - ld [wEndBattleWinTextPointer + 1], a - ld a, d - ld [wEndBattleLoseTextPointer], a - ld a, e - ld [wEndBattleLoseTextPointer + 1], a - ret - -; loads data of some trainer on the current map and plays pre-battle music -; [wSpriteIndex]: sprite ID of trainer who is engaged -EngageMapTrainer:: - ld hl, wMapSpriteExtraData - ld d, $0 - ld a, [wSpriteIndex] - dec a - add a - ld e, a - add hl, de ; seek to engaged trainer data - ld a, [hli] ; load trainer class - ld [wEngagedTrainerClass], a - ld a, [hl] ; load trainer mon set - ld [wEngagedTrainerSet], a - jp PlayTrainerMusic - -PrintEndBattleText:: - push hl - ld hl, wd72d - bit 7, [hl] - res 7, [hl] - pop hl - ret z - ld a, [H_LOADEDROMBANK] - push af - ld a, [wEndBattleTextRomBank] - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - push hl - callba SaveTrainerName - ld hl, TrainerEndBattleText - call PrintText - pop hl - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - callba FreezeEnemyTrainerSprite - jp WaitForSoundToFinish - -GetSavedEndBattleTextPointer:: - ld a, [wBattleResult] - and a -; won battle - jr nz, .lostBattle - ld a, [wEndBattleWinTextPointer] - ld h, a - ld a, [wEndBattleWinTextPointer + 1] - ld l, a - ret -.lostBattle - ld a, [wEndBattleLoseTextPointer] - ld h, a - ld a, [wEndBattleLoseTextPointer + 1] - ld l, a - ret - -TrainerEndBattleText:: - TX_FAR _TrainerNameText - TX_ASM - call GetSavedEndBattleTextPointer - call TextCommandProcessor - jp TextScriptEnd - -; only engage withe trainer if the player is not already -; engaged with another trainer -; XXX unused? -CheckIfAlreadyEngaged:: - ld a, [wFlags_0xcd60] - bit 0, a - ret nz - call EngageMapTrainer - xor a - ret - -PlayTrainerMusic:: - ld a, [wEngagedTrainerClass] - cp OPP_SONY1 - ret z - cp OPP_SONY2 - ret z - cp OPP_SONY3 - ret z - ld a, [wGymLeaderNo] - and a - ret nz - xor a - ld [wAudioFadeOutControl], a - ld a, $ff - call PlaySound - ld a, 0 ; BANK(Music_MeetEvilTrainer) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a - ld a, [wEngagedTrainerClass] - ld b, a - ld hl, EvilTrainerList -.evilTrainerListLoop - ld a, [hli] - cp $ff - jr z, .noEvilTrainer - cp b - jr nz, .evilTrainerListLoop - ld a, MUSIC_MEET_EVIL_TRAINER - jr .PlaySound -.noEvilTrainer - ld hl, FemaleTrainerList -.femaleTrainerListLoop - ld a, [hli] - cp $ff - jr z, .maleTrainer - cp b - jr nz, .femaleTrainerListLoop - ld a, MUSIC_MEET_FEMALE_TRAINER - jr .PlaySound -.maleTrainer - ld a, MUSIC_MEET_MALE_TRAINER -.PlaySound - ld [wNewSoundID], a - jp PlayMusic - -INCLUDE "data/trainer_types.asm" - -; checks if the player's coordinates match an arrow movement tile's coordinates -; and if so, decodes the RLE movement data -; b = player Y -; c = player X -DecodeArrowMovementRLE:: - ld a, [hli] - cp $ff - ret z ; no match in the list - cp b - jr nz, .nextArrowMovementTileEntry1 - ld a, [hli] - cp c - jr nz, .nextArrowMovementTileEntry2 - ld a, [hli] - ld d, [hl] - ld e, a - ld hl, wSimulatedJoypadStatesEnd - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - ret -.nextArrowMovementTileEntry1 - inc hl -.nextArrowMovementTileEntry2 - inc hl - inc hl - jr DecodeArrowMovementRLE - -FuncTX_ItemStoragePC:: - call SaveScreenTilesToBuffer2 - ld b, BANK(PlayerPC) - ld hl, PlayerPC - jr bankswitchAndContinue - -FuncTX_BillsPC:: - call SaveScreenTilesToBuffer2 - ld b, BANK(BillsPC_) - ld hl, BillsPC_ - jr bankswitchAndContinue - -FuncTX_GameCornerPrizeMenu:: -; XXX find a better name for this function -; special_F7 - ld b, BANK(CeladonPrizeMenu) - ld hl, CeladonPrizeMenu -bankswitchAndContinue:: - call Bankswitch - jp HoldTextDisplayOpen ; continue to main text-engine function - -FuncTX_PokemonCenterPC:: - ld b, BANK(ActivatePC) - ld hl, ActivatePC - jr bankswitchAndContinue - -StartSimulatingJoypadStates:: - xor a - ld [wOverrideSimulatedJoypadStatesMask], a - ld [wSpriteStateData2 + $06], a ; player's sprite movement byte 1 - ld hl, wd730 - set 7, [hl] - ret - -IsItemInBag:: -; given an item_id in b -; set zero flag if item isn't in player's bag -; else reset zero flag -; related to Pokémon Tower and ghosts - predef GetQuantityOfItemInBag - ld a, b - and a - ret - -DisplayPokedex:: - ld [wd11e], a - jpba _DisplayPokedex - -SetSpriteFacingDirectionAndDelay:: - call SetSpriteFacingDirection - ld c, 6 - jp DelayFrames - -SetSpriteFacingDirection:: - ld a, $9 - ld [H_SPRITEDATAOFFSET], a - call GetPointerWithinSpriteStateData1 - ld a, [hSpriteFacingDirection] - ld [hl], a - ret - -SetSpriteImageIndexAfterSettingFacingDirection:: - ld de, -7 - add hl, de - ld [hl], a - ret - -; tests if the player's coordinates are in a specified array -; INPUT: -; hl = address of array -; OUTPUT: -; [wCoordIndex] = if there is match, the matching array index -; sets carry if the coordinates are in the array, clears carry if not -ArePlayerCoordsInArray:: - ld a, [wYCoord] - ld b, a - ld a, [wXCoord] - ld c, a - ; fallthrough - -CheckCoords:: - xor a - ld [wCoordIndex], a -.loop - ld a, [hli] - cp $ff ; reached terminator? - jr z, .notInArray - push hl - ld hl, wCoordIndex - inc [hl] - pop hl -.compareYCoord - cp b - jr z, .compareXCoord - inc hl - jr .loop -.compareXCoord - ld a, [hli] - cp c - jr nz, .loop -.inArray - scf - ret -.notInArray - and a - ret - -; tests if a boulder's coordinates are in a specified array -; INPUT: -; hl = address of array -; [H_SPRITEINDEX] = index of boulder sprite -; OUTPUT: -; [wCoordIndex] = if there is match, the matching array index -; sets carry if the coordinates are in the array, clears carry if not -CheckBoulderCoords:: - push hl - ld hl, wSpriteStateData2 + $04 - ld a, [H_SPRITEINDEX] - swap a - ld d, $0 - ld e, a - add hl, de - ld a, [hli] - sub $4 ; because sprite coordinates are offset by 4 - ld b, a - ld a, [hl] - sub $4 ; because sprite coordinates are offset by 4 - ld c, a - pop hl - jp CheckCoords - -GetPointerWithinSpriteStateData1:: - ld h, $c1 - jr _GetPointerWithinSpriteStateData - -GetPointerWithinSpriteStateData2:: - ld h, $c2 - -_GetPointerWithinSpriteStateData: - ld a, [H_SPRITEDATAOFFSET] - ld b, a - ld a, [H_SPRITEINDEX] - swap a - add b - ld l, a - ret - -; decodes a $ff-terminated RLEncoded list -; each entry is a pair of bytes -; the final $ff will be replicated in the output list and a contains the number of bytes written -; de: input list -; hl: output list -DecodeRLEList:: - xor a - ld [wRLEByteCount], a ; count written bytes here -.listLoop - ld a, [de] - cp $ff - jr z, .endOfList - ld [hRLEByteValue], a ; store byte value to be written - inc de - ld a, [de] - ld b, $0 - ld c, a ; number of bytes to be written - ld a, [wRLEByteCount] - add c - ld [wRLEByteCount], a ; update total number of written bytes - ld a, [hRLEByteValue] - call FillMemory ; write a c-times to output - inc de - jr .listLoop -.endOfList - ld a, $ff - ld [hl], a ; write final $ff - ld a, [wRLEByteCount] - inc a ; include sentinel in counting - ret - -; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2] -SetSpriteMovementBytesToFE:: - push hl - call GetSpriteMovementByte1Pointer - ld [hl], $fe - call GetSpriteMovementByte2Pointer - ld a, [hSpriteMovementByte2] - ld [hl], a - pop hl - ret - -; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF -SetSpriteMovementBytesToFF:: - push hl - call GetSpriteMovementByte1Pointer - ld [hl], $FF - call GetSpriteMovementByte2Pointer - ld [hl], $FF ; prevent person from walking? - pop hl - ret - -; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl -GetSpriteMovementByte1Pointer:: - ld h, $C2 - ld a, [H_SPRITEINDEX] - swap a - add 6 - ld l, a - ret - -; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl -GetSpriteMovementByte2Pointer:: - push de - ld hl, wMapSpriteData - ld a, [H_SPRITEINDEX] - dec a - add a - ld d, 0 - ld e, a - add hl, de - pop de - ret - -GetTrainerInformation:: - call GetTrainerName - ld a, [wLinkState] - and a - jr nz, .linkBattle - ld a, Bank(TrainerPicAndMoneyPointers) - call BankswitchHome - ld a, [wTrainerClass] - dec a - ld hl, TrainerPicAndMoneyPointers - ld bc, $5 - call AddNTimes - ld de, wTrainerPicPointer - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - ld de, wTrainerBaseMoney - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - jp BankswitchBack -.linkBattle - ld hl, wTrainerPicPointer - ld de, RedPicFront - ld [hl], e - inc hl - ld [hl], d - ret - -GetTrainerName:: - jpba GetTrainerName_ - -HasEnoughMoney:: -; Check if the player has at least as much -; money as the 3-byte BCD value at hMoney. - ld de, wPlayerMoney - ld hl, hMoney - ld c, 3 - jp StringCmp - -HasEnoughCoins:: -; Check if the player has at least as many -; coins as the 2-byte BCD value at hCoins. - ld de, wPlayerCoins - ld hl, hCoins - ld c, 2 - jp StringCmp - - -BankswitchHome:: -; switches to bank # in a -; Only use this when in the home bank! - ld [wBankswitchHomeTemp], a - ld a, [H_LOADEDROMBANK] - ld [wBankswitchHomeSavedROMBank], a - ld a, [wBankswitchHomeTemp] - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -BankswitchBack:: -; returns from BankswitchHome - ld a, [wBankswitchHomeSavedROMBank] - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -Bankswitch:: -; self-contained bankswitch, use this when not in the home bank -; switches to the bank in b - ld a, [H_LOADEDROMBANK] - push af - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ld bc, .Return - push bc - jp hl -.Return - pop bc - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; displays yes/no choice -; yes -> set carry -YesNoChoice:: - call SaveScreenTilesToBuffer1 - call InitYesNoTextBoxParameters - jr DisplayYesNoChoice - -Func_35f4:: - ld a, TWO_OPTION_MENU - ld [wTextBoxID], a - call InitYesNoTextBoxParameters - jp DisplayTextBoxID - -InitYesNoTextBoxParameters:: - xor a ; YES_NO_MENU - ld [wTwoOptionMenuID], a - coord hl, 14, 7 - ld bc, $80f - ret - -YesNoChoicePokeCenter:: - call SaveScreenTilesToBuffer1 - ld a, HEAL_CANCEL_MENU - ld [wTwoOptionMenuID], a - coord hl, 11, 6 - lb bc, 8, 12 - jr DisplayYesNoChoice - -WideYesNoChoice:: ; unused - call SaveScreenTilesToBuffer1 - ld a, WIDE_YES_NO_MENU - ld [wTwoOptionMenuID], a - coord hl, 12, 7 - lb bc, 8, 13 - -DisplayYesNoChoice:: - ld a, TWO_OPTION_MENU - ld [wTextBoxID], a - call DisplayTextBoxID - jp LoadScreenTilesFromBuffer1 - -; calculates the difference |a-b|, setting carry flag if a999) - cp 999 / $100 + 1 - jr nc, .overflow - cp 999 / $100 - jr c, .noOverflow - ld a, [H_MULTIPLICAND+2] - cp 999 % $100 + 1 - jr c, .noOverflow -.overflow - ld a, 999 / $100 ; overflow: cap at 999 - ld [H_MULTIPLICAND+1], a - ld a, 999 % $100 - ld [H_MULTIPLICAND+2], a -.noOverflow - pop bc - pop de - pop hl - ret - -AddEnemyMonToPlayerParty:: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(_AddEnemyMonToPlayerParty) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call _AddEnemyMonToPlayerParty - pop bc - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -MoveMon:: - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(_MoveMon) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call _MoveMon - pop bc - ld a, b - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - ret - -; skips a text entries, each of size NAME_LENGTH (like trainer name, OT name, rival name, ...) -; hl: base pointer, will be incremented by NAME_LENGTH * a -SkipFixedLengthTextEntries:: - and a - ret z - ld bc, NAME_LENGTH -.skipLoop - add hl, bc - dec a - jr nz, .skipLoop - ret - -AddNTimes:: -; add bc to hl a times - and a - ret z -.loop - add hl, bc - dec a - jr nz, .loop - ret - -; Compare strings, c bytes in length, at de and hl. -; Often used to compare big endian numbers in battle calculations. -StringCmp:: - ld a, [de] - cp [hl] - ret nz - inc de - inc hl - dec c - jr nz, StringCmp - ret - -; INPUT: -; a = oam block index (each block is 4 oam entries) -; b = Y coordinate of upper left corner of sprite -; c = X coordinate of upper left corner of sprite -; de = base address of 4 tile number and attribute pairs -WriteOAMBlock:: - ld h, wOAMBuffer / $100 - swap a ; multiply by 16 - ld l, a - call .writeOneEntry ; upper left - push bc - ld a, 8 - add c - ld c, a - call .writeOneEntry ; upper right - pop bc - ld a, 8 - add b - ld b, a - call .writeOneEntry ; lower left - ld a, 8 - add c - ld c, a - ; lower right -.writeOneEntry - ld [hl], b ; Y coordinate - inc hl - ld [hl], c ; X coordinate - inc hl - ld a, [de] ; tile number - inc de - ld [hli], a - ld a, [de] ; attribute - inc de - ld [hli], a - ret - -HandleMenuInput:: - xor a - ld [wPartyMenuAnimMonEnabled], a - -HandleMenuInput_:: - ld a, [H_DOWNARROWBLINKCNT1] - push af - ld a, [H_DOWNARROWBLINKCNT2] - push af ; save existing values on stack - xor a - ld [H_DOWNARROWBLINKCNT1], a ; blinking down arrow timing value 1 - ld a, 6 - ld [H_DOWNARROWBLINKCNT2], a ; blinking down arrow timing value 2 -.loop1 - xor a - ld [wAnimCounter], a ; counter for pokemon shaking animation - call PlaceMenuCursor - call Delay3 -.loop2 - push hl - ld a, [wPartyMenuAnimMonEnabled] - and a ; is it a pokemon selection menu? - jr z, .getJoypadState - callba AnimatePartyMon ; shake mini sprite of selected pokemon -.getJoypadState - pop hl - call JoypadLowSensitivity - ld a, [hJoy5] - and a ; was a key pressed? - jr nz, .keyPressed - push hl - coord hl, 18, 11 ; coordinates of blinking down arrow in some menus - call HandleDownArrowBlinkTiming ; blink down arrow (if any) - pop hl - ld a, [wMenuJoypadPollCount] - dec a - jr z, .giveUpWaiting - jr .loop2 -.giveUpWaiting -; if a key wasn't pressed within the specified number of checks - pop af - ld [H_DOWNARROWBLINKCNT2], a - pop af - ld [H_DOWNARROWBLINKCNT1], a ; restore previous values - xor a - ld [wMenuWrappingEnabled], a ; disable menu wrapping - ret -.keyPressed - xor a - ld [wCheckFor180DegreeTurn], a - ld a, [hJoy5] - ld b, a - bit 6, a ; pressed Up key? - jr z, .checkIfDownPressed -.upPressed - ld a, [wCurrentMenuItem] ; selected menu item - and a ; already at the top of the menu? - jr z, .alreadyAtTop -.notAtTop - dec a - ld [wCurrentMenuItem], a ; move selected menu item up one space - jr .checkOtherKeys -.alreadyAtTop - ld a, [wMenuWrappingEnabled] - and a ; is wrapping around enabled? - jr z, .noWrappingAround - ld a, [wMaxMenuItem] - ld [wCurrentMenuItem], a ; wrap to the bottom of the menu - jr .checkOtherKeys -.checkIfDownPressed - bit 7, a - jr z, .checkOtherKeys -.downPressed - ld a, [wCurrentMenuItem] - inc a - ld c, a - ld a, [wMaxMenuItem] - cp c - jr nc, .notAtBottom -.alreadyAtBottom - ld a, [wMenuWrappingEnabled] - and a ; is wrapping around enabled? - jr z, .noWrappingAround - ld c, $00 ; wrap from bottom to top -.notAtBottom - ld a, c - ld [wCurrentMenuItem], a -.checkOtherKeys - ld a, [wMenuWatchedKeys] - and b ; does the menu care about any of the pressed keys? - jp z, .loop1 -.checkIfAButtonOrBButtonPressed - ld a, [hJoy5] - and A_BUTTON | B_BUTTON - jr z, .skipPlayingSound -.AButtonOrBButtonPressed - push hl - ld hl, wFlags_0xcd60 - bit 5, [hl] - pop hl - jr nz, .skipPlayingSound - ld a, SFX_PRESS_AB - call PlaySound -.skipPlayingSound - pop af - ld [H_DOWNARROWBLINKCNT2], a - pop af - ld [H_DOWNARROWBLINKCNT1], a ; restore previous values - xor a - ld [wMenuWrappingEnabled], a ; disable menu wrapping - ld a, [hJoy5] - ret -.noWrappingAround - ld a, [wMenuWatchMovingOutOfBounds] - and a ; should we return if the user tried to go past the top or bottom? - jr z, .checkOtherKeys - jr .checkIfAButtonOrBButtonPressed - -PlaceMenuCursor:: - ld a, [wTopMenuItemY] - and a ; is the y coordinate 0? - jr z, .adjustForXCoord - coord hl, 0, 0 - ld bc, SCREEN_WIDTH -.topMenuItemLoop - add hl, bc - dec a - jr nz, .topMenuItemLoop -.adjustForXCoord - ld a, [wTopMenuItemX] - ld b, 0 - ld c, a - add hl, bc - push hl - ld a, [wLastMenuItem] - and a ; was the previous menu id 0? - jr z, .checkForArrow1 - push af - ld a, [hFlags_0xFFF6] - bit 1, a ; is the menu double spaced? - jr z, .doubleSpaced1 - ld bc, 20 - jr .getOldMenuItemScreenPosition -.doubleSpaced1 - ld bc, 40 -.getOldMenuItemScreenPosition - pop af -.oldMenuItemLoop - add hl, bc - dec a - jr nz, .oldMenuItemLoop -.checkForArrow1 - ld a, [hl] - cp "▶" ; was an arrow next to the previously selected menu item? - jr nz, .skipClearingArrow -.clearArrow - ld a, [wTileBehindCursor] - ld [hl], a -.skipClearingArrow - pop hl - ld a, [wCurrentMenuItem] - and a - jr z, .checkForArrow2 - push af - ld a, [hFlags_0xFFF6] - bit 1, a ; is the menu double spaced? - jr z, .doubleSpaced2 - ld bc, 20 - jr .getCurrentMenuItemScreenPosition -.doubleSpaced2 - ld bc, 40 -.getCurrentMenuItemScreenPosition - pop af -.currentMenuItemLoop - add hl, bc - dec a - jr nz, .currentMenuItemLoop -.checkForArrow2 - ld a, [hl] - cp "▶" ; has the right arrow already been placed? - jr z, .skipSavingTile ; if so, don't lose the saved tile - ld [wTileBehindCursor], a ; save tile before overwriting with right arrow -.skipSavingTile - ld a, "▶" ; place right arrow - ld [hl], a - ld a, l - ld [wMenuCursorLocation], a - ld a, h - ld [wMenuCursorLocation + 1], a - ld a, [wCurrentMenuItem] - ld [wLastMenuItem], a - ret - -; This is used to mark a menu cursor other than the one currently being -; manipulated. In the case of submenus, this is used to show the location of -; the menu cursor in the parent menu. In the case of swapping items in list, -; this is used to mark the item that was first chosen to be swapped. -PlaceUnfilledArrowMenuCursor:: - ld b, a - ld a, [wMenuCursorLocation] - ld l, a - ld a, [wMenuCursorLocation + 1] - ld h, a - ld [hl], $ec ; outline of right arrow - ld a, b - ret - -; Replaces the menu cursor with a blank space. -EraseMenuCursor:: - ld a, [wMenuCursorLocation] - ld l, a - ld a, [wMenuCursorLocation + 1] - ld h, a - ld [hl], " " - ret - -; This toggles a blinking down arrow at hl on and off after a delay has passed. -; This is often called even when no blinking is occurring. -; The reason is that most functions that call this initialize H_DOWNARROWBLINKCNT1 to 0. -; The effect is that if the tile at hl is initialized with a down arrow, -; this function will toggle that down arrow on and off, but if the tile isn't -; initialized with a down arrow, this function does nothing. -; That allows this to be called without worrying about if a down arrow should -; be blinking. -HandleDownArrowBlinkTiming:: - ld a, [hl] - ld b, a - ld a, "▼" - cp b - jr nz, .downArrowOff -.downArrowOn - ld a, [H_DOWNARROWBLINKCNT1] - dec a - ld [H_DOWNARROWBLINKCNT1], a - ret nz - ld a, [H_DOWNARROWBLINKCNT2] - dec a - ld [H_DOWNARROWBLINKCNT2], a - ret nz - ld a, " " - ld [hl], a - ld a, $ff - ld [H_DOWNARROWBLINKCNT1], a - ld a, $06 - ld [H_DOWNARROWBLINKCNT2], a - ret -.downArrowOff - ld a, [H_DOWNARROWBLINKCNT1] - and a - ret z - dec a - ld [H_DOWNARROWBLINKCNT1], a - ret nz - dec a - ld [H_DOWNARROWBLINKCNT1], a - ld a, [H_DOWNARROWBLINKCNT2] - dec a - ld [H_DOWNARROWBLINKCNT2], a - ret nz - ld a, $06 - ld [H_DOWNARROWBLINKCNT2], a - ld a, "▼" - ld [hl], a - ret - -; The following code either enables or disables the automatic drawing of -; text boxes by DisplayTextID. Both functions cause DisplayTextID to wait -; for a button press after displaying text (unless [wEnteringCableClub] is set). - -EnableAutoTextBoxDrawing:: - xor a - jr AutoTextBoxDrawingCommon - -DisableAutoTextBoxDrawing:: - ld a, $01 - -AutoTextBoxDrawingCommon:: - ld [wAutoTextBoxDrawingControl], a - xor a - ld [wDoNotWaitForButtonPressAfterDisplayingText], a ; make DisplayTextID wait for button press - ret - -PrintText:: -; Print text hl at (1, 14). - push hl - ld a, MESSAGE_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - call UpdateSprites - call Delay3 - pop hl -PrintText_NoCreatingTextBox:: - coord bc, 1, 14 - jp TextCommandProcessor - - -PrintNumber:: -; Print the c-digit, b-byte value at de. -; Allows 2 to 7 digits. For 1-digit numbers, add -; the value to char "0" instead of calling PrintNumber. -; Flags LEADING_ZEROES and LEFT_ALIGN can be given -; in bits 7 and 6 of b respectively. - push bc - xor a - ld [H_PASTLEADINGZEROES], a - ld [H_NUMTOPRINT], a - ld [H_NUMTOPRINT + 1], a - ld a, b - and $f - cp 1 - jr z, .byte - cp 2 - jr z, .word -.long - ld a, [de] - ld [H_NUMTOPRINT], a - inc de - ld a, [de] - ld [H_NUMTOPRINT + 1], a - inc de - ld a, [de] - ld [H_NUMTOPRINT + 2], a - jr .start - -.word - ld a, [de] - ld [H_NUMTOPRINT + 1], a - inc de - ld a, [de] - ld [H_NUMTOPRINT + 2], a - jr .start - -.byte - ld a, [de] - ld [H_NUMTOPRINT + 2], a - -.start - push de - - ld d, b - ld a, c - ld b, a - xor a - ld c, a - ld a, b - - cp 2 - jr z, .tens - cp 3 - jr z, .hundreds - cp 4 - jr z, .thousands - cp 5 - jr z, .ten_thousands - cp 6 - jr z, .hundred_thousands - -print_digit: macro - -if (\1) / $10000 - ld a, \1 / $10000 % $100 -else xor a -endc - ld [H_POWEROFTEN + 0], a - -if (\1) / $100 - ld a, \1 / $100 % $100 -else xor a -endc - ld [H_POWEROFTEN + 1], a - - ld a, \1 / $1 % $100 - ld [H_POWEROFTEN + 2], a - - call .PrintDigit - call .NextDigit -endm - -.millions print_digit 1000000 -.hundred_thousands print_digit 100000 -.ten_thousands print_digit 10000 -.thousands print_digit 1000 -.hundreds print_digit 100 - -.tens - ld c, 0 - ld a, [H_NUMTOPRINT + 2] -.mod - cp 10 - jr c, .ok - sub 10 - inc c - jr .mod -.ok - - ld b, a - ld a, [H_PASTLEADINGZEROES] - or c - ld [H_PASTLEADINGZEROES], a - jr nz, .past - call .PrintLeadingZero - jr .next -.past - ld a, "0" - add c - ld [hl], a -.next - - call .NextDigit -.ones - ld a, "0" - add b - ld [hli], a - pop de - dec de - pop bc - ret - -.PrintDigit: -; Divide by the current decimal place. -; Print the quotient, and keep the modulus. - ld c, 0 -.loop - ld a, [H_POWEROFTEN] - ld b, a - ld a, [H_NUMTOPRINT] - ld [H_SAVEDNUMTOPRINT], a - cp b - jr c, .underflow0 - sub b - ld [H_NUMTOPRINT], a - ld a, [H_POWEROFTEN + 1] - ld b, a - ld a, [H_NUMTOPRINT + 1] - ld [H_SAVEDNUMTOPRINT + 1], a - cp b - jr nc, .noborrow1 - - ld a, [H_NUMTOPRINT] - or 0 - jr z, .underflow1 - dec a - ld [H_NUMTOPRINT], a - ld a, [H_NUMTOPRINT + 1] -.noborrow1 - - sub b - ld [H_NUMTOPRINT + 1], a - ld a, [H_POWEROFTEN + 2] - ld b, a - ld a, [H_NUMTOPRINT + 2] - ld [H_SAVEDNUMTOPRINT + 2], a - cp b - jr nc, .noborrow2 - - ld a, [H_NUMTOPRINT + 1] - and a - jr nz, .borrowed - - ld a, [H_NUMTOPRINT] - and a - jr z, .underflow2 - dec a - ld [H_NUMTOPRINT], a - xor a -.borrowed - - dec a - ld [H_NUMTOPRINT + 1], a - ld a, [H_NUMTOPRINT + 2] -.noborrow2 - sub b - ld [H_NUMTOPRINT + 2], a - inc c - jr .loop - -.underflow2 - ld a, [H_SAVEDNUMTOPRINT + 1] - ld [H_NUMTOPRINT + 1], a -.underflow1 - ld a, [H_SAVEDNUMTOPRINT] - ld [H_NUMTOPRINT], a -.underflow0 - ld a, [H_PASTLEADINGZEROES] - or c - jr z, .PrintLeadingZero - - ld a, "0" - add c - ld [hl], a - ld [H_PASTLEADINGZEROES], a - ret - -.PrintLeadingZero: - bit BIT_LEADING_ZEROES, d - ret z - ld [hl], "0" - ret - -.NextDigit: -; Increment unless the number is left-aligned, -; leading zeroes are not printed, and no digits -; have been printed yet. - bit BIT_LEADING_ZEROES, d - jr nz, .inc - bit BIT_LEFT_ALIGN, d - jr z, .inc - ld a, [H_PASTLEADINGZEROES] - and a - ret z -.inc - inc hl - ret - - -CallFunctionInTable:: -; Call function a in jumptable hl. -; de is not preserved. - push hl - push de - push bc - add a - ld d, 0 - ld e, a - add hl, de - ld a, [hli] - ld h, [hl] - ld l, a - ld de, .returnAddress - push de - jp hl -.returnAddress - pop bc - pop de - pop hl - ret - - -IsInArray:: -; Search an array at hl for the value in a. -; Entry size is de bytes. -; Return count b and carry if found. - ld b, 0 - -IsInRestOfArray:: - ld c, a -.loop - ld a, [hl] - cp -1 - jr z, .notfound - cp c - jr z, .found - inc b - add hl, de - jr .loop - -.notfound - and a - ret - -.found - scf - ret - - -RestoreScreenTilesAndReloadTilePatterns:: - call ClearSprites - ld a, $1 - ld [wUpdateSpritesEnabled], a - call ReloadMapSpriteTilePatterns - call LoadScreenTilesFromBuffer2 - call LoadTextBoxTilePatterns - call RunDefaultPaletteCommand - jr Delay3 - - -GBPalWhiteOutWithDelay3:: - call GBPalWhiteOut - -Delay3:: -; The bg map is updated each frame in thirds. -; Wait three frames to let the bg map fully update. - ld c, 3 - jp DelayFrames - -GBPalNormal:: -; Reset BGP and OBP0. - ld a, %11100100 ; 3210 - ld [rBGP], a - ld a, %11010000 ; 3100 - ld [rOBP0], a - ret - -GBPalWhiteOut:: -; White out all palettes. - xor a - ld [rBGP], a - ld [rOBP0], a - ld [rOBP1], a - ret - - -RunDefaultPaletteCommand:: - ld b, $ff -RunPaletteCommand:: - ld a, [wOnSGB] - and a - ret z - predef_jump _RunPaletteCommand - -GetHealthBarColor:: -; Return at hl the palette of -; an HP bar e pixels long. - ld a, e - cp 27 - ld d, 0 ; green - jr nc, .gotColor - cp 10 - inc d ; yellow - jr nc, .gotColor - inc d ; red -.gotColor - ld [hl], d - ret - -; Copy the current map's sprites' tile patterns to VRAM again after they have -; been overwritten by other tile patterns. -ReloadMapSpriteTilePatterns:: - ld hl, wFontLoaded - ld a, [hl] - push af - res 0, [hl] - push hl - xor a - ld [wSpriteSetID], a - call DisableLCD - callba InitMapSprites - call EnableLCD - pop hl - pop af - ld [hl], a - call LoadPlayerSpriteGraphics - call LoadFontTilePatterns - jp UpdateSprites - - -GiveItem:: -; Give player quantity c of item b, -; and copy the item's name to wcf4b. -; Return carry on success. - ld a, b - ld [wd11e], a - ld [wcf91], a - ld a, c - ld [wItemQuantity], a - ld hl, wNumBagItems - call AddItemToInventory - ret nc - call GetItemName - call CopyStringToCF4B - scf - ret - -GivePokemon:: -; Give the player monster b at level c. - ld a, b - ld [wcf91], a - ld a, c - ld [wCurEnemyLVL], a - xor a ; PLAYER_PARTY_DATA - ld [wMonDataLocation], a - jpba _GivePokemon - - -Random:: -; Return a random number in a. -; For battles, use BattleRandom. - push hl - push de - push bc - callba Random_ - ld a, [hRandomAdd] - pop bc - pop de - pop hl - ret - - +INCLUDE "home/update_sprites.asm" + +INCLUDE "data/items/marts.asm" + +INCLUDE "home/overworld_text.asm" +INCLUDE "home/uncompress.asm" +INCLUDE "home/reset_player_sprite.asm" +INCLUDE "home/fade_audio.asm" +INCLUDE "home/text_script.asm" +INCLUDE "home/start_menu.asm" +INCLUDE "home/count_set_bits.asm" +INCLUDE "home/inventory.asm" +INCLUDE "home/list_menu.asm" +INCLUDE "home/names.asm" +INCLUDE "home/reload_tiles.asm" +INCLUDE "home/item.asm" +INCLUDE "home/textbox.asm" +INCLUDE "home/npc_movement.asm" +INCLUDE "home/trainers.asm" +INCLUDE "home/map_objects.asm" +INCLUDE "home/trainers2.asm" +INCLUDE "home/money.asm" +INCLUDE "home/bankswitch.asm" +INCLUDE "home/yes_no.asm" +INCLUDE "home/pathfinding.asm" +INCLUDE "home/load_font.asm" +INCLUDE "home/tilemap.asm" +INCLUDE "home/delay.asm" +INCLUDE "home/names2.asm" +INCLUDE "home/item_price.asm" +INCLUDE "home/copy_string.asm" +INCLUDE "home/joypad2.asm" +INCLUDE "home/math.asm" +INCLUDE "home/print_text.asm" +INCLUDE "home/move_mon.asm" +INCLUDE "home/array.asm" +INCLUDE "home/compare.asm" +INCLUDE "home/oam.asm" +INCLUDE "home/window.asm" +INCLUDE "home/print_num.asm" +INCLUDE "home/array2.asm" +INCLUDE "home/palettes.asm" +INCLUDE "home/reload_sprites.asm" +INCLUDE "home/give.asm" +INCLUDE "home/random.asm" INCLUDE "home/predef.asm" - - -UpdateCinnabarGymGateTileBlocks:: - jpba UpdateCinnabarGymGateTileBlocks_ - -CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: - ld a, [H_LOADEDROMBANK] - push af - ld a, [hJoyHeld] - bit 0, a ; A button - jr z, .nothingFound -; A button is pressed - ld a, Bank(CheckForHiddenObject) - ld [MBC1RomBank], a - ld [H_LOADEDROMBANK], a - call CheckForHiddenObject - ld a, [$ffee] - and a - jr nz, .hiddenObjectNotFound - ld a, [wHiddenObjectFunctionRomBank] - ld [MBC1RomBank], a - ld [H_LOADEDROMBANK], a - ld de, .returnAddress - push de - jp hl -.returnAddress - xor a - jr .done -.hiddenObjectNotFound - callba PrintBookshelfText - ld a, [$ffdb] - and a - jr z, .done -.nothingFound - ld a, $ff -.done - ld [$ffeb], a - pop af - ld [MBC1RomBank], a - ld [H_LOADEDROMBANK], a - ret - -PrintPredefTextID:: - ld [hSpriteIndexOrTextID], a - ld hl, TextPredefs - call SetMapTextPointer - ld hl, wTextPredefFlag - set 0, [hl] - call DisplayTextID - -RestoreMapTextPointer:: - ld hl, wMapTextPtr - ld a, [$ffec] - ld [hli], a - ld a, [$ffec + 1] - ld [hl], a - ret - -SetMapTextPointer:: - ld a, [wMapTextPtr] - ld [$ffec], a - ld a, [wMapTextPtr + 1] - ld [$ffec + 1], a - ld a, l - ld [wMapTextPtr], a - ld a, h - ld [wMapTextPtr + 1], a - ret - -TextPredefs:: -const_value = 1 - - add_tx_pre CardKeySuccessText ; 01 - add_tx_pre CardKeyFailText ; 02 - add_tx_pre RedBedroomPCText ; 03 - add_tx_pre RedBedroomSNESText ; 04 - add_tx_pre PushStartText ; 05 - add_tx_pre SaveOptionText ; 06 - add_tx_pre StrengthsAndWeaknessesText ; 07 - add_tx_pre OakLabEmailText ; 08 - add_tx_pre AerodactylFossilText ; 09 - add_tx_pre Route15UpstairsBinocularsText ; 0A - add_tx_pre KabutopsFossilText ; 0B - add_tx_pre GymStatueText1 ; 0C - add_tx_pre GymStatueText2 ; 0D - add_tx_pre BookcaseText ; 0E - add_tx_pre ViridianCityPokecenterBenchGuyText ; 0F - add_tx_pre PewterCityPokecenterBenchGuyText ; 10 - add_tx_pre CeruleanCityPokecenterBenchGuyText ; 11 - add_tx_pre LavenderCityPokecenterBenchGuyText ; 12 - add_tx_pre VermilionCityPokecenterBenchGuyText ; 13 - add_tx_pre CeladonCityPokecenterBenchGuyText ; 14 - add_tx_pre CeladonCityHotelText ; 15 - add_tx_pre FuchsiaCityPokecenterBenchGuyText ; 16 - add_tx_pre CinnabarIslandPokecenterBenchGuyText ; 17 - add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 - add_tx_pre MtMoonPokecenterBenchGuyText ; 19 - add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A - add_tx_pre UnusedBenchGuyText1 ; 1B XXX unused - add_tx_pre UnusedBenchGuyText2 ; 1C XXX unused - add_tx_pre UnusedBenchGuyText3 ; 1D XXX unused - add_tx_pre UnusedPredefText ; 1E XXX unused - add_tx_pre PokemonCenterPCText ; 1F - add_tx_pre ViridianSchoolNotebook ; 20 - add_tx_pre ViridianSchoolBlackboard ; 21 - add_tx_pre JustAMomentText ; 22 - add_tx_pre OpenBillsPCText ; 23 - add_tx_pre FoundHiddenItemText ; 24 - add_tx_pre HiddenItemBagFullText ; 25 XXX unused - add_tx_pre VermilionGymTrashText ; 26 - add_tx_pre IndigoPlateauHQText ; 27 - add_tx_pre GameCornerOutOfOrderText ; 28 - add_tx_pre GameCornerOutToLunchText ; 29 - add_tx_pre GameCornerSomeonesKeysText ; 2A - add_tx_pre FoundHiddenCoinsText ; 2B - add_tx_pre DroppedHiddenCoinsText ; 2C - add_tx_pre BillsHouseMonitorText ; 2D - add_tx_pre BillsHouseInitiatedText ; 2E - add_tx_pre BillsHousePokemonList ; 2F - add_tx_pre MagazinesText ; 30 - add_tx_pre CinnabarGymQuiz ; 31 - add_tx_pre GameCornerNoCoinsText ; 32 - add_tx_pre GameCornerCoinCaseText ; 33 - add_tx_pre LinkCableHelp ; 34 - add_tx_pre TMNotebook ; 35 - add_tx_pre FightingDojoText ; 36 - add_tx_pre EnemiesOnEverySideText ; 37 - add_tx_pre WhatGoesAroundComesAroundText ; 38 - add_tx_pre NewBicycleText ; 39 - add_tx_pre IndigoPlateauStatues ; 3A - add_tx_pre VermilionGymTrashSuccessText1 ; 3B - add_tx_pre VermilionGymTrashSuccessText2 ; 3C XXX unused - add_tx_pre VermilionGymTrashSuccessText3 ; 3D - add_tx_pre VermilionGymTrashFailText ; 3E - add_tx_pre TownMapText ; 3F - add_tx_pre BookOrSculptureText ; 40 - add_tx_pre ElevatorText ; 41 - add_tx_pre PokemonStuffText ; 42 +INCLUDE "home/hidden_objects.asm" +INCLUDE "home/predef_text.asm" diff --git a/home/array.asm b/home/array.asm new file mode 100644 index 00000000..256c58e1 --- /dev/null +++ b/home/array.asm @@ -0,0 +1,21 @@ +; skips a text entries, each of size NAME_LENGTH (like trainer name, OT name, rival name, ...) +; hl: base pointer, will be incremented by NAME_LENGTH * a +SkipFixedLengthTextEntries:: + and a + ret z + ld bc, NAME_LENGTH +.skipLoop + add hl, bc + dec a + jr nz, .skipLoop + ret + +AddNTimes:: +; add bc to hl a times + and a + ret z +.loop + add hl, bc + dec a + jr nz, .loop + ret diff --git a/home/array2.asm b/home/array2.asm new file mode 100644 index 00000000..f4ed8389 --- /dev/null +++ b/home/array2.asm @@ -0,0 +1,47 @@ +CallFunctionInTable:: +; Call function a in jumptable hl. +; de is not preserved. + push hl + push de + push bc + add a + ld d, 0 + ld e, a + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + ld de, .returnAddress + push de + jp hl +.returnAddress + pop bc + pop de + pop hl + ret + +IsInArray:: +; Search an array at hl for the value in a. +; Entry size is de bytes. +; Return count b and carry if found. + ld b, 0 + +IsInRestOfArray:: + ld c, a +.loop + ld a, [hl] + cp -1 + jr z, .notfound + cp c + jr z, .found + inc b + add hl, de + jr .loop + +.notfound + and a + ret + +.found + scf + ret diff --git a/home/audio.asm b/home/audio.asm index f0e1ec47..d2c69bf7 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -108,16 +108,16 @@ OpenSRAMForSound:: ; ; call OpenSRAMForSound ; -; ldh a, [hROMBank] +; ldh a, [hLoadedROMBank] ; push af ; ld a, BANK(_MapSetup_Sound_Off) -; ldh [hROMBank], a +; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a ; ; call _MapSetup_Sound_Off ; ; pop af -; ldh [hROMBank], a +; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a ; ; pop af @@ -136,16 +136,16 @@ UpdateSound:: and a ret nz - ldh a, [hROMBank] + ldh a, [hLoadedROMBank] push af ld a, BANK(_UpdateSound) - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call _UpdateSound pop af - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ; pop af @@ -156,14 +156,14 @@ UpdateSound:: _LoadMusicByte:: ; wCurMusicByte = [a:de] - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld a, [de] ld [wCurMusicByte], a ld a, BANK(LoadMusicByte) - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret @@ -178,10 +178,10 @@ PlayMusic:: push bc push af - ldh a, [hROMBank] + ldh a, [hLoadedROMBank] push af - ld a, BANK(_PlayMusic) ; aka BANK(_MapSetup_Sound_Off) - ldh [hROMBank], a + ld a, BANK(_PlayMusic) ; aka BANK(_InitSound) + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld a, e @@ -192,11 +192,11 @@ PlayMusic:: jr .end .nomusic - call _MapSetup_Sound_Off + call _InitSound .end pop af - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a pop af pop bc @@ -215,10 +215,10 @@ PlayMusic:: ; push bc ; push af ; -; ldh a, [hROMBank] +; ldh a, [hLoadedROMBank] ; push af ; ld a, BANK(_PlayMusic) -; ldh [hROMBank], a +; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a ; ; push de @@ -229,7 +229,7 @@ PlayMusic:: ; call _PlayMusic ; ; pop af -; ldh [hROMBank], a +; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a ; ; pop af @@ -253,12 +253,12 @@ PlayCry:: ld e, a ld d, 0 - ldh a, [hROMBank] + ldh a, [hLoadedROMBank] push af ; Cries are stuck in one bank. ld a, BANK(PokemonCries) - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld hl, PokemonCries @@ -281,13 +281,13 @@ endr ld [wCryLength + 1], a ld a, BANK(_PlayCry) - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call _PlayCry pop af - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call WaitForSoundToFinish @@ -317,10 +317,10 @@ PlaySFX:: ; jr c, .done .play - ldh a, [hROMBank] + ldh a, [hLoadedROMBank] push af ld a, BANK(_PlaySFX) - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld a, e @@ -328,7 +328,7 @@ PlaySFX:: call _PlaySFX pop af - ldh [hROMBank], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a .done diff --git a/home/bankswitch.asm b/home/bankswitch.asm new file mode 100644 index 00000000..52c8a45c --- /dev/null +++ b/home/bankswitch.asm @@ -0,0 +1,35 @@ +BankswitchHome:: +; switches to bank # in a +; Only use this when in the home bank! + ld [wBankswitchHomeTemp], a + ldh a, [hLoadedROMBank] + ld [wBankswitchHomeSavedROMBank], a + ld a, [wBankswitchHomeTemp] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +BankswitchBack:: +; returns from BankswitchHome + ld a, [wBankswitchHomeSavedROMBank] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +Bankswitch:: +; self-contained bankswitch, use this when not in the home bank +; switches to the bank in b + ldh a, [hLoadedROMBank] + push af + ld a, b + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld bc, .Return + push bc + jp hl +.Return + pop bc + ld a, b + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm new file mode 100644 index 00000000..79cc99d6 --- /dev/null +++ b/home/clear_sprites.asm @@ -0,0 +1,21 @@ +ClearSprites:: + xor a + ld hl, wOAMBuffer + ld b, wOAMBufferEnd - wOAMBuffer +.loop + ld [hli], a + dec b + jr nz, .loop + ret + +HideSprites:: + ld a, 160 + ld hl, wOAMBuffer + ld de, 4 + ld b, 40 +.loop + ld [hl], a + add hl, de + dec b + jr nz, .loop + ret diff --git a/home/compare.asm b/home/compare.asm new file mode 100644 index 00000000..e2da7857 --- /dev/null +++ b/home/compare.asm @@ -0,0 +1,11 @@ +; Compare strings, c bytes in length, at de and hl. +; Often used to compare big endian numbers in battle calculations. +StringCmp:: + ld a, [de] + cp [hl] + ret nz + inc de + inc hl + dec c + jr nz, StringCmp + ret diff --git a/home/copy.asm b/home/copy.asm index be9c8c0c..880d1fb7 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,14 +1,14 @@ FarCopyData:: ; Copy bc bytes from a:hl to de. ld [wBuffer], a - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, [wBuffer] - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call CopyData pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret diff --git a/home/copy2.asm b/home/copy2.asm index d4f35668..1c9a56f3 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,25 +1,25 @@ FarCopyData2:: ; Identical to FarCopyData, but uses hROMBankTemp ; as temp space instead of wBuffer. - ld [hROMBankTemp], a - ld a, [H_LOADEDROMBANK] + ldh [hROMBankTemp], a + ldh a, [hLoadedROMBank] push af - ld a, [hROMBankTemp] - ld [H_LOADEDROMBANK], a + ldh a, [hROMBankTemp] + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call CopyData pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret FarCopyData3:: ; Copy bc bytes from a:de to hl. - ld [hROMBankTemp], a - ld a, [H_LOADEDROMBANK] + ldh [hROMBankTemp], a + ldh a, [hLoadedROMBank] push af - ld a, [hROMBankTemp] - ld [H_LOADEDROMBANK], a + ldh a, [hROMBankTemp] + ldh [hLoadedROMBank], a ld [MBC1RomBank], a push hl push de @@ -31,18 +31,18 @@ FarCopyData3:: pop de pop hl pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret FarCopyDataDouble:: ; Expand bc bytes of 1bpp image data ; from a:hl to 2bpp data at de. - ld [hROMBankTemp], a - ld a, [H_LOADEDROMBANK] + ldh [hROMBankTemp], a + ldh a, [hLoadedROMBank] push af - ld a, [hROMBankTemp] - ld [H_LOADEDROMBANK], a + ldh a, [hROMBankTemp] + ldh [hLoadedROMBank], a ld [MBC1RomBank], a .loop ld a, [hli] @@ -55,7 +55,7 @@ FarCopyDataDouble:: or b jr nz, .loop pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret @@ -64,27 +64,27 @@ CopyVideoData:: ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. - ld a, [H_AUTOBGTRANSFERENABLED] + ldh a, [hAutoBGTransferEnabled] push af xor a ; disable auto-transfer while copying - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a - ld a, [H_LOADEDROMBANK] - ld [hROMBankTemp], a + ldh a, [hLoadedROMBank] + ldh [hROMBankTemp], a ld a, b - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld a, e - ld [H_VBCOPYSRC], a + ldh [hVBlankCopySource], a ld a, d - ld [H_VBCOPYSRC + 1], a + ldh [hVBlankCopySource + 1], a ld a, l - ld [H_VBCOPYDEST], a + ldh [hVBlankCopyDest], a ld a, h - ld [H_VBCOPYDEST + 1], a + ldh [hVBlankCopyDest + 1], a .loop ld a, c @@ -92,18 +92,18 @@ CopyVideoData:: jr nc, .keepgoing .done - ld [H_VBCOPYSIZE], a + ldh [hVBlankCopySize], a call DelayFrame - ld a, [hROMBankTemp] - ld [H_LOADEDROMBANK], a + ldh a, [hROMBankTemp] + ldh [hLoadedROMBank], a ld [MBC1RomBank], a pop af - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret .keepgoing ld a, 8 - ld [H_VBCOPYSIZE], a + ldh [hVBlankCopySize], a call DelayFrame ld a, c sub 8 @@ -114,26 +114,26 @@ CopyVideoDataDouble:: ; Wait for the next VBlank, then copy c 1bpp ; tiles from b:de to hl, 8 tiles at a time. ; This takes c/8 frames. - ld a, [H_AUTOBGTRANSFERENABLED] + ldh a, [hAutoBGTransferEnabled] push af xor a ; disable auto-transfer while copying - ld [H_AUTOBGTRANSFERENABLED], a - ld a, [H_LOADEDROMBANK] - ld [hROMBankTemp], a + ldh [hAutoBGTransferEnabled], a + ldh a, [hLoadedROMBank] + ldh [hROMBankTemp], a ld a, b - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld a, e - ld [H_VBCOPYDOUBLESRC], a + ldh [hVBlankCopyDoubleSource], a ld a, d - ld [H_VBCOPYDOUBLESRC + 1], a + ldh [hVBlankCopyDoubleSource + 1], a ld a, l - ld [H_VBCOPYDOUBLEDEST], a + ldh [hVBlankCopyDoubleDest], a ld a, h - ld [H_VBCOPYDOUBLEDEST + 1], a + ldh [hVBlankCopyDoubleDest + 1], a .loop ld a, c @@ -141,18 +141,18 @@ CopyVideoDataDouble:: jr nc, .keepgoing .done - ld [H_VBCOPYDOUBLESIZE], a + ldh [hVBlankCopyDoubleSize], a call DelayFrame - ld a, [hROMBankTemp] - ld [H_LOADEDROMBANK], a + ldh a, [hROMBankTemp] + ldh [hLoadedROMBank], a ld [MBC1RomBank], a pop af - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ret .keepgoing ld a, 8 - ld [H_VBCOPYDOUBLESIZE], a + ldh [hVBlankCopyDoubleSize], a call DelayFrame ld a, c sub 8 @@ -184,32 +184,32 @@ CopyScreenTileBufferToVRAM:: ld c, 6 ld hl, $600 * 0 - coord de, 0, 6 * 0 + decoord 0, 6 * 0 call .setup call DelayFrame ld hl, $600 * 1 - coord de, 0, 6 * 1 + decoord 0, 6 * 1 call .setup call DelayFrame ld hl, $600 * 2 - coord de, 0, 6 * 2 + decoord 0, 6 * 2 call .setup jp DelayFrame .setup ld a, d - ld [H_VBCOPYBGSRC+1], a + ldh [hVBlankCopyBGSource+1], a call GetRowColAddressBgMap ld a, l - ld [H_VBCOPYBGDEST], a + ldh [hVBlankCopyBGDest], a ld a, h - ld [H_VBCOPYBGDEST+1], a + ldh [hVBlankCopyBGDest+1], a ld a, c - ld [H_VBCOPYBGNUMROWS], a + ldh [hVBlankCopyBGNumRows], a ld a, e - ld [H_VBCOPYBGSRC], a + ldh [hVBlankCopyBGSource], a ret ClearScreen:: @@ -217,7 +217,7 @@ ClearScreen:: ; for the bg map to update. ld bc, 20 * 18 inc b - coord hl, 0, 0 + hlcoord 0, 0 ld a, " " .loop ld [hli], a diff --git a/home/copy_string.asm b/home/copy_string.asm new file mode 100644 index 00000000..7f86e501 --- /dev/null +++ b/home/copy_string.asm @@ -0,0 +1,13 @@ +; copies a string from [de] to [wcf4b] +CopyStringToCF4B:: + ld hl, wcf4b + ; fall through + +; copies a string from [de] to [hl] +CopyString:: + ld a, [de] + inc de + ld [hli], a + cp "@" + jr nz, CopyString + ret diff --git a/home/count_set_bits.asm b/home/count_set_bits.asm new file mode 100644 index 00000000..73f7fa9c --- /dev/null +++ b/home/count_set_bits.asm @@ -0,0 +1,24 @@ +; function to count how many bits are set in a string of bytes +; INPUT: +; hl = address of string of bytes +; b = length of string of bytes +; OUTPUT: +; [wNumSetBits] = number of set bits +CountSetBits:: + ld c, 0 +.loop + ld a, [hli] + ld e, a + ld d, 8 +.innerLoop ; count how many bits are set in the current byte + srl e + ld a, 0 + adc c + ld c, a + dec d + jr nz, .innerLoop + dec b + jr nz, .loop + ld a, c + ld [wNumSetBits], a + ret diff --git a/home/delay.asm b/home/delay.asm new file mode 100644 index 00000000..63babd80 --- /dev/null +++ b/home/delay.asm @@ -0,0 +1,6 @@ +DelayFrames:: +; wait c frames + call DelayFrame + dec c + jr nz, DelayFrames + ret diff --git a/home/fade.asm b/home/fade.asm index 9482fcb0..f5ddf964 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,7 +1,7 @@ ; These routines manage gradual fading ; (e.g., entering a doorway) LoadGBPal:: - ld a, [wMapPalOffset] ;tells if wCurMap is dark (requires HM5_FLASH?) + ld a, [wMapPalOffset] ; tells if wCurMap is dark (requires HM5_FLASH?) ld b, a ld hl, FadePal4 ld a, l @@ -11,11 +11,11 @@ LoadGBPal:: dec h .ok ld a, [hli] - ld [rBGP], a + ldh [rBGP], a ld a, [hli] - ld [rOBP0], a + ldh [rOBP0], a ld a, [hli] - ld [rOBP1], a + ldh [rOBP1], a ret GBFadeInFromBlack:: @@ -29,11 +29,11 @@ GBFadeOutToWhite:: GBFadeIncCommon: ld a, [hli] - ld [rBGP], a + ldh [rBGP], a ld a, [hli] - ld [rOBP0], a + ldh [rOBP0], a ld a, [hli] - ld [rOBP1], a + ldh [rOBP1], a ld c, 8 call DelayFrames dec b @@ -51,11 +51,11 @@ GBFadeInFromWhite:: GBFadeDecCommon: ld a, [hld] - ld [rOBP1], a + ldh [rOBP1], a ld a, [hld] - ld [rOBP0], a + ldh [rOBP0], a ld a, [hld] - ld [rBGP], a + ldh [rBGP], a ld c, 8 call DelayFrames dec b diff --git a/home/fade_audio.asm b/home/fade_audio.asm new file mode 100644 index 00000000..4ad2607d --- /dev/null +++ b/home/fade_audio.asm @@ -0,0 +1,48 @@ +FadeOutAudio:: + ld a, [wAudioFadeOutControl] + and a ; currently fading out audio? + jr nz, .fadingOut + ld a, [wd72c] + bit 1, a + ret nz + ld a, $77 + ldh [rNR50], a + ret +.fadingOut + ld a, [wAudioFadeOutCounter] + and a + jr z, .counterReachedZero + dec a + ld [wAudioFadeOutCounter], a + ret +.counterReachedZero + ld a, [wAudioFadeOutCounterReloadValue] + ld [wAudioFadeOutCounter], a + ldh a, [rNR50] + and a ; has the volume reached 0? + jr z, .fadeOutComplete + ld b, a + and $f + dec a + ld c, a + ld a, b + and $f0 + swap a + dec a + swap a + or c + ldh [rNR50], a + ret +.fadeOutComplete + ld a, [wAudioFadeOutControl] + ld b, a + xor a + ld [wAudioFadeOutControl], a + ld a, SFX_STOP_ALL_MUSIC + ld [wNewSoundID], a + call PlaySound + ld a, [wAudioSavedROMBank] + ld [wAudioROMBank], a + ld a, b + ld [wNewSoundID], a + jp PlaySound diff --git a/home/give.asm b/home/give.asm new file mode 100644 index 00000000..cbfd0310 --- /dev/null +++ b/home/give.asm @@ -0,0 +1,26 @@ +GiveItem:: +; Give player quantity c of item b, +; and copy the item's name to wcf4b. +; Return carry on success. + ld a, b + ld [wd11e], a + ld [wcf91], a + ld a, c + ld [wItemQuantity], a + ld hl, wNumBagItems + call AddItemToInventory + ret nc + call GetItemName + call CopyStringToCF4B + scf + ret + +GivePokemon:: +; Give the player monster b at level c. + ld a, b + ld [wcf91], a + ld a, c + ld [wCurEnemyLVL], a + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + farjp _GivePokemon diff --git a/home/header.asm b/home/header.asm new file mode 100644 index 00000000..c12a0565 --- /dev/null +++ b/home/header.asm @@ -0,0 +1,81 @@ +; rst vectors (unused) + +SECTION "rst0", ROM0[$0000] + rst $38 + + ds $08 - @, 0 ; unused + +SECTION "rst8", ROM0[$0008] + rst $38 + + ds $10 - @, 0 ; unused + +SECTION "rst10", ROM0[$0010] + rst $38 + + ds $18 - @, 0 ; unused + +SECTION "rst18", ROM0[$0018] + rst $38 + + ds $20 - @, 0 ; unused + +SECTION "rst20", ROM0[$0020] + rst $38 + + ds $28 - @, 0 ; unused + +SECTION "rst28", ROM0[$0028] + rst $38 + + ds $30 - @, 0 ; unused + +SECTION "rst30", ROM0[$0030] + rst $38 + + ds $38 - @, 0 ; unused + +SECTION "rst38", ROM0[$0038] + rst $38 + + ds $40 - @, 0 ; unused + + +; Game Boy hardware interrupts + +SECTION "vblank", ROM0[$0040] + jp VBlank + + ds $48 - @, 0 ; unused + +SECTION "lcd", ROM0[$0048] + rst $38 + + ds $50 - @, 0 ; unused + +SECTION "timer", ROM0[$0050] + jp Timer + + ds $58 - @, 0 ; unused + +SECTION "serial", ROM0[$0058] + jp Serial + + ds $60 - @, 0 ; unused + +SECTION "joypad", ROM0[$0060] + reti + + +SECTION "Header", ROM0[$0100] + +Start:: +; Nintendo requires all Game Boy ROMs to begin with a nop ($00) and a jp ($C3) +; to the starting address. + nop + jp _Start + +; The Game Boy cartridge header data is patched over by rgbfix. +; This makes sure it doesn't get used for anything else. + + ds $0150 - @ diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm new file mode 100644 index 00000000..eccf1c8f --- /dev/null +++ b/home/hidden_objects.asm @@ -0,0 +1,39 @@ +UpdateCinnabarGymGateTileBlocks:: + farjp UpdateCinnabarGymGateTileBlocks_ + +CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: + ldh a, [hLoadedROMBank] + push af + ldh a, [hJoyHeld] + bit 0, a ; A button + jr z, .nothingFound +; A button is pressed + ld a, BANK(CheckForHiddenObject) + ld [MBC1RomBank], a + ldh [hLoadedROMBank], a + call CheckForHiddenObject + ldh a, [hDidntFindAnyHiddenObject] + and a + jr nz, .hiddenObjectNotFound + ld a, [wHiddenObjectFunctionRomBank] + ld [MBC1RomBank], a + ldh [hLoadedROMBank], a + ld de, .returnAddress + push de + jp hl +.returnAddress + xor a + jr .done +.hiddenObjectNotFound + farcall PrintBookshelfText + ldh a, [hFFDB] + and a + jr z, .done +.nothingFound + ld a, $ff +.done + ldh [hItemAlreadyFound], a + pop af + ld [MBC1RomBank], a + ldh [hLoadedROMBank], a + ret diff --git a/home/init.asm b/home/init.asm index 8261a8a5..6d29a739 100644 --- a/home/init.asm +++ b/home/init.asm @@ -21,28 +21,28 @@ rLCDC_DEFAULT EQU %11100011 di xor a - ld [rIF], a - ld [rIE], a - ld [rSCX], a - ld [rSCY], a - ld [rSB], a - ld [rSC], a - ld [rWX], a - ld [rWY], a - ld [rTMA], a - ld [rTAC], a - ld [rBGP], a - ld [rOBP0], a - ld [rOBP1], a + ldh [rIF], a + ldh [rIE], a + ldh [rSCX], a + ldh [rSCY], a + ldh [rSB], a + ldh [rSC], a + ldh [rWX], a + ldh [rWY], a + ldh [rTMA], a + ldh [rTAC], a + ldh [rBGP], a + ldh [rOBP0], a + ldh [rOBP1], a ld a, rLCDC_ENABLE_MASK - ld [rLCDC], a + ldh [rLCDC], a call DisableLCD ld sp, wStack - ld hl, $c000 ; start of WRAM - ld bc, $2000 ; size of WRAM + ld hl, WRAM0_Begin + ld bc, WRAM1_End - WRAM0_Begin .loop ld [hl], 0 inc hl @@ -53,44 +53,44 @@ rLCDC_DEFAULT EQU %11100011 call ClearVram - ld hl, $ff80 - ld bc, $ffff - $ff80 + ld hl, HRAM_Begin + ld bc, HRAM_End - HRAM_Begin call FillMemory call ClearSprites - ld a, Bank(WriteDMACodeToHRAM) - ld [H_LOADEDROMBANK], a + ld a, BANK(WriteDMACodeToHRAM) + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call WriteDMACodeToHRAM xor a - ld [hTilesetType], a - ld [rSTAT], a - ld [hSCX], a - ld [hSCY], a - ld [rIF], a + ldh [hTileAnimations], a + ldh [rSTAT], a + ldh [hSCX], a + ldh [hSCY], a + ldh [rIF], a ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL - ld [rIE], a + ldh [rIE], a ld a, 144 ; move the window off-screen - ld [hWY], a - ld [rWY], a + ldh [hWY], a + ldh [rWY], a ld a, 7 - ld [rWX], a + ldh [rWX], a ld a, CONNECTION_NOT_ESTABLISHED - ld [hSerialConnectionStatus], a + ldh [hSerialConnectionStatus], a - ld h, vBGMap0 / $100 + ld h, HIGH(vBGMap0) call ClearBgMap - ld h, vBGMap1 / $100 + ld h, HIGH(vBGMap1) call ClearBgMap ld a, rLCDC_DEFAULT - ld [rLCDC], a + ldh [rLCDC], a ld a, 16 - ld [hSoftReset], a + ldh [hSoftReset], a call StopAllSounds ei @@ -101,9 +101,9 @@ rLCDC_DEFAULT EQU %11100011 ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, $9c - ld [H_AUTOBGTRANSFERDEST + 1], a + ldh [hAutoBGTransferDest + 1], a xor a - ld [H_AUTOBGTRANSFERDEST], a + ldh [hAutoBGTransferDest], a dec a ld [wUpdateSpritesEnabled], a @@ -114,13 +114,13 @@ rLCDC_DEFAULT EQU %11100011 call GBPalNormal call ClearSprites ld a, rLCDC_DEFAULT - ld [rLCDC], a + ldh [rLCDC], a jp SetDefaultNamesBeforeTitlescreen -ClearVram: - ld hl, $8000 - ld bc, $2000 +ClearVram:: + ld hl, VRAM_Begin + ld bc, VRAM_End - VRAM_Begin xor a jp FillMemory @@ -128,7 +128,7 @@ ClearVram: StopAllSounds:: call OpenSRAMForSound - ld a, 0 ; BANK(Audio1_UpdateMusic) + ld a, 0 ; BANK("Audio Engine 1") ld [wAudioROMBank], a ld [wAudioSavedROMBank], a xor a diff --git a/home/inventory.asm b/home/inventory.asm new file mode 100644 index 00000000..1100666f --- /dev/null +++ b/home/inventory.asm @@ -0,0 +1,38 @@ +; subtracts the amount the player paid from their money +; OUTPUT: carry = 0(success) or 1(fail because there is not enough money) +SubtractAmountPaidFromMoney:: + farjp SubtractAmountPaidFromMoney_ + +; adds the amount the player sold to their money +AddAmountSoldToMoney:: + ld de, wPlayerMoney + 2 + ld hl, hMoney + 2 ; total price of items + ld c, 3 ; length of money in bytes + predef AddBCDPredef ; add total price to money + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID ; redraw money text box + ld a, SFX_PURCHASE + call PlaySoundWaitForCurrent + jp WaitForSoundToFinish + +; function to remove an item (in varying quantities) from the player's bag or PC box +; INPUT: +; HL = address of inventory (either wNumBagItems or wNumBoxItems) +; [wWhichPokemon] = index (within the inventory) of the item to remove +; [wItemQuantity] = quantity to remove +RemoveItemFromInventory:: + homecall RemoveItemFromInventory_ + ret + +; function to add an item (in varying quantities) to the player's bag or PC box +; INPUT: +; HL = address of inventory (either wNumBagItems or wNumBoxItems) +; [wcf91] = item ID +; [wItemQuantity] = item quantity +; sets carry flag if successful, unsets carry flag if unsuccessful +AddItemToInventory:: + push bc + homecall_sf AddItemToInventory_ + pop bc + ret diff --git a/home/item.asm b/home/item.asm new file mode 100644 index 00000000..f27d46f4 --- /dev/null +++ b/home/item.asm @@ -0,0 +1,49 @@ +; uses an item +; UseItem is used with dummy items to perform certain other functions as well +; INPUT: +; [wcf91] = item ID +; OUTPUT: +; [wActionResultOrTookBattleTurn] = success +; 00: unsuccessful +; 01: successful +; 02: not able to be used right now, no extra menu displayed (only certain items use this) +UseItem:: + farjp UseItem_ + +; confirms the item toss and then tosses the item +; INPUT: +; hl = address of inventory (either wNumBagItems or wNumBoxItems) +; [wcf91] = item ID +; [wWhichPokemon] = index of item within inventory +; [wItemQuantity] = quantity to toss +; OUTPUT: +; clears carry flag if the item is tossed, sets carry flag if not +TossItem:: + ldh a, [hLoadedROMBank] + push af + ld a, BANK(TossItem_) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + call TossItem_ + pop de + ld a, d + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +; checks if an item is a key item +; INPUT: +; [wcf91] = item ID +; OUTPUT: +; [wIsKeyItem] = result +; 00: item is not key item +; 01: item is key item +IsKeyItem:: + push hl + push de + push bc + farcall IsKeyItem_ + pop bc + pop de + pop hl + ret diff --git a/home/item_price.asm b/home/item_price.asm new file mode 100644 index 00000000..98eb31b1 --- /dev/null +++ b/home/item_price.asm @@ -0,0 +1,44 @@ +GetItemPrice:: +; Stores item's price as BCD at hItemPrice (3 bytes) +; Input: [wcf91] = item id + ldh a, [hLoadedROMBank] + push af + ld a, [wListMenuID] + cp MOVESLISTMENU + ld a, BANK(ItemPrices) + jr nz, .ok + ld a, $f ; hardcoded Bank +.ok + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld hl, wItemPrices + ld a, [hli] + ld h, [hl] + ld l, a + ld a, [wcf91] ; a contains item id + cp HM01 + jr nc, .getTMPrice + ld bc, $3 +.loop + add hl, bc + dec a + jr nz, .loop + dec hl + ld a, [hld] + ldh [hItemPrice + 2], a + ld a, [hld] + ldh [hItemPrice + 1], a + ld a, [hl] + ldh [hItemPrice], a + jr .done +.getTMPrice + ld a, BANK(GetMachinePrice) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + call GetMachinePrice +.done + ld de, hItemPrice + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret diff --git a/home/joypad.asm b/home/joypad.asm index 2002bb29..9bc8663e 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -6,28 +6,28 @@ ReadJoypad:: ld a, 1 << 5 ; select direction keys ld c, 0 - ld [rJOYP], a - rept 6 - ld a, [rJOYP] - endr + ldh [rJOYP], a +REPT 6 + ldh a, [rJOYP] +ENDR cpl and %1111 swap a ld b, a ld a, 1 << 4 ; select button keys - ld [rJOYP], a - rept 10 - ld a, [rJOYP] - endr + ldh [rJOYP], a +REPT 10 + ldh a, [rJOYP] +ENDR cpl and %1111 or b - ld [hJoyInput], a + ldh [hJoyInput], a ld a, 1 << 4 + 1 << 5 ; deselect keys - ld [rJOYP], a + ldh [rJOYP], a ret Joypad:: diff --git a/home/joypad2.asm b/home/joypad2.asm new file mode 100644 index 00000000..139dd3f5 --- /dev/null +++ b/home/joypad2.asm @@ -0,0 +1,95 @@ +; this function is used when lower button sensitivity is wanted (e.g. menus) +; OUTPUT: [hJoy5] = pressed buttons in usual format +; there are two flags that control its functionality, [hJoy6] and [hJoy7] +; there are essentially three modes of operation +; 1. Get newly pressed buttons only +; ([hJoy7] == 0, [hJoy6] == any) +; Just copies [hJoyPressed] to [hJoy5]. +; 2. Get currently pressed buttons at low sample rate with delay +; ([hJoy7] == 1, [hJoy6] != 0) +; If the user holds down buttons for more than half a second, +; report buttons as being pressed up to 12 times per second thereafter. +; If the user holds down buttons for less than half a second, +; report only one button press. +; 3. Same as 2, but report no buttons as pressed if A or B is held down. +; ([hJoy7] == 1, [hJoy6] == 0) +JoypadLowSensitivity:: + call Joypad + ldh a, [hJoy7] ; flag + and a ; get all currently pressed buttons or only newly pressed buttons? + ldh a, [hJoyPressed] ; newly pressed buttons + jr z, .storeButtonState + ldh a, [hJoyHeld] ; all currently pressed buttons +.storeButtonState + ldh [hJoy5], a + ldh a, [hJoyPressed] ; newly pressed buttons + and a ; have any buttons been newly pressed since last check? + jr z, .noNewlyPressedButtons +.newlyPressedButtons + ld a, 30 ; half a second delay + ldh [hFrameCounter], a + ret +.noNewlyPressedButtons + ldh a, [hFrameCounter] + and a ; is the delay over? + jr z, .delayOver +.delayNotOver + xor a + ldh [hJoy5], a ; report no buttons as pressed + ret +.delayOver +; if [hJoy6] = 0 and A or B is pressed, report no buttons as pressed + ldh a, [hJoyHeld] + and A_BUTTON | B_BUTTON + jr z, .setShortDelay + ldh a, [hJoy6] ; flag + and a + jr nz, .setShortDelay + xor a + ldh [hJoy5], a +.setShortDelay + ld a, 5 ; 1/12 of a second delay + ldh [hFrameCounter], a + ret + +WaitForTextScrollButtonPress:: + ldh a, [hDownArrowBlinkCount1] + push af + ldh a, [hDownArrowBlinkCount2] + push af + xor a + ldh [hDownArrowBlinkCount1], a + ld a, $6 + ldh [hDownArrowBlinkCount2], a +.loop + push hl + ld a, [wTownMapSpriteBlinkingEnabled] + and a + jr z, .skipAnimation + call TownMapSpriteBlinkingAnimation +.skipAnimation + hlcoord 18, 16 + call HandleDownArrowBlinkTiming + pop hl + call JoypadLowSensitivity + predef CableClub_Run + ldh a, [hJoy5] + and A_BUTTON | B_BUTTON + jr z, .loop + pop af + ldh [hDownArrowBlinkCount2], a + pop af + ldh [hDownArrowBlinkCount1], a + ret + +; (unless in link battle) waits for A or B being pressed and outputs the scrolling sound effect +ManualTextScroll:: + ld a, [wLinkState] + cp LINK_STATE_BATTLING + jr z, .inLinkBattle + call WaitForTextScrollButtonPress + ld a, SFX_PRESS_AB + jp PlaySound +.inLinkBattle + ld c, 65 + jp DelayFrames diff --git a/home/lcd.asm b/home/lcd.asm new file mode 100644 index 00000000..72fc70ed --- /dev/null +++ b/home/lcd.asm @@ -0,0 +1,25 @@ +DisableLCD:: + xor a + ldh [rIF], a + ldh a, [rIE] + ld b, a + res 0, a + ldh [rIE], a + +.wait + ldh a, [rLY] + cp LY_VBLANK + jr nz, .wait + + ldh a, [rLCDC] + and $ff ^ rLCDC_ENABLE_MASK + ldh [rLCDC], a + ld a, b + ldh [rIE], a + ret + +EnableLCD:: + ldh a, [rLCDC] + set rLCDC_ENABLE, a + ldh [rLCDC], a + ret diff --git a/home/list_menu.asm b/home/list_menu.asm new file mode 100644 index 00000000..c856e91d --- /dev/null +++ b/home/list_menu.asm @@ -0,0 +1,526 @@ +; INPUT: +; [wListMenuID] = list menu ID +; [wListPointer] = address of the list (2 bytes) +DisplayListMenuID:: + xor a + ldh [hAutoBGTransferEnabled], a ; disable auto-transfer + ld a, 1 + ldh [hJoy7], a ; joypad state update flag + ld a, [wBattleType] + and a ; is it the Old Man battle? + jr nz, .specialBattleType + ld a, $01 ; hardcoded bank + jr .bankswitch +.specialBattleType ; Old Man battle + ld a, BANK(DisplayBattleMenu) +.bankswitch + call BankswitchHome + ld hl, wd730 + set 6, [hl] ; turn off letter printing delay + xor a + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped + ld [wListCount], a + ld a, [wListPointer] + ld l, a + ld a, [wListPointer + 1] + ld h, a ; hl = address of the list + ld a, [hl] ; the first byte is the number of entries in the list + ld [wListCount], a + ld a, LIST_MENU_BOX + ld [wTextBoxID], a + call DisplayTextBoxID ; draw the menu text box + call UpdateSprites ; disable sprites behind the text box +; the code up to .skipMovingSprites appears to be useless + hlcoord 4, 2 ; coordinates of upper left corner of menu text box + lb de, 9, 14 ; height and width of menu text box + ld a, [wListMenuID] + and a ; PCPOKEMONLISTMENU? + jr nz, .skipMovingSprites + call UpdateSprites +.skipMovingSprites + ld a, 1 ; max menu item ID is 1 if the list has less than 2 entries + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wListCount] + cp 2 ; does the list have less than 2 entries? + jr c, .setMenuVariables + ld a, 2 ; max menu item ID is 2 if the list has at least 2 entries +.setMenuVariables + ld [wMaxMenuItem], a + ld a, 4 + ld [wTopMenuItemY], a + ld a, 5 + ld [wTopMenuItemX], a + ld a, A_BUTTON | B_BUTTON | SELECT + ld [wMenuWatchedKeys], a + ld c, 10 + call DelayFrames + +DisplayListMenuIDLoop:: + xor a + ldh [hAutoBGTransferEnabled], a ; disable transfer + call PrintListMenuEntries + ld a, 1 + ldh [hAutoBGTransferEnabled], a ; enable transfer + call Delay3 + ld a, [wBattleType] + and a ; is it the Old Man battle? + jr z, .notOldManBattle +.oldManBattle + ld a, "▶" + ldcoord_a 5, 4 ; place menu cursor in front of first menu entry + ld c, 80 + call DelayFrames + xor a + ld [wCurrentMenuItem], a + hlcoord 5, 4 + ld a, l + ld [wMenuCursorLocation], a + ld a, h + ld [wMenuCursorLocation + 1], a + jr .buttonAPressed +.notOldManBattle + call LoadGBPal + call HandleMenuInput + push af + call PlaceMenuCursor + pop af + bit 0, a ; was the A button pressed? + jp z, .checkOtherKeys +.buttonAPressed + ld a, [wCurrentMenuItem] + call PlaceUnfilledArrowMenuCursor + +; pointless because both values are overwritten before they are read + ld a, $01 + ld [wMenuExitMethod], a + ld [wChosenMenuItem], a + + xor a + ld [wMenuWatchMovingOutOfBounds], a + ld a, [wCurrentMenuItem] + ld c, a + ld a, [wListScrollOffset] + add c + ld c, a + ld a, [wListCount] + and a ; is the list empty? + jp z, ExitListMenu ; if so, exit the menu + dec a + cp c ; did the player select Cancel? + jp c, ExitListMenu ; if so, exit the menu + ld a, c + ld [wWhichPokemon], a + ld a, [wListMenuID] + cp ITEMLISTMENU + jr nz, .skipMultiplying +; if it's an item menu + sla c ; item entries are 2 bytes long, so multiply by 2 +.skipMultiplying + ld a, [wListPointer] + ld l, a + ld a, [wListPointer + 1] + ld h, a + inc hl ; hl = beginning of list entries + ld b, 0 + add hl, bc + ld a, [hl] + ld [wcf91], a + ld a, [wListMenuID] + and a ; PCPOKEMONLISTMENU? + jr z, .pokemonList + push hl + call GetItemPrice + pop hl + ld a, [wListMenuID] + cp ITEMLISTMENU + jr nz, .skipGettingQuantity +; if it's an item menu + inc hl + ld a, [hl] ; a = item quantity + ld [wMaxItemQuantity], a +.skipGettingQuantity + ld a, [wcf91] + ld [wd0b5], a + ld a, BANK(ItemNames) + ld [wPredefBank], a + call GetName + jr .storeChosenEntry +.pokemonList + ld hl, wPartyCount + ld a, [wListPointer] + cp l ; is it a list of party pokemon or box pokemon? + ld hl, wPartyMonNicks + jr z, .getPokemonName + ld hl, wBoxMonNicks ; box pokemon names +.getPokemonName + ld a, [wWhichPokemon] + call GetPartyMonName +.storeChosenEntry ; store the menu entry that the player chose and return + ld de, wcd6d + call CopyStringToCF4B ; copy name to wcf4b + ld a, CHOSE_MENU_ITEM + ld [wMenuExitMethod], a + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + xor a + ldh [hJoy7], a ; joypad state update flag + ld hl, wd730 + res 6, [hl] ; turn on letter printing delay + jp BankswitchBack +.checkOtherKeys ; check B, SELECT, Up, and Down keys + bit 1, a ; was the B button pressed? + jp nz, ExitListMenu ; if so, exit the menu + bit 2, a ; was the select button pressed? + jp nz, HandleItemListSwapping ; if so, allow the player to swap menu entries + ld b, a + bit 7, b ; was Down pressed? + ld hl, wListScrollOffset + jr z, .upPressed +.downPressed + ld a, [hl] + add 3 + ld b, a + ld a, [wListCount] + cp b ; will going down scroll past the Cancel button? + jp c, DisplayListMenuIDLoop + inc [hl] ; if not, go down + jp DisplayListMenuIDLoop +.upPressed + ld a, [hl] + and a + jp z, DisplayListMenuIDLoop + dec [hl] + jp DisplayListMenuIDLoop + +DisplayChooseQuantityMenu:: +; text box dimensions/coordinates for just quantity + hlcoord 15, 9 + ld b, 1 ; height + ld c, 3 ; width + ld a, [wListMenuID] + cp PRICEDITEMLISTMENU + jr nz, .drawTextBox +; text box dimensions/coordinates for quantity and price + hlcoord 7, 9 + ld b, 1 ; height + ld c, 11 ; width +.drawTextBox + call TextBoxBorder + hlcoord 16, 10 + ld a, [wListMenuID] + cp PRICEDITEMLISTMENU + jr nz, .printInitialQuantity + hlcoord 8, 10 +.printInitialQuantity + ld de, InitialQuantityText + call PlaceString + xor a + ld [wItemQuantity], a ; initialize current quantity to 0 + jp .incrementQuantity +.waitForKeyPressLoop + call JoypadLowSensitivity + ldh a, [hJoyPressed] ; newly pressed buttons + bit 0, a ; was the A button pressed? + jp nz, .buttonAPressed + bit 1, a ; was the B button pressed? + jp nz, .buttonBPressed + bit 6, a ; was Up pressed? + jr nz, .incrementQuantity + bit 7, a ; was Down pressed? + jr nz, .decrementQuantity + jr .waitForKeyPressLoop +.incrementQuantity + ld a, [wMaxItemQuantity] + inc a + ld b, a + ld hl, wItemQuantity ; current quantity + inc [hl] + ld a, [hl] + cp b + jr nz, .handleNewQuantity +; wrap to 1 if the player goes above the max quantity + ld a, 1 + ld [hl], a + jr .handleNewQuantity +.decrementQuantity + ld hl, wItemQuantity ; current quantity + dec [hl] + jr nz, .handleNewQuantity +; wrap to the max quantity if the player goes below 1 + ld a, [wMaxItemQuantity] + ld [hl], a +.handleNewQuantity + hlcoord 17, 10 + ld a, [wListMenuID] + cp PRICEDITEMLISTMENU + jr nz, .printQuantity +.printPrice + ld c, $03 + ld a, [wItemQuantity] + ld b, a + ld hl, hMoney ; total price +; initialize total price to 0 + xor a + ld [hli], a + ld [hli], a + ld [hl], a +.addLoop ; loop to multiply the individual price by the quantity to get the total price + ld de, hMoney + 2 + ld hl, hItemPrice + 2 + push bc + predef AddBCDPredef ; add the individual price to the current sum + pop bc + dec b + jr nz, .addLoop + ldh a, [hHalveItemPrices] + and a ; should the price be halved (for selling items)? + jr z, .skipHalvingPrice + xor a + ldh [hDivideBCDDivisor], a + ldh [hDivideBCDDivisor + 1], a + ld a, $02 + ldh [hDivideBCDDivisor + 2], a + predef DivideBCDPredef3 ; halves the price +; store the halved price + ldh a, [hDivideBCDQuotient] + ldh [hMoney], a + ldh a, [hDivideBCDQuotient + 1] + ldh [hMoney + 1], a + ldh a, [hDivideBCDQuotient + 2] + ldh [hMoney + 2], a +.skipHalvingPrice + hlcoord 12, 10 + ld de, SpacesBetweenQuantityAndPriceText + call PlaceString + ld de, hMoney ; total price + ld c, $a3 + call PrintBCDNumber + hlcoord 9, 10 +.printQuantity + ld de, wItemQuantity ; current quantity + lb bc, LEADING_ZEROES | 1, 2 ; 1 byte, 2 digits + call PrintNumber + jp .waitForKeyPressLoop +.buttonAPressed ; the player chose to make the transaction + xor a + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped + ret +.buttonBPressed ; the player chose to cancel the transaction + xor a + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped + ld a, $ff + ret + +InitialQuantityText:: + db "×01@" + +SpacesBetweenQuantityAndPriceText:: + db " @" + +ExitListMenu:: + ld a, [wCurrentMenuItem] + ld [wChosenMenuItem], a + ld a, CANCELLED_MENU + ld [wMenuExitMethod], a + ld [wMenuWatchMovingOutOfBounds], a + xor a + ldh [hJoy7], a + ld hl, wd730 + res 6, [hl] + call BankswitchBack + xor a + ld [wMenuItemToSwap], a ; 0 means no item is currently being swapped + scf + ret + +PrintListMenuEntries:: + hlcoord 5, 3 + ld b, 9 + ld c, 14 + call ClearScreenArea + ld a, [wListPointer] + ld e, a + ld a, [wListPointer + 1] + ld d, a + inc de ; de = beginning of list entries + ld a, [wListScrollOffset] + ld c, a + ld a, [wListMenuID] + cp ITEMLISTMENU + ld a, c + jr nz, .skipMultiplying +; if it's an item menu +; item entries are 2 bytes long, so multiply by 2 + sla a + sla c +.skipMultiplying + add e + ld e, a + jr nc, .noCarry + inc d +.noCarry + hlcoord 6, 4 ; coordinates of first list entry name + ld b, 4 ; print 4 names +.loop + ld a, b + ld [wWhichPokemon], a + ld a, [de] + ld [wd11e], a + cp $ff + jp z, .printCancelMenuItem + push bc + push de + push hl + push hl + push de + ld a, [wListMenuID] + and a ; PCPOKEMONLISTMENU? + jr z, .pokemonPCMenu + cp MOVESLISTMENU + jr z, .movesMenu +.itemMenu + call GetItemName + jr .placeNameString +.pokemonPCMenu + push hl + ld hl, wPartyCount + ld a, [wListPointer] + cp l ; is it a list of party pokemon or box pokemon? + ld hl, wPartyMonNicks + jr z, .getPokemonName + ld hl, wBoxMonNicks ; box pokemon names +.getPokemonName + ld a, [wWhichPokemon] + ld b, a + ld a, 4 + sub b + ld b, a + ld a, [wListScrollOffset] + add b + call GetPartyMonName + pop hl + jr .placeNameString +.movesMenu + call GetMoveName +.placeNameString + call PlaceString + pop de + pop hl + ld a, [wPrintItemPrices] + and a ; should prices be printed? + jr z, .skipPrintingItemPrice +.printItemPrice + push hl + ld a, [de] + ld de, ItemPrices + ld [wcf91], a + call GetItemPrice ; get price + pop hl + ld bc, SCREEN_WIDTH + 5 ; 1 row down and 5 columns right + add hl, bc + ld c, $a3 ; no leading zeroes, right-aligned, print currency symbol, 3 bytes + call PrintBCDNumber +.skipPrintingItemPrice + ld a, [wListMenuID] + and a ; PCPOKEMONLISTMENU? + jr nz, .skipPrintingPokemonLevel +.printPokemonLevel + ld a, [wd11e] + push af + push hl + ld hl, wPartyCount + ld a, [wListPointer] + cp l ; is it a list of party pokemon or box pokemon? + ld a, PLAYER_PARTY_DATA + jr z, .next + ld a, BOX_DATA +.next + ld [wMonDataLocation], a + ld hl, wWhichPokemon + ld a, [hl] + ld b, a + ld a, $04 + sub b + ld b, a + ld a, [wListScrollOffset] + add b + ld [hl], a + call LoadMonData + ld a, [wMonDataLocation] + and a ; is it a list of party pokemon or box pokemon? + jr z, .skipCopyingLevel +.copyLevel + ld a, [wLoadedMonBoxLevel] + ld [wLoadedMonLevel], a +.skipCopyingLevel + pop hl + ld bc, $1c + add hl, bc + call PrintLevel + pop af + ld [wd11e], a +.skipPrintingPokemonLevel + pop hl + pop de + inc de + ld a, [wListMenuID] + cp ITEMLISTMENU + jr nz, .nextListEntry +.printItemQuantity + ld a, [wd11e] + ld [wcf91], a + call IsKeyItem ; check if item is unsellable + ld a, [wIsKeyItem] + and a ; is the item unsellable? + jr nz, .skipPrintingItemQuantity ; if so, don't print the quantity + push hl + ld bc, SCREEN_WIDTH + 8 ; 1 row down and 8 columns right + add hl, bc + ld a, "×" + ld [hli], a + ld a, [wd11e] + push af + ld a, [de] + ld [wMaxItemQuantity], a + push de + ld de, wd11e + ld [de], a + lb bc, 1, 2 + call PrintNumber + pop de + pop af + ld [wd11e], a + pop hl +.skipPrintingItemQuantity + inc de + pop bc + inc c + push bc + inc c + ld a, [wMenuItemToSwap] ; ID of item chosen for swapping (counts from 1) + and a ; is an item being swapped? + jr z, .nextListEntry + sla a + cp c ; is it this item? + jr nz, .nextListEntry + dec hl + ld a, "▷" + ld [hli], a +.nextListEntry + ld bc, 2 * SCREEN_WIDTH ; 2 rows + add hl, bc + pop bc + inc c + dec b + jp nz, .loop + ld bc, -8 + add hl, bc + ld a, "▼" + ld [hl], a + ret +.printCancelMenuItem + ld de, ListMenuCancelText + jp PlaceString + +ListMenuCancelText:: + db "CANCEL@" diff --git a/home/load_font.asm b/home/load_font.asm new file mode 100644 index 00000000..3b56d3a8 --- /dev/null +++ b/home/load_font.asm @@ -0,0 +1,47 @@ +LoadFontTilePatterns:: + ldh a, [rLCDC] + bit 7, a ; is the LCD enabled? + jr nz, .on +.off + ld hl, FontGraphics + ld de, vFont + ld bc, FontGraphicsEnd - FontGraphics + ld a, BANK(FontGraphics) + jp FarCopyDataDouble ; if LCD is off, transfer all at once +.on + ld de, FontGraphics + ld hl, vFont + lb bc, BANK(FontGraphics), (FontGraphicsEnd - FontGraphics) / $8 + jp CopyVideoDataDouble ; if LCD is on, transfer during V-blank + +LoadTextBoxTilePatterns:: + ldh a, [rLCDC] + bit 7, a ; is the LCD enabled? + jr nz, .on +.off + ld hl, TextBoxGraphics + ld de, vChars2 tile $60 + ld bc, TextBoxGraphicsEnd - TextBoxGraphics + ld a, BANK(TextBoxGraphics) + jp FarCopyData2 ; if LCD is off, transfer all at once +.on + ld de, TextBoxGraphics + ld hl, vChars2 tile $60 + lb bc, BANK(TextBoxGraphics), (TextBoxGraphicsEnd - TextBoxGraphics) / $10 + jp CopyVideoData ; if LCD is on, transfer during V-blank + +LoadHpBarAndStatusTilePatterns:: + ldh a, [rLCDC] + bit 7, a ; is the LCD enabled? + jr nz, .on +.off + ld hl, HpBarAndStatusGraphics + ld de, vChars2 tile $62 + ld bc, HpBarAndStatusGraphicsEnd - HpBarAndStatusGraphics + ld a, BANK(HpBarAndStatusGraphics) + jp FarCopyData2 ; if LCD is off, transfer all at once +.on + ld de, HpBarAndStatusGraphics + ld hl, vChars2 tile $62 + lb bc, BANK(HpBarAndStatusGraphics), (HpBarAndStatusGraphicsEnd - HpBarAndStatusGraphics) / $10 + jp CopyVideoData ; if LCD is on, transfer during V-blank diff --git a/home/map_objects.asm b/home/map_objects.asm new file mode 100644 index 00000000..27a69965 --- /dev/null +++ b/home/map_objects.asm @@ -0,0 +1,248 @@ +; checks if the player's coordinates match an arrow movement tile's coordinates +; and if so, decodes the RLE movement data +; b = player Y +; c = player X +DecodeArrowMovementRLE:: + ld a, [hli] + cp $ff + ret z ; no match in the list + cp b + jr nz, .nextArrowMovementTileEntry1 + ld a, [hli] + cp c + jr nz, .nextArrowMovementTileEntry2 + ld a, [hli] + ld d, [hl] + ld e, a + ld hl, wSimulatedJoypadStatesEnd + call DecodeRLEList + dec a + ld [wSimulatedJoypadStatesIndex], a + ret +.nextArrowMovementTileEntry1 + inc hl +.nextArrowMovementTileEntry2 + inc hl + inc hl + jr DecodeArrowMovementRLE + +TextScript_ItemStoragePC:: + call SaveScreenTilesToBuffer2 + ld b, BANK(PlayerPC) + ld hl, PlayerPC + jr bankswitchAndContinue + +TextScript_BillsPC:: + call SaveScreenTilesToBuffer2 + ld b, BANK(BillsPC_) + ld hl, BillsPC_ + jr bankswitchAndContinue + +TextScript_GameCornerPrizeMenu:: +; XXX find a better name for this function +; special_F7 + ld b, BANK(CeladonPrizeMenu) + ld hl, CeladonPrizeMenu +bankswitchAndContinue:: + call Bankswitch + jp HoldTextDisplayOpen ; continue to main text-engine function + +TextScript_PokemonCenterPC:: + ld b, BANK(ActivatePC) + ld hl, ActivatePC + jr bankswitchAndContinue + +StartSimulatingJoypadStates:: + xor a + ld [wOverrideSimulatedJoypadStatesMask], a + ld [wSpritePlayerStateData2MovementByte1], a + ld hl, wd730 + set 7, [hl] + ret + +IsItemInBag:: +; given an item_id in b +; set zero flag if item isn't in player's bag +; else reset zero flag +; related to Pokémon Tower and ghosts + predef GetQuantityOfItemInBag + ld a, b + and a + ret + +DisplayPokedex:: + ld [wd11e], a + farjp _DisplayPokedex + +SetSpriteFacingDirectionAndDelay:: + call SetSpriteFacingDirection + ld c, 6 + jp DelayFrames + +SetSpriteFacingDirection:: + ld a, SPRITESTATEDATA1_FACINGDIRECTION + ldh [hSpriteDataOffset], a + call GetPointerWithinSpriteStateData1 + ldh a, [hSpriteFacingDirection] + ld [hl], a + ret + +SetSpriteImageIndexAfterSettingFacingDirection:: + ld de, SPRITESTATEDATA1_IMAGEINDEX - SPRITESTATEDATA1_FACINGDIRECTION + add hl, de + ld [hl], a + ret + +; tests if the player's coordinates are in a specified array +; INPUT: +; hl = address of array +; OUTPUT: +; [wCoordIndex] = if there is match, the matching array index +; sets carry if the coordinates are in the array, clears carry if not +ArePlayerCoordsInArray:: + ld a, [wYCoord] + ld b, a + ld a, [wXCoord] + ld c, a + ; fallthrough + +CheckCoords:: + xor a + ld [wCoordIndex], a +.loop + ld a, [hli] + cp $ff ; reached terminator? + jr z, .notInArray + push hl + ld hl, wCoordIndex + inc [hl] + pop hl +.compareYCoord + cp b + jr z, .compareXCoord + inc hl + jr .loop +.compareXCoord + ld a, [hli] + cp c + jr nz, .loop +.inArray + scf + ret +.notInArray + and a + ret + +; tests if a boulder's coordinates are in a specified array +; INPUT: +; hl = address of array +; [hSpriteIndex] = index of boulder sprite +; OUTPUT: +; [wCoordIndex] = if there is match, the matching array index +; sets carry if the coordinates are in the array, clears carry if not +CheckBoulderCoords:: + push hl + ld hl, wSpritePlayerStateData2MapY + ldh a, [hSpriteIndex] + swap a + ld d, $0 + ld e, a + add hl, de + ld a, [hli] + sub $4 ; because sprite coordinates are offset by 4 + ld b, a + ld a, [hl] + sub $4 ; because sprite coordinates are offset by 4 + ld c, a + pop hl + jp CheckCoords + +GetPointerWithinSpriteStateData1:: + ld h, HIGH(wSpriteStateData1) + jr _GetPointerWithinSpriteStateData + +GetPointerWithinSpriteStateData2:: + ld h, HIGH(wSpriteStateData2) + +_GetPointerWithinSpriteStateData: + ldh a, [hSpriteDataOffset] + ld b, a + ldh a, [hSpriteIndex] + swap a + add b + ld l, a + ret + +; decodes a $ff-terminated RLEncoded list +; each entry is a pair of bytes +; the final $ff will be replicated in the output list and a contains the number of bytes written +; de: input list +; hl: output list +DecodeRLEList:: + xor a + ld [wRLEByteCount], a ; count written bytes here +.listLoop + ld a, [de] + cp $ff + jr z, .endOfList + ldh [hRLEByteValue], a ; store byte value to be written + inc de + ld a, [de] + ld b, $0 + ld c, a ; number of bytes to be written + ld a, [wRLEByteCount] + add c + ld [wRLEByteCount], a ; update total number of written bytes + ldh a, [hRLEByteValue] + call FillMemory ; write a c-times to output + inc de + jr .listLoop +.endOfList + ld a, $ff + ld [hl], a ; write final $ff + ld a, [wRLEByteCount] + inc a ; include sentinel in counting + ret + +; sets movement byte 1 for sprite [hSpriteIndex] to $FE and byte 2 to [hSpriteMovementByte2] +SetSpriteMovementBytesToFE:: + push hl + call GetSpriteMovementByte1Pointer + ld [hl], $fe + call GetSpriteMovementByte2Pointer + ldh a, [hSpriteMovementByte2] + ld [hl], a + pop hl + ret + +; sets both movement bytes for sprite [hSpriteIndex] to $FF +SetSpriteMovementBytesToFF:: + push hl + call GetSpriteMovementByte1Pointer + ld [hl], $FF + call GetSpriteMovementByte2Pointer + ld [hl], $FF ; prevent person from walking? + pop hl + ret + +; returns the sprite movement byte 1 pointer for sprite [hSpriteIndex] in hl +GetSpriteMovementByte1Pointer:: + ld h, $C2 + ldh a, [hSpriteIndex] + swap a + add 6 + ld l, a + ret + +; returns the sprite movement byte 2 pointer for sprite [hSpriteIndex] in hl +GetSpriteMovementByte2Pointer:: + push de + ld hl, wMapSpriteData + ldh a, [hSpriteIndex] + dec a + add a + ld d, 0 + ld e, a + add hl, de + pop de + ret diff --git a/home/math.asm b/home/math.asm new file mode 100644 index 00000000..59eda606 --- /dev/null +++ b/home/math.asm @@ -0,0 +1,33 @@ +; function to do multiplication +; all values are big endian +; INPUT +; FF96-FF98 = multiplicand +; FF99 = multiplier +; OUTPUT +; FF95-FF98 = product +Multiply:: + push hl + push bc + callfar _Multiply + pop bc + pop hl + ret + +; function to do division +; all values are big endian +; INPUT +; FF95-FF98 = dividend +; FF99 = divisor +; b = number of bytes in the dividend (starting from FF95) +; OUTPUT +; FF95-FF98 = quotient +; FF99 = remainder +Divide:: + push hl + push de + push bc + homecall _Divide + pop bc + pop de + pop hl + ret diff --git a/home/money.asm b/home/money.asm new file mode 100644 index 00000000..a62835ea --- /dev/null +++ b/home/money.asm @@ -0,0 +1,15 @@ +HasEnoughMoney:: +; Check if the player has at least as much +; money as the 3-byte BCD value at hMoney. + ld de, wPlayerMoney + ld hl, hMoney + ld c, 3 + jp StringCmp + +HasEnoughCoins:: +; Check if the player has at least as many +; coins as the 2-byte BCD value at hCoins. + ld de, wPlayerCoins + ld hl, hCoins + ld c, 2 + jp StringCmp diff --git a/home/move_mon.asm b/home/move_mon.asm new file mode 100644 index 00000000..c766fbd5 --- /dev/null +++ b/home/move_mon.asm @@ -0,0 +1,239 @@ +; Copies [hl, bc) to [de, de + bc - hl). +; In other words, the source data is from hl up to but not including bc, +; and the destination is de. +CopyDataUntil:: + ld a, [hli] + ld [de], a + inc de + ld a, h + cp b + jr nz, CopyDataUntil + ld a, l + cp c + jr nz, CopyDataUntil + ret + +; Function to remove a pokemon from the party or the current box. +; wWhichPokemon determines the pokemon. +; [wRemoveMonFromBox] == 0 specifies the party. +; [wRemoveMonFromBox] != 0 specifies the current box. +RemovePokemon:: + jpfar _RemovePokemon + +AddPartyMon:: + push hl + push de + push bc + farcall _AddPartyMon + pop bc + pop de + pop hl + ret + +; calculates all 5 stats of current mon and writes them to [de] +CalcStats:: + ld c, $0 +.statsLoop + inc c + call CalcStat + ldh a, [hMultiplicand+1] + ld [de], a + inc de + ldh a, [hMultiplicand+2] + ld [de], a + inc de + ld a, c + cp NUM_STATS + jr nz, .statsLoop + ret + +; calculates stat c of current mon +; c: stat to calc (HP=1,Atk=2,Def=3,Spd=4,Spc=5) +; b: consider stat exp? +; hl: base ptr to stat exp values ([hl + 2*c - 1] and [hl + 2*c]) +CalcStat:: + push hl + push de + push bc + ld a, b + ld d, a + push hl + ld hl, wMonHeader + ld b, $0 + add hl, bc + ld a, [hl] ; read base value of stat + ld e, a + pop hl + push hl + sla c + ld a, d + and a + jr z, .statExpDone ; consider stat exp? + add hl, bc ; skip to corresponding stat exp value +.statExpLoop ; calculates ceil(Sqrt(stat exp)) in b + xor a + ldh [hMultiplicand], a + ldh [hMultiplicand+1], a + inc b ; increment current stat exp bonus + ld a, b + cp $ff + jr z, .statExpDone + ldh [hMultiplicand+2], a + ldh [hMultiplier], a + call Multiply + ld a, [hld] + ld d, a + ldh a, [hProduct + 3] + sub d + ld a, [hli] + ld d, a + ldh a, [hProduct + 2] + sbc d ; test if (current stat exp bonus)^2 < stat exp + jr c, .statExpLoop +.statExpDone + srl c + pop hl + push bc + ld bc, wPartyMon1DVs - (wPartyMon1HPExp - 1) ; also wEnemyMonDVs - wEnemyMonHP + add hl, bc + pop bc + ld a, c + cp $2 + jr z, .getAttackIV + cp $3 + jr z, .getDefenseIV + cp $4 + jr z, .getSpeedIV + cp $5 + jr z, .getSpecialIV +.getHpIV + push bc + ld a, [hl] ; Atk IV + swap a + and $1 + sla a + sla a + sla a + ld b, a + ld a, [hli] ; Def IV + and $1 + sla a + sla a + add b + ld b, a + ld a, [hl] ; Spd IV + swap a + and $1 + sla a + add b + ld b, a + ld a, [hl] ; Spc IV + and $1 + add b ; HP IV: LSB of the other 4 IVs + pop bc + jr .calcStatFromIV +.getAttackIV + ld a, [hl] + swap a + and $f + jr .calcStatFromIV +.getDefenseIV + ld a, [hl] + and $f + jr .calcStatFromIV +.getSpeedIV + inc hl + ld a, [hl] + swap a + and $f + jr .calcStatFromIV +.getSpecialIV + inc hl + ld a, [hl] + and $f +.calcStatFromIV + ld d, $0 + add e + ld e, a + jr nc, .noCarry + inc d ; de = Base + IV +.noCarry + sla e + rl d ; de = (Base + IV) * 2 + srl b + srl b ; b = ceil(Sqrt(stat exp)) / 4 + ld a, b + add e + jr nc, .noCarry2 + inc d ; de = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4 +.noCarry2 + ldh [hMultiplicand+2], a + ld a, d + ldh [hMultiplicand+1], a + xor a + ldh [hMultiplicand], a + ld a, [wCurEnemyLVL] + ldh [hMultiplier], a + call Multiply ; ((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level + ldh a, [hMultiplicand] + ldh [hDividend], a + ldh a, [hMultiplicand+1] + ldh [hDividend+1], a + ldh a, [hMultiplicand+2] + ldh [hDividend+2], a + ld a, $64 + ldh [hDivisor], a + ld a, $3 + ld b, a + call Divide ; (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + ld a, c + cp $1 + ld a, 5 ; + 5 for non-HP stat + jr nz, .notHPStat + ld a, [wCurEnemyLVL] + ld b, a + ldh a, [hMultiplicand+2] + add b + ldh [hMultiplicand+2], a + jr nc, .noCarry3 + ldh a, [hMultiplicand+1] + inc a + ldh [hMultiplicand+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level +.noCarry3 + ld a, 10 ; +10 for HP stat +.notHPStat + ld b, a + ldh a, [hMultiplicand+2] + add b + ldh [hMultiplicand+2], a + jr nc, .noCarry4 + ldh a, [hMultiplicand+1] + inc a ; non-HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + 5 + ldh [hMultiplicand+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level + 10 +.noCarry4 + ldh a, [hMultiplicand+1] ; check for overflow (>999) + cp HIGH(MAX_STAT_VALUE) + 1 + jr nc, .overflow + cp HIGH(MAX_STAT_VALUE) + jr c, .noOverflow + ldh a, [hMultiplicand+2] + cp LOW(MAX_STAT_VALUE) + 1 + jr c, .noOverflow +.overflow + ld a, HIGH(MAX_STAT_VALUE) ; overflow: cap at 999 + ldh [hMultiplicand+1], a + ld a, LOW(MAX_STAT_VALUE) + ldh [hMultiplicand+2], a +.noOverflow + pop bc + pop de + pop hl + ret + +AddEnemyMonToPlayerParty:: + homecall_sf _AddEnemyMonToPlayerParty + ret + +MoveMon:: + homecall_sf _MoveMon + ret diff --git a/home/names.asm b/home/names.asm new file mode 100644 index 00000000..f7751fa0 --- /dev/null +++ b/home/names.asm @@ -0,0 +1,141 @@ +GetMonName:: + push hl + ldh a, [hLoadedROMBank] + push af + ld a, BANK(MonsterNames) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld a, [wd11e] + dec a + ld hl, MonsterNames + ld c, 10 + ld b, 0 + call AddNTimes + ld de, wcd6d + push de + ld bc, 10 + call CopyData + ld hl, wcd6d + 10 + ld [hl], "@" + pop de + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + pop hl + ret + +GetItemName:: +; given an item ID at [wd11e], store the name of the item into a string +; starting at wcd6d + push hl + push bc + ld a, [wd11e] + cp HM01 ; is this a TM/HM? + jr nc, .Machine + + ld [wd0b5], a + ld a, ITEM_NAME + ld [wNameListType], a + ld a, BANK(ItemNames) + ld [wPredefBank], a + call GetName + jr .Finish + +.Machine + call GetMachineName +.Finish + ld de, wcd6d ; pointer to where item name is stored in RAM + pop bc + pop hl + ret + +GetMachineName:: +; copies the name of the TM/HM in [wd11e] to wcd6d + push hl + push de + push bc + ld a, [wd11e] + push af + cp TM01 ; is this a TM? [not HM] + jr nc, .WriteTM +; if HM, then write "HM" and add NUM_HMS to the item ID, so we can reuse the +; TM printing code + add NUM_HMS + ld [wd11e], a + ld hl, HiddenPrefix ; points to "HM" + ld bc, 2 + jr .WriteMachinePrefix +.WriteTM + ld hl, TechnicalPrefix ; points to "TM" + ld bc, 2 +.WriteMachinePrefix + ld de, wcd6d + call CopyData + +; now get the machine number and convert it to text + ld a, [wd11e] + sub TM01 - 1 + ld b, "0" +.FirstDigit + sub 10 + jr c, .SecondDigit + inc b + jr .FirstDigit +.SecondDigit + add 10 + push af + ld a, b + ld [de], a + inc de + pop af + ld b, "0" + add b + ld [de], a + inc de + ld a, "@" + ld [de], a + pop af + ld [wd11e], a + pop bc + pop de + pop hl + ret + +TechnicalPrefix:: + db "TM" +HiddenPrefix:: + db "HM" + +; sets carry if item is HM, clears carry if item is not HM +; Input: a = item ID +IsItemHM:: + cp HM01 + jr c, .notHM + cp TM01 + ret +.notHM + and a + ret + +; sets carry if move is an HM, clears carry if move is not an HM +; Input: a = move ID +IsMoveHM:: + ld hl, HMMoves + ld de, 1 + jp IsInArray + +HMMoves:: +INCLUDE "data/moves/hm_moves.asm" + +GetMoveName:: + push hl + ld a, MOVE_NAME + ld [wNameListType], a + ld a, [wd11e] + ld [wd0b5], a + ld a, BANK(MoveNames) + ld [wPredefBank], a + call GetName + ld de, wcd6d ; pointer to where move name is stored in RAM + pop hl + ret diff --git a/home/names2.asm b/home/names2.asm new file mode 100644 index 00000000..39ba1f55 --- /dev/null +++ b/home/names2.asm @@ -0,0 +1,94 @@ +NamePointers:: +; entries correspond to *_NAME constants + dw MonsterNames + dw MoveNames + dw UnusedBadgeNames + dw ItemNames + dw wPartyMonOT ; player's OT names list + dw wEnemyMonOT ; enemy's OT names list + dw TrainerNames + +GetName:: +; arguments: +; [wd0b5] = which name +; [wNameListType] = which list +; [wPredefBank] = bank of list +; +; returns pointer to name in de + ld a, [wd0b5] + ld [wd11e], a + + ; TM names are separate from item names. + ; BUG: This applies to all names instead of just items. + cp HM01 + jp nc, GetMachineName + + ldh a, [hLoadedROMBank] + push af + push hl + push bc + push de + ld a, [wNameListType] ;List3759_entrySelector + dec a + jr nz, .otherEntries + ;1 = MON_NAMES + call GetMonName + ld hl, NAME_LENGTH + add hl, de + ld e, l + ld d, h + jr .gotPtr +.otherEntries + ;2-7 = OTHER ENTRIES + ld a, [wPredefBank] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld a, [wNameListType] ;VariousNames' entryID + dec a + add a + ld d, 0 + ld e, a + jr nc, .skip + inc d +.skip + ld hl, NamePointers + add hl, de + ld a, [hli] + ldh [hSwapTemp + 1], a + ld a, [hl] + ldh [hSwapTemp], a + ldh a, [hSwapTemp] + ld h, a + ldh a, [hSwapTemp + 1] + ld l, a + ld a, [wd0b5] + ld b, a + ld c, 0 +.nextName + ld d, h + ld e, l +.nextChar + ld a, [hli] + cp "@" + jr nz, .nextChar + inc c ;entry counter + ld a, b ;wanted entry + cp c + jr nz, .nextName + ld h, d + ld l, e + ld de, wcd6d + ld bc, $14 + call CopyData +.gotPtr + ld a, e + ld [wUnusedCF8D], a + ld a, d + ld [wUnusedCF8D + 1], a + pop de + pop bc + pop hl + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret diff --git a/home/npc_movement.asm b/home/npc_movement.asm new file mode 100644 index 00000000..a3367f9a --- /dev/null +++ b/home/npc_movement.asm @@ -0,0 +1,64 @@ +; not zero if an NPC movement script is running, the player character is +; automatically stepping down from a door, or joypad states are being simulated +IsPlayerCharacterBeingControlledByGame:: + ld a, [wNPCMovementScriptPointerTableNum] + and a + ret nz + ld a, [wd736] + bit 1, a ; currently stepping down from door bit + ret nz + ld a, [wd730] + and $80 + ret + +RunNPCMovementScript:: + ld hl, wd736 + bit 0, [hl] + res 0, [hl] + jr nz, .playerStepOutFromDoor + ld a, [wNPCMovementScriptPointerTableNum] + and a + ret z + dec a + add a + ld d, 0 + ld e, a + ld hl, .NPCMovementScriptPointerTables + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + ldh a, [hLoadedROMBank] + push af + ld a, [wNPCMovementScriptBank] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld a, [wNPCMovementScriptFunctionNum] + call CallFunctionInTable + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +.NPCMovementScriptPointerTables + dw PalletMovementScriptPointerTable + dw PewterMuseumGuyMovementScriptPointerTable + dw PewterGymGuyMovementScriptPointerTable +.playerStepOutFromDoor + farjp PlayerStepOutFromDoor + +EndNPCMovementScript:: + farjp _EndNPCMovementScript + +DebugPressedOrHeldB:: +IF DEF(_DEBUG) + ld a, [wd732] + bit 1, a + ret z + ldh a, [hJoyHeld] + bit BIT_B_BUTTON, a + ret nz + ldh a, [hJoyPressed] + bit BIT_B_BUTTON, a +ENDC + ret diff --git a/home/oam.asm b/home/oam.asm new file mode 100644 index 00000000..8a940d97 --- /dev/null +++ b/home/oam.asm @@ -0,0 +1,36 @@ +; INPUT: +; a = oam block index (each block is 4 oam entries) +; b = Y coordinate of upper left corner of sprite +; c = X coordinate of upper left corner of sprite +; de = base address of 4 tile number and attribute pairs +WriteOAMBlock:: + ld h, HIGH(wOAMBuffer) + swap a ; multiply by 16 + ld l, a + call .writeOneEntry ; upper left + push bc + ld a, 8 + add c + ld c, a + call .writeOneEntry ; upper right + pop bc + ld a, 8 + add b + ld b, a + call .writeOneEntry ; lower left + ld a, 8 + add c + ld c, a + ; lower right +.writeOneEntry + ld [hl], b ; Y coordinate + inc hl + ld [hl], c ; X coordinate + inc hl + ld a, [de] ; tile number + inc de + ld [hli], a + ld a, [de] ; attribute + inc de + ld [hli], a + ret diff --git a/home/overworld.asm b/home/overworld.asm index 9053ab19..c7f161ee 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1,14 +1,14 @@ HandleMidJump:: ; Handle the player jumping down ; a ledge in the overworld. - jpba _HandleMidJump + farjp _HandleMidJump EnterMap:: ; Load a new map. ld a, $ff ld [wJoyIgnore], a call LoadMapData - callba ClearVariablesOnEnterMap + farcall ClearVariablesOnEnterMap ld hl, wd72c bit 0, [hl] ; has the player already made 3 steps since the last battle? jr z, .skipGivingThreeStepsOfNoRandomBattles @@ -25,10 +25,10 @@ EnterMap:: and 1 << 4 | 1 << 3 ; fly warp or dungeon warp jr z, .didNotEnterUsingFlyWarpOrDungeonWarp res 3, [hl] - callba EnterMapAnim + farcall EnterMapAnim call UpdateSprites .didNotEnterUsingFlyWarpOrDungeonWarp - callba CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road + farcall CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road ld hl, wd72d res 5, [hl] call UpdateSprites @@ -50,7 +50,7 @@ OverworldLoopLessDelay:: and a jp nz, .moveAhead ; if the player sprite has not yet completed the walking animation call JoypadOverworld ; get joypad state (which is possibly simulated) - callba SafariZoneCheck + farcall SafariZoneCheck ld a, [wSafariZoneGameOver] and a jp nz, WarpFound2 @@ -67,16 +67,16 @@ OverworldLoopLessDelay:: ld a, [wd730] bit 7, a ; are we simulating button presses? jr z, .notSimulating - ld a, [hJoyHeld] + ldh a, [hJoyHeld] jr .checkIfStartIsPressed .notSimulating - ld a, [hJoyPressed] + ldh a, [hJoyPressed] .checkIfStartIsPressed bit 3, a ; start button jr z, .startButtonNotPressed ; if START is pressed - xor a - ld [hSpriteIndexOrTextID], a ; start menu text ID + xor a ; TEXT_START_MENU + ldh [hSpriteIndexOrTextID], a jp .displayDialogue .startButtonNotPressed bit 0, a ; A button @@ -88,11 +88,11 @@ OverworldLoopLessDelay:: call IsPlayerCharacterBeingControlledByGame jr nz, .checkForOpponent call CheckForHiddenObjectOrBookshelfOrCardKeyDoor - ld a, [$ffeb] + ldh a, [hItemAlreadyFound] and a jp z, OverworldLoop ; jump if a hidden object or bookshelf was found, but not if a card key door was found call IsSpriteOrSignInFrontOfPlayer - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] and a jp z, OverworldLoop .displayDialogue @@ -103,7 +103,7 @@ OverworldLoopLessDelay:: jr nz, .checkForOpponent bit 0, a jr nz, .checkForOpponent - aCoord 8, 9 + lda_coord 8, 9 ld [wTilePlayerStandingOn], a ; unused? call DisplayTextID ; display either the start menu or the NPC/sign text ld a, [wEnteringCableClub] @@ -145,11 +145,11 @@ OverworldLoopLessDelay:: jp OverworldLoop .checkIfDownButtonIsPressed - ld a, [hJoyHeld] ; current joypad state + ldh a, [hJoyHeld] ; current joypad state bit 7, a ; down button jr z, .checkIfUpButtonIsPressed ld a, 1 - ld [wSpriteStateData1 + 3], a ; delta Y + ld [wSpritePlayerStateData1YStepVector], a ld a, PLAYER_DIR_DOWN jr .handleDirectionButtonPress @@ -157,7 +157,7 @@ OverworldLoopLessDelay:: bit 6, a ; up button jr z, .checkIfLeftButtonIsPressed ld a, -1 - ld [wSpriteStateData1 + 3], a ; delta Y + ld [wSpritePlayerStateData1YStepVector], a ld a, PLAYER_DIR_UP jr .handleDirectionButtonPress @@ -165,7 +165,7 @@ OverworldLoopLessDelay:: bit 5, a ; left button jr z, .checkIfRightButtonIsPressed ld a, -1 - ld [wSpriteStateData1 + 5], a ; delta X + ld [wSpritePlayerStateData1XStepVector], a ld a, PLAYER_DIR_LEFT jr .handleDirectionButtonPress @@ -173,7 +173,7 @@ OverworldLoopLessDelay:: bit 4, a ; right button jr z, .noDirectionButtonsPressed ld a, 1 - ld [wSpriteStateData1 + 5], a ; delta X + ld [wSpritePlayerStateData1XStepVector], a .handleDirectionButtonPress @@ -269,7 +269,7 @@ OverworldLoopLessDelay:: ld a, [wd736] bit 7, a jr z, .noSpinning - callba LoadSpinnerArrowTiles + farcall LoadSpinnerArrowTiles .noSpinning call UpdateSprites @@ -306,7 +306,7 @@ OverworldLoopLessDelay:: .doneStepCounting CheckEvent EVENT_IN_SAFARI_ZONE jr z, .notSafariZone - callba SafariZoneCheckSteps + farcall SafariZoneCheckSteps ld a, [wSafariZoneGameOver] and a jp nz, WarpFound2 @@ -332,7 +332,7 @@ OverworldLoopLessDelay:: set 5, [hl] set 6, [hl] xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, [wCurMap] cp CINNABAR_GYM jr nz, .notCinnabarGym @@ -343,7 +343,7 @@ OverworldLoopLessDelay:: ld a, [wCurMap] cp OAKS_LAB jp z, .noFaintCheck ; no blacking out if the player lost to the rival in Oak's lab - callab AnyPartyAlive + callfar AnyPartyAlive ld a, d and a jr z, .allPokemonFainted @@ -368,7 +368,7 @@ NewBattle:: ld a, [wd72e] bit 4, a jr nz, .noBattle - jpba InitBattle + farjp InitBattle .noBattle and a ret @@ -381,7 +381,7 @@ DoBikeSpeedup:: ld a, [wCurMap] cp ROUTE_17 ; Cycling Road jr nz, .goFaster - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and D_UP | D_LEFT | D_RIGHT ret nz .goFaster @@ -412,7 +412,7 @@ CheckWarpsNoCollisionLoop:: push bc ld hl, wd736 set 2, [hl] ; standing on warp flag - callba IsPlayerStandingOnDoorTileOrWarpTile + farcall IsPlayerStandingOnDoorTileOrWarpTile pop bc pop hl jr c, WarpFound1 ; jump if standing on door or warp @@ -431,7 +431,7 @@ CheckWarpsNoCollisionLoop:: call Joypad pop bc pop de - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and D_DOWN | D_UP | D_LEFT | D_RIGHT jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp jr WarpFound1 @@ -455,7 +455,7 @@ CheckWarpsCollision:: ld a, [hli] ld [wDestinationWarpID], a ld a, [hl] - ld [hWarpDestinationMap], a + ldh [hWarpDestinationMap], a jr WarpFound2 .retry1 inc hl @@ -477,7 +477,7 @@ WarpFound1:: ld a, [hli] ld [wDestinationWarpID], a ld a, [hli] - ld [hWarpDestinationMap], a + ldh [hWarpDestinationMap], a WarpFound2:: ld a, [wNumberOfWarps] @@ -492,7 +492,7 @@ WarpFound2:: ld [wLastMap], a ld a, [wCurMapWidth] ld [wUnusedD366], a ; not read - ld a, [hWarpDestinationMap] + ldh a, [hWarpDestinationMap] ld [wCurMap], a cp ROCK_TUNNEL_1F jr nz, .notRockTunnel @@ -506,12 +506,12 @@ WarpFound2:: ; for maps that can have the 0xFF destination map, which means to return to the outside map ; not all these maps are necessarily indoors, though .indoorMaps - ld a, [hWarpDestinationMap] ; destination map - cp $ff + ldh a, [hWarpDestinationMap] ; destination map + cp LAST_MAP jr z, .goBackOutside ; if not going back to the previous map ld [wCurMap], a - callba IsPlayerStandingOnWarpPadOrHole + farcall IsPlayerStandingOnWarpPadOrHole ld a, [wStandingOnWarpPadOrHole] dec a ; is the player on a warp pad? jr nz, .notWarpPad @@ -678,8 +678,8 @@ CheckMapConnections:: ld b, SET_PAL_OVERWORLD call RunPaletteCommand ; Since the sprite set shouldn't change, this will just update VRAM slots at -; $C2XE without loading any tile patterns. - callba InitMapSprites +; x#SPRITESTATEDATA2_IMAGEBASEOFFSET without loading any tile patterns. + farcall InitMapSprites call LoadTileBlockMap jp OverworldLoopLessDelay @@ -688,7 +688,7 @@ CheckMapConnections:: ; function to play a sound when changing maps PlayMapChangeSound:: - aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on + lda_coord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on cp $0b ; door tile in tileset 0 jr nz, .didNotGoThroughDoor ld a, SFX_GO_INSIDE @@ -747,7 +747,7 @@ ExtraWarpCheck:: jp Bankswitch MapEntryAfterBattle:: - callba IsPlayerStandingOnWarp ; for enabling warp testing after collisions + farcall IsPlayerStandingOnWarp ; for enabling warp testing after collisions ld a, [wMapPalOffset] and a jp z, GBFadeInFromWhite @@ -762,8 +762,8 @@ HandleBlackOut:: call StopMusic ld hl, wd72e res 5, [hl] - ld a, Bank(ResetStatusAndHalveMoneyOnBlackout) ; also Bank(SpecialWarpIn) and Bank(SpecialEnterMap) - ld [H_LOADEDROMBANK], a + ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(SpecialWarpIn) and BANK(SpecialEnterMap) + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call ResetStatusAndHalveMoneyOnBlackout call SpecialWarpIn @@ -785,7 +785,7 @@ StopMusic:: jr nz, .wait1 ret ; ld [wAudioFadeOutControl], a -; ld a, $ff +; ld a, SFX_STOP_ALL_MUSIC ; ld [wNewSoundID], a ; call PlaySound ;.wait @@ -806,14 +806,14 @@ HandleFlyWarpOrDungeonWarp:: set 2, [hl] ; fly warp or dungeon warp res 5, [hl] ; forced to ride bike call LeaveMapAnim - ld a, Bank(SpecialWarpIn) - ld [H_LOADEDROMBANK], a + ld a, BANK(SpecialWarpIn) + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call SpecialWarpIn jp SpecialEnterMap LeaveMapAnim:: - jpba _LeaveMapAnim + farjp _LeaveMapAnim LoadPlayerSpriteGraphics:: ; Load sprite graphics based on whether the player is standing, biking, or surfing. @@ -826,7 +826,7 @@ LoadPlayerSpriteGraphics:: dec a jr z, .ridingBike - ld a, [hTilesetType] + ldh a, [hTileAnimations] and a jr nz, .determineGraphics jr .startWalking @@ -880,7 +880,7 @@ IsBikeRidingAllowed:: scf ret -INCLUDE "data/bike_riding_tilesets.asm" +INCLUDE "data/tilesets/bike_riding_tilesets.asm" ; load the tile pattern data of the current tileset into VRAM LoadTilesetTilePatternData:: @@ -900,7 +900,7 @@ LoadTileBlockMap:: ld hl, wOverworldMap ld a, [wMapBackgroundTile] ld d, a - ld bc, $0514 + ld bc, wOverworldMapEnd - wOverworldMap .backgroundTileLoop ld a, d ld [hli], a @@ -912,9 +912,9 @@ LoadTileBlockMap:: ; a 3-byte border at the edges of the map is kept so that there is space for map connections ld hl, wOverworldMap ld a, [wCurMapWidth] - ld [hMapWidth], a + ldh [hMapWidth], a add MAP_BORDER * 2 ; east and west - ld [hMapStride], a ; map width + border + ldh [hMapStride], a ; map width + border ld b, 0 ld c, a ; make space for north border (next 3 lines) @@ -931,7 +931,7 @@ LoadTileBlockMap:: ld b, a .rowLoop ; copy one row each iteration push hl - ld a, [hMapWidth] ; map width (without border) + ldh a, [hMapWidth] ; map width (without border) ld c, a .rowInnerLoop ld a, [de] @@ -941,7 +941,7 @@ LoadTileBlockMap:: jr nz, .rowInnerLoop ; add the map width plus the border to the base address of the current row to get the next row's address pop hl - ld a, [hMapStride] ; map width + border + ldh a, [hMapStride] ; map width + border add l ld l, a jr nc, .noCarry @@ -963,9 +963,9 @@ LoadTileBlockMap:: ld a, [wNorthConnectionStripDest + 1] ld d, a ld a, [wNorthConnectionStripWidth] - ld [hNorthSouthConnectionStripWidth], a + ldh [hNorthSouthConnectionStripWidth], a ld a, [wNorthConnectedMapWidth] - ld [hNorthSouthConnectedMapWidth], a + ldh [hNorthSouthConnectedMapWidth], a call LoadNorthSouthConnectionsTileMap .southConnection ld a, [wMapConn2Ptr] @@ -981,9 +981,9 @@ LoadTileBlockMap:: ld a, [wSouthConnectionStripDest + 1] ld d, a ld a, [wSouthConnectionStripWidth] - ld [hNorthSouthConnectionStripWidth], a + ldh [hNorthSouthConnectionStripWidth], a ld a, [wSouthConnectedMapWidth] - ld [hNorthSouthConnectedMapWidth], a + ldh [hNorthSouthConnectedMapWidth], a call LoadNorthSouthConnectionsTileMap .westConnection ld a, [wMapConn3Ptr] @@ -1001,7 +1001,7 @@ LoadTileBlockMap:: ld a, [wWestConnectionStripHeight] ld b, a ld a, [wWestConnectedMapWidth] - ld [hEastWestConnectedMapWidth], a + ldh [hEastWestConnectedMapWidth], a call LoadEastWestConnectionsTileMap .eastConnection ld a, [wMapConn4Ptr] @@ -1019,7 +1019,7 @@ LoadTileBlockMap:: ld a, [wEastConnectionStripHeight] ld b, a ld a, [wEastConnectedMapWidth] - ld [hEastWestConnectedMapWidth], a + ldh [hEastWestConnectedMapWidth], a call LoadEastWestConnectionsTileMap .done ret @@ -1029,7 +1029,7 @@ LoadNorthSouthConnectionsTileMap:: .loop push de push hl - ld a, [hNorthSouthConnectionStripWidth] + ldh a, [hNorthSouthConnectionStripWidth] ld b, a .innerLoop ld a, [hli] @@ -1039,7 +1039,7 @@ LoadNorthSouthConnectionsTileMap:: jr nz, .innerLoop pop hl pop de - ld a, [hNorthSouthConnectedMapWidth] + ldh a, [hNorthSouthConnectedMapWidth] add l ld l, a jr nc, .noCarry1 @@ -1068,7 +1068,7 @@ LoadEastWestConnectionsTileMap:: jr nz, .innerLoop pop de pop hl - ld a, [hEastWestConnectedMapWidth] + ldh a, [hEastWestConnectedMapWidth] add l ld l, a jr nc, .noCarry1 @@ -1090,7 +1090,7 @@ LoadEastWestConnectionsTileMap:: ; if not, [hSpriteIndexOrTextID] is set to 0 IsSpriteOrSignInFrontOfPlayer:: xor a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a ld a, [wNumSigns] and a jr z, .extendRangeOverCounter @@ -1120,7 +1120,7 @@ IsSpriteOrSignInFrontOfPlayer:: dec c add hl, bc ld a, [hl] - ld [hSpriteIndexOrTextID], a ; store sign text ID + ldh [hSpriteIndexOrTextID], a ; store sign text ID pop bc pop hl ret @@ -1146,7 +1146,7 @@ IsSpriteInFrontOfPlayer:: ld d, $10 ; talking range in pixels (normal range) IsSpriteInFrontOfPlayer2:: lb bc, $3c, $40 ; Y and X position of player sprite - ld a, [wSpriteStateData1 + 9] ; direction the player is facing + ld a, [wSpritePlayerStateData1FacingDirection] .checkIfPlayerFacingUp cp SPRITE_FACING_UP jr nz, .checkIfPlayerFacingDown @@ -1189,7 +1189,7 @@ IsSpriteInFrontOfPlayer2:: and a ret z ; if there are sprites - ld hl, wSpriteStateData1 + $10 + ld hl, wSprite01StateData1 ld d, a ld e, $01 .spriteLoop @@ -1223,10 +1223,10 @@ IsSpriteInFrontOfPlayer2:: ld a, l and $f0 inc a - ld l, a ; hl = $c1x1 + ld l, a ; hl = x#SPRITESTATEDATA1_MOVEMENTSTATUS set 7, [hl] ; set flag to make the sprite face the player ld a, e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a ret ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing) @@ -1241,13 +1241,13 @@ CollisionCheckOnLand:: jr nz, .noCollision ; no collisions when the player's movements are being controlled by the game ld a, [wPlayerDirection] ; the direction that the player is trying to go in ld d, a - ld a, [wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) + ld a, [wSpritePlayerStateData1CollisionData] and d ; check if a sprite is in the direction the player is trying to go jr nz, .collision xor a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call IsSpriteInFrontOfPlayer ; check for sprite collisions again? when does the above check fail to detect a sprite collision? - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] and a ; was there a sprite collision? jr nz, .collision ; if no sprite collision @@ -1257,8 +1257,10 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc, .noCollision .collision - ;ld a, [wChannelSoundIDs + Ch4] + ;ld a, [wChannelSoundIDs + Ch5] ;cp SFX_COLLISION ; check if collision sound is already playing + ;jr z, .setCarry + ; curSFX is not cleared for some reason. ; ch5 on? @@ -1305,7 +1307,7 @@ CheckForJumpingAndTilePairCollisions:: predef GetTileAndCoordsInFrontOfPlayer ; get the tile in front of the player push de push bc - callba HandleLedges ; check if the player is trying to jump a ledge + farcall HandleLedges ; check if the player is trying to jump a ledge pop bc pop de pop hl @@ -1316,7 +1318,7 @@ CheckForJumpingAndTilePairCollisions:: ; if not jumping CheckForTilePairCollisions2:: - aCoord 8, 9 ; tile the player is on + lda_coord 8, 9 ; tile the player is on ld [wTilePlayerStandingOn], a CheckForTilePairCollisions:: @@ -1364,37 +1366,14 @@ CheckForTilePairCollisions:: and a ret -; FORMAT: tileset number, tile 1, tile 2 -; terminated by 0xFF -; these entries indicate that the player may not cross between tile 1 and tile 2 -; it's mainly used to simulate differences in elevation - -TilePairCollisionsLand:: - db CAVERN, $20, $05 - db CAVERN, $41, $05 - db FOREST, $30, $2E - db CAVERN, $2A, $05 - db CAVERN, $05, $21 - db FOREST, $52, $2E - db FOREST, $55, $2E - db FOREST, $56, $2E - db FOREST, $20, $2E - db FOREST, $5E, $2E - db FOREST, $5F, $2E - db $FF - -TilePairCollisionsWater:: - db FOREST, $14, $2E - db FOREST, $48, $2E - db CAVERN, $14, $05 - db $FF +INCLUDE "data/tilesets/pair_collision_tile_ids.asm" ; this builds a tile map from the tile block map based on the current X/Y coordinates of the player's character LoadCurrentMapView:: - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, [wTilesetBank] ; tile data ROM bank - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ; switch to ROM bank that contains tile data ld a, [wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view ld e, a @@ -1443,21 +1422,21 @@ LoadCurrentMapView:: dec b jr nz, .rowLoop ld hl, wTileMapBackup - ld bc, $0000 + ld bc, $0 .adjustForYCoordWithinTileBlock ld a, [wYBlockCoord] and a jr z, .adjustForXCoordWithinTileBlock - ld bc, $0030 + ld bc, $30 add hl, bc .adjustForXCoordWithinTileBlock ld a, [wXBlockCoord] and a jr z, .copyToVisibleAreaBuffer - ld bc, $0002 + ld bc, $2 add hl, bc .copyToVisibleAreaBuffer - coord de, 0, 0 ; base address for the tiles that are directly transferred to VRAM during V-blank + decoord 0, 0 ; base address for the tiles that are directly transferred to VRAM during V-blank ld b, SCREEN_HEIGHT .rowLoop2 ld c, SCREEN_WIDTH @@ -1476,14 +1455,14 @@ LoadCurrentMapView:: dec b jr nz, .rowLoop2 pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ; restore previous ROM bank ret AdvancePlayerSprite:: - ld a, [wSpriteStateData1 + 3] ; delta Y + ld a, [wSpritePlayerStateData1YStepVector] ld b, a - ld a, [wSpriteStateData1 + 5] ; delta X + ld a, [wSpritePlayerStateData1XStepVector] ld c, a ld hl, wWalkCounter ; walking animation counter dec [hl] @@ -1615,7 +1594,7 @@ AdvancePlayerSprite:: call MoveTileBlockMapPointerNorth .updateMapView call LoadCurrentMapView - ld a, [wSpriteStateData1 + 3] ; delta Y + ld a, [wSpritePlayerStateData1YStepVector] cp $01 jr nz, .checkIfMovingNorth2 ; if moving south @@ -1628,7 +1607,7 @@ AdvancePlayerSprite:: call ScheduleNorthRowRedraw jr .scrollBackgroundAndSprites .checkIfMovingEast2 - ld a, [wSpriteStateData1 + 5] ; delta X + ld a, [wSpritePlayerStateData1XStepVector] cp $01 jr nz, .checkIfMovingWest2 ; if moving east @@ -1640,21 +1619,21 @@ AdvancePlayerSprite:: ; if moving west call ScheduleWestColumnRedraw .scrollBackgroundAndSprites - ld a, [wSpriteStateData1 + 3] ; delta Y + ld a, [wSpritePlayerStateData1YStepVector] ld b, a - ld a, [wSpriteStateData1 + 5] ; delta X + ld a, [wSpritePlayerStateData1XStepVector] ld c, a sla b sla c - ld a, [hSCY] + ldh a, [hSCY] add b - ld [hSCY], a ; update background scroll Y - ld a, [hSCX] + ldh [hSCY], a ; update background scroll Y + ldh a, [hSCX] add c - ld [hSCX], a ; update background scroll X + ldh [hSCX], a ; update background scroll X ; shift all the sprites in the direction opposite of the player's motion ; so that the player appears to move relative to them - ld hl, wSpriteStateData1 + $14 + ld hl, wSprite01StateData1YPixels ld a, [wNumSprites] ; number of sprites and a ; are there any sprites? jr z, .done @@ -1730,14 +1709,14 @@ MoveTileBlockMapPointerNorth:: ; the portion of the map that was newly exposed due to the player's movement ScheduleNorthRowRedraw:: - coord hl, 0, 0 + hlcoord 0, 0 call CopyToRedrawRowOrColumnSrcTiles ld a, [wMapViewVRAMPointer] - ld [hRedrawRowOrColumnDest], a + ldh [hRedrawRowOrColumnDest], a ld a, [wMapViewVRAMPointer + 1] - ld [hRedrawRowOrColumnDest + 1], a + ldh [hRedrawRowOrColumnDest + 1], a ld a, REDRAW_ROW - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a ret CopyToRedrawRowOrColumnSrcTiles:: @@ -1752,26 +1731,26 @@ CopyToRedrawRowOrColumnSrcTiles:: ret ScheduleSouthRowRedraw:: - coord hl, 0, 16 + hlcoord 0, 16 call CopyToRedrawRowOrColumnSrcTiles ld a, [wMapViewVRAMPointer] ld l, a ld a, [wMapViewVRAMPointer + 1] ld h, a - ld bc, $0200 + ld bc, $200 add hl, bc ld a, h and $03 or $98 - ld [hRedrawRowOrColumnDest + 1], a + ldh [hRedrawRowOrColumnDest + 1], a ld a, l - ld [hRedrawRowOrColumnDest], a + ldh [hRedrawRowOrColumnDest], a ld a, REDRAW_ROW - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a ret ScheduleEastColumnRedraw:: - coord hl, 18, 0 + hlcoord 18, 0 call ScheduleColumnRedrawHelper ld a, [wMapViewVRAMPointer] ld c, a @@ -1781,11 +1760,11 @@ ScheduleEastColumnRedraw:: add 18 and $1f or b - ld [hRedrawRowOrColumnDest], a + ldh [hRedrawRowOrColumnDest], a ld a, [wMapViewVRAMPointer + 1] - ld [hRedrawRowOrColumnDest + 1], a + ldh [hRedrawRowOrColumnDest + 1], a ld a, REDRAW_COL - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a ret ScheduleColumnRedrawHelper:: @@ -1809,14 +1788,14 @@ ScheduleColumnRedrawHelper:: ret ScheduleWestColumnRedraw:: - coord hl, 0, 0 + hlcoord 0, 0 call ScheduleColumnRedrawHelper ld a, [wMapViewVRAMPointer] - ld [hRedrawRowOrColumnDest], a + ldh [hRedrawRowOrColumnDest], a ld a, [wMapViewVRAMPointer + 1] - ld [hRedrawRowOrColumnDest + 1], a + ldh [hRedrawRowOrColumnDest + 1], a ld a, REDRAW_COL - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a ret ; function to write the tiles that make up a tile block to memory @@ -1854,7 +1833,7 @@ DrawTileBlock:: ld a, [de] ld [hl], a inc de - ld bc, $0015 + ld bc, $15 add hl, bc pop bc dec c @@ -1864,8 +1843,8 @@ DrawTileBlock:: ; function to update joypad state and simulate button presses JoypadOverworld:: xor a - ld [wSpriteStateData1 + 3], a - ld [wSpriteStateData1 + 5], a + ld [wSpritePlayerStateData1YStepVector], a + ld [wSpritePlayerStateData1XStepVector], a call RunMapScript call Joypad ld a, [wFlags_D733] @@ -1874,17 +1853,17 @@ JoypadOverworld:: ld a, [wCurMap] cp ROUTE_17 ; Cycling Road jr nz, .notForcedDownwards - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON jr nz, .notForcedDownwards ld a, D_DOWN - ld [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press + ldh [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press .notForcedDownwards ld a, [wd730] bit 7, a ret z ; if simulating button presses - ld a, [hJoyHeld] + ldh a, [hJoyHeld] ld b, a ld a, [wOverrideSimulatedJoypadStatesMask] ; bit mask for button presses that override simulated ones and b @@ -1901,11 +1880,11 @@ JoypadOverworld:: inc h .noCarry ld a, [hl] - ld [hJoyHeld], a ; store simulated button press in joypad state + ldh [hJoyHeld], a ; store simulated button press in joypad state and a ret nz - ld [hJoyPressed], a - ld [hJoyReleased], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a ret ; if done simulating button presses @@ -1915,7 +1894,7 @@ JoypadOverworld:: ld [wSimulatedJoypadStatesIndex], a ld [wSimulatedJoypadStatesEnd], a ld [wJoyIgnore], a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld hl, wd736 ld a, [hl] and $f8 @@ -1939,7 +1918,7 @@ CollisionCheckOnWater:: jp nz, .noCollision ; return and clear carry if button presses are being simulated ld a, [wPlayerDirection] ; the direction that the player is trying to go in ld d, a - ld a, [wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code) + ld a, [wSpritePlayerStateData1CollisionData] and d ; check if a sprite is in the direction the player is trying to go jr nz, .checkIfNextTileIsPassable ; bug? ld hl, TilePairCollisionsWater @@ -1967,8 +1946,10 @@ CollisionCheckOnWater:: jr z, .stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ;ld a, [wChannelSoundIDs + Ch4] + ;ld a, [wChannelSoundIDs + Ch5] ;cp SFX_COLLISION ; check if collision sound is already playing + ;jr z, .setCarry + ; curSFX is not cleared for some reason. ; ch5 on? @@ -2002,11 +1983,11 @@ RunMapScript:: push hl push de push bc - callba TryPushingBoulder + farcall TryPushingBoulder ld a, [wFlags_0xcd60] bit 1, a ; play boulder dust animation jr z, .afterBoulderEffect - callba DoBoulderDustAnimation + farcall DoBoulderDustAnimation .afterBoulderEffect pop bc pop de @@ -2035,7 +2016,7 @@ LoadSurfingPlayerSpriteGraphics:: jr LoadPlayerSpriteGraphicsCommon LoadBikePlayerSpriteGraphics:: - ld de, RedCyclingSprite + ld de, RedBikeSprite ld hl, vNPCSprites LoadPlayerSpriteGraphicsCommon:: @@ -2057,7 +2038,7 @@ LoadPlayerSpriteGraphicsCommon:: ; function to load data from the map header LoadMapHeader:: - callba MarkTownVisitedAndLoadMissableObjects + farcall MarkTownVisitedAndLoadMissableObjects ld a, [wCurMapTileset] ld [wUnusedD119], a ld a, [wCurMap] @@ -2066,7 +2047,7 @@ LoadMapHeader:: ld b, a res 7, a ld [wCurMapTileset], a - ld [hPreviousTileset], a + ldh [hPreviousTileset], a bit 7, b ret nz ld hl, MapHeaderPointers @@ -2159,9 +2140,9 @@ LoadMapHeader:: ld c, a ld de, wSignTextIDs ld a, d - ld [hSignCoordPointer], a + ldh [hSignCoordPointer], a ld a, e - ld [hSignCoordPointer + 1], a + ldh [hSignCoordPointer + 1], a ld de, wSignCoords .signLoop ld a, [hli] @@ -2171,17 +2152,17 @@ LoadMapHeader:: ld [de], a inc de push de - ld a, [hSignCoordPointer] + ldh a, [hSignCoordPointer] ld d, a - ld a, [hSignCoordPointer + 1] + ldh a, [hSignCoordPointer + 1] ld e, a ld a, [hli] ld [de], a inc de ld a, d - ld [hSignCoordPointer], a + ldh [hSignCoordPointer], a ld a, e - ld [hSignCoordPointer + 1], a + ldh [hSignCoordPointer + 1], a pop de dec c jr nz, .signLoop @@ -2192,9 +2173,9 @@ LoadMapHeader:: ld a, [hli] ld [wNumSprites], a ; save the number of sprites push hl -; zero C110-C1FF and C210-C2FF - ld hl, wSpriteStateData1 + $10 - ld de, wSpriteStateData2 + $10 +; zero out sprite state data for sprites 01-15 + ld hl, wSprite01StateData1 + ld de, wSprite01StateData2 xor a ld b, $f0 .zeroSpriteDataLoop @@ -2203,9 +2184,9 @@ LoadMapHeader:: inc e dec b jr nz, .zeroSpriteDataLoop -; initialize all C100-C1FF sprite entries to disabled (other than player's) - ld hl, wSpriteStateData1 + $12 - ld de, $0010 +; disable SPRITESTATEDATA1_IMAGEINDEX (set to $ff) for sprites 01-15 + ld hl, wSprite01StateData1ImageIndex + ld de, $10 ld c, $0f .disableSpriteEntriesLoop ld [hl], $ff @@ -2213,7 +2194,7 @@ LoadMapHeader:: dec c jr nz, .disableSpriteEntriesLoop pop hl - ld de, wSpriteStateData1 + $10 + ld de, wSprite01StateData1 ld a, [wNumSprites] ; number of sprites and a ; are there any sprites? jp z, .finishUp ; if there are no sprites, skip the rest @@ -2221,38 +2202,38 @@ LoadMapHeader:: ld c, $00 .loadSpriteLoop ld a, [hli] - ld [de], a ; store picture ID at C1X0 + ld [de], a ; x#SPRITESTATEDATA1_PICTUREID inc d ld a, $04 add e ld e, a ld a, [hli] - ld [de], a ; store Y position at C2X4 + ld [de], a ; x#SPRITESTATEDATA2_MAPY inc e ld a, [hli] - ld [de], a ; store X position at C2X5 + ld [de], a ; x#SPRITESTATEDATA2_MAPX inc e ld a, [hli] - ld [de], a ; store movement byte 1 at C2X6 + ld [de], a ; x#SPRITESTATEDATA2_MOVEMENTBYTE1 ld a, [hli] - ld [hLoadSpriteTemp1], a ; save movement byte 2 + ldh [hLoadSpriteTemp1], a ; save movement byte 2 ld a, [hli] - ld [hLoadSpriteTemp2], a ; save text ID and flags byte + ldh [hLoadSpriteTemp2], a ; save text ID and flags byte push bc push hl ld b, $00 ld hl, wMapSpriteData add hl, bc - ld a, [hLoadSpriteTemp1] + ldh a, [hLoadSpriteTemp1] ld [hli], a ; store movement byte 2 in byte 0 of sprite entry - ld a, [hLoadSpriteTemp2] + ldh a, [hLoadSpriteTemp2] ld [hl], a ; this appears pointless, since the value is overwritten immediately after - ld a, [hLoadSpriteTemp2] - ld [hLoadSpriteTemp1], a + ldh a, [hLoadSpriteTemp2] + ldh [hLoadSpriteTemp1], a and $3f ld [hl], a ; store text ID in byte 1 of sprite entry pop hl - ld a, [hLoadSpriteTemp1] + ldh a, [hLoadSpriteTemp1] bit 6, a jr nz, .trainerSprite bit 7, a @@ -2260,25 +2241,25 @@ LoadMapHeader:: jr .regularSprite .trainerSprite ld a, [hli] - ld [hLoadSpriteTemp1], a ; save trainer class + ldh [hLoadSpriteTemp1], a ; save trainer class ld a, [hli] - ld [hLoadSpriteTemp2], a ; save trainer number (within class) + ldh [hLoadSpriteTemp2], a ; save trainer number (within class) push hl ld hl, wMapSpriteExtraData add hl, bc - ld a, [hLoadSpriteTemp1] + ldh a, [hLoadSpriteTemp1] ld [hli], a ; store trainer class in byte 0 of the entry - ld a, [hLoadSpriteTemp2] + ldh a, [hLoadSpriteTemp2] ld [hl], a ; store trainer number in byte 1 of the entry pop hl jr .nextSprite .itemBallSprite ld a, [hli] - ld [hLoadSpriteTemp1], a ; save item number + ldh [hLoadSpriteTemp1], a ; save item number push hl ld hl, wMapSpriteExtraData add hl, bc - ld a, [hLoadSpriteTemp1] + ldh a, [hLoadSpriteTemp1] ld [hli], a ; store item number in byte 0 of the entry xor a ld [hl], a ; zero byte 1, since it is not used @@ -2305,7 +2286,7 @@ LoadMapHeader:: jp nz, .loadSpriteLoop .finishUp predef LoadTilesetHeader - callab LoadWildData + callfar LoadWildData pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) ld a, [wCurMapHeight] ; map height in 4x4 tile blocks add a ; double it @@ -2316,10 +2297,10 @@ LoadMapHeader:: ld a, [wCurMap] ld c, a ld b, $00 - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af ld a, BANK(MapSongBanks) - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld hl, MapSongBanks add hl, bc @@ -2329,7 +2310,7 @@ LoadMapHeader:: ld a, [hl] ld [wMapMusicROMBank], a ; music 2 pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret @@ -2347,38 +2328,38 @@ CopyMapConnectionHeader:: ; function to load map data LoadMapData:: - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af call DisableLCD ld a, $98 ld [wMapViewVRAMPointer + 1], a xor a ld [wMapViewVRAMPointer], a - ld [hSCY], a - ld [hSCX], a + ldh [hSCY], a + ldh [hSCX], a ld [wWalkCounter], a ld [wUnusedD119], a ld [wWalkBikeSurfStateCopy], a ld [wSpriteSetID], a call LoadTextBoxTilePatterns call LoadMapHeader - callba InitMapSprites ; load tile pattern data for sprites + farcall InitMapSprites ; load tile pattern data for sprites call LoadTileBlockMap call LoadTilesetTilePatternData call LoadCurrentMapView ; copy current map view to VRAM - coord hl, 0, 0 + hlcoord 0, 0 ld de, vBGMap0 - ld b, 18 + ld b, SCREEN_HEIGHT .vramCopyLoop - ld c, 20 + ld c, SCREEN_WIDTH .vramCopyInnerLoop ld a, [hli] ld [de], a inc e dec c jr nz, .vramCopyInnerLoop - ld a, 32 - 20 + ld a, BG_MAP_WIDTH - SCREEN_WIDTH add e ld e, a jr nc, .noCarry @@ -2402,7 +2383,7 @@ LoadMapData:: call PlayDefaultMusicFadeOutCurrent .restoreRomBank pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret @@ -2413,16 +2394,16 @@ SwitchToMapRomBank:: push bc ld c, a ld b, $00 - ld a, Bank(MapHeaderBanks) - call BankswitchHome ; switch to ROM bank 3 + ld a, BANK(MapHeaderBanks) + call BankswitchHome ld hl, MapHeaderBanks add hl, bc ld a, [hl] - ld [$ffe8], a ; save map ROM bank + ldh [hMapROMBank], a call BankswitchBack - ld a, [$ffe8] - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a ; switch to map ROM bank + ldh a, [hMapROMBank] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a pop bc pop hl ret @@ -2443,6 +2424,61 @@ ResetUsingStrengthOutOfBattleBit: ForceBikeOrSurf:: ld b, BANK(RedSprite) - ld hl, LoadPlayerSpriteGraphics + ld hl, LoadPlayerSpriteGraphics ; in bank 0 call Bankswitch jp PlayDefaultMusic ; update map/player state? + +CheckForUserInterruption:: +; Return carry if Up+Select+B, Start or A are pressed in c frames. +; Used only in the intro and title screen. + call DelayFrame + + push bc + call JoypadLowSensitivity + pop bc + + ldh a, [hJoyHeld] + cp D_UP + SELECT + B_BUTTON + jr z, .input + + ldh a, [hJoy5] +IF DEF(_DEBUG) + and START | SELECT | A_BUTTON +ELSE + and START | A_BUTTON +ENDC + jr nz, .input + + dec c + jr nz, CheckForUserInterruption + + and a + ret + +.input + scf + ret + +; function to load position data for destination warp when switching maps +; INPUT: +; a = ID of destination warp within destination map +LoadDestinationWarpPosition:: + ld b, a + ldh a, [hLoadedROMBank] + push af + ld a, [wPredefParentBank] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld a, b + add a + add a + ld c, a + ld b, 0 + add hl, bc + ld bc, 4 + ld de, wCurrentTileBlockMapViewPointer + call CopyData + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret diff --git a/home/overworld_text.asm b/home/overworld_text.asm new file mode 100644 index 00000000..7ea23fe4 --- /dev/null +++ b/home/overworld_text.asm @@ -0,0 +1,31 @@ +TextScriptEndingText:: + text_end + +TextScriptEnd:: + ld hl, TextScriptEndingText + ret + +ExclamationText:: + text_far _ExclamationText + text_end + +GroundRoseText:: + text_far _GroundRoseText + text_end + +BoulderText:: + text_far _BoulderText + text_end + +MartSignText:: + text_far _MartSignText + text_end + +PokeCenterSignText:: + text_far _PokeCenterSignText + text_end + +PickUpItemText:: + text_asm + predef PickUpItem + jp TextScriptEnd diff --git a/home/palettes.asm b/home/palettes.asm new file mode 100644 index 00000000..08dcdc85 --- /dev/null +++ b/home/palettes.asm @@ -0,0 +1,57 @@ +RestoreScreenTilesAndReloadTilePatterns:: + call ClearSprites + ld a, $1 + ld [wUpdateSpritesEnabled], a + call ReloadMapSpriteTilePatterns + call LoadScreenTilesFromBuffer2 + call LoadTextBoxTilePatterns + call RunDefaultPaletteCommand + jr Delay3 + +GBPalWhiteOutWithDelay3:: + call GBPalWhiteOut + +Delay3:: +; The bg map is updated each frame in thirds. +; Wait three frames to let the bg map fully update. + ld c, 3 + jp DelayFrames + +GBPalNormal:: +; Reset BGP and OBP0. + ld a, %11100100 ; 3210 + ldh [rBGP], a + ld a, %11010000 ; 3100 + ldh [rOBP0], a + ret + +GBPalWhiteOut:: +; White out all palettes. + xor a + ldh [rBGP], a + ldh [rOBP0], a + ldh [rOBP1], a + ret + +RunDefaultPaletteCommand:: + ld b, SET_PAL_DEFAULT +RunPaletteCommand:: + ld a, [wOnSGB] + and a + ret z + predef_jump _RunPaletteCommand + +GetHealthBarColor:: +; Return at hl the palette of +; an HP bar e pixels long. + ld a, e + cp 27 + ld d, 0 ; green + jr nc, .gotColor + cp 10 + inc d ; yellow + jr nc, .gotColor + inc d ; red +.gotColor + ld [hl], d + ret diff --git a/home/pathfinding.asm b/home/pathfinding.asm new file mode 100644 index 00000000..53f98847 --- /dev/null +++ b/home/pathfinding.asm @@ -0,0 +1,65 @@ +; calculates the difference |a-b|, setting carry flag if a mode 0 - call ReadNextInputBit ; 1 0 -> mode 1 - inc a ; 1 1 -> mode 2 -.unpackingMode0 - ld [wSpriteUnpackMode], a -.startDecompression - call ReadNextInputBit - and a - jr z, .readRLEncodedZeros ; if first bit is 0, the input starts with zeroes, otherwise with (non-zero) input -.readNextInput - call ReadNextInputBit - ld c, a - call ReadNextInputBit - sla c - or c ; read next two bits into c - and a - jr z, .readRLEncodedZeros ; 00 -> RLEncoded zeroes following - call WriteSpriteBitsToBuffer ; otherwise write input to output and repeat - call MoveToNextBufferPosition - jr .readNextInput -.readRLEncodedZeros - ld c, $0 ; number of zeroes it length encoded, the number -.countConsecutiveOnesLoop ; of consecutive ones determines the number of bits the number has - call ReadNextInputBit - and a - jr z, .countConsecutiveOnesFinished - inc c - jr .countConsecutiveOnesLoop -.countConsecutiveOnesFinished - ld a, c - add a - ld hl, LengthEncodingOffsetList - add l - ld l, a - jr nc, .noCarry - inc h -.noCarry - ld a, [hli] ; read offset that is added to the number later on - ld e, a ; adding an offset of 2^length - 1 makes every integer uniquely - ld d, [hl] ; representable in the length encoding and saves bits - push de - inc c - ld e, $0 - ld d, e -.readNumberOfZerosLoop ; reads the next c+1 bits of input - call ReadNextInputBit - or e - ld e, a - dec c - jr z, .readNumberOfZerosDone - sla e - rl d - jr .readNumberOfZerosLoop -.readNumberOfZerosDone - pop hl ; add the offset - add hl, de - ld e, l - ld d, h -.writeZerosLoop - ld b, e - xor a ; write 00 to buffer - call WriteSpriteBitsToBuffer - ld e, b - call MoveToNextBufferPosition - dec de - ld a, d - and a - jr nz, .continueLoop - ld a, e - and a -.continueLoop - jr nz, .writeZerosLoop - jr .readNextInput - -; moves output pointer to next position -; also cancels the calling function if the all output is done (by removing the return pointer from stack) -; and calls postprocessing functions according to the unpack mode -MoveToNextBufferPosition:: - ld a, [wSpriteHeight] - ld b, a - ld a, [wSpriteCurPosY] - inc a - cp b - jr z, .curColumnDone - ld [wSpriteCurPosY], a - ld a, [wSpriteOutputPtr] - inc a - ld [wSpriteOutputPtr], a - ret nz - ld a, [wSpriteOutputPtr+1] - inc a - ld [wSpriteOutputPtr+1], a - ret -.curColumnDone - xor a - ld [wSpriteCurPosY], a - ld a, [wSpriteOutputBitOffset] - and a - jr z, .bitOffsetsDone - dec a - ld [wSpriteOutputBitOffset], a - ld hl, wSpriteOutputPtrCached - ld a, [hli] - ld [wSpriteOutputPtr], a - ld a, [hl] - ld [wSpriteOutputPtr+1], a - ret -.bitOffsetsDone - ld a, $3 - ld [wSpriteOutputBitOffset], a - ld a, [wSpriteCurPosX] - add $8 - ld [wSpriteCurPosX], a - ld b, a - ld a, [wSpriteWidth] - cp b - jr z, .allColumnsDone - ld a, [wSpriteOutputPtr] - ld l, a - ld a, [wSpriteOutputPtr+1] - ld h, a - inc hl - jp StoreSpriteOutputPointer -.allColumnsDone - pop hl - xor a - ld [wSpriteCurPosX], a - ld a, [wSpriteLoadFlags] - bit 1, a - jr nz, .done ; test if there is one more sprite to go - xor $1 - set 1, a - ld [wSpriteLoadFlags], a - jp UncompressSpriteDataLoop -.done - jp UnpackSprite - -; writes 2 bits (from a) to the output buffer (pointed to from wSpriteOutputPtr) -WriteSpriteBitsToBuffer:: - ld e, a - ld a, [wSpriteOutputBitOffset] - and a - jr z, .offset0 - cp $2 - jr c, .offset1 - jr z, .offset2 - rrc e ; offset 3 - rrc e - jr .offset0 -.offset1 - sla e - sla e - jr .offset0 -.offset2 - swap e -.offset0 - ld a, [wSpriteOutputPtr] - ld l, a - ld a, [wSpriteOutputPtr+1] - ld h, a - ld a, [hl] - or e - ld [hl], a - ret - -; reads next bit from input stream and returns it in a -ReadNextInputBit:: - ld a, [wSpriteInputBitCounter] - dec a - jr nz, .curByteHasMoreBitsToRead - call ReadNextInputByte - ld [wSpriteInputCurByte], a - ld a, $8 -.curByteHasMoreBitsToRead - ld [wSpriteInputBitCounter], a - ld a, [wSpriteInputCurByte] - rlca - ld [wSpriteInputCurByte], a - and $1 - ret - -; reads next byte from input stream and returns it in a -ReadNextInputByte:: - ld a, [wSpriteInputPtr] - ld l, a - ld a, [wSpriteInputPtr+1] - ld h, a - ld a, [hli] - ld b, a - ld a, l - ld [wSpriteInputPtr], a - ld a, h - ld [wSpriteInputPtr+1], a - ld a, b - ret - -; the nth item is 2^n - 1 -LengthEncodingOffsetList:: - dw %0000000000000001 - dw %0000000000000011 - dw %0000000000000111 - dw %0000000000001111 - dw %0000000000011111 - dw %0000000000111111 - dw %0000000001111111 - dw %0000000011111111 - dw %0000000111111111 - dw %0000001111111111 - dw %0000011111111111 - dw %0000111111111111 - dw %0001111111111111 - dw %0011111111111111 - dw %0111111111111111 - dw %1111111111111111 - -; unpacks the sprite data depending on the unpack mode -UnpackSprite:: - ld a, [wSpriteUnpackMode] - cp $2 - jp z, UnpackSpriteMode2 - and a - jp nz, XorSpriteChunks - ld hl, sSpriteBuffer1 - call SpriteDifferentialDecode - ld hl, sSpriteBuffer2 - ; fall through - -; decodes differential encoded sprite data -; input bit value 0 preserves the current bit value and input bit value 1 toggles it (starting from initial value 0). -SpriteDifferentialDecode:: - xor a - ld [wSpriteCurPosX], a - ld [wSpriteCurPosY], a - call StoreSpriteOutputPointer - ld a, [wSpriteFlipped] - and a - jr z, .notFlipped - ld hl, DecodeNybble0TableFlipped - ld de, DecodeNybble1TableFlipped - jr .storeDecodeTablesPointers -.notFlipped - ld hl, DecodeNybble0Table - ld de, DecodeNybble1Table -.storeDecodeTablesPointers - ld a, l - ld [wSpriteDecodeTable0Ptr], a - ld a, h - ld [wSpriteDecodeTable0Ptr+1], a - ld a, e - ld [wSpriteDecodeTable1Ptr], a - ld a, d - ld [wSpriteDecodeTable1Ptr+1], a - ld e, $0 ; last decoded nybble, initialized to 0 -.decodeNextByteLoop - ld a, [wSpriteOutputPtr] - ld l, a - ld a, [wSpriteOutputPtr+1] - ld h, a - ld a, [hl] - ld b, a - swap a - and $f - call DifferentialDecodeNybble ; decode high nybble - swap a - ld d, a - ld a, b - and $f - call DifferentialDecodeNybble ; decode low nybble - or d - ld b, a - ld a, [wSpriteOutputPtr] - ld l, a - ld a, [wSpriteOutputPtr+1] - ld h, a - ld a, b - ld [hl], a ; write back decoded data - ld a, [wSpriteHeight] - add l ; move on to next column - jr nc, .noCarry - inc h -.noCarry - ld [wSpriteOutputPtr], a - ld a, h - ld [wSpriteOutputPtr+1], a - ld a, [wSpriteCurPosX] - add $8 - ld [wSpriteCurPosX], a - ld b, a - ld a, [wSpriteWidth] - cp b - jr nz, .decodeNextByteLoop ; test if current row is done - xor a - ld e, a - ld [wSpriteCurPosX], a - ld a, [wSpriteCurPosY] ; move on to next row - inc a - ld [wSpriteCurPosY], a - ld b, a - ld a, [wSpriteHeight] - cp b - jr z, .done ; test if all rows finished - ld a, [wSpriteOutputPtrCached] - ld l, a - ld a, [wSpriteOutputPtrCached+1] - ld h, a - inc hl - call StoreSpriteOutputPointer - jr .decodeNextByteLoop -.done - xor a - ld [wSpriteCurPosY], a - ret - -; decodes the nybble stored in a. Last decoded data is assumed to be in e (needed to determine if initial value is 0 or 1) -DifferentialDecodeNybble:: - srl a ; c=a%2, a/=2 - ld c, $0 - jr nc, .evenNumber - ld c, $1 -.evenNumber - ld l, a - ld a, [wSpriteFlipped] - and a - jr z, .notFlipped ; determine if initial value is 0 or one - bit 3, e ; if flipped, consider MSB of last data - jr .selectLookupTable -.notFlipped - bit 0, e ; else consider LSB -.selectLookupTable - ld e, l - jr nz, .initialValue1 ; load the appropriate table - ld a, [wSpriteDecodeTable0Ptr] - ld l, a - ld a, [wSpriteDecodeTable0Ptr+1] - jr .tableLookup -.initialValue1 - ld a, [wSpriteDecodeTable1Ptr] - ld l, a - ld a, [wSpriteDecodeTable1Ptr+1] -.tableLookup - ld h, a - ld a, e - add l - ld l, a - jr nc, .noCarry - inc h -.noCarry - ld a, [hl] - bit 0, c - jr nz, .selectLowNybble - swap a ; select high nybble -.selectLowNybble - and $f - ld e, a ; update last decoded data - ret - -DecodeNybble0Table:: - dn $0, $1 - dn $3, $2 - dn $7, $6 - dn $4, $5 - dn $f, $e - dn $c, $d - dn $8, $9 - dn $b, $a -DecodeNybble1Table:: - dn $f, $e - dn $c, $d - dn $8, $9 - dn $b, $a - dn $0, $1 - dn $3, $2 - dn $7, $6 - dn $4, $5 -DecodeNybble0TableFlipped:: - dn $0, $8 - dn $c, $4 - dn $e, $6 - dn $2, $a - dn $f, $7 - dn $3, $b - dn $1, $9 - dn $d, $5 -DecodeNybble1TableFlipped:: - dn $f, $7 - dn $3, $b - dn $1, $9 - dn $d, $5 - dn $0, $8 - dn $c, $4 - dn $e, $6 - dn $2, $a - -; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differeintial decoded beforehand. -XorSpriteChunks:: - xor a - ld [wSpriteCurPosX], a - ld [wSpriteCurPosY], a - call ResetSpriteBufferPointers - ld a, [wSpriteOutputPtr] ; points to buffer 1 or 2, depending on flags - ld l, a - ld a, [wSpriteOutputPtr+1] - ld h, a - call SpriteDifferentialDecode ; decode buffer 1 or 2, depending on flags - call ResetSpriteBufferPointers - ld a, [wSpriteOutputPtr] ; source buffer, points to buffer 1 or 2, depending on flags - ld l, a - ld a, [wSpriteOutputPtr+1] - ld h, a - ld a, [wSpriteOutputPtrCached] ; destination buffer, points to buffer 2 or 1, depending on flags - ld e, a - ld a, [wSpriteOutputPtrCached+1] - ld d, a -.xorChunksLoop - ld a, [wSpriteFlipped] - and a - jr z, .notFlipped - push de - ld a, [de] - ld b, a - swap a - and $f - call ReverseNybble ; if flipped reverse the nybbles in the destination buffer - swap a - ld c, a - ld a, b - and $f - call ReverseNybble - or c - pop de - ld [de], a -.notFlipped - ld a, [hli] - ld b, a - ld a, [de] - xor b - ld [de], a - inc de - ld a, [wSpriteCurPosY] - inc a - ld [wSpriteCurPosY], a ; go to next row - ld b, a - ld a, [wSpriteHeight] - cp b - jr nz, .xorChunksLoop ; test if column finished - xor a - ld [wSpriteCurPosY], a - ld a, [wSpriteCurPosX] - add $8 - ld [wSpriteCurPosX], a ; go to next column - ld b, a - ld a, [wSpriteWidth] - cp b - jr nz, .xorChunksLoop ; test if all columns finished - xor a - ld [wSpriteCurPosX], a - ret - -; reverses the bits in the nybble given in register a -ReverseNybble:: - ld de, NybbleReverseTable - add e - ld e, a - jr nc, .noCarry - inc d -.noCarry - ld a, [de] - ret - -; resets sprite buffer pointers to buffer 1 and 2, depending on wSpriteLoadFlags -ResetSpriteBufferPointers:: - ld a, [wSpriteLoadFlags] - bit 0, a - jr nz, .buffer2Selected - ld de, sSpriteBuffer1 - ld hl, sSpriteBuffer2 - jr .storeBufferPointers -.buffer2Selected - ld de, sSpriteBuffer2 - ld hl, sSpriteBuffer1 -.storeBufferPointers - ld a, l - ld [wSpriteOutputPtr], a - ld a, h - ld [wSpriteOutputPtr+1], a - ld a, e - ld [wSpriteOutputPtrCached], a - ld a, d - ld [wSpriteOutputPtrCached+1], a - ret - -; maps each nybble to its reverse -NybbleReverseTable:: - db $0, $8, $4, $c, $2, $a, $6 ,$e, $1, $9, $5, $d, $3, $b, $7 ,$f - -; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand. -UnpackSpriteMode2:: - call ResetSpriteBufferPointers - ld a, [wSpriteFlipped] - push af - xor a - ld [wSpriteFlipped], a ; temporarily clear flipped flag for decoding the destination chunk - ld a, [wSpriteOutputPtrCached] - ld l, a - ld a, [wSpriteOutputPtrCached+1] - ld h, a - call SpriteDifferentialDecode - call ResetSpriteBufferPointers - pop af - ld [wSpriteFlipped], a - jp XorSpriteChunks - -; stores hl into the output pointers -StoreSpriteOutputPointer:: - ld a, l - ld [wSpriteOutputPtr], a - ld [wSpriteOutputPtrCached], a - ld a, h - ld [wSpriteOutputPtr+1], a - ld [wSpriteOutputPtrCached+1], a - ret diff --git a/home/pics.asm b/home/pics.asm new file mode 100644 index 00000000..ef668620 --- /dev/null +++ b/home/pics.asm @@ -0,0 +1,196 @@ +; uncompresses the front or back sprite of the specified mon +; assumes the corresponding mon header is already loaded +; hl contains offset to sprite pointer ($b for front or $d for back) +UncompressMonSprite:: + ld bc, wMonHeader + add hl, bc + ld a, [hli] + ld [wSpriteInputPtr], a ; fetch sprite input pointer + ld a, [hl] + ld [wSpriteInputPtr+1], a +; define (by index number) the bank that a pokemon's image is in +; index = Mew, bank 1 +; index = Kabutops fossil, bank $B +; index < $1F, bank 9 +; $1F ≤ index < $4A, bank $A +; $4A ≤ index < $74, bank $B +; $74 ≤ index < $99, bank $C +; $99 ≤ index, bank $D + ld a, [wcf91] ; XXX name for this ram location + ld b, a + cp MEW + ld a, BANK(MewPicFront) + jr z, .GotBank + ld a, b + cp FOSSIL_KABUTOPS + ld a, BANK(FossilKabutopsPic) + jr z, .GotBank + ld a, b + cp TANGELA + 1 + ld a, BANK(TangelaPicFront) + jr c, .GotBank + ld a, b + cp MOLTRES + 1 + ld a, BANK(MoltresPicFront) + jr c, .GotBank + ld a, b + cp BEEDRILL + 2 + ld a, BANK(BeedrillPicFront) + jr c, .GotBank + ld a, b + cp STARMIE + 1 + ld a, BANK(StarmiePicFront) + jr c, .GotBank + ld a, BANK(VictreebelPicFront) +.GotBank + jp UncompressSpriteData + +; de: destination location +LoadMonFrontSprite:: + push de + ld hl, wMonHFrontSprite - wMonHeader + call UncompressMonSprite + ld hl, wMonHSpriteDim + ld a, [hli] + ld c, a + pop de + ; fall through + +; postprocesses uncompressed sprite chunks to a 2bpp sprite and loads it into video ram +; calculates alignment parameters to place both sprite chunks in the center of the 7*7 tile sprite buffers +; de: destination location +; a,c: sprite dimensions (in tiles of 8x8 each) +LoadUncompressedSpriteData:: + push de + and $f + ldh [hSpriteWidth], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width + ld b, a + ld a, $7 + sub b ; 7-w + inc a ; 8-w + srl a ; (8-w)/2 ; horizontal center (in tiles, rounded up) + ld b, a + add a + add a + add a + sub b ; 7*((8-w)/2) ; skip for horizontal center (in tiles) + ldh [hSpriteOffset], a + ld a, c + swap a + and $f + ld b, a + add a + add a + add a ; 8*tiles is height in bytes + ldh [hSpriteHeight], a + ld a, $7 + sub b ; 7-h ; skip for vertical center (in tiles, relative to current column) + ld b, a + ldh a, [hSpriteOffset] + add b ; 7*((8-w)/2) + 7-h ; combined overall offset (in tiles) + add a + add a + add a ; 8*(7*((8-w)/2) + 7-h) ; combined overall offset (in bytes) + ldh [hSpriteOffset], a + xor a + ld [MBC1SRamBank], a + ld hl, sSpriteBuffer0 + call ZeroSpriteBuffer ; zero buffer 0 + ld de, sSpriteBuffer1 + ld hl, sSpriteBuffer0 + call AlignSpriteDataCentered ; copy and align buffer 1 to 0 (containing the MSB of the 2bpp sprite) + ld hl, sSpriteBuffer1 + call ZeroSpriteBuffer ; zero buffer 1 + ld de, sSpriteBuffer2 + ld hl, sSpriteBuffer1 + call AlignSpriteDataCentered ; copy and align buffer 2 to 1 (containing the LSB of the 2bpp sprite) + pop de + jp InterlaceMergeSpriteBuffers + +; copies and aligns the sprite data properly inside the sprite buffer +; sprite buffers are 7*7 tiles in size, the loaded sprite is centered within this area +AlignSpriteDataCentered:: + ldh a, [hSpriteOffset] + ld b, $0 + ld c, a + add hl, bc + ldh a, [hSpriteWidth] +.columnLoop + push af + push hl + ldh a, [hSpriteHeight] + ld c, a +.columnInnerLoop + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .columnInnerLoop + pop hl + ld bc, 7*8 ; 7 tiles + add hl, bc ; advance one full column + pop af + dec a + jr nz, .columnLoop + ret + +; fills the sprite buffer (pointed to in hl) with zeros +ZeroSpriteBuffer:: + ld bc, SPRITEBUFFERSIZE +.nextByteLoop + xor a + ld [hli], a + dec bc + ld a, b + or c + jr nz, .nextByteLoop + ret + +; combines the (7*7 tiles, 1bpp) sprite chunks in buffer 0 and 1 into a 2bpp sprite located in buffer 1 through 2 +; in the resulting sprite, the rows of the two source sprites are interlaced +; de: output address +InterlaceMergeSpriteBuffers:: + xor a + ld [MBC1SRamBank], a + push de + ld hl, sSpriteBuffer2 + (SPRITEBUFFERSIZE - 1) ; destination: end of buffer 2 + ld de, sSpriteBuffer1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1 + ld bc, sSpriteBuffer0 + (SPRITEBUFFERSIZE - 1) ; source 1: end of buffer 0 + ld a, SPRITEBUFFERSIZE/2 ; $c4 + ldh [hSpriteInterlaceCounter], a +.interlaceLoop + ld a, [de] + dec de + ld [hld], a ; write byte of source 2 + ld a, [bc] + dec bc + ld [hld], a ; write byte of source 1 + ld a, [de] + dec de + ld [hld], a ; write byte of source 2 + ld a, [bc] + dec bc + ld [hld], a ; write byte of source 1 + ldh a, [hSpriteInterlaceCounter] + dec a + ldh [hSpriteInterlaceCounter], a + jr nz, .interlaceLoop + ld a, [wSpriteFlipped] + and a + jr z, .notFlipped + ld bc, 2*SPRITEBUFFERSIZE + ld hl, sSpriteBuffer1 +.swapLoop + swap [hl] ; if flipped swap nybbles in all bytes + inc hl + dec bc + ld a, b + or c + jr nz, .swapLoop +.notFlipped + pop hl + ld de, sSpriteBuffer1 + ld c, (2*SPRITEBUFFERSIZE)/16 ; $31, number of 16 byte chunks to be copied + ldh a, [hLoadedROMBank] + ld b, a + jp CopyVideoData diff --git a/home/pokemon.asm b/home/pokemon.asm new file mode 100644 index 00000000..1f3112df --- /dev/null +++ b/home/pokemon.asm @@ -0,0 +1,451 @@ +DrawHPBar:: +; Draw an HP bar d tiles long, and fill it to e pixels. +; If c is nonzero, show at least a sliver regardless. +; The right end of the bar changes with [wHPBarType]. + + push hl + push de + push bc + + ; Left + ld a, $71 ; "HP:" + ld [hli], a + ld a, $62 + ld [hli], a + + push hl + + ; Middle + ld a, $63 ; empty +.draw + ld [hli], a + dec d + jr nz, .draw + + ; Right + ld a, [wHPBarType] + dec a + ld a, $6d ; status screen and battle + jr z, .ok + dec a ; pokemon menu +.ok + ld [hl], a + + pop hl + + ld a, e + and a + jr nz, .fill + + ; If c is nonzero, draw a pixel anyway. + ld a, c + and a + jr z, .done + ld e, 1 + +.fill + ld a, e + sub 8 + jr c, .partial + ld e, a + ld a, $6b ; full + ld [hli], a + ld a, e + and a + jr z, .done + jr .fill + +.partial + ; Fill remaining pixels at the end if necessary. + ld a, $63 ; empty + add e + ld [hl], a +.done + pop bc + pop de + pop hl + ret + + +; loads pokemon data from one of multiple sources to wLoadedMon +; loads base stats to wMonHeader +; INPUT: +; [wWhichPokemon] = index of pokemon within party/box +; [wMonDataLocation] = source +; 00: player's party +; 01: enemy's party +; 02: current box +; 03: daycare +; OUTPUT: +; [wcf91] = pokemon ID +; wLoadedMon = base address of pokemon data +; wMonHeader = base address of base stats +LoadMonData:: + jpfar LoadMonData_ + +OverwritewMoves:: +; Write c to [wMoves + b]. Unused. + ld hl, wMoves + ld e, b + ld d, 0 + add hl, de + ld a, c + ld [hl], a + ret + +LoadFlippedFrontSpriteByMonIndex:: + ld a, 1 + ld [wSpriteFlipped], a + +LoadFrontSpriteByMonIndex:: + push hl + ld a, [wd11e] + push af + ld a, [wcf91] + ld [wd11e], a + predef IndexToPokedex + ld hl, wd11e + ld a, [hl] + pop bc + ld [hl], b + and a + pop hl + jr z, .invalidDexNumber ; dex #0 invalid + cp NUM_POKEMON + 1 + jr c, .validDexNumber ; dex >#151 invalid +.invalidDexNumber + ld a, RHYDON ; $1 + ld [wcf91], a + ret +.validDexNumber + push hl + ld de, vFrontPic + call LoadMonFrontSprite + pop hl + ldh a, [hLoadedROMBank] + push af + ld a, BANK(CopyUncompressedPicToHL) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + xor a + ldh [hStartTileID], a + call CopyUncompressedPicToHL + xor a + ld [wSpriteFlipped], a + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + + +; PlayCry + +GetCryData:: +; Load cry data for monster a. + dec a + ld c, a + ld b, 0 + ld hl, CryData + add hl, bc + add hl, bc + add hl, bc + + ld a, BANK(CryData) + call BankswitchHome + ld a, [hli] + ld b, a ; cry id + ld a, [hli] + ld [wFrequencyModifier], a + ld a, [hl] + ld [wTempoModifier], a + call BankswitchBack + + ; Cry headers have 3 channels, + ; and start from index CRY_SFX_START, + ; so add 3 times the cry id. + ld a, b + ld c, $14 ; CRY_SFX_START + rlca ; * 2 + add b + add c + ret + +DisplayPartyMenu:: + ldh a, [hTileAnimations] + push af + xor a + ldh [hTileAnimations], a + call GBPalWhiteOutWithDelay3 + call ClearSprites + call PartyMenuInit + call DrawPartyMenu + jp HandlePartyMenuInput + +GoBackToPartyMenu:: + ldh a, [hTileAnimations] + push af + xor a + ldh [hTileAnimations], a + call PartyMenuInit + call RedrawPartyMenu + jp HandlePartyMenuInput + +PartyMenuInit:: + ld a, 1 ; hardcoded bank + call BankswitchHome + call LoadHpBarAndStatusTilePatterns + ld hl, wd730 + set 6, [hl] ; turn off letter printing delay + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + ld [wMenuWatchMovingOutOfBounds], a + ld hl, wTopMenuItemY + inc a + ld [hli], a ; top menu item Y + xor a + ld [hli], a ; top menu item X + ld a, [wPartyAndBillsPCSavedMenuItem] + push af + ld [hli], a ; current menu item ID + inc hl + ld a, [wPartyCount] + and a ; are there more than 0 pokemon in the party? + jr z, .storeMaxMenuItemID + dec a +; if party is not empty, the max menu item ID is ([wPartyCount] - 1) +; otherwise, it is 0 +.storeMaxMenuItemID + ld [hli], a ; max menu item ID + ld a, [wForcePlayerToChooseMon] + and a + ld a, A_BUTTON | B_BUTTON + jr z, .next + xor a + ld [wForcePlayerToChooseMon], a + inc a ; a = A_BUTTON +.next + ld [hli], a ; menu watched keys + pop af + ld [hl], a ; old menu item ID + ret + +HandlePartyMenuInput:: + ld a, 1 + ld [wMenuWrappingEnabled], a + ld a, $40 + ld [wPartyMenuAnimMonEnabled], a + call HandleMenuInput_ + call PlaceUnfilledArrowMenuCursor + ld b, a + xor a + ld [wPartyMenuAnimMonEnabled], a + ld a, [wCurrentMenuItem] + ld [wPartyAndBillsPCSavedMenuItem], a + ld hl, wd730 + res 6, [hl] ; turn on letter printing delay + ld a, [wMenuItemToSwap] + and a + jp nz, .swappingPokemon + pop af + ldh [hTileAnimations], a + bit 1, b + jr nz, .noPokemonChosen + ld a, [wPartyCount] + and a + jr z, .noPokemonChosen + ld a, [wCurrentMenuItem] + ld [wWhichPokemon], a + ld hl, wPartySpecies + ld b, 0 + ld c, a + add hl, bc + ld a, [hl] + ld [wcf91], a + ld [wBattleMonSpecies2], a + call BankswitchBack + and a + ret +.noPokemonChosen + call BankswitchBack + scf + ret +.swappingPokemon + bit 1, b ; was the B button pressed? + jr z, .handleSwap ; if not, handle swapping the pokemon +.cancelSwap ; if the B button was pressed + farcall ErasePartyMenuCursors + xor a + ld [wMenuItemToSwap], a + ld [wPartyMenuTypeOrMessageID], a + call RedrawPartyMenu + jr HandlePartyMenuInput +.handleSwap + ld a, [wCurrentMenuItem] + ld [wWhichPokemon], a + farcall SwitchPartyMon + jr HandlePartyMenuInput + +DrawPartyMenu:: + ld hl, DrawPartyMenu_ + jr DrawPartyMenuCommon + +RedrawPartyMenu:: + ld hl, RedrawPartyMenu_ + +DrawPartyMenuCommon:: + ld b, BANK(RedrawPartyMenu_) + jp Bankswitch + +; prints a pokemon's status condition +; INPUT: +; de = address of status condition +; hl = destination address +PrintStatusCondition:: + push de + dec de + dec de ; de = address of current HP + ld a, [de] + ld b, a + dec de + ld a, [de] + or b ; is the pokemon's HP zero? + pop de + jr nz, PrintStatusConditionNotFainted +; if the pokemon's HP is 0, print "FNT" + ld a, "F" + ld [hli], a + ld a, "N" + ld [hli], a + ld [hl], "T" + and a + ret + +PrintStatusConditionNotFainted:: + homecall_sf PrintStatusAilment + ret + +; function to print pokemon level, leaving off the ":L" if the level is at least 100 +; INPUT: +; hl = destination address +; [wLoadedMonLevel] = level +PrintLevel:: + ld a, "" ; ":L" tile ID + ld [hli], a + ld c, 2 ; number of digits + ld a, [wLoadedMonLevel] ; level + cp 100 + jr c, PrintLevelCommon +; if level at least 100, write over the ":L" tile + dec hl + inc c ; increment number of digits to 3 + jr PrintLevelCommon + +; prints the level without leaving off ":L" regardless of level +; INPUT: +; hl = destination address +; [wLoadedMonLevel] = level +PrintLevelFull:: + ld a, "" ; ":L" tile ID + ld [hli], a + ld c, 3 ; number of digits + ld a, [wLoadedMonLevel] ; level + +PrintLevelCommon:: + ld [wd11e], a + ld de, wd11e + ld b, LEFT_ALIGN | 1 ; 1 byte + jp PrintNumber + +GetwMoves:: +; Unused. Returns the move at index a from wMoves in a + ld hl, wMoves + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + ret + +; copies the base stat data of a pokemon to wMonHeader +; INPUT: +; [wd0b5] = pokemon ID +GetMonHeader:: + ldh a, [hLoadedROMBank] + push af + ld a, BANK(BaseStats) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + push bc + push de + push hl + ld a, [wd11e] + push af + ld a, [wd0b5] + ld [wd11e], a + ld de, FossilKabutopsPic + ld b, $66 ; size of Kabutops fossil and Ghost sprites + cp FOSSIL_KABUTOPS ; Kabutops fossil + jr z, .specialID + ld de, GhostPic + cp MON_GHOST ; Ghost + jr z, .specialID + ld de, FossilAerodactylPic + ld b, $77 ; size of Aerodactyl fossil sprite + cp FOSSIL_AERODACTYL ; Aerodactyl fossil + jr z, .specialID + cp MEW + jr z, .mew + predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number + ld a, [wd11e] + dec a + ld bc, MonBaseStatsEnd - MonBaseStats + ld hl, BaseStats + call AddNTimes + ld de, wMonHeader + ld bc, MonBaseStatsEnd - MonBaseStats + call CopyData + jr .done +.specialID + ld hl, wMonHSpriteDim + ld [hl], b ; write sprite dimensions + inc hl + ld [hl], e ; write front sprite pointer + inc hl + ld [hl], d + jr .done +.mew + ld hl, MewBaseStats + ld de, wMonHeader + ld bc, MonBaseStatsEnd - MonBaseStats + ld a, BANK(MewBaseStats) + call FarCopyData +.done + ld a, [wd0b5] + ld [wMonHIndex], a + pop af + ld [wd11e], a + pop hl + pop de + pop bc + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +; copy party pokemon's name to wcd6d +GetPartyMonName2:: + ld a, [wWhichPokemon] ; index within party + ld hl, wPartyMonNicks + +; this is called more often +GetPartyMonName:: + push hl + push bc + call SkipFixedLengthTextEntries ; add NAME_LENGTH to hl, a times + ld de, wcd6d + push de + ld bc, NAME_LENGTH + call CopyData + pop de + pop bc + pop hl + ret diff --git a/home/predef.asm b/home/predef.asm index 9bb9be74..69aa7347 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -8,18 +8,18 @@ Predef:: ; A hack for LoadDestinationWarpPosition. ; See LoadTilesetHeader (predef $19). - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld [wPredefParentBank], a push af ld a, BANK(GetPredefPointer) - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call GetPredefPointer ld a, [wPredefBank] - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld de, .done @@ -28,7 +28,7 @@ Predef:: .done pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ret diff --git a/home/predef_text.asm b/home/predef_text.asm new file mode 100644 index 00000000..b494a2c8 --- /dev/null +++ b/home/predef_text.asm @@ -0,0 +1,28 @@ +PrintPredefTextID:: + ldh [hSpriteIndexOrTextID], a + ld hl, TextPredefs + call SetMapTextPointer + ld hl, wTextPredefFlag + set 0, [hl] + call DisplayTextID + +RestoreMapTextPointer:: + ld hl, wMapTextPtr + ldh a, [hSavedMapTextPtr] + ld [hli], a + ldh a, [hSavedMapTextPtr + 1] + ld [hl], a + ret + +SetMapTextPointer:: + ld a, [wMapTextPtr] + ldh [hSavedMapTextPtr], a + ld a, [wMapTextPtr + 1] + ldh [hSavedMapTextPtr + 1], a + ld a, l + ld [wMapTextPtr], a + ld a, h + ld [wMapTextPtr + 1], a + ret + +INCLUDE "data/text_predef_pointers.asm" diff --git a/home/print_bcd.asm b/home/print_bcd.asm new file mode 100644 index 00000000..38aedd3c --- /dev/null +++ b/home/print_bcd.asm @@ -0,0 +1,77 @@ +; function to print a BCD (Binary-coded decimal) number +; de = address of BCD number +; hl = destination address +; c = flags and length +; bit 7: if set, do not print leading zeroes +; if unset, print leading zeroes +; bit 6: if set, left-align the string (do not pad empty digits with spaces) +; if unset, right-align the string +; bit 5: if set, print currency symbol at the beginning of the string +; if unset, do not print the currency symbol +; bits 0-4: length of BCD number in bytes +; Note that bits 5 and 7 are modified during execution. The above reflects +; their meaning at the beginning of the functions's execution. +PrintBCDNumber:: + ld b, c ; save flags in b + res 7, c + res 6, c + res 5, c ; c now holds the length + bit 5, b + jr z, .loop + bit 7, b + jr nz, .loop + ld [hl], "¥" + inc hl +.loop + ld a, [de] + swap a + call PrintBCDDigit ; print upper digit + ld a, [de] + call PrintBCDDigit ; print lower digit + inc de + dec c + jr nz, .loop + bit 7, b ; were any non-zero digits printed? + jr z, .done ; if so, we are done +.numberEqualsZero ; if every digit of the BCD number is zero + bit 6, b ; left or right alignment? + jr nz, .skipRightAlignmentAdjustment + dec hl ; if the string is right-aligned, it needs to be moved back one space +.skipRightAlignmentAdjustment + bit 5, b + jr z, .skipCurrencySymbol + ld [hl], "¥" + inc hl +.skipCurrencySymbol + ld [hl], "0" + call PrintLetterDelay + inc hl +.done + ret + +PrintBCDDigit:: + and $f + and a + jr z, .zeroDigit +.nonzeroDigit + bit 7, b ; have any non-space characters been printed? + jr z, .outputDigit +; if bit 7 is set, then no numbers have been printed yet + bit 5, b ; print the currency symbol? + jr z, .skipCurrencySymbol + ld [hl], "¥" + inc hl + res 5, b +.skipCurrencySymbol + res 7, b ; unset 7 to indicate that a nonzero digit has been reached +.outputDigit + add "0" + ld [hli], a + jp PrintLetterDelay +.zeroDigit + bit 7, b ; either printing leading zeroes or already reached a nonzero digit? + jr z, .outputDigit ; if so, print a zero digit + bit 6, b ; left or right alignment? + ret nz + inc hl ; if right-aligned, "print" a space by advancing the pointer + ret diff --git a/home/print_num.asm b/home/print_num.asm new file mode 100644 index 00000000..e2628b1f --- /dev/null +++ b/home/print_num.asm @@ -0,0 +1,219 @@ +PrintNumber:: +; Print the c-digit, b-byte value at de. +; Allows 2 to 7 digits. For 1-digit numbers, add +; the value to char "0" instead of calling PrintNumber. +; Flags LEADING_ZEROES and LEFT_ALIGN can be given +; in bits 7 and 6 of b respectively. + push bc + xor a + ldh [hPastLeadingZeros], a + ldh [hNumToPrint], a + ldh [hNumToPrint + 1], a + ld a, b + and $f + cp 1 + jr z, .byte + cp 2 + jr z, .word +.long + ld a, [de] + ldh [hNumToPrint], a + inc de + ld a, [de] + ldh [hNumToPrint + 1], a + inc de + ld a, [de] + ldh [hNumToPrint + 2], a + jr .start + +.word + ld a, [de] + ldh [hNumToPrint + 1], a + inc de + ld a, [de] + ldh [hNumToPrint + 2], a + jr .start + +.byte + ld a, [de] + ldh [hNumToPrint + 2], a + +.start + push de + + ld d, b + ld a, c + ld b, a + xor a + ld c, a + ld a, b + + cp 2 + jr z, .tens + cp 3 + jr z, .hundreds + cp 4 + jr z, .thousands + cp 5 + jr z, .ten_thousands + cp 6 + jr z, .hundred_thousands + +print_digit: MACRO + +IF (\1) / $10000 + ld a, \1 / $10000 % $100 +ELSE + xor a +ENDC + ldh [hPowerOf10 + 0], a + +IF (\1) / $100 + ld a, \1 / $100 % $100 +ELSE + xor a +ENDC + ldh [hPowerOf10 + 1], a + + ld a, \1 / $1 % $100 + ldh [hPowerOf10 + 2], a + + call .PrintDigit + call .NextDigit +ENDM + +.millions print_digit 1000000 +.hundred_thousands print_digit 100000 +.ten_thousands print_digit 10000 +.thousands print_digit 1000 +.hundreds print_digit 100 + +.tens + ld c, 0 + ldh a, [hNumToPrint + 2] +.mod + cp 10 + jr c, .ok + sub 10 + inc c + jr .mod +.ok + + ld b, a + ldh a, [hPastLeadingZeros] + or c + ldh [hPastLeadingZeros], a + jr nz, .past + call .PrintLeadingZero + jr .next +.past + ld a, "0" + add c + ld [hl], a +.next + + call .NextDigit +.ones + ld a, "0" + add b + ld [hli], a + pop de + dec de + pop bc + ret + +.PrintDigit: +; Divide by the current decimal place. +; Print the quotient, and keep the modulus. + ld c, 0 +.loop + ldh a, [hPowerOf10] + ld b, a + ldh a, [hNumToPrint] + ldh [hSavedNumToPrint], a + cp b + jr c, .underflow0 + sub b + ldh [hNumToPrint], a + ldh a, [hPowerOf10 + 1] + ld b, a + ldh a, [hNumToPrint + 1] + ldh [hSavedNumToPrint + 1], a + cp b + jr nc, .noborrow1 + + ldh a, [hNumToPrint] + or 0 + jr z, .underflow1 + dec a + ldh [hNumToPrint], a + ldh a, [hNumToPrint + 1] +.noborrow1 + + sub b + ldh [hNumToPrint + 1], a + ldh a, [hPowerOf10 + 2] + ld b, a + ldh a, [hNumToPrint + 2] + ldh [hSavedNumToPrint + 2], a + cp b + jr nc, .noborrow2 + + ldh a, [hNumToPrint + 1] + and a + jr nz, .borrowed + + ldh a, [hNumToPrint] + and a + jr z, .underflow2 + dec a + ldh [hNumToPrint], a + xor a +.borrowed + + dec a + ldh [hNumToPrint + 1], a + ldh a, [hNumToPrint + 2] +.noborrow2 + sub b + ldh [hNumToPrint + 2], a + inc c + jr .loop + +.underflow2 + ldh a, [hSavedNumToPrint + 1] + ldh [hNumToPrint + 1], a +.underflow1 + ldh a, [hSavedNumToPrint] + ldh [hNumToPrint], a +.underflow0 + ldh a, [hPastLeadingZeros] + or c + jr z, .PrintLeadingZero + + ld a, "0" + add c + ld [hl], a + ldh [hPastLeadingZeros], a + ret + +.PrintLeadingZero: + bit BIT_LEADING_ZEROES, d + ret z + ld [hl], "0" + ret + +.NextDigit: +; Increment unless the number is left-aligned, +; leading zeroes are not printed, and no digits +; have been printed yet. + bit BIT_LEADING_ZEROES, d + jr nz, .inc + bit BIT_LEFT_ALIGN, d + jr z, .inc + ldh a, [hPastLeadingZeros] + and a + ret z +.inc + inc hl + ret diff --git a/home/print_text.asm b/home/print_text.asm new file mode 100644 index 00000000..049ddfb4 --- /dev/null +++ b/home/print_text.asm @@ -0,0 +1,45 @@ +; This function is used to wait a short period after printing a letter to the +; screen unless the player presses the A/B button or the delay is turned off +; through the [wd730] or [wLetterPrintingDelayFlags] flags. +PrintLetterDelay:: + ld a, [wd730] + bit 6, a + ret nz + ld a, [wLetterPrintingDelayFlags] + bit 1, a + ret z + push hl + push de + push bc + ld a, [wLetterPrintingDelayFlags] + bit 0, a + jr z, .waitOneFrame + ld a, [wOptions] + and $f + ldh [hFrameCounter], a + jr .checkButtons +.waitOneFrame + ld a, 1 + ldh [hFrameCounter], a +.checkButtons + call Joypad + ldh a, [hJoyHeld] +.checkAButton + bit 0, a ; is the A button pressed? + jr z, .checkBButton + jr .endWait +.checkBButton + bit 1, a ; is the B button pressed? + jr z, .buttonsNotPressed +.endWait + call DelayFrame + jr .done +.buttonsNotPressed ; if neither A nor B is pressed + ldh a, [hFrameCounter] + and a + jr nz, .checkButtons +.done + pop bc + pop de + pop hl + ret diff --git a/home/random.asm b/home/random.asm new file mode 100644 index 00000000..33a24425 --- /dev/null +++ b/home/random.asm @@ -0,0 +1,12 @@ +Random:: +; Return a random number in a. +; For battles, use BattleRandom. + push hl + push de + push bc + farcall Random_ + ldh a, [hRandomAdd] + pop bc + pop de + pop hl + ret diff --git a/home/reload_sprites.asm b/home/reload_sprites.asm new file mode 100644 index 00000000..8a08d64d --- /dev/null +++ b/home/reload_sprites.asm @@ -0,0 +1,19 @@ +; Copy the current map's sprites' tile patterns to VRAM again after they have +; been overwritten by other tile patterns. +ReloadMapSpriteTilePatterns:: + ld hl, wFontLoaded + ld a, [hl] + push af + res 0, [hl] + push hl + xor a + ld [wSpriteSetID], a + call DisableLCD + farcall InitMapSprites + call EnableLCD + pop hl + pop af + ld [hl], a + call LoadPlayerSpriteGraphics + call LoadFontTilePatterns + jp UpdateSprites diff --git a/home/reload_tiles.asm b/home/reload_tiles.asm new file mode 100644 index 00000000..6228395c --- /dev/null +++ b/home/reload_tiles.asm @@ -0,0 +1,41 @@ +; reloads text box tile patterns, current map view, and tileset tile patterns +ReloadMapData:: + ldh a, [hLoadedROMBank] + push af + ld a, [wCurMap] + call SwitchToMapRomBank + call DisableLCD + call LoadTextBoxTilePatterns + call LoadCurrentMapView + call LoadTilesetTilePatternData + call EnableLCD + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +; reloads tileset tile patterns +ReloadTilesetTilePatterns:: + ldh a, [hLoadedROMBank] + push af + ld a, [wCurMap] + call SwitchToMapRomBank + call DisableLCD + call LoadTilesetTilePatternData + call EnableLCD + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +; shows the town map and lets the player choose a destination to fly to +ChooseFlyDestination:: + ld hl, wd72e + res 4, [hl] + farjp LoadTownMap_Fly + +; causes the text box to close without waiting for a button press after displaying text +DisableWaitingAfterTextDisplay:: + ld a, $01 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret diff --git a/home/reset_player_sprite.asm b/home/reset_player_sprite.asm new file mode 100644 index 00000000..72df31a1 --- /dev/null +++ b/home/reset_player_sprite.asm @@ -0,0 +1,20 @@ +ResetPlayerSpriteData:: + ld hl, wSpriteStateData1 + call ResetPlayerSpriteData_ClearSpriteData + ld hl, wSpriteStateData2 + call ResetPlayerSpriteData_ClearSpriteData + ld a, $1 + ld [wSpritePlayerStateData1PictureID], a + ld [wSpritePlayerStateData2ImageBaseOffset], a + ld hl, wSpritePlayerStateData1YPixels + ld [hl], $3c ; set Y screen pos + inc hl + inc hl + ld [hl], $40 ; set X screen pos + ret + +; overwrites sprite data with zeroes +ResetPlayerSpriteData_ClearSpriteData:: + ld bc, $10 + xor a + jp FillMemory diff --git a/home/serial.asm b/home/serial.asm index 6c412239..bd984d4f 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -3,46 +3,46 @@ Serial:: push bc push de push hl - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] inc a jr z, .connectionNotYetEstablished - ld a, [rSB] - ld [hSerialReceiveData], a - ld a, [hSerialSendData] - ld [rSB], a - ld a, [hSerialConnectionStatus] + ldh a, [rSB] + ldh [hSerialReceiveData], a + ldh a, [hSerialSendData] + ldh [rSB], a + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr z, .done ; using external clock ld a, START_TRANSFER_EXTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a jr .done .connectionNotYetEstablished - ld a, [rSB] - ld [hSerialReceiveData], a - ld [hSerialConnectionStatus], a + ldh a, [rSB] + ldh [hSerialReceiveData], a + ldh [hSerialConnectionStatus], a cp USING_INTERNAL_CLOCK jr z, .usingInternalClock ; using external clock xor a - ld [rSB], a + ldh [rSB], a ld a, $3 - ld [rDIV], a + ldh [rDIV], a .waitLoop - ld a, [rDIV] + ldh a, [rDIV] bit 7, a jr nz, .waitLoop ld a, START_TRANSFER_EXTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a jr .done .usingInternalClock xor a - ld [rSB], a + ldh [rSB], a .done ld a, $1 - ld [hSerialReceivedNewData], a + ldh [hSerialReceivedNewData], a ld a, SERIAL_NO_DATA_BYTE - ld [hSerialSendData], a + ldh [hSerialSendData], a pop hl pop de pop bc @@ -54,10 +54,10 @@ Serial:: ; bc = length of data Serial_ExchangeBytes:: ld a, 1 - ld [hSerialIgnoringInitialData], a + ldh [hSerialIgnoringInitialData], a .loop ld a, [hl] - ld [hSerialSendData], a + ldh [hSerialSendData], a call Serial_ExchangeByte push bc ld b, a @@ -66,7 +66,7 @@ Serial_ExchangeBytes:: .waitLoop dec a jr nz, .waitLoop - ld a, [hSerialIgnoringInitialData] + ldh a, [hSerialIgnoringInitialData] and a ld a, b pop bc @@ -75,7 +75,7 @@ Serial_ExchangeBytes:: cp SERIAL_PREAMBLE_BYTE jr nz, .loop xor a - ld [hSerialIgnoringInitialData], a + ldh [hSerialIgnoringInitialData], a jr .loop .storeReceivedByte ld [de], a @@ -88,17 +88,17 @@ Serial_ExchangeBytes:: Serial_ExchangeByte:: xor a - ld [hSerialReceivedNewData], a - ld a, [hSerialConnectionStatus] + ldh [hSerialReceivedNewData], a + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr nz, .loop ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a .loop - ld a, [hSerialReceivedNewData] + ldh a, [hSerialReceivedNewData] and a jr nz, .ok - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK jr nz, .doNotIncrementUnknownCounter call IsUnknownCounterZero @@ -116,7 +116,7 @@ Serial_ExchangeByte:: jr nz, .loop jp SetUnknownCounterToFFFF .doNotIncrementUnknownCounter - ld a, [rIE] + ldh a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) cp (1 << SERIAL) jr nz, .loop @@ -128,7 +128,7 @@ Serial_ExchangeByte:: dec a ld [wUnknownSerialCounter2 + 1], a jr nz, .loop - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_EXTERNAL_CLOCK jr z, .ok ld a, 255 @@ -137,8 +137,8 @@ Serial_ExchangeByte:: jr nz, .waitLoop .ok xor a - ld [hSerialReceivedNewData], a - ld a, [rIE] + ldh [hSerialReceivedNewData], a + ldh a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) sub (1 << SERIAL) jr nz, .skipReloadingUnknownCounter2 @@ -146,7 +146,7 @@ Serial_ExchangeByte:: ld a, $50 ld [wUnknownSerialCounter2 + 1], a .skipReloadingUnknownCounter2 - ld a, [hSerialReceiveData] + ldh a, [hSerialReceiveData] cp SERIAL_NO_DATA_BYTE ret nz call IsUnknownCounterZero @@ -164,13 +164,13 @@ Serial_ExchangeByte:: call IsUnknownCounterZero jr z, SetUnknownCounterToFFFF .done - ld a, [rIE] + ldh a, [rIE] and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK) cp (1 << SERIAL) ld a, SERIAL_NO_DATA_BYTE ret z ld a, [hl] - ld [hSerialSendData], a + ldh [hSerialSendData], a call DelayFrame jp Serial_ExchangeByte @@ -203,18 +203,18 @@ Serial_ExchangeLinkMenuSelection:: ld de, wLinkMenuSelectionReceiveBuffer ld c, 2 ; number of bytes to save ld a, 1 - ld [hSerialIgnoringInitialData], a + ldh [hSerialIgnoringInitialData], a .loop call DelayFrame ld a, [hl] - ld [hSerialSendData], a + ldh [hSerialSendData], a call Serial_ExchangeByte ld b, a inc hl - ld a, [hSerialIgnoringInitialData] + ldh a, [hSerialIgnoringInitialData] and a ld a, 0 - ld [hSerialIgnoringInitialData], a + ldh [hSerialIgnoringInitialData], a jr nz, .loop ld a, b ld [de], a @@ -225,7 +225,7 @@ Serial_ExchangeLinkMenuSelection:: Serial_PrintWaitingTextAndSyncAndExchangeNybble:: call SaveScreenTilesToBuffer1 - callab PrintWaitingText + callfar PrintWaitingText call Serial_SyncAndExchangeNybble jp LoadScreenTilesFromBuffer1 @@ -273,20 +273,20 @@ Serial_ExchangeNybble:: call .doExchange ld a, [wSerialExchangeNybbleSendData] add $60 - ld [hSerialSendData], a - ld a, [hSerialConnectionStatus] + ldh [hSerialSendData], a + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK jr nz, .doExchange ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a .doExchange - ld a, [hSerialReceiveData] + ldh a, [hSerialReceiveData] ld [wSerialExchangeNybbleTempReceiveData], a and $f0 cp $60 ret nz xor a - ld [hSerialReceiveData], a + ldh [hSerialReceiveData], a ld a, [wSerialExchangeNybbleTempReceiveData] and $f ld [wSerialExchangeNybbleReceiveData], a @@ -294,19 +294,19 @@ Serial_ExchangeNybble:: Serial_SendZeroByte:: xor a - ld [hSerialSendData], a - ld a, [hSerialConnectionStatus] + ldh [hSerialSendData], a + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret nz ld a, START_TRANSFER_INTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a ret Serial_TryEstablishingExternallyClockedConnection:: ld a, ESTABLISH_CONNECTION_WITH_EXTERNAL_CLOCK - ld [rSB], a + ldh [rSB], a xor a - ld [hSerialReceiveData], a + ldh [hSerialReceiveData], a ld a, START_TRANSFER_EXTERNAL_CLOCK - ld [rSC], a + ldh [rSC], a ret diff --git a/home/start.asm b/home/start.asm new file mode 100644 index 00000000..764f9468 --- /dev/null +++ b/home/start.asm @@ -0,0 +1,10 @@ +_Start:: + cp GBC + jr z, .gbc + xor a + jr .ok +.gbc + ld a, FALSE +.ok + ld [wGBC], a + jp Init diff --git a/engine/menu/start_menu.asm b/home/start_menu.asm old mode 100755 new mode 100644 similarity index 93% rename from engine/menu/start_menu.asm rename to home/start_menu.asm index eb4b4f2d..5b29f67a --- a/engine/menu/start_menu.asm +++ b/home/start_menu.asm @@ -1,6 +1,6 @@ DisplayStartMenu:: ld a, BANK(StartMenu_Pokedex) - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a ld a, [wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy], a @@ -8,8 +8,8 @@ DisplayStartMenu:: call PlaySound RedisplayStartMenu:: - callba DrawStartMenu - callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone + farcall DrawStartMenu + farcall PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone call UpdateSprites .loop call HandleMenuInput @@ -78,7 +78,7 @@ RedisplayStartMenu:: ; EXIT falls through to here CloseStartMenu:: call Joypad - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit 0, a ; was A button newly pressed? jr nz, CloseStartMenu call LoadTextBoxTilePatterns diff --git a/home/text.asm b/home/text.asm index 9db81530..244c6fdb 100644 --- a/home/text.asm +++ b/home/text.asm @@ -5,9 +5,9 @@ TextBoxBorder:: push hl ld a, "┌" ld [hli], a - inc a ; ─ - call NPlaceChar - inc a ; ┐ + inc a ; "─" + call .PlaceChars + inc a ; "┐" ld [hl], a pop hl @@ -20,7 +20,7 @@ TextBoxBorder:: ld a, "│" ld [hli], a ld a, " " - call NPlaceChar + call .PlaceChars ld [hl], "│" pop hl @@ -33,11 +33,11 @@ TextBoxBorder:: ld a, "└" ld [hli], a ld a, "─" - call NPlaceChar + call .PlaceChars ld [hl], "┘" ret -NPlaceChar:: +.PlaceChars:: ; Place char a c times. ld d, c .loop @@ -48,21 +48,21 @@ NPlaceChar:: PlaceString:: push hl + PlaceNextChar:: ld a, [de] - cp "@" - jr nz, Char4ETest + jr nz, .NotTerminator ld b, h ld c, l pop hl ret -Char4ETest:: - cp $4E ; next - jr nz, .char4FTest +.NotTerminator + cp "" + jr nz, .NotNext ld bc, 2 * SCREEN_WIDTH - ld a, [hFlags_0xFFF6] + ldh a, [hUILayoutFlags] bit 2, a jr z, .ok ld bc, SCREEN_WIDTH @@ -70,142 +70,101 @@ Char4ETest:: pop hl add hl, bc push hl - jp PlaceNextChar_inc + jp NextChar -.char4FTest - cp $4F ; line - jr nz, .next3 +.NotNext + cp "" + jr nz, .NotLine pop hl - coord hl, 1, 16 + hlcoord 1, 16 push hl - jp PlaceNextChar_inc + jp NextChar -.next3 ; Check against a dictionary -dict: macro -if \1 == 0 - and a -else - cp \1 -endc - jp z, \2 -endm +.NotLine - dict $00, Char00 ; error - dict $4C, Char4C ; autocont - dict $4B, Char4B ; cont_ - dict $51, Char51 ; para - dict $49, Char49 ; page - dict $52, Char52 ; player - dict $53, Char53 ; rival - dict $54, Char54 ; POKé - dict $5B, Char5B ; PC - dict $5E, Char5E ; ROCKET - dict $5C, Char5C ; TM - dict $5D, Char5D ; TRAINER - dict $55, Char55 ; cont - dict $56, Char56 ; 6 dots - dict $57, Char57 ; done - dict $58, Char58 ; prompt - dict $4A, Char4A ; PKMN - dict $5F, Char5F ; dex - dict $59, Char59 ; TARGET - dict $5A, Char5A ; USER +; Check against a dictionary + dict "", NullChar + dict "", _ContTextNoPause + dict "<_CONT>", _ContText + dict "", Paragraph + dict "", PageChar + dict "", PrintPlayerName + dict "", PrintRivalName + dict "#", PlacePOKe + dict "", PCChar + dict "", RocketChar + dict "", TMChar + dict "", TrainerChar + dict "", ContText + dict "<……>", SixDotsChar + dict "", DoneText + dict "", PromptText + dict "", PlacePKMN + dict "", PlaceDexEnd + dict "", PlaceMoveTargetsName + dict "", PlaceMoveUsersName ld [hli], a call PrintLetterDelay -PlaceNextChar_inc:: + +NextChar:: inc de jp PlaceNextChar -Char00:: +NullChar:: ld b, h ld c, l pop hl - ld de, Char00Text + ld de, TextIDErrorText dec de ret -Char00Text:: ; “%d ERROR.” - TX_FAR _Char00Text - db "@" +TextIDErrorText:: ; "[hSpriteIndexOrTextID] ERROR." + text_far _TextIDErrorText + text_end -Char52:: ; player’s name +print_name: MACRO push de - ld de, wPlayerName - jr FinishDTE + ld de, \1 + jr PlaceCommandCharacter +ENDM -Char53:: ; rival’s name - push de - ld de, wRivalName - jr FinishDTE +PrintPlayerName:: print_name wPlayerName +PrintRivalName:: print_name wRivalName -Char5D:: ; TRAINER - push de - ld de, Char5DText - jr FinishDTE +TrainerChar:: print_name TrainerCharText +TMChar:: print_name TMCharText +PCChar:: print_name PCCharText +RocketChar:: print_name RocketCharText +PlacePOKe:: print_name PlacePOKeText +SixDotsChar:: print_name SixDotsCharText +PlacePKMN:: print_name PlacePKMNText -Char5C:: ; TM - push de - ld de, Char5CText - jr FinishDTE - -Char5B:: ; PC - push de - ld de, Char5BText - jr FinishDTE - -Char5E:: ; ROCKET - push de - ld de, Char5EText - jr FinishDTE - -Char54:: ; POKé - push de - ld de, Char54Text - jr FinishDTE - -Char56:: ; …… - push de - ld de, Char56Text - jr FinishDTE - -Char4A:: ; PKMN - push de - ld de, Char4AText - jr FinishDTE - -Char59:: -; depending on whose turn it is, print -; enemy active monster’s name, prefixed with “Enemy ” -; or -; player active monster’s name -; (like Char5A but flipped) - ld a, [H_WHOSETURN] +PlaceMoveTargetsName:: + ldh a, [hWhoseTurn] xor 1 - jr MonsterNameCharsCommon + jr PlaceMoveUsersName.place -Char5A:: -; depending on whose turn it is, print -; player active monster’s name -; or -; enemy active monster’s name, prefixed with “Enemy ” - ld a, [H_WHOSETURN] -MonsterNameCharsCommon:: +PlaceMoveUsersName:: + ldh a, [hWhoseTurn] + +.place: push de and a - jr nz, .Enemy - ld de, wBattleMonNick ; player active monster name - jr FinishDTE + jr nz, .enemy -.Enemy - ; print “Enemy ” - ld de, Char5AText + ld de, wBattleMonNick + jr PlaceCommandCharacter + +.enemy + ld de, EnemyText call PlaceString ld h, b ld l, c - ld de, wEnemyMonNick ; enemy active monster name + ld de, wEnemyMonNick + ; fallthrough -FinishDTE:: +PlaceCommandCharacter:: call PlaceString ld h, b ld l, c @@ -213,28 +172,20 @@ FinishDTE:: inc de jp PlaceNextChar -Char5CText:: - db "TM@" -Char5DText:: - db "TRAINER@" -Char5BText:: - db "PC@" -Char5EText:: - db "ROCKET@" -Char54Text:: - db "POKé@" -Char56Text:: - db "……@" -Char5AText:: - db "Enemy @" -Char4AText:: - db $E1,$E2,"@" ; PKMN +TMCharText:: db "TM@" +TrainerCharText:: db "TRAINER@" +PCCharText:: db "PC@" +RocketCharText:: db "ROCKET@" +PlacePOKeText:: db "POKé@" +SixDotsCharText:: db "……@" +EnemyText:: db "Enemy @" +PlacePKMNText:: db "@" -Char55:: +ContText:: push de ld b, h ld c, l - ld hl, Char55Text + ld hl, ContCharText call TextCommandProcessor ld h, b ld l, c @@ -242,94 +193,92 @@ Char55:: inc de jp PlaceNextChar -Char55Text:: -; equivalent to Char4B - TX_FAR _Char55Text - db "@" +ContCharText:: + text_far _ContCharText + text_end -Char5F:: -; ends a Pokédex entry +PlaceDexEnd:: ld [hl], "." pop hl ret -Char58:: ; prompt +PromptText:: ld a, [wLinkState] cp LINK_STATE_BATTLING jp z, .ok ld a, "▼" - Coorda 18, 16 + ldcoord_a 18, 16 .ok call ProtectedDelay3 call ManualTextScroll ld a, " " - Coorda 18, 16 -Char57:: ; done + ldcoord_a 18, 16 + +DoneText:: pop hl - ld de, Char58Text + ld de, .stop dec de ret -Char58Text:: - db "@" +.stop: + text_end -Char51:: ; para +Paragraph:: push de ld a, "▼" - Coorda 18, 16 + ldcoord_a 18, 16 call ProtectedDelay3 call ManualTextScroll - coord hl, 1, 13 + hlcoord 1, 13 lb bc, 4, 18 call ClearScreenArea ld c, 20 call DelayFrames pop de - coord hl, 1, 14 - jp PlaceNextChar_inc + hlcoord 1, 14 + jp NextChar -Char49:: +PageChar:: push de ld a, "▼" - Coorda 18, 16 + ldcoord_a 18, 16 call ProtectedDelay3 call ManualTextScroll - coord hl, 1, 10 + hlcoord 1, 10 lb bc, 7, 18 call ClearScreenArea ld c, 20 call DelayFrames pop de pop hl - coord hl, 1, 11 + hlcoord 1, 11 push hl - jp PlaceNextChar_inc + jp NextChar -Char4B:: +_ContText:: ld a, "▼" - Coorda 18, 16 + ldcoord_a 18, 16 call ProtectedDelay3 push de call ManualTextScroll pop de ld a, " " - Coorda 18, 16 - ;fall through -Char4C:: + ldcoord_a 18, 16 +_ContTextNoPause:: push de call ScrollTextUpOneLine call ScrollTextUpOneLine - coord hl, 1, 16 + hlcoord 1, 16 pop de - jp PlaceNextChar_inc + jp NextChar ; move both rows of text in the normal text box up one row ; always called twice in a row ; first time, copy the two rows of text to the "in between" rows that are usually emtpy ; second time, copy the bottom row of text into the top row of text ScrollTextUpOneLine:: - coord hl, 0, 14 ; top row of text - coord de, 0, 13 ; empty line above text + hlcoord 0, 14 ; top row of text + decoord 0, 13 ; empty line above text ld b, SCREEN_WIDTH * 3 .copyText ld a, [hli] @@ -337,7 +286,7 @@ ScrollTextUpOneLine:: inc de dec b jr nz, .copyText - coord hl, 1, 16 + hlcoord 1, 16 ld a, " " ld b, SCREEN_WIDTH - 2 .clearText @@ -345,7 +294,6 @@ ScrollTextUpOneLine:: dec b jr nz, .clearText - ; wait five frames ld b, 5 .WaitFrame call DelayFrame @@ -365,7 +313,7 @@ TextCommandProcessor:: push af set 1, a ld e, a - ld a, [$fff4] + ldh a, [hClearLetterPrintingDelayFlags] xor e ld [wLetterPrintingDelayFlags], a ld a, c @@ -375,18 +323,18 @@ TextCommandProcessor:: NextTextCommand:: ld a, [hli] - cp "@" ; terminator - jr nz, .doTextCommand + cp TX_END + jr nz, .TextCommand pop af ld [wLetterPrintingDelayFlags], a ret -.doTextCommand + +.TextCommand: push hl - cp $17 - jp z, TextCommand17 - cp $0e - jp nc, TextCommand0B ; if a != 0x17 and a >= 0xE, go to command 0xB -; if a < 0xE, use a jump table + cp TX_FAR + jp z, TextCommand_FAR + cp TX_SOUND_POKEDEX_RATING + jp nc, TextCommand_SOUND ld hl, TextCommandJumpTable push bc add a @@ -399,12 +347,8 @@ NextTextCommand:: ld l, a jp hl -; draw box -; 04AAAABBCC -; AAAA = address of upper left corner -; BB = height -; CC = width -TextCommand04:: +TextCommand_BOX:: +; draw a box (height, width) pop hl ld a, [hli] ld e, a @@ -421,9 +365,8 @@ TextCommand04:: pop hl jr NextTextCommand -; place string inline -; 00{string} -TextCommand00:: +TextCommand_START:: +; write text until "@" pop hl ld d, h ld e, l @@ -435,10 +378,8 @@ TextCommand00:: inc hl jr NextTextCommand -; place string from RAM -; 01AAAA -; AAAA = address of string -TextCommand01:: +TextCommand_RAM:: +; write text from a ram address (little endian) pop hl ld a, [hli] ld e, a @@ -451,13 +392,8 @@ TextCommand01:: pop hl jr NextTextCommand -; print BCD number -; 02AAAABB -; AAAA = address of BCD number -; BB -; bits 0-4 = length in bytes -; bits 5-7 = unknown flags -TextCommand02:: +TextCommand_BCD:: +; write bcd from address, typically ram pop hl ld a, [hli] ld e, a @@ -474,10 +410,8 @@ TextCommand02:: pop hl jr NextTextCommand -; repoint destination address -; 03AAAA -; AAAA = new destination address -TextCommand03:: +TextCommand_MOVE:: +; move to a new tile pop hl ld a, [hli] ld [wTextDest], a @@ -487,58 +421,47 @@ TextCommand03:: ld b, a jp NextTextCommand -; repoint destination to second line of dialogue text box -; 05 -; (no arguments) -TextCommand05:: +TextCommand_LOW:: +; write text at (1,16) pop hl - coord bc, 1, 16 ; address of second line of dialogue text box + bccoord 1, 16 ; second line of dialogue text box jp NextTextCommand -; blink arrow and wait for A or B to be pressed -; 06 -; (no arguments) -TextCommand06:: +TextCommand_PROMPT_BUTTON:: +; wait for button press; show arrow ld a, [wLinkState] cp LINK_STATE_BATTLING - jp z, TextCommand0D + jp z, TextCommand_WAIT_BUTTON ld a, "▼" - Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box + ldcoord_a 18, 16 ; place down arrow in lower right corner of dialogue text box push bc call ManualTextScroll ; blink arrow and wait for A or B to be pressed pop bc ld a, " " - Coorda 18, 16 ; overwrite down arrow with blank space + ldcoord_a 18, 16 ; overwrite down arrow with blank space pop hl jp NextTextCommand -; scroll text up one line -; 07 -; (no arguments) -TextCommand07:: +TextCommand_SCROLL:: +; pushes text up two lines and sets the BC cursor to the border tile +; below the first character column of the text box. ld a, " " - Coorda 18, 16 ; place blank space in lower right corner of dialogue text box + ldcoord_a 18, 16 ; place blank space in lower right corner of dialogue text box call ScrollTextUpOneLine call ScrollTextUpOneLine pop hl - coord bc, 1, 16 ; address of second line of dialogue text box + bccoord 1, 16 ; second line of dialogue text box jp NextTextCommand -; execute asm inline -; 08{code} -TextCommand08:: +TextCommand_START_ASM:: +; run assembly code pop hl ld de, NextTextCommand - push de ; return address + push de jp hl -; print decimal number (converted from binary number) -; 09AAAABB -; AAAA = address of number -; BB -; bits 0-3 = how many digits to display -; bits 4-7 = how long the number is in bytes -TextCommand09:: +TextCommand_NUM:: +; print a number pop hl ld a, [hli] ld e, a @@ -554,7 +477,7 @@ TextCommand09:: ld a, b and $f0 swap a - set BIT_LEFT_ALIGN,a + set BIT_LEFT_ALIGN, a ld b, a call PrintNumber ld b, h @@ -562,45 +485,42 @@ TextCommand09:: pop hl jp NextTextCommand -; wait half a second if the user doesn't hold A or B -; 0A -; (no arguments) -TextCommand0A:: +TextCommand_PAUSE:: +; wait for button press or 30 frames push bc call Joypad - ld a, [hJoyHeld] + ldh a, [hJoyHeld] and A_BUTTON | B_BUTTON - jr nz, .skipDelay - ld c, 30 + jr nz, .done + ld c, 30 ; half a second call DelayFrames -.skipDelay +.done pop bc pop hl jp NextTextCommand -; plays sounds -; this actually handles various command ID's, not just 0B -; (no arguments) -TextCommand0B:: +TextCommand_SOUND:: +; play a sound effect from TextCommandSounds pop hl push bc dec hl ld a, [hli] - ld b, a ; b = command number that got us here + ld b, a ; b = text command number that got us here push hl ld hl, TextCommandSounds .loop ld a, [hli] cp b - jr z, .matchFound + jr z, .play inc hl jr .loop -.matchFound - cp $14 + +.play + cp TX_SOUND_CRY_NIDORINA jr z, .pokemonCry - cp $15 + cp TX_SOUND_CRY_PIDGEOT jr z, .pokemonCry - cp $16 + cp TX_SOUND_CRY_DEWGONG jr z, .pokemonCry ld a, [hl] call PlaySound @@ -608,6 +528,7 @@ TextCommand0B:: pop hl pop bc jp NextTextCommand + .pokemonCry push de ld a, [hl] @@ -617,95 +538,99 @@ TextCommand0B:: pop bc jp NextTextCommand -; format: text command ID, sound ID or cry ID TextCommandSounds:: - db $0B, SFX_GET_ITEM_1 ; actually plays SFX_LEVEL_UP when the battle music engine is loaded - db $12, SFX_CAUGHT_MON - db $0E, SFX_POKEDEX_RATING ; unused? - db $0F, SFX_GET_ITEM_1 ; unused? - db $10, SFX_GET_ITEM_2 - db $11, SFX_GET_KEY_ITEM - db $13, SFX_DEX_PAGE_ADDED - db $14, NIDORINA ; used in OakSpeech - db $15, PIDGEOT ; used in SaffronCityText12 - db $16, DEWGONG ; unused? + db TX_SOUND_GET_ITEM_1, SFX_GET_ITEM_1 ; actually plays SFX_LEVEL_UP when the battle music engine is loaded + db TX_SOUND_CAUGHT_MON, SFX_CAUGHT_MON + db TX_SOUND_POKEDEX_RATING, SFX_POKEDEX_RATING ; unused + db TX_SOUND_GET_ITEM_1_DUPLICATE, SFX_GET_ITEM_1 ; unused + db TX_SOUND_GET_ITEM_2, SFX_GET_ITEM_2 + db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM + db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED + db TX_SOUND_CRY_NIDORINA, NIDORINA ; used in OakSpeech + db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 + db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused -; draw ellipses -; 0CAA -; AA = number of ellipses to draw -TextCommand0C:: +TextCommand_DOTS:: +; wait for button press or 30 frames while printing "…"s pop hl ld a, [hli] ld d, a push hl ld h, b ld l, c + .loop ld a, "…" ld [hli], a push de call Joypad pop de - ld a, [hJoyHeld] ; joypad state + ldh a, [hJoyHeld] ; joypad state and A_BUTTON | B_BUTTON - jr nz, .skipDelay ; if so, skip the delay + jr nz, .next ; if so, skip the delay ld c, 10 call DelayFrames -.skipDelay +.next dec d jr nz, .loop + ld b, h ld c, l pop hl jp NextTextCommand -; wait for A or B to be pressed -; 0D -; (no arguments) -TextCommand0D:: +TextCommand_WAIT_BUTTON:: +; wait for button press; don't show arrow push bc - call ManualTextScroll ; wait for A or B to be pressed + call ManualTextScroll pop bc pop hl jp NextTextCommand -; process text commands in another ROM bank -; 17AAAABB -; AAAA = address of text commands -; BB = bank -TextCommand17:: +TextCommand_FAR:: +; write text from a different bank (little endian) pop hl - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] push af + ld a, [hli] ld e, a ld a, [hli] ld d, a ld a, [hli] - ld [H_LOADEDROMBANK], a + + ldh [hLoadedROMBank], a ld [MBC1RomBank], a + push hl ld l, e ld h, d call TextCommandProcessor pop hl + pop af - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a jp NextTextCommand TextCommandJumpTable:: - dw TextCommand00 - dw TextCommand01 - dw TextCommand02 - dw TextCommand03 - dw TextCommand04 - dw TextCommand05 - dw TextCommand06 - dw TextCommand07 - dw TextCommand08 - dw TextCommand09 - dw TextCommand0A - dw TextCommand0B - dw TextCommand0C - dw TextCommand0D +; entries correspond to TX_* constants (see macros/scripts/text.asm) + dw TextCommand_START ; TX_START + dw TextCommand_RAM ; TX_RAM + dw TextCommand_BCD ; TX_BCD + dw TextCommand_MOVE ; TX_MOVE + dw TextCommand_BOX ; TX_BOX + dw TextCommand_LOW ; TX_LOW + dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON +IF DEF(_DEBUG) + dw _ContTextNoPause ; TX_SCROLL +ELSE + dw TextCommand_SCROLL ; TX_SCROLL +ENDC + dw TextCommand_START_ASM ; TX_START_ASM + dw TextCommand_NUM ; TX_NUM + dw TextCommand_PAUSE ; TX_PAUSE + dw TextCommand_SOUND ; TX_SOUND_GET_ITEM_1 (also handles other TX_SOUND_* commands) + dw TextCommand_DOTS ; TX_DOTS + dw TextCommand_WAIT_BUTTON ; TX_WAIT_BUTTON + ; greater TX_* constants are handled directly by NextTextCommand diff --git a/home/text_script.asm b/home/text_script.asm new file mode 100644 index 00000000..a6881dc5 --- /dev/null +++ b/home/text_script.asm @@ -0,0 +1,215 @@ +; this function is used to display sign messages, sprite dialog, etc. +; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID +DisplayTextID:: + ldh a, [hLoadedROMBank] + push af + farcall DisplayTextIDInit ; initialization + ld hl, wTextPredefFlag + bit 0, [hl] + res 0, [hl] + jr nz, .skipSwitchToMapBank + ld a, [wCurMap] + call SwitchToMapRomBank +.skipSwitchToMapBank + ld a, 30 ; half a second + ldh [hFrameCounter], a ; used as joypad poll timer + ld hl, wMapTextPtr + ld a, [hli] + ld h, [hl] + ld l, a ; hl = map text pointer + ld d, $00 + ldh a, [hSpriteIndexOrTextID] ; text ID + ld [wSpriteIndex], a + + dict TEXT_START_MENU, DisplayStartMenu + dict TEXT_SAFARI_GAME_OVER, DisplaySafariGameOverText + dict TEXT_MON_FAINTED, DisplayPokemonFaintedText + dict TEXT_BLACKED_OUT, DisplayPlayerBlackedOutText + dict TEXT_REPEL_WORE_OFF, DisplayRepelWoreOffText + + ld a, [wNumSprites] + ld e, a + ldh a, [hSpriteIndexOrTextID] ; sprite ID + cp e + jr z, .spriteHandling + jr nc, .skipSpriteHandling +.spriteHandling +; get the text ID of the sprite + push hl + push de + push bc + farcall UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction) + pop bc + pop de + ld hl, wMapSpriteData ; NPC text entries + ldh a, [hSpriteIndexOrTextID] + dec a + add a + add l + ld l, a + jr nc, .noCarry + inc h +.noCarry + inc hl + ld a, [hl] ; a = text ID of the sprite + pop hl +.skipSpriteHandling +; look up the address of the text in the map's text entries + dec a + ld e, a + sla e + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a ; hl = address of the text + ld a, [hl] ; a = first byte of text + +; check first byte of text for special cases + +dict2: MACRO + cp \1 + jr nz, .not\@ + \2 + jr AfterDisplayingTextID +.not\@ +ENDM + + dict TX_SCRIPT_MART, DisplayPokemartDialogue + dict TX_SCRIPT_POKECENTER_NURSE, DisplayPokemonCenterDialogue + dict TX_SCRIPT_PLAYERS_PC, TextScript_ItemStoragePC + dict TX_SCRIPT_BILLS_PC, TextScript_BillsPC + dict TX_SCRIPT_POKECENTER_PC, TextScript_PokemonCenterPC + dict2 TX_SCRIPT_VENDING_MACHINE, farcall VendingMachineMenu + dict TX_SCRIPT_PRIZE_VENDOR, TextScript_GameCornerPrizeMenu + dict2 TX_SCRIPT_CABLE_CLUB_RECEPTIONIST, callfar CableClubNPC + + call PrintText_NoCreatingTextBox ; display the text + ld a, [wDoNotWaitForButtonPressAfterDisplayingText] + and a + jr nz, HoldTextDisplayOpen + +AfterDisplayingTextID:: + ld a, [wEnteringCableClub] + and a + jr nz, HoldTextDisplayOpen + call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text + +; loop to hold the dialogue box open as long as the player keeps holding down the A button +HoldTextDisplayOpen:: + call Joypad + ldh a, [hJoyHeld] + bit 0, a ; is the A button being pressed? + jr nz, HoldTextDisplayOpen + +CloseTextDisplay:: + ld a, [wCurMap] + call SwitchToMapRomBank + ld a, $90 + ldh [hWY], a ; move the window off the screen + call DelayFrame + call LoadGBPal + xor a + ldh [hAutoBGTransferEnabled], a ; disable continuous WRAM to VRAM transfer each V-blank +; loop to make sprites face the directions they originally faced before the dialogue + ld hl, wSprite01StateData2OrigFacingDirection + ld c, $0f + ld de, $10 +.restoreSpriteFacingDirectionLoop + ld a, [hl] ; x#SPRITESTATEDATA2_ORIGFACINGDIRECTION + dec h + ld [hl], a ; [x#SPRITESTATEDATA1_FACINGDIRECTION] + inc h + add hl, de + dec c + jr nz, .restoreSpriteFacingDirectionLoop + ld a, BANK(InitMapSprites) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + call InitMapSprites ; reload sprite tile pattern data (since it was partially overwritten by text tile patterns) + ld hl, wFontLoaded + res 0, [hl] + ld a, [wd732] + bit 3, a ; used fly warp + call z, LoadPlayerSpriteGraphics + call LoadCurrentMapView + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + jp UpdateSprites + +DisplayPokemartDialogue:: + push hl + ld hl, PokemartGreetingText + call PrintText + pop hl + inc hl + call LoadItemList + ld a, PRICEDITEMLISTMENU + ld [wListMenuID], a + homecall DisplayPokemartDialogue_ + jp AfterDisplayingTextID + +PokemartGreetingText:: + text_far _PokemartGreetingText + text_end + +LoadItemList:: + ld a, 1 + ld [wUpdateSpritesEnabled], a + ld a, h + ld [wItemListPointer], a + ld a, l + ld [wItemListPointer + 1], a + ld de, wItemList +.loop + ld a, [hli] + ld [de], a + inc de + cp $ff + jr nz, .loop + ret + +DisplayPokemonCenterDialogue:: +; zeroing these doesn't appear to serve any purpose + xor a + ldh [hItemPrice], a + ldh [hItemPrice + 1], a + ldh [hItemPrice + 2], a + + inc hl + homecall DisplayPokemonCenterDialogue_ + jp AfterDisplayingTextID + +DisplaySafariGameOverText:: + callfar PrintSafariGameOverText + jp AfterDisplayingTextID + +DisplayPokemonFaintedText:: + ld hl, PokemonFaintedText + call PrintText + jp AfterDisplayingTextID + +PokemonFaintedText:: + text_far _PokemonFaintedText + text_end + +DisplayPlayerBlackedOutText:: + ld hl, PlayerBlackedOutText + call PrintText + ld a, [wd732] + res 5, a ; reset forced to use bike bit + ld [wd732], a + jp HoldTextDisplayOpen + +PlayerBlackedOutText:: + text_far _PlayerBlackedOutText + text_end + +DisplayRepelWoreOffText:: + ld hl, RepelWoreOffText + call PrintText + jp AfterDisplayingTextID + +RepelWoreOffText:: + text_far _RepelWoreOffText + text_end diff --git a/home/textbox.asm b/home/textbox.asm new file mode 100644 index 00000000..f95c72c7 --- /dev/null +++ b/home/textbox.asm @@ -0,0 +1,7 @@ +; function to draw various text boxes +; INPUT: +; [wTextBoxID] = text box ID +; b, c = y, x cursor position (TWO_OPTION_MENU only) +DisplayTextBoxID:: + homecall_sf DisplayTextBoxID_ + ret diff --git a/home/tilemap.asm b/home/tilemap.asm new file mode 100644 index 00000000..afee7097 --- /dev/null +++ b/home/tilemap.asm @@ -0,0 +1,61 @@ +FillMemory:: +; Fill bc bytes at hl with a. + push de + ld d, a +.loop + ld a, d + ld [hli], a + dec bc + ld a, b + or c + jr nz, .loop + pop de + ret + +UncompressSpriteFromDE:: +; Decompress pic at a:de. + ld hl, wSpriteInputPtr + ld [hl], e + inc hl + ld [hl], d + jp UncompressSpriteData + +SaveScreenTilesToBuffer2:: + hlcoord 0, 0 + ld de, wTileMapBackup2 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + call CopyData + ret + +LoadScreenTilesFromBuffer2:: + call LoadScreenTilesFromBuffer2DisableBGTransfer + ld a, 1 + ldh [hAutoBGTransferEnabled], a + ret + +; loads screen tiles stored in wTileMapBackup2 but leaves hAutoBGTransferEnabled disabled +LoadScreenTilesFromBuffer2DisableBGTransfer:: + xor a + ldh [hAutoBGTransferEnabled], a + ld hl, wTileMapBackup2 + decoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + call CopyData + ret + +SaveScreenTilesToBuffer1:: + hlcoord 0, 0 + ld de, wTileMapBackup + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + jp CopyData + +LoadScreenTilesFromBuffer1:: + xor a + ldh [hAutoBGTransferEnabled], a + ld hl, wTileMapBackup + decoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + call CopyData + ld a, 1 + ldh [hAutoBGTransferEnabled], a + ret diff --git a/home/trainers.asm b/home/trainers.asm new file mode 100644 index 00000000..4a0a16f6 --- /dev/null +++ b/home/trainers.asm @@ -0,0 +1,442 @@ +; stores hl in [wTrainerHeaderPtr] +StoreTrainerHeaderPointer:: + ld a, h + ld [wTrainerHeaderPtr], a + ld a, l + ld [wTrainerHeaderPtr+1], a + ret + +; executes the current map script from the function pointer array provided in de. +; a: map script index to execute (unless overridden by [wd733] bit 4) +; hl: trainer header pointer +ExecuteCurMapScriptInTable:: + push af + push de + call StoreTrainerHeaderPointer + pop hl + pop af + push hl + ld hl, wFlags_D733 + bit 4, [hl] + res 4, [hl] + jr z, .useProvidedIndex ; test if map script index was overridden manually + ld a, [wCurMapScript] +.useProvidedIndex + pop hl + ld [wCurMapScript], a + call CallFunctionInTable + ld a, [wCurMapScript] + ret + +LoadGymLeaderAndCityName:: + push de + ld de, wGymCityName + ld bc, $11 + call CopyData ; load city name + pop hl + ld de, wGymLeaderName + ld bc, NAME_LENGTH + jp CopyData ; load gym leader name + +; reads specific information from trainer header (pointed to at wTrainerHeaderPtr) +; a: offset in header data +; 0 -> flag's bit (into wTrainerHeaderFlagBit) +; 2 -> flag's byte ptr (into hl) +; 4 -> before battle text (into hl) +; 6 -> after battle text (into hl) +; 8 -> end battle text (into hl) +ReadTrainerHeaderInfo:: + push de + push af + ld d, $0 + ld e, a + ld hl, wTrainerHeaderPtr + ld a, [hli] + ld l, [hl] + ld h, a + add hl, de + pop af + and a + jr nz, .nonZeroOffset + ld a, [hl] + ld [wTrainerHeaderFlagBit], a ; store flag's bit + jr .done +.nonZeroOffset + cp $2 + jr z, .readPointer ; read flag's byte ptr + cp $4 + jr z, .readPointer ; read before battle text + cp $6 + jr z, .readPointer ; read after battle text + cp $8 + jr z, .readPointer ; read end battle text + cp $a + jr nz, .done + ld a, [hli] ; read end battle text (2) but override the result afterwards (XXX why, bug?) + ld d, [hl] + ld e, a + jr .done +.readPointer + ld a, [hli] + ld h, [hl] + ld l, a +.done + pop de + ret + +TrainerFlagAction:: + predef_jump FlagActionPredef + +TalkToTrainer:: + call StoreTrainerHeaderPointer + xor a + call ReadTrainerHeaderInfo ; read flag's bit + ld a, $2 + call ReadTrainerHeaderInfo ; read flag's byte ptr + ld a, [wTrainerHeaderFlagBit] + ld c, a + ld b, FLAG_TEST + call TrainerFlagAction ; read trainer's flag + ld a, c + and a + jr z, .trainerNotYetFought ; test trainer's flag + ld a, $6 + call ReadTrainerHeaderInfo ; print after battle text + jp PrintText +.trainerNotYetFought + ld a, $4 + call ReadTrainerHeaderInfo ; print before battle text + call PrintText + ld a, $a + call ReadTrainerHeaderInfo ; (?) does nothing apparently (maybe bug in ReadTrainerHeaderInfo) + push de + ld a, $8 + call ReadTrainerHeaderInfo ; read end battle text + pop de + call SaveEndBattleTextPointers + ld hl, wFlags_D733 + set 4, [hl] ; activate map script index override (index is set below) + ld hl, wFlags_0xcd60 + bit 0, [hl] ; test if player is already engaging the trainer (because the trainer saw the player) + ret nz +; if the player talked to the trainer of his own volition + call EngageMapTrainer + ld hl, wCurMapScript + inc [hl] ; increment map script index before StartTrainerBattle increments it again (next script function is usually EndTrainerBattle) + jp StartTrainerBattle + +; checks if any trainers are seeing the player and wanting to fight +CheckFightingMapTrainers:: +IF DEF(_DEBUG) + call DebugPressedOrHeldB + jr nz, .trainerNotEngaging +ENDC + call CheckForEngagingTrainers + ld a, [wSpriteIndex] + cp $ff + jr nz, .trainerEngaging +.trainerNotEngaging + xor a + ld [wSpriteIndex], a + ld [wTrainerHeaderFlagBit], a + ret +.trainerEngaging + ld hl, wFlags_D733 + set 3, [hl] + ld [wEmotionBubbleSpriteIndex], a + xor a ; EXCLAMATION_BUBBLE + ld [wWhichEmotionBubble], a + predef EmotionBubble + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld [wJoyIgnore], a + xor a + ldh [hJoyHeld], a + call TrainerWalkUpToPlayer_Bank0 + ld hl, wCurMapScript + inc [hl] ; increment map script index (next script function is usually DisplayEnemyTrainerTextAndStartBattle) + ret + +; display the before battle text after the enemy trainer has walked up to the player's sprite +DisplayEnemyTrainerTextAndStartBattle:: + ld a, [wd730] + and $1 + ret nz ; return if the enemy trainer hasn't finished walking to the player's sprite + ld [wJoyIgnore], a + ld a, [wSpriteIndex] + ldh [hSpriteIndexOrTextID], a + call DisplayTextID + ; fall through + +StartTrainerBattle:: + xor a + ld [wJoyIgnore], a + call InitBattleEnemyParameters + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, wd72e + set 1, [hl] + ld hl, wCurMapScript + inc [hl] ; increment map script index (next script function is usually EndTrainerBattle) + ret + +EndTrainerBattle:: + ld hl, wCurrentMapScriptFlags + set 5, [hl] + set 6, [hl] + ld hl, wd72d + res 7, [hl] + ld hl, wFlags_0xcd60 + res 0, [hl] ; player is no longer engaged by any trainer + ld a, [wIsInBattle] + cp $ff + jp z, ResetButtonPressedAndMapScript + ld a, $2 + call ReadTrainerHeaderInfo + ld a, [wTrainerHeaderFlagBit] + ld c, a + ld b, FLAG_SET + call TrainerFlagAction ; flag trainer as fought + ld a, [wEnemyMonOrTrainerClass] + cp OPP_ID_OFFSET + jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite) + ld hl, wMissableObjectList + ld de, $2 + ld a, [wSpriteIndex] + call IsInArray ; search for sprite ID + inc hl + ld a, [hl] + ld [wMissableObjectIndex], a ; load corresponding missable object index and remove it + predef HideObject +.skipRemoveSprite + ld hl, wd730 + bit 4, [hl] + res 4, [hl] + ret nz + +ResetButtonPressedAndMapScript:: + xor a + ld [wJoyIgnore], a + ldh [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a + ld [wCurMapScript], a ; reset battle status + ret + +; calls TrainerWalkUpToPlayer +TrainerWalkUpToPlayer_Bank0:: + farjp TrainerWalkUpToPlayer + +; sets opponent type and mon set/lvl based on the engaging trainer data +InitBattleEnemyParameters:: + ld a, [wEngagedTrainerClass] + ld [wCurOpponent], a + ld [wEnemyMonOrTrainerClass], a + cp OPP_ID_OFFSET + ld a, [wEngagedTrainerSet] + jr c, .noTrainer + ld [wTrainerNo], a + ret +.noTrainer + ld [wCurEnemyLVL], a + ret + +GetSpritePosition1:: + ld hl, _GetSpritePosition1 + jr SpritePositionBankswitch + +GetSpritePosition2:: + ld hl, _GetSpritePosition2 + jr SpritePositionBankswitch + +SetSpritePosition1:: + ld hl, _SetSpritePosition1 + jr SpritePositionBankswitch + +SetSpritePosition2:: + ld hl, _SetSpritePosition2 +SpritePositionBankswitch:: + ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2) + jp Bankswitch ; indirect jump to one of the four functions + +CheckForEngagingTrainers:: + xor a + call ReadTrainerHeaderInfo ; read trainer flag's bit (unused) + ld d, h ; store trainer header address in de + ld e, l +.trainerLoop + call StoreTrainerHeaderPointer ; set trainer header pointer to current trainer + ld a, [de] + ld [wSpriteIndex], a ; store trainer flag's bit + ld [wTrainerHeaderFlagBit], a + cp -1 + ret z + ld a, $2 + call ReadTrainerHeaderInfo ; read trainer flag's byte ptr + ld b, FLAG_TEST + ld a, [wTrainerHeaderFlagBit] + ld c, a + call TrainerFlagAction ; read trainer flag + ld a, c + and a ; has the trainer already been defeated? + jr nz, .continue + push hl + push de + push hl + xor a + call ReadTrainerHeaderInfo ; get trainer header pointer + inc hl + ld a, [hl] ; read trainer engage distance + pop hl + ld [wTrainerEngageDistance], a + ld a, [wSpriteIndex] + swap a + ld [wTrainerSpriteOffset], a + predef TrainerEngage + pop de + pop hl + ld a, [wTrainerSpriteOffset] + and a + ret nz ; break if the trainer is engaging +.continue + ld hl, $c + add hl, de + ld d, h + ld e, l + jr .trainerLoop + +; hl = text if the player wins +; de = text if the player loses +SaveEndBattleTextPointers:: + ldh a, [hLoadedROMBank] + ld [wEndBattleTextRomBank], a + ld a, h + ld [wEndBattleWinTextPointer], a + ld a, l + ld [wEndBattleWinTextPointer + 1], a + ld a, d + ld [wEndBattleLoseTextPointer], a + ld a, e + ld [wEndBattleLoseTextPointer + 1], a + ret + +; loads data of some trainer on the current map and plays pre-battle music +; [wSpriteIndex]: sprite ID of trainer who is engaged +EngageMapTrainer:: + ld hl, wMapSpriteExtraData + ld d, $0 + ld a, [wSpriteIndex] + dec a + add a + ld e, a + add hl, de ; seek to engaged trainer data + ld a, [hli] ; load trainer class + ld [wEngagedTrainerClass], a + ld a, [hl] ; load trainer mon set + ld [wEngagedTrainerSet], a + jp PlayTrainerMusic + +PrintEndBattleText:: + push hl + ld hl, wd72d + bit 7, [hl] + res 7, [hl] + pop hl + ret z + ldh a, [hLoadedROMBank] + push af + ld a, [wEndBattleTextRomBank] + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + push hl + farcall SaveTrainerName + ld hl, TrainerEndBattleText + call PrintText + pop hl + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + farcall FreezeEnemyTrainerSprite + jp WaitForSoundToFinish + +GetSavedEndBattleTextPointer:: + ld a, [wBattleResult] + and a +; won battle + jr nz, .lostBattle + ld a, [wEndBattleWinTextPointer] + ld h, a + ld a, [wEndBattleWinTextPointer + 1] + ld l, a + ret +.lostBattle + ld a, [wEndBattleLoseTextPointer] + ld h, a + ld a, [wEndBattleLoseTextPointer + 1] + ld l, a + ret + +TrainerEndBattleText:: + text_far _TrainerNameText + text_asm + call GetSavedEndBattleTextPointer + call TextCommandProcessor + jp TextScriptEnd + +; only engage with the trainer if the player is not already +; engaged with another trainer +; XXX unused? +CheckIfAlreadyEngaged:: + ld a, [wFlags_0xcd60] + bit 0, a + ret nz + call EngageMapTrainer + xor a + ret + +PlayTrainerMusic:: + ld a, [wEngagedTrainerClass] + cp OPP_RIVAL1 + ret z + cp OPP_RIVAL2 + ret z + cp OPP_RIVAL3 + ret z + ld a, [wGymLeaderNo] + and a + ret nz + xor a + ld [wAudioFadeOutControl], a + ld a, SFX_STOP_ALL_MUSIC + call PlaySound + ld a, 0 ; BANK(Music_MeetEvilTrainer) + ld [wAudioROMBank], a + ld [wAudioSavedROMBank], a + ld a, [wEngagedTrainerClass] + ld b, a + ld hl, EvilTrainerList +.evilTrainerListLoop + ld a, [hli] + cp $ff + jr z, .noEvilTrainer + cp b + jr nz, .evilTrainerListLoop + ld a, MUSIC_MEET_EVIL_TRAINER + jr .PlaySound +.noEvilTrainer + ld hl, FemaleTrainerList +.femaleTrainerListLoop + ld a, [hli] + cp $ff + jr z, .maleTrainer + cp b + jr nz, .femaleTrainerListLoop + ld a, MUSIC_MEET_FEMALE_TRAINER + jr .PlaySound +.maleTrainer + ld a, MUSIC_MEET_MALE_TRAINER +.PlaySound + ld [wNewSoundID], a + jp PlayMusic + +INCLUDE "data/trainers/encounter_types.asm" diff --git a/home/trainers2.asm b/home/trainers2.asm new file mode 100644 index 00000000..950eabb2 --- /dev/null +++ b/home/trainers2.asm @@ -0,0 +1,35 @@ +GetTrainerInformation:: + call GetTrainerName + ld a, [wLinkState] + and a + jr nz, .linkBattle + ld a, BANK(TrainerPicAndMoneyPointers) + call BankswitchHome + ld a, [wTrainerClass] + dec a + ld hl, TrainerPicAndMoneyPointers + ld bc, $5 + call AddNTimes + ld de, wTrainerPicPointer + ld a, [hli] + ld [de], a + inc de + ld a, [hli] + ld [de], a + ld de, wTrainerBaseMoney + ld a, [hli] + ld [de], a + inc de + ld a, [hli] + ld [de], a + jp BankswitchBack +.linkBattle + ld hl, wTrainerPicPointer + ld de, RedPicFront + ld [hl], e + inc hl + ld [hl], d + ret + +GetTrainerName:: + farjp GetTrainerName_ diff --git a/home/uncompress.asm b/home/uncompress.asm new file mode 100644 index 00000000..d3d84b26 --- /dev/null +++ b/home/uncompress.asm @@ -0,0 +1,591 @@ +; bankswitches and runs _UncompressSpriteData +; bank is given in a, sprite input stream is pointed to in wSpriteInputPtr +UncompressSpriteData:: + ld b, a + ldh a, [hLoadedROMBank] + push af + ld a, b + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ld a, SRAM_ENABLE + ld [MBC1SRamEnable], a + xor a + ld [MBC1SRamBank], a + call _UncompressSpriteData + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + ret + +; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop +_UncompressSpriteData:: + ld hl, sSpriteBuffer1 + ld c, LOW(2 * SPRITEBUFFERSIZE) + ld b, HIGH(2 * SPRITEBUFFERSIZE) + xor a + call FillMemory ; clear sprite buffer 1 and 2 + ld a, $1 + ld [wSpriteInputBitCounter], a + ld a, $3 + ld [wSpriteOutputBitOffset], a + xor a + ld [wSpriteCurPosX], a + ld [wSpriteCurPosY], a + ld [wSpriteLoadFlags], a + call ReadNextInputByte ; first byte of input determines sprite width (high nybble) and height (low nybble) in tiles (8x8 pixels) + ld b, a + and $f + add a + add a + add a + ld [wSpriteHeight], a + ld a, b + swap a + and $f + add a + add a + add a + ld [wSpriteWidth], a + call ReadNextInputBit + ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit + ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2 + ; bit 0 decides in which one the first chunk is placed + ; fall through + +; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into sSpriteBuffer1 or sSpriteBuffer2 +; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards +; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack +UncompressSpriteDataLoop:: + ld hl, sSpriteBuffer1 + ld a, [wSpriteLoadFlags] + bit 0, a + jr z, .useSpriteBuffer1 ; check which buffer to use + ld hl, sSpriteBuffer2 +.useSpriteBuffer1 + call StoreSpriteOutputPointer + ld a, [wSpriteLoadFlags] + bit 1, a + jr z, .startDecompression ; check if last iteration + call ReadNextInputBit ; if last chunk, read 1-2 bit unpacking mode + and a + jr z, .unpackingMode0 ; 0 -> mode 0 + call ReadNextInputBit ; 1 0 -> mode 1 + inc a ; 1 1 -> mode 2 +.unpackingMode0 + ld [wSpriteUnpackMode], a +.startDecompression + call ReadNextInputBit + and a + jr z, .readRLEncodedZeros ; if first bit is 0, the input starts with zeroes, otherwise with (non-zero) input +.readNextInput + call ReadNextInputBit + ld c, a + call ReadNextInputBit + sla c + or c ; read next two bits into c + and a + jr z, .readRLEncodedZeros ; 00 -> RLEncoded zeroes following + call WriteSpriteBitsToBuffer ; otherwise write input to output and repeat + call MoveToNextBufferPosition + jr .readNextInput +.readRLEncodedZeros + ld c, $0 ; number of zeroes it length encoded, the number +.countConsecutiveOnesLoop ; of consecutive ones determines the number of bits the number has + call ReadNextInputBit + and a + jr z, .countConsecutiveOnesFinished + inc c + jr .countConsecutiveOnesLoop +.countConsecutiveOnesFinished + ld a, c + add a + ld hl, LengthEncodingOffsetList + add l + ld l, a + jr nc, .noCarry + inc h +.noCarry + ld a, [hli] ; read offset that is added to the number later on + ld e, a ; adding an offset of 2^length - 1 makes every integer uniquely + ld d, [hl] ; representable in the length encoding and saves bits + push de + inc c + ld e, $0 + ld d, e +.readNumberOfZerosLoop ; reads the next c+1 bits of input + call ReadNextInputBit + or e + ld e, a + dec c + jr z, .readNumberOfZerosDone + sla e + rl d + jr .readNumberOfZerosLoop +.readNumberOfZerosDone + pop hl ; add the offset + add hl, de + ld e, l + ld d, h +.writeZerosLoop + ld b, e + xor a ; write 00 to buffer + call WriteSpriteBitsToBuffer + ld e, b + call MoveToNextBufferPosition + dec de + ld a, d + and a + jr nz, .continueLoop + ld a, e + and a +.continueLoop + jr nz, .writeZerosLoop + jr .readNextInput + +; moves output pointer to next position +; also cancels the calling function if the all output is done (by removing the return pointer from stack) +; and calls postprocessing functions according to the unpack mode +MoveToNextBufferPosition:: + ld a, [wSpriteHeight] + ld b, a + ld a, [wSpriteCurPosY] + inc a + cp b + jr z, .curColumnDone + ld [wSpriteCurPosY], a + ld a, [wSpriteOutputPtr] + inc a + ld [wSpriteOutputPtr], a + ret nz + ld a, [wSpriteOutputPtr+1] + inc a + ld [wSpriteOutputPtr+1], a + ret +.curColumnDone + xor a + ld [wSpriteCurPosY], a + ld a, [wSpriteOutputBitOffset] + and a + jr z, .bitOffsetsDone + dec a + ld [wSpriteOutputBitOffset], a + ld hl, wSpriteOutputPtrCached + ld a, [hli] + ld [wSpriteOutputPtr], a + ld a, [hl] + ld [wSpriteOutputPtr+1], a + ret +.bitOffsetsDone + ld a, $3 + ld [wSpriteOutputBitOffset], a + ld a, [wSpriteCurPosX] + add $8 + ld [wSpriteCurPosX], a + ld b, a + ld a, [wSpriteWidth] + cp b + jr z, .allColumnsDone + ld a, [wSpriteOutputPtr] + ld l, a + ld a, [wSpriteOutputPtr+1] + ld h, a + inc hl + jp StoreSpriteOutputPointer +.allColumnsDone + pop hl + xor a + ld [wSpriteCurPosX], a + ld a, [wSpriteLoadFlags] + bit 1, a + jr nz, .done ; test if there is one more sprite to go + xor $1 + set 1, a + ld [wSpriteLoadFlags], a + jp UncompressSpriteDataLoop +.done + jp UnpackSprite + +; writes 2 bits (from a) to the output buffer (pointed to from wSpriteOutputPtr) +WriteSpriteBitsToBuffer:: + ld e, a + ld a, [wSpriteOutputBitOffset] + and a + jr z, .offset0 + cp $2 + jr c, .offset1 + jr z, .offset2 + rrc e ; offset 3 + rrc e + jr .offset0 +.offset1 + sla e + sla e + jr .offset0 +.offset2 + swap e +.offset0 + ld a, [wSpriteOutputPtr] + ld l, a + ld a, [wSpriteOutputPtr+1] + ld h, a + ld a, [hl] + or e + ld [hl], a + ret + +; reads next bit from input stream and returns it in a +ReadNextInputBit:: + ld a, [wSpriteInputBitCounter] + dec a + jr nz, .curByteHasMoreBitsToRead + call ReadNextInputByte + ld [wSpriteInputCurByte], a + ld a, $8 +.curByteHasMoreBitsToRead + ld [wSpriteInputBitCounter], a + ld a, [wSpriteInputCurByte] + rlca + ld [wSpriteInputCurByte], a + and $1 + ret + +; reads next byte from input stream and returns it in a +ReadNextInputByte:: + ld a, [wSpriteInputPtr] + ld l, a + ld a, [wSpriteInputPtr+1] + ld h, a + ld a, [hli] + ld b, a + ld a, l + ld [wSpriteInputPtr], a + ld a, h + ld [wSpriteInputPtr+1], a + ld a, b + ret + +; the nth item is 2^n - 1 +LengthEncodingOffsetList:: + dw %0000000000000001 + dw %0000000000000011 + dw %0000000000000111 + dw %0000000000001111 + dw %0000000000011111 + dw %0000000000111111 + dw %0000000001111111 + dw %0000000011111111 + dw %0000000111111111 + dw %0000001111111111 + dw %0000011111111111 + dw %0000111111111111 + dw %0001111111111111 + dw %0011111111111111 + dw %0111111111111111 + dw %1111111111111111 + +; unpacks the sprite data depending on the unpack mode +UnpackSprite:: + ld a, [wSpriteUnpackMode] + cp $2 + jp z, UnpackSpriteMode2 + and a + jp nz, XorSpriteChunks + ld hl, sSpriteBuffer1 + call SpriteDifferentialDecode + ld hl, sSpriteBuffer2 + ; fall through + +; decodes differential encoded sprite data +; input bit value 0 preserves the current bit value and input bit value 1 toggles it (starting from initial value 0). +SpriteDifferentialDecode:: + xor a + ld [wSpriteCurPosX], a + ld [wSpriteCurPosY], a + call StoreSpriteOutputPointer + ld a, [wSpriteFlipped] + and a + jr z, .notFlipped + ld hl, DecodeNybble0TableFlipped + ld de, DecodeNybble1TableFlipped + jr .storeDecodeTablesPointers +.notFlipped + ld hl, DecodeNybble0Table + ld de, DecodeNybble1Table +.storeDecodeTablesPointers + ld a, l + ld [wSpriteDecodeTable0Ptr], a + ld a, h + ld [wSpriteDecodeTable0Ptr+1], a + ld a, e + ld [wSpriteDecodeTable1Ptr], a + ld a, d + ld [wSpriteDecodeTable1Ptr+1], a + ld e, $0 ; last decoded nybble, initialized to 0 +.decodeNextByteLoop + ld a, [wSpriteOutputPtr] + ld l, a + ld a, [wSpriteOutputPtr+1] + ld h, a + ld a, [hl] + ld b, a + swap a + and $f + call DifferentialDecodeNybble ; decode high nybble + swap a + ld d, a + ld a, b + and $f + call DifferentialDecodeNybble ; decode low nybble + or d + ld b, a + ld a, [wSpriteOutputPtr] + ld l, a + ld a, [wSpriteOutputPtr+1] + ld h, a + ld a, b + ld [hl], a ; write back decoded data + ld a, [wSpriteHeight] + add l ; move on to next column + jr nc, .noCarry + inc h +.noCarry + ld [wSpriteOutputPtr], a + ld a, h + ld [wSpriteOutputPtr+1], a + ld a, [wSpriteCurPosX] + add $8 + ld [wSpriteCurPosX], a + ld b, a + ld a, [wSpriteWidth] + cp b + jr nz, .decodeNextByteLoop ; test if current row is done + xor a + ld e, a + ld [wSpriteCurPosX], a + ld a, [wSpriteCurPosY] ; move on to next row + inc a + ld [wSpriteCurPosY], a + ld b, a + ld a, [wSpriteHeight] + cp b + jr z, .done ; test if all rows finished + ld a, [wSpriteOutputPtrCached] + ld l, a + ld a, [wSpriteOutputPtrCached+1] + ld h, a + inc hl + call StoreSpriteOutputPointer + jr .decodeNextByteLoop +.done + xor a + ld [wSpriteCurPosY], a + ret + +; decodes the nybble stored in a. Last decoded data is assumed to be in e (needed to determine if initial value is 0 or 1) +DifferentialDecodeNybble:: + srl a ; c=a%2, a/=2 + ld c, $0 + jr nc, .evenNumber + ld c, $1 +.evenNumber + ld l, a + ld a, [wSpriteFlipped] + and a + jr z, .notFlipped ; determine if initial value is 0 or one + bit 3, e ; if flipped, consider MSB of last data + jr .selectLookupTable +.notFlipped + bit 0, e ; else consider LSB +.selectLookupTable + ld e, l + jr nz, .initialValue1 ; load the appropriate table + ld a, [wSpriteDecodeTable0Ptr] + ld l, a + ld a, [wSpriteDecodeTable0Ptr+1] + jr .tableLookup +.initialValue1 + ld a, [wSpriteDecodeTable1Ptr] + ld l, a + ld a, [wSpriteDecodeTable1Ptr+1] +.tableLookup + ld h, a + ld a, e + add l + ld l, a + jr nc, .noCarry + inc h +.noCarry + ld a, [hl] + bit 0, c + jr nz, .selectLowNybble + swap a ; select high nybble +.selectLowNybble + and $f + ld e, a ; update last decoded data + ret + +DecodeNybble0Table:: + dn $0, $1 + dn $3, $2 + dn $7, $6 + dn $4, $5 + dn $f, $e + dn $c, $d + dn $8, $9 + dn $b, $a +DecodeNybble1Table:: + dn $f, $e + dn $c, $d + dn $8, $9 + dn $b, $a + dn $0, $1 + dn $3, $2 + dn $7, $6 + dn $4, $5 +DecodeNybble0TableFlipped:: + dn $0, $8 + dn $c, $4 + dn $e, $6 + dn $2, $a + dn $f, $7 + dn $3, $b + dn $1, $9 + dn $d, $5 +DecodeNybble1TableFlipped:: + dn $f, $7 + dn $3, $b + dn $1, $9 + dn $d, $5 + dn $0, $8 + dn $c, $4 + dn $e, $6 + dn $2, $a + +; combines the two loaded chunks with xor (the chunk loaded second is the destination). The source chunk is differeintial decoded beforehand. +XorSpriteChunks:: + xor a + ld [wSpriteCurPosX], a + ld [wSpriteCurPosY], a + call ResetSpriteBufferPointers + ld a, [wSpriteOutputPtr] ; points to buffer 1 or 2, depending on flags + ld l, a + ld a, [wSpriteOutputPtr+1] + ld h, a + call SpriteDifferentialDecode ; decode buffer 1 or 2, depending on flags + call ResetSpriteBufferPointers + ld a, [wSpriteOutputPtr] ; source buffer, points to buffer 1 or 2, depending on flags + ld l, a + ld a, [wSpriteOutputPtr+1] + ld h, a + ld a, [wSpriteOutputPtrCached] ; destination buffer, points to buffer 2 or 1, depending on flags + ld e, a + ld a, [wSpriteOutputPtrCached+1] + ld d, a +.xorChunksLoop + ld a, [wSpriteFlipped] + and a + jr z, .notFlipped + push de + ld a, [de] + ld b, a + swap a + and $f + call ReverseNybble ; if flipped reverse the nybbles in the destination buffer + swap a + ld c, a + ld a, b + and $f + call ReverseNybble + or c + pop de + ld [de], a +.notFlipped + ld a, [hli] + ld b, a + ld a, [de] + xor b + ld [de], a + inc de + ld a, [wSpriteCurPosY] + inc a + ld [wSpriteCurPosY], a ; go to next row + ld b, a + ld a, [wSpriteHeight] + cp b + jr nz, .xorChunksLoop ; test if column finished + xor a + ld [wSpriteCurPosY], a + ld a, [wSpriteCurPosX] + add $8 + ld [wSpriteCurPosX], a ; go to next column + ld b, a + ld a, [wSpriteWidth] + cp b + jr nz, .xorChunksLoop ; test if all columns finished + xor a + ld [wSpriteCurPosX], a + ret + +; reverses the bits in the nybble given in register a +ReverseNybble:: + ld de, NybbleReverseTable + add e + ld e, a + jr nc, .noCarry + inc d +.noCarry + ld a, [de] + ret + +; resets sprite buffer pointers to buffer 1 and 2, depending on wSpriteLoadFlags +ResetSpriteBufferPointers:: + ld a, [wSpriteLoadFlags] + bit 0, a + jr nz, .buffer2Selected + ld de, sSpriteBuffer1 + ld hl, sSpriteBuffer2 + jr .storeBufferPointers +.buffer2Selected + ld de, sSpriteBuffer2 + ld hl, sSpriteBuffer1 +.storeBufferPointers + ld a, l + ld [wSpriteOutputPtr], a + ld a, h + ld [wSpriteOutputPtr+1], a + ld a, e + ld [wSpriteOutputPtrCached], a + ld a, d + ld [wSpriteOutputPtrCached+1], a + ret + +; maps each nybble to its reverse +NybbleReverseTable:: + db $0, $8, $4, $c, $2, $a, $6, $e, $1, $9, $5, $d, $3, $b, $7, $f + +; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand. +UnpackSpriteMode2:: + call ResetSpriteBufferPointers + ld a, [wSpriteFlipped] + push af + xor a + ld [wSpriteFlipped], a ; temporarily clear flipped flag for decoding the destination chunk + ld a, [wSpriteOutputPtrCached] + ld l, a + ld a, [wSpriteOutputPtrCached+1] + ld h, a + call SpriteDifferentialDecode + call ResetSpriteBufferPointers + pop af + ld [wSpriteFlipped], a + jp XorSpriteChunks + +; stores hl into the output pointers +StoreSpriteOutputPointer:: + ld a, l + ld [wSpriteOutputPtr], a + ld [wSpriteOutputPtrCached], a + ld a, h + ld [wSpriteOutputPtr+1], a + ld [wSpriteOutputPtrCached+1], a + ret diff --git a/home/update_sprites.asm b/home/update_sprites.asm new file mode 100644 index 00000000..5530c2a4 --- /dev/null +++ b/home/update_sprites.asm @@ -0,0 +1,6 @@ +UpdateSprites:: + ld a, [wUpdateSpritesEnabled] + dec a + ret nz + homecall _UpdateSprites + ret diff --git a/home/vblank.asm b/home/vblank.asm index 19203452..bb645a44 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -5,19 +5,19 @@ VBlank:: push de push hl - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld [wVBlankSavedROMBank], a - ld a, [hSCX] - ld [rSCX], a - ld a, [hSCY] - ld [rSCY], a + ldh a, [hSCX] + ldh [rSCX], a + ldh a, [hSCY] + ldh [rSCY], a ld a, [wDisableVBlankWYUpdate] and a jr nz, .ok - ld a, [hWY] - ld [rWY], a + ldh a, [hWY] + ldh [rWY], a .ok call AutoBgMapTransfer @@ -26,9 +26,9 @@ VBlank:: call VBlankCopy call VBlankCopyDouble call UpdateMovingBgTiles - call $ff80 ; hOAMDMA + call hDMARoutine ld a, BANK(PrepareOAMData) - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a call PrepareOAMData @@ -36,25 +36,25 @@ VBlank:: call Random - ld a, [H_VBLANKOCCURRED] + ldh a, [hVBlankOccurred] and a jr z, .skipZeroing xor a - ld [H_VBLANKOCCURRED], a + ldh [hVBlankOccurred], a .skipZeroing - ld a, [H_FRAMECOUNTER] + ldh a, [hFrameCounter] and a jr z, .skipDec dec a - ld [H_FRAMECOUNTER], a + ldh [hFrameCounter], a .skipDec ; call FadeOutAudio call UpdateSound ; ld a, [wAudioROMBank] ; music ROM bank -; ld [H_LOADEDROMBANK], a +; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a ; cp BANK(Audio1_UpdateMusic) @@ -73,14 +73,14 @@ VBlank:: ; call Audio3_UpdateMusic ;.afterMusic - callba TrackPlayTime ; keep track of time played + farcall TrackPlayTime ; keep track of time played - ld a, [hDisableJoypadPolling] + ldh a, [hDisableJoypadPolling] and a call z, ReadJoypad ld a, [wVBlankSavedROMBank] - ld [H_LOADEDROMBANK], a + ldh [hLoadedROMBank], a ld [MBC1RomBank], a pop hl @@ -97,10 +97,10 @@ DelayFrame:: NOT_VBLANKED EQU 1 ld a, NOT_VBLANKED - ld [H_VBLANKOCCURRED], a + ldh [hVBlankOccurred], a .halt halt - ld a, [H_VBLANKOCCURRED] + ldh a, [hVBlankOccurred] and a jr nz, .halt ret diff --git a/home/vcopy.asm b/home/vcopy.asm index 3f49ad3e..882773a8 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -40,19 +40,19 @@ ClearBgMap:: ; However, this function is also called repeatedly to redraw the whole screen ; when necessary. It is also used in trade animation and elevator code. RedrawRowOrColumn:: - ld a, [hRedrawRowOrColumnMode] + ldh a, [hRedrawRowOrColumnMode] and a ret z ld b, a xor a - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a dec b jr nz, .redrawRow .redrawColumn ld hl, wRedrawRowOrColumnSrcTiles - ld a, [hRedrawRowOrColumnDest] + ldh a, [hRedrawRowOrColumnDest] ld e, a - ld a, [hRedrawRowOrColumnDest + 1] + ldh a, [hRedrawRowOrColumnDest + 1] ld d, a ld c, SCREEN_HEIGHT .loop1 @@ -75,13 +75,13 @@ RedrawRowOrColumn:: dec c jr nz, .loop1 xor a - ld [hRedrawRowOrColumnMode], a + ldh [hRedrawRowOrColumnMode], a ret .redrawRow ld hl, wRedrawRowOrColumnSrcTiles - ld a, [hRedrawRowOrColumnDest] + ldh a, [hRedrawRowOrColumnDest] ld e, a - ld a, [hRedrawRowOrColumnDest + 1] + ldh a, [hRedrawRowOrColumnDest + 1] ld d, a push de call .DrawHalf ; draw upper half @@ -120,63 +120,63 @@ RedrawRowOrColumn:: ; the above function, RedrawRowOrColumn, is used when walking to ; improve efficiency. AutoBgMapTransfer:: - ld a, [H_AUTOBGTRANSFERENABLED] + ldh a, [hAutoBGTransferEnabled] and a ret z ld hl, sp + 0 ld a, h - ld [H_SPTEMP], a + ldh [hSPTemp], a ld a, l - ld [H_SPTEMP + 1], a ; save stack pinter - ld a, [H_AUTOBGTRANSFERPORTION] + ldh [hSPTemp + 1], a ; save stack pinter + ldh a, [hAutoBGTransferPortion] and a jr z, .transferTopThird dec a jr z, .transferMiddleThird .transferBottomThird - coord hl, 0, 12 + hlcoord 0, 12 ld sp, hl - ld a, [H_AUTOBGTRANSFERDEST + 1] + ldh a, [hAutoBGTransferDest + 1] ld h, a - ld a, [H_AUTOBGTRANSFERDEST] + ldh a, [hAutoBGTransferDest] ld l, a ld de, (12 * 32) add hl, de xor a ; TRANSFERTOP jr .doTransfer .transferTopThird - coord hl, 0, 0 + hlcoord 0, 0 ld sp, hl - ld a, [H_AUTOBGTRANSFERDEST + 1] + ldh a, [hAutoBGTransferDest + 1] ld h, a - ld a, [H_AUTOBGTRANSFERDEST] + ldh a, [hAutoBGTransferDest] ld l, a ld a, TRANSFERMIDDLE jr .doTransfer .transferMiddleThird - coord hl, 0, 6 + hlcoord 0, 6 ld sp, hl - ld a, [H_AUTOBGTRANSFERDEST + 1] + ldh a, [hAutoBGTransferDest + 1] ld h, a - ld a, [H_AUTOBGTRANSFERDEST] + ldh a, [hAutoBGTransferDest] ld l, a ld de, (6 * 32) add hl, de ld a, TRANSFERBOTTOM .doTransfer - ld [H_AUTOBGTRANSFERPORTION], a ; store next portion + ldh [hAutoBGTransferPortion], a ; store next portion ld b, 6 TransferBgRows:: ; unrolled loop and using pop for speed - rept 20 / 2 - 1 + REPT 20 / 2 - 1 pop de ld [hl], e inc l ld [hl], d inc l - endr + ENDR pop de ld [hl], e @@ -192,76 +192,76 @@ TransferBgRows:: dec b jr nz, TransferBgRows - ld a, [H_SPTEMP] + ldh a, [hSPTemp] ld h, a - ld a, [H_SPTEMP + 1] + ldh a, [hSPTemp + 1] ld l, a ld sp, hl ret -; Copies [H_VBCOPYBGNUMROWS] rows from H_VBCOPYBGSRC to H_VBCOPYBGDEST. -; If H_VBCOPYBGSRC is XX00, the transfer is disabled. +; Copies [hVBlankCopyBGNumRows] rows from hVBlankCopyBGSource to hVBlankCopyBGDest. +; If hVBlankCopyBGSource is XX00, the transfer is disabled. VBlankCopyBgMap:: - ld a, [H_VBCOPYBGSRC] ; doubles as enabling byte + ldh a, [hVBlankCopyBGSource] ; doubles as enabling byte and a ret z ld hl, sp + 0 ld a, h - ld [H_SPTEMP], a + ldh [hSPTemp], a ld a, l - ld [H_SPTEMP + 1], a ; save stack pointer - ld a, [H_VBCOPYBGSRC] + ldh [hSPTemp + 1], a ; save stack pointer + ldh a, [hVBlankCopyBGSource] ld l, a - ld a, [H_VBCOPYBGSRC + 1] + ldh a, [hVBlankCopyBGSource + 1] ld h, a ld sp, hl - ld a, [H_VBCOPYBGDEST] + ldh a, [hVBlankCopyBGDest] ld l, a - ld a, [H_VBCOPYBGDEST + 1] + ldh a, [hVBlankCopyBGDest + 1] ld h, a - ld a, [H_VBCOPYBGNUMROWS] + ldh a, [hVBlankCopyBGNumRows] ld b, a xor a - ld [H_VBCOPYBGSRC], a ; disable transfer so it doesn't continue next V-blank + ldh [hVBlankCopyBGSource], a ; disable transfer so it doesn't continue next V-blank jr TransferBgRows VBlankCopyDouble:: -; Copy [H_VBCOPYDOUBLESIZE] 1bpp tiles -; from H_VBCOPYDOUBLESRC to H_VBCOPYDOUBLEDEST. +; Copy [hVBlankCopyDoubleSize] 1bpp tiles +; from hVBlankCopyDoubleSource to hVBlankCopyDoubleDest. ; While we're here, convert to 2bpp. ; The process is straightforward: ; copy each byte twice. - ld a, [H_VBCOPYDOUBLESIZE] + ldh a, [hVBlankCopyDoubleSize] and a ret z ld hl, sp + 0 ld a, h - ld [H_SPTEMP], a + ldh [hSPTemp], a ld a, l - ld [H_SPTEMP + 1], a + ldh [hSPTemp + 1], a - ld a, [H_VBCOPYDOUBLESRC] + ldh a, [hVBlankCopyDoubleSource] ld l, a - ld a, [H_VBCOPYDOUBLESRC + 1] + ldh a, [hVBlankCopyDoubleSource + 1] ld h, a ld sp, hl - ld a, [H_VBCOPYDOUBLEDEST] + ldh a, [hVBlankCopyDoubleDest] ld l, a - ld a, [H_VBCOPYDOUBLEDEST + 1] + ldh a, [hVBlankCopyDoubleDest + 1] ld h, a - ld a, [H_VBCOPYDOUBLESIZE] + ldh a, [hVBlankCopyDoubleSize] ld b, a xor a ; transferred - ld [H_VBCOPYDOUBLESIZE], a + ldh [hVBlankCopyDoubleSize], a .loop - rept 3 + REPT 3 pop de ld [hl], e inc l @@ -271,7 +271,7 @@ VBlankCopyDouble:: inc l ld [hl], d inc l - endr + ENDR pop de ld [hl], e @@ -286,19 +286,19 @@ VBlankCopyDouble:: jr nz, .loop ld a, l - ld [H_VBCOPYDOUBLEDEST], a + ldh [hVBlankCopyDoubleDest], a ld a, h - ld [H_VBCOPYDOUBLEDEST + 1], a + ldh [hVBlankCopyDoubleDest + 1], a ld hl, sp + 0 ld a, l - ld [H_VBCOPYDOUBLESRC], a + ldh [hVBlankCopyDoubleSource], a ld a, h - ld [H_VBCOPYDOUBLESRC + 1], a + ldh [hVBlankCopyDoubleSource + 1], a - ld a, [H_SPTEMP] + ldh a, [hSPTemp] ld h, a - ld a, [H_SPTEMP + 1] + ldh a, [hSPTemp + 1] ld l, a ld sp, hl @@ -306,46 +306,46 @@ VBlankCopyDouble:: VBlankCopy:: -; Copy [H_VBCOPYSIZE] 2bpp tiles (or 16 * [H_VBCOPYSIZE] tile map entries) -; from H_VBCOPYSRC to H_VBCOPYDEST. +; Copy [hVBlankCopySize] 2bpp tiles (or 16 * [hVBlankCopySize] tile map entries) +; from hVBlankCopySource to hVBlankCopyDest. ; Source and destination addresses are updated, ; so transfer can continue in subsequent calls. - ld a, [H_VBCOPYSIZE] + ldh a, [hVBlankCopySize] and a ret z ld hl, sp + 0 ld a, h - ld [H_SPTEMP], a + ldh [hSPTemp], a ld a, l - ld [H_SPTEMP + 1], a + ldh [hSPTemp + 1], a - ld a, [H_VBCOPYSRC] + ldh a, [hVBlankCopySource] ld l, a - ld a, [H_VBCOPYSRC + 1] + ldh a, [hVBlankCopySource + 1] ld h, a ld sp, hl - ld a, [H_VBCOPYDEST] + ldh a, [hVBlankCopyDest] ld l, a - ld a, [H_VBCOPYDEST + 1] + ldh a, [hVBlankCopyDest + 1] ld h, a - ld a, [H_VBCOPYSIZE] + ldh a, [hVBlankCopySize] ld b, a xor a ; transferred - ld [H_VBCOPYSIZE], a + ldh [hVBlankCopySize], a .loop - rept 7 + REPT 7 pop de ld [hl], e inc l ld [hl], d inc l - endr + ENDR pop de ld [hl], e @@ -356,19 +356,19 @@ VBlankCopy:: jr nz, .loop ld a, l - ld [H_VBCOPYDEST], a + ldh [hVBlankCopyDest], a ld a, h - ld [H_VBCOPYDEST + 1], a + ldh [hVBlankCopyDest + 1], a ld hl, sp + 0 ld a, l - ld [H_VBCOPYSRC], a + ldh [hVBlankCopySource], a ld a, h - ld [H_VBCOPYSRC + 1], a + ldh [hVBlankCopySource + 1], a - ld a, [H_SPTEMP] + ldh a, [hSPTemp] ld h, a - ld a, [H_SPTEMP + 1] + ldh a, [hSPTemp + 1] ld l, a ld sp, hl @@ -379,13 +379,13 @@ UpdateMovingBgTiles:: ; Animate water and flower ; tiles in the overworld. - ld a, [hTilesetType] + ldh a, [hTileAnimations] and a ret z ; no animations if indoors (or if a menu set this to 0) - ld a, [hMovingBGTilesCounter1] + ldh a, [hMovingBGTilesCounter1] inc a - ld [hMovingBGTilesCounter1], a + ldh [hMovingBGTilesCounter1], a cp 20 ret c cp 21 @@ -393,7 +393,7 @@ UpdateMovingBgTiles:: ; water - ld hl, vTileset + $14 * $10 + ld hl, vTileset tile $14 ld c, $10 ld a, [wMovingBGTilesCounter2] @@ -417,17 +417,17 @@ UpdateMovingBgTiles:: dec c jr nz, .left .done - ld a, [hTilesetType] + ldh a, [hTileAnimations] rrca ret nc ; if in a cave, no flower animations xor a - ld [hMovingBGTilesCounter1], a + ldh [hMovingBGTilesCounter1], a ret .flower xor a - ld [hMovingBGTilesCounter1], a + ldh [hMovingBGTilesCounter1], a ld a, [wMovingBGTilesCounter2] and 3 @@ -438,7 +438,7 @@ UpdateMovingBgTiles:: jr z, .copy ld hl, FlowerTile3 .copy - ld de, vTileset + $3 * $10 + ld de, vTileset tile $03 ld c, $10 .loop ld a, [hli] diff --git a/home/window.asm b/home/window.asm new file mode 100644 index 00000000..0182bdd3 --- /dev/null +++ b/home/window.asm @@ -0,0 +1,294 @@ +HandleMenuInput:: + xor a + ld [wPartyMenuAnimMonEnabled], a + +HandleMenuInput_:: + ldh a, [hDownArrowBlinkCount1] + push af + ldh a, [hDownArrowBlinkCount2] + push af ; save existing values on stack + xor a + ldh [hDownArrowBlinkCount1], a ; blinking down arrow timing value 1 + ld a, 6 + ldh [hDownArrowBlinkCount2], a ; blinking down arrow timing value 2 +.loop1 + xor a + ld [wAnimCounter], a ; counter for pokemon shaking animation + call PlaceMenuCursor + call Delay3 +.loop2 + push hl + ld a, [wPartyMenuAnimMonEnabled] + and a ; is it a pokemon selection menu? + jr z, .getJoypadState + farcall AnimatePartyMon ; shake mini sprite of selected pokemon +.getJoypadState + pop hl + call JoypadLowSensitivity + ldh a, [hJoy5] + and a ; was a key pressed? + jr nz, .keyPressed + push hl + hlcoord 18, 11 ; coordinates of blinking down arrow in some menus + call HandleDownArrowBlinkTiming ; blink down arrow (if any) + pop hl + ld a, [wMenuJoypadPollCount] + dec a + jr z, .giveUpWaiting + jr .loop2 +.giveUpWaiting +; if a key wasn't pressed within the specified number of checks + pop af + ldh [hDownArrowBlinkCount2], a + pop af + ldh [hDownArrowBlinkCount1], a ; restore previous values + xor a + ld [wMenuWrappingEnabled], a ; disable menu wrapping + ret +.keyPressed + xor a + ld [wCheckFor180DegreeTurn], a + ldh a, [hJoy5] + ld b, a + bit 6, a ; pressed Up key? + jr z, .checkIfDownPressed +.upPressed + ld a, [wCurrentMenuItem] ; selected menu item + and a ; already at the top of the menu? + jr z, .alreadyAtTop +.notAtTop + dec a + ld [wCurrentMenuItem], a ; move selected menu item up one space + jr .checkOtherKeys +.alreadyAtTop + ld a, [wMenuWrappingEnabled] + and a ; is wrapping around enabled? + jr z, .noWrappingAround + ld a, [wMaxMenuItem] + ld [wCurrentMenuItem], a ; wrap to the bottom of the menu + jr .checkOtherKeys +.checkIfDownPressed + bit 7, a + jr z, .checkOtherKeys +.downPressed + ld a, [wCurrentMenuItem] + inc a + ld c, a + ld a, [wMaxMenuItem] + cp c + jr nc, .notAtBottom +.alreadyAtBottom + ld a, [wMenuWrappingEnabled] + and a ; is wrapping around enabled? + jr z, .noWrappingAround + ld c, $00 ; wrap from bottom to top +.notAtBottom + ld a, c + ld [wCurrentMenuItem], a +.checkOtherKeys + ld a, [wMenuWatchedKeys] + and b ; does the menu care about any of the pressed keys? + jp z, .loop1 +.checkIfAButtonOrBButtonPressed + ldh a, [hJoy5] + and A_BUTTON | B_BUTTON + jr z, .skipPlayingSound +.AButtonOrBButtonPressed + push hl + ld hl, wFlags_0xcd60 + bit 5, [hl] + pop hl + jr nz, .skipPlayingSound + ld a, SFX_PRESS_AB + call PlaySound +.skipPlayingSound + pop af + ldh [hDownArrowBlinkCount2], a + pop af + ldh [hDownArrowBlinkCount1], a ; restore previous values + xor a + ld [wMenuWrappingEnabled], a ; disable menu wrapping + ldh a, [hJoy5] + ret +.noWrappingAround + ld a, [wMenuWatchMovingOutOfBounds] + and a ; should we return if the user tried to go past the top or bottom? + jr z, .checkOtherKeys + jr .checkIfAButtonOrBButtonPressed + +PlaceMenuCursor:: + ld a, [wTopMenuItemY] + and a ; is the y coordinate 0? + jr z, .adjustForXCoord + hlcoord 0, 0 + ld bc, SCREEN_WIDTH +.topMenuItemLoop + add hl, bc + dec a + jr nz, .topMenuItemLoop +.adjustForXCoord + ld a, [wTopMenuItemX] + ld b, 0 + ld c, a + add hl, bc + push hl + ld a, [wLastMenuItem] + and a ; was the previous menu id 0? + jr z, .checkForArrow1 + push af + ldh a, [hUILayoutFlags] + bit 1, a ; is the menu double spaced? + jr z, .doubleSpaced1 + ld bc, 20 + jr .getOldMenuItemScreenPosition +.doubleSpaced1 + ld bc, 40 +.getOldMenuItemScreenPosition + pop af +.oldMenuItemLoop + add hl, bc + dec a + jr nz, .oldMenuItemLoop +.checkForArrow1 + ld a, [hl] + cp "▶" ; was an arrow next to the previously selected menu item? + jr nz, .skipClearingArrow +.clearArrow + ld a, [wTileBehindCursor] + ld [hl], a +.skipClearingArrow + pop hl + ld a, [wCurrentMenuItem] + and a + jr z, .checkForArrow2 + push af + ldh a, [hUILayoutFlags] + bit 1, a ; is the menu double spaced? + jr z, .doubleSpaced2 + ld bc, 20 + jr .getCurrentMenuItemScreenPosition +.doubleSpaced2 + ld bc, 40 +.getCurrentMenuItemScreenPosition + pop af +.currentMenuItemLoop + add hl, bc + dec a + jr nz, .currentMenuItemLoop +.checkForArrow2 + ld a, [hl] + cp "▶" ; has the right arrow already been placed? + jr z, .skipSavingTile ; if so, don't lose the saved tile + ld [wTileBehindCursor], a ; save tile before overwriting with right arrow +.skipSavingTile + ld a, "▶" ; place right arrow + ld [hl], a + ld a, l + ld [wMenuCursorLocation], a + ld a, h + ld [wMenuCursorLocation + 1], a + ld a, [wCurrentMenuItem] + ld [wLastMenuItem], a + ret + +; This is used to mark a menu cursor other than the one currently being +; manipulated. In the case of submenus, this is used to show the location of +; the menu cursor in the parent menu. In the case of swapping items in list, +; this is used to mark the item that was first chosen to be swapped. +PlaceUnfilledArrowMenuCursor:: + ld b, a + ld a, [wMenuCursorLocation] + ld l, a + ld a, [wMenuCursorLocation + 1] + ld h, a + ld [hl], "▷" + ld a, b + ret + +; Replaces the menu cursor with a blank space. +EraseMenuCursor:: + ld a, [wMenuCursorLocation] + ld l, a + ld a, [wMenuCursorLocation + 1] + ld h, a + ld [hl], " " + ret + +; This toggles a blinking down arrow at hl on and off after a delay has passed. +; This is often called even when no blinking is occurring. +; The reason is that most functions that call this initialize hDownArrowBlinkCount1 to 0. +; The effect is that if the tile at hl is initialized with a down arrow, +; this function will toggle that down arrow on and off, but if the tile isn't +; initialized with a down arrow, this function does nothing. +; That allows this to be called without worrying about if a down arrow should +; be blinking. +HandleDownArrowBlinkTiming:: + ld a, [hl] + ld b, a + ld a, "▼" + cp b + jr nz, .downArrowOff +.downArrowOn + ldh a, [hDownArrowBlinkCount1] + dec a + ldh [hDownArrowBlinkCount1], a + ret nz + ldh a, [hDownArrowBlinkCount2] + dec a + ldh [hDownArrowBlinkCount2], a + ret nz + ld a, " " + ld [hl], a + ld a, $ff + ldh [hDownArrowBlinkCount1], a + ld a, $06 + ldh [hDownArrowBlinkCount2], a + ret +.downArrowOff + ldh a, [hDownArrowBlinkCount1] + and a + ret z + dec a + ldh [hDownArrowBlinkCount1], a + ret nz + dec a + ldh [hDownArrowBlinkCount1], a + ldh a, [hDownArrowBlinkCount2] + dec a + ldh [hDownArrowBlinkCount2], a + ret nz + ld a, $06 + ldh [hDownArrowBlinkCount2], a + ld a, "▼" + ld [hl], a + ret + +; The following code either enables or disables the automatic drawing of +; text boxes by DisplayTextID. Both functions cause DisplayTextID to wait +; for a button press after displaying text (unless [wEnteringCableClub] is set). + +EnableAutoTextBoxDrawing:: + xor a + jr AutoTextBoxDrawingCommon + +DisableAutoTextBoxDrawing:: + ld a, TRUE + +AutoTextBoxDrawingCommon:: + ld [wAutoTextBoxDrawingControl], a + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a ; make DisplayTextID wait for button press + ret + +PrintText:: +; Print text hl at (1, 14). + push hl + ld a, MESSAGE_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + call UpdateSprites + call Delay3 + pop hl +PrintText_NoCreatingTextBox:: + bccoord 1, 14 + jp TextCommandProcessor diff --git a/home/yes_no.asm b/home/yes_no.asm new file mode 100644 index 00000000..5b0e09ed --- /dev/null +++ b/home/yes_no.asm @@ -0,0 +1,40 @@ +; displays yes/no choice +; yes -> set carry +YesNoChoice:: + call SaveScreenTilesToBuffer1 + call InitYesNoTextBoxParameters + jr DisplayYesNoChoice + +Func_35f4:: + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a + call InitYesNoTextBoxParameters + jp DisplayTextBoxID + +InitYesNoTextBoxParameters:: + xor a ; YES_NO_MENU + ld [wTwoOptionMenuID], a + hlcoord 14, 7 + lb bc, 8, 15 + ret + +YesNoChoicePokeCenter:: + call SaveScreenTilesToBuffer1 + ld a, HEAL_CANCEL_MENU + ld [wTwoOptionMenuID], a + hlcoord 11, 6 + lb bc, 8, 12 + jr DisplayYesNoChoice + +WideYesNoChoice:: ; unused + call SaveScreenTilesToBuffer1 + ld a, WIDE_YES_NO_MENU + ld [wTwoOptionMenuID], a + hlcoord 12, 7 + lb bc, 8, 13 + +DisplayYesNoChoice:: + ld a, TWO_OPTION_MENU + ld [wTextBoxID], a + call DisplayTextBoxID + jp LoadScreenTilesFromBuffer1 diff --git a/hram.asm b/hram.asm index 57c75e1c..0607a484 100644 --- a/hram.asm +++ b/hram.asm @@ -1,325 +1,402 @@ -hSoftReset EQU $FF8A +SECTION "HRAM", HRAM + ; Initialized to 16. ; Decremented each input iteration if the player ; presses the reset sequence (A+B+SEL+START). ; Soft reset when 0 is reached. +hSoftReset:: db -; base tile ID to which offsets are added -hBaseTileID EQU $FF8B +UNION +hBaseTileID:: ; base tile ID to which offsets are added +hDexWeight:: +hWarpDestinationMap:: +hOAMTile:: +hROMBankTemp:: +hPreviousTileset:: +hRLEByteValue:: + db -; 3-byte BCD number -hItemPrice EQU $FF8B +hSpriteIndexOrTextID:: ; DisplayTextID's argument +hPartyMonIndex:: + db -hDexWeight EQU $FF8B +hVRAMSlot:: + db -hWarpDestinationMap EQU $FF8B +hFourTileSpriteCount:: +hHalveItemPrices:: + db -hOAMTile EQU $FF8B +NEXTU +hItemPrice:: ds 3 ; BCD number -hROMBankTemp EQU $FF8B - -hPreviousTileset EQU $FF8B - -hEastWestConnectedMapWidth EQU $FF8B - -hSlideAmount EQU $FF8B - -hRLEByteValue EQU $FF8B - -H_SPRITEWIDTH EQU $FF8B ; in tiles -H_SPRITEINTERLACECOUNTER EQU $FF8B -H_SPRITEHEIGHT EQU $FF8C ; in tiles -H_SPRITEOFFSET EQU $FF8D - -; counters for blinking down arrow -H_DOWNARROWBLINKCNT1 EQU $FF8B -H_DOWNARROWBLINKCNT2 EQU $FF8C - -H_SPRITEDATAOFFSET EQU $FF8B -H_SPRITEINDEX EQU $FF8C - -hMapStride EQU $FF8B -hMapWidth EQU $FF8C - -hNorthSouthConnectionStripWidth EQU $FF8B -hNorthSouthConnectedMapWidth EQU $FF8C - -; DisplayTextID's argument -hSpriteIndexOrTextID EQU $FF8C - -hPartyMonIndex EQU $FF8C +NEXTU +hSlideAmount:: db ; the total number of tiles being shifted each time the pic slides by one tile -hSlidingRegionSize EQU $FF8C - -; 2 bytes -hEnemySpeed EQU $FF8D - -hVRAMSlot EQU $FF8D - -hFourTileSpriteCount EQU $FF8E +hSlidingRegionSize:: db ; -1 = left ; 0 = right -hSlideDirection EQU $FF8D +hSlideDirection:: db -hSpriteFacingDirection EQU $FF8D +NEXTU +hSpriteInterlaceCounter:: +hSpriteWidth:: db ; in tiles +hSpriteHeight:: db ; in tiles +hSpriteOffset:: db -hSpriteMovementByte2 EQU $FF8D +NEXTU +; counters for blinking down arrow +hDownArrowBlinkCount1:: db +hDownArrowBlinkCount2:: db -hSpriteImageIndex EQU $FF8D +NEXTU +hMapStride:: +hEastWestConnectedMapWidth:: +hNorthSouthConnectionStripWidth:: + db +hMapWidth:: +hNorthSouthConnectedMapWidth:: + db -hLoadSpriteTemp1 EQU $FF8D -hLoadSpriteTemp2 EQU $FF8E +NEXTU +hSpriteDataOffset:: db +hSpriteIndex:: db +hSpriteImageIndex:: +hSpriteFacingDirection:: +hSpriteMovementByte2:: + db -hHalveItemPrices EQU $FF8E +NEXTU + ds 2 +hLoadSpriteTemp1:: db +hLoadSpriteTemp2:: db -hSpriteOffset2 EQU $FF8F +NEXTU + ds 2 +hEnemySpeed:: dw +ENDU -hOAMBufferOffset EQU $FF90 +UNION +hSpriteOffset2:: db +hOAMBufferOffset:: db +hSpriteScreenX:: db +hSpriteScreenY:: db -hSpriteScreenX EQU $FF91 -hSpriteScreenY EQU $FF92 +NEXTU +hFF8F:: db +hFF90:: db +hFF91:: db +hFF92:: db +ENDU -hTilePlayerStandingOn EQU $FF93 +hTilePlayerStandingOn:: db -hSpritePriority EQU $FF94 - -; 2 bytes -hSignCoordPointer EQU $FF95 - -hNPCMovementDirections2Index EQU $FF95 - -; CalcPositionOfPlayerRelativeToNPC -hNPCSpriteOffset EQU $FF95 - -; temp value used when swapping bytes -hSwapTemp EQU $FF95 - -hExperience EQU $FF96 ; 3 bytes, big endian +hSpritePriority:: db +UNION ; Multiplication and division variables are meant ; to overlap for back-to-back usage. Big endian. +UNION + ds 1 +hMultiplicand:: ds 3 +hMultiplier:: db + ds 1 +hMultiplyBuffer:: ds 4 +NEXTU +hProduct:: ds 4 +NEXTU +hDividend:: ds 4 +hDivisor:: db +hDivideBuffer:: ds 5 +NEXTU +hQuotient:: ds 4 +hRemainder:: db +ENDU -H_MULTIPLICAND EQU $FF96 ; 3 bytes -H_MULTIPLIER EQU $FF99 ; 1 byte -H_PRODUCT EQU $FF95 ; 4 bytes - -H_DIVIDEND EQU $FF95 ; 4 bytes -H_DIVISOR EQU $FF99 ; 1 byte -H_QUOTIENT EQU $FF95 ; 4 bytes -H_REMAINDER EQU $FF99 ; 1 byte - -H_DIVIDEBUFFER EQU $FF9A - -H_MULTIPLYBUFFER EQU $FF9B - +NEXTU ; PrintNumber (big endian). -H_PASTLEADINGZEROES EQU $FF95 ; last char printed -H_NUMTOPRINT EQU $FF96 ; 3 bytes -H_POWEROFTEN EQU $FF99 ; 3 bytes -H_SAVEDNUMTOPRINT EQU $FF9C ; 3 bytes +hPastLeadingZeros:: db ; last char printed +hNumToPrint:: ds 3 +hPowerOf10:: ds 3 +hSavedNumToPrint:: ds 3 +NEXTU +hNPCMovementDirections2Index:: +hNPCSpriteOffset:: ; distance in steps between NPC and player -hNPCPlayerYDistance EQU $FF95 -hNPCPlayerXDistance EQU $FF96 - -hFindPathNumSteps EQU $FF97 - +hNPCPlayerYDistance:: + db +hNPCPlayerXDistance:: + db +hFindPathNumSteps:: db ; bit 0: set when the end of the path's Y coordinate matches the target's ; bit 1: set when the end of the path's X coordinate matches the target's ; When both bits are set, the end of the path is at the target's position ; (i.e. the path has been found). -hFindPathFlags EQU $FF98 - -hFindPathYProgress EQU $FF99 -hFindPathXProgress EQU $FF9A - +hFindPathFlags:: db +hFindPathYProgress:: db +hFindPathXProgress:: db ; 0 = from player to NPC ; 1 = from NPC to player -hNPCPlayerRelativePosPerspective EQU $FF9B - +hNPCPlayerRelativePosPerspective:: db + ds 1 ; bit 0: ; 0 = target is to the south or aligned ; 1 = target is to the north ; bit 1: ; 0 = target is to the east or aligned ; 1 = target is to the west -hNPCPlayerRelativePosFlags EQU $FF9D +hNPCPlayerRelativePosFlags:: db +NEXTU +hSwapItemID:: db +hSwapItemQuantity:: db + +NEXTU +hSignCoordPointer:: dw + +NEXTU + ds 1 +hMutateWY:: db +hMutateWX:: db + +NEXTU +; temp value used when swapping bytes or words +hSwapTemp:: db +hExperience:: ds 3 ; big endian +ENDU + +UNION +hMoney:: ds 3 ; BCD number +NEXTU ; some code zeroes this for no reason when writing a coin amount -hUnusedCoinsByte EQU $FF9F +hUnusedCoinsByte:: db +hCoins:: ds 2 ; BCD number +ENDU -hMoney EQU $FF9F ; 3-byte BCD number -hCoins EQU $FFA0 ; 2-byte BCD number +hDivideBCDDivisor:: +hDivideBCDQuotient:: + ds 3 ; BCD number +hDivideBCDBuffer:: + ds 3 ; BCD number -hDivideBCDDivisor EQU $FFA2 ; 3-byte BCD number -hDivideBCDQuotient EQU $FFA2 ; 3-byte BCD number -hDivideBCDBuffer EQU $FFA5 ; 3-byte BCD number - -hSerialReceivedNewData EQU $FFA9 + ds 1 +hSerialReceivedNewData:: db ; $01 = using external clock ; $02 = using internal clock ; $ff = establishing connection -hSerialConnectionStatus EQU $FFAA +hSerialConnectionStatus:: db +hSerialIgnoringInitialData:: db +hSerialSendData:: db +hSerialReceiveData:: db -hSerialIgnoringInitialData EQU $FFAB +; these values are copied to rSCX, rSCY, and rWY during V-blank +hSCX:: db +hSCY:: db +hWY:: db -hSerialSendData EQU $FFAC +hJoyLast:: db +hJoyReleased:: db +hJoyPressed:: db +hJoyHeld:: db +hJoy5:: db +hJoy6:: db +hJoy7:: db -hSerialReceiveData EQU $FFAD - -; these values are copied to SCX, SCY, and WY during V-blank -hSCX EQU $FFAE -hSCY EQU $FFAF -hWY EQU $FFB0 - -hJoyLast EQU $FFB1 -hJoyReleased EQU $FFB2 -hJoyPressed EQU $FFB3 -hJoyHeld EQU $FFB4 -hJoy5 EQU $FFB5 -hJoy6 EQU $FFB6 -hJoy7 EQU $FFB7 - -H_LOADEDROMBANK EQU $FFB8 -hROMBank EQU $FFB8 ; XXXXX - -hSavedROMBank EQU $FFB9 +hLoadedROMBank:: db +hSavedROMBank:: db ; is automatic background transfer during V-blank enabled? ; if nonzero, yes ; if zero, no -H_AUTOBGTRANSFERENABLED EQU $FFBA - -TRANSFERTOP EQU 0 -TRANSFERMIDDLE EQU 1 -TRANSFERBOTTOM EQU 2 +hAutoBGTransferEnabled:: db ; 00 = top third of background ; 01 = middle third of background ; 02 = bottom third of background -H_AUTOBGTRANSFERPORTION EQU $FFBB +hAutoBGTransferPortion:: db ; the destination address of the automatic background transfer -H_AUTOBGTRANSFERDEST EQU $FFBC ; 2 bytes +hAutoBGTransferDest:: dw + +hRedrawMapViewRowOffset:: db ; temporary storage for stack pointer during memory transfers that use pop ; to increase speed -H_SPTEMP EQU $FFBF ; 2 bytes +hSPTemp:: dw ; source address for VBlankCopyBgMap function ; the first byte doubles as the byte that enabled the transfer. ; if it is 0, the transfer is disabled ; if it is not 0, the transfer is enabled ; this means that XX00 is not a valid source address -H_VBCOPYBGSRC EQU $FFC1 ; 2 bytes +hVBlankCopyBGSource:: dw ; destination address for VBlankCopyBgMap function -H_VBCOPYBGDEST EQU $FFC3 ; 2 bytes +hVBlankCopyBGDest:: dw ; number of rows for VBlankCopyBgMap to copy -H_VBCOPYBGNUMROWS EQU $FFC5 +hVBlankCopyBGNumRows:: db ; size of VBlankCopy transfer in 16-byte units -H_VBCOPYSIZE EQU $FFC6 +hVBlankCopySize:: db ; source address for VBlankCopy function -H_VBCOPYSRC EQU $FFC7 +hVBlankCopySource:: dw ; destination address for VBlankCopy function -H_VBCOPYDEST EQU $FFC9 +hVBlankCopyDest:: dw ; size of source data for VBlankCopyDouble in 8-byte units -H_VBCOPYDOUBLESIZE EQU $FFCB +hVBlankCopyDoubleSize:: db ; source address for VBlankCopyDouble function -H_VBCOPYDOUBLESRC EQU $FFCC +hVBlankCopyDoubleSource:: dw ; destination address for VBlankCopyDouble function -H_VBCOPYDOUBLEDEST EQU $FFCE +hVBlankCopyDoubleDest:: dw ; controls whether a row or column of 2x2 tile blocks is redrawn in V-blank ; 00 = no redraw ; 01 = redraw column ; 02 = redraw row -hRedrawRowOrColumnMode EQU $FFD0 +hRedrawRowOrColumnMode:: db -REDRAW_COL EQU 1 -REDRAW_ROW EQU 2 +hRedrawRowOrColumnDest:: dw -hRedrawRowOrColumnDest EQU $FFD1 +hRandomAdd:: db +hRandomSub:: db -hRandomAdd EQU $FFD3 -hRandomSub EQU $FFD4 - -H_FRAMECOUNTER EQU $FFD5 ; decremented every V-blank (used for delays) +hFrameCounter:: db ; decremented every V-blank (used for delays) ; V-blank sets this to 0 each time it runs. ; So, by setting it to a nonzero value and waiting for it to become 0 again, ; you can detect that the V-blank handler has run since then. -H_VBLANKOCCURRED EQU $FFD6 +hVBlankOccurred:: db -; 00 = indoor -; 01 = cave -; 02 = outdoor -; this is often set to 00 in order to turn off water and flower BG tile animations -hTilesetType EQU $FFD7 +; Controls which tiles are animated. +; 0 = no animations (breaks Surf) +; 1 = water tile $14 is animated +; 2 = water tile $14 and flower tile $03 are animated +hTileAnimations:: db -hMovingBGTilesCounter1 EQU $FFD8 +hMovingBGTilesCounter1:: db -H_CURRENTSPRITEOFFSET EQU $FFDA ; multiple of $10 + ds 1 -hItemCounter EQU $FFDB +hCurrentSpriteOffset:: db ; multiple of $10 -hGymGateIndex EQU $FFDB +UNION +hPlayerFacing:: db +hPlayerYCoord:: db +hPlayerXCoord:: db -hGymTrashCanRandNumMask EQU $FFDB - -hDexRatingNumMonsSeen EQU $FFDB -hDexRatingNumMonsOwned EQU $FFDC +NEXTU ; $00 = bag full ; $01 = got item ; $80 = didn't meet required number of owned mons ; $FF = player cancelled -hOaksAideResult EQU $FFDB +hOaksAideResult:: +hOaksAideRequirement:: ; required number of owned mons + db +hOaksAideRewardItem:: db +hOaksAideNumMonsOwned:: db -hOaksAideRequirement EQU $FFDB ; required number of owned mons -hOaksAideRewardItem EQU $FFDC -hOaksAideNumMonsOwned EQU $FFDD +NEXTU +hVendingMachineItem:: db +hVendingMachinePrice:: ds 3 ; BCD number -hItemToRemoveID EQU $FFDB -hItemToRemoveIndex EQU $FFDC +NEXTU +hGymGateIndex:: db +hGymGateAnswer:: db -hVendingMachineItem EQU $FFDB -hVendingMachinePrice EQU $FFDC ; 3-byte BCD number +NEXTU +hDexRatingNumMonsSeen:: db +hDexRatingNumMonsOwned:: db + +NEXTU +hItemToRemoveID:: db +hItemToRemoveIndex:: db + +NEXTU +hItemCounter:: +hSavedCoordIndex:: +hMissableObjectIndex:: +hGymTrashCanRandNumMask:: + db + +NEXTU +hFFDB:: db +hFFDC:: db +ENDU + + ds 1 + +hBackupGymGateIndex:: +hUnlockedSilphCoDoors:: + db ; the first tile ID in a sequence of tile IDs that increase by 1 each step -hStartTileID EQU $FFE1 +hStartTileID:: db -hNewPartyLength EQU $FFE4 + ds 2 -hDividend2 EQU $FFE5 -hDivisor2 EQU $FFE6 -hQuotient2 EQU $FFE7 +hNewPartyLength:: db -hSpriteVRAMSlotAndFacing EQU $FFE9 +UNION +hDividend2:: db +hDivisor2:: db +hQuotient2:: db -hCoordsInFrontOfPlayerMatch EQU $FFEA +NEXTU +hIsHiddenMissableObject:: db +ENDU -hSpriteAnimFrameCounter EQU $FFEA +hMapROMBank:: db -H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn +hSpriteVRAMSlotAndFacing:: db + +hCoordsInFrontOfPlayerMatch:: +hSpriteAnimFrameCounter:: + db + +UNION +hSpriteScreenYCoord:: db +hSpriteScreenXCoord:: db +hSpriteMapYCoord:: db +hSpriteMapXCoord:: db + +NEXTU +hItemAlreadyFound:: db + ds 2 +hDidntFindAnyHiddenObject:: db + +NEXTU + ds 1 +hSavedMapTextPtr:: dw + ds 1 +ENDU + + ds 4 + +hWhoseTurn:: db ; 0 on player's turn, 1 on enemy's turn + +hClearLetterPrintingDelayFlags:: db + + ds 1 ; bit 0: draw HP fraction to the right of bar instead of below (for party menu) ; bit 1: menu is double spaced -hFlags_0xFFF6 EQU $FFF6 +hUILayoutFlags:: db -hFieldMoveMonMenuTopMenuItemX EQU $FFF7 +hFieldMoveMonMenuTopMenuItemX:: db -hDisableJoypadPolling EQU $FFF9 +hJoyInput:: db -hJoyInput EQU $FFF8 +hDisableJoypadPolling:: db + ds 5 diff --git a/layout.link b/layout.link new file mode 100644 index 00000000..4e276594 --- /dev/null +++ b/layout.link @@ -0,0 +1,199 @@ +ROM0 + org $0000 + "NULL" + org $0000 + "rst0" + org $0008 + "rst8" + org $0010 + "rst10" + org $0018 + "rst18" + org $0020 + "rst20" + org $0028 + "rst28" + org $0030 + "rst30" + org $0038 + "rst38" + org $0040 + "vblank" + org $0048 + "lcd" + org $0050 + "timer" + org $0058 + "serial" + org $0060 + "joypad" + ; $0061 + "High Home" + org $100 + "Header" + org $150 + "Home" +ROMX $1 + "bank1" +ROMX $2 + "Sound Effect Headers 1" +; "Music Headers 1" + "Sound Effects 1" + "Audio Engine 1" +; "Music 1" +ROMX $3 + "bank3" +ROMX $4 + "NPC Sprites 1" + "Font Graphics" + "Battle Engine 1" +ROMX $5 + "NPC Sprites 2" + "Battle Engine 2" +ROMX $6 + "Maps 1" + "Play Time" + "Maps 2" + "Doors and Ledges" +ROMX $7 + "Maps 3" + "Pokémon Names" + "Maps 4" + "Hidden Objects 1" +ROMX $8 + "Sound Effect Headers 2" +; "Music Headers 2" + "Sound Effects 2" +; "Low Health Alarm (Audio Engine 2)" +; "Bill's PC" +; "Audio Engine 2" +; "Music 2" +ROMX $9 + "Pics 1" + "Battle Engine 3" +ROMX $A + "Pics 2" + "Battle Engine 4" +ROMX $B + "Pics 3" + "Battle Engine 5" +ROMX $C + "Pics 4" + "Battle Engine 6" +ROMX $D + "Pics 5" + "Slot Machines" +ROMX $E + "Battle Engine 7" +ROMX $F + "Battle Core" +ROMX $10 + "bank10" +ROMX $11 + "Maps 5" + "Pokédex Rating" + "Maps 6" + "Hidden Objects Core" +ROMX $12 + "Maps 7" + "Screen Effects" + "Maps 8" +ROMX $13 + "Pics 6" + "Maps 9" + "Predefs" +ROMX $14 + "Maps 10" + "Battle Engine 8" + "Hidden Objects 2" +ROMX $15 + "Maps 11" + "Battle Engine 9" + "Maps 12" + "Diploma" + "Trainer Sight" +ROMX $16 + "Maps 13" + "Battle Engine 10" + "Maps 14" + "Saffron Guards" +ROMX $17 + "Maps 15" + "Starter Dex" + "Maps 16" + "Hidden Objects 3" +ROMX $18 + "Maps 17" + "Cinnabar Lab Fossils" + "Maps 18" + "Hidden Objects 4" +ROMX $19 + "Tilesets 1" +ROMX $1A + "Battle Engine 11" + "Tilesets 2" +ROMX $1B + "Tilesets 3" +ROMX $1C + "bank1C" +ROMX $1D + "Maps 19" + "Itemfinder 1" + "Maps 20" + "Vending Machine" + "Maps 21" + "Itemfinder 2" +ROMX $1E + "bank1E" +ROMX $1F + "Sound Effect Headers 3" +; "Music Headers 3" + "Sound Effects 3" +; "Audio Engine 3" +; "Music 3" +ROMX $20 + "Text 1" +ROMX $21 + "Text 2" +ROMX $22 + "Text 3" +ROMX $23 + "Text 4" +ROMX $24 + "Text 5" +ROMX $25 + "Text 6" +ROMX $26 + "Text 7" +ROMX $27 + "Text 8" +ROMX $28 + "Text 9" +ROMX $29 + "Text 10" +ROMX $2A + "Text 11" +ROMX $2B + "Pokédex Text" +ROMX $2C + "Move Names" +WRAM0 + "WRAM" + org $c100 + "Sprite State Data" + "OAM Buffer" + org $dfff + "Stack" +VRAM + "VRAM" +SRAM $0 + "Sprite Buffers" +SRAM $1 + "Save Data" +SRAM $2 + "Saved Boxes 1" +SRAM $3 + "Saved Boxes 2" +HRAM + "OAM DMA" + "HRAM" diff --git a/macros.asm b/macros.asm index b779ec5f..316b9eba 100644 --- a/macros.asm +++ b/macros.asm @@ -1,5 +1,12 @@ -INCLUDE "macros/asm_macros.asm" -INCLUDE "macros/data_macros.asm" -INCLUDE "macros/text_macros.asm" -INCLUDE "macros/audio_macros.asm" -INCLUDE "macros/event_macros.asm" +INCLUDE "macros/const.asm" +INCLUDE "macros/predef.asm" +INCLUDE "macros/farcall.asm" +INCLUDE "macros/data.asm" +INCLUDE "macros/code.asm" +INCLUDE "macros/gfx.asm" +INCLUDE "macros/coords.asm" + +;INCLUDE "macros/scripts/audio.asm" +INCLUDE "macros/scripts/maps.asm" +INCLUDE "macros/scripts/events.asm" +INCLUDE "macros/scripts/text.asm" diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm deleted file mode 100755 index 50efde33..00000000 --- a/macros/asm_macros.asm +++ /dev/null @@ -1,211 +0,0 @@ - -lb: MACRO ; r, hi, lo - ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) -ENDM - -homecall: MACRO - ld a, [H_LOADEDROMBANK] - push af - ld a, BANK(\1) - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - call \1 - pop af - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a -ENDM - -farcall EQUS "callba" - -callba: MACRO - ld b, BANK(\1) - ld hl, \1 - call Bankswitch -ENDM - -callab: MACRO - ld hl, \1 - ld b, BANK(\1) - call Bankswitch -ENDM - -jpba: MACRO - ld b, BANK(\1) - ld hl, \1 - jp Bankswitch -ENDM - -jpab: MACRO - ld hl, \1 - ld b, BANK(\1) - jp Bankswitch -ENDM - -validateCoords: MACRO - IF \1 >= SCREEN_WIDTH - fail "x coord out of range" - ENDC - IF \2 >= SCREEN_HEIGHT - fail "y coord out of range" - ENDC -ENDM - -;\1 = r -;\2 = X -;\3 = Y -;\4 = which tilemap (optional) -coord: MACRO - validateCoords \2, \3 - IF _NARG >= 4 - ld \1, \4 + SCREEN_WIDTH * \3 + \2 - ELSE - ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 - ENDC -ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -aCoord: MACRO - validateCoords \1, \2 - IF _NARG >= 3 - ld a, [\3 + SCREEN_WIDTH * \2 + \1] - ELSE - ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] - ENDC -ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -Coorda: MACRO - validateCoords \1, \2 - IF _NARG >= 3 - ld [\3 + SCREEN_WIDTH * \2 + \1], a - ELSE - ld [wTileMap + SCREEN_WIDTH * \2 + \1], a - ENDC -ENDM - -;\1 = X -;\2 = Y -;\3 = which tilemap (optional) -dwCoord: MACRO - validateCoords \1, \2 - IF _NARG >= 3 - dw \3 + SCREEN_WIDTH * \2 + \1 - ELSE - dw wTileMap + SCREEN_WIDTH * \2 + \1 - ENDC -ENDM - -;\1 = r -;\2 = X -;\3 = Y -;\4 = map width -overworldMapCoord: MACRO - ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) -ENDM - -; macro for two nibbles -dn: MACRO -rept _NARG / 2 - db ((\1) << 4) | (\2) - shift - shift -endr -ENDM - -; macro for putting a byte then a word -dbw: MACRO - db \1 - dw \2 -ENDM - -dba: MACRO - dbw BANK(\1), \1 -ENDM - -dwb: MACRO - dw \1 - db \2 -ENDM - -dab: MACRO - dwb \1, BANK(\1) -ENDM - -dbbw: MACRO - db \1, \2 - dw \3 -ENDM - -bigdw: MACRO ; big-endian word - dw ((\1)/$100) + (((\1)&$ff)*$100) -ENDM - -dt: MACRO ; three-byte (big-endian) - db (\1 >> 16) & $ff - db (\1 >> 8) & $ff - db \1 & $ff -ENDM - -; Predef macro. -predef_const: MACRO - const \1PredefID -ENDM - -add_predef: MACRO -\1Predef:: - db BANK(\1) - dw \1 -ENDM - -predef_id: MACRO - ld a, (\1Predef - PredefPointers) / 3 -ENDM - -predef: MACRO - predef_id \1 - call Predef -ENDM - -predef_jump: MACRO - predef_id \1 - jp Predef -ENDM - -tx_pre_const: MACRO - const \1_id -ENDM - -add_tx_pre: MACRO -\1_id:: dw \1 -ENDM - -db_tx_pre: MACRO - db (\1_id - TextPredefs) / 2 + 1 -ENDM - -tx_pre_id: MACRO - ld a, (\1_id - TextPredefs) / 2 + 1 -ENDM - -tx_pre: MACRO - tx_pre_id \1 - call PrintPredefTextID -ENDM - -tx_pre_jump: MACRO - tx_pre_id \1 - jp PrintPredefTextID -ENDM - -ldPal: MACRO - ld \1, \2 << 6 | \3 << 4 | \4 << 2 | \5 -ENDM - -inc_section: MACRO - SECTION \1, ROMX - include \1 -ENDM diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm deleted file mode 100755 index fda60df1..00000000 --- a/macros/audio_macros.asm +++ /dev/null @@ -1,177 +0,0 @@ - -StopAllMusic: MACRO - ld a, $ff - call PlaySound -ENDM - -Ch0 EQU 0 -Ch1 EQU 1 -Ch2 EQU 2 -Ch3 EQU 3 -Ch4 EQU 4 -Ch5 EQU 5 -Ch6 EQU 6 -Ch7 EQU 7 - -audio: MACRO - db (_NARG - 2) << 6 | \2 - dw \1_\2 - IF _NARG > 2 - db \3 - dw \1_\3 - ENDC - IF _NARG > 3 - db \4 - dw \1_\4 - ENDC - IF _NARG > 4 - db \5 - dw \1_\5 - ENDC -ENDM - -;format: length [0, 7], pitch change [-7, 7] -pitchenvelope: MACRO - db $dd ; soundinput - IF \2 > 0 - db (\1 << 4) | \2 - ELSE - db (\1 << 4) | (%1000 | (\2 * -1)) - ENDC -ENDM - -;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch -squarenote: MACRO - ; noise/sound - db \1 - ;db $20 | \1 - IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) - ELSE - db (\2 << 4) | \3 - ENDC - dw \4 -ENDM - -;format: length [0, 15], volume [0, 15], volume change [-7, 7], pitch -noisenote: MACRO - db \1 ; | $20 - IF \3 < 0 - db (\2 << 4) | (%1000 | (\3 * -1)) - ELSE - db (\2 << 4) | \3 - ENDC - db \4 -ENDM - - -;format: instrument length (in 16ths) -snare1: MACRO - db $B0 | (\1 - 1) - db $01 -ENDM - -snare2: MACRO - db $B0 | (\1 - 1) - db $02 -ENDM - -snare3: MACRO - db $B0 | (\1 - 1) - db $03 -ENDM - -snare4: MACRO - db $B0 | (\1 - 1) - db $04 -ENDM - -snare5: MACRO - db $B0 | (\1 - 1) - db $05 -ENDM - -triangle1: MACRO - db $B0 | (\1 - 1) - db $06 -ENDM - -triangle2: MACRO - db $B0 | (\1 - 1) - db $07 -ENDM - -snare6: MACRO - db $B0 | (\1 - 1) - db $08 -ENDM - -snare7: MACRO - db $B0 | (\1 - 1) - db $09 -ENDM - -snare8: MACRO - db $B0 | (\1 - 1) - db $0A -ENDM - -snare9: MACRO - db $B0 | (\1 - 1) - db $0B -ENDM - -cymbal1: MACRO - db $B0 | (\1 - 1) - db $0C -ENDM - -cymbal2: MACRO - db $B0 | (\1 - 1) - db $0D -ENDM - -cymbal3: MACRO - db $B0 | (\1 - 1) - db $0E -ENDM - -mutedsnare1: MACRO - db $B0 | (\1 - 1) - db $0F -ENDM - -triangle3: MACRO - db $B0 | (\1 - 1) - db $10 -ENDM - -mutedsnare2: MACRO - db $B0 | (\1 - 1) - db $11 -ENDM - -mutedsnare3: MACRO - db $B0 | (\1 - 1) - db $12 -ENDM - -mutedsnare4: MACRO - db $B0 | (\1 - 1) - db $13 -ENDM - -duty: MACRO - ;db $EC - db $db - db \1 -ENDM - -;format: rest length (in 16ths) -rest: MACRO - db $C0 | (\1 - 1) -ENDM - -executemusic: MACRO - togglesfx -ENDM diff --git a/macros/code.asm b/macros/code.asm new file mode 100644 index 00000000..e0b3e9c9 --- /dev/null +++ b/macros/code.asm @@ -0,0 +1,20 @@ +; Syntactic sugar macros + +lb: MACRO ; r, hi, lo + ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) +ENDM + +ldpal: MACRO + ld \1, \2 << 6 | \3 << 4 | \4 << 2 | \5 +ENDM + +; Design patterns + +dict: MACRO +IF \1 == 0 + and a +ELSE + cp \1 +ENDC + jp z, \2 +ENDM diff --git a/macros/const.asm b/macros/const.asm new file mode 100644 index 00000000..57380e97 --- /dev/null +++ b/macros/const.asm @@ -0,0 +1,40 @@ +; Enumerate constants + +const_def: MACRO +IF _NARG >= 1 +const_value = \1 +ELSE +const_value = 0 +ENDC +IF _NARG >= 2 +const_inc = \2 +ELSE +const_inc = 1 +ENDC +ENDM + +const: MACRO +\1 EQU const_value +const_value = const_value + const_inc +ENDM + +shift_const: MACRO +\1 EQU (1 << const_value) +const_value = const_value + const_inc +ENDM + +const_skip: MACRO +if _NARG >= 1 +const_value = const_value + const_inc * (\1) +else +const_value = const_value + const_inc +endc +ENDM + +const_next: MACRO +if (const_value > 0 && \1 < const_value) || (const_value < 0 && \1 > const_value) +fail "const_next cannot go backwards from {const_value} to \1" +else +const_value = \1 +endc +ENDM diff --git a/macros/coords.asm b/macros/coords.asm new file mode 100644 index 00000000..6b16e7f7 --- /dev/null +++ b/macros/coords.asm @@ -0,0 +1,90 @@ +validate_coords: MACRO + IF _NARG >= 4 + IF \1 >= \3 + fail "x coord out of range" + ENDC + IF \2 >= \4 + fail "y coord out of range" + ENDC + ELSE + validate_coords \1, \2, SCREEN_WIDTH, SCREEN_HEIGHT + ENDC +ENDM + +hlcoord EQUS "coord hl," +bccoord EQUS "coord bc," +decoord EQUS "coord de," + +coord: MACRO +; register, x, y[, origin] + validate_coords \2, \3 + IF _NARG >= 4 + ld \1, (\3) * SCREEN_WIDTH + (\2) + \4 + ELSE + ld \1, (\3) * SCREEN_WIDTH + (\2) + wTileMap + ENDC +ENDM + +hlbgcoord EQUS "bgcoord hl," +bcbgcoord EQUS "bgcoord bc," +debgcoord EQUS "bgcoord de," + +bgcoord: MACRO +; register, x, y[, origin] + validate_coords \2, \3, BG_MAP_WIDTH, BG_MAP_HEIGHT + IF _NARG >= 4 + ld \1, (\3) * BG_MAP_WIDTH + (\2) + \4 + ELSE + ld \1, (\3) * BG_MAP_WIDTH + (\2) + vBGMap0 + ENDC +ENDM + +hlowcoord EQUS "owcoord hl," +bcowcoord EQUS "owcoord bc," +deowcoord EQUS "owcoord de," + +owcoord: MACRO +; register, x, y, map width + ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) +ENDM + +event_displacement: MACRO +; map width, x blocks, y blocks + dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\3) >> 1) + ((\2) >> 1)) + db \3, \2 +ENDM + +dwcoord: MACRO +; x, y + validate_coords \1, \2 + IF _NARG >= 3 + dw (\2) * SCREEN_WIDTH + (\1) + \3 + ELSE + dw (\2) * SCREEN_WIDTH + (\1) + wTileMap + ENDC +ENDM + +ldcoord_a: MACRO +; x, y[, origin] + validate_coords \1, \2 + IF _NARG >= 3 + ld [(\2) * SCREEN_WIDTH + (\1) + \3], a + ELSE + ld [(\2) * SCREEN_WIDTH + (\1) + wTileMap], a + ENDC +ENDM + +lda_coord: MACRO +; x, y[, origin] + validate_coords \1, \2 + IF _NARG >= 3 + ld a, [(\2) * SCREEN_WIDTH + (\1) + \3] + ELSE + ld a, [(\2) * SCREEN_WIDTH + (\1) + wTileMap] + ENDC +ENDM + +dbmapcoord: MACRO +; x, y + db \2, \1 +ENDM diff --git a/macros/data.asm b/macros/data.asm new file mode 100644 index 00000000..accc873d --- /dev/null +++ b/macros/data.asm @@ -0,0 +1,84 @@ +; Value macros + +percent EQUS "* $ff / 100" + +bcd2: MACRO + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 +ENDM + +bcd3: MACRO + dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 +ENDM + +coins EQUS "bcd2" +money EQUS "bcd3" + +; used in data/pokemon/base_stats/*.asm +tmhm: MACRO +; initialize bytes to 0 +n = 0 +REPT (NUM_TM_HM + 7) / 8 +_TM_BYTE EQUS "_tm{d:n}" +_TM_BYTE = 0 +PURGE _TM_BYTE +n = n + 1 +ENDR +; set bits of bytes +REPT _NARG + IF DEF(\1_TMNUM) +n = (\1_TMNUM - 1) / 8 +i = (\1_TMNUM - 1) % 8 +_TM_BYTE EQUS "_tm{d:n}" +_TM_BYTE = _TM_BYTE | (1 << i) +PURGE _TM_BYTE + ELSE + FAIL "\1 is not a TM or HM move" + ENDC + SHIFT +ENDR +; output bytes +n = 0 +REPT (NUM_TM_HM + 7) / 8 +_TM_BYTE EQUS "_tm{d:n}" + db _TM_BYTE +PURGE _TM_BYTE +n = n + 1 +ENDR +ENDM + + +; Constant data (db, dw, dl) macros + +dn: MACRO ; nybbles +rept _NARG / 2 + db ((\1) << 4) | (\2) + shift + shift +endr +ENDM + +dbw: MACRO + db \1 + dw \2 +ENDM + +dba: MACRO + dbw BANK(\1), \1 +ENDM + +dwb: MACRO + dw \1 + db \2 +ENDM + +dab: MACRO + dwb \1, BANK(\1) +ENDM + +dbbw: MACRO + db \1, \2 + dw \3 +ENDM diff --git a/macros/data_macros.asm b/macros/data_macros.asm deleted file mode 100755 index 371247d3..00000000 --- a/macros/data_macros.asm +++ /dev/null @@ -1,246 +0,0 @@ - -; Constant enumeration is useful for monsters, items, moves, etc. -const_def: MACRO -if _NARG >= 1 -const_value = \1 -else -const_value = 0 -endc -ENDM - -const: MACRO -\1 EQU const_value -const_value = const_value + 1 -ENDM - -; data format macros - -percent EQUS "* $ff / 100" - -bcd2: MACRO - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 -ENDM - -bcd3: MACRO - dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 -ENDM - -coins equs "bcd2" -money equs "bcd3" - -;\1 = Map Width -;\2 = Rows above (Y-blocks) -;\3 = X movement (X-blocks) -EVENT_DISP: MACRO - dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp - db \2,\3 ;Y,X -ENDM - -FLYWARP_DATA: MACRO - EVENT_DISP \1,\2,\3 - db ((\2) & $01) ;sub-block Y - db ((\3) & $01) ;sub-block X -ENDM - -; external map entry macro -EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer -; the appearance of towns and routes in the town map, indexed by map id - ; nybble: y-coordinate - ; nybble: x-coordinate - ; word : pointer to map name - dn \2, \1 - dw \3 -ENDM - -; internal map entry macro -IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer -; the appearance of buildings and dungeons in the town map - ; byte : maximum map id subject to this rule - ; nybble: y-coordinate - ; nybble: x-coordinate - ; word : pointer to map name - db \1 + 1 - dn \3, \2 - dw \4 -ENDM - -; tilesets' headers macro -tileset: MACRO - db BANK(\2) ; BANK(GFX) - dw \1, \2, \3 ; Block, GFX, Coll - db \4, \5, \6 ; counter tiles - db \7 ; grass tile - db \8 ; permission (indoor, cave, outdoor) -ENDM - -INDOOR EQU 0 -CAVE EQU 1 -OUTDOOR EQU 2 - -RGB: MACRO - dw (\3 << 10 | \2 << 5 | \1) -ENDM - -WALK EQU $FE -STAY EQU $FF - -DOWN EQU $D0 -UP EQU $D1 -LEFT EQU $D2 -RIGHT EQU $D3 -NONE EQU $FF - -;\1 sprite id -;\2 x position -;\3 y position -;\4 movement (WALK/STAY) -;\5 range or direction -;\6 text id -;\7 items only: item id -;\7 trainers only: trainer class/pokemon id -;\8 trainers only: trainer number/pokemon level -object: MACRO - db \1 - db \3 + 4 - db \2 + 4 - db \4 - db \5 - IF (_NARG > 7) - db TRAINER | \6 - db \7 - db \8 - ELSE - IF (_NARG > 6) - db ITEM | \6 - db \7 - ELSE - db \6 - ENDC - ENDC -ENDM - -;\1 x position -;\2 y position -;\3 destination warp id -;\4 destination map (-1 = wLastMap) -warp: MACRO - db \2, \1, \3, \4 -ENDM - -;\1 x position -;\2 y position -;\3 sign id -sign: MACRO - db \2, \1, \3 -ENDM - -;\1 x position -;\2 y position -;\3 map width -warp_to: MACRO - EVENT_DISP \3, \2, \1 -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -NORTH_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * (\2_HEIGHT - 3)) + \4; "Connection Strip" location - dw wOverworldMap + 3 + \3 ; current map position - IF (\1_WIDTH < \2_WIDTH) - db \1_WIDTH - \3 + 3 ; width of connection strip - ELSE - db \2_WIDTH - \4 ; width of connection strip - ENDC - db \2_WIDTH ; map width - db (\2_HEIGHT * 2) - 1 ; y alignment (y coordinate of player when entering map) - db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 1 + (\2_HEIGHT * (\2_WIDTH + 6)) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -;\6 (flag) = add 3 to width of connection strip (why?) -SOUTH_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + \4 ; "Connection Strip" location - dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position - IF (\1_WIDTH < \2_WIDTH) - IF (_NARG > 5) - db \1_WIDTH - \3 + 3 ; width of connection strip - ELSE - db \1_WIDTH - \3 ; width of connection strip - ENDC - ELSE - db \2_WIDTH - \4 ; width of connection strip - ENDC - db \2_WIDTH ; map width - db 0 ; y alignment (y coordinate of player when entering map) - db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -WEST_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * \4) + \2_WIDTH - 3 ; "Connection Strip" location - dw wOverworldMap + (\1_WIDTH + 6) * (\3 + 3) ; current map position - IF (\1_HEIGHT < \2_HEIGHT) - db \1_HEIGHT - \3 + 3 ; height of connection strip - ELSE - db \2_HEIGHT - \4 ; height of connection strip - ENDC - db \2_WIDTH ; map width - db (\3 - \4) * -2 ; y alignment - db (\2_WIDTH * 2) - 1 ; x alignment - dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = current map id -;\2 (byte) = connected map id -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (word) = connected map blocks pointer -;\6 (flag) = add 3 to height of connection strip (why?) -EAST_MAP_CONNECTION: MACRO - db \2 ; map id - dw \5 + (\2_WIDTH * \4) ; "Connection Strip" location - dw wOverworldMap - 3 + (\1_WIDTH + 6) * (\3 + 4) ; current map position - IF (\1_HEIGHT < \2_HEIGHT) - IF (_NARG > 5) - db \1_HEIGHT - \3 + 3 ; height of connection strip - ELSE - db \1_HEIGHT - \3 ; height of connection strip - ENDC - ELSE - db \2_HEIGHT - \4 ; height of connection strip - ENDC - db \2_WIDTH ; map width - db (\3 - \4) * -2 ; y alignment - db 0 ; x alignment - dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) -ENDM - -tmlearn: MACRO -x = 0 - REPT _NARG -IF \1 != 0 -x = x | (1 << ((\1 - 1) % 8)) -ENDC - SHIFT - ENDR - db x -ENDM diff --git a/macros/event_macros.asm b/macros/event_macros.asm deleted file mode 100755 index 20027209..00000000 --- a/macros/event_macros.asm +++ /dev/null @@ -1,441 +0,0 @@ -;\1 = event index -;\2 = return result in carry instead of zero flag -CheckEvent: MACRO -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - - IF _NARG > 1 - IF ((\1) % 8) == 7 - add a - ELSE - REPT ((\1) % 8) + 1 - rrca - ENDR - ENDC - ELSE - bit (\1) % 8, a - ENDC - ENDM - -;\1 = event index -CheckEventReuseA: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - ENDC - - bit (\1) % 8, a - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -CheckEventAfterBranchReuseA: MACRO -event_byte = ((\2) / 8) - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld a, [wEventFlags + event_byte] - ENDC - - bit (\1) % 8, a - ENDM - -;\1 = reg -;\2 = event index -;\3 = event index this event is relative to (optional, this is needed when there is a fixed flag address) -EventFlagBit: MACRO - IF _NARG > 2 - ld \1, ((\3) % 8) + ((\2) - (\3)) - ELSE - ld \1, (\2) % 8 - ENDC - ENDM - -;\1 = reg -;\2 = event index -EventFlagAddress: MACRO -event_byte = ((\2) / 8) - ld \1, wEventFlags + event_byte - ENDM - -;\1 = event index -CheckEventHL: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckEventReuseHL: MACRO -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - bit (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -CheckEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -CheckEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - bit (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndSetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - set (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndResetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - bit (\1) % 8, [hl] - res (\1) % 8, [hl] - ENDM - -;\1 = event index -CheckAndSetEventA: MACRO - ld a, [wEventFlags + ((\1) / 8)] - bit (\1) % 8, a - set (\1) % 8, a - ld [wEventFlags + ((\1) / 8)], a - ENDM - -;\1 = event index -CheckAndResetEventA: MACRO - ld a, [wEventFlags + ((\1) / 8)] - bit (\1) % 8, a - res (\1) % 8, a - ld [wEventFlags + ((\1) / 8)], a - ENDM - -;\1 = event index -SetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - set (\1) % 8, [hl] - ENDM - -;\1 = event index -SetEventReuseHL: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - set (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -SetEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - set (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -SetEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - set (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index -;\3, \4, ... = additional (optional) event indices -SetEvents: MACRO - SetEvent \1 - rept (_NARG + -1) - SetEventReuseHL \2 - shift - endr - ENDM - -;\1 = event index -ResetEvent: MACRO -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - res (\1) % 8, [hl] - ENDM - -;\1 = event index -ResetEventReuseHL: MACRO - IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - res (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index of the last event used before the branch -ResetEventAfterBranchReuseHL: MACRO -event_byte = ((\2) / 8) -IF event_byte != ((\1) / 8) -event_byte = ((\1) / 8) - ld hl, wEventFlags + event_byte - ENDC - - res (\1) % 8, [hl] - ENDM - -; dangerous, only use when HL is guaranteed to be the desired value -;\1 = event index -ResetEventForceReuseHL: MACRO -event_byte = ((\1) / 8) - res (\1) % 8, [hl] - ENDM - -;\1 = event index -;\2 = event index -;\3 = event index (optional) -ResetEvents: MACRO - ResetEvent \1 - rept (_NARG + -1) - ResetEventReuseHL \2 - shift - endr - ENDM - -;\1 = event index -;\2 = number of bytes away from the base address (optional, for matching the ROM) -dbEventFlagBit: MACRO - IF _NARG > 1 - db ((\1) % 8) + ((\2) * 8) - ELSE - db ((\1) % 8) - ENDC - ENDM - -;\1 = event index -;\2 = number of bytes away from the base address (optional, for matching the ROM) -dwEventFlagAddress: MACRO - IF _NARG > 1 - dw wEventFlags + ((\1) / 8) - (\2) - ELSE - dw wEventFlags + ((\1) / 8) - ENDC - ENDM - -;\1 = start -;\2 = end -SetEventRange: MACRO -event_start_byte = ((\1) / 8) -event_end_byte = ((\2) / 8) - - IF event_end_byte < event_start_byte - FAIL "Incorrect argument order in SetEventRange." - ENDC - - IF event_start_byte == event_end_byte - ld a, [wEventFlags + event_start_byte] - or (1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8)) - ld [wEventFlags + event_start_byte], a - ELSE -event_fill_start = event_start_byte + 1 -event_fill_count = event_end_byte - event_start_byte - 1 - - IF ((\1) % 8) == 0 -event_fill_start = event_fill_start + -1 -event_fill_count = event_fill_count + 1 - ELSE - ld a, [wEventFlags + event_start_byte] - or $ff - ((1 << ((\1) % 8)) - 1) - ld [wEventFlags + event_start_byte], a - ENDC - - IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 - ENDC - - IF event_fill_count == 1 - ld hl, wEventFlags + event_fill_start - ld [hl], $ff - ENDC - - IF event_fill_count > 1 - ld a, $ff - ld hl, wEventFlags + event_fill_start - - REPT event_fill_count + -1 - ld [hli], a - ENDR - - ld [hl], a - ENDC - - IF ((\2) % 8) == 0 - ld hl, wEventFlags + event_end_byte - set 0, [hl] - ELSE - IF ((\2) % 8) != 7 - ld a, [wEventFlags + event_end_byte] - or (1 << (((\2) % 8) + 1)) - 1 - ld [wEventFlags + event_end_byte], a - ENDC - ENDC - ENDC - ENDM - -;\1 = start -;\2 = end -;\3 = assume a is 0 if present -ResetEventRange: MACRO -event_start_byte = ((\1) / 8) -event_end_byte = ((\2) / 8) - - IF event_end_byte < event_start_byte - FAIL "Incorrect argument order in ResetEventRange." - ENDC - - IF event_start_byte == event_end_byte - ld a, [wEventFlags + event_start_byte] - and ~((1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8))) & $ff - ld [wEventFlags + event_start_byte], a - ELSE -event_fill_start = event_start_byte + 1 -event_fill_count = event_end_byte - event_start_byte - 1 - - IF ((\1) % 8) == 0 -event_fill_start = event_fill_start + -1 -event_fill_count = event_fill_count + 1 - ELSE - ld a, [wEventFlags + event_start_byte] - and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff - ld [wEventFlags + event_start_byte], a - ENDC - - IF ((\2) % 8) == 7 -event_fill_count = event_fill_count + 1 - ENDC - - IF event_fill_count == 1 - ld hl, wEventFlags + event_fill_start - ld [hl], 0 - ENDC - - IF event_fill_count > 1 - ld hl, wEventFlags + event_fill_start - - ; force xor a if we just to wrote to it above - IF (_NARG < 3) || (((\1) % 8) != 0) - xor a - ENDC - - REPT event_fill_count + -1 - ld [hli], a - ENDR - - ld [hl], a - ENDC - - IF ((\2) % 8) == 0 - ld hl, wEventFlags + event_end_byte - res 0, [hl] - ELSE - IF ((\2) % 8) != 7 - ld a, [wEventFlags + event_end_byte] - and ~((1 << (((\2) % 8) + 1)) - 1) & $ff - ld [wEventFlags + event_end_byte], a - ENDC - ENDC - ENDC - ENDM - -; returns whether both events are set in Z flag -; This is counter-intuitive because the other event checks set the Z flag when -; the event is not set, but this sets the Z flag when the event is set. -;\1 = event index 1 -;\2 = event index 2 -;\3 = try to reuse a (optional) -CheckBothEventsSet: MACRO - IF ((\1) / 8) == ((\2) / 8) - IF (_NARG < 3) || (((\1) / 8) != event_byte) -event_byte = ((\1) / 8) - ld a, [wEventFlags + ((\1) / 8)] - ENDC - and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - ELSE - ; This case doesn't happen in the original ROM. - IF ((\1) % 8) == ((\2) % 8) - push hl - ld a, [wEventFlags + ((\1) / 8)] - ld hl, wEventFlags + ((\2) / 8) - and [hl] - cpl - bit ((\1) % 8), a - pop hl - ELSE - push bc - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) - ld b, a - ld a, [wEventFlags + ((\2) / 8)] - and (1 << ((\2) % 8)) - or b - cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - pop bc - ENDC - ENDC - ENDM - -; returns the complement of whether either event is set in Z flag -;\1 = event index 1 -;\2 = event index 2 -CheckEitherEventSet: MACRO - IF ((\1) / 8) == ((\2) / 8) - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) - ELSE - ; This case doesn't happen in the original ROM. - IF ((\1) % 8) == ((\2) % 8) - push hl - ld a, [wEventFlags + ((\1) / 8)] - ld hl, wEventFlags + ((\2) / 8) - or [hl] - bit ((\1) % 8), a - pop hl - ELSE - push bc - ld a, [wEventFlags + ((\1) / 8)] - and (1 << ((\1) % 8)) - ld b, a - ld a, [wEventFlags + ((\2) / 8)] - and (1 << ((\2) % 8)) - or b - pop bc - ENDC - ENDC - ENDM - -; for handling fixed event bits when events are inserted/removed -;\1 = event index -;\2 = fixed flag bit -AdjustEventBit: MACRO - IF ((\1) % 8) != (\2) - add ((\1) % 8) - (\2) - ENDC - ENDM diff --git a/macros/farcall.asm b/macros/farcall.asm new file mode 100644 index 00000000..93f8f1ac --- /dev/null +++ b/macros/farcall.asm @@ -0,0 +1,48 @@ +farcall: MACRO + ld b, BANK(\1) + ld hl, \1 + call Bankswitch +ENDM + +callfar: MACRO + ld hl, \1 + ld b, BANK(\1) + call Bankswitch +ENDM + +farjp: MACRO + ld b, BANK(\1) + ld hl, \1 + jp Bankswitch +ENDM + +jpfar: MACRO + ld hl, \1 + ld b, BANK(\1) + jp Bankswitch +ENDM + +homecall: MACRO + ldh a, [hLoadedROMBank] + push af + ld a, BANK(\1) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + call \1 + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a +ENDM + +homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af + ldh a, [hLoadedROMBank] + push af + ld a, BANK(\1) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + call \1 + pop bc + ld a, b + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a +ENDM diff --git a/macros/gfx.asm b/macros/gfx.asm new file mode 100644 index 00000000..98eabec4 --- /dev/null +++ b/macros/gfx.asm @@ -0,0 +1,22 @@ +RGB: MACRO +REPT _NARG / 3 + dw palred (\1) + palgreen (\2) + palblue (\3) + SHIFT 3 +ENDR +ENDM + +palred EQUS "(1 << 0) *" +palgreen EQUS "(1 << 5) *" +palblue EQUS "(1 << 10) *" + +palettes EQUS "* PALETTE_SIZE" +palette EQUS "+ PALETTE_SIZE *" +color EQUS "+ PAL_COLOR_SIZE *" + +tiles EQUS "* LEN_2BPP_TILE" +tile EQUS "+ LEN_2BPP_TILE *" + +dbsprite: MACRO +; x tile, y tile, x pixel, y pixel, vtile offset, attributes + db (\2 * TILE_WIDTH) % $100 + \4, (\1 * TILE_WIDTH) % $100 + \3, \5, \6 +ENDM diff --git a/macros/predef.asm b/macros/predef.asm new file mode 100644 index 00000000..d86582d1 --- /dev/null +++ b/macros/predef.asm @@ -0,0 +1,32 @@ +predef_id: MACRO + ld a, (\1Predef - PredefPointers) / 3 +ENDM + +predef: MACRO + predef_id \1 + call Predef +ENDM + +predef_jump: MACRO + predef_id \1 + jp Predef +ENDM + + +tx_pre_id: MACRO + ld a, (\1_id - TextPredefs) / 2 + 1 +ENDM + +tx_pre: MACRO + tx_pre_id \1 + call PrintPredefTextID +ENDM + +tx_pre_jump: MACRO + tx_pre_id \1 + jp PrintPredefTextID +ENDM + +db_tx_pre: MACRO + db (\1_id - TextPredefs) / 2 + 1 +ENDM diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm new file mode 100644 index 00000000..b12a2adc --- /dev/null +++ b/macros/scripts/audio.asm @@ -0,0 +1,233 @@ +audio_header: MACRO + db (_NARG - 2) << 6 | \2 + dw \1_\2 + IF _NARG > 2 + db \3 + dw \1_\3 + ENDC + IF _NARG > 3 + db \4 + dw \1_\4 + ENDC + IF _NARG > 4 + db \5 + dw \1_\5 + ENDC +ENDM + + const_def $10 + +; arguments: length [0, 7], pitch change [-7, 7] +; length: length of time between pitch shifts +; sometimes used with a value >7 in which case the MSB is ignored +; pitch change: positive value means increase in pitch, negative value means decrease in pitch +; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 + const pitch_sweep_cmd ; $10 +pitch_sweep: MACRO + db pitch_sweep_cmd + IF \2 < 0 + db (\1 << 4) | (%1000 | (\2 * -1)) + ELSE + db (\1 << 4) | \2 + ENDC +ENDM + + const_next $20 + + const sfx_note_cmd ; $20 + +; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency +; fade: positive value means decrease in volume, negative value means increase in volume +; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 +square_note_cmd EQU sfx_note_cmd ; $20 +square_note: MACRO + db square_note_cmd | \1 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC + dw \4 +ENDM + +; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency +; fade: positive value means decrease in volume, negative value means increase in volume +; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 +noise_note_cmd EQU sfx_note_cmd ; $20 +noise_note: MACRO + db noise_note_cmd | \1 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC + db \4 +ENDM + +; arguments: pitch, length [1, 16] +note: MACRO + db (\1 << 4) | (\2 - 1) +ENDM + + const_next $b0 + +; arguments: instrument [1, 19], length [1, 16] + const drum_note_cmd ; $b0 +drum_note: MACRO + db drum_note_cmd | (\2 - 1) + db \1 +ENDM + +; arguments: instrument, length [1, 16] +; like drum_note but one 1 byte instead of 2 +; can only be used with instruments 1-10, excluding 2 +; unused +drum_note_short: MACRO + db (\1 << 4) | (\2 - 1) +ENDM + + const_next $c0 + +; arguments: length [1, 16] + const rest_cmd ; $c0 +rest: MACRO + db rest_cmd | (\1 - 1) +ENDM + + const_next $d0 + +; arguments: speed [0, 15], volume [0, 15], fade [-7, 7] +; fade: positive value means decrease in volume, negative value means increase in volume +; small magnitude means quick change, large magnitude means slow change +; in signed magnitude representation, so a value of 8 is the same as (negative) 0 + const note_type_cmd ; $d0 +note_type: MACRO + db note_type_cmd | \1 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC +ENDM + +; arguments: speed [0, 15] +drum_speed_cmd EQU note_type_cmd ; $d0 +drum_speed: MACRO + db drum_speed_cmd | \1 +ENDM + + const_next $e0 + +; arguments: octave [1, 8] + const octave_cmd ; $e0 +octave: MACRO + db octave_cmd | (8 - \1) +ENDM + + const_next $e8 + +; when enabled, effective frequency used is incremented by 1 + const toggle_perfect_pitch_cmd ; $e8 +toggle_perfect_pitch: MACRO + db toggle_perfect_pitch_cmd +ENDM + + const_skip ; $e9 + +; arguments: delay [0, 255], depth [0, 15], rate [0, 15] +; delay: time delay until vibrato effect begins +; depth: amplitude of vibrato wave +; rate: frequency of vibrato wave + const vibrato_cmd ; $ea +vibrato: MACRO + db vibrato_cmd + db \1 + db (\2 << 4) | \3 +ENDM + +; arguments: length [1, 256], octave [1, 8], pitch + const pitch_slide_cmd ; $eb +pitch_slide: MACRO + db pitch_slide_cmd + db \1 - 1 + db ((8 - \2) << 4) | \3 +ENDM + +; arguments: duty cycle [0, 3] (12.5%, 25%, 50%, 75%) + const duty_cycle_cmd ; $ec +duty_cycle: MACRO + db duty_cycle_cmd + db \1 +ENDM + +; arguments: tempo [0, $ffff] +; used to calculate note delay counters +; so a smaller value means music plays faster +; ideally should be set to $100 or less to guarantee no overflow +; if larger than $100, large note speed or note length values might cause overflow +; stored in big endian + const tempo_cmd ; $ed +tempo: MACRO + db tempo_cmd + db HIGH(\1), LOW(\1) +ENDM + +; arguments: left output enable mask, right output enable mask + const stereo_panning_cmd ; $ee +stereo_panning: MACRO + db stereo_panning_cmd + db (\1 << 4) | \2 +ENDM + + const unknownmusic0xef_cmd ; $ef +unknownmusic0xef: MACRO + db unknownmusic0xef_cmd + db \1 +ENDM + +; arguments: left master volume [0, 7], right master volume [0, 7] + const volume_cmd ; $f0 +volume: MACRO + db volume_cmd + db (\1 << 4) | \2 +ENDM + + const_next $f8 + +; when enabled, the sfx data is interpreted as music data + const execute_music_cmd ; $f8 +execute_music: MACRO + db execute_music_cmd +ENDM + + const_next $fc + +; arguments: duty cycle 1, duty cycle 2, duty cycle 3, duty cycle 4 + const duty_cycle_pattern_cmd ; $fc +duty_cycle_pattern: MACRO + db duty_cycle_pattern_cmd + db \1 << 6 | \2 << 4 | \3 << 2 | \4 +ENDM + +; arguments: address + const sound_call_cmd ; $fd +sound_call: MACRO + db sound_call_cmd + dw \1 +ENDM + +; arguments: count, address + const sound_loop_cmd ; $fe +sound_loop: MACRO + db sound_loop_cmd + db \1 + dw \2 +ENDM + + const sound_ret_cmd ; $ff +sound_ret: MACRO + db sound_ret_cmd +ENDM diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm new file mode 100644 index 00000000..8087c5c2 --- /dev/null +++ b/macros/scripts/events.asm @@ -0,0 +1,471 @@ +;\1 = event index +;\2 = return result in carry instead of zero flag +CheckEvent: MACRO +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + + IF _NARG > 1 + IF ((\1) % 8) == 7 + add a + ELSE + REPT ((\1) % 8) + 1 + rrca + ENDR + ENDC + ELSE + bit (\1) % 8, a + ENDC +ENDM + + +;\1 = event index +CheckEventReuseA: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + + bit (\1) % 8, a +ENDM + + +;\1 = event index +;\2 = event index of the last event used before the branch +CheckEventAfterBranchReuseA: MACRO +event_byte = ((\2) / 8) + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + + bit (\1) % 8, a +ENDM + + +;\1 = reg +;\2 = event index +;\3 = event index this event is relative to (optional, this is needed when there is a fixed flag address) +EventFlagBit: MACRO + IF _NARG > 2 + ld \1, ((\3) % 8) + ((\2) - (\3)) + ELSE + ld \1, (\2) % 8 + ENDC +ENDM + + +;\1 = reg +;\2 = event index +EventFlagAddress: MACRO +event_byte = ((\2) / 8) + ld \1, wEventFlags + event_byte +ENDM + + +;\1 = event index +CheckEventHL: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] +ENDM + + +;\1 = event index +CheckEventReuseHL: MACRO +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] +ENDM + + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +CheckEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + bit (\1) % 8, [hl] +ENDM + + +;\1 = event index +;\2 = event index of the last event used before the branch +CheckEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] +ENDM + + +;\1 = event index +CheckAndSetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + set (\1) % 8, [hl] +ENDM + + +;\1 = event index +CheckAndResetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + bit (\1) % 8, [hl] + res (\1) % 8, [hl] +ENDM + + +;\1 = event index +CheckAndSetEventA: MACRO + ld a, [wEventFlags + ((\1) / 8)] + bit (\1) % 8, a + set (\1) % 8, a + ld [wEventFlags + ((\1) / 8)], a +ENDM + + +;\1 = event index +CheckAndResetEventA: MACRO + ld a, [wEventFlags + ((\1) / 8)] + bit (\1) % 8, a + res (\1) % 8, a + ld [wEventFlags + ((\1) / 8)], a +ENDM + + +;\1 = event index +SetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + set (\1) % 8, [hl] +ENDM + + +;\1 = event index +SetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + set (\1) % 8, [hl] +ENDM + + +;\1 = event index +;\2 = event index of the last event used before the branch +SetEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + set (\1) % 8, [hl] +ENDM + + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +SetEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + set (\1) % 8, [hl] +ENDM + + +;\1 = event index +;\2 = event index +;\3, \4, ... = additional (optional) event indices +SetEvents: MACRO + SetEvent \1 + REPT _NARG - 1 + SetEventReuseHL \2 + SHIFT + ENDR +ENDM + + +;\1 = event index +ResetEvent: MACRO +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + res (\1) % 8, [hl] +ENDM + + +;\1 = event index +ResetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + res (\1) % 8, [hl] +ENDM + + +;\1 = event index +;\2 = event index of the last event used before the branch +ResetEventAfterBranchReuseHL: MACRO +event_byte = ((\2) / 8) +IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + res (\1) % 8, [hl] +ENDM + + +; dangerous, only use when HL is guaranteed to be the desired value +;\1 = event index +ResetEventForceReuseHL: MACRO +event_byte = ((\1) / 8) + res (\1) % 8, [hl] +ENDM + + +;\1 = event index +;\2 = event index +;\3 = event index (optional) +ResetEvents: MACRO + ResetEvent \1 + REPT _NARG - 1 + ResetEventReuseHL \2 + SHIFT + ENDR +ENDM + + +;\1 = event index +;\2 = number of bytes away from the base address (optional, for matching the ROM) +dbEventFlagBit: MACRO + IF _NARG > 1 + db ((\1) % 8) + ((\2) * 8) + ELSE + db ((\1) % 8) + ENDC +ENDM + + +;\1 = event index +;\2 = number of bytes away from the base address (optional, for matching the ROM) +dwEventFlagAddress: MACRO + IF _NARG > 1 + dw wEventFlags + ((\1) / 8) - (\2) + ELSE + dw wEventFlags + ((\1) / 8) + ENDC +ENDM + + +;\1 = start +;\2 = end +SetEventRange: MACRO +event_start_byte = ((\1) / 8) +event_end_byte = ((\2) / 8) + + IF event_end_byte < event_start_byte + FAIL "Incorrect argument order in SetEventRange." + ENDC + + IF event_start_byte == event_end_byte + ld a, [wEventFlags + event_start_byte] + or (1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8)) + ld [wEventFlags + event_start_byte], a + ELSE +event_fill_start = event_start_byte + 1 +event_fill_count = event_end_byte - event_start_byte - 1 + + IF ((\1) % 8) == 0 +event_fill_start = event_fill_start - 1 +event_fill_count = event_fill_count + 1 + ELSE + ld a, [wEventFlags + event_start_byte] + or $ff - ((1 << ((\1) % 8)) - 1) + ld [wEventFlags + event_start_byte], a + ENDC + + IF ((\2) % 8) == 7 +event_fill_count = event_fill_count + 1 + ENDC + + IF event_fill_count == 1 + ld hl, wEventFlags + event_fill_start + ld [hl], $ff + ENDC + + IF event_fill_count > 1 + ld a, $ff + ld hl, wEventFlags + event_fill_start + + REPT event_fill_count - 1 + ld [hli], a + ENDR + + ld [hl], a + ENDC + + IF ((\2) % 8) == 0 + ld hl, wEventFlags + event_end_byte + set 0, [hl] + ELSE + IF ((\2) % 8) != 7 + ld a, [wEventFlags + event_end_byte] + or (1 << (((\2) % 8) + 1)) - 1 + ld [wEventFlags + event_end_byte], a + ENDC + ENDC + ENDC +ENDM + + +;\1 = start +;\2 = end +;\3 = assume a is 0 if present +ResetEventRange: MACRO +event_start_byte = ((\1) / 8) +event_end_byte = ((\2) / 8) + + IF event_end_byte < event_start_byte + FAIL "Incorrect argument order in ResetEventRange." + ENDC + + IF event_start_byte == event_end_byte + ld a, [wEventFlags + event_start_byte] + and ~((1 << (((\2) % 8) + 1)) - (1 << ((\1) % 8))) & $ff + ld [wEventFlags + event_start_byte], a + ELSE +event_fill_start = event_start_byte + 1 +event_fill_count = event_end_byte - event_start_byte - 1 + + IF ((\1) % 8) == 0 +event_fill_start = event_fill_start - 1 +event_fill_count = event_fill_count + 1 + ELSE + ld a, [wEventFlags + event_start_byte] + and ~($ff - ((1 << ((\1) % 8)) - 1)) & $ff + ld [wEventFlags + event_start_byte], a + ENDC + + IF ((\2) % 8) == 7 +event_fill_count = event_fill_count + 1 + ENDC + + IF event_fill_count == 1 + ld hl, wEventFlags + event_fill_start + ld [hl], 0 + ENDC + + IF event_fill_count > 1 + ld hl, wEventFlags + event_fill_start + + ; force xor a if we just to wrote to it above + IF (_NARG < 3) || (((\1) % 8) != 0) + xor a + ENDC + + REPT event_fill_count - 1 + ld [hli], a + ENDR + + ld [hl], a + ENDC + + IF ((\2) % 8) == 0 + ld hl, wEventFlags + event_end_byte + res 0, [hl] + ELSE + IF ((\2) % 8) != 7 + ld a, [wEventFlags + event_end_byte] + and ~((1 << (((\2) % 8) + 1)) - 1) & $ff + ld [wEventFlags + event_end_byte], a + ENDC + ENDC + ENDC +ENDM + + +; returns whether both events are set in Z flag +; This is counter-intuitive because the other event checks set the Z flag when +; the event is not set, but this sets the Z flag when the event is set. +;\1 = event index 1 +;\2 = event index 2 +;\3 = try to reuse a (optional) +CheckBothEventsSet: MACRO + IF ((\1) / 8) == ((\2) / 8) + IF (_NARG < 3) || (((\1) / 8) != event_byte) +event_byte = ((\1) / 8) + ld a, [wEventFlags + ((\1) / 8)] + ENDC + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + and [hl] + cpl + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + cp (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + pop bc + ENDC + ENDC +ENDM + + +; returns the complement of whether either event is set in Z flag +;\1 = event index 1 +;\2 = event index 2 +CheckEitherEventSet: MACRO + IF ((\1) / 8) == ((\2) / 8) + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + or [hl] + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + pop bc + ENDC + ENDC +ENDM + + +; for handling fixed event bits when events are inserted/removed +;\1 = event index +;\2 = fixed flag bit +AdjustEventBit: MACRO + IF ((\1) % 8) != (\2) + add ((\1) % 8) - (\2) + ENDC +ENDM + diff --git a/macros/scripts/maps.asm b/macros/scripts/maps.asm new file mode 100644 index 00000000..a282acba --- /dev/null +++ b/macros/scripts/maps.asm @@ -0,0 +1,219 @@ +def_objects: MACRO + IF DEF(_NUM_OBJECTS) + PURGE _NUM_OBJECTS + ENDC +_NUM_OBJECTS EQUS "_NUM_OBJECTS_\@" + db _NUM_OBJECTS +_NUM_OBJECTS = 0 +ENDM + +;\1 sprite id +;\2 x position +;\3 y position +;\4 movement (WALK/STAY) +;\5 range or direction +;\6 text id +;\7 items only: item id +;\7 trainers only: trainer class/pokemon id +;\8 trainers only: trainer number/pokemon level +object: MACRO + db \1 + db \3 + 4 + db \2 + 4 + db \4 + db \5 + IF _NARG > 7 + db TRAINER | \6 + db \7 + db \8 + ELIF _NARG > 6 + db ITEM | \6 + db \7 + ELSE + db \6 + ENDC +_NUM_OBJECTS = _NUM_OBJECTS + 1 +ENDM + +def_warps: MACRO + IF DEF(_NUM_WARPS) + PURGE _NUM_WARPS + ENDC +_NUM_WARPS EQUS "_NUM_WARPS_\@" + db _NUM_WARPS +_NUM_WARPS = 0 +ENDM + +;\1 x position +;\2 y position +;\3 destination warp id +;\4 destination map (-1 = wLastMap) +warp: MACRO + db \2, \1, \3, \4 +_TMP EQUS "\n_WARP_{d:{_NUM_WARPS}}_X = \1\n_WARP_{d:{_NUM_WARPS}}_Y = \2" + _TMP + PURGE _TMP +_NUM_WARPS = _NUM_WARPS + 1 +ENDM + +def_signs: MACRO + IF DEF(_NUM_SIGNS) + PURGE _NUM_SIGNS + ENDC +_NUM_SIGNS EQUS "_NUM_SIGNS_\@" + db _NUM_SIGNS +_NUM_SIGNS = 0 +ENDM + +;\1 x position +;\2 y position +;\3 sign id +sign: MACRO + db \2, \1, \3 +_NUM_SIGNS = _NUM_SIGNS + 1 +ENDM + +;\1 source map +def_warps_to: MACRO +N = 0 + REPT _NUM_WARPS +_TMP EQUS "warp_to _WARP_{d:N}_X, _WARP_{d:N}_Y, \1_WIDTH" + _TMP + PURGE _TMP +N = N + 1 + ENDR +ENDM + +;\1 x position +;\2 y position +;\3 map width +warp_to: MACRO + event_displacement \3, \1, \2 +ENDM + + +;\1 event flag +;\2 view range +;\3 TextBeforeBattle +;\4 TextAfterBattle +;\5 TextEndBattle +trainer: MACRO + IF _NARG > 5 + dbEventFlagBit \1, \2 + db (\3 << 4) + dwEventFlagAddress \1, \2 + SHIFT + ELSE + dbEventFlagBit \1 + db (\2 << 4) + dwEventFlagAddress \1 + ENDC + dw \3, \5, \4, \4 +ENDM + +;\1 x position +;\2 y position +;\3 movement data +map_coord_movement: MACRO + dbmapcoord \1, \2 + dw \3 +ENDM + + +;\1 map name +;\2 map id +;\3 tileset +;\4 connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +map_header: MACRO +CURRENT_MAP_WIDTH = \2_WIDTH +CURRENT_MAP_HEIGHT = \2_HEIGHT +CURRENT_MAP_OBJECT EQUS "\1_Object" +\1_h:: + db \3 + db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH + dw \1_Blocks + dw \1_TextPointers + dw \1_Script + db \4 +ENDM + +; Comes after map_header and connection macros +end_map_header: MACRO + dw CURRENT_MAP_OBJECT + PURGE CURRENT_MAP_WIDTH + PURGE CURRENT_MAP_HEIGHT + PURGE CURRENT_MAP_OBJECT +ENDM + +; Connections go in order: north, south, west, east +;\1 direction +;\2 map name +;\3 map id +;\4 offset of the target map relative to the current map +; (x offset for east/west, y offset for north/south) +connection: MACRO + +; Calculate tile offsets for source (current) and target maps +_src = 0 +_tgt = (\4) + 3 +IF _tgt < 2 +_src = -_tgt +_tgt = 0 +ENDC + +IF !STRCMP("\1", "north") +_blk = \3_WIDTH * (\3_HEIGHT - 3) + _src +_map = _tgt +_win = (\3_WIDTH + 6) * \3_HEIGHT + 1 +_y = \3_HEIGHT * 2 - 1 +_x = (\4) * -2 +_len = CURRENT_MAP_WIDTH + 3 - (\4) +IF _len > \3_WIDTH +_len = \3_WIDTH +ENDC + +ELIF !STRCMP("\1", "south") +_blk = _src +_map = (CURRENT_MAP_WIDTH + 6) * (CURRENT_MAP_HEIGHT + 3) + _tgt +_win = \3_WIDTH + 7 +_y = 0 +_x = (\4) * -2 +_len = CURRENT_MAP_WIDTH + 3 - (\4) +IF _len > \3_WIDTH +_len = \3_WIDTH +ENDC + +ELIF !STRCMP("\1", "west") +_blk = (\3_WIDTH * _src) + \3_WIDTH - 3 +_map = (CURRENT_MAP_WIDTH + 6) * _tgt +_win = (\3_WIDTH + 6) * 2 - 6 +_y = (\4) * -2 +_x = \3_WIDTH * 2 - 1 +_len = CURRENT_MAP_HEIGHT + 3 - (\4) +IF _len > \3_HEIGHT +_len = \3_HEIGHT +ENDC + +ELIF !STRCMP("\1", "east") +_blk = (\3_WIDTH * _src) +_map = (CURRENT_MAP_WIDTH + 6) * _tgt + CURRENT_MAP_WIDTH + 3 +_win = \3_WIDTH + 7 +_y = (\4) * -2 +_x = 0 +_len = CURRENT_MAP_HEIGHT + 3 - (\4) +IF _len > \3_HEIGHT +_len = \3_HEIGHT +ENDC + +ELSE +fail "Invalid direction for 'connection'." +ENDC + + db \3 + dw \2_Blocks + _blk + dw wOverworldMap + _map + db _len - _src + db \3_WIDTH + db _y, _x + dw wOverworldMap + _win +ENDM diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm new file mode 100644 index 00000000..a947ca2f --- /dev/null +++ b/macros/scripts/text.asm @@ -0,0 +1,213 @@ +text EQUS "db TX_START," ; Start writing text. +next EQUS "db \"\"," ; Move a line down. +line EQUS "db \"\"," ; Start writing at the bottom line. +para EQUS "db \"\"," ; Start a new paragraph. +cont EQUS "db \"\"," ; Scroll to the next line. +done EQUS "db \"\"" ; End a text box. +prompt EQUS "db \"\"" ; Prompt the player to end a text box (initiating some other event). + +page EQUS "db \"\"," ; Start a new Pokédex page. +dex EQUS "db \"\", \"@\"" ; End a Pokédex entry. + + +; TextCommandJumpTable indexes (see home/text.asm) + const_def + + const TX_START ; $00 +text_start: MACRO + db TX_START +ENDM + + const TX_RAM ; $01 +text_ram: MACRO + db TX_RAM + dw \1 ; address to read from +ENDM + + const TX_BCD ; $02 +text_bcd: MACRO + db TX_BCD + dw \1 ; address to read from + db \2 ; number of bytes + print flags +ENDM + + const TX_MOVE ; $03 +text_move: MACRO + db TX_MOVE + dw \1 ; address of the new location +ENDM + + const TX_BOX ; $04 +text_box: MACRO +; draw box + db TX_BOX + dw \1 ; address of upper left corner + db \2, \3 ; height, width +ENDM + + const TX_LOW ; $05 +text_low: MACRO + db TX_LOW +ENDM + + const TX_PROMPT_BUTTON ; $06 +text_promptbutton: MACRO + db TX_PROMPT_BUTTON +ENDM + + const TX_SCROLL ; $07 +text_scroll: MACRO + db TX_SCROLL +ENDM + + const TX_START_ASM ; $08 +text_asm: MACRO + db TX_START_ASM +ENDM + + const TX_NUM ; $09 +text_decimal: MACRO +; print a big-endian decimal number. + db TX_NUM + dw \1 ; address to read from + dn \2, \3 ; number of bytes to read, number of digits to display +ENDM + + const TX_PAUSE ; $0a +text_pause: MACRO + db TX_PAUSE +ENDM + + const TX_SOUND_GET_ITEM_1 ; $0b +sound_get_item_1: MACRO + db TX_SOUND_GET_ITEM_1 +ENDM + +TX_SOUND_LEVEL_UP EQU TX_SOUND_GET_ITEM_1 +sound_level_up EQUS "sound_get_item_1" + + const TX_DOTS ; $0c +text_dots: MACRO + db TX_DOTS + db \1 ; number of ellipses to draw +ENDM + + const TX_WAIT_BUTTON ; $0d +text_waitbutton: MACRO + db TX_WAIT_BUTTON +ENDM + + const TX_SOUND_POKEDEX_RATING ; $0e +sound_pokedex_rating: MACRO + db TX_SOUND_POKEDEX_RATING +ENDM + + const TX_SOUND_GET_ITEM_1_DUPLICATE ; $0f +sound_get_item_1_duplicate: MACRO + db TX_SOUND_GET_ITEM_1_DUPLICATE +ENDM + + const TX_SOUND_GET_ITEM_2 ; $10 +sound_get_item_2: MACRO + db TX_SOUND_GET_ITEM_2 +ENDM + + const TX_SOUND_GET_KEY_ITEM ; $11 +sound_get_key_item: MACRO + db TX_SOUND_GET_KEY_ITEM +ENDM + + const TX_SOUND_CAUGHT_MON ; $12 +sound_caught_mon: MACRO + db TX_SOUND_CAUGHT_MON +ENDM + + const TX_SOUND_DEX_PAGE_ADDED ; $13 +sound_dex_page_added: MACRO + db TX_SOUND_DEX_PAGE_ADDED +ENDM + + const TX_SOUND_CRY_NIDORINA ; $14 +sound_cry_nidorina: MACRO + db TX_SOUND_CRY_NIDORINA +ENDM + + const TX_SOUND_CRY_PIDGEOT ; $15 +sound_cry_pidgeot: MACRO + db TX_SOUND_CRY_PIDGEOT +ENDM + + const TX_SOUND_CRY_DEWGONG ; $16 +sound_cry_dewgong: MACRO + db TX_SOUND_CRY_DEWGONG +ENDM + + const TX_FAR ; $17 +text_far: MACRO + db TX_FAR + dab \1 ; address of text commands +ENDM + + + const_next $50 + + const TX_END ; $50 +text_end: MACRO + db TX_END +ENDM + + +; Text script IDs (see home/text_script.asm) + const_def -1, -1 + + const TX_SCRIPT_POKECENTER_NURSE ; $ff +script_pokecenter_nurse: MACRO + db TX_SCRIPT_POKECENTER_NURSE +ENDM + + const TX_SCRIPT_MART ; $fe +script_mart: MACRO + db TX_SCRIPT_MART + db _NARG ; number of items +REPT _NARG + db \1 ; item id + SHIFT +ENDR + db -1 ; end +ENDM + + const TX_SCRIPT_BILLS_PC ; $fd +script_bills_pc: MACRO + db TX_SCRIPT_BILLS_PC +ENDM + + const TX_SCRIPT_PLAYERS_PC ; $fc +script_players_pc: MACRO + db TX_SCRIPT_PLAYERS_PC +ENDM + + const_skip ; $fb + + const_skip ; $fa + + const TX_SCRIPT_POKECENTER_PC ; $f9 +script_pokecenter_pc: MACRO + db TX_SCRIPT_POKECENTER_PC +ENDM + + const_skip ; $f8 + + const TX_SCRIPT_PRIZE_VENDOR ; $f7 +script_prize_vendor: MACRO + db TX_SCRIPT_PRIZE_VENDOR +ENDM + + const TX_SCRIPT_CABLE_CLUB_RECEPTIONIST ; $f6 +script_cable_club_receptionist: MACRO + db TX_SCRIPT_CABLE_CLUB_RECEPTIONIST +ENDM + + const TX_SCRIPT_VENDING_MACHINE ; $f5 +script_vending_machine: MACRO + db TX_SCRIPT_VENDING_MACHINE +ENDM diff --git a/macros/text_macros.asm b/macros/text_macros.asm deleted file mode 100755 index 21e02634..00000000 --- a/macros/text_macros.asm +++ /dev/null @@ -1,80 +0,0 @@ - -; text macros -text EQUS "db $00," ; Start writing text. -next EQUS "db $4e," ; Move a line down. -line EQUS "db $4f," ; Start writing at the bottom line. -para EQUS "db $51," ; Start a new paragraph. -cont EQUS "db $55," ; Scroll to the next line. -done EQUS "db $57" ; End a text box. -prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event). - -page EQUS "db $49," ; Start a new Pokedex page. -dex EQUS "db $5f, $50" ; End a Pokedex entry. - -TX_RAM: MACRO -; prints text to screen -; \1: RAM address to read from - db $1 - dw \1 -ENDM - -TX_BCD: MACRO -; \1: RAM address to read from -; \2: number of bytes + print flags - db $2 - dw \1 - db \2 -ENDM - -TX_LINE EQUS "db $05" -TX_BLINK EQUS "db $06" -;TX_SCROLL EQUS "db $07" -TX_ASM EQUS "db $08" - -TX_NUM: MACRO -; print a big-endian decimal number. -; \1: address to read from -; \2: number of bytes to read -; \3: number of digits to display - db $09 - dw \1 - db \2 << 4 | \3 -ENDM - -TX_DELAY EQUS "db $0a" -TX_SFX_ITEM_1 EQUS "db $0b" -TX_SFX_LEVEL_UP EQUS "db $0b" -;TX_ELLIPSES EQUS "db $0c" -TX_WAIT EQUS "db $0d" -;TX_SFX_DEX_RATING EQUS "db $0e" -TX_SFX_ITEM_2 EQUS "db $10" -TX_SFX_KEY_ITEM EQUS "db $11" -TX_SFX_CAUGHT_MON EQUS "db $12" -TX_SFX_DEX_PAGE_ADDED EQUS "db $13" -TX_CRY_NIDORINA EQUS "db $14" -TX_CRY_PIDGEOT EQUS "db $15" -;TX_CRY_DEWGONG EQUS "db $16" - -TX_FAR: MACRO - db $17 - dw \1 - db BANK(\1) -ENDM - -TX_VENDING_MACHINE EQUS "db $f5" -TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" -TX_PRIZE_VENDOR EQUS "db $f7" -TX_POKECENTER_PC EQUS "db $f9" -TX_PLAYERS_PC EQUS "db $fc" -TX_BILLS_PC EQUS "db $fd" - -TX_MART: MACRO - db $FE, _NARG - REPT _NARG - db \1 - SHIFT - ENDR - db $FF -ENDM - -TX_POKECENTER_NURSE EQUS "db $ff" diff --git a/macros/wram.asm b/macros/wram.asm new file mode 100644 index 00000000..41fd1dad --- /dev/null +++ b/macros/wram.asm @@ -0,0 +1,97 @@ +; Used in wram.asm + +flag_array: MACRO + ds ((\1) + 7) / 8 +ENDM + +BOX_STRUCT_LENGTH EQU 25 + NUM_MOVES * 2 + +box_struct: MACRO +\1Species:: db +\1HP:: dw +\1BoxLevel:: db +\1Status:: db +\1Type:: +\1Type1:: db +\1Type2:: db +\1CatchRate:: db +\1Moves:: ds NUM_MOVES +\1OTID:: dw +\1Exp:: ds 3 +\1HPExp:: dw +\1AttackExp:: dw +\1DefenseExp:: dw +\1SpeedExp:: dw +\1SpecialExp:: dw +\1DVs:: ds 2 +\1PP:: ds NUM_MOVES +ENDM + +party_struct: MACRO + box_struct \1 +\1Level:: db +\1Stats:: +\1MaxHP:: dw +\1Attack:: dw +\1Defense:: dw +\1Speed:: dw +\1Special:: dw +ENDM + +battle_struct: MACRO +\1Species:: db +\1HP:: dw +\1PartyPos:: +\1BoxLevel:: db +\1Status:: db +\1Type:: +\1Type1:: db +\1Type2:: db +\1CatchRate:: db +\1Moves:: ds NUM_MOVES +\1DVs:: ds 2 +\1Level:: db +\1Stats:: +\1MaxHP:: dw +\1Attack:: dw +\1Defense:: dw +\1Speed:: dw +\1Special:: dw +\1PP:: ds NUM_MOVES +ENDM + +spritestatedata1: MACRO +\1PictureID:: db +\1MovementStatus:: db +\1ImageIndex:: db +\1YStepVector:: db +\1YPixels:: db +\1XStepVector:: db +\1XPixels:: db +\1IntraAnimFrameCounter:: db +\1AnimFrameCounter:: db +\1FacingDirection:: db +\1YAdjusted:: db +\1XAdjusted:: db +\1CollisionData:: db + ds 3 +\1End:: +ENDM + +spritestatedata2: MACRO +\1WalkAnimationCounter:: db + ds 1 +\1YDisplacement:: db +\1XDisplacement:: db +\1MapY:: db +\1MapX:: db +\1MovementByte1:: db +\1GrassPriority:: db +\1MovementDelay:: db +\1OrigFacingDirection:: db + ds 3 +\1PictureID:: db +\1ImageBaseOffset:: db + ds 1 +\1End:: +ENDM diff --git a/main.asm b/main.asm old mode 100755 new mode 100644 index da4e691d..31506a29 --- a/main.asm +++ b/main.asm @@ -1,2098 +1,359 @@ INCLUDE "constants.asm" -NPC_SPRITES_1 EQU $4 -NPC_SPRITES_2 EQU $5 - -GFX EQU $4 - -PICS_1 EQU $9 -PICS_2 EQU $A -PICS_3 EQU $B -PICS_4 EQU $C -PICS_5 EQU $D - -INCLUDE "home.asm" - SECTION "bank1", ROMX -INCLUDE "data/facing.asm" - -INCLUDE "engine/black_out.asm" - -MewPicFront:: INCBIN "pic/bmon/mew.pic" -MewPicBack:: INCBIN "pic/monback/mewb.pic" -INCLUDE "data/baseStats/mew.asm" - +INCLUDE "data/sprites/facings.asm" +INCLUDE "engine/events/black_out.asm" +INCLUDE "data/pokemon/mew.asm" INCLUDE "engine/battle/safari_zone.asm" - -INCLUDE "engine/titlescreen.asm" -INCLUDE "engine/load_mon_data.asm" - -INCLUDE "data/item_prices.asm" -INCLUDE "text/item_names.asm" -INCLUDE "text/unused_names.asm" - -INCLUDE "engine/overworld/oam.asm" -INCLUDE "engine/oam_dma.asm" - -INCLUDE "engine/print_waiting_text.asm" - -INCLUDE "engine/overworld/map_sprite_functions1.asm" - -INCLUDE "engine/test_battle.asm" - -INCLUDE "engine/overworld/item.asm" +INCLUDE "engine/movie/title.asm" +INCLUDE "engine/pokemon/load_mon_data.asm" +INCLUDE "data/items/prices.asm" +INCLUDE "data/items/names.asm" +INCLUDE "data/text/unused_names.asm" +INCLUDE "engine/gfx/sprite_oam.asm" +INCLUDE "engine/gfx/oam_dma.asm" +INCLUDE "engine/link/print_waiting_text.asm" +INCLUDE "engine/overworld/sprite_collisions.asm" +INCLUDE "engine/debug/debug_menu.asm" +INCLUDE "engine/events/pick_up_item.asm" INCLUDE "engine/overworld/movement.asm" - -INCLUDE "engine/cable_club.asm" - -INCLUDE "engine/menu/main_menu.asm" - -INCLUDE "engine/oak_speech.asm" - -INCLUDE "engine/special_warps.asm" - -INCLUDE "engine/debug1.asm" - -INCLUDE "engine/menu/naming_screen.asm" - -INCLUDE "engine/oak_speech2.asm" - -INCLUDE "engine/subtract_paid_money.asm" - -INCLUDE "engine/menu/swap_items.asm" - -INCLUDE "engine/overworld/pokemart.asm" - -INCLUDE "engine/learn_move.asm" - -INCLUDE "engine/overworld/pokecenter.asm" - -INCLUDE "engine/overworld/set_blackout_map.asm" - -INCLUDE "engine/display_text_id_init.asm" -INCLUDE "engine/menu/draw_start_menu.asm" - -INCLUDE "engine/overworld/cable_club_npc.asm" - -INCLUDE "engine/menu/text_box.asm" - -INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" - -INCLUDE "engine/menu/players_pc.asm" - -INCLUDE "engine/remove_pokemon.asm" - -INCLUDE "engine/display_pokedex.asm" +INCLUDE "engine/link/cable_club.asm" +INCLUDE "engine/menus/main_menu.asm" +INCLUDE "engine/movie/oak_speech/oak_speech.asm" +INCLUDE "engine/overworld/special_warps.asm" +INCLUDE "engine/debug/debug_party.asm" +INCLUDE "engine/menus/naming_screen.asm" +INCLUDE "engine/movie/oak_speech/oak_speech2.asm" +INCLUDE "engine/items/subtract_paid_money.asm" +INCLUDE "engine/menus/swap_items.asm" +INCLUDE "engine/events/pokemart.asm" +INCLUDE "engine/pokemon/learn_move.asm" +INCLUDE "engine/events/pokecenter.asm" +INCLUDE "engine/events/set_blackout_map.asm" +INCLUDE "engine/menus/display_text_id_init.asm" +INCLUDE "engine/menus/draw_start_menu.asm" +INCLUDE "engine/link/cable_club_npc.asm" +INCLUDE "engine/menus/text_box.asm" +INCLUDE "engine/battle/move_effects/drain_hp.asm" +INCLUDE "engine/menus/players_pc.asm" +INCLUDE "engine/pokemon/remove_mon.asm" +INCLUDE "engine/events/display_pokedex.asm" SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" - -INCLUDE "data/map_songs.asm" - -INCLUDE "data/map_header_banks.asm" - +INCLUDE "data/maps/songs.asm" +INCLUDE "data/maps/map_header_banks.asm" INCLUDE "engine/overworld/clear_variables.asm" INCLUDE "engine/overworld/player_state.asm" -INCLUDE "engine/overworld/poison.asm" -INCLUDE "engine/overworld/tileset_header.asm" +INCLUDE "engine/events/poison.asm" +INCLUDE "engine/overworld/tilesets.asm" INCLUDE "engine/overworld/daycare_exp.asm" - -INCLUDE "data/hide_show_data.asm" - +INCLUDE "data/maps/hide_show_data.asm" INCLUDE "engine/overworld/field_move_messages.asm" - INCLUDE "engine/items/inventory.asm" - INCLUDE "engine/overworld/wild_mons.asm" - -INCLUDE "engine/items/items.asm" - -INCLUDE "engine/menu/draw_badges.asm" - +INCLUDE "engine/items/item_effects.asm" +INCLUDE "engine/menus/draw_badges.asm" INCLUDE "engine/overworld/update_map.asm" INCLUDE "engine/overworld/cut.asm" INCLUDE "engine/overworld/missable_objects.asm" INCLUDE "engine/overworld/push_boulder.asm" - -INCLUDE "engine/add_mon.asm" +INCLUDE "engine/pokemon/add_mon.asm" INCLUDE "engine/flag_action.asm" -INCLUDE "engine/heal_party.asm" -INCLUDE "engine/bcd.asm" -INCLUDE "engine/init_player_data.asm" -INCLUDE "engine/get_bag_item_quantity.asm" -INCLUDE "engine/pathfinding.asm" -INCLUDE "engine/hp_bar.asm" -INCLUDE "engine/hidden_object_functions3.asm" +INCLUDE "engine/events/heal_party.asm" +INCLUDE "engine/math/bcd.asm" +INCLUDE "engine/movie/oak_speech/init_player_data.asm" +INCLUDE "engine/items/get_bag_item_quantity.asm" +INCLUDE "engine/overworld/pathfinding.asm" +INCLUDE "engine/gfx/hp_bar.asm" +INCLUDE "engine/events/hidden_objects/bookshelves.asm" +INCLUDE "engine/events/hidden_objects/indigo_plateau_statues.asm" +INCLUDE "engine/events/hidden_objects/book_or_sculpture.asm" +INCLUDE "engine/events/hidden_objects/elevator.asm" +INCLUDE "engine/events/hidden_objects/town_map.asm" +INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm" -SECTION "NPC Sprites 1", ROMX ; BANK $04 +SECTION "Font Graphics", ROMX -OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" -RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" -SwimmerSprite: INCBIN "gfx/sprites/swimmer.2bpp" -WhitePlayerSprite: INCBIN "gfx/sprites/white_player.2bpp" -GymHelperSprite: INCBIN "gfx/sprites/gym_helper.2bpp" -OldPersonSprite: INCBIN "gfx/sprites/old_person.2bpp" -MartGuySprite: INCBIN "gfx/sprites/mart_guy.2bpp" -FisherSprite: INCBIN "gfx/sprites/fisher.2bpp" -OldMediumWomanSprite: INCBIN "gfx/sprites/old_medium_woman.2bpp" -NurseSprite: INCBIN "gfx/sprites/nurse.2bpp" -CableClubWomanSprite: INCBIN "gfx/sprites/cable_club_woman.2bpp" -MrMasterballSprite: INCBIN "gfx/sprites/mr_masterball.2bpp" -LaprasGiverSprite: INCBIN "gfx/sprites/lapras_giver.2bpp" -WardenSprite: INCBIN "gfx/sprites/warden.2bpp" -SsCaptainSprite: INCBIN "gfx/sprites/ss_captain.2bpp" -Fisher2Sprite: INCBIN "gfx/sprites/fisher2.2bpp" -BlackbeltSprite: INCBIN "gfx/sprites/blackbelt.2bpp" -GuardSprite: INCBIN "gfx/sprites/guard.2bpp" -BallSprite: INCBIN "gfx/sprites/ball.2bpp" -OmanyteSprite: INCBIN "gfx/sprites/omanyte.2bpp" -BoulderSprite: INCBIN "gfx/sprites/boulder.2bpp" -PaperSheetSprite: INCBIN "gfx/sprites/paper_sheet.2bpp" -BookMapDexSprite: INCBIN "gfx/sprites/book_map_dex.2bpp" -ClipboardSprite: INCBIN "gfx/sprites/clipboard.2bpp" -SnorlaxSprite: INCBIN "gfx/sprites/snorlax.2bpp" -OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" -LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" +INCLUDE "gfx/font.asm" -SECTION "Graphics (BANK 4)", ROMX - -PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" -FontGraphics: INCBIN "gfx/font.1bpp" -FontGraphicsEnd: -ABTiles: INCBIN "gfx/AB.2bpp" -HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp" -HpBarAndStatusGraphicsEnd: -BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp" -BattleHudTiles1End: -BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp" -BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp" -BattleHudTiles3End: -NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp" -GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp" -GamefreakLogoGraphicsEnd: -TextBoxGraphics: INCBIN "gfx/text_box.2bpp" -TextBoxGraphicsEnd: -PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" -PokedexTileGraphicsEnd: -WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" -WorldMapTileGraphicsEnd: -PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" -PlayerCharacterTitleGraphicsEnd: - - -SECTION "Battle (BANK 4)", ROMX +SECTION "Battle Engine 1", ROMX INCLUDE "engine/overworld/is_player_just_outside_map.asm" -INCLUDE "engine/menu/status_screen.asm" -INCLUDE "engine/menu/party_menu.asm" - -RedPicFront:: INCBIN "pic/trainer/red.pic" -ShrinkPic1:: INCBIN "pic/trainer/shrink1.pic" -ShrinkPic2:: INCBIN "pic/trainer/shrink2.pic" - -INCLUDE "engine/turn_sprite.asm" -INCLUDE "engine/menu/start_sub_menus.asm" +INCLUDE "engine/pokemon/status_screen.asm" +INCLUDE "engine/menus/party_menu.asm" +INCLUDE "gfx/player.asm" +INCLUDE "engine/overworld/turn_sprite.asm" +INCLUDE "engine/menus/start_sub_menus.asm" INCLUDE "engine/items/tms.asm" INCLUDE "engine/battle/end_of_battle.asm" INCLUDE "engine/battle/wild_encounters.asm" -INCLUDE "engine/battle/moveEffects/recoil_effect.asm" -INCLUDE "engine/battle/moveEffects/conversion_effect.asm" -INCLUDE "engine/battle/moveEffects/haze_effect.asm" +INCLUDE "engine/battle/move_effects/recoil.asm" +INCLUDE "engine/battle/move_effects/conversion.asm" +INCLUDE "engine/battle/move_effects/haze.asm" INCLUDE "engine/battle/get_trainer_name.asm" -INCLUDE "engine/random.asm" +INCLUDE "engine/math/random.asm" -SECTION "NPC Sprites 2", ROMX ; BANK $05 +SECTION "Battle Engine 2", ROMX -RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" -RedSprite: INCBIN "gfx/sprites/red.2bpp" -BlueSprite: INCBIN "gfx/sprites/blue.2bpp" -OakSprite: INCBIN "gfx/sprites/oak.2bpp" -BugCatcherSprite: INCBIN "gfx/sprites/bug_catcher.2bpp" -SlowbroSprite: INCBIN "gfx/sprites/slowbro.2bpp" -LassSprite: INCBIN "gfx/sprites/lass.2bpp" -BlackHairBoy1Sprite: INCBIN "gfx/sprites/black_hair_boy_1.2bpp" -LittleGirlSprite: INCBIN "gfx/sprites/little_girl.2bpp" -BirdSprite: INCBIN "gfx/sprites/bird.2bpp" -FatBaldGuySprite: INCBIN "gfx/sprites/fat_bald_guy.2bpp" -GamblerSprite: INCBIN "gfx/sprites/gambler.2bpp" -BlackHairBoy2Sprite: INCBIN "gfx/sprites/black_hair_boy_2.2bpp" -GirlSprite: INCBIN "gfx/sprites/girl.2bpp" -HikerSprite: INCBIN "gfx/sprites/hiker.2bpp" -FoulardWomanSprite: INCBIN "gfx/sprites/foulard_woman.2bpp" -GentlemanSprite: INCBIN "gfx/sprites/gentleman.2bpp" -DaisySprite: INCBIN "gfx/sprites/daisy.2bpp" -BikerSprite: INCBIN "gfx/sprites/biker.2bpp" -SailorSprite: INCBIN "gfx/sprites/sailor.2bpp" -CookSprite: INCBIN "gfx/sprites/cook.2bpp" -BikeShopGuySprite: INCBIN "gfx/sprites/bike_shop_guy.2bpp" -MrFujiSprite: INCBIN "gfx/sprites/mr_fuji.2bpp" -GiovanniSprite: INCBIN "gfx/sprites/giovanni.2bpp" -RocketSprite: INCBIN "gfx/sprites/rocket.2bpp" -MediumSprite: INCBIN "gfx/sprites/medium.2bpp" -WaiterSprite: INCBIN "gfx/sprites/waiter.2bpp" -ErikaSprite: INCBIN "gfx/sprites/erika.2bpp" -MomGeishaSprite: INCBIN "gfx/sprites/mom_geisha.2bpp" -BrunetteGirlSprite: INCBIN "gfx/sprites/brunette_girl.2bpp" -LanceSprite: INCBIN "gfx/sprites/lance.2bpp" -MomSprite: INCBIN "gfx/sprites/mom.2bpp" -BaldingGuySprite: INCBIN "gfx/sprites/balding_guy.2bpp" -YoungBoySprite: INCBIN "gfx/sprites/young_boy.2bpp" -GameboyKidSprite: INCBIN "gfx/sprites/gameboy_kid.2bpp" -ClefairySprite: INCBIN "gfx/sprites/clefairy.2bpp" -AgathaSprite: INCBIN "gfx/sprites/agatha.2bpp" -BrunoSprite: INCBIN "gfx/sprites/bruno.2bpp" -LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" -SeelSprite: INCBIN "gfx/sprites/seel.2bpp" - - -SECTION "Battle (BANK 5)", ROMX - -INCLUDE "engine/load_pokedex_tiles.asm" +INCLUDE "engine/gfx/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" INCLUDE "engine/overworld/emotion_bubbles.asm" -INCLUDE "engine/evolve_trade.asm" -INCLUDE "engine/battle/moveEffects/substitute_effect.asm" -INCLUDE "engine/menu/pc.asm" +INCLUDE "engine/events/evolve_trade.asm" +INCLUDE "engine/battle/move_effects/substitute.asm" +INCLUDE "engine/menus/pc.asm" -SECTION "bank6", ROMX - -INCLUDE "data/mapHeaders/CeladonCity.asm" -INCLUDE "data/mapObjects/CeladonCity.asm" -CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" - -INCLUDE "data/mapHeaders/PalletTown.asm" -INCLUDE "data/mapObjects/PalletTown.asm" -PalletTown_Blocks: INCBIN "maps/PalletTown.blk" - -INCLUDE "data/mapHeaders/ViridianCity.asm" -INCLUDE "data/mapObjects/ViridianCity.asm" -ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk" - -INCLUDE "data/mapHeaders/PewterCity.asm" - ds 1 -INCLUDE "data/mapObjects/PewterCity.asm" -PewterCity_Blocks: INCBIN "maps/PewterCity.blk" - -INCLUDE "data/mapHeaders/CeruleanCity.asm" -INCLUDE "data/mapObjects/CeruleanCity.asm" -CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk" - -INCLUDE "data/mapHeaders/VermilionCity.asm" -INCLUDE "data/mapObjects/VermilionCity.asm" -VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk" - -INCLUDE "data/mapHeaders/FuchsiaCity.asm" -INCLUDE "data/mapObjects/FuchsiaCity.asm" -FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk" +SECTION "Play Time", ROMX INCLUDE "engine/play_time.asm" -INCLUDE "scripts/PalletTown.asm" -INCLUDE "scripts/ViridianCity.asm" -INCLUDE "scripts/PewterCity.asm" -INCLUDE "scripts/CeruleanCity.asm" -INCLUDE "scripts/VermilionCity.asm" -INCLUDE "scripts/CeladonCity.asm" -INCLUDE "scripts/FuchsiaCity.asm" -INCLUDE "data/mapHeaders/BluesHouse.asm" -INCLUDE "scripts/BluesHouse.asm" -INCLUDE "data/mapObjects/BluesHouse.asm" -BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk" +SECTION "Doors and Ledges", ROMX -INCLUDE "data/mapHeaders/VermilionTradeHouse.asm" -INCLUDE "scripts/VermilionTradeHouse.asm" -INCLUDE "data/mapObjects/VermilionTradeHouse.asm" -VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk" - -INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm" -INCLUDE "scripts/IndigoPlateauLobby.asm" -INCLUDE "data/mapObjects/IndigoPlateauLobby.asm" -IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk" - -INCLUDE "data/mapHeaders/SilphCo4F.asm" -INCLUDE "scripts/SilphCo4F.asm" -INCLUDE "data/mapObjects/SilphCo4F.asm" -SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk" - -INCLUDE "data/mapHeaders/SilphCo5F.asm" -INCLUDE "scripts/SilphCo5F.asm" -INCLUDE "data/mapObjects/SilphCo5F.asm" -SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk" - -INCLUDE "data/mapHeaders/SilphCo6F.asm" -INCLUDE "scripts/SilphCo6F.asm" -INCLUDE "data/mapObjects/SilphCo6F.asm" -SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk" - -INCLUDE "engine/overworld/npc_movement.asm" +INCLUDE "engine/overworld/auto_movement.asm" INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank7", ROMX +SECTION "Pokémon Names", ROMX -INCLUDE "data/mapHeaders/CinnabarIsland.asm" -INCLUDE "data/mapObjects/CinnabarIsland.asm" -CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk" - -INCLUDE "data/mapHeaders/Route1.asm" -INCLUDE "data/mapObjects/Route1.asm" -Route1_Blocks: INCBIN "maps/Route1.blk" - -UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk" - -OaksLab_Blocks: INCBIN "maps/OaksLab.blk" - -MrPsychicsHouse_Blocks: -NameRatersHouse_Blocks: -MrFujisHouse_Blocks: -Route16FlyHouse_Blocks: -Route2TradeHouse_Blocks: -SaffronPidgeyHouse_Blocks: -VermilionPidgeyHouse_Blocks: -LavenderCuboneHouse_Blocks: -CeruleanTradeHouse_Blocks: -PewterNidoranHouse_Blocks: -PewterSpeechHouse_Blocks: -ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" - -CeladonMansionRoofHouse_Blocks: -ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk" - -CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk" - -DiglettsCaveRoute11_Blocks: -DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk" - -INCLUDE "text/monster_names.asm" - -INCLUDE "engine/clear_save.asm" - -INCLUDE "engine/predefs7.asm" - -INCLUDE "scripts/CinnabarIsland.asm" - -INCLUDE "scripts/Route1.asm" - -INCLUDE "data/mapHeaders/OaksLab.asm" -INCLUDE "scripts/OaksLab.asm" -INCLUDE "data/mapObjects/OaksLab.asm" - -INCLUDE "data/mapHeaders/ViridianMart.asm" -INCLUDE "scripts/ViridianMart.asm" -INCLUDE "data/mapObjects/ViridianMart.asm" -ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk" - -INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm" -INCLUDE "scripts/ViridianSchoolHouse.asm" -INCLUDE "data/mapObjects/ViridianSchoolHouse.asm" - -INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm" - ds 1 -INCLUDE "scripts/ViridianNicknameHouse.asm" -INCLUDE "data/mapObjects/ViridianNicknameHouse.asm" - -INCLUDE "data/mapHeaders/PewterNidoranHouse.asm" -INCLUDE "scripts/PewterNidoranHouse.asm" -INCLUDE "data/mapObjects/PewterNidoranHouse.asm" - -INCLUDE "data/mapHeaders/PewterSpeechHouse.asm" -INCLUDE "scripts/PewterSpeechHouse.asm" -INCLUDE "data/mapObjects/PewterSpeechHouse.asm" - -INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm" -INCLUDE "scripts/CeruleanTrashedHouse.asm" -INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm" - -INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm" -INCLUDE "scripts/CeruleanTradeHouse.asm" -INCLUDE "data/mapObjects/CeruleanTradeHouse.asm" - -INCLUDE "data/mapHeaders/BikeShop.asm" -INCLUDE "scripts/BikeShop.asm" -INCLUDE "data/mapObjects/BikeShop.asm" -BikeShop_Blocks: INCBIN "maps/BikeShop.blk" - -INCLUDE "data/mapHeaders/MrFujisHouse.asm" -INCLUDE "scripts/MrFujisHouse.asm" -INCLUDE "data/mapObjects/MrFujisHouse.asm" - -INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm" -INCLUDE "scripts/LavenderCuboneHouse.asm" -INCLUDE "data/mapObjects/LavenderCuboneHouse.asm" - -INCLUDE "data/mapHeaders/NameRatersHouse.asm" -INCLUDE "scripts/NameRatersHouse.asm" -INCLUDE "data/mapObjects/NameRatersHouse.asm" - -INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm" -INCLUDE "scripts/VermilionPidgeyHouse.asm" -INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm" - -INCLUDE "data/mapHeaders/VermilionDock.asm" -INCLUDE "scripts/VermilionDock.asm" -INCLUDE "data/mapObjects/VermilionDock.asm" -VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk" - -INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm" -INCLUDE "scripts/CeladonMansionRoofHouse.asm" -INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm" - -INCLUDE "data/mapHeaders/FuchsiaMart.asm" -INCLUDE "scripts/FuchsiaMart.asm" -INCLUDE "data/mapObjects/FuchsiaMart.asm" -FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk" - -INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm" -INCLUDE "scripts/SaffronPidgeyHouse.asm" -INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm" - -INCLUDE "data/mapHeaders/MrPsychicsHouse.asm" -INCLUDE "scripts/MrPsychicsHouse.asm" -INCLUDE "data/mapObjects/MrPsychicsHouse.asm" - -INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm" -INCLUDE "scripts/DiglettsCaveRoute2.asm" -INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm" - -INCLUDE "data/mapHeaders/Route2TradeHouse.asm" -INCLUDE "scripts/Route2TradeHouse.asm" -INCLUDE "data/mapObjects/Route2TradeHouse.asm" - -INCLUDE "data/mapHeaders/Route5Gate.asm" -INCLUDE "scripts/Route5Gate.asm" -INCLUDE "data/mapObjects/Route5Gate.asm" -Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk" - -INCLUDE "data/mapHeaders/Route6Gate.asm" -INCLUDE "scripts/Route6Gate.asm" -INCLUDE "data/mapObjects/Route6Gate.asm" -Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk" - -INCLUDE "data/mapHeaders/Route7Gate.asm" -INCLUDE "scripts/Route7Gate.asm" -INCLUDE "data/mapObjects/Route7Gate.asm" -Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk" - -INCLUDE "data/mapHeaders/Route8Gate.asm" -INCLUDE "scripts/Route8Gate.asm" -INCLUDE "data/mapObjects/Route8Gate.asm" -Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk" - -INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm" -INCLUDE "scripts/UndergroundPathRoute8.asm" -INCLUDE "data/mapObjects/UndergroundPathRoute8.asm" - -INCLUDE "data/mapHeaders/PowerPlant.asm" -INCLUDE "scripts/PowerPlant.asm" -INCLUDE "data/mapObjects/PowerPlant.asm" -PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk" - -INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm" -INCLUDE "scripts/DiglettsCaveRoute11.asm" -INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm" - -INCLUDE "data/mapHeaders/Route16FlyHouse.asm" -INCLUDE "scripts/Route16FlyHouse.asm" -INCLUDE "data/mapObjects/Route16FlyHouse.asm" - -INCLUDE "data/mapHeaders/Route22Gate.asm" -INCLUDE "scripts/Route22Gate.asm" -INCLUDE "data/mapObjects/Route22Gate.asm" -Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk" - -INCLUDE "data/mapHeaders/BillsHouse.asm" -INCLUDE "scripts/BillsHouse.asm" -INCLUDE "data/mapObjects/BillsHouse.asm" -BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk" - -INCLUDE "engine/menu/oaks_pc.asm" - -INCLUDE "engine/hidden_object_functions7.asm" +INCLUDE "data/pokemon/names.asm" +INCLUDE "engine/movie/oak_speech/clear_save.asm" +INCLUDE "engine/events/elevator.asm" -SECTION "Pics 1", ROMX ; BANK $09 +SECTION "Hidden Objects 1", ROMX -RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" -RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" -KangaskhanPicFront:: INCBIN "pic/bmon/kangaskhan.pic" -KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic" -NidoranMPicFront:: INCBIN "pic/bmon/nidoranm.pic" -NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic" -ClefairyPicFront:: INCBIN "pic/bmon/clefairy.pic" -ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic" -SpearowPicFront:: INCBIN "pic/bmon/spearow.pic" -SpearowPicBack:: INCBIN "pic/monback/spearowb.pic" -VoltorbPicFront:: INCBIN "pic/bmon/voltorb.pic" -VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic" -NidokingPicFront:: INCBIN "pic/bmon/nidoking.pic" -NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic" -SlowbroPicFront:: INCBIN "pic/bmon/slowbro.pic" -SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic" -IvysaurPicFront:: INCBIN "pic/bmon/ivysaur.pic" -IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic" -ExeggutorPicFront:: INCBIN "pic/bmon/exeggutor.pic" -ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic" -LickitungPicFront:: INCBIN "pic/bmon/lickitung.pic" -LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic" -ExeggcutePicFront:: INCBIN "pic/bmon/exeggcute.pic" -ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic" -GrimerPicFront:: INCBIN "pic/bmon/grimer.pic" -GrimerPicBack:: INCBIN "pic/monback/grimerb.pic" -GengarPicFront:: INCBIN "pic/bmon/gengar.pic" -GengarPicBack:: INCBIN "pic/monback/gengarb.pic" -NidoranFPicFront:: INCBIN "pic/bmon/nidoranf.pic" -NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic" -NidoqueenPicFront:: INCBIN "pic/bmon/nidoqueen.pic" -NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic" -CubonePicFront:: INCBIN "pic/bmon/cubone.pic" -CubonePicBack:: INCBIN "pic/monback/cuboneb.pic" -RhyhornPicFront:: INCBIN "pic/bmon/rhyhorn.pic" -RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic" -LaprasPicFront:: INCBIN "pic/bmon/lapras.pic" -LaprasPicBack:: INCBIN "pic/monback/laprasb.pic" -ArcaninePicFront:: INCBIN "pic/bmon/arcanine.pic" -ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic" -GyaradosPicFront:: INCBIN "pic/bmon/gyarados.pic" -GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic" -ShellderPicFront:: INCBIN "pic/bmon/shellder.pic" -ShellderPicBack:: INCBIN "pic/monback/shellderb.pic" -TentacoolPicFront:: INCBIN "pic/bmon/tentacool.pic" -TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic" -GastlyPicFront:: INCBIN "pic/bmon/gastly.pic" -GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic" -ScytherPicFront:: INCBIN "pic/bmon/scyther.pic" -ScytherPicBack:: INCBIN "pic/monback/scytherb.pic" -StaryuPicFront:: INCBIN "pic/bmon/staryu.pic" -StaryuPicBack:: INCBIN "pic/monback/staryub.pic" -BlastoisePicFront:: INCBIN "pic/bmon/blastoise.pic" -BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic" -PinsirPicFront:: INCBIN "pic/bmon/pinsir.pic" -PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic" -TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" -TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" +INCLUDE "engine/menus/oaks_pc.asm" +INCLUDE "engine/events/hidden_objects/new_bike.asm" +INCLUDE "engine/events/hidden_objects/oaks_lab_posters.asm" +INCLUDE "engine/events/hidden_objects/safari_game.asm" +INCLUDE "engine/events/hidden_objects/cinnabar_gym_quiz.asm" +INCLUDE "engine/events/hidden_objects/magazines.asm" +INCLUDE "engine/events/hidden_objects/bills_house_pc.asm" +INCLUDE "engine/events/hidden_objects/oaks_lab_email.asm" -SECTION "Battle (BANK 9)", ROMX +SECTION "Bill's PC", ROMX + +INCLUDE "engine/pokemon/bills_pc.asm" + + +SECTION "Battle Engine 3", ROMX INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" -INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm" +INCLUDE "engine/battle/move_effects/focus_energy.asm" -SECTION "Pics 2", ROMX ; BANK $0A +SECTION "Battle Engine 4", ROMX -GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" -GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" -OnixPicFront:: INCBIN "pic/bmon/onix.pic" -OnixPicBack:: INCBIN "pic/monback/onixb.pic" -FearowPicFront:: INCBIN "pic/bmon/fearow.pic" -FearowPicBack:: INCBIN "pic/monback/fearowb.pic" -PidgeyPicFront:: INCBIN "pic/bmon/pidgey.pic" -PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic" -SlowpokePicFront:: INCBIN "pic/bmon/slowpoke.pic" -SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic" -KadabraPicFront:: INCBIN "pic/bmon/kadabra.pic" -KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic" -GravelerPicFront:: INCBIN "pic/bmon/graveler.pic" -GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic" -ChanseyPicFront:: INCBIN "pic/bmon/chansey.pic" -ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic" -MachokePicFront:: INCBIN "pic/bmon/machoke.pic" -MachokePicBack:: INCBIN "pic/monback/machokeb.pic" -MrMimePicFront:: INCBIN "pic/bmon/mr.mime.pic" -MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic" -HitmonleePicFront:: INCBIN "pic/bmon/hitmonlee.pic" -HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic" -HitmonchanPicFront:: INCBIN "pic/bmon/hitmonchan.pic" -HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic" -ArbokPicFront:: INCBIN "pic/bmon/arbok.pic" -ArbokPicBack:: INCBIN "pic/monback/arbokb.pic" -ParasectPicFront:: INCBIN "pic/bmon/parasect.pic" -ParasectPicBack:: INCBIN "pic/monback/parasectb.pic" -PsyduckPicFront:: INCBIN "pic/bmon/psyduck.pic" -PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic" -DrowzeePicFront:: INCBIN "pic/bmon/drowzee.pic" -DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic" -GolemPicFront:: INCBIN "pic/bmon/golem.pic" -GolemPicBack:: INCBIN "pic/monback/golemb.pic" -MagmarPicFront:: INCBIN "pic/bmon/magmar.pic" -MagmarPicBack:: INCBIN "pic/monback/magmarb.pic" -ElectabuzzPicFront:: INCBIN "pic/bmon/electabuzz.pic" -ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic" -MagnetonPicFront:: INCBIN "pic/bmon/magneton.pic" -MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic" -KoffingPicFront:: INCBIN "pic/bmon/koffing.pic" -KoffingPicBack:: INCBIN "pic/monback/koffingb.pic" -MankeyPicFront:: INCBIN "pic/bmon/mankey.pic" -MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic" -SeelPicFront:: INCBIN "pic/bmon/seel.pic" -SeelPicBack:: INCBIN "pic/monback/seelb.pic" -DiglettPicFront:: INCBIN "pic/bmon/diglett.pic" -DiglettPicBack:: INCBIN "pic/monback/diglettb.pic" -TaurosPicFront:: INCBIN "pic/bmon/tauros.pic" -TaurosPicBack:: INCBIN "pic/monback/taurosb.pic" -FarfetchdPicFront:: INCBIN "pic/bmon/farfetchd.pic" -FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic" -VenonatPicFront:: INCBIN "pic/bmon/venonat.pic" -VenonatPicBack:: INCBIN "pic/monback/venonatb.pic" -DragonitePicFront:: INCBIN "pic/bmon/dragonite.pic" -DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic" -DoduoPicFront:: INCBIN "pic/bmon/doduo.pic" -DoduoPicBack:: INCBIN "pic/monback/doduob.pic" -PoliwagPicFront:: INCBIN "pic/bmon/poliwag.pic" -PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic" -JynxPicFront:: INCBIN "pic/bmon/jynx.pic" -JynxPicBack:: INCBIN "pic/monback/jynxb.pic" -MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" -MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" +INCLUDE "engine/battle/move_effects/leech_seed.asm" -SECTION "Battle (BANK A)", ROMX - -INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" - - -SECTION "Pics 3", ROMX ; BANK $0B - -ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" -ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" -ZapdosPicFront:: INCBIN "pic/bmon/zapdos.pic" -ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic" -DittoPicFront:: INCBIN "pic/bmon/ditto.pic" -DittoPicBack:: INCBIN "pic/monback/dittob.pic" -MeowthPicFront:: INCBIN "pic/bmon/meowth.pic" -MeowthPicBack:: INCBIN "pic/monback/meowthb.pic" -KrabbyPicFront:: INCBIN "pic/bmon/krabby.pic" -KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic" -VulpixPicFront:: INCBIN "pic/bmon/vulpix.pic" -VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic" -NinetalesPicFront:: INCBIN "pic/bmon/ninetales.pic" -NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic" -PikachuPicFront:: INCBIN "pic/bmon/pikachu.pic" -PikachuPicBack:: INCBIN "pic/monback/pikachub.pic" -RaichuPicFront:: INCBIN "pic/bmon/raichu.pic" -RaichuPicBack:: INCBIN "pic/monback/raichub.pic" -DratiniPicFront:: INCBIN "pic/bmon/dratini.pic" -DratiniPicBack:: INCBIN "pic/monback/dratinib.pic" -DragonairPicFront:: INCBIN "pic/bmon/dragonair.pic" -DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic" -KabutoPicFront:: INCBIN "pic/bmon/kabuto.pic" -KabutoPicBack:: INCBIN "pic/monback/kabutob.pic" -KabutopsPicFront:: INCBIN "pic/bmon/kabutops.pic" -KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic" -HorseaPicFront:: INCBIN "pic/bmon/horsea.pic" -HorseaPicBack:: INCBIN "pic/monback/horseab.pic" -SeadraPicFront:: INCBIN "pic/bmon/seadra.pic" -SeadraPicBack:: INCBIN "pic/monback/seadrab.pic" -SandshrewPicFront:: INCBIN "pic/bmon/sandshrew.pic" -SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic" -SandslashPicFront:: INCBIN "pic/bmon/sandslash.pic" -SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic" -OmanytePicFront:: INCBIN "pic/bmon/omanyte.pic" -OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic" -OmastarPicFront:: INCBIN "pic/bmon/omastar.pic" -OmastarPicBack:: INCBIN "pic/monback/omastarb.pic" -JigglypuffPicFront:: INCBIN "pic/bmon/jigglypuff.pic" -JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic" -WigglytuffPicFront:: INCBIN "pic/bmon/wigglytuff.pic" -WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic" -EeveePicFront:: INCBIN "pic/bmon/eevee.pic" -EeveePicBack:: INCBIN "pic/monback/eeveeb.pic" -FlareonPicFront:: INCBIN "pic/bmon/flareon.pic" -FlareonPicBack:: INCBIN "pic/monback/flareonb.pic" -JolteonPicFront:: INCBIN "pic/bmon/jolteon.pic" -JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic" -VaporeonPicFront:: INCBIN "pic/bmon/vaporeon.pic" -VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic" -MachopPicFront:: INCBIN "pic/bmon/machop.pic" -MachopPicBack:: INCBIN "pic/monback/machopb.pic" -ZubatPicFront:: INCBIN "pic/bmon/zubat.pic" -ZubatPicBack:: INCBIN "pic/monback/zubatb.pic" -EkansPicFront:: INCBIN "pic/bmon/ekans.pic" -EkansPicBack:: INCBIN "pic/monback/ekansb.pic" -ParasPicFront:: INCBIN "pic/bmon/paras.pic" -ParasPicBack:: INCBIN "pic/monback/parasb.pic" -PoliwhirlPicFront:: INCBIN "pic/bmon/poliwhirl.pic" -PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic" -PoliwrathPicFront:: INCBIN "pic/bmon/poliwrath.pic" -PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic" -WeedlePicFront:: INCBIN "pic/bmon/weedle.pic" -WeedlePicBack:: INCBIN "pic/monback/weedleb.pic" -KakunaPicFront:: INCBIN "pic/bmon/kakuna.pic" -KakunaPicBack:: INCBIN "pic/monback/kakunab.pic" -BeedrillPicFront:: INCBIN "pic/bmon/beedrill.pic" -BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" - -FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" - - -SECTION "Battle (BANK B)", ROMX +SECTION "Battle Engine 5", ROMX INCLUDE "engine/battle/display_effectiveness.asm" - -TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_info.2bpp" -TrainerInfoTextBoxTileGraphicsEnd: -BlankLeaderNames: INCBIN "gfx/blank_leader_names.2bpp" -CircleTile: INCBIN "gfx/circle_tile.2bpp" -BadgeNumbersTileGraphics: INCBIN "gfx/badge_numbers.2bpp" - +INCLUDE "gfx/trainer_card.asm" INCLUDE "engine/items/tmhm.asm" INCLUDE "engine/battle/scale_sprites.asm" -INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" -INCLUDE "engine/game_corner_slots2.asm" +INCLUDE "engine/battle/move_effects/pay_day.asm" +INCLUDE "engine/slots/game_corner_slots2.asm" -SECTION "Pics 4", ROMX ; BANK $0C +SECTION "Battle Engine 6", ROMX -DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" -DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" -PrimeapePicFront:: INCBIN "pic/bmon/primeape.pic" -PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic" -DugtrioPicFront:: INCBIN "pic/bmon/dugtrio.pic" -DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic" -VenomothPicFront:: INCBIN "pic/bmon/venomoth.pic" -VenomothPicBack:: INCBIN "pic/monback/venomothb.pic" -DewgongPicFront:: INCBIN "pic/bmon/dewgong.pic" -DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic" -CaterpiePicFront:: INCBIN "pic/bmon/caterpie.pic" -CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic" -MetapodPicFront:: INCBIN "pic/bmon/metapod.pic" -MetapodPicBack:: INCBIN "pic/monback/metapodb.pic" -ButterfreePicFront:: INCBIN "pic/bmon/butterfree.pic" -ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic" -MachampPicFront:: INCBIN "pic/bmon/machamp.pic" -MachampPicBack:: INCBIN "pic/monback/machampb.pic" -GolduckPicFront:: INCBIN "pic/bmon/golduck.pic" -GolduckPicBack:: INCBIN "pic/monback/golduckb.pic" -HypnoPicFront:: INCBIN "pic/bmon/hypno.pic" -HypnoPicBack:: INCBIN "pic/monback/hypnob.pic" -GolbatPicFront:: INCBIN "pic/bmon/golbat.pic" -GolbatPicBack:: INCBIN "pic/monback/golbatb.pic" -MewtwoPicFront:: INCBIN "pic/bmon/mewtwo.pic" -MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic" -SnorlaxPicFront:: INCBIN "pic/bmon/snorlax.pic" -SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic" -MagikarpPicFront:: INCBIN "pic/bmon/magikarp.pic" -MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic" -MukPicFront:: INCBIN "pic/bmon/muk.pic" -MukPicBack:: INCBIN "pic/monback/mukb.pic" -KinglerPicFront:: INCBIN "pic/bmon/kingler.pic" -KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic" -CloysterPicFront:: INCBIN "pic/bmon/cloyster.pic" -CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic" -ElectrodePicFront:: INCBIN "pic/bmon/electrode.pic" -ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic" -ClefablePicFront:: INCBIN "pic/bmon/clefable.pic" -ClefablePicBack:: INCBIN "pic/monback/clefableb.pic" -WeezingPicFront:: INCBIN "pic/bmon/weezing.pic" -WeezingPicBack:: INCBIN "pic/monback/weezingb.pic" -PersianPicFront:: INCBIN "pic/bmon/persian.pic" -PersianPicBack:: INCBIN "pic/monback/persianb.pic" -MarowakPicFront:: INCBIN "pic/bmon/marowak.pic" -MarowakPicBack:: INCBIN "pic/monback/marowakb.pic" -HaunterPicFront:: INCBIN "pic/bmon/haunter.pic" -HaunterPicBack:: INCBIN "pic/monback/haunterb.pic" -AbraPicFront:: INCBIN "pic/bmon/abra.pic" -AbraPicBack:: INCBIN "pic/monback/abrab.pic" -AlakazamPicFront:: INCBIN "pic/bmon/alakazam.pic" -AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic" -PidgeottoPicFront:: INCBIN "pic/bmon/pidgeotto.pic" -PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic" -PidgeotPicFront:: INCBIN "pic/bmon/pidgeot.pic" -PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic" -StarmiePicFront:: INCBIN "pic/bmon/starmie.pic" -StarmiePicBack:: INCBIN "pic/monback/starmieb.pic" - -RedPicBack:: INCBIN "pic/trainer/redb.pic" -OldManPic:: INCBIN "pic/trainer/oldman.pic" +INCLUDE "engine/battle/move_effects/mist.asm" +INCLUDE "engine/battle/move_effects/one_hit_ko.asm" -SECTION "Battle (BANK C)", ROMX +SECTION "Slot Machines", ROMX -INCLUDE "engine/battle/moveEffects/mist_effect.asm" -INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" - - -SECTION "Pics 5", ROMX ; BANK $0D - -BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" -BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" -VenusaurPicFront:: INCBIN "pic/bmon/venusaur.pic" -VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic" -TentacruelPicFront:: INCBIN "pic/bmon/tentacruel.pic" -TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic" -GoldeenPicFront:: INCBIN "pic/bmon/goldeen.pic" -GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic" -SeakingPicFront:: INCBIN "pic/bmon/seaking.pic" -SeakingPicBack:: INCBIN "pic/monback/seakingb.pic" -PonytaPicFront:: INCBIN "pic/bmon/ponyta.pic" -RapidashPicFront:: INCBIN "pic/bmon/rapidash.pic" -PonytaPicBack:: INCBIN "pic/monback/ponytab.pic" -RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic" -RattataPicFront:: INCBIN "pic/bmon/rattata.pic" -RattataPicBack:: INCBIN "pic/monback/rattatab.pic" -RaticatePicFront:: INCBIN "pic/bmon/raticate.pic" -RaticatePicBack:: INCBIN "pic/monback/raticateb.pic" -NidorinoPicFront:: INCBIN "pic/bmon/nidorino.pic" -NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic" -NidorinaPicFront:: INCBIN "pic/bmon/nidorina.pic" -NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic" -GeodudePicFront:: INCBIN "pic/bmon/geodude.pic" -GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic" -PorygonPicFront:: INCBIN "pic/bmon/porygon.pic" -PorygonPicBack:: INCBIN "pic/monback/porygonb.pic" -AerodactylPicFront:: INCBIN "pic/bmon/aerodactyl.pic" -AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic" -MagnemitePicFront:: INCBIN "pic/bmon/magnemite.pic" -MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic" -CharmanderPicFront:: INCBIN "pic/bmon/charmander.pic" -CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic" -SquirtlePicFront:: INCBIN "pic/bmon/squirtle.pic" -SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic" -CharmeleonPicFront:: INCBIN "pic/bmon/charmeleon.pic" -CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic" -WartortlePicFront:: INCBIN "pic/bmon/wartortle.pic" -WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic" -CharizardPicFront:: INCBIN "pic/bmon/charizard.pic" -CharizardPicBack:: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic" -GhostPic:: INCBIN "pic/other/ghost.pic" -OddishPicFront:: INCBIN "pic/bmon/oddish.pic" -OddishPicBack:: INCBIN "pic/monback/oddishb.pic" -GloomPicFront:: INCBIN "pic/bmon/gloom.pic" -GloomPicBack:: INCBIN "pic/monback/gloomb.pic" -VileplumePicFront:: INCBIN "pic/bmon/vileplume.pic" -VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic" -BellsproutPicFront:: INCBIN "pic/bmon/bellsprout.pic" -BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "pic/bmon/weepinbell.pic" -WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic" -VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" -VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" - - -SECTION "Battle (BANK D)", ROMX - -INCLUDE "engine/titlescreen2.asm" +INCLUDE "engine/movie/title2.asm" INCLUDE "engine/battle/link_battle_versus_text.asm" -INCLUDE "engine/slot_machine.asm" -INCLUDE "engine/overworld/pewter_guys.asm" -INCLUDE "engine/multiply_divide.asm" -INCLUDE "engine/game_corner_slots.asm" +INCLUDE "engine/slots/slot_machine.asm" +INCLUDE "engine/events/pewter_guys.asm" +INCLUDE "engine/math/multiply_divide.asm" +INCLUDE "engine/slots/game_corner_slots.asm" -SECTION "bankE", ROMX +SECTION "Battle Engine 7", ROMX -INCLUDE "data/moves.asm" -BaseStats: INCLUDE "data/base_stats.asm" -INCLUDE "data/cries.asm" +INCLUDE "data/moves/moves.asm" +INCLUDE "data/pokemon/base_stats.asm" +INCLUDE "data/pokemon/cries.asm" INCLUDE "engine/battle/unused_stats_functions.asm" INCLUDE "engine/battle/scroll_draw_trainer_pic.asm" INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" - -TradingAnimationGraphics: -INCBIN "gfx/game_boy.2bpp" -INCBIN "gfx/link_cable.2bpp" -TradingAnimationGraphicsEnd: - -; Pokeball traveling through the link cable. -TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp" -TradingAnimationGraphics2End: - -INCLUDE "engine/evos_moves.asm" -INCLUDE "engine/battle/moveEffects/heal_effect.asm" -INCLUDE "engine/battle/moveEffects/transform_effect.asm" -INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" +INCLUDE "gfx/trade.asm" +INCLUDE "engine/pokemon/evos_moves.asm" +INCLUDE "engine/battle/move_effects/heal.asm" +INCLUDE "engine/battle/move_effects/transform.asm" +INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" -SECTION "bankF", ROMX +SECTION "Battle Core", ROMX INCLUDE "engine/battle/core.asm" +INCLUDE "engine/battle/effects.asm" SECTION "bank10", ROMX -INCLUDE "engine/menu/pokedex.asm" -INCLUDE "engine/trade.asm" -INCLUDE "engine/intro.asm" -INCLUDE "engine/trade2.asm" +INCLUDE "engine/menus/pokedex.asm" +INCLUDE "engine/movie/trade.asm" +INCLUDE "engine/movie/intro.asm" +INCLUDE "engine/movie/trade2.asm" -SECTION "bank11", ROMX +SECTION "Pokédex Rating", ROMX -INCLUDE "data/mapHeaders/LavenderTown.asm" -INCLUDE "data/mapObjects/LavenderTown.asm" -LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk" +INCLUDE "engine/events/pokedex_rating.asm" -ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk" -SafariZoneCenterRestHouse_Blocks: -SafariZoneWestRestHouse_Blocks: -SafariZoneEastRestHouse_Blocks: -SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk" - -INCLUDE "scripts/LavenderTown.asm" - -INCLUDE "engine/pokedex_rating.asm" - -INCLUDE "data/mapHeaders/ViridianPokecenter.asm" -INCLUDE "scripts/ViridianPokecenter.asm" -INCLUDE "data/mapObjects/ViridianPokecenter.asm" - -INCLUDE "data/mapHeaders/PokemonMansion1F.asm" -INCLUDE "scripts/PokemonMansion1F.asm" -INCLUDE "data/mapObjects/PokemonMansion1F.asm" -PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk" - -INCLUDE "data/mapHeaders/RockTunnel1F.asm" -INCLUDE "scripts/RockTunnel1F.asm" -INCLUDE "data/mapObjects/RockTunnel1F.asm" -RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" - -INCLUDE "data/mapHeaders/SeafoamIslands1F.asm" -INCLUDE "scripts/SeafoamIslands1F.asm" -INCLUDE "data/mapObjects/SeafoamIslands1F.asm" -SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk" - -INCLUDE "data/mapHeaders/SSAnne3F.asm" -INCLUDE "scripts/SSAnne3F.asm" -INCLUDE "data/mapObjects/SSAnne3F.asm" -SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk" - -INCLUDE "data/mapHeaders/VictoryRoad3F.asm" -INCLUDE "scripts/VictoryRoad3F.asm" -INCLUDE "data/mapObjects/VictoryRoad3F.asm" -VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk" - -INCLUDE "data/mapHeaders/RocketHideoutB1F.asm" -INCLUDE "scripts/RocketHideoutB1F.asm" -INCLUDE "data/mapObjects/RocketHideoutB1F.asm" -RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk" - -INCLUDE "data/mapHeaders/RocketHideoutB2F.asm" -INCLUDE "scripts/RocketHideoutB2F.asm" -INCLUDE "data/mapObjects/RocketHideoutB2F.asm" -RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk" - -INCLUDE "data/mapHeaders/RocketHideoutB3F.asm" -INCLUDE "scripts/RocketHideoutB3F.asm" -INCLUDE "data/mapObjects/RocketHideoutB3F.asm" -RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk" - -INCLUDE "data/mapHeaders/RocketHideoutB4F.asm" -INCLUDE "scripts/RocketHideoutB4F.asm" -INCLUDE "data/mapObjects/RocketHideoutB4F.asm" -RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk" - -INCLUDE "data/mapHeaders/RocketHideoutElevator.asm" -INCLUDE "scripts/RocketHideoutElevator.asm" -INCLUDE "data/mapObjects/RocketHideoutElevator.asm" -RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" - -INCLUDE "data/mapHeaders/SilphCoElevator.asm" -INCLUDE "scripts/SilphCoElevator.asm" -INCLUDE "data/mapObjects/SilphCoElevator.asm" -SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" - -INCLUDE "data/mapHeaders/SafariZoneEast.asm" -INCLUDE "scripts/SafariZoneEast.asm" -INCLUDE "data/mapObjects/SafariZoneEast.asm" -SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk" - -INCLUDE "data/mapHeaders/SafariZoneNorth.asm" -INCLUDE "scripts/SafariZoneNorth.asm" -INCLUDE "data/mapObjects/SafariZoneNorth.asm" -SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk" - -INCLUDE "data/mapHeaders/SafariZoneCenter.asm" -INCLUDE "scripts/SafariZoneCenter.asm" -INCLUDE "data/mapObjects/SafariZoneCenter.asm" -SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk" - -INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm" -INCLUDE "scripts/SafariZoneCenterRestHouse.asm" -INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm" - -INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm" -INCLUDE "scripts/SafariZoneWestRestHouse.asm" -INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm" - -INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm" -INCLUDE "scripts/SafariZoneEastRestHouse.asm" -INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm" - -INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm" -INCLUDE "scripts/SafariZoneNorthRestHouse.asm" -INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm" - -INCLUDE "data/mapHeaders/CeruleanCave2F.asm" -INCLUDE "scripts/CeruleanCave2F.asm" -INCLUDE "data/mapObjects/CeruleanCave2F.asm" -CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk" - -INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm" -INCLUDE "scripts/CeruleanCaveB1F.asm" -INCLUDE "data/mapObjects/CeruleanCaveB1F.asm" -CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk" - -INCLUDE "data/mapHeaders/RockTunnelB1F.asm" -INCLUDE "scripts/RockTunnelB1F.asm" -INCLUDE "data/mapObjects/RockTunnelB1F.asm" -RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk" - -INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm" -INCLUDE "scripts/SeafoamIslandsB1F.asm" -INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm" -SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk" - -INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm" -INCLUDE "scripts/SeafoamIslandsB2F.asm" -INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm" -SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk" - -INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm" -INCLUDE "scripts/SeafoamIslandsB3F.asm" -INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm" -SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk" - -INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm" -INCLUDE "scripts/SeafoamIslandsB4F.asm" -INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm" -SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk" +SECTION "Hidden Objects Core", ROMX INCLUDE "engine/overworld/hidden_objects.asm" -SECTION "bank12", ROMX +SECTION "Screen Effects", ROMX -INCLUDE "data/mapHeaders/Route7.asm" -INCLUDE "data/mapObjects/Route7.asm" -Route7_Blocks: INCBIN "maps/Route7.blk" - -CeladonPokecenter_Blocks: -RockTunnelPokecenter_Blocks: -MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk" - -Route18Gate1F_Blocks: -Route15Gate1F_Blocks: -Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk" - -Route18Gate2F_Blocks: -Route16Gate2F_Blocks: -Route15Gate2F_Blocks: -Route12Gate2F_Blocks: -Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk" - -INCLUDE "engine/predefs12.asm" - -INCLUDE "scripts/Route7.asm" - -INCLUDE "data/mapHeaders/RedsHouse1F.asm" -INCLUDE "scripts/RedsHouse1F.asm" -INCLUDE "data/mapObjects/RedsHouse1F.asm" -RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk" - -INCLUDE "data/mapHeaders/CeladonMart3F.asm" -INCLUDE "scripts/CeladonMart3F.asm" -INCLUDE "data/mapObjects/CeladonMart3F.asm" -CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk" - -INCLUDE "data/mapHeaders/CeladonMart4F.asm" -INCLUDE "scripts/CeladonMart4F.asm" -INCLUDE "data/mapObjects/CeladonMart4F.asm" -CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk" - -INCLUDE "data/mapHeaders/CeladonMartRoof.asm" -INCLUDE "scripts/CeladonMartRoof.asm" -INCLUDE "data/mapObjects/CeladonMartRoof.asm" -CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk" - -INCLUDE "data/mapHeaders/CeladonMartElevator.asm" -INCLUDE "scripts/CeladonMartElevator.asm" -INCLUDE "data/mapObjects/CeladonMartElevator.asm" -CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk" - -INCLUDE "data/mapHeaders/CeladonMansion1F.asm" -INCLUDE "scripts/CeladonMansion1F.asm" -INCLUDE "data/mapObjects/CeladonMansion1F.asm" -CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk" - -INCLUDE "data/mapHeaders/CeladonMansion2F.asm" -INCLUDE "scripts/CeladonMansion2F.asm" -INCLUDE "data/mapObjects/CeladonMansion2F.asm" -CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk" - -INCLUDE "data/mapHeaders/CeladonMansion3F.asm" -INCLUDE "scripts/CeladonMansion3F.asm" -INCLUDE "data/mapObjects/CeladonMansion3F.asm" -CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk" - -INCLUDE "data/mapHeaders/CeladonMansionRoof.asm" -INCLUDE "scripts/CeladonMansionRoof.asm" -INCLUDE "data/mapObjects/CeladonMansionRoof.asm" -CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk" - -INCLUDE "data/mapHeaders/CeladonPokecenter.asm" -INCLUDE "scripts/CeladonPokecenter.asm" -INCLUDE "data/mapObjects/CeladonPokecenter.asm" - -INCLUDE "data/mapHeaders/CeladonGym.asm" -INCLUDE "scripts/CeladonGym.asm" -INCLUDE "data/mapObjects/CeladonGym.asm" -CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" - -INCLUDE "data/mapHeaders/GameCorner.asm" -INCLUDE "scripts/GameCorner.asm" -INCLUDE "data/mapObjects/GameCorner.asm" -GameCorner_Blocks: INCBIN "maps/GameCorner.blk" - -INCLUDE "data/mapHeaders/CeladonMart5F.asm" -INCLUDE "scripts/CeladonMart5F.asm" -INCLUDE "data/mapObjects/CeladonMart5F.asm" -CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk" - -INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm" -INCLUDE "scripts/GameCornerPrizeRoom.asm" -INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm" -GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk" - -INCLUDE "data/mapHeaders/CeladonDiner.asm" -INCLUDE "scripts/CeladonDiner.asm" -INCLUDE "data/mapObjects/CeladonDiner.asm" -CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk" - -INCLUDE "data/mapHeaders/CeladonChiefHouse.asm" -INCLUDE "scripts/CeladonChiefHouse.asm" -INCLUDE "data/mapObjects/CeladonChiefHouse.asm" -CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk" - -INCLUDE "data/mapHeaders/CeladonHotel.asm" -INCLUDE "scripts/CeladonHotel.asm" -INCLUDE "data/mapObjects/CeladonHotel.asm" -CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk" - -INCLUDE "data/mapHeaders/MtMoonPokecenter.asm" -INCLUDE "scripts/MtMoonPokecenter.asm" -INCLUDE "data/mapObjects/MtMoonPokecenter.asm" - -INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm" -INCLUDE "scripts/RockTunnelPokecenter.asm" -INCLUDE "data/mapObjects/RockTunnelPokecenter.asm" - -INCLUDE "data/mapHeaders/Route11Gate1F.asm" -INCLUDE "scripts/Route11Gate1F.asm" -INCLUDE "data/mapObjects/Route11Gate1F.asm" - -INCLUDE "data/mapHeaders/Route11Gate2F.asm" -INCLUDE "scripts/Route11Gate2F.asm" -INCLUDE "data/mapObjects/Route11Gate2F.asm" - -INCLUDE "data/mapHeaders/Route12Gate1F.asm" -INCLUDE "scripts/Route12Gate1F.asm" -INCLUDE "data/mapObjects/Route12Gate1F.asm" -Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk" - -INCLUDE "data/mapHeaders/Route12Gate2F.asm" -INCLUDE "scripts/Route12Gate2F.asm" -INCLUDE "data/mapObjects/Route12Gate2F.asm" - -INCLUDE "data/mapHeaders/Route15Gate1F.asm" -INCLUDE "scripts/Route15Gate1F.asm" -INCLUDE "data/mapObjects/Route15Gate1F.asm" - -INCLUDE "data/mapHeaders/Route15Gate2F.asm" -INCLUDE "scripts/Route15Gate2F.asm" -INCLUDE "data/mapObjects/Route15Gate2F.asm" - -INCLUDE "data/mapHeaders/Route16Gate1F.asm" -INCLUDE "scripts/Route16Gate1F.asm" -INCLUDE "data/mapObjects/Route16Gate1F.asm" -Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk" - -INCLUDE "data/mapHeaders/Route16Gate2F.asm" -INCLUDE "scripts/Route16Gate2F.asm" -INCLUDE "data/mapObjects/Route16Gate2F.asm" - -INCLUDE "data/mapHeaders/Route18Gate1F.asm" -INCLUDE "scripts/Route18Gate1F.asm" -INCLUDE "data/mapObjects/Route18Gate1F.asm" - -INCLUDE "data/mapHeaders/Route18Gate2F.asm" -INCLUDE "scripts/Route18Gate2F.asm" -INCLUDE "data/mapObjects/Route18Gate2F.asm" - -INCLUDE "data/mapHeaders/MtMoon1F.asm" -INCLUDE "scripts/MtMoon1F.asm" -INCLUDE "data/mapObjects/MtMoon1F.asm" -MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk" - -INCLUDE "data/mapHeaders/MtMoonB2F.asm" -INCLUDE "scripts/MtMoonB2F.asm" -INCLUDE "data/mapObjects/MtMoonB2F.asm" -MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk" - -INCLUDE "data/mapHeaders/SafariZoneWest.asm" -INCLUDE "scripts/SafariZoneWest.asm" -INCLUDE "data/mapObjects/SafariZoneWest.asm" -SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk" - -INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm" -INCLUDE "scripts/SafariZoneSecretHouse.asm" -INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm" -SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk" +INCLUDE "engine/gfx/screen_effects.asm" -SECTION "bank13", ROMX - -TrainerPics:: -YoungsterPic:: INCBIN "pic/trainer/youngster.pic" -BugCatcherPic:: INCBIN "pic/trainer/bugcatcher.pic" -LassPic:: INCBIN "pic/trainer/lass.pic" -SailorPic:: INCBIN "pic/trainer/sailor.pic" -JrTrainerMPic:: INCBIN "pic/trainer/jr.trainerm.pic" -JrTrainerFPic:: INCBIN "pic/trainer/jr.trainerf.pic" -PokemaniacPic:: INCBIN "pic/trainer/pokemaniac.pic" -SuperNerdPic:: INCBIN "pic/trainer/supernerd.pic" -HikerPic:: INCBIN "pic/trainer/hiker.pic" -BikerPic:: INCBIN "pic/trainer/biker.pic" -BurglarPic:: INCBIN "pic/trainer/burglar.pic" -EngineerPic:: INCBIN "pic/trainer/engineer.pic" -FisherPic:: INCBIN "pic/trainer/fisher.pic" -SwimmerPic:: INCBIN "pic/trainer/swimmer.pic" -CueBallPic:: INCBIN "pic/trainer/cueball.pic" -GamblerPic:: INCBIN "pic/trainer/gambler.pic" -BeautyPic:: INCBIN "pic/trainer/beauty.pic" -PsychicPic:: INCBIN "pic/trainer/psychic.pic" -RockerPic:: INCBIN "pic/trainer/rocker.pic" -JugglerPic:: INCBIN "pic/trainer/juggler.pic" -TamerPic:: INCBIN "pic/trainer/tamer.pic" -BirdKeeperPic:: INCBIN "pic/trainer/birdkeeper.pic" -BlackbeltPic:: INCBIN "pic/trainer/blackbelt.pic" -Rival1Pic:: INCBIN "pic/trainer/rival1.pic" -ProfOakPic:: INCBIN "pic/trainer/prof.oak.pic" -ChiefPic:: -ScientistPic:: INCBIN "pic/trainer/scientist.pic" -GiovanniPic:: INCBIN "pic/trainer/giovanni.pic" -RocketPic:: INCBIN "pic/trainer/rocket.pic" -CooltrainerMPic:: INCBIN "pic/trainer/cooltrainerm.pic" -CooltrainerFPic:: INCBIN "pic/trainer/cooltrainerf.pic" -BrunoPic:: INCBIN "pic/trainer/bruno.pic" -BrockPic:: INCBIN "pic/trainer/brock.pic" -MistyPic:: INCBIN "pic/trainer/misty.pic" -LtSurgePic:: INCBIN "pic/trainer/lt.surge.pic" -ErikaPic:: INCBIN "pic/trainer/erika.pic" -KogaPic:: INCBIN "pic/trainer/koga.pic" -BlainePic:: INCBIN "pic/trainer/blaine.pic" -SabrinaPic:: INCBIN "pic/trainer/sabrina.pic" -GentlemanPic:: INCBIN "pic/trainer/gentleman.pic" -Rival2Pic:: INCBIN "pic/trainer/rival2.pic" -Rival3Pic:: INCBIN "pic/trainer/rival3.pic" -LoreleiPic:: INCBIN "pic/trainer/lorelei.pic" -ChannelerPic:: INCBIN "pic/trainer/channeler.pic" -AgathaPic:: INCBIN "pic/trainer/agatha.pic" -LancePic:: INCBIN "pic/trainer/lance.pic" - -INCLUDE "data/mapHeaders/TradeCenter.asm" -INCLUDE "scripts/TradeCenter.asm" -INCLUDE "data/mapObjects/TradeCenter.asm" -TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk" - -INCLUDE "data/mapHeaders/Colosseum.asm" -INCLUDE "scripts/Colosseum.asm" -INCLUDE "data/mapObjects/Colosseum.asm" -Colosseum_Blocks: INCBIN "maps/Colosseum.blk" - -INCLUDE "engine/give_pokemon.asm" +SECTION "Predefs", ROMX +INCLUDE "engine/events/give_pokemon.asm" INCLUDE "engine/predefs.asm" -SECTION "bank14", ROMX - -INCLUDE "data/mapHeaders/Route22.asm" -INCLUDE "data/mapObjects/Route22.asm" -Route22_Blocks: INCBIN "maps/Route22.blk" - -INCLUDE "data/mapHeaders/Route20.asm" -INCLUDE "data/mapObjects/Route20.asm" -Route20_Blocks: INCBIN "maps/Route20.blk" - -INCLUDE "data/mapHeaders/Route23.asm" -INCLUDE "data/mapObjects/Route23.asm" -Route23_Blocks: INCBIN "maps/Route23.blk" - -INCLUDE "data/mapHeaders/Route24.asm" -INCLUDE "data/mapObjects/Route24.asm" -Route24_Blocks: INCBIN "maps/Route24.blk" - -INCLUDE "data/mapHeaders/Route25.asm" -INCLUDE "data/mapObjects/Route25.asm" -Route25_Blocks: INCBIN "maps/Route25.blk" - -INCLUDE "data/mapHeaders/IndigoPlateau.asm" -INCLUDE "scripts/IndigoPlateau.asm" -INCLUDE "data/mapObjects/IndigoPlateau.asm" -IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk" - -INCLUDE "data/mapHeaders/SaffronCity.asm" -INCLUDE "data/mapObjects/SaffronCity.asm" -SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk" -INCLUDE "scripts/SaffronCity.asm" - -INCLUDE "scripts/Route20.asm" -INCLUDE "scripts/Route22.asm" -INCLUDE "scripts/Route23.asm" -INCLUDE "scripts/Route24.asm" -INCLUDE "scripts/Route25.asm" - -INCLUDE "data/mapHeaders/VictoryRoad2F.asm" -INCLUDE "scripts/VictoryRoad2F.asm" -INCLUDE "data/mapObjects/VictoryRoad2F.asm" -VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk" - -INCLUDE "data/mapHeaders/MtMoonB1F.asm" -INCLUDE "scripts/MtMoonB1F.asm" -INCLUDE "data/mapObjects/MtMoonB1F.asm" -MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk" - -INCLUDE "data/mapHeaders/SilphCo7F.asm" -INCLUDE "scripts/SilphCo7F.asm" -INCLUDE "data/mapObjects/SilphCo7F.asm" -SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk" - -INCLUDE "data/mapHeaders/PokemonMansion2F.asm" -INCLUDE "scripts/PokemonMansion2F.asm" -INCLUDE "data/mapObjects/PokemonMansion2F.asm" -PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk" - -INCLUDE "data/mapHeaders/PokemonMansion3F.asm" -INCLUDE "scripts/PokemonMansion3F.asm" -INCLUDE "data/mapObjects/PokemonMansion3F.asm" -PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk" - -INCLUDE "data/mapHeaders/PokemonMansionB1F.asm" -INCLUDE "scripts/PokemonMansionB1F.asm" -INCLUDE "data/mapObjects/PokemonMansionB1F.asm" -PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk" +SECTION "Battle Engine 8", ROMX INCLUDE "engine/battle/init_battle_variables.asm" -INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" - -INCLUDE "engine/overworld/card_key.asm" - -INCLUDE "engine/menu/prize_menu.asm" - -INCLUDE "engine/hidden_object_functions14.asm" +INCLUDE "engine/battle/move_effects/paralyze.asm" -SECTION "bank15", ROMX +SECTION "Hidden Objects 2", ROMX -INCLUDE "data/mapHeaders/Route2.asm" -INCLUDE "data/mapObjects/Route2.asm" -Route2_Blocks: INCBIN "maps/Route2.blk" +INCLUDE "engine/events/card_key.asm" +INCLUDE "engine/events/prize_menu.asm" +INCLUDE "engine/events/hidden_objects/school_notebooks.asm" +INCLUDE "engine/events/hidden_objects/fighting_dojo.asm" +INCLUDE "engine/events/hidden_objects/indigo_plateau_hq.asm" -INCLUDE "data/mapHeaders/Route3.asm" -INCLUDE "data/mapObjects/Route3.asm" -Route3_Blocks: INCBIN "maps/Route3.blk" -INCLUDE "data/mapHeaders/Route4.asm" -INCLUDE "data/mapObjects/Route4.asm" -Route4_Blocks: INCBIN "maps/Route4.blk" - -INCLUDE "data/mapHeaders/Route5.asm" -INCLUDE "data/mapObjects/Route5.asm" -Route5_Blocks: INCBIN "maps/Route5.blk" - -INCLUDE "data/mapHeaders/Route9.asm" -INCLUDE "data/mapObjects/Route9.asm" -Route9_Blocks: INCBIN "maps/Route9.blk" - -INCLUDE "data/mapHeaders/Route13.asm" -INCLUDE "data/mapObjects/Route13.asm" -Route13_Blocks: INCBIN "maps/Route13.blk" - -INCLUDE "data/mapHeaders/Route14.asm" -INCLUDE "data/mapObjects/Route14.asm" -Route14_Blocks: INCBIN "maps/Route14.blk" - -INCLUDE "data/mapHeaders/Route17.asm" -INCLUDE "data/mapObjects/Route17.asm" -Route17_Blocks: INCBIN "maps/Route17.blk" - -INCLUDE "data/mapHeaders/Route19.asm" -INCLUDE "data/mapObjects/Route19.asm" -Route19_Blocks: INCBIN "maps/Route19.blk" - -INCLUDE "data/mapHeaders/Route21.asm" -INCLUDE "data/mapObjects/Route21.asm" -Route21_Blocks: INCBIN "maps/Route21.blk" - -VermilionOldRodHouse_Blocks: -Route12SuperRodHouse_Blocks: -Daycare_Blocks: INCBIN "maps/Daycare.blk" - -FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" +SECTION "Battle Engine 9", ROMX INCLUDE "engine/battle/experience.asm" -INCLUDE "scripts/Route2.asm" -INCLUDE "scripts/Route3.asm" -INCLUDE "scripts/Route4.asm" -INCLUDE "scripts/Route5.asm" -INCLUDE "scripts/Route9.asm" -INCLUDE "scripts/Route13.asm" -INCLUDE "scripts/Route14.asm" -INCLUDE "scripts/Route17.asm" -INCLUDE "scripts/Route19.asm" -INCLUDE "scripts/Route21.asm" -INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm" -INCLUDE "scripts/VermilionOldRodHouse.asm" -INCLUDE "data/mapObjects/VermilionOldRodHouse.asm" +SECTION "Diploma", ROMX -INCLUDE "data/mapHeaders/CeladonMart2F.asm" -INCLUDE "scripts/CeladonMart2F.asm" -INCLUDE "data/mapObjects/CeladonMart2F.asm" -CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk" - -INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm" -INCLUDE "scripts/FuchsiaGoodRodHouse.asm" -INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm" - -INCLUDE "data/mapHeaders/Daycare.asm" -INCLUDE "scripts/Daycare.asm" -INCLUDE "data/mapObjects/Daycare.asm" - -INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm" -INCLUDE "scripts/Route12SuperRodHouse.asm" -INCLUDE "data/mapObjects/Route12SuperRodHouse.asm" - -INCLUDE "data/mapHeaders/SilphCo8F.asm" -INCLUDE "scripts/SilphCo8F.asm" -INCLUDE "data/mapObjects/SilphCo8F.asm" -SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" - -INCLUDE "engine/menu/diploma.asm" - -INCLUDE "engine/overworld/trainers.asm" +INCLUDE "engine/events/diploma.asm" -SECTION "bank16", ROMX +SECTION "Trainer Sight", ROMX -INCLUDE "data/mapHeaders/Route6.asm" -INCLUDE "data/mapObjects/Route6.asm" -Route6_Blocks: INCBIN "maps/Route6.blk" +INCLUDE "engine/overworld/trainer_sight.asm" -INCLUDE "data/mapHeaders/Route8.asm" -INCLUDE "data/mapObjects/Route8.asm" -Route8_Blocks: INCBIN "maps/Route8.blk" -INCLUDE "data/mapHeaders/Route10.asm" -INCLUDE "data/mapObjects/Route10.asm" -Route10_Blocks: INCBIN "maps/Route10.blk" - -INCLUDE "data/mapHeaders/Route11.asm" -INCLUDE "data/mapObjects/Route11.asm" -Route11_Blocks: INCBIN "maps/Route11.blk" - -INCLUDE "data/mapHeaders/Route12.asm" -INCLUDE "data/mapObjects/Route12.asm" -Route12_Blocks: INCBIN "maps/Route12.blk" - -INCLUDE "data/mapHeaders/Route15.asm" -INCLUDE "data/mapObjects/Route15.asm" -Route15_Blocks: INCBIN "maps/Route15.blk" - -INCLUDE "data/mapHeaders/Route16.asm" -INCLUDE "data/mapObjects/Route16.asm" -Route16_Blocks: INCBIN "maps/Route16.blk" - -INCLUDE "data/mapHeaders/Route18.asm" -INCLUDE "data/mapObjects/Route18.asm" -Route18_Blocks: INCBIN "maps/Route18.blk" - - INCBIN "maps/UnusedPokecenterCopy.blk" +SECTION "Battle Engine 10", ROMX INCLUDE "engine/battle/common_text.asm" +INCLUDE "engine/pokemon/experience.asm" +INCLUDE "engine/events/oaks_aide.asm" -INCLUDE "engine/experience.asm" -INCLUDE "engine/overworld/oaks_aide.asm" +SECTION "Saffron Guards", ROMX -INCLUDE "scripts/Route6.asm" -INCLUDE "scripts/Route8.asm" -INCLUDE "scripts/Route10.asm" -INCLUDE "scripts/Route11.asm" -INCLUDE "scripts/Route12.asm" -INCLUDE "scripts/Route15.asm" -INCLUDE "scripts/Route16.asm" -INCLUDE "scripts/Route18.asm" +INCLUDE "engine/events/saffron_guards.asm" -INCLUDE "data/mapHeaders/PokemonFanClub.asm" -INCLUDE "scripts/PokemonFanClub.asm" -INCLUDE "data/mapObjects/PokemonFanClub.asm" -PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk" -INCLUDE "data/mapHeaders/SilphCo2F.asm" -INCLUDE "scripts/SilphCo2F.asm" -INCLUDE "data/mapObjects/SilphCo2F.asm" -SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk" +SECTION "Starter Dex", ROMX -INCLUDE "data/mapHeaders/SilphCo3F.asm" -INCLUDE "scripts/SilphCo3F.asm" -INCLUDE "data/mapObjects/SilphCo3F.asm" -SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" +INCLUDE "engine/events/starter_dex.asm" -INCLUDE "data/mapHeaders/SilphCo10F.asm" -INCLUDE "scripts/SilphCo10F.asm" -INCLUDE "data/mapObjects/SilphCo10F.asm" -SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" -INCLUDE "data/mapHeaders/LancesRoom.asm" -INCLUDE "scripts/LancesRoom.asm" -INCLUDE "data/mapObjects/LancesRoom.asm" -LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk" +SECTION "Hidden Objects 3", ROMX -INCLUDE "data/mapHeaders/HallOfFame.asm" -INCLUDE "scripts/HallOfFame.asm" -INCLUDE "data/mapObjects/HallOfFame.asm" -HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk" +INCLUDE "engine/pokemon/set_types.asm" +INCLUDE "engine/events/hidden_objects/reds_room.asm" +INCLUDE "engine/events/hidden_objects/route_15_binoculars.asm" +INCLUDE "engine/events/hidden_objects/museum_fossils.asm" +INCLUDE "engine/events/hidden_objects/school_blackboard.asm" +INCLUDE "engine/events/hidden_objects/vermilion_gym_trash.asm" -INCLUDE "engine/overworld/saffron_guards.asm" +SECTION "Cinnabar Lab Fossils", ROMX -SECTION "bank17", ROMX +INCLUDE "engine/events/cinnabar_lab.asm" -SaffronMart_Blocks: -LavenderMart_Blocks: -CeruleanMart_Blocks: -VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk" -CopycatsHouse2F_Blocks: -RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk" +SECTION "Hidden Objects 4", ROMX -Museum1F_Blocks: INCBIN "maps/Museum1F.blk" +INCLUDE "engine/events/hidden_objects/gym_statues.asm" +INCLUDE "engine/events/hidden_objects/bench_guys.asm" +INCLUDE "engine/events/hidden_objects/blues_room.asm" +INCLUDE "engine/events/hidden_objects/pokecenter_pc.asm" -Museum2F_Blocks: INCBIN "maps/Museum2F.blk" -SaffronPokecenter_Blocks: -VermilionPokecenter_Blocks: -LavenderPokecenter_Blocks: -PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk" - -UndergroundPathRoute7_Blocks: -UndergroundPathRoute7Copy_Blocks: -UndergroundPathRoute6_Blocks: -UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk" - -Route2Gate_Blocks: -ViridianForestSouthGate_Blocks: -ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk" - -INCLUDE "data/mapHeaders/RedsHouse2F.asm" -INCLUDE "scripts/RedsHouse2F.asm" -INCLUDE "data/mapObjects/RedsHouse2F.asm" - -INCLUDE "engine/predefs17.asm" - -INCLUDE "data/mapHeaders/Museum1F.asm" -INCLUDE "scripts/Museum1F.asm" -INCLUDE "data/mapObjects/Museum1F.asm" - -INCLUDE "data/mapHeaders/Museum2F.asm" -INCLUDE "scripts/Museum2F.asm" -INCLUDE "data/mapObjects/Museum2F.asm" - -INCLUDE "data/mapHeaders/PewterGym.asm" -INCLUDE "scripts/PewterGym.asm" -INCLUDE "data/mapObjects/PewterGym.asm" -PewterGym_Blocks: INCBIN "maps/PewterGym.blk" - -INCLUDE "data/mapHeaders/PewterPokecenter.asm" -INCLUDE "scripts/PewterPokecenter.asm" -INCLUDE "data/mapObjects/PewterPokecenter.asm" - -INCLUDE "data/mapHeaders/CeruleanPokecenter.asm" -INCLUDE "scripts/CeruleanPokecenter.asm" -INCLUDE "data/mapObjects/CeruleanPokecenter.asm" -CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk" - -INCLUDE "data/mapHeaders/CeruleanGym.asm" -INCLUDE "scripts/CeruleanGym.asm" -INCLUDE "data/mapObjects/CeruleanGym.asm" -CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk" - -INCLUDE "data/mapHeaders/CeruleanMart.asm" -INCLUDE "scripts/CeruleanMart.asm" -INCLUDE "data/mapObjects/CeruleanMart.asm" - -INCLUDE "data/mapHeaders/LavenderPokecenter.asm" -INCLUDE "scripts/LavenderPokecenter.asm" -INCLUDE "data/mapObjects/LavenderPokecenter.asm" - -INCLUDE "data/mapHeaders/LavenderMart.asm" -INCLUDE "scripts/LavenderMart.asm" -INCLUDE "data/mapObjects/LavenderMart.asm" - -INCLUDE "data/mapHeaders/VermilionPokecenter.asm" -INCLUDE "scripts/VermilionPokecenter.asm" -INCLUDE "data/mapObjects/VermilionPokecenter.asm" - -INCLUDE "data/mapHeaders/VermilionMart.asm" -INCLUDE "scripts/VermilionMart.asm" -INCLUDE "data/mapObjects/VermilionMart.asm" - -INCLUDE "data/mapHeaders/VermilionGym.asm" -INCLUDE "scripts/VermilionGym.asm" -INCLUDE "data/mapObjects/VermilionGym.asm" -VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk" - -INCLUDE "data/mapHeaders/CopycatsHouse2F.asm" -INCLUDE "scripts/CopycatsHouse2F.asm" -INCLUDE "data/mapObjects/CopycatsHouse2F.asm" - -INCLUDE "data/mapHeaders/FightingDojo.asm" -INCLUDE "scripts/FightingDojo.asm" -INCLUDE "data/mapObjects/FightingDojo.asm" -FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk" - -INCLUDE "data/mapHeaders/SaffronGym.asm" -INCLUDE "scripts/SaffronGym.asm" -INCLUDE "data/mapObjects/SaffronGym.asm" -SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk" - -INCLUDE "data/mapHeaders/SaffronMart.asm" -INCLUDE "scripts/SaffronMart.asm" -INCLUDE "data/mapObjects/SaffronMart.asm" - -INCLUDE "data/mapHeaders/SilphCo1F.asm" -INCLUDE "scripts/SilphCo1F.asm" -INCLUDE "data/mapObjects/SilphCo1F.asm" -SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk" - -INCLUDE "data/mapHeaders/SaffronPokecenter.asm" -INCLUDE "scripts/SaffronPokecenter.asm" -INCLUDE "data/mapObjects/SaffronPokecenter.asm" - -INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm" -INCLUDE "scripts/ViridianForestNorthGate.asm" -INCLUDE "data/mapObjects/ViridianForestNorthGate.asm" - -INCLUDE "data/mapHeaders/Route2Gate.asm" -INCLUDE "scripts/Route2Gate.asm" -INCLUDE "data/mapObjects/Route2Gate.asm" - -INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm" -INCLUDE "scripts/ViridianForestSouthGate.asm" -INCLUDE "data/mapObjects/ViridianForestSouthGate.asm" - -INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm" -INCLUDE "scripts/UndergroundPathRoute5.asm" -INCLUDE "data/mapObjects/UndergroundPathRoute5.asm" - -INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm" -INCLUDE "scripts/UndergroundPathRoute6.asm" -INCLUDE "data/mapObjects/UndergroundPathRoute6.asm" - -INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm" -INCLUDE "scripts/UndergroundPathRoute7.asm" -INCLUDE "data/mapObjects/UndergroundPathRoute7.asm" - -INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm" -INCLUDE "scripts/UndergroundPathRoute7Copy.asm" -INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm" - -INCLUDE "data/mapHeaders/SilphCo9F.asm" -INCLUDE "scripts/SilphCo9F.asm" -INCLUDE "data/mapObjects/SilphCo9F.asm" -SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" - -INCLUDE "data/mapHeaders/VictoryRoad1F.asm" -INCLUDE "scripts/VictoryRoad1F.asm" -INCLUDE "data/mapObjects/VictoryRoad1F.asm" -VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk" - -INCLUDE "engine/predefs17_2.asm" - -INCLUDE "engine/hidden_object_functions17.asm" - - -SECTION "bank18", ROMX - -ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk" -UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk" -UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk" - - INCBIN "maps/UnusedDiglettsCaveCopy.blk" - -SSAnneB1FRooms_Blocks: -SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk" - -INCLUDE "data/mapHeaders/PokemonTower1F.asm" -INCLUDE "scripts/PokemonTower1F.asm" -INCLUDE "data/mapObjects/PokemonTower1F.asm" -PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk" - -INCLUDE "data/mapHeaders/PokemonTower2F.asm" -INCLUDE "scripts/PokemonTower2F.asm" -INCLUDE "data/mapObjects/PokemonTower2F.asm" -PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk" - -INCLUDE "data/mapHeaders/PokemonTower3F.asm" -INCLUDE "scripts/PokemonTower3F.asm" -INCLUDE "data/mapObjects/PokemonTower3F.asm" -PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk" - -INCLUDE "data/mapHeaders/PokemonTower4F.asm" -INCLUDE "scripts/PokemonTower4F.asm" -INCLUDE "data/mapObjects/PokemonTower4F.asm" -PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk" - -INCLUDE "data/mapHeaders/PokemonTower5F.asm" -INCLUDE "scripts/PokemonTower5F.asm" -INCLUDE "data/mapObjects/PokemonTower5F.asm" -PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk" - -INCLUDE "data/mapHeaders/PokemonTower6F.asm" -INCLUDE "scripts/PokemonTower6F.asm" -INCLUDE "data/mapObjects/PokemonTower6F.asm" -PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk" - - INCBIN "maps/UnusedEmptyMap.blk" - -INCLUDE "data/mapHeaders/PokemonTower7F.asm" -INCLUDE "scripts/PokemonTower7F.asm" -INCLUDE "data/mapObjects/PokemonTower7F.asm" -PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk" - -INCLUDE "data/mapHeaders/CeladonMart1F.asm" -INCLUDE "scripts/CeladonMart1F.asm" -INCLUDE "data/mapObjects/CeladonMart1F.asm" -CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" - -INCLUDE "engine/overworld/cinnabar_lab.asm" - -INCLUDE "data/mapHeaders/ViridianForest.asm" -INCLUDE "scripts/ViridianForest.asm" -INCLUDE "data/mapObjects/ViridianForest.asm" - -INCLUDE "data/mapHeaders/SSAnne1F.asm" -INCLUDE "scripts/SSAnne1F.asm" -INCLUDE "data/mapObjects/SSAnne1F.asm" -SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk" - -INCLUDE "data/mapHeaders/SSAnne2F.asm" -INCLUDE "scripts/SSAnne2F.asm" -INCLUDE "data/mapObjects/SSAnne2F.asm" -SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk" - -INCLUDE "data/mapHeaders/SSAnneB1F.asm" -INCLUDE "scripts/SSAnneB1F.asm" -INCLUDE "data/mapObjects/SSAnneB1F.asm" -SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk" - -INCLUDE "data/mapHeaders/SSAnneBow.asm" -INCLUDE "scripts/SSAnneBow.asm" -INCLUDE "data/mapObjects/SSAnneBow.asm" -SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk" - -INCLUDE "data/mapHeaders/SSAnneKitchen.asm" -INCLUDE "scripts/SSAnneKitchen.asm" -INCLUDE "data/mapObjects/SSAnneKitchen.asm" -SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk" - -INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm" -INCLUDE "scripts/SSAnneCaptainsRoom.asm" -INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm" -SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk" - -INCLUDE "data/mapHeaders/SSAnne1FRooms.asm" -INCLUDE "scripts/SSAnne1FRooms.asm" -INCLUDE "data/mapObjects/SSAnne1FRooms.asm" -SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk" - -INCLUDE "data/mapHeaders/SSAnne2FRooms.asm" -INCLUDE "scripts/SSAnne2FRooms.asm" -INCLUDE "data/mapObjects/SSAnne2FRooms.asm" - -INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm" -INCLUDE "scripts/SSAnneB1FRooms.asm" -INCLUDE "data/mapObjects/SSAnneB1FRooms.asm" - -INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm" -INCLUDE "scripts/UndergroundPathNorthSouth.asm" -INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm" - -INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm" -INCLUDE "scripts/UndergroundPathWestEast.asm" -INCLUDE "data/mapObjects/UndergroundPathWestEast.asm" - -INCLUDE "data/mapHeaders/DiglettsCave.asm" -INCLUDE "scripts/DiglettsCave.asm" -INCLUDE "data/mapObjects/DiglettsCave.asm" -DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk" - -INCLUDE "data/mapHeaders/SilphCo11F.asm" -INCLUDE "scripts/SilphCo11F.asm" -INCLUDE "data/mapObjects/SilphCo11F.asm" -SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk" - -INCLUDE "engine/hidden_object_functions18.asm" - - -SECTION "bank19", ROMX - -Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" -Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" - -RedsHouse1_GFX: -RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.2bpp" - ds 16 -RedsHouse1_Block: -RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst" - -House_GFX: INCBIN "gfx/tilesets/house.2bpp" -House_Block: INCBIN "gfx/blocksets/house.bst" -Mansion_GFX: INCBIN "gfx/tilesets/mansion.2bpp" -Mansion_Block: INCBIN "gfx/blocksets/mansion.bst" -ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.2bpp" -ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst" -Interior_GFX: INCBIN "gfx/tilesets/interior.2bpp" -Interior_Block: INCBIN "gfx/blocksets/interior.bst" -Plateau_GFX: INCBIN "gfx/tilesets/plateau.2bpp" -Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" - - -SECTION "bank1A", ROMX +SECTION "Battle Engine 11", ROMX INCLUDE "engine/battle/decrement_pp.asm" - -Version_GFX: -IF DEF(_RED) - INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles -ENDC -Version_GFXEnd: - -Dojo_GFX: -Gym_GFX: INCBIN "gfx/tilesets/gym.2bpp" -Dojo_Block: -Gym_Block: INCBIN "gfx/blocksets/gym.bst" - -Mart_GFX: -Pokecenter_GFX: INCBIN "gfx/tilesets/pokecenter.2bpp" -Mart_Block: -Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst" - -ForestGate_GFX: -Museum_GFX: -Gate_GFX: INCBIN "gfx/tilesets/gate.2bpp" -ForestGate_Block: -Museum_Block: -Gate_Block: INCBIN "gfx/blocksets/gate.bst" - -Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp" -Forest_Block: INCBIN "gfx/blocksets/forest.bst" -Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" -Facility_Block: INCBIN "gfx/blocksets/facility.bst" - ds 1 - - -SECTION "bank1B", ROMX - -Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.2bpp" -Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" -Cavern_GFX: INCBIN "gfx/tilesets/cavern.2bpp" -Cavern_Block: INCBIN "gfx/blocksets/cavern.bst" -Lobby_GFX: INCBIN "gfx/tilesets/lobby.2bpp" -Lobby_Block: INCBIN "gfx/blocksets/lobby.bst" -Ship_GFX: INCBIN "gfx/tilesets/ship.2bpp" -Ship_Block: INCBIN "gfx/blocksets/ship.bst" -Lab_GFX: INCBIN "gfx/tilesets/lab.2bpp" -Lab_Block: INCBIN "gfx/blocksets/lab.bst" -Club_GFX: INCBIN "gfx/tilesets/club.2bpp" -Club_Block: INCBIN "gfx/blocksets/club.bst" -Underground_GFX: INCBIN "gfx/tilesets/underground.2bpp" -Underground_Block: INCBIN "gfx/blocksets/underground.bst" +INCLUDE "gfx/version.asm" SECTION "bank1C", ROMX -INCLUDE "engine/gamefreak.asm" -INCLUDE "engine/hall_of_fame.asm" +INCLUDE "engine/movie/splash.asm" +INCLUDE "engine/movie/hall_of_fame.asm" INCLUDE "engine/overworld/healing_machine.asm" INCLUDE "engine/overworld/player_animations.asm" INCLUDE "engine/battle/ghost_marowak_anim.asm" INCLUDE "engine/battle/battle_transitions.asm" -INCLUDE "engine/town_map.asm" -INCLUDE "engine/mon_party_sprites.asm" -INCLUDE "engine/in_game_trades.asm" -INCLUDE "engine/palettes.asm" -INCLUDE "engine/save.asm" +INCLUDE "engine/items/town_map.asm" +INCLUDE "engine/gfx/mon_icons.asm" +INCLUDE "engine/events/in_game_trades.asm" +INCLUDE "engine/gfx/palettes.asm" +INCLUDE "engine/menus/save.asm" -SECTION "bank1D", ROMX - -CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk" - -CinnabarMart_Blocks: -PewterMart_Blocks: INCBIN "maps/PewterMart.blk" - -FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk" - -CinnabarPokecenter_Blocks: -FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk" - -CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk" - -INCLUDE "engine/HoF_room_pc.asm" - -INCLUDE "engine/status_ailments.asm" +SECTION "Itemfinder 1", ROMX +INCLUDE "engine/movie/credits.asm" +INCLUDE "engine/pokemon/status_ailments.asm" INCLUDE "engine/items/itemfinder.asm" -INCLUDE "scripts/CeruleanCity_2.asm" -INCLUDE "data/mapHeaders/ViridianGym.asm" -INCLUDE "scripts/ViridianGym.asm" -INCLUDE "data/mapObjects/ViridianGym.asm" -ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk" +SECTION "Vending Machine", ROMX -INCLUDE "data/mapHeaders/PewterMart.asm" -INCLUDE "scripts/PewterMart.asm" -INCLUDE "data/mapObjects/PewterMart.asm" +INCLUDE "engine/events/vending_machine.asm" -INCLUDE "data/mapHeaders/CeruleanCave1F.asm" -INCLUDE "scripts/CeruleanCave1F.asm" -INCLUDE "data/mapObjects/CeruleanCave1F.asm" -CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk" -INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm" -INCLUDE "scripts/CeruleanBadgeHouse.asm" -INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm" +SECTION "Itemfinder 2", ROMX -INCLUDE "engine/menu/vending_machine.asm" - -INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm" -INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm" -INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm" - -INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm" -INCLUDE "scripts/FuchsiaPokecenter.asm" -INCLUDE "data/mapObjects/FuchsiaPokecenter.asm" - -INCLUDE "data/mapHeaders/WardensHouse.asm" -INCLUDE "scripts/WardensHouse.asm" -INCLUDE "data/mapObjects/WardensHouse.asm" -WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk" - -INCLUDE "data/mapHeaders/SafariZoneGate.asm" -INCLUDE "scripts/SafariZoneGate.asm" -INCLUDE "data/mapObjects/SafariZoneGate.asm" -SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk" - -INCLUDE "data/mapHeaders/FuchsiaGym.asm" -INCLUDE "scripts/FuchsiaGym.asm" -INCLUDE "data/mapObjects/FuchsiaGym.asm" -FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk" - -INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm" -INCLUDE "scripts/FuchsiaMeetingRoom.asm" -INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm" -FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk" - -INCLUDE "data/mapHeaders/CinnabarGym.asm" -INCLUDE "scripts/CinnabarGym.asm" -INCLUDE "data/mapObjects/CinnabarGym.asm" -CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk" - -INCLUDE "data/mapHeaders/CinnabarLab.asm" -INCLUDE "scripts/CinnabarLab.asm" -INCLUDE "data/mapObjects/CinnabarLab.asm" -CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk" - -INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm" -INCLUDE "scripts/CinnabarLabTradeRoom.asm" -INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm" -CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk" - -INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm" -INCLUDE "scripts/CinnabarLabMetronomeRoom.asm" -INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm" -CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk" - -INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm" -INCLUDE "scripts/CinnabarLabFossilRoom.asm" -INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm" -CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk" - -INCLUDE "data/mapHeaders/CinnabarPokecenter.asm" -INCLUDE "scripts/CinnabarPokecenter.asm" -INCLUDE "data/mapObjects/CinnabarPokecenter.asm" - -INCLUDE "data/mapHeaders/CinnabarMart.asm" -INCLUDE "scripts/CinnabarMart.asm" -INCLUDE "data/mapObjects/CinnabarMart.asm" - -INCLUDE "data/mapHeaders/CopycatsHouse1F.asm" -INCLUDE "scripts/CopycatsHouse1F.asm" -INCLUDE "data/mapObjects/CopycatsHouse1F.asm" - -INCLUDE "data/mapHeaders/ChampionsRoom.asm" -INCLUDE "scripts/ChampionsRoom.asm" -INCLUDE "data/mapObjects/ChampionsRoom.asm" -ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk" - -INCLUDE "data/mapHeaders/LoreleisRoom.asm" -INCLUDE "scripts/LoreleisRoom.asm" -INCLUDE "data/mapObjects/LoreleisRoom.asm" -LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk" - -INCLUDE "data/mapHeaders/BrunosRoom.asm" -INCLUDE "scripts/BrunosRoom.asm" -INCLUDE "data/mapObjects/BrunosRoom.asm" -BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk" - -INCLUDE "data/mapHeaders/AgathasRoom.asm" -INCLUDE "scripts/AgathasRoom.asm" -INCLUDE "data/mapObjects/AgathasRoom.asm" -AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" - -INCLUDE "engine/menu/league_pc.asm" - -INCLUDE "engine/overworld/hidden_items.asm" +INCLUDE "engine/menus/league_pc.asm" +INCLUDE "engine/events/hidden_items.asm" SECTION "bank1E", ROMX INCLUDE "engine/battle/animations.asm" - INCLUDE "engine/overworld/cut2.asm" - -INCLUDE "engine/overworld/ssanne.asm" - -RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp" -RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp" -RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp" -RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" - -INCLUDE "data/animations.asm" - -INCLUDE "engine/evolution.asm" - +INCLUDE "engine/overworld/dust_smoke.asm" +INCLUDE "gfx/fishing.asm" +INCLUDE "data/moves/animations.asm" +INCLUDE "data/battle_anims/subanimations.asm" +INCLUDE "data/battle_anims/frame_blocks.asm" +INCLUDE "engine/movie/evolution.asm" INCLUDE "engine/overworld/elevator.asm" - INCLUDE "engine/items/tm_prices.asm" diff --git a/maps.asm b/maps.asm new file mode 100644 index 00000000..4f00f451 --- /dev/null +++ b/maps.asm @@ -0,0 +1,1224 @@ +INCLUDE "constants.asm" + + +SECTION "Maps 1", ROMX + +INCLUDE "data/maps/headers/CeladonCity.asm" +INCLUDE "data/maps/objects/CeladonCity.asm" +CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" + +INCLUDE "data/maps/headers/PalletTown.asm" +INCLUDE "data/maps/objects/PalletTown.asm" +PalletTown_Blocks: INCBIN "maps/PalletTown.blk" + +INCLUDE "data/maps/headers/ViridianCity.asm" +INCLUDE "data/maps/objects/ViridianCity.asm" +ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk" + +INCLUDE "data/maps/headers/PewterCity.asm" + ds 1 +INCLUDE "data/maps/objects/PewterCity.asm" +PewterCity_Blocks: INCBIN "maps/PewterCity.blk" + +INCLUDE "data/maps/headers/CeruleanCity.asm" +INCLUDE "data/maps/objects/CeruleanCity.asm" +CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk" + +INCLUDE "data/maps/headers/VermilionCity.asm" +INCLUDE "data/maps/objects/VermilionCity.asm" +VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk" + +INCLUDE "data/maps/headers/FuchsiaCity.asm" +INCLUDE "data/maps/objects/FuchsiaCity.asm" +FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk" + + +SECTION "Maps 2", ROMX + +INCLUDE "scripts/PalletTown.asm" +INCLUDE "scripts/ViridianCity.asm" +INCLUDE "scripts/PewterCity.asm" +INCLUDE "scripts/CeruleanCity.asm" +INCLUDE "scripts/VermilionCity.asm" +INCLUDE "scripts/CeladonCity.asm" +INCLUDE "scripts/FuchsiaCity.asm" + +INCLUDE "data/maps/headers/BluesHouse.asm" +INCLUDE "scripts/BluesHouse.asm" +INCLUDE "data/maps/objects/BluesHouse.asm" +BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk" + +INCLUDE "data/maps/headers/VermilionTradeHouse.asm" +INCLUDE "scripts/VermilionTradeHouse.asm" +INCLUDE "data/maps/objects/VermilionTradeHouse.asm" +VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk" + +INCLUDE "data/maps/headers/IndigoPlateauLobby.asm" +INCLUDE "scripts/IndigoPlateauLobby.asm" +INCLUDE "data/maps/objects/IndigoPlateauLobby.asm" +IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk" + +INCLUDE "data/maps/headers/SilphCo4F.asm" +INCLUDE "scripts/SilphCo4F.asm" +INCLUDE "data/maps/objects/SilphCo4F.asm" +SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk" + +INCLUDE "data/maps/headers/SilphCo5F.asm" +INCLUDE "scripts/SilphCo5F.asm" +INCLUDE "data/maps/objects/SilphCo5F.asm" +SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk" + +INCLUDE "data/maps/headers/SilphCo6F.asm" +INCLUDE "scripts/SilphCo6F.asm" +INCLUDE "data/maps/objects/SilphCo6F.asm" +SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk" + + +SECTION "Maps 3", ROMX + +INCLUDE "data/maps/headers/CinnabarIsland.asm" +INCLUDE "data/maps/objects/CinnabarIsland.asm" +CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk" + +INCLUDE "data/maps/headers/Route1.asm" +INCLUDE "data/maps/objects/Route1.asm" +Route1_Blocks: INCBIN "maps/Route1.blk" + +UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk" + +OaksLab_Blocks: INCBIN "maps/OaksLab.blk" + +MrPsychicsHouse_Blocks: +NameRatersHouse_Blocks: +MrFujisHouse_Blocks: +Route16FlyHouse_Blocks: +Route2TradeHouse_Blocks: +SaffronPidgeyHouse_Blocks: +VermilionPidgeyHouse_Blocks: +LavenderCuboneHouse_Blocks: +CeruleanTradeHouse_Blocks: +PewterNidoranHouse_Blocks: +PewterSpeechHouse_Blocks: +ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" + +CeladonMansionRoofHouse_Blocks: +ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk" + +CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk" + +DiglettsCaveRoute11_Blocks: +DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk" + + +SECTION "Maps 4", ROMX + +INCLUDE "scripts/CinnabarIsland.asm" + +INCLUDE "scripts/Route1.asm" + +INCLUDE "data/maps/headers/OaksLab.asm" +INCLUDE "scripts/OaksLab.asm" +INCLUDE "data/maps/objects/OaksLab.asm" + +INCLUDE "data/maps/headers/ViridianMart.asm" +INCLUDE "scripts/ViridianMart.asm" +INCLUDE "data/maps/objects/ViridianMart.asm" +ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk" + +INCLUDE "data/maps/headers/ViridianSchoolHouse.asm" +INCLUDE "scripts/ViridianSchoolHouse.asm" +INCLUDE "data/maps/objects/ViridianSchoolHouse.asm" + +INCLUDE "data/maps/headers/ViridianNicknameHouse.asm" + ds 1 +INCLUDE "scripts/ViridianNicknameHouse.asm" +INCLUDE "data/maps/objects/ViridianNicknameHouse.asm" + +INCLUDE "data/maps/headers/PewterNidoranHouse.asm" +INCLUDE "scripts/PewterNidoranHouse.asm" +INCLUDE "data/maps/objects/PewterNidoranHouse.asm" + +INCLUDE "data/maps/headers/PewterSpeechHouse.asm" +INCLUDE "scripts/PewterSpeechHouse.asm" +INCLUDE "data/maps/objects/PewterSpeechHouse.asm" + +INCLUDE "data/maps/headers/CeruleanTrashedHouse.asm" +INCLUDE "scripts/CeruleanTrashedHouse.asm" +INCLUDE "data/maps/objects/CeruleanTrashedHouse.asm" + +INCLUDE "data/maps/headers/CeruleanTradeHouse.asm" +INCLUDE "scripts/CeruleanTradeHouse.asm" +INCLUDE "data/maps/objects/CeruleanTradeHouse.asm" + +INCLUDE "data/maps/headers/BikeShop.asm" +INCLUDE "scripts/BikeShop.asm" +INCLUDE "data/maps/objects/BikeShop.asm" +BikeShop_Blocks: INCBIN "maps/BikeShop.blk" + +INCLUDE "data/maps/headers/MrFujisHouse.asm" +INCLUDE "scripts/MrFujisHouse.asm" +INCLUDE "data/maps/objects/MrFujisHouse.asm" + +INCLUDE "data/maps/headers/LavenderCuboneHouse.asm" +INCLUDE "scripts/LavenderCuboneHouse.asm" +INCLUDE "data/maps/objects/LavenderCuboneHouse.asm" + +INCLUDE "data/maps/headers/NameRatersHouse.asm" +INCLUDE "scripts/NameRatersHouse.asm" +INCLUDE "data/maps/objects/NameRatersHouse.asm" + +INCLUDE "data/maps/headers/VermilionPidgeyHouse.asm" +INCLUDE "scripts/VermilionPidgeyHouse.asm" +INCLUDE "data/maps/objects/VermilionPidgeyHouse.asm" + +INCLUDE "data/maps/headers/VermilionDock.asm" +INCLUDE "scripts/VermilionDock.asm" +INCLUDE "data/maps/objects/VermilionDock.asm" +VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk" + +INCLUDE "data/maps/headers/CeladonMansionRoofHouse.asm" +INCLUDE "scripts/CeladonMansionRoofHouse.asm" +INCLUDE "data/maps/objects/CeladonMansionRoofHouse.asm" + +INCLUDE "data/maps/headers/FuchsiaMart.asm" +INCLUDE "scripts/FuchsiaMart.asm" +INCLUDE "data/maps/objects/FuchsiaMart.asm" +FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk" + +INCLUDE "data/maps/headers/SaffronPidgeyHouse.asm" +INCLUDE "scripts/SaffronPidgeyHouse.asm" +INCLUDE "data/maps/objects/SaffronPidgeyHouse.asm" + +INCLUDE "data/maps/headers/MrPsychicsHouse.asm" +INCLUDE "scripts/MrPsychicsHouse.asm" +INCLUDE "data/maps/objects/MrPsychicsHouse.asm" + +INCLUDE "data/maps/headers/DiglettsCaveRoute2.asm" +INCLUDE "scripts/DiglettsCaveRoute2.asm" +INCLUDE "data/maps/objects/DiglettsCaveRoute2.asm" + +INCLUDE "data/maps/headers/Route2TradeHouse.asm" +INCLUDE "scripts/Route2TradeHouse.asm" +INCLUDE "data/maps/objects/Route2TradeHouse.asm" + +INCLUDE "data/maps/headers/Route5Gate.asm" +INCLUDE "scripts/Route5Gate.asm" +INCLUDE "data/maps/objects/Route5Gate.asm" +Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk" + +INCLUDE "data/maps/headers/Route6Gate.asm" +INCLUDE "scripts/Route6Gate.asm" +INCLUDE "data/maps/objects/Route6Gate.asm" +Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk" + +INCLUDE "data/maps/headers/Route7Gate.asm" +INCLUDE "scripts/Route7Gate.asm" +INCLUDE "data/maps/objects/Route7Gate.asm" +Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk" + +INCLUDE "data/maps/headers/Route8Gate.asm" +INCLUDE "scripts/Route8Gate.asm" +INCLUDE "data/maps/objects/Route8Gate.asm" +Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk" + +INCLUDE "data/maps/headers/UndergroundPathRoute8.asm" +INCLUDE "scripts/UndergroundPathRoute8.asm" +INCLUDE "data/maps/objects/UndergroundPathRoute8.asm" + +INCLUDE "data/maps/headers/PowerPlant.asm" +INCLUDE "scripts/PowerPlant.asm" +INCLUDE "data/maps/objects/PowerPlant.asm" +PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk" + +INCLUDE "data/maps/headers/DiglettsCaveRoute11.asm" +INCLUDE "scripts/DiglettsCaveRoute11.asm" +INCLUDE "data/maps/objects/DiglettsCaveRoute11.asm" + +INCLUDE "data/maps/headers/Route16FlyHouse.asm" +INCLUDE "scripts/Route16FlyHouse.asm" +INCLUDE "data/maps/objects/Route16FlyHouse.asm" + +INCLUDE "data/maps/headers/Route22Gate.asm" +INCLUDE "scripts/Route22Gate.asm" +INCLUDE "data/maps/objects/Route22Gate.asm" +Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk" + +INCLUDE "data/maps/headers/BillsHouse.asm" +INCLUDE "scripts/BillsHouse.asm" +INCLUDE "data/maps/objects/BillsHouse.asm" +BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk" + + +SECTION "Maps 5", ROMX + +INCLUDE "data/maps/headers/LavenderTown.asm" +INCLUDE "data/maps/objects/LavenderTown.asm" +LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk" + +ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk" + +SafariZoneCenterRestHouse_Blocks: +SafariZoneWestRestHouse_Blocks: +SafariZoneEastRestHouse_Blocks: +SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk" + +INCLUDE "scripts/LavenderTown.asm" + + +SECTION "Maps 6", ROMX + +INCLUDE "data/maps/headers/ViridianPokecenter.asm" +INCLUDE "scripts/ViridianPokecenter.asm" +INCLUDE "data/maps/objects/ViridianPokecenter.asm" + +INCLUDE "data/maps/headers/PokemonMansion1F.asm" +INCLUDE "scripts/PokemonMansion1F.asm" +INCLUDE "data/maps/objects/PokemonMansion1F.asm" +PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk" + +INCLUDE "data/maps/headers/RockTunnel1F.asm" +INCLUDE "scripts/RockTunnel1F.asm" +INCLUDE "data/maps/objects/RockTunnel1F.asm" +RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" + +INCLUDE "data/maps/headers/SeafoamIslands1F.asm" +INCLUDE "scripts/SeafoamIslands1F.asm" +INCLUDE "data/maps/objects/SeafoamIslands1F.asm" +SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk" + +INCLUDE "data/maps/headers/SSAnne3F.asm" +INCLUDE "scripts/SSAnne3F.asm" +INCLUDE "data/maps/objects/SSAnne3F.asm" +SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk" + +INCLUDE "data/maps/headers/VictoryRoad3F.asm" +INCLUDE "scripts/VictoryRoad3F.asm" +INCLUDE "data/maps/objects/VictoryRoad3F.asm" +VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk" + +INCLUDE "data/maps/headers/RocketHideoutB1F.asm" +INCLUDE "scripts/RocketHideoutB1F.asm" +INCLUDE "data/maps/objects/RocketHideoutB1F.asm" +RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk" + +INCLUDE "data/maps/headers/RocketHideoutB2F.asm" +INCLUDE "scripts/RocketHideoutB2F.asm" +INCLUDE "data/maps/objects/RocketHideoutB2F.asm" +RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk" + +INCLUDE "data/maps/headers/RocketHideoutB3F.asm" +INCLUDE "scripts/RocketHideoutB3F.asm" +INCLUDE "data/maps/objects/RocketHideoutB3F.asm" +RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk" + +INCLUDE "data/maps/headers/RocketHideoutB4F.asm" +INCLUDE "scripts/RocketHideoutB4F.asm" +INCLUDE "data/maps/objects/RocketHideoutB4F.asm" +RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk" + +INCLUDE "data/maps/headers/RocketHideoutElevator.asm" +INCLUDE "scripts/RocketHideoutElevator.asm" +INCLUDE "data/maps/objects/RocketHideoutElevator.asm" +RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" + +INCLUDE "data/maps/headers/SilphCoElevator.asm" +INCLUDE "scripts/SilphCoElevator.asm" +INCLUDE "data/maps/objects/SilphCoElevator.asm" +SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" + +INCLUDE "data/maps/headers/SafariZoneEast.asm" +INCLUDE "scripts/SafariZoneEast.asm" +INCLUDE "data/maps/objects/SafariZoneEast.asm" +SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk" + +INCLUDE "data/maps/headers/SafariZoneNorth.asm" +INCLUDE "scripts/SafariZoneNorth.asm" +INCLUDE "data/maps/objects/SafariZoneNorth.asm" +SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk" + +INCLUDE "data/maps/headers/SafariZoneCenter.asm" +INCLUDE "scripts/SafariZoneCenter.asm" +INCLUDE "data/maps/objects/SafariZoneCenter.asm" +SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk" + +INCLUDE "data/maps/headers/SafariZoneCenterRestHouse.asm" +INCLUDE "scripts/SafariZoneCenterRestHouse.asm" +INCLUDE "data/maps/objects/SafariZoneCenterRestHouse.asm" + +INCLUDE "data/maps/headers/SafariZoneWestRestHouse.asm" +INCLUDE "scripts/SafariZoneWestRestHouse.asm" +INCLUDE "data/maps/objects/SafariZoneWestRestHouse.asm" + +INCLUDE "data/maps/headers/SafariZoneEastRestHouse.asm" +INCLUDE "scripts/SafariZoneEastRestHouse.asm" +INCLUDE "data/maps/objects/SafariZoneEastRestHouse.asm" + +INCLUDE "data/maps/headers/SafariZoneNorthRestHouse.asm" +INCLUDE "scripts/SafariZoneNorthRestHouse.asm" +INCLUDE "data/maps/objects/SafariZoneNorthRestHouse.asm" + +INCLUDE "data/maps/headers/CeruleanCave2F.asm" +INCLUDE "scripts/CeruleanCave2F.asm" +INCLUDE "data/maps/objects/CeruleanCave2F.asm" +CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk" + +INCLUDE "data/maps/headers/CeruleanCaveB1F.asm" +INCLUDE "scripts/CeruleanCaveB1F.asm" +INCLUDE "data/maps/objects/CeruleanCaveB1F.asm" +CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk" + +INCLUDE "data/maps/headers/RockTunnelB1F.asm" +INCLUDE "scripts/RockTunnelB1F.asm" +INCLUDE "data/maps/objects/RockTunnelB1F.asm" +RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk" + +INCLUDE "data/maps/headers/SeafoamIslandsB1F.asm" +INCLUDE "scripts/SeafoamIslandsB1F.asm" +INCLUDE "data/maps/objects/SeafoamIslandsB1F.asm" +SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk" + +INCLUDE "data/maps/headers/SeafoamIslandsB2F.asm" +INCLUDE "scripts/SeafoamIslandsB2F.asm" +INCLUDE "data/maps/objects/SeafoamIslandsB2F.asm" +SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk" + +INCLUDE "data/maps/headers/SeafoamIslandsB3F.asm" +INCLUDE "scripts/SeafoamIslandsB3F.asm" +INCLUDE "data/maps/objects/SeafoamIslandsB3F.asm" +SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk" + +INCLUDE "data/maps/headers/SeafoamIslandsB4F.asm" +INCLUDE "scripts/SeafoamIslandsB4F.asm" +INCLUDE "data/maps/objects/SeafoamIslandsB4F.asm" +SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk" + + +SECTION "Maps 7", ROMX + +INCLUDE "data/maps/headers/Route7.asm" +INCLUDE "data/maps/objects/Route7.asm" +Route7_Blocks: INCBIN "maps/Route7.blk" + +CeladonPokecenter_Blocks: +RockTunnelPokecenter_Blocks: +MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk" + +Route18Gate1F_Blocks: +Route15Gate1F_Blocks: +Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk" + +Route18Gate2F_Blocks: +Route16Gate2F_Blocks: +Route15Gate2F_Blocks: +Route12Gate2F_Blocks: +Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk" + + +SECTION "Maps 8", ROMX + +INCLUDE "scripts/Route7.asm" + +INCLUDE "data/maps/headers/RedsHouse1F.asm" +INCLUDE "scripts/RedsHouse1F.asm" +INCLUDE "data/maps/objects/RedsHouse1F.asm" +RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk" + +INCLUDE "data/maps/headers/CeladonMart3F.asm" +INCLUDE "scripts/CeladonMart3F.asm" +INCLUDE "data/maps/objects/CeladonMart3F.asm" +CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk" + +INCLUDE "data/maps/headers/CeladonMart4F.asm" +INCLUDE "scripts/CeladonMart4F.asm" +INCLUDE "data/maps/objects/CeladonMart4F.asm" +CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk" + +INCLUDE "data/maps/headers/CeladonMartRoof.asm" +INCLUDE "scripts/CeladonMartRoof.asm" +INCLUDE "data/maps/objects/CeladonMartRoof.asm" +CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk" + +INCLUDE "data/maps/headers/CeladonMartElevator.asm" +INCLUDE "scripts/CeladonMartElevator.asm" +INCLUDE "data/maps/objects/CeladonMartElevator.asm" +CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk" + +INCLUDE "data/maps/headers/CeladonMansion1F.asm" +INCLUDE "scripts/CeladonMansion1F.asm" +INCLUDE "data/maps/objects/CeladonMansion1F.asm" +CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk" + +INCLUDE "data/maps/headers/CeladonMansion2F.asm" +INCLUDE "scripts/CeladonMansion2F.asm" +INCLUDE "data/maps/objects/CeladonMansion2F.asm" +CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk" + +INCLUDE "data/maps/headers/CeladonMansion3F.asm" +INCLUDE "scripts/CeladonMansion3F.asm" +INCLUDE "data/maps/objects/CeladonMansion3F.asm" +CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk" + +INCLUDE "data/maps/headers/CeladonMansionRoof.asm" +INCLUDE "scripts/CeladonMansionRoof.asm" +INCLUDE "data/maps/objects/CeladonMansionRoof.asm" +CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk" + +INCLUDE "data/maps/headers/CeladonPokecenter.asm" +INCLUDE "scripts/CeladonPokecenter.asm" +INCLUDE "data/maps/objects/CeladonPokecenter.asm" + +INCLUDE "data/maps/headers/CeladonGym.asm" +INCLUDE "scripts/CeladonGym.asm" +INCLUDE "data/maps/objects/CeladonGym.asm" +CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" + +INCLUDE "data/maps/headers/GameCorner.asm" +INCLUDE "scripts/GameCorner.asm" +INCLUDE "data/maps/objects/GameCorner.asm" +GameCorner_Blocks: INCBIN "maps/GameCorner.blk" + +INCLUDE "data/maps/headers/CeladonMart5F.asm" +INCLUDE "scripts/CeladonMart5F.asm" +INCLUDE "data/maps/objects/CeladonMart5F.asm" +CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk" + +INCLUDE "data/maps/headers/GameCornerPrizeRoom.asm" +INCLUDE "scripts/GameCornerPrizeRoom.asm" +INCLUDE "data/maps/objects/GameCornerPrizeRoom.asm" +GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk" + +INCLUDE "data/maps/headers/CeladonDiner.asm" +INCLUDE "scripts/CeladonDiner.asm" +INCLUDE "data/maps/objects/CeladonDiner.asm" +CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk" + +INCLUDE "data/maps/headers/CeladonChiefHouse.asm" +INCLUDE "scripts/CeladonChiefHouse.asm" +INCLUDE "data/maps/objects/CeladonChiefHouse.asm" +CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk" + +INCLUDE "data/maps/headers/CeladonHotel.asm" +INCLUDE "scripts/CeladonHotel.asm" +INCLUDE "data/maps/objects/CeladonHotel.asm" +CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk" + +INCLUDE "data/maps/headers/MtMoonPokecenter.asm" +INCLUDE "scripts/MtMoonPokecenter.asm" +INCLUDE "data/maps/objects/MtMoonPokecenter.asm" + +INCLUDE "data/maps/headers/RockTunnelPokecenter.asm" +INCLUDE "scripts/RockTunnelPokecenter.asm" +INCLUDE "data/maps/objects/RockTunnelPokecenter.asm" + +INCLUDE "data/maps/headers/Route11Gate1F.asm" +INCLUDE "scripts/Route11Gate1F.asm" +INCLUDE "data/maps/objects/Route11Gate1F.asm" + +INCLUDE "data/maps/headers/Route11Gate2F.asm" +INCLUDE "scripts/Route11Gate2F.asm" +INCLUDE "data/maps/objects/Route11Gate2F.asm" + +INCLUDE "data/maps/headers/Route12Gate1F.asm" +INCLUDE "scripts/Route12Gate1F.asm" +INCLUDE "data/maps/objects/Route12Gate1F.asm" +Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk" + +INCLUDE "data/maps/headers/Route12Gate2F.asm" +INCLUDE "scripts/Route12Gate2F.asm" +INCLUDE "data/maps/objects/Route12Gate2F.asm" + +INCLUDE "data/maps/headers/Route15Gate1F.asm" +INCLUDE "scripts/Route15Gate1F.asm" +INCLUDE "data/maps/objects/Route15Gate1F.asm" + +INCLUDE "data/maps/headers/Route15Gate2F.asm" +INCLUDE "scripts/Route15Gate2F.asm" +INCLUDE "data/maps/objects/Route15Gate2F.asm" + +INCLUDE "data/maps/headers/Route16Gate1F.asm" +INCLUDE "scripts/Route16Gate1F.asm" +INCLUDE "data/maps/objects/Route16Gate1F.asm" +Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk" + +INCLUDE "data/maps/headers/Route16Gate2F.asm" +INCLUDE "scripts/Route16Gate2F.asm" +INCLUDE "data/maps/objects/Route16Gate2F.asm" + +INCLUDE "data/maps/headers/Route18Gate1F.asm" +INCLUDE "scripts/Route18Gate1F.asm" +INCLUDE "data/maps/objects/Route18Gate1F.asm" + +INCLUDE "data/maps/headers/Route18Gate2F.asm" +INCLUDE "scripts/Route18Gate2F.asm" +INCLUDE "data/maps/objects/Route18Gate2F.asm" + +INCLUDE "data/maps/headers/MtMoon1F.asm" +INCLUDE "scripts/MtMoon1F.asm" +INCLUDE "data/maps/objects/MtMoon1F.asm" +MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk" + +INCLUDE "data/maps/headers/MtMoonB2F.asm" +INCLUDE "scripts/MtMoonB2F.asm" +INCLUDE "data/maps/objects/MtMoonB2F.asm" +MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk" + +INCLUDE "data/maps/headers/SafariZoneWest.asm" +INCLUDE "scripts/SafariZoneWest.asm" +INCLUDE "data/maps/objects/SafariZoneWest.asm" +SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk" + +INCLUDE "data/maps/headers/SafariZoneSecretHouse.asm" +INCLUDE "scripts/SafariZoneSecretHouse.asm" +INCLUDE "data/maps/objects/SafariZoneSecretHouse.asm" +SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk" + + +SECTION "Maps 9", ROMX + +INCLUDE "data/maps/headers/TradeCenter.asm" +INCLUDE "scripts/TradeCenter.asm" +INCLUDE "data/maps/objects/TradeCenter.asm" +TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk" + +INCLUDE "data/maps/headers/Colosseum.asm" +INCLUDE "scripts/Colosseum.asm" +INCLUDE "data/maps/objects/Colosseum.asm" +Colosseum_Blocks: INCBIN "maps/Colosseum.blk" + + +SECTION "Maps 10", ROMX + +INCLUDE "data/maps/headers/Route22.asm" +INCLUDE "data/maps/objects/Route22.asm" +Route22_Blocks: INCBIN "maps/Route22.blk" + +INCLUDE "data/maps/headers/Route20.asm" +INCLUDE "data/maps/objects/Route20.asm" +Route20_Blocks: INCBIN "maps/Route20.blk" + +INCLUDE "data/maps/headers/Route23.asm" +INCLUDE "data/maps/objects/Route23.asm" +Route23_Blocks: INCBIN "maps/Route23.blk" + +INCLUDE "data/maps/headers/Route24.asm" +INCLUDE "data/maps/objects/Route24.asm" +Route24_Blocks: INCBIN "maps/Route24.blk" + +INCLUDE "data/maps/headers/Route25.asm" +INCLUDE "data/maps/objects/Route25.asm" +Route25_Blocks: INCBIN "maps/Route25.blk" + +INCLUDE "data/maps/headers/IndigoPlateau.asm" +INCLUDE "scripts/IndigoPlateau.asm" +INCLUDE "data/maps/objects/IndigoPlateau.asm" +IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk" + +INCLUDE "data/maps/headers/SaffronCity.asm" +INCLUDE "data/maps/objects/SaffronCity.asm" +SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk" +INCLUDE "scripts/SaffronCity.asm" + +INCLUDE "scripts/Route20.asm" +INCLUDE "scripts/Route22.asm" +INCLUDE "scripts/Route23.asm" +INCLUDE "scripts/Route24.asm" +INCLUDE "scripts/Route25.asm" + +INCLUDE "data/maps/headers/VictoryRoad2F.asm" +INCLUDE "scripts/VictoryRoad2F.asm" +INCLUDE "data/maps/objects/VictoryRoad2F.asm" +VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk" + +INCLUDE "data/maps/headers/MtMoonB1F.asm" +INCLUDE "scripts/MtMoonB1F.asm" +INCLUDE "data/maps/objects/MtMoonB1F.asm" +MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk" + +INCLUDE "data/maps/headers/SilphCo7F.asm" +INCLUDE "scripts/SilphCo7F.asm" +INCLUDE "data/maps/objects/SilphCo7F.asm" +SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk" + +INCLUDE "data/maps/headers/PokemonMansion2F.asm" +INCLUDE "scripts/PokemonMansion2F.asm" +INCLUDE "data/maps/objects/PokemonMansion2F.asm" +PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk" + +INCLUDE "data/maps/headers/PokemonMansion3F.asm" +INCLUDE "scripts/PokemonMansion3F.asm" +INCLUDE "data/maps/objects/PokemonMansion3F.asm" +PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk" + +INCLUDE "data/maps/headers/PokemonMansionB1F.asm" +INCLUDE "scripts/PokemonMansionB1F.asm" +INCLUDE "data/maps/objects/PokemonMansionB1F.asm" +PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk" + + +SECTION "Maps 11", ROMX + +INCLUDE "data/maps/headers/Route2.asm" +INCLUDE "data/maps/objects/Route2.asm" +Route2_Blocks: INCBIN "maps/Route2.blk" + +INCLUDE "data/maps/headers/Route3.asm" +INCLUDE "data/maps/objects/Route3.asm" +Route3_Blocks: INCBIN "maps/Route3.blk" + +INCLUDE "data/maps/headers/Route4.asm" +INCLUDE "data/maps/objects/Route4.asm" +Route4_Blocks: INCBIN "maps/Route4.blk" + +INCLUDE "data/maps/headers/Route5.asm" +INCLUDE "data/maps/objects/Route5.asm" +Route5_Blocks: INCBIN "maps/Route5.blk" + +INCLUDE "data/maps/headers/Route9.asm" +INCLUDE "data/maps/objects/Route9.asm" +Route9_Blocks: INCBIN "maps/Route9.blk" + +INCLUDE "data/maps/headers/Route13.asm" +INCLUDE "data/maps/objects/Route13.asm" +Route13_Blocks: INCBIN "maps/Route13.blk" + +INCLUDE "data/maps/headers/Route14.asm" +INCLUDE "data/maps/objects/Route14.asm" +Route14_Blocks: INCBIN "maps/Route14.blk" + +INCLUDE "data/maps/headers/Route17.asm" +INCLUDE "data/maps/objects/Route17.asm" +Route17_Blocks: INCBIN "maps/Route17.blk" + +INCLUDE "data/maps/headers/Route19.asm" +INCLUDE "data/maps/objects/Route19.asm" +Route19_Blocks: INCBIN "maps/Route19.blk" + +INCLUDE "data/maps/headers/Route21.asm" +INCLUDE "data/maps/objects/Route21.asm" +Route21_Blocks: INCBIN "maps/Route21.blk" + +VermilionOldRodHouse_Blocks: +Route12SuperRodHouse_Blocks: +Daycare_Blocks: INCBIN "maps/Daycare.blk" + +FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" + + +SECTION "Maps 12", ROMX + +INCLUDE "scripts/Route2.asm" +INCLUDE "scripts/Route3.asm" +INCLUDE "scripts/Route4.asm" +INCLUDE "scripts/Route5.asm" +INCLUDE "scripts/Route9.asm" +INCLUDE "scripts/Route13.asm" +INCLUDE "scripts/Route14.asm" +INCLUDE "scripts/Route17.asm" +INCLUDE "scripts/Route19.asm" +INCLUDE "scripts/Route21.asm" + +INCLUDE "data/maps/headers/VermilionOldRodHouse.asm" +INCLUDE "scripts/VermilionOldRodHouse.asm" +INCLUDE "data/maps/objects/VermilionOldRodHouse.asm" + +INCLUDE "data/maps/headers/CeladonMart2F.asm" +INCLUDE "scripts/CeladonMart2F.asm" +INCLUDE "data/maps/objects/CeladonMart2F.asm" +CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk" + +INCLUDE "data/maps/headers/FuchsiaGoodRodHouse.asm" +INCLUDE "scripts/FuchsiaGoodRodHouse.asm" +INCLUDE "data/maps/objects/FuchsiaGoodRodHouse.asm" + +INCLUDE "data/maps/headers/Daycare.asm" +INCLUDE "scripts/Daycare.asm" +INCLUDE "data/maps/objects/Daycare.asm" + +INCLUDE "data/maps/headers/Route12SuperRodHouse.asm" +INCLUDE "scripts/Route12SuperRodHouse.asm" +INCLUDE "data/maps/objects/Route12SuperRodHouse.asm" + +INCLUDE "data/maps/headers/SilphCo8F.asm" +INCLUDE "scripts/SilphCo8F.asm" +INCLUDE "data/maps/objects/SilphCo8F.asm" +SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" + + +SECTION "Maps 13", ROMX + +INCLUDE "data/maps/headers/Route6.asm" +INCLUDE "data/maps/objects/Route6.asm" +Route6_Blocks: INCBIN "maps/Route6.blk" + +INCLUDE "data/maps/headers/Route8.asm" +INCLUDE "data/maps/objects/Route8.asm" +Route8_Blocks: INCBIN "maps/Route8.blk" + +INCLUDE "data/maps/headers/Route10.asm" +INCLUDE "data/maps/objects/Route10.asm" +Route10_Blocks: INCBIN "maps/Route10.blk" + +INCLUDE "data/maps/headers/Route11.asm" +INCLUDE "data/maps/objects/Route11.asm" +Route11_Blocks: INCBIN "maps/Route11.blk" + +INCLUDE "data/maps/headers/Route12.asm" +INCLUDE "data/maps/objects/Route12.asm" +Route12_Blocks: INCBIN "maps/Route12.blk" + +INCLUDE "data/maps/headers/Route15.asm" +INCLUDE "data/maps/objects/Route15.asm" +Route15_Blocks: INCBIN "maps/Route15.blk" + +INCLUDE "data/maps/headers/Route16.asm" +INCLUDE "data/maps/objects/Route16.asm" +Route16_Blocks: INCBIN "maps/Route16.blk" + +INCLUDE "data/maps/headers/Route18.asm" +INCLUDE "data/maps/objects/Route18.asm" +Route18_Blocks: INCBIN "maps/Route18.blk" + + INCBIN "maps/UnusedPokecenterCopy.blk" + + +SECTION "Maps 14", ROMX + +INCLUDE "scripts/Route6.asm" +INCLUDE "scripts/Route8.asm" +INCLUDE "scripts/Route10.asm" +INCLUDE "scripts/Route11.asm" +INCLUDE "scripts/Route12.asm" +INCLUDE "scripts/Route15.asm" +INCLUDE "scripts/Route16.asm" +INCLUDE "scripts/Route18.asm" + +INCLUDE "data/maps/headers/PokemonFanClub.asm" +INCLUDE "scripts/PokemonFanClub.asm" +INCLUDE "data/maps/objects/PokemonFanClub.asm" +PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk" + +INCLUDE "data/maps/headers/SilphCo2F.asm" +INCLUDE "scripts/SilphCo2F.asm" +INCLUDE "data/maps/objects/SilphCo2F.asm" +SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk" + +INCLUDE "data/maps/headers/SilphCo3F.asm" +INCLUDE "scripts/SilphCo3F.asm" +INCLUDE "data/maps/objects/SilphCo3F.asm" +SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" + +INCLUDE "data/maps/headers/SilphCo10F.asm" +INCLUDE "scripts/SilphCo10F.asm" +INCLUDE "data/maps/objects/SilphCo10F.asm" +SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" + +INCLUDE "data/maps/headers/LancesRoom.asm" +INCLUDE "scripts/LancesRoom.asm" +INCLUDE "data/maps/objects/LancesRoom.asm" +LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk" + +INCLUDE "data/maps/headers/HallOfFame.asm" +INCLUDE "scripts/HallOfFame.asm" +INCLUDE "data/maps/objects/HallOfFame.asm" +HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk" + + +SECTION "Maps 15", ROMX + +SaffronMart_Blocks: +LavenderMart_Blocks: +CeruleanMart_Blocks: +VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk" + +CopycatsHouse2F_Blocks: +RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk" + +Museum1F_Blocks: INCBIN "maps/Museum1F.blk" + +Museum2F_Blocks: INCBIN "maps/Museum2F.blk" + +SaffronPokecenter_Blocks: +VermilionPokecenter_Blocks: +LavenderPokecenter_Blocks: +PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk" + +UndergroundPathRoute7_Blocks: +UndergroundPathRoute7Copy_Blocks: +UndergroundPathRoute6_Blocks: +UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk" + +Route2Gate_Blocks: +ViridianForestSouthGate_Blocks: +ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk" + +INCLUDE "data/maps/headers/RedsHouse2F.asm" +INCLUDE "scripts/RedsHouse2F.asm" +INCLUDE "data/maps/objects/RedsHouse2F.asm" + + +SECTION "Maps 16", ROMX + +INCLUDE "data/maps/headers/Museum1F.asm" +INCLUDE "scripts/Museum1F.asm" +INCLUDE "data/maps/objects/Museum1F.asm" + +INCLUDE "data/maps/headers/Museum2F.asm" +INCLUDE "scripts/Museum2F.asm" +INCLUDE "data/maps/objects/Museum2F.asm" + +INCLUDE "data/maps/headers/PewterGym.asm" +INCLUDE "scripts/PewterGym.asm" +INCLUDE "data/maps/objects/PewterGym.asm" +PewterGym_Blocks: INCBIN "maps/PewterGym.blk" + +INCLUDE "data/maps/headers/PewterPokecenter.asm" +INCLUDE "scripts/PewterPokecenter.asm" +INCLUDE "data/maps/objects/PewterPokecenter.asm" + +INCLUDE "data/maps/headers/CeruleanPokecenter.asm" +INCLUDE "scripts/CeruleanPokecenter.asm" +INCLUDE "data/maps/objects/CeruleanPokecenter.asm" +CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk" + +INCLUDE "data/maps/headers/CeruleanGym.asm" +INCLUDE "scripts/CeruleanGym.asm" +INCLUDE "data/maps/objects/CeruleanGym.asm" +CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk" + +INCLUDE "data/maps/headers/CeruleanMart.asm" +INCLUDE "scripts/CeruleanMart.asm" +INCLUDE "data/maps/objects/CeruleanMart.asm" + +INCLUDE "data/maps/headers/LavenderPokecenter.asm" +INCLUDE "scripts/LavenderPokecenter.asm" +INCLUDE "data/maps/objects/LavenderPokecenter.asm" + +INCLUDE "data/maps/headers/LavenderMart.asm" +INCLUDE "scripts/LavenderMart.asm" +INCLUDE "data/maps/objects/LavenderMart.asm" + +INCLUDE "data/maps/headers/VermilionPokecenter.asm" +INCLUDE "scripts/VermilionPokecenter.asm" +INCLUDE "data/maps/objects/VermilionPokecenter.asm" + +INCLUDE "data/maps/headers/VermilionMart.asm" +INCLUDE "scripts/VermilionMart.asm" +INCLUDE "data/maps/objects/VermilionMart.asm" + +INCLUDE "data/maps/headers/VermilionGym.asm" +INCLUDE "scripts/VermilionGym.asm" +INCLUDE "data/maps/objects/VermilionGym.asm" +VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk" + +INCLUDE "data/maps/headers/CopycatsHouse2F.asm" +INCLUDE "scripts/CopycatsHouse2F.asm" +INCLUDE "data/maps/objects/CopycatsHouse2F.asm" + +INCLUDE "data/maps/headers/FightingDojo.asm" +INCLUDE "scripts/FightingDojo.asm" +INCLUDE "data/maps/objects/FightingDojo.asm" +FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk" + +INCLUDE "data/maps/headers/SaffronGym.asm" +INCLUDE "scripts/SaffronGym.asm" +INCLUDE "data/maps/objects/SaffronGym.asm" +SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk" + +INCLUDE "data/maps/headers/SaffronMart.asm" +INCLUDE "scripts/SaffronMart.asm" +INCLUDE "data/maps/objects/SaffronMart.asm" + +INCLUDE "data/maps/headers/SilphCo1F.asm" +INCLUDE "scripts/SilphCo1F.asm" +INCLUDE "data/maps/objects/SilphCo1F.asm" +SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk" + +INCLUDE "data/maps/headers/SaffronPokecenter.asm" +INCLUDE "scripts/SaffronPokecenter.asm" +INCLUDE "data/maps/objects/SaffronPokecenter.asm" + +INCLUDE "data/maps/headers/ViridianForestNorthGate.asm" +INCLUDE "scripts/ViridianForestNorthGate.asm" +INCLUDE "data/maps/objects/ViridianForestNorthGate.asm" + +INCLUDE "data/maps/headers/Route2Gate.asm" +INCLUDE "scripts/Route2Gate.asm" +INCLUDE "data/maps/objects/Route2Gate.asm" + +INCLUDE "data/maps/headers/ViridianForestSouthGate.asm" +INCLUDE "scripts/ViridianForestSouthGate.asm" +INCLUDE "data/maps/objects/ViridianForestSouthGate.asm" + +INCLUDE "data/maps/headers/UndergroundPathRoute5.asm" +INCLUDE "scripts/UndergroundPathRoute5.asm" +INCLUDE "data/maps/objects/UndergroundPathRoute5.asm" + +INCLUDE "data/maps/headers/UndergroundPathRoute6.asm" +INCLUDE "scripts/UndergroundPathRoute6.asm" +INCLUDE "data/maps/objects/UndergroundPathRoute6.asm" + +INCLUDE "data/maps/headers/UndergroundPathRoute7.asm" +INCLUDE "scripts/UndergroundPathRoute7.asm" +INCLUDE "data/maps/objects/UndergroundPathRoute7.asm" + +INCLUDE "data/maps/headers/UndergroundPathRoute7Copy.asm" +INCLUDE "scripts/UndergroundPathRoute7Copy.asm" +INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm" + +INCLUDE "data/maps/headers/SilphCo9F.asm" +INCLUDE "scripts/SilphCo9F.asm" +INCLUDE "data/maps/objects/SilphCo9F.asm" +SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" + +INCLUDE "data/maps/headers/VictoryRoad1F.asm" +INCLUDE "scripts/VictoryRoad1F.asm" +INCLUDE "data/maps/objects/VictoryRoad1F.asm" +VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk" + + +SECTION "Maps 17", ROMX + +ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk" +UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk" +UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk" + + INCBIN "maps/UnusedDiglettsCaveCopy.blk" + +SSAnneB1FRooms_Blocks: +SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk" + +INCLUDE "data/maps/headers/PokemonTower1F.asm" +INCLUDE "scripts/PokemonTower1F.asm" +INCLUDE "data/maps/objects/PokemonTower1F.asm" +PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk" + +INCLUDE "data/maps/headers/PokemonTower2F.asm" +INCLUDE "scripts/PokemonTower2F.asm" +INCLUDE "data/maps/objects/PokemonTower2F.asm" +PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk" + +INCLUDE "data/maps/headers/PokemonTower3F.asm" +INCLUDE "scripts/PokemonTower3F.asm" +INCLUDE "data/maps/objects/PokemonTower3F.asm" +PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk" + +INCLUDE "data/maps/headers/PokemonTower4F.asm" +INCLUDE "scripts/PokemonTower4F.asm" +INCLUDE "data/maps/objects/PokemonTower4F.asm" +PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk" + +INCLUDE "data/maps/headers/PokemonTower5F.asm" +INCLUDE "scripts/PokemonTower5F.asm" +INCLUDE "data/maps/objects/PokemonTower5F.asm" +PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk" + +INCLUDE "data/maps/headers/PokemonTower6F.asm" +INCLUDE "scripts/PokemonTower6F.asm" +INCLUDE "data/maps/objects/PokemonTower6F.asm" +PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk" + + INCBIN "maps/UnusedEmptyMap.blk" + +INCLUDE "data/maps/headers/PokemonTower7F.asm" +INCLUDE "scripts/PokemonTower7F.asm" +INCLUDE "data/maps/objects/PokemonTower7F.asm" +PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk" + +INCLUDE "data/maps/headers/CeladonMart1F.asm" +INCLUDE "scripts/CeladonMart1F.asm" +INCLUDE "data/maps/objects/CeladonMart1F.asm" +CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" + + +SECTION "Maps 18", ROMX + +INCLUDE "data/maps/headers/ViridianForest.asm" +INCLUDE "scripts/ViridianForest.asm" +INCLUDE "data/maps/objects/ViridianForest.asm" + +INCLUDE "data/maps/headers/SSAnne1F.asm" +INCLUDE "scripts/SSAnne1F.asm" +INCLUDE "data/maps/objects/SSAnne1F.asm" +SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk" + +INCLUDE "data/maps/headers/SSAnne2F.asm" +INCLUDE "scripts/SSAnne2F.asm" +INCLUDE "data/maps/objects/SSAnne2F.asm" +SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk" + +INCLUDE "data/maps/headers/SSAnneB1F.asm" +INCLUDE "scripts/SSAnneB1F.asm" +INCLUDE "data/maps/objects/SSAnneB1F.asm" +SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk" + +INCLUDE "data/maps/headers/SSAnneBow.asm" +INCLUDE "scripts/SSAnneBow.asm" +INCLUDE "data/maps/objects/SSAnneBow.asm" +SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk" + +INCLUDE "data/maps/headers/SSAnneKitchen.asm" +INCLUDE "scripts/SSAnneKitchen.asm" +INCLUDE "data/maps/objects/SSAnneKitchen.asm" +SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk" + +INCLUDE "data/maps/headers/SSAnneCaptainsRoom.asm" +INCLUDE "scripts/SSAnneCaptainsRoom.asm" +INCLUDE "data/maps/objects/SSAnneCaptainsRoom.asm" +SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk" + +INCLUDE "data/maps/headers/SSAnne1FRooms.asm" +INCLUDE "scripts/SSAnne1FRooms.asm" +INCLUDE "data/maps/objects/SSAnne1FRooms.asm" +SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk" + +INCLUDE "data/maps/headers/SSAnne2FRooms.asm" +INCLUDE "scripts/SSAnne2FRooms.asm" +INCLUDE "data/maps/objects/SSAnne2FRooms.asm" + +INCLUDE "data/maps/headers/SSAnneB1FRooms.asm" +INCLUDE "scripts/SSAnneB1FRooms.asm" +INCLUDE "data/maps/objects/SSAnneB1FRooms.asm" + +INCLUDE "data/maps/headers/UndergroundPathNorthSouth.asm" +INCLUDE "scripts/UndergroundPathNorthSouth.asm" +INCLUDE "data/maps/objects/UndergroundPathNorthSouth.asm" + +INCLUDE "data/maps/headers/UndergroundPathWestEast.asm" +INCLUDE "scripts/UndergroundPathWestEast.asm" +INCLUDE "data/maps/objects/UndergroundPathWestEast.asm" + +INCLUDE "data/maps/headers/DiglettsCave.asm" +INCLUDE "scripts/DiglettsCave.asm" +INCLUDE "data/maps/objects/DiglettsCave.asm" +DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk" + +INCLUDE "data/maps/headers/SilphCo11F.asm" +INCLUDE "scripts/SilphCo11F.asm" +INCLUDE "data/maps/objects/SilphCo11F.asm" +SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk" + + +SECTION "Maps 19", ROMX + +CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk" + +CinnabarMart_Blocks: +PewterMart_Blocks: INCBIN "maps/PewterMart.blk" + +FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk" + +CinnabarPokecenter_Blocks: +FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk" + +CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk" + + +SECTION "Maps 20", ROMX + +INCLUDE "scripts/CeruleanCity_2.asm" + +INCLUDE "data/maps/headers/ViridianGym.asm" +INCLUDE "scripts/ViridianGym.asm" +INCLUDE "data/maps/objects/ViridianGym.asm" +ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk" + +INCLUDE "data/maps/headers/PewterMart.asm" +INCLUDE "scripts/PewterMart.asm" +INCLUDE "data/maps/objects/PewterMart.asm" + +INCLUDE "data/maps/headers/CeruleanCave1F.asm" +INCLUDE "scripts/CeruleanCave1F.asm" +INCLUDE "data/maps/objects/CeruleanCave1F.asm" +CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk" + +INCLUDE "data/maps/headers/CeruleanBadgeHouse.asm" +INCLUDE "scripts/CeruleanBadgeHouse.asm" +INCLUDE "data/maps/objects/CeruleanBadgeHouse.asm" + + +SECTION "Maps 21", ROMX + +INCLUDE "data/maps/headers/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "data/maps/objects/FuchsiaBillsGrandpasHouse.asm" + +INCLUDE "data/maps/headers/FuchsiaPokecenter.asm" +INCLUDE "scripts/FuchsiaPokecenter.asm" +INCLUDE "data/maps/objects/FuchsiaPokecenter.asm" + +INCLUDE "data/maps/headers/WardensHouse.asm" +INCLUDE "scripts/WardensHouse.asm" +INCLUDE "data/maps/objects/WardensHouse.asm" +WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk" + +INCLUDE "data/maps/headers/SafariZoneGate.asm" +INCLUDE "scripts/SafariZoneGate.asm" +INCLUDE "data/maps/objects/SafariZoneGate.asm" +SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk" + +INCLUDE "data/maps/headers/FuchsiaGym.asm" +INCLUDE "scripts/FuchsiaGym.asm" +INCLUDE "data/maps/objects/FuchsiaGym.asm" +FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk" + +INCLUDE "data/maps/headers/FuchsiaMeetingRoom.asm" +INCLUDE "scripts/FuchsiaMeetingRoom.asm" +INCLUDE "data/maps/objects/FuchsiaMeetingRoom.asm" +FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk" + +INCLUDE "data/maps/headers/CinnabarGym.asm" +INCLUDE "scripts/CinnabarGym.asm" +INCLUDE "data/maps/objects/CinnabarGym.asm" +CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk" + +INCLUDE "data/maps/headers/CinnabarLab.asm" +INCLUDE "scripts/CinnabarLab.asm" +INCLUDE "data/maps/objects/CinnabarLab.asm" +CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk" + +INCLUDE "data/maps/headers/CinnabarLabTradeRoom.asm" +INCLUDE "scripts/CinnabarLabTradeRoom.asm" +INCLUDE "data/maps/objects/CinnabarLabTradeRoom.asm" +CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk" + +INCLUDE "data/maps/headers/CinnabarLabMetronomeRoom.asm" +INCLUDE "scripts/CinnabarLabMetronomeRoom.asm" +INCLUDE "data/maps/objects/CinnabarLabMetronomeRoom.asm" +CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk" + +INCLUDE "data/maps/headers/CinnabarLabFossilRoom.asm" +INCLUDE "scripts/CinnabarLabFossilRoom.asm" +INCLUDE "data/maps/objects/CinnabarLabFossilRoom.asm" +CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk" + +INCLUDE "data/maps/headers/CinnabarPokecenter.asm" +INCLUDE "scripts/CinnabarPokecenter.asm" +INCLUDE "data/maps/objects/CinnabarPokecenter.asm" + +INCLUDE "data/maps/headers/CinnabarMart.asm" +INCLUDE "scripts/CinnabarMart.asm" +INCLUDE "data/maps/objects/CinnabarMart.asm" + +INCLUDE "data/maps/headers/CopycatsHouse1F.asm" +INCLUDE "scripts/CopycatsHouse1F.asm" +INCLUDE "data/maps/objects/CopycatsHouse1F.asm" + +INCLUDE "data/maps/headers/ChampionsRoom.asm" +INCLUDE "scripts/ChampionsRoom.asm" +INCLUDE "data/maps/objects/ChampionsRoom.asm" +ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk" + +INCLUDE "data/maps/headers/LoreleisRoom.asm" +INCLUDE "scripts/LoreleisRoom.asm" +INCLUDE "data/maps/objects/LoreleisRoom.asm" +LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk" + +INCLUDE "data/maps/headers/BrunosRoom.asm" +INCLUDE "scripts/BrunosRoom.asm" +INCLUDE "data/maps/objects/BrunosRoom.asm" +BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk" + +INCLUDE "data/maps/headers/AgathasRoom.asm" +INCLUDE "scripts/AgathasRoom.asm" +INCLUDE "data/maps/objects/AgathasRoom.asm" +AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" diff --git a/maps/Route15Gate2F.blk b/maps/Route15Gate2F.blk old mode 100755 new mode 100644 diff --git a/maps/UnusedDiglettsCaveCopy.blk b/maps/UnusedDiglettsCaveCopy.blk old mode 100755 new mode 100644 diff --git a/maps/UnusedEmptyMap.blk b/maps/UnusedEmptyMap.blk old mode 100755 new mode 100644 diff --git a/maps/UnusedPokecenterCopy.blk b/maps/UnusedPokecenterCopy.blk old mode 100755 new mode 100644 diff --git a/maps/green/CeruleanCave1F.blk b/maps/green/CeruleanCave1F.blk new file mode 100644 index 00000000..689593fd --- /dev/null +++ b/maps/green/CeruleanCave1F.blk @@ -0,0 +1,3 @@ +|_vvvv|bRvvvvvfm,+vvvvv'fv,+|vvtvf,v=vvv f S + ^-f+ +$ \ No newline at end of file diff --git a/maps/green/CeruleanCave2F.blk b/maps/green/CeruleanCave2F.blk new file mode 100644 index 00000000..c62864da --- /dev/null +++ b/maps/green/CeruleanCave2F.blk @@ -0,0 +1 @@ + (  ((    (#( \ No newline at end of file diff --git a/maps/green/CeruleanCaveB1F.blk b/maps/green/CeruleanCaveB1F.blk new file mode 100644 index 00000000..8411849f --- /dev/null +++ b/maps/green/CeruleanCaveB1F.blk @@ -0,0 +1 @@ +n !"n,- " L  "avvv "Q-+tv "vfvvNvvvvvvf--SQvvvvvL  \ No newline at end of file diff --git a/pic/ymon/abra.png b/pic/ymon/abra.png deleted file mode 100644 index 3573a040..00000000 Binary files a/pic/ymon/abra.png and /dev/null differ diff --git a/pic/ymon/aerodactyl.png b/pic/ymon/aerodactyl.png deleted file mode 100644 index cf0212a0..00000000 Binary files a/pic/ymon/aerodactyl.png and /dev/null differ diff --git a/pic/ymon/alakazam.png b/pic/ymon/alakazam.png deleted file mode 100644 index 613ae5ad..00000000 Binary files a/pic/ymon/alakazam.png and /dev/null differ diff --git a/pic/ymon/arbok.png b/pic/ymon/arbok.png deleted file mode 100644 index 45df87b1..00000000 Binary files a/pic/ymon/arbok.png and /dev/null differ diff --git a/pic/ymon/arcanine.png b/pic/ymon/arcanine.png deleted file mode 100644 index 77bb89b0..00000000 Binary files a/pic/ymon/arcanine.png and /dev/null differ diff --git a/pic/ymon/articuno.png b/pic/ymon/articuno.png deleted file mode 100644 index e8ae875e..00000000 Binary files a/pic/ymon/articuno.png and /dev/null differ diff --git a/pic/ymon/beedrill.png b/pic/ymon/beedrill.png deleted file mode 100644 index bc9ca73d..00000000 Binary files a/pic/ymon/beedrill.png and /dev/null differ diff --git a/pic/ymon/bellsprout.png b/pic/ymon/bellsprout.png deleted file mode 100644 index f3d2ff1c..00000000 Binary files a/pic/ymon/bellsprout.png and /dev/null differ diff --git a/pic/ymon/blastoise.png b/pic/ymon/blastoise.png deleted file mode 100644 index 6cdd8e30..00000000 Binary files a/pic/ymon/blastoise.png and /dev/null differ diff --git a/pic/ymon/bulbasaur.png b/pic/ymon/bulbasaur.png deleted file mode 100644 index 27abe273..00000000 Binary files a/pic/ymon/bulbasaur.png and /dev/null differ diff --git a/pic/ymon/butterfree.png b/pic/ymon/butterfree.png deleted file mode 100644 index 951ae4c4..00000000 Binary files a/pic/ymon/butterfree.png and /dev/null differ diff --git a/pic/ymon/caterpie.png b/pic/ymon/caterpie.png deleted file mode 100644 index 8e3205c9..00000000 Binary files a/pic/ymon/caterpie.png and /dev/null differ diff --git a/pic/ymon/chansey.png b/pic/ymon/chansey.png deleted file mode 100644 index d517535a..00000000 Binary files a/pic/ymon/chansey.png and /dev/null differ diff --git a/pic/ymon/charizard.png b/pic/ymon/charizard.png deleted file mode 100644 index 100416d4..00000000 Binary files a/pic/ymon/charizard.png and /dev/null differ diff --git a/pic/ymon/charmander.png b/pic/ymon/charmander.png deleted file mode 100644 index 155a68a4..00000000 Binary files a/pic/ymon/charmander.png and /dev/null differ diff --git a/pic/ymon/charmeleon.png b/pic/ymon/charmeleon.png deleted file mode 100644 index 63808b25..00000000 Binary files a/pic/ymon/charmeleon.png and /dev/null differ diff --git a/pic/ymon/clefable.png b/pic/ymon/clefable.png deleted file mode 100644 index 8e5111f9..00000000 Binary files a/pic/ymon/clefable.png and /dev/null differ diff --git a/pic/ymon/clefairy.png b/pic/ymon/clefairy.png deleted file mode 100644 index 4a26be0b..00000000 Binary files a/pic/ymon/clefairy.png and /dev/null differ diff --git a/pic/ymon/cloyster.png b/pic/ymon/cloyster.png deleted file mode 100644 index 67542d93..00000000 Binary files a/pic/ymon/cloyster.png and /dev/null differ diff --git a/pic/ymon/cubone.png b/pic/ymon/cubone.png deleted file mode 100644 index c5dec329..00000000 Binary files a/pic/ymon/cubone.png and /dev/null differ diff --git a/pic/ymon/dewgong.png b/pic/ymon/dewgong.png deleted file mode 100644 index c7bb5424..00000000 Binary files a/pic/ymon/dewgong.png and /dev/null differ diff --git a/pic/ymon/diglett.png b/pic/ymon/diglett.png deleted file mode 100644 index a9becda8..00000000 Binary files a/pic/ymon/diglett.png and /dev/null differ diff --git a/pic/ymon/ditto.png b/pic/ymon/ditto.png deleted file mode 100644 index 3c662491..00000000 Binary files a/pic/ymon/ditto.png and /dev/null differ diff --git a/pic/ymon/dodrio.png b/pic/ymon/dodrio.png deleted file mode 100644 index 45606e63..00000000 Binary files a/pic/ymon/dodrio.png and /dev/null differ diff --git a/pic/ymon/doduo.png b/pic/ymon/doduo.png deleted file mode 100644 index 0aa722c0..00000000 Binary files a/pic/ymon/doduo.png and /dev/null differ diff --git a/pic/ymon/dragonair.png b/pic/ymon/dragonair.png deleted file mode 100644 index e7fc1448..00000000 Binary files a/pic/ymon/dragonair.png and /dev/null differ diff --git a/pic/ymon/dragonite.png b/pic/ymon/dragonite.png deleted file mode 100644 index 7ac78924..00000000 Binary files a/pic/ymon/dragonite.png and /dev/null differ diff --git a/pic/ymon/dratini.png b/pic/ymon/dratini.png deleted file mode 100644 index 5a1a880f..00000000 Binary files a/pic/ymon/dratini.png and /dev/null differ diff --git a/pic/ymon/drowzee.png b/pic/ymon/drowzee.png deleted file mode 100644 index 16d3edfc..00000000 Binary files a/pic/ymon/drowzee.png and /dev/null differ diff --git a/pic/ymon/dugtrio.png b/pic/ymon/dugtrio.png deleted file mode 100644 index c20d01b6..00000000 Binary files a/pic/ymon/dugtrio.png and /dev/null differ diff --git a/pic/ymon/eevee.png b/pic/ymon/eevee.png deleted file mode 100644 index 7bc62ae9..00000000 Binary files a/pic/ymon/eevee.png and /dev/null differ diff --git a/pic/ymon/ekans.png b/pic/ymon/ekans.png deleted file mode 100644 index 1d454a13..00000000 Binary files a/pic/ymon/ekans.png and /dev/null differ diff --git a/pic/ymon/electabuzz.png b/pic/ymon/electabuzz.png deleted file mode 100644 index 77647d26..00000000 Binary files a/pic/ymon/electabuzz.png and /dev/null differ diff --git a/pic/ymon/electrode.png b/pic/ymon/electrode.png deleted file mode 100755 index f5e05464..00000000 Binary files a/pic/ymon/electrode.png and /dev/null differ diff --git a/pic/ymon/exeggcute.png b/pic/ymon/exeggcute.png deleted file mode 100644 index 901e2244..00000000 Binary files a/pic/ymon/exeggcute.png and /dev/null differ diff --git a/pic/ymon/exeggutor.png b/pic/ymon/exeggutor.png deleted file mode 100644 index 3e8d37cb..00000000 Binary files a/pic/ymon/exeggutor.png and /dev/null differ diff --git a/pic/ymon/farfetchd.png b/pic/ymon/farfetchd.png deleted file mode 100644 index 8412e767..00000000 Binary files a/pic/ymon/farfetchd.png and /dev/null differ diff --git a/pic/ymon/fearow.png b/pic/ymon/fearow.png deleted file mode 100644 index 7b54a854..00000000 Binary files a/pic/ymon/fearow.png and /dev/null differ diff --git a/pic/ymon/flareon.png b/pic/ymon/flareon.png deleted file mode 100644 index 5b0e5376..00000000 Binary files a/pic/ymon/flareon.png and /dev/null differ diff --git a/pic/ymon/gastly.png b/pic/ymon/gastly.png deleted file mode 100644 index 9d236e5a..00000000 Binary files a/pic/ymon/gastly.png and /dev/null differ diff --git a/pic/ymon/gengar.png b/pic/ymon/gengar.png deleted file mode 100644 index 1993bcfc..00000000 Binary files a/pic/ymon/gengar.png and /dev/null differ diff --git a/pic/ymon/geodude.png b/pic/ymon/geodude.png deleted file mode 100644 index c28db680..00000000 Binary files a/pic/ymon/geodude.png and /dev/null differ diff --git a/pic/ymon/gloom.png b/pic/ymon/gloom.png deleted file mode 100644 index 6071ea5d..00000000 Binary files a/pic/ymon/gloom.png and /dev/null differ diff --git a/pic/ymon/golbat.png b/pic/ymon/golbat.png deleted file mode 100644 index 7d2b17da..00000000 Binary files a/pic/ymon/golbat.png and /dev/null differ diff --git a/pic/ymon/goldeen.png b/pic/ymon/goldeen.png deleted file mode 100644 index c6bbeae5..00000000 Binary files a/pic/ymon/goldeen.png and /dev/null differ diff --git a/pic/ymon/golduck.png b/pic/ymon/golduck.png deleted file mode 100644 index 299b6300..00000000 Binary files a/pic/ymon/golduck.png and /dev/null differ diff --git a/pic/ymon/golem.png b/pic/ymon/golem.png deleted file mode 100644 index 7d317b7d..00000000 Binary files a/pic/ymon/golem.png and /dev/null differ diff --git a/pic/ymon/graveler.png b/pic/ymon/graveler.png deleted file mode 100644 index 26d4b0a1..00000000 Binary files a/pic/ymon/graveler.png and /dev/null differ diff --git a/pic/ymon/grimer.png b/pic/ymon/grimer.png deleted file mode 100644 index a72c9e45..00000000 Binary files a/pic/ymon/grimer.png and /dev/null differ diff --git a/pic/ymon/growlithe.png b/pic/ymon/growlithe.png deleted file mode 100644 index e75173cf..00000000 Binary files a/pic/ymon/growlithe.png and /dev/null differ diff --git a/pic/ymon/gyarados.png b/pic/ymon/gyarados.png deleted file mode 100644 index 387c2725..00000000 Binary files a/pic/ymon/gyarados.png and /dev/null differ diff --git a/pic/ymon/haunter.png b/pic/ymon/haunter.png deleted file mode 100644 index d7f96e3d..00000000 Binary files a/pic/ymon/haunter.png and /dev/null differ diff --git a/pic/ymon/hitmonchan.png b/pic/ymon/hitmonchan.png deleted file mode 100644 index 2fb7122b..00000000 Binary files a/pic/ymon/hitmonchan.png and /dev/null differ diff --git a/pic/ymon/hitmonlee.png b/pic/ymon/hitmonlee.png deleted file mode 100644 index acbe68ff..00000000 Binary files a/pic/ymon/hitmonlee.png and /dev/null differ diff --git a/pic/ymon/horsea.png b/pic/ymon/horsea.png deleted file mode 100644 index 390c419d..00000000 Binary files a/pic/ymon/horsea.png and /dev/null differ diff --git a/pic/ymon/hypno.png b/pic/ymon/hypno.png deleted file mode 100644 index ed100f66..00000000 Binary files a/pic/ymon/hypno.png and /dev/null differ diff --git a/pic/ymon/ivysaur.png b/pic/ymon/ivysaur.png deleted file mode 100644 index 4da5664b..00000000 Binary files a/pic/ymon/ivysaur.png and /dev/null differ diff --git a/pic/ymon/jigglypuff.png b/pic/ymon/jigglypuff.png deleted file mode 100644 index d11ec165..00000000 Binary files a/pic/ymon/jigglypuff.png and /dev/null differ diff --git a/pic/ymon/jolteon.png b/pic/ymon/jolteon.png deleted file mode 100644 index a1942ec6..00000000 Binary files a/pic/ymon/jolteon.png and /dev/null differ diff --git a/pic/ymon/jynx.png b/pic/ymon/jynx.png deleted file mode 100644 index 699ab3f5..00000000 Binary files a/pic/ymon/jynx.png and /dev/null differ diff --git a/pic/ymon/kabuto.png b/pic/ymon/kabuto.png deleted file mode 100644 index 58f27e0f..00000000 Binary files a/pic/ymon/kabuto.png and /dev/null differ diff --git a/pic/ymon/kabutops.png b/pic/ymon/kabutops.png deleted file mode 100644 index e898ca12..00000000 Binary files a/pic/ymon/kabutops.png and /dev/null differ diff --git a/pic/ymon/kadabra.png b/pic/ymon/kadabra.png deleted file mode 100644 index 58aff19a..00000000 Binary files a/pic/ymon/kadabra.png and /dev/null differ diff --git a/pic/ymon/kakuna.png b/pic/ymon/kakuna.png deleted file mode 100644 index fb4ec863..00000000 Binary files a/pic/ymon/kakuna.png and /dev/null differ diff --git a/pic/ymon/kangaskhan.png b/pic/ymon/kangaskhan.png deleted file mode 100644 index 56ab2619..00000000 Binary files a/pic/ymon/kangaskhan.png and /dev/null differ diff --git a/pic/ymon/kingler.png b/pic/ymon/kingler.png deleted file mode 100644 index c7610d11..00000000 Binary files a/pic/ymon/kingler.png and /dev/null differ diff --git a/pic/ymon/koffing.png b/pic/ymon/koffing.png deleted file mode 100644 index 9d394cdc..00000000 Binary files a/pic/ymon/koffing.png and /dev/null differ diff --git a/pic/ymon/krabby.png b/pic/ymon/krabby.png deleted file mode 100644 index fe463732..00000000 Binary files a/pic/ymon/krabby.png and /dev/null differ diff --git a/pic/ymon/lapras.png b/pic/ymon/lapras.png deleted file mode 100644 index ee954079..00000000 Binary files a/pic/ymon/lapras.png and /dev/null differ diff --git a/pic/ymon/lickitung.png b/pic/ymon/lickitung.png deleted file mode 100644 index 3b480655..00000000 Binary files a/pic/ymon/lickitung.png and /dev/null differ diff --git a/pic/ymon/machamp.png b/pic/ymon/machamp.png deleted file mode 100644 index f2bf5a0b..00000000 Binary files a/pic/ymon/machamp.png and /dev/null differ diff --git a/pic/ymon/machoke.png b/pic/ymon/machoke.png deleted file mode 100644 index 7079a52b..00000000 Binary files a/pic/ymon/machoke.png and /dev/null differ diff --git a/pic/ymon/machop.png b/pic/ymon/machop.png deleted file mode 100644 index cd6d6891..00000000 Binary files a/pic/ymon/machop.png and /dev/null differ diff --git a/pic/ymon/magikarp.png b/pic/ymon/magikarp.png deleted file mode 100644 index 881aa50a..00000000 Binary files a/pic/ymon/magikarp.png and /dev/null differ diff --git a/pic/ymon/magmar.png b/pic/ymon/magmar.png deleted file mode 100644 index 839fa204..00000000 Binary files a/pic/ymon/magmar.png and /dev/null differ diff --git a/pic/ymon/magnemite.png b/pic/ymon/magnemite.png deleted file mode 100644 index 4cb5e3da..00000000 Binary files a/pic/ymon/magnemite.png and /dev/null differ diff --git a/pic/ymon/magneton.png b/pic/ymon/magneton.png deleted file mode 100644 index 5d2a3eaa..00000000 Binary files a/pic/ymon/magneton.png and /dev/null differ diff --git a/pic/ymon/mankey.png b/pic/ymon/mankey.png deleted file mode 100644 index f3266f29..00000000 Binary files a/pic/ymon/mankey.png and /dev/null differ diff --git a/pic/ymon/marowak.png b/pic/ymon/marowak.png deleted file mode 100644 index d90e4627..00000000 Binary files a/pic/ymon/marowak.png and /dev/null differ diff --git a/pic/ymon/meowth.png b/pic/ymon/meowth.png deleted file mode 100644 index de82b0c2..00000000 Binary files a/pic/ymon/meowth.png and /dev/null differ diff --git a/pic/ymon/metapod.png b/pic/ymon/metapod.png deleted file mode 100644 index 6268ed9a..00000000 Binary files a/pic/ymon/metapod.png and /dev/null differ diff --git a/pic/ymon/mew.png b/pic/ymon/mew.png deleted file mode 100644 index a00783a9..00000000 Binary files a/pic/ymon/mew.png and /dev/null differ diff --git a/pic/ymon/mewtwo.png b/pic/ymon/mewtwo.png deleted file mode 100644 index 40c6f217..00000000 Binary files a/pic/ymon/mewtwo.png and /dev/null differ diff --git a/pic/ymon/moltres.png b/pic/ymon/moltres.png deleted file mode 100644 index e5e3d02e..00000000 Binary files a/pic/ymon/moltres.png and /dev/null differ diff --git a/pic/ymon/mr.mime.png b/pic/ymon/mr.mime.png deleted file mode 100644 index 5a3642d3..00000000 Binary files a/pic/ymon/mr.mime.png and /dev/null differ diff --git a/pic/ymon/muk.png b/pic/ymon/muk.png deleted file mode 100644 index d7d98e37..00000000 Binary files a/pic/ymon/muk.png and /dev/null differ diff --git a/pic/ymon/nidoking.png b/pic/ymon/nidoking.png deleted file mode 100644 index 785adc67..00000000 Binary files a/pic/ymon/nidoking.png and /dev/null differ diff --git a/pic/ymon/nidoqueen.png b/pic/ymon/nidoqueen.png deleted file mode 100644 index 24f786c7..00000000 Binary files a/pic/ymon/nidoqueen.png and /dev/null differ diff --git a/pic/ymon/nidoranf.png b/pic/ymon/nidoranf.png deleted file mode 100644 index 1f6532d2..00000000 Binary files a/pic/ymon/nidoranf.png and /dev/null differ diff --git a/pic/ymon/nidoranm.png b/pic/ymon/nidoranm.png deleted file mode 100644 index bb960e01..00000000 Binary files a/pic/ymon/nidoranm.png and /dev/null differ diff --git a/pic/ymon/nidorina.png b/pic/ymon/nidorina.png deleted file mode 100644 index 76edf719..00000000 Binary files a/pic/ymon/nidorina.png and /dev/null differ diff --git a/pic/ymon/nidorino.png b/pic/ymon/nidorino.png deleted file mode 100644 index c68dbdd1..00000000 Binary files a/pic/ymon/nidorino.png and /dev/null differ diff --git a/pic/ymon/ninetales.png b/pic/ymon/ninetales.png deleted file mode 100644 index f7ff9ff6..00000000 Binary files a/pic/ymon/ninetales.png and /dev/null differ diff --git a/pic/ymon/oddish.png b/pic/ymon/oddish.png deleted file mode 100644 index 17281e3b..00000000 Binary files a/pic/ymon/oddish.png and /dev/null differ diff --git a/pic/ymon/omanyte.png b/pic/ymon/omanyte.png deleted file mode 100644 index eafbd593..00000000 Binary files a/pic/ymon/omanyte.png and /dev/null differ diff --git a/pic/ymon/omastar.png b/pic/ymon/omastar.png deleted file mode 100644 index 2eb40d37..00000000 Binary files a/pic/ymon/omastar.png and /dev/null differ diff --git a/pic/ymon/onix.png b/pic/ymon/onix.png deleted file mode 100644 index 1e49634f..00000000 Binary files a/pic/ymon/onix.png and /dev/null differ diff --git a/pic/ymon/paras.png b/pic/ymon/paras.png deleted file mode 100644 index 73c805c8..00000000 Binary files a/pic/ymon/paras.png and /dev/null differ diff --git a/pic/ymon/parasect.png b/pic/ymon/parasect.png deleted file mode 100644 index def9e493..00000000 Binary files a/pic/ymon/parasect.png and /dev/null differ diff --git a/pic/ymon/persian.png b/pic/ymon/persian.png deleted file mode 100644 index 831a9da8..00000000 Binary files a/pic/ymon/persian.png and /dev/null differ diff --git a/pic/ymon/pidgeot.png b/pic/ymon/pidgeot.png deleted file mode 100644 index 4bb98422..00000000 Binary files a/pic/ymon/pidgeot.png and /dev/null differ diff --git a/pic/ymon/pidgeotto.png b/pic/ymon/pidgeotto.png deleted file mode 100644 index 0490003c..00000000 Binary files a/pic/ymon/pidgeotto.png and /dev/null differ diff --git a/pic/ymon/pidgey.png b/pic/ymon/pidgey.png deleted file mode 100644 index fe507e6d..00000000 Binary files a/pic/ymon/pidgey.png and /dev/null differ diff --git a/pic/ymon/pikachu.png b/pic/ymon/pikachu.png deleted file mode 100644 index 4fc61c87..00000000 Binary files a/pic/ymon/pikachu.png and /dev/null differ diff --git a/pic/ymon/pinsir.png b/pic/ymon/pinsir.png deleted file mode 100644 index 0f8d8639..00000000 Binary files a/pic/ymon/pinsir.png and /dev/null differ diff --git a/pic/ymon/poliwag.png b/pic/ymon/poliwag.png deleted file mode 100644 index 1c19fd1c..00000000 Binary files a/pic/ymon/poliwag.png and /dev/null differ diff --git a/pic/ymon/poliwhirl.png b/pic/ymon/poliwhirl.png deleted file mode 100644 index f56f75df..00000000 Binary files a/pic/ymon/poliwhirl.png and /dev/null differ diff --git a/pic/ymon/poliwrath.png b/pic/ymon/poliwrath.png deleted file mode 100644 index 20fe9e6c..00000000 Binary files a/pic/ymon/poliwrath.png and /dev/null differ diff --git a/pic/ymon/ponyta.png b/pic/ymon/ponyta.png deleted file mode 100644 index b4ec63b2..00000000 Binary files a/pic/ymon/ponyta.png and /dev/null differ diff --git a/pic/ymon/porygon.png b/pic/ymon/porygon.png deleted file mode 100644 index f991dd6e..00000000 Binary files a/pic/ymon/porygon.png and /dev/null differ diff --git a/pic/ymon/primeape.png b/pic/ymon/primeape.png deleted file mode 100644 index a14234f5..00000000 Binary files a/pic/ymon/primeape.png and /dev/null differ diff --git a/pic/ymon/psyduck.png b/pic/ymon/psyduck.png deleted file mode 100644 index 75cd2f17..00000000 Binary files a/pic/ymon/psyduck.png and /dev/null differ diff --git a/pic/ymon/raichu.png b/pic/ymon/raichu.png deleted file mode 100644 index 1ef39dc9..00000000 Binary files a/pic/ymon/raichu.png and /dev/null differ diff --git a/pic/ymon/rapidash.png b/pic/ymon/rapidash.png deleted file mode 100644 index 804e7829..00000000 Binary files a/pic/ymon/rapidash.png and /dev/null differ diff --git a/pic/ymon/raticate.png b/pic/ymon/raticate.png deleted file mode 100644 index 95018e0b..00000000 Binary files a/pic/ymon/raticate.png and /dev/null differ diff --git a/pic/ymon/rattata.png b/pic/ymon/rattata.png deleted file mode 100644 index 423299bb..00000000 Binary files a/pic/ymon/rattata.png and /dev/null differ diff --git a/pic/ymon/rhydon.png b/pic/ymon/rhydon.png deleted file mode 100644 index 6d75e4be..00000000 Binary files a/pic/ymon/rhydon.png and /dev/null differ diff --git a/pic/ymon/rhyhorn.png b/pic/ymon/rhyhorn.png deleted file mode 100644 index dcf9dd6a..00000000 Binary files a/pic/ymon/rhyhorn.png and /dev/null differ diff --git a/pic/ymon/sandshrew.png b/pic/ymon/sandshrew.png deleted file mode 100644 index 010908fd..00000000 Binary files a/pic/ymon/sandshrew.png and /dev/null differ diff --git a/pic/ymon/sandslash.png b/pic/ymon/sandslash.png deleted file mode 100644 index d37a8de1..00000000 Binary files a/pic/ymon/sandslash.png and /dev/null differ diff --git a/pic/ymon/scyther.png b/pic/ymon/scyther.png deleted file mode 100644 index 51663342..00000000 Binary files a/pic/ymon/scyther.png and /dev/null differ diff --git a/pic/ymon/seadra.png b/pic/ymon/seadra.png deleted file mode 100644 index 150416dc..00000000 Binary files a/pic/ymon/seadra.png and /dev/null differ diff --git a/pic/ymon/seaking.png b/pic/ymon/seaking.png deleted file mode 100644 index 75060461..00000000 Binary files a/pic/ymon/seaking.png and /dev/null differ diff --git a/pic/ymon/seel.png b/pic/ymon/seel.png deleted file mode 100644 index ef3574b0..00000000 Binary files a/pic/ymon/seel.png and /dev/null differ diff --git a/pic/ymon/shellder.png b/pic/ymon/shellder.png deleted file mode 100644 index d7ddfa48..00000000 Binary files a/pic/ymon/shellder.png and /dev/null differ diff --git a/pic/ymon/slowbro.png b/pic/ymon/slowbro.png deleted file mode 100644 index e506c9ec..00000000 Binary files a/pic/ymon/slowbro.png and /dev/null differ diff --git a/pic/ymon/slowpoke.png b/pic/ymon/slowpoke.png deleted file mode 100644 index 1328f4a0..00000000 Binary files a/pic/ymon/slowpoke.png and /dev/null differ diff --git a/pic/ymon/snorlax.png b/pic/ymon/snorlax.png deleted file mode 100644 index 00c78d27..00000000 Binary files a/pic/ymon/snorlax.png and /dev/null differ diff --git a/pic/ymon/spearow.png b/pic/ymon/spearow.png deleted file mode 100644 index d9349987..00000000 Binary files a/pic/ymon/spearow.png and /dev/null differ diff --git a/pic/ymon/squirtle.png b/pic/ymon/squirtle.png deleted file mode 100644 index db7aa6c7..00000000 Binary files a/pic/ymon/squirtle.png and /dev/null differ diff --git a/pic/ymon/starmie.png b/pic/ymon/starmie.png deleted file mode 100644 index 2ed93b4d..00000000 Binary files a/pic/ymon/starmie.png and /dev/null differ diff --git a/pic/ymon/staryu.png b/pic/ymon/staryu.png deleted file mode 100644 index 320fb6a6..00000000 Binary files a/pic/ymon/staryu.png and /dev/null differ diff --git a/pic/ymon/tangela.png b/pic/ymon/tangela.png deleted file mode 100644 index 43d04726..00000000 Binary files a/pic/ymon/tangela.png and /dev/null differ diff --git a/pic/ymon/tauros.png b/pic/ymon/tauros.png deleted file mode 100644 index 8086fd13..00000000 Binary files a/pic/ymon/tauros.png and /dev/null differ diff --git a/pic/ymon/tentacool.png b/pic/ymon/tentacool.png deleted file mode 100644 index 88d7fde3..00000000 Binary files a/pic/ymon/tentacool.png and /dev/null differ diff --git a/pic/ymon/tentacruel.png b/pic/ymon/tentacruel.png deleted file mode 100644 index 47383372..00000000 Binary files a/pic/ymon/tentacruel.png and /dev/null differ diff --git a/pic/ymon/vaporeon.png b/pic/ymon/vaporeon.png deleted file mode 100644 index 2c35af22..00000000 Binary files a/pic/ymon/vaporeon.png and /dev/null differ diff --git a/pic/ymon/venomoth.png b/pic/ymon/venomoth.png deleted file mode 100644 index 9d801497..00000000 Binary files a/pic/ymon/venomoth.png and /dev/null differ diff --git a/pic/ymon/venonat.png b/pic/ymon/venonat.png deleted file mode 100644 index 574ed26b..00000000 Binary files a/pic/ymon/venonat.png and /dev/null differ diff --git a/pic/ymon/venusaur.png b/pic/ymon/venusaur.png deleted file mode 100644 index f6a964e3..00000000 Binary files a/pic/ymon/venusaur.png and /dev/null differ diff --git a/pic/ymon/victreebel.png b/pic/ymon/victreebel.png deleted file mode 100644 index 115c45a3..00000000 Binary files a/pic/ymon/victreebel.png and /dev/null differ diff --git a/pic/ymon/vileplume.png b/pic/ymon/vileplume.png deleted file mode 100644 index af4f0862..00000000 Binary files a/pic/ymon/vileplume.png and /dev/null differ diff --git a/pic/ymon/voltorb.png b/pic/ymon/voltorb.png deleted file mode 100644 index 8b4bc64d..00000000 Binary files a/pic/ymon/voltorb.png and /dev/null differ diff --git a/pic/ymon/vulpix.png b/pic/ymon/vulpix.png deleted file mode 100644 index cef8fbd8..00000000 Binary files a/pic/ymon/vulpix.png and /dev/null differ diff --git a/pic/ymon/wartortle.png b/pic/ymon/wartortle.png deleted file mode 100644 index 961aaf4f..00000000 Binary files a/pic/ymon/wartortle.png and /dev/null differ diff --git a/pic/ymon/weedle.png b/pic/ymon/weedle.png deleted file mode 100644 index 989b57b5..00000000 Binary files a/pic/ymon/weedle.png and /dev/null differ diff --git a/pic/ymon/weepinbell.png b/pic/ymon/weepinbell.png deleted file mode 100644 index 8dd8fc34..00000000 Binary files a/pic/ymon/weepinbell.png and /dev/null differ diff --git a/pic/ymon/weezing.png b/pic/ymon/weezing.png deleted file mode 100644 index 445556b3..00000000 Binary files a/pic/ymon/weezing.png and /dev/null differ diff --git a/pic/ymon/wigglytuff.png b/pic/ymon/wigglytuff.png deleted file mode 100644 index c9ae89ad..00000000 Binary files a/pic/ymon/wigglytuff.png and /dev/null differ diff --git a/pic/ymon/zapdos.png b/pic/ymon/zapdos.png deleted file mode 100644 index 47b63d6a..00000000 Binary files a/pic/ymon/zapdos.png and /dev/null differ diff --git a/pic/ymon/zubat.png b/pic/ymon/zubat.png deleted file mode 100644 index 86ac4710..00000000 Binary files a/pic/ymon/zubat.png and /dev/null differ diff --git a/pic/ytrainer/brock.png b/pic/ytrainer/brock.png deleted file mode 100644 index 8b33e8b9..00000000 Binary files a/pic/ytrainer/brock.png and /dev/null differ diff --git a/pic/ytrainer/erika.png b/pic/ytrainer/erika.png deleted file mode 100644 index 446ed6aa..00000000 Binary files a/pic/ytrainer/erika.png and /dev/null differ diff --git a/pic/ytrainer/jessiejames.png b/pic/ytrainer/jessiejames.png deleted file mode 100644 index 764e5af4..00000000 Binary files a/pic/ytrainer/jessiejames.png and /dev/null differ diff --git a/pic/ytrainer/misty.png b/pic/ytrainer/misty.png deleted file mode 100644 index a7fdd6bc..00000000 Binary files a/pic/ytrainer/misty.png and /dev/null differ diff --git a/pic/ytrainer/prof.oakb.png b/pic/ytrainer/prof.oakb.png deleted file mode 100644 index fb96bbf9..00000000 Binary files a/pic/ytrainer/prof.oakb.png and /dev/null differ diff --git a/pic/ytrainer/red.png b/pic/ytrainer/red.png deleted file mode 100644 index dff68167..00000000 Binary files a/pic/ytrainer/red.png and /dev/null differ diff --git a/pic/ytrainer/rival1.png b/pic/ytrainer/rival1.png deleted file mode 100644 index 4a0ba97c..00000000 Binary files a/pic/ytrainer/rival1.png and /dev/null differ diff --git a/pic/ytrainer/rival2.png b/pic/ytrainer/rival2.png deleted file mode 100644 index e8718589..00000000 Binary files a/pic/ytrainer/rival2.png and /dev/null differ diff --git a/pic/ytrainer/rival3.png b/pic/ytrainer/rival3.png deleted file mode 100644 index 08e22813..00000000 Binary files a/pic/ytrainer/rival3.png and /dev/null differ diff --git a/pokered.link b/pokered.link deleted file mode 100644 index 32582e6f..00000000 --- a/pokered.link +++ /dev/null @@ -1,273 +0,0 @@ -ROM0 - org $0000 - "rst 00" - - org $0008 - "rst 08" - - org $0010 - "rst 10" - - org $0018 - "rst 18" - - org $0020 - "rst 20" - - org $0028 - "rst 28" - - org $0030 - "rst 30" - - org $0038 - "rst 38" - - org $0040 - "vblank" - - org $0048 - "hblank" - - org $0050 - "timer" - - org $0058 - "serial" - - org $0060 - "joypad" - ; $0061 - "Home" - - org $100 - "Entry" - ; $0104 - "Header" - - org $150 - "Main" - -ROMX $1 - org $4000 - "bank1" - -ROMX $2 - org $4000 - "Sound Effect Headers 1" ; AUDIO_1 -; "Music Headers 1" - "Sound Effects 1" - "Audio Engine 1" -; "Music 1" - -ROMX $3 - org $4000 - "bank3" - -ROMX $4 - org $4000 - "NPC Sprites 1" ; NPC_SPRITES_1 - "Graphics (BANK 4)" ; GFX - "Battle (BANK 4)" - -ROMX $5 - org $4000 - "NPC Sprites 2" ; NPC_SPRITES_2 - "Battle (BANK 5)" - -ROMX $6 - org $4000 - "bank6" - -ROMX $7 - org $4000 - "bank7" - -ROMX $8 - org $4000 - "Sound Effect Headers 2" ; AUDIO_2 -; "Music Headers 2" - "Sound Effects 2" -; "Audio Engine 2" -; "Music 2" - -ROMX $9 - org $4000 - "Pics 1" ; PICS_1 - "Battle (BANK 9)" - -ROMX $A - org $4000 - "Pics 2" ; PICS_2 - "Battle (BANK A)" - -ROMX $B - org $4000 - "Pics 3" ; PICS_3 - "Battle (BANK B)" - -ROMX $C - org $4000 - "Pics 4" ; PICS_4 - "Battle (BANK C)" - -ROMX $D - org $4000 - "Pics 5" ; PICS_5 - "Battle (BANK D)" - -ROMX $E - org $4000 - "bankE" - -ROMX $F - org $4000 - "bankF" - -ROMX $10 - org $4000 - "bank10" - -ROMX $11 - org $4000 - "bank11" - -ROMX $12 - org $4000 - "bank12" - -ROMX $13 - org $4000 - "bank13" - -ROMX $14 - org $4000 - "bank14" - -ROMX $15 - org $4000 - "bank15" - -ROMX $16 - org $4000 - "bank16" - -ROMX $17 - org $4000 - "bank17" - -ROMX $18 - org $4000 - "bank18" - -ROMX $19 - org $4000 - "bank19" - -ROMX $1A - org $4000 - "bank1A" - -ROMX $1B - org $4000 - "bank1B" - -ROMX $1C - org $4000 - "bank1C" - -ROMX $1D - org $4000 - "bank1D" - -ROMX $1E - org $4000 - "bank1E" - -ROMX $1F - org $4000 - "Sound Effect Headers 3" ; AUDIO_3 -; "Music Headers 3" - "Sound Effects 3" -; "Audio Engine 3" -; "Music 3" - -ROMX $20 - org $4000 - "Text 1" ; TEXT_1 - -ROMX $21 - org $4000 - "Text 2" ; TEXT_2 - -ROMX $22 - org $4000 - "Text 3" ; TEXT_3 - -ROMX $23 - org $4000 - "Text 4" ; TEXT_4 - -ROMX $24 - org $4000 - "Text 5" ; TEXT_5 - -ROMX $25 - org $4000 - "Text 6" ; TEXT_6 - -ROMX $26 - org $4000 - "Text 7" ; TEXT_7 - -ROMX $27 - org $4000 - "Text 8" ; TEXT_8 - -ROMX $28 - org $4000 - "Text 9" ; TEXT_9 - -ROMX $29 - org $4000 - "Text 10" ; TEXT_10 - -ROMX $2A - org $4000 - "Text 11" ; TEXT_11 - -ROMX $2B - org $4000 - "Pokedex Text" ; POKEDEX_TEXT - -ROMX $2C - org $4000 - "Move Names" ; MOVE_NAMES - -WRAM0 - org $c000 - "WRAM Bank 0" - - org $c100 - "Sprite State Data" - "OAM Buffer" - - org $dfff - "Stack" - -SRAM 0 - org $a000 - "Sprite Buffers" - -SRAM 1 - org $a000 - "Save Data" - -SRAM 2 - org $a000 - "Saved Boxes 1" - -SRAM 3 - org $a000 - "Saved Boxes 2" - diff --git a/rgbdscheck.asm b/rgbdscheck.asm new file mode 100644 index 00000000..63df3575 --- /dev/null +++ b/rgbdscheck.asm @@ -0,0 +1,14 @@ +; pokered requires rgbds 0.4.2 or newer. +MAJOR EQU 0 +MINOR EQU 4 +PATCH EQU 2 + +IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) + fail "pokered requires rgbds 0.4.2 or newer." +ELSE +IF (__RGBDS_MAJOR__ < MAJOR) || \ + (__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ < MINOR) || \ + (__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ == MINOR && __RGBDS_PATCH__ < PATCH) + fail "pokered requires rgbds 0.4.2 or newer." +ENDC +ENDC diff --git a/roms.md5 b/roms.md5 deleted file mode 100644 index c4128cfd..00000000 --- a/roms.md5 +++ /dev/null @@ -1,2 +0,0 @@ -3d45c1ee9abd5738df46d2bdda8b57dc pokered.gbc -50927e843568814f7ed45ec4f944bd8b pokeblue.gbc diff --git a/roms.sha1 b/roms.sha1 new file mode 100644 index 00000000..44e94aaf --- /dev/null +++ b/roms.sha1 @@ -0,0 +1,3 @@ +ea9bcae617fdf159b045185467ae58b2e4a48b9a *pokered.gbc +d7037c83e1ae5b39bde3c30787637ba1d4c48ce2 *pokeblue.gbc +5b1456177671b79b263c614ea0e7cc9ac542e9c4 *pokeblue_debug.gbc diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm old mode 100755 new mode 100644 index a1dba196..3c5740e9 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -20,7 +20,7 @@ AgathaShowOrHideExitBlock: jp .setExitBlock .blockExitToNextRoom ld a, $3b -.setExitBlock: +.setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock @@ -63,8 +63,8 @@ AgathaScript0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyPressed], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] @@ -74,7 +74,7 @@ AgathaScript0: jr z, AgathaScriptWalkIntoRoom .stopPlayerFromLeaving ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -87,11 +87,11 @@ AgathaScript0: ret AgathaEntranceCoords: - db $0A,$04 - db $0A,$05 - db $0B,$04 - db $0B,$05 - db $FF + dbmapcoord 4, 10 + dbmapcoord 5, 10 + dbmapcoord 4, 11 + dbmapcoord 5, 11 + db -1 ; end AgathaScript3: ld a, [wSimulatedJoypadStatesIndex] @@ -110,7 +110,7 @@ AgathaScript2: cp $ff jp z, ResetAgathaScript ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wChampionsRoomCurScript], a @@ -121,34 +121,27 @@ AgathasRoom_TextPointers: dw AgathaDontRunAwayText AgathaTrainerHeader0: - dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - dw AgathaBeforeBattleText ; TextBeforeBattle - dw AgathaAfterBattleText ; TextAfterBattle - dw AgathaEndBattleText ; TextEndBattle - dw AgathaEndBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_AGATHAS_ROOM_TRAINER_0, 0, AgathaBeforeBattleText, AgathaEndBattleText, AgathaAfterBattleText + db -1 ; end AgathaText1: - TX_ASM + text_asm ld hl, AgathaTrainerHeader0 call TalkToTrainer jp TextScriptEnd AgathaBeforeBattleText: - TX_FAR _AgathaBeforeBattleText - db "@" + text_far _AgathaBeforeBattleText + text_end AgathaEndBattleText: - TX_FAR _AgathaEndBattleText - db "@" + text_far _AgathaEndBattleText + text_end AgathaAfterBattleText: - TX_FAR _AgathaAfterBattleText - db "@" + text_far _AgathaAfterBattleText + text_end AgathaDontRunAwayText: - TX_FAR _AgathaDontRunAwayText - db "@" + text_far _AgathaDontRunAwayText + text_end diff --git a/scripts/BikeShop.asm b/scripts/BikeShop.asm old mode 100755 new mode 100644 index 71149759..f5f0539e --- a/scripts/BikeShop.asm +++ b/scripts/BikeShop.asm @@ -7,7 +7,7 @@ BikeShop_TextPointers: dw BikeShopText3 BikeShopText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_BICYCLE jr z, .asm_260d4 ld hl, BikeShopText_1d82f @@ -23,8 +23,8 @@ BikeShopText1: call GiveItem jr nc, .BagFull ld a, BIKE_VOUCHER - ld [$ffdb], a - callba RemoveItemByID + ldh [hItemToRemoveID], a + farcall RemoveItemByID SetEvent EVENT_GOT_BICYCLE ld hl, BikeShopText_1d824 call PrintText @@ -49,21 +49,21 @@ BikeShopText1: ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] - coord hl, 0, 0 - ld b, $4 - ld c, $f + hlcoord 0, 0 + ld b, 4 + ld c, 15 call TextBoxBorder call UpdateSprites - coord hl, 2, 2 + hlcoord 2, 2 ld de, BikeShopMenuText call PlaceString - coord hl, 8, 3 + hlcoord 8, 3 ld de, BikeShopMenuPrice call PlaceString ld hl, BikeShopText_1d815 call PrintText call HandleMenuInput - bit 1, a + bit BIT_B_BUTTON, a jr nz, .cancel ld hl, wd730 res 6, [hl] @@ -86,50 +86,50 @@ BikeShopMenuPrice: db "¥1000000@" BikeShopText_1d810: - TX_FAR _BikeShopText_1d810 - db "@" + text_far _BikeShopText_1d810 + text_end BikeShopText_1d815: - TX_FAR _BikeShopText_1d815 - db "@" + text_far _BikeShopText_1d815 + text_end BikeShopCantAffordText: - TX_FAR _BikeShopCantAffordText - db "@" + text_far _BikeShopCantAffordText + text_end BikeShopText_1d81f: - TX_FAR _BikeShopText_1d81f - db "@" + text_far _BikeShopText_1d81f + text_end BikeShopText_1d824: - TX_FAR _BikeShopText_1d824 - TX_SFX_KEY_ITEM - db "@" + text_far _BikeShopText_1d824 + sound_get_key_item + text_end BikeShopComeAgainText: - TX_FAR _BikeShopComeAgainText - db "@" + text_far _BikeShopComeAgainText + text_end BikeShopText_1d82f: - TX_FAR _BikeShopText_1d82f - db "@" + text_far _BikeShopText_1d82f + text_end BikeShopText_1d834: - TX_FAR _BikeShopText_1d834 - db "@" + text_far _BikeShopText_1d834 + text_end BikeShopText2: - TX_ASM + text_asm ld hl, BikeShopText_1d843 call PrintText jp TextScriptEnd BikeShopText_1d843: - TX_FAR _BikeShopText_1d843 - db "@" + text_far _BikeShopText_1d843 + text_end BikeShopText3: - TX_ASM + text_asm CheckEvent EVENT_GOT_BICYCLE ld hl, BikeShopText_1d861 jr nz, .asm_34d2d @@ -139,9 +139,9 @@ BikeShopText3: jp TextScriptEnd BikeShopText_1d85c: - TX_FAR _BikeShopText_1d85c - db "@" + text_far _BikeShopText_1d85c + text_end BikeShopText_1d861: - TX_FAR _BikeShopText_1d861 - db "@" + text_far _BikeShopText_1d861 + text_end diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm old mode 100755 new mode 100644 index 74efc960..2085f417 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -16,14 +16,14 @@ BillsHouseScript0: ret BillsHouseScript1: - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN ld de, MovementData_1e79c jr nz, .notDown ld de, MovementData_1e7a0 .notDown ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $2 ld [wBillsHouseCurScript], a @@ -33,7 +33,7 @@ MovementData_1e79c: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP - db $FF + db -1 ; end ; make Bill walk around the player MovementData_1e7a0: @@ -42,7 +42,7 @@ MovementData_1e7a0: db NPC_MOVEMENT_UP db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_UP - db $FF + db -1 ; end BillsHouseScript2: ld a, [wd730] @@ -66,13 +66,13 @@ BillsHouseScript3: ld a, $2 ld [wSpriteIndex], a ld a, $c - ld [$ffeb], a + ldh [hSpriteScreenYCoord], a ld a, $40 - ld [$ffec], a - ld a, $6 - ld [$ffed], a - ld a, $5 - ld [$ffee], a + ldh [hSpriteScreenXCoord], a + ld a, 6 + ldh [hSpriteMapYCoord], a + ld a, 5 + ldh [hSpriteMapXCoord], a call SetSpritePosition1 ld a, HS_BILL_1 ld [wMissableObjectIndex], a @@ -80,7 +80,7 @@ BillsHouseScript3: ld c, 8 call DelayFrames ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, MovementData_1e807 call MoveSprite ld a, $4 @@ -93,7 +93,7 @@ MovementData_1e807: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end BillsHouseScript4: ld a, [wd730] @@ -109,7 +109,7 @@ BillsHouseScript4: BillsHouseScript5: ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $0 ld [wBillsHouseCurScript], a @@ -122,10 +122,10 @@ BillsHouse_TextPointers: dw BillsHouseText4 BillsHouseText4: - TX_BILLS_PC + script_bills_pc BillsHouseText1: - TX_ASM + text_asm ld hl, BillsHouseText_1e865 call PrintText call YesNoChoice @@ -146,19 +146,19 @@ BillsHouseText1: jp TextScriptEnd BillsHouseText_1e865: - TX_FAR _BillsHouseText_1e865 - db "@" + text_far _BillsHouseText_1e865 + text_end BillsHouseText_1e86a: - TX_FAR _BillsHouseText_1e86a - db "@" + text_far _BillsHouseText_1e86a + text_end BillsHouseText_1e86f: - TX_FAR _BillsHouseText_1e86f - db "@" + text_far _BillsHouseText_1e86f + text_end BillsHouseText2: - TX_ASM + text_asm CheckEvent EVENT_GOT_SS_TICKET jr nz, .asm_1e8a9 ld hl, BillThankYouText @@ -186,29 +186,29 @@ BillsHouseText2: jp TextScriptEnd BillThankYouText: - TX_FAR _BillThankYouText - db "@" + text_far _BillThankYouText + text_end SSTicketReceivedText: - TX_FAR _SSTicketReceivedText - TX_SFX_KEY_ITEM - TX_BLINK - db "@" + text_far _SSTicketReceivedText + sound_get_key_item + text_promptbutton + text_end SSTicketNoRoomText: - TX_FAR _SSTicketNoRoomText - db "@" + text_far _SSTicketNoRoomText + text_end BillsHouseText_1e8cb: - TX_FAR _BillsHouseText_1e8cb - db "@" + text_far _BillsHouseText_1e8cb + text_end BillsHouseText3: - TX_ASM + text_asm ld hl, BillsHouseText_1e8da call PrintText jp TextScriptEnd BillsHouseText_1e8da: - TX_FAR _BillsHouseText_1e8da - db "@" + text_far _BillsHouseText_1e8da + text_end diff --git a/scripts/BluesHouse.asm b/scripts/BluesHouse.asm old mode 100755 new mode 100644 index f325049f..1ab0fd06 --- a/scripts/BluesHouse.asm +++ b/scripts/BluesHouse.asm @@ -10,9 +10,7 @@ BluesHouse_ScriptPointers: BluesHouseScript0: SetEvent EVENT_ENTERED_BLUES_HOUSE - - ; trigger the next script - ld a, 1 + ld a, $1 ld [wBluesHouseCurScript], a ret @@ -20,70 +18,70 @@ BluesHouseScript1: ret BluesHouse_TextPointers: - dw BluesHouseText1 - dw BluesHouseText2 - dw BluesHouseText3 + dw BluesHouseDaisySittingText + dw BluesHouseDaisyWalkingText + dw BluesHouseTownMapText -BluesHouseText1: - TX_ASM +BluesHouseDaisySittingText: + text_asm CheckEvent EVENT_GOT_TOWN_MAP - jr nz, .GotMap + jr nz, .got_town_map CheckEvent EVENT_GOT_POKEDEX - jr nz, .GiveMap + jr nz, .give_town_map ld hl, DaisyInitialText call PrintText jr .done -.GiveMap +.give_town_map ld hl, DaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld a, HS_TOWN_MAP ld [wMissableObjectIndex], a - predef HideObject ; hide table map object + predef HideObject ld hl, GotMapText call PrintText SetEvent EVENT_GOT_TOWN_MAP jr .done -.GotMap +.got_town_map ld hl, DaisyUseMapText call PrintText jr .done -.BagFull +.bag_full ld hl, DaisyBagFullText call PrintText .done jp TextScriptEnd DaisyInitialText: - TX_FAR _DaisyInitialText - db "@" + text_far _DaisyInitialText + text_end DaisyOfferMapText: - TX_FAR _DaisyOfferMapText - db "@" + text_far _DaisyOfferMapText + text_end GotMapText: - TX_FAR _GotMapText - TX_SFX_KEY_ITEM - db "@" + text_far _GotMapText + sound_get_key_item + text_end DaisyBagFullText: - TX_FAR _DaisyBagFullText - db "@" + text_far _DaisyBagFullText + text_end DaisyUseMapText: - TX_FAR _DaisyUseMapText - db "@" + text_far _DaisyUseMapText + text_end -BluesHouseText2: ; Daisy, walking around - TX_FAR _BluesHouseText2 - db "@" +BluesHouseDaisyWalkingText: + text_far _BluesHouseDaisyWalkingText + text_end -BluesHouseText3: ; map on table - TX_FAR _BluesHouseText3 - db "@" +BluesHouseTownMapText: + text_far _BluesHouseTownMapText + text_end diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm old mode 100755 new mode 100644 index 3b6385b7..578cbb98 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -63,8 +63,8 @@ BrunoScript0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyPressed], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] @@ -74,7 +74,7 @@ BrunoScript0: jr z, BrunoScriptWalkIntoRoom .stopPlayerFromLeaving ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -87,11 +87,11 @@ BrunoScript0: ret BrunoEntranceCoords: - db $0A,$04 - db $0A,$05 - db $0B,$04 - db $0B,$05 - db $FF + dbmapcoord 4, 10 + dbmapcoord 5, 10 + dbmapcoord 4, 11 + dbmapcoord 5, 11 + db -1 ; end BrunoScript3: ld a, [wSimulatedJoypadStatesIndex] @@ -110,7 +110,7 @@ BrunoScript2: cp $ff jp z, ResetBrunoScript ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID BrunosRoom_TextPointers: @@ -118,34 +118,27 @@ BrunosRoom_TextPointers: dw BrunoDontRunAwayText BrunoTrainerHeader0: - dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - dw BrunoBeforeBattleText ; TextBeforeBattle - dw BrunoAfterBattleText ; TextAfterBattle - dw BrunoEndBattleText ; TextEndBattle - dw BrunoEndBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_BRUNOS_ROOM_TRAINER_0, 0, BrunoBeforeBattleText, BrunoEndBattleText, BrunoAfterBattleText + db -1 ; end BrunoText1: - TX_ASM + text_asm ld hl, BrunoTrainerHeader0 call TalkToTrainer jp TextScriptEnd BrunoBeforeBattleText: - TX_FAR _BrunoBeforeBattleText - db "@" + text_far _BrunoBeforeBattleText + text_end BrunoEndBattleText: - TX_FAR _BrunoEndBattleText - db "@" + text_far _BrunoEndBattleText + text_end BrunoAfterBattleText: - TX_FAR _BrunoAfterBattleText - db "@" + text_far _BrunoAfterBattleText + text_end BrunoDontRunAwayText: - TX_FAR _BrunoDontRunAwayText - db "@" + text_far _BrunoDontRunAwayText + text_end diff --git a/scripts/CeladonChiefHouse.asm b/scripts/CeladonChiefHouse.asm old mode 100755 new mode 100644 index fc37bd4d..ad604b98 --- a/scripts/CeladonChiefHouse.asm +++ b/scripts/CeladonChiefHouse.asm @@ -8,13 +8,13 @@ CeladonChiefHouse_TextPointers: dw CeladonHouseText3 CeladonHouseText1: - TX_FAR _CeladonHouseText1 - db "@" + text_far _CeladonHouseText1 + text_end CeladonHouseText2: - TX_FAR _CeladonHouseText2 - db "@" + text_far _CeladonHouseText2 + text_end CeladonHouseText3: - TX_FAR _CeladonHouseText3 - db "@" + text_far _CeladonHouseText3 + text_end diff --git a/scripts/CeladonCity.asm b/scripts/CeladonCity.asm old mode 100755 new mode 100644 index e2d7d371..bd0228d8 --- a/scripts/CeladonCity.asm +++ b/scripts/CeladonCity.asm @@ -25,28 +25,28 @@ CeladonCity_TextPointers: dw CeladonCityText18 CeladonCityText1: - TX_FAR _CeladonCityText1 - db "@" + text_far _CeladonCityText1 + text_end CeladonCityText2: - TX_FAR _CeladonCityText2 - db "@" + text_far _CeladonCityText2 + text_end CeladonCityText3: - TX_FAR _CeladonCityText3 - db "@" + text_far _CeladonCityText3 + text_end CeladonCityText4: - TX_FAR _CeladonCityText4 - db "@" + text_far _CeladonCityText4 + text_end CeladonCityText5: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM41 jr nz, .asm_7053f ld hl, TM41PreText call PrintText - lb bc, TM_41, 1 + lb bc, TM_SOFTBOILED, 1 call GiveItem jr c, .Success ld hl, TM41NoRoomText @@ -64,69 +64,69 @@ CeladonCityText5: jp TextScriptEnd TM41PreText: - TX_FAR _TM41PreText - db "@" + text_far _TM41PreText + text_end ReceivedTM41Text: - TX_FAR _ReceivedTM41Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM41Text + sound_get_item_1 + text_end TM41ExplanationText: - TX_FAR _TM41ExplanationText - db "@" + text_far _TM41ExplanationText + text_end TM41NoRoomText: - TX_FAR _TM41NoRoomText - db "@" + text_far _TM41NoRoomText + text_end CeladonCityText6: - TX_FAR _CeladonCityText6 - db "@" + text_far _CeladonCityText6 + text_end CeladonCityText7: - TX_FAR _CeladonCityText7 - TX_ASM + text_far _CeladonCityText7 + text_asm ld a, POLIWRATH call PlayCry jp TextScriptEnd CeladonCityText8: - TX_FAR _CeladonCityText8 - db "@" + text_far _CeladonCityText8 + text_end CeladonCityText9: - TX_FAR _CeladonCityText9 - db "@" + text_far _CeladonCityText9 + text_end CeladonCityText10: - TX_FAR _CeladonCityText10 - db "@" + text_far _CeladonCityText10 + text_end CeladonCityText11: - TX_FAR _CeladonCityText11 - db "@" + text_far _CeladonCityText11 + text_end CeladonCityText13: - TX_FAR _CeladonCityText13 - db "@" + text_far _CeladonCityText13 + text_end CeladonCityText14: - TX_FAR _CeladonCityText14 - db "@" + text_far _CeladonCityText14 + text_end CeladonCityText15: - TX_FAR _CeladonCityText15 - db "@" + text_far _CeladonCityText15 + text_end CeladonCityText16: - TX_FAR _CeladonCityText16 - db "@" + text_far _CeladonCityText16 + text_end CeladonCityText17: - TX_FAR _CeladonCityText17 - db "@" + text_far _CeladonCityText17 + text_end CeladonCityText18: - TX_FAR _CeladonCityText18 - db "@" + text_far _CeladonCityText18 + text_end diff --git a/scripts/CeladonDiner.asm b/scripts/CeladonDiner.asm old mode 100755 new mode 100644 index 371205de..e95035f0 --- a/scripts/CeladonDiner.asm +++ b/scripts/CeladonDiner.asm @@ -10,57 +10,57 @@ CeladonDiner_TextPointers: dw CeladonDinerText5 CeladonDinerText1: - TX_FAR _CeladonDinerText1 - db "@" + text_far _CeladonDinerText1 + text_end CeladonDinerText2: - TX_FAR _CeladonDinerText2 - db "@" + text_far _CeladonDinerText2 + text_end CeladonDinerText3: - TX_FAR _CeladonDinerText3 - db "@" + text_far _CeladonDinerText3 + text_end CeladonDinerText4: - TX_FAR _CeladonDinerText4 - db "@" + text_far _CeladonDinerText4 + text_end CeladonDinerText5: - TX_ASM + text_asm CheckEvent EVENT_GOT_COIN_CASE - jr nz, .asm_eb14d + jr nz, .got_item ld hl, CeladonDinerText_491a7 call PrintText lb bc, COIN_CASE, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full SetEvent EVENT_GOT_COIN_CASE ld hl, ReceivedCoinCaseText call PrintText - jr .asm_68b61 -.BagFull + jr .done +.bag_full ld hl, CoinCaseNoRoomText call PrintText - jr .asm_68b61 -.asm_eb14d + jr .done +.got_item ld hl, CeladonDinerText_491b7 call PrintText -.asm_68b61 +.done jp TextScriptEnd CeladonDinerText_491a7: - TX_FAR _CeladonDinerText_491a7 - db "@" + text_far _CeladonDinerText_491a7 + text_end ReceivedCoinCaseText: - TX_FAR _ReceivedCoinCaseText - TX_SFX_KEY_ITEM - db "@" + text_far _ReceivedCoinCaseText + sound_get_key_item + text_end CoinCaseNoRoomText: - TX_FAR _CoinCaseNoRoomText - db "@" + text_far _CoinCaseNoRoomText + text_end CeladonDinerText_491b7: - TX_FAR _CeladonDinerText_491b7 - db "@" + text_far _CeladonDinerText_491b7 + text_end diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm old mode 100755 new mode 100644 index 8ceb36ee..2b695819 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -2,7 +2,7 @@ CeladonGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] - call nz, CeladonGymScript_48927 + call nz, .LoadNames call EnableAutoTextBoxDrawing ld hl, CeladonGymTrainerHeader0 ld de, CeladonGym_ScriptPointers @@ -11,15 +11,15 @@ CeladonGym_Script: ld [wCeladonGymCurScript], a ret -CeladonGymScript_48927: - ld hl, Gym4CityName - ld de, Gym4LeaderName +.LoadNames: + ld hl, .CityName + ld de, .LeaderName jp LoadGymLeaderAndCityName -Gym4CityName: +.CityName: db "CELADON CITY@" -Gym4LeaderName: +.LeaderName: db "ERIKA@" CeladonGymText_48943: @@ -44,26 +44,26 @@ CeladonGymScript3: CeladonGymText_48963: ld a, $9 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_ERIKA - lb bc, TM_21, 1 + lb bc, TM_MEGA_DRAIN, 1 call GiveItem jr nc, .BagFull ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM21 - jr .asm_4898c + jr .gymVictory .BagFull ld a, $b - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_4898c +.gymVictory ld hl, wObtainedBadges - set 3, [hl] + set BIT_RAINBOWBADGE, [hl] ld hl, wBeatGymFlags - set 3, [hl] + set BIT_RAINBOWBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6 @@ -84,84 +84,35 @@ CeladonGym_TextPointers: dw TM21NoRoomText CeladonGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_0 - dw CeladonGymBattleText2 ; TextBeforeBattle - dw CeladonGymAfterBattleText2 ; TextAfterBattle - dw CeladonGymEndBattleText2 ; TextEndBattle - dw CeladonGymEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_CELADON_GYM_TRAINER_0, 2, CeladonGymBattleText2, CeladonGymEndBattleText2, CeladonGymAfterBattleText2 CeladonGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1 - dw CeladonGymBattleText3 ; TextBeforeBattle - dw CeladonGymAfterBattleText3 ; TextAfterBattle - dw CeladonGymEndBattleText3 ; TextEndBattle - dw CeladonGymEndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_CELADON_GYM_TRAINER_1, 2, CeladonGymBattleText3, CeladonGymEndBattleText3, CeladonGymAfterBattleText3 CeladonGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 - dw CeladonGymBattleText4 ; TextBeforeBattle - dw CeladonGymAfterBattleText4 ; TextAfterBattle - dw CeladonGymEndBattleText4 ; TextEndBattle - dw CeladonGymEndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_CELADON_GYM_TRAINER_2, 4, CeladonGymBattleText4, CeladonGymEndBattleText4, CeladonGymAfterBattleText4 CeladonGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 - dw CeladonGymBattleText5 ; TextBeforeBattle - dw CeladonGymAfterBattleText5 ; TextAfterBattle - dw CeladonGymEndBattleText5 ; TextEndBattle - dw CeladonGymEndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_CELADON_GYM_TRAINER_3, 4, CeladonGymBattleText5, CeladonGymEndBattleText5, CeladonGymAfterBattleText5 CeladonGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 - dw CeladonGymBattleText6 ; TextBeforeBattle - dw CeladonGymAfterBattleText6 ; TextAfterBattle - dw CeladonGymEndBattleText6 ; TextEndBattle - dw CeladonGymEndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_CELADON_GYM_TRAINER_4, 2, CeladonGymBattleText6, CeladonGymEndBattleText6, CeladonGymAfterBattleText6 CeladonGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 - dw CeladonGymBattleText7 ; TextBeforeBattle - dw CeladonGymAfterBattleText7 ; TextAfterBattle - dw CeladonGymEndBattleText7 ; TextEndBattle - dw CeladonGymEndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_CELADON_GYM_TRAINER_5, 2, CeladonGymBattleText7, CeladonGymEndBattleText7, CeladonGymAfterBattleText7 CeladonGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1 - dw CeladonGymBattleText8 ; TextBeforeBattle - dw CeladonGymAfterBattleText8 ; TextAfterBattle - dw CeladonGymEndBattleText8 ; TextEndBattle - dw CeladonGymEndBattleText8 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_CELADON_GYM_TRAINER_6, 1, 3, CeladonGymBattleText8, CeladonGymEndBattleText8, CeladonGymAfterBattleText8 + db -1 ; end CeladonGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_ERIKA - jr z, .asm_48a2d + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM21 - jr nz, .asm_48a25 + jr nz, .afterVictory call z, CeladonGymText_48963 call DisableWaitingAfterTextDisplay - jr .asm_48a5b -.asm_48a25 + jr .done +.afterVictory ld hl, CeladonGymText_48a68 call PrintText - jr .asm_48a5b -.asm_48a2d + jr .done +.beginBattle ld hl, CeladonGymText_48a5e call PrintText ld hl, wd72d @@ -170,7 +121,7 @@ CeladonGymText1: ld hl, CeladonGymText_48a63 ld de, CeladonGymText_48a63 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -179,157 +130,157 @@ CeladonGymText1: ld a, $3 ld [wCeladonGymCurScript], a ld [wCurMapScript], a -.asm_48a5b +.done jp TextScriptEnd CeladonGymText_48a5e: - TX_FAR _CeladonGymText_48a5e - db "@" + text_far _CeladonGymText_48a5e + text_end CeladonGymText_48a63: - TX_FAR _CeladonGymText_48a63 - db "@" + text_far _CeladonGymText_48a63 + text_end CeladonGymText_48a68: - TX_FAR _CeladonGymText_48a68 - db "@" + text_far _CeladonGymText_48a68 + text_end CeladonGymText9: - TX_FAR _CeladonGymText9 - db "@" + text_far _CeladonGymText9 + text_end TM21Text: - TX_FAR _ReceivedTM21Text - TX_SFX_ITEM_1 - TX_FAR _TM21ExplanationText - db "@" + text_far _ReceivedTM21Text + sound_get_item_1 + text_far _TM21ExplanationText + text_end TM21NoRoomText: - TX_FAR _TM21NoRoomText - db "@" + text_far _TM21NoRoomText + text_end CeladonGymText2: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText2: - TX_FAR _CeladonGymBattleText2 - db "@" + text_far _CeladonGymBattleText2 + text_end CeladonGymEndBattleText2: - TX_FAR _CeladonGymEndBattleText2 - db "@" + text_far _CeladonGymEndBattleText2 + text_end CeladonGymAfterBattleText2: - TX_FAR _CeladonGymAfterBattleText2 - db "@" + text_far _CeladonGymAfterBattleText2 + text_end CeladonGymText3: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText3: - TX_FAR _CeladonGymBattleText3 - db "@" + text_far _CeladonGymBattleText3 + text_end CeladonGymEndBattleText3: - TX_FAR _CeladonGymEndBattleText3 - db "@" + text_far _CeladonGymEndBattleText3 + text_end CeladonGymAfterBattleText3: - TX_FAR _CeladonGymAfterBattleText3 - db "@" + text_far _CeladonGymAfterBattleText3 + text_end CeladonGymText4: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText4: - TX_FAR _CeladonGymBattleText4 - db "@" + text_far _CeladonGymBattleText4 + text_end CeladonGymEndBattleText4: - TX_FAR _CeladonGymEndBattleText4 - db "@" + text_far _CeladonGymEndBattleText4 + text_end CeladonGymAfterBattleText4: - TX_FAR _CeladonGymAfterBattleText4 - db "@" + text_far _CeladonGymAfterBattleText4 + text_end CeladonGymText5: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText5: - TX_FAR _CeladonGymBattleText5 - db "@" + text_far _CeladonGymBattleText5 + text_end CeladonGymEndBattleText5: - TX_FAR _CeladonGymEndBattleText5 - db "@" + text_far _CeladonGymEndBattleText5 + text_end CeladonGymAfterBattleText5: - TX_FAR _CeladonGymAfterBattleText5 - db "@" + text_far _CeladonGymAfterBattleText5 + text_end CeladonGymText6: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText6: - TX_FAR _CeladonGymBattleText6 - db "@" + text_far _CeladonGymBattleText6 + text_end CeladonGymEndBattleText6: - TX_FAR _CeladonGymEndBattleText6 - db "@" + text_far _CeladonGymEndBattleText6 + text_end CeladonGymAfterBattleText6: - TX_FAR _CeladonGymAfterBattleText6 - db "@" + text_far _CeladonGymAfterBattleText6 + text_end CeladonGymText7: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText7: - TX_FAR _CeladonGymBattleText7 - db "@" + text_far _CeladonGymBattleText7 + text_end CeladonGymEndBattleText7: - TX_FAR _CeladonGymEndBattleText7 - db "@" + text_far _CeladonGymEndBattleText7 + text_end CeladonGymAfterBattleText7: - TX_FAR _CeladonGymAfterBattleText7 - db "@" + text_far _CeladonGymAfterBattleText7 + text_end CeladonGymText8: - TX_ASM + text_asm ld hl, CeladonGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd CeladonGymBattleText8: - TX_FAR _CeladonGymBattleText8 - db "@" + text_far _CeladonGymBattleText8 + text_end CeladonGymEndBattleText8: - TX_FAR _CeladonGymEndBattleText8 - db "@" + text_far _CeladonGymEndBattleText8 + text_end CeladonGymAfterBattleText8: - TX_FAR _CeladonGymAfterBattleText8 - db "@" + text_far _CeladonGymAfterBattleText8 + text_end diff --git a/scripts/CeladonHotel.asm b/scripts/CeladonHotel.asm old mode 100755 new mode 100644 index ee4e140c..2cdd95b0 --- a/scripts/CeladonHotel.asm +++ b/scripts/CeladonHotel.asm @@ -7,13 +7,13 @@ CeladonHotel_TextPointers: dw CeladonHotelText3 CeladonHotelText1: - TX_FAR _CeladonHotelText1 - db "@" + text_far _CeladonHotelText1 + text_end CeladonHotelText2: - TX_FAR _CeladonHotelText2 - db "@" + text_far _CeladonHotelText2 + text_end CeladonHotelText3: - TX_FAR _CeladonHotelText3 - db "@" + text_far _CeladonHotelText3 + text_end diff --git a/scripts/CeladonMansion1F.asm b/scripts/CeladonMansion1F.asm old mode 100755 new mode 100644 index 41524983..fa901ff9 --- a/scripts/CeladonMansion1F.asm +++ b/scripts/CeladonMansion1F.asm @@ -8,32 +8,32 @@ CeladonMansion1F_TextPointers: dw CeladonMansion1Text4 dw CeladonMansion1Text5 -CeladonMansion1_486a1: +CeladonMansion1_PlayCryScript: call PlayCry jp TextScriptEnd CeladonMansion1Text1: - TX_FAR _CeladonMansion1Text1 - TX_ASM + text_far _CeladonMansion1Text1 + text_asm ld a, MEOWTH - jp CeladonMansion1_486a1 + jp CeladonMansion1_PlayCryScript CeladonMansion1Text2: - TX_FAR _CeladonMansion1Text2 - db "@" + text_far _CeladonMansion1Text2 + text_end CeladonMansion1Text3: - TX_FAR _CeladonMansion1Text3 - TX_ASM + text_far _CeladonMansion1Text3 + text_asm ld a, CLEFAIRY - jp CeladonMansion1_486a1 + jp CeladonMansion1_PlayCryScript CeladonMansion1Text4: - TX_FAR _CeladonMansion1Text4 - TX_ASM + text_far _CeladonMansion1Text4 + text_asm ld a, NIDORAN_F - jp CeladonMansion1_486a1 + jp CeladonMansion1_PlayCryScript CeladonMansion1Text5: - TX_FAR _CeladonMansion1Text5 - db "@" + text_far _CeladonMansion1Text5 + text_end diff --git a/scripts/CeladonMansion2F.asm b/scripts/CeladonMansion2F.asm old mode 100755 new mode 100644 index 9deb606d..8f83e86a --- a/scripts/CeladonMansion2F.asm +++ b/scripts/CeladonMansion2F.asm @@ -6,5 +6,5 @@ CeladonMansion2F_TextPointers: dw CeladonMansion2Text1 CeladonMansion2Text1: - TX_FAR _CeladonMansion2Text1 - db "@" + text_far _CeladonMansion2Text1 + text_end diff --git a/scripts/CeladonMansion3F.asm b/scripts/CeladonMansion3F.asm old mode 100755 new mode 100644 index 43832f63..f8972793 --- a/scripts/CeladonMansion3F.asm +++ b/scripts/CeladonMansion3F.asm @@ -12,60 +12,58 @@ CeladonMansion3F_TextPointers: dw GameFreakSignText ProgrammerText: - TX_FAR _ProgrammerText - db "@" + text_far _ProgrammerText + text_end GraphicArtistText: - TX_FAR _GraphicArtistText - db "@" + text_far _GraphicArtistText + text_end WriterText: - TX_FAR _WriterText - db "@" + text_far _WriterText + text_end DirectorText: - TX_ASM - - ; check pokédex + text_asm ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld a, [wNumSetBits] - cp 150 - jr nc, .CompletedDex - ld hl, .GameDesigner + cp NUM_POKEMON - 1 ; discount Mew + jr nc, .completed_dex + ld hl, .GameDesignerText jr .done -.CompletedDex +.completed_dex ld hl, .CompletedDexText .done call PrintText jp TextScriptEnd -.GameDesigner - TX_FAR _GameDesignerText - db "@" +.GameDesignerText: + text_far _GameDesignerText + text_end -.CompletedDexText - TX_FAR _CompletedDexText - TX_BLINK - TX_ASM - callab DisplayDiploma - ld a, $1 +.CompletedDexText: + text_far _CompletedDexText + text_promptbutton + text_asm + callfar DisplayDiploma + ld a, TRUE ld [wDoNotWaitForButtonPressAfterDisplayingText], a jp TextScriptEnd GameFreakPCText1: - TX_FAR _CeladonMansion3Text5 - db "@" + text_far _CeladonMansion3Text5 + text_end GameFreakPCText2: - TX_FAR _CeladonMansion3Text6 - db "@" + text_far _CeladonMansion3Text6 + text_end GameFreakPCText3: - TX_FAR _CeladonMansion3Text7 - db "@" + text_far _CeladonMansion3Text7 + text_end GameFreakSignText: - TX_FAR _CeladonMansion3Text8 - db "@" + text_far _CeladonMansion3Text8 + text_end diff --git a/scripts/CeladonMansionRoof.asm b/scripts/CeladonMansionRoof.asm old mode 100755 new mode 100644 index d5028537..860fcbdf --- a/scripts/CeladonMansionRoof.asm +++ b/scripts/CeladonMansionRoof.asm @@ -5,5 +5,5 @@ CeladonMansionRoof_TextPointers: dw CeladonMansion4Text1 CeladonMansion4Text1: - TX_FAR _CeladonMansion4Text1 - db "@" + text_far _CeladonMansion4Text1 + text_end diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm old mode 100755 new mode 100644 index e519d506..bd564dcc --- a/scripts/CeladonMansionRoofHouse.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -6,16 +6,16 @@ CeladonMansionRoofHouse_TextPointers: dw CeladonMansion5Text2 CeladonMansion5Text1: - TX_FAR _CeladonMansion5Text1 - db "@" + text_far _CeladonMansion5Text1 + text_end CeladonMansion5Text2: - TX_ASM + text_asm lb bc, EEVEE, 25 call GivePokemon - jr nc, .asm_24365 + jr nc, .party_full ld a, HS_CELADON_MANSION_EEVEE_GIFT ld [wMissableObjectIndex], a predef HideObject -.asm_24365 +.party_full jp TextScriptEnd diff --git a/scripts/CeladonMart1F.asm b/scripts/CeladonMart1F.asm old mode 100755 new mode 100644 index 8afd805a..dca3c796 --- a/scripts/CeladonMart1F.asm +++ b/scripts/CeladonMart1F.asm @@ -7,13 +7,13 @@ CeladonMart1F_TextPointers: dw CeladonMart1Text3 CeladonMart1Text1: - TX_FAR _CeladonMart1Text1 - db "@" + text_far _CeladonMart1Text1 + text_end CeladonMart1Text2: - TX_FAR _CeladonMart1Text2 - db "@" + text_far _CeladonMart1Text2 + text_end CeladonMart1Text3: - TX_FAR _CeladonMart1Text3 - db "@" + text_far _CeladonMart1Text3 + text_end diff --git a/scripts/CeladonMart2F.asm b/scripts/CeladonMart2F.asm old mode 100755 new mode 100644 index 787c186e..11827128 --- a/scripts/CeladonMart2F.asm +++ b/scripts/CeladonMart2F.asm @@ -9,13 +9,13 @@ CeladonMart2F_TextPointers: dw CeladonMart2Text5 CeladonMart2Text3: - TX_FAR _CeladonMart2Text3 - db "@" + text_far _CeladonMart2Text3 + text_end CeladonMart2Text4: - TX_FAR _CeladonMart2Text4 - db "@" + text_far _CeladonMart2Text4 + text_end CeladonMart2Text5: - TX_FAR _CeladonMart2Text5 - db "@" + text_far _CeladonMart2Text5 + text_end diff --git a/scripts/CeladonMart3F.asm b/scripts/CeladonMart3F.asm old mode 100755 new mode 100644 index e7e216d9..55081982 --- a/scripts/CeladonMart3F.asm +++ b/scripts/CeladonMart3F.asm @@ -21,88 +21,88 @@ CeladonMart3F_TextPointers: dw CeladonMart3Text17 CeladonMart3Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM18 - jr nz, .asm_a5463 + jr nz, .got_item ld hl, TM18PreReceiveText call PrintText - lb bc, TM_18, 1 + lb bc, TM_COUNTER, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full SetEvent EVENT_GOT_TM18 ld hl, ReceivedTM18Text - jr .asm_81359 -.BagFull + jr .done +.bag_full ld hl, TM18NoRoomText - jr .asm_81359 -.asm_a5463 + jr .done +.got_item ld hl, TM18ExplanationText -.asm_81359 +.done call PrintText jp TextScriptEnd TM18PreReceiveText: - TX_FAR _TM18PreReceiveText - db "@" + text_far _TM18PreReceiveText + text_end ReceivedTM18Text: - TX_FAR _ReceivedTM18Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM18Text + sound_get_item_1 + text_end TM18ExplanationText: - TX_FAR _TM18ExplanationText - db "@" + text_far _TM18ExplanationText + text_end TM18NoRoomText: - TX_FAR _TM18NoRoomText - db "@" + text_far _TM18NoRoomText + text_end CeladonMart3Text2: - TX_FAR _CeladonMart3Text2 - db "@" + text_far _CeladonMart3Text2 + text_end CeladonMart3Text3: - TX_FAR _CeladonMart3Text3 - db "@" + text_far _CeladonMart3Text3 + text_end CeladonMart3Text4: - TX_FAR _CeladonMart3Text4 - db "@" + text_far _CeladonMart3Text4 + text_end CeladonMart3Text5: - TX_FAR _CeladonMart3Text5 - db "@" + text_far _CeladonMart3Text5 + text_end -CeladonMart3Text12 +CeladonMart3Text12: CeladonMart3Text10: CeladonMart3Text8: CeladonMart3Text6: - TX_FAR _CeladonMart3Text6 - db "@" + text_far _CeladonMart3Text6 + text_end CeladonMart3Text7: - TX_FAR _CeladonMart3Text7 - db "@" + text_far _CeladonMart3Text7 + text_end CeladonMart3Text9: - TX_FAR _CeladonMart3Text9 - db "@" + text_far _CeladonMart3Text9 + text_end CeladonMart3Text11: - TX_FAR _CeladonMart3Text11 - db "@" + text_far _CeladonMart3Text11 + text_end CeladonMart3Text13: - TX_FAR _CeladonMart3Text13 - db "@" + text_far _CeladonMart3Text13 + text_end CeladonMart3Text14: - TX_FAR _CeladonMart3Text14 - db "@" + text_far _CeladonMart3Text14 + text_end CeladonMart3Text17: CeladonMart3Text16: CeladonMart3Text15: - TX_FAR _CeladonMart3Text15 - db "@" + text_far _CeladonMart3Text15 + text_end diff --git a/scripts/CeladonMart4F.asm b/scripts/CeladonMart4F.asm old mode 100755 new mode 100644 index 20f817e9..1365dd0d --- a/scripts/CeladonMart4F.asm +++ b/scripts/CeladonMart4F.asm @@ -8,13 +8,13 @@ CeladonMart4F_TextPointers: dw CeladonMart4Text4 CeladonMart4Text2: - TX_FAR _CeladonMart4Text2 - db "@" + text_far _CeladonMart4Text2 + text_end CeladonMart4Text3: - TX_FAR _CeladonMart4Text3 - db "@" + text_far _CeladonMart4Text3 + text_end CeladonMart4Text4: - TX_FAR _CeladonMart4Text4 - db "@" + text_far _CeladonMart4Text4 + text_end diff --git a/scripts/CeladonMart5F.asm b/scripts/CeladonMart5F.asm old mode 100755 new mode 100644 index 9f52f866..91748706 --- a/scripts/CeladonMart5F.asm +++ b/scripts/CeladonMart5F.asm @@ -9,13 +9,13 @@ CeladonMart5F_TextPointers: dw CeladonMart5Text5 CeladonMart5Text1: - TX_FAR _CeladonMart5Text1 - db "@" + text_far _CeladonMart5Text1 + text_end CeladonMart5Text2: - TX_FAR _CeladonMart5Text2 - db "@" + text_far _CeladonMart5Text2 + text_end CeladonMart5Text5: - TX_FAR _CeladonMart5Text5 - db "@" + text_far _CeladonMart5Text5 + text_end diff --git a/scripts/CeladonMartElevator.asm b/scripts/CeladonMartElevator.asm old mode 100755 new mode 100644 index 34b923f9..b657b3f9 --- a/scripts/CeladonMartElevator.asm +++ b/scripts/CeladonMartElevator.asm @@ -40,33 +40,32 @@ CeladonMartElevatorScript_48631: jp CopyData CeladonMartElevatorFloors: - db 5 ; number of elements in list + db 5 ; # db FLOOR_1F db FLOOR_2F db FLOOR_3F db FLOOR_4F db FLOOR_5F - db $FF + db -1 ; end -CeladonMartElevatorWarpMaps: -; first byte is warp number -; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $05, CELADON_MART_1F - db $02, CELADON_MART_2F - db $02, CELADON_MART_3F - db $02, CELADON_MART_4F - db $02, CELADON_MART_5F +CeladonMartElevatorWarpMaps: + ; warp number, map id + db 5, CELADON_MART_1F + db 2, CELADON_MART_2F + db 2, CELADON_MART_3F + db 2, CELADON_MART_4F + db 2, CELADON_MART_5F CeladonMartElevatorWarpMapsEnd: CeladonMartElevatorScript_48654: - jpba ShakeElevator + farjp ShakeElevator CeladonMartElevator_TextPointers: dw CeladonMartElevatorText1 CeladonMartElevatorText1: - TX_ASM + text_asm call CeladonMartElevatorScript_48631 ld hl, CeladonMartElevatorWarpMaps predef DisplayElevatorFloorMenu diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm old mode 100755 new mode 100644 index 35c740b2..37b8671e --- a/scripts/CeladonMartRoof.asm +++ b/scripts/CeladonMartRoof.asm @@ -38,7 +38,7 @@ CeladonMartRoofDrinkList: db FRESH_WATER db SODA_POP db LEMONADE - db $00 + db 0 ; end CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wd730 @@ -64,14 +64,14 @@ CeladonMartRoofScript_GiveDrinkToGirl: dec l ld b, l ld c, 12 - coord hl, 0, 0 + hlcoord 0, 0 call TextBoxBorder call UpdateSprites call CeladonMartRoofScript_PrintDrinksInBag ld hl, wd730 res 6, [hl] call HandleMenuInput - bit 1, a ; pressed b + bit BIT_B_BUTTON, a ret nz ld hl, wFilteredBagItems ld a, [wCurrentMenuItem] @@ -79,7 +79,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld e, a add hl, de ld a, [hl] - ld [hItemToRemoveID], a + ldh [hItemToRemoveID], a cp FRESH_WATER jr z, .gaveFreshWater cp SODA_POP @@ -90,7 +90,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld hl, CeladonMartRoofText_48515 call PrintText call RemoveItemByIDBank12 - lb bc, TM_49, 1 + lb bc, TM_TRI_ATTACK, 1 call GiveItem jr nc, .bagFull ld hl, ReceivedTM49Text @@ -103,7 +103,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld hl, CeladonMartRoofText_48504 call PrintText call RemoveItemByIDBank12 - lb bc, TM_48, 1 + lb bc, TM_ROCK_SLIDE, 1 call GiveItem jr nc, .bagFull ld hl, CeladonMartRoofText_4850a @@ -116,7 +116,7 @@ CeladonMartRoofScript_GiveDrinkToGirl: ld hl, CeladonMartRoofText_484f3 call PrintText call RemoveItemByIDBank12 - lb bc, TM_13, 1 + lb bc, TM_ICE_BEAM, 1 call GiveItem jr nc, .bagFull ld hl, CeladonMartRoofText_484f9 @@ -131,62 +131,62 @@ CeladonMartRoofScript_GiveDrinkToGirl: jp PrintText RemoveItemByIDBank12: - jpba RemoveItemByID + farjp RemoveItemByID CeladonMartRoofText_484ee: - TX_FAR _CeladonMartRoofText_484ee - db "@" + text_far _CeladonMartRoofText_484ee + text_end CeladonMartRoofText_484f3: - TX_FAR _CeladonMartRoofText_484f3 - TX_WAIT - db "@" + text_far _CeladonMartRoofText_484f3 + text_waitbutton + text_end CeladonMartRoofText_484f9: - TX_FAR _CeladonMartRoofText_484f9 - TX_SFX_ITEM_1 - TX_FAR _CeladonMartRoofText_484fe - TX_WAIT - db "@" + text_far _CeladonMartRoofText_484f9 + sound_get_item_1 + text_far _CeladonMartRoofText_484fe + text_waitbutton + text_end CeladonMartRoofText_48504: - TX_FAR _CeladonMartRoofText_48504 - TX_WAIT - db "@" + text_far _CeladonMartRoofText_48504 + text_waitbutton + text_end CeladonMartRoofText_4850a: - TX_FAR _CeladonMartRoofText_4850a - TX_SFX_ITEM_1 - TX_FAR _CeladonMartRoofText_4850f - TX_WAIT - db "@" + text_far _CeladonMartRoofText_4850a + sound_get_item_1 + text_far _CeladonMartRoofText_4850f + text_waitbutton + text_end CeladonMartRoofText_48515: - TX_FAR _CeladonMartRoofText_48515 - TX_WAIT - db "@" + text_far _CeladonMartRoofText_48515 + text_waitbutton + text_end ReceivedTM49Text: - TX_FAR _ReceivedTM49Text - TX_SFX_ITEM_1 - TX_FAR _CeladonMartRoofText_48520 - TX_WAIT - db "@" + text_far _ReceivedTM49Text + sound_get_item_1 + text_far _CeladonMartRoofText_48520 + text_waitbutton + text_end CeladonMartRoofText_48526: - TX_FAR _CeladonMartRoofText_48526 - TX_WAIT - db "@" + text_far _CeladonMartRoofText_48526 + text_waitbutton + text_end CeladonMartRoofText_4852c: - TX_FAR _CeladonMartRoofText_4852c - TX_WAIT - db "@" + text_far _CeladonMartRoofText_4852c + text_waitbutton + text_end CeladonMartRoofScript_PrintDrinksInBag: ld hl, wFilteredBagItems xor a - ld [hItemCounter], a + ldh [hItemCounter], a .loop ld a, [hli] cp $ff @@ -194,8 +194,8 @@ CeladonMartRoofScript_PrintDrinksInBag: push hl ld [wd11e], a call GetItemName - coord hl, 2, 2 - ld a, [hItemCounter] + hlcoord 2, 2 + ldh a, [hItemCounter] ld bc, SCREEN_WIDTH * 2 call AddNTimes ld de, wcd6d @@ -214,11 +214,11 @@ CeladonMartRoof_TextPointers: dw CeladonMartRoofText6 CeladonMartRoofText1: - TX_FAR _CeladonMartRoofText1 - db "@" + text_far _CeladonMartRoofText1 + text_end CeladonMartRoofText2: - TX_ASM + text_asm call CeladonMartRoofScript_GetDrinksInBag ld a, [wFilteredBagItemsCount] and a @@ -240,16 +240,16 @@ CeladonMartRoofText2: jp TextScriptEnd CeladonMartRoofText3: - TX_FAR _CeladonMartRoofText_48598 - db "@" + text_far _CeladonMartRoofText_48598 + text_end CeladonMartRoofText4: - TX_FAR _CeladonMartRoofText4 - db "@" + text_far _CeladonMartRoofText4 + text_end CeladonMartRoofText5: - TX_VENDING_MACHINE + script_vending_machine CeladonMartRoofText6: - TX_FAR _CeladonMartRoofText6 - db "@" + text_far _CeladonMartRoofText6 + text_end diff --git a/scripts/CeladonPokecenter.asm b/scripts/CeladonPokecenter.asm old mode 100755 new mode 100644 index b5efb7d5..0f28e1b2 --- a/scripts/CeladonPokecenter.asm +++ b/scripts/CeladonPokecenter.asm @@ -9,15 +9,15 @@ CeladonPokecenter_TextPointers: dw CeladonTradeNurseText CeladonTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist CeladonHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse CeladonPokecenterText2: - TX_FAR _CeladonPokecenterText2 - db "@" + text_far _CeladonPokecenterText2 + text_end CeladonPokecenterText3: - TX_FAR _CeladonPokecenterText3 - db "@" + text_far _CeladonPokecenterText3 + text_end diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm old mode 100755 new mode 100644 index cab2bf23..5e35b079 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -1,5 +1,5 @@ CeruleanBadgeHouse_Script: - ld a, $1 + ld a, TRUE ld [wAutoTextBoxDrawingControl], a dec a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -9,7 +9,7 @@ CeruleanBadgeHouse_TextPointers: dw CeruleanHouse2Text1 CeruleanHouse2Text1: - TX_ASM + text_asm ld hl, CeruleanHouse2Text_74e77 call PrintText xor a @@ -34,7 +34,7 @@ CeruleanHouse2Text1: jr c, .asm_74e60 ld hl, TextPointers_74e86 ld a, [wcf91] - sub $15 + sub BOULDERBADGE add a ld d, $0 ld e, a @@ -52,19 +52,28 @@ CeruleanHouse2Text1: jp TextScriptEnd BadgeItemList: - db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF + db 8 ; # + db BOULDERBADGE + db CASCADEBADGE + db THUNDERBADGE + db RAINBOWBADGE + db SOULBADGE + db MARSHBADGE + db VOLCANOBADGE + db EARTHBADGE + db -1 ; end CeruleanHouse2Text_74e77: - TX_FAR _CeruleanHouse2Text_74e77 - db "@" + text_far _CeruleanHouse2Text_74e77 + text_end CeruleanHouse2Text_74e7c: - TX_FAR _CeruleanHouse2Text_74e7c - db "@" + text_far _CeruleanHouse2Text_74e7c + text_end CeruleanHouse2Text_74e81: - TX_FAR _CeruleanHouse2Text_74e81 - db "@" + text_far _CeruleanHouse2Text_74e81 + text_end TextPointers_74e86: dw CeruleanHouse2Text_74e96 @@ -77,33 +86,33 @@ TextPointers_74e86: dw CeruleanHouse2Text_74eb9 CeruleanHouse2Text_74e96: - TX_FAR _CeruleanHouse2Text_74e96 - db "@" + text_far _CeruleanHouse2Text_74e96 + text_end CeruleanHouse2Text_74e9b: - TX_FAR _CeruleanHouse2Text_74e9b - db "@" + text_far _CeruleanHouse2Text_74e9b + text_end CeruleanHouse2Text_74ea0: - TX_FAR _CeruleanHouse2Text_74ea0 - db "@" + text_far _CeruleanHouse2Text_74ea0 + text_end CeruleanHouse2Text_74ea5: - TX_FAR _CeruleanHouse2Text_74ea5 - db "@" + text_far _CeruleanHouse2Text_74ea5 + text_end CeruleanHouse2Text_74eaa: - TX_FAR _CeruleanHouse2Text_74eaa - db "@" + text_far _CeruleanHouse2Text_74eaa + text_end CeruleanHouse2Text_74eaf: - TX_FAR _CeruleanHouse2Text_74eaf - db "@" + text_far _CeruleanHouse2Text_74eaf + text_end CeruleanHouse2Text_74eb4: - TX_FAR _CeruleanHouse2Text_74eb4 - db "@" + text_far _CeruleanHouse2Text_74eb4 + text_end CeruleanHouse2Text_74eb9: - TX_FAR _CeruleanHouse2Text_74eb9 - db "@" + text_far _CeruleanHouse2Text_74eb9 + text_end diff --git a/scripts/CeruleanCave1F.asm b/scripts/CeruleanCave1F.asm old mode 100755 new mode 100644 diff --git a/scripts/CeruleanCave2F.asm b/scripts/CeruleanCave2F.asm old mode 100755 new mode 100644 diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm old mode 100755 new mode 100644 index a570ab18..621815b0 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -7,7 +7,7 @@ CeruleanCaveB1F_Script: ld [wCeruleanCaveB1FCurScript], a ret -CeruleanCaveB1F_ScriptPointers +CeruleanCaveB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -18,25 +18,18 @@ CeruleanCaveB1F_TextPointers: dw PickUpItemText MewtwoTrainerHeader: - dbEventFlagBit EVENT_BEAT_MEWTWO - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MEWTWO - dw MewtwoBattleText ; TextBeforeBattle - dw MewtwoBattleText ; TextAfterBattle - dw MewtwoBattleText ; TextEndBattle - dw MewtwoBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText + db -1 ; end MewtwoText: - TX_ASM + text_asm ld hl, MewtwoTrainerHeader call TalkToTrainer jp TextScriptEnd MewtwoBattleText: - TX_FAR _MewtwoBattleText - TX_ASM + text_far _MewtwoBattleText + text_asm ld a, MEWTWO call PlayCry call WaitForSoundToFinish diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm old mode 100755 new mode 100644 index 7e99cda7..fb332e58 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -27,7 +27,7 @@ CeruleanCityScript4: ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -35,6 +35,10 @@ CeruleanCityScript4: ret CeruleanCityScript0: +IF DEF(_DEBUG) + call DebugPressedOrHeldB + ret nz +ENDC CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .asm_194f7 ld hl, CeruleanCityCoords1 @@ -50,10 +54,10 @@ CeruleanCityScript0: .asm_194e6 ld [wPlayerMovingDirection], a ld a, b - ld [wSpriteStateData1 + 2 * $10 + $9], a + ld [wSprite02StateData1FacingDirection], a call Delay3 ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID .asm_194f7 CheckEvent EVENT_BEAT_CERULEAN_RIVAL @@ -64,7 +68,7 @@ CeruleanCityScript0: ld a, [wWalkBikeSurfState] and a jr z, .asm_19512 - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound .asm_19512 @@ -72,51 +76,51 @@ CeruleanCityScript0: ld a, MUSIC_MEET_RIVAL call PlayMusic xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, [wXCoord] - cp $14 + cp 20 jr z, .asm_19535 ld a, $1 - ld [H_SPRITEINDEX], a - ld a, $5 - ld [H_SPRITEDATAOFFSET], a + ldh [hSpriteIndex], a + ld a, SPRITESTATEDATA2_MAPX + ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData2 - ld [hl], $19 + ld [hl], 25 .asm_19535 ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a predef ShowObject ld de, CeruleanCityMovement1 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $1 ld [wCeruleanCityCurScript], a ret CeruleanCityCoords1: - db $07,$1e - db $09,$1e - db $ff + dbmapcoord 30, 7 + dbmapcoord 30, 9 + db -1 ; end CeruleanCityCoords2: - db $06,$14 - db $06,$15 - db $ff + dbmapcoord 20, 6 + dbmapcoord 21, 6 + db -1 ; end CeruleanCityMovement1: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end CeruleanCityScript_1955d: ld a, 1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay ; face object CeruleanCityScript1: @@ -126,7 +130,7 @@ CeruleanCityScript1: xor a ld [wJoyIgnore], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -134,7 +138,7 @@ CeruleanCityScript1: ld hl, CeruleanCityText_1966d ld de, CeruleanCityText_19672 call SaveEndBattleTextPointers - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a ; select which team to use during the encounter @@ -154,7 +158,7 @@ CeruleanCityScript1: ld [wTrainerNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 ld [wCeruleanCityCurScript], a @@ -169,17 +173,17 @@ CeruleanCityScript2: ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_RIVAL ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] - cp $14 + cp 20 jr nz, .asm_195f0 ld de, CeruleanCityMovement4 jr .asm_195f3 @@ -187,7 +191,7 @@ CeruleanCityScript2: ld de, CeruleanCityMovement3 .asm_195f3 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $3 ld [wCeruleanCityCurScript], a @@ -201,7 +205,7 @@ CeruleanCityMovement3: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end CeruleanCityMovement4: db NPC_MOVEMENT_RIGHT @@ -211,7 +215,7 @@ CeruleanCityMovement4: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end CeruleanCityScript3: ld a, [wd730] @@ -247,7 +251,7 @@ CeruleanCity_TextPointers: dw CeruleanCityText17 CeruleanCityText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_CERULEAN_RIVAL ; do pre-battle text jr z, .PreBattleText @@ -262,23 +266,23 @@ CeruleanCityText1: jp TextScriptEnd CeruleanCityText_19668: - TX_FAR _CeruleanCityText_19668 - db "@" + text_far _CeruleanCityText_19668 + text_end CeruleanCityText_1966d: - TX_FAR _CeruleanCityText_1966d - db "@" + text_far _CeruleanCityText_1966d + text_end CeruleanCityText_19672: - TX_FAR _CeruleanCityText_19672 - db "@" + text_far _CeruleanCityText_19672 + text_end CeruleanCityText_19677: - TX_FAR _CeruleanCityText_19677 - db "@" + text_far _CeruleanCityText_19677 + text_end CeruleanCityText2: - TX_ASM + text_asm CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .asm_4ca20 ld hl, CeruleanCityText_196d9 @@ -289,7 +293,7 @@ CeruleanCityText2: ld hl, CeruleanCityText_196ee ld de, CeruleanCityText_196ee call SaveEndBattleTextPointers - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -299,7 +303,7 @@ CeruleanCityText2: .asm_4ca20 ld hl, CeruleanCityText_196f3 call PrintText - lb bc, TM_28, 1 + lb bc, TM_DIG, 1 call GiveItem jr c, .Success ld hl, TM28NoRoomText @@ -310,53 +314,53 @@ CeruleanCityText2: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, ReceivedTM28Text call PrintText - callba CeruleanHideRocket + farcall CeruleanHideRocket .Done jp TextScriptEnd CeruleanCityText_196d9: - TX_FAR _CeruleanCityText_196d9 - db "@" + text_far _CeruleanCityText_196d9 + text_end ReceivedTM28Text: - TX_FAR _ReceivedTM28Text - TX_SFX_ITEM_1 - TX_FAR _ReceivedTM28Text2 - TX_WAIT - db "@" + text_far _ReceivedTM28Text + sound_get_item_1 + text_far _ReceivedTM28Text2 + text_waitbutton + text_end TM28NoRoomText: - TX_FAR _TM28NoRoomText - db "@" + text_far _TM28NoRoomText + text_end CeruleanCityText_196ee: - TX_FAR _CeruleanCityText_196ee - db "@" + text_far _CeruleanCityText_196ee + text_end CeruleanCityText_196f3: - TX_FAR _CeruleanCityText_196f3 - db "@" + text_far _CeruleanCityText_196f3 + text_end CeruleanCityText3: - TX_FAR _CeruleanCityText3 - db "@" + text_far _CeruleanCityText3 + text_end CeruleanCityText4: - TX_FAR _CeruleanCityText4 - db "@" + text_far _CeruleanCityText4 + text_end CeruleanCityText5: - TX_FAR _CeruleanCityText5 - db "@" + text_far _CeruleanCityText5 + text_end CeruleanCityText11: CeruleanCityText6: - TX_FAR _CeruleanCityText6 - db "@" + text_far _CeruleanCityText6 + text_end CeruleanCityText7: - TX_ASM - ld a, [hRandomAdd] + text_asm + ldh a, [hRandomAdd] cp 180 jr c, .asm_e9fc9 ld hl, CeruleanCityText_19730 @@ -375,20 +379,20 @@ CeruleanCityText7: jp TextScriptEnd CeruleanCityText_19730: - TX_FAR _CeruleanCityText_19730 - db "@" + text_far _CeruleanCityText_19730 + text_end CeruleanCityText_19735: - TX_FAR _CeruleanCityText_19735 - db "@" + text_far _CeruleanCityText_19735 + text_end CeruleanCityText_1973a: - TX_FAR _CeruleanCityText_1973a - db "@" + text_far _CeruleanCityText_1973a + text_end CeruleanCityText8: - TX_ASM - ld a, [hRandomAdd] + text_asm + ldh a, [hRandomAdd] cp 180 jr c, .asm_e28da ld hl, CeruleanCityText_1976f @@ -413,41 +417,41 @@ CeruleanCityText8: jp TextScriptEnd CeruleanCityText_1976f: - TX_FAR _CeruleanCityText_1976f - db "@" + text_far _CeruleanCityText_1976f + text_end CeruleanCityText_19774: - TX_FAR _CeruleanCityText_19774 - db "@" + text_far _CeruleanCityText_19774 + text_end CeruleanCityText_19779: - TX_FAR _CeruleanCityText_19779 - db "@" + text_far _CeruleanCityText_19779 + text_end CeruleanCityText_1977e: - TX_FAR _CeruleanCityText_1977e - db "@" + text_far _CeruleanCityText_1977e + text_end CeruleanCityText9: - TX_FAR _CeruleanCityText9 - db "@" + text_far _CeruleanCityText9 + text_end CeruleanCityText10: - TX_FAR _CeruleanCityText10 - db "@" + text_far _CeruleanCityText10 + text_end CeruleanCityText12: - TX_FAR _CeruleanCityText12 - db "@" + text_far _CeruleanCityText12 + text_end CeruleanCityText13: - TX_FAR _CeruleanCityText13 - db "@" + text_far _CeruleanCityText13 + text_end CeruleanCityText16: - TX_FAR _CeruleanCityText16 - db "@" + text_far _CeruleanCityText16 + text_end CeruleanCityText17: - TX_FAR _CeruleanCityText17 - db "@" + text_far _CeruleanCityText17 + text_end diff --git a/scripts/CeruleanCity_2.asm b/scripts/CeruleanCity_2.asm old mode 100755 new mode 100644 diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm old mode 100755 new mode 100644 index 7d152b4f..a6630cf8 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -2,7 +2,7 @@ CeruleanGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] - call nz, CeruleanGymScript_5c6d0 + call nz, .LoadNames call EnableAutoTextBoxDrawing ld hl, CeruleanGymTrainerHeader0 ld de, CeruleanGym_ScriptPointers @@ -11,15 +11,15 @@ CeruleanGym_Script: ld [wCeruleanGymCurScript], a ret -CeruleanGymScript_5c6d0: - ld hl, Gym2CityName - ld de, Gym2LeaderName +.LoadNames: + ld hl, .CityName + ld de, .LeaderName jp LoadGymLeaderAndCityName -Gym2CityName: +.CityName: db "CERULEAN CITY@" -Gym2LeaderName: +.LeaderName: db "MISTY@" CeruleanGymScript_5c6ed: @@ -44,26 +44,26 @@ CeruleanGymScript3: CeruleanGymScript_5c70d: ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_MISTY - lb bc, TM_11, 1 + lb bc, TM_BUBBLEBEAM, 1 call GiveItem jr nc, .BagFull ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM11 - jr .asm_5c736 + jr .gymVictory .BagFull ld a, $7 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5c736 +.gymVictory ld hl, wObtainedBadges - set 1, [hl] + set BIT_CASCADEBADGE, [hl] ld hl, wBeatGymFlags - set 1, [hl] + set BIT_CASCADEBADGE, [hl] ; deactivate gym trainers SetEvents EVENT_BEAT_CERULEAN_GYM_TRAINER_0, EVENT_BEAT_CERULEAN_GYM_TRAINER_1 @@ -80,39 +80,25 @@ CeruleanGym_TextPointers: dw CeruleanGymText7 CeruleanGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0 - dw CeruleanGymBattleText1 ; TextBeforeBattle - dw CeruleanGymAfterBattleText1 ; TextAfterBattle - dw CeruleanGymEndBattleText1 ; TextEndBattle - dw CeruleanGymEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_0, 3, CeruleanGymBattleText1, CeruleanGymEndBattleText1, CeruleanGymAfterBattleText1 CeruleanGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1 - dw CeruleanGymBattleText2 ; TextBeforeBattle - dw CeruleanGymAfterBattleText2 ; TextAfterBattle - dw CeruleanGymEndBattleText2 ; TextEndBattle - dw CeruleanGymEndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_CERULEAN_GYM_TRAINER_1, 3, CeruleanGymBattleText2, CeruleanGymEndBattleText2, CeruleanGymAfterBattleText2 + db -1 ; end CeruleanGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_MISTY - jr z, .asm_5c78d + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM11 - jr nz, .asm_5c785 + jr nz, .afterVictory call z, CeruleanGymScript_5c70d call DisableWaitingAfterTextDisplay - jr .asm_5c7bb -.asm_5c785 + jr .done +.afterVictory ld hl, CeruleanGymText_5c7c3 call PrintText - jr .asm_5c7bb -.asm_5c78d + jr .done +.beginBattle ld hl, CeruleanGymText_5c7be call PrintText ld hl, wd72d @@ -121,84 +107,84 @@ CeruleanGymText1: ld hl, CeruleanGymText_5c7d8 ld de, CeruleanGymText_5c7d8 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 ld [wGymLeaderNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wCeruleanGymCurScript], a -.asm_5c7bb +.done jp TextScriptEnd CeruleanGymText_5c7be: - TX_FAR _CeruleanGymText_5c7be - db "@" + text_far _CeruleanGymText_5c7be + text_end CeruleanGymText_5c7c3: - TX_FAR _CeruleanGymText_5c7c3 - db "@" + text_far _CeruleanGymText_5c7c3 + text_end CeruleanGymText5: - TX_FAR _CeruleanGymText_5c7c8 - db "@" + text_far _CeruleanGymText_5c7c8 + text_end CeruleanGymText6: - TX_FAR _ReceivedTM11Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM11Text + sound_get_item_1 + text_end CeruleanGymText7: - TX_FAR _CeruleanGymText_5c7d3 - db "@" + text_far _CeruleanGymText_5c7d3 + text_end CeruleanGymText_5c7d8: - TX_FAR _CeruleanGymText_5c7d8 - TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded - TX_BLINK - db "@" + text_far _CeruleanGymText_5c7d8 + sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + text_promptbutton + text_end CeruleanGymText2: - TX_ASM + text_asm ld hl, CeruleanGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd CeruleanGymBattleText1: - TX_FAR _CeruleanGymBattleText1 - db "@" + text_far _CeruleanGymBattleText1 + text_end CeruleanGymEndBattleText1: - TX_FAR _CeruleanGymEndBattleText1 - db "@" + text_far _CeruleanGymEndBattleText1 + text_end CeruleanGymAfterBattleText1: - TX_FAR _CeruleanGymAfterBattleText1 - db "@" + text_far _CeruleanGymAfterBattleText1 + text_end CeruleanGymText3: - TX_ASM + text_asm ld hl, CeruleanGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd CeruleanGymBattleText2: - TX_FAR _CeruleanGymBattleText2 - db "@" + text_far _CeruleanGymBattleText2 + text_end CeruleanGymEndBattleText2: - TX_FAR _CeruleanGymEndBattleText2 - db "@" + text_far _CeruleanGymEndBattleText2 + text_end CeruleanGymAfterBattleText2: - TX_FAR _CeruleanGymAfterBattleText2 - db "@" + text_far _CeruleanGymAfterBattleText2 + text_end CeruleanGymText4: - TX_ASM + text_asm CheckEvent EVENT_BEAT_MISTY jr nz, .asm_5c821 ld hl, CeruleanGymText_5c82a @@ -211,9 +197,9 @@ CeruleanGymText4: jp TextScriptEnd CeruleanGymText_5c82a: - TX_FAR _CeruleanGymText_5c82a - db "@" + text_far _CeruleanGymText_5c82a + text_end CeruleanGymText_5c82f: - TX_FAR _CeruleanGymText_5c82f - db "@" + text_far _CeruleanGymText_5c82f + text_end diff --git a/scripts/CeruleanMart.asm b/scripts/CeruleanMart.asm old mode 100755 new mode 100644 index f812aadd..beb0fa1b --- a/scripts/CeruleanMart.asm +++ b/scripts/CeruleanMart.asm @@ -7,9 +7,9 @@ CeruleanMart_TextPointers: dw CeruleanMartText3 CeruleanMartText2: - TX_FAR _CeruleanMartText2 - db "@" + text_far _CeruleanMartText2 + text_end CeruleanMartText3: - TX_FAR _CeruleanMartText3 - db "@" + text_far _CeruleanMartText3 + text_end diff --git a/scripts/CeruleanPokecenter.asm b/scripts/CeruleanPokecenter.asm old mode 100755 new mode 100644 index 82bd04f3..680640f4 --- a/scripts/CeruleanPokecenter.asm +++ b/scripts/CeruleanPokecenter.asm @@ -9,15 +9,15 @@ CeruleanPokecenter_TextPointers: dw CeruleanTradeNurseText CeruleanTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist CeruleanHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse CeruleanPokecenterText2: - TX_FAR _CeruleanPokecenterText2 - db "@" + text_far _CeruleanPokecenterText2 + text_end CeruleanPokecenterText3: - TX_FAR _CeruleanPokecenterText3 - db "@" + text_far _CeruleanPokecenterText3 + text_end diff --git a/scripts/CeruleanTradeHouse.asm b/scripts/CeruleanTradeHouse.asm old mode 100755 new mode 100644 index f80da19a..66952cd4 --- a/scripts/CeruleanTradeHouse.asm +++ b/scripts/CeruleanTradeHouse.asm @@ -6,12 +6,12 @@ CeruleanTradeHouse_TextPointers: dw CeruleanHouse1Text2 CeruleanHouse1Text1: - TX_FAR _CeruleanHouse1Text1 - db "@" + text_far _CeruleanHouse1Text1 + text_end CeruleanHouse1Text2: - TX_ASM - ld a, $6 + text_asm + ld a, TRADE_FOR_LOLA ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CeruleanTrashedHouse.asm b/scripts/CeruleanTrashedHouse.asm old mode 100755 new mode 100644 index f249ef01..d11c7721 --- a/scripts/CeruleanTrashedHouse.asm +++ b/scripts/CeruleanTrashedHouse.asm @@ -8,32 +8,32 @@ CeruleanTrashedHouse_TextPointers: dw CeruleanHouseTrashedText3 CeruleanHouseTrashedText1: - TX_ASM - ld b, $e4 + text_asm + ld b, TM_DIG predef GetQuantityOfItemInBag and b - jr z, .asm_f8734 + jr z, .no_dig_tm ld hl, CeruleanHouseTrashedText_1d6b0 call PrintText - jr .asm_8dfe9 -.asm_f8734 + jr .done +.no_dig_tm ld hl, CeruleanHouseTrashedText_1d6ab call PrintText -.asm_8dfe9 +.done jp TextScriptEnd CeruleanHouseTrashedText_1d6ab: - TX_FAR _CeruleanTrashedText_1d6ab - db "@" + text_far _CeruleanTrashedText_1d6ab + text_end CeruleanHouseTrashedText_1d6b0: - TX_FAR _CeruleanTrashedText_1d6b0 - db "@" + text_far _CeruleanTrashedText_1d6b0 + text_end CeruleanHouseTrashedText2: - TX_FAR _CeruleanHouseTrashedText2 - db "@" + text_far _CeruleanHouseTrashedText2 + text_end CeruleanHouseTrashedText3: - TX_FAR _CeruleanHouseTrashedText3 - db "@" + text_far _CeruleanHouseTrashedText3 + text_end diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm old mode 100755 new mode 100644 index e3cdc6d2..11f99ee1 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -40,10 +40,10 @@ GaryScript1: ret GaryEntrance_RLEMovement: - db D_UP,1 - db D_RIGHT,1 - db D_UP,3 - db $ff + db D_UP, 1 + db D_RIGHT, 1 + db D_UP, 3 + db -1 ; end GaryScript2: ld a, [wSimulatedJoypadStatesIndex] @@ -55,7 +55,7 @@ GaryScript2: ld hl, wOptions res 7, [hl] ; Turn on battle animations to make the battle feel more epic. ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d @@ -64,7 +64,7 @@ GaryScript2: ld hl, GaryDefeatedText ld de, GaryVictoryText call SaveEndBattleTextPointers - ld a, OPP_SONY3 + ld a, OPP_RIVAL3 ld [wCurOpponent], a ; select which team to use during the encounter @@ -84,7 +84,7 @@ GaryScript2: ld [wTrainerNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wChampionsRoomCurScript], a ret @@ -98,26 +98,26 @@ GaryScript3: ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, $4 ld [wChampionsRoomCurScript], a ret GaryScript4: - callba Music_Cities1AlternateTempo + farcall Music_Cities1AlternateTempo ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld de, OakEntranceAfterVictoryMovement ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, HS_CHAMPIONS_ROOM_OAK ld [wMissableObjectIndex], a @@ -132,7 +132,7 @@ OakEntranceAfterVictoryMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP - db $FF + db -1 ; end GaryScript5: ld a, [wd730] @@ -141,17 +141,17 @@ GaryScript5: ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 ld [wChampionsRoomCurScript], a @@ -159,12 +159,12 @@ GaryScript5: GaryScript6: ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 ld [wChampionsRoomCurScript], a @@ -172,16 +172,16 @@ GaryScript6: GaryScript7: ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call GaryScript_760c8 ld de, OakExitGaryRoomMovement ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $8 ld [wChampionsRoomCurScript], a @@ -190,7 +190,7 @@ GaryScript7: OakExitGaryRoomMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP - db $FF + db -1 ; end GaryScript8: ld a, [wd730] @@ -217,9 +217,9 @@ GaryScript9: ret WalkToHallOfFame_RLEMovment: - db D_UP,4 - db D_LEFT,1 - db $ff + db D_UP, 4 + db D_LEFT, 1 + db -1 ; end GaryScript10: ld a, [wSimulatedJoypadStatesIndex] @@ -247,7 +247,7 @@ ChampionsRoom_TextPointers: dw GaryText5 GaryText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_CHAMPION_RIVAL ld hl, GaryChampionIntroText jr z, .printText @@ -257,27 +257,27 @@ GaryText1: jp TextScriptEnd GaryChampionIntroText: - TX_FAR _GaryChampionIntroText - db "@" + text_far _GaryChampionIntroText + text_end GaryDefeatedText: - TX_FAR _GaryDefeatedText - db "@" + text_far _GaryDefeatedText + text_end GaryVictoryText: - TX_FAR _GaryVictoryText - db "@" + text_far _GaryVictoryText + text_end GaryText_76103: - TX_FAR _GaryText_76103 - db "@" + text_far _GaryText_76103 + text_end GaryText2: - TX_FAR _GaryText2 - db "@" + text_far _GaryText2 + text_end GaryText3: - TX_ASM + text_asm ld a, [wPlayerStarter] ld [wd11e], a call GetMonName @@ -286,13 +286,13 @@ GaryText3: jp TextScriptEnd GaryText_76120: - TX_FAR _GaryText_76120 - db "@" + text_far _GaryText_76120 + text_end GaryText4: - TX_FAR _GaryText_76125 - db "@" + text_far _GaryText_76125 + text_end GaryText5: - TX_FAR _GaryText_7612a - db "@" + text_far _GaryText_7612a + text_end diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm old mode 100755 new mode 100644 index 295bd63d..5703bb1d --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -10,21 +10,23 @@ CinnabarGymScript_75759: bit 6, [hl] res 6, [hl] push hl - call nz, CinnabarGymScript_75772 + call nz, .LoadNames pop hl bit 5, [hl] res 5, [hl] call nz, UpdateCinnabarGymGateTileBlocks ResetEvent EVENT_2A7 ret -CinnabarGymScript_75772: - ld hl, Gym7CityName - ld de, Gym7LeaderName + +.LoadNames: + ld hl, .CityName + ld de, .LeaderName jp LoadGymLeaderAndCityName -Gym7CityName: +.CityName: db "CINNABAR ISLAND@" -Gym7LeaderName: + +.LeaderName: db "BLAINE@" CinnabarGymScript_75792: @@ -36,7 +38,7 @@ CinnabarGymScript_75792: ret CinnabarGymScript_757a0: - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] ld [wTrainerHeaderFlagBit], a ret @@ -50,7 +52,7 @@ CinnabarGymScript0: ld a, [wOpponentAfterWrongAnswer] and a ret z - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a cp $4 jr nz, .asm_757c3 ld a, PLAYER_DIR_DOWN @@ -71,11 +73,11 @@ CinnabarGymScript0: MovementData_757d7: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_UP - db $FF + db -1 ; end MovementData_757da: db NPC_MOVEMENT_LEFT - db $FF + db -1 ; end CinnabarGymScript1: ld a, [wd730] @@ -85,7 +87,7 @@ CinnabarGymScript1: ld [wJoyIgnore], a ld a, [wOpponentAfterWrongAnswer] ld [wTrainerHeaderFlagBit], a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID CinnabarGymFlagAction: @@ -96,7 +98,7 @@ CinnabarGymScript2: cp $ff jp z, CinnabarGymScript_75792 ld a, [wTrainerHeaderFlagBit] - ld [$ffdb], a + ldh [hGymGateIndex], a AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 ld c, a ld b, FLAG_TEST @@ -111,7 +113,7 @@ CinnabarGymScript2: call WaitForSoundToFinish .asm_7581b ld a, [wTrainerHeaderFlagBit] - ld [$ffdb], a + ldh [hGymGateIndex], a AdjustEventBit EVENT_BEAT_CINNABAR_GYM_TRAINER_0, 2 ld c, a ld b, FLAG_SET @@ -141,26 +143,26 @@ CinnabarGymScript3: ld [wJoyIgnore], a CinnabarGymScript3_75857: ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_BLAINE - lb bc, TM_38, 1 + lb bc, TM_FIRE_BLAST, 1 call GiveItem jr nc, .BagFull ld a, $b - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM38 - jr .asm_75880 + jr .gymVictory .BagFull ld a, $c - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_75880 +.gymVictory ld hl, wObtainedBadges - set 6, [hl] + set BIT_VOLCANOBADGE, [hl] ld hl, wBeatGymFlags - set 6, [hl] + set BIT_VOLCANOBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 @@ -185,7 +187,7 @@ CinnabarGym_TextPointers: dw TM38NoRoomText CinnabarGymScript_758b7: - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -205,19 +207,19 @@ CinnabarGymScript_758b7: jp TextScriptEnd CinnabarGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_BLAINE - jr z, .asm_d9332 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM38 - jr nz, .asm_3012f + jr nz, .afterVictory call z, CinnabarGymScript3_75857 call DisableWaitingAfterTextDisplay jp TextScriptEnd -.asm_3012f +.afterVictory ld hl, BlaineFireBlastText call PrintText jp TextScriptEnd -.asm_d9332 +.beginBattle ld hl, BlaineBattleText call PrintText ld hl, BlaineEndBattleText @@ -228,35 +230,35 @@ CinnabarGymText1: jp CinnabarGymScript_758b7 BlaineBattleText: - TX_FAR _BlaineBattleText - db "@" + text_far _BlaineBattleText + text_end BlaineEndBattleText: - TX_FAR _BlaineEndBattleText - TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded - TX_WAIT - db "@" + text_far _BlaineEndBattleText + sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + text_waitbutton + text_end BlaineFireBlastText: - TX_FAR _BlaineFireBlastText - db "@" + text_far _BlaineFireBlastText + text_end BlaineBadgeText: - TX_FAR _BlaineBadgeText - db "@" + text_far _BlaineBadgeText + text_end ReceivedTM38Text: - TX_FAR _ReceivedTM38Text - TX_SFX_ITEM_1 - TX_FAR _TM38ExplanationText - db "@" + text_far _ReceivedTM38Text + sound_get_item_1 + text_far _TM38ExplanationText + text_end TM38NoRoomText: - TX_FAR _TM38NoRoomText - db "@" + text_far _TM38NoRoomText + text_end CinnabarGymText2: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 jr nz, .asm_46bb4 @@ -272,19 +274,19 @@ CinnabarGymText2: jp TextScriptEnd CinnabarGymText_7595f: - TX_FAR _CinnabarGymText_7595f - db "@" + text_far _CinnabarGymText_7595f + text_end CinnabarGymText_75964: - TX_FAR _CinnabarGymText_75964 - db "@" + text_far _CinnabarGymText_75964 + text_end CinnabarGymText_75969: - TX_FAR _CinnabarGymText_75969 - db "@" + text_far _CinnabarGymText_75969 + text_end CinnabarGymText3: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 jr nz, .asm_4b406 @@ -300,19 +302,19 @@ CinnabarGymText3: jp TextScriptEnd CinnabarGymText_75994: - TX_FAR _CinnabarGymText_75994 - db "@" + text_far _CinnabarGymText_75994 + text_end CinnabarGymText_75999: - TX_FAR _CinnabarGymText_75999 - db "@" + text_far _CinnabarGymText_75999 + text_end CinnabarGymText_7599e: - TX_FAR _CinnabarGymText_7599e - db "@" + text_far _CinnabarGymText_7599e + text_end CinnabarGymText4: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 jr nz, .asm_c0673 @@ -328,19 +330,19 @@ CinnabarGymText4: jp TextScriptEnd CinnabarGymText_759c9: - TX_FAR _CinnabarGymText_759c9 - db "@" + text_far _CinnabarGymText_759c9 + text_end CinnabarGymText_759ce: - TX_FAR _CinnabarGymText_759ce - db "@" + text_far _CinnabarGymText_759ce + text_end CinnabarGymText_759d3: - TX_FAR _CinnabarGymText_759d3 - db "@" + text_far _CinnabarGymText_759d3 + text_end CinnabarGymText5: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 jr nz, .asm_5cfd7 @@ -356,19 +358,19 @@ CinnabarGymText5: jp TextScriptEnd CinnabarGymText_759fe: - TX_FAR _CinnabarGymText_759fe - db "@" + text_far _CinnabarGymText_759fe + text_end CinnabarGymText_75a03: - TX_FAR _CinnabarGymText_75a03 - db "@" + text_far _CinnabarGymText_75a03 + text_end CinnabarGymText_75a08: - TX_FAR _CinnabarGymText_75a08 - db "@" + text_far _CinnabarGymText_75a08 + text_end CinnabarGymText6: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 jr nz, .asm_776b4 @@ -384,19 +386,19 @@ CinnabarGymText6: jp TextScriptEnd CinnabarGymText_75a33: - TX_FAR _CinnabarGymText_75a33 - db "@" + text_far _CinnabarGymText_75a33 + text_end CinnabarGymText_75a38: - TX_FAR _CinnabarGymText_75a38 - db "@" + text_far _CinnabarGymText_75a38 + text_end CinnabarGymText_75a3d: - TX_FAR _CinnabarGymText_75a3d - db "@" + text_far _CinnabarGymText_75a3d + text_end CinnabarGymText7: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 jr nz, .asm_2f755 @@ -412,19 +414,19 @@ CinnabarGymText7: jp TextScriptEnd CinnabarGymText_75a68: - TX_FAR _CinnabarGymText_75a68 - db "@" + text_far _CinnabarGymText_75a68 + text_end CinnabarGymText_75a6d: - TX_FAR _CinnabarGymText_75a6d - db "@" + text_far _CinnabarGymText_75a6d + text_end CinnabarGymText_75a72: - TX_FAR _CinnabarGymText_75a72 - db "@" + text_far _CinnabarGymText_75a72 + text_end CinnabarGymText8: - TX_ASM + text_asm call CinnabarGymScript_757a0 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 jr nz, .asm_d87be @@ -440,19 +442,19 @@ CinnabarGymText8: jp TextScriptEnd CinnabarGymText_75a9d: - TX_FAR _CinnabarGymText_75a9d - db "@" + text_far _CinnabarGymText_75a9d + text_end CinnabarGymText_75aa2: - TX_FAR _CinnabarGymText_75aa2 - db "@" + text_far _CinnabarGymText_75aa2 + text_end CinnabarGymText_75aa7: - TX_FAR _CinnabarGymText_75aa7 - db "@" + text_far _CinnabarGymText_75aa7 + text_end CinnabarGymText9: - TX_ASM + text_asm CheckEvent EVENT_BEAT_BLAINE jr nz, .asm_627d9 ld hl, CinnabarGymText_75ac2 @@ -464,9 +466,9 @@ CinnabarGymText9: jp TextScriptEnd CinnabarGymText_75ac2: - TX_FAR _CinnabarGymText_75ac2 - db "@" + text_far _CinnabarGymText_75ac2 + text_end CinnabarGymText_75ac7: - TX_FAR _CinnabarGymText_75ac7 - db "@" + text_far _CinnabarGymText_75ac7 + text_end diff --git a/scripts/CinnabarIsland.asm b/scripts/CinnabarIsland.asm old mode 100755 new mode 100644 index b6346a9c..a1b20cd3 --- a/scripts/CinnabarIsland.asm +++ b/scripts/CinnabarIsland.asm @@ -17,25 +17,25 @@ CinnabarIslandScript0: call IsItemInBag ret nz ld a, [wYCoord] - cp $4 + cp 4 ret nz ld a, [wXCoord] - cp $12 + cp 18 ret nz ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates xor a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a ld a, $1 ld [wCinnabarIslandCurScript], a @@ -61,25 +61,25 @@ CinnabarIsland_TextPointers: dw CinnabarIslandText8 CinnabarIslandText8: - TX_FAR _CinnabarIslandText8 - db "@" + text_far _CinnabarIslandText8 + text_end CinnabarIslandText1: - TX_FAR _CinnabarIslandText1 - db "@" + text_far _CinnabarIslandText1 + text_end CinnabarIslandText2: - TX_FAR _CinnabarIslandText2 - db "@" + text_far _CinnabarIslandText2 + text_end CinnabarIslandText3: - TX_FAR _CinnabarIslandText3 - db "@" + text_far _CinnabarIslandText3 + text_end CinnabarIslandText6: - TX_FAR _CinnabarIslandText6 - db "@" + text_far _CinnabarIslandText6 + text_end CinnabarIslandText7: - TX_FAR _CinnabarIslandText7 - db "@" + text_far _CinnabarIslandText7 + text_end diff --git a/scripts/CinnabarLab.asm b/scripts/CinnabarLab.asm old mode 100755 new mode 100644 index aab3324b..2f4be7f2 --- a/scripts/CinnabarLab.asm +++ b/scripts/CinnabarLab.asm @@ -10,21 +10,21 @@ CinnabarLab_TextPointers: dw Lab1Text5 Lab1Text1: - TX_FAR _Lab1Text1 - db "@" + text_far _Lab1Text1 + text_end Lab1Text2: - TX_FAR _Lab1Text2 - db "@" + text_far _Lab1Text2 + text_end Lab1Text3: - TX_FAR _Lab1Text3 - db "@" + text_far _Lab1Text3 + text_end Lab1Text4: - TX_FAR _Lab1Text4 - db "@" + text_far _Lab1Text4 + text_end Lab1Text5: - TX_FAR _Lab1Text5 - db "@" + text_far _Lab1Text5 + text_end diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm old mode 100755 new mode 100644 index f5f03a19..2c388119 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -44,10 +44,10 @@ FossilsList: db DOME_FOSSIL db HELIX_FOSSIL db OLD_AMBER - db $00 + db 0 ; end Lab4Text1: - TX_ASM + text_asm CheckEvent EVENT_GAVE_FOSSIL_TO_LAB jr nz, .asm_75d96 ld hl, Lab4Text_75dc6 @@ -56,7 +56,7 @@ Lab4Text1: ld a, [wFilteredBagItemsCount] and a jr z, .asm_75d8d - callba GiveFossilToCinnabarLab + farcall GiveFossilToCinnabarLab jr .asm_75d93 .asm_75d8d ld hl, Lab4Text_75dcb @@ -83,27 +83,27 @@ Lab4Text1: jr .asm_75d93 Lab4Text_75dc6: - TX_FAR _Lab4Text_75dc6 - db "@" + text_far _Lab4Text_75dc6 + text_end Lab4Text_75dcb: - TX_FAR _Lab4Text_75dcb - db "@" + text_far _Lab4Text_75dcb + text_end Lab4Text_75dd0: - TX_FAR _Lab4Text_75dd0 - db "@" + text_far _Lab4Text_75dd0 + text_end Lab4Text_75dd5: - TX_FAR _Lab4Text_75dd5 - db "@" + text_far _Lab4Text_75dd5 + text_end Lab4Text2: - TX_ASM - ld a, $3 + text_asm + ld a, TRADE_FOR_SAILOR ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd LoadFossilItemAndMonNameBank1D: - jpba LoadFossilItemAndMonName + farjp LoadFossilItemAndMonName diff --git a/scripts/CinnabarLabMetronomeRoom.asm b/scripts/CinnabarLabMetronomeRoom.asm old mode 100755 new mode 100644 index 6eddceae..b43f98e2 --- a/scripts/CinnabarLabMetronomeRoom.asm +++ b/scripts/CinnabarLabMetronomeRoom.asm @@ -9,54 +9,54 @@ CinnabarLabMetronomeRoom_TextPointers: dw Lab3Text5 Lab3Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM35 - jr nz, .asm_e551a + jr nz, .got_item ld hl, TM35PreReceiveText call PrintText - lb bc, TM_35, 1 + lb bc, TM_METRONOME, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedTM35Text call PrintText SetEvent EVENT_GOT_TM35 - jr .asm_eb896 -.BagFull + jr .done +.bag_full ld hl, TM35NoRoomText call PrintText - jr .asm_eb896 -.asm_e551a + jr .done +.got_item ld hl, TM35ExplanationText call PrintText -.asm_eb896 +.done jp TextScriptEnd TM35PreReceiveText: - TX_FAR _TM35PreReceiveText - db "@" + text_far _TM35PreReceiveText + text_end ReceivedTM35Text: - TX_FAR _ReceivedTM35Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM35Text + sound_get_item_1 + text_end TM35ExplanationText: - TX_FAR _TM35ExplanationText - db "@" + text_far _TM35ExplanationText + text_end TM35NoRoomText: - TX_FAR _TM35NoRoomText - db "@" + text_far _TM35NoRoomText + text_end Lab3Text2: - TX_FAR _Lab3Text2 - db "@" + text_far _Lab3Text2 + text_end Lab3Text4: Lab3Text3: - TX_FAR _Lab3Text3 - db "@" + text_far _Lab3Text3 + text_end Lab3Text5: - TX_FAR _Lab3Text5 - db "@" + text_far _Lab3Text5 + text_end diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm old mode 100755 new mode 100644 index 6093ae14..1f8710be --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -7,18 +7,18 @@ CinnabarLabTradeRoom_TextPointers: dw Lab2Text3 Lab2Text1: - TX_FAR _Lab2Text1 - db "@" + text_far _Lab2Text1 + text_end Lab2Text2: - TX_ASM - ld a, $7 + text_asm + ld a, TRADE_FOR_DORIS ld [wWhichTrade], a jr Lab2DoTrade Lab2Text3: - TX_ASM - ld a, $8 + text_asm + ld a, TRADE_FOR_CRINKLES ld [wWhichTrade], a Lab2DoTrade: predef DoInGameTradeDialogue diff --git a/scripts/CinnabarMart.asm b/scripts/CinnabarMart.asm old mode 100755 new mode 100644 index 898948c7..e614bd29 --- a/scripts/CinnabarMart.asm +++ b/scripts/CinnabarMart.asm @@ -7,9 +7,9 @@ CinnabarMart_TextPointers: dw CinnabarMartText3 CinnabarMartText2: - TX_FAR _CinnabarMartText2 - db "@" + text_far _CinnabarMartText2 + text_end CinnabarMartText3: - TX_FAR _CinnabarMartText3 - db "@" + text_far _CinnabarMartText3 + text_end diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm old mode 100755 new mode 100644 index a6184bb0..9396f851 --- a/scripts/CinnabarPokecenter.asm +++ b/scripts/CinnabarPokecenter.asm @@ -9,15 +9,15 @@ CinnabarPokecenter_TextPointers: dw CinnabarTradeNurseText CinnabarHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse CinnabarPokecenterText2: - TX_FAR _CinnabarPokecenterText2 - db "@" + text_far _CinnabarPokecenterText2 + text_end CinnabarPokecenterText3: - TX_FAR _CinnabarPokecenterText3 - db "@" + text_far _CinnabarPokecenterText3 + text_end CinnabarTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/Colosseum.asm b/scripts/Colosseum.asm old mode 100755 new mode 100644 index 8cc6b056..83d41bdc --- a/scripts/Colosseum.asm +++ b/scripts/Colosseum.asm @@ -5,5 +5,5 @@ Colosseum_TextPointers: dw ColosseumText1 ColosseumText1: - TX_FAR _ColosseumText1 - db "@" + text_far _ColosseumText1 + text_end diff --git a/scripts/CopycatsHouse1F.asm b/scripts/CopycatsHouse1F.asm old mode 100755 new mode 100644 index a86625fc..fc5ff3cf --- a/scripts/CopycatsHouse1F.asm +++ b/scripts/CopycatsHouse1F.asm @@ -7,16 +7,16 @@ CopycatsHouse1F_TextPointers: dw CopycatsHouse1FText3 CopycatsHouse1FText1: - TX_FAR _CopycatsHouse1FText1 - db "@" + text_far _CopycatsHouse1FText1 + text_end CopycatsHouse1FText2: - TX_FAR _CopycatsHouse1FText2 - db "@" + text_far _CopycatsHouse1FText2 + text_end CopycatsHouse1FText3: - TX_FAR _CopycatsHouse1FText3 - TX_ASM + text_far _CopycatsHouse1FText3 + text_asm ld a, CHANSEY call PlayCry jp TextScriptEnd diff --git a/scripts/CopycatsHouse2F.asm b/scripts/CopycatsHouse2F.asm old mode 100755 new mode 100644 index b43234c3..ef0742ab --- a/scripts/CopycatsHouse2F.asm +++ b/scripts/CopycatsHouse2F.asm @@ -11,80 +11,80 @@ CopycatsHouse2F_TextPointers: dw CopycatsHouse2FText7 CopycatsHouse2FText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM31 - jr nz, .asm_7ccf3 - ld a, $1 + jr nz, .got_item + ld a, TRUE ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, CopycatsHouse2FText_5ccd4 call PrintText ld b, POKE_DOLL call IsItemInBag - jr z, .asm_62ecd + jr z, .done ld hl, TM31PreReceiveText call PrintText - lb bc, TM_31, 1 + lb bc, TM_MIMIC, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedTM31Text call PrintText ld a, POKE_DOLL - ld [$ffdb], a - callba RemoveItemByID + ldh [hItemToRemoveID], a + farcall RemoveItemByID SetEvent EVENT_GOT_TM31 - jr .asm_62ecd -.BagFull + jr .done +.bag_full ld hl, TM31NoRoomText call PrintText - jr .asm_62ecd -.asm_7ccf3 + jr .done +.got_item ld hl, TM31ExplanationText2 call PrintText -.asm_62ecd +.done jp TextScriptEnd CopycatsHouse2FText_5ccd4: - TX_FAR _CopycatsHouse2FText_5ccd4 - db "@" + text_far _CopycatsHouse2FText_5ccd4 + text_end TM31PreReceiveText: - TX_FAR _TM31PreReceiveText - db "@" + text_far _TM31PreReceiveText + text_end ReceivedTM31Text: - TX_FAR _ReceivedTM31Text - TX_SFX_ITEM_1 + text_far _ReceivedTM31Text + sound_get_item_1 TM31ExplanationText1: - TX_FAR _TM31ExplanationText1 - TX_WAIT - db "@" + text_far _TM31ExplanationText1 + text_waitbutton + text_end TM31ExplanationText2: - TX_FAR _TM31ExplanationText2 - db "@" + text_far _TM31ExplanationText2 + text_end TM31NoRoomText: - TX_FAR _TM31NoRoomText - TX_WAIT - db "@" + text_far _TM31NoRoomText + text_waitbutton + text_end CopycatsHouse2FText2: - TX_FAR _CopycatsHouse2FText2 - db "@" + text_far _CopycatsHouse2FText2 + text_end CopycatsHouse2FText5: CopycatsHouse2FText4: CopycatsHouse2FText3: - TX_FAR _CopycatsHouse2FText3 - db "@" + text_far _CopycatsHouse2FText3 + text_end CopycatsHouse2FText6: - TX_FAR _CopycatsHouse2FText6 - db "@" + text_far _CopycatsHouse2FText6 + text_end CopycatsHouse2FText7: - TX_ASM - ld a, [wSpriteStateData1 + 9] + text_asm + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ld hl, CopycatsHouse2FText_5cd1c jr nz, .notUp @@ -94,9 +94,9 @@ CopycatsHouse2FText7: jp TextScriptEnd CopycatsHouse2FText_5cd17: - TX_FAR _CopycatsHouse2FText_5cd17 - db "@" + text_far _CopycatsHouse2FText_5cd17 + text_end CopycatsHouse2FText_5cd1c: - TX_FAR _CopycatsHouse2FText_5cd1c - db "@" + text_far _CopycatsHouse2FText_5cd1c + text_end diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm old mode 100755 new mode 100644 index 81cf5534..481d7e14 --- a/scripts/Daycare.asm +++ b/scripts/Daycare.asm @@ -5,7 +5,7 @@ Daycare_TextPointers: dw DayCareMText1 DayCareMText1: - TX_ASM + text_asm call SaveScreenTilesToBuffer2 ld a, [wDayCareInUse] and a @@ -35,7 +35,7 @@ DayCareMText1: pop af ld hl, DayCareAllRightThenText jp c, .done - callab KnowsHMMove + callfar KnowsHMMove ld hl, DayCareCantAcceptMonWithHMText jp c, .done xor a @@ -65,19 +65,19 @@ DayCareMText1: ld a, DAYCARE_DATA ld [wMonDataLocation], a call LoadMonData - callab CalcLevelFromExperience + callfar CalcLevelFromExperience ld a, d cp MAX_LEVEL jr c, .skipCalcExp ld d, MAX_LEVEL - callab CalcExperience + callfar CalcExperience ld hl, wDayCareMonExp - ld a, [hExperience] + ldh a, [hExperience] ld [hli], a - ld a, [hExperience + 1] + ldh a, [hExperience + 1] ld [hli], a - ld a, [hExperience + 2] + ldh a, [hExperience + 2] ld [hl], a ld d, MAX_LEVEL @@ -138,11 +138,11 @@ DayCareMText1: and a jp nz, .leaveMonInDayCare ld hl, wDayCareTotalCost - ld [hMoney], a + ldh [hMoney], a ld a, [hli] - ld [hMoney + 1], a + ldh [hMoney + 1], a ld a, [hl] - ld [hMoney + 2], a + ldh [hMoney + 2], a call HasEnoughMoney jr nc, .enoughMoney ld hl, DayCareNotEnoughMoneyText @@ -211,59 +211,59 @@ DayCareMText1: jp TextScriptEnd DayCareIntroText: - TX_FAR _DayCareIntroText - db "@" + text_far _DayCareIntroText + text_end DayCareWhichMonText: - TX_FAR _DayCareWhichMonText - db "@" + text_far _DayCareWhichMonText + text_end DayCareWillLookAfterMonText: - TX_FAR _DayCareWillLookAfterMonText - db "@" + text_far _DayCareWillLookAfterMonText + text_end DayCareComeSeeMeInAWhileText: - TX_FAR _DayCareComeSeeMeInAWhileText - db "@" + text_far _DayCareComeSeeMeInAWhileText + text_end DayCareMonHasGrownText: - TX_FAR _DayCareMonHasGrownText - db "@" + text_far _DayCareMonHasGrownText + text_end DayCareOweMoneyText: - TX_FAR _DayCareOweMoneyText - db "@" + text_far _DayCareOweMoneyText + text_end DayCareGotMonBackText: - TX_FAR _DayCareGotMonBackText - db "@" + text_far _DayCareGotMonBackText + text_end DayCareMonNeedsMoreTimeText: - TX_FAR _DayCareMonNeedsMoreTimeText - db "@" + text_far _DayCareMonNeedsMoreTimeText + text_end DayCareAllRightThenText: - TX_FAR _DayCareAllRightThenText + text_far _DayCareAllRightThenText DayCareComeAgainText: - TX_FAR _DayCareComeAgainText - db "@" + text_far _DayCareComeAgainText + text_end DayCareNoRoomForMonText: - TX_FAR _DayCareNoRoomForMonText - db "@" + text_far _DayCareNoRoomForMonText + text_end DayCareOnlyHaveOneMonText: - TX_FAR _DayCareOnlyHaveOneMonText - db "@" + text_far _DayCareOnlyHaveOneMonText + text_end DayCareCantAcceptMonWithHMText: - TX_FAR _DayCareCantAcceptMonWithHMText - db "@" + text_far _DayCareCantAcceptMonWithHMText + text_end DayCareHeresYourMonText: - TX_FAR _DayCareHeresYourMonText - db "@" + text_far _DayCareHeresYourMonText + text_end DayCareNotEnoughMoneyText: - TX_FAR _DayCareNotEnoughMoneyText - db "@" + text_far _DayCareNotEnoughMoneyText + text_end diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm old mode 100755 new mode 100644 index 1d7b23f9..f9f2e590 --- a/scripts/DiglettsCave.asm +++ b/scripts/DiglettsCave.asm @@ -2,4 +2,5 @@ DiglettsCave_Script: jp EnableAutoTextBoxDrawing DiglettsCave_TextPointers: - db "@" + + text_end ; unused diff --git a/scripts/DiglettsCaveRoute11.asm b/scripts/DiglettsCaveRoute11.asm old mode 100755 new mode 100644 index 54c3112e..648fe2bc --- a/scripts/DiglettsCaveRoute11.asm +++ b/scripts/DiglettsCaveRoute11.asm @@ -8,5 +8,5 @@ DiglettsCaveRoute11_TextPointers: dw DiglettsCaveEntranceRoute11Text1 DiglettsCaveEntranceRoute11Text1: - TX_FAR _DiglettsCaveEntRoute11Text1 - db "@" + text_far _DiglettsCaveEntRoute11Text1 + text_end diff --git a/scripts/DiglettsCaveRoute2.asm b/scripts/DiglettsCaveRoute2.asm old mode 100755 new mode 100644 index 5fe7777c..32f17d65 --- a/scripts/DiglettsCaveRoute2.asm +++ b/scripts/DiglettsCaveRoute2.asm @@ -7,5 +7,5 @@ DiglettsCaveRoute2_TextPointers: dw DiglettsCaveRoute2Text1 DiglettsCaveRoute2Text1: - TX_FAR _DiglettsCaveRoute2Text1 - db "@" + text_far _DiglettsCaveRoute2Text1 + text_end diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm old mode 100755 new mode 100644 index fc691dba..e5d0a0a7 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -30,25 +30,25 @@ FightingDojoScript1: CheckEvent EVENT_BEAT_KARATE_MASTER ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld [wcf0d], a ld a, [wYCoord] - cp $3 + cp 3 ret nz ld a, [wXCoord] - cp $4 + cp 4 ret nz ld a, $1 ld [wcf0d], a ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ret @@ -62,9 +62,9 @@ FightingDojoScript3: ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay .asm_5cde4 @@ -72,7 +72,7 @@ FightingDojoScript3: ld [wJoyIgnore], a SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -91,45 +91,17 @@ FightingDojo_TextPointers: dw FightingDojoText8 FightingDojoTrainerHeader0: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 - dw FightingDojoBattleText1 ; TextBeforeBattle - dw FightingDojoAfterBattleText1 ; TextAfterBattle - dw FightingDojoEndBattleText1 ; TextEndBattle - dw FightingDojoEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_0, 4, FightingDojoBattleText1, FightingDojoEndBattleText1, FightingDojoAfterBattleText1 FightingDojoTrainerHeader1: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 - dw FightingDojoBattleText2 ; TextBeforeBattle - dw FightingDojoAfterBattleText2 ; TextAfterBattle - dw FightingDojoEndBattleText2 ; TextEndBattle - dw FightingDojoEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_1, 4, FightingDojoBattleText2, FightingDojoEndBattleText2, FightingDojoAfterBattleText2 FightingDojoTrainerHeader2: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 - dw FightingDojoBattleText3 ; TextBeforeBattle - dw FightingDojoAfterBattleText3 ; TextAfterBattle - dw FightingDojoEndBattleText3 ; TextEndBattle - dw FightingDojoEndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_2, 3, FightingDojoBattleText3, FightingDojoEndBattleText3, FightingDojoAfterBattleText3 FightingDojoTrainerHeader3: - dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 - dw FightingDojoBattleText4 ; TextBeforeBattle - dw FightingDojoAfterBattleText4 ; TextAfterBattle - dw FightingDojoEndBattleText4 ; TextEndBattle - dw FightingDojoEndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_FIGHTING_DOJO_TRAINER_3, 3, FightingDojoBattleText4, FightingDojoEndBattleText4, FightingDojoAfterBattleText4 + db -1 ; end FightingDojoText1: - TX_ASM + text_asm CheckEvent EVENT_DEFEATED_FIGHTING_DOJO jp nz, .continue1 CheckEventReuseA EVENT_BEAT_KARATE_MASTER @@ -142,7 +114,7 @@ FightingDojoText1: ld hl, FightingDojoText_5ce93 ld de, FightingDojoText_5ce93 call SaveEndBattleTextPointers - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -161,96 +133,96 @@ FightingDojoText1: jp TextScriptEnd FightingDojoText_5ce8e: - TX_FAR _FightingDojoText_5ce8e - db "@" + text_far _FightingDojoText_5ce8e + text_end FightingDojoText_5ce93: - TX_FAR _FightingDojoText_5ce93 - db "@" + text_far _FightingDojoText_5ce93 + text_end FightingDojoText8: - TX_FAR _FightingDojoText_5ce98 - db "@" + text_far _FightingDojoText_5ce98 + text_end FightingDojoText_5ce9d: - TX_FAR _FightingDojoText_5ce9d - db "@" + text_far _FightingDojoText_5ce9d + text_end FightingDojoText2: - TX_ASM + text_asm ld hl, FightingDojoTrainerHeader0 call TalkToTrainer jp TextScriptEnd FightingDojoBattleText1: - TX_FAR _FightingDojoBattleText1 - db "@" + text_far _FightingDojoBattleText1 + text_end FightingDojoEndBattleText1: - TX_FAR _FightingDojoEndBattleText1 - db "@" + text_far _FightingDojoEndBattleText1 + text_end FightingDojoAfterBattleText1: - TX_FAR _FightingDojoAfterBattleText1 - db "@" + text_far _FightingDojoAfterBattleText1 + text_end FightingDojoText3: - TX_ASM + text_asm ld hl, FightingDojoTrainerHeader1 call TalkToTrainer jp TextScriptEnd FightingDojoBattleText2: - TX_FAR _FightingDojoBattleText2 - db "@" + text_far _FightingDojoBattleText2 + text_end FightingDojoEndBattleText2: - TX_FAR _FightingDojoEndBattleText2 - db "@" + text_far _FightingDojoEndBattleText2 + text_end FightingDojoAfterBattleText2: - TX_FAR _FightingDojoAfterBattleText2 - db "@" + text_far _FightingDojoAfterBattleText2 + text_end FightingDojoText4: - TX_ASM + text_asm ld hl, FightingDojoTrainerHeader2 call TalkToTrainer jp TextScriptEnd FightingDojoBattleText3: - TX_FAR _FightingDojoBattleText3 - db "@" + text_far _FightingDojoBattleText3 + text_end FightingDojoEndBattleText3: - TX_FAR _FightingDojoEndBattleText3 - db "@" + text_far _FightingDojoEndBattleText3 + text_end FightingDojoAfterBattleText3: - TX_FAR _FightingDojoAfterBattleText3 - db "@" + text_far _FightingDojoAfterBattleText3 + text_end FightingDojoText5: - TX_ASM + text_asm ld hl, FightingDojoTrainerHeader3 call TalkToTrainer jp TextScriptEnd FightingDojoBattleText4: - TX_FAR _FightingDojoBattleText4 - db "@" + text_far _FightingDojoBattleText4 + text_end FightingDojoEndBattleText4: - TX_FAR _FightingDojoEndBattleText4 - db "@" + text_far _FightingDojoEndBattleText4 + text_end FightingDojoAfterBattleText4: - TX_FAR _FightingDojoAfterBattleText4 - db "@" + text_far _FightingDojoAfterBattleText4 + text_end FightingDojoText6: ; Hitmonlee Poké Ball - TX_ASM + text_asm CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN jr z, .GetMon ld hl, OtherHitmonText @@ -280,12 +252,12 @@ FightingDojoText6: jp TextScriptEnd WantHitmonleeText: - TX_FAR _WantHitmonleeText - db "@" + text_far _WantHitmonleeText + text_end FightingDojoText7: ; Hitmonchan Poké Ball - TX_ASM + text_asm CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN jr z, .GetMon ld hl, OtherHitmonText @@ -315,9 +287,9 @@ FightingDojoText7: jp TextScriptEnd WantHitmonchanText: - TX_FAR _WantHitmonchanText - db "@" + text_far _WantHitmonchanText + text_end OtherHitmonText: - TX_FAR _OtherHitmonText - db "@" + text_far _OtherHitmonText + text_end diff --git a/scripts/FuchsiaBillsGrandpasHouse.asm b/scripts/FuchsiaBillsGrandpasHouse.asm old mode 100755 new mode 100644 index ca5f2c16..69ce1cf1 --- a/scripts/FuchsiaBillsGrandpasHouse.asm +++ b/scripts/FuchsiaBillsGrandpasHouse.asm @@ -8,13 +8,13 @@ FuchsiaBillsGrandpasHouse_TextPointers: dw FuchsiaHouse1Text3 FuchsiaHouse1Text1: - TX_FAR _FuchsiaHouse1Text1 - db "@" + text_far _FuchsiaHouse1Text1 + text_end FuchsiaHouse1Text2: - TX_FAR _FuchsiaHouse1Text2 - db "@" + text_far _FuchsiaHouse1Text2 + text_end FuchsiaHouse1Text3: - TX_FAR _FuchsiaHouse1Text3 - db "@" + text_far _FuchsiaHouse1Text3 + text_end diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm old mode 100755 new mode 100644 index d3f0ce32..ac9f273b --- a/scripts/FuchsiaCity.asm +++ b/scripts/FuchsiaCity.asm @@ -28,20 +28,20 @@ FuchsiaCity_TextPointers: dw FuchsiaCityText24 FuchsiaCityText1: - TX_FAR _FuchsiaCityText1 - db "@" + text_far _FuchsiaCityText1 + text_end FuchsiaCityText2: - TX_FAR _FuchsiaCityText2 - db "@" + text_far _FuchsiaCityText2 + text_end FuchsiaCityText3: - TX_FAR _FuchsiaCityText3 - db "@" + text_far _FuchsiaCityText3 + text_end FuchsiaCityText4: - TX_FAR _FuchsiaCityText4 - db "@" + text_far _FuchsiaCityText4 + text_end FuchsiaCityText5: FuchsiaCityText6: @@ -49,32 +49,32 @@ FuchsiaCityText7: FuchsiaCityText8: FuchsiaCityText9: FuchsiaCityText10: - TX_FAR _FuchsiaCityText5 - db "@" + text_far _FuchsiaCityText5 + text_end FuchsiaCityText12: FuchsiaCityText11: - TX_FAR _FuchsiaCityText11 - db "@" + text_far _FuchsiaCityText11 + text_end FuchsiaCityText13: - TX_FAR _FuchsiaCityText13 - db "@" + text_far _FuchsiaCityText13 + text_end FuchsiaCityText16: - TX_FAR _FuchsiaCityText16 - db "@" + text_far _FuchsiaCityText16 + text_end FuchsiaCityText17: - TX_FAR _FuchsiaCityText17 - db "@" + text_far _FuchsiaCityText17 + text_end FuchsiaCityText18: - TX_FAR _FuchsiaCityText18 - db "@" + text_far _FuchsiaCityText18 + text_end FuchsiaCityText19: - TX_ASM + text_asm ld hl, FuchsiaCityChanseyText call PrintText ld a, CHANSEY @@ -82,11 +82,11 @@ FuchsiaCityText19: jp TextScriptEnd FuchsiaCityChanseyText: - TX_FAR _FuchsiaCityChanseyText - db "@" + text_far _FuchsiaCityChanseyText + text_end FuchsiaCityText20: - TX_ASM + text_asm ld hl, FuchsiaCityVoltorbText call PrintText ld a, VOLTORB @@ -94,11 +94,11 @@ FuchsiaCityText20: jp TextScriptEnd FuchsiaCityVoltorbText: - TX_FAR _FuchsiaCityVoltorbText - db "@" + text_far _FuchsiaCityVoltorbText + text_end FuchsiaCityText21: - TX_ASM + text_asm ld hl, FuchsiaCityKangaskhanText call PrintText ld a, KANGASKHAN @@ -106,11 +106,11 @@ FuchsiaCityText21: jp TextScriptEnd FuchsiaCityKangaskhanText: - TX_FAR _FuchsiaCityKangaskhanText - db "@" + text_far _FuchsiaCityKangaskhanText + text_end FuchsiaCityText22: - TX_ASM + text_asm ld hl, FuchsiaCitySlowpokeText call PrintText ld a, SLOWPOKE @@ -118,11 +118,11 @@ FuchsiaCityText22: jp TextScriptEnd FuchsiaCitySlowpokeText: - TX_FAR _FuchsiaCitySlowpokeText - db "@" + text_far _FuchsiaCitySlowpokeText + text_end FuchsiaCityText23: - TX_ASM + text_asm ld hl, FuchsiaCityLaprasText call PrintText ld a, LAPRAS @@ -130,11 +130,11 @@ FuchsiaCityText23: jp TextScriptEnd FuchsiaCityLaprasText: - TX_FAR _FuchsiaCityLaprasText - db "@" + text_far _FuchsiaCityLaprasText + text_end FuchsiaCityText24: - TX_ASM + text_asm CheckEvent EVENT_GOT_DOME_FOSSIL jr nz, .asm_3b4e8 CheckEventReuseA EVENT_GOT_HELIX_FOSSIL @@ -157,13 +157,13 @@ FuchsiaCityText24: jp TextScriptEnd FuchsiaCityOmanyteText: - TX_FAR _FuchsiaCityOmanyteText - db "@" + text_far _FuchsiaCityOmanyteText + text_end FuchsiaCityKabutoText: - TX_FAR _FuchsiaCityKabutoText - db "@" + text_far _FuchsiaCityKabutoText + text_end FuchsiaCityText_19b2a: - TX_FAR _FuchsiaCityText_19b2a - db "@" + text_far _FuchsiaCityText_19b2a + text_end diff --git a/scripts/FuchsiaGoodRodHouse.asm b/scripts/FuchsiaGoodRodHouse.asm old mode 100755 new mode 100644 index 93a20e80..28f6d056 --- a/scripts/FuchsiaGoodRodHouse.asm +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -5,71 +5,62 @@ FuchsiaGoodRodHouse_TextPointers: dw FuchsiaHouse3Text1 FuchsiaHouse3Text1: - TX_ASM + text_asm ld a, [wd728] - bit 4, a - jr nz, .after - + bit 4, a ; got good rod? + jr nz, .got_item ld hl, FuchsiaHouse3Text_561bd call PrintText - call YesNoChoice ld a, [wCurrentMenuItem] and a jr nz, .refused - lb bc, GOOD_ROD, 1 call GiveItem - jr nc, .full - + jr nc, .bag_full ld hl, wd728 - set 4, [hl] - + set 4, [hl] ; got good rod ld hl, FuchsiaHouse3Text_561c2 - jr .talk - -.full + jr .done +.bag_full ld hl, FuchsiaHouse3Text_5621c - jr .talk - + jr .done .refused ld hl, FuchsiaHouse3Text_56212 - jr .talk - -.after + jr .done +.got_item ld hl, FuchsiaHouse3Text_56217 - -.talk +.done call PrintText jp TextScriptEnd FuchsiaHouse3Text_561bd: - TX_FAR _FuchsiaHouse3Text_561bd - db "@" + text_far _FuchsiaHouse3Text_561bd + text_end FuchsiaHouse3Text_561c2: - TX_FAR _FuchsiaHouse3Text_561c2 - TX_SFX_ITEM_1 - db "@" + text_far _FuchsiaHouse3Text_561c2 + sound_get_item_1 + text_end UnusedText_561c8: - para "つり こそ" - line "おとこの ロマン だ!" + para "つり　こそ" + line "おとこの　ロマン　だ！" para "へぼいつりざおは" - line "コイキングしか つれ なんだが" - line "この いいつりざおなら" - line "もっと いいもんが つれるんじゃ!" + line "コイキングしか　つれ　なんだが" + line "この　いいつりざおなら" + line "もっと　いいもんが　つれるんじゃ！" done FuchsiaHouse3Text_56212: - TX_FAR _FuchsiaHouse3Text_56212 - db "@" + text_far _FuchsiaHouse3Text_56212 + text_end FuchsiaHouse3Text_56217: - TX_FAR _FuchsiaHouse3Text_56217 - db "@" + text_far _FuchsiaHouse3Text_56217 + text_end FuchsiaHouse3Text_5621c: - TX_FAR _FuchsiaHouse3Text_5621c - db "@" + text_far _FuchsiaHouse3Text_5621c + text_end diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm old mode 100755 new mode 100644 index c856c93b..6f4f28fc --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -1,5 +1,5 @@ FuchsiaGym_Script: - call FuchsiaGymScript_75453 + call .LoadNames call EnableAutoTextBoxDrawing ld hl, FuchsiaGymTrainerHeader0 ld de, FuchsiaGym_ScriptPointers @@ -8,19 +8,20 @@ FuchsiaGym_Script: ld [wFuchsiaGymCurScript], a ret -FuchsiaGymScript_75453: +.LoadNames: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z - ld hl, Gym5CityName - ld de, Gym5LeaderName + ld hl, .CityName + ld de, .LeaderName call LoadGymLeaderAndCityName ret -Gym5CityName: +.CityName: db "FUCHSIA CITY@" -Gym5LeaderName: + +.LeaderName: db "KOGA@" FuchsiaGymScript_75477: @@ -44,26 +45,26 @@ FuchsiaGymScript3: ld [wJoyIgnore], a FuchsiaGymScript3_75497: ld a, $9 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_KOGA - lb bc, TM_06, 1 + lb bc, TM_TOXIC, 1 call GiveItem jr nc, .BagFull ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM06 - jr .asm_754c0 + jr .gymVictory .BagFull ld a, $b - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_754c0 +.gymVictory ld hl, wObtainedBadges - set 4, [hl] + set BIT_SOULBADGE, [hl] ld hl, wBeatGymFlags - set 4, [hl] + set BIT_SOULBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 @@ -84,75 +85,33 @@ FuchsiaGym_TextPointers: dw FuchsiaGymText11 FuchsiaGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 - dw FuchsiaGymBattleText1 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText1 ; TextAfterBattle - dw FuchsiaGymEndBattleText1 ; TextEndBattle - dw FuchsiaGymEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, 2, FuchsiaGymBattleText1, FuchsiaGymEndBattleText1, FuchsiaGymAfterBattleText1 FuchsiaGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1 - dw FuchsiaGymBattleText2 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText2 ; TextAfterBattle - dw FuchsiaGymEndBattleText2 ; TextEndBattle - dw FuchsiaGymEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_1, 2, FuchsiaGymBattleText2, FuchsiaGymEndBattleText2, FuchsiaGymAfterBattleText2 FuchsiaGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 - dw FuchsiaGymBattleText3 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText3 ; TextAfterBattle - dw FuchsiaGymEndBattleText3 ; TextEndBattle - dw FuchsiaGymEndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_2, 4, FuchsiaGymBattleText3, FuchsiaGymEndBattleText3, FuchsiaGymAfterBattleText3 FuchsiaGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 - dw FuchsiaGymBattleText4 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText4 ; TextAfterBattle - dw FuchsiaGymEndBattleText4 ; TextEndBattle - dw FuchsiaGymEndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_3, 2, FuchsiaGymBattleText4, FuchsiaGymEndBattleText4, FuchsiaGymAfterBattleText4 FuchsiaGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 - dw FuchsiaGymBattleText5 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText5 ; TextAfterBattle - dw FuchsiaGymEndBattleText5 ; TextEndBattle - dw FuchsiaGymEndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_4, 2, FuchsiaGymBattleText5, FuchsiaGymEndBattleText5, FuchsiaGymAfterBattleText5 FuchsiaGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 - dw FuchsiaGymBattleText6 ; TextBeforeBattle - dw FuchsiaGymAfterBattleText6 ; TextAfterBattle - dw FuchsiaGymEndBattleText6 ; TextEndBattle - dw FuchsiaGymEndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_FUCHSIA_GYM_TRAINER_5, 2, FuchsiaGymBattleText6, FuchsiaGymEndBattleText6, FuchsiaGymAfterBattleText6 + db -1 ; end FuchsiaGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_KOGA - jr z, .asm_181b6 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM06 - jr nz, .asm_adc3b + jr nz, .afterVictory call z, FuchsiaGymScript3_75497 call DisableWaitingAfterTextDisplay - jr .asm_e84c6 -.asm_adc3b + jr .done +.afterVictory ld hl, KogaExplainToxicText call PrintText - jr .asm_e84c6 -.asm_181b6 + jr .done +.beginBattle ld hl, KogaBeforeBattleText call PrintText ld hl, wd72d @@ -161,157 +120,157 @@ FuchsiaGymText1: ld hl, KogaAfterBattleText ld de, KogaAfterBattleText call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $5 ld [wGymLeaderNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wFuchsiaGymCurScript], a -.asm_e84c6 +.done jp TextScriptEnd KogaBeforeBattleText: - TX_FAR _KogaBeforeBattleText - db "@" + text_far _KogaBeforeBattleText + text_end KogaAfterBattleText: - TX_FAR _KogaAfterBattleText - db "@" + text_far _KogaAfterBattleText + text_end KogaExplainToxicText: - TX_FAR _KogaExplainToxicText - db "@" + text_far _KogaExplainToxicText + text_end FuchsiaGymText9: - TX_FAR _FuchsiaGymText9 - db "@" + text_far _FuchsiaGymText9 + text_end FuchsiaGymText10: - TX_FAR _ReceivedTM06Text - TX_SFX_KEY_ITEM + text_far _ReceivedTM06Text + sound_get_key_item TM06ExplanationText: - TX_FAR _TM06ExplanationText - db "@" + text_far _TM06ExplanationText + text_end FuchsiaGymText11: - TX_FAR _TM06NoRoomText - db "@" + text_far _TM06NoRoomText + text_end FuchsiaGymText2: - TX_ASM + text_asm ld hl, FuchsiaGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd FuchsiaGymBattleText1: - TX_FAR _FuchsiaGymBattleText1 - db "@" + text_far _FuchsiaGymBattleText1 + text_end FuchsiaGymEndBattleText1: - TX_FAR _FuchsiaGymEndBattleText1 - db "@" + text_far _FuchsiaGymEndBattleText1 + text_end FuchsiaGymAfterBattleText1: - TX_FAR _FuchsiaGymAfterBattleText1 - db "@" + text_far _FuchsiaGymAfterBattleText1 + text_end FuchsiaGymText3: - TX_ASM + text_asm ld hl, FuchsiaGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd FuchsiaGymBattleText2: - TX_FAR _FuchsiaGymBattleText2 - db "@" + text_far _FuchsiaGymBattleText2 + text_end FuchsiaGymEndBattleText2: - TX_FAR _FuchsiaGymEndBattleText2 - db "@" + text_far _FuchsiaGymEndBattleText2 + text_end FuchsiaGymAfterBattleText2: - TX_FAR _FuchsiaGymAfterBattleText2 - db "@" + text_far _FuchsiaGymAfterBattleText2 + text_end FuchsiaGymText4: - TX_ASM + text_asm ld hl, FuchsiaGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd FuchsiaGymBattleText3: - TX_FAR _FuchsiaGymBattleText3 - db "@" + text_far _FuchsiaGymBattleText3 + text_end FuchsiaGymEndBattleText3: - TX_FAR _FuchsiaGymEndBattleText3 - db "@" + text_far _FuchsiaGymEndBattleText3 + text_end FuchsiaGymAfterBattleText3: - TX_FAR _FuchsiaGymAfterBattleText3 - db "@" + text_far _FuchsiaGymAfterBattleText3 + text_end FuchsiaGymText5: - TX_ASM + text_asm ld hl, FuchsiaGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd FuchsiaGymBattleText4: - TX_FAR _FuchsiaGymBattleText4 - db "@" + text_far _FuchsiaGymBattleText4 + text_end FuchsiaGymEndBattleText4: - TX_FAR _FuchsiaGymEndBattleText4 - db "@" + text_far _FuchsiaGymEndBattleText4 + text_end FuchsiaGymAfterBattleText4: - TX_FAR _FuchsiaGymAfterBattleText4 - db "@" + text_far _FuchsiaGymAfterBattleText4 + text_end FuchsiaGymText6: - TX_ASM + text_asm ld hl, FuchsiaGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd FuchsiaGymBattleText5: - TX_FAR _FuchsiaGymBattleText5 - db "@" + text_far _FuchsiaGymBattleText5 + text_end FuchsiaGymEndBattleText5: - TX_FAR _FuchsiaGymEndBattleText5 - db "@" + text_far _FuchsiaGymEndBattleText5 + text_end FuchsiaGymAfterBattleText5: - TX_FAR _FuchsiaGymAfterBattleText5 - db "@" + text_far _FuchsiaGymAfterBattleText5 + text_end FuchsiaGymText7: - TX_ASM + text_asm ld hl, FuchsiaGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd FuchsiaGymBattleText6: - TX_FAR _FuchsiaGymBattleText6 - db "@" + text_far _FuchsiaGymBattleText6 + text_end FuchsiaGymEndBattleText6: - TX_FAR _FuchsiaGymEndBattleText6 - db "@" + text_far _FuchsiaGymEndBattleText6 + text_end FuchsiaGymAfterBattleText6: - TX_FAR _FuchsiaGymAfterBattleText6 - db "@" + text_far _FuchsiaGymAfterBattleText6 + text_end FuchsiaGymText8: - TX_ASM + text_asm CheckEvent EVENT_BEAT_KOGA ld hl, FuchsiaGymText_75653 jr nz, .asm_50671 @@ -321,9 +280,9 @@ FuchsiaGymText8: jp TextScriptEnd FuchsiaGymText_7564e: - TX_FAR _FuchsiaGymText_7564e - db "@" + text_far _FuchsiaGymText_7564e + text_end FuchsiaGymText_75653: - TX_FAR _FuchsiaGymText_75653 - db "@" + text_far _FuchsiaGymText_75653 + text_end diff --git a/scripts/FuchsiaMart.asm b/scripts/FuchsiaMart.asm old mode 100755 new mode 100644 index f17cac49..e6d64c53 --- a/scripts/FuchsiaMart.asm +++ b/scripts/FuchsiaMart.asm @@ -7,9 +7,9 @@ FuchsiaMart_TextPointers: dw FuchsiaMartText3 FuchsiaMartText2: - TX_FAR _FuchsiaMartText2 - db "@" + text_far _FuchsiaMartText2 + text_end FuchsiaMartText3: - TX_FAR _FuchsiaMartText3 - db "@" + text_far _FuchsiaMartText3 + text_end diff --git a/scripts/FuchsiaMeetingRoom.asm b/scripts/FuchsiaMeetingRoom.asm old mode 100755 new mode 100644 index 95ac12fa..4fc05b1f --- a/scripts/FuchsiaMeetingRoom.asm +++ b/scripts/FuchsiaMeetingRoom.asm @@ -8,13 +8,13 @@ FuchsiaMeetingRoom_TextPointers: dw FuchsiaMeetingRoomText3 FuchsiaMeetingRoomText1: - TX_FAR _FuchsiaMeetingRoomText1 - db "@" + text_far _FuchsiaMeetingRoomText1 + text_end FuchsiaMeetingRoomText2: - TX_FAR _FuchsiaMeetingRoomText2 - db "@" + text_far _FuchsiaMeetingRoomText2 + text_end FuchsiaMeetingRoomText3: - TX_FAR _FuchsiaMeetingRoomText3 - db "@" + text_far _FuchsiaMeetingRoomText3 + text_end diff --git a/scripts/FuchsiaPokecenter.asm b/scripts/FuchsiaPokecenter.asm old mode 100755 new mode 100644 index 182ec8c3..788ee24b --- a/scripts/FuchsiaPokecenter.asm +++ b/scripts/FuchsiaPokecenter.asm @@ -9,15 +9,15 @@ FuchsiaPokecenter_TextPointers: dw FuchsiaTradeNurseText FuchsiaHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse FuchsiaPokecenterText2: - TX_FAR _FuchsiaPokecenterText1 - db "@" + text_far _FuchsiaPokecenterText1 + text_end FuchsiaPokecenterText3: - TX_FAR _FuchsiaPokecenterText3 - db "@" + text_far _FuchsiaPokecenterText3 + text_end FuchsiaTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm old mode 100755 new mode 100644 index 265508e0..04c8504e --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -12,7 +12,7 @@ CeladonGameCornerScript_48bcf: res 6, [hl] ret z call Random - ld a, [hRandomAdd] + ldh a, [hRandomAdd] cp $7 jr nc, .asm_48be2 ld a, $8 @@ -57,25 +57,25 @@ CeladonGameCornerScript1: ld a, $f0 ld [wJoyIgnore], a ld a, $d - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $b - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld de, MovementData_48c5a ld a, [wYCoord] - cp $6 + cp 6 jr nz, .asm_48c43 ld de, MovementData_48c63 jr .asm_48c4d .asm_48c43 ld a, [wXCoord] - cp $8 + cp 8 jr nz, .asm_48c4d ld de, MovementData_48c63 .asm_48c4d ld a, $b - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $2 ld [wGameCornerCurScript], a @@ -90,7 +90,7 @@ MovementData_48c5a: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end MovementData_48c63: db NPC_MOVEMENT_RIGHT @@ -98,7 +98,7 @@ MovementData_48c63: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end CeladonGameCornerScript2: ld a, [wd730] @@ -132,11 +132,11 @@ GameCorner_TextPointers: dw CeladonGameCornerText13 CeladonGameCornerText1: - TX_FAR _CeladonGameCornerText1 - db "@" + text_far _CeladonGameCornerText1 + text_end CeladonGameCornerText2: - TX_ASM + text_asm call CeladonGameCornerScript_48f1e ld hl, CeladonGameCornerText_48d22 call PrintText @@ -150,29 +150,29 @@ CeladonGameCornerText2: call Has9990Coins jr nc, .asm_48d14 xor a - ld [hMoney], a - ld [hMoney + 2], a + ldh [hMoney], a + ldh [hMoney + 2], a ld a, $10 - ld [hMoney + 1], a + ldh [hMoney + 1], a call HasEnoughMoney jr nc, .asm_48cdb ld hl, CeladonGameCornerText_48d31 jr .asm_48d1c .asm_48cdb xor a - ld [hMoney], a - ld [hMoney + 2], a + ldh [hMoney], a + ldh [hMoney + 2], a ld a, $10 - ld [hMoney + 1], a + ldh [hMoney + 1], a ld hl, hMoney + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a + ldh [hUnusedCoinsByte], a + ldh [hCoins], a ld a, $50 - ld [hCoins + 1], a + ldh [hCoins + 1], a ld de, wPlayerCoins + 1 ld hl, hCoins + 1 ld c, $2 @@ -193,39 +193,39 @@ CeladonGameCornerText2: jp TextScriptEnd CeladonGameCornerText_48d22: - TX_FAR _CeladonGameCornerText_48d22 - db "@" + text_far _CeladonGameCornerText_48d22 + text_end CeladonGameCornerText_48d27: - TX_FAR _CeladonGameCornerText_48d27 - db "@" + text_far _CeladonGameCornerText_48d27 + text_end CeladonGameCornerText_48d2c: - TX_FAR _CeladonGameCornerText_48d2c - db "@" + text_far _CeladonGameCornerText_48d2c + text_end CeladonGameCornerText_48d31: - TX_FAR _CeladonGameCornerText_48d31 - db "@" + text_far _CeladonGameCornerText_48d31 + text_end CeladonGameCornerText_48d36: - TX_FAR _CeladonGameCornerText_48d36 - db "@" + text_far _CeladonGameCornerText_48d36 + text_end CeladonGameCornerText_48d3b: - TX_FAR _CeladonGameCornerText_48d3b - db "@" + text_far _CeladonGameCornerText_48d3b + text_end CeladonGameCornerText3: - TX_FAR _CeladonGameCornerText3 - db "@" + text_far _CeladonGameCornerText3 + text_end CeladonGameCornerText4: - TX_FAR _CeladonGameCornerText4 - db "@" + text_far _CeladonGameCornerText4 + text_end CeladonGameCornerText5: - TX_ASM + text_asm CheckEvent EVENT_GOT_10_COINS jr nz, .asm_48d89 ld hl, CeladonGameCornerText_48d9c @@ -236,10 +236,10 @@ CeladonGameCornerText5: call Has9990Coins jr nc, .asm_48d8e xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a + ldh [hUnusedCoinsByte], a + ldh [hCoins], a ld a, $10 - ld [hCoins + 1], a + ldh [hCoins + 1], a ld de, wPlayerCoins + 1 ld hl, hCoins + 1 ld c, $2 @@ -262,28 +262,28 @@ CeladonGameCornerText5: jp TextScriptEnd CeladonGameCornerText_48d9c: - TX_FAR _CeladonGameCornerText_48d9c - db "@" + text_far _CeladonGameCornerText_48d9c + text_end Received10CoinsText: - TX_FAR _Received10CoinsText - TX_SFX_ITEM_1 - db "@" + text_far _Received10CoinsText + sound_get_item_1 + text_end CeladonGameCornerText_48da7: - TX_FAR _CeladonGameCornerText_48da7 - db "@" + text_far _CeladonGameCornerText_48da7 + text_end CeladonGameCornerText_48dac: - TX_FAR _CeladonGameCornerText_48dac - db "@" + text_far _CeladonGameCornerText_48dac + text_end CeladonGameCornerText6: - TX_FAR _CeladonGameCornerText6 - db "@" + text_far _CeladonGameCornerText6 + text_end CeladonGameCornerText7: - TX_ASM + text_asm CheckEvent EVENT_BEAT_ERIKA ld hl, CeladonGameCornerText_48dca jr z, .asm_48dc4 @@ -293,19 +293,19 @@ CeladonGameCornerText7: jp TextScriptEnd CeladonGameCornerText_48dca: - TX_FAR _CeladonGameCornerText_48dca - db "@" + text_far _CeladonGameCornerText_48dca + text_end CeladonGameCornerText_48dcf: - TX_FAR _CeladonGameCornerText_48dcf - db "@" + text_far _CeladonGameCornerText_48dcf + text_end CeladonGameCornerText8: - TX_FAR _CeladonGameCornerText8 - db "@" + text_far _CeladonGameCornerText8 + text_end CeladonGameCornerText9: - TX_ASM + text_asm CheckEvent EVENT_GOT_20_COINS_2 jr nz, .asm_48e13 ld hl, CeladonGameCornerText_48e26 @@ -316,10 +316,10 @@ CeladonGameCornerText9: call Has9990Coins jr nc, .asm_48e18 xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a + ldh [hUnusedCoinsByte], a + ldh [hCoins], a ld a, $20 - ld [hCoins + 1], a + ldh [hCoins + 1], a ld de, wPlayerCoins + 1 ld hl, hCoins + 1 ld c, $2 @@ -340,24 +340,24 @@ CeladonGameCornerText9: jp TextScriptEnd CeladonGameCornerText_48e26: - TX_FAR _CeladonGameCornerText_48e26 - db "@" + text_far _CeladonGameCornerText_48e26 + text_end Received20CoinsText: - TX_FAR _Received20CoinsText - TX_SFX_ITEM_1 - db "@" + text_far _Received20CoinsText + sound_get_item_1 + text_end CeladonGameCornerText_48e31: - TX_FAR _CeladonGameCornerText_48e31 - db "@" + text_far _CeladonGameCornerText_48e31 + text_end CeladonGameCornerText_48e36: - TX_FAR _CeladonGameCornerText_48e36 - db "@" + text_far _CeladonGameCornerText_48e36 + text_end CeladonGameCornerText10: - TX_ASM + text_asm CheckEvent EVENT_GOT_20_COINS jr nz, .asm_48e75 ld hl, CeladonGameCornerText_48e88 @@ -368,10 +368,10 @@ CeladonGameCornerText10: call Has9990Coins jr z, .asm_48e7a xor a - ld [hUnusedCoinsByte], a - ld [hCoins], a + ldh [hUnusedCoinsByte], a + ldh [hCoins], a ld a, $20 - ld [hCoins + 1], a + ldh [hCoins + 1], a ld de, wPlayerCoins + 1 ld hl, hCoins + 1 ld c, $2 @@ -392,24 +392,24 @@ CeladonGameCornerText10: jp TextScriptEnd CeladonGameCornerText_48e88: - TX_FAR _CeladonGameCornerText_48e88 - db "@" + text_far _CeladonGameCornerText_48e88 + text_end CeladonGameCornerText_48e8d: - TX_FAR _CeladonGameCornerText_48e8d - TX_SFX_ITEM_1 - db "@" + text_far _CeladonGameCornerText_48e8d + sound_get_item_1 + text_end CeladonGameCornerText_48e93: - TX_FAR _CeladonGameCornerText_48e93 - db "@" + text_far _CeladonGameCornerText_48e93 + text_end CeladonGameCornerText_48e98: - TX_FAR _CeladonGameCornerText_48e98 - db "@" + text_far _CeladonGameCornerText_48e98 + text_end CeladonGameCornerText11: - TX_ASM + text_asm ld hl, CeladonGameCornerText_48ece call PrintText ld hl, wd72d @@ -418,32 +418,32 @@ CeladonGameCornerText11: ld hl, CeladonGameCornerText_48ed3 ld de, CeladonGameCornerText_48ed3 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters xor a - ld [hJoyHeld], a - ld [hJoyPressed], a - ld [hJoyReleased], a + ldh [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a ld a, $1 ld [wGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: - TX_FAR _CeladonGameCornerText_48ece - db "@" + text_far _CeladonGameCornerText_48ece + text_end CeladonGameCornerText_48ed3: - TX_FAR _CeladonGameCornerText_48ed3 - db "@" + text_far _CeladonGameCornerText_48ed3 + text_end CeladonGameCornerText13: - TX_FAR _CeladonGameCornerText_48ed8 - db "@" + text_far _CeladonGameCornerText_48ed8 + text_end CeladonGameCornerText12: - TX_ASM + text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, CeladonGameCornerText_48f09 @@ -460,46 +460,46 @@ CeladonGameCornerText12: jp TextScriptEnd CeladonGameCornerText_48f09: - TX_FAR _CeladonGameCornerText_48f09 - TX_ASM + text_far _CeladonGameCornerText_48f09 + text_asm ld a, SFX_SWITCH call PlaySound call WaitForSoundToFinish jp TextScriptEnd CeladonGameCornerText_48f19: - TX_FAR _CeladonGameCornerText_48f19 - db "@" + text_far _CeladonGameCornerText_48f19 + text_end CeladonGameCornerScript_48f1e: ld hl, wd730 set 6, [hl] - coord hl, 11, 0 - ld b, $5 - ld c, $7 + hlcoord 11, 0 + ld b, 5 + ld c, 7 call TextBoxBorder call UpdateSprites - coord hl, 12, 1 + hlcoord 12, 1 ld b, 4 ld c, 7 call ClearScreenArea - coord hl, 12, 2 + hlcoord 12, 2 ld de, GameCornerMoneyText call PlaceString - coord hl, 12, 3 + hlcoord 12, 3 ld de, GameCornerBlankText1 call PlaceString - coord hl, 12, 3 + hlcoord 12, 3 ld de, wPlayerMoney - ld c, $a3 + ld c, 3 | MONEY_SIGN | LEADING_ZEROES call PrintBCDNumber - coord hl, 12, 4 + hlcoord 12, 4 ld de, GameCornerCoinText call PlaceString - coord hl, 12, 5 + hlcoord 12, 5 ld de, GameCornerBlankText2 call PlaceString - coord hl, 15, 5 + hlcoord 15, 5 ld de, wPlayerCoins ld c, $82 call PrintBCDNumber @@ -521,7 +521,7 @@ GameCornerBlankText2: Has9990Coins: ld a, $99 - ld [hCoins], a + ldh [hCoins], a ld a, $90 - ld [hCoins + 1], a + ldh [hCoins + 1], a jp HasEnoughCoins diff --git a/scripts/GameCornerPrizeRoom.asm b/scripts/GameCornerPrizeRoom.asm old mode 100755 new mode 100644 index e6cf6f0d..c8dddf71 --- a/scripts/GameCornerPrizeRoom.asm +++ b/scripts/GameCornerPrizeRoom.asm @@ -9,12 +9,12 @@ GameCornerPrizeRoom_TextPointers: dw CeladonPrizeRoomText3 CeladonPrizeRoomText1: - TX_FAR _CeladonPrizeRoomText1 - db "@" + text_far _CeladonPrizeRoomText1 + text_end CeladonPrizeRoomText2: - TX_FAR _CeladonPrizeRoomText2 - db "@" + text_far _CeladonPrizeRoomText2 + text_end CeladonPrizeRoomText3: - TX_PRIZE_VENDOR + script_prize_vendor diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm old mode 100755 new mode 100644 index 511c9754..fd13719b --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -45,7 +45,7 @@ HallofFameRoomScript2: ld [wHallOfFameCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a - callba SaveSAVtoSRAM + farcall SaveSAVtoSRAM ld b, 5 .delayLoop ld c, 600 / 5 @@ -69,8 +69,8 @@ HallofFameRoomScript0: ret RLEMovement5a528: - db D_UP,$5 - db $ff + db D_UP, 5 + db -1 ; end HallofFameRoomScript1: ld a, [wSimulatedJoypadStatesIndex] @@ -79,10 +79,10 @@ HallofFameRoomScript1: ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 xor a @@ -90,11 +90,11 @@ HallofFameRoomScript1: inc a ; PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a - ld a, HS_UNKNOWN_DUNGEON_GUY + ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject ld a, $2 @@ -105,5 +105,5 @@ HallOfFame_TextPointers: dw HallofFameRoomText1 HallofFameRoomText1: - TX_FAR _HallofFameRoomText1 - db "@" + text_far _HallofFameRoomText1 + text_end diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm old mode 100755 new mode 100644 diff --git a/scripts/IndigoPlateauLobby.asm b/scripts/IndigoPlateauLobby.asm old mode 100755 new mode 100644 index f83c0ba4..a9b549e3 --- a/scripts/IndigoPlateauLobby.asm +++ b/scripts/IndigoPlateauLobby.asm @@ -22,15 +22,15 @@ IndigoPlateauLobby_TextPointers: dw IndigoTradeNurseText IndigoHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse IndigoPlateauLobbyText2: - TX_FAR _IndigoPlateauLobbyText2 - db "@" + text_far _IndigoPlateauLobbyText2 + text_end IndigoPlateauLobbyText3: - TX_FAR _IndigoPlateauLobbyText3 - db "@" + text_far _IndigoPlateauLobbyText3 + text_end IndigoTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm old mode 100755 new mode 100644 index 5e19ea7d..6de0283e --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -18,23 +18,21 @@ LanceShowOrHideEntranceBlocks: ; open entrance ld a, $31 ld b, $32 - jp LanceSetEntranceBlocks + jp .setEntranceBlocks .closeEntrance ld a, $72 ld b, $73 - -LanceSetEntranceBlocks: +.setEntranceBlocks ; Replaces the tile blocks so the player can't leave. push bc ld [wNewTileBlockID], a lb bc, 6, 2 - call LanceSetEntranceBlock + call .SetEntranceBlock pop bc ld a, b ld [wNewTileBlockID], a lb bc, 6, 3 - -LanceSetEntranceBlock: +.SetEntranceBlock: predef_jump ReplaceTileBlock ResetLanceScript: @@ -59,12 +57,12 @@ LanceScript0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, [wCoordIndex] cp $3 ; Is player standing next to Lance's sprite? jr nc, .notStandingNextToLance ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID .notStandingNextToLance cp $5 ; Is player standing on the entrance staircase? @@ -78,12 +76,12 @@ LanceScript0: jp LanceShowOrHideEntranceBlocks LanceTriggerMovementCoords: - db $01,$05 - db $02,$06 - db $0B,$05 - db $0B,$06 - db $10,$18 - db $FF + dbmapcoord 5, 1 + dbmapcoord 6, 2 + dbmapcoord 5, 11 + dbmapcoord 6, 11 + dbmapcoord 24, 16 + db -1 ; end LanceScript2: call EndTrainerBattle @@ -91,7 +89,7 @@ LanceScript2: cp $ff jp z, ResetLanceScript ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID WalkToLance: @@ -110,11 +108,11 @@ WalkToLance: ret WalkToLance_RLEList: - db D_UP, $0C - db D_LEFT, $0C - db D_DOWN, $07 - db D_LEFT, $06 - db $FF + db D_UP, 12 + db D_LEFT, 12 + db D_DOWN, 7 + db D_LEFT, 6 + db -1 ; end LanceScript3: ld a, [wSimulatedJoypadStatesIndex] @@ -131,32 +129,25 @@ LancesRoom_TextPointers: dw LanceText1 LanceTrainerHeader0: - dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0 - dw LanceBeforeBattleText ; TextBeforeBattle - dw LanceAfterBattleText ; TextAfterBattle - dw LanceEndBattleText ; TextEndBattle - dw LanceEndBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_LANCES_ROOM_TRAINER_0, 0, LanceBeforeBattleText, LanceEndBattleText, LanceAfterBattleText + db -1 ; end LanceText1: - TX_ASM + text_asm ld hl, LanceTrainerHeader0 call TalkToTrainer jp TextScriptEnd LanceBeforeBattleText: - TX_FAR _LanceBeforeBattleText - db "@" + text_far _LanceBeforeBattleText + text_end LanceEndBattleText: - TX_FAR _LanceEndBattleText - db "@" + text_far _LanceEndBattleText + text_end LanceAfterBattleText: - TX_FAR _LanceAfterBattleText - TX_ASM + text_far _LanceAfterBattleText + text_asm SetEvent EVENT_BEAT_LANCE jp TextScriptEnd diff --git a/scripts/LavenderCuboneHouse.asm b/scripts/LavenderCuboneHouse.asm old mode 100755 new mode 100644 index ff5aa732..69d74ede --- a/scripts/LavenderCuboneHouse.asm +++ b/scripts/LavenderCuboneHouse.asm @@ -7,29 +7,29 @@ LavenderCuboneHouse_TextPointers: dw LavenderHouse2Text2 LavenderHouse2Text1: - TX_FAR _LavenderHouse2Text1 - TX_ASM + text_far _LavenderHouse2Text1 + text_asm ld a, CUBONE call PlayCry jp TextScriptEnd LavenderHouse2Text2: - TX_ASM + text_asm CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_65711 + jr nz, .rescued_mr_fuji ld hl, LavenderHouse2Text_1d9dc call PrintText - jr .asm_64be1 -.asm_65711 + jr .done +.rescued_mr_fuji ld hl, LavenderHouse2Text_1d9e1 call PrintText -.asm_64be1 +.done jp TextScriptEnd LavenderHouse2Text_1d9dc: - TX_FAR _LavenderHouse2Text_1d9dc - db "@" + text_far _LavenderHouse2Text_1d9dc + text_end LavenderHouse2Text_1d9e1: - TX_FAR _LavenderHouse2Text_1d9e1 - db "@" + text_far _LavenderHouse2Text_1d9e1 + text_end diff --git a/scripts/LavenderMart.asm b/scripts/LavenderMart.asm old mode 100755 new mode 100644 index 47330e5d..2b67aaa6 --- a/scripts/LavenderMart.asm +++ b/scripts/LavenderMart.asm @@ -7,11 +7,11 @@ LavenderMart_TextPointers: dw LavenderMartText3 LavenderMartText2: - TX_FAR _LavenderMartText2 - db "@" + text_far _LavenderMartText2 + text_end LavenderMartText3: - TX_ASM + text_asm CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .Nugget ld hl, .ReviveText @@ -24,9 +24,9 @@ LavenderMartText3: jp TextScriptEnd .ReviveText - TX_FAR _LavenderMartReviveText - db "@" + text_far _LavenderMartReviveText + text_end .NuggetText - TX_FAR _LavenderMartNuggetText - db "@" + text_far _LavenderMartNuggetText + text_end diff --git a/scripts/LavenderPokecenter.asm b/scripts/LavenderPokecenter.asm old mode 100755 new mode 100644 index 10482fef..b8a1d2a5 --- a/scripts/LavenderPokecenter.asm +++ b/scripts/LavenderPokecenter.asm @@ -9,15 +9,15 @@ LavenderPokecenter_TextPointers: dw LavenderTradeNurseText LavenderTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist LavenderHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse LavenderPokecenterText2: - TX_FAR _LavenderPokecenterText2 - db "@" + text_far _LavenderPokecenterText2 + text_end LavenderPokecenterText3: - TX_FAR _LavenderPokecenterText3 - db "@" + text_far _LavenderPokecenterText3 + text_end diff --git a/scripts/LavenderTown.asm b/scripts/LavenderTown.asm old mode 100755 new mode 100644 index c23996e9..d0c66208 --- a/scripts/LavenderTown.asm +++ b/scripts/LavenderTown.asm @@ -13,51 +13,51 @@ LavenderTown_TextPointers: dw LavenderTownText9 LavenderTownText1: - TX_ASM + text_asm ld hl, LavenderTownText_4413c call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a ld hl, LavenderTownText_44146 - jr nz, .asm_40831 + jr nz, .got_text ld hl, LavenderTownText_44141 -.asm_40831 +.got_text call PrintText jp TextScriptEnd LavenderTownText_4413c: - TX_FAR _LavenderTownText_4413c - db "@" + text_far _LavenderTownText_4413c + text_end LavenderTownText_44141: - TX_FAR _LavenderTownText_44141 - db "@" + text_far _LavenderTownText_44141 + text_end LavenderTownText_44146: - TX_FAR _LavenderTownText_44146 - db "@" + text_far _LavenderTownText_44146 + text_end LavenderTownText2: - TX_FAR _LavenderTownText2 - db "@" + text_far _LavenderTownText2 + text_end LavenderTownText3: - TX_FAR _LavenderTownText3 - db "@" + text_far _LavenderTownText3 + text_end LavenderTownText4: - TX_FAR _LavenderTownText4 - db "@" + text_far _LavenderTownText4 + text_end LavenderTownText5: - TX_FAR _LavenderTownText5 - db "@" + text_far _LavenderTownText5 + text_end LavenderTownText8: - TX_FAR _LavenderTownText8 - db "@" + text_far _LavenderTownText8 + text_end LavenderTownText9: - TX_FAR _LavenderTownText9 - db "@" + text_far _LavenderTownText9 + text_end diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm old mode 100755 new mode 100644 index 81142377..8e9730ff --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -65,8 +65,8 @@ LoreleiScript0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyPressed], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] @@ -76,7 +76,7 @@ LoreleiScript0: jr z, LoreleiScriptWalkIntoRoom .stopPlayerFromLeaving ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -89,11 +89,11 @@ LoreleiScript0: ret LoreleiEntranceCoords: - db $0A,$04 - db $0A,$05 - db $0B,$04 - db $0B,$05 - db $FF + dbmapcoord 4, 10 + dbmapcoord 5, 10 + dbmapcoord 4, 11 + dbmapcoord 5, 11 + db -1 ; end LoreleiScript3: ld a, [wSimulatedJoypadStatesIndex] @@ -112,7 +112,7 @@ LoreleiScript2: cp $ff jp z, ResetLoreleiScript ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID LoreleisRoom_TextPointers: @@ -120,34 +120,27 @@ LoreleisRoom_TextPointers: dw LoreleiDontRunAwayText LoreleiTrainerHeader0: - dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - dw LoreleiBeforeBattleText ; TextBeforeBattle - dw LoreleiAfterBattleText ; TextAfterBattle - dw LoreleiEndBattleText ; TextEndBattle - dw LoreleiEndBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_LORELEIS_ROOM_TRAINER_0, 0, LoreleiBeforeBattleText, LoreleiEndBattleText, LoreleiAfterBattleText + db -1 ; end LoreleiText1: - TX_ASM + text_asm ld hl, LoreleiTrainerHeader0 call TalkToTrainer jp TextScriptEnd LoreleiBeforeBattleText: - TX_FAR _LoreleiBeforeBattleText - db "@" + text_far _LoreleiBeforeBattleText + text_end LoreleiEndBattleText: - TX_FAR _LoreleiEndBattleText - db "@" + text_far _LoreleiEndBattleText + text_end LoreleiAfterBattleText: - TX_FAR _LoreleiAfterBattleText - db "@" + text_far _LoreleiAfterBattleText + text_end LoreleiDontRunAwayText: - TX_FAR _LoreleiDontRunAwayText - db "@" + text_far _LoreleiDontRunAwayText + text_end diff --git a/scripts/MrFujisHouse.asm b/scripts/MrFujisHouse.asm old mode 100755 new mode 100644 index 98190cd8..3ef3017a --- a/scripts/MrFujisHouse.asm +++ b/scripts/MrFujisHouse.asm @@ -11,102 +11,102 @@ MrFujisHouse_TextPointers: dw LavenderHouse1Text6 LavenderHouse1Text1: - TX_ASM + text_asm CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_72e5d + jr nz, .rescued_mr_fuji ld hl, LavenderHouse1Text_1d8d1 call PrintText - jr .asm_6957f -.asm_72e5d + jr .done +.rescued_mr_fuji ld hl, LavenderHouse1Text_1d8d6 call PrintText -.asm_6957f +.done jp TextScriptEnd LavenderHouse1Text_1d8d1: - TX_FAR _LavenderHouse1Text_1d8d1 - db "@" + text_far _LavenderHouse1Text_1d8d1 + text_end LavenderHouse1Text_1d8d6: - TX_FAR _LavenderHouse1Text_1d8d6 - db "@" + text_far _LavenderHouse1Text_1d8d6 + text_end LavenderHouse1Text2: - TX_ASM + text_asm CheckEvent EVENT_RESCUED_MR_FUJI - jr nz, .asm_06470 + jr nz, .rescued_mr_fuji ld hl, LavenderHouse1Text_1d8f4 call PrintText - jr .asm_3d208 -.asm_06470 + jr .done +.rescued_mr_fuji ld hl, LavenderHouse1Text_1d8f9 call PrintText -.asm_3d208 +.done jp TextScriptEnd LavenderHouse1Text_1d8f4: - TX_FAR _LavenderHouse1Text_1d8f4 - db "@" + text_far _LavenderHouse1Text_1d8f4 + text_end LavenderHouse1Text_1d8f9: - TX_FAR _LavenderHouse1Text_1d8f9 - db "@" + text_far _LavenderHouse1Text_1d8f9 + text_end LavenderHouse1Text3: - TX_FAR _LavenderHouse1Text3 - TX_ASM + text_far _LavenderHouse1Text3 + text_asm ld a, PSYDUCK call PlayCry jp TextScriptEnd LavenderHouse1Text4: - TX_FAR _LavenderHouse1Text4 - TX_ASM + text_far _LavenderHouse1Text4 + text_asm ld a, NIDORINO call PlayCry jp TextScriptEnd LavenderHouse1Text5: - TX_ASM + text_asm CheckEvent EVENT_GOT_POKE_FLUTE - jr nz, .asm_15ac2 + jr nz, .got_item ld hl, LavenderHouse1Text_1d94c call PrintText lb bc, POKE_FLUTE, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedFluteText call PrintText SetEvent EVENT_GOT_POKE_FLUTE - jr .asm_da749 -.BagFull + jr .done +.bag_full ld hl, FluteNoRoomText call PrintText - jr .asm_da749 -.asm_15ac2 + jr .done +.got_item ld hl, MrFujiAfterFluteText call PrintText -.asm_da749 +.done jp TextScriptEnd LavenderHouse1Text_1d94c: - TX_FAR _LavenderHouse1Text_1d94c - db "@" + text_far _LavenderHouse1Text_1d94c + text_end ReceivedFluteText: - TX_FAR _ReceivedFluteText - TX_SFX_KEY_ITEM - TX_FAR _FluteExplanationText - db "@" + text_far _ReceivedFluteText + sound_get_key_item + text_far _FluteExplanationText + text_end FluteNoRoomText: - TX_FAR _FluteNoRoomText - db "@" + text_far _FluteNoRoomText + text_end MrFujiAfterFluteText: - TX_FAR _MrFujiAfterFluteText - db "@" + text_far _MrFujiAfterFluteText + text_end LavenderHouse1Text6: - TX_FAR _LavenderHouse1Text6 - db "@" + text_far _LavenderHouse1Text6 + text_end diff --git a/scripts/MrPsychicsHouse.asm b/scripts/MrPsychicsHouse.asm old mode 100755 new mode 100644 index 7d4f54c0..399edfbd --- a/scripts/MrPsychicsHouse.asm +++ b/scripts/MrPsychicsHouse.asm @@ -5,41 +5,41 @@ MrPsychicsHouse_TextPointers: dw SaffronHouse2Text1 SaffronHouse2Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM29 - jr nz, .asm_9e72b + jr nz, .got_item ld hl, TM29PreReceiveText call PrintText - lb bc, TM_29, 1 + lb bc, TM_PSYCHIC_M, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedTM29Text call PrintText SetEvent EVENT_GOT_TM29 - jr .asm_fe4e1 -.BagFull + jr .done +.bag_full ld hl, TM29NoRoomText call PrintText - jr .asm_fe4e1 -.asm_9e72b + jr .done +.got_item ld hl, TM29ExplanationText call PrintText -.asm_fe4e1 +.done jp TextScriptEnd TM29PreReceiveText: - TX_FAR _TM29PreReceiveText - db "@" + text_far _TM29PreReceiveText + text_end ReceivedTM29Text: - TX_FAR _ReceivedTM29Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM29Text + sound_get_item_1 + text_end TM29ExplanationText: - TX_FAR _TM29ExplanationText - db "@" + text_far _TM29ExplanationText + text_end TM29NoRoomText: - TX_FAR _TM29NoRoomText - db "@" + text_far _TM29NoRoomText + text_end diff --git a/scripts/MtMoon1F.asm b/scripts/MtMoon1F.asm old mode 100755 new mode 100644 index b05b3f60..68dacf29 --- a/scripts/MtMoon1F.asm +++ b/scripts/MtMoon1F.asm @@ -29,196 +29,147 @@ MtMoon1F_TextPointers: dw MtMoon1Text14 MtMoon1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_0 - dw MtMoon1BattleText2 ; TextBeforeBattle - dw MtMoon1AfterBattleText2 ; TextAfterBattle - dw MtMoon1EndBattleText2 ; TextEndBattle - dw MtMoon1EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_1_TRAINER_0, 2, MtMoon1BattleText2, MtMoon1EndBattleText2, MtMoon1AfterBattleText2 MtMoon1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1 - dw MtMoon1BattleText3 ; TextBeforeBattle - dw MtMoon1AfterBattleText3 ; TextAfterBattle - dw MtMoon1EndBattleText3 ; TextEndBattle - dw MtMoon1EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_1_TRAINER_1, 3, MtMoon1BattleText3, MtMoon1EndBattleText3, MtMoon1AfterBattleText3 MtMoon1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 - dw MtMoon1BattleText4 ; TextBeforeBattle - dw MtMoon1AfterBattleText4 ; TextAfterBattle - dw MtMoon1EndBattleText4 ; TextEndBattle - dw MtMoon1EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_1_TRAINER_2, 3, MtMoon1BattleText4, MtMoon1EndBattleText4, MtMoon1AfterBattleText4 MtMoon1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 - dw MtMoon1BattleText5 ; TextBeforeBattle - dw MtMoon1AfterBattleText5 ; TextAfterBattle - dw MtMoon1EndBattleText5 ; TextEndBattle - dw MtMoon1EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_1_TRAINER_3, 3, MtMoon1BattleText5, MtMoon1EndBattleText5, MtMoon1AfterBattleText5 MtMoon1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 - dw MtMoon1BattleText6 ; TextBeforeBattle - dw MtMoon1AfterBattleText6 ; TextAfterBattle - dw MtMoon1EndBattleText6 ; TextEndBattle - dw MtMoon1EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_1_TRAINER_4, 3, MtMoon1BattleText6, MtMoon1EndBattleText6, MtMoon1AfterBattleText6 MtMoon1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 - dw MtMoon1BattleText7 ; TextBeforeBattle - dw MtMoon1AfterBattleText7 ; TextAfterBattle - dw MtMoon1EndBattleText7 ; TextEndBattle - dw MtMoon1EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_1_TRAINER_5, 3, MtMoon1BattleText7, MtMoon1EndBattleText7, MtMoon1AfterBattleText7 MtMoon1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 - dw MtMoon1BattleText8 ; TextBeforeBattle - dw MtMoon1AfterBattleText8 ; TextAfterBattle - dw MtMoon1EndBattleText8 ; TextEndBattle - dw MtMoon1EndBattleText8 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MT_MOON_1_TRAINER_6, 3, MtMoon1BattleText8, MtMoon1EndBattleText8, MtMoon1AfterBattleText8 + db -1 ; end MtMoon1Text1: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader0 call TalkToTrainer jp TextScriptEnd MtMoon1Text2: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon1Text3: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon1Text4: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader3 call TalkToTrainer jp TextScriptEnd MtMoon1Text5: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader4 call TalkToTrainer jp TextScriptEnd MtMoon1Text6: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader5 call TalkToTrainer jp TextScriptEnd MtMoon1Text7: - TX_ASM + text_asm ld hl, MtMoon1TrainerHeader6 call TalkToTrainer jp TextScriptEnd MtMoon1BattleText2: - TX_FAR _MtMoon1BattleText2 - db "@" + text_far _MtMoon1BattleText2 + text_end MtMoon1EndBattleText2: - TX_FAR _MtMoon1EndBattleText2 - db "@" + text_far _MtMoon1EndBattleText2 + text_end MtMoon1AfterBattleText2: - TX_FAR _MtMoon1AfterBattleText2 - db "@" + text_far _MtMoon1AfterBattleText2 + text_end MtMoon1BattleText3: - TX_FAR _MtMoon1BattleText3 - db "@" + text_far _MtMoon1BattleText3 + text_end MtMoon1EndBattleText3: - TX_FAR _MtMoon1EndBattleText3 - db "@" + text_far _MtMoon1EndBattleText3 + text_end MtMoon1AfterBattleText3: - TX_FAR _MtMoon1AfterBattleText3 - db "@" + text_far _MtMoon1AfterBattleText3 + text_end MtMoon1BattleText4: - TX_FAR _MtMoon1BattleText4 - db "@" + text_far _MtMoon1BattleText4 + text_end MtMoon1EndBattleText4: - TX_FAR _MtMoon1EndBattleText4 - db "@" + text_far _MtMoon1EndBattleText4 + text_end MtMoon1AfterBattleText4: - TX_FAR _MtMoon1AfterBattleText4 - db "@" + text_far _MtMoon1AfterBattleText4 + text_end MtMoon1BattleText5: - TX_FAR _MtMoon1BattleText5 - db "@" + text_far _MtMoon1BattleText5 + text_end MtMoon1EndBattleText5: - TX_FAR _MtMoon1EndBattleText5 - db "@" + text_far _MtMoon1EndBattleText5 + text_end MtMoon1AfterBattleText5: - TX_FAR _MtMoon1AfterBattleText5 - db "@" + text_far _MtMoon1AfterBattleText5 + text_end MtMoon1BattleText6: - TX_FAR _MtMoon1BattleText6 - db "@" + text_far _MtMoon1BattleText6 + text_end MtMoon1EndBattleText6: - TX_FAR _MtMoon1EndBattleText6 - db "@" + text_far _MtMoon1EndBattleText6 + text_end MtMoon1AfterBattleText6: - TX_FAR _MtMoon1AfterBattleText6 - db "@" + text_far _MtMoon1AfterBattleText6 + text_end MtMoon1BattleText7: - TX_FAR _MtMoon1BattleText7 - db "@" + text_far _MtMoon1BattleText7 + text_end MtMoon1EndBattleText7: - TX_FAR _MtMoon1EndBattleText7 - db "@" + text_far _MtMoon1EndBattleText7 + text_end MtMoon1AfterBattleText7: - TX_FAR _MtMoon1AfterBattleText7 - db "@" + text_far _MtMoon1AfterBattleText7 + text_end MtMoon1BattleText8: - TX_FAR _MtMoon1BattleText8 - db "@" + text_far _MtMoon1BattleText8 + text_end MtMoon1EndBattleText8: - TX_FAR _MtMoon1EndBattleText8 - db "@" + text_far _MtMoon1EndBattleText8 + text_end MtMoon1AfterBattleText8: - TX_FAR _MtMoon1AfterBattleText8 - db "@" + text_far _MtMoon1AfterBattleText8 + text_end MtMoon1Text14: - TX_FAR _MtMoon1Text14 - db "@" + text_far _MtMoon1Text14 + text_end diff --git a/scripts/MtMoonB1F.asm b/scripts/MtMoonB1F.asm old mode 100755 new mode 100644 index 779812c3..06af2dd3 --- a/scripts/MtMoonB1F.asm +++ b/scripts/MtMoonB1F.asm @@ -6,5 +6,5 @@ MtMoonB1F_TextPointers: dw MtMoonText1 MtMoonText1: - TX_FAR _MtMoonText1 - db "@" + text_far _MtMoonText1 + text_end diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm old mode 100755 new mode 100644 index 863d9d22..ab6e673e --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -19,23 +19,23 @@ MtMoonB2F_Script: ret CoordsData_49d37: - db $05,$0B - db $05,$0C - db $05,$0D - db $05,$0E - db $06,$0B - db $06,$0C - db $06,$0D - db $06,$0E - db $07,$0B - db $07,$0C - db $07,$0D - db $07,$0E - db $08,$0B - db $08,$0C - db $08,$0D - db $08,$0E - db $FF + dbmapcoord 11, 5 + dbmapcoord 12, 5 + dbmapcoord 13, 5 + dbmapcoord 14, 5 + dbmapcoord 11, 6 + dbmapcoord 12, 6 + dbmapcoord 13, 6 + dbmapcoord 14, 6 + dbmapcoord 11, 7 + dbmapcoord 12, 7 + dbmapcoord 13, 7 + dbmapcoord 14, 7 + dbmapcoord 11, 8 + dbmapcoord 12, 8 + dbmapcoord 13, 8 + dbmapcoord 14, 8 + db -1 ; end MtMoon3Script_49d58: xor a @@ -56,15 +56,15 @@ MtMoon3Script0: CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jp nz, MtMoon3Script_49d91 ld a, [wYCoord] - cp $8 + cp 8 jp nz, MtMoon3Script_49d91 ld a, [wXCoord] - cp $d + cp 13 jp nz, MtMoon3Script_49d91 xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID MtMoon3Script_49d91: @@ -88,7 +88,7 @@ MtMoon3Script3: MtMoon3Script4: ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld hl, CoordsData_49dea call ArePlayerCoordsInArray @@ -102,7 +102,7 @@ MtMoon3Script4: ld de, MovementData_49df8 .asm_49dda ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $5 ld [wMtMoonB2FCurScript], a @@ -110,22 +110,22 @@ MtMoon3Script4: ret CoordsData_49dea: - db $07,$0C - db $06,$0B - db $05,$0C - db $FF + dbmapcoord 12, 7 + dbmapcoord 11, 6 + dbmapcoord 12, 5 + db -1 ; end CoordsData_49df1: - db $07,$0D - db $06,$0E - db $05,$0E - db $FF + dbmapcoord 13, 7 + dbmapcoord 14, 6 + dbmapcoord 14, 5 + db -1 ; end MovementData_49df8: db NPC_MOVEMENT_RIGHT - MovementData_49df9: - db NPC_MOVEMENT_UP,$FF + db NPC_MOVEMENT_UP + db -1 ; end MtMoon3Script5: ld a, [wd730] @@ -136,7 +136,7 @@ MtMoon3Script5: ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID CheckEvent EVENT_GOT_DOME_FOSSIL jr z, .asm_49e1d @@ -167,48 +167,21 @@ MtMoonB2F_TextPointers: dw MtMoon3Text_49f99 MtMoon3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_0 - dw MtMoon3BattleText2 ; TextBeforeBattle - dw MtMoon3AfterBattleText2 ; TextAfterBattle - dw MtMoon3EndBattleText2 ; TextEndBattle - dw MtMoon3EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_3_TRAINER_0, 4, MtMoon3BattleText2, MtMoon3EndBattleText2, MtMoon3AfterBattleText2 MtMoon3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1 - dw MtMoon3BattleText3 ; TextBeforeBattle - dw MtMoon3AfterBattleText3 ; TextAfterBattle - dw MtMoon3EndBattleText3 ; TextEndBattle - dw MtMoon3EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_3_TRAINER_1, 4, MtMoon3BattleText3, MtMoon3EndBattleText3, MtMoon3AfterBattleText3 MtMoon3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 - dw MtMoon3BattleText4 ; TextBeforeBattle - dw MtMoon3AfterBattleText4 ; TextAfterBattle - dw MtMoon3EndBattleText4 ; TextEndBattle - dw MtMoon3EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_MT_MOON_3_TRAINER_2, 4, MtMoon3BattleText4, MtMoon3EndBattleText4, MtMoon3AfterBattleText4 MtMoon3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 - dw MtMoon3BattleText5 ; TextBeforeBattle - dw MtMoon3AfterBattleText5 ; TextAfterBattle - dw MtMoon3EndBattleText5 ; TextEndBattle - dw MtMoon3EndBattleText5 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MT_MOON_3_TRAINER_3, 4, MtMoon3BattleText5, MtMoon3EndBattleText5, MtMoon3AfterBattleText5 + db -1 ; end MtMoon3Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jr z, .asm_49e8d - and $c0 + ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL + and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8)) jr nz, .asm_49eb8 ld hl, MtMoon3Text_49f8f call PrintText @@ -222,7 +195,7 @@ MtMoon3Text1: ld hl, MtMoon3Text_49f8a ld de, MtMoon3Text_49f8a call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -237,31 +210,31 @@ MtMoon3Text1: jp TextScriptEnd MtMoon3Text2: - TX_ASM + text_asm ld hl, MtMoon3TrainerHeader0 call TalkToTrainer jp TextScriptEnd MtMoon3Text3: - TX_ASM + text_asm ld hl, MtMoon3TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon3Text4: - TX_ASM + text_asm ld hl, MtMoon3TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon3Text5: - TX_ASM + text_asm ld hl, MtMoon3TrainerHeader3 call TalkToTrainer jp TextScriptEnd MtMoon3Text6: - TX_ASM + text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, MtMoon3Text_49f24 @@ -285,11 +258,11 @@ MtMoon3Text6: jp TextScriptEnd MtMoon3Text_49f24: - TX_FAR _MtMoon3Text_49f24 - db "@" + text_far _MtMoon3Text_49f24 + text_end MtMoon3Text7: - TX_ASM + text_asm ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, MtMoon3Text_49f64 @@ -313,18 +286,18 @@ MtMoon3Text7: jp TextScriptEnd MtMoon3Text_49f64: - TX_FAR _MtMoon3Text_49f64 - db "@" + text_far _MtMoon3Text_49f64 + text_end MtMoon3Script_49f69: ld hl, MtMoon3Text_49f6f jp PrintText MtMoon3Text_49f6f: - TX_FAR _MtMoon3Text_49f6f - TX_SFX_KEY_ITEM - TX_WAIT - db "@" + text_far _MtMoon3Text_49f6f + sound_get_key_item + text_waitbutton + text_end MtMoon3Script_49f76: ld hl, MtMoon3Text_49f7f @@ -332,75 +305,75 @@ MtMoon3Script_49f76: jp TextScriptEnd MtMoon3Text_49f7f: - TX_FAR _MtMoon3Text_49f7f - TX_WAIT - db "@" + text_far _MtMoon3Text_49f7f + text_waitbutton + text_end MtMoon3Text_49f85: - TX_FAR _MtMoon3Text_49f85 - db "@" + text_far _MtMoon3Text_49f85 + text_end MtMoon3Text_49f8a: - TX_FAR _MtMoon3Text_49f8a - db "@" + text_far _MtMoon3Text_49f8a + text_end MtMoon3Text_49f8f: - TX_FAR _MtMoon3Text_49f8f - db "@" + text_far _MtMoon3Text_49f8f + text_end MtMoon3Text_49f94: - TX_FAR _MtMoon3Text_49f94 - db "@" + text_far _MtMoon3Text_49f94 + text_end MtMoon3Text_49f99: - TX_FAR _MtMoon3Text_49f99 - TX_SFX_KEY_ITEM - db "@" + text_far _MtMoon3Text_49f99 + sound_get_key_item + text_end MtMoon3BattleText2: - TX_FAR _MtMoon3BattleText2 - db "@" + text_far _MtMoon3BattleText2 + text_end MtMoon3EndBattleText2: - TX_FAR _MtMoon3EndBattleText2 - db "@" + text_far _MtMoon3EndBattleText2 + text_end MtMoon3AfterBattleText2: - TX_FAR _MtMoon3AfterBattleText2 - db "@" + text_far _MtMoon3AfterBattleText2 + text_end MtMoon3BattleText3: - TX_FAR _MtMoon3BattleText3 - db "@" + text_far _MtMoon3BattleText3 + text_end MtMoon3EndBattleText3: - TX_FAR _MtMoon3EndBattleText3 - db "@" + text_far _MtMoon3EndBattleText3 + text_end MtMoon3AfterBattleText3: - TX_FAR _MtMoon3AfterBattleText3 - db "@" + text_far _MtMoon3AfterBattleText3 + text_end MtMoon3BattleText4: - TX_FAR _MtMoon3BattleText4 - db "@" + text_far _MtMoon3BattleText4 + text_end MtMoon3EndBattleText4: - TX_FAR _MtMoon3EndBattleText4 - db "@" + text_far _MtMoon3EndBattleText4 + text_end MtMoon3AfterBattleText4: - TX_FAR _MtMoon3AfterBattleText4 - db "@" + text_far _MtMoon3AfterBattleText4 + text_end MtMoon3BattleText5: - TX_FAR _MtMoon3BattleText5 - db "@" + text_far _MtMoon3BattleText5 + text_end MtMoon3EndBattleText5: - TX_FAR _MtMoon3EndBattleText5 - db "@" + text_far _MtMoon3EndBattleText5 + text_end MtMoon3AfterBattleText5: - TX_FAR _MtMoon3AfterBattleText5 - db "@" + text_far _MtMoon3AfterBattleText5 + text_end diff --git a/scripts/MtMoonPokecenter.asm b/scripts/MtMoonPokecenter.asm old mode 100755 new mode 100644 index 969031db..e4b881d1 --- a/scripts/MtMoonPokecenter.asm +++ b/scripts/MtMoonPokecenter.asm @@ -11,18 +11,18 @@ MtMoonPokecenter_TextPointers: dw MtMoonTradeNurseText MtMoonHealNurseText: - db $ff + script_pokecenter_nurse MtMoonPokecenterText2: - TX_FAR _MtMoonPokecenterText1 - db "@" + text_far _MtMoonPokecenterText1 + text_end MtMoonPokecenterText3: - TX_FAR _MtMoonPokecenterText3 - db "@" + text_far _MtMoonPokecenterText3 + text_end MagikarpSalesmanText: - TX_ASM + text_asm CheckEvent EVENT_BOUGHT_MAGIKARP, 1 jp c, .alreadyBoughtMagikarp ld hl, .Text1 @@ -34,10 +34,10 @@ MagikarpSalesmanText: ld a, [wCurrentMenuItem] and a jp nz, .choseNo - ld [hMoney], a - ld [hMoney + 2], a + ldh [hMoney], a + ldh [hMoney + 2], a ld a, $5 - ld [hMoney + 1], a + ldh [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney ld hl, .NoMoneyText @@ -71,24 +71,24 @@ MagikarpSalesmanText: jp TextScriptEnd .Text1 - TX_FAR _MagikarpSalesmanText1 - db "@" + text_far _MagikarpSalesmanText1 + text_end .RefuseText - TX_FAR _MagikarpSalesmanNoText - db "@" + text_far _MagikarpSalesmanNoText + text_end .NoMoneyText - TX_FAR _MagikarpSalesmanNoMoneyText - db "@" + text_far _MagikarpSalesmanNoMoneyText + text_end .Text2 - TX_FAR _MagikarpSalesmanText2 - db "@" + text_far _MagikarpSalesmanText2 + text_end MtMoonPokecenterText5: - TX_FAR _MtMoonPokecenterText5 - db "@" + text_far _MtMoonPokecenterText5 + text_end MtMoonTradeNurseText: - db $f6 + script_cable_club_receptionist diff --git a/scripts/Museum1F.asm b/scripts/Museum1F.asm old mode 100755 new mode 100644 index 712f1fc4..ee3473ff --- a/scripts/Museum1F.asm +++ b/scripts/Museum1F.asm @@ -1,5 +1,5 @@ Museum1F_Script: - ld a, $1 + ld a, TRUE ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -13,19 +13,19 @@ Museum1F_ScriptPointers: Museum1FScript0: ld a, [wYCoord] - cp $4 + cp 4 ret nz ld a, [wXCoord] - cp $9 + cp 9 jr z, .asm_5c120 ld a, [wXCoord] - cp $a + cp 10 ret nz .asm_5c120 xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID Museum1FScript1: @@ -39,19 +39,19 @@ Museum1F_TextPointers: dw Museum1FText5 Museum1FText1: - TX_ASM + text_asm ld a, [wYCoord] - cp $4 + cp 4 jr nz, .asm_8774b ld a, [wXCoord] - cp $d + cp 13 jp z, Museum1FScript_5c1f9 jr .asm_b8709 .asm_8774b cp $3 jr nz, .asm_d49e7 ld a, [wXCoord] - cp $c + cp 12 jp z, Museum1FScript_5c1f9 .asm_d49e7 CheckEvent EVENT_BOUGHT_MUSEUM_TICKET @@ -71,7 +71,7 @@ Museum1FText1: ld [wTextBoxID], a call DisplayTextBoxID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld hl, Museum1FText_5c21f call PrintText call YesNoChoice @@ -79,10 +79,10 @@ Museum1FText1: and a jr nz, .asm_de133 xor a - ld [hMoney], a - ld [hMoney + 1], a + ldh [hMoney], a + ldh [hMoney + 1], a ld a, $50 - ld [hMoney + 2], a + ldh [hMoney + 2], a call HasEnoughMoney jr nc, .asm_0f3e3 ld hl, Museum1FText_5c229 @@ -140,108 +140,108 @@ Museum1FScriptEnd: jp TextScriptEnd Museum1FText_5c21a: - TX_FAR _Museum1FText_5c21a - db "@" + text_far _Museum1FText_5c21a + text_end Museum1FText_5c21f: - TX_FAR _Museum1FText_5c21f - db "@" + text_far _Museum1FText_5c21f + text_end Museum1FText_5c224: - TX_FAR _Museum1FText_5c224 - db "@" + text_far _Museum1FText_5c224 + text_end Museum1FText_5c229: - TX_FAR _Museum1FText_5c229 - db "@" + text_far _Museum1FText_5c229 + text_end Museum1FText_5c22e: - TX_FAR _Museum1FText_5c22e - db "@" + text_far _Museum1FText_5c22e + text_end Museum1FText_5c233: - TX_FAR _Museum1FText_5c233 - db "@" + text_far _Museum1FText_5c233 + text_end Museum1FText_5c238: - TX_FAR _Museum1FText_5c238 - db "@" + text_far _Museum1FText_5c238 + text_end Museum1FText_5c23d: - TX_FAR _Museum1FText_5c23d - db "@" + text_far _Museum1FText_5c23d + text_end Museum1FText_5c242: - TX_FAR _Museum1FText_5c242 - db "@" + text_far _Museum1FText_5c242 + text_end Museum1FText2: - TX_ASM + text_asm ld hl, Museum1FText_5c251 call PrintText jp TextScriptEnd Museum1FText_5c251: - TX_FAR _Museum1FText_5c251 - db "@" + text_far _Museum1FText_5c251 + text_end Museum1FText3: - TX_ASM + text_asm CheckEvent EVENT_GOT_OLD_AMBER - jr nz, .asm_5c285 + jr nz, .got_item ld hl, Museum1FText_5c28e call PrintText lb bc, OLD_AMBER, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full SetEvent EVENT_GOT_OLD_AMBER ld a, HS_OLD_AMBER ld [wMissableObjectIndex], a predef HideObject ld hl, ReceivedOldAmberText - jr .asm_5c288 -.BagFull + jr .done +.bag_full ld hl, Museum1FText_5c29e - jr .asm_5c288 -.asm_5c285 + jr .done +.got_item ld hl, Museum1FText_5c299 -.asm_5c288 +.done call PrintText jp TextScriptEnd Museum1FText_5c28e: - TX_FAR _Museum1FText_5c28e - db "@" + text_far _Museum1FText_5c28e + text_end ReceivedOldAmberText: - TX_FAR _ReceivedOldAmberText - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedOldAmberText + sound_get_item_1 + text_end Museum1FText_5c299: - TX_FAR _Museum1FText_5c299 - db "@" + text_far _Museum1FText_5c299 + text_end Museum1FText_5c29e: - TX_FAR _Museum1FText_5c29e - db "@" + text_far _Museum1FText_5c29e + text_end Museum1FText4: - TX_ASM + text_asm ld hl, Museum1FText_5c2ad call PrintText jp TextScriptEnd Museum1FText_5c2ad: - TX_FAR _Museum1FText_5c2ad - db "@" + text_far _Museum1FText_5c2ad + text_end Museum1FText5: - TX_ASM + text_asm ld hl, Museum1FText_5c2bc call PrintText jp TextScriptEnd Museum1FText_5c2bc: - TX_FAR _Museum1FText_5c2bc - db "@" + text_far _Museum1FText_5c2bc + text_end diff --git a/scripts/Museum2F.asm b/scripts/Museum2F.asm old mode 100755 new mode 100644 index ce4d3d81..8b1aa0bf --- a/scripts/Museum2F.asm +++ b/scripts/Museum2F.asm @@ -11,29 +11,29 @@ Museum2F_TextPointers: dw Museum2FText7 Museum2FText1: - TX_FAR _Museum2FText1 - db "@" + text_far _Museum2FText1 + text_end Museum2FText2: - TX_FAR _Museum2FText2 - db "@" + text_far _Museum2FText2 + text_end Museum2FText3: - TX_FAR _Museum2FText3 - db "@" + text_far _Museum2FText3 + text_end Museum2FText4: - TX_FAR _Museum2FText4 - db "@" + text_far _Museum2FText4 + text_end Museum2FText5: - TX_FAR _Museum2FText5 - db "@" + text_far _Museum2FText5 + text_end Museum2FText6: - TX_FAR _Museum2FText6 - db "@" + text_far _Museum2FText6 + text_end Museum2FText7: - TX_FAR _Museum2FText7 - db "@" + text_far _Museum2FText7 + text_end diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm old mode 100755 new mode 100644 index 323cb360..cecf97e7 --- a/scripts/NameRatersHouse.asm +++ b/scripts/NameRatersHouse.asm @@ -41,7 +41,7 @@ NameRatersHouse_TextPointers: dw NameRaterText1 NameRaterText1: - TX_ASM + text_asm call SaveScreenTilesToBuffer2 ld hl, NameRaterText_1dab3 call NameRaterScript_1da15 @@ -68,7 +68,7 @@ NameRaterText1: jr nz, .asm_1daae ld hl, NameRaterText_1dac2 call PrintText - callba DisplayNameRaterScreen + farcall DisplayNameRaterScreen jr c, .asm_1daae ld hl, NameRaterText_1dac7 .asm_1daa8 @@ -79,29 +79,29 @@ NameRaterText1: jr .asm_1daa8 NameRaterText_1dab3: - TX_FAR _NameRaterText_1dab3 - db "@" + text_far _NameRaterText_1dab3 + text_end NameRaterText_1dab8: - TX_FAR _NameRaterText_1dab8 - db "@" + text_far _NameRaterText_1dab8 + text_end NameRaterText_1dabd: - TX_FAR _NameRaterText_1dabd - db "@" + text_far _NameRaterText_1dabd + text_end NameRaterText_1dac2: - TX_FAR _NameRaterText_1dac2 - db "@" + text_far _NameRaterText_1dac2 + text_end NameRaterText_1dac7: - TX_FAR _NameRaterText_1dac7 - db "@" + text_far _NameRaterText_1dac7 + text_end NameRaterText_1dacc: - TX_FAR _NameRaterText_1dacc - db "@" + text_far _NameRaterText_1dacc + text_end NameRaterText_1dad1: - TX_FAR _NameRaterText_1dad1 - db "@" + text_far _NameRaterText_1dad1 + text_end diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm old mode 100755 new mode 100644 index 0c59f10b..9d6f8c3b --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -1,7 +1,7 @@ OaksLab_Script: CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 call nz, OaksLabScript_1d076 - ld a, $1 + ld a, TRUE ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -48,7 +48,7 @@ OaksLabScript0: OaksLabScript1: ld a, $8 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, OakEntryMovement call MoveSprite @@ -60,7 +60,7 @@ OakEntryMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP - db $FF + db -1 ; end OaksLabScript2: ld a, [wd730] @@ -86,14 +86,14 @@ OaksLabScript3: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $5 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $4 @@ -101,8 +101,8 @@ OaksLabScript3: ret PlayerEntryMovementRLE: - db D_UP,$8 - db $ff + db D_UP, 8 + db -1 ; end OaksLabScript4: ld a, [wSimulatedJoypadStatesIndex] @@ -111,9 +111,9 @@ OaksLabScript4: SetEvent EVENT_FOLLOWED_OAK_INTO_LAB SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites ld hl, wFlags_D733 @@ -128,19 +128,19 @@ OaksLabScript5: ld a, $fc ld [wJoyIgnore], a ld a, $11 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $12 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $13 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $14 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON xor a @@ -152,21 +152,21 @@ OaksLabScript5: OaksLabScript6: ld a, [wYCoord] - cp $6 + cp 6 ret nz ld a, $5 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites ld a, $c - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -200,10 +200,10 @@ OaksLabScript8: .Charmander ld de, .MiddleBallMovement1 ld a, [wYCoord] - cp $4 ; is the player standing below the table? - jr z, .asm_1ccf3 + cp 4 ; is the player standing below the table? + jr z, .moveBlue ld de, .MiddleBallMovement2 - jr .asm_1ccf3 + jr .moveBlue .MiddleBallMovement1 db NPC_MOVEMENT_DOWN @@ -212,22 +212,22 @@ OaksLabScript8: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_UP - db $FF + db -1 ; end .MiddleBallMovement2 db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end .Squirtle ld de, .RightBallMovement1 ld a, [wYCoord] - cp $4 ; is the player standing below the table? - jr z, .asm_1ccf3 + cp 4 ; is the player standing below the table? + jr z, .moveBlue ld de, .RightBallMovement2 - jr .asm_1ccf3 + jr .moveBlue .RightBallMovement1 db NPC_MOVEMENT_DOWN @@ -237,7 +237,7 @@ OaksLabScript8: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_UP - db $FF + db -1 ; end .RightBallMovement2 db NPC_MOVEMENT_DOWN @@ -245,43 +245,43 @@ OaksLabScript8: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end .Bulbasaur ld de, .LeftBallMovement1 ld a, [wXCoord] - cp $9 ; is the player standing to the right of the table? - jr nz, .asm_1ccf3 + cp 9 ; is the player standing to the right of the table? + jr nz, .moveBlue push hl ld a, $1 - ld [H_SPRITEINDEX], a - ld a, $4 - ld [H_SPRITEDATAOFFSET], a + ldh [hSpriteIndex], a + ld a, SPRITESTATEDATA1_YPIXELS + ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 push hl - ld [hl], $4c + ld [hl], $4c ; SPRITESTATEDATA1_YPIXELS inc hl inc hl - ld [hl], $0 + ld [hl], $0 ; SPRITESTATEDATA1_XPIXELS pop hl inc h - ld [hl], $8 + ld [hl], 8 ; SPRITESTATEDATA2_MAPY inc hl - ld [hl], $9 + ld [hl], 9 ; SPRITESTATEDATA2_MAPX ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that pop hl - jr .asm_1ccf3 + jr .moveBlue .LeftBallMovement1 db NPC_MOVEMENT_DOWN - db NPC_MOVEMENT_RIGHT ; not yet terminated! + db NPC_MOVEMENT_RIGHT .LeftBallMovement2 db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end -.asm_1ccf3 +.moveBlue ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $9 @@ -295,26 +295,26 @@ OaksLabScript9: ld a, $fc ld [wJoyIgnore], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $d - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wRivalStarterBallSpriteIndex] cp $2 - jr nz, .asm_1cd28 + jr nz, .rivalDidNotChoseBall1 ld a, HS_STARTER_BALL_1 - jr .asm_1cd32 -.asm_1cd28 + jr .hideBallAndContinue +.rivalDidNotChoseBall1 cp $3 - jr nz, .asm_1cd30 + jr nz, .rivalChoseBall3 ld a, HS_STARTER_BALL_2 - jr .asm_1cd32 -.asm_1cd30 + jr .hideBallAndContinue +.rivalChoseBall3 ld a, HS_STARTER_BALL_3 -.asm_1cd32 +.hideBallAndContinue ld [wMissableObjectIndex], a predef HideObject call Delay3 @@ -324,12 +324,12 @@ OaksLabScript9: ld [wd11e], a call GetMonName ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_STARTER xor a @@ -341,12 +341,12 @@ OaksLabScript9: OaksLabScript10: ld a, [wYCoord] - cp $6 + cp 6 ret nz ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a @@ -354,21 +354,21 @@ OaksLabScript10: ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $f - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [hNPCPlayerRelativePosPerspective], a + ldh [hNPCPlayerRelativePosPerspective], a ld a, $1 swap a - ld [hNPCSpriteOffset], a + ldh [hNPCSpriteOffset], a predef CalcPositionOfPlayerRelativeToNPC - ld a, [hNPCPlayerYDistance] + ldh a, [hNPCPlayerYDistance] dec a - ld [hNPCPlayerYDistance], a + ldh [hNPCPlayerYDistance], a predef FindPathToPlayer ld de, wNPCMovementDirections2 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $b @@ -381,7 +381,7 @@ OaksLabScript11: ret nz ; define which team rival uses, and fight it - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a ld a, [wRivalStarter] cp STARTER2 @@ -424,9 +424,9 @@ OaksLabScript12: ld [wSpriteIndex], a call SetSpritePosition1 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay predef HealParty SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB @@ -439,15 +439,15 @@ OaksLabScript13: ld c, 20 call DelayFrames ld a, $10 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, .RivalExitMovement call MoveSprite ld a, [wXCoord] - cp $4 + cp 4 ; move left or right depending on where the player is standing jr nz, .moveLeft ld a, NPC_MOVEMENT_RIGHT @@ -462,18 +462,18 @@ OaksLabScript13: ret .RivalExitMovement - db $E0 ; change sprite facing direction + db NPC_CHANGE_FACING db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end OaksLabScript14: ld a, [wd730] bit 0, a - jr nz, .asm_1ce8c + jr nz, .checkRivalPosition ld a, HS_OAKS_LAB_RIVAL ld [wMissableObjectIndex], a predef HideObject @@ -484,38 +484,38 @@ OaksLabScript14: ld [wOaksLabCurScript], a jr .done ; make the player keep facing the rival as he walks away -.asm_1ce8c +.checkRivalPosition ld a, [wNPCNumScriptedSteps] cp $5 - jr nz, .asm_1cea8 + jr nz, .turnPlayerDown ld a, [wXCoord] - cp $4 - jr nz, .asm_1cea1 + cp 4 + jr nz, .turnPlayerLeft ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a jr .done -.asm_1cea1 +.turnPlayerLeft ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a jr .done -.asm_1cea8 +.turnPlayerDown cp $4 ret nz xor a ; ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a .done ret OaksLabScript15: xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a call EnableAutoTextBoxDrawing - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, $15 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call OaksLabScript_1d02b ld a, HS_OAKS_LAB_RIVAL @@ -530,7 +530,7 @@ OaksLabScript15: call FillMemory ld [hl], $ff ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, wNPCMovementDirections2 call MoveSprite @@ -540,14 +540,14 @@ OaksLabScript15: OaksLabScript_1cefd: ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $8 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a xor a ; SPRITE_FACING_DOWN - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay OaksLabScript16: @@ -560,21 +560,21 @@ OaksLabScript16: ld [wJoyIgnore], a call OaksLabScript_1cefd ld a, $16 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame call OaksLabScript_1cefd ld a, $17 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame call OaksLabScript_1cefd ld a, $18 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame ld a, $19 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, HS_POKEDEX_1 @@ -585,16 +585,16 @@ OaksLabScript16: predef HideObject call OaksLabScript_1cefd ld a, $1a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 ld a, $1b - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_POKEDEX SetEvent EVENT_OAK_GOT_PARCEL @@ -611,12 +611,12 @@ OaksLabScript16: xor a ; NPC_MOVEMENT_DOWN call FillMemory ld [hl], $ff - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, wNPCMovementDirections2 call MoveSprite @@ -652,7 +652,7 @@ OaksLabScript18: OaksLabScript_RemoveParcel: ld hl, wBagItems - ld bc, $0000 + ld bc, 0 .loop ld a, [hli] cp $ff @@ -666,46 +666,46 @@ OaksLabScript_RemoveParcel: ld hl, wNumBagItems ld a, c ld [wWhichPokemon], a - ld a, $1 + ld a, 1 ld [wItemQuantity], a jp RemoveItemFromInventory OaksLabScript_1d02b: ld a, $7c - ld [$ffeb], a - ld a, $8 - ld [$ffee], a + ldh [hSpriteScreenYCoord], a + ld a, 8 + ldh [hSpriteMapXCoord], a ld a, [wYCoord] - cp $3 + cp 3 jr nz, .asm_1d045 ld a, $4 ld [wNPCMovementDirections2Index], a ld a, $30 - ld b, $b + ld b, 11 jr .asm_1d068 .asm_1d045 - cp $1 + cp 1 jr nz, .asm_1d054 ld a, $2 ld [wNPCMovementDirections2Index], a ld a, $30 - ld b, $9 + ld b, 9 jr .asm_1d068 .asm_1d054 ld a, $3 ld [wNPCMovementDirections2Index], a - ld b, $a + ld b, 10 ld a, [wXCoord] - cp $4 + cp 4 jr nz, .asm_1d066 ld a, $40 jr .asm_1d068 .asm_1d066 ld a, $20 .asm_1d068 - ld [$ffec], a + ldh [hSpriteScreenXCoord], a ld a, b - ld [$ffed], a + ldh [hSpriteMapYCoord], a ld a, $1 ld [wSpriteIndex], a call SetSpritePosition1 @@ -716,7 +716,7 @@ OaksLabScript_1d076: ld a, l ld [wMapTextPtr], a ld a, h - ld [wMapTextPtr+1], a + ld [wMapTextPtr + 1], a ret OaksLab_TextPointers: @@ -762,38 +762,38 @@ OaksLab_TextPointers2: dw OaksLabText11 OaksLabText1: - TX_ASM + text_asm CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2 - jr nz, .asm_1d0de + jr nz, .beforeChooseMon ld hl, OaksLabGaryText1 call PrintText - jr .asm_1d0f0 -.asm_1d0de + jr .done +.beforeChooseMon bit 2, a - jr nz, .asm_1d0ea + jr nz, .afterChooseMon ld hl, OaksLabText40 call PrintText - jr .asm_1d0f0 -.asm_1d0ea + jr .done +.afterChooseMon ld hl, OaksLabText41 call PrintText -.asm_1d0f0 +.done jp TextScriptEnd OaksLabGaryText1: - TX_FAR _OaksLabGaryText1 - db "@" + text_far _OaksLabGaryText1 + text_end OaksLabText40: - TX_FAR _OaksLabText40 - db "@" + text_far _OaksLabText40 + text_end OaksLabText41: - TX_FAR _OaksLabText41 - db "@" + text_far _OaksLabText41 + text_end OaksLabText2: - TX_ASM + text_asm ld a, STARTER2 ld [wRivalStarterTemp], a ld a, $3 @@ -803,7 +803,7 @@ OaksLabText2: jr OaksLabScript_1d133 OaksLabText3: - TX_ASM + text_asm ld a, STARTER3 ld [wRivalStarterTemp], a ld a, $4 @@ -813,7 +813,7 @@ OaksLabText3: jr OaksLabScript_1d133 OaksLabText4: - TX_ASM + text_asm ld a, STARTER1 ld [wRivalStarterTemp], a ld a, $2 @@ -835,20 +835,20 @@ OaksLabScript_1d133: jp TextScriptEnd OaksLabText39: - TX_FAR _OaksLabText39 - db "@" + text_far _OaksLabText39 + text_end OaksLabScript_1d157: ld a, $5 - ld [H_SPRITEINDEX], a - ld a, $9 - ld [H_SPRITEDATAOFFSET], a + ldh [hSpriteIndex], a + ld a, SPRITESTATEDATA1_FACINGDIRECTION + ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 ld [hl], SPRITE_FACING_DOWN ld a, $1 - ld [H_SPRITEINDEX], a - ld a, $9 - ld [H_SPRITEDATAOFFSET], a + ldh [hSpriteIndex], a + ld a, SPRITESTATEDATA1_FACINGDIRECTION + ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 ld [hl], SPRITE_FACING_RIGHT ld hl, wd730 @@ -870,22 +870,22 @@ OaksLabLookAtCharmander: ld hl, OaksLabCharmanderText jr OaksLabMonChoiceMenu OaksLabCharmanderText: - TX_FAR _OaksLabCharmanderText - db "@" + text_far _OaksLabCharmanderText + text_end OaksLabLookAtSquirtle: ld hl, OaksLabSquirtleText jr OaksLabMonChoiceMenu OaksLabSquirtleText: - TX_FAR _OaksLabSquirtleText - db "@" + text_far _OaksLabSquirtleText + text_end OaksLabLookAtBulbasaur: ld hl, OaksLabBulbasaurText jr OaksLabMonChoiceMenu OaksLabBulbasaurText: - TX_FAR _OaksLabBulbasaurText - db "@" + text_far _OaksLabBulbasaurText + text_end OaksLabMonChoiceMenu: call PrintText @@ -937,32 +937,32 @@ OaksLabMonChoiceEnd: jp TextScriptEnd OaksLabMonEnergeticText: - TX_FAR _OaksLabMonEnergeticText - db "@" + text_far _OaksLabMonEnergeticText + text_end OaksLabReceivedMonText: - TX_FAR _OaksLabReceivedMonText - TX_SFX_KEY_ITEM - db "@" + text_far _OaksLabReceivedMonText + sound_get_key_item + text_end OaksLabScript_1d22d: ld a, $5 - ld [H_SPRITEINDEX], a - ld a, $9 - ld [H_SPRITEDATAOFFSET], a + ldh [hSpriteIndex], a + ld a, SPRITESTATEDATA1_FACINGDIRECTION + ldh [hSpriteDataOffset], a call GetPointerWithinSpriteStateData1 - ld [hl], $0 + ld [hl], SPRITE_FACING_DOWN ld hl, OaksLabLastMonText call PrintText jp TextScriptEnd OaksLabLastMonText: - TX_FAR _OaksLabLastMonText - db "@" + text_far _OaksLabLastMonText + text_end OaksLabText32: OaksLabText5: - TX_ASM + text_asm CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS jr nz, .asm_1d266 ld hl, wPokedexOwned @@ -1033,201 +1033,201 @@ OaksLabText5: jp TextScriptEnd OaksLabText_1d2f0: - TX_FAR _OaksLabText_1d2f0 - db "@" + text_far _OaksLabText_1d2f0 + text_end OaksLabText_1d2f5: - TX_FAR _OaksLabText_1d2f5 - db "@" + text_far _OaksLabText_1d2f5 + text_end OaksLabText_1d2fa: - TX_FAR _OaksLabText_1d2fa - db "@" + text_far _OaksLabText_1d2fa + text_end OaksLabDeliverParcelText: - TX_FAR _OaksLabDeliverParcelText1 - TX_SFX_KEY_ITEM - TX_FAR _OaksLabDeliverParcelText2 - db "@" + text_far _OaksLabDeliverParcelText1 + sound_get_key_item + text_far _OaksLabDeliverParcelText2 + text_end OaksLabAroundWorldText: - TX_FAR _OaksLabAroundWorldText - db "@" + text_far _OaksLabAroundWorldText + text_end OaksLabGivePokeballsText: - TX_FAR _OaksLabGivePokeballsText1 - TX_SFX_KEY_ITEM - TX_FAR _OaksLabGivePokeballsText2 - db "@" + text_far _OaksLabGivePokeballsText1 + sound_get_key_item + text_far _OaksLabGivePokeballsText2 + text_end OaksLabPleaseVisitText: - TX_FAR _OaksLabPleaseVisitText - db "@" + text_far _OaksLabPleaseVisitText + text_end OaksLabText_1d31d: - TX_FAR _OaksLabText_1d31d - db "@" + text_far _OaksLabText_1d31d + text_end OaksLabText7: OaksLabText6: - TX_ASM + text_asm ld hl, OaksLabText_1d32c call PrintText jp TextScriptEnd OaksLabText_1d32c: - TX_FAR _OaksLabText_1d32c - db "@" + text_far _OaksLabText_1d32c + text_end OaksLabText8: - TX_FAR _OaksLabText8 - db "@" + text_far _OaksLabText8 + text_end OaksLabText9: - TX_ASM + text_asm ld hl, OaksLabText_1d340 call PrintText jp TextScriptEnd OaksLabText_1d340: - TX_FAR _OaksLabText_1d340 - db "@" + text_far _OaksLabText_1d340 + text_end OaksLabText17: - TX_ASM + text_asm ld hl, OaksLabRivalWaitingText call PrintText jp TextScriptEnd OaksLabRivalWaitingText: - TX_FAR _OaksLabRivalWaitingText - db "@" + text_far _OaksLabRivalWaitingText + text_end OaksLabText18: - TX_ASM + text_asm ld hl, OaksLabChooseMonText call PrintText jp TextScriptEnd OaksLabChooseMonText: - TX_FAR _OaksLabChooseMonText - db "@" + text_far _OaksLabChooseMonText + text_end OaksLabText19: - TX_ASM + text_asm ld hl, OaksLabRivalInterjectionText call PrintText jp TextScriptEnd OaksLabRivalInterjectionText: - TX_FAR _OaksLabRivalInterjectionText - db "@" + text_far _OaksLabRivalInterjectionText + text_end OaksLabText20: - TX_ASM + text_asm ld hl, OaksLabBePatientText call PrintText jp TextScriptEnd OaksLabBePatientText: - TX_FAR _OaksLabBePatientText - db "@" + text_far _OaksLabBePatientText + text_end OaksLabText12: - TX_ASM + text_asm ld hl, OaksLabLeavingText call PrintText jp TextScriptEnd OaksLabLeavingText: - TX_FAR _OaksLabLeavingText - db "@" + text_far _OaksLabLeavingText + text_end OaksLabText13: - TX_ASM + text_asm ld hl, OaksLabRivalPickingMonText call PrintText jp TextScriptEnd OaksLabRivalPickingMonText: - TX_FAR _OaksLabRivalPickingMonText - db "@" + text_far _OaksLabRivalPickingMonText + text_end OaksLabText14: - TX_ASM + text_asm ld hl, OaksLabRivalReceivedMonText call PrintText jp TextScriptEnd OaksLabRivalReceivedMonText: - TX_FAR _OaksLabRivalReceivedMonText - TX_SFX_KEY_ITEM - db "@" + text_far _OaksLabRivalReceivedMonText + sound_get_key_item + text_end OaksLabText15: - TX_ASM + text_asm ld hl, OaksLabRivalChallengeText call PrintText jp TextScriptEnd OaksLabRivalChallengeText: - TX_FAR _OaksLabRivalChallengeText - db "@" + text_far _OaksLabRivalChallengeText + text_end OaksLabText_1d3be: - TX_FAR _OaksLabText_1d3be - db "@" + text_far _OaksLabText_1d3be + text_end OaksLabText_1d3c3: - TX_FAR _OaksLabText_1d3c3 - db "@" + text_far _OaksLabText_1d3c3 + text_end OaksLabText16: - TX_ASM + text_asm ld hl, OaksLabRivalToughenUpText call PrintText jp TextScriptEnd OaksLabRivalToughenUpText: - TX_FAR _OaksLabRivalToughenUpText - db "@" + text_far _OaksLabRivalToughenUpText + text_end OaksLabText21: - TX_FAR _OaksLabText21 - db "@" + text_far _OaksLabText21 + text_end OaksLabText22: - TX_FAR _OaksLabText22 - db "@" + text_far _OaksLabText22 + text_end OaksLabText23: - TX_FAR _OaksLabText23 - db "@" + text_far _OaksLabText23 + text_end OaksLabText24: - TX_FAR _OaksLabText24 - db "@" + text_far _OaksLabText24 + text_end OaksLabText25: - TX_FAR _OaksLabText25 - TX_SFX_KEY_ITEM - db "@" + text_far _OaksLabText25 + sound_get_key_item + text_end OaksLabText26: - TX_FAR _OaksLabText26 - db "@" + text_far _OaksLabText26 + text_end OaksLabText27: - TX_FAR _OaksLabText27 - db "@" + text_far _OaksLabText27 + text_end OaksLabText11: OaksLabText10: - TX_ASM + text_asm ld hl, OaksLabText_1d405 call PrintText jp TextScriptEnd OaksLabText_1d405: - TX_FAR _OaksLabText_1d405 - db "@" + text_far _OaksLabText_1d405 + text_end diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm old mode 100755 new mode 100644 index 26a87ab1..b3478ba0 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -24,14 +24,14 @@ PalletTownScript0: cp 1 ; is player near north exit? ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld a, $FF - call PlaySound ; stop music + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld a, 0 ; BANK(Music_MeetProfOak) ld c, a - ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music + ld a, MUSIC_MEET_PROF_OAK ; "oak appears" music call PlayMusic ld a, $FC ld [wJoyIgnore], a @@ -46,7 +46,7 @@ PalletTownScript1: xor a ld [wcf0d], a ld a, 1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $FF ld [wJoyIgnore], a @@ -61,25 +61,25 @@ PalletTownScript1: PalletTownScript2: ld a, 1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 ld a, 1 ld [wYCoord], a ld a, 1 - ld [hNPCPlayerRelativePosPerspective], a + ldh [hNPCPlayerRelativePosPerspective], a ld a, 1 swap a - ld [hNPCSpriteOffset], a + ldh [hNPCSpriteOffset], a predef CalcPositionOfPlayerRelativeToNPC ld hl, hNPCPlayerYDistance dec [hl] - predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2 + predef FindPathToPlayer ; load Oak's movement into wNPCMovementDirections2 ld de, wNPCMovementDirections2 ld a, 1 ; oak - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $FF ld [wJoyIgnore], a @@ -94,13 +94,13 @@ PalletTownScript3: bit 0, a ret nz xor a ; ld a, SPRITE_FACING_DOWN - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, 1 ld [wcf0d], a ld a, $FC ld [wJoyIgnore], a ld a, 1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ; set up movement script that causes the player to follow Oak to his lab ld a, $FF @@ -111,7 +111,7 @@ PalletTownScript3: ld [wNPCMovementScriptFunctionNum], a ld a, 1 ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a ; trigger the next script @@ -158,7 +158,7 @@ PalletTown_TextPointers: dw PalletTownText7 PalletTownText1: - TX_ASM + text_asm ld a, [wcf0d] and a jr nz, .next @@ -173,8 +173,8 @@ PalletTownText1: jp TextScriptEnd OakAppearsText: - TX_FAR _OakAppearsText - TX_ASM + text_far _OakAppearsText + text_asm ld c, 10 call DelayFrames xor a @@ -186,29 +186,29 @@ OakAppearsText: jp TextScriptEnd OakWalksUpText: - TX_FAR _OakWalksUpText - db "@" + text_far _OakWalksUpText + text_end PalletTownText2: ; girl - TX_FAR _PalletTownText2 - db "@" + text_far _PalletTownText2 + text_end PalletTownText3: ; fat man - TX_FAR _PalletTownText3 - db "@" + text_far _PalletTownText3 + text_end PalletTownText4: ; sign by lab - TX_FAR _PalletTownText4 - db "@" + text_far _PalletTownText4 + text_end PalletTownText5: ; sign by fence - TX_FAR _PalletTownText5 - db "@" + text_far _PalletTownText5 + text_end -PalletTownText6: ; sign by Red’s house - TX_FAR _PalletTownText6 - db "@" +PalletTownText6: ; sign by Red's house + text_far _PalletTownText6 + text_end -PalletTownText7: ; sign by Blue’s house - TX_FAR _PalletTownText7 - db "@" +PalletTownText7: ; sign by Blue's house + text_far _PalletTownText7 + text_end diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm old mode 100755 new mode 100644 index dcc449c1..221834de --- a/scripts/PewterCity.asm +++ b/scripts/PewterCity.asm @@ -23,53 +23,57 @@ PewterCityScript0: PewterCityScript_1925e: CheckEvent EVENT_BEAT_BROCK ret nz +IF DEF(_DEBUG) + call DebugPressedOrHeldB + ret nz +ENDC ld hl, CoordsData_19277 call ArePlayerCoordsInArray ret nc ld a, $f0 ld [wJoyIgnore], a ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_19277: - db $11,$23 - db $11,$24 - db $12,$25 - db $13,$25 - db $ff + dbmapcoord 35, 17 + dbmapcoord 36, 17 + dbmapcoord 37, 18 + dbmapcoord 37, 19 + db -1 ; end PewterCityScript1: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz ld a, $3 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, ($3 << 4) | SPRITE_FACING_UP - ld [hSpriteImageIndex], a + ldh [hSpriteImageIndex], a call SetSpriteImageIndexAfterSettingFacingDirection call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] ld a, $d - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c - ld [$ffeb], a + ldh [hSpriteScreenYCoord], a ld a, $30 - ld [$ffec], a - ld a, $c - ld [$ffed], a - ld a, $11 - ld [$ffee], a + ldh [hSpriteScreenXCoord], a + ld a, 12 + ldh [hSpriteMapYCoord], a + ld a, 17 + ldh [hSpriteMapXCoord], a ld a, $3 ld [wSpriteIndex], a call SetSpritePosition1 ld a, $3 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 @@ -81,7 +85,7 @@ MovementData_PewterMuseumGuyExit: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end PewterCityScript2: ld a, [wd730] @@ -112,32 +116,32 @@ PewterCityScript4: and a ret nz ld a, $5 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_LEFT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, ($1 << 4) | SPRITE_FACING_LEFT - ld [hSpriteImageIndex], a + ldh [hSpriteImageIndex], a call SetSpriteImageIndexAfterSettingFacingDirection call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] ld a, $e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c - ld [$ffeb], a + ldh [hSpriteScreenYCoord], a ld a, $40 - ld [$ffec], a - ld a, $16 - ld [$ffed], a - ld a, $10 - ld [$ffee], a + ldh [hSpriteScreenXCoord], a + ld a, 22 + ldh [hSpriteMapYCoord], a + ld a, 16 + ldh [hSpriteMapXCoord], a ld a, $5 ld [wSpriteIndex], a call SetSpritePosition1 ld a, $5 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 @@ -150,7 +154,7 @@ MovementData_PewterGymGuyExit: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end PewterCityScript5: ld a, [wd730] @@ -193,98 +197,98 @@ PewterCity_TextPointers: dw PewterCityText14 PewterCityText1: - TX_FAR _PewterCityText1 - db "@" + text_far _PewterCityText1 + text_end PewterCityText2: - TX_FAR _PewterCityText2 - db "@" + text_far _PewterCityText2 + text_end PewterCityText3: - TX_ASM + text_asm ld hl, PewterCityText_193f1 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_193c9 + jr nz, .playerDidNotGoIntoMuseum ld hl, PewterCityText_193f6 call PrintText - jr .asm_193ee -.asm_193c9 + jr .done +.playerDidNotGoIntoMuseum ld hl, PewterCityText_193fb call PrintText xor a - ld [hJoyPressed], a - ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyHeld], a ld [wNPCMovementScriptFunctionNum], a ld a, $2 ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a ld a, $3 ld [wSpriteIndex], a call GetSpritePosition2 ld a, $1 ld [wPewterCityCurScript], a -.asm_193ee +.done jp TextScriptEnd PewterCityText_193f1: - TX_FAR _PewterCityText_193f1 - db "@" + text_far _PewterCityText_193f1 + text_end PewterCityText_193f6: - TX_FAR _PewterCityText_193f6 - db "@" + text_far _PewterCityText_193f6 + text_end PewterCityText_193fb: - TX_FAR _PewterCityText_193fb - db "@" + text_far _PewterCityText_193fb + text_end PewterCityText13: - TX_FAR _PewterCityText13 - db "@" + text_far _PewterCityText13 + text_end PewterCityText4: - TX_ASM + text_asm ld hl, PewterCityText_19427 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] cp $0 - jr nz, .asm_1941e + jr nz, .playerDoesNotKnow ld hl, PewterCityText_1942c call PrintText - jr .asm_19424 -.asm_1941e + jr .done +.playerDoesNotKnow ld hl, PewterCityText_19431 call PrintText -.asm_19424 +.done jp TextScriptEnd PewterCityText_19427: - TX_FAR _PewterCityText_19427 - db "@" + text_far _PewterCityText_19427 + text_end PewterCityText_1942c: - TX_FAR _PewterCityText_1942c - db "@" + text_far _PewterCityText_1942c + text_end PewterCityText_19431: - TX_FAR _PewterCityText_19431 - db "@" + text_far _PewterCityText_19431 + text_end PewterCityText5: - TX_ASM + text_asm ld hl, PewterCityText_1945d call PrintText xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld [wNPCMovementScriptFunctionNum], a ld a, $3 ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] + ldh a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a ld a, $5 ld [wSpriteIndex], a @@ -294,29 +298,29 @@ PewterCityText5: jp TextScriptEnd PewterCityText_1945d: - TX_FAR _PewterCityText_1945d - db "@" + text_far _PewterCityText_1945d + text_end PewterCityText14: - TX_FAR _PewterCityText14 - db "@" + text_far _PewterCityText14 + text_end PewterCityText6: - TX_FAR _PewterCityText6 - db "@" + text_far _PewterCityText6 + text_end PewterCityText7: - TX_FAR _PewterCityText7 - db "@" + text_far _PewterCityText7 + text_end PewterCityText10: - TX_FAR _PewterCityText10 - db "@" + text_far _PewterCityText10 + text_end PewterCityText11: - TX_FAR _PewterCityText11 - db "@" + text_far _PewterCityText11 + text_end PewterCityText12: - TX_FAR _PewterCityText12 - db "@" + text_far _PewterCityText12 + text_end diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm old mode 100755 new mode 100644 index 6dd24b08..ba0bdd00 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -2,7 +2,7 @@ PewterGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] - call nz, PewterGymScript_5c3a4 + call nz, .LoadNames call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeader0 ld de, PewterGym_ScriptPointers @@ -11,15 +11,15 @@ PewterGym_Script: ld [wPewterGymCurScript], a ret -PewterGymScript_5c3a4: - ld hl, Gym1CityName - ld de, Gym1LeaderName +.LoadNames: + ld hl, .CityName + ld de, .LeaderName jp LoadGymLeaderAndCityName -Gym1CityName: +.CityName: db "PEWTER CITY@" -Gym1LeaderName: +.LeaderName: db "BROCK@" PewterGymScript_5c3bf: @@ -41,29 +41,28 @@ PewterGymScript3: jp z, PewterGymScript_5c3bf ld a, $f0 ld [wJoyIgnore], a - PewterGymScript_5c3df: ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_BROCK - lb bc, TM_34, 1 + lb bc, TM_BIDE, 1 call GiveItem jr nc, .BagFull ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM34 - jr .asm_5c408 + jr .gymVictory .BagFull ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5c408 +.gymVictory ld hl, wObtainedBadges - set 0, [hl] + set BIT_BOULDERBADGE, [hl] ld hl, wBeatGymFlags - set 0, [hl] + set BIT_BOULDERBADGE, [hl] ld a, HS_GYM_GUY ld [wMissableObjectIndex], a @@ -88,30 +87,23 @@ PewterGym_TextPointers: dw PewterGymText6 PewterGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 - db ($5 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_PEWTER_GYM_TRAINER_0 - dw PewterGymBattleText1 ; TextBeforeBattle - dw PewterGymAfterBattleText1 ; TextAfterBattle - dw PewterGymEndBattleText1 ; TextEndBattle - dw PewterGymEndBattleText1 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_PEWTER_GYM_TRAINER_0, 5, PewterGymBattleText1, PewterGymEndBattleText1, PewterGymAfterBattleText1 + db -1 ; end PewterGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_BROCK - jr z, .asm_5c46a + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM34 - jr nz, .asm_5c462 + jr nz, .gymVictory call z, PewterGymScript_5c3df call DisableWaitingAfterTextDisplay - jr .asm_5c49b -.asm_5c462 + jr .done +.gymVictory ld hl, PewterGymText_5c4a3 call PrintText - jr .asm_5c49b -.asm_5c46a + jr .done +.beginBattle ld hl, PewterGymText_5c49e call PrintText ld hl, wd72d @@ -120,70 +112,70 @@ PewterGymText1: ld hl, PewterGymText_5c4bc ld de, PewterGymText_5c4bc call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 ld [wGymLeaderNo], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wPewterGymCurScript], a ld [wCurMapScript], a -.asm_5c49b +.done jp TextScriptEnd PewterGymText_5c49e: - TX_FAR _PewterGymText_5c49e - db "@" + text_far _PewterGymText_5c49e + text_end PewterGymText_5c4a3: - TX_FAR _PewterGymText_5c4a3 - db "@" + text_far _PewterGymText_5c4a3 + text_end PewterGymText4: - TX_FAR _TM34PreReceiveText - db "@" + text_far _TM34PreReceiveText + text_end PewterGymText5: - TX_FAR _ReceivedTM34Text - TX_SFX_ITEM_1 - TX_FAR _TM34ExplanationText - db "@" + text_far _ReceivedTM34Text + sound_get_item_1 + text_far _TM34ExplanationText + text_end PewterGymText6: - TX_FAR _TM34NoRoomText - db "@" + text_far _TM34NoRoomText + text_end PewterGymText_5c4bc: - TX_FAR _PewterGymText_5c4bc - TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded - TX_FAR _PewterGymText_5c4c1 - db "@" + text_far _PewterGymText_5c4bc + sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + text_far _PewterGymText_5c4c1 + text_end PewterGymText2: - TX_ASM + text_asm ld hl, PewterGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd PewterGymBattleText1: - TX_FAR _PewterGymBattleText1 - db "@" + text_far _PewterGymBattleText1 + text_end PewterGymEndBattleText1: - TX_FAR _PewterGymEndBattleText1 - db "@" + text_far _PewterGymEndBattleText1 + text_end PewterGymAfterBattleText1: - TX_FAR _PewterGymAfterBattleText1 - db "@" + text_far _PewterGymAfterBattleText1 + text_end PewterGymText3: - TX_ASM + text_asm ld a, [wBeatGymFlags] - bit 0, a + bit BIT_BOULDERBADGE, a jr nz, .asm_5c50c ld hl, PewterGymText_5c515 call PrintText @@ -208,21 +200,21 @@ PewterGymText3: jp TextScriptEnd PewterGymText_5c515: - TX_FAR _PewterGymText_5c515 - db "@" + text_far _PewterGymText_5c515 + text_end PewterGymText_5c51a: - TX_FAR _PewterGymText_5c51a - db "@" + text_far _PewterGymText_5c51a + text_end PewterGymText_5c51f: - TX_FAR _PewterGymText_5c51f - db "@" + text_far _PewterGymText_5c51f + text_end PewterGymText_5c524: - TX_FAR _PewterGymText_5c524 - db "@" + text_far _PewterGymText_5c524 + text_end PewterGymText_5c529: - TX_FAR _PewterGymText_5c529 - db "@" + text_far _PewterGymText_5c529 + text_end diff --git a/scripts/PewterMart.asm b/scripts/PewterMart.asm old mode 100755 new mode 100644 index c71f8413..a0e9e63e --- a/scripts/PewterMart.asm +++ b/scripts/PewterMart.asm @@ -1,6 +1,6 @@ PewterMart_Script: call EnableAutoTextBoxDrawing - ld a, $1 + ld a, TRUE ld [wAutoTextBoxDrawingControl], a ret @@ -10,19 +10,21 @@ PewterMart_TextPointers: dw PewterMartText3 PewterMartText2: - TX_ASM + text_asm ld hl, .Text call PrintText jp TextScriptEnd + .Text - TX_FAR _PewterMartText2 - db "@" + text_far _PewterMartText2 + text_end PewterMartText3: - TX_ASM + text_asm ld hl, .Text call PrintText jp TextScriptEnd + .Text - TX_FAR _PewterMartText3 - db "@" + text_far _PewterMartText3 + text_end diff --git a/scripts/PewterNidoranHouse.asm b/scripts/PewterNidoranHouse.asm old mode 100755 new mode 100644 index a4e85e08..93d430c0 --- a/scripts/PewterNidoranHouse.asm +++ b/scripts/PewterNidoranHouse.asm @@ -7,17 +7,17 @@ PewterNidoranHouse_TextPointers: dw PewterHouse1Text3 PewterHouse1Text1: - TX_FAR _PewterHouse1Text1 - TX_ASM + text_far _PewterHouse1Text1 + text_asm ld a, NIDORAN_M call PlayCry call WaitForSoundToFinish jp TextScriptEnd PewterHouse1Text2: - TX_FAR _PewterHouse1Text2 - db "@" + text_far _PewterHouse1Text2 + text_end PewterHouse1Text3: - TX_FAR _PewterHouse1Text3 - db "@" + text_far _PewterHouse1Text3 + text_end diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm old mode 100755 new mode 100644 index 09eb2982..0687b845 --- a/scripts/PewterPokecenter.asm +++ b/scripts/PewterPokecenter.asm @@ -9,21 +9,24 @@ PewterPokecenter_TextPointers: dw PewterTradeNurseText PewterHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse PewterPokecenterText2: - TX_FAR _PewterPokecenterText2 - db "@" + text_far _PewterPokecenterText2 + text_end PewterJigglypuffText: - TX_ASM - ld a, $1 + text_asm + ld a, TRUE ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, .Text + ld hl, .JigglypuffText call PrintText - StopAllMusic + + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld c, 32 call DelayFrames + ld hl, JigglypuffFacingDirections ld de, wJigglypuffFacingDirections ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections @@ -36,15 +39,16 @@ PewterJigglypuffText: inc hl jr nz, .findMatchingFacingDirectionLoop dec hl + push hl ld c, 0 ; BANK(Music_JigglypuffSong) ld a, MUSIC_JIGGLYPUFF_SONG call PlayMusic pop hl -.loop + +.spinMovementLoop ld a, [hl] ld [wSprite03StateData1ImageIndex], a - ; rotate the array push hl ld hl, wJigglypuffFacingDirections @@ -54,23 +58,22 @@ PewterJigglypuffText: ld a, [wJigglypuffFacingDirections - 1] ld [wJigglypuffFacingDirections + 3], a pop hl - ld c, 24 call DelayFrames push hl call IsSongPlaying pop hl - jr c, .loop + jr c, .spinMovementLoop ld c, 48 call DelayFrames call PlayDefaultMusic jp TextScriptEnd -.Text - TX_FAR _PewterJigglypuffText - db "@" +.JigglypuffText: + text_far _PewterJigglypuffText + text_end JigglypuffFacingDirections: db $30 | SPRITE_FACING_DOWN @@ -80,4 +83,4 @@ JigglypuffFacingDirections: JigglypuffFacingDirectionsEnd: PewterTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/PewterSpeechHouse.asm b/scripts/PewterSpeechHouse.asm old mode 100755 new mode 100644 index 943e1759..5d3d9249 --- a/scripts/PewterSpeechHouse.asm +++ b/scripts/PewterSpeechHouse.asm @@ -6,9 +6,9 @@ PewterSpeechHouse_TextPointers: dw PewterHouse2Text2 PewterHouse2Text1: - TX_FAR _PewterHouse2Text1 - db "@" + text_far _PewterHouse2Text1 + text_end PewterHouse2Text2: - TX_FAR _PewterHouse2Text2 - db "@" + text_far _PewterHouse2Text2 + text_end diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm old mode 100755 new mode 100644 index 673d6011..717ba4bb --- a/scripts/PokemonFanClub.asm +++ b/scripts/PokemonFanClub.asm @@ -23,7 +23,7 @@ PokemonFanClub_TextPointers: FanClubText1: ; pikachu fan - TX_ASM + text_asm CheckEvent EVENT_PIKACHU_FAN_BOAST jr nz, .mineisbetter ld hl, .normaltext @@ -38,16 +38,16 @@ FanClubText1: jp TextScriptEnd .normaltext - TX_FAR PikachuFanText - db "@" + text_far PikachuFanText + text_end .bettertext - TX_FAR PikachuFanBetterText - db "@" + text_far PikachuFanBetterText + text_end FanClubText2: ; seel fan - TX_ASM + text_asm CheckEvent EVENT_SEEL_FAN_BOAST jr nz, .mineisbetter ld hl, .normaltext @@ -62,16 +62,16 @@ FanClubText2: jp TextScriptEnd .normaltext - TX_FAR SeelFanText - db "@" + text_far SeelFanText + text_end .bettertext - TX_FAR SeelFanBetterText - db "@" + text_far SeelFanBetterText + text_end FanClubText3: ; pikachu - TX_ASM + text_asm ld hl, .text call PrintText ld a, PIKACHU @@ -80,12 +80,12 @@ FanClubText3: jp TextScriptEnd .text - TX_FAR FanClubPikachuText - db "@" + text_far FanClubPikachuText + text_end FanClubText4: ; seel - TX_ASM + text_asm ld hl, .text call PrintText ld a, SEEL @@ -94,12 +94,12 @@ FanClubText4: jp TextScriptEnd .text - TX_FAR FanClubSeelText - db "@" + text_far FanClubSeelText + text_end FanClubText5: ; chair - TX_ASM + text_asm call FanClubBikeInBag jr nz, .nothingleft @@ -115,12 +115,12 @@ FanClubText5: call PrintText lb bc, BIKE_VOUCHER, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, .receivedvouchertext call PrintText SetEvent EVENT_GOT_BIKE_VOUCHER jr .done -.BagFull +.bag_full ld hl, .bagfulltext call PrintText jr .done @@ -135,39 +135,39 @@ FanClubText5: jp TextScriptEnd .meetchairtext - TX_FAR FanClubMeetChairText - db "@" + text_far FanClubMeetChairText + text_end .storytext - TX_FAR FanClubChairStoryText - db "@" + text_far FanClubChairStoryText + text_end .receivedvouchertext - TX_FAR ReceivedBikeVoucherText - TX_SFX_KEY_ITEM - TX_FAR ExplainBikeVoucherText - db "@" + text_far ReceivedBikeVoucherText + sound_get_key_item + text_far ExplainBikeVoucherText + text_end .nostorytext - TX_FAR FanClubNoStoryText - db "@" + text_far FanClubNoStoryText + text_end .finaltext - TX_FAR FanClubChairFinalText - db "@" + text_far FanClubChairFinalText + text_end .bagfulltext - TX_FAR FanClubBagFullText - db "@" + text_far FanClubBagFullText + text_end FanClubText6: - TX_FAR _FanClubText6 - db "@" + text_far _FanClubText6 + text_end FanClubText7: - TX_FAR _FanClubText7 - db "@" + text_far _FanClubText7 + text_end FanClubText8: - TX_FAR _FanClubText8 - db "@" + text_far _FanClubText8 + text_end diff --git a/scripts/PokemonMansion1F.asm b/scripts/PokemonMansion1F.asm old mode 100755 new mode 100644 index 41f40635..ac86d626 --- a/scripts/PokemonMansion1F.asm +++ b/scripts/PokemonMansion1F.asm @@ -45,14 +45,14 @@ Mansion1ReplaceBlock: predef ReplaceTileBlock ret -Mansion1Script_Switches: - ld a, [wSpriteStateData1 + 9] +Mansion1Script_Switches:: + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansion1F_ScriptPointers: @@ -67,36 +67,29 @@ PokemonMansion1F_TextPointers: dw Mansion1Text4 Mansion1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0 - dw Mansion1BattleText2 ; TextBeforeBattle - dw Mansion1AfterBattleText2 ; TextAfterBattle - dw Mansion1EndBattleText2 ; TextEndBattle - dw Mansion1EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MANSION_1_TRAINER_0, 3, Mansion1BattleText2, Mansion1EndBattleText2, Mansion1AfterBattleText2 + db -1 ; end Mansion1Text1: - TX_ASM + text_asm ld hl, Mansion1TrainerHeader0 call TalkToTrainer jp TextScriptEnd Mansion1BattleText2: - TX_FAR _Mansion1BattleText2 - db "@" + text_far _Mansion1BattleText2 + text_end Mansion1EndBattleText2: - TX_FAR _Mansion1EndBattleText2 - db "@" + text_far _Mansion1EndBattleText2 + text_end Mansion1AfterBattleText2: - TX_FAR _Mansion1AfterBattleText2 - db "@" + text_far _Mansion1AfterBattleText2 + text_end Mansion1Text4: - TX_ASM + text_asm ld hl, MansionSwitchText call PrintText call YesNoChoice @@ -122,13 +115,13 @@ Mansion1Text4: jp TextScriptEnd MansionSwitchText: - TX_FAR _MansionSwitchText - db "@" + text_far _MansionSwitchText + text_end MansionSwitchPressedText: - TX_FAR _MansionSwitchPressedText - db "@" + text_far _MansionSwitchPressedText + text_end MansionSwitchNotPressedText: - TX_FAR _MansionSwitchNotPressedText - db "@" + text_far _MansionSwitchNotPressedText + text_end diff --git a/scripts/PokemonMansion2F.asm b/scripts/PokemonMansion2F.asm old mode 100755 new mode 100644 index a7b90bcd..2edd0fb6 --- a/scripts/PokemonMansion2F.asm +++ b/scripts/PokemonMansion2F.asm @@ -41,14 +41,14 @@ Mansion2Script_5202f: ld [wNewTileBlockID], a predef_jump ReplaceTileBlock -Mansion2Script_Switches: - ld a, [wSpriteStateData1 + 9] +Mansion2Script_Switches:: + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansion2F_ScriptPointers: @@ -64,45 +64,38 @@ PokemonMansion2F_TextPointers: dw Mansion2Text5 Mansion2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0 - dw Mansion2BattleText1 ; TextBeforeBattle - dw Mansion2AfterBattleText1 ; TextAfterBattle - dw Mansion2EndBattleText1 ; TextEndBattle - dw Mansion2EndBattleText1 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MANSION_2_TRAINER_0, 0, Mansion2BattleText1, Mansion2EndBattleText1, Mansion2AfterBattleText1 + db -1 ; end Mansion2Text1: - TX_ASM + text_asm ld hl, Mansion2TrainerHeader0 call TalkToTrainer jp TextScriptEnd Mansion2BattleText1: - TX_FAR _Mansion2BattleText1 - db "@" + text_far _Mansion2BattleText1 + text_end Mansion2EndBattleText1: - TX_FAR _Mansion2EndBattleText1 - db "@" + text_far _Mansion2EndBattleText1 + text_end Mansion2AfterBattleText1: - TX_FAR _Mansion2AfterBattleText1 - db "@" + text_far _Mansion2AfterBattleText1 + text_end Mansion2Text3: - TX_FAR _Mansion2Text3 - db "@" + text_far _Mansion2Text3 + text_end Mansion2Text4: - TX_FAR _Mansion2Text4 - db "@" + text_far _Mansion2Text4 + text_end Mansion3Text6: Mansion2Text5: - TX_ASM + text_asm ld hl, Mansion2Text_520c2 call PrintText call YesNoChoice @@ -128,13 +121,13 @@ Mansion2Text5: jp TextScriptEnd Mansion2Text_520c2: - TX_FAR _Mansion2Text_520c2 - db "@" + text_far _Mansion2Text_520c2 + text_end Mansion2Text_520c7: - TX_FAR _Mansion2Text_520c7 - db "@" + text_far _Mansion2Text_520c7 + text_end Mansion2Text_520cc: - TX_FAR _Mansion2Text_520cc - db "@" + text_far _Mansion2Text_520cc + text_end diff --git a/scripts/PokemonMansion3F.asm b/scripts/PokemonMansion3F.asm old mode 100755 new mode 100644 index 3edc7bfd..0f62d6e0 --- a/scripts/PokemonMansion3F.asm +++ b/scripts/PokemonMansion3F.asm @@ -16,18 +16,18 @@ Mansion3Script_52204: CheckEvent EVENT_MANSION_SWITCH_ON jr nz, .asm_52224 ld a, $e - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $5f - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret .asm_52224 ld a, $5f - ld bc, $207 + lb bc, 2, 7 call Mansion2Script_5202f ld a, $e - ld bc, $507 + lb bc, 5, 7 call Mansion2Script_5202f ret @@ -43,18 +43,18 @@ Mansion3Script0: and a jp z, CheckFightingMapTrainers cp $3 - ld a, $a5 + ld a, POKEMON_MANSION_1F jr nz, .asm_52250 - ld a, $d6 + ld a, POKEMON_MANSION_2F .asm_52250 ld [wDungeonWarpDestinationMap], a ret CoordsData_52254: - db $0E,$10 - db $0E,$11 - db $0E,$13 - db $FF + dbmapcoord 16, 14 + dbmapcoord 17, 14 + dbmapcoord 19, 14 + db -1 ; end Mansion3Script_5225b: xor a @@ -72,14 +72,14 @@ Mansion3Script_5225b: set 4, [hl] ret -Mansion3Script_Switches: - ld a, [wSpriteStateData1 + 9] +Mansion3Script_Switches:: + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansion3F_TextPointers: @@ -91,61 +91,47 @@ PokemonMansion3F_TextPointers: dw Mansion3Text6 Mansion3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_0 - dw Mansion3BattleText1 ; TextBeforeBattle - dw Mansion3AfterBattleText1 ; TextAfterBattle - dw Mansion3EndBattleText1 ; TextEndBattle - dw Mansion3EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_MANSION_3_TRAINER_0, 0, Mansion3BattleText1, Mansion3EndBattleText1, Mansion3AfterBattleText1 Mansion3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 - dw Mansion3BattleText2 ; TextBeforeBattle - dw Mansion3AfterBattleText2 ; TextAfterBattle - dw Mansion3EndBattleText2 ; TextEndBattle - dw Mansion3EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MANSION_3_TRAINER_1, 2, Mansion3BattleText2, Mansion3EndBattleText2, Mansion3AfterBattleText2 + db -1 ; end Mansion3Text1: - TX_ASM + text_asm ld hl, Mansion3TrainerHeader0 call TalkToTrainer jp TextScriptEnd Mansion3Text2: - TX_ASM + text_asm ld hl, Mansion3TrainerHeader1 call TalkToTrainer jp TextScriptEnd Mansion3BattleText1: - TX_FAR _Mansion3BattleText1 - db "@" + text_far _Mansion3BattleText1 + text_end Mansion3EndBattleText1: - TX_FAR _Mansion3EndBattleText1 - db "@" + text_far _Mansion3EndBattleText1 + text_end Mansion3AfterBattleText1: - TX_FAR _Mansion3AfterBattleText1 - db "@" + text_far _Mansion3AfterBattleText1 + text_end Mansion3BattleText2: - TX_FAR _Mansion3BattleText2 - db "@" + text_far _Mansion3BattleText2 + text_end Mansion3EndBattleText2: - TX_FAR _Mansion3EndBattleText2 - db "@" + text_far _Mansion3EndBattleText2 + text_end Mansion3AfterBattleText2: - TX_FAR _Mansion3AfterBattleText2 - db "@" + text_far _Mansion3AfterBattleText2 + text_end Mansion3Text5: - TX_FAR _Mansion3Text5 - db "@" + text_far _Mansion3Text5 + text_end diff --git a/scripts/PokemonMansionB1F.asm b/scripts/PokemonMansionB1F.asm old mode 100755 new mode 100644 index 887b4762..f3b62793 --- a/scripts/PokemonMansionB1F.asm +++ b/scripts/PokemonMansionB1F.asm @@ -43,14 +43,14 @@ Mansion4Script_523cf: call Mansion2Script_5202f ret -Mansion4Script_Switches: - ld a, [wSpriteStateData1 + 9] +Mansion4Script_Switches:: + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $9 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID PokemonMansionB1F_ScriptPointers: @@ -70,61 +70,47 @@ PokemonMansionB1F_TextPointers: dw Mansion3Text6 Mansion4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_0 - dw Mansion4BattleText1 ; TextBeforeBattle - dw Mansion4AfterBattleText1 ; TextAfterBattle - dw Mansion4EndBattleText1 ; TextEndBattle - dw Mansion4EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_MANSION_4_TRAINER_0, 0, Mansion4BattleText1, Mansion4EndBattleText1, Mansion4AfterBattleText1 Mansion4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1 - dw Mansion4BattleText2 ; TextBeforeBattle - dw Mansion4AfterBattleText2 ; TextAfterBattle - dw Mansion4EndBattleText2 ; TextEndBattle - dw Mansion4EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MANSION_4_TRAINER_1, 3, Mansion4BattleText2, Mansion4EndBattleText2, Mansion4AfterBattleText2 + db -1 ; end Mansion4Text1: - TX_ASM + text_asm ld hl, Mansion4TrainerHeader0 call TalkToTrainer jp TextScriptEnd Mansion4Text2: - TX_ASM + text_asm ld hl, Mansion4TrainerHeader1 call TalkToTrainer jp TextScriptEnd Mansion4BattleText1: - TX_FAR _Mansion4BattleText1 - db "@" + text_far _Mansion4BattleText1 + text_end Mansion4EndBattleText1: - TX_FAR _Mansion4EndBattleText1 - db "@" + text_far _Mansion4EndBattleText1 + text_end Mansion4AfterBattleText1: - TX_FAR _Mansion4AfterBattleText1 - db "@" + text_far _Mansion4AfterBattleText1 + text_end Mansion4BattleText2: - TX_FAR _Mansion4BattleText2 - db "@" + text_far _Mansion4BattleText2 + text_end Mansion4EndBattleText2: - TX_FAR _Mansion4EndBattleText2 - db "@" + text_far _Mansion4EndBattleText2 + text_end Mansion4AfterBattleText2: - TX_FAR _Mansion4AfterBattleText2 - db "@" + text_far _Mansion4AfterBattleText2 + text_end Mansion4Text7: - TX_FAR _Mansion4Text7 - db "@" + text_far _Mansion4Text7 + text_end diff --git a/scripts/PokemonTower1F.asm b/scripts/PokemonTower1F.asm old mode 100755 new mode 100644 index 66b5505c..65614523 --- a/scripts/PokemonTower1F.asm +++ b/scripts/PokemonTower1F.asm @@ -9,21 +9,21 @@ PokemonTower1F_TextPointers: dw PokemonTower1Text5 PokemonTower1Text1: - TX_FAR _PokemonTower1Text1 - db "@" + text_far _PokemonTower1Text1 + text_end PokemonTower1Text2: - TX_FAR _PokemonTower1Text2 - db "@" + text_far _PokemonTower1Text2 + text_end PokemonTower1Text3: - TX_FAR _PokemonTower1Text3 - db "@" + text_far _PokemonTower1Text3 + text_end PokemonTower1Text4: - TX_FAR _PokemonTower1Text4 - db "@" + text_far _PokemonTower1Text4 + text_end PokemonTower1Text5: - TX_FAR _PokemonTower1Text5 - db "@" + text_far _PokemonTower1Text5 + text_end diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm old mode 100755 new mode 100644 index ace80e78..0ec03f90 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -17,12 +17,16 @@ PokemonTower2F_ScriptPointers: dw PokemonTower2Script2 PokemonTower2Script0: +IF DEF(_DEBUG) + call DebugPressedOrHeldB + ret nz +ENDC CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL ret nz ld hl, CoordsData_6055e call ArePlayerCoordsInArray ret nc - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_MeetRival) @@ -41,22 +45,22 @@ PokemonTower2Script0: .asm_60544 ld [wPlayerMovingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, b - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a - ld [hJoyPressed], a + ldh [hJoyHeld], a + ldh [hJoyPressed], a ret CoordsData_6055e: - db $05,$0F - db $06,$0E - db $0F ; isn't this supposed to end in $ff? + dbmapcoord 15, 5 + dbmapcoord 14, 6 + db $0F ; end? (should be $ff?) PokemonTower2Script1: ld a, [wIsInBattle] @@ -66,7 +70,7 @@ PokemonTower2Script1: ld [wJoyIgnore], a SetEvent EVENT_BEAT_POKEMON_TOWER_RIVAL ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld de, MovementData_605b2 CheckEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT @@ -74,12 +78,12 @@ PokemonTower2Script1: ld de, MovementData_605a9 .asm_60589 ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, $2 ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a @@ -94,7 +98,7 @@ MovementData_605a9: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end MovementData_605b2: db NPC_MOVEMENT_DOWN @@ -105,7 +109,7 @@ MovementData_605b2: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end PokemonTower2Script2: ld a, [wd730] @@ -127,7 +131,7 @@ PokemonTower2F_TextPointers: dw PokemonTower2Text2 PokemonTower2Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL jr z, .asm_16f24 ld hl, PokemonTower2Text_6063c @@ -142,7 +146,7 @@ PokemonTower2Text1: ld hl, PokemonTower2Text_60632 ld de, PokemonTower2Text_60637 call SaveEndBattleTextPointers - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ; select which team to use during the encounter @@ -168,21 +172,21 @@ PokemonTower2Text1: jp TextScriptEnd PokemonTower2Text_6062d: - TX_FAR _PokemonTower2Text_6062d - db "@" + text_far _PokemonTower2Text_6062d + text_end PokemonTower2Text_60632: - TX_FAR _PokemonTower2Text_60632 - db "@" + text_far _PokemonTower2Text_60632 + text_end PokemonTower2Text_60637: - TX_FAR _PokemonTower2Text_60637 - db "@" + text_far _PokemonTower2Text_60637 + text_end PokemonTower2Text_6063c: - TX_FAR _PokemonTower2Text_6063c - db "@" + text_far _PokemonTower2Text_6063c + text_end PokemonTower2Text2: - TX_FAR _PokemonTower2Text2 - db "@" + text_far _PokemonTower2Text2 + text_end diff --git a/scripts/PokemonTower3F.asm b/scripts/PokemonTower3F.asm old mode 100755 new mode 100644 index 7d8f63e9..cf56904f --- a/scripts/PokemonTower3F.asm +++ b/scripts/PokemonTower3F.asm @@ -19,83 +19,63 @@ PokemonTower3F_TextPointers: dw PickUpItemText PokemonTower3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 - dw PokemonTower3BattleText1 ; TextBeforeBattle - dw PokemonTower3AfterBattleText1 ; TextAfterBattle - dw PokemonTower3EndBattleText1 ; TextEndBattle - dw PokemonTower3EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_0, 2, PokemonTower3BattleText1, PokemonTower3EndBattleText1, PokemonTower3AfterBattleText1 PokemonTower3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 - dw PokemonTower3BattleText2 ; TextBeforeBattle - dw PokemonTower3AfterBattleText2 ; TextAfterBattle - dw PokemonTower3EndBattleText2 ; TextEndBattle - dw PokemonTower3EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_1, 3, PokemonTower3BattleText2, PokemonTower3EndBattleText2, PokemonTower3AfterBattleText2 PokemonTower3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 - dw PokemonTower3BattleText3 ; TextBeforeBattle - dw PokemonTower3AfterBattleText3 ; TextAfterBattle - dw PokemonTower3EndBattleText3 ; TextEndBattle - dw PokemonTower3EndBattleText3 ; TextEndBattle - db $ff + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_2, 2, PokemonTower3BattleText3, PokemonTower3EndBattleText3, PokemonTower3AfterBattleText3 + db -1 ; end PokemonTower3Text1: - TX_ASM + text_asm ld hl, PokemonTower3TrainerHeader0 call TalkToTrainer jp TextScriptEnd PokemonTower3Text2: - TX_ASM + text_asm ld hl, PokemonTower3TrainerHeader1 call TalkToTrainer jp TextScriptEnd PokemonTower3Text3: - TX_ASM + text_asm ld hl, PokemonTower3TrainerHeader2 call TalkToTrainer jp TextScriptEnd PokemonTower3BattleText1: - TX_FAR _PokemonTower3BattleText1 - db "@" + text_far _PokemonTower3BattleText1 + text_end PokemonTower3EndBattleText1: - TX_FAR _PokemonTower3EndBattleText1 - db "@" + text_far _PokemonTower3EndBattleText1 + text_end PokemonTower3AfterBattleText1: - TX_FAR _PokemonTower3AfterBattleText1 - db "@" + text_far _PokemonTower3AfterBattleText1 + text_end PokemonTower3BattleText2: - TX_FAR _PokemonTower3BattleText2 - db "@" + text_far _PokemonTower3BattleText2 + text_end PokemonTower3EndBattleText2: - TX_FAR _PokemonTower3EndBattleText2 - db "@" + text_far _PokemonTower3EndBattleText2 + text_end PokemonTower3AfterBattleText2: - TX_FAR _PokemonTower3AfterBattleText2 - db "@" + text_far _PokemonTower3AfterBattleText2 + text_end PokemonTower3BattleText3: - TX_FAR _PokemonTower3BattleText3 - db "@" + text_far _PokemonTower3BattleText3 + text_end PokemonTower3EndBattleText3: - TX_FAR _PokemonTower3EndBattleText3 - db "@" + text_far _PokemonTower3EndBattleText3 + text_end PokemonTower3AfterBattleText3: - TX_FAR _PokemonTower3AfterBattleText3 - db "@" + text_far _PokemonTower3AfterBattleText3 + text_end diff --git a/scripts/PokemonTower4F.asm b/scripts/PokemonTower4F.asm old mode 100755 new mode 100644 index b8e0d772..e3431644 --- a/scripts/PokemonTower4F.asm +++ b/scripts/PokemonTower4F.asm @@ -21,84 +21,63 @@ PokemonTower4F_TextPointers: dw PickUpItemText PokemonTower4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 - dw PokemonTower4BattleText1 ; TextBeforeBattle - dw PokemonTower4AfterBattleText1 ; TextAfterBattle - dw PokemonTower4EndBattleText1 ; TextEndBattle - dw PokemonTower4EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4BattleText1, PokemonTower4EndBattleText1, PokemonTower4AfterBattleText1 PokemonTower4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 - dw PokemonTower4BattleText2 ; TextBeforeBattle - dw PokemonTower4AfterBattleText2 ; TextAfterBattle - dw PokemonTower4EndBattleText2 ; TextEndBattle - dw PokemonTower4EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_1, 2, PokemonTower4BattleText2, PokemonTower4EndBattleText2, PokemonTower4AfterBattleText2 PokemonTower4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 - dw PokemonTower4BattleText3 ; TextBeforeBattle - dw PokemonTower4AfterBattleText3 ; TextAfterBattle - dw PokemonTower4EndBattleText3 ; TextEndBattle - dw PokemonTower4EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_2, 2, PokemonTower4BattleText3, PokemonTower4EndBattleText3, PokemonTower4AfterBattleText3 + db -1 ; end PokemonTower4Text1: - TX_ASM + text_asm ld hl, PokemonTower4TrainerHeader0 call TalkToTrainer jp TextScriptEnd PokemonTower4Text2: - TX_ASM + text_asm ld hl, PokemonTower4TrainerHeader1 call TalkToTrainer jp TextScriptEnd PokemonTower4Text3: - TX_ASM + text_asm ld hl, PokemonTower4TrainerHeader2 call TalkToTrainer jp TextScriptEnd PokemonTower4BattleText1: - TX_FAR _PokemonTower4BattleText1 - db "@" + text_far _PokemonTower4BattleText1 + text_end PokemonTower4EndBattleText1: - TX_FAR _PokemonTower4EndBattleText1 - db "@" + text_far _PokemonTower4EndBattleText1 + text_end PokemonTower4AfterBattleText1: - TX_FAR _PokemonTower4AfterBattleText1 - db "@" + text_far _PokemonTower4AfterBattleText1 + text_end PokemonTower4BattleText2: - TX_FAR _PokemonTower4BattleText2 - db "@" + text_far _PokemonTower4BattleText2 + text_end PokemonTower4EndBattleText2: - TX_FAR _PokemonTower4EndBattleText2 - db "@" + text_far _PokemonTower4EndBattleText2 + text_end PokemonTower4AfterBattleText2: - TX_FAR _PokemonTower4AfterBattleText2 - db "@" + text_far _PokemonTower4AfterBattleText2 + text_end PokemonTower4BattleText3: - TX_FAR _PokemonTower4BattleText3 - db "@" + text_far _PokemonTower4BattleText3 + text_end PokemonTower4EndBattleText3: - TX_FAR _PokemonTower4EndBattleText3 - db "@" + text_far _PokemonTower4EndBattleText3 + text_end PokemonTower4AfterBattleText3: - TX_FAR _PokemonTower4AfterBattleText3 - db "@" + text_far _PokemonTower4AfterBattleText3 + text_end diff --git a/scripts/PokemonTower5F.asm b/scripts/PokemonTower5F.asm old mode 100755 new mode 100644 index 299261e9..10189a8e --- a/scripts/PokemonTower5F.asm +++ b/scripts/PokemonTower5F.asm @@ -24,7 +24,7 @@ PokemonTower5Script0: CheckAndSetEvent EVENT_IN_PURIFIED_ZONE ret nz xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld hl, wd72e @@ -35,18 +35,18 @@ PokemonTower5Script0: call Delay3 call GBFadeInFromWhite ld a, $7 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a ret CoordsData_60992: - db $08,$0A - db $08,$0B - db $09,$0A - db $09,$0B - db $FF + dbmapcoord 10, 8 + dbmapcoord 11, 8 + dbmapcoord 10, 9 + dbmapcoord 11, 9 + db -1 ; end PokemonTower5F_TextPointers: dw PokemonTower5Text1 @@ -58,119 +58,91 @@ PokemonTower5F_TextPointers: dw PokemonTower5Text7 PokemonTower5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 - dw PokemonTower5BattleText1 ; TextBeforeBattle - dw PokemonTower5AfterBattleText1 ; TextAfterBattle - dw PokemonTower5EndBattleText1 ; TextEndBattle - dw PokemonTower5EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_0, 2, PokemonTower5BattleText1, PokemonTower5EndBattleText1, PokemonTower5AfterBattleText1 PokemonTower5TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 - dw PokemonTower5BattleText2 ; TextBeforeBattle - dw PokemonTower5AfterBattleText2 ; TextAfterBattle - dw PokemonTower5EndBattleText2 ; TextEndBattle - dw PokemonTower5EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_1, 3, PokemonTower5BattleText2, PokemonTower5EndBattleText2, PokemonTower5AfterBattleText2 PokemonTower5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 - dw PokemonTower5BattleText3 ; TextBeforeBattle - dw PokemonTower5AfterBattleText3 ; TextAfterBattle - dw PokemonTower5EndBattleText3 ; TextEndBattle - dw PokemonTower5EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_2, 2, PokemonTower5BattleText3, PokemonTower5EndBattleText3, PokemonTower5AfterBattleText3 PokemonTower5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 - dw PokemonTower5BattleText4 ; TextBeforeBattle - dw PokemonTower5AfterBattleText4 ; TextAfterBattle - dw PokemonTower5EndBattleText4 ; TextEndBattle - dw PokemonTower5EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_POKEMONTOWER_5_TRAINER_3, 2, PokemonTower5BattleText4, PokemonTower5EndBattleText4, PokemonTower5AfterBattleText4 + db -1 ; end PokemonTower5Text1: - TX_FAR _PokemonTower5Text1 - db "@" + text_far _PokemonTower5Text1 + text_end PokemonTower5Text2: - TX_ASM + text_asm ld hl, PokemonTower5TrainerHeader0 call TalkToTrainer jp TextScriptEnd PokemonTower5BattleText1: - TX_FAR _PokemonTower5BattleText1 - db "@" + text_far _PokemonTower5BattleText1 + text_end PokemonTower5EndBattleText1: - TX_FAR _PokemonTower5EndBattleText1 - db "@" + text_far _PokemonTower5EndBattleText1 + text_end PokemonTower5AfterBattleText1: - TX_FAR _PokemonTower5AfterBattleText1 - db "@" + text_far _PokemonTower5AfterBattleText1 + text_end PokemonTower5Text3: - TX_ASM + text_asm ld hl, PokemonTower5TrainerHeader1 call TalkToTrainer jp TextScriptEnd PokemonTower5BattleText2: - TX_FAR _PokemonTower5BattleText2 - db "@" + text_far _PokemonTower5BattleText2 + text_end PokemonTower5EndBattleText2: - TX_FAR _PokemonTower5EndBattleText2 - db "@" + text_far _PokemonTower5EndBattleText2 + text_end PokemonTower5AfterBattleText2: - TX_FAR _PokemonTower5AfterBattleText2 - db "@" + text_far _PokemonTower5AfterBattleText2 + text_end PokemonTower5Text4: - TX_ASM + text_asm ld hl, PokemonTower5TrainerHeader2 call TalkToTrainer jp TextScriptEnd PokemonTower5BattleText3: - TX_FAR _PokemonTower5BattleText3 - db "@" + text_far _PokemonTower5BattleText3 + text_end PokemonTower5EndBattleText3: - TX_FAR _PokemonTower5EndBattleText3 - db "@" + text_far _PokemonTower5EndBattleText3 + text_end PokemonTower5AfterBattleText3: - TX_FAR _PokemonTower5AfterBattleText3 - db "@" + text_far _PokemonTower5AfterBattleText3 + text_end PokemonTower5Text5: - TX_ASM + text_asm ld hl, PokemonTower5TrainerHeader3 call TalkToTrainer jp TextScriptEnd PokemonTower5BattleText4: - TX_FAR _PokemonTower5BattleText4 - db "@" + text_far _PokemonTower5BattleText4 + text_end PokemonTower5EndBattleText4: - TX_FAR _PokemonTower5EndBattleText4 - db "@" + text_far _PokemonTower5EndBattleText4 + text_end PokemonTower5AfterBattleText4: - TX_FAR _PokemonTower5AfterBattleText4 - db "@" + text_far _PokemonTower5AfterBattleText4 + text_end PokemonTower5Text7: - TX_FAR _PokemonTower5Text7 - db "@" + text_far _PokemonTower5Text7 + text_end diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm old mode 100755 new mode 100644 index 14c07c48..e236488e --- a/scripts/PokemonTower6F.asm +++ b/scripts/PokemonTower6F.asm @@ -28,11 +28,11 @@ PokemonTower6Script0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, MAROWAK + ld a, RESTLESS_SOUL ld [wCurOpponent], a ld a, 30 ld [wCurEnemyLVL], a @@ -42,7 +42,8 @@ PokemonTower6Script0: ret CoordsData_60b45: - db $10,$0A,$FF + dbmapcoord 10, 16 + db -1 ; end PokemonTower6Script4: ld a, [wIsInBattle] @@ -61,7 +62,7 @@ PokemonTower6Script4: jr nz, .asm_60b82 SetEvent EVENT_BEAT_GHOST_MAROWAK ld a, $7 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -75,7 +76,7 @@ PokemonTower6Script4: ld a, $10 ld [wSimulatedJoypadStatesEnd], a xor a - ld [wSpriteStateData2 + $06], a + ld [wSpritePlayerStateData2MovementByte1], a ld [wOverrideSimulatedJoypadStatesMask], a ld hl, wd730 set 7, [hl] @@ -104,57 +105,36 @@ PokemonTower6F_TextPointers: dw PokemonTower6Text7 PokemonTower6TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 - dw PokemonTower6BattleText1 ; TextBeforeBattle - dw PokemonTower6AfterBattleText1 ; TextAfterBattle - dw PokemonTower6EndBattleText1 ; TextEndBattle - dw PokemonTower6EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_0, 3, PokemonTower6BattleText1, PokemonTower6EndBattleText1, PokemonTower6AfterBattleText1 PokemonTower6TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 - dw PokemonTower6BattleText2 ; TextBeforeBattle - dw PokemonTower6AfterBattleText2 ; TextAfterBattle - dw PokemonTower6EndBattleText2 ; TextEndBattle - dw PokemonTower6EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_1, 3, PokemonTower6BattleText2, PokemonTower6EndBattleText2, PokemonTower6AfterBattleText2 PokemonTower6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 - dw PokemonTower6BattleText3 ; TextBeforeBattle - dw PokemonTower6AfterBattleText3 ; TextAfterBattle - dw PokemonTower6EndBattleText3 ; TextEndBattle - dw PokemonTower6EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_POKEMONTOWER_6_TRAINER_2, 2, PokemonTower6BattleText3, PokemonTower6EndBattleText3, PokemonTower6AfterBattleText3 + db -1 ; end PokemonTower6Text1: - TX_ASM + text_asm ld hl, PokemonTower6TrainerHeader0 call TalkToTrainer jp TextScriptEnd PokemonTower6Text2: - TX_ASM + text_asm ld hl, PokemonTower6TrainerHeader1 call TalkToTrainer jp TextScriptEnd PokemonTower6Text3: - TX_ASM + text_asm ld hl, PokemonTower6TrainerHeader2 call TalkToTrainer jp TextScriptEnd PokemonTower6Text7: - TX_ASM + text_asm ld hl, PokemonTower2Text_60c1f call PrintText - ld a, MAROWAK + ld a, RESTLESS_SOUL call PlayCry call WaitForSoundToFinish ld c, 30 @@ -164,49 +144,49 @@ PokemonTower6Text7: jp TextScriptEnd PokemonTower2Text_60c1f: - TX_FAR _PokemonTower2Text_60c1f - db "@" + text_far _PokemonTower2Text_60c1f + text_end PokemonTower2Text_60c24: - TX_FAR _PokemonTower2Text_60c24 - db "@" + text_far _PokemonTower2Text_60c24 + text_end PokemonTower6BattleText1: - TX_FAR _PokemonTower6BattleText1 - db "@" + text_far _PokemonTower6BattleText1 + text_end PokemonTower6EndBattleText1: - TX_FAR _PokemonTower6EndBattleText1 - db "@" + text_far _PokemonTower6EndBattleText1 + text_end PokemonTower6AfterBattleText1: - TX_FAR _PokemonTower6AfterBattleText1 - db "@" + text_far _PokemonTower6AfterBattleText1 + text_end PokemonTower6BattleText2: - TX_FAR _PokemonTower6BattleText2 - db "@" + text_far _PokemonTower6BattleText2 + text_end PokemonTower6EndBattleText2: - TX_FAR _PokemonTower6EndBattleText2 - db "@" + text_far _PokemonTower6EndBattleText2 + text_end PokemonTower6AfterBattleText2: - TX_FAR _PokemonTower6AfterBattleText2 - db "@" + text_far _PokemonTower6AfterBattleText2 + text_end PokemonTower6BattleText3: - TX_FAR _PokemonTower6BattleText3 - db "@" + text_far _PokemonTower6BattleText3 + text_end PokemonTower6EndBattleText3: - TX_FAR _PokemonTower6EndBattleText3 - db "@" + text_far _PokemonTower6EndBattleText3 + text_end PokemonTower6AfterBattleText3: - TX_FAR _PokemonTower6AfterBattleText3 - db "@" + text_far _PokemonTower6AfterBattleText3 + text_end PokemonTower6Text6: - TX_FAR _PokemonTower6Text6 - db "@" + text_far _PokemonTower6Text6 + text_end diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm old mode 100755 new mode 100644 index 4b2a1827..e098b95f --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -31,7 +31,7 @@ PokemonTower7Script2: ld a, $f0 ld [wJoyIgnore], a ld a, [wSpriteIndex] - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 @@ -70,9 +70,9 @@ PokemonTower7Script4: ld [wMissableObjectIndex], a predef HideObject ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, MR_FUJIS_HOUSE - ld [hWarpDestinationMap], a + ldh [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a ld a, LAVENDER_TOWN @@ -107,7 +107,7 @@ PokemonTower7Script_60db6: ld d, [hl] ld e, a ld a, [wSpriteIndex] - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a jp MoveSprite .asm_60dde inc hl @@ -117,30 +117,18 @@ PokemonTower7Script_60db6: jr .asm_60dcb CoordsData_60de3: - db $0C,$09 - dw MovementData_60e13 - db $0B,$0A - dw MovementData_60e1b - db $0B,$0B - dw MovementData_60e22 - db $0B,$0C - dw MovementData_60e22 - db $0A,$0C - dw MovementData_60e28 - db $09,$0B - dw MovementData_60e30 - db $09,$0A - dw MovementData_60e22 - db $09,$09 - dw MovementData_60e22 - db $08,$09 - dw MovementData_60e37 - db $07,$0A - dw MovementData_60e22 - db $07,$0B - dw MovementData_60e22 - db $07,$0C - dw MovementData_60e22 + map_coord_movement 9, 12, MovementData_60e13 + map_coord_movement 10, 11, MovementData_60e1b + map_coord_movement 11, 11, MovementData_60e22 + map_coord_movement 12, 11, MovementData_60e22 + map_coord_movement 12, 10, MovementData_60e28 + map_coord_movement 11, 9, MovementData_60e30 + map_coord_movement 10, 9, MovementData_60e22 + map_coord_movement 9, 9, MovementData_60e22 + map_coord_movement 9, 8, MovementData_60e37 + map_coord_movement 10, 7, MovementData_60e22 + map_coord_movement 11, 7, MovementData_60e22 + map_coord_movement 12, 7, MovementData_60e22 MovementData_60e13: db NPC_MOVEMENT_RIGHT @@ -150,7 +138,7 @@ MovementData_60e13: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_LEFT - db $FF + db -1 ; end MovementData_60e1b: db NPC_MOVEMENT_DOWN @@ -159,7 +147,7 @@ MovementData_60e1b: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end MovementData_60e22: db NPC_MOVEMENT_DOWN @@ -167,7 +155,7 @@ MovementData_60e22: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end MovementData_60e28: db NPC_MOVEMENT_LEFT @@ -177,7 +165,7 @@ MovementData_60e28: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end MovementData_60e30: db NPC_MOVEMENT_DOWN @@ -186,7 +174,7 @@ MovementData_60e30: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end MovementData_60e37: db NPC_MOVEMENT_RIGHT @@ -196,7 +184,7 @@ MovementData_60e37: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end PokemonTower7F_TextPointers: dw PokemonTower7Text1 @@ -205,54 +193,33 @@ PokemonTower7F_TextPointers: dw PokemonTower7FujiText PokemonTower7TrainerHeader0: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 - dw PokemonTower7BattleText1 ; TextBeforeBattle - dw PokemonTower7AfterBattleText1 ; TextAfterBattle - dw PokemonTower7EndBattleText1 ; TextEndBattle - dw PokemonTower7EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_0, 3, PokemonTower7BattleText1, PokemonTower7EndBattleText1, PokemonTower7AfterBattleText1 PokemonTower7TrainerHeader1: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_1 - dw PokemonTower7BattleText2 ; TextBeforeBattle - dw PokemonTower7AfterBattleText2 ; TextAfterBattle - dw PokemonTower7EndBattleText2 ; TextEndBattle - dw PokemonTower7EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_1, 3, PokemonTower7BattleText2, PokemonTower7EndBattleText2, PokemonTower7AfterBattleText2 PokemonTower7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_7_TRAINER_2 - dw PokemonTower7BattleText3 ; TextBeforeBattle - dw PokemonTower7AfterBattleText3 ; TextAfterBattle - dw PokemonTower7EndBattleText3 ; TextEndBattle - dw PokemonTower7EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_POKEMONTOWER_7_TRAINER_2, 3, PokemonTower7BattleText3, PokemonTower7EndBattleText3, PokemonTower7AfterBattleText3 + db -1 ; end PokemonTower7Text1: - TX_ASM + text_asm ld hl, PokemonTower7TrainerHeader0 call TalkToTrainer jp TextScriptEnd PokemonTower7Text2: - TX_ASM + text_asm ld hl, PokemonTower7TrainerHeader1 call TalkToTrainer jp TextScriptEnd PokemonTower7Text3: - TX_ASM + text_asm ld hl, PokemonTower7TrainerHeader2 call TalkToTrainer jp TextScriptEnd PokemonTower7FujiText: - TX_ASM + text_asm ld hl, TowerRescueFujiText call PrintText SetEvent EVENT_RESCUED_MR_FUJI @@ -272,41 +239,41 @@ PokemonTower7FujiText: jp TextScriptEnd TowerRescueFujiText: - TX_FAR _TowerRescueFujiText - db "@" + text_far _TowerRescueFujiText + text_end PokemonTower7BattleText1: - TX_FAR _PokemonTower7BattleText1 - db "@" + text_far _PokemonTower7BattleText1 + text_end PokemonTower7EndBattleText1: - TX_FAR _PokemonTower7EndBattleText1 - db "@" + text_far _PokemonTower7EndBattleText1 + text_end PokemonTower7AfterBattleText1: - TX_FAR _PokemonTower7AfterBattleText1 - db "@" + text_far _PokemonTower7AfterBattleText1 + text_end PokemonTower7BattleText2: - TX_FAR _PokemonTower7BattleText2 - db "@" + text_far _PokemonTower7BattleText2 + text_end PokemonTower7EndBattleText2: - TX_FAR _PokemonTower7EndBattleText2 - db "@" + text_far _PokemonTower7EndBattleText2 + text_end PokemonTower7AfterBattleText2: - TX_FAR _PokemonTower7AfterBattleText2 - db "@" + text_far _PokemonTower7AfterBattleText2 + text_end PokemonTower7BattleText3: - TX_FAR _PokemonTower7BattleText3 - db "@" + text_far _PokemonTower7BattleText3 + text_end PokemonTower7EndBattleText3: - TX_FAR _PokemonTower7EndBattleText3 - db "@" + text_far _PokemonTower7EndBattleText3 + text_end PokemonTower7AfterBattleText3: - TX_FAR _PokemonTower7AfterBattleText3 - db "@" + text_far _PokemonTower7AfterBattleText3 + text_end diff --git a/scripts/PowerPlant.asm b/scripts/PowerPlant.asm old mode 100755 new mode 100644 index 35b4893f..76859218 --- a/scripts/PowerPlant.asm +++ b/scripts/PowerPlant.asm @@ -7,7 +7,7 @@ PowerPlant_Script: ld [wPowerPlantCurScript], a ret -PowerPlant_ScriptPointers +PowerPlant_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -29,87 +29,24 @@ PowerPlant_TextPointers: dw PickUpItemText Voltorb0TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_0, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb1TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb2TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_2, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb3TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_3, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb4TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_4, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb5TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_5, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb6TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_6, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText Voltorb7TrainerHeader: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 - dw VoltorbBattleText ; TextBeforeBattle - dw VoltorbBattleText ; TextAfterBattle - dw VoltorbBattleText ; TextEndBattle - dw VoltorbBattleText ; TextEndBattle - + trainer EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1, 0, VoltorbBattleText, VoltorbBattleText, VoltorbBattleText ZapdosTrainerHeader: - dbEventFlagBit EVENT_BEAT_ZAPDOS, 1 - db 0 ; view range - dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1 - dw ZapdosBattleText ; TextBeforeBattle - dw ZapdosBattleText ; TextAfterBattle - dw ZapdosBattleText ; TextEndBattle - dw ZapdosBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ZAPDOS, 1, 0, ZapdosBattleText, ZapdosBattleText, ZapdosBattleText + db -1 ; end InitVoltorbBattle: call TalkToTrainer @@ -118,57 +55,57 @@ InitVoltorbBattle: jp TextScriptEnd Voltorb0Text: - TX_ASM + text_asm ld hl, Voltorb0TrainerHeader jr InitVoltorbBattle Voltorb1Text: - TX_ASM + text_asm ld hl, Voltorb1TrainerHeader jr InitVoltorbBattle Voltorb2Text: - TX_ASM + text_asm ld hl, Voltorb2TrainerHeader jr InitVoltorbBattle Voltorb3Text: - TX_ASM + text_asm ld hl, Voltorb3TrainerHeader jr InitVoltorbBattle Voltorb4Text: - TX_ASM + text_asm ld hl, Voltorb4TrainerHeader jr InitVoltorbBattle Voltorb5Text: - TX_ASM + text_asm ld hl, Voltorb5TrainerHeader jr InitVoltorbBattle Voltorb6Text: - TX_ASM + text_asm ld hl, Voltorb6TrainerHeader jr InitVoltorbBattle Voltorb7Text: - TX_ASM + text_asm ld hl, Voltorb7TrainerHeader jr InitVoltorbBattle ZapdosText: - TX_ASM + text_asm ld hl, ZapdosTrainerHeader jr InitVoltorbBattle VoltorbBattleText: - TX_FAR _VoltorbBattleText - db "@" + text_far _VoltorbBattleText + text_end ZapdosBattleText: - TX_FAR _ZapdosBattleText - TX_ASM + text_far _ZapdosBattleText + text_asm ld a, ZAPDOS call PlayCry call WaitForSoundToFinish diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm old mode 100755 new mode 100644 index 2e461722..57d50cab --- a/scripts/RedsHouse1F.asm +++ b/scripts/RedsHouse1F.asm @@ -2,14 +2,14 @@ RedsHouse1F_Script: jp EnableAutoTextBoxDrawing RedsHouse1F_TextPointers: - dw RedsHouse1FText1 - dw RedsHouse1FText2 + dw RedsHouse1FMomText + dw RedsHouse1FTVText -RedsHouse1FText1: ; Mom - TX_ASM +RedsHouse1FMomText: + text_asm ld a, [wd72e] - bit 3, a - jr nz, .heal ; if player has received a Pokémon from Oak, heal team + bit 3, a ; received a Pokémon from Oak? + jr nz, .heal ld hl, MomWakeUpText call PrintText jr .done @@ -19,8 +19,8 @@ RedsHouse1FText1: ; Mom jp TextScriptEnd MomWakeUpText: - TX_FAR _MomWakeUpText - db "@" + text_far _MomWakeUpText + text_end MomHealPokemon: ld hl, MomHealText1 @@ -40,27 +40,27 @@ MomHealPokemon: jp PrintText MomHealText1: - TX_FAR _MomHealText1 - db "@" + text_far _MomHealText1 + text_end MomHealText2: - TX_FAR _MomHealText2 - db "@" + text_far _MomHealText2 + text_end -RedsHouse1FText2: ; TV - TX_ASM - ld a, [wSpriteStateData1 + 9] +RedsHouse1FTVText: + text_asm + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP ld hl, TVWrongSideText - jr nz, .notUp + jr nz, .got_text ld hl, StandByMeText -.notUp +.got_text call PrintText jp TextScriptEnd StandByMeText: - TX_FAR _StandByMeText - db "@" + text_far _StandByMeText + text_end TVWrongSideText: - TX_FAR _TVWrongSideText - db "@" + text_far _TVWrongSideText + text_end diff --git a/scripts/RedsHouse2F.asm b/scripts/RedsHouse2F.asm old mode 100755 new mode 100644 index 5ec86678..b44b9f98 --- a/scripts/RedsHouse2F.asm +++ b/scripts/RedsHouse2F.asm @@ -10,7 +10,7 @@ RedsHouse2F_ScriptPointers: RedsHouse2FScript0: xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, 1 @@ -21,4 +21,5 @@ RedsHouse2FScript1: ret RedsHouse2F_TextPointers: - db "@" + + text_end ; unused diff --git a/scripts/RockTunnel1F.asm b/scripts/RockTunnel1F.asm old mode 100755 new mode 100644 index 94620d96..606e0317 --- a/scripts/RockTunnel1F.asm +++ b/scripts/RockTunnel1F.asm @@ -23,191 +23,142 @@ RockTunnel1F_TextPointers: dw RockTunnel1Text8 RockTunnel1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0 - dw RockTunnel1BattleText1 ; TextBeforeBattle - dw RockTunnel1AfterBattleText1 ; TextAfterBattle - dw RockTunnel1EndBattleText1 ; TextEndBattle - dw RockTunnel1EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0, 4, RockTunnel1BattleText1, RockTunnel1EndBattleText1, RockTunnel1AfterBattleText1 RockTunnel1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 - dw RockTunnel1BattleText2 ; TextBeforeBattle - dw RockTunnel1AfterBattleText2 ; TextAfterBattle - dw RockTunnel1EndBattleText2 ; TextEndBattle - dw RockTunnel1EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1, 4, RockTunnel1BattleText2, RockTunnel1EndBattleText2, RockTunnel1AfterBattleText2 RockTunnel1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 - dw RockTunnel1BattleText3 ; TextBeforeBattle - dw RockTunnel1AfterBattleText3 ; TextAfterBattle - dw RockTunnel1EndBattleText3 ; TextEndBattle - dw RockTunnel1EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2, 3, RockTunnel1BattleText3, RockTunnel1EndBattleText3, RockTunnel1AfterBattleText3 RockTunnel1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 - dw RockTunnel1BattleText4 ; TextBeforeBattle - dw RockTunnel1AfterBattleText4 ; TextAfterBattle - dw RockTunnel1EndBattleText4 ; TextEndBattle - dw RockTunnel1EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3, 3, RockTunnel1BattleText4, RockTunnel1EndBattleText4, RockTunnel1AfterBattleText4 RockTunnel1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 - dw RockTunnel1BattleText5 ; TextBeforeBattle - dw RockTunnel1AfterBattleText5 ; TextAfterBattle - dw RockTunnel1EndBattleText5 ; TextEndBattle - dw RockTunnel1EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4, 4, RockTunnel1BattleText5, RockTunnel1EndBattleText5, RockTunnel1AfterBattleText5 RockTunnel1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 - dw RockTunnel1BattleText6 ; TextBeforeBattle - dw RockTunnel1AfterBattleText6 ; TextAfterBattle - dw RockTunnel1EndBattleText6 ; TextEndBattle - dw RockTunnel1EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5, 4, RockTunnel1BattleText6, RockTunnel1EndBattleText6, RockTunnel1AfterBattleText6 RockTunnel1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 - dw RockTunnel1BattleText7 ; TextBeforeBattle - dw RockTunnel1AfterBattleText7 ; TextAfterBattle - dw RockTunnel1EndBattleText7 ; TextEndBattle - dw RockTunnel1EndBattleText7 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6, 4, RockTunnel1BattleText7, RockTunnel1EndBattleText7, RockTunnel1AfterBattleText7 + db -1 ; end RockTunnel1Text1: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader0 jr RockTunnel1TalkToTrainer RockTunnel1Text2: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader1 jr RockTunnel1TalkToTrainer RockTunnel1Text3: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader2 jr RockTunnel1TalkToTrainer RockTunnel1Text4: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader3 jr RockTunnel1TalkToTrainer RockTunnel1Text5: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader4 jr RockTunnel1TalkToTrainer RockTunnel1Text6: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader5 jr RockTunnel1TalkToTrainer RockTunnel1Text7: - TX_ASM + text_asm ld hl, RockTunnel1TrainerHeader6 RockTunnel1TalkToTrainer: call TalkToTrainer jp TextScriptEnd RockTunnel1BattleText1: - TX_FAR _RockTunnel1BattleText1 - db "@" + text_far _RockTunnel1BattleText1 + text_end RockTunnel1EndBattleText1: - TX_FAR _RockTunnel1EndBattleText1 - db "@" + text_far _RockTunnel1EndBattleText1 + text_end RockTunnel1AfterBattleText1: - TX_FAR _RockTunnel1AfterBattleText1 - db "@" + text_far _RockTunnel1AfterBattleText1 + text_end RockTunnel1BattleText2: - TX_FAR _RockTunnel1BattleText2 - db "@" + text_far _RockTunnel1BattleText2 + text_end RockTunnel1EndBattleText2: - TX_FAR _RockTunnel1EndBattleText2 - db "@" + text_far _RockTunnel1EndBattleText2 + text_end RockTunnel1AfterBattleText2: - TX_FAR _RockTunnel1AfterBattleText2 - db "@" + text_far _RockTunnel1AfterBattleText2 + text_end RockTunnel1BattleText3: - TX_FAR _RockTunnel1BattleText3 - db "@" + text_far _RockTunnel1BattleText3 + text_end RockTunnel1EndBattleText3: - TX_FAR _RockTunnel1EndBattleText3 - db "@" + text_far _RockTunnel1EndBattleText3 + text_end RockTunnel1AfterBattleText3: - TX_FAR _RockTunnel1AfterBattleText3 - db "@" + text_far _RockTunnel1AfterBattleText3 + text_end RockTunnel1BattleText4: - TX_FAR _RockTunnel1BattleText4 - db "@" + text_far _RockTunnel1BattleText4 + text_end RockTunnel1EndBattleText4: - TX_FAR _RockTunnel1EndBattleText4 - db "@" + text_far _RockTunnel1EndBattleText4 + text_end RockTunnel1AfterBattleText4: - TX_FAR _RockTunnel1AfterBattleText4 - db "@" + text_far _RockTunnel1AfterBattleText4 + text_end RockTunnel1BattleText5: - TX_FAR _RockTunnel1BattleText5 - db "@" + text_far _RockTunnel1BattleText5 + text_end RockTunnel1EndBattleText5: - TX_FAR _RockTunnel1EndBattleText5 - db "@" + text_far _RockTunnel1EndBattleText5 + text_end RockTunnel1AfterBattleText5: - TX_FAR _RockTunnel1AfterBattleText5 - db "@" + text_far _RockTunnel1AfterBattleText5 + text_end RockTunnel1BattleText6: - TX_FAR _RockTunnel1BattleText6 - db "@" + text_far _RockTunnel1BattleText6 + text_end RockTunnel1EndBattleText6: - TX_FAR _RockTunnel1EndBattleText6 - db "@" + text_far _RockTunnel1EndBattleText6 + text_end RockTunnel1AfterBattleText6: - TX_FAR _RockTunnel1AfterBattleText6 - db "@" + text_far _RockTunnel1AfterBattleText6 + text_end RockTunnel1BattleText7: - TX_FAR _RockTunnel1BattleText7 - db "@" + text_far _RockTunnel1BattleText7 + text_end RockTunnel1EndBattleText7: - TX_FAR _RockTunnel1EndBattleText7 - db "@" + text_far _RockTunnel1EndBattleText7 + text_end RockTunnel1AfterBattleText7: - TX_FAR _RockTunnel1AfterBattleText7 - db "@" + text_far _RockTunnel1AfterBattleText7 + text_end RockTunnel1Text8: - TX_FAR _RockTunnel1Text8 - db "@" + text_far _RockTunnel1Text8 + text_end diff --git a/scripts/RockTunnelB1F.asm b/scripts/RockTunnelB1F.asm old mode 100755 new mode 100644 index 7e6fcc8b..9cba9c3e --- a/scripts/RockTunnelB1F.asm +++ b/scripts/RockTunnelB1F.asm @@ -23,219 +23,163 @@ RockTunnelB1F_TextPointers: dw RockTunnel2Text8 RockTunnel2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 - dw RockTunnel2BattleText2 ; TextBeforeBattle - dw RockTunnel2AfterBattleText2 ; TextAfterBattle - dw RockTunnel2EndBattleText2 ; TextEndBattle - dw RockTunnel2EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0, 4, RockTunnel2BattleText2, RockTunnel2EndBattleText2, RockTunnel2AfterBattleText2 RockTunnel2TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1 - dw RockTunnel2BattleText3 ; TextBeforeBattle - dw RockTunnel2AfterBattleText3 ; TextAfterBattle - dw RockTunnel2EndBattleText3 ; TextEndBattle - dw RockTunnel2EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1, 3, RockTunnel2BattleText3, RockTunnel2EndBattleText3, RockTunnel2AfterBattleText3 RockTunnel2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 - dw RockTunnel2BattleText4 ; TextBeforeBattle - dw RockTunnel2AfterBattleText4 ; TextAfterBattle - dw RockTunnel2EndBattleText4 ; TextEndBattle - dw RockTunnel2EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2, 3, RockTunnel2BattleText4, RockTunnel2EndBattleText4, RockTunnel2AfterBattleText4 RockTunnel2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 - dw RockTunnel2BattleText5 ; TextBeforeBattle - dw RockTunnel2AfterBattleText5 ; TextAfterBattle - dw RockTunnel2EndBattleText5 ; TextEndBattle - dw RockTunnel2EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3, 4, RockTunnel2BattleText5, RockTunnel2EndBattleText5, RockTunnel2AfterBattleText5 RockTunnel2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 - dw RockTunnel2BattleText6 ; TextBeforeBattle - dw RockTunnel2AfterBattleText6 ; TextAfterBattle - dw RockTunnel2EndBattleText6 ; TextEndBattle - dw RockTunnel2EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4, 3, RockTunnel2BattleText6, RockTunnel2EndBattleText6, RockTunnel2AfterBattleText6 RockTunnel2TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 - dw RockTunnel2BattleText7 ; TextBeforeBattle - dw RockTunnel2AfterBattleText7 ; TextAfterBattle - dw RockTunnel2EndBattleText7 ; TextEndBattle - dw RockTunnel2EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5, 4, RockTunnel2BattleText7, RockTunnel2EndBattleText7, RockTunnel2AfterBattleText7 RockTunnel2TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 - dw RockTunnel2BattleText8 ; TextBeforeBattle - dw RockTunnel2AfterBattleText8 ; TextAfterBattle - dw RockTunnel2EndBattleText8 ; TextEndBattle - dw RockTunnel2EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6, 3, RockTunnel2BattleText8, RockTunnel2EndBattleText8, RockTunnel2AfterBattleText8 RockTunnel2TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1 - dw RockTunnel2BattleText9 ; TextBeforeBattle - dw RockTunnel2AfterBattleText9 ; TextAfterBattle - dw RockTunnel2EndBattleText9 ; TextEndBattle - dw RockTunnel2EndBattleText9 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1, 3, RockTunnel2BattleText9, RockTunnel2EndBattleText9, RockTunnel2AfterBattleText9 + db -1 ; end RockTunnel2Text1: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader0 call TalkToTrainer jp TextScriptEnd RockTunnel2Text2: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader1 call TalkToTrainer jp TextScriptEnd RockTunnel2Text3: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader2 call TalkToTrainer jp TextScriptEnd RockTunnel2Text4: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader3 call TalkToTrainer jp TextScriptEnd RockTunnel2Text5: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader4 call TalkToTrainer jp TextScriptEnd RockTunnel2Text6: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader5 call TalkToTrainer jp TextScriptEnd RockTunnel2Text7: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader6 call TalkToTrainer jp TextScriptEnd RockTunnel2Text8: - TX_ASM + text_asm ld hl, RockTunnel2TrainerHeader7 call TalkToTrainer jp TextScriptEnd RockTunnel2BattleText2: - TX_FAR _RockTunnel2BattleText2 - db "@" + text_far _RockTunnel2BattleText2 + text_end RockTunnel2EndBattleText2: - TX_FAR _RockTunnel2EndBattleText2 - db "@" + text_far _RockTunnel2EndBattleText2 + text_end RockTunnel2AfterBattleText2: - TX_FAR _RockTunnel2AfterBattleText2 - db "@" + text_far _RockTunnel2AfterBattleText2 + text_end RockTunnel2BattleText3: - TX_FAR _RockTunnel2BattleText3 - db "@" + text_far _RockTunnel2BattleText3 + text_end RockTunnel2EndBattleText3: - TX_FAR _RockTunnel2EndBattleText3 - db "@" + text_far _RockTunnel2EndBattleText3 + text_end RockTunnel2AfterBattleText3: - TX_FAR _RockTunnel2AfterBattleText3 - db "@" + text_far _RockTunnel2AfterBattleText3 + text_end RockTunnel2BattleText4: - TX_FAR _RockTunnel2BattleText4 - db "@" + text_far _RockTunnel2BattleText4 + text_end RockTunnel2EndBattleText4: - TX_FAR _RockTunnel2EndBattleText4 - db "@" + text_far _RockTunnel2EndBattleText4 + text_end RockTunnel2AfterBattleText4: - TX_FAR _RockTunnel2AfterBattleText4 - db "@" + text_far _RockTunnel2AfterBattleText4 + text_end RockTunnel2BattleText5: - TX_FAR _RockTunnel2BattleText5 - db "@" + text_far _RockTunnel2BattleText5 + text_end RockTunnel2EndBattleText5: - TX_FAR _RockTunnel2EndBattleText5 - db "@" + text_far _RockTunnel2EndBattleText5 + text_end RockTunnel2AfterBattleText5: - TX_FAR _RockTunnel2AfterBattleText5 - db "@" + text_far _RockTunnel2AfterBattleText5 + text_end RockTunnel2BattleText6: - TX_FAR _RockTunnel2BattleText6 - db "@" + text_far _RockTunnel2BattleText6 + text_end RockTunnel2EndBattleText6: - TX_FAR _RockTunnel2EndBattleText6 - db "@" + text_far _RockTunnel2EndBattleText6 + text_end RockTunnel2AfterBattleText6: - TX_FAR _RockTunnel2AfterBattleText6 - db "@" + text_far _RockTunnel2AfterBattleText6 + text_end RockTunnel2BattleText7: - TX_FAR _RockTunnel2BattleText7 - db "@" + text_far _RockTunnel2BattleText7 + text_end RockTunnel2EndBattleText7: - TX_FAR _RockTunnel2EndBattleText7 - db "@" + text_far _RockTunnel2EndBattleText7 + text_end RockTunnel2AfterBattleText7: - TX_FAR _RockTunnel2AfterBattleText7 - db "@" + text_far _RockTunnel2AfterBattleText7 + text_end RockTunnel2BattleText8: - TX_FAR _RockTunnel2BattleText8 - db "@" + text_far _RockTunnel2BattleText8 + text_end RockTunnel2EndBattleText8: - TX_FAR _RockTunnel2EndBattleText8 - db "@" + text_far _RockTunnel2EndBattleText8 + text_end RockTunnel2AfterBattleText8: - TX_FAR _RockTunnel2AfterBattleText8 - db "@" + text_far _RockTunnel2AfterBattleText8 + text_end RockTunnel2BattleText9: - TX_FAR _RockTunnel2BattleText9 - db "@" + text_far _RockTunnel2BattleText9 + text_end RockTunnel2EndBattleText9: - TX_FAR _RockTunnel2EndBattleText9 - db "@" + text_far _RockTunnel2EndBattleText9 + text_end RockTunnel2AfterBattleText9: - TX_FAR _RockTunnel2AfterBattleText9 - db "@" + text_far _RockTunnel2AfterBattleText9 + text_end diff --git a/scripts/RockTunnelPokecenter.asm b/scripts/RockTunnelPokecenter.asm old mode 100755 new mode 100644 index cbcd6318..755bb8f8 --- a/scripts/RockTunnelPokecenter.asm +++ b/scripts/RockTunnelPokecenter.asm @@ -9,15 +9,15 @@ RockTunnelPokecenter_TextPointers: dw RockTunnelTradeNurseText RockTunnelHealNurseText: - db $ff + script_pokecenter_nurse RockTunnelPokecenterText2: - TX_FAR _RockTunnelPokecenterText2 - db "@" + text_far _RockTunnelPokecenterText2 + text_end RockTunnelPokecenterText3: - TX_FAR _RockTunnelPokecenterText3 - db "@" + text_far _RockTunnelPokecenterText3 + text_end RockTunnelTradeNurseText: - db $f6 + script_cable_club_receptionist diff --git a/scripts/RocketHideoutB1F.asm b/scripts/RocketHideoutB1F.asm old mode 100755 new mode 100644 index 0cbddb49..f20c0892 --- a/scripts/RocketHideoutB1F.asm +++ b/scripts/RocketHideoutB1F.asm @@ -45,145 +45,110 @@ RocketHideoutB1F_TextPointers: dw PickUpItemText RocketHideout1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 - dw RocketHideout1BattleText2 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout1EndBattleText2 ; TextEndBattle - dw RocketHideout1EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2 RocketHideout1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 - dw RocketHideout1BattleText3 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle - dw RocketHideout1EndBattleText3 ; TextEndBattle - dw RocketHideout1EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1, 2, RocketHideout1BattleText3, RocketHideout1EndBattleText3, RocketHideout1AfterBattleTxt3 RocketHideout1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 - dw RocketHideout1BattleText4 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle - dw RocketHideout1EndBattleText4 ; TextEndBattle - dw RocketHideout1EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2, 2, RocketHideout1BattleText4, RocketHideout1EndBattleText4, RocketHideout1AfterBattleTxt4 RocketHideout1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 - dw RocketHideout1BattleText5 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle - dw RocketHideout1EndBattleText5 ; TextEndBattle - dw RocketHideout1EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3, 3, RocketHideout1BattleText5, RocketHideout1EndBattleText5, RocketHideout1AfterBattleTxt5 RocketHideout1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 - dw RocketHideout1BattleText6 ; TextBeforeBattle - dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle - dw RocketHideout1EndBattleText6 ; TextEndBattle - dw RocketHideout1EndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4, 3, RocketHideout1BattleText6, RocketHideout1EndBattleText6, RocketHideout1AfterBattleTxt6 + db -1 ; end RocketHideout1Text1: - TX_ASM + text_asm ld hl, RocketHideout1TrainerHeader0 call TalkToTrainer jp TextScriptEnd RocketHideout1Text2: - TX_ASM + text_asm ld hl, RocketHideout1TrainerHeader1 call TalkToTrainer jp TextScriptEnd RocketHideout1Text3: - TX_ASM + text_asm ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd RocketHideout1Text4: - TX_ASM + text_asm ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd RocketHideout1Text5: - TX_ASM + text_asm ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd RocketHideout1EndBattleText6: - TX_FAR _RocketHideout1EndBattleText6 - TX_ASM + text_far _RocketHideout1EndBattleText6 + text_asm SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ld hl, RocketHideout1Text_44c9f ret RocketHideout1Text_44c9f: - TX_BLINK - db "@" + text_promptbutton + text_end RocketHideout1BattleText2: - TX_FAR _RocketHideout1BattleText2 - db "@" + text_far _RocketHideout1BattleText2 + text_end RocketHideout1EndBattleText2: - TX_FAR _RocketHideout1EndBattleText2 - db "@" + text_far _RocketHideout1EndBattleText2 + text_end RocketHideout1AfterBattleTxt2: - TX_FAR _RocketHideout1AfterBattleTxt2 - db "@" + text_far _RocketHideout1AfterBattleTxt2 + text_end RocketHideout1BattleText3: - TX_FAR _RocketHideout1BattleText3 - db "@" + text_far _RocketHideout1BattleText3 + text_end RocketHideout1EndBattleText3: - TX_FAR _RocketHideout1EndBattleText3 - db "@" + text_far _RocketHideout1EndBattleText3 + text_end RocketHideout1AfterBattleTxt3: - TX_FAR _RocketHideout1AfterBattleTxt3 - db "@" + text_far _RocketHideout1AfterBattleTxt3 + text_end RocketHideout1BattleText4: - TX_FAR _RocketHideout1BattleText4 - db "@" + text_far _RocketHideout1BattleText4 + text_end RocketHideout1EndBattleText4: - TX_FAR _RocketHideout1EndBattleText4 - db "@" + text_far _RocketHideout1EndBattleText4 + text_end RocketHideout1AfterBattleTxt4: - TX_FAR _RocketHideout1AfterBattleTxt4 - db "@" + text_far _RocketHideout1AfterBattleTxt4 + text_end RocketHideout1BattleText5: - TX_FAR _RocketHideout1BattleText5 - db "@" + text_far _RocketHideout1BattleText5 + text_end RocketHideout1EndBattleText5: - TX_FAR _RocketHideout1EndBattleText5 - db "@" + text_far _RocketHideout1EndBattleText5 + text_end RocketHideout1AfterBattleTxt5: - TX_FAR _RocketHideout1AfterBattleTxt5 - db "@" + text_far _RocketHideout1AfterBattleTxt5 + text_end RocketHideout1BattleText6: - TX_FAR _RocketHideout1BattleText6 - db "@" + text_far _RocketHideout1BattleText6 + text_end RocketHideout1AfterBattleTxt6: - TX_FAR _RocketHideout1AfterBattleTxt6 - db "@" + text_far _RocketHideout1AfterBattleTxt6 + text_end diff --git a/scripts/RocketHideoutB2F.asm b/scripts/RocketHideoutB2F.asm old mode 100755 new mode 100644 index 1b487df2..d6fae24f --- a/scripts/RocketHideoutB2F.asm +++ b/scripts/RocketHideoutB2F.asm @@ -33,273 +33,227 @@ RocketHideout2Script0: ld [wCurMapScript], a ret -;format: -;db y,x -;dw pointer to movement RocketHideout2ArrowTilePlayerMovement: - db $9,$4 - dw RocketHideout2ArrowMovement1 - db $b,$4 - dw RocketHideout2ArrowMovement2 - db $f,$4 - dw RocketHideout2ArrowMovement3 - db $10,$4 - dw RocketHideout2ArrowMovement4 - db $13,$4 - dw RocketHideout2ArrowMovement1 - db $16,$4 - dw RocketHideout2ArrowMovement5 - db $e,$5 - dw RocketHideout2ArrowMovement6 - db $16,$6 - dw RocketHideout2ArrowMovement7 - db $18,$6 - dw RocketHideout2ArrowMovement8 - db $9,$8 - dw RocketHideout2ArrowMovement9 - db $c,$8 - dw RocketHideout2ArrowMovement10 - db $f,$8 - dw RocketHideout2ArrowMovement8 - db $13,$8 - dw RocketHideout2ArrowMovement9 - db $17,$8 - dw RocketHideout2ArrowMovement11 - db $e,$9 - dw RocketHideout2ArrowMovement12 - db $16,$9 - dw RocketHideout2ArrowMovement12 - db $9,$a - dw RocketHideout2ArrowMovement13 - db $a,$a - dw RocketHideout2ArrowMovement14 - db $f,$a - dw RocketHideout2ArrowMovement15 - db $11,$a - dw RocketHideout2ArrowMovement16 - db $13,$a - dw RocketHideout2ArrowMovement17 - db $19,$a - dw RocketHideout2ArrowMovement2 - db $e,$b - dw RocketHideout2ArrowMovement18 - db $10,$b - dw RocketHideout2ArrowMovement19 - db $12,$b - dw RocketHideout2ArrowMovement12 - db $9,$c - dw RocketHideout2ArrowMovement20 - db $b,$c - dw RocketHideout2ArrowMovement21 - db $d,$c - dw RocketHideout2ArrowMovement22 - db $11,$c - dw RocketHideout2ArrowMovement23 - db $a,$d - dw RocketHideout2ArrowMovement24 - db $c,$d - dw RocketHideout2ArrowMovement25 - db $10,$d - dw RocketHideout2ArrowMovement26 - db $12,$d - dw RocketHideout2ArrowMovement27 - db $13,$d - dw RocketHideout2ArrowMovement28 - db $16,$d - dw RocketHideout2ArrowMovement29 - db $17,$d - dw RocketHideout2ArrowMovement30 - db $11,$e - dw RocketHideout2ArrowMovement31 - db $10,$f - dw RocketHideout2ArrowMovement12 - db $e,$10 - dw RocketHideout2ArrowMovement32 - db $10,$10 - dw RocketHideout2ArrowMovement33 - db $12,$10 - dw RocketHideout2ArrowMovement34 - db $a,$11 - dw RocketHideout2ArrowMovement35 - db $b,$11 - dw RocketHideout2ArrowMovement36 - db $FF + map_coord_movement 4, 9, RocketHideout2ArrowMovement1 + map_coord_movement 4, 11, RocketHideout2ArrowMovement2 + map_coord_movement 4, 15, RocketHideout2ArrowMovement3 + map_coord_movement 4, 16, RocketHideout2ArrowMovement4 + map_coord_movement 4, 19, RocketHideout2ArrowMovement1 + map_coord_movement 4, 22, RocketHideout2ArrowMovement5 + map_coord_movement 5, 14, RocketHideout2ArrowMovement6 + map_coord_movement 6, 22, RocketHideout2ArrowMovement7 + map_coord_movement 6, 24, RocketHideout2ArrowMovement8 + map_coord_movement 8, 9, RocketHideout2ArrowMovement9 + map_coord_movement 8, 12, RocketHideout2ArrowMovement10 + map_coord_movement 8, 15, RocketHideout2ArrowMovement8 + map_coord_movement 8, 19, RocketHideout2ArrowMovement9 + map_coord_movement 8, 23, RocketHideout2ArrowMovement11 + map_coord_movement 9, 14, RocketHideout2ArrowMovement12 + map_coord_movement 9, 22, RocketHideout2ArrowMovement12 + map_coord_movement 10, 9, RocketHideout2ArrowMovement13 + map_coord_movement 10, 10, RocketHideout2ArrowMovement14 + map_coord_movement 10, 15, RocketHideout2ArrowMovement15 + map_coord_movement 10, 17, RocketHideout2ArrowMovement16 + map_coord_movement 10, 19, RocketHideout2ArrowMovement17 + map_coord_movement 10, 25, RocketHideout2ArrowMovement2 + map_coord_movement 11, 14, RocketHideout2ArrowMovement18 + map_coord_movement 11, 16, RocketHideout2ArrowMovement19 + map_coord_movement 11, 18, RocketHideout2ArrowMovement12 + map_coord_movement 12, 9, RocketHideout2ArrowMovement20 + map_coord_movement 12, 11, RocketHideout2ArrowMovement21 + map_coord_movement 12, 13, RocketHideout2ArrowMovement22 + map_coord_movement 12, 17, RocketHideout2ArrowMovement23 + map_coord_movement 13, 10, RocketHideout2ArrowMovement24 + map_coord_movement 13, 12, RocketHideout2ArrowMovement25 + map_coord_movement 13, 16, RocketHideout2ArrowMovement26 + map_coord_movement 13, 18, RocketHideout2ArrowMovement27 + map_coord_movement 13, 19, RocketHideout2ArrowMovement28 + map_coord_movement 13, 22, RocketHideout2ArrowMovement29 + map_coord_movement 13, 23, RocketHideout2ArrowMovement30 + map_coord_movement 14, 17, RocketHideout2ArrowMovement31 + map_coord_movement 15, 16, RocketHideout2ArrowMovement12 + map_coord_movement 16, 14, RocketHideout2ArrowMovement32 + map_coord_movement 16, 16, RocketHideout2ArrowMovement33 + map_coord_movement 16, 18, RocketHideout2ArrowMovement34 + map_coord_movement 17, 10, RocketHideout2ArrowMovement35 + map_coord_movement 17, 11, RocketHideout2ArrowMovement36 + db -1 ; end ;format: direction, count ;each list is read starting from the $FF and working backwards RocketHideout2ArrowMovement1: - db D_LEFT,$02 - db $FF + db D_LEFT, 2 + db -1 ; end RocketHideout2ArrowMovement2: - db D_RIGHT,$04 - db $FF + db D_RIGHT, 4 + db -1 ; end RocketHideout2ArrowMovement3: - db D_UP,$04 - db D_RIGHT,$04 - db $FF + db D_UP, 4 + db D_RIGHT, 4 + db -1 ; end RocketHideout2ArrowMovement4: - db D_UP,$04 - db D_RIGHT,$04 - db D_UP,$01 - db $FF + db D_UP, 4 + db D_RIGHT, 4 + db D_UP, 1 + db -1 ; end RocketHideout2ArrowMovement5: - db D_LEFT,$02 - db D_UP,$03 - db $FF + db D_LEFT, 2 + db D_UP, 3 + db -1 ; end RocketHideout2ArrowMovement6: - db D_DOWN,$02 - db D_RIGHT,$04 - db $FF + db D_DOWN, 2 + db D_RIGHT, 4 + db -1 ; end RocketHideout2ArrowMovement7: - db D_UP,$02 - db $FF + db D_UP, 2 + db -1 ; end RocketHideout2ArrowMovement8: - db D_UP,$04 - db $FF + db D_UP, 4 + db -1 ; end RocketHideout2ArrowMovement9: - db D_LEFT,$06 - db $FF + db D_LEFT, 6 + db -1 ; end RocketHideout2ArrowMovement10: - db D_UP,$01 - db $FF + db D_UP, 1 + db -1 ; end RocketHideout2ArrowMovement11: - db D_LEFT,$06 - db D_UP,$04 - db $FF + db D_LEFT, 6 + db D_UP, 4 + db -1 ; end RocketHideout2ArrowMovement12: - db D_DOWN,$02 - db $FF + db D_DOWN, 2 + db -1 ; end RocketHideout2ArrowMovement13: - db D_LEFT,$08 - db $FF + db D_LEFT, 8 + db -1 ; end RocketHideout2ArrowMovement14: - db D_LEFT,$08 - db D_UP,$01 - db $FF + db D_LEFT, 8 + db D_UP, 1 + db -1 ; end RocketHideout2ArrowMovement15: - db D_LEFT,$08 - db D_UP,$06 - db $FF + db D_LEFT, 8 + db D_UP, 6 + db -1 ; end RocketHideout2ArrowMovement16: - db D_UP,$02 - db D_RIGHT,$04 - db $FF + db D_UP, 2 + db D_RIGHT, 4 + db -1 ; end RocketHideout2ArrowMovement17: - db D_UP,$02 - db D_RIGHT,$04 - db D_UP,$02 - db $FF + db D_UP, 2 + db D_RIGHT, 4 + db D_UP, 2 + db -1 ; end RocketHideout2ArrowMovement18: - db D_DOWN,$02 - db D_RIGHT,$04 - db D_DOWN,$02 - db $FF + db D_DOWN, 2 + db D_RIGHT, 4 + db D_DOWN, 2 + db -1 ; end RocketHideout2ArrowMovement19: - db D_DOWN,$02 - db D_RIGHT,$04 - db $FF + db D_DOWN, 2 + db D_RIGHT, 4 + db -1 ; end RocketHideout2ArrowMovement20: - db D_LEFT,$0A - db $FF + db D_LEFT, 10 + db -1 ; end RocketHideout2ArrowMovement21: - db D_LEFT,$0A - db D_UP,$02 - db $FF + db D_LEFT, 10 + db D_UP, 2 + db -1 ; end RocketHideout2ArrowMovement22: - db D_LEFT,$0A - db D_UP,$04 - db $FF + db D_LEFT, 10 + db D_UP, 4 + db -1 ; end RocketHideout2ArrowMovement23: - db D_UP,$02 - db D_RIGHT,$02 - db $FF + db D_UP, 2 + db D_RIGHT, 2 + db -1 ; end RocketHideout2ArrowMovement24: - db D_RIGHT,$01 - db D_DOWN,$02 - db $FF + db D_RIGHT, 1 + db D_DOWN, 2 + db -1 ; end RocketHideout2ArrowMovement25: - db D_RIGHT,$01 - db $FF + db D_RIGHT, 1 + db -1 ; end RocketHideout2ArrowMovement26: - db D_DOWN,$02 - db D_RIGHT,$02 - db $FF + db D_DOWN, 2 + db D_RIGHT, 2 + db -1 ; end RocketHideout2ArrowMovement27: - db D_DOWN,$02 - db D_LEFT,$02 - db $FF + db D_DOWN, 2 + db D_LEFT, 2 + db -1 ; end RocketHideout2ArrowMovement28: - db D_UP,$02 - db D_RIGHT,$04 - db D_UP,$02 - db D_LEFT,$03 - db $FF + db D_UP, 2 + db D_RIGHT, 4 + db D_UP, 2 + db D_LEFT, 3 + db -1 ; end RocketHideout2ArrowMovement29: - db D_DOWN,$02 - db D_LEFT,$04 - db $FF + db D_DOWN, 2 + db D_LEFT, 4 + db -1 ; end RocketHideout2ArrowMovement30: - db D_LEFT,$06 - db D_UP,$04 - db D_LEFT,$05 - db $FF + db D_LEFT, 6 + db D_UP, 4 + db D_LEFT, 5 + db -1 ; end RocketHideout2ArrowMovement31: - db D_UP,$02 - db $FF + db D_UP, 2 + db -1 ; end RocketHideout2ArrowMovement32: - db D_UP,$01 - db $FF + db D_UP, 1 + db -1 ; end RocketHideout2ArrowMovement33: - db D_UP,$03 - db $FF + db D_UP, 3 + db -1 ; end RocketHideout2ArrowMovement34: - db D_UP,$05 - db $FF + db D_UP, 5 + db -1 ; end RocketHideout2ArrowMovement35: - db D_RIGHT,$01 - db D_DOWN,$02 - db D_LEFT,$04 - db $FF + db D_RIGHT, 1 + db D_DOWN, 2 + db D_LEFT, 4 + db -1 ; end RocketHideout2ArrowMovement36: - db D_LEFT,$0A - db D_UP,$02 - db D_LEFT,$05 - db $FF + db D_LEFT, 10 + db D_UP, 2 + db D_LEFT, 5 + db -1 ; end RocketHideout2Script3: ld a, [wSimulatedJoypadStatesIndex] @@ -313,105 +267,7 @@ RocketHideout2Script3: ld [wCurMapScript], a ret -LoadSpinnerArrowTiles: - ld a, [wSpriteStateData1 + 2] - srl a - srl a - ld hl, SpinnerPlayerFacingDirections - ld c, a - ld b, $0 - add hl, bc - ld a, [hl] - ld [wSpriteStateData1 + 2], a - ld a, [wCurMapTileset] - cp FACILITY - ld hl, FacilitySpinnerArrows - jr z, .asm_44ff6 - ld hl, GymSpinnerArrows -.asm_44ff6 - ld a, [wSimulatedJoypadStatesIndex] - bit 0, a - jr nz, .asm_45001 - ld de, $18 - add hl, de -.asm_45001 - ld a, $4 - ld bc, $0 -.asm_45006 - push af - push hl - push bc - add hl, bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld a, [hli] - ld h, [hl] - ld l, a - call CopyVideoData - pop bc - ld a, $6 - add c - ld c, a - pop hl - pop af - dec a - jr nz, .asm_45006 - ret - -spinner: MACRO -; \1: source -; \2: offset (BANK() chokes on literals) -; \3: length -; \4: dest - dw \1 + \2 - db \3, BANK(\1) - dw \4 -ENDM - -FacilitySpinnerArrows: -FACILITY_SPINNER EQU $20 * $10 -vFacilitySpinner EQU vTileset + FACILITY_SPINNER - - spinner SpinnerArrowAnimTiles, $00, 1, vFacilitySpinner - spinner SpinnerArrowAnimTiles, $10, 1, vFacilitySpinner + $10 - spinner SpinnerArrowAnimTiles, $20, 1, vFacilitySpinner + $100 - spinner SpinnerArrowAnimTiles, $30, 1, vFacilitySpinner + $110 - spinner Facility_GFX, FACILITY_SPINNER + $000, 1, vFacilitySpinner - spinner Facility_GFX, FACILITY_SPINNER + $010, 1, vFacilitySpinner + $10 - spinner Facility_GFX, FACILITY_SPINNER + $100, 1, vFacilitySpinner + $100 - spinner Facility_GFX, FACILITY_SPINNER + $110, 1, vFacilitySpinner + $110 - -GymSpinnerArrows: -GYM_SPINNER EQU $3c * $10 -vGymSpinner EQU vTileset + GYM_SPINNER - - spinner SpinnerArrowAnimTiles, $10, 1, vGymSpinner - spinner SpinnerArrowAnimTiles, $30, 1, vGymSpinner + $10 - spinner SpinnerArrowAnimTiles, $00, 1, vGymSpinner + $100 - spinner SpinnerArrowAnimTiles, $20, 1, vGymSpinner + $110 - spinner Gym_GFX, GYM_SPINNER + $000, 1, vGymSpinner - spinner Gym_GFX, GYM_SPINNER + $010, 1, vGymSpinner + $10 - spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100 - spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110 - -SpinnerPlayerFacingDirections: -; This isn't the order of the facing directions. Rather, it's a list of -; the facing directions that come next. For example, when the player is -; facing down (00), the next facing direction is left (08). - db $08 ; down -> left - db $0C ; up -> right - db $04 ; left -> up - db $00 ; right -> down - -; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ -SpinnerArrowAnimTiles: - INCBIN "gfx/spinner_arrow.2bpp" +INCLUDE "engine/overworld/spinners.asm" RocketHideoutB2F_TextPointers: dw RocketHideout2Text1 @@ -421,30 +277,23 @@ RocketHideoutB2F_TextPointers: dw PickUpItemText RocketHideout2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 - dw RocketHideout2BattleText2 ; TextBeforeBattle - dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout2EndBattleText2 ; TextEndBattle - dw RocketHideout2EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0, 4, RocketHideout2BattleText2, RocketHideout2EndBattleText2, RocketHideout2AfterBattleTxt2 + db -1 ; end RocketHideout2Text1: - TX_ASM + text_asm ld hl, RocketHideout2TrainerHeader0 call TalkToTrainer jp TextScriptEnd RocketHideout2BattleText2: - TX_FAR _RocketHideout2BattleText2 - db "@" + text_far _RocketHideout2BattleText2 + text_end RocketHideout2EndBattleText2: - TX_FAR _RocketHideout2EndBattleText2 - db "@" + text_far _RocketHideout2EndBattleText2 + text_end RocketHideout2AfterBattleTxt2: - TX_FAR _RocketHideout2AfterBattleTxt2 - db "@" + text_far _RocketHideout2AfterBattleTxt2 + text_end diff --git a/scripts/RocketHideoutB3F.asm b/scripts/RocketHideoutB3F.asm old mode 100755 new mode 100644 index 4dd537b3..88876f04 --- a/scripts/RocketHideoutB3F.asm +++ b/scripts/RocketHideoutB3F.asm @@ -33,103 +33,84 @@ RocketHideout3Script0: ld [wCurMapScript], a ret -;format: -;db y,x -;dw pointer to movement RocketHideout3ArrowTilePlayerMovement: - db $d,$a - dw RocketHideout3ArrowMovement6 - db $13,$a - dw RocketHideout3ArrowMovement1 - db $12,$b - dw RocketHideout3ArrowMovement2 - db $b,$c - dw RocketHideout3ArrowMovement3 - db $11,$c - dw RocketHideout3ArrowMovement4 - db $14,$c - dw RocketHideout3ArrowMovement5 - db $10,$d - dw RocketHideout3ArrowMovement6 - db $b,$e - dw RocketHideout3ArrowMovement7 - db $f,$e - dw RocketHideout3ArrowMovement6 - db $11,$e - dw RocketHideout3ArrowMovement8 - db $13,$e - dw RocketHideout3ArrowMovement9 - db $10,$f - dw RocketHideout3ArrowMovement7 - db $12,$f - dw RocketHideout3ArrowMovement10 - db $d,$10 - dw RocketHideout3ArrowMovement11 - db $c,$11 - dw RocketHideout3ArrowMovement10 - db $10,$12 - dw RocketHideout3ArrowMovement12 - db $FF + map_coord_movement 10, 13, RocketHideout3ArrowMovement6 + map_coord_movement 10, 19, RocketHideout3ArrowMovement1 + map_coord_movement 11, 18, RocketHideout3ArrowMovement2 + map_coord_movement 12, 11, RocketHideout3ArrowMovement3 + map_coord_movement 12, 17, RocketHideout3ArrowMovement4 + map_coord_movement 12, 20, RocketHideout3ArrowMovement5 + map_coord_movement 13, 16, RocketHideout3ArrowMovement6 + map_coord_movement 14, 11, RocketHideout3ArrowMovement7 + map_coord_movement 14, 15, RocketHideout3ArrowMovement6 + map_coord_movement 14, 17, RocketHideout3ArrowMovement8 + map_coord_movement 14, 19, RocketHideout3ArrowMovement9 + map_coord_movement 15, 16, RocketHideout3ArrowMovement7 + map_coord_movement 15, 18, RocketHideout3ArrowMovement10 + map_coord_movement 16, 13, RocketHideout3ArrowMovement11 + map_coord_movement 17, 12, RocketHideout3ArrowMovement10 + map_coord_movement 18, 16, RocketHideout3ArrowMovement12 + db -1 ; end ;format: direction, count ;each list is read starting from the $FF and working backwards RocketHideout3ArrowMovement1: - db D_RIGHT,$04 - db D_UP,$04 - db D_RIGHT,$04 - db $FF + db D_RIGHT, 4 + db D_UP, 4 + db D_RIGHT, 4 + db -1 ; end RocketHideout3ArrowMovement2: - db D_DOWN,$04 - db D_RIGHT,$04 - db $FF + db D_DOWN, 4 + db D_RIGHT, 4 + db -1 ; end RocketHideout3ArrowMovement3: - db D_LEFT,$02 - db $FF + db D_LEFT, 2 + db -1 ; end RocketHideout3ArrowMovement4: - db D_RIGHT,$04 - db D_UP,$02 - db D_RIGHT,$02 - db $FF + db D_RIGHT, 4 + db D_UP, 2 + db D_RIGHT, 2 + db -1 ; end RocketHideout3ArrowMovement5: - db D_RIGHT,$04 - db D_UP,$02 - db D_RIGHT,$02 - db D_UP,$03 - db $FF + db D_RIGHT, 4 + db D_UP, 2 + db D_RIGHT, 2 + db D_UP, 3 + db -1 ; end RocketHideout3ArrowMovement6: - db D_RIGHT,$04 - db $FF + db D_RIGHT, 4 + db -1 ; end RocketHideout3ArrowMovement7: - db D_RIGHT,$02 - db $FF + db D_RIGHT, 2 + db -1 ; end RocketHideout3ArrowMovement8: - db D_RIGHT,$04 - db D_UP,$02 - db $FF + db D_RIGHT, 4 + db D_UP, 2 + db -1 ; end RocketHideout3ArrowMovement9: - db D_RIGHT,$04 - db D_UP,$04 - db $FF + db D_RIGHT, 4 + db D_UP, 4 + db -1 ; end RocketHideout3ArrowMovement10: - db D_DOWN,$04 - db $FF + db D_DOWN, 4 + db -1 ; end RocketHideout3ArrowMovement11: - db D_UP,$02 - db $FF + db D_UP, 2 + db -1 ; end RocketHideout3ArrowMovement12: - db D_UP,$01 - db $FF + db D_UP, 1 + db -1 ; end RocketHideout3Script3: ld a, [wSimulatedJoypadStatesIndex] @@ -150,57 +131,43 @@ RocketHideoutB3F_TextPointers: dw PickUpItemText RocketHideout3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 - dw RocketHideout3BattleText2 ; TextBeforeBattle - dw RocketHideout3AfterBattleTxt2 ; TextAfterBattle - dw RocketHideout3EndBattleText2 ; TextEndBattle - dw RocketHideout3EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0, 2, RocketHideout3BattleText2, RocketHideout3EndBattleText2, RocketHideout3AfterBattleTxt2 RocketHideout3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 - dw RocketHideout3BattleTxt ; TextBeforeBattle - dw RocketHideout3AfterBattleText3 ; TextAfterBattle - dw RocketHideout3EndBattleText3 ; TextEndBattle - dw RocketHideout3EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1, 4, RocketHideout3BattleTxt, RocketHideout3EndBattleText3, RocketHideout3AfterBattleText3 + db -1 ; end RocketHideout3Text1: - TX_ASM + text_asm ld hl, RocketHideout3TrainerHeader0 call TalkToTrainer jp TextScriptEnd RocketHideout3BattleText2: - TX_FAR _RocketHideout3BattleText2 - db "@" + text_far _RocketHideout3BattleText2 + text_end RocketHideout3EndBattleText2: - TX_FAR _RocketHideout3EndBattleText2 - db "@" + text_far _RocketHideout3EndBattleText2 + text_end RocketHideout3AfterBattleTxt2: - TX_FAR _RocketHideout3AfterBattleTxt2 - db "@" + text_far _RocketHideout3AfterBattleTxt2 + text_end RocketHideout3Text2: - TX_ASM + text_asm ld hl, RocketHideout3TrainerHeader1 call TalkToTrainer jp TextScriptEnd RocketHideout3BattleTxt: - TX_FAR _RocketHideout3BattleTxt - db "@" + text_far _RocketHideout3BattleTxt + text_end RocketHideout3EndBattleText3: - TX_FAR _RocketHideout3EndBattleText3 - db "@" + text_far _RocketHideout3EndBattleText3 + text_end RocketHideout3AfterBattleText3: - TX_FAR _RocketHide3AfterBattleText3 - db "@" + text_far _RocketHide3AfterBattleText3 + text_end diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm old mode 100755 new mode 100644 index b2ce21f4..bc13da12 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -52,7 +52,7 @@ RocketHideout4Script3: ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI @@ -85,36 +85,15 @@ RocketHideoutB4F_TextPointers: dw RocketHideout4Text10 RocketHideout4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 - dw RocketHideout4BattleText2 ; TextBeforeBattle - dw RocketHideout4AfterBattleText2 ; TextAfterBattle - dw RocketHideout4EndBattleText2 ; TextEndBattle - dw RocketHideout4EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, 0, RocketHideout4BattleText2, RocketHideout4EndBattleText2, RocketHideout4AfterBattleText2 RocketHideout4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1 - dw RocketHideout4BattleText3 ; TextBeforeBattle - dw RocketHideout4AfterBattleText3 ; TextAfterBattle - dw RocketHideout4EndBattleText3 ; TextEndBattle - dw RocketHideout4EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1, 0, RocketHideout4BattleText3, RocketHideout4EndBattleText3, RocketHideout4AfterBattleText3 RocketHideout4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 - dw RocketHideout4BattleText4 ; TextBeforeBattle - dw RocketHideout4AfterBattleText4 ; TextAfterBattle - dw RocketHideout4EndBattleText4 ; TextEndBattle - dw RocketHideout4EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1, RocketHideout4BattleText4, RocketHideout4EndBattleText4, RocketHideout4AfterBattleText4 + db -1 ; end RocketHideout4Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI jp nz, .asm_545571 ld hl, RocketHideout4Text_4557a @@ -125,12 +104,12 @@ RocketHideout4Text1: ld hl, RocketHideout4Text_4557f ld de, RocketHideout4Text_4557f call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a @@ -142,69 +121,69 @@ RocketHideout4Text1: jp TextScriptEnd RocketHideout4Text_4557a: - TX_FAR _RocketHideout4Text_4557a - db "@" + text_far _RocketHideout4Text_4557a + text_end RocketHideout4Text_4557f: - TX_FAR _RocketHideout4Text_4557f - db "@" + text_far _RocketHideout4Text_4557f + text_end RocketHideout4Text10: - TX_FAR _RocketHideout4Text_45584 - db "@" + text_far _RocketHideout4Text_45584 + text_end RocketHideout4Text2: - TX_ASM + text_asm ld hl, RocketHideout4TrainerHeader0 call TalkToTrainer jp TextScriptEnd RocketHideout4BattleText2: - TX_FAR _RocketHideout4BattleText2 - db "@" + text_far _RocketHideout4BattleText2 + text_end RocketHideout4EndBattleText2: - TX_FAR _RocketHideout4EndBattleText2 - db "@" + text_far _RocketHideout4EndBattleText2 + text_end RocketHideout4AfterBattleText2: - TX_FAR _RocketHide4AfterBattleText2 - db "@" + text_far _RocketHide4AfterBattleText2 + text_end RocketHideout4Text3: - TX_ASM + text_asm ld hl, RocketHideout4TrainerHeader1 call TalkToTrainer jp TextScriptEnd RocketHideout4BattleText3: - TX_FAR _RocketHideout4BattleText3 - db "@" + text_far _RocketHideout4BattleText3 + text_end RocketHideout4EndBattleText3: - TX_FAR _RocketHideout4EndBattleText3 - db "@" + text_far _RocketHideout4EndBattleText3 + text_end RocketHideout4AfterBattleText3: - TX_FAR _RocketHide4AfterBattleText3 - db "@" + text_far _RocketHide4AfterBattleText3 + text_end RocketHideout4Text4: - TX_ASM + text_asm ld hl, RocketHideout4TrainerHeader2 call TalkToTrainer jp TextScriptEnd RocketHideout4BattleText4: - TX_FAR _RocketHideout4BattleText4 - db "@" + text_far _RocketHideout4BattleText4 + text_end RocketHideout4EndBattleText4: - TX_FAR _RocketHideout4EndBattleText4 - db "@" + text_far _RocketHideout4EndBattleText4 + text_end RocketHideout4AfterBattleText4: - TX_ASM + text_asm ld hl, RocketHideout4Text_455ec call PrintText CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY @@ -216,5 +195,5 @@ RocketHideout4AfterBattleText4: jp TextScriptEnd RocketHideout4Text_455ec: - TX_FAR _RocketHideout4Text_455ec - db "@" + text_far _RocketHideout4Text_455ec + text_end diff --git a/scripts/RocketHideoutElevator.asm b/scripts/RocketHideoutElevator.asm old mode 100755 new mode 100644 index 9525db3a..8c51294e --- a/scripts/RocketHideoutElevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -41,31 +41,30 @@ RocketHideoutElevatorScript_45741: ret RocketHideoutElavatorFloors: - db $03 ; num elements in list + db 3 ; # db FLOOR_B1F db FLOOR_B2F db FLOOR_B4F - db $FF ; terminator + db -1 ; end -RocketHideoutElevatorWarpMaps: -; first byte is warp number -; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $04, ROCKET_HIDEOUT_B1F - db $04, ROCKET_HIDEOUT_B2F - db $02, ROCKET_HIDEOUT_B4F +RocketHideoutElevatorWarpMaps: + ; warp number, map id + db 4, ROCKET_HIDEOUT_B1F + db 4, ROCKET_HIDEOUT_B2F + db 2, ROCKET_HIDEOUT_B4F RocketHideoutElevatorWarpMapsEnd: RocketHideoutElevatorScript_4575f: call Delay3 - callba ShakeElevator + farcall ShakeElevator ret RocketHideoutElevator_TextPointers: dw RocketHideoutElevatorText1 RocketHideoutElevatorText1: - TX_ASM + text_asm ld b, LIFT_KEY call IsItemInBag jr z, .asm_45782 @@ -80,6 +79,6 @@ RocketHideoutElevatorText1: jp TextScriptEnd RocketHideoutElevatorText_4578b: - TX_FAR _RocketElevatorText_4578b - TX_WAIT - db "@" + text_far _RocketElevatorText_4578b + text_waitbutton + text_end diff --git a/scripts/Route1.asm b/scripts/Route1.asm old mode 100755 new mode 100644 index e733b54d..bd9afea3 --- a/scripts/Route1.asm +++ b/scripts/Route1.asm @@ -7,46 +7,46 @@ Route1_TextPointers: dw Route1Text3 Route1Text1: - TX_ASM + text_asm CheckAndSetEvent EVENT_GOT_POTION_SAMPLE - jr nz, .asm_1cada + jr nz, .got_item ld hl, Route1ViridianMartSampleText call PrintText lb bc, POTION, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, Route1Text_1cae8 - jr .asm_1cadd -.BagFull + jr .done +.bag_full ld hl, Route1Text_1caf3 - jr .asm_1cadd -.asm_1cada + jr .done +.got_item ld hl, Route1Text_1caee -.asm_1cadd +.done call PrintText jp TextScriptEnd Route1ViridianMartSampleText: - TX_FAR _Route1ViridianMartSampleText - db "@" + text_far _Route1ViridianMartSampleText + text_end Route1Text_1cae8: - TX_FAR _Route1Text_1cae8 - TX_SFX_ITEM_1 - db "@" + text_far _Route1Text_1cae8 + sound_get_item_1 + text_end Route1Text_1caee: - TX_FAR _Route1Text_1caee - db "@" + text_far _Route1Text_1caee + text_end Route1Text_1caf3: - TX_FAR _Route1Text_1caf3 - db "@" + text_far _Route1Text_1caf3 + text_end Route1Text2: - TX_FAR _Route1Text2 - db "@" + text_far _Route1Text2 + text_end Route1Text3: - TX_FAR _Route1Text3 - db "@" + text_far _Route1Text3 + text_end diff --git a/scripts/Route10.asm b/scripts/Route10.asm old mode 100755 new mode 100644 index 3fffa2c0..93012b9a --- a/scripts/Route10.asm +++ b/scripts/Route10.asm @@ -25,174 +25,132 @@ Route10_TextPointers: dw Route10Text10 Route10TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0 - dw Route10BattleText1 ; TextBeforeBattle - dw Route10AfterBattleText1 ; TextAfterBattle - dw Route10EndBattleText1 ; TextEndBattle - dw Route10EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_10_TRAINER_0, 4, Route10BattleText1, Route10EndBattleText1, Route10AfterBattleText1 Route10TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1 - dw Route10BattleText2 ; TextBeforeBattle - dw Route10AfterBattleText2 ; TextAfterBattle - dw Route10EndBattleText2 ; TextEndBattle - dw Route10EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_10_TRAINER_1, 3, Route10BattleText2, Route10EndBattleText2, Route10AfterBattleText2 Route10TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2 - dw Route10BattleText3 ; TextBeforeBattle - dw Route10AfterBattleText3 ; TextAfterBattle - dw Route10EndBattleText3 ; TextEndBattle - dw Route10EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_10_TRAINER_2, 4, Route10BattleText3, Route10EndBattleText3, Route10AfterBattleText3 Route10TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3 - dw Route10BattleText4 ; TextBeforeBattle - dw Route10AfterBattleText4 ; TextAfterBattle - dw Route10EndBattleText4 ; TextEndBattle - dw Route10EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_10_TRAINER_3, 3, Route10BattleText4, Route10EndBattleText4, Route10AfterBattleText4 Route10TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4 - dw Route10BattleText5 ; TextBeforeBattle - dw Route10AfterBattleText5 ; TextAfterBattle - dw Route10EndBattleText5 ; TextEndBattle - dw Route10EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_10_TRAINER_4, 2, Route10BattleText5, Route10EndBattleText5, Route10AfterBattleText5 Route10TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5 - dw Route10BattleText6 ; TextBeforeBattle - dw Route10AfterBattleText6 ; TextAfterBattle - dw Route10EndBattleText6 ; TextEndBattle - dw Route10EndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_10_TRAINER_5, 2, Route10BattleText6, Route10EndBattleText6, Route10AfterBattleText6 + db -1 ; end Route10Text1: - TX_ASM + text_asm ld hl, Route10TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route10BattleText1: - TX_FAR _Route10BattleText1 - db "@" + text_far _Route10BattleText1 + text_end Route10EndBattleText1: - TX_FAR _Route10EndBattleText1 - db "@" + text_far _Route10EndBattleText1 + text_end Route10AfterBattleText1: - TX_FAR _Route10AfterBattleText1 - db "@" + text_far _Route10AfterBattleText1 + text_end Route10Text2: - TX_ASM + text_asm ld hl, Route10TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route10BattleText2: - TX_FAR _Route10BattleText2 - db "@" + text_far _Route10BattleText2 + text_end Route10EndBattleText2: - TX_FAR _Route10EndBattleText2 - db "@" + text_far _Route10EndBattleText2 + text_end Route10AfterBattleText2: - TX_FAR _Route10AfterBattleText2 - db "@" + text_far _Route10AfterBattleText2 + text_end Route10Text3: - TX_ASM + text_asm ld hl, Route10TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route10BattleText3: - TX_FAR _Route10BattleText3 - db "@" + text_far _Route10BattleText3 + text_end Route10EndBattleText3: - TX_FAR _Route10EndBattleText3 - db "@" + text_far _Route10EndBattleText3 + text_end Route10AfterBattleText3: - TX_FAR _Route10AfterBattleText3 - db "@" + text_far _Route10AfterBattleText3 + text_end Route10Text4: - TX_ASM + text_asm ld hl, Route10TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route10BattleText4: - TX_FAR _Route10BattleText4 - db "@" + text_far _Route10BattleText4 + text_end Route10EndBattleText4: - TX_FAR _Route10EndBattleText4 - db "@" + text_far _Route10EndBattleText4 + text_end Route10AfterBattleText4: - TX_FAR _Route10AfterBattleText4 - db "@" + text_far _Route10AfterBattleText4 + text_end Route10Text5: - TX_ASM + text_asm ld hl, Route10TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route10BattleText5: - TX_FAR _Route10BattleText5 - db "@" + text_far _Route10BattleText5 + text_end Route10EndBattleText5: - TX_FAR _Route10EndBattleText5 - db "@" + text_far _Route10EndBattleText5 + text_end Route10AfterBattleText5: - TX_FAR _Route10AfterBattleText5 - db "@" + text_far _Route10AfterBattleText5 + text_end Route10Text6: - TX_ASM + text_asm ld hl, Route10TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route10BattleText6: - TX_FAR _Route10BattleText6 - db "@" + text_far _Route10BattleText6 + text_end Route10EndBattleText6: - TX_FAR _Route10EndBattleText6 - db "@" + text_far _Route10EndBattleText6 + text_end Route10AfterBattleText6: - TX_FAR _Route10AfterBattleText6 - db "@" + text_far _Route10AfterBattleText6 + text_end Route10Text9: Route10Text7: - TX_FAR _Route10Text7 ; _Route10Text9 - db "@" + text_far _Route10Text7 ; _Route10Text9 + text_end Route10Text10: - TX_FAR _Route10Text10 - db "@" + text_far _Route10Text10 + text_end diff --git a/scripts/Route11.asm b/scripts/Route11.asm old mode 100755 new mode 100644 index 891237cc..924c0276 --- a/scripts/Route11.asm +++ b/scripts/Route11.asm @@ -26,277 +26,207 @@ Route11_TextPointers: dw Route11Text11 Route11TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_0 - dw Route11BattleText1 ; TextBeforeBattle - dw Route11AfterBattleText1 ; TextAfterBattle - dw Route11EndBattleText1 ; TextEndBattle - dw Route11EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_0, 3, Route11BattleText1, Route11EndBattleText1, Route11AfterBattleText1 Route11TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_1 - dw Route11BattleText2 ; TextBeforeBattle - dw Route11AfterBattleText2 ; TextAfterBattle - dw Route11EndBattleText2 ; TextEndBattle - dw Route11EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_1, 2, Route11BattleText2, Route11EndBattleText2, Route11AfterBattleText2 Route11TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_2 - dw Route11BattleText3 ; TextBeforeBattle - dw Route11AfterBattleText3 ; TextAfterBattle - dw Route11EndBattleText3 ; TextEndBattle - dw Route11EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_2, 3, Route11BattleText3, Route11EndBattleText3, Route11AfterBattleText3 Route11TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_3 - dw Route11BattleText4 ; TextBeforeBattle - dw Route11AfterBattleText4 ; TextAfterBattle - dw Route11EndBattleText4 ; TextEndBattle - dw Route11EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_3, 3, Route11BattleText4, Route11EndBattleText4, Route11AfterBattleText4 Route11TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_4 - dw Route11BattleText5 ; TextBeforeBattle - dw Route11AfterBattleText5 ; TextAfterBattle - dw Route11EndBattleText5 ; TextEndBattle - dw Route11EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_4, 4, Route11BattleText5, Route11EndBattleText5, Route11AfterBattleText5 Route11TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_5 - dw Route11BattleText6 ; TextBeforeBattle - dw Route11AfterBattleText6 ; TextAfterBattle - dw Route11EndBattleText6 ; TextEndBattle - dw Route11EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_5, 3, Route11BattleText6, Route11EndBattleText6, Route11AfterBattleText6 Route11TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_6 - dw Route11BattleText7 ; TextBeforeBattle - dw Route11AfterBattleText7 ; TextAfterBattle - dw Route11EndBattleText7 ; TextEndBattle - dw Route11EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_6, 3, Route11BattleText7, Route11EndBattleText7, Route11AfterBattleText7 Route11TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_7, 1 - dw Route11BattleText8 ; TextBeforeBattle - dw Route11AfterBattleText8 ; TextAfterBattle - dw Route11EndBattleText8 ; TextEndBattle - dw Route11EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_7, 1, 4, Route11BattleText8, Route11EndBattleText8, Route11AfterBattleText8 Route11TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_8, 1 - dw Route11BattleText9 ; TextBeforeBattle - dw Route11AfterBattleText9 ; TextAfterBattle - dw Route11EndBattleText9 ; TextEndBattle - dw Route11EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_11_TRAINER_8, 1, 3, Route11BattleText9, Route11EndBattleText9, Route11AfterBattleText9 Route11TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_9, 1 - dw Route11BattleText10 ; TextBeforeBattle - dw Route11AfterBattleText10 ; TextAfterBattle - dw Route11EndBattleText10 ; TextEndBattle - dw Route11EndBattleText10 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_11_TRAINER_9, 1, 4, Route11BattleText10, Route11EndBattleText10, Route11AfterBattleText10 + db -1 ; end Route11Text1: - TX_ASM + text_asm ld hl, Route11TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route11BattleText1: - TX_FAR _Route11BattleText1 - db "@" + text_far _Route11BattleText1 + text_end Route11EndBattleText1: - TX_FAR _Route11EndBattleText1 - db "@" + text_far _Route11EndBattleText1 + text_end Route11AfterBattleText1: - TX_FAR _Route11AfterBattleText1 - db "@" + text_far _Route11AfterBattleText1 + text_end Route11Text2: - TX_ASM + text_asm ld hl, Route11TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route11BattleText2: - TX_FAR _Route11BattleText2 - db "@" + text_far _Route11BattleText2 + text_end Route11EndBattleText2: - TX_FAR _Route11EndBattleText2 - db "@" + text_far _Route11EndBattleText2 + text_end Route11AfterBattleText2: - TX_FAR _Route11AfterBattleText2 - db "@" + text_far _Route11AfterBattleText2 + text_end Route11Text3: - TX_ASM + text_asm ld hl, Route11TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route11BattleText3: - TX_FAR _Route11BattleText3 - db "@" + text_far _Route11BattleText3 + text_end Route11EndBattleText3: - TX_FAR _Route11EndBattleText3 - db "@" + text_far _Route11EndBattleText3 + text_end Route11AfterBattleText3: - TX_FAR _Route11AfterBattleText3 - db "@" + text_far _Route11AfterBattleText3 + text_end Route11Text4: - TX_ASM + text_asm ld hl, Route11TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route11BattleText4: - TX_FAR _Route11BattleText4 - db "@" + text_far _Route11BattleText4 + text_end Route11EndBattleText4: - TX_FAR _Route11EndBattleText4 - db "@" + text_far _Route11EndBattleText4 + text_end Route11AfterBattleText4: - TX_FAR _Route11AfterBattleText4 - db "@" + text_far _Route11AfterBattleText4 + text_end Route11Text5: - TX_ASM + text_asm ld hl, Route11TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route11BattleText5: - TX_FAR _Route11BattleText5 - db "@" + text_far _Route11BattleText5 + text_end Route11EndBattleText5: - TX_FAR _Route11EndBattleText5 - db "@" + text_far _Route11EndBattleText5 + text_end Route11AfterBattleText5: - TX_FAR _Route11AfterBattleText5 - db "@" + text_far _Route11AfterBattleText5 + text_end Route11Text6: - TX_ASM + text_asm ld hl, Route11TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route11BattleText6: - TX_FAR _Route11BattleText6 - db "@" + text_far _Route11BattleText6 + text_end Route11EndBattleText6: - TX_FAR _Route11EndBattleText6 - db "@" + text_far _Route11EndBattleText6 + text_end Route11AfterBattleText6: - TX_FAR _Route11AfterBattleText6 - db "@" + text_far _Route11AfterBattleText6 + text_end Route11Text7: - TX_ASM + text_asm ld hl, Route11TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route11BattleText7: - TX_FAR _Route11BattleText7 - db "@" + text_far _Route11BattleText7 + text_end Route11EndBattleText7: - TX_FAR _Route11EndBattleText7 - db "@" + text_far _Route11EndBattleText7 + text_end Route11AfterBattleText7: - TX_FAR _Route11AfterBattleText7 - db "@" + text_far _Route11AfterBattleText7 + text_end Route11Text8: - TX_ASM + text_asm ld hl, Route11TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route11BattleText8: - TX_FAR _Route11BattleText8 - db "@" + text_far _Route11BattleText8 + text_end Route11EndBattleText8: - TX_FAR _Route11EndBattleText8 - db "@" + text_far _Route11EndBattleText8 + text_end Route11AfterBattleText8: - TX_FAR _Route11AfterBattleText8 - db "@" + text_far _Route11AfterBattleText8 + text_end Route11Text9: - TX_ASM + text_asm ld hl, Route11TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route11BattleText9: - TX_FAR _Route11BattleText9 - db "@" + text_far _Route11BattleText9 + text_end Route11EndBattleText9: - TX_FAR _Route11EndBattleText9 - db "@" + text_far _Route11EndBattleText9 + text_end Route11AfterBattleText9: - TX_FAR _Route11AfterBattleText9 - db "@" + text_far _Route11AfterBattleText9 + text_end Route11Text10: - TX_ASM + text_asm ld hl, Route11TrainerHeader9 call TalkToTrainer jp TextScriptEnd Route11BattleText10: - TX_FAR _Route11BattleText10 - db "@" + text_far _Route11BattleText10 + text_end Route11EndBattleText10: - TX_FAR _Route11EndBattleText10 - db "@" + text_far _Route11EndBattleText10 + text_end Route11AfterBattleText10: - TX_FAR _Route11AfterBattleText10 - db "@" + text_far _Route11AfterBattleText10 + text_end Route11Text11: - TX_FAR _Route11Text11 - db "@" + text_far _Route11Text11 + text_end diff --git a/scripts/Route11Gate1F.asm b/scripts/Route11Gate1F.asm old mode 100755 new mode 100644 index 8e5f6c03..d1ebe6ea --- a/scripts/Route11Gate1F.asm +++ b/scripts/Route11Gate1F.asm @@ -5,5 +5,5 @@ Route11Gate1F_TextPointers: dw Route11GateText1 Route11GateText1: - TX_FAR _Route11GateText1 - db "@" + text_far _Route11GateText1 + text_end diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm old mode 100755 new mode 100644 index c140937d..47c8db22 --- a/scripts/Route11Gate2F.asm +++ b/scripts/Route11Gate2F.asm @@ -8,21 +8,21 @@ Route11Gate2F_TextPointers: dw Route11GateUpstairsText4 Route11GateUpstairsText1: - TX_ASM - xor a + text_asm + xor a ; TRADE_FOR_TERRY ld [wWhichTrade], a predef DoInGameTradeDialogue Route11GateUpstairsScriptEnd: jp TextScriptEnd Route11GateUpstairsText2: - TX_ASM + text_asm CheckEvent EVENT_GOT_ITEMFINDER, 1 - jr c, .asm_4949b - ld a, 30 ; pokemon needed - ld [hOaksAideRequirement], a - ld a, ITEMFINDER ; oak's aide reward - ld [hOaksAideRewardItem], a + jr c, .got_item + ld a, 30 + ldh [hOaksAideRequirement], a + ld a, ITEMFINDER + ldh [hOaksAideRewardItem], a ld [wd11e], a call GetItemName ld h, d @@ -31,23 +31,23 @@ Route11GateUpstairsText2: ld bc, ITEM_NAME_LENGTH call CopyData predef OaksAideScript - ld a, [hOaksAideResult] - dec a - jr nz, .asm_494a1 + ldh a, [hOaksAideResult] + dec a ; OAKS_AIDE_GOT_ITEM? + jr nz, .no_item SetEvent EVENT_GOT_ITEMFINDER -.asm_4949b +.got_item ld hl, Route11GateUpstairsText_494a3 call PrintText -.asm_494a1 +.no_item jr Route11GateUpstairsScriptEnd Route11GateUpstairsText_494a3: - TX_FAR _Route11GateUpstairsText_494a3 - db "@" + text_far _Route11GateUpstairsText_494a3 + text_end Route11GateUpstairsText3: - TX_ASM - ld a, [wSpriteStateData1 + 9] + text_asm + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jp nz, GateUpstairsScript_PrintIfFacingUp CheckEvent EVENT_BEAT_ROUTE12_SNORLAX @@ -59,18 +59,18 @@ Route11GateUpstairsText3: jp TextScriptEnd BinocularsSnorlaxText: - TX_FAR _BinocularsSnorlaxText - db "@" + text_far _BinocularsSnorlaxText + text_end BinocularsNoSnorlaxText: - TX_FAR _BinocularsNoSnorlaxText - db "@" + text_far _BinocularsNoSnorlaxText + text_end Route11GateUpstairsText4: - TX_ASM + text_asm ld hl, Route11GateUpstairsText_494d5 jp GateUpstairsScript_PrintIfFacingUp Route11GateUpstairsText_494d5: - TX_FAR _Route11GateUpstairsText_494d5 - db "@" + text_far _Route11GateUpstairsText_494d5 + text_end diff --git a/scripts/Route12.asm b/scripts/Route12.asm old mode 100755 new mode 100644 index 510e7727..3c0d77e1 --- a/scripts/Route12.asm +++ b/scripts/Route12.asm @@ -27,7 +27,7 @@ Route12Script0: ResetEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX jp z, CheckFightingMapTrainers ld a, $d - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [wCurOpponent], a @@ -50,7 +50,7 @@ Route12Script3: cp $2 jr z, .asm_59664 ld a, $e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID .asm_59664 SetEvent EVENT_BEAT_ROUTE12_SNORLAX @@ -77,212 +77,163 @@ Route12_TextPointers: dw Route12Text14 Route12TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_0 - dw Route12BattleText1 ; TextBeforeBattle - dw Route12AfterBattleText1 ; TextAfterBattle - dw Route12EndBattleText1 ; TextEndBattle - dw Route12EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_12_TRAINER_0, 4, Route12BattleText1, Route12EndBattleText1, Route12AfterBattleText1 Route12TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_1 - dw Route12BattleText2 ; TextBeforeBattle - dw Route12AfterBattleText2 ; TextAfterBattle - dw Route12EndBattleText2 ; TextEndBattle - dw Route12EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_12_TRAINER_1, 4, Route12BattleText2, Route12EndBattleText2, Route12AfterBattleText2 Route12TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_2 - dw Route12BattleText3 ; TextBeforeBattle - dw Route12AfterBattleText3 ; TextAfterBattle - dw Route12EndBattleText3 ; TextEndBattle - dw Route12EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_12_TRAINER_2, 4, Route12BattleText3, Route12EndBattleText3, Route12AfterBattleText3 Route12TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_3 - dw Route12BattleText4 ; TextBeforeBattle - dw Route12AfterBattleText4 ; TextAfterBattle - dw Route12EndBattleText4 ; TextEndBattle - dw Route12EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_12_TRAINER_3, 4, Route12BattleText4, Route12EndBattleText4, Route12AfterBattleText4 Route12TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_4 - dw Route12BattleText5 ; TextBeforeBattle - dw Route12AfterBattleText5 ; TextAfterBattle - dw Route12EndBattleText5 ; TextEndBattle - dw Route12EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_12_TRAINER_4, 4, Route12BattleText5, Route12EndBattleText5, Route12AfterBattleText5 Route12TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_5 - dw Route12BattleText6 ; TextBeforeBattle - dw Route12AfterBattleText6 ; TextAfterBattle - dw Route12EndBattleText6 ; TextEndBattle - dw Route12EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_12_TRAINER_5, 4, Route12BattleText6, Route12EndBattleText6, Route12AfterBattleText6 Route12TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_6, 1 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_6, 1 - dw Route12BattleText7 ; TextBeforeBattle - dw Route12AfterBattleText7 ; TextAfterBattle - dw Route12EndBattleText7 ; TextEndBattle - dw Route12EndBattleText7 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_12_TRAINER_6, 1, 1, Route12BattleText7, Route12EndBattleText7, Route12AfterBattleText7 + db -1 ; end Route12Text1: - TX_FAR _Route12Text1 - db "@" + text_far _Route12Text1 + text_end Route12Text13: - TX_FAR _Route12Text13 - db "@" + text_far _Route12Text13 + text_end Route12Text14: - TX_FAR _Route12Text14 - db "@" + text_far _Route12Text14 + text_end Route12Text2: - TX_ASM + text_asm ld hl, Route12TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route12BattleText1: - TX_FAR _Route12BattleText1 - db "@" + text_far _Route12BattleText1 + text_end Route12EndBattleText1: - TX_FAR _Route12EndBattleText1 - db "@" + text_far _Route12EndBattleText1 + text_end Route12AfterBattleText1: - TX_FAR _Route12AfterBattleText1 - db "@" + text_far _Route12AfterBattleText1 + text_end Route12Text3: - TX_ASM + text_asm ld hl, Route12TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route12BattleText2: - TX_FAR _Route12BattleText2 - db "@" + text_far _Route12BattleText2 + text_end Route12EndBattleText2: - TX_FAR _Route12EndBattleText2 - db "@" + text_far _Route12EndBattleText2 + text_end Route12AfterBattleText2: - TX_FAR _Route12AfterBattleText2 - db "@" + text_far _Route12AfterBattleText2 + text_end Route12Text4: - TX_ASM + text_asm ld hl, Route12TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route12BattleText3: - TX_FAR _Route12BattleText3 - db "@" + text_far _Route12BattleText3 + text_end Route12EndBattleText3: - TX_FAR _Route12EndBattleText3 - db "@" + text_far _Route12EndBattleText3 + text_end Route12AfterBattleText3: - TX_FAR _Route12AfterBattleText3 - db "@" + text_far _Route12AfterBattleText3 + text_end Route12Text5: - TX_ASM + text_asm ld hl, Route12TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route12BattleText4: - TX_FAR _Route12BattleText4 - db "@" + text_far _Route12BattleText4 + text_end Route12EndBattleText4: - TX_FAR _Route12EndBattleText4 - db "@" + text_far _Route12EndBattleText4 + text_end Route12AfterBattleText4: - TX_FAR _Route12AfterBattleText4 - db "@" + text_far _Route12AfterBattleText4 + text_end Route12Text6: - TX_ASM + text_asm ld hl, Route12TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route12BattleText5: - TX_FAR _Route12BattleText5 - db "@" + text_far _Route12BattleText5 + text_end Route12EndBattleText5: - TX_FAR _Route12EndBattleText5 - db "@" + text_far _Route12EndBattleText5 + text_end Route12AfterBattleText5: - TX_FAR _Route12AfterBattleText5 - db "@" + text_far _Route12AfterBattleText5 + text_end Route12Text7: - TX_ASM + text_asm ld hl, Route12TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route12BattleText6: - TX_FAR _Route12BattleText6 - db "@" + text_far _Route12BattleText6 + text_end Route12EndBattleText6: - TX_FAR _Route12EndBattleText6 - db "@" + text_far _Route12EndBattleText6 + text_end Route12AfterBattleText6: - TX_FAR _Route12AfterBattleText6 - db "@" + text_far _Route12AfterBattleText6 + text_end Route12Text8: - TX_ASM + text_asm ld hl, Route12TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route12BattleText7: - TX_FAR _Route12BattleText7 - db "@" + text_far _Route12BattleText7 + text_end Route12EndBattleText7: - TX_FAR _Route12EndBattleText7 - db "@" + text_far _Route12EndBattleText7 + text_end Route12AfterBattleText7: - TX_FAR _Route12AfterBattleText7 - db "@" + text_far _Route12AfterBattleText7 + text_end Route12Text11: - TX_FAR _Route12Text11 - db "@" + text_far _Route12Text11 + text_end Route12Text12: - TX_FAR _Route12Text12 - db "@" + text_far _Route12Text12 + text_end diff --git a/scripts/Route12Gate1F.asm b/scripts/Route12Gate1F.asm old mode 100755 new mode 100644 index 52d427ee..72f2dfbf --- a/scripts/Route12Gate1F.asm +++ b/scripts/Route12Gate1F.asm @@ -5,5 +5,5 @@ Route12Gate1F_TextPointers: dw Route12GateText1 Route12GateText1: - TX_FAR _Route12GateText1 - db "@" + text_far _Route12GateText1 + text_end diff --git a/scripts/Route12Gate2F.asm b/scripts/Route12Gate2F.asm old mode 100755 new mode 100644 index 0cc2768b..2174fba8 --- a/scripts/Route12Gate2F.asm +++ b/scripts/Route12Gate2F.asm @@ -7,68 +7,68 @@ Route12Gate2F_TextPointers: dw Route12GateUpstairsText3 Route12GateUpstairsText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM39, 1 - jr c, .asm_0ad3c + jr c, .got_item ld hl, TM39PreReceiveText call PrintText - lb bc, TM_39, 1 + lb bc, TM_SWIFT, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedTM39Text call PrintText SetEvent EVENT_GOT_TM39 - jr .asm_4ba56 -.BagFull + jr .done +.bag_full ld hl, TM39NoRoomText call PrintText - jr .asm_4ba56 -.asm_0ad3c + jr .done +.got_item ld hl, TM39ExplanationText call PrintText -.asm_4ba56 +.done jp TextScriptEnd TM39PreReceiveText: - TX_FAR _TM39PreReceiveText - db "@" + text_far _TM39PreReceiveText + text_end ReceivedTM39Text: - TX_FAR _ReceivedTM39Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM39Text + sound_get_item_1 + text_end TM39ExplanationText: - TX_FAR _TM39ExplanationText - db "@" + text_far _TM39ExplanationText + text_end TM39NoRoomText: - TX_FAR _TM39NoRoomText - db "@" + text_far _TM39NoRoomText + text_end Route12GateUpstairsText2: - TX_ASM + text_asm ld hl, Route12GateUpstairsText_495b8 jp GateUpstairsScript_PrintIfFacingUp Route12GateUpstairsText_495b8: - TX_FAR _Route12GateUpstairsText_495b8 - db "@" + text_far _Route12GateUpstairsText_495b8 + text_end Route12GateUpstairsText3: - TX_ASM + text_asm ld hl, Route12GateUpstairsText_495c4 jp GateUpstairsScript_PrintIfFacingUp Route12GateUpstairsText_495c4: - TX_FAR _Route12GateUpstairsText_495c4 - db "@" + text_far _Route12GateUpstairsText_495c4 + text_end GateUpstairsScript_PrintIfFacingUp: - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_UP jr z, .up - ld a, $1 + ld a, TRUE jr .done .up call PrintText diff --git a/scripts/Route12SuperRodHouse.asm b/scripts/Route12SuperRodHouse.asm old mode 100755 new mode 100644 index de8ed8f0..fba5426e --- a/scripts/Route12SuperRodHouse.asm +++ b/scripts/Route12SuperRodHouse.asm @@ -5,53 +5,53 @@ Route12SuperRodHouse_TextPointers: dw Route12HouseText1 Route12HouseText1: - TX_ASM + text_asm ld a, [wd728] - bit 5, a - jr nz, .asm_b4cad + bit 5, a ; received super rod? + jr nz, .got_item ld hl, Route12HouseText_564c0 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_a2d76 + jr nz, .refused lb bc, SUPER_ROD, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, wd728 - set 5, [hl] + set 5, [hl] ; received super rod ld hl, Route12HouseText_564c5 - jr .asm_df984 -.BagFull + jr .done +.bag_full ld hl, Route12HouseText_564d9 - jr .asm_df984 -.asm_a2d76 + jr .done +.refused ld hl, Route12HouseText_564cf - jr .asm_df984 -.asm_b4cad + jr .done +.got_item ld hl, Route12HouseText_564d4 -.asm_df984 +.done call PrintText jp TextScriptEnd Route12HouseText_564c0: - TX_FAR _Route12HouseText_564c0 - db "@" + text_far _Route12HouseText_564c0 + text_end Route12HouseText_564c5: - TX_FAR _Route12HouseText_564c5 - TX_SFX_ITEM_1 - TX_FAR _Route12HouseText_564ca - db "@" + text_far _Route12HouseText_564c5 + sound_get_item_1 + text_far _Route12HouseText_564ca + text_end Route12HouseText_564cf: - TX_FAR _Route12HouseText_564cf - db "@" + text_far _Route12HouseText_564cf + text_end Route12HouseText_564d4: - TX_FAR _Route12HouseText_564d4 - db "@" + text_far _Route12HouseText_564d4 + text_end Route12HouseText_564d9: - TX_FAR _Route12HouseText_564d9 - db "@" + text_far _Route12HouseText_564d9 + text_end diff --git a/scripts/Route13.asm b/scripts/Route13.asm old mode 100755 new mode 100644 index 8f92147e..c01ed514 --- a/scripts/Route13.asm +++ b/scripts/Route13.asm @@ -28,285 +28,215 @@ Route13_TextPointers: dw Route13Text13 Route13TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_0 - dw Route13BattleText2 ; TextBeforeBattle - dw Route13AfterBattleText2 ; TextAfterBattle - dw Route13EndBattleText2 ; TextEndBattle - dw Route13EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_0, 2, Route13BattleText2, Route13EndBattleText2, Route13AfterBattleText2 Route13TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1 - dw Route13BattleText3 ; TextBeforeBattle - dw Route13AfterBattleText3 ; TextAfterBattle - dw Route13EndBattleText3 ; TextEndBattle - dw Route13EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_1, 2, Route13BattleText3, Route13EndBattleText3, Route13AfterBattleText3 Route13TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 - dw Route13BattleText4 ; TextBeforeBattle - dw Route13AfterBattleText4 ; TextAfterBattle - dw Route13EndBattleText4 ; TextEndBattle - dw Route13EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_2, 2, Route13BattleText4, Route13EndBattleText4, Route13AfterBattleText4 Route13TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 - dw Route13BattleText5 ; TextBeforeBattle - dw Route13AfterBattleText5 ; TextAfterBattle - dw Route13EndBattleText5 ; TextEndBattle - dw Route13EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_3, 2, Route13BattleText5, Route13EndBattleText5, Route13AfterBattleText5 Route13TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 - dw Route13BattleText6 ; TextBeforeBattle - dw Route13AfterBattleText6 ; TextAfterBattle - dw Route13EndBattleText6 ; TextEndBattle - dw Route13EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_4, 4, Route13BattleText6, Route13EndBattleText6, Route13AfterBattleText6 Route13TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 - dw Route13BattleText7 ; TextBeforeBattle - dw Route13AfterBattleText7 ; TextAfterBattle - dw Route13EndBattleText7 ; TextEndBattle - dw Route13EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_5, 2, Route13BattleText7, Route13EndBattleText7, Route13AfterBattleText7 Route13TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 - dw Route13BattleText8 ; TextBeforeBattle - dw Route13AfterBattleText8 ; TextAfterBattle - dw Route13EndBattleText8 ; TextEndBattle - dw Route13EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_6, 4, Route13BattleText8, Route13EndBattleText8, Route13AfterBattleText8 Route13TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1 - dw Route13BattleText9 ; TextBeforeBattle - dw Route13AfterBattleText9 ; TextAfterBattle - dw Route13EndBattleText9 ; TextEndBattle - dw Route13EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_7, 1, 2, Route13BattleText9, Route13EndBattleText9, Route13AfterBattleText9 Route13TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 - dw Route13BattleText10 ; TextBeforeBattle - dw Route13AfterBattleText10 ; TextAfterBattle - dw Route13EndBattleText10 ; TextEndBattle - dw Route13EndBattleText10 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_13_TRAINER_8, 1, 2, Route13BattleText10, Route13EndBattleText10, Route13AfterBattleText10 Route13TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 - dw Route13BattleText11 ; TextBeforeBattle - dw Route13AfterBattleText11 ; TextAfterBattle - dw Route13EndBattleText11 ; TextEndBattle - dw Route13EndBattleText11 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_13_TRAINER_9, 1, 4, Route13BattleText11, Route13EndBattleText11, Route13AfterBattleText11 + db -1 ; end Route13Text1: - TX_ASM + text_asm ld hl, Route13TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route13BattleText2: - TX_FAR _Route13BattleText2 - db "@" + text_far _Route13BattleText2 + text_end Route13EndBattleText2: - TX_FAR _Route13EndBattleText2 - db "@" + text_far _Route13EndBattleText2 + text_end Route13AfterBattleText2: - TX_FAR _Route13AfterBattleText2 - db "@" + text_far _Route13AfterBattleText2 + text_end Route13Text2: - TX_ASM + text_asm ld hl, Route13TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route13BattleText3: - TX_FAR _Route13BattleText3 - db "@" + text_far _Route13BattleText3 + text_end Route13EndBattleText3: - TX_FAR _Route13EndBattleText3 - db "@" + text_far _Route13EndBattleText3 + text_end Route13AfterBattleText3: - TX_FAR _Route13AfterBattleText3 - db "@" + text_far _Route13AfterBattleText3 + text_end Route13Text3: - TX_ASM + text_asm ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route13BattleText4: - TX_FAR _Route13BattleText4 - db "@" + text_far _Route13BattleText4 + text_end Route13EndBattleText4: - TX_FAR _Route13EndBattleText4 - db "@" + text_far _Route13EndBattleText4 + text_end Route13AfterBattleText4: - TX_FAR _Route13AfterBattleText4 - db "@" + text_far _Route13AfterBattleText4 + text_end Route13Text4: - TX_ASM + text_asm ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route13BattleText5: - TX_FAR _Route13BattleText5 - db "@" + text_far _Route13BattleText5 + text_end Route13EndBattleText5: - TX_FAR _Route13EndBattleText5 - db "@" + text_far _Route13EndBattleText5 + text_end Route13AfterBattleText5: - TX_FAR _Route13AfterBattleText5 - db "@" + text_far _Route13AfterBattleText5 + text_end Route13Text5: - TX_ASM + text_asm ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route13BattleText6: - TX_FAR _Route13BattleText6 - db "@" + text_far _Route13BattleText6 + text_end Route13EndBattleText6: - TX_FAR _Route13EndBattleText6 - db "@" + text_far _Route13EndBattleText6 + text_end Route13AfterBattleText6: - TX_FAR _Route13AfterBattleText6 - db "@" + text_far _Route13AfterBattleText6 + text_end Route13Text6: - TX_ASM + text_asm ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route13BattleText7: - TX_FAR _Route13BattleText7 - db "@" + text_far _Route13BattleText7 + text_end Route13EndBattleText7: - TX_FAR _Route13EndBattleText7 - db "@" + text_far _Route13EndBattleText7 + text_end Route13AfterBattleText7: - TX_FAR _Route13AfterBattleText7 - db "@" + text_far _Route13AfterBattleText7 + text_end Route13Text7: - TX_ASM + text_asm ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route13BattleText8: - TX_FAR _Route13BattleText8 - db "@" + text_far _Route13BattleText8 + text_end Route13EndBattleText8: - TX_FAR _Route13EndBattleText8 - db "@" + text_far _Route13EndBattleText8 + text_end Route13AfterBattleText8: - TX_FAR _Route13AfterBattleText8 - db "@" + text_far _Route13AfterBattleText8 + text_end Route13Text8: - TX_ASM + text_asm ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route13BattleText9: - TX_FAR _Route13BattleText9 - db "@" + text_far _Route13BattleText9 + text_end Route13EndBattleText9: - TX_FAR _Route13EndBattleText9 - db "@" + text_far _Route13EndBattleText9 + text_end Route13AfterBattleText9: - TX_FAR _Route13AfterBattleText9 - db "@" + text_far _Route13AfterBattleText9 + text_end Route13Text9: - TX_ASM + text_asm ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route13BattleText10: - TX_FAR _Route13BattleText10 - db "@" + text_far _Route13BattleText10 + text_end Route13EndBattleText10: - TX_FAR _Route13EndBattleText10 - db "@" + text_far _Route13EndBattleText10 + text_end Route13AfterBattleText10: - TX_FAR _Route13AfterBattleText10 - db "@" + text_far _Route13AfterBattleText10 + text_end Route13Text10: - TX_ASM + text_asm ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd Route13BattleText11: - TX_FAR _Route13BattleText11 - db "@" + text_far _Route13BattleText11 + text_end Route13EndBattleText11: - TX_FAR _Route13EndBattleText11 - db "@" + text_far _Route13EndBattleText11 + text_end Route13AfterBattleText11: - TX_FAR _Route13AfterBattleText11 - db "@" + text_far _Route13AfterBattleText11 + text_end Route13Text11: - TX_FAR _Route13Text11 - db "@" + text_far _Route13Text11 + text_end Route13Text12: - TX_FAR _Route13Text12 - db "@" + text_far _Route13Text12 + text_end Route13Text13: - TX_FAR _Route13Text13 - db "@" + text_far _Route13Text13 + text_end diff --git a/scripts/Route14.asm b/scripts/Route14.asm old mode 100755 new mode 100644 index fdc84d74..988fbe32 --- a/scripts/Route14.asm +++ b/scripts/Route14.asm @@ -26,277 +26,207 @@ Route14_TextPointers: dw Route14Text11 Route14TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_0 - dw Route14BattleText1 ; TextBeforeBattle - dw Route14AfterBattleText1 ; TextAfterBattle - dw Route14EndBattleText1 ; TextEndBattle - dw Route14EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_0, 2, Route14BattleText1, Route14EndBattleText1, Route14AfterBattleText1 Route14TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_1 - dw Route14BattleText2 ; TextBeforeBattle - dw Route14AfterBattleText2 ; TextAfterBattle - dw Route14EndBattleText2 ; TextEndBattle - dw Route14EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_1, 2, Route14BattleText2, Route14EndBattleText2, Route14AfterBattleText2 Route14TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_2 - dw Route14BattleText3 ; TextBeforeBattle - dw Route14AfterBattleText3 ; TextAfterBattle - dw Route14EndBattleText3 ; TextEndBattle - dw Route14EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_2, 4, Route14BattleText3, Route14EndBattleText3, Route14AfterBattleText3 Route14TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_3 - dw Route14BattleText4 ; TextBeforeBattle - dw Route14AfterBattleText4 ; TextAfterBattle - dw Route14EndBattleText4 ; TextEndBattle - dw Route14EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_3, 3, Route14BattleText4, Route14EndBattleText4, Route14AfterBattleText4 Route14TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_4 - dw Route14BattleText5 ; TextBeforeBattle - dw Route14AfterBattleText5 ; TextAfterBattle - dw Route14EndBattleText5 ; TextEndBattle - dw Route14EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_4, 3, Route14BattleText5, Route14EndBattleText5, Route14AfterBattleText5 Route14TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_5 - dw Route14BattleText6 ; TextBeforeBattle - dw Route14AfterBattleText6 ; TextAfterBattle - dw Route14EndBattleText6 ; TextEndBattle - dw Route14EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_5, 4, Route14BattleText6, Route14EndBattleText6, Route14AfterBattleText6 Route14TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_6 - dw Route14BattleText7 ; TextBeforeBattle - dw Route14AfterBattleText7 ; TextAfterBattle - dw Route14EndBattleText7 ; TextEndBattle - dw Route14EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_6, 4, Route14BattleText7, Route14EndBattleText7, Route14AfterBattleText7 Route14TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_7, 1 - dw Route14BattleText8 ; TextBeforeBattle - dw Route14AfterBattleText8 ; TextAfterBattle - dw Route14EndBattleText8 ; TextEndBattle - dw Route14EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_7, 1, 4, Route14BattleText8, Route14EndBattleText8, Route14AfterBattleText8 Route14TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_8, 1 - dw Route14BattleText9 ; TextBeforeBattle - dw Route14AfterBattleText9 ; TextAfterBattle - dw Route14EndBattleText9 ; TextEndBattle - dw Route14EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_14_TRAINER_8, 1, 3, Route14BattleText9, Route14EndBattleText9, Route14AfterBattleText9 Route14TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_9, 1 - dw Route14BattleText10 ; TextBeforeBattle - dw Route14AfterBattleText10 ; TextAfterBattle - dw Route14EndBattleText10 ; TextEndBattle - dw Route14EndBattleText10 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_14_TRAINER_9, 1, 4, Route14BattleText10, Route14EndBattleText10, Route14AfterBattleText10 + db -1 ; end Route14Text1: - TX_ASM + text_asm ld hl, Route14TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route14BattleText1: - TX_FAR _Route14BattleText1 - db "@" + text_far _Route14BattleText1 + text_end Route14EndBattleText1: - TX_FAR _Route14EndBattleText1 - db "@" + text_far _Route14EndBattleText1 + text_end Route14AfterBattleText1: - TX_FAR _Route14AfterBattleText1 - db "@" + text_far _Route14AfterBattleText1 + text_end Route14Text2: - TX_ASM + text_asm ld hl, Route14TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route14BattleText2: - TX_FAR _Route14BattleText2 - db "@" + text_far _Route14BattleText2 + text_end Route14EndBattleText2: - TX_FAR _Route14EndBattleText2 - db "@" + text_far _Route14EndBattleText2 + text_end Route14AfterBattleText2: - TX_FAR _Route14AfterBattleText2 - db "@" + text_far _Route14AfterBattleText2 + text_end Route14Text3: - TX_ASM + text_asm ld hl, Route14TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route14BattleText3: - TX_FAR _Route14BattleText3 - db "@" + text_far _Route14BattleText3 + text_end Route14EndBattleText3: - TX_FAR _Route14EndBattleText3 - db "@" + text_far _Route14EndBattleText3 + text_end Route14AfterBattleText3: - TX_FAR _Route14AfterBattleText3 - db "@" + text_far _Route14AfterBattleText3 + text_end Route14Text4: - TX_ASM + text_asm ld hl, Route14TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route14BattleText4: - TX_FAR _Route14BattleText4 - db "@" + text_far _Route14BattleText4 + text_end Route14EndBattleText4: - TX_FAR _Route14EndBattleText4 - db "@" + text_far _Route14EndBattleText4 + text_end Route14AfterBattleText4: - TX_FAR _Route14AfterBattleText4 - db "@" + text_far _Route14AfterBattleText4 + text_end Route14Text5: - TX_ASM + text_asm ld hl, Route14TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route14BattleText5: - TX_FAR _Route14BattleText5 - db "@" + text_far _Route14BattleText5 + text_end Route14EndBattleText5: - TX_FAR _Route14EndBattleText5 - db "@" + text_far _Route14EndBattleText5 + text_end Route14AfterBattleText5: - TX_FAR _Route14AfterBattleText5 - db "@" + text_far _Route14AfterBattleText5 + text_end Route14Text6: - TX_ASM + text_asm ld hl, Route14TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route14BattleText6: - TX_FAR _Route14BattleText6 - db "@" + text_far _Route14BattleText6 + text_end Route14EndBattleText6: - TX_FAR _Route14EndBattleText6 - db "@" + text_far _Route14EndBattleText6 + text_end Route14AfterBattleText6: - TX_FAR _Route14AfterBattleText6 - db "@" + text_far _Route14AfterBattleText6 + text_end Route14Text7: - TX_ASM + text_asm ld hl, Route14TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route14BattleText7: - TX_FAR _Route14BattleText7 - db "@" + text_far _Route14BattleText7 + text_end Route14EndBattleText7: - TX_FAR _Route14EndBattleText7 - db "@" + text_far _Route14EndBattleText7 + text_end Route14AfterBattleText7: - TX_FAR _Route14AfterBattleText7 - db "@" + text_far _Route14AfterBattleText7 + text_end Route14Text8: - TX_ASM + text_asm ld hl, Route14TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route14BattleText8: - TX_FAR _Route14BattleText8 - db "@" + text_far _Route14BattleText8 + text_end Route14EndBattleText8: - TX_FAR _Route14EndBattleText8 - db "@" + text_far _Route14EndBattleText8 + text_end Route14AfterBattleText8: - TX_FAR _Route14AfterBattleText8 - db "@" + text_far _Route14AfterBattleText8 + text_end Route14Text9: - TX_ASM + text_asm ld hl, Route14TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route14BattleText9: - TX_FAR _Route14BattleText9 - db "@" + text_far _Route14BattleText9 + text_end Route14EndBattleText9: - TX_FAR _Route14EndBattleText9 - db "@" + text_far _Route14EndBattleText9 + text_end Route14AfterBattleText9: - TX_FAR _Route14AfterBattleText9 - db "@" + text_far _Route14AfterBattleText9 + text_end Route14Text10: - TX_ASM + text_asm ld hl, Route14TrainerHeader9 call TalkToTrainer jp TextScriptEnd Route14BattleText10: - TX_FAR _Route14BattleText10 - db "@" + text_far _Route14BattleText10 + text_end Route14EndBattleText10: - TX_FAR _Route14EndBattleText10 - db "@" + text_far _Route14EndBattleText10 + text_end Route14AfterBattleText10: - TX_FAR _Route14AfterBattleText10 - db "@" + text_far _Route14AfterBattleText10 + text_end Route14Text11: - TX_FAR _Route14Text11 - db "@" + text_far _Route14Text11 + text_end diff --git a/scripts/Route15.asm b/scripts/Route15.asm old mode 100755 new mode 100644 index d973eb9c..3eed25d5 --- a/scripts/Route15.asm +++ b/scripts/Route15.asm @@ -27,269 +27,199 @@ Route15_TextPointers: dw Route15Text12 Route15TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_0 - dw Route15BattleText1 ; TextBeforeBattle - dw Route15AfterBattleText1 ; TextAfterBattle - dw Route15EndBattleText1 ; TextEndBattle - dw Route15EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_0, 2, Route15BattleText1, Route15EndBattleText1, Route15AfterBattleText1 Route15TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_1 - dw Route15BattleText2 ; TextBeforeBattle - dw Route15AfterBattleText2 ; TextAfterBattle - dw Route15EndBattleText2 ; TextEndBattle - dw Route15EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_1, 3, Route15BattleText2, Route15EndBattleText2, Route15AfterBattleText2 Route15TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_2 - dw Route15BattleText3 ; TextBeforeBattle - dw Route15AfterBattleText3 ; TextAfterBattle - dw Route15EndBattleText3 ; TextEndBattle - dw Route15EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_2, 3, Route15BattleText3, Route15EndBattleText3, Route15AfterBattleText3 Route15TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_3 - dw Route15BattleText4 ; TextBeforeBattle - dw Route15AfterBattleText4 ; TextAfterBattle - dw Route15EndBattleText4 ; TextEndBattle - dw Route15EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_3, 3, Route15BattleText4, Route15EndBattleText4, Route15AfterBattleText4 Route15TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_4 - dw Route15BattleText5 ; TextBeforeBattle - dw Route15AfterBattleText5 ; TextAfterBattle - dw Route15EndBattleText5 ; TextEndBattle - dw Route15EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_4, 2, Route15BattleText5, Route15EndBattleText5, Route15AfterBattleText5 Route15TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_5 - dw Route15BattleText6 ; TextBeforeBattle - dw Route15AfterBattleText6 ; TextAfterBattle - dw Route15EndBattleText6 ; TextEndBattle - dw Route15EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_5, 3, Route15BattleText6, Route15EndBattleText6, Route15AfterBattleText6 Route15TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_6 - dw Route15BattleText7 ; TextBeforeBattle - dw Route15AfterBattleText7 ; TextAfterBattle - dw Route15EndBattleText7 ; TextEndBattle - dw Route15EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_6, 3, Route15BattleText7, Route15EndBattleText7, Route15AfterBattleText7 Route15TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_7, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_7, 1 - dw Route15BattleText8 ; TextBeforeBattle - dw Route15AfterBattleText8 ; TextAfterBattle - dw Route15EndBattleText8 ; TextEndBattle - dw Route15EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_7, 1, 3, Route15BattleText8, Route15EndBattleText8, Route15AfterBattleText8 Route15TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_8, 1 - dw Route15BattleText9 ; TextBeforeBattle - dw Route15AfterBattleText9 ; TextAfterBattle - dw Route15EndBattleText9 ; TextEndBattle - dw Route15EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_15_TRAINER_8, 1, 3, Route15BattleText9, Route15EndBattleText9, Route15AfterBattleText9 Route15TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_9, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_9, 1 - dw Route15BattleText10 ; TextBeforeBattle - dw Route15AfterBattleText10 ; TextAfterBattle - dw Route15EndBattleText10 ; TextEndBattle - dw Route15EndBattleText10 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_15_TRAINER_9, 1, 3, Route15BattleText10, Route15EndBattleText10, Route15AfterBattleText10 + db -1 ; end Route15Text1: - TX_ASM + text_asm ld hl, Route15TrainerHeader0 jr Route15TalkToTrainer Route15Text2: - TX_ASM + text_asm ld hl, Route15TrainerHeader1 jr Route15TalkToTrainer Route15Text3: - TX_ASM + text_asm ld hl, Route15TrainerHeader2 jr Route15TalkToTrainer Route15Text4: - TX_ASM + text_asm ld hl, Route15TrainerHeader3 jr Route15TalkToTrainer Route15Text5: - TX_ASM + text_asm ld hl, Route15TrainerHeader4 jr Route15TalkToTrainer Route15Text6: - TX_ASM + text_asm ld hl, Route15TrainerHeader5 jr Route15TalkToTrainer Route15Text7: - TX_ASM + text_asm ld hl, Route15TrainerHeader6 jr Route15TalkToTrainer Route15Text8: - TX_ASM + text_asm ld hl, Route15TrainerHeader7 jr Route15TalkToTrainer Route15Text9: - TX_ASM + text_asm ld hl, Route15TrainerHeader8 jr Route15TalkToTrainer Route15Text10: - TX_ASM + text_asm ld hl, Route15TrainerHeader9 Route15TalkToTrainer: call TalkToTrainer jp TextScriptEnd Route15BattleText1: - TX_FAR _Route15BattleText1 - db "@" + text_far _Route15BattleText1 + text_end Route15EndBattleText1: - TX_FAR _Route15EndBattleText1 - db "@" + text_far _Route15EndBattleText1 + text_end Route15AfterBattleText1: - TX_FAR _Route15AfterBattleText1 - db "@" + text_far _Route15AfterBattleText1 + text_end Route15BattleText2: - TX_FAR _Route15BattleText2 - db "@" + text_far _Route15BattleText2 + text_end Route15EndBattleText2: - TX_FAR _Route15EndBattleText2 - db "@" + text_far _Route15EndBattleText2 + text_end Route15AfterBattleText2: - TX_FAR _Route15AfterBattleText2 - db "@" + text_far _Route15AfterBattleText2 + text_end Route15BattleText3: - TX_FAR _Route15BattleText3 - db "@" + text_far _Route15BattleText3 + text_end Route15EndBattleText3: - TX_FAR _Route15EndBattleText3 - db "@" + text_far _Route15EndBattleText3 + text_end Route15AfterBattleText3: - TX_FAR _Route15AfterBattleText3 - db "@" + text_far _Route15AfterBattleText3 + text_end Route15BattleText4: - TX_FAR _Route15BattleText4 - db "@" + text_far _Route15BattleText4 + text_end Route15EndBattleText4: - TX_FAR _Route15EndBattleText4 - db "@" + text_far _Route15EndBattleText4 + text_end Route15AfterBattleText4: - TX_FAR _Route15AfterBattleText4 - db "@" + text_far _Route15AfterBattleText4 + text_end Route15BattleText5: - TX_FAR _Route15BattleText5 - db "@" + text_far _Route15BattleText5 + text_end Route15EndBattleText5: - TX_FAR _Route15EndBattleText5 - db "@" + text_far _Route15EndBattleText5 + text_end Route15AfterBattleText5: - TX_FAR _Route15AfterBattleText5 - db "@" + text_far _Route15AfterBattleText5 + text_end Route15BattleText6: - TX_FAR _Route15BattleText6 - db "@" + text_far _Route15BattleText6 + text_end Route15EndBattleText6: - TX_FAR _Route15EndBattleText6 - db "@" + text_far _Route15EndBattleText6 + text_end Route15AfterBattleText6: - TX_FAR _Route15AfterBattleText6 - db "@" + text_far _Route15AfterBattleText6 + text_end Route15BattleText7: - TX_FAR _Route15BattleText7 - db "@" + text_far _Route15BattleText7 + text_end Route15EndBattleText7: - TX_FAR _Route15EndBattleText7 - db "@" + text_far _Route15EndBattleText7 + text_end Route15AfterBattleText7: - TX_FAR _Route15AfterBattleText7 - db "@" + text_far _Route15AfterBattleText7 + text_end Route15BattleText8: - TX_FAR _Route15BattleText8 - db "@" + text_far _Route15BattleText8 + text_end Route15EndBattleText8: - TX_FAR _Route15EndBattleText8 - db "@" + text_far _Route15EndBattleText8 + text_end Route15AfterBattleText8: - TX_FAR _Route15AfterBattleText8 - db "@" + text_far _Route15AfterBattleText8 + text_end Route15BattleText9: - TX_FAR _Route15BattleText9 - db "@" + text_far _Route15BattleText9 + text_end Route15EndBattleText9: - TX_FAR _Route15EndBattleText9 - db "@" + text_far _Route15EndBattleText9 + text_end Route15AfterBattleText9: - TX_FAR _Route15AfterBattleText9 - db "@" + text_far _Route15AfterBattleText9 + text_end Route15BattleText10: - TX_FAR _Route15BattleText10 - db "@" + text_far _Route15BattleText10 + text_end Route15EndBattleText10: - TX_FAR _Route15EndBattleText10 - db "@" + text_far _Route15EndBattleText10 + text_end Route15AfterBattleText10: - TX_FAR _Route15AfterBattleText10 - db "@" + text_far _Route15AfterBattleText10 + text_end Route15Text12: - TX_FAR _Route15Text12 - db "@" + text_far _Route15Text12 + text_end diff --git a/scripts/Route15Gate1F.asm b/scripts/Route15Gate1F.asm old mode 100755 new mode 100644 index 910eb2a5..dfbce9d4 --- a/scripts/Route15Gate1F.asm +++ b/scripts/Route15Gate1F.asm @@ -5,5 +5,5 @@ Route15Gate1F_TextPointers: dw Route15GateText1 Route15GateText1: - TX_FAR _Route15GateText1 - db "@" + text_far _Route15GateText1 + text_end diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm old mode 100755 new mode 100644 index 83763762..1b85e34e --- a/scripts/Route15Gate2F.asm +++ b/scripts/Route15Gate2F.asm @@ -6,13 +6,13 @@ Route15Gate2F_TextPointers: dw Route15GateUpstairsText2 Route15GateUpstairsText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_EXP_ALL - jr nz, .asm_49683 - ld a, 50 ; pokemon needed - ld [hOaksAideRequirement], a - ld a, EXP_ALL ; oak's aide reward - ld [hOaksAideRewardItem], a + jr nz, .got_item + ld a, 50 + ldh [hOaksAideRequirement], a + ld a, EXP_ALL + ldh [hOaksAideRewardItem], a ld [wd11e], a call GetItemName ld hl, wcd6d @@ -20,25 +20,25 @@ Route15GateUpstairsText1: ld bc, ITEM_NAME_LENGTH call CopyData predef OaksAideScript - ld a, [hOaksAideResult] - cp $1 - jr nz, .asm_49689 + ldh a, [hOaksAideResult] + cp OAKS_AIDE_GOT_ITEM + jr nz, .no_item SetEvent EVENT_GOT_EXP_ALL -.asm_49683 +.got_item ld hl, Route15GateUpstairsText_4968c call PrintText -.asm_49689 +.no_item jp TextScriptEnd Route15GateUpstairsText_4968c: - TX_FAR _Route15GateUpstairsText_4968c - db "@" + text_far _Route15GateUpstairsText_4968c + text_end Route15GateUpstairsText2: - TX_ASM + text_asm ld hl, Route15GateUpstairsText_49698 jp GateUpstairsScript_PrintIfFacingUp Route15GateUpstairsText_49698: - TX_FAR _Route15GateUpstairsText_49698 - db "@" + text_far _Route15GateUpstairsText_49698 + text_end diff --git a/scripts/Route16.asm b/scripts/Route16.asm old mode 100755 new mode 100644 index 54f83380..e7b1eb9a --- a/scripts/Route16.asm +++ b/scripts/Route16.asm @@ -27,7 +27,7 @@ Route16Script0: ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX jp z, CheckFightingMapTrainers ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [wCurOpponent], a @@ -51,7 +51,7 @@ Route16Script3: cp $2 jr z, .asm_599a8 ld a, $b - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID .asm_599a8 SetEvent EVENT_BEAT_ROUTE16_SNORLAX @@ -75,185 +75,143 @@ Route16_TextPointers: dw Route16Text11 Route16TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_0 - dw Route16BattleText1 ; TextBeforeBattle - dw Route16AfterBattleText1 ; TextAfterBattle - dw Route16EndBattleText1 ; TextEndBattle - dw Route16EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16BattleText1, Route16EndBattleText1, Route16AfterBattleText1 Route16TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_1 - dw Route16BattleText2 ; TextBeforeBattle - dw Route16AfterBattleText2 ; TextAfterBattle - dw Route16EndBattleText2 ; TextEndBattle - dw Route16EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_16_TRAINER_1, 2, Route16BattleText2, Route16EndBattleText2, Route16AfterBattleText2 Route16TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_2 - dw Route16BattleText3 ; TextBeforeBattle - dw Route16AfterBattleText3 ; TextAfterBattle - dw Route16EndBattleText3 ; TextEndBattle - dw Route16EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_16_TRAINER_2, 2, Route16BattleText3, Route16EndBattleText3, Route16AfterBattleText3 Route16TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_3 - dw Route16BattleText4 ; TextBeforeBattle - dw Route16AfterBattleText4 ; TextAfterBattle - dw Route16EndBattleText4 ; TextEndBattle - dw Route16EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_16_TRAINER_3, 2, Route16BattleText4, Route16EndBattleText4, Route16AfterBattleText4 Route16TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_4 - dw Route16BattleText5 ; TextBeforeBattle - dw Route16AfterBattleText5 ; TextAfterBattle - dw Route16EndBattleText5 ; TextEndBattle - dw Route16EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_16_TRAINER_4, 2, Route16BattleText5, Route16EndBattleText5, Route16AfterBattleText5 Route16TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_5 - dw Route16BattleText6 ; TextBeforeBattle - dw Route16AfterBattleText6 ; TextAfterBattle - dw Route16EndBattleText6 ; TextEndBattle - dw Route16EndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_16_TRAINER_5, 4, Route16BattleText6, Route16EndBattleText6, Route16AfterBattleText6 + db -1 ; end Route16Text1: - TX_ASM + text_asm ld hl, Route16TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route16BattleText1: - TX_FAR _Route16BattleText1 - db "@" + text_far _Route16BattleText1 + text_end Route16EndBattleText1: - TX_FAR _Route16EndBattleText1 - db "@" + text_far _Route16EndBattleText1 + text_end Route16AfterBattleText1: - TX_FAR _Route16AfterBattleText1 - db "@" + text_far _Route16AfterBattleText1 + text_end Route16Text2: - TX_ASM + text_asm ld hl, Route16TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route16BattleText2: - TX_FAR _Route16BattleText2 - db "@" + text_far _Route16BattleText2 + text_end Route16EndBattleText2: - TX_FAR _Route16EndBattleText2 - db "@" + text_far _Route16EndBattleText2 + text_end Route16AfterBattleText2: - TX_FAR _Route16AfterBattleText2 - db "@" + text_far _Route16AfterBattleText2 + text_end Route16Text3: - TX_ASM + text_asm ld hl, Route16TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route16BattleText3: - TX_FAR _Route16BattleText3 - db "@" + text_far _Route16BattleText3 + text_end Route16EndBattleText3: - TX_FAR _Route16EndBattleText3 - db "@" + text_far _Route16EndBattleText3 + text_end Route16AfterBattleText3: - TX_FAR _Route16AfterBattleText3 - db "@" + text_far _Route16AfterBattleText3 + text_end Route16Text4: - TX_ASM + text_asm ld hl, Route16TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route16BattleText4: - TX_FAR _Route16BattleText4 - db "@" + text_far _Route16BattleText4 + text_end Route16EndBattleText4: - TX_FAR _Route16EndBattleText4 - db "@" + text_far _Route16EndBattleText4 + text_end Route16AfterBattleText4: - TX_FAR _Route16AfterBattleText4 - db "@" + text_far _Route16AfterBattleText4 + text_end Route16Text5: - TX_ASM + text_asm ld hl, Route16TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route16BattleText5: - TX_FAR _Route16BattleText5 - db "@" + text_far _Route16BattleText5 + text_end Route16EndBattleText5: - TX_FAR _Route16EndBattleText5 - db "@" + text_far _Route16EndBattleText5 + text_end Route16AfterBattleText5: - TX_FAR _Route16AfterBattleText5 - db "@" + text_far _Route16AfterBattleText5 + text_end Route16Text6: - TX_ASM + text_asm ld hl, Route16TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route16BattleText6: - TX_FAR _Route16BattleText6 - db "@" + text_far _Route16BattleText6 + text_end Route16EndBattleText6: - TX_FAR _Route16EndBattleText6 - db "@" + text_far _Route16EndBattleText6 + text_end Route16AfterBattleText6: - TX_FAR _Route16AfterBattleText6 - db "@" + text_far _Route16AfterBattleText6 + text_end Route16Text7: - TX_FAR _Route16Text7 - db "@" + text_far _Route16Text7 + text_end Route16Text10: - TX_FAR _Route16Text10 - db "@" + text_far _Route16Text10 + text_end Route16Text11: - TX_FAR _Route16Text11 - db "@" + text_far _Route16Text11 + text_end Route16Text8: - TX_FAR _Route16Text8 - db "@" + text_far _Route16Text8 + text_end Route16Text9: - TX_FAR _Route16Text9 - db "@" + text_far _Route16Text9 + text_end diff --git a/scripts/Route16FlyHouse.asm b/scripts/Route16FlyHouse.asm old mode 100755 new mode 100644 index 1d74ac80..3bb34b75 --- a/scripts/Route16FlyHouse.asm +++ b/scripts/Route16FlyHouse.asm @@ -6,43 +6,43 @@ Route16FlyHouse_TextPointers: dw Route16HouseText2 Route16HouseText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_HM02 ld hl, HM02ExplanationText - jr nz, .asm_13616 + jr nz, .got_item ld hl, Route16HouseText3 call PrintText - lb bc, HM_02, 1 + lb bc, HM_FLY, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full SetEvent EVENT_GOT_HM02 ld hl, ReceivedHM02Text - jr .asm_13616 -.BagFull + jr .got_item +.bag_full ld hl, HM02NoRoomText -.asm_13616 +.got_item call PrintText jp TextScriptEnd Route16HouseText3: - TX_FAR _Route16HouseText3 - db "@" + text_far _Route16HouseText3 + text_end ReceivedHM02Text: - TX_FAR _ReceivedHM02Text - TX_SFX_KEY_ITEM - db "@" + text_far _ReceivedHM02Text + sound_get_key_item + text_end HM02ExplanationText: - TX_FAR _HM02ExplanationText - db "@" + text_far _HM02ExplanationText + text_end HM02NoRoomText: - TX_FAR _HM02NoRoomText - db "@" + text_far _HM02NoRoomText + text_end Route16HouseText2: - TX_ASM + text_asm ld hl, Route16HouseText_1e652 call PrintText ld a, FEAROW @@ -51,5 +51,5 @@ Route16HouseText2: jp TextScriptEnd Route16HouseText_1e652: - TX_FAR _Route16HouseText_1e652 - db "@" + text_far _Route16HouseText_1e652 + text_end diff --git a/scripts/Route16Gate1F.asm b/scripts/Route16Gate1F.asm old mode 100755 new mode 100644 index f814d209..e992fa44 --- a/scripts/Route16Gate1F.asm +++ b/scripts/Route16Gate1F.asm @@ -19,10 +19,10 @@ Route16GateScript0: call ArePlayerCoordsInArray ret nc ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, [wCoordIndex] cp $1 jr z, .asm_4970e @@ -44,11 +44,11 @@ Route16GateScript0: ret CoordsData_49714: - db $07,$04 - db $08,$04 - db $09,$04 - db $0A,$04 - db $FF + dbmapcoord 4, 7 + dbmapcoord 4, 8 + dbmapcoord 4, 9 + dbmapcoord 4, 10 + db -1 ; end Route16GateScript1: ld a, [wSimulatedJoypadStatesIndex] @@ -59,7 +59,7 @@ Route16GateScript1: Route16GateScript2: ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -92,7 +92,7 @@ Route16Gate1F_TextPointers: dw Route16GateText3 Route16GateText1: - TX_ASM + text_asm call Route16GateScript_49755 jr z, .asm_0bdf3 ld hl, Route16GateText_4977c @@ -105,17 +105,17 @@ Route16GateText1: jp TextScriptEnd Route16GateText_49777: - TX_FAR _Route16GateText_49777 - db "@" + text_far _Route16GateText_49777 + text_end Route16GateText_4977c: - TX_FAR _Route16GateText_4977c - db "@" + text_far _Route16GateText_4977c + text_end Route16GateText3: - TX_FAR _Route16GateText_49781 - db "@" + text_far _Route16GateText_49781 + text_end Route16GateText2: - TX_FAR _Route16GateText2 - db "@" + text_far _Route16GateText2 + text_end diff --git a/scripts/Route16Gate2F.asm b/scripts/Route16Gate2F.asm old mode 100755 new mode 100644 index 643a5ec7..27e147a1 --- a/scripts/Route16Gate2F.asm +++ b/scripts/Route16Gate2F.asm @@ -8,39 +8,39 @@ Route16Gate2F_TextPointers: dw Route16GateUpstairsText4 Route16GateUpstairsText1: - TX_ASM + text_asm ld hl, Route16GateUpstairsText_49820 call PrintText jp TextScriptEnd Route16GateUpstairsText_49820: - TX_FAR _Route16GateUpstairsText_49820 - db "@" + text_far _Route16GateUpstairsText_49820 + text_end Route16GateUpstairsText2: - TX_ASM + text_asm ld hl, Route16GateUpstairsText_4982f call PrintText jp TextScriptEnd Route16GateUpstairsText_4982f: - TX_FAR _Route16GateUpstairsText_4982f - db "@" + text_far _Route16GateUpstairsText_4982f + text_end Route16GateUpstairsText3: - TX_ASM + text_asm ld hl, Route16GateUpstairsText_4983b jp GateUpstairsScript_PrintIfFacingUp Route16GateUpstairsText_4983b: - TX_FAR _Route16GateUpstairsText_4983b - db "@" + text_far _Route16GateUpstairsText_4983b + text_end Route16GateUpstairsText4: - TX_ASM + text_asm ld hl, Route16GateUpstairsText_49847 jp GateUpstairsScript_PrintIfFacingUp Route16GateUpstairsText_49847: - TX_FAR _Route16GateUpstairsText_49847 - db "@" + text_far _Route16GateUpstairsText_49847 + text_end diff --git a/scripts/Route17.asm b/scripts/Route17.asm old mode 100755 new mode 100644 index dd92ac44..27693f9f --- a/scripts/Route17.asm +++ b/scripts/Route17.asm @@ -31,297 +31,227 @@ Route17_TextPointers: dw Route17Text16 Route17TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0 - dw Route17BattleText1 ; TextBeforeBattle - dw Route17AfterBattleText1 ; TextAfterBattle - dw Route17EndBattleText1 ; TextEndBattle - dw Route17EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_0, 3, Route17BattleText1, Route17EndBattleText1, Route17AfterBattleText1 Route17TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1 - dw Route17BattleText2 ; TextBeforeBattle - dw Route17AfterBattleText2 ; TextAfterBattle - dw Route17EndBattleText2 ; TextEndBattle - dw Route17EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_1, 4, Route17BattleText2, Route17EndBattleText2, Route17AfterBattleText2 Route17TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2 - dw Route17BattleText3 ; TextBeforeBattle - dw Route17AfterBattleText3 ; TextAfterBattle - dw Route17EndBattleText3 ; TextEndBattle - dw Route17EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_2, 4, Route17BattleText3, Route17EndBattleText3, Route17AfterBattleText3 Route17TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3 - dw Route17BattleText4 ; TextBeforeBattle - dw Route17AfterBattleText4 ; TextAfterBattle - dw Route17EndBattleText4 ; TextEndBattle - dw Route17EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_3, 4, Route17BattleText4, Route17EndBattleText4, Route17AfterBattleText4 Route17TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4 - dw Route17BattleText5 ; TextBeforeBattle - dw Route17AfterBattleText5 ; TextAfterBattle - dw Route17EndBattleText5 ; TextEndBattle - dw Route17EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_4, 3, Route17BattleText5, Route17EndBattleText5, Route17AfterBattleText5 Route17TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5 - dw Route17BattleText6 ; TextBeforeBattle - dw Route17AfterBattleText6 ; TextAfterBattle - dw Route17EndBattleText6 ; TextEndBattle - dw Route17EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_5, 2, Route17BattleText6, Route17EndBattleText6, Route17AfterBattleText6 Route17TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6 - dw Route17BattleText7 ; TextBeforeBattle - dw Route17AfterBattleText7 ; TextAfterBattle - dw Route17EndBattleText7 ; TextEndBattle - dw Route17EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_6, 4, Route17BattleText7, Route17EndBattleText7, Route17AfterBattleText7 Route17TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1 - dw Route17BattleText8 ; TextBeforeBattle - dw Route17AfterBattleText8 ; TextAfterBattle - dw Route17EndBattleText8 ; TextEndBattle - dw Route17EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_7, 1, 2, Route17BattleText8, Route17EndBattleText8, Route17AfterBattleText8 Route17TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1 - dw Route17BattleText9 ; TextBeforeBattle - dw Route17AfterBattleText9 ; TextAfterBattle - dw Route17EndBattleText9 ; TextEndBattle - dw Route17EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_17_TRAINER_8, 1, 3, Route17BattleText9, Route17EndBattleText9, Route17AfterBattleText9 Route17TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1 - dw Route17BattleText10 ; TextBeforeBattle - dw Route17AfterBattleText10 ; TextAfterBattle - dw Route17EndBattleText10 ; TextEndBattle - dw Route17EndBattleText10 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_17_TRAINER_9, 1, 4, Route17BattleText10, Route17EndBattleText10, Route17AfterBattleText10 + db -1 ; end Route17Text1: - TX_ASM + text_asm ld hl, Route17TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route17BattleText1: - TX_FAR _Route17BattleText1 - db "@" + text_far _Route17BattleText1 + text_end Route17EndBattleText1: - TX_FAR _Route17EndBattleText1 - db "@" + text_far _Route17EndBattleText1 + text_end Route17AfterBattleText1: - TX_FAR _Route17AfterBattleText1 - db "@" + text_far _Route17AfterBattleText1 + text_end Route17Text2: - TX_ASM + text_asm ld hl, Route17TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route17BattleText2: - TX_FAR _Route17BattleText2 - db "@" + text_far _Route17BattleText2 + text_end Route17EndBattleText2: - TX_FAR _Route17EndBattleText2 - db "@" + text_far _Route17EndBattleText2 + text_end Route17AfterBattleText2: - TX_FAR _Route17AfterBattleText2 - db "@" + text_far _Route17AfterBattleText2 + text_end Route17Text3: - TX_ASM + text_asm ld hl, Route17TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route17BattleText3: - TX_FAR _Route17BattleText3 - db "@" + text_far _Route17BattleText3 + text_end Route17EndBattleText3: - TX_FAR _Route17EndBattleText3 - db "@" + text_far _Route17EndBattleText3 + text_end Route17AfterBattleText3: - TX_FAR _Route17AfterBattleText3 - db "@" + text_far _Route17AfterBattleText3 + text_end Route17Text4: - TX_ASM + text_asm ld hl, Route17TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route17BattleText4: - TX_FAR _Route17BattleText4 - db "@" + text_far _Route17BattleText4 + text_end Route17EndBattleText4: - TX_FAR _Route17EndBattleText4 - db "@" + text_far _Route17EndBattleText4 + text_end Route17AfterBattleText4: - TX_FAR _Route17AfterBattleText4 - db "@" + text_far _Route17AfterBattleText4 + text_end Route17Text5: - TX_ASM + text_asm ld hl, Route17TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route17BattleText5: - TX_FAR _Route17BattleText5 - db "@" + text_far _Route17BattleText5 + text_end Route17EndBattleText5: - TX_FAR _Route17EndBattleText5 - db "@" + text_far _Route17EndBattleText5 + text_end Route17AfterBattleText5: - TX_FAR _Route17AfterBattleText5 - db "@" + text_far _Route17AfterBattleText5 + text_end Route17Text6: - TX_ASM + text_asm ld hl, Route17TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route17BattleText6: - TX_FAR _Route17BattleText6 - db "@" + text_far _Route17BattleText6 + text_end Route17EndBattleText6: - TX_FAR _Route17EndBattleText6 - db "@" + text_far _Route17EndBattleText6 + text_end Route17AfterBattleText6: - TX_FAR _Route17AfterBattleText6 - db "@" + text_far _Route17AfterBattleText6 + text_end Route17Text7: - TX_ASM + text_asm ld hl, Route17TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route17BattleText7: - TX_FAR _Route17BattleText7 - db "@" + text_far _Route17BattleText7 + text_end Route17EndBattleText7: - TX_FAR _Route17EndBattleText7 - db "@" + text_far _Route17EndBattleText7 + text_end Route17AfterBattleText7: - TX_FAR _Route17AfterBattleText7 - db "@" + text_far _Route17AfterBattleText7 + text_end Route17Text8: - TX_ASM + text_asm ld hl, Route17TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route17BattleText8: - TX_FAR _Route17BattleText8 - db "@" + text_far _Route17BattleText8 + text_end Route17EndBattleText8: - TX_FAR _Route17EndBattleText8 - db "@" + text_far _Route17EndBattleText8 + text_end Route17AfterBattleText8: - TX_FAR _Route17AfterBattleText8 - db "@" + text_far _Route17AfterBattleText8 + text_end Route17Text9: - TX_ASM + text_asm ld hl, Route17TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route17BattleText9: - TX_FAR _Route17BattleText9 - db "@" + text_far _Route17BattleText9 + text_end Route17EndBattleText9: - TX_FAR _Route17EndBattleText9 - db "@" + text_far _Route17EndBattleText9 + text_end Route17AfterBattleText9: - TX_FAR _Route17AfterBattleText9 - db "@" + text_far _Route17AfterBattleText9 + text_end Route17Text10: - TX_ASM + text_asm ld hl, Route17TrainerHeader9 call TalkToTrainer jp TextScriptEnd Route17BattleText10: - TX_FAR _Route17BattleText10 - db "@" + text_far _Route17BattleText10 + text_end Route17EndBattleText10: - TX_FAR _Route17EndBattleText10 - db "@" + text_far _Route17EndBattleText10 + text_end Route17AfterBattleText10: - TX_FAR _Route17AfterBattleText10 - db "@" + text_far _Route17AfterBattleText10 + text_end Route17Text11: - TX_FAR _Route17Text11 - db "@" + text_far _Route17Text11 + text_end Route17Text12: - TX_FAR _Route17Text12 - db "@" + text_far _Route17Text12 + text_end Route17Text13: - TX_FAR _Route17Text13 - db "@" + text_far _Route17Text13 + text_end Route17Text14: - TX_FAR _Route17Text14 - db "@" + text_far _Route17Text14 + text_end Route17Text15: - TX_FAR _Route17Text15 - db "@" + text_far _Route17Text15 + text_end Route17Text16: - TX_FAR _Route17Text16 - db "@" + text_far _Route17Text16 + text_end diff --git a/scripts/Route18.asm b/scripts/Route18.asm old mode 100755 new mode 100644 index 022d41be..f6738fc6 --- a/scripts/Route18.asm +++ b/scripts/Route18.asm @@ -20,92 +20,71 @@ Route18_TextPointers: dw Route18Text5 Route18TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0 - dw Route18BattleText1 ; TextBeforeBattle - dw Route18AfterBattleText1 ; TextAfterBattle - dw Route18EndBattleText1 ; TextEndBattle - dw Route18EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_18_TRAINER_0, 3, Route18BattleText1, Route18EndBattleText1, Route18AfterBattleText1 Route18TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1 - dw Route18BattleText2 ; TextBeforeBattle - dw Route18AfterBattleText2 ; TextAfterBattle - dw Route18EndBattleText2 ; TextEndBattle - dw Route18EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_18_TRAINER_1, 3, Route18BattleText2, Route18EndBattleText2, Route18AfterBattleText2 Route18TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2 - dw Route18BattleText3 ; TextBeforeBattle - dw Route18AfterBattleText3 ; TextAfterBattle - dw Route18EndBattleText3 ; TextEndBattle - dw Route18EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_18_TRAINER_2, 4, Route18BattleText3, Route18EndBattleText3, Route18AfterBattleText3 + db -1 ; end Route18Text1: - TX_ASM + text_asm ld hl, Route18TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route18BattleText1: - TX_FAR _Route18BattleText1 - db "@" + text_far _Route18BattleText1 + text_end Route18EndBattleText1: - TX_FAR _Route18EndBattleText1 - db "@" + text_far _Route18EndBattleText1 + text_end Route18AfterBattleText1: - TX_FAR _Route18AfterBattleText1 - db "@" + text_far _Route18AfterBattleText1 + text_end Route18Text2: - TX_ASM + text_asm ld hl, Route18TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route18BattleText2: - TX_FAR _Route18BattleText2 - db "@" + text_far _Route18BattleText2 + text_end Route18EndBattleText2: - TX_FAR _Route18EndBattleText2 - db "@" + text_far _Route18EndBattleText2 + text_end Route18AfterBattleText2: - TX_FAR _Route18AfterBattleText2 - db "@" + text_far _Route18AfterBattleText2 + text_end Route18Text3: - TX_ASM + text_asm ld hl, Route18TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route18BattleText3: - TX_FAR _Route18BattleText3 - db "@" + text_far _Route18BattleText3 + text_end Route18EndBattleText3: - TX_FAR _Route18EndBattleText3 - db "@" + text_far _Route18EndBattleText3 + text_end Route18AfterBattleText3: - TX_FAR _Route18AfterBattleText3 - db "@" + text_far _Route18AfterBattleText3 + text_end Route18Text4: - TX_FAR _Route18Text4 - db "@" + text_far _Route18Text4 + text_end Route18Text5: - TX_FAR _Route18Text5 - db "@" + text_far _Route18Text5 + text_end diff --git a/scripts/Route18Gate1F.asm b/scripts/Route18Gate1F.asm old mode 100755 new mode 100644 index 812cb3e0..2caeaedd --- a/scripts/Route18Gate1F.asm +++ b/scripts/Route18Gate1F.asm @@ -19,10 +19,10 @@ Route18GateScript0: call ArePlayerCoordsInArray ret nc ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, [wCoordIndex] cp $1 jr z, .asm_498c6 @@ -44,11 +44,11 @@ Route18GateScript0: ret CoordsData_498cc: - db $03,$04 - db $04,$04 - db $05,$04 - db $06,$04 - db $FF + dbmapcoord 4, 3 + dbmapcoord 4, 4 + dbmapcoord 4, 5 + dbmapcoord 4, 6 + db -1 ; end Route18GateScript1: ld a, [wSimulatedJoypadStatesIndex] @@ -59,7 +59,7 @@ Route18GateScript1: Route18GateScript2: ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -87,7 +87,7 @@ Route18Gate1F_TextPointers: dw Route18GateText2 Route18GateText1: - TX_ASM + text_asm call Route16GateScript_49755 jr z, .asm_3c84d ld hl, Route18GateText_4992d @@ -100,13 +100,13 @@ Route18GateText1: jp TextScriptEnd Route18GateText_49928: - TX_FAR _Route18GateText_49928 - db "@" + text_far _Route18GateText_49928 + text_end Route18GateText_4992d: - TX_FAR _Route18GateText_4992d - db "@" + text_far _Route18GateText_4992d + text_end Route18GateText2: - TX_FAR _Route18GateText_49932 - db "@" + text_far _Route18GateText_49932 + text_end diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm old mode 100755 new mode 100644 index 6987a099..efb6d70a --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm @@ -7,26 +7,26 @@ Route18Gate2F_TextPointers: dw Route18GateUpstairsText3 Route18GateUpstairsText1: - TX_ASM - ld a, $5 + text_asm + ld a, TRADE_FOR_MARC ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd Route18GateUpstairsText2: - TX_ASM + text_asm ld hl, Route18GateUpstairsText_49993 jp GateUpstairsScript_PrintIfFacingUp Route18GateUpstairsText_49993: - TX_FAR _Route18GateUpstairsText_49993 - db "@" + text_far _Route18GateUpstairsText_49993 + text_end Route18GateUpstairsText3: - TX_ASM + text_asm ld hl, Route18GateUpstairsText_4999f jp GateUpstairsScript_PrintIfFacingUp Route18GateUpstairsText_4999f: - TX_FAR _Route18GateUpstairsText_4999f - db "@" + text_far _Route18GateUpstairsText_4999f + text_end diff --git a/scripts/Route19.asm b/scripts/Route19.asm old mode 100755 new mode 100644 index 6f603e05..8d0c9629 --- a/scripts/Route19.asm +++ b/scripts/Route19.asm @@ -26,277 +26,207 @@ Route19_TextPointers: dw Route19Text11 Route19TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_0 - dw Route19BattleText1 ; TextBeforeBattle - dw Route19AfterBattleText1 ; TextAfterBattle - dw Route19EndBattleText1 ; TextEndBattle - dw Route19EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_0, 4, Route19BattleText1, Route19EndBattleText1, Route19AfterBattleText1 Route19TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1 - dw Route19BattleText2 ; TextBeforeBattle - dw Route19AfterBattleText2 ; TextAfterBattle - dw Route19EndBattleText2 ; TextEndBattle - dw Route19EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_1, 3, Route19BattleText2, Route19EndBattleText2, Route19AfterBattleText2 Route19TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_2 - dw Route19BattleText3 ; TextBeforeBattle - dw Route19AfterBattleText3 ; TextAfterBattle - dw Route19EndBattleText3 ; TextEndBattle - dw Route19EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_2, 3, Route19BattleText3, Route19EndBattleText3, Route19AfterBattleText3 Route19TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_3 - dw Route19BattleText4 ; TextBeforeBattle - dw Route19AfterBattleText4 ; TextAfterBattle - dw Route19EndBattleText4 ; TextEndBattle - dw Route19EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_3, 4, Route19BattleText4, Route19EndBattleText4, Route19AfterBattleText4 Route19TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_4 - dw Route19BattleText5 ; TextBeforeBattle - dw Route19AfterBattleText5 ; TextAfterBattle - dw Route19EndBattleText5 ; TextEndBattle - dw Route19EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_4, 4, Route19BattleText5, Route19EndBattleText5, Route19AfterBattleText5 Route19TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_5 - dw Route19BattleText6 ; TextBeforeBattle - dw Route19AfterBattleText6 ; TextAfterBattle - dw Route19EndBattleText6 ; TextEndBattle - dw Route19EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_5, 4, Route19BattleText6, Route19EndBattleText6, Route19AfterBattleText6 Route19TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_6 - dw Route19BattleText7 ; TextBeforeBattle - dw Route19AfterBattleText7 ; TextAfterBattle - dw Route19EndBattleText7 ; TextEndBattle - dw Route19EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_6, 3, Route19BattleText7, Route19EndBattleText7, Route19AfterBattleText7 Route19TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_7, 1 - dw Route19BattleText8 ; TextBeforeBattle - dw Route19AfterBattleText8 ; TextAfterBattle - dw Route19EndBattleText8 ; TextEndBattle - dw Route19EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_7, 1, 4, Route19BattleText8, Route19EndBattleText8, Route19AfterBattleText8 Route19TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_8, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_8, 1 - dw Route19BattleText9 ; TextBeforeBattle - dw Route19AfterBattleText9 ; TextAfterBattle - dw Route19EndBattleText9 ; TextEndBattle - dw Route19EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_19_TRAINER_8, 1, 4, Route19BattleText9, Route19EndBattleText9, Route19AfterBattleText9 Route19TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_9, 1 - dw Route19BattleText10 ; TextBeforeBattle - dw Route19AfterBattleText10 ; TextAfterBattle - dw Route19EndBattleText10 ; TextEndBattle - dw Route19EndBattleText10 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_19_TRAINER_9, 1, 4, Route19BattleText10, Route19EndBattleText10, Route19AfterBattleText10 + db -1 ; end Route19Text1: - TX_ASM + text_asm ld hl, Route19TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route19Text2: - TX_ASM + text_asm ld hl, Route19TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route19Text3: - TX_ASM + text_asm ld hl, Route19TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route19Text4: - TX_ASM + text_asm ld hl, Route19TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route19Text5: - TX_ASM + text_asm ld hl, Route19TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route19Text6: - TX_ASM + text_asm ld hl, Route19TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route19Text7: - TX_ASM + text_asm ld hl, Route19TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route19Text8: - TX_ASM + text_asm ld hl, Route19TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route19Text9: - TX_ASM + text_asm ld hl, Route19TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route19Text10: - TX_ASM + text_asm ld hl, Route19TrainerHeader9 call TalkToTrainer jp TextScriptEnd Route19BattleText1: - TX_FAR _Route19BattleText1 - db "@" + text_far _Route19BattleText1 + text_end Route19EndBattleText1: - TX_FAR _Route19EndBattleText1 - db "@" + text_far _Route19EndBattleText1 + text_end Route19AfterBattleText1: - TX_FAR _Route19AfterBattleText1 - db "@" + text_far _Route19AfterBattleText1 + text_end Route19BattleText2: - TX_FAR _Route19BattleText2 - db "@" + text_far _Route19BattleText2 + text_end Route19EndBattleText2: - TX_FAR _Route19EndBattleText2 - db "@" + text_far _Route19EndBattleText2 + text_end Route19AfterBattleText2: - TX_FAR _Route19AfterBattleText2 - db "@" + text_far _Route19AfterBattleText2 + text_end Route19BattleText3: - TX_FAR _Route19BattleText3 - db "@" + text_far _Route19BattleText3 + text_end Route19EndBattleText3: - TX_FAR _Route19EndBattleText3 - db "@" + text_far _Route19EndBattleText3 + text_end Route19AfterBattleText3: - TX_FAR _Route19AfterBattleText3 - db "@" + text_far _Route19AfterBattleText3 + text_end Route19BattleText4: - TX_FAR _Route19BattleText4 - db "@" + text_far _Route19BattleText4 + text_end Route19EndBattleText4: - TX_FAR _Route19EndBattleText4 - db "@" + text_far _Route19EndBattleText4 + text_end Route19AfterBattleText4: - TX_FAR _Route19AfterBattleText4 - db "@" + text_far _Route19AfterBattleText4 + text_end Route19BattleText5: - TX_FAR _Route19BattleText5 - db "@" + text_far _Route19BattleText5 + text_end Route19EndBattleText5: - TX_FAR _Route19EndBattleText5 - db "@" + text_far _Route19EndBattleText5 + text_end Route19AfterBattleText5: - TX_FAR _Route19AfterBattleText5 - db "@" + text_far _Route19AfterBattleText5 + text_end Route19BattleText6: - TX_FAR _Route19BattleText6 - db "@" + text_far _Route19BattleText6 + text_end Route19EndBattleText6: - TX_FAR _Route19EndBattleText6 - db "@" + text_far _Route19EndBattleText6 + text_end Route19AfterBattleText6: - TX_FAR _Route19AfterBattleText6 - db "@" + text_far _Route19AfterBattleText6 + text_end Route19BattleText7: - TX_FAR _Route19BattleText7 - db "@" + text_far _Route19BattleText7 + text_end Route19EndBattleText7: - TX_FAR _Route19EndBattleText7 - db "@" + text_far _Route19EndBattleText7 + text_end Route19AfterBattleText7: - TX_FAR _Route19AfterBattleText7 - db "@" + text_far _Route19AfterBattleText7 + text_end Route19BattleText8: - TX_FAR _Route19BattleText8 - db "@" + text_far _Route19BattleText8 + text_end Route19EndBattleText8: - TX_FAR _Route19EndBattleText8 - db "@" + text_far _Route19EndBattleText8 + text_end Route19AfterBattleText8: - TX_FAR _Route19AfterBattleText8 - db "@" + text_far _Route19AfterBattleText8 + text_end Route19BattleText9: - TX_FAR _Route19BattleText9 - db "@" + text_far _Route19BattleText9 + text_end Route19EndBattleText9: - TX_FAR _Route19EndBattleText9 - db "@" + text_far _Route19EndBattleText9 + text_end Route19AfterBattleText9: - TX_FAR _Route19AfterBattleText9 - db "@" + text_far _Route19AfterBattleText9 + text_end Route19BattleText10: - TX_FAR _Route19BattleText10 - db "@" + text_far _Route19BattleText10 + text_end Route19EndBattleText10: - TX_FAR _Route19EndBattleText10 - db "@" + text_far _Route19EndBattleText10 + text_end Route19AfterBattleText10: - TX_FAR _Route19AfterBattleText10 - db "@" + text_far _Route19AfterBattleText10 + text_end Route19Text11: - TX_FAR _Route19Text11 - db "@" + text_far _Route19Text11 + text_end diff --git a/scripts/Route2.asm b/scripts/Route2.asm old mode 100755 new mode 100644 index f4b1c8c4..c6886ce4 --- a/scripts/Route2.asm +++ b/scripts/Route2.asm @@ -8,9 +8,9 @@ Route2_TextPointers: dw Route2Text4 Route2Text3: - TX_FAR _Route2Text3 - db "@" + text_far _Route2Text3 + text_end Route2Text4: - TX_FAR _Route2Text4 - db "@" + text_far _Route2Text4 + text_end diff --git a/scripts/Route20.asm b/scripts/Route20.asm old mode 100755 new mode 100644 index 081a723e..f9904d4e --- a/scripts/Route20.asm +++ b/scripts/Route20.asm @@ -33,7 +33,7 @@ Route20Script_50cc6: db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 - db $FF + db -1 ; end .asm_50cef CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE @@ -76,278 +76,208 @@ Route20_TextPointers: dw Route20Text12 Route20TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_0 - dw Route20BattleText1 ; TextBeforeBattle - dw Route20AfterBattleText1 ; TextAfterBattle - dw Route20EndBattleText1 ; TextEndBattle - dw Route20EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20BattleText1, Route20EndBattleText1, Route20AfterBattleText1 Route20TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1 - dw Route20BattleText2 ; TextBeforeBattle - dw Route20AfterBattleText2 ; TextAfterBattle - dw Route20EndBattleText2 ; TextEndBattle - dw Route20EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_1, 4, Route20BattleText2, Route20EndBattleText2, Route20AfterBattleText2 Route20TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 - dw Route20BattleText3 ; TextBeforeBattle - dw Route20AfterBattleText3 ; TextAfterBattle - dw Route20EndBattleText3 ; TextEndBattle - dw Route20EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_2, 2, Route20BattleText3, Route20EndBattleText3, Route20AfterBattleText3 Route20TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 - dw Route20BattleText4 ; TextBeforeBattle - dw Route20AfterBattleText4 ; TextAfterBattle - dw Route20EndBattleText4 ; TextEndBattle - dw Route20EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_3, 4, Route20BattleText4, Route20EndBattleText4, Route20AfterBattleText4 Route20TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 - dw Route20BattleText5 ; TextBeforeBattle - dw Route20AfterBattleText5 ; TextAfterBattle - dw Route20EndBattleText5 ; TextEndBattle - dw Route20EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_4, 3, Route20BattleText5, Route20EndBattleText5, Route20AfterBattleText5 Route20TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 - dw Route20BattleText6 ; TextBeforeBattle - dw Route20AfterBattleText6 ; TextAfterBattle - dw Route20EndBattleText6 ; TextEndBattle - dw Route20EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_5, 4, Route20BattleText6, Route20EndBattleText6, Route20AfterBattleText6 Route20TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 - dw Route20BattleText7 ; TextBeforeBattle - dw Route20AfterBattleText7 ; TextAfterBattle - dw Route20EndBattleText7 ; TextEndBattle - dw Route20EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20BattleText7, Route20EndBattleText7, Route20AfterBattleText7 Route20TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1 - dw Route20BattleText8 ; TextBeforeBattle - dw Route20AfterBattleText8 ; TextAfterBattle - dw Route20EndBattleText8 ; TextEndBattle - dw Route20EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 1, 4, Route20BattleText8, Route20EndBattleText8, Route20AfterBattleText8 Route20TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 - dw Route20BattleText9 ; TextBeforeBattle - dw Route20AfterBattleText9 ; TextAfterBattle - dw Route20EndBattleText9 ; TextEndBattle - dw Route20EndBattleText9 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 1, 3, Route20BattleText9, Route20EndBattleText9, Route20AfterBattleText9 Route20TrainerHeader9: - dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 - dw Route20BattleText10 ; TextBeforeBattle - dw Route20AfterBattleText10 ; TextAfterBattle - dw Route20EndBattleText10 ; TextEndBattle - dw Route20EndBattleText10 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 1, 4, Route20BattleText10, Route20EndBattleText10, Route20AfterBattleText10 + db -1 ; end Route20Text1: - TX_ASM + text_asm ld hl, Route20TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route20Text2: - TX_ASM + text_asm ld hl, Route20TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route20Text3: - TX_ASM + text_asm ld hl, Route20TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route20Text4: - TX_ASM + text_asm ld hl, Route20TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route20Text5: - TX_ASM + text_asm ld hl, Route20TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route20Text6: - TX_ASM + text_asm ld hl, Route20TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route20Text7: - TX_ASM + text_asm ld hl, Route20TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route20Text8: - TX_ASM + text_asm ld hl, Route20TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route20Text9: - TX_ASM + text_asm ld hl, Route20TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route20Text10: - TX_ASM + text_asm ld hl, Route20TrainerHeader9 call TalkToTrainer jp TextScriptEnd Route20BattleText1: - TX_FAR _Route20BattleText1 - db "@" + text_far _Route20BattleText1 + text_end Route20EndBattleText1: - TX_FAR _Route20EndBattleText1 - db "@" + text_far _Route20EndBattleText1 + text_end Route20AfterBattleText1: - TX_FAR _Route20AfterBattleText1 - db "@" + text_far _Route20AfterBattleText1 + text_end Route20BattleText2: - TX_FAR _Route20BattleText2 - db "@" + text_far _Route20BattleText2 + text_end Route20EndBattleText2: - TX_FAR _Route20EndBattleText2 - db "@" + text_far _Route20EndBattleText2 + text_end Route20AfterBattleText2: - TX_FAR _Route20AfterBattleText2 - db "@" + text_far _Route20AfterBattleText2 + text_end Route20BattleText3: - TX_FAR _Route20BattleText3 - db "@" + text_far _Route20BattleText3 + text_end Route20EndBattleText3: - TX_FAR _Route20EndBattleText3 - db "@" + text_far _Route20EndBattleText3 + text_end Route20AfterBattleText3: - TX_FAR _Route20AfterBattleText3 - db "@" + text_far _Route20AfterBattleText3 + text_end Route20BattleText4: - TX_FAR _Route20BattleText4 - db "@" + text_far _Route20BattleText4 + text_end Route20EndBattleText4: - TX_FAR _Route20EndBattleText4 - db "@" + text_far _Route20EndBattleText4 + text_end Route20AfterBattleText4: - TX_FAR _Route20AfterBattleText4 - db "@" + text_far _Route20AfterBattleText4 + text_end Route20BattleText5: - TX_FAR _Route20BattleText5 - db "@" + text_far _Route20BattleText5 + text_end Route20EndBattleText5: - TX_FAR _Route20EndBattleText5 - db "@" + text_far _Route20EndBattleText5 + text_end Route20AfterBattleText5: - TX_FAR _Route20AfterBattleText5 - db "@" + text_far _Route20AfterBattleText5 + text_end Route20BattleText6: - TX_FAR _Route20BattleText6 - db "@" + text_far _Route20BattleText6 + text_end Route20EndBattleText6: - TX_FAR _Route20EndBattleText6 - db "@" + text_far _Route20EndBattleText6 + text_end Route20AfterBattleText6: - TX_FAR _Route20AfterBattleText6 - db "@" + text_far _Route20AfterBattleText6 + text_end Route20BattleText7: - TX_FAR _Route20BattleText7 - db "@" + text_far _Route20BattleText7 + text_end Route20EndBattleText7: - TX_FAR _Route20EndBattleText7 - db "@" + text_far _Route20EndBattleText7 + text_end Route20AfterBattleText7: - TX_FAR _Route20AfterBattleText7 - db "@" + text_far _Route20AfterBattleText7 + text_end Route20BattleText8: - TX_FAR _Route20BattleText8 - db "@" + text_far _Route20BattleText8 + text_end Route20EndBattleText8: - TX_FAR _Route20EndBattleText8 - db "@" + text_far _Route20EndBattleText8 + text_end Route20AfterBattleText8: - TX_FAR _Route20AfterBattleText8 - db "@" + text_far _Route20AfterBattleText8 + text_end Route20BattleText9: - TX_FAR _Route20BattleText9 - db "@" + text_far _Route20BattleText9 + text_end Route20EndBattleText9: - TX_FAR _Route20EndBattleText9 - db "@" + text_far _Route20EndBattleText9 + text_end Route20AfterBattleText9: - TX_FAR _Route20AfterBattleText9 - db "@" + text_far _Route20AfterBattleText9 + text_end Route20BattleText10: - TX_FAR _Route20BattleText10 - db "@" + text_far _Route20BattleText10 + text_end Route20EndBattleText10: - TX_FAR _Route20EndBattleText10 - db "@" + text_far _Route20EndBattleText10 + text_end Route20AfterBattleText10: - TX_FAR _Route20AfterBattleText10 - db "@" + text_far _Route20AfterBattleText10 + text_end Route20Text12: Route20Text11: - TX_FAR _Route20Text11 - db "@" + text_far _Route20Text11 + text_end diff --git a/scripts/Route21.asm b/scripts/Route21.asm old mode 100755 new mode 100644 index 15dacd5d..7afe350f --- a/scripts/Route21.asm +++ b/scripts/Route21.asm @@ -24,246 +24,183 @@ Route21_TextPointers: dw Route21Text9 Route21TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0 - dw Route21BattleText1 ; TextBeforeBattle - dw Route21AfterBattleText1 ; TextAfterBattle - dw Route21EndBattleText1 ; TextEndBattle - dw Route21EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21BattleText1, Route21EndBattleText1, Route21AfterBattleText1 Route21TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1 - dw Route21BattleText2 ; TextBeforeBattle - dw Route21AfterBattleText2 ; TextAfterBattle - dw Route21EndBattleText2 ; TextEndBattle - dw Route21EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_1, 0, Route21BattleText2, Route21EndBattleText2, Route21AfterBattleText2 Route21TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2 - dw Route21BattleText3 ; TextBeforeBattle - dw Route21AfterBattleText3 ; TextAfterBattle - dw Route21EndBattleText3 ; TextEndBattle - dw Route21EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_2, 4, Route21BattleText3, Route21EndBattleText3, Route21AfterBattleText3 Route21TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3 - dw Route21BattleText4 ; TextBeforeBattle - dw Route21AfterBattleText4 ; TextAfterBattle - dw Route21EndBattleText4 ; TextEndBattle - dw Route21EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_3, 4, Route21BattleText4, Route21EndBattleText4, Route21AfterBattleText4 Route21TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4 - dw Route21BattleText5 ; TextBeforeBattle - dw Route21AfterBattleText5 ; TextAfterBattle - dw Route21EndBattleText5 ; TextEndBattle - dw Route21EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_4, 4, Route21BattleText5, Route21EndBattleText5, Route21AfterBattleText5 Route21TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5 - dw Route21BattleText6 ; TextBeforeBattle - dw Route21AfterBattleText6 ; TextAfterBattle - dw Route21EndBattleText6 ; TextEndBattle - dw Route21EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_5, 4, Route21BattleText6, Route21EndBattleText6, Route21AfterBattleText6 Route21TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6 - dw Route21BattleText7 ; TextBeforeBattle - dw Route21AfterBattleText7 ; TextAfterBattle - dw Route21EndBattleText7 ; TextEndBattle - dw Route21EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21BattleText7, Route21EndBattleText7, Route21AfterBattleText7 Route21TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1 - dw Route21BattleText8 ; TextBeforeBattle - dw Route21AfterBattleText8 ; TextAfterBattle - dw Route21EndBattleText8 ; TextEndBattle - dw Route21EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 1, 0, Route21BattleText8, Route21EndBattleText8, Route21AfterBattleText8 Route21TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1 - dw Route21BattleText9 ; TextBeforeBattle - dw Route21AfterBattleText9 ; TextAfterBattle - dw Route21EndBattleText9 ; TextEndBattle - dw Route21EndBattleText9 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 1, 0, Route21BattleText9, Route21EndBattleText9, Route21AfterBattleText9 + db -1 ; end Route21Text1: - TX_ASM + text_asm ld hl, Route21TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route21Text2: - TX_ASM + text_asm ld hl, Route21TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route21Text3: - TX_ASM + text_asm ld hl, Route21TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route21Text4: - TX_ASM + text_asm ld hl, Route21TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route21Text5: - TX_ASM + text_asm ld hl, Route21TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route21Text6: - TX_ASM + text_asm ld hl, Route21TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route21Text7: - TX_ASM + text_asm ld hl, Route21TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route21Text8: - TX_ASM + text_asm ld hl, Route21TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route21Text9: - TX_ASM + text_asm ld hl, Route21TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route21BattleText1: - TX_FAR _Route21BattleText1 - db "@" + text_far _Route21BattleText1 + text_end Route21EndBattleText1: - TX_FAR _Route21EndBattleText1 - db "@" + text_far _Route21EndBattleText1 + text_end Route21AfterBattleText1: - TX_FAR _Route21AfterBattleText1 - db "@" + text_far _Route21AfterBattleText1 + text_end Route21BattleText2: - TX_FAR _Route21BattleText2 - db "@" + text_far _Route21BattleText2 + text_end Route21EndBattleText2: - TX_FAR _Route21EndBattleText2 - db "@" + text_far _Route21EndBattleText2 + text_end Route21AfterBattleText2: - TX_FAR _Route21AfterBattleText2 - db "@" + text_far _Route21AfterBattleText2 + text_end Route21BattleText3: - TX_FAR _Route21BattleText3 - db "@" + text_far _Route21BattleText3 + text_end Route21EndBattleText3: - TX_FAR _Route21EndBattleText3 - db "@" + text_far _Route21EndBattleText3 + text_end Route21AfterBattleText3: - TX_FAR _Route21AfterBattleText3 - db "@" + text_far _Route21AfterBattleText3 + text_end Route21BattleText4: - TX_FAR _Route21BattleText4 - db "@" + text_far _Route21BattleText4 + text_end Route21EndBattleText4: - TX_FAR _Route21EndBattleText4 - db "@" + text_far _Route21EndBattleText4 + text_end Route21AfterBattleText4: - TX_FAR _Route21AfterBattleText4 - db "@" + text_far _Route21AfterBattleText4 + text_end Route21BattleText5: - TX_FAR _Route21BattleText5 - db "@" + text_far _Route21BattleText5 + text_end Route21EndBattleText5: - TX_FAR _Route21EndBattleText5 - db "@" + text_far _Route21EndBattleText5 + text_end Route21AfterBattleText5: - TX_FAR _Route21AfterBattleText5 - db "@" + text_far _Route21AfterBattleText5 + text_end Route21BattleText6: - TX_FAR _Route21BattleText6 - db "@" + text_far _Route21BattleText6 + text_end Route21EndBattleText6: - TX_FAR _Route21EndBattleText6 - db "@" + text_far _Route21EndBattleText6 + text_end Route21AfterBattleText6: - TX_FAR _Route21AfterBattleText6 - db "@" + text_far _Route21AfterBattleText6 + text_end Route21BattleText7: - TX_FAR _Route21BattleText7 - db "@" + text_far _Route21BattleText7 + text_end Route21EndBattleText7: - TX_FAR _Route21EndBattleText7 - db "@" + text_far _Route21EndBattleText7 + text_end Route21AfterBattleText7: - TX_FAR _Route21AfterBattleText7 - db "@" + text_far _Route21AfterBattleText7 + text_end Route21BattleText8: - TX_FAR _Route21BattleText8 - db "@" + text_far _Route21BattleText8 + text_end Route21EndBattleText8: - TX_FAR _Route21EndBattleText8 - db "@" + text_far _Route21EndBattleText8 + text_end Route21AfterBattleText8: - TX_FAR _Route21AfterBattleText8 - db "@" + text_far _Route21AfterBattleText8 + text_end Route21BattleText9: - TX_FAR _Route21BattleText9 - db "@" + text_far _Route21BattleText9 + text_end Route21EndBattleText9: - TX_FAR _Route21EndBattleText9 - db "@" + text_far _Route21EndBattleText9 + text_end Route21AfterBattleText9: - TX_FAR _Route21AfterBattleText9 - db "@" + text_far _Route21AfterBattleText9 + text_end diff --git a/scripts/Route22.asm b/scripts/Route22.asm old mode 100755 new mode 100644 index 180c5335..dfd2b2cb --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -44,7 +44,7 @@ Route22MoveRivalSprite: .asm_50ef1 call MoveSprite ld a, SPRITE_FACING_RIGHT - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay Route22RivalMovementData: @@ -52,7 +52,7 @@ Route22RivalMovementData: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end Route22Script0: CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE @@ -63,7 +63,7 @@ Route22Script0: ld a, [wCoordIndex] ld [wcf0d], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, PLAYER_DIR_LEFT @@ -75,9 +75,9 @@ Route22Script0: ret .Route22RivalBattleCoords - db $04, $1D - db $05, $1D - db $FF + dbmapcoord 29, 4 + dbmapcoord 29, 5 + db -1 ; end .firstRivalBattle ld a, $1 @@ -88,7 +88,7 @@ Route22Script0: ld a, [wWalkBikeSurfState] and a jr z, .asm_50f4e - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound .asm_50f4e @@ -96,7 +96,7 @@ Route22Script0: ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call Route22MoveRivalSprite ld a, $1 ld [wRoute22CurScript], a @@ -116,14 +116,14 @@ Route22Script1: .asm_50f78 ld a, SPRITE_FACING_RIGHT .asm_50f7a - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -131,7 +131,7 @@ Route22Script1: ld hl, Route22RivalDefeatedText1 ld de, Route22Text_511bc call SaveEndBattleTextPointers - ld a, OPP_SONY1 + ld a, OPP_RIVAL1 ld [wCurOpponent], a ld hl, StarterMons_50faf call Route22Script_50ed6 @@ -141,15 +141,15 @@ Route22Script1: StarterMons_50faf: ; starter the rival picked, rival trainer number - db STARTER2,$04 - db STARTER3,$05 - db STARTER1,$06 + db STARTER2, 4 + db STARTER3, 5 + db STARTER1, 6 Route22Script2: ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN jr nz, .notDown ld a, SPRITE_FACING_UP @@ -157,20 +157,20 @@ Route22Script2: .notDown ld a, SPRITE_FACING_RIGHT .done - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteFacingDirectionAndDelay ld a, $f0 ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, [wcf0d] cp $1 jr nz, .asm_50fff @@ -191,7 +191,7 @@ Route22Script_5100d: ld de, Route22RivalExitMovementData2 Route22MoveRival1: ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a jp MoveSprite Route22RivalExitMovementData1: @@ -202,7 +202,7 @@ Route22RivalExitMovementData1: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end Route22RivalExitMovementData2: db NPC_MOVEMENT_UP @@ -215,7 +215,7 @@ Route22RivalExitMovementData2: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end Route22Script3: ld a, [wd730] @@ -241,16 +241,16 @@ Route22Script_5104e: ld a, [wWalkBikeSurfState] and a jr z, .skipYVisibilityTesta - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound .skipYVisibilityTesta - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateTempo + farcall Music_RivalAlternateTempo ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call Route22MoveRivalSprite ld a, $4 ld [wRoute22CurScript], a @@ -261,7 +261,7 @@ Route22Script4: bit 0, a ret nz ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, [wcf0d] cp $1 jr nz, .asm_510a1 @@ -274,12 +274,12 @@ Route22Script4: ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_RIGHT .asm_510a8 - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -287,7 +287,7 @@ Route22Script4: ld hl, Route22RivalDefeatedText2 ld de, Route22Text_511d0 call SaveEndBattleTextPointers - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ld hl, StarterMons_510d9 call Route22Script_50ed6 @@ -296,16 +296,16 @@ Route22Script4: ret StarterMons_510d9: - db STARTER2,$0a - db STARTER3,$0b - db STARTER1,$0c + db STARTER2, 10 + db STARTER3, 11 + db STARTER1, 12 Route22Script5: ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, [wcf0d] cp $1 jr nz, .asm_510fb @@ -318,18 +318,18 @@ Route22Script5: ld [wPlayerMovingDirection], a ld a, SPRITE_FACING_RIGHT .asm_51102 - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $f0 ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStartAndTempo + farcall Music_RivalAlternateStartAndTempo ld a, [wcf0d] cp $1 jr nz, .asm_51134 @@ -350,17 +350,16 @@ Route22Script_51142: ld de, MovementData_5114d Route22MoveRival2: ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a jp MoveSprite MovementData_5114c: db NPC_MOVEMENT_LEFT - MovementData_5114d: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT - db $FF + db -1 ; end Route22Script6: ld a, [wd730] @@ -383,7 +382,7 @@ Route22_TextPointers: dw Route22FrontGateText Route22Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE jr z, .asm_5118b ld hl, Route22RivalAfterBattleText1 @@ -396,7 +395,7 @@ Route22Text1: jp TextScriptEnd Route22Text2: - TX_ASM + text_asm CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE jr z, .asm_511a4 ld hl, Route22RivalAfterBattleText2 @@ -409,37 +408,37 @@ Route22Text2: jp TextScriptEnd Route22RivalBeforeBattleText1: - TX_FAR _Route22RivalBeforeBattleText1 - db "@" + text_far _Route22RivalBeforeBattleText1 + text_end Route22RivalAfterBattleText1: - TX_FAR _Route22RivalAfterBattleText1 - db "@" + text_far _Route22RivalAfterBattleText1 + text_end Route22RivalDefeatedText1: - TX_FAR _Route22RivalDefeatedText1 - db "@" + text_far _Route22RivalDefeatedText1 + text_end Route22Text_511bc: - TX_FAR _Route22Text_511bc - db "@" + text_far _Route22Text_511bc + text_end Route22RivalBeforeBattleText2: - TX_FAR _Route22RivalBeforeBattleText2 - db "@" + text_far _Route22RivalBeforeBattleText2 + text_end Route22RivalAfterBattleText2: - TX_FAR _Route22RivalAfterBattleText2 - db "@" + text_far _Route22RivalAfterBattleText2 + text_end Route22RivalDefeatedText2: - TX_FAR _Route22RivalDefeatedText2 - db "@" + text_far _Route22RivalDefeatedText2 + text_end Route22Text_511d0: - TX_FAR _Route22Text_511d0 - db "@" + text_far _Route22Text_511d0 + text_end Route22FrontGateText: - TX_FAR _Route22FrontGateText - db "@" + text_far _Route22FrontGateText + text_end diff --git a/scripts/Route22Gate.asm b/scripts/Route22Gate.asm old mode 100755 new mode 100644 index 86b1220d..8a726515 --- a/scripts/Route22Gate.asm +++ b/scripts/Route22Gate.asm @@ -4,7 +4,7 @@ Route22Gate_Script: ld a, [wRoute22GateCurScript] call CallFunctionInTable ld a, [wYCoord] - cp $4 + cp 4 ld a, ROUTE_23 jr c, .asm_1e69a ld a, ROUTE_22 @@ -22,22 +22,22 @@ Route22GateScript0: call ArePlayerCoordsInArray ret nc xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID Route22GateScriptCoords: - db 2,4 - db 2,5 - db $ff + dbmapcoord 4, 2 + dbmapcoord 5, 2 + db -1 ; end Route22GateScript_1e6ba: ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a jp StartSimulatingJoypadStates @@ -57,9 +57,9 @@ Route22Gate_TextPointers: dw Route22GateText1 Route22GateText1: - TX_ASM + text_asm ld a, [wObtainedBadges] - bit 0, a + bit BIT_BOULDERBADGE, a jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 call PrintText @@ -75,8 +75,8 @@ Route22GateText1: jp TextScriptEnd Route22GateText_1e704: - TX_FAR _Route22GateText_1e704 - TX_ASM + text_far _Route22GateText_1e704 + text_asm ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish @@ -84,10 +84,10 @@ Route22GateText_1e704: ret Route22GateText_1e715: - TX_FAR _Route22GateText_1e715 - db "@" + text_far _Route22GateText_1e715 + text_end Route22GateText_1e71a: - TX_FAR _Route22GateText_1e71a - TX_SFX_ITEM_1 - db "@" + text_far _Route22GateText_1e71a + sound_get_item_1 + text_end diff --git a/scripts/Route23.asm b/scripts/Route23.asm old mode 100755 new mode 100644 index e91e2c98..e5318862 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm @@ -32,20 +32,20 @@ Route23Script0: EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK .asm_51224 ld a, [hli] - cp $ff + cp -1 ret z inc e dec c cp b jr nz, .asm_51224 - cp $23 + cp 35 jr nz, .asm_51237 ld a, [wXCoord] - cp $e + cp 14 ret nc .asm_51237 ld a, e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a ld a, c ld [wWhichBadge], a ld b, FLAG_TEST @@ -57,11 +57,18 @@ Route23Script0: call Route23Script_5125d call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ret YCoordsData_51255: - db $23,$38,$55,$60,$69,$77,$88,$FF + db 35 + db 56 + db 85 + db 96 + db 105 + db 119 + db 136 + db -1 ; end Route23Script_5125d: ld hl, BadgeTextPointers @@ -118,7 +125,7 @@ Route23Script_512d8: ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a xor a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a jp StartSimulatingJoypadStates @@ -142,43 +149,43 @@ Route23_TextPointers: dw Route23Text8 Route23Text1: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_EARTHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd Route23Text2: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_VOLCANOBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd Route23Text3: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_MARSHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd Route23Text4: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_SOULBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd Route23Text5: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_RAINBOWBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd Route23Text6: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_THUNDERBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd Route23Text7: - TX_ASM + text_asm EventFlagBit a, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd @@ -218,19 +225,19 @@ Route23Script_51388: jp PrintText VictoryRoadGuardText1: - TX_FAR _VictoryRoadGuardText1 - TX_ASM + text_far _VictoryRoadGuardText1 + text_asm ld a, SFX_DENIED call PlaySoundWaitForCurrent call WaitForSoundToFinish jp TextScriptEnd VictoryRoadGuardText2: - TX_FAR _VictoryRoadGuardText2 - TX_SFX_ITEM_1 - TX_FAR _VictoryRoadGuardText_513a3 - db "@" + text_far _VictoryRoadGuardText2 + sound_get_item_1 + text_far _VictoryRoadGuardText_513a3 + text_end Route23Text8: - TX_FAR _Route23Text8 - db "@" + text_far _Route23Text8 + text_end diff --git a/scripts/Route24.asm b/scripts/Route24.asm old mode 100755 new mode 100644 index a8e16e7d..aed112ac --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -28,9 +28,9 @@ Route24Script0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID CheckAndResetEvent EVENT_NUGGET_REWARD_AVAILABLE ret z @@ -45,7 +45,8 @@ Route24Script0: ret CoordsData_5140e: - db $0F,$0A,$FF + dbmapcoord 10, 15 + db -1 ; end Route24Script4: ld a, [wSimulatedJoypadStatesIndex] @@ -66,7 +67,7 @@ Route24Script3: ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROUTE24_ROCKET ld a, $1 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -86,71 +87,29 @@ Route24_TextPointers: dw PickUpItemText Route24TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_0 - dw Route24BattleText1 ; TextBeforeBattle - dw Route24AfterBattleText1 ; TextAfterBattle - dw Route24EndBattleText1 ; TextEndBattle - dw Route24EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_24_TRAINER_0, 4, Route24BattleText1, Route24EndBattleText1, Route24AfterBattleText1 Route24TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1 - dw Route24BattleText2 ; TextBeforeBattle - dw Route24AfterBattleText2 ; TextAfterBattle - dw Route24EndBattleText2 ; TextEndBattle - dw Route24EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_24_TRAINER_1, 1, Route24BattleText2, Route24EndBattleText2, Route24AfterBattleText2 Route24TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 - dw Route24BattleText3 ; TextBeforeBattle - dw Route24AfterBattleText3 ; TextAfterBattle - dw Route24EndBattleText3 ; TextEndBattle - dw Route24EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_24_TRAINER_2, 1, Route24BattleText3, Route24EndBattleText3, Route24AfterBattleText3 Route24TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 - dw Route24BattleText4 ; TextBeforeBattle - dw Route24AfterBattleText4 ; TextAfterBattle - dw Route24EndBattleText4 ; TextEndBattle - dw Route24EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_24_TRAINER_3, 1, Route24BattleText4, Route24EndBattleText4, Route24AfterBattleText4 Route24TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 - dw Route24BattleText5 ; TextBeforeBattle - dw Route24AfterBattleText5 ; TextAfterBattle - dw Route24EndBattleText5 ; TextEndBattle - dw Route24EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_24_TRAINER_4, 1, Route24BattleText5, Route24EndBattleText5, Route24AfterBattleText5 Route24TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 - dw Route24BattleText6 ; TextBeforeBattle - dw Route24AfterBattleText6 ; TextAfterBattle - dw Route24EndBattleText6 ; TextEndBattle - dw Route24EndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_24_TRAINER_5, 1, Route24BattleText6, Route24EndBattleText6, Route24AfterBattleText6 + db -1 ; end Route24Text1: - TX_ASM + text_asm ResetEvent EVENT_NUGGET_REWARD_AVAILABLE CheckEvent EVENT_GOT_NUGGET - jr nz, .asm_514f9 + jr nz, .got_item ld hl, Route24Text_51510 call PrintText lb bc, NUGGET, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full SetEvent EVENT_GOT_NUGGET ld hl, Route24Text_5151a call PrintText @@ -162,158 +121,158 @@ Route24Text1: ld hl, Route24Text_5152b ld de, Route24Text_5152b call SaveEndBattleTextPointers - ld a, [hSpriteIndexOrTextID] + ldh a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $3 ld [wRoute24CurScript], a ld [wCurMapScript], a jp TextScriptEnd -.asm_514f9 +.got_item ld hl, Route24Text_51530 call PrintText jp TextScriptEnd -.BagFull +.bag_full ld hl, Route24Text_51521 call PrintText SetEvent EVENT_NUGGET_REWARD_AVAILABLE jp TextScriptEnd Route24Text_51510: - TX_FAR _Route24Text_51510 - TX_SFX_ITEM_1 - TX_FAR _Route24Text_51515 - db "@" + text_far _Route24Text_51510 + sound_get_item_1 + text_far _Route24Text_51515 + text_end Route24Text_5151a: - TX_FAR _Route24Text_5151a - TX_SFX_ITEM_1 - TX_BLINK - db "@" + text_far _Route24Text_5151a + sound_get_item_1 + text_promptbutton + text_end Route24Text_51521: - TX_FAR _Route24Text_51521 - db "@" + text_far _Route24Text_51521 + text_end Route24Text_51526: - TX_FAR _Route24Text_51526 - db "@" + text_far _Route24Text_51526 + text_end Route24Text_5152b: - TX_FAR _Route24Text_5152b - db "@" + text_far _Route24Text_5152b + text_end Route24Text_51530: - TX_FAR _Route24Text_51530 - db "@" + text_far _Route24Text_51530 + text_end Route24Text2: - TX_ASM + text_asm ld hl, Route24TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route24Text3: - TX_ASM + text_asm ld hl, Route24TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route24Text4: - TX_ASM + text_asm ld hl, Route24TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route24Text5: - TX_ASM + text_asm ld hl, Route24TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route24Text6: - TX_ASM + text_asm ld hl, Route24TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route24Text7: - TX_ASM + text_asm ld hl, Route24TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route24BattleText1: - TX_FAR _Route24BattleText1 - db "@" + text_far _Route24BattleText1 + text_end Route24EndBattleText1: - TX_FAR _Route24EndBattleText1 - db "@" + text_far _Route24EndBattleText1 + text_end Route24AfterBattleText1: - TX_FAR _Route24AfterBattleText1 - db "@" + text_far _Route24AfterBattleText1 + text_end Route24BattleText2: - TX_FAR _Route24BattleText2 - db "@" + text_far _Route24BattleText2 + text_end Route24EndBattleText2: - TX_FAR _Route24EndBattleText2 - db "@" + text_far _Route24EndBattleText2 + text_end Route24AfterBattleText2: - TX_FAR _Route24AfterBattleText2 - db "@" + text_far _Route24AfterBattleText2 + text_end Route24BattleText3: - TX_FAR _Route24BattleText3 - db "@" + text_far _Route24BattleText3 + text_end Route24EndBattleText3: - TX_FAR _Route24EndBattleText3 - db "@" + text_far _Route24EndBattleText3 + text_end Route24AfterBattleText3: - TX_FAR _Route24AfterBattleText3 - db "@" + text_far _Route24AfterBattleText3 + text_end Route24BattleText4: - TX_FAR _Route24BattleText4 - db "@" + text_far _Route24BattleText4 + text_end Route24EndBattleText4: - TX_FAR _Route24EndBattleText4 - db "@" + text_far _Route24EndBattleText4 + text_end Route24AfterBattleText4: - TX_FAR _Route24AfterBattleText4 - db "@" + text_far _Route24AfterBattleText4 + text_end Route24BattleText5: - TX_FAR _Route24BattleText5 - db "@" + text_far _Route24BattleText5 + text_end Route24EndBattleText5: - TX_FAR _Route24EndBattleText5 - db "@" + text_far _Route24EndBattleText5 + text_end Route24AfterBattleText5: - TX_FAR _Route24AfterBattleText5 - db "@" + text_far _Route24AfterBattleText5 + text_end Route24BattleText6: - TX_FAR _Route24BattleText6 - db "@" + text_far _Route24BattleText6 + text_end Route24EndBattleText6: - TX_FAR _Route24EndBattleText6 - db "@" + text_far _Route24EndBattleText6 + text_end Route24AfterBattleText6: - TX_FAR _Route24AfterBattleText6 - db "@" + text_far _Route24AfterBattleText6 + text_end diff --git a/scripts/Route25.asm b/scripts/Route25.asm old mode 100755 new mode 100644 index 7166919d..fba28bc4 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm @@ -54,250 +54,187 @@ Route25_TextPointers: dw Route25Text11 Route25TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_0 - dw Route25BattleText1 ; TextBeforeBattle - dw Route25AfterBattleText1 ; TextAfterBattle - dw Route25EndBattleText1 ; TextEndBattle - dw Route25EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25BattleText1, Route25EndBattleText1, Route25AfterBattleText1 Route25TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1 - dw Route25BattleText2 ; TextBeforeBattle - dw Route25AfterBattleText2 ; TextAfterBattle - dw Route25EndBattleText2 ; TextEndBattle - dw Route25EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_1, 3, Route25BattleText2, Route25EndBattleText2, Route25AfterBattleText2 Route25TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 - dw Route25BattleText3 ; TextBeforeBattle - dw Route25AfterBattleText3 ; TextAfterBattle - dw Route25EndBattleText3 ; TextEndBattle - dw Route25EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_2, 3, Route25BattleText3, Route25EndBattleText3, Route25AfterBattleText3 Route25TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 - dw Route25BattleText4 ; TextBeforeBattle - dw Route25AfterBattleText4 ; TextAfterBattle - dw Route25EndBattleText4 ; TextEndBattle - dw Route25EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_3, 2, Route25BattleText4, Route25EndBattleText4, Route25AfterBattleText4 Route25TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 - dw Route25BattleText5 ; TextBeforeBattle - dw Route25AfterBattleText5 ; TextAfterBattle - dw Route25EndBattleText5 ; TextEndBattle - dw Route25EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_4, 4, Route25BattleText5, Route25EndBattleText5, Route25AfterBattleText5 Route25TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 - dw Route25BattleText6 ; TextBeforeBattle - dw Route25AfterBattleText6 ; TextAfterBattle - dw Route25EndBattleText6 ; TextEndBattle - dw Route25EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_5, 4, Route25BattleText6, Route25EndBattleText6, Route25AfterBattleText6 Route25TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 - dw Route25BattleText7 ; TextBeforeBattle - dw Route25AfterBattleText7 ; TextAfterBattle - dw Route25EndBattleText7 ; TextEndBattle - dw Route25EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25BattleText7, Route25EndBattleText7, Route25AfterBattleText7 Route25TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1 - dw Route25BattleText8 ; TextBeforeBattle - dw Route25AfterBattleText8 ; TextAfterBattle - dw Route25EndBattleText8 ; TextEndBattle - dw Route25EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 1, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8 Route25TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 - dw Route25BattleText9 ; TextBeforeBattle - dw Route25AfterBattleText9 ; TextAfterBattle - dw Route25EndBattleText9 ; TextEndBattle - dw Route25EndBattleText9 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 1, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9 + db -1 ; end Route25Text1: - TX_ASM + text_asm ld hl, Route25TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route25Text2: - TX_ASM + text_asm ld hl, Route25TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route25Text3: - TX_ASM + text_asm ld hl, Route25TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route25Text4: - TX_ASM + text_asm ld hl, Route25TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route25Text5: - TX_ASM + text_asm ld hl, Route25TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route25Text6: - TX_ASM + text_asm ld hl, Route25TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route25Text7: - TX_ASM + text_asm ld hl, Route25TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route25Text8: - TX_ASM + text_asm ld hl, Route25TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route25Text9: - TX_ASM + text_asm ld hl, Route25TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route25BattleText1: - TX_FAR _Route25BattleText1 - db "@" + text_far _Route25BattleText1 + text_end Route25EndBattleText1: - TX_FAR _Route25EndBattleText1 - db "@" + text_far _Route25EndBattleText1 + text_end Route25AfterBattleText1: - TX_FAR _Route25AfterBattleText1 - db "@" + text_far _Route25AfterBattleText1 + text_end Route25BattleText2: - TX_FAR _Route25BattleText2 - db "@" + text_far _Route25BattleText2 + text_end Route25EndBattleText2: - TX_FAR _Route25EndBattleText2 - db "@" + text_far _Route25EndBattleText2 + text_end Route25AfterBattleText2: - TX_FAR _Route25AfterBattleText2 - db "@" + text_far _Route25AfterBattleText2 + text_end Route25BattleText3: - TX_FAR _Route25BattleText3 - db "@" + text_far _Route25BattleText3 + text_end Route25EndBattleText3: - TX_FAR _Route25EndBattleText3 - db "@" + text_far _Route25EndBattleText3 + text_end Route25AfterBattleText3: - TX_FAR _Route25AfterBattleText3 - db "@" + text_far _Route25AfterBattleText3 + text_end Route25BattleText4: - TX_FAR _Route25BattleText4 - db "@" + text_far _Route25BattleText4 + text_end Route25EndBattleText4: - TX_FAR _Route25EndBattleText4 - db "@" + text_far _Route25EndBattleText4 + text_end Route25AfterBattleText4: - TX_FAR _Route25AfterBattleText4 - db "@" + text_far _Route25AfterBattleText4 + text_end Route25BattleText5: - TX_FAR _Route25BattleText5 - db "@" + text_far _Route25BattleText5 + text_end Route25EndBattleText5: - TX_FAR _Route25EndBattleText5 - db "@" + text_far _Route25EndBattleText5 + text_end Route25AfterBattleText5: - TX_FAR _Route25AfterBattleText5 - db "@" + text_far _Route25AfterBattleText5 + text_end Route25BattleText6: - TX_FAR _Route25BattleText6 - db "@" + text_far _Route25BattleText6 + text_end Route25EndBattleText6: - TX_FAR _Route25EndBattleText6 - db "@" + text_far _Route25EndBattleText6 + text_end Route25AfterBattleText6: - TX_FAR _Route25AfterBattleText6 - db "@" + text_far _Route25AfterBattleText6 + text_end Route25BattleText7: - TX_FAR _Route25BattleText7 - db "@" + text_far _Route25BattleText7 + text_end Route25EndBattleText7: - TX_FAR _Route25EndBattleText7 - db "@" + text_far _Route25EndBattleText7 + text_end Route25AfterBattleText7: - TX_FAR _Route25AfterBattleText7 - db "@" + text_far _Route25AfterBattleText7 + text_end Route25BattleText8: - TX_FAR _Route25BattleText8 - db "@" + text_far _Route25BattleText8 + text_end Route25EndBattleText8: - TX_FAR _Route25EndBattleText8 - db "@" + text_far _Route25EndBattleText8 + text_end Route25AfterBattleText8: - TX_FAR _Route25AfterBattleText8 - db "@" + text_far _Route25AfterBattleText8 + text_end Route25BattleText9: - TX_FAR _Route25BattleText9 - db "@" + text_far _Route25BattleText9 + text_end Route25EndBattleText9: - TX_FAR _Route25EndBattleText9 - db "@" + text_far _Route25EndBattleText9 + text_end Route25AfterBattleText9: - TX_FAR _Route25AfterBattleText9 - db "@" + text_far _Route25AfterBattleText9 + text_end Route25Text11: - TX_FAR _Route25Text11 - db "@" + text_far _Route25Text11 + text_end diff --git a/scripts/Route2Gate.asm b/scripts/Route2Gate.asm old mode 100755 new mode 100644 index 70d93814..60f6ffe1 --- a/scripts/Route2Gate.asm +++ b/scripts/Route2Gate.asm @@ -6,13 +6,13 @@ Route2Gate_TextPointers: dw Route2GateText2 Route2GateText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_HM05 - jr nz, .asm_5d60d - ld a, 10 ; pokemon needed - ld [hOaksAideRequirement], a - ld a, HM_05 ; oak's aide reward - ld [hOaksAideRewardItem], a + jr nz, .got_item + ld a, 10 + ldh [hOaksAideRequirement], a + ld a, HM_FLASH + ldh [hOaksAideRewardItem], a ld [wd11e], a call GetItemName ld hl, wcd6d @@ -20,20 +20,20 @@ Route2GateText1: ld bc, ITEM_NAME_LENGTH call CopyData predef OaksAideScript - ld a, [hOaksAideResult] - cp $1 - jr nz, .asm_5d613 + ldh a, [hOaksAideResult] + cp OAKS_AIDE_GOT_ITEM + jr nz, .no_item SetEvent EVENT_GOT_HM05 -.asm_5d60d +.got_item ld hl, Route2GateText_5d616 call PrintText -.asm_5d613 +.no_item jp TextScriptEnd Route2GateText_5d616: - TX_FAR _Route2GateText_5d616 - db "@" + text_far _Route2GateText_5d616 + text_end Route2GateText2: - TX_FAR _Route2GateText2 - db "@" + text_far _Route2GateText2 + text_end diff --git a/scripts/Route2TradeHouse.asm b/scripts/Route2TradeHouse.asm old mode 100755 new mode 100644 index a89e2fe9..85ed2d34 --- a/scripts/Route2TradeHouse.asm +++ b/scripts/Route2TradeHouse.asm @@ -6,12 +6,12 @@ Route2TradeHouse_TextPointers: dw Route2HouseText2 Route2HouseText1: - TX_FAR _Route2HouseText1 - db "@" + text_far _Route2HouseText1 + text_end Route2HouseText2: - TX_ASM - ld a, $1 + text_asm + ld a, TRADE_FOR_MARCEL ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/Route3.asm b/scripts/Route3.asm old mode 100755 new mode 100644 index d55831bf..74140b40 --- a/scripts/Route3.asm +++ b/scripts/Route3.asm @@ -25,227 +25,171 @@ Route3_TextPointers: dw Route3Text10 Route3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_0 - dw Route3BattleText1 ; TextBeforeBattle - dw Route3AfterBattleText1 ; TextAfterBattle - dw Route3EndBattleText1 ; TextEndBattle - dw Route3EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3BattleText1, Route3EndBattleText1, Route3AfterBattleText1 Route3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1 - dw Route3BattleText2 ; TextBeforeBattle - dw Route3AfterBattleText2 ; TextAfterBattle - dw Route3EndBattleText2 ; TextEndBattle - dw Route3EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_1, 3, Route3BattleText2, Route3EndBattleText2, Route3AfterBattleText2 Route3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 - dw Route3BattleText3 ; TextBeforeBattle - dw Route3AfterBattleText3 ; TextAfterBattle - dw Route3EndBattleText3 ; TextEndBattle - dw Route3EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_2, 2, Route3BattleText3, Route3EndBattleText3, Route3AfterBattleText3 Route3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 - dw Route3BattleText4 ; TextBeforeBattle - dw Route3AfterBattleText4 ; TextAfterBattle - dw Route3EndBattleText4 ; TextEndBattle - dw Route3EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_3, 1, Route3BattleText4, Route3EndBattleText4, Route3AfterBattleText4 Route3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 - dw Route3BattleText5 ; TextBeforeBattle - dw Route3AfterBattleText5 ; TextAfterBattle - dw Route3EndBattleText5 ; TextEndBattle - dw Route3EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_4, 4, Route3BattleText5, Route3EndBattleText5, Route3AfterBattleText5 Route3TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 - dw Route3BattleText6 ; TextBeforeBattle - dw Route3AfterBattleText6 ; TextAfterBattle - dw Route3EndBattleText6 ; TextEndBattle - dw Route3EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3BattleText6, Route3EndBattleText6, Route3AfterBattleText6 Route3TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1 - dw Route3BattleText7 ; TextBeforeBattle - dw Route3AfterBattleText7 ; TextAfterBattle - dw Route3EndBattleText7 ; TextEndBattle - dw Route3EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 1, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7 Route3TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 - dw Route3BattleText8 ; TextBeforeBattle - dw Route3AfterBattleText8 ; TextAfterBattle - dw Route3EndBattleText8 ; TextEndBattle - dw Route3EndBattleText8 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 1, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8 + db -1 ; end Route3Text1: - TX_FAR _Route3Text1 - db "@" + text_far _Route3Text1 + text_end Route3Text2: - TX_ASM + text_asm ld hl, Route3TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route3BattleText1: - TX_FAR _Route3BattleText1 - db "@" + text_far _Route3BattleText1 + text_end Route3EndBattleText1: - TX_FAR _Route3EndBattleText1 - db "@" + text_far _Route3EndBattleText1 + text_end Route3AfterBattleText1: - TX_FAR _Route3AfterBattleText1 - db "@" + text_far _Route3AfterBattleText1 + text_end Route3Text3: - TX_ASM + text_asm ld hl, Route3TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route3BattleText2: - TX_FAR _Route3BattleText2 - db "@" + text_far _Route3BattleText2 + text_end Route3EndBattleText2: - TX_FAR _Route3EndBattleText2 - db "@" + text_far _Route3EndBattleText2 + text_end Route3AfterBattleText2: - TX_FAR _Route3AfterBattleText2 - db "@" + text_far _Route3AfterBattleText2 + text_end Route3Text4: - TX_ASM + text_asm ld hl, Route3TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route3BattleText3: - TX_FAR _Route3BattleText3 - db "@" + text_far _Route3BattleText3 + text_end Route3EndBattleText3: - TX_FAR _Route3EndBattleText3 - db "@" + text_far _Route3EndBattleText3 + text_end Route3AfterBattleText3: - TX_FAR _Route3AfterBattleText3 - db "@" + text_far _Route3AfterBattleText3 + text_end Route3Text5: - TX_ASM + text_asm ld hl, Route3TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route3BattleText4: - TX_FAR _Route3BattleText4 - db "@" + text_far _Route3BattleText4 + text_end Route3EndBattleText4: - TX_FAR _Route3EndBattleText4 - db "@" + text_far _Route3EndBattleText4 + text_end Route3AfterBattleText4: - TX_FAR _Route3AfterBattleText4 - db "@" + text_far _Route3AfterBattleText4 + text_end Route3Text6: - TX_ASM + text_asm ld hl, Route3TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route3BattleText5: - TX_FAR _Route3BattleText5 - db "@" + text_far _Route3BattleText5 + text_end Route3EndBattleText5: - TX_FAR _Route3EndBattleText5 - db "@" + text_far _Route3EndBattleText5 + text_end Route3AfterBattleText5: - TX_FAR _Route3AfterBattleText5 - db "@" + text_far _Route3AfterBattleText5 + text_end Route3Text7: - TX_ASM + text_asm ld hl, Route3TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route3BattleText6: - TX_FAR _Route3BattleText6 - db "@" + text_far _Route3BattleText6 + text_end Route3EndBattleText6: - TX_FAR _Route3EndBattleText6 - db "@" + text_far _Route3EndBattleText6 + text_end Route3AfterBattleText6: - TX_FAR _Route3AfterBattleText6 - db "@" + text_far _Route3AfterBattleText6 + text_end Route3Text8: - TX_ASM + text_asm ld hl, Route3TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route3BattleText7: - TX_FAR _Route3BattleText7 - db "@" + text_far _Route3BattleText7 + text_end Route3EndBattleText7: - TX_FAR _Route3EndBattleText7 - db "@" + text_far _Route3EndBattleText7 + text_end Route3AfterBattleText7: - TX_FAR _Route3AfterBattleText7 - db "@" + text_far _Route3AfterBattleText7 + text_end Route3Text9: - TX_ASM + text_asm ld hl, Route3TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route3BattleText8: - TX_FAR _Route3BattleText8 - db "@" + text_far _Route3BattleText8 + text_end Route3EndBattleText8: - TX_FAR _Route3EndBattleText8 - db "@" + text_far _Route3EndBattleText8 + text_end Route3AfterBattleText8: - TX_FAR _Route3AfterBattleText8 - db "@" + text_far _Route3AfterBattleText8 + text_end Route3Text10: - TX_FAR _Route3Text10 - db "@" + text_far _Route3Text10 + text_end diff --git a/scripts/Route4.asm b/scripts/Route4.asm old mode 100755 new mode 100644 index 9b04a47a..b69a88c7 --- a/scripts/Route4.asm +++ b/scripts/Route4.asm @@ -21,42 +21,35 @@ Route4_TextPointers: dw Route4Text6 Route4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_4_TRAINER_0 - dw Route4BattleText1 ; TextBeforeBattle - dw Route4AfterBattleText1 ; TextAfterBattle - dw Route4EndBattleText1 ; TextEndBattle - dw Route4EndBattleText1 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_4_TRAINER_0, 3, Route4BattleText1, Route4EndBattleText1, Route4AfterBattleText1 + db -1 ; end Route4Text1: - TX_FAR _Route4Text1 - db "@" + text_far _Route4Text1 + text_end Route4Text2: - TX_ASM + text_asm ld hl, Route4TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route4BattleText1: - TX_FAR _Route4BattleText1 - db "@" + text_far _Route4BattleText1 + text_end Route4EndBattleText1: - TX_FAR _Route4EndBattleText1 - db "@" + text_far _Route4EndBattleText1 + text_end Route4AfterBattleText1: - TX_FAR _Route4AfterBattleText1 - db "@" + text_far _Route4AfterBattleText1 + text_end Route4Text5: - TX_FAR _Route4Text5 - db "@" + text_far _Route4Text5 + text_end Route4Text6: - TX_FAR _Route4Text6 - db "@" + text_far _Route4Text6 + text_end diff --git a/scripts/Route5.asm b/scripts/Route5.asm old mode 100755 new mode 100644 index 1b2bd242..33f3c345 --- a/scripts/Route5.asm +++ b/scripts/Route5.asm @@ -5,5 +5,5 @@ Route5_TextPointers: dw Route5Text1 Route5Text1: - TX_FAR _Route5Text1 - db "@" + text_far _Route5Text1 + text_end diff --git a/scripts/Route5Gate.asm b/scripts/Route5Gate.asm old mode 100755 new mode 100644 index bc763dfd..e155694a --- a/scripts/Route5Gate.asm +++ b/scripts/Route5Gate.asm @@ -25,13 +25,13 @@ Route5GateScript0: ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] + ldh [hJoyHeld], a + farcall RemoveGuardDrink + ldh a, [hItemToRemoveID] and a jr nz, .asm_1df82 ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Route5GateScript_1df43 ld a, $1 @@ -39,16 +39,16 @@ Route5GateScript0: ret .asm_1df82 ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] ret CoordsData_1df8f: - db 3,3 - db 3,4 - db $ff + dbmapcoord 3, 3 + dbmapcoord 4, 3 + db -1 ; end Route5GateScript1: ld a, [wSimulatedJoypadStatesIndex] @@ -69,12 +69,12 @@ Route8GateText1: Route7GateText1: Route6GateText1: Route5GateText1: - TX_ASM + text_asm ld a, [wd728] bit 6, a jr nz, .asm_88856 - callba RemoveGuardDrink - ld a, [$ffdb] + farcall RemoveGuardDrink + ldh a, [hItemToRemoveID] and a jr nz, .asm_768a2 ld hl, Route5GateText2 @@ -98,20 +98,20 @@ Route8GateText2: Route7GateText2: Route6GateText2: Route5GateText2: - TX_FAR _SaffronGateText_1dfe7 - db "@" + text_far _SaffronGateText_1dfe7 + text_end Route8GateText3: Route7GateText3: Route6GateText3: Route5GateText3: - TX_FAR _SaffronGateText_8aaa9 - TX_SFX_KEY_ITEM - TX_FAR _SaffronGateText_1dff1 - db "@" + text_far _SaffronGateText_8aaa9 + sound_get_key_item + text_far _SaffronGateText_1dff1 + text_end SaffronGateText_1dff6: - TX_FAR _SaffronGateText_1dff6 - db "@" + text_far _SaffronGateText_1dff6 + text_end diff --git a/scripts/Route6.asm b/scripts/Route6.asm old mode 100755 new mode 100644 index 9f43b800..36883e09 --- a/scripts/Route6.asm +++ b/scripts/Route6.asm @@ -22,165 +22,123 @@ Route6_TextPointers: dw Route6Text7 Route6TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_0 - dw Route6BattleText1 ; TextBeforeBattle - dw Route6AfterBattleText1 ; TextAfterBattle - dw Route6EndBattleText1 ; TextEndBattle - dw Route6EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_6_TRAINER_0, 0, Route6BattleText1, Route6EndBattleText1, Route6AfterBattleText1 Route6TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_1 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1 - dw Route6BattleText2 ; TextBeforeBattle - dw Route6AfterBattleText1 ; TextAfterBattle - dw Route6EndBattleText2 ; TextEndBattle - dw Route6EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_6_TRAINER_1, 0, Route6BattleText2, Route6EndBattleText2, Route6AfterBattleText1 Route6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_2 - dw Route6BattleText3 ; TextBeforeBattle - dw Route6AfterBattleText3 ; TextAfterBattle - dw Route6EndBattleText3 ; TextEndBattle - dw Route6EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_6_TRAINER_2, 4, Route6BattleText3, Route6EndBattleText3, Route6AfterBattleText3 Route6TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_3 - dw Route6BattleText4 ; TextBeforeBattle - dw Route6AfterBattleText4 ; TextAfterBattle - dw Route6EndBattleText4 ; TextEndBattle - dw Route6EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_6_TRAINER_3, 3, Route6BattleText4, Route6EndBattleText4, Route6AfterBattleText4 Route6TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_4 - dw Route6BattleText5 ; TextBeforeBattle - dw Route6AfterBattleText5 ; TextAfterBattle - dw Route6EndBattleText5 ; TextEndBattle - dw Route6EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_6_TRAINER_4, 3, Route6BattleText5, Route6EndBattleText5, Route6AfterBattleText5 Route6TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_5 - dw Route6BattleText6 ; TextBeforeBattle - dw Route6AfterBattleText6 ; TextAfterBattle - dw Route6EndBattleText6 ; TextEndBattle - dw Route6EndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_6_TRAINER_5, 3, Route6BattleText6, Route6EndBattleText6, Route6AfterBattleText6 + db -1 ; end Route6Text1: - TX_ASM + text_asm ld hl, Route6TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route6BattleText1: - TX_FAR _Route6BattleText1 - db "@" + text_far _Route6BattleText1 + text_end Route6EndBattleText1: - TX_FAR _Route6EndBattleText1 - db "@" + text_far _Route6EndBattleText1 + text_end Route6AfterBattleText1: - TX_FAR _Route6AfterBattleText1 - db "@" + text_far _Route6AfterBattleText1 + text_end Route6Text2: - TX_ASM + text_asm ld hl, Route6TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route6BattleText2: - TX_FAR _Route6BattleText2 - db "@" + text_far _Route6BattleText2 + text_end Route6EndBattleText2: - TX_FAR _Route6EndBattleText2 - db "@" + text_far _Route6EndBattleText2 + text_end Route6Text3: - TX_ASM + text_asm ld hl, Route6TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route6BattleText3: - TX_FAR _Route6BattleText3 - db "@" + text_far _Route6BattleText3 + text_end Route6EndBattleText3: - TX_FAR _Route6EndBattleText3 - db "@" + text_far _Route6EndBattleText3 + text_end Route6AfterBattleText3: - TX_FAR _Route6AfterBattleText3 - db "@" + text_far _Route6AfterBattleText3 + text_end Route6Text4: - TX_ASM + text_asm ld hl, Route6TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route6BattleText4: - TX_FAR _Route6BattleText4 - db "@" + text_far _Route6BattleText4 + text_end Route6EndBattleText4: - TX_FAR _Route6EndBattleText4 - db "@" + text_far _Route6EndBattleText4 + text_end Route6AfterBattleText4: - TX_FAR _Route6AfterBattleText4 - db "@" + text_far _Route6AfterBattleText4 + text_end Route6Text5: - TX_ASM + text_asm ld hl, Route6TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route6BattleText5: - TX_FAR _Route6BattleText5 - db "@" + text_far _Route6BattleText5 + text_end Route6EndBattleText5: - TX_FAR _Route6EndBattleText5 - db "@" + text_far _Route6EndBattleText5 + text_end Route6AfterBattleText5: - TX_FAR _Route6AfterBattleText5 - db "@" + text_far _Route6AfterBattleText5 + text_end Route6Text6: - TX_ASM + text_asm ld hl, Route6TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route6BattleText6: - TX_FAR _Route6BattleText6 - db "@" + text_far _Route6BattleText6 + text_end Route6EndBattleText6: - TX_FAR _Route6EndBattleText6 - db "@" + text_far _Route6EndBattleText6 + text_end Route6AfterBattleText6: - TX_FAR _Route6AfterBattleText6 - db "@" + text_far _Route6AfterBattleText6 + text_end Route6Text7: - TX_FAR _Route6Text7 - db "@" + text_far _Route6Text7 + text_end diff --git a/scripts/Route6Gate.asm b/scripts/Route6Gate.asm old mode 100755 new mode 100644 index 348f61ac..143f60ae --- a/scripts/Route6Gate.asm +++ b/scripts/Route6Gate.asm @@ -19,13 +19,13 @@ Route6GateScript0: ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] + ldh [hJoyHeld], a + farcall RemoveGuardDrink + ldh a, [hItemToRemoveID] and a jr nz, .asm_1e080 ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Route6GateScript_1e0a1 ld a, $1 @@ -35,12 +35,13 @@ Route6GateScript0: ld hl, wd728 set 6, [hl] ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e08c: - db $02,$03 - db $02,$04,$FF + dbmapcoord 3, 2 + dbmapcoord 4, 2 + db -1 ; end Route6GateScript1: ld a, [wSimulatedJoypadStatesIndex] @@ -60,7 +61,7 @@ Route6GateScript_1e0a1: ld a, $1 ld [wSimulatedJoypadStatesIndex], a xor a - ld [wSpriteStateData2 + $06], a + ld [wSpritePlayerStateData2MovementByte1], a ld [wOverrideSimulatedJoypadStatesMask], a ret diff --git a/scripts/Route7.asm b/scripts/Route7.asm old mode 100755 new mode 100644 index 55774553..1fd38abb --- a/scripts/Route7.asm +++ b/scripts/Route7.asm @@ -5,5 +5,5 @@ Route7_TextPointers: dw Route7Text1 Route7Text1: - TX_FAR _Route7Text1 - db "@" + text_far _Route7Text1 + text_end diff --git a/scripts/Route7Gate.asm b/scripts/Route7Gate.asm old mode 100755 new mode 100644 index 724172c5..9a647965 --- a/scripts/Route7Gate.asm +++ b/scripts/Route7Gate.asm @@ -17,7 +17,7 @@ Route7GateScript_1e111: ld a, $1 ld [wSimulatedJoypadStatesIndex], a xor a - ld [wSpriteStateData2 + $06], a + ld [wSpritePlayerStateData2MovementByte1], a ld [wOverrideSimulatedJoypadStatesMask], a ret @@ -31,13 +31,13 @@ Route7GateScript0: ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] + ldh [hJoyHeld], a + farcall RemoveGuardDrink + ldh a, [hItemToRemoveID] and a jr nz, .asm_1e15a ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Route7GateScript_1e111 ld a, $1 @@ -45,16 +45,16 @@ Route7GateScript0: ret .asm_1e15a ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] ret CoordsData_1e167: - db 3,3 - db 4,3 - db $ff + dbmapcoord 3, 3 + dbmapcoord 3, 4 + db -1 ; end Route7GateScript1: ld a, [wSimulatedJoypadStatesIndex] diff --git a/scripts/Route8.asm b/scripts/Route8.asm old mode 100755 new mode 100644 index f3388505..f50167c0 --- a/scripts/Route8.asm +++ b/scripts/Route8.asm @@ -25,250 +25,187 @@ Route8_TextPointers: dw Route8Text10 Route8TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_0 - dw Route8BattleText1 ; TextBeforeBattle - dw Route8AfterBattleText1 ; TextAfterBattle - dw Route8EndBattleText1 ; TextEndBattle - dw Route8EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_0, 4, Route8BattleText1, Route8EndBattleText1, Route8AfterBattleText1 Route8TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_1 - dw Route8BattleText2 ; TextBeforeBattle - dw Route8AfterBattleText2 ; TextAfterBattle - dw Route8EndBattleText2 ; TextEndBattle - dw Route8EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_1, 4, Route8BattleText2, Route8EndBattleText2, Route8AfterBattleText2 Route8TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_2 - dw Route8BattleText3 ; TextBeforeBattle - dw Route8AfterBattleText3 ; TextAfterBattle - dw Route8EndBattleText3 ; TextEndBattle - dw Route8EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8BattleText3, Route8EndBattleText3, Route8AfterBattleText3 Route8TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_3 - dw Route8BattleText4 ; TextBeforeBattle - dw Route8AfterBattleText4 ; TextAfterBattle - dw Route8EndBattleText4 ; TextEndBattle - dw Route8EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8BattleText4, Route8EndBattleText4, Route8AfterBattleText4 Route8TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_4 - dw Route8BattleText5 ; TextBeforeBattle - dw Route8AfterBattleText5 ; TextAfterBattle - dw Route8EndBattleText5 ; TextEndBattle - dw Route8EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8BattleText5, Route8EndBattleText5, Route8AfterBattleText5 Route8TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_5 - dw Route8BattleText6 ; TextBeforeBattle - dw Route8AfterBattleText6 ; TextAfterBattle - dw Route8EndBattleText6 ; TextEndBattle - dw Route8EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_5, 3, Route8BattleText6, Route8EndBattleText6, Route8AfterBattleText6 Route8TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_6 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_6 - dw Route8BattleText7 ; TextBeforeBattle - dw Route8AfterBattleText7 ; TextAfterBattle - dw Route8EndBattleText7 ; TextEndBattle - dw Route8EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_6, 2, Route8BattleText7, Route8EndBattleText7, Route8AfterBattleText7 Route8TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_7, 1 - dw Route8BattleText8 ; TextBeforeBattle - dw Route8AfterBattleText8 ; TextAfterBattle - dw Route8EndBattleText8 ; TextEndBattle - dw Route8EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 1, 2, Route8BattleText8, Route8EndBattleText8, Route8AfterBattleText8 Route8TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_8, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1 - dw Route8BattleText9 ; TextBeforeBattle - dw Route8AfterBattleText9 ; TextAfterBattle - dw Route8EndBattleText9 ; TextEndBattle - dw Route8EndBattleText9 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 1, 4, Route8BattleText9, Route8EndBattleText9, Route8AfterBattleText9 + db -1 ; end Route8Text1: - TX_ASM + text_asm ld hl, Route8TrainerHeader0 call TalkToTrainer jp TextScriptEnd Route8BattleText1: - TX_FAR _Route8BattleText1 - db "@" + text_far _Route8BattleText1 + text_end Route8EndBattleText1: - TX_FAR _Route8EndBattleText1 - db "@" + text_far _Route8EndBattleText1 + text_end Route8AfterBattleText1: - TX_FAR _Route8AfterBattleText1 - db "@" + text_far _Route8AfterBattleText1 + text_end Route8Text2: - TX_ASM + text_asm ld hl, Route8TrainerHeader1 call TalkToTrainer jp TextScriptEnd Route8BattleText2: - TX_FAR _Route8BattleText2 - db "@" + text_far _Route8BattleText2 + text_end Route8EndBattleText2: - TX_FAR _Route8EndBattleText2 - db "@" + text_far _Route8EndBattleText2 + text_end Route8AfterBattleText2: - TX_FAR _Route8AfterBattleText2 - db "@" + text_far _Route8AfterBattleText2 + text_end Route8Text3: - TX_ASM + text_asm ld hl, Route8TrainerHeader2 call TalkToTrainer jp TextScriptEnd Route8BattleText3: - TX_FAR _Route8BattleText3 - db "@" + text_far _Route8BattleText3 + text_end Route8EndBattleText3: - TX_FAR _Route8EndBattleText3 - db "@" + text_far _Route8EndBattleText3 + text_end Route8AfterBattleText3: - TX_FAR _Route8AfterBattleText3 - db "@" + text_far _Route8AfterBattleText3 + text_end Route8Text4: - TX_ASM + text_asm ld hl, Route8TrainerHeader3 call TalkToTrainer jp TextScriptEnd Route8BattleText4: - TX_FAR _Route8BattleText4 - db "@" + text_far _Route8BattleText4 + text_end Route8EndBattleText4: - TX_FAR _Route8EndBattleText4 - db "@" + text_far _Route8EndBattleText4 + text_end Route8AfterBattleText4: - TX_FAR _Route8AfterBattleText4 - db "@" + text_far _Route8AfterBattleText4 + text_end Route8Text5: - TX_ASM + text_asm ld hl, Route8TrainerHeader4 call TalkToTrainer jp TextScriptEnd Route8BattleText5: - TX_FAR _Route8BattleText5 - db "@" + text_far _Route8BattleText5 + text_end Route8EndBattleText5: - TX_FAR _Route8EndBattleText5 - db "@" + text_far _Route8EndBattleText5 + text_end Route8AfterBattleText5: - TX_FAR _Route8AfterBattleText5 - db "@" + text_far _Route8AfterBattleText5 + text_end Route8Text6: - TX_ASM + text_asm ld hl, Route8TrainerHeader5 call TalkToTrainer jp TextScriptEnd Route8BattleText6: - TX_FAR _Route8BattleText6 - db "@" + text_far _Route8BattleText6 + text_end Route8EndBattleText6: - TX_FAR _Route8EndBattleText6 - db "@" + text_far _Route8EndBattleText6 + text_end Route8AfterBattleText6: - TX_FAR _Route8AfterBattleText6 - db "@" + text_far _Route8AfterBattleText6 + text_end Route8Text7: - TX_ASM + text_asm ld hl, Route8TrainerHeader6 call TalkToTrainer jp TextScriptEnd Route8BattleText7: - TX_FAR _Route8BattleText7 - db "@" + text_far _Route8BattleText7 + text_end Route8EndBattleText7: - TX_FAR _Route8EndBattleText7 - db "@" + text_far _Route8EndBattleText7 + text_end Route8AfterBattleText7: - TX_FAR _Route8AfterBattleText7 - db "@" + text_far _Route8AfterBattleText7 + text_end Route8Text8: - TX_ASM + text_asm ld hl, Route8TrainerHeader7 call TalkToTrainer jp TextScriptEnd Route8BattleText8: - TX_FAR _Route8BattleText8 - db "@" + text_far _Route8BattleText8 + text_end Route8EndBattleText8: - TX_FAR _Route8EndBattleText8 - db "@" + text_far _Route8EndBattleText8 + text_end Route8AfterBattleText8: - TX_FAR _Route8AfterBattleText8 - db "@" + text_far _Route8AfterBattleText8 + text_end Route8Text9: - TX_ASM + text_asm ld hl, Route8TrainerHeader8 call TalkToTrainer jp TextScriptEnd Route8BattleText9: - TX_FAR _Route8BattleText9 - db "@" + text_far _Route8BattleText9 + text_end Route8EndBattleText9: - TX_FAR _Route8EndBattleText9 - db "@" + text_far _Route8EndBattleText9 + text_end Route8AfterBattleText9: - TX_FAR _Route8AfterBattleText9 - db "@" + text_far _Route8AfterBattleText9 + text_end Route8Text10: - TX_FAR _Route8Text10 - db "@" + text_far _Route8Text10 + text_end diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm old mode 100755 new mode 100644 index 8ecea68e..3167cd76 --- a/scripts/Route8Gate.asm +++ b/scripts/Route8Gate.asm @@ -16,7 +16,7 @@ Route8GateScript_1e1d7: ld a, $1 ld [wSimulatedJoypadStatesIndex], a xor a - ld [wSpriteStateData2 + $06], a + ld [wSpritePlayerStateData2MovementByte1], a ld [wOverrideSimulatedJoypadStatesMask], a ret @@ -30,13 +30,13 @@ Route8GateScript0: ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a xor a - ld [hJoyHeld], a - callba RemoveGuardDrink - ld a, [$ffdb] + ldh [hJoyHeld], a + farcall RemoveGuardDrink + ldh a, [hItemToRemoveID] and a jr nz, .asm_1e220 ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 @@ -46,13 +46,13 @@ Route8GateScript0: ld hl, wd728 set 6, [hl] ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e22c: - db 3,2 - db 4,2 - db $ff + dbmapcoord 2, 3 + dbmapcoord 2, 4 + db -1 ; end Route8GateScript1: ld a, [wSimulatedJoypadStatesIndex] diff --git a/scripts/Route9.asm b/scripts/Route9.asm old mode 100755 new mode 100644 index a18096f0..5dc060c4 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm @@ -26,243 +26,180 @@ Route9_TextPointers: dw Route9Text11 Route9TrainerHeader0: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0 - dw Route9BattleText1 ; TextBeforeBattle - dw Route9AfterBattleText1 ; TextAfterBattle - dw Route9EndBattleText1 ; TextEndBattle - dw Route9EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9BattleText1, Route9EndBattleText1, Route9AfterBattleText1 Route9TrainerHeader1: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1 - dw Route9BattleText2 ; TextBeforeBattle - dw Route9AfterBattleText2 ; TextAfterBattle - dw Route9EndBattleText2 ; TextEndBattle - dw Route9EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_1, 2, Route9BattleText2, Route9EndBattleText2, Route9AfterBattleText2 Route9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 - dw Route9BattleText3 ; TextBeforeBattle - dw Route9AfterBattleText3 ; TextAfterBattle - dw Route9EndBattleText3 ; TextEndBattle - dw Route9EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_2, 4, Route9BattleText3, Route9EndBattleText3, Route9AfterBattleText3 Route9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 - dw Route9BattleText4 ; TextBeforeBattle - dw Route9AfterBattleText4 ; TextAfterBattle - dw Route9EndBattleText4 ; TextEndBattle - dw Route9EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_3, 2, Route9BattleText4, Route9EndBattleText4, Route9AfterBattleText4 Route9TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 - dw Route9BattleText5 ; TextBeforeBattle - dw Route9AfterBattleText5 ; TextAfterBattle - dw Route9EndBattleText5 ; TextEndBattle - dw Route9EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_4, 2, Route9BattleText5, Route9EndBattleText5, Route9AfterBattleText5 Route9TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 - dw Route9BattleText6 ; TextBeforeBattle - dw Route9AfterBattleText6 ; TextAfterBattle - dw Route9EndBattleText6 ; TextEndBattle - dw Route9EndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_5, 3, Route9BattleText6, Route9EndBattleText6, Route9AfterBattleText6 Route9TrainerHeader6: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 - dw Route9BattleText7 ; TextBeforeBattle - dw Route9AfterBattleText7 ; TextAfterBattle - dw Route9EndBattleText7 ; TextEndBattle - dw Route9EndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9BattleText7, Route9EndBattleText7, Route9AfterBattleText7 Route9TrainerHeader7: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1 - dw Route9BattleText8 ; TextBeforeBattle - dw Route9AfterBattleText8 ; TextAfterBattle - dw Route9EndBattleText8 ; TextEndBattle - dw Route9EndBattleText8 ; TextEndBattle - + trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 1, 2, Route9BattleText8, Route9EndBattleText8, Route9AfterBattleText8 Route9TrainerHeader8: - dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 - dw Route9BattleText9 ; TextBeforeBattle - dw Route9AfterBattleText9 ; TextAfterBattle - dw Route9EndBattleText9 ; TextEndBattle - dw Route9EndBattleText9 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 1, 2, Route9BattleText9, Route9EndBattleText9, Route9AfterBattleText9 + db -1 ; end Route9Text1: - TX_ASM + text_asm ld hl, Route9TrainerHeader0 jr Route9TalkToTrainer Route9Text2: - TX_ASM + text_asm ld hl, Route9TrainerHeader1 jr Route9TalkToTrainer Route9Text3: - TX_ASM + text_asm ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer Route9Text4: - TX_ASM + text_asm ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer Route9Text5: - TX_ASM + text_asm ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer Route9Text6: - TX_ASM + text_asm ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer Route9Text7: - TX_ASM + text_asm ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer Route9Text8: - TX_ASM + text_asm ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer Route9Text9: - TX_ASM + text_asm ld hl, Route9TrainerHeader8 Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd Route9BattleText1: - TX_FAR _Route9BattleText1 - db "@" + text_far _Route9BattleText1 + text_end Route9EndBattleText1: - TX_FAR _Route9EndBattleText1 - db "@" + text_far _Route9EndBattleText1 + text_end Route9AfterBattleText1: - TX_FAR _Route9AfterBattleText1 - db "@" + text_far _Route9AfterBattleText1 + text_end Route9BattleText2: - TX_FAR _Route9BattleText2 - db "@" + text_far _Route9BattleText2 + text_end Route9EndBattleText2: - TX_FAR _Route9EndBattleText2 - db "@" + text_far _Route9EndBattleText2 + text_end Route9AfterBattleText2: - TX_FAR _Route9AfterBattleText2 - db "@" + text_far _Route9AfterBattleText2 + text_end Route9BattleText3: - TX_FAR _Route9BattleText3 - db "@" + text_far _Route9BattleText3 + text_end Route9EndBattleText3: - TX_FAR _Route9EndBattleText3 - db "@" + text_far _Route9EndBattleText3 + text_end Route9AfterBattleText3: - TX_FAR _Route9AfterBattleText3 - db "@" + text_far _Route9AfterBattleText3 + text_end Route9BattleText4: - TX_FAR _Route9BattleText4 - db "@" + text_far _Route9BattleText4 + text_end Route9EndBattleText4: - TX_FAR _Route9EndBattleText4 - db "@" + text_far _Route9EndBattleText4 + text_end Route9AfterBattleText4: - TX_FAR _Route9AfterBattleText4 - db "@" + text_far _Route9AfterBattleText4 + text_end Route9BattleText5: - TX_FAR _Route9BattleText5 - db "@" + text_far _Route9BattleText5 + text_end Route9EndBattleText5: - TX_FAR _Route9EndBattleText5 - db "@" + text_far _Route9EndBattleText5 + text_end Route9AfterBattleText5: - TX_FAR _Route9AfterBattleText5 - db "@" + text_far _Route9AfterBattleText5 + text_end Route9BattleText6: - TX_FAR _Route9BattleText6 - db "@" + text_far _Route9BattleText6 + text_end Route9EndBattleText6: - TX_FAR _Route9EndBattleText6 - db "@" + text_far _Route9EndBattleText6 + text_end Route9AfterBattleText6: - TX_FAR _Route9AfterBattleText6 - db "@" + text_far _Route9AfterBattleText6 + text_end Route9BattleText7: - TX_FAR _Route9BattleText7 - db "@" + text_far _Route9BattleText7 + text_end Route9EndBattleText7: - TX_FAR _Route9EndBattleText7 - db "@" + text_far _Route9EndBattleText7 + text_end Route9AfterBattleText7: - TX_FAR _Route9AfterBattleText7 - db "@" + text_far _Route9AfterBattleText7 + text_end Route9BattleText8: - TX_FAR _Route9BattleText8 - db "@" + text_far _Route9BattleText8 + text_end Route9EndBattleText8: - TX_FAR _Route9EndBattleText8 - db "@" + text_far _Route9EndBattleText8 + text_end Route9AfterBattleText8: - TX_FAR _Route9AfterBattleText8 - db "@" + text_far _Route9AfterBattleText8 + text_end Route9BattleText9: - TX_FAR _Route9BattleText9 - db "@" + text_far _Route9BattleText9 + text_end Route9EndBattleText9: - TX_FAR _Route9EndBattleText9 - db "@" + text_far _Route9EndBattleText9 + text_end Route9AfterBattleText9: - TX_FAR _Route9AfterBattleText9 - db "@" + text_far _Route9AfterBattleText9 + text_end Route9Text11: - TX_FAR _Route9Text11 - db "@" + text_far _Route9Text11 + text_end diff --git a/scripts/SSAnne1F.asm b/scripts/SSAnne1F.asm old mode 100755 new mode 100644 index 5cace6ee..c819f470 --- a/scripts/SSAnne1F.asm +++ b/scripts/SSAnne1F.asm @@ -7,9 +7,9 @@ SSAnne1F_TextPointers: dw SSAnne1Text2 SSAnne1Text1: - TX_FAR _SSAnne1Text1 - db "@" + text_far _SSAnne1Text1 + text_end SSAnne1Text2: - TX_FAR _SSAnne1Text2 - db "@" + text_far _SSAnne1Text2 + text_end diff --git a/scripts/SSAnne1FRooms.asm b/scripts/SSAnne1FRooms.asm old mode 100755 new mode 100644 index 2371f286..e4e4813d --- a/scripts/SSAnne1FRooms.asm +++ b/scripts/SSAnne1FRooms.asm @@ -26,138 +26,110 @@ SSAnne1FRooms_TextPointers: dw SSAnne8Text11 SSAnne8TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_0 - dw SSAnne8BattleText1 ; TextBeforeBattle - dw SSAnne8AfterBattleText1 ; TextAfterBattle - dw SSAnne8EndBattleText1 ; TextEndBattle - dw SSAnne8EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_0, 2, SSAnne8BattleText1, SSAnne8EndBattleText1, SSAnne8AfterBattleText1 SSAnne8TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_1 - dw SSAnne8BattleText2 ; TextBeforeBattle - dw SSAnne8AfterBattleText2 ; TextAfterBattle - dw SSAnne8EndBattleText2 ; TextEndBattle - dw SSAnne8EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_1, 3, SSAnne8BattleText2, SSAnne8EndBattleText2, SSAnne8AfterBattleText2 SSAnne8TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_2 - dw SSAnne8BattleText3 ; TextBeforeBattle - dw SSAnne8AfterBattleText3 ; TextAfterBattle - dw SSAnne8EndBattleText3 ; TextEndBattle - dw SSAnne8EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_2, 2, SSAnne8BattleText3, SSAnne8EndBattleText3, SSAnne8AfterBattleText3 SSAnne8TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_3 - dw SSAnne8BattleText4 ; TextBeforeBattle - dw SSAnne8AfterBattleText4 ; TextAfterBattle - dw SSAnne8EndBattleText4 ; TextEndBattle - dw SSAnne8EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SS_ANNE_8_TRAINER_3, 2, SSAnne8BattleText4, SSAnne8EndBattleText4, SSAnne8AfterBattleText4 + db -1 ; end SSAnne8Text1: - TX_ASM + text_asm ld hl, SSAnne8TrainerHeader0 call TalkToTrainer jp TextScriptEnd SSAnne8Text2: - TX_ASM + text_asm ld hl, SSAnne8TrainerHeader1 call TalkToTrainer jp TextScriptEnd SSAnne8Text3: - TX_ASM + text_asm ld hl, SSAnne8TrainerHeader2 call TalkToTrainer jp TextScriptEnd SSAnne8Text4: - TX_ASM + text_asm ld hl, SSAnne8TrainerHeader3 call TalkToTrainer jp TextScriptEnd SSAnne8Text8: - TX_FAR _SSAnne8Text8 - TX_ASM + text_far _SSAnne8Text8 + text_asm ld a, WIGGLYTUFF call PlayCry jp TextScriptEnd SSAnne8BattleText1: - TX_FAR _SSAnne8BattleText1 - db "@" + text_far _SSAnne8BattleText1 + text_end SSAnne8EndBattleText1: - TX_FAR _SSAnne8EndBattleText1 - db "@" + text_far _SSAnne8EndBattleText1 + text_end SSAnne8AfterBattleText1: - TX_FAR _SSAnne8AfterBattleText1 - db "@" + text_far _SSAnne8AfterBattleText1 + text_end SSAnne8BattleText2: - TX_FAR _SSAnne8BattleText2 - db "@" + text_far _SSAnne8BattleText2 + text_end SSAnne8EndBattleText2: - TX_FAR _SSAnne8EndBattleText2 - db "@" + text_far _SSAnne8EndBattleText2 + text_end SSAnne8AfterBattleText2: - TX_FAR _SSAnne8AfterBattleText2 - db "@" + text_far _SSAnne8AfterBattleText2 + text_end SSAnne8BattleText3: - TX_FAR _SSAnne8BattleText3 - db "@" + text_far _SSAnne8BattleText3 + text_end SSAnne8EndBattleText3: - TX_FAR _SSAnne8EndBattleText3 - db "@" + text_far _SSAnne8EndBattleText3 + text_end SSAnne8AfterBattleText3: - TX_FAR _SSAnne8AfterBattleText3 - db "@" + text_far _SSAnne8AfterBattleText3 + text_end SSAnne8BattleText4: - TX_FAR _SSAnne8BattleText4 - db "@" + text_far _SSAnne8BattleText4 + text_end SSAnne8EndBattleText4: - TX_FAR _SSAnne8EndBattleText4 - db "@" + text_far _SSAnne8EndBattleText4 + text_end SSAnne8AfterBattleText4: - TX_FAR _SSAnne8AfterBattleText4 - db "@" + text_far _SSAnne8AfterBattleText4 + text_end SSAnne8Text5: - TX_FAR _SSAnne8Text5 - db "@" + text_far _SSAnne8Text5 + text_end SSAnne8Text6: - TX_FAR _SSAnne8Text6 - db "@" + text_far _SSAnne8Text6 + text_end SSAnne8Text7: - TX_FAR _SSAnne8Text7 - db "@" + text_far _SSAnne8Text7 + text_end SSAnne8Text9: - TX_FAR _SSAnne8Text9 - db "@" + text_far _SSAnne8Text9 + text_end SSAnne8Text11: - TX_FAR _SSAnne8Text11 - db "@" + text_far _SSAnne8Text11 + text_end diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm old mode 100755 new mode 100644 index d4419e33..1311477c --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -24,26 +24,26 @@ SSAnne2Script0: ld hl, CoordsData_61411 call ArePlayerCoordsInArray ret nc - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, [wCoordIndex] - ld [$ffdb], a + ldh [hSavedCoordIndex], a ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef ShowObject call Delay3 ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a - ld a, [$ffdb] + ldh a, [hSavedCoordIndex] cp $2 jr nz, .asm_61400 ld de, MovementData_6140c @@ -58,21 +58,20 @@ SSAnne2Script0: MovementData_6140c: db NPC_MOVEMENT_DOWN - MovementData_6140d: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end CoordsData_61411: - db $08,$24 - db $08,$25 - db $FF + dbmapcoord 36, 8 + dbmapcoord 37, 8 + db -1 ; end SSAnne2Script_61416: ld a, [wXCoord] - cp $25 + cp 37 jr nz, .asm_61426 ld a, PLAYER_DIR_LEFT ld [wPlayerMovingDirection], a @@ -81,9 +80,9 @@ SSAnne2Script_61416: .asm_61426 xor a ; SPRITE_FACING_DOWN .asm_61427 - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a jp SetSpriteFacingDirectionAndDelay SSAnne2Script1: @@ -94,10 +93,10 @@ SSAnne2Script1: xor a ld [wJoyIgnore], a ld a, $2 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ; select which team to use during the encounter @@ -129,13 +128,13 @@ SSAnne2Script2: ld a, $f0 ld [wJoyIgnore], a ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wXCoord] - cp $25 + cp 37 jr nz, .asm_61497 ld de, MovementData_614b9 jr .asm_6149a @@ -143,12 +142,12 @@ SSAnne2Script2: ld de, MovementData_614b7 .asm_6149a ld a, $2 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld a, $3 ld [wSSAnne2FCurScript], a ret @@ -156,13 +155,12 @@ SSAnne2Script2: MovementData_614b7: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN - MovementData_614b9: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end SSAnne2Script3: ld a, [wd730] @@ -184,11 +182,11 @@ SSAnne2F_TextPointers: dw SSAnne2Text3 SSAnne2Text1: - TX_FAR _SSAnne2Text1 - db "@" + text_far _SSAnne2Text1 + text_end SSAnne2Text2: - TX_ASM + text_asm ld hl, SSAnneRivalBeforeBattleText call PrintText ld hl, wd72d @@ -200,17 +198,17 @@ SSAnne2Text2: jp TextScriptEnd SSAnneRivalBeforeBattleText: - TX_FAR _SSAnneRivalBeforeBattleText - db "@" + text_far _SSAnneRivalBeforeBattleText + text_end SSAnneRivalDefeatedText: - TX_FAR _SSAnneRivalDefeatedText - db "@" + text_far _SSAnneRivalDefeatedText + text_end SSAnneRivalWonText: - TX_FAR _SSAnneRivalWonText - db "@" + text_far _SSAnneRivalWonText + text_end SSAnne2Text3: - TX_FAR _SSAnneRivalCaptainText - db "@" + text_far _SSAnneRivalCaptainText + text_end diff --git a/scripts/SSAnne2FRooms.asm b/scripts/SSAnne2FRooms.asm old mode 100755 new mode 100644 index a79e1be8..3fe2d34f --- a/scripts/SSAnne2FRooms.asm +++ b/scripts/SSAnne2FRooms.asm @@ -1,5 +1,5 @@ SSAnne2FRooms_Script: - ld a, $1 + ld a, TRUE ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -31,69 +31,41 @@ SSAnne2FRooms_TextPointers: dw SSAnne9Text13 SSAnne9TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0 - dw SSAnne9BattleText1 ; TextBeforeBattle - dw SSAnne9AfterBattleText1 ; TextAfterBattle - dw SSAnne9EndBattleText1 ; TextEndBattle - dw SSAnne9EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_0, 2, SSAnne9BattleText1, SSAnne9EndBattleText1, SSAnne9AfterBattleText1 SSAnne9TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1 - dw SSAnne9BattleText2 ; TextBeforeBattle - dw SSAnne9AfterBattleText2 ; TextAfterBattle - dw SSAnne9EndBattleText2 ; TextEndBattle - dw SSAnne9EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_1, 3, SSAnne9BattleText2, SSAnne9EndBattleText2, SSAnne9AfterBattleText2 SSAnne9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2 - dw SSAnne9BattleText3 ; TextBeforeBattle - dw SSAnne9AfterBattleText3 ; TextAfterBattle - dw SSAnne9EndBattleText3 ; TextEndBattle - dw SSAnne9EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_2, 3, SSAnne9BattleText3, SSAnne9EndBattleText3, SSAnne9AfterBattleText3 SSAnne9TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3 - dw SSAnne9BattleText4 ; TextBeforeBattle - dw SSAnne9AfterBattleText4 ; TextAfterBattle - dw SSAnne9EndBattleText4 ; TextEndBattle - dw SSAnne9EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SS_ANNE_9_TRAINER_3, 2, SSAnne9BattleText4, SSAnne9EndBattleText4, SSAnne9AfterBattleText4 + db -1 ; end SSAnne9Text1: - TX_ASM + text_asm ld hl, SSAnne9TrainerHeader0 call TalkToTrainer jp TextScriptEnd SSAnne9Text2: - TX_ASM + text_asm ld hl, SSAnne9TrainerHeader1 call TalkToTrainer jp TextScriptEnd SSAnne9Text3: - TX_ASM + text_asm ld hl, SSAnne9TrainerHeader2 call TalkToTrainer jp TextScriptEnd SSAnne9Text4: - TX_ASM + text_asm ld hl, SSAnne9TrainerHeader3 call TalkToTrainer jp TextScriptEnd SSAnne9Text5: - TX_ASM + text_asm call SaveScreenTilesToBuffer1 ld hl, SSAnne9Text_61bf2 call PrintText @@ -103,113 +75,113 @@ SSAnne9Text5: jp TextScriptEnd SSAnne9Text_61bf2: - TX_FAR _SSAnne9Text_61bf2 - db "@" + text_far _SSAnne9Text_61bf2 + text_end SSAnne9Text7: - TX_ASM + text_asm ld hl, SSAnne9Text_61c01 call PrintText jp TextScriptEnd SSAnne9Text_61c01: - TX_FAR _SSAnne9Text_61c01 - db "@" + text_far _SSAnne9Text_61c01 + text_end SSAnne9Text8: - TX_ASM + text_asm ld hl, SSAnne9Text_61c10 call PrintText jp TextScriptEnd SSAnne9Text_61c10: - TX_FAR _SSAnne9Text_61c10 - db "@" + text_far _SSAnne9Text_61c10 + text_end SSAnne9Text10: - TX_ASM + text_asm ld hl, SSAnne9Text_61c1f call PrintText jp TextScriptEnd SSAnne9Text_61c1f: - TX_FAR _SSAnne9Text_61c1f - db "@" + text_far _SSAnne9Text_61c1f + text_end SSAnne9Text11: - TX_ASM + text_asm ld hl, SSAnne9Text_61c2e call PrintText jp TextScriptEnd SSAnne9Text_61c2e: - TX_FAR _SSAnne9Text_61c2e - db "@" + text_far _SSAnne9Text_61c2e + text_end SSAnne9Text12: - TX_ASM + text_asm ld hl, SSAnne9Text_61c3d call PrintText jp TextScriptEnd SSAnne9Text_61c3d: - TX_FAR _SSAnne9Text_61c3d - db "@" + text_far _SSAnne9Text_61c3d + text_end SSAnne9Text13: - TX_ASM + text_asm ld hl, SSAnne9Text_61c4c call PrintText jp TextScriptEnd SSAnne9Text_61c4c: - TX_FAR _SSAnne9Text_61c4c - db "@" + text_far _SSAnne9Text_61c4c + text_end SSAnne9BattleText1: - TX_FAR _SSAnne9BattleText1 - db "@" + text_far _SSAnne9BattleText1 + text_end SSAnne9EndBattleText1: - TX_FAR _SSAnne9EndBattleText1 - db "@" + text_far _SSAnne9EndBattleText1 + text_end SSAnne9AfterBattleText1: - TX_FAR _SSAnne9AfterBattleText1 - db "@" + text_far _SSAnne9AfterBattleText1 + text_end SSAnne9BattleText2: - TX_FAR _SSAnne9BattleText2 - db "@" + text_far _SSAnne9BattleText2 + text_end SSAnne9EndBattleText2: - TX_FAR _SSAnne9EndBattleText2 - db "@" + text_far _SSAnne9EndBattleText2 + text_end SSAnne9AfterBattleText2: - TX_FAR _SSAnne9AfterBattleText2 - db "@" + text_far _SSAnne9AfterBattleText2 + text_end SSAnne9BattleText3: - TX_FAR _SSAnne9BattleText3 - db "@" + text_far _SSAnne9BattleText3 + text_end SSAnne9EndBattleText3: - TX_FAR _SSAnne9EndBattleText3 - db "@" + text_far _SSAnne9EndBattleText3 + text_end SSAnne9AfterBattleText3: - TX_FAR _SSAnne9AfterBattleText3 - db "@" + text_far _SSAnne9AfterBattleText3 + text_end SSAnne9BattleText4: - TX_FAR _SSAnne9BattleText4 - db "@" + text_far _SSAnne9BattleText4 + text_end SSAnne9EndBattleText4: - TX_FAR _SSAnne9EndBattleText4 - db "@" + text_far _SSAnne9EndBattleText4 + text_end SSAnne9AfterBattleText4: - TX_FAR _SSAnne9AfterBattleText4 - db "@" + text_far _SSAnne9AfterBattleText4 + text_end diff --git a/scripts/SSAnne3F.asm b/scripts/SSAnne3F.asm old mode 100755 new mode 100644 index 5da0e0c7..e3e7a1d3 --- a/scripts/SSAnne3F.asm +++ b/scripts/SSAnne3F.asm @@ -5,5 +5,5 @@ SSAnne3F_TextPointers: dw SSAnne3Text1 SSAnne3Text1: - TX_FAR _SSAnne3Text1 - db "@" + text_far _SSAnne3Text1 + text_end diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm old mode 100755 new mode 100644 index 25df076f..f66fdfaa --- a/scripts/SSAnneB1F.asm +++ b/scripts/SSAnneB1F.asm @@ -2,4 +2,5 @@ SSAnneB1F_Script: jp EnableAutoTextBoxDrawing SSAnneB1F_TextPointers: - db "@" + + text_end ; unused diff --git a/scripts/SSAnneB1FRooms.asm b/scripts/SSAnneB1FRooms.asm old mode 100755 new mode 100644 index 3777852c..2a077c33 --- a/scripts/SSAnneB1FRooms.asm +++ b/scripts/SSAnneB1FRooms.asm @@ -26,176 +26,134 @@ SSAnneB1FRooms_TextPointers: dw PickUpItemText SSAnne10TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0 - dw SSAnne10BattleText1 ; TextBeforeBattle - dw SSAnne10AfterBattleText1 ; TextAfterBattle - dw SSAnne10EndBattleText1 ; TextEndBattle - dw SSAnne10EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_0, 2, SSAnne10BattleText1, SSAnne10EndBattleText1, SSAnne10AfterBattleText1 SSAnne10TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1 - dw SSAnne10BattleText2 ; TextBeforeBattle - dw SSAnne10AfterBattleText2 ; TextAfterBattle - dw SSAnne10EndBattleText2 ; TextEndBattle - dw SSAnne10EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_1, 3, SSAnne10BattleText2, SSAnne10EndBattleText2, SSAnne10AfterBattleText2 SSAnne10TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2 - dw SSAnne10BattleText3 ; TextBeforeBattle - dw SSAnne10AfterBattleText3 ; TextAfterBattle - dw SSAnne10EndBattleText3 ; TextEndBattle - dw SSAnne10EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_2, 2, SSAnne10BattleText3, SSAnne10EndBattleText3, SSAnne10AfterBattleText3 SSAnne10TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3 - dw SSAnne10BattleText4 ; TextBeforeBattle - dw SSAnne10AfterBattleText4 ; TextAfterBattle - dw SSAnne10EndBattleText4 ; TextEndBattle - dw SSAnne10EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_3, 2, SSAnne10BattleText4, SSAnne10EndBattleText4, SSAnne10AfterBattleText4 SSAnne10TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4 - dw SSAnne10BattleText5 ; TextBeforeBattle - dw SSAnne10AfterBattleText5 ; TextAfterBattle - dw SSAnne10EndBattleText5 ; TextEndBattle - dw SSAnne10EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_4, 2, SSAnne10BattleText5, SSAnne10EndBattleText5, SSAnne10AfterBattleText5 SSAnne10TrainerHeader5: - dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5 - dw SSAnne10BattleText6 ; TextBeforeBattle - dw SSAnne10AfterBattleText6 ; TextAfterBattle - dw SSAnne10EndBattleText6 ; TextEndBattle - dw SSAnne10EndBattleText6 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SS_ANNE_10_TRAINER_5, 3, SSAnne10BattleText6, SSAnne10EndBattleText6, SSAnne10AfterBattleText6 + db -1 ; end SSAnne10Text1: - TX_ASM + text_asm ld hl, SSAnne10TrainerHeader0 call TalkToTrainer jp TextScriptEnd SSAnne10Text2: - TX_ASM + text_asm ld hl, SSAnne10TrainerHeader1 call TalkToTrainer jp TextScriptEnd SSAnne10Text3: - TX_ASM + text_asm ld hl, SSAnne10TrainerHeader2 call TalkToTrainer jp TextScriptEnd SSAnne10Text4: - TX_ASM + text_asm ld hl, SSAnne10TrainerHeader3 call TalkToTrainer jp TextScriptEnd SSAnne10Text5: - TX_ASM + text_asm ld hl, SSAnne10TrainerHeader4 call TalkToTrainer jp TextScriptEnd SSAnne10Text6: - TX_ASM + text_asm ld hl, SSAnne10TrainerHeader5 call TalkToTrainer jp TextScriptEnd SSAnne10Text8: - TX_FAR _SSAnne10Text8 - TX_ASM + text_far _SSAnne10Text8 + text_asm ld a, MACHOKE call PlayCry jp TextScriptEnd SSAnne10BattleText1: - TX_FAR _SSAnne10BattleText1 - db "@" + text_far _SSAnne10BattleText1 + text_end SSAnne10EndBattleText1: - TX_FAR _SSAnne10EndBattleText1 - db "@" + text_far _SSAnne10EndBattleText1 + text_end SSAnne10AfterBattleText1: - TX_FAR _SSAnne10AfterBattleText1 - db "@" + text_far _SSAnne10AfterBattleText1 + text_end SSAnne10BattleText2: - TX_FAR _SSAnne10BattleText2 - db "@" + text_far _SSAnne10BattleText2 + text_end SSAnne10EndBattleText2: - TX_FAR _SSAnne10EndBattleText2 - db "@" + text_far _SSAnne10EndBattleText2 + text_end SSAnne10AfterBattleText2: - TX_FAR _SSAnne10AfterBattleText2 - db "@" + text_far _SSAnne10AfterBattleText2 + text_end SSAnne10BattleText3: - TX_FAR _SSAnne10BattleText3 - db "@" + text_far _SSAnne10BattleText3 + text_end SSAnne10EndBattleText3: - TX_FAR _SSAnne10EndBattleText3 - db "@" + text_far _SSAnne10EndBattleText3 + text_end SSAnne10AfterBattleText3: - TX_FAR _SSAnne10AfterBattleText3 - db "@" + text_far _SSAnne10AfterBattleText3 + text_end SSAnne10BattleText4: - TX_FAR _SSAnne10BattleText4 - db "@" + text_far _SSAnne10BattleText4 + text_end SSAnne10EndBattleText4: - TX_FAR _SSAnne10EndBattleText4 - db "@" + text_far _SSAnne10EndBattleText4 + text_end SSAnne10AfterBattleText4: - TX_FAR _SSAnne10AfterBattleText4 - db "@" + text_far _SSAnne10AfterBattleText4 + text_end SSAnne10BattleText5: - TX_FAR _SSAnne10BattleText5 - db "@" + text_far _SSAnne10BattleText5 + text_end SSAnne10EndBattleText5: - TX_FAR _SSAnne10EndBattleText5 - db "@" + text_far _SSAnne10EndBattleText5 + text_end SSAnne10AfterBattleText5: - TX_FAR _SSAnne10AfterBattleText5 - db "@" + text_far _SSAnne10AfterBattleText5 + text_end SSAnne10BattleText6: - TX_FAR _SSAnne10BattleText6 - db "@" + text_far _SSAnne10BattleText6 + text_end SSAnne10EndBattleText6: - TX_FAR _SSAnne10EndBattleText6 - db "@" + text_far _SSAnne10EndBattleText6 + text_end SSAnne10AfterBattleText6: - TX_FAR _SSAnne10AfterBattleText6 - db "@" + text_far _SSAnne10AfterBattleText6 + text_end SSAnne10Text7: - TX_FAR _SSAnne10Text7 - db "@" + text_far _SSAnne10Text7 + text_end diff --git a/scripts/SSAnneBow.asm b/scripts/SSAnneBow.asm old mode 100755 new mode 100644 index 4569f0f8..0621785d --- a/scripts/SSAnneBow.asm +++ b/scripts/SSAnneBow.asm @@ -20,69 +20,55 @@ SSAnneBow_TextPointers: dw SSAnne5Text5 SSAnne5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_0 - dw SSAnne5BattleText1 ; TextBeforeBattle - dw SSAnne5AfterBattleText1 ; TextAfterBattle - dw SSAnne5EndBattleText1 ; TextEndBattle - dw SSAnne5EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SS_ANNE_5_TRAINER_0, 3, SSAnne5BattleText1, SSAnne5EndBattleText1, SSAnne5AfterBattleText1 SSAnne5TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_1 - dw SSAnne5BattleText2 ; TextBeforeBattle - dw SSAnne5AfterBattleText2 ; TextAfterBattle - dw SSAnne5EndBattleText2 ; TextEndBattle - dw SSAnne5EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SS_ANNE_5_TRAINER_1, 3, SSAnne5BattleText2, SSAnne5EndBattleText2, SSAnne5AfterBattleText2 + db -1 ; end SSAnne5Text1: - TX_FAR _SSAnne5Text1 - db "@" + text_far _SSAnne5Text1 + text_end SSAnne5Text2: - TX_FAR _SSAnne5Text2 - db "@" + text_far _SSAnne5Text2 + text_end SSAnne5Text3: - TX_FAR _SSAnne5Text3 - db "@" + text_far _SSAnne5Text3 + text_end SSAnne5Text4: - TX_ASM + text_asm ld hl, SSAnne5TrainerHeader0 call TalkToTrainer jp TextScriptEnd SSAnne5BattleText1: - TX_FAR _SSAnne5BattleText1 - db "@" + text_far _SSAnne5BattleText1 + text_end SSAnne5EndBattleText1: - TX_FAR _SSAnne5EndBattleText1 - db "@" + text_far _SSAnne5EndBattleText1 + text_end SSAnne5AfterBattleText1: - TX_FAR _SSAnne5AfterBattleText1 - db "@" + text_far _SSAnne5AfterBattleText1 + text_end SSAnne5Text5: - TX_ASM + text_asm ld hl, SSAnne5TrainerHeader1 call TalkToTrainer jp TextScriptEnd SSAnne5BattleText2: - TX_FAR _SSAnne5BattleText2 - db "@" + text_far _SSAnne5BattleText2 + text_end SSAnne5EndBattleText2: - TX_FAR _SSAnne5EndBattleText2 - db "@" + text_far _SSAnne5EndBattleText2 + text_end SSAnne5AfterBattleText2: - TX_FAR _SSAnne5AfterBattleText2 - db "@" + text_far _SSAnne5AfterBattleText2 + text_end diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm old mode 100755 new mode 100644 index e6a0bf97..8b458cc4 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -15,43 +15,43 @@ SSAnneCaptainsRoom_TextPointers: dw SSAnne7Text3 SSAnne7Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_HM01 - jr nz, .asm_797c4 + jr nz, .got_item ld hl, SSAnne7RubText call PrintText ld hl, ReceivingHM01Text call PrintText - lb bc, HM_01, 1 + lb bc, HM_CUT, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedHM01Text call PrintText SetEvent EVENT_GOT_HM01 - jr .asm_0faf5 -.BagFull + jr .done +.bag_full ld hl, HM01NoRoomText call PrintText ld hl, wd72d set 5, [hl] - jr .asm_0faf5 -.asm_797c4 + jr .done +.got_item ld hl, SSAnne7Text_61932 call PrintText -.asm_0faf5 +.done jp TextScriptEnd SSAnne7RubText: - TX_FAR _SSAnne7RubText - TX_ASM + text_far _SSAnne7RubText + text_asm ld a, [wAudioROMBank] - cp $1f ; 0 ; BANK(Audio3_UpdateMusic) XXXXX + cp $1f ; BANK("Audio Engine 3") ld [wAudioSavedROMBank], a jr nz, .asm_61908 - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - ld a, 0 ; Bank(Music_PkmnHealed) + ld a, 0 ; BANK(Music_PkmnHealed) ld [wAudioROMBank], a .asm_61908 ld a, MUSIC_PKMN_HEALED @@ -65,26 +65,26 @@ SSAnne7RubText: jp TextScriptEnd ReceivingHM01Text: - TX_FAR _ReceivingHM01Text - db "@" + text_far _ReceivingHM01Text + text_end ReceivedHM01Text: - TX_FAR _ReceivedHM01Text - TX_SFX_KEY_ITEM - db "@" + text_far _ReceivedHM01Text + sound_get_key_item + text_end SSAnne7Text_61932: - TX_FAR _SSAnne7Text_61932 - db "@" + text_far _SSAnne7Text_61932 + text_end HM01NoRoomText: - TX_FAR _HM01NoRoomText - db "@" + text_far _HM01NoRoomText + text_end SSAnne7Text2: - TX_FAR _SSAnne7Text2 - db "@" + text_far _SSAnne7Text2 + text_end SSAnne7Text3: - TX_FAR _SSAnne7Text3 - db "@" + text_far _SSAnne7Text3 + text_end diff --git a/scripts/SSAnneKitchen.asm b/scripts/SSAnneKitchen.asm old mode 100755 new mode 100644 index 137706a0..30a9830f --- a/scripts/SSAnneKitchen.asm +++ b/scripts/SSAnneKitchen.asm @@ -12,61 +12,61 @@ SSAnneKitchen_TextPointers: dw SSAnne6Text7 SSAnne6Text1: - TX_FAR _SSAnne6Text1 - db "@" + text_far _SSAnne6Text1 + text_end SSAnne6Text2: - TX_FAR _SSAnne6Text2 - db "@" + text_far _SSAnne6Text2 + text_end SSAnne6Text3: - TX_FAR _SSAnne6Text3 - db "@" + text_far _SSAnne6Text3 + text_end SSAnne6Text4: - TX_FAR _SSAnne6Text4 - db "@" + text_far _SSAnne6Text4 + text_end SSAnne6Text5: - TX_FAR _SSAnne6Text5 - db "@" + text_far _SSAnne6Text5 + text_end SSAnne6Text6: - TX_FAR _SSAnne6Text6 - db "@" + text_far _SSAnne6Text6 + text_end SSAnne6Text7: - TX_ASM + text_asm ld hl, SSAnne6Text_61807 call PrintText - ld a, [hRandomAdd] + ldh a, [hRandomAdd] bit 7, a - jr z, .asm_93eb1 + jr z, .not_dialog_1 ld hl, SSAnne6Text_6180c - jr .asm_63292 -.asm_93eb1 + jr .done +.not_dialog_1 bit 4, a - jr z, .asm_7436c + jr z, .not_dialog_2 ld hl, SSAnne6Text_61811 - jr .asm_63292 -.asm_7436c + jr .done +.not_dialog_2 ld hl, SSAnne6Text_61816 -.asm_63292 +.done call PrintText jp TextScriptEnd SSAnne6Text_61807: - TX_FAR _SSAnne6Text_61807 - db "@" + text_far _SSAnne6Text_61807 + text_end SSAnne6Text_6180c: - TX_FAR _SSAnne6Text_6180c - db "@" + text_far _SSAnne6Text_6180c + text_end SSAnne6Text_61811: - TX_FAR _SSAnne6Text_61811 - db "@" + text_far _SSAnne6Text_61811 + text_end SSAnne6Text_61816: - TX_FAR _SSAnne6Text_61816 - db "@" + text_far _SSAnne6Text_61816 + text_end diff --git a/scripts/SafariZoneCenter.asm b/scripts/SafariZoneCenter.asm old mode 100755 new mode 100644 index 0a266887..1e7db243 --- a/scripts/SafariZoneCenter.asm +++ b/scripts/SafariZoneCenter.asm @@ -7,9 +7,9 @@ SafariZoneCenter_TextPointers: dw SafariZoneCenterText3 SafariZoneCenterText2: - TX_FAR _SafariZoneCenterText2 - db "@" + text_far _SafariZoneCenterText2 + text_end SafariZoneCenterText3: - TX_FAR _SafariZoneCenterText3 - db "@" + text_far _SafariZoneCenterText3 + text_end diff --git a/scripts/SafariZoneCenterRestHouse.asm b/scripts/SafariZoneCenterRestHouse.asm old mode 100755 new mode 100644 index a652644b..a03823cc --- a/scripts/SafariZoneCenterRestHouse.asm +++ b/scripts/SafariZoneCenterRestHouse.asm @@ -6,9 +6,9 @@ SafariZoneCenterRestHouse_TextPointers: dw SafariZoneRestHouse1Text2 SafariZoneRestHouse1Text1: - TX_FAR _SafariZoneRestHouse1Text1 - db "@" + text_far _SafariZoneRestHouse1Text1 + text_end SafariZoneRestHouse1Text2: - TX_FAR _SafariZoneRestHouse1Text2 - db "@" + text_far _SafariZoneRestHouse1Text2 + text_end diff --git a/scripts/SafariZoneEast.asm b/scripts/SafariZoneEast.asm old mode 100755 new mode 100644 index 7f4a5543..062eeab1 --- a/scripts/SafariZoneEast.asm +++ b/scripts/SafariZoneEast.asm @@ -11,13 +11,13 @@ SafariZoneEast_TextPointers: dw SafariZoneEastText7 SafariZoneEastText5: - TX_FAR _SafariZoneEastText5 - db "@" + text_far _SafariZoneEastText5 + text_end SafariZoneEastText6: - TX_FAR _SafariZoneEastText6 - db "@" + text_far _SafariZoneEastText6 + text_end SafariZoneEastText7: - TX_FAR _SafariZoneEastText7 - db "@" + text_far _SafariZoneEastText7 + text_end diff --git a/scripts/SafariZoneEastRestHouse.asm b/scripts/SafariZoneEastRestHouse.asm old mode 100755 new mode 100644 index 24141459..03655d69 --- a/scripts/SafariZoneEastRestHouse.asm +++ b/scripts/SafariZoneEastRestHouse.asm @@ -8,13 +8,13 @@ SafariZoneEastRestHouse_TextPointers: dw SafariZoneRestHouse3Text3 SafariZoneRestHouse3Text1: - TX_FAR _SafariZoneRestHouse3Text1 - db "@" + text_far _SafariZoneRestHouse3Text1 + text_end SafariZoneRestHouse3Text2: - TX_FAR _SafariZoneRestHouse3Text2 - db "@" + text_far _SafariZoneRestHouse3Text2 + text_end SafariZoneRestHouse3Text3: - TX_FAR _SafariZoneRestHouse3Text3 - db "@" + text_far _SafariZoneRestHouse3Text3 + text_end diff --git a/scripts/SafariZoneGate.asm b/scripts/SafariZoneGate.asm old mode 100755 new mode 100644 index f3de556b..fd9a0884 --- a/scripts/SafariZoneGate.asm +++ b/scripts/SafariZoneGate.asm @@ -18,14 +18,14 @@ SafariZoneGate_ScriptPointers: call ArePlayerCoordsInArray ret nc ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, [wCoordIndex] cp $1 jr z, .asm_7520f @@ -43,20 +43,20 @@ SafariZoneGate_ScriptPointers: ret .CoordsData_75221: - db $02,$03 - db $02,$04 - db $FF + dbmapcoord 3, 2 + dbmapcoord 4, 2 + db -1 ; end .SafariZoneEntranceScript1 call SafariZoneEntranceScript_752b4 ret nz .SafariZoneEntranceScript2 xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld [wJoyIgnore], a call UpdateSprites ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a @@ -81,7 +81,7 @@ SafariZoneGate_ScriptPointers: ld a, $f0 ld [wJoyIgnore], a ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wNumSafariBalls], a @@ -93,7 +93,7 @@ SafariZoneGate_ScriptPointers: jr .asm_75286 .asm_7527f ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID .asm_75286 ret @@ -139,12 +139,12 @@ SafariZoneGate_TextPointers: dw .SafariZoneEntranceText6 .SafariZoneEntranceText1 - TX_FAR _SafariZoneEntranceText1 - db "@" + text_far _SafariZoneEntranceText1 + text_end .SafariZoneEntranceText4 - TX_FAR SafariZoneEntranceText_9e6e4 - TX_ASM + text_far SafariZoneEntranceText_9e6e4 + text_asm ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID @@ -153,11 +153,11 @@ SafariZoneGate_TextPointers: and a jp nz, .PleaseComeAgain xor a - ld [hMoney], a + ldh [hMoney], a ld a, $05 - ld [hMoney + 1], a + ldh [hMoney + 1], a ld a, $00 - ld [hMoney + 2], a + ldh [hMoney + 2], a call HasEnoughMoney jr nc, .success ld hl, .NotEnoughMoneyText @@ -182,9 +182,9 @@ SafariZoneGate_TextPointers: call PrintText ld a, 30 ld [wNumSafariBalls], a - ld a, 502 / $100 + ld a, HIGH(502) ld [wSafariSteps], a - ld a, 502 % $100 + ld a, LOW(502) ld [wSafariSteps + 1], a ld a, D_UP ld c, 3 @@ -208,22 +208,22 @@ SafariZoneGate_TextPointers: jp TextScriptEnd .MakePaymentText - TX_FAR SafariZoneEntranceText_9e747 - TX_SFX_ITEM_1 - TX_FAR _SafariZoneEntranceText_75360 - db "@" + text_far SafariZoneEntranceText_9e747 + sound_get_item_1 + text_far _SafariZoneEntranceText_75360 + text_end .PleaseComeAgainText - TX_FAR _SafariZoneEntranceText_75365 - db "@" + text_far _SafariZoneEntranceText_75365 + text_end .NotEnoughMoneyText - TX_FAR _SafariZoneEntranceText_7536a - db "@" + text_far _SafariZoneEntranceText_7536a + text_end .SafariZoneEntranceText5 - TX_FAR SafariZoneEntranceText_9e814 - TX_ASM + text_far SafariZoneEntranceText_9e814 + text_asm call YesNoChoice ld a, [wCurrentMenuItem] and a @@ -231,7 +231,7 @@ SafariZoneGate_TextPointers: ld hl, .SafariZoneEntranceText_753bb call PrintText xor a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, D_DOWN ld c, $3 call SafariZoneEntranceAutoWalk @@ -243,7 +243,7 @@ SafariZoneGate_TextPointers: ld hl, .SafariZoneEntranceText_753c0 call PrintText ld a, SPRITE_FACING_UP - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld a, D_UP ld c, $1 call SafariZoneEntranceAutoWalk @@ -255,19 +255,19 @@ SafariZoneGate_TextPointers: jp TextScriptEnd .SafariZoneEntranceText_753bb - TX_FAR _SafariZoneEntranceText_753bb - db "@" + text_far _SafariZoneEntranceText_753bb + text_end .SafariZoneEntranceText_753c0 - TX_FAR _SafariZoneEntranceText_753c0 - db "@" + text_far _SafariZoneEntranceText_753c0 + text_end .SafariZoneEntranceText6 - TX_FAR _SafariZoneEntranceText_753c5 - db "@" + text_far _SafariZoneEntranceText_753c5 + text_end .SafariZoneEntranceText2 - TX_ASM + text_asm ld hl, .FirstTimeQuestionText call PrintText call YesNoChoice @@ -281,13 +281,13 @@ SafariZoneGate_TextPointers: jp TextScriptEnd .FirstTimeQuestionText - TX_FAR _SafariZoneEntranceText_753e6 - db "@" + text_far _SafariZoneEntranceText_753e6 + text_end .ExplanationText - TX_FAR _SafariZoneEntranceText_753eb - db "@" + text_far _SafariZoneEntranceText_753eb + text_end .RegularText - TX_FAR _SafariZoneEntranceText_753f0 - db "@" + text_far _SafariZoneEntranceText_753f0 + text_end diff --git a/scripts/SafariZoneNorth.asm b/scripts/SafariZoneNorth.asm old mode 100755 new mode 100644 index 734328b4..aaf39ea2 --- a/scripts/SafariZoneNorth.asm +++ b/scripts/SafariZoneNorth.asm @@ -11,21 +11,21 @@ SafariZoneNorth_TextPointers: dw SafariZoneNorthText7 SafariZoneNorthText3: - TX_FAR _SafariZoneNorthText3 - db "@" + text_far _SafariZoneNorthText3 + text_end SafariZoneNorthText4: - TX_FAR _SafariZoneNorthText4 - db "@" + text_far _SafariZoneNorthText4 + text_end SafariZoneNorthText5: - TX_FAR _SafariZoneNorthText5 - db "@" + text_far _SafariZoneNorthText5 + text_end SafariZoneNorthText6: - TX_FAR _SafariZoneNorthText6 - db "@" + text_far _SafariZoneNorthText6 + text_end SafariZoneNorthText7: - TX_FAR _SafariZoneNorthText7 - db "@" + text_far _SafariZoneNorthText7 + text_end diff --git a/scripts/SafariZoneNorthRestHouse.asm b/scripts/SafariZoneNorthRestHouse.asm old mode 100755 new mode 100644 index fdc438f4..b7a690a1 --- a/scripts/SafariZoneNorthRestHouse.asm +++ b/scripts/SafariZoneNorthRestHouse.asm @@ -8,13 +8,13 @@ SafariZoneNorthRestHouse_TextPointers: dw SafariZoneRestHouse4Text3 SafariZoneRestHouse4Text1: - TX_FAR _SafariZoneRestHouse4Text1 - db "@" + text_far _SafariZoneRestHouse4Text1 + text_end SafariZoneRestHouse4Text2: - TX_FAR _SafariZoneRestHouse4Text2 - db "@" + text_far _SafariZoneRestHouse4Text2 + text_end SafariZoneRestHouse4Text3: - TX_FAR _SafariZoneRestHouse4Text3 - db "@" + text_far _SafariZoneRestHouse4Text3 + text_end diff --git a/scripts/SafariZoneSecretHouse.asm b/scripts/SafariZoneSecretHouse.asm old mode 100755 new mode 100644 index 2d9b2305..6eeff8ad --- a/scripts/SafariZoneSecretHouse.asm +++ b/scripts/SafariZoneSecretHouse.asm @@ -5,41 +5,41 @@ SafariZoneSecretHouse_TextPointers: dw SafariZoneSecretHouseText1 SafariZoneSecretHouseText1: - TX_ASM + text_asm CheckEvent EVENT_GOT_HM03 - jr nz, .asm_20a9b + jr nz, .got_item ld hl, SafariZoneSecretHouseText_4a350 call PrintText - lb bc, HM_03, 1 + lb bc, HM_SURF, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedHM03Text call PrintText SetEvent EVENT_GOT_HM03 - jr .asm_8f1fc -.BagFull + jr .done +.bag_full ld hl, HM03NoRoomText call PrintText - jr .asm_8f1fc -.asm_20a9b + jr .done +.got_item ld hl, HM03ExplanationText call PrintText -.asm_8f1fc +.done jp TextScriptEnd SafariZoneSecretHouseText_4a350: - TX_FAR _SecretHouseText_4a350 - db "@" + text_far _SecretHouseText_4a350 + text_end ReceivedHM03Text: - TX_FAR _ReceivedHM03Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedHM03Text + sound_get_item_1 + text_end HM03ExplanationText: - TX_FAR _HM03ExplanationText - db "@" + text_far _HM03ExplanationText + text_end HM03NoRoomText: - TX_FAR _HM03NoRoomText - db "@" + text_far _HM03NoRoomText + text_end diff --git a/scripts/SafariZoneWest.asm b/scripts/SafariZoneWest.asm old mode 100755 new mode 100644 index 483a92ee..7ae0807d --- a/scripts/SafariZoneWest.asm +++ b/scripts/SafariZoneWest.asm @@ -12,17 +12,17 @@ SafariZoneWest_TextPointers: dw SafariZoneWestText8 SafariZoneWestText5: - TX_FAR _SafariZoneWestText5 - db "@" + text_far _SafariZoneWestText5 + text_end SafariZoneWestText6: - TX_FAR _SafariZoneWestText6 - db "@" + text_far _SafariZoneWestText6 + text_end SafariZoneWestText7: - TX_FAR _SafariZoneWestText7 - db "@" + text_far _SafariZoneWestText7 + text_end SafariZoneWestText8: - TX_FAR _SafariZoneWestText8 - db "@" + text_far _SafariZoneWestText8 + text_end diff --git a/scripts/SafariZoneWestRestHouse.asm b/scripts/SafariZoneWestRestHouse.asm old mode 100755 new mode 100644 index 371bd56c..74ad98fe --- a/scripts/SafariZoneWestRestHouse.asm +++ b/scripts/SafariZoneWestRestHouse.asm @@ -8,13 +8,13 @@ SafariZoneWestRestHouse_TextPointers: dw SafariZoneRestHouse2Text3 SafariZoneRestHouse2Text1: - TX_FAR _SafariZoneRestHouse2Text1 - db "@" + text_far _SafariZoneRestHouse2Text1 + text_end SafariZoneRestHouse2Text2: - TX_FAR _SafariZoneRestHouse2Text2 - db "@" + text_far _SafariZoneRestHouse2Text2 + text_end SafariZoneRestHouse2Text3: - TX_FAR _SafariZoneRestHouse2Text3 - db "@" + text_far _SafariZoneRestHouse2Text3 + text_end diff --git a/scripts/SaffronCity.asm b/scripts/SaffronCity.asm old mode 100755 new mode 100644 index 02e6e2bb..84982534 --- a/scripts/SaffronCity.asm +++ b/scripts/SaffronCity.asm @@ -29,94 +29,94 @@ SaffronCity_TextPointers: dw SaffronCityText25 SaffronCityText1: - TX_FAR _SaffronCityText1 - db "@" + text_far _SaffronCityText1 + text_end SaffronCityText2: - TX_FAR _SaffronCityText2 - db "@" + text_far _SaffronCityText2 + text_end SaffronCityText3: - TX_FAR _SaffronCityText3 - db "@" + text_far _SaffronCityText3 + text_end SaffronCityText4: - TX_FAR _SaffronCityText4 - db "@" + text_far _SaffronCityText4 + text_end SaffronCityText5: - TX_FAR _SaffronCityText5 - db "@" + text_far _SaffronCityText5 + text_end SaffronCityText6: - TX_FAR _SaffronCityText6 - db "@" + text_far _SaffronCityText6 + text_end SaffronCityText7: - TX_FAR _SaffronCityText7 - db "@" + text_far _SaffronCityText7 + text_end SaffronCityText8: - TX_FAR _SaffronCityText8 - db "@" + text_far _SaffronCityText8 + text_end SaffronCityText9: - TX_FAR _SaffronCityText9 - db "@" + text_far _SaffronCityText9 + text_end SaffronCityText10: - TX_FAR _SaffronCityText10 - db "@" + text_far _SaffronCityText10 + text_end SaffronCityText11: - TX_FAR _SaffronCityText11 - db "@" + text_far _SaffronCityText11 + text_end SaffronCityText12: - TX_FAR _SaffronCityText12 - TX_CRY_PIDGEOT - db "@" + text_far _SaffronCityText12 + sound_cry_pidgeot + text_end SaffronCityText13: - TX_FAR _SaffronCityText13 - db "@" + text_far _SaffronCityText13 + text_end SaffronCityText14: - TX_FAR _SaffronCityText14 - db "@" + text_far _SaffronCityText14 + text_end SaffronCityText15: - TX_FAR _SaffronCityText15 - db "@" + text_far _SaffronCityText15 + text_end SaffronCityText16: - TX_FAR _SaffronCityText16 - db "@" + text_far _SaffronCityText16 + text_end SaffronCityText17: - TX_FAR _SaffronCityText17 - db "@" + text_far _SaffronCityText17 + text_end SaffronCityText18: - TX_FAR _SaffronCityText18 - db "@" + text_far _SaffronCityText18 + text_end SaffronCityText20: - TX_FAR _SaffronCityText20 - db "@" + text_far _SaffronCityText20 + text_end SaffronCityText21: - TX_FAR _SaffronCityText21 - db "@" + text_far _SaffronCityText21 + text_end SaffronCityText22: - TX_FAR _SaffronCityText22 - db "@" + text_far _SaffronCityText22 + text_end SaffronCityText24: - TX_FAR _SaffronCityText24 - db "@" + text_far _SaffronCityText24 + text_end SaffronCityText25: - TX_FAR _SaffronCityText25 - db "@" + text_far _SaffronCityText25 + text_end diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm old mode 100755 new mode 100644 index e51763e5..f90bba65 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -2,7 +2,7 @@ SaffronGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] - call nz, .extra + call nz, .LoadNames call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 ld de, SaffronGym_ScriptPointers @@ -11,15 +11,15 @@ SaffronGym_Script: ld [wSaffronGymCurScript], a ret -.extra - ld hl, Gym6CityName - ld de, Gym6LeaderName +.LoadNames: + ld hl, .CityName + ld de, .LeaderName jp LoadGymLeaderAndCityName -Gym6CityName: +.CityName: db "SAFFRON CITY@" -Gym6LeaderName: +.LeaderName: db "SABRINA@" SaffronGymText_5d048: @@ -44,26 +44,26 @@ SaffronGymScript3: SaffronGymText_5d068: ld a, $a - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_SABRINA - lb bc, TM_46, 1 + lb bc, TM_PSYWAVE, 1 call GiveItem jr nc, .BagFull ld a, $b - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM46 - jr .asm_5d091 + jr .gymVictory .BagFull ld a, $c - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5d091 +.gymVictory ld hl, wObtainedBadges - set 5, [hl] + set BIT_MARSHBADGE, [hl] ld hl, wBeatGymFlags - set 5, [hl] + set BIT_MARSHBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_SAFFRON_GYM_TRAINER_0, EVENT_BEAT_SAFFRON_GYM_TRAINER_6 @@ -85,84 +85,35 @@ SaffronGym_TextPointers: dw SaffronGymText12 SaffronGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_0 - dw SaffronGymBattleText1 ; TextBeforeBattle - dw SaffronGymAfterBattleText1 ; TextAfterBattle - dw SaffronGymEndBattleText1 ; TextEndBattle - dw SaffronGymEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_0, 3, SaffronGymBattleText1, SaffronGymEndBattleText1, SaffronGymAfterBattleText1 SaffronGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_1 - dw SaffronGymBattleText2 ; TextBeforeBattle - dw SaffronGymAfterBattleText2 ; TextAfterBattle - dw SaffronGymEndBattleText2 ; TextEndBattle - dw SaffronGymEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_1, 3, SaffronGymBattleText2, SaffronGymEndBattleText2, SaffronGymAfterBattleText2 SaffronGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_2 - dw SaffronGymBattleText3 ; TextBeforeBattle - dw SaffronGymAfterBattleText3 ; TextAfterBattle - dw SaffronGymEndBattleText3 ; TextEndBattle - dw SaffronGymEndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_2, 3, SaffronGymBattleText3, SaffronGymEndBattleText3, SaffronGymAfterBattleText3 SaffronGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_3 - dw SaffronGymBattleText4 ; TextBeforeBattle - dw SaffronGymAfterBattleText4 ; TextAfterBattle - dw SaffronGymEndBattleText4 ; TextEndBattle - dw SaffronGymEndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_3, 3, SaffronGymBattleText4, SaffronGymEndBattleText4, SaffronGymAfterBattleText4 SaffronGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_4 - dw SaffronGymBattleText5 ; TextBeforeBattle - dw SaffronGymAfterBattleText5 ; TextAfterBattle - dw SaffronGymEndBattleText5 ; TextEndBattle - dw SaffronGymEndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_4, 3, SaffronGymBattleText5, SaffronGymEndBattleText5, SaffronGymAfterBattleText5 SaffronGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_5 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_5 - dw SaffronGymBattleText6 ; TextBeforeBattle - dw SaffronGymAfterBattleText6 ; TextAfterBattle - dw SaffronGymEndBattleText6 ; TextEndBattle - dw SaffronGymEndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_5, 3, SaffronGymBattleText6, SaffronGymEndBattleText6, SaffronGymAfterBattleText6 SaffronGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 - dw SaffronGymBattleText7 ; TextBeforeBattle - dw SaffronGymAfterBattleText7 ; TextAfterBattle - dw SaffronGymEndBattleText7 ; TextEndBattle - dw SaffronGymEndBattleText7 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1, 3, SaffronGymBattleText7, SaffronGymEndBattleText7, SaffronGymAfterBattleText7 + db -1 ; end SaffronGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SABRINA - jr z, .asm_5d134 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM46 - jr nz, .asm_5d12c + jr nz, .afterVictory call z, SaffronGymText_5d068 call DisableWaitingAfterTextDisplay - jr .asm_5d15f -.asm_5d12c + jr .done +.afterVictory ld hl, SaffronGymText_5d16e call PrintText - jr .asm_5d15f -.asm_5d134 + jr .done +.beginBattle ld hl, SaffronGymText_5d162 call PrintText ld hl, wd72d @@ -171,7 +122,7 @@ SaffronGymText1: ld hl, SaffronGymText_5d167 ld de, SaffronGymText_5d167 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -179,81 +130,81 @@ SaffronGymText1: ld [wGymLeaderNo], a ld a, $3 ld [wSaffronGymCurScript], a -.asm_5d15f +.done jp TextScriptEnd SaffronGymText_5d162: - TX_FAR _SaffronGymText_5d162 - db "@" + text_far _SaffronGymText_5d162 + text_end SaffronGymText_5d167: - TX_FAR _SaffronGymText_5d167 - TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded - TX_BLINK - db "@" + text_far _SaffronGymText_5d167 + sound_get_key_item ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded + text_promptbutton + text_end SaffronGymText_5d16e: - TX_FAR _SaffronGymText_5d16e - db "@" + text_far _SaffronGymText_5d16e + text_end SaffronGymText10: - TX_FAR _SaffronGymText_5d173 - db "@" + text_far _SaffronGymText_5d173 + text_end SaffronGymText11: - TX_FAR ReceivedTM46Text - TX_SFX_ITEM_1 - TX_FAR _TM46ExplanationText - db "@" + text_far ReceivedTM46Text + sound_get_item_1 + text_far _TM46ExplanationText + text_end SaffronGymText12: - TX_FAR _TM46NoRoomText - db "@" + text_far _TM46NoRoomText + text_end SaffronGymText2: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd SaffronGymText3: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd SaffronGymText4: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd SaffronGymText5: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd SaffronGymText6: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd SaffronGymText7: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd SaffronGymText8: - TX_ASM + text_asm ld hl, SaffronGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd SaffronGymText9: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SABRINA jr nz, .asm_5d1dd ld hl, SaffronGymText_5d1e6 @@ -266,93 +217,93 @@ SaffronGymText9: jp TextScriptEnd SaffronGymText_5d1e6: - TX_FAR _SaffronGymText_5d1e6 - db "@" + text_far _SaffronGymText_5d1e6 + text_end SaffronGymText_5d1eb: - TX_FAR _SaffronGymText_5d1eb - db "@" + text_far _SaffronGymText_5d1eb + text_end SaffronGymBattleText1: - TX_FAR _SaffronGymBattleText1 - db "@" + text_far _SaffronGymBattleText1 + text_end SaffronGymEndBattleText1: - TX_FAR _SaffronGymEndBattleText1 - db "@" + text_far _SaffronGymEndBattleText1 + text_end SaffronGymAfterBattleText1: - TX_FAR _SaffronGymAfterBattleText1 - db "@" + text_far _SaffronGymAfterBattleText1 + text_end SaffronGymBattleText2: - TX_FAR _SaffronGymBattleText2 - db "@" + text_far _SaffronGymBattleText2 + text_end SaffronGymEndBattleText2: - TX_FAR _SaffronGymEndBattleText2 - db "@" + text_far _SaffronGymEndBattleText2 + text_end SaffronGymAfterBattleText2: - TX_FAR _SaffronGymAfterBattleText2 - db "@" + text_far _SaffronGymAfterBattleText2 + text_end SaffronGymBattleText3: - TX_FAR _SaffronGymBattleText3 - db "@" + text_far _SaffronGymBattleText3 + text_end SaffronGymEndBattleText3: - TX_FAR _SaffronGymEndBattleText3 - db "@" + text_far _SaffronGymEndBattleText3 + text_end SaffronGymAfterBattleText3: - TX_FAR _SaffronGymAfterBattleText3 - db "@" + text_far _SaffronGymAfterBattleText3 + text_end SaffronGymBattleText4: - TX_FAR _SaffronGymBattleText4 - db "@" + text_far _SaffronGymBattleText4 + text_end SaffronGymEndBattleText4: - TX_FAR _SaffronGymEndBattleText4 - db "@" + text_far _SaffronGymEndBattleText4 + text_end SaffronGymAfterBattleText4: - TX_FAR _SaffronGymAfterBattleText4 - db "@" + text_far _SaffronGymAfterBattleText4 + text_end SaffronGymBattleText5: - TX_FAR _SaffronGymBattleText5 - db "@" + text_far _SaffronGymBattleText5 + text_end SaffronGymEndBattleText5: - TX_FAR _SaffronGymEndBattleText5 - db "@" + text_far _SaffronGymEndBattleText5 + text_end SaffronGymAfterBattleText5: - TX_FAR _SaffronGymAfterBattleText5 - db "@" + text_far _SaffronGymAfterBattleText5 + text_end SaffronGymBattleText6: - TX_FAR _SaffronGymBattleText6 - db "@" + text_far _SaffronGymBattleText6 + text_end SaffronGymEndBattleText6: - TX_FAR _SaffronGymEndBattleText6 - db "@" + text_far _SaffronGymEndBattleText6 + text_end SaffronGymAfterBattleText6: - TX_FAR _SaffronGymAfterBattleText6 - db "@" + text_far _SaffronGymAfterBattleText6 + text_end SaffronGymBattleText7: - TX_FAR _SaffronGymBattleText7 - db "@" + text_far _SaffronGymBattleText7 + text_end SaffronGymEndBattleText7: - TX_FAR _SaffronGymEndBattleText7 - db "@" + text_far _SaffronGymEndBattleText7 + text_end SaffronGymAfterBattleText7: - TX_FAR _SaffronGymAfterBattleText7 - db "@" + text_far _SaffronGymAfterBattleText7 + text_end diff --git a/scripts/SaffronMart.asm b/scripts/SaffronMart.asm old mode 100755 new mode 100644 index ebb3cddf..bfa47eb1 --- a/scripts/SaffronMart.asm +++ b/scripts/SaffronMart.asm @@ -7,9 +7,9 @@ SaffronMart_TextPointers: dw SaffronMartText3 SaffronMartText2: - TX_FAR _SaffronMartText2 - db "@" + text_far _SaffronMartText2 + text_end SaffronMartText3: - TX_FAR _SaffronMartText3 - db "@" + text_far _SaffronMartText3 + text_end diff --git a/scripts/SaffronPidgeyHouse.asm b/scripts/SaffronPidgeyHouse.asm old mode 100755 new mode 100644 index f38fbfdb..90078e81 --- a/scripts/SaffronPidgeyHouse.asm +++ b/scripts/SaffronPidgeyHouse.asm @@ -8,20 +8,20 @@ SaffronPidgeyHouse_TextPointers: dw SaffronHouse1Text4 SaffronHouse1Text1: - TX_FAR _SaffronHouse1Text1 - db "@" + text_far _SaffronHouse1Text1 + text_end SaffronHouse1Text2: - TX_FAR _SaffronHouse1Text2 - TX_ASM + text_far _SaffronHouse1Text2 + text_asm ld a, PIDGEY call PlayCry jp TextScriptEnd SaffronHouse1Text3: - TX_FAR _SaffronHouse1Text3 - db "@" + text_far _SaffronHouse1Text3 + text_end SaffronHouse1Text4: - TX_FAR _SaffronHouse1Text4 - db "@" + text_far _SaffronHouse1Text4 + text_end diff --git a/scripts/SaffronPokecenter.asm b/scripts/SaffronPokecenter.asm old mode 100755 new mode 100644 index a1d73628..68eb4fc6 --- a/scripts/SaffronPokecenter.asm +++ b/scripts/SaffronPokecenter.asm @@ -9,15 +9,15 @@ SaffronPokecenter_TextPointers: dw SaffronTradeNurseText SaffronHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse SaffronPokecenterText2: - TX_FAR _SaffronPokecenterText2 - db "@" + text_far _SaffronPokecenterText2 + text_end SaffronPokecenterText3: - TX_FAR _SaffronPokecenterText3 - db "@" + text_far _SaffronPokecenterText3 + text_end SaffronTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/SeafoamIslands1F.asm b/scripts/SeafoamIslands1F.asm old mode 100755 new mode 100644 index dc3b8599..ceb2a2fb --- a/scripts/SeafoamIslands1F.asm +++ b/scripts/SeafoamIslands1F.asm @@ -32,15 +32,15 @@ SeafoamIslands1F_Script: ld [wMissableObjectIndex], a predef_jump ShowObject .asm_4483b - ld a, $9f + ld a, SEAFOAM_ISLANDS_B1F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam1HolesCoords jp IsPlayerOnDungeonWarp Seafoam1HolesCoords: - db $06,$11 - db $06,$18 - db $ff + dbmapcoord 17, 6 + dbmapcoord 24, 6 + db -1 ; end SeafoamIslands1F_TextPointers: dw BoulderText diff --git a/scripts/SeafoamIslandsB1F.asm b/scripts/SeafoamIslandsB1F.asm old mode 100755 new mode 100644 index 876c0837..ac667513 --- a/scripts/SeafoamIslandsB1F.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -31,15 +31,15 @@ SeafoamIslandsB1F_Script: ld [wMissableObjectIndex], a predef_jump ShowObject .asm_46362 - ld a, $a0 + ld a, SEAFOAM_ISLANDS_B2F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam2HolesCoords jp IsPlayerOnDungeonWarp Seafoam2HolesCoords: - db $06,$12 - db $06,$17 - db $ff + dbmapcoord 18, 6 + dbmapcoord 23, 6 + db -1 ; end SeafoamIslandsB1F_TextPointers: dw BoulderText diff --git a/scripts/SeafoamIslandsB2F.asm b/scripts/SeafoamIslandsB2F.asm old mode 100755 new mode 100644 index c0141a3e..fe4b3ead --- a/scripts/SeafoamIslandsB2F.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -31,15 +31,15 @@ SeafoamIslandsB2F_Script: ld [wMissableObjectIndex], a predef_jump ShowObject .asm_4649e - ld a, $a1 + ld a, SEAFOAM_ISLANDS_B3F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam3HolesCoords jp IsPlayerOnDungeonWarp Seafoam3HolesCoords: - db $06,$13 - db $06,$16 - db $ff + dbmapcoord 19, 6 + dbmapcoord 22, 6 + db -1 ; end SeafoamIslandsB2F_TextPointers: dw BoulderText diff --git a/scripts/SeafoamIslandsB3F.asm b/scripts/SeafoamIslandsB3F.asm old mode 100755 new mode 100644 index 7343b17d..9d1093e5 --- a/scripts/SeafoamIslandsB3F.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -32,7 +32,7 @@ SeafoamIslandsB3F_Script: predef ShowObject jr .asm_465ed .asm_465dc - ld a, $a2 + ld a, SEAFOAM_ISLANDS_B4F ld [wDungeonWarpDestinationMap], a ld hl, Seafoam4HolesCoords call IsPlayerOnDungeonWarp @@ -45,9 +45,9 @@ SeafoamIslandsB3F_Script: jp CallFunctionInTable Seafoam4HolesCoords: - db $10,$03 - db $10,$06 - db $ff + dbmapcoord 3, 16 + dbmapcoord 6, 16 + db -1 ; end SeafoamIslandsB3F_ScriptPointers: dw SeafoamIslands4Script0 @@ -59,10 +59,10 @@ SeafoamIslands4Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wYCoord] - cp $8 + cp 8 ret nz ld a, [wXCoord] - cp $f + cp 15 ret nz ld hl, wSimulatedJoypadStatesEnd ld de, RLEMovement46632 @@ -77,10 +77,10 @@ SeafoamIslands4Script0: ret RLEMovement46632: - db D_DOWN,6 - db D_RIGHT,5 - db D_DOWN,3 - db $ff + db D_DOWN, 6 + db D_RIGHT, 5 + db D_DOWN, 3 + db -1 ; end SeafoamIslands4Script1: ld a, [wSimulatedJoypadStatesIndex] @@ -94,9 +94,9 @@ SeafoamIslands4Script2: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wXCoord] - cp $12 + cp 18 jr z, .asm_4665e - cp $13 + cp 19 ld a, $0 jr nz, .asm_4667b ld de, RLEData_4667f @@ -109,7 +109,7 @@ SeafoamIslands4Script2: dec a ld [wSimulatedJoypadStatesIndex], a xor a - ld [wSpriteStateData2 + $06], a + ld [wSpritePlayerStateData2MovementByte1], a ld hl, wd730 set 7, [hl] ld hl, wFlags_D733 @@ -120,17 +120,17 @@ SeafoamIslands4Script2: ret RLEData_4667f: - db D_DOWN,$06 - db D_RIGHT,$02 - db D_DOWN,$04 - db D_LEFT,$01 - db $FF + db D_DOWN, 6 + db D_RIGHT, 2 + db D_DOWN, 4 + db D_LEFT, 1 + db -1 ; end RLEData_46688: - db D_DOWN,$06 - db D_RIGHT,$02 - db D_DOWN,$04 - db $FF + db D_DOWN, 6 + db D_RIGHT, 2 + db D_DOWN, 4 + db -1 ; end SeafoamIslands4Script3: ld a, [wSimulatedJoypadStatesIndex] diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm old mode 100755 new mode 100644 index d08628d0..bf80d3e0 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -53,11 +53,11 @@ SeafoamIslands5Script0: ret .Coords - db $11,$14 - db $11,$15 - db $10,$14 - db $10,$15 - db $FF + dbmapcoord 20, 17 + dbmapcoord 21, 17 + dbmapcoord 20, 16 + dbmapcoord 21, 16 + db -1 ; end SeafoamIslands5Script1: ld a, [wSimulatedJoypadStatesIndex] @@ -96,21 +96,21 @@ SeafoamIslands5Script2: ret .Coords - db $0E,$04 - db $0E,$05 - db $FF + dbmapcoord 4, 14 + dbmapcoord 5, 14 + db -1 ; end RLEMovementData_46852: - db D_UP,$03 - db D_RIGHT,$02 - db D_UP,$01 - db $FF + db D_UP, 3 + db D_RIGHT, 2 + db D_UP, 1 + db -1 ; end RLEMovementData_46859: - db D_UP,$03 - db D_RIGHT,$03 - db D_UP,$01 - db $FF + db D_UP, 3 + db D_RIGHT, 3 + db D_UP, 1 + db -1 ; end SeafoamIslands5Script3: ld a, [wSimulatedJoypadStatesIndex] @@ -138,18 +138,11 @@ SeafoamIslandsB4F_TextPointers: dw SeafoamIslands5Text5 ArticunoTrainerHeader: - dbEventFlagBit EVENT_BEAT_ARTICUNO - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ARTICUNO - dw ArticunoBattleText ; TextBeforeBattle - dw ArticunoBattleText ; TextAfterBattle - dw ArticunoBattleText ; TextEndBattle - dw ArticunoBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_ARTICUNO, 0, ArticunoBattleText, ArticunoBattleText, ArticunoBattleText + db -1 ; end ArticunoText: - TX_ASM + text_asm ld hl, ArticunoTrainerHeader call TalkToTrainer ld a, $4 @@ -157,17 +150,17 @@ ArticunoText: jp TextScriptEnd ArticunoBattleText: - TX_FAR _ArticunoBattleText - TX_ASM + text_far _ArticunoBattleText + text_asm ld a, ARTICUNO call PlayCry call WaitForSoundToFinish jp TextScriptEnd SeafoamIslands5Text4: - TX_FAR _SeafoamIslands5Text4 - db "@" + text_far _SeafoamIslands5Text4 + text_end SeafoamIslands5Text5: - TX_FAR _SeafoamIslands5Text5 - db "@" + text_far _SeafoamIslands5Text5 + text_end diff --git a/scripts/SilphCo10F.asm b/scripts/SilphCo10F.asm old mode 100755 new mode 100644 index 40506682..29b640fd --- a/scripts/SilphCo10F.asm +++ b/scripts/SilphCo10F.asm @@ -24,11 +24,11 @@ SilphCo10Script_5a14f: predef_jump ReplaceTileBlock SilphCo10GateCoords: - db $04,$05 - db $FF + dbmapcoord 5, 4 + db -1 ; end SilphCo10Text_5a176: - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR @@ -48,39 +48,25 @@ SilphCo10F_TextPointers: dw PickUpItemText SilphCo10TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_0 - dw SilphCo10BattleText1 ; TextBeforeBattle - dw SilphCo10AfterBattleText1 ; TextAfterBattle - dw SilphCo10EndBattleText1 ; TextEndBattle - dw SilphCo10EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_0, 3, SilphCo10BattleText1, SilphCo10EndBattleText1, SilphCo10AfterBattleText1 SilphCo10TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_1 - dw SilphCo10BattleText2 ; TextBeforeBattle - dw SilphCo10AfterBattleText2 ; TextAfterBattle - dw SilphCo10EndBattleText2 ; TextEndBattle - dw SilphCo10EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_10F_TRAINER_1, 4, SilphCo10BattleText2, SilphCo10EndBattleText2, SilphCo10AfterBattleText2 + db -1 ; end SilphCo10Text1: - TX_ASM + text_asm ld hl, SilphCo10TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo10Text2: - TX_ASM + text_asm ld hl, SilphCo10TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo10Text3: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo10Text_5a1d8 jr nz, .asm_cf85f @@ -90,33 +76,33 @@ SilphCo10Text3: jp TextScriptEnd SilphCo10Text_5a1d3: - TX_FAR _SilphCo10Text_5a1d3 - db "@" + text_far _SilphCo10Text_5a1d3 + text_end SilphCo10Text_5a1d8: - TX_FAR _SilphCo10Text_5a1d8 - db "@" + text_far _SilphCo10Text_5a1d8 + text_end SilphCo10BattleText1: - TX_FAR _SilphCo10BattleText1 - db "@" + text_far _SilphCo10BattleText1 + text_end SilphCo10EndBattleText1: - TX_FAR _SilphCo10EndBattleText1 - db "@" + text_far _SilphCo10EndBattleText1 + text_end SilphCo10AfterBattleText1: - TX_FAR _SilphCo10AfterBattleText1 - db "@" + text_far _SilphCo10AfterBattleText1 + text_end SilphCo10BattleText2: - TX_FAR _SilphCo10BattleText2 - db "@" + text_far _SilphCo10BattleText2 + text_end SilphCo10EndBattleText2: - TX_FAR _SilphCo10EndBattleText2 - db "@" + text_far _SilphCo10EndBattleText2 + text_end SilphCo10AfterBattleText2: - TX_FAR _SilphCo10AfterBattleText2 - db "@" + text_far _SilphCo10AfterBattleText2 + text_end diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm old mode 100755 new mode 100644 index 483082a1..f3a7088b --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -24,8 +24,8 @@ SilphCo11Script_62110: predef_jump ReplaceTileBlock SilphCo11GateCoords: - db $06,$03 - db $FF + dbmapcoord 3, 6 + db -1 ; end SilphCo11Script_62137: push hl @@ -35,14 +35,14 @@ SilphCo11Script_62137: ld a, [hl] ld c, a xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a pop hl .asm_62143 ld a, [hli] cp $ff jr z, .asm_6215f push hl - ld hl, $ffe0 + ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b @@ -60,11 +60,11 @@ SilphCo11Script_62137: ret .asm_6215f xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a ret SilphCo11Script_62163: - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR @@ -85,7 +85,7 @@ SilphCo11Script_6216d: ld hl, MissableObjectIDs_62194 .asm_62184 ld a, [hli] - cp $ff + cp -1 ret z push hl ld [wMissableObjectIndex], a @@ -100,7 +100,7 @@ MissableObjectIDs_62194: db HS_SAFFRON_CITY_B db HS_SAFFRON_CITY_C db HS_SAFFRON_CITY_D - db $FF + db -1 ; end MissableObjectIDs_6219b: db HS_SAFFRON_CITY_1 @@ -143,7 +143,7 @@ MissableObjectIDs_6219b: db HS_SILPH_CO_11F_1 db HS_SILPH_CO_11F_2 db HS_SILPH_CO_11F_3 - db $FF + db -1 ; end SilphCo11Script_621c4: xor a @@ -171,14 +171,14 @@ SilphCo11Script0: ld a, [wCoordIndex] ld [wcf0d], a xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld de, MovementData_62216 call MoveSprite @@ -186,22 +186,22 @@ SilphCo11Script0: jp SilphCo11Script_621c8 CoordsData_62211: - db $0D,$06 - db $0C,$07 - db $FF + dbmapcoord 6, 13 + dbmapcoord 7, 12 + db -1 ; end MovementData_62216: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end SilphCo11Script_6221a: ld [wPlayerMovingDirection], a ld a, $3 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, b - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: @@ -222,7 +222,7 @@ SilphCo11Script5: ld a, $f0 ld [wJoyIgnore], a ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack call SilphCo11Script_6216d @@ -239,7 +239,7 @@ SilphCo11Script3: bit 0, a ret nz ld a, $3 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, [wcf0d] cp $1 @@ -263,7 +263,7 @@ SilphCo11Script4: ld hl, SilphCo10Text_62330 ld de, SilphCo10Text_62330 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -281,119 +281,105 @@ SilphCo11F_TextPointers: dw SilphCo11Text6 SilphCo11TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0 - dw SilphCo11BattleText1 ; TextBeforeBattle - dw SilphCo11AfterBattleText1 ; TextAfterBattle - dw SilphCo11EndBattleText1 ; TextEndBattle - dw SilphCo11EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_0, 4, SilphCo11BattleText1, SilphCo11EndBattleText1, SilphCo11AfterBattleText1 SilphCo11TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1 - dw SilphCo11BattleText2 ; TextBeforeBattle - dw SilphCo11AfterBattleText2 ; TextAfterBattle - dw SilphCo11EndBattleText2 ; TextEndBattle - dw SilphCo11EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11BattleText2, SilphCo11EndBattleText2, SilphCo11AfterBattleText2 + db -1 ; end SilphCo11Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_MASTER_BALL - jp nz, .asm_62308 + jp nz, .got_item ld hl, SilphCoPresidentText call PrintText lb bc, MASTER_BALL, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedSilphCoMasterBallText call PrintText SetEvent EVENT_GOT_MASTER_BALL - jr .asm_6230e -.BagFull + jr .done +.bag_full ld hl, SilphCoMasterBallNoRoomText call PrintText - jr .asm_6230e -.asm_62308 + jr .done +.got_item ld hl, SilphCo10Text_6231c call PrintText -.asm_6230e +.done jp TextScriptEnd SilphCoPresidentText: - TX_FAR _SilphCoPresidentText - db "@" + text_far _SilphCoPresidentText + text_end ReceivedSilphCoMasterBallText: - TX_FAR _ReceivedSilphCoMasterBallText - TX_SFX_KEY_ITEM - db "@" + text_far _ReceivedSilphCoMasterBallText + sound_get_key_item + text_end SilphCo10Text_6231c: - TX_FAR _SilphCo10Text_6231c - db "@" + text_far _SilphCo10Text_6231c + text_end SilphCoMasterBallNoRoomText: - TX_FAR _SilphCoMasterBallNoRoomText - db "@" + text_far _SilphCoMasterBallNoRoomText + text_end SilphCo11Text2: - TX_FAR _SilphCo11Text2 - db "@" + text_far _SilphCo11Text2 + text_end SilphCo11Text3: - TX_FAR _SilphCo11Text3 - db "@" + text_far _SilphCo11Text3 + text_end SilphCo10Text_62330: - TX_FAR _SilphCo10Text_62330 - db "@" + text_far _SilphCo10Text_62330 + text_end SilphCo11Text6: - TX_FAR _SilphCo10Text_62335 - db "@" + text_far _SilphCo10Text_62335 + text_end SilphCo11Text4: - TX_ASM + text_asm ld hl, SilphCo11TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo11BattleText1: - TX_FAR _SilphCo11BattleText1 - db "@" + text_far _SilphCo11BattleText1 + text_end SilphCo11EndBattleText1: - TX_FAR _SilphCo11EndBattleText1 - db "@" + text_far _SilphCo11EndBattleText1 + text_end SilphCo11AfterBattleText1: - TX_FAR _SilphCo11AfterBattleText1 - db "@" + text_far _SilphCo11AfterBattleText1 + text_end SilphCo11Text5: - TX_ASM + text_asm ld hl, SilphCo11TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo11BattleText2: - TX_FAR _SilphCo11BattleText2 - db "@" + text_far _SilphCo11BattleText2 + text_end SilphCo11EndBattleText2: - TX_FAR _SilphCo11EndBattleText2 - db "@" + text_far _SilphCo11EndBattleText2 + text_end SilphCo11AfterBattleText2: - TX_FAR _SilphCo11AfterBattleText2 - db "@" + text_far _SilphCo11AfterBattleText2 + text_end SilphCo10Text_6236c: - TX_ASM + text_asm ld hl, SilphCo10Text_6237b call PrintText ld a, PORYGON @@ -401,5 +387,5 @@ SilphCo10Text_6236c: jp TextScriptEnd SilphCo10Text_6237b: - TX_FAR _SilphCo10Text_6237b - db "@" + text_far _SilphCo10Text_6237b + text_end diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm old mode 100755 new mode 100644 index 6ccaa29c..bc484b7c --- a/scripts/SilphCo1F.asm +++ b/scripts/SilphCo1F.asm @@ -12,5 +12,5 @@ SilphCo1F_TextPointers: dw SilphCo1Text1 SilphCo1Text1: - TX_FAR _SilphCo1Text1 - db "@" + text_far _SilphCo1Text1 + text_end diff --git a/scripts/SilphCo2F.asm b/scripts/SilphCo2F.asm old mode 100755 new mode 100644 index 5fd542cb..4b96c314 --- a/scripts/SilphCo2F.asm +++ b/scripts/SilphCo2F.asm @@ -33,9 +33,9 @@ SilphCo2Script_59d07: predef_jump ReplaceTileBlock SilphCo2GateCoords: - db $02,$02 - db $05,$02 - db $FF + dbmapcoord 2, 2 + dbmapcoord 2, 5 + db -1 ; end SilphCo2Script_59d43: push hl @@ -45,14 +45,14 @@ SilphCo2Script_59d43: ld a, [hl] ld c, a xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a pop hl .asm_59d4f ld a, [hli] cp $ff jr z, .asm_59d6b push hl - ld hl, $ffe0 + ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b @@ -70,12 +70,12 @@ SilphCo2Script_59d43: ret .asm_59d6b xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a ret SilphCo2Script_59d6f: EventFlagAddress hl, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 @@ -99,50 +99,22 @@ SilphCo2F_TextPointers: dw SilphCo2Text5 SilphCo2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_0 - dw SilphCo2BattleText1 ; TextBeforeBattle - dw SilphCo2AfterBattleText1 ; TextAfterBattle - dw SilphCo2EndBattleText1 ; TextEndBattle - dw SilphCo2EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_0, 3, SilphCo2BattleText1, SilphCo2EndBattleText1, SilphCo2AfterBattleText1 SilphCo2TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_1 - dw SilphCo2BattleText2 ; TextBeforeBattle - dw SilphCo2AfterBattleText2 ; TextAfterBattle - dw SilphCo2EndBattleText2 ; TextEndBattle - dw SilphCo2EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_1, 4, SilphCo2BattleText2, SilphCo2EndBattleText2, SilphCo2AfterBattleText2 SilphCo2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_2 - dw SilphCo2BattleText3 ; TextBeforeBattle - dw SilphCo2AfterBattleText3 ; TextAfterBattle - dw SilphCo2EndBattleText3 ; TextEndBattle - dw SilphCo2EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_2, 3, SilphCo2BattleText3, SilphCo2EndBattleText3, SilphCo2AfterBattleText3 SilphCo2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_3 - dw SilphCo2BattleText4 ; TextBeforeBattle - dw SilphCo2AfterBattleText4 ; TextAfterBattle - dw SilphCo2EndBattleText4 ; TextEndBattle - dw SilphCo2EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_2F_TRAINER_3, 3, SilphCo2BattleText4, SilphCo2EndBattleText4, SilphCo2AfterBattleText4 + db -1 ; end SilphCo2Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM36 jr nz, .asm_59de4 ld hl, SilphCo2Text_59ded call PrintText - lb bc, TM_36, 1 + lb bc, TM_SELFDESTRUCT, 1 call GiveItem ld hl, TM36NoRoomText jr nc, .asm_59de7 @@ -156,90 +128,90 @@ SilphCo2Text1: jp TextScriptEnd SilphCo2Text_59ded: - TX_FAR _SilphCo2Text_59ded - db "@" + text_far _SilphCo2Text_59ded + text_end ReceivedTM36Text: - TX_FAR _ReceivedTM36Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedTM36Text + sound_get_item_1 + text_end TM36ExplanationText: - TX_FAR _TM36ExplanationText - db "@" + text_far _TM36ExplanationText + text_end TM36NoRoomText: - TX_FAR _TM36NoRoomText - db "@" + text_far _TM36NoRoomText + text_end SilphCo2Text2: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo2Text3: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo2Text4: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo2Text5: - TX_ASM + text_asm ld hl, SilphCo2TrainerHeader3 call TalkToTrainer jp TextScriptEnd SilphCo2BattleText1: - TX_FAR _SilphCo2BattleText1 - db "@" + text_far _SilphCo2BattleText1 + text_end SilphCo2EndBattleText1: - TX_FAR _SilphCo2EndBattleText1 - db "@" + text_far _SilphCo2EndBattleText1 + text_end SilphCo2AfterBattleText1: - TX_FAR _SilphCo2AfterBattleText1 - db "@" + text_far _SilphCo2AfterBattleText1 + text_end SilphCo2BattleText2: - TX_FAR _SilphCo2BattleText2 - db "@" + text_far _SilphCo2BattleText2 + text_end SilphCo2EndBattleText2: - TX_FAR _SilphCo2EndBattleText2 - db "@" + text_far _SilphCo2EndBattleText2 + text_end SilphCo2AfterBattleText2: - TX_FAR _SilphCo2AfterBattleText2 - db "@" + text_far _SilphCo2AfterBattleText2 + text_end SilphCo2BattleText3: - TX_FAR _SilphCo2BattleText3 - db "@" + text_far _SilphCo2BattleText3 + text_end SilphCo2EndBattleText3: - TX_FAR _SilphCo2EndBattleText3 - db "@" + text_far _SilphCo2EndBattleText3 + text_end SilphCo2AfterBattleText3: - TX_FAR _SilphCo2AfterBattleText3 - db "@" + text_far _SilphCo2AfterBattleText3 + text_end SilphCo2BattleText4: - TX_FAR _SilphCo2BattleText4 - db "@" + text_far _SilphCo2BattleText4 + text_end SilphCo2EndBattleText4: - TX_FAR _SilphCo2EndBattleText4 - db "@" + text_far _SilphCo2EndBattleText4 + text_end SilphCo2AfterBattleText4: - TX_FAR _SilphCo2AfterBattleText4 - db "@" + text_far _SilphCo2AfterBattleText4 + text_end diff --git a/scripts/SilphCo3F.asm b/scripts/SilphCo3F.asm old mode 100755 new mode 100644 index 42b5d611..69dfdad9 --- a/scripts/SilphCo3F.asm +++ b/scripts/SilphCo3F.asm @@ -33,13 +33,13 @@ SilphCo3Script_59f71: predef_jump ReplaceTileBlock SilphCo3GateCoords: - db $04,$04 - db $04,$08 - db $FF + dbmapcoord 4, 4 + dbmapcoord 8, 4 + db -1 ; end SilphCo3Script_59fad: EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 @@ -62,27 +62,13 @@ SilphCo3F_TextPointers: dw PickUpItemText SilphCo3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0 - dw SilphCo3BattleText1 ; TextBeforeBattle - dw SilphCo3AfterBattleText1 ; TextAfterBattle - dw SilphCo3EndBattleText1 ; TextEndBattle - dw SilphCo3EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_0, 2, SilphCo3BattleText1, SilphCo3EndBattleText1, SilphCo3AfterBattleText1 SilphCo3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1 - dw SilphCo3BattleText2 ; TextBeforeBattle - dw SilphCo3AfterBattleText2 ; TextAfterBattle - dw SilphCo3EndBattleText2 ; TextEndBattle - dw SilphCo3EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_3F_TRAINER_1, 3, SilphCo3BattleText2, SilphCo3EndBattleText2, SilphCo3AfterBattleText2 + db -1 ; end SilphCo3Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo3Text_59ffe jr nz, .asm_59fee @@ -92,45 +78,45 @@ SilphCo3Text1: jp TextScriptEnd SilphCo3Text_59ff9: - TX_FAR _SilphCo3Text_59ff9 - db "@" + text_far _SilphCo3Text_59ff9 + text_end SilphCo3Text_59ffe: - TX_FAR _SilphCo3Text_59ffe - db "@" + text_far _SilphCo3Text_59ffe + text_end SilphCo3Text2: - TX_ASM + text_asm ld hl, SilphCo3TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo3BattleText1: - TX_FAR _SilphCo3BattleText1 - db "@" + text_far _SilphCo3BattleText1 + text_end SilphCo3EndBattleText1: - TX_FAR _SilphCo3EndBattleText1 - db "@" + text_far _SilphCo3EndBattleText1 + text_end SilphCo3AfterBattleText1: - TX_FAR _SilphCo3AfterBattleText1 - db "@" + text_far _SilphCo3AfterBattleText1 + text_end SilphCo3Text3: - TX_ASM + text_asm ld hl, SilphCo3TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo3BattleText2: - TX_FAR _SilphCo3BattleText2 - db "@" + text_far _SilphCo3BattleText2 + text_end SilphCo3EndBattleText2: - TX_FAR _SilphCo3EndBattleText2 - db "@" + text_far _SilphCo3EndBattleText2 + text_end SilphCo3AfterBattleText2: - TX_FAR _SilphCo3AfterBattleText2 - db "@" + text_far _SilphCo3AfterBattleText2 + text_end diff --git a/scripts/SilphCo4F.asm b/scripts/SilphCo4F.asm old mode 100755 new mode 100644 index 7d5072f6..8d5d696a --- a/scripts/SilphCo4F.asm +++ b/scripts/SilphCo4F.asm @@ -33,9 +33,9 @@ SilphCo4Script_19d21: predef_jump ReplaceTileBlock SilphCo4GateCoords: - db $06,$02 - db $04,$06 - db $FF + dbmapcoord 2, 6 + dbmapcoord 6, 4 + db -1 ; end SilphCo4Script_19d5d: push hl @@ -45,14 +45,14 @@ SilphCo4Script_19d5d: ld a, [hl] ld c, a xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a pop hl .asm_19d69 ld a, [hli] cp $ff jr z, .asm_19d85 push hl - ld hl, $ffe0 + ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b @@ -70,12 +70,12 @@ SilphCo4Script_19d5d: ret .asm_19d85 xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a ret SilphCo4Script_19d89: EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 @@ -101,99 +101,78 @@ SilphCo4F_TextPointers: dw PickUpItemText SilphCo4TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_0 - dw SilphCo4BattleText2 ; TextBeforeBattle - dw SilphCo4AfterBattleText2 ; TextAfterBattle - dw SilphCo4EndBattleText2 ; TextEndBattle - dw SilphCo4EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_0, 4, SilphCo4BattleText2, SilphCo4EndBattleText2, SilphCo4AfterBattleText2 SilphCo4TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1 - dw SilphCo4BattleText3 ; TextBeforeBattle - dw SilphCo4AfterBattleText3 ; TextAfterBattle - dw SilphCo4EndBattleText3 ; TextEndBattle - dw SilphCo4EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_1, 3, SilphCo4BattleText3, SilphCo4EndBattleText3, SilphCo4AfterBattleText3 SilphCo4TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 - dw SilphCo4BattleText4 ; TextBeforeBattle - dw SilphCo4AfterBattleText4 ; TextAfterBattle - dw SilphCo4EndBattleText4 ; TextEndBattle - dw SilphCo4EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_4F_TRAINER_2, 4, SilphCo4BattleText4, SilphCo4EndBattleText4, SilphCo4AfterBattleText4 + db -1 ; end SilphCo4Text1: - TX_ASM + text_asm ld hl, SilphCo4Text_19de0 ld de, SilphCo4Text_19de5 call SilphCo6Script_1a22f jp TextScriptEnd SilphCo4Text_19de0: - TX_FAR _SilphCo4Text_19de0 - db "@" + text_far _SilphCo4Text_19de0 + text_end SilphCo4Text_19de5: - TX_FAR _SilphCo4Text_19de5 - db "@" + text_far _SilphCo4Text_19de5 + text_end SilphCo4Text2: - TX_ASM + text_asm ld hl, SilphCo4TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo4BattleText2: - TX_FAR _SilphCo4BattleText2 - db "@" + text_far _SilphCo4BattleText2 + text_end SilphCo4EndBattleText2: - TX_FAR _SilphCo4EndBattleText2 - db "@" + text_far _SilphCo4EndBattleText2 + text_end SilphCo4AfterBattleText2: - TX_FAR _SilphCo4AfterBattleText2 - db "@" + text_far _SilphCo4AfterBattleText2 + text_end SilphCo4Text3: - TX_ASM + text_asm ld hl, SilphCo4TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo4BattleText3: - TX_FAR _SilphCo4BattleText3 - db "@" + text_far _SilphCo4BattleText3 + text_end SilphCo4EndBattleText3: - TX_FAR _SilphCo4EndBattleText3 - db "@" + text_far _SilphCo4EndBattleText3 + text_end SilphCo4AfterBattleText3: - TX_FAR _SilphCo4AfterBattleText3 - db "@" + text_far _SilphCo4AfterBattleText3 + text_end SilphCo4Text4: - TX_ASM + text_asm ld hl, SilphCo4TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo4BattleText4: - TX_FAR _SilphCo4BattleText4 - db "@" + text_far _SilphCo4BattleText4 + text_end SilphCo4EndBattleText4: - TX_FAR _SilphCo4EndBattleText4 - db "@" + text_far _SilphCo4EndBattleText4 + text_end SilphCo4AfterBattleText4: - TX_FAR _SilphCo4AfterBattleText4 - db "@" + text_far _SilphCo4AfterBattleText4 + text_end diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm old mode 100755 new mode 100644 index d9deda5b..975dacac --- a/scripts/SilphCo5F.asm +++ b/scripts/SilphCo5F.asm @@ -42,14 +42,14 @@ SilphCo5Script_19f4d: predef_jump ReplaceTileBlock SilphCo5GateCoords: - db $02,$03 - db $06,$03 - db $05,$07 - db $FF + dbmapcoord 3, 2 + dbmapcoord 3, 6 + dbmapcoord 7, 5 + db -1 ; end SilphCo5Script_19f9e: EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 @@ -84,138 +84,110 @@ SilphCo5F_TextPointers: dw SilphCo5Text11 SilphCo5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 - dw SilphCo5BattleText2 ; TextBeforeBattle - dw SilphCo5AfterBattleText2 ; TextAfterBattle - dw SilphCo5EndBattleText2 ; TextEndBattle - dw SilphCo5EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_0, 1, SilphCo5BattleText2, SilphCo5EndBattleText2, SilphCo5AfterBattleText2 SilphCo5TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 - dw SilphCo5BattleText3 ; TextBeforeBattle - dw SilphCo5AfterBattleText3 ; TextAfterBattle - dw SilphCo5EndBattleText3 ; TextEndBattle - dw SilphCo5EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_1, 2, SilphCo5BattleText3, SilphCo5EndBattleText3, SilphCo5AfterBattleText3 SilphCo5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 - dw SilphCo5BattleText4 ; TextBeforeBattle - dw SilphCo5AfterBattleText4 ; TextAfterBattle - dw SilphCo5EndBattleText4 ; TextEndBattle - dw SilphCo5EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_2, 4, SilphCo5BattleText4, SilphCo5EndBattleText4, SilphCo5AfterBattleText4 SilphCo5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 - dw SilphCo5BattleText5 ; TextBeforeBattle - dw SilphCo5AfterBattleText5 ; TextAfterBattle - dw SilphCo5EndBattleText5 ; TextEndBattle - dw SilphCo5EndBattleText5 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_3, 3, SilphCo5BattleText5, SilphCo5EndBattleText5, SilphCo5AfterBattleText5 + db -1 ; end SilphCo5Text1: - TX_ASM + text_asm ld hl, SilphCo5Text_1a010 ld de, SilphCo5Text_1a015 call SilphCo6Script_1a22f jp TextScriptEnd SilphCo5Text_1a010: - TX_FAR _SilphCo5Text_1a010 - db "@" + text_far _SilphCo5Text_1a010 + text_end SilphCo5Text_1a015: - TX_FAR _SilphCo5Text_1a015 - db "@" + text_far _SilphCo5Text_1a015 + text_end SilphCo5Text2: - TX_ASM + text_asm ld hl, SilphCo5TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo5BattleText2: - TX_FAR _SilphCo5BattleText2 - db "@" + text_far _SilphCo5BattleText2 + text_end SilphCo5EndBattleText2: - TX_FAR _SilphCo5EndBattleText2 - db "@" + text_far _SilphCo5EndBattleText2 + text_end SilphCo5AfterBattleText2: - TX_FAR _SilphCo5AfterBattleText2 - db "@" + text_far _SilphCo5AfterBattleText2 + text_end SilphCo5Text3: - TX_ASM + text_asm ld hl, SilphCo5TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo5BattleText3: - TX_FAR _SilphCo5BattleText3 - db "@" + text_far _SilphCo5BattleText3 + text_end SilphCo5EndBattleText3: - TX_FAR _SilphCo5EndBattleText3 - db "@" + text_far _SilphCo5EndBattleText3 + text_end SilphCo5AfterBattleText3: - TX_FAR _SilphCo5AfterBattleText3 - db "@" + text_far _SilphCo5AfterBattleText3 + text_end SilphCo5Text4: - TX_ASM + text_asm ld hl, SilphCo5TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo5BattleText4: - TX_FAR _SilphCo5BattleText4 - db "@" + text_far _SilphCo5BattleText4 + text_end SilphCo5EndBattleText4: - TX_FAR _SilphCo5EndBattleText4 - db "@" + text_far _SilphCo5EndBattleText4 + text_end SilphCo5AfterBattleText4: - TX_FAR _SilphCo5AfterBattleText4 - db "@" + text_far _SilphCo5AfterBattleText4 + text_end SilphCo5Text5: - TX_ASM + text_asm ld hl, SilphCo5TrainerHeader3 call TalkToTrainer jp TextScriptEnd SilphCo5BattleText5: - TX_FAR _SilphCo5BattleText5 - db "@" + text_far _SilphCo5BattleText5 + text_end SilphCo5EndBattleText5: - TX_FAR _SilphCo5EndBattleText5 - db "@" + text_far _SilphCo5EndBattleText5 + text_end SilphCo5AfterBattleText5: - TX_FAR _SilphCo5AfterBattleText5 - db "@" + text_far _SilphCo5AfterBattleText5 + text_end SilphCo5Text9: - TX_FAR _SilphCo5Text9 - db "@" + text_far _SilphCo5Text9 + text_end SilphCo5Text10: - TX_FAR _SilphCo5Text10 - db "@" + text_far _SilphCo5Text10 + text_end SilphCo5Text11: - TX_FAR _SilphCo5Text11 - db "@" + text_far _SilphCo5Text11 + text_end diff --git a/scripts/SilphCo6F.asm b/scripts/SilphCo6F.asm old mode 100755 new mode 100644 index ddbcba79..ea8c20c2 --- a/scripts/SilphCo6F.asm +++ b/scripts/SilphCo6F.asm @@ -24,11 +24,11 @@ SilphCo6Script_1a1bf: predef_jump ReplaceTileBlock SilphCo6GateCoords: - db $06,$02 - db $FF + dbmapcoord 2, 6 + db -1 ; end SilphCo6Script_1a1e6: - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR @@ -52,33 +52,12 @@ SilphCo6F_TextPointers: dw PickUpItemText SilphCo6TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0 - dw SilphCo6BattleText2 ; TextBeforeBattle - dw SilphCo6AfterBattleText2 ; TextAfterBattle - dw SilphCo6EndBattleText2 ; TextEndBattle - dw SilphCo6EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_0, 2, SilphCo6BattleText2, SilphCo6EndBattleText2, SilphCo6AfterBattleText2 SilphCo6TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 - dw SilphCo6BattleText3 ; TextBeforeBattle - dw SilphCo6AfterBattleText3 ; TextAfterBattle - dw SilphCo6EndBattleText3 ; TextEndBattle - dw SilphCo6EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_1, 3, SilphCo6BattleText3, SilphCo6EndBattleText3, SilphCo6AfterBattleText3 SilphCo6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 - dw SilphCo6BattleText4 ; TextBeforeBattle - dw SilphCo6AfterBattleText4 ; TextAfterBattle - dw SilphCo6EndBattleText4 ; TextEndBattle - dw SilphCo6EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1, 2, SilphCo6BattleText4, SilphCo6EndBattleText4, SilphCo6AfterBattleText4 + db -1 ; end SilphCo6Script_1a22f: CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI @@ -91,130 +70,130 @@ SilphCo6Script_1a22f: jp PrintText SilphCo6Text1: - TX_ASM + text_asm ld hl, SilphCo6Text_1a24a ld de, SilphCo6Text_1a24f call SilphCo6Script_1a22f jp TextScriptEnd SilphCo6Text_1a24a: - TX_FAR _SilphCo6Text_1a24a - db "@" + text_far _SilphCo6Text_1a24a + text_end SilphCo6Text_1a24f: - TX_FAR _SilphCo6Text_1a24f - db "@" + text_far _SilphCo6Text_1a24f + text_end SilphCo6Text2: - TX_ASM + text_asm ld hl, SilphCo6Text_1a261 ld de, SilphCo6Text_1a266 call SilphCo6Script_1a22f jp TextScriptEnd SilphCo6Text_1a261: - TX_FAR _SilphCo6Text_1a261 - db "@" + text_far _SilphCo6Text_1a261 + text_end SilphCo6Text_1a266: - TX_FAR _SilphCo6Text_1a266 - db "@" + text_far _SilphCo6Text_1a266 + text_end SilphCo6Text3: - TX_ASM + text_asm ld hl, SilphCo6Text_1a278 ld de, SilphCo6Text_1a27d call SilphCo6Script_1a22f jp TextScriptEnd SilphCo6Text_1a278: - TX_FAR _SilphCo6Text_1a278 - db "@" + text_far _SilphCo6Text_1a278 + text_end SilphCo6Text_1a27d: - TX_FAR _SilphCo6Text_1a27d - db "@" + text_far _SilphCo6Text_1a27d + text_end SilphCo6Text4: - TX_ASM + text_asm ld hl, SilphCo6Text_1a28f ld de, SilphCo6Text_1a294 call SilphCo6Script_1a22f jp TextScriptEnd SilphCo6Text_1a28f: - TX_FAR _SilphCo6Text_1a28f - db "@" + text_far _SilphCo6Text_1a28f + text_end SilphCo6Text_1a294: - TX_FAR _SilphCo6Text_1a294 - db "@" + text_far _SilphCo6Text_1a294 + text_end SilphCo6Text5: - TX_ASM + text_asm ld hl, SilphCo6Text_1a2a6 ld de, SilphCo6Text_1a2ab call SilphCo6Script_1a22f jp TextScriptEnd SilphCo6Text_1a2a6: - TX_FAR _SilphCo6Text_1a2a6 - db "@" + text_far _SilphCo6Text_1a2a6 + text_end SilphCo6Text_1a2ab: - TX_FAR _SilphCo6Text_1a2ab - db "@" + text_far _SilphCo6Text_1a2ab + text_end SilphCo6Text6: - TX_ASM + text_asm ld hl, SilphCo6TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo6BattleText2: - TX_FAR _SilphCo6BattleText2 - db "@" + text_far _SilphCo6BattleText2 + text_end SilphCo6EndBattleText2: - TX_FAR _SilphCo6EndBattleText2 - db "@" + text_far _SilphCo6EndBattleText2 + text_end SilphCo6AfterBattleText2: - TX_FAR _SilphCo6AfterBattleText2 - db "@" + text_far _SilphCo6AfterBattleText2 + text_end SilphCo6Text7: - TX_ASM + text_asm ld hl, SilphCo6TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo6BattleText3: - TX_FAR _SilphCo6BattleText3 - db "@" + text_far _SilphCo6BattleText3 + text_end SilphCo6EndBattleText3: - TX_FAR _SilphCo6EndBattleText3 - db "@" + text_far _SilphCo6EndBattleText3 + text_end SilphCo6AfterBattleText3: - TX_FAR _SilphCo6AfterBattleText3 - db "@" + text_far _SilphCo6AfterBattleText3 + text_end SilphCo6Text8: - TX_ASM + text_asm ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo6BattleText4: - TX_FAR _SilphCo6BattleText4 - db "@" + text_far _SilphCo6BattleText4 + text_end SilphCo6EndBattleText4: - TX_FAR _SilphCo6EndBattleText4 - db "@" + text_far _SilphCo6EndBattleText4 + text_end SilphCo6AfterBattleText4: - TX_FAR _SilphCo6AfterBattleText4 - db "@" + text_far _SilphCo6AfterBattleText4 + text_end diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm old mode 100755 new mode 100644 index 47ea133e..1f15ae12 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -42,10 +42,10 @@ SilphCo7Script_51b77: predef_jump ReplaceTileBlock SilphCo7GateCoords: - db $03,$05 - db $02,$0A - db $06,$0A - db $FF + dbmapcoord 5, 3 + dbmapcoord 10, 2 + dbmapcoord 10, 6 + db -1 ; end SilphCo7Text_51bc8: push hl @@ -55,14 +55,14 @@ SilphCo7Text_51bc8: ld a, [hl] ld c, a xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a pop hl .asm_51bd4 ld a, [hli] cp $ff jr z, .asm_51bf0 push hl - ld hl, $ffe0 + ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b @@ -80,12 +80,12 @@ SilphCo7Text_51bc8: ret .asm_51bf0 xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a ret SilphCo7Text_51bf4: EventFlagAddress hl, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 @@ -125,22 +125,22 @@ SilphCo7Script0: call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $9 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, $9 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld de, MovementData_51c7d ld a, [wCoordIndex] @@ -150,22 +150,22 @@ SilphCo7Script0: inc de .asm_51c6c ld a, $9 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $3 jp SilphCo7Text_51c10 CoordsData_51c78: - db $02,$03 - db $03,$03 - db $FF + dbmapcoord 3, 2 + dbmapcoord 3, 3 + db -1 ; end MovementData_51c7d: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP - db $FF + db -1 ; end SilphCo7Script3: ld a, [wd730] @@ -174,7 +174,7 @@ SilphCo7Script3: xor a ld [wJoyIgnore], a ld a, $d - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d @@ -183,7 +183,7 @@ SilphCo7Script3: ld hl, SilphCo7Text14 ld de, SilphCo7Text_51ecd call SaveEndBattleTextPointers - ld a, OPP_SONY2 + ld a, OPP_RIVAL2 ld [wCurOpponent], a ld a, [wRivalStarter] cp STARTER2 @@ -212,17 +212,17 @@ SilphCo7Script4: ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, $9 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a ld a, SPRITE_FACING_UP - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $f - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound - callba Music_RivalAlternateStart + farcall Music_RivalAlternateStart ld de, MovementData_51d1d ld a, [wcf0d] cp $1 @@ -230,7 +230,7 @@ SilphCo7Script4: ld de, MovementData_51d1a .asm_51d0e ld a, $9 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call MoveSprite ld a, $5 jp SilphCo7Text_51c10 @@ -238,7 +238,7 @@ SilphCo7Script4: MovementData_51d1a: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db $FF + db -1 ; end MovementData_51d1d: db NPC_MOVEMENT_LEFT @@ -248,7 +248,7 @@ MovementData_51d1d: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN - db $FF + db -1 ; end SilphCo7Script5: ld a, [wd730] @@ -280,46 +280,18 @@ SilphCo7F_TextPointers: dw SilphCo7Text15 SilphCo7TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_0 - dw SilphCo7BattleText1 ; TextBeforeBattle - dw SilphCo7AfterBattleText1 ; TextAfterBattle - dw SilphCo7EndBattleText1 ; TextEndBattle - dw SilphCo7EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_0, 2, SilphCo7BattleText1, SilphCo7EndBattleText1, SilphCo7AfterBattleText1 SilphCo7TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1 - dw SilphCo7BattleText2 ; TextBeforeBattle - dw SilphCo7AfterBattleText2 ; TextAfterBattle - dw SilphCo7EndBattleText2 ; TextEndBattle - dw SilphCo7EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_1, 3, SilphCo7BattleText2, SilphCo7EndBattleText2, SilphCo7AfterBattleText2 SilphCo7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 - dw SilphCo7BattleText3 ; TextBeforeBattle - dw SilphCo7AfterBattleText3 ; TextAfterBattle - dw SilphCo7EndBattleText3 ; TextEndBattle - dw SilphCo7EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_2, 3, SilphCo7BattleText3, SilphCo7EndBattleText3, SilphCo7AfterBattleText3 SilphCo7TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 - dw SilphCo7BattleText4 ; TextBeforeBattle - dw SilphCo7AfterBattleText4 ; TextAfterBattle - dw SilphCo7EndBattleText4 ; TextEndBattle - dw SilphCo7EndBattleText4 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1, 4, SilphCo7BattleText4, SilphCo7EndBattleText4, SilphCo7AfterBattleText4 + db -1 ; end SilphCo7Text1: ; lapras guy - TX_ASM + text_asm ld a, [wd72e] bit 0, a ; got lapras? jr z, .givelapras @@ -350,23 +322,23 @@ SilphCo7Text1: jp TextScriptEnd .MeetLaprasGuyText - TX_FAR _MeetLaprasGuyText - db "@" + text_far _MeetLaprasGuyText + text_end .HeresYourLaprasText - TX_FAR _HeresYourLaprasText - db "@" + text_far _HeresYourLaprasText + text_end .LaprasGuyText - TX_FAR _LaprasGuyText - db "@" + text_far _LaprasGuyText + text_end .LaprasGuySavedText - TX_FAR _LaprasGuySavedText - db "@" + text_far _LaprasGuySavedText + text_end SilphCo7Text2: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .savedsilph ld hl, .rockettext @@ -379,15 +351,15 @@ SilphCo7Text2: jp TextScriptEnd .rockettext - TX_FAR _SilphCo7Text_51e00 - db "@" + text_far _SilphCo7Text_51e00 + text_end .savedtext - TX_FAR _CanceledMasterBallText - db "@" + text_far _CanceledMasterBallText + text_end SilphCo7Text3: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .savedsilph ld hl, .rockettext @@ -400,15 +372,15 @@ SilphCo7Text3: jp TextScriptEnd .rockettext - TX_FAR _SilphCo7Text_51e23 - db "@" + text_far _SilphCo7Text_51e23 + text_end .savedtext - TX_FAR _SilphCo7Text_51e28 - db "@" + text_far _SilphCo7Text_51e28 + text_end SilphCo7Text4: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .savedsilph ld hl, .rockettext @@ -421,107 +393,107 @@ SilphCo7Text4: jp TextScriptEnd .rockettext - TX_FAR _SilphCo7Text_51e46 - db "@" + text_far _SilphCo7Text_51e46 + text_end .savedtext - TX_FAR _SilphCo7Text_51e4b - db "@" + text_far _SilphCo7Text_51e4b + text_end SilphCo7Text5: - TX_ASM + text_asm ld hl, SilphCo7TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo7BattleText1: - TX_FAR _SilphCo7BattleText1 - db "@" + text_far _SilphCo7BattleText1 + text_end SilphCo7EndBattleText1: - TX_FAR _SilphCo7EndBattleText1 - db "@" + text_far _SilphCo7EndBattleText1 + text_end SilphCo7AfterBattleText1: - TX_FAR _SilphCo7AfterBattleText1 - db "@" + text_far _SilphCo7AfterBattleText1 + text_end SilphCo7Text6: - TX_ASM + text_asm ld hl, SilphCo7TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo7BattleText2: - TX_FAR _SilphCo7BattleText2 - db "@" + text_far _SilphCo7BattleText2 + text_end SilphCo7EndBattleText2: - TX_FAR _SilphCo7EndBattleText2 - db "@" + text_far _SilphCo7EndBattleText2 + text_end SilphCo7AfterBattleText2: - TX_FAR _SilphCo7AfterBattleText2 - db "@" + text_far _SilphCo7AfterBattleText2 + text_end SilphCo7Text7: - TX_ASM + text_asm ld hl, SilphCo7TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo7BattleText3: - TX_FAR _SilphCo7BattleText3 - db "@" + text_far _SilphCo7BattleText3 + text_end SilphCo7EndBattleText3: - TX_FAR _SilphCo7EndBattleText3 - db "@" + text_far _SilphCo7EndBattleText3 + text_end SilphCo7AfterBattleText3: - TX_FAR _SilphCo7AfterBattleText3 - db "@" + text_far _SilphCo7AfterBattleText3 + text_end SilphCo7Text8: - TX_ASM + text_asm ld hl, SilphCo7TrainerHeader3 call TalkToTrainer jp TextScriptEnd SilphCo7BattleText4: - TX_FAR _SilphCo7BattleText4 - db "@" + text_far _SilphCo7BattleText4 + text_end SilphCo7EndBattleText4: - TX_FAR _SilphCo7EndBattleText4 - db "@" + text_far _SilphCo7EndBattleText4 + text_end SilphCo7AfterBattleText4: - TX_FAR _SilphCo7AfterBattleText4 - db "@" + text_far _SilphCo7AfterBattleText4 + text_end SilphCo7Text9: - TX_ASM + text_asm ld hl, SilphCo7Text_51ebe call PrintText jp TextScriptEnd SilphCo7Text_51ebe: - TX_FAR _SilphCo7Text_51ebe - db "@" + text_far _SilphCo7Text_51ebe + text_end SilphCo7Text13: - TX_FAR _SilphCo7Text_51ec3 - db "@" + text_far _SilphCo7Text_51ec3 + text_end SilphCo7Text14: - TX_FAR _SilphCo7Text_51ec8 - db "@" + text_far _SilphCo7Text_51ec8 + text_end SilphCo7Text_51ecd: - TX_FAR _SilphCo7Text_51ecd - db "@" + text_far _SilphCo7Text_51ecd + text_end SilphCo7Text15: - TX_FAR _SilphCo7Text_51ed2 - db "@" + text_far _SilphCo7Text_51ed2 + text_end diff --git a/scripts/SilphCo8F.asm b/scripts/SilphCo8F.asm old mode 100755 new mode 100644 index ce6579f7..c4e022d4 --- a/scripts/SilphCo8F.asm +++ b/scripts/SilphCo8F.asm @@ -24,8 +24,8 @@ SilphCo8Script_5651a: predef_jump ReplaceTileBlock SilphCo8GateCoords: - db $04,$03 - db $FF + dbmapcoord 3, 4 + db -1 ; end SilphCo8Script_56541: push hl @@ -35,14 +35,14 @@ SilphCo8Script_56541: ld a, [hl] ld c, a xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a pop hl .asm_5654d ld a, [hli] cp $ff jr z, .asm_56569 push hl - ld hl, $ffe0 + ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b @@ -60,11 +60,11 @@ SilphCo8Script_56541: ret .asm_56569 xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a ret SilphCo8Script_5656d: - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR @@ -82,36 +82,15 @@ SilphCo8F_TextPointers: dw SilphCo8Text4 SilphCo8TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_0 - dw SilphCo8BattleText1 ; TextBeforeBattle - dw SilphCo8AfterBattleText1 ; TextAfterBattle - dw SilphCo8EndBattleText1 ; TextEndBattle - dw SilphCo8EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_0, 4, SilphCo8BattleText1, SilphCo8EndBattleText1, SilphCo8AfterBattleText1 SilphCo8TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_1 - dw SilphCo8BattleText2 ; TextBeforeBattle - dw SilphCo8AfterBattleText2 ; TextAfterBattle - dw SilphCo8EndBattleText2 ; TextEndBattle - dw SilphCo8EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_1, 4, SilphCo8BattleText2, SilphCo8EndBattleText2, SilphCo8AfterBattleText2 SilphCo8TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_2 - dw SilphCo8BattleText3 ; TextBeforeBattle - dw SilphCo8AfterBattleText3 ; TextAfterBattle - dw SilphCo8EndBattleText3 ; TextEndBattle - dw SilphCo8EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_8F_TRAINER_2, 4, SilphCo8BattleText3, SilphCo8EndBattleText3, SilphCo8AfterBattleText3 + db -1 ; end SilphCo8Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo8Text_565c3 jr nz, .asm_565b8 @@ -121,63 +100,63 @@ SilphCo8Text1: jp TextScriptEnd SilphCo8Text_565be: - TX_FAR _SilphCo8Text_565be - db "@" + text_far _SilphCo8Text_565be + text_end SilphCo8Text_565c3: - TX_FAR _SilphCo8Text_565c3 - db "@" + text_far _SilphCo8Text_565c3 + text_end SilphCo8Text2: - TX_ASM + text_asm ld hl, SilphCo8TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo8Text3: - TX_ASM + text_asm ld hl, SilphCo8TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo8Text4: - TX_ASM + text_asm ld hl, SilphCo8TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo8BattleText1: - TX_FAR _SilphCo8BattleText1 - db "@" + text_far _SilphCo8BattleText1 + text_end SilphCo8EndBattleText1: - TX_FAR _SilphCo8EndBattleText1 - db "@" + text_far _SilphCo8EndBattleText1 + text_end SilphCo8AfterBattleText1: - TX_FAR _SilphCo8AfterBattleText1 - db "@" + text_far _SilphCo8AfterBattleText1 + text_end SilphCo8BattleText2: - TX_FAR _SilphCo8BattleText2 - db "@" + text_far _SilphCo8BattleText2 + text_end SilphCo8EndBattleText2: - TX_FAR _SilphCo8EndBattleText2 - db "@" + text_far _SilphCo8EndBattleText2 + text_end SilphCo8AfterBattleText2: - TX_FAR _SilphCo8AfterBattleText2 - db "@" + text_far _SilphCo8AfterBattleText2 + text_end SilphCo8BattleText3: - TX_FAR _SilphCo8BattleText3 - db "@" + text_far _SilphCo8BattleText3 + text_end SilphCo8EndBattleText3: - TX_FAR _SilphCo8EndBattleText3 - db "@" + text_far _SilphCo8EndBattleText3 + text_end SilphCo8AfterBattleText3: - TX_FAR _SilphCo8AfterBattleText3 - db "@" + text_far _SilphCo8AfterBattleText3 + text_end diff --git a/scripts/SilphCo9F.asm b/scripts/SilphCo9F.asm old mode 100755 new mode 100644 index 66291e98..1efb3d78 --- a/scripts/SilphCo9F.asm +++ b/scripts/SilphCo9F.asm @@ -51,11 +51,11 @@ SilphCo9Script_5d7d1: predef_jump ReplaceTileBlock SilphCo9GateCoords: - db $04,$01 - db $02,$09 - db $05,$09 - db $06,$05 - db $FF + dbmapcoord 1, 4 + dbmapcoord 9, 2 + dbmapcoord 9, 5 + dbmapcoord 5, 6 + db -1 ; end SilphCo9Script_5d837: push hl @@ -65,14 +65,14 @@ SilphCo9Script_5d837: ld a, [hl] ld c, a xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a pop hl .asm_5d843 ld a, [hli] cp $ff jr z, .asm_5d85f push hl - ld hl, $ffe0 + ld hl, hUnlockedSilphCoDoors inc [hl] pop hl cp b @@ -90,12 +90,12 @@ SilphCo9Script_5d837: ret .asm_5d85f xor a - ld [$ffe0], a + ldh [hUnlockedSilphCoDoors], a ret SilphCo9Script_5d863: EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 - ld a, [$ffe0] + ldh a, [hUnlockedSilphCoDoors] and a ret z cp $1 @@ -130,36 +130,15 @@ SilphCo9F_TextPointers: dw SilphCo9Text4 SilphCo9TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_0 - dw SilphCo9BattleText1 ; TextBeforeBattle - dw SilphCo9AfterBattleText1 ; TextAfterBattle - dw SilphCo9EndBattleText1 ; TextEndBattle - dw SilphCo9EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_0, 4, SilphCo9BattleText1, SilphCo9EndBattleText1, SilphCo9AfterBattleText1 SilphCo9TrainerHeader1: - dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_1 - dw SilphCo9BattleText2 ; TextBeforeBattle - dw SilphCo9AfterBattleText2 ; TextAfterBattle - dw SilphCo9EndBattleText2 ; TextEndBattle - dw SilphCo9EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_1, 2, SilphCo9BattleText2, SilphCo9EndBattleText2, SilphCo9AfterBattleText2 SilphCo9TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_2 - dw SilphCo9BattleText3 ; TextBeforeBattle - dw SilphCo9AfterBattleText3 ; TextAfterBattle - dw SilphCo9EndBattleText3 ; TextEndBattle - dw SilphCo9EndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_SILPH_CO_9F_TRAINER_2, 4, SilphCo9BattleText3, SilphCo9EndBattleText3, SilphCo9AfterBattleText3 + db -1 ; end SilphCo9Text1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .asm_5d8dc ld hl, SilphCo9Text_5d8e5 @@ -178,67 +157,67 @@ SilphCo9Text1: jp TextScriptEnd SilphCo9Text_5d8e5: - TX_FAR _SilphCo9Text_5d8e5 - db "@" + text_far _SilphCo9Text_5d8e5 + text_end SilphCo9Text_5d8ea: - TX_FAR _SilphCo9Text_5d8ea - db "@" + text_far _SilphCo9Text_5d8ea + text_end SilphCo9Text_5d8ef: - TX_FAR _SilphCo9Text_5d8ef - db "@" + text_far _SilphCo9Text_5d8ef + text_end SilphCo9Text2: - TX_ASM + text_asm ld hl, SilphCo9TrainerHeader0 call TalkToTrainer jp TextScriptEnd SilphCo9Text3: - TX_ASM + text_asm ld hl, SilphCo9TrainerHeader1 call TalkToTrainer jp TextScriptEnd SilphCo9Text4: - TX_ASM + text_asm ld hl, SilphCo9TrainerHeader2 call TalkToTrainer jp TextScriptEnd SilphCo9BattleText1: - TX_FAR _SilphCo9BattleText1 - db "@" + text_far _SilphCo9BattleText1 + text_end SilphCo9EndBattleText1: - TX_FAR _SilphCo9EndBattleText1 - db "@" + text_far _SilphCo9EndBattleText1 + text_end SilphCo9AfterBattleText1: - TX_FAR _SilphCo9AfterBattleText1 - db "@" + text_far _SilphCo9AfterBattleText1 + text_end SilphCo9BattleText2: - TX_FAR _SilphCo9BattleText2 - db "@" + text_far _SilphCo9BattleText2 + text_end SilphCo9EndBattleText2: - TX_FAR _SilphCo9EndBattleText2 - db "@" + text_far _SilphCo9EndBattleText2 + text_end SilphCo9AfterBattleText2: - TX_FAR _SilphCo9AfterBattleText2 - db "@" + text_far _SilphCo9AfterBattleText2 + text_end SilphCo9BattleText3: - TX_FAR _SilphCo9BattleText3 - db "@" + text_far _SilphCo9BattleText3 + text_end SilphCo9EndBattleText3: - TX_FAR _SilphCo9EndBattleText3 - db "@" + text_far _SilphCo9EndBattleText3 + text_end SilphCo9AfterBattleText3: - TX_FAR _SilphCo9AfterBattleText3 - db "@" + text_far _SilphCo9AfterBattleText3 + text_end diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm old mode 100755 new mode 100644 index 49de6b27..c898cbd1 --- a/scripts/SilphCoElevator.asm +++ b/scripts/SilphCoElevator.asm @@ -41,7 +41,7 @@ SilphCoElevatorScript_457f1: ret SilphCoElevatorFloors: - db $0B ; num elements in list + db 11 ; # db FLOOR_1F db FLOOR_2F db FLOOR_3F @@ -53,35 +53,34 @@ SilphCoElevatorFloors: db FLOOR_9F db FLOOR_10F db FLOOR_11F - db $FF ; terminator + db -1 ; end -SilphCoElevatorWarpMaps: -; first byte is warp number -; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $03, SILPH_CO_1F - db $02, SILPH_CO_2F - db $02, SILPH_CO_3F - db $02, SILPH_CO_4F - db $02, SILPH_CO_5F - db $02, SILPH_CO_6F - db $02, SILPH_CO_7F - db $02, SILPH_CO_8F - db $02, SILPH_CO_9F - db $02, SILPH_CO_10F - db $01, SILPH_CO_11F +SilphCoElevatorWarpMaps: + ; warp number, map id + db 3, SILPH_CO_1F + db 2, SILPH_CO_2F + db 2, SILPH_CO_3F + db 2, SILPH_CO_4F + db 2, SILPH_CO_5F + db 2, SILPH_CO_6F + db 2, SILPH_CO_7F + db 2, SILPH_CO_8F + db 2, SILPH_CO_9F + db 2, SILPH_CO_10F + db 1, SILPH_CO_11F SilphCoElevatorWarpMapsEnd: SilphCoElevatorScript_45827: call Delay3 - callba ShakeElevator + farcall ShakeElevator ret SilphCoElevator_TextPointers: dw SilphCoElevatorText1 SilphCoElevatorText1: - TX_ASM + text_asm call SilphCoElevatorScript_457f1 ld hl, SilphCoElevatorWarpMaps predef DisplayElevatorFloorMenu diff --git a/scripts/TradeCenter.asm b/scripts/TradeCenter.asm old mode 100755 new mode 100644 index ddb3061e..dbed79c1 --- a/scripts/TradeCenter.asm +++ b/scripts/TradeCenter.asm @@ -1,38 +1,38 @@ TradeCenter_Script: call EnableAutoTextBoxDrawing - ld a, [hSerialConnectionStatus] + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ld a, SPRITE_FACING_LEFT jr z, .next ld a, SPRITE_FACING_RIGHT .next - ld [hSpriteFacingDirection], a + ldh [hSpriteFacingDirection], a ld a, $1 - ld [H_SPRITEINDEX], a + ldh [hSpriteIndex], a call SetSpriteFacingDirection ld hl, wd72d bit 0, [hl] set 0, [hl] ret nz - ld hl, wSpriteStateData2 + $14 - ld a, $8 + ld hl, wSprite01StateData2MapY + ld a, 8 ; y ld [hli], a - ld a, $a + ld a, 10 ; x ld [hl], a ld a, SPRITE_FACING_LEFT - ld [wSpriteStateData1 + $19], a - ld a, [hSerialConnectionStatus] + ld [wSprite01StateData1FacingDirection], a + ldh a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK ret z - ld a, $7 - ld [wSpriteStateData2 + $15], a + ld a, 7 ; x + ld [wSprite01StateData2MapX], a ld a, SPRITE_FACING_RIGHT - ld [wSpriteStateData1 + $19], a + ld [wSprite01StateData1FacingDirection], a ret TradeCenter_TextPointers: dw TradeCenterText1 TradeCenterText1: - TX_FAR _TradeCenterText1 - db "@" + text_far _TradeCenterText1 + text_end diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm old mode 100755 new mode 100644 index 52b3d8bf..00a7ef90 --- a/scripts/UndergroundPathNorthSouth.asm +++ b/scripts/UndergroundPathNorthSouth.asm @@ -2,4 +2,5 @@ UndergroundPathNorthSouth_Script: jp EnableAutoTextBoxDrawing UndergroundPathNorthSouth_TextPointers: - db "@" + + text_end ; unused diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm old mode 100755 new mode 100644 index 23d72569..5c078050 --- a/scripts/UndergroundPathRoute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -3,16 +3,16 @@ UndergroundPathRoute5_Script: ld [wLastMap], a ret -UndergroundPathEntranceRoute5_5d6af: - db "@" +UndergroundPathEntranceRoute5_TextScriptEndingText: + text_end UndergroundPathRoute5_TextPointers: dw UndergroundPathEntranceRoute5Text1 UndergroundPathEntranceRoute5Text1: - TX_ASM - ld a, $9 + text_asm + ld a, TRADE_FOR_SPOT ld [wWhichTrade], a predef DoInGameTradeDialogue - ld hl, UndergroundPathEntranceRoute5_5d6af + ld hl, UndergroundPathEntranceRoute5_TextScriptEndingText ret diff --git a/scripts/UndergroundPathRoute6.asm b/scripts/UndergroundPathRoute6.asm old mode 100755 new mode 100644 index 0a690518..e3994e33 --- a/scripts/UndergroundPathRoute6.asm +++ b/scripts/UndergroundPathRoute6.asm @@ -7,5 +7,5 @@ UndergroundPathRoute6_TextPointers: dw UndergroundPathEntranceRoute6Text1 UndergroundPathEntranceRoute6Text1: - TX_FAR _UndergrdTunnelEntRoute6Text1 - db "@" + text_far _UndergrdTunnelEntRoute6Text1 + text_end diff --git a/scripts/UndergroundPathRoute7.asm b/scripts/UndergroundPathRoute7.asm old mode 100755 new mode 100644 index 3a1f14c7..c311b409 --- a/scripts/UndergroundPathRoute7.asm +++ b/scripts/UndergroundPathRoute7.asm @@ -7,5 +7,5 @@ UndergroundPathRoute7_TextPointers: dw UndergroundPathEntranceRoute7Text1 UndergroundPathEntranceRoute7Text1: - TX_FAR _UndergroundPathEntRoute7Text1 - db "@" + text_far _UndergroundPathEntRoute7Text1 + text_end diff --git a/scripts/UndergroundPathRoute7Copy.asm b/scripts/UndergroundPathRoute7Copy.asm old mode 100755 new mode 100644 index 8a494caf..2eb74fce --- a/scripts/UndergroundPathRoute7Copy.asm +++ b/scripts/UndergroundPathRoute7Copy.asm @@ -8,17 +8,17 @@ UndergroundPathRoute7Copy_TextPointers: dw UGPathRoute7EntranceUnusedText_5d77d UGPathRoute7EntranceUnusedText_5d773: - TX_FAR _UGPathRoute7EntranceUnusedText_5d773 - db "@" + text_far _UGPathRoute7EntranceUnusedText_5d773 + text_end UGPathRoute7EntranceUnusedText_5d778: - TX_FAR _UGPathRoute7EntranceUnusedText_5d778 - db "@" + text_far _UGPathRoute7EntranceUnusedText_5d778 + text_end UGPathRoute7EntranceUnusedText_5d77d: - TX_FAR _UGPathRoute7EntranceUnusedText_5d77d - db "@" + text_far _UGPathRoute7EntranceUnusedText_5d77d + text_end UGPathRoute7EntranceUnusedText_5d782: - TX_FAR _UGPathRoute7EntranceUnusedText_5d782 - db "@" + text_far _UGPathRoute7EntranceUnusedText_5d782 + text_end diff --git a/scripts/UndergroundPathRoute8.asm b/scripts/UndergroundPathRoute8.asm old mode 100755 new mode 100644 index ab0a9977..6eab58c2 --- a/scripts/UndergroundPathRoute8.asm +++ b/scripts/UndergroundPathRoute8.asm @@ -7,5 +7,5 @@ UndergroundPathRoute8_TextPointers: dw UndergroundPathEntranceRoute8Text1 UndergroundPathEntranceRoute8Text1: - TX_FAR _UndergroundPathEntRoute8Text1 - db "@" + text_far _UndergroundPathEntRoute8Text1 + text_end diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm old mode 100755 new mode 100644 index cb1a7bd8..98571e17 --- a/scripts/UndergroundPathWestEast.asm +++ b/scripts/UndergroundPathWestEast.asm @@ -2,4 +2,5 @@ UndergroundPathWestEast_Script: jp EnableAutoTextBoxDrawing UndergroundPathWestEast_TextPointers: - db "@" + + text_end ; unused diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm old mode 100755 new mode 100644 index 1ac81521..629bb0c8 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -4,23 +4,23 @@ VermilionCity_Script: bit 6, [hl] res 6, [hl] push hl - call nz, VermilionCityScript_197cb + call nz, .initCityScript pop hl bit 5, [hl] res 5, [hl] - call nz, VermilionCityScript_197c0 + call nz, .setFirstLockTrashCanIndex ld hl, VermilionCity_ScriptPointers ld a, [wVermilionCityCurScript] jp CallFunctionInTable -VermilionCityScript_197c0: +.setFirstLockTrashCanIndex call Random - ld a, [$ffd4] + ldh a, [hRandomSub] and $e ld [wFirstLockTrashCanIndex], a ret -VermilionCityScript_197cb: +.initCityScript CheckEventHL EVENT_SS_ANNE_LEFT ret z CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT @@ -38,26 +38,26 @@ VermilionCity_ScriptPointers: dw VermilionCityScript4 VermilionCityScript0: - ld a, [wSpriteStateData1 + 9] + ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN ret nz - ld hl, CoordsData_19823 + ld hl, SSAnneTicketCheckCoords call ArePlayerCoordsInArray ret nc xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld [wcf0d], a ld a, $3 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_19810 + jr nz, .shipHasDeparted ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a ret nz -.asm_19810 +.shipHasDeparted ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 @@ -67,12 +67,12 @@ VermilionCityScript0: ld [wVermilionCityCurScript], a ret -CoordsData_19823: - db $1e,$12 - db $ff +SSAnneTicketCheckCoords: + dbmapcoord 18, 30 + db -1 ; end VermilionCityScript4: - ld hl, CoordsData_19823 + ld hl, SSAnneTicketCheckCoords call ArePlayerCoordsInArray ret c ld a, $0 @@ -98,7 +98,7 @@ VermilionCityScript3: ret nz xor a ld [wJoyIgnore], a - ld [hJoyHeld], a + ldh [hJoyHeld], a ld a, $0 ld [wVermilionCityCurScript], a ret @@ -129,99 +129,99 @@ VermilionCity_TextPointers: dw VermilionCityText13 VermilionCityText1: - TX_FAR _VermilionCityText1 - db "@" + text_far _VermilionCityText1 + text_end VermilionCityText2: - TX_ASM + text_asm CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_1989e - ld hl, VermilionCityText_198a7 + jr nz, .shipHasDeparted + ld hl, VermilionCityTextDidYouSee call PrintText - jr .asm_198a4 -.asm_1989e - ld hl, VermilionCityText_198ac + jr .end +.shipHasDeparted + ld hl, VermilionCityTextSSAnneDeparted call PrintText -.asm_198a4 +.end jp TextScriptEnd -VermilionCityText_198a7: - TX_FAR _VermilionCityText_198a7 - db "@" +VermilionCityTextDidYouSee: + text_far _VermilionCityTextDidYouSee + text_end -VermilionCityText_198ac: - TX_FAR _VermilionCityText_198ac - db "@" +VermilionCityTextSSAnneDeparted: + text_far _VermilionCityTextSSAnneDeparted + text_end VermilionCityText3: - TX_ASM + text_asm CheckEvent EVENT_SS_ANNE_LEFT - jr nz, .asm_198f6 - ld a, [wSpriteStateData1 + 9] + jr nz, .shipHasDeparted + ld a, [wSpritePlayerStateData1FacingDirection] cp SPRITE_FACING_RIGHT - jr z, .asm_198c8 - ld hl, VermilionCityCoords1 + jr z, .greetPlayer + ld hl, .inFrontOfOrBehindGuardCoords call ArePlayerCoordsInArray - jr nc, .asm_198d0 -.asm_198c8 + jr nc, .greetPlayerAndCheckTicket +.greetPlayer ld hl, SSAnneWelcomeText4 call PrintText - jr .asm_198fc -.asm_198d0 + jr .end +.greetPlayerAndCheckTicket ld hl, SSAnneWelcomeText9 call PrintText ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b and a - jr nz, .asm_198e9 + jr nz, .playerHasTicket ld hl, SSAnneNoTicketText call PrintText - jr .asm_198fc -.asm_198e9 + jr .end +.playerHasTicket ld hl, SSAnneFlashedTicketText call PrintText ld a, $4 ld [wVermilionCityCurScript], a - jr .asm_198fc -.asm_198f6 + jr .end +.shipHasDeparted ld hl, SSAnneNotHereText call PrintText -.asm_198fc +.end jp TextScriptEnd -VermilionCityCoords1: - db $1d,$13 - db $1f,$13 - db $ff +.inFrontOfOrBehindGuardCoords + dbmapcoord 19, 29 ; in front of guard + dbmapcoord 19, 31 ; behind guard + db -1 ; end SSAnneWelcomeText4: - TX_FAR _SSAnneWelcomeText4 - db "@" + text_far _SSAnneWelcomeText4 + text_end SSAnneWelcomeText9: - TX_FAR _SSAnneWelcomeText9 - db "@" + text_far _SSAnneWelcomeText9 + text_end SSAnneFlashedTicketText: - TX_FAR _SSAnneFlashedTicketText - db "@" + text_far _SSAnneFlashedTicketText + text_end SSAnneNoTicketText: - TX_FAR _SSAnneNoTicketText - db "@" + text_far _SSAnneNoTicketText + text_end SSAnneNotHereText: - TX_FAR _SSAnneNotHereText - db "@" + text_far _SSAnneNotHereText + text_end VermilionCityText4: - TX_FAR _VermilionCityText4 - db "@" + text_far _VermilionCityText4 + text_end VermilionCityText5: - TX_FAR _VermilionCityText5 - TX_ASM + text_far _VermilionCityText5 + text_asm ld a, MACHOP call PlayCry call WaitForSoundToFinish @@ -229,29 +229,29 @@ VermilionCityText5: ret VermilionCityText14: - TX_FAR _VermilionCityText14 - db "@" + text_far _VermilionCityText14 + text_end VermilionCityText6: - TX_FAR _VermilionCityText6 - db "@" + text_far _VermilionCityText6 + text_end VermilionCityText7: - TX_FAR _VermilionCityText7 - db "@" + text_far _VermilionCityText7 + text_end VermilionCityText8: - TX_FAR _VermilionCityText8 - db "@" + text_far _VermilionCityText8 + text_end VermilionCityText11: - TX_FAR _VermilionCityText11 - db "@" + text_far _VermilionCityText11 + text_end VermilionCityText12: - TX_FAR _VermilionCityText12 - db "@" + text_far _VermilionCityText12 + text_end VermilionCityText13: - TX_FAR _VermilionCityText13 - db "@" + text_far _VermilionCityText13 + text_end diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm old mode 100755 new mode 100644 index 55f165f2..ae81b448 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -21,7 +21,7 @@ VermilionDock_Script: ld a, $3 ld [wSimulatedJoypadStatesIndex], a xor a - ld [wSpriteStateData2 + $06], a + ld [wSpritePlayerStateData2MovementByte1], a ld [wOverrideSimulatedJoypadStatesMask], a dec a ld [wJoyIgnore], a @@ -38,31 +38,31 @@ VermilionDock_Script: VermilionDock_1db9b: SetEventForceReuseHL EVENT_SS_ANNE_LEFT - ld a, $ff + ld a, SFX_STOP_ALL_MUSIC ld [wJoyIgnore], a ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_Surfing) ld a, MUSIC_SURFING call PlayMusic - callba LoadSmokeTileFourTimes + farcall LoadSmokeTileFourTimes xor a - ld [wSpriteStateData1 + 2], a + ld [wSpritePlayerStateData1ImageIndex], a ld c, 120 call DelayFrames ld b, $9c call CopyScreenTileBufferToVRAM - coord hl, 0, 10 + hlcoord 0, 10 ld bc, SCREEN_WIDTH * 6 ld a, $14 ; water tile call FillMemory ld a, 1 - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a call Delay3 xor a - ld [H_AUTOBGTRANSFERENABLED], a + ldh [hAutoBGTransferEnabled], a ld [wSSAnneSmokeDriftAmount], a - ld [rOBP1], a + ldh [rOBP1], a ld a, 88 ld [wSSAnneSmokeX], a ld hl, wMapViewVRAMPointer @@ -78,7 +78,7 @@ VermilionDock_1db9b: ld d, $0 ld e, $8 .asm_1dbfa - ld hl, $0002 + ld hl, $2 add hl, bc ld a, l ld [wMapViewVRAMPointer], a @@ -104,11 +104,11 @@ VermilionDock_1db9b: dec e jr nz, .asm_1dbfa xor a - ld [rWY], a - ld [hWY], a + ldh [rWY], a + ldh [hWY], a call VermilionDock_EraseSSAnne ld a, $90 - ld [hWY], a + ldh [hWY], a ld a, $1 ld [wUpdateSpritesEnabled], a pop hl @@ -124,7 +124,7 @@ VermilionDock_1db9b: VermilionDock_AnimSmokePuffDriftRight: push bc push de - ld hl, wOAMBuffer + $11 + ld hl, wOAMBuffer + 4 * $4 + 1 ; x coord ld a, [wSSAnneSmokeDriftAmount] swap a ld c, a @@ -155,6 +155,7 @@ VermilionDock_EmitSmokePuff: ret VermilionDockOAMBlock: + ; tile id, attribute db $fc, $10 db $fd, $10 db $fe, $10 @@ -167,13 +168,13 @@ VermilionDock_1dc7c: ld h, $0 ld l, $80 .asm_1dc86 - ld a, [rLY] + ldh a, [rLY] cp l jr nz, .asm_1dc86 ld a, h - ld [rSCX], a + ldh [rSCX], a .asm_1dc8e - ld a, [rLY] + ldh a, [rLY] cp h jr z, .asm_1dc8e ret @@ -184,7 +185,7 @@ VermilionDock_EraseSSAnne: ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH ld a, $14 ; water tile call FillMemory - ld hl, vBGMap0 + 10 * BG_MAP_WIDTH + hlbgcoord 0, 10 ld de, wVermilionDockTileMapBuffer ld bc, (6 * BG_MAP_WIDTH) / 16 call CopyVideoData @@ -194,7 +195,7 @@ VermilionDock_EraseSSAnne: ; the blocks is unnecessary because the blocks the ship occupies are south of ; the player and won't be redrawn when the player automatically walks north and ; exits the map. This code could be removed without affecting anything. - overworldMapCoord hl, 5, 2, VERMILION_DOCK_WIDTH + hlowcoord 5, 2, VERMILION_DOCK_WIDTH ld a, $d ; water block ld [hli], a ld [hli], a @@ -211,5 +212,5 @@ VermilionDock_TextPointers: dw VermilionDockText1 VermilionDockText1: - TX_FAR _VermilionDockText1 - db "@" + text_far _VermilionDockText1 + text_end diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm old mode 100755 new mode 100644 index 5755628c..7343f37f --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -3,11 +3,11 @@ VermilionGym_Script: bit 5, [hl] res 5, [hl] push hl - call nz, VermilionGymScript_5ca4c + call nz, .LoadNames pop hl bit 6, [hl] res 6, [hl] - call nz, VermilionGymScript_5ca6d + call nz, VermilionGymSetDoorTile call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 ld de, VermilionGym_ScriptPointers @@ -16,32 +16,32 @@ VermilionGym_Script: ld [wVermilionGymCurScript], a ret -VermilionGymScript_5ca4c: - ld hl, Gym3CityName - ld de, Gym3LeaderName +.LoadNames: + ld hl, .CityName + ld de, .LeaderName jp LoadGymLeaderAndCityName -Gym3CityName: +.CityName: db "VERMILION CITY@" -Gym3LeaderName: +.LeaderName: db "LT.SURGE@" -VermilionGymScript_5ca6d: +VermilionGymSetDoorTile: CheckEvent EVENT_2ND_LOCK_OPENED - jr nz, .asm_5ca78 - ld a, $24 - jr .asm_5ca7f -.asm_5ca78 + jr nz, .doorsOpen + ld a, $24 ; double door tile ID + jr .replaceTile +.doorsOpen ld a, SFX_GO_INSIDE call PlaySound - ld a, $5 -.asm_5ca7f + ld a, $5 ; clear floor tile ID +.replaceTile ld [wNewTileBlockID], a lb bc, 2, 2 predef_jump ReplaceTileBlock -VermilionGymScript_5ca8a: +VermilionGymResetScripts: xor a ld [wJoyIgnore], a ld [wVermilionGymCurScript], a @@ -52,97 +52,76 @@ VermilionGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw VermilionGymScript3 + dw VermilionGymLTSurgePostBattle -VermilionGymScript3: +VermilionGymLTSurgePostBattle: ld a, [wIsInBattle] - cp $ff - jp z, VermilionGymScript_5ca8a - ld a, $f0 + cp $ff ; did we lose? + jp z, VermilionGymResetScripts + ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a -VermilionGymScript_5caaa: +VermilionGymReceiveTM24: ld a, $6 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_LT_SURGE - lb bc, TM_24, 1 + lb bc, TM_THUNDERBOLT, 1 call GiveItem jr nc, .BagFull ld a, $7 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM24 - jr .asm_5cad3 + jr .gymVictory .BagFull ld a, $8 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_5cad3 +.gymVictory ld hl, wObtainedBadges - set 2, [hl] + set BIT_THUNDERBADGE, [hl] ld hl, wBeatGymFlags - set 2, [hl] + set BIT_THUNDERBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2 - jp VermilionGymScript_5ca8a + jp VermilionGymResetScripts VermilionGym_TextPointers: - dw VermilionGymText1 - dw VermilionGymText2 - dw VermilionGymText3 - dw VermilionGymText4 - dw VermilionGymText5 - dw VermilionGymText6 - dw VermilionGymText7 - dw VermilionGymText8 + dw LTSurgeText + dw VermilionGymTrainerText1 + dw VermilionGymTrainerText2 + dw VermilionGymTrainerText3 + dw VermilionGymFanText + dw LTSurgeThunderbadgeInfoText + dw ReceivedTM24Text + dw TM24NoRoomText VermilionGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_0 - dw VermilionGymBattleText1 ; TextBeforeBattle - dw VermilionGymAfterBattleText1 ; TextAfterBattle - dw VermilionGymEndBattleText1 ; TextEndBattle - dw VermilionGymEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_VERMILION_GYM_TRAINER_0, 3, VermilionGymBattleText1, VermilionGymEndBattleText1, VermilionGymAfterBattleText1 VermilionGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_1 - dw VermilionGymBattleText2 ; TextBeforeBattle - dw VermilionGymAfterBattleText2 ; TextAfterBattle - dw VermilionGymEndBattleText2 ; TextEndBattle - dw VermilionGymEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_VERMILION_GYM_TRAINER_1, 2, VermilionGymBattleText2, VermilionGymEndBattleText2, VermilionGymAfterBattleText2 VermilionGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_2 - dw VermilionGymBattleText3 ; TextBeforeBattle - dw VermilionGymAfterBattleText3 ; TextAfterBattle - dw VermilionGymEndBattleText3 ; TextEndBattle - dw VermilionGymEndBattleText3 ; TextEndBattle + trainer EVENT_BEAT_VERMILION_GYM_TRAINER_2, 3, VermilionGymBattleText3, VermilionGymEndBattleText3, VermilionGymAfterBattleText3 + db -1 ; end - db $ff - -VermilionGymText1: - TX_ASM +LTSurgeText: + text_asm CheckEvent EVENT_BEAT_LT_SURGE - jr z, .asm_5cb39 + jr z, .beforeBeat CheckEventReuseA EVENT_GOT_TM24 - jr nz, .asm_5cb31 - call z, VermilionGymScript_5caaa + jr nz, .afterBeat + call z, VermilionGymReceiveTM24 call DisableWaitingAfterTextDisplay - jr .asm_5cb6a -.asm_5cb31 - ld hl, VermilionGymText_5cb72 + jr .done +.afterBeat + ld hl, LTSurgePostBattleAdviceText call PrintText - jr .asm_5cb6a -.asm_5cb39 - ld hl, VermilionGymText_5cb6d + jr .done +.beforeBeat + ld hl, LTSurgePreBattleText call PrintText ld hl, wd72d set 6, [hl] @@ -150,118 +129,118 @@ VermilionGymText1: ld hl, ReceivedThunderbadgeText ld de, ReceivedThunderbadgeText call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 ld [wGymLeaderNo], a xor a - ld [hJoyHeld], a - ld a, $3 + ldh [hJoyHeld], a + ld a, $3 ; set script index to LT Surge post-battle script ld [wVermilionGymCurScript], a ld [wCurMapScript], a -.asm_5cb6a +.done jp TextScriptEnd -VermilionGymText_5cb6d: - TX_FAR _VermilionGymText_5cb6d - db "@" +LTSurgePreBattleText: + text_far _LTSurgePreBattleText + text_end -VermilionGymText_5cb72: - TX_FAR _VermilionGymText_5cb72 - db "@" +LTSurgePostBattleAdviceText: + text_far _LTSurgePostBattleAdviceText + text_end -VermilionGymText6: - TX_FAR _VermilionGymText_5cb77 - db "@" +LTSurgeThunderbadgeInfoText: + text_far _LTSurgeThunderbadgeInfoText + text_end -VermilionGymText7: - TX_FAR _ReceivedTM24Text - TX_SFX_KEY_ITEM - TX_FAR _TM24ExplanationText - db "@" +ReceivedTM24Text: + text_far _ReceivedTM24Text + sound_get_key_item + text_far _TM24ExplanationText + text_end -VermilionGymText8: - TX_FAR _TM24NoRoomText - db "@" +TM24NoRoomText: + text_far _TM24NoRoomText + text_end ReceivedThunderbadgeText: - TX_FAR _ReceivedThunderbadgeText - db "@" + text_far _ReceivedThunderbadgeText + text_end -VermilionGymText2: - TX_ASM +VermilionGymTrainerText1: + text_asm ld hl, VermilionGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd VermilionGymBattleText1: - TX_FAR _VermilionGymBattleText1 - db "@" + text_far _VermilionGymBattleText1 + text_end VermilionGymEndBattleText1: - TX_FAR _VermilionGymEndBattleText1 - db "@" + text_far _VermilionGymEndBattleText1 + text_end VermilionGymAfterBattleText1: - TX_FAR _VermilionGymAfterBattleText1 - db "@" + text_far _VermilionGymAfterBattleText1 + text_end -VermilionGymText3: - TX_ASM +VermilionGymTrainerText2: + text_asm ld hl, VermilionGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd VermilionGymBattleText2: - TX_FAR _VermilionGymBattleText2 - db "@" + text_far _VermilionGymBattleText2 + text_end VermilionGymEndBattleText2: - TX_FAR _VermilionGymEndBattleText2 - db "@" + text_far _VermilionGymEndBattleText2 + text_end VermilionGymAfterBattleText2: - TX_FAR _VermilionGymAfterBattleText2 - db "@" + text_far _VermilionGymAfterBattleText2 + text_end -VermilionGymText4: - TX_ASM +VermilionGymTrainerText3: + text_asm ld hl, VermilionGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd VermilionGymBattleText3: - TX_FAR _VermilionGymBattleText3 - db "@" + text_far _VermilionGymBattleText3 + text_end VermilionGymEndBattleText3: - TX_FAR _VermilionGymEndBattleText3 - db "@" + text_far _VermilionGymEndBattleText3 + text_end VermilionGymAfterBattleText3: - TX_FAR _VermilionGymAfterBattleText3 - db "@" + text_far _VermilionGymAfterBattleText3 + text_end -VermilionGymText5: - TX_ASM +VermilionGymFanText: + text_asm ld a, [wBeatGymFlags] - bit 2, a - jr nz, .asm_5cbeb - ld hl, VermilionGymText_5cbf4 + bit BIT_THUNDERBADGE, a + jr nz, .afterBeat + ld hl, VermilionGymFanPreBattleText call PrintText - jr .asm_5cbf1 -.asm_5cbeb - ld hl, VermilionGymText_5cbf9 + jr .done +.afterBeat + ld hl, VermilionGymFanPostBattleText call PrintText -.asm_5cbf1 +.done jp TextScriptEnd -VermilionGymText_5cbf4: - TX_FAR _VermilionGymText_5cbf4 - db "@" +VermilionGymFanPreBattleText: + text_far _VermilionGymFanPreBattleText + text_end -VermilionGymText_5cbf9: - TX_FAR _VermilionGymText_5cbf9 - db "@" +VermilionGymFanPostBattleText: + text_far _VermilionGymFanPostBattleText + text_end diff --git a/scripts/VermilionMart.asm b/scripts/VermilionMart.asm old mode 100755 new mode 100644 index 00ba0c26..88a632c8 --- a/scripts/VermilionMart.asm +++ b/scripts/VermilionMart.asm @@ -7,9 +7,9 @@ VermilionMart_TextPointers: dw VermilionMartText3 VermilionMartText2: - TX_FAR _VermilionMartText2 - db "@" + text_far _VermilionMartText2 + text_end VermilionMartText3: - TX_FAR _VermilionMartText3 - db "@" + text_far _VermilionMartText3 + text_end diff --git a/scripts/VermilionOldRodHouse.asm b/scripts/VermilionOldRodHouse.asm old mode 100755 new mode 100644 index 772158ff..524395d4 --- a/scripts/VermilionOldRodHouse.asm +++ b/scripts/VermilionOldRodHouse.asm @@ -5,53 +5,53 @@ VermilionOldRodHouse_TextPointers: dw VermilionHouse2Text1 VermilionHouse2Text1: - TX_ASM + text_asm ld a, [wd728] - bit 3, a - jr nz, .asm_03ef5 + bit 3, a ; got old rod? + jr nz, .got_item ld hl, VermilionHouse2Text_560b1 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_eb1b7 + jr nz, .refused lb bc, OLD_ROD, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, wd728 - set 3, [hl] + set 3, [hl] ; got old rod ld hl, VermilionHouse2Text_560b6 - jr .asm_5dd95 -.BagFull + jr .done +.bag_full ld hl, VermilionHouse2Text_560ca - jr .asm_5dd95 -.asm_eb1b7 + jr .done +.refused ld hl, VermilionHouse2Text_560c0 - jr .asm_5dd95 -.asm_03ef5 + jr .done +.got_item ld hl, VermilionHouse2Text_560c5 -.asm_5dd95 +.done call PrintText jp TextScriptEnd VermilionHouse2Text_560b1: - TX_FAR _VermilionHouse2Text_560b1 - db "@" + text_far _VermilionHouse2Text_560b1 + text_end VermilionHouse2Text_560b6: - TX_FAR _VermilionHouse2Text_560b6 - TX_SFX_ITEM_1 - TX_FAR _VermilionHouse2Text_560bb - db "@" + text_far _VermilionHouse2Text_560b6 + sound_get_item_1 + text_far _VermilionHouse2Text_560bb + text_end VermilionHouse2Text_560c0: - TX_FAR _VermilionHouse2Text_560c0 - db "@" + text_far _VermilionHouse2Text_560c0 + text_end VermilionHouse2Text_560c5: - TX_FAR _VermilionHouse2Text_560c5 - db "@" + text_far _VermilionHouse2Text_560c5 + text_end VermilionHouse2Text_560ca: - TX_FAR _VermilionHouse2Text_560ca - db "@" + text_far _VermilionHouse2Text_560ca + text_end diff --git a/scripts/VermilionPidgeyHouse.asm b/scripts/VermilionPidgeyHouse.asm old mode 100755 new mode 100644 index 5004d367..fef476d5 --- a/scripts/VermilionPidgeyHouse.asm +++ b/scripts/VermilionPidgeyHouse.asm @@ -8,17 +8,17 @@ VermilionPidgeyHouse_TextPointers: dw VermilionHouse1Text3 VermilionHouse1Text1: - TX_FAR _VermilionHouse1Text1 - db "@" + text_far _VermilionHouse1Text1 + text_end VermilionHouse1Text2: - TX_FAR _VermilionHouse1Text2 - TX_ASM + text_far _VermilionHouse1Text2 + text_asm ld a, PIDGEY call PlayCry call WaitForSoundToFinish jp TextScriptEnd VermilionHouse1Text3: - TX_FAR _VermilionHouse1Text3 - db "@" + text_far _VermilionHouse1Text3 + text_end diff --git a/scripts/VermilionPokecenter.asm b/scripts/VermilionPokecenter.asm old mode 100755 new mode 100644 index 60b28c57..65b5a3df --- a/scripts/VermilionPokecenter.asm +++ b/scripts/VermilionPokecenter.asm @@ -9,15 +9,15 @@ VermilionPokecenter_TextPointers: dw VermilionTradeNurseText VermilionHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse VermilionPokecenterText2: - TX_FAR _VermilionPokecenterText2 - db "@" + text_far _VermilionPokecenterText2 + text_end VermilionPokecenterText3: - TX_FAR _VermilionPokecenterText3 - db "@" + text_far _VermilionPokecenterText3 + text_end VermilionTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/VermilionTradeHouse.asm b/scripts/VermilionTradeHouse.asm old mode 100755 new mode 100644 index 828e3716..7fdb9f40 --- a/scripts/VermilionTradeHouse.asm +++ b/scripts/VermilionTradeHouse.asm @@ -5,8 +5,8 @@ VermilionTradeHouse_TextPointers: dw VermilionHouse3Text1 VermilionHouse3Text1: - TX_ASM - ld a, $4 + text_asm + ld a, TRADE_FOR_DUX ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm old mode 100755 new mode 100644 index 0a2588a7..b70f0dd4 --- a/scripts/VictoryRoad1F.asm +++ b/scripts/VictoryRoad1F.asm @@ -35,7 +35,8 @@ VictoryRoad1Script0: ret CoordsData_5da5c: - db $0D,$11,$FF + dbmapcoord 17, 13 + db -1 ; end VictoryRoad1F_TextPointers: dw VictoryRoad1Text1 @@ -47,57 +48,43 @@ VictoryRoad1F_TextPointers: dw BoulderText VictoryRoad1TrainerHeader0: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 - dw VictoryRoad1BattleText1 ; TextBeforeBattle - dw VictoryRoad1AfterBattleText1 ; TextAfterBattle - dw VictoryRoad1EndBattleText1 ; TextEndBattle - dw VictoryRoad1EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1BattleText1, VictoryRoad1EndBattleText1, VictoryRoad1AfterBattleText1 VictoryRoad1TrainerHeader1: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 - dw VictoryRoad1BattleText2 ; TextBeforeBattle - dw VictoryRoad1AfterBattleText2 ; TextAfterBattle - dw VictoryRoad1EndBattleText2 ; TextEndBattle - dw VictoryRoad1EndBattleText2 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1, 2, VictoryRoad1BattleText2, VictoryRoad1EndBattleText2, VictoryRoad1AfterBattleText2 + db -1 ; end VictoryRoad1Text1: - TX_ASM + text_asm ld hl, VictoryRoad1TrainerHeader0 call TalkToTrainer jp TextScriptEnd VictoryRoad1Text2: - TX_ASM + text_asm ld hl, VictoryRoad1TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad1BattleText1: - TX_FAR _VictoryRoad1BattleText1 - db "@" + text_far _VictoryRoad1BattleText1 + text_end VictoryRoad1EndBattleText1: - TX_FAR _VictoryRoad1EndBattleText1 - db "@" + text_far _VictoryRoad1EndBattleText1 + text_end VictoryRoad1AfterBattleText1: - TX_FAR _VictoryRoad1AfterBattleText1 - db "@" + text_far _VictoryRoad1AfterBattleText1 + text_end VictoryRoad1BattleText2: - TX_FAR _VictoryRoad1BattleText2 - db "@" + text_far _VictoryRoad1BattleText2 + text_end VictoryRoad1EndBattleText2: - TX_FAR _VictoryRoad1EndBattleText2 - db "@" + text_far _VictoryRoad1EndBattleText2 + text_end VictoryRoad1AfterBattleText2: - TX_FAR _VictoryRoad1AfterBattleText2 - db "@" + text_far _VictoryRoad1AfterBattleText2 + text_end diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm old mode 100755 new mode 100644 index 9dfb05ed..61843e5e --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm @@ -17,7 +17,6 @@ VictoryRoad2F_Script: VictoryRoad2Script_517c4: ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH - VictoryRoad2Script_517c9: CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 jr z, .asm_517da @@ -31,7 +30,6 @@ VictoryRoad2Script_517c9: ret z ld a, $1d lb bc, 7, 11 - VictoryRoad2Script_517e2: ld [wNewTileBlockID], a predef ReplaceTileBlock @@ -64,9 +62,9 @@ VictoryRoad2Script0: ret CoordsData_51816: - db $10,$01 - db $10,$09 - db $FF + dbmapcoord 1, 16 + dbmapcoord 9, 16 + db -1 ; end VictoryRoad2F_TextPointers: dw VictoryRoad2Text1 @@ -84,161 +82,119 @@ VictoryRoad2F_TextPointers: dw BoulderText VictoryRoad2TrainerHeader0: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 - dw VictoryRoad2BattleText1 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText1 ; TextAfterBattle - dw VictoryRoad2EndBattleText1 ; TextEndBattle - dw VictoryRoad2EndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0, 4, VictoryRoad2BattleText1, VictoryRoad2EndBattleText1, VictoryRoad2AfterBattleText1 VictoryRoad2TrainerHeader1: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1 - dw VictoryRoad2BattleText2 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText2 ; TextAfterBattle - dw VictoryRoad2EndBattleText2 ; TextEndBattle - dw VictoryRoad2EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1, 3, VictoryRoad2BattleText2, VictoryRoad2EndBattleText2, VictoryRoad2AfterBattleText2 VictoryRoad2TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 - dw VictoryRoad2BattleText3 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText3 ; TextAfterBattle - dw VictoryRoad2EndBattleText3 ; TextEndBattle - dw VictoryRoad2EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2, 3, VictoryRoad2BattleText3, VictoryRoad2EndBattleText3, VictoryRoad2AfterBattleText3 VictoryRoad2TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 - dw VictoryRoad2BattleText4 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText4 ; TextAfterBattle - dw VictoryRoad2EndBattleText4 ; TextEndBattle - dw VictoryRoad2EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3, 1, VictoryRoad2BattleText4, VictoryRoad2EndBattleText4, VictoryRoad2AfterBattleText4 VictoryRoad2TrainerHeader4: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 - dw VictoryRoad2BattleText5 ; TextBeforeBattle - dw VictoryRoad2AfterBattleText5 ; TextAfterBattle - dw VictoryRoad2EndBattleText5 ; TextEndBattle - dw VictoryRoad2EndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4, 3, VictoryRoad2BattleText5, VictoryRoad2EndBattleText5, VictoryRoad2AfterBattleText5 MoltresTrainerHeader: - dbEventFlagBit EVENT_BEAT_MOLTRES - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MOLTRES - dw MoltresBattleText ; TextBeforeBattle - dw MoltresBattleText ; TextAfterBattle - dw MoltresBattleText ; TextEndBattle - dw MoltresBattleText ; TextEndBattle - - db $ff + trainer EVENT_BEAT_MOLTRES, 0, MoltresBattleText, MoltresBattleText, MoltresBattleText + db -1 ; end VictoryRoad2Text1: - TX_ASM + text_asm ld hl, VictoryRoad2TrainerHeader0 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text2: - TX_ASM + text_asm ld hl, VictoryRoad2TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text3: - TX_ASM + text_asm ld hl, VictoryRoad2TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text4: - TX_ASM + text_asm ld hl, VictoryRoad2TrainerHeader3 call TalkToTrainer jp TextScriptEnd VictoryRoad2Text5: - TX_ASM + text_asm ld hl, VictoryRoad2TrainerHeader4 call TalkToTrainer jp TextScriptEnd MoltresText: - TX_ASM + text_asm ld hl, MoltresTrainerHeader call TalkToTrainer jp TextScriptEnd MoltresBattleText: - TX_FAR _MoltresBattleText - TX_ASM + text_far _MoltresBattleText + text_asm ld a, MOLTRES call PlayCry call WaitForSoundToFinish jp TextScriptEnd VictoryRoad2BattleText1: - TX_FAR _VictoryRoad2BattleText1 - db "@" + text_far _VictoryRoad2BattleText1 + text_end VictoryRoad2EndBattleText1: - TX_FAR _VictoryRoad2EndBattleText1 - db "@" + text_far _VictoryRoad2EndBattleText1 + text_end VictoryRoad2AfterBattleText1: - TX_FAR _VictoryRoad2AfterBattleText1 - db "@" + text_far _VictoryRoad2AfterBattleText1 + text_end VictoryRoad2BattleText2: - TX_FAR _VictoryRoad2BattleText2 - db "@" + text_far _VictoryRoad2BattleText2 + text_end VictoryRoad2EndBattleText2: - TX_FAR _VictoryRoad2EndBattleText2 - db "@" + text_far _VictoryRoad2EndBattleText2 + text_end VictoryRoad2AfterBattleText2: - TX_FAR _VictoryRoad2AfterBattleText2 - db "@" + text_far _VictoryRoad2AfterBattleText2 + text_end VictoryRoad2BattleText3: - TX_FAR _VictoryRoad2BattleText3 - db "@" + text_far _VictoryRoad2BattleText3 + text_end VictoryRoad2EndBattleText3: - TX_FAR _VictoryRoad2EndBattleText3 - db "@" + text_far _VictoryRoad2EndBattleText3 + text_end VictoryRoad2AfterBattleText3: - TX_FAR _VictoryRoad2AfterBattleText3 - db "@" + text_far _VictoryRoad2AfterBattleText3 + text_end VictoryRoad2BattleText4: - TX_FAR _VictoryRoad2BattleText4 - db "@" + text_far _VictoryRoad2BattleText4 + text_end VictoryRoad2EndBattleText4: - TX_FAR _VictoryRoad2EndBattleText4 - db "@" + text_far _VictoryRoad2EndBattleText4 + text_end VictoryRoad2AfterBattleText4: - TX_FAR _VictoryRoad2AfterBattleText4 - db "@" + text_far _VictoryRoad2AfterBattleText4 + text_end VictoryRoad2BattleText5: - TX_FAR _VictoryRoad2BattleText5 - db "@" + text_far _VictoryRoad2BattleText5 + text_end VictoryRoad2EndBattleText5: - TX_FAR _VictoryRoad2EndBattleText5 - db "@" + text_far _VictoryRoad2EndBattleText5 + text_end VictoryRoad2AfterBattleText5: - TX_FAR _VictoryRoad2AfterBattleText5 - db "@" + text_far _VictoryRoad2AfterBattleText5 + text_end diff --git a/scripts/VictoryRoad3F.asm b/scripts/VictoryRoad3F.asm old mode 100755 new mode 100644 index d145c4a1..7febdd3d --- a/scripts/VictoryRoad3F.asm +++ b/scripts/VictoryRoad3F.asm @@ -51,9 +51,9 @@ VictoryRoad3Script0: predef_jump ShowObject .coordsData_449f9: - db $05,$03 - db $0F,$17 - db $FF + dbmapcoord 3, 5 + dbmapcoord 23, 15 + db -1 ; end .asm_449fe ld a, VICTORY_ROAD_2F @@ -87,111 +87,83 @@ VictoryRoad3F_TextPointers: dw BoulderText VictoryRoad3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 - dw VictoryRoad3BattleText2 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText2 ; TextAfterBattle - dw VictoryRoad3EndBattleText2 ; TextEndBattle - dw VictoryRoad3EndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0, 1, VictoryRoad3BattleText2, VictoryRoad3EndBattleText2, VictoryRoad3AfterBattleText2 VictoryRoad3TrainerHeader1: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1 - dw VictoryRoad3BattleText3 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText3 ; TextAfterBattle - dw VictoryRoad3EndBattleText3 ; TextEndBattle - dw VictoryRoad3EndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1, 4, VictoryRoad3BattleText3, VictoryRoad3EndBattleText3, VictoryRoad3AfterBattleText3 VictoryRoad3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 - dw VictoryRoad3BattleText4 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText4 ; TextAfterBattle - dw VictoryRoad3EndBattleText4 ; TextEndBattle - dw VictoryRoad3EndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2, 4, VictoryRoad3BattleText4, VictoryRoad3EndBattleText4, VictoryRoad3AfterBattleText4 VictoryRoad3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 - dw VictoryRoad3BattleText5 ; TextBeforeBattle - dw VictoryRoad3AfterBattleText5 ; TextAfterBattle - dw VictoryRoad3EndBattleText5 ; TextEndBattle - dw VictoryRoad3EndBattleText5 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3, 4, VictoryRoad3BattleText5, VictoryRoad3EndBattleText5, VictoryRoad3AfterBattleText5 + db -1 ; end VictoryRoad3Text1: - TX_ASM + text_asm ld hl, VictoryRoad3TrainerHeader0 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text2: - TX_ASM + text_asm ld hl, VictoryRoad3TrainerHeader1 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text3: - TX_ASM + text_asm ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd VictoryRoad3Text4: - TX_ASM + text_asm ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd VictoryRoad3BattleText2: - TX_FAR _VictoryRoad3BattleText2 - db "@" + text_far _VictoryRoad3BattleText2 + text_end VictoryRoad3EndBattleText2: - TX_FAR _VictoryRoad3EndBattleText2 - db "@" + text_far _VictoryRoad3EndBattleText2 + text_end VictoryRoad3AfterBattleText2: - TX_FAR _VictoryRoad3AfterBattleText2 - db "@" + text_far _VictoryRoad3AfterBattleText2 + text_end VictoryRoad3BattleText3: - TX_FAR _VictoryRoad3BattleText3 - db "@" + text_far _VictoryRoad3BattleText3 + text_end VictoryRoad3EndBattleText3: - TX_FAR _VictoryRoad3EndBattleText3 - db "@" + text_far _VictoryRoad3EndBattleText3 + text_end VictoryRoad3AfterBattleText3: - TX_FAR _VictoryRoad3AfterBattleText3 - db "@" + text_far _VictoryRoad3AfterBattleText3 + text_end VictoryRoad3BattleText4: - TX_FAR _VictoryRoad3BattleText4 - db "@" + text_far _VictoryRoad3BattleText4 + text_end VictoryRoad3EndBattleText4: - TX_FAR _VictoryRoad3EndBattleText4 - db "@" + text_far _VictoryRoad3EndBattleText4 + text_end VictoryRoad3AfterBattleText4: - TX_FAR _VictoryRoad3AfterBattleText4 - db "@" + text_far _VictoryRoad3AfterBattleText4 + text_end VictoryRoad3BattleText5: - TX_FAR _VictoryRoad3BattleText5 - db "@" + text_far _VictoryRoad3BattleText5 + text_end VictoryRoad3EndBattleText5: - TX_FAR _VictoryRoad3EndBattleText5 - db "@" + text_far _VictoryRoad3EndBattleText5 + text_end VictoryRoad3AfterBattleText5: - TX_FAR _VictoryRoad3AfterBattleText5 - db "@" + text_far _VictoryRoad3AfterBattleText5 + text_end diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm old mode 100755 new mode 100644 index b70927b2..96e58a19 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -18,22 +18,22 @@ ViridianCityScript_1900b: CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz ld a, [wObtainedBadges] - cp %01111111 - jr nz, .asm_1901e + cp $ff ^ (1 << BIT_EARTHBADGE) + jr nz, .gym_closed SetEvent EVENT_VIRIDIAN_GYM_OPEN ret -.asm_1901e +.gym_closed ld a, [wYCoord] - cp $8 + cp 8 ret nz ld a, [wXCoord] - cp $20 + cp 32 ret nz ld a, $e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 ld [wViridianCityCurScript], a @@ -43,30 +43,30 @@ ViridianCityScript_1903d: CheckEvent EVENT_GOT_POKEDEX ret nz ld a, [wYCoord] - cp $9 + cp 9 ret nz ld a, [wXCoord] - cp $13 + cp 19 ret nz ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [hJoyHeld], a + ldh [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 ld [wViridianCityCurScript], a ret ViridianCityScript1: - ld a, [wSpriteStateData1 + $34] - ld [$ffeb], a - ld a, [wSpriteStateData1 + $36] - ld [$ffec], a - ld a, [wSpriteStateData2 + $34] - ld [$ffed], a - ld a, [wSpriteStateData2 + $35] - ld [$ffee], a + ld a, [wSprite03StateData1YPixels] + ldh [hSpriteScreenYCoord], a + ld a, [wSprite03StateData1XPixels] + ldh [hSpriteScreenXCoord], a + ld a, [wSprite03StateData2MapY] + ldh [hSpriteMapYCoord], a + ld a, [wSprite03StateData2MapX] + ldh [hSpriteMapXCoord], a xor a ld [wListScrollOffset], a @@ -82,20 +82,20 @@ ViridianCityScript1: ret ViridianCityScript2: - ld a, [$ffeb] - ld [wSpriteStateData1 + $34], a - ld a, [$ffec] - ld [wSpriteStateData1 + $36], a - ld a, [$ffed] - ld [wSpriteStateData2 + $34], a - ld a, [$ffee] - ld [wSpriteStateData2 + $35], a + ldh a, [hSpriteScreenYCoord] + ld [wSprite03StateData1YPixels], a + ldh a, [hSpriteScreenXCoord] + ld [wSprite03StateData1XPixels], a + ldh a, [hSpriteMapYCoord] + ld [wSprite03StateData2MapY], a + ldh a, [hSpriteMapXCoord] + ld [wSprite03StateData2MapX], a call UpdateSprites call Delay3 xor a ld [wJoyIgnore], a ld a, $f - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wBattleType], a @@ -120,7 +120,7 @@ ViridianCityScript_190cf: ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a xor a - ld [wSpriteStateData1 + 9], a + ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a ret @@ -142,82 +142,82 @@ ViridianCity_TextPointers: dw ViridianCityText15 ViridianCityText1: - TX_FAR _ViridianCityText1 - db "@" + text_far _ViridianCityText1 + text_end ViridianCityText2: - TX_ASM + text_asm ld a, [wObtainedBadges] - cp %01111111 + cp $ff ^ (1 << BIT_EARTHBADGE) ld hl, ViridianCityText_19127 - jr z, .asm_ae9fe + jr z, .done CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr nz, .asm_ae9fe + jr nz, .done ld hl, ViridianCityText_19122 -.asm_ae9fe +.done call PrintText jp TextScriptEnd ViridianCityText_19122: - TX_FAR _ViridianCityText_19122 - db "@" + text_far _ViridianCityText_19122 + text_end ViridianCityText_19127: - TX_FAR _ViridianCityText_19127 - db "@" + text_far _ViridianCityText_19127 + text_end ViridianCityText3: - TX_ASM + text_asm ld hl, ViridianCityText_1914d call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_6dfea + jr nz, .no ld hl, ViridianCityText_19157 call PrintText - jr .asm_d611f -.asm_6dfea + jr .done +.no ld hl, ViridianCityText_19152 call PrintText -.asm_d611f +.done jp TextScriptEnd ViridianCityText_1914d: - TX_FAR _ViridianCityText_1914d - db "@" + text_far _ViridianCityText_1914d + text_end ViridianCityText_19152: - TX_FAR _ViridianCityText_19152 - db "@" + text_far _ViridianCityText_19152 + text_end ViridianCityText_19157: - TX_FAR _ViridianCityText_19157 - db "@" + text_far _ViridianCityText_19157 + text_end ViridianCityText4: - TX_ASM + text_asm CheckEvent EVENT_GOT_POKEDEX - jr nz, .asm_83894 + jr nz, .gotPokedex ld hl, ViridianCityText_19175 call PrintText - jr .asm_700a6 -.asm_83894 + jr .done +.gotPokedex ld hl, ViridianCityText_1917a call PrintText -.asm_700a6 +.done jp TextScriptEnd ViridianCityText_19175: - TX_FAR _ViridianCityText_19175 - db "@" + text_far _ViridianCityText_19175 + text_end ViridianCityText_1917a: - TX_FAR _ViridianCityText_1917a - db "@" + text_far _ViridianCityText_1917a + text_end ViridianCityText5: - TX_ASM + text_asm ld hl, ViridianCityText_19191 call PrintText call ViridianCityScript_190cf @@ -226,51 +226,51 @@ ViridianCityText5: jp TextScriptEnd ViridianCityText_19191: - TX_FAR _ViridianCityText_19191 - db "@" + text_far _ViridianCityText_19191 + text_end ViridianCityText6: - TX_ASM + text_asm CheckEvent EVENT_GOT_TM42 - jr nz, .asm_4e5a0 + jr nz, .got_item ld hl, ViridianCityText_191ca call PrintText - lb bc, TM_42, 1 + lb bc, TM_DREAM_EATER, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedTM42Text call PrintText SetEvent EVENT_GOT_TM42 - jr .asm_3c73c -.BagFull + jr .done +.bag_full ld hl, TM42NoRoomText call PrintText - jr .asm_3c73c -.asm_4e5a0 + jr .done +.got_item ld hl, TM42Explanation call PrintText -.asm_3c73c +.done jp TextScriptEnd ViridianCityText_191ca: - TX_FAR _ViridianCityText_191ca - db "@" + text_far _ViridianCityText_191ca + text_end ReceivedTM42Text: - TX_FAR _ReceivedTM42Text - TX_SFX_ITEM_2 - db "@" + text_far _ReceivedTM42Text + sound_get_item_2 + text_end TM42Explanation: - TX_FAR _TM42Explanation - db "@" + text_far _TM42Explanation + text_end TM42NoRoomText: - TX_FAR _TM42NoRoomText - db "@" + text_far _TM42NoRoomText + text_end ViridianCityText7: - TX_ASM + text_asm ld hl, ViridianCityText_1920a call PrintText ld c, 2 @@ -278,50 +278,50 @@ ViridianCityText7: call YesNoChoice ld a, [wCurrentMenuItem] and a - jr z, .asm_42f68 + jr z, .refused ld hl, ViridianCityText_1920f call PrintText ld a, $1 ld [wViridianCityCurScript], a - jr .asm_2413a -.asm_42f68 + jr .done +.refused ld hl, ViridianCityText_19214 call PrintText -.asm_2413a +.done jp TextScriptEnd ViridianCityText_1920a: - TX_FAR _ViridianCityText_1920a - db "@" + text_far _ViridianCityText_1920a + text_end ViridianCityText_1920f: - TX_FAR _ViridianCityText_1920f - db "@" + text_far _ViridianCityText_1920f + text_end ViridianCityText_19214: - TX_FAR _ViridianCityText_19214 - db "@" + text_far _ViridianCityText_19214 + text_end ViridianCityText15: - TX_FAR _ViridianCityText_19219 - db "@" + text_far _ViridianCityText_19219 + text_end ViridianCityText8: - TX_FAR _ViridianCityText8 - db "@" + text_far _ViridianCityText8 + text_end ViridianCityText9: - TX_FAR _ViridianCityText9 - db "@" + text_far _ViridianCityText9 + text_end ViridianCityText10: - TX_FAR _ViridianCityText10 - db "@" + text_far _ViridianCityText10 + text_end ViridianCityText13: - TX_FAR _ViridianCityText13 - db "@" + text_far _ViridianCityText13 + text_end ViridianCityText14: - TX_FAR _ViridianCityText14 - db "@" + text_far _ViridianCityText14 + text_end diff --git a/scripts/ViridianForest.asm b/scripts/ViridianForest.asm old mode 100755 new mode 100644 index acd26b8a..a7e4acf8 --- a/scripts/ViridianForest.asm +++ b/scripts/ViridianForest.asm @@ -29,116 +29,95 @@ ViridianForest_TextPointers: dw ViridianForestText14 ViridianForestTrainerHeader0: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 - dw ViridianForestBattleText1 ; TextBeforeBattle - dw ViridianForestAfterBattleText1 ; TextAfterBattle - dw ViridianForestEndBattleText1 ; TextEndBattle - dw ViridianForestEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestBattleText1, ViridianForestEndBattleText1, ViridianForestAfterBattleText1 ViridianForestTrainerHeader1: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 - dw ViridianForestBattleText2 ; TextBeforeBattle - dw ViridianForestAfterBattleText2 ; TextAfterBattle - dw ViridianForestEndBattleText2 ; TextEndBattle - dw ViridianForestEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestBattleText2, ViridianForestEndBattleText2, ViridianForestAfterBattleText2 ViridianForestTrainerHeader2: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 - db ($1 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 - dw ViridianForestBattleText3 ; TextBeforeBattle - dw ViridianForestAfterBattleText3 ; TextAfterBattle - dw ViridianForestEndBattleText3 ; TextEndBattle - dw ViridianForestEndBattleText3 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestBattleText3, ViridianForestEndBattleText3, ViridianForestAfterBattleText3 + db -1 ; end ViridianForestText1: - TX_FAR _ViridianForestText1 - db "@" + text_far _ViridianForestText1 + text_end ViridianForestText2: - TX_ASM + text_asm ld hl, ViridianForestTrainerHeader0 call TalkToTrainer jp TextScriptEnd ViridianForestText3: - TX_ASM + text_asm ld hl, ViridianForestTrainerHeader1 call TalkToTrainer jp TextScriptEnd ViridianForestText4: - TX_ASM + text_asm ld hl, ViridianForestTrainerHeader2 call TalkToTrainer jp TextScriptEnd ViridianForestBattleText1: - TX_FAR _ViridianForestBattleText1 - db "@" + text_far _ViridianForestBattleText1 + text_end ViridianForestEndBattleText1: - TX_FAR _ViridianForestEndBattleText1 - db "@" + text_far _ViridianForestEndBattleText1 + text_end ViridianForestAfterBattleText1: - TX_FAR _ViridianFrstAfterBattleText1 - db "@" + text_far _ViridianFrstAfterBattleText1 + text_end ViridianForestBattleText2: - TX_FAR _ViridianForestBattleText2 - db "@" + text_far _ViridianForestBattleText2 + text_end ViridianForestEndBattleText2: - TX_FAR _ViridianForestEndBattleText2 - db "@" + text_far _ViridianForestEndBattleText2 + text_end ViridianForestAfterBattleText2: - TX_FAR _ViridianFrstAfterBattleText2 - db "@" + text_far _ViridianFrstAfterBattleText2 + text_end ViridianForestBattleText3: - TX_FAR _ViridianForestBattleText3 - db "@" + text_far _ViridianForestBattleText3 + text_end ViridianForestEndBattleText3: - TX_FAR _ViridianForestEndBattleText3 - db "@" + text_far _ViridianForestEndBattleText3 + text_end ViridianForestAfterBattleText3: - TX_FAR _ViridianFrstAfterBattleText3 - db "@" + text_far _ViridianFrstAfterBattleText3 + text_end ViridianForestText8: - TX_FAR _ViridianForestText8 - db "@" + text_far _ViridianForestText8 + text_end ViridianForestText9: - TX_FAR _ViridianForestText9 - db "@" + text_far _ViridianForestText9 + text_end ViridianForestText10: - TX_FAR _ViridianForestText10 - db "@" + text_far _ViridianForestText10 + text_end ViridianForestText11: - TX_FAR _ViridianForestText11 - db "@" + text_far _ViridianForestText11 + text_end ViridianForestText12: - TX_FAR _ViridianForestText12 - db "@" + text_far _ViridianForestText12 + text_end ViridianForestText13: - TX_FAR _ViridianForestText13 - db "@" + text_far _ViridianForestText13 + text_end ViridianForestText14: - TX_FAR _ViridianForestText14 - db "@" + text_far _ViridianForestText14 + text_end diff --git a/scripts/ViridianForestNorthGate.asm b/scripts/ViridianForestNorthGate.asm old mode 100755 new mode 100644 index e421bf5b..6aef26d3 --- a/scripts/ViridianForestNorthGate.asm +++ b/scripts/ViridianForestNorthGate.asm @@ -6,9 +6,9 @@ ViridianForestNorthGate_TextPointers: dw ViridianForestExitText2 ViridianForestExitText1: - TX_FAR _ViridianForestExitText1 - db "@" + text_far _ViridianForestExitText1 + text_end ViridianForestExitText2: - TX_FAR _ViridianForestExitText2 - db "@" + text_far _ViridianForestExitText2 + text_end diff --git a/scripts/ViridianForestSouthGate.asm b/scripts/ViridianForestSouthGate.asm old mode 100755 new mode 100644 index 397f0eca..996ac2ae --- a/scripts/ViridianForestSouthGate.asm +++ b/scripts/ViridianForestSouthGate.asm @@ -6,9 +6,9 @@ ViridianForestSouthGate_TextPointers: dw ViridianForestEntranceText2 ViridianForestEntranceText1: - TX_FAR _ViridianForestEntranceText1 - db "@" + text_far _ViridianForestEntranceText1 + text_end ViridianForestEntranceText2: - TX_FAR _ViridianForestEntranceText2 - db "@" + text_far _ViridianForestEntranceText2 + text_end diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm old mode 100755 new mode 100644 index 44966fef..68da9301 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -1,6 +1,6 @@ ViridianGym_Script: - ld hl, Gym8CityName - ld de, Gym8LeaderName + ld hl, .CityName + ld de, .LeaderName call LoadGymLeaderAndCityName call EnableAutoTextBoxDrawing ld hl, ViridianGymTrainerHeader0 @@ -10,9 +10,10 @@ ViridianGym_Script: ld [wViridianGymCurScript], a ret -Gym8CityName: +.CityName: db "VIRIDIAN CITY@" -Gym8LeaderName: + +.LeaderName: db "GIOVANNI@" ViridianGymScript_748d6: @@ -49,72 +50,68 @@ ViridianGymScript0: ld [wCurMapScript], a ret -;format: -;db y,x -;dw pointer to movement ViridianGymArrowTilePlayerMovement: - db $b,$13 - dw ViridianGymArrowMovement1 - db $1,$13 - dw ViridianGymArrowMovement2 - db $2,$12 - dw ViridianGymArrowMovement3 - db $2,$b - dw ViridianGymArrowMovement4 - db $a,$10 - dw ViridianGymArrowMovement5 - db $6,$4 - dw ViridianGymArrowMovement6 - db $d,$5 - dw ViridianGymArrowMovement7 - db $e,$4 - dw ViridianGymArrowMovement8 - db $f,$0 - dw ViridianGymArrowMovement9 - db $f,$1 - dw ViridianGymArrowMovement10 - db $10,$d - dw ViridianGymArrowMovement11 - db $11,$d - dw ViridianGymArrowMovement12 - db $FF + map_coord_movement 19, 11, ViridianGymArrowMovement1 + map_coord_movement 19, 1, ViridianGymArrowMovement2 + map_coord_movement 18, 2, ViridianGymArrowMovement3 + map_coord_movement 11, 2, ViridianGymArrowMovement4 + map_coord_movement 16, 10, ViridianGymArrowMovement5 + map_coord_movement 4, 6, ViridianGymArrowMovement6 + map_coord_movement 5, 13, ViridianGymArrowMovement7 + map_coord_movement 4, 14, ViridianGymArrowMovement8 + map_coord_movement 0, 15, ViridianGymArrowMovement9 + map_coord_movement 1, 15, ViridianGymArrowMovement10 + map_coord_movement 13, 16, ViridianGymArrowMovement11 + map_coord_movement 13, 17, ViridianGymArrowMovement12 + db -1 ; end -;format: direction, count ViridianGymArrowMovement1: - db D_UP,$09,$FF + db D_UP, 9 + db -1 ; end ViridianGymArrowMovement2: - db D_LEFT,$08,$FF + db D_LEFT, 8 + db -1 ; end ViridianGymArrowMovement3: - db D_DOWN,$09,$FF + db D_DOWN, 9 + db -1 ; end ViridianGymArrowMovement4: - db D_RIGHT,$06,$FF + db D_RIGHT, 6 + db -1 ; end ViridianGymArrowMovement5: - db D_DOWN,$02,$FF + db D_DOWN, 2 + db -1 ; end ViridianGymArrowMovement6: - db D_DOWN,$07,$FF + db D_DOWN, 7 + db -1 ; end ViridianGymArrowMovement7: - db D_RIGHT,$08,$FF + db D_RIGHT, 8 + db -1 ; end ViridianGymArrowMovement8: - db D_RIGHT,$09,$FF + db D_RIGHT, 9 + db -1 ; end ViridianGymArrowMovement9: - db D_UP,$08,$FF + db D_UP, 8 + db -1 ; end ViridianGymArrowMovement10: - db D_UP,$06,$FF + db D_UP, 6 + db -1 ; end ViridianGymArrowMovement11: - db D_LEFT,$06,$FF + db D_LEFT, 6 + db -1 ; end ViridianGymArrowMovement12: - db D_LEFT,$0C,$FF + db D_LEFT, 12 + db -1 ; end ViridianGymScript4: ld a, [wSimulatedJoypadStatesIndex] @@ -128,7 +125,7 @@ ViridianGymScript4: ld [wCurMapScript], a ret .asm_74980 - jpba LoadSpinnerArrowTiles + farjp LoadSpinnerArrowTiles ViridianGymScript3: ld a, [wIsInBattle] @@ -138,26 +135,26 @@ ViridianGymScript3: ld [wJoyIgnore], a ViridianGymScript3_74995: ld a, $c - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - lb bc, TM_27, 1 + lb bc, TM_FISSURE, 1 call GiveItem jr nc, .BagFull ld a, $d - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_GOT_TM27 - jr .asm_749be + jr .gymVictory .BagFull ld a, $e - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_749be +.gymVictory ld hl, wObtainedBadges - set 7, [hl] + set BIT_EARTHBADGE, [hl] ld hl, wBeatGymFlags - set 7, [hl] + set BIT_EARTHBADGE, [hl] ; deactivate gym trainers SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7 @@ -185,89 +182,33 @@ ViridianGym_TextPointers: dw ViridianGymText14 ViridianGymTrainerHeader0: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 - dw ViridianGymBattleText1 ; TextBeforeBattle - dw ViridianGymAfterBattleText1 ; TextAfterBattle - dw ViridianGymEndBattleText1 ; TextEndBattle - dw ViridianGymEndBattleText1 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, 4, ViridianGymBattleText1, ViridianGymEndBattleText1, ViridianGymAfterBattleText1 ViridianGymTrainerHeader1: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 - dw ViridianGymBattleText2 ; TextBeforeBattle - dw ViridianGymAfterBattleText2 ; TextAfterBattle - dw ViridianGymEndBattleText2 ; TextEndBattle - dw ViridianGymEndBattleText2 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1, 4, ViridianGymBattleText2, ViridianGymEndBattleText2, ViridianGymAfterBattleText2 ViridianGymTrainerHeader2: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 - dw ViridianGymBattleText3 ; TextBeforeBattle - dw ViridianGymAfterBattleText3 ; TextAfterBattle - dw ViridianGymEndBattleText3 ; TextEndBattle - dw ViridianGymEndBattleText3 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2, 4, ViridianGymBattleText3, ViridianGymEndBattleText3, ViridianGymAfterBattleText3 ViridianGymTrainerHeader3: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 - db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 - dw ViridianGymBattleText4 ; TextBeforeBattle - dw ViridianGymAfterBattleText4 ; TextAfterBattle - dw ViridianGymEndBattleText4 ; TextEndBattle - dw ViridianGymEndBattleText4 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3, 2, ViridianGymBattleText4, ViridianGymEndBattleText4, ViridianGymAfterBattleText4 ViridianGymTrainerHeader4: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 - dw ViridianGymBattleText5 ; TextBeforeBattle - dw ViridianGymAfterBattleText5 ; TextAfterBattle - dw ViridianGymEndBattleText5 ; TextEndBattle - dw ViridianGymEndBattleText5 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4, 3, ViridianGymBattleText5, ViridianGymEndBattleText5, ViridianGymAfterBattleText5 ViridianGymTrainerHeader5: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 - dw ViridianGymBattleText6 ; TextBeforeBattle - dw ViridianGymAfterBattleText6 ; TextAfterBattle - dw ViridianGymEndBattleText6 ; TextEndBattle - dw ViridianGymEndBattleText6 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5, 4, ViridianGymBattleText6, ViridianGymEndBattleText6, ViridianGymAfterBattleText6 ViridianGymTrainerHeader6: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 - db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 - dw ViridianGymBattleText7 ; TextBeforeBattle - dw ViridianGymAfterBattleText7 ; TextAfterBattle - dw ViridianGymEndBattleText7 ; TextEndBattle - dw ViridianGymEndBattleText7 ; TextEndBattle - + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1, 3, ViridianGymBattleText7, ViridianGymEndBattleText7, ViridianGymAfterBattleText7 ViridianGymTrainerHeader7: - dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 - dw ViridianGymBattleText8 ; TextBeforeBattle - dw ViridianGymAfterBattleText8 ; TextAfterBattle - dw ViridianGymEndBattleText8 ; TextEndBattle - dw ViridianGymEndBattleText8 ; TextEndBattle - - db $ff + trainer EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1, 4, ViridianGymBattleText8, ViridianGymEndBattleText8, ViridianGymAfterBattleText8 + db -1 ; end ViridianGymText1: - TX_ASM + text_asm CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI - jr z, .asm_6de66 + jr z, .beginBattle CheckEventReuseA EVENT_GOT_TM27 - jr nz, .asm_9fc95 + jr nz, .afterVictory call z, ViridianGymScript3_74995 call DisableWaitingAfterTextDisplay - jr .asm_6dff7 -.asm_9fc95 + jr .done +.afterVictory ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, ViridianGymText_74ad9 @@ -279,8 +220,8 @@ ViridianGymText1: call UpdateSprites call Delay3 call GBFadeInFromBlack - jr .asm_6dff7 -.asm_6de66 + jr .done +.beginBattle ld hl, ViridianGymText_74ace call PrintText ld hl, wd72d @@ -289,7 +230,7 @@ ViridianGymText1: ld hl, ViridianGymText_74ad3 ld de, ViridianGymText_74ad3 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ldh a, [hSpriteIndex] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -297,185 +238,185 @@ ViridianGymText1: ld [wGymLeaderNo], a ld a, $3 ld [wViridianGymCurScript], a -.asm_6dff7 +.done jp TextScriptEnd ViridianGymText_74ace: - TX_FAR _ViridianGymText_74ace - db "@" + text_far _ViridianGymText_74ace + text_end ViridianGymText_74ad3: - TX_FAR _ViridianGymText_74ad3 - TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded - db "@" + text_far _ViridianGymText_74ad3 + sound_level_up ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded + text_end ViridianGymText_74ad9: - TX_FAR _ViridianGymText_74ad9 - TX_WAIT - db "@" + text_far _ViridianGymText_74ad9 + text_waitbutton + text_end ViridianGymText12: - TX_FAR _ViridianGymText12 - db "@" + text_far _ViridianGymText12 + text_end ViridianGymText13: - TX_FAR _ReceivedTM27Text - TX_SFX_ITEM_1 + text_far _ReceivedTM27Text + sound_get_item_1 TM27ExplanationText: - TX_FAR _TM27ExplanationText - db "@" + text_far _TM27ExplanationText + text_end ViridianGymText14: - TX_FAR _TM27NoRoomText - db "@" + text_far _TM27NoRoomText + text_end ViridianGymText2: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText1: - TX_FAR _ViridianGymBattleText1 - db "@" + text_far _ViridianGymBattleText1 + text_end ViridianGymEndBattleText1: - TX_FAR _ViridianGymEndBattleText1 - db "@" + text_far _ViridianGymEndBattleText1 + text_end ViridianGymAfterBattleText1: - TX_FAR _ViridianGymAfterBattleText1 - db "@" + text_far _ViridianGymAfterBattleText1 + text_end ViridianGymText3: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText2: - TX_FAR _ViridianGymBattleText2 - db "@" + text_far _ViridianGymBattleText2 + text_end ViridianGymEndBattleText2: - TX_FAR _ViridianGymEndBattleText2 - db "@" + text_far _ViridianGymEndBattleText2 + text_end ViridianGymAfterBattleText2: - TX_FAR _ViridianGymAfterBattleText2 - db "@" + text_far _ViridianGymAfterBattleText2 + text_end ViridianGymText4: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText3: - TX_FAR _ViridianGymBattleText3 - db "@" + text_far _ViridianGymBattleText3 + text_end ViridianGymEndBattleText3: - TX_FAR _ViridianGymEndBattleText3 - db "@" + text_far _ViridianGymEndBattleText3 + text_end ViridianGymAfterBattleText3: - TX_FAR _ViridianGymAfterBattleText3 - db "@" + text_far _ViridianGymAfterBattleText3 + text_end ViridianGymText5: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText4: - TX_FAR _ViridianGymBattleText4 - db "@" + text_far _ViridianGymBattleText4 + text_end ViridianGymEndBattleText4: - TX_FAR _ViridianGymEndBattleText4 - db "@" + text_far _ViridianGymEndBattleText4 + text_end ViridianGymAfterBattleText4: - TX_FAR _ViridianGymAfterBattleText4 - db "@" + text_far _ViridianGymAfterBattleText4 + text_end ViridianGymText6: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText5: - TX_FAR _ViridianGymBattleText5 - db "@" + text_far _ViridianGymBattleText5 + text_end ViridianGymEndBattleText5: - TX_FAR _ViridianGymEndBattleText5 - db "@" + text_far _ViridianGymEndBattleText5 + text_end ViridianGymAfterBattleText5: - TX_FAR _ViridianGymAfterBattleText5 - db "@" + text_far _ViridianGymAfterBattleText5 + text_end ViridianGymText7: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText6: - TX_FAR _ViridianGymBattleText6 - db "@" + text_far _ViridianGymBattleText6 + text_end ViridianGymEndBattleText6: - TX_FAR _ViridianGymEndBattleText6 - db "@" + text_far _ViridianGymEndBattleText6 + text_end ViridianGymAfterBattleText6: - TX_FAR _ViridianGymAfterBattleText6 - db "@" + text_far _ViridianGymAfterBattleText6 + text_end ViridianGymText8: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText7: - TX_FAR _ViridianGymBattleText7 - db "@" + text_far _ViridianGymBattleText7 + text_end ViridianGymEndBattleText7: - TX_FAR _ViridianGymEndBattleText7 - db "@" + text_far _ViridianGymEndBattleText7 + text_end ViridianGymAfterBattleText7: - TX_FAR _ViridianGymAfterBattleText7 - db "@" + text_far _ViridianGymAfterBattleText7 + text_end ViridianGymText9: - TX_ASM + text_asm ld hl, ViridianGymTrainerHeader7 call TalkToTrainer jp TextScriptEnd ViridianGymBattleText8: - TX_FAR _ViridianGymBattleText8 - db "@" + text_far _ViridianGymBattleText8 + text_end ViridianGymEndBattleText8: - TX_FAR _ViridianGymEndBattleText8 - db "@" + text_far _ViridianGymEndBattleText8 + text_end ViridianGymAfterBattleText8: - TX_FAR _ViridianGymAfterBattleText8 - db "@" + text_far _ViridianGymAfterBattleText8 + text_end ViridianGymText10: - TX_ASM + text_asm CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI jr nz, .asm_1abd1 ld hl, ViridianGymText_74bd4 @@ -488,9 +429,9 @@ ViridianGymText10: jp TextScriptEnd ViridianGymText_74bd4: - TX_FAR _ViridianGymText_74bd4 - db "@" + text_far _ViridianGymText_74bd4 + text_end ViridianGymText_74bd9: - TX_FAR _ViridianGymText_74bd9 - db "@" + text_far _ViridianGymText_74bd9 + text_end diff --git a/scripts/ViridianMart.asm b/scripts/ViridianMart.asm old mode 100755 new mode 100644 index b90d331c..f71cc6ef --- a/scripts/ViridianMart.asm +++ b/scripts/ViridianMart.asm @@ -7,12 +7,12 @@ ViridianMart_Script: ViridianMartScript_1d47d: CheckEvent EVENT_OAK_GOT_PARCEL - jr nz, .asm_1d489 + jr nz, .delivered_parcel ld hl, ViridianMart_TextPointers - jr .asm_1d48c -.asm_1d489 + jr .done +.delivered_parcel ld hl, ViridianMart_TextPointers2 -.asm_1d48c +.done ld a, l ld [wMapTextPtr], a ld a, h @@ -27,7 +27,7 @@ ViridianMart_ScriptPointers: ViridianMartScript0: call UpdateSprites ld a, $4 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wSimulatedJoypadStatesEnd ld de, RLEMovement1d4bb @@ -40,9 +40,9 @@ ViridianMartScript0: ret RLEMovement1d4bb: - db D_LEFT, $01 - db D_UP, $02 - db $ff + db D_LEFT, 1 + db D_UP, 2 + db -1 ; end ViridianMartScript1: ld a, [wSimulatedJoypadStatesIndex] @@ -50,7 +50,7 @@ ViridianMartScript1: ret nz call Delay3 ld a, $5 - ld [hSpriteIndexOrTextID], a + ldh [hSpriteIndexOrTextID], a call DisplayTextID lb bc, OAKS_PARCEL, 1 call GiveItem @@ -67,28 +67,29 @@ ViridianMart_TextPointers: dw ViridianMartText3 dw ViridianMartText4 dw ViridianMartText5 + ViridianMart_TextPointers2: dw ViridianCashierText dw ViridianMartText2 dw ViridianMartText3 ViridianMartText1: - TX_FAR _ViridianMartText1 - db "@" + text_far _ViridianMartText1 + text_end ViridianMartText4: - TX_FAR _ViridianMartText4 - db "@" + text_far _ViridianMartText4 + text_end ViridianMartText5: - TX_FAR ViridianMartParcelQuestText - TX_SFX_KEY_ITEM - db "@" + text_far ViridianMartParcelQuestText + sound_get_key_item + text_end ViridianMartText2: - TX_FAR _ViridianMartText2 - db "@" + text_far _ViridianMartText2 + text_end ViridianMartText3: - TX_FAR _ViridianMartText3 - db "@" + text_far _ViridianMartText3 + text_end diff --git a/scripts/ViridianNicknameHouse.asm b/scripts/ViridianNicknameHouse.asm old mode 100755 new mode 100644 index 000fe82b..df7482c2 --- a/scripts/ViridianNicknameHouse.asm +++ b/scripts/ViridianNicknameHouse.asm @@ -8,15 +8,15 @@ ViridianNicknameHouse_TextPointers: dw ViridianHouseText4 ViridianHouseText1: - TX_FAR _ViridianHouseText1 - db "@" + text_far _ViridianHouseText1 + text_end ViridianHouseText2: - TX_FAR _ViridianHouseText2 - db "@" + text_far _ViridianHouseText2 + text_end ViridianHouseText3: - TX_ASM + text_asm ld hl, ViridianHouseText_1d5b1 call PrintText ld a, SPEAROW @@ -25,9 +25,9 @@ ViridianHouseText3: jp TextScriptEnd ViridianHouseText_1d5b1: - TX_FAR _ViridianHouseText_1d5b1 - db "@" + text_far _ViridianHouseText_1d5b1 + text_end ViridianHouseText4: - TX_FAR _ViridianHouseText4 - db "@" + text_far _ViridianHouseText4 + text_end diff --git a/scripts/ViridianPokecenter.asm b/scripts/ViridianPokecenter.asm old mode 100755 new mode 100644 index 14c25b9f..08577678 --- a/scripts/ViridianPokecenter.asm +++ b/scripts/ViridianPokecenter.asm @@ -9,15 +9,15 @@ ViridianPokecenter_TextPointers: dw ViridianTradeNurseText ViridianHealNurseText: - TX_POKECENTER_NURSE + script_pokecenter_nurse ViridianPokeCenterText2: - TX_FAR _ViridianPokeCenterText2 - db "@" + text_far _ViridianPokeCenterText2 + text_end ViridianPokeCenterText3: - TX_FAR _ViridianPokeCenterText3 - db "@" + text_far _ViridianPokeCenterText3 + text_end ViridianTradeNurseText: - TX_CABLE_CLUB_RECEPTIONIST + script_cable_club_receptionist diff --git a/scripts/ViridianSchoolHouse.asm b/scripts/ViridianSchoolHouse.asm old mode 100755 new mode 100644 index 2d9579b7..731e2dac --- a/scripts/ViridianSchoolHouse.asm +++ b/scripts/ViridianSchoolHouse.asm @@ -6,9 +6,9 @@ ViridianSchoolHouse_TextPointers: dw SchoolText2 SchoolText1: - TX_FAR _SchoolText1 - db "@" + text_far _SchoolText1 + text_end SchoolText2: - TX_FAR _SchoolText2 - db "@" + text_far _SchoolText2 + text_end diff --git a/scripts/WardensHouse.asm b/scripts/WardensHouse.asm old mode 100755 new mode 100644 index 69e199c9..2dd0410c --- a/scripts/WardensHouse.asm +++ b/scripts/WardensHouse.asm @@ -9,93 +9,93 @@ WardensHouse_TextPointers: dw FuchsiaHouse2Text5 FuchsiaHouse2Text1: - TX_ASM + text_asm CheckEvent EVENT_GOT_HM04 - jr nz, .subtract + jr nz, .got_item ld b, GOLD_TEETH call IsItemInBag - jr nz, .asm_3f30f + jr nz, .have_gold_teeth CheckEvent EVENT_GAVE_GOLD_TEETH - jr nz, .asm_60cba + jr nz, .gave_gold_teeth ld hl, WardenGibberishText1 call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a ld hl, WardenGibberishText3 - jr nz, .asm_61238 + jr nz, .refused ld hl, WardenGibberishText2 -.asm_61238 +.refused call PrintText - jr .asm_52039 -.asm_3f30f + jr .done +.have_gold_teeth ld hl, WardenTeethText1 call PrintText ld a, GOLD_TEETH - ld [$ffdb], a - callba RemoveItemByID + ldh [hItemToRemoveID], a + farcall RemoveItemByID SetEvent EVENT_GAVE_GOLD_TEETH -.asm_60cba +.gave_gold_teeth ld hl, WardenThankYouText call PrintText - lb bc, HM_04, 1 + lb bc, HM_STRENGTH, 1 call GiveItem - jr nc, .BagFull + jr nc, .bag_full ld hl, ReceivedHM04Text call PrintText SetEvent EVENT_GOT_HM04 - jr .asm_52039 -.subtract + jr .done +.got_item ld hl, HM04ExplanationText call PrintText - jr .asm_52039 -.BagFull + jr .done +.bag_full ld hl, HM04NoRoomText call PrintText -.asm_52039 +.done jp TextScriptEnd WardenGibberishText1: - TX_FAR _WardenGibberishText1 - db "@" + text_far _WardenGibberishText1 + text_end WardenGibberishText2: - TX_FAR _WardenGibberishText2 - db "@" + text_far _WardenGibberishText2 + text_end WardenGibberishText3: - TX_FAR _WardenGibberishText3 - db "@" + text_far _WardenGibberishText3 + text_end WardenTeethText1: - TX_FAR _WardenTeethText1 - TX_SFX_ITEM_1 + text_far _WardenTeethText1 + sound_get_item_1 WardenTeethText2: - TX_FAR _WardenTeethText2 - db "@" + text_far _WardenTeethText2 + text_end WardenThankYouText: - TX_FAR _WardenThankYouText - db "@" + text_far _WardenThankYouText + text_end ReceivedHM04Text: - TX_FAR _ReceivedHM04Text - TX_SFX_ITEM_1 - db "@" + text_far _ReceivedHM04Text + sound_get_item_1 + text_end HM04ExplanationText: - TX_FAR _HM04ExplanationText - db "@" + text_far _HM04ExplanationText + text_end HM04NoRoomText: - TX_FAR _HM04NoRoomText - db "@" + text_far _HM04NoRoomText + text_end FuchsiaHouse2Text5: FuchsiaHouse2Text4: - TX_ASM - ld a, [H_SPRITEINDEX] + text_asm + ldh a, [hSpriteIndex] cp $4 ld hl, FuchsiaHouse2Text_7517b jr nz, .asm_4c9a2 @@ -105,9 +105,9 @@ FuchsiaHouse2Text4: jp TextScriptEnd FuchsiaHouse2Text_75176: - TX_FAR _FuchsiaHouse2Text_75176 - db "@" + text_far _FuchsiaHouse2Text_75176 + text_end FuchsiaHouse2Text_7517b: - TX_FAR _FuchsiaHouse2Text_7517b - db "@" + text_far _FuchsiaHouse2Text_7517b + text_end diff --git a/sram.asm b/sram.asm index 966ccba3..48542dc7 100644 --- a/sram.asm +++ b/sram.asm @@ -1,45 +1,45 @@ SECTION "Sprite Buffers", SRAM ; BANK 0 -sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000 -sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188 -sSpriteBuffer2:: ds SPRITEBUFFERSIZE ; a310 +sSpriteBuffer0:: ds SPRITEBUFFERSIZE +sSpriteBuffer1:: ds SPRITEBUFFERSIZE +sSpriteBuffer2:: ds SPRITEBUFFERSIZE ds $100 -sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598 +sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY SECTION "Save Data", SRAM ; BANK 1 ds $598 -sPlayerName:: ds NAME_LENGTH ; a598 -sMainData:: ds wMainDataEnd - wMainDataStart ; a5a3 -sSpriteData:: ds wSpriteDataEnd - wSpriteDataStart ; ad2c -sPartyData:: ds wPartyDataEnd - wPartyDataStart ; af2c -sCurBoxData:: ds wBoxDataEnd - wBoxDataStart ; b0c0 -sTilesetType:: ds 1 ; b522 -sMainDataCheckSum:: ds 1 ; b523 +sPlayerName:: ds NAME_LENGTH +sMainData:: ds wMainDataEnd - wMainDataStart +sSpriteData:: ds wSpriteDataEnd - wSpriteDataStart +sPartyData:: ds wPartyDataEnd - wPartyDataStart +sCurBoxData:: ds wBoxDataEnd - wBoxDataStart +sTileAnimations:: ds 1 +sMainDataCheckSum:: ds 1 SECTION "Saved Boxes 1", SRAM ; BANK 2 -sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000 -sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462 -sBox3:: ds wBoxDataEnd - wBoxDataStart ; a8c4 -sBox4:: ds wBoxDataEnd - wBoxDataStart ; ad26 -sBox5:: ds wBoxDataEnd - wBoxDataStart ; b188 -sBox6:: ds wBoxDataEnd - wBoxDataStart ; b5ea -sBank2AllBoxesChecksum:: ds 1 ; ba4c -sBank2IndividualBoxChecksums:: ds 6 ; ba4d +sBox1:: ds wBoxDataEnd - wBoxDataStart +sBox2:: ds wBoxDataEnd - wBoxDataStart +sBox3:: ds wBoxDataEnd - wBoxDataStart +sBox4:: ds wBoxDataEnd - wBoxDataStart +sBox5:: ds wBoxDataEnd - wBoxDataStart +sBox6:: ds wBoxDataEnd - wBoxDataStart +sBank2AllBoxesChecksum:: ds 1 +sBank2IndividualBoxChecksums:: ds 6 SECTION "Saved Boxes 2", SRAM ; BANK 3 -sBox7:: ds wBoxDataEnd - wBoxDataStart ; a000 -sBox8:: ds wBoxDataEnd - wBoxDataStart ; a462 -sBox9:: ds wBoxDataEnd - wBoxDataStart ; a8c4 -sBox10:: ds wBoxDataEnd - wBoxDataStart ; ad26 -sBox11:: ds wBoxDataEnd - wBoxDataStart ; b188 -sBox12:: ds wBoxDataEnd - wBoxDataStart ; b5ea -sBank3AllBoxesChecksum:: ds 1 ; ba4c -sBank3IndividualBoxChecksums:: ds 6 ; ba4d +sBox7:: ds wBoxDataEnd - wBoxDataStart +sBox8:: ds wBoxDataEnd - wBoxDataStart +sBox9:: ds wBoxDataEnd - wBoxDataStart +sBox10:: ds wBoxDataEnd - wBoxDataStart +sBox11:: ds wBoxDataEnd - wBoxDataStart +sBox12:: ds wBoxDataEnd - wBoxDataStart +sBank3AllBoxesChecksum:: ds 1 +sBank3IndividualBoxChecksums:: ds 6 diff --git a/text.asm b/text.asm index 5a760a8e..be17bfc6 100644 --- a/text.asm +++ b/text.asm @@ -1,3205 +1,280 @@ -INCLUDE "charmap.asm" - -INCLUDE "constants/text_constants.asm" - -TEXT_1 EQU $20 -TEXT_2 EQU TEXT_1 + 1 -TEXT_3 EQU TEXT_2 + 1 -TEXT_4 EQU TEXT_3 + 1 -TEXT_5 EQU TEXT_4 + 1 -TEXT_6 EQU TEXT_5 + 1 -TEXT_7 EQU TEXT_6 + 1 -TEXT_8 EQU TEXT_7 + 1 -TEXT_9 EQU TEXT_8 + 1 -TEXT_10 EQU TEXT_9 + 1 -TEXT_11 EQU TEXT_10 + 1 - -POKEDEX_TEXT EQU TEXT_11 + 1 -MOVE_NAMES EQU POKEDEX_TEXT + 1 - -INCLUDE "macros.asm" - -INCLUDE "hram.asm" - - -SECTION "Text 1", ROMX ; BANK $20 - -_CardKeySuccessText1:: - text "Bingo!@@" - -_CardKeySuccessText2:: - text "" - line "The CARD KEY" - cont "opened the door!" - done - -_CardKeyFailText:: - text "Darn! It needs a" - line "CARD KEY!" - done - -_TrainerNameText:: - TX_RAM wcd6d - text ": @@" - -_NoNibbleText:: - text "Not even a nibble!" - prompt - -_NothingHereText:: - text "Looks like there's" - line "nothing here." - prompt - -_ItsABiteText:: - text "Oh!" - line "It's a bite!" - prompt - -_ExclamationText:: - text "!" - done - -_GroundRoseText:: - text "Ground rose up" - line "somewhere!" - done - -_BoulderText:: - text "This requires" - line "STRENGTH to move!" - done - -_MartSignText:: - text "All your item" - line "needs fulfilled!" - cont "#MON MART" - done - -_PokeCenterSignText:: - text "Heal Your #MON!" - line "#MON CENTER" - done - -_FoundItemText:: - text " found" - line "@" - TX_RAM wcf4b - text "!@@" - -_NoMoreRoomForItemText:: - text "No more room for" - line "items!" - done - -_OaksAideHiText:: - text "Hi! Remember me?" - line "I'm PROF.OAK's" - cont "AIDE!" - - para "If you caught @" - TX_NUM hOaksAideRequirement, 1, 3 - text "" - line "kinds of #MON," - cont "I'm supposed to" - cont "give you an" - cont "@" - TX_RAM wOaksAideRewardItemName - text "!" - - para "So, ! Have" - line "you caught at" - cont "least @" - TX_NUM hOaksAideRequirement, 1, 3 - text " kinds of" - cont "#MON?" - done - -_OaksAideUhOhText:: - text "Let's see..." - line "Uh-oh! You have" - cont "caught only @" - TX_NUM hOaksAideNumMonsOwned, 1, 3 - text "" - cont "kinds of #MON!" - - para "You need @" - TX_NUM hOaksAideRequirement, 1, 3 - text " kinds" - line "if you want the" - cont "@" - TX_RAM wOaksAideRewardItemName - text "." - done - -_OaksAideComeBackText:: - text "Oh. I see." - - para "When you get @" - TX_NUM hOaksAideRequirement, 1, 3 - text "" - line "kinds, come back" - cont "for @" - TX_RAM wOaksAideRewardItemName - text "." - done - -_OaksAideHereYouGoText:: - text "Great! You have" - line "caught @" - TX_NUM hOaksAideNumMonsOwned, 1, 3 - text " kinds " - cont "of #MON!" - cont "Congratulations!" - - para "Here you go!" - prompt - -_OaksAideGotItemText:: - text " got the" - line "@" - TX_RAM wOaksAideRewardItemName - text "!@@" - -_OaksAideNoRoomText:: - text "Oh! I see you" - line "don't have any" - cont "room for the" - cont "@" - TX_RAM wOaksAideRewardItemName - text "." - done - -INCLUDE "text/maps/ViridianForest.asm" -INCLUDE "text/maps/MtMoon1F.asm" -INCLUDE "text/maps/MtMoonB1F.asm" -INCLUDE "text/maps/MtMoonB2F.asm" -INCLUDE "text/maps/SSAnne1F.asm" -INCLUDE "text/maps/SSAnne2F.asm" -INCLUDE "text/maps/SSAnne3F.asm" -INCLUDE "text/maps/SSAnneBow.asm" -INCLUDE "text/maps/SSAnneKitchen.asm" -INCLUDE "text/maps/SSAnneCaptainsRoom.asm" -INCLUDE "text/maps/SSAnne1FRooms.asm" -INCLUDE "text/maps/SSAnne2FRooms.asm" -INCLUDE "text/maps/SSAnneB1FRooms.asm" -INCLUDE "text/maps/VictoryRoad3F.asm" -INCLUDE "text/maps/RocketHideoutB1F.asm" -INCLUDE "text/maps/RocketHideoutB2F.asm" -INCLUDE "text/maps/RocketHideoutB3F.asm" -INCLUDE "text/maps/RocketHideoutB4F.asm" -INCLUDE "text/maps/RocketHideoutElevator.asm" -INCLUDE "text/maps/SilphCo2F.asm" -INCLUDE "text/maps/SilphCo3F.asm" -INCLUDE "text/maps/SilphCo4F.asm" -INCLUDE "text/maps/SilphCo5F.asm" - - -SECTION "Text 2", ROMX ; BANK $21 - -INCLUDE "text/maps/SilphCo5F_2.asm" -INCLUDE "text/maps/SilphCo6F.asm" -INCLUDE "text/maps/SilphCo7F.asm" -INCLUDE "text/maps/SilphCo8F.asm" -INCLUDE "text/maps/SilphCo9F.asm" -INCLUDE "text/maps/SilphCo10F.asm" -INCLUDE "text/maps/SilphCo11F.asm" -INCLUDE "text/maps/PokemonMansion2F.asm" -INCLUDE "text/maps/PokemonMansion3F.asm" -INCLUDE "text/maps/PokemonMansionB1F.asm" -INCLUDE "text/maps/SafariZoneEast.asm" -INCLUDE "text/maps/SafariZoneNorth.asm" -INCLUDE "text/maps/SafariZoneWest.asm" -INCLUDE "text/maps/SafariZoneCenter.asm" -INCLUDE "text/maps/SafariZoneCenterRestHouse.asm" -INCLUDE "text/maps/SafariZoneSecretHouse.asm" -INCLUDE "text/maps/SafariZoneWestRestHouse.asm" -INCLUDE "text/maps/SafariZoneEastRestHouse.asm" -INCLUDE "text/maps/SafariZoneNorthRestHouse.asm" -INCLUDE "text/maps/CeruleanCaveB1F.asm" -INCLUDE "text/maps/VictoryRoad1F.asm" -INCLUDE "text/maps/LancesRoom.asm" -INCLUDE "text/maps/HallOfFame.asm" -INCLUDE "text/maps/ChampionsRoom.asm" -INCLUDE "text/maps/LoreleisRoom.asm" -INCLUDE "text/maps/BrunosRoom.asm" -INCLUDE "text/maps/AgathasRoom.asm" -INCLUDE "text/maps/RockTunnelB1F.asm" - - -SECTION "Text 3", ROMX ; BANK $22 - -INCLUDE "text/maps/RockTunnelB1F_2.asm" -INCLUDE "text/maps/SeafoamIslandsB4F.asm" - -_AIBattleWithdrawText:: - TX_RAM wTrainerName - text " with-" - line "drew @" - TX_RAM wEnemyMonNick - text "!" - prompt - -_AIBattleUseItemText:: - TX_RAM wTrainerName - text "" - line "used @" - TX_RAM wcd6d - text "" - cont "on @" - TX_RAM wEnemyMonNick - text "!" - prompt - -_TradeWentToText:: - TX_RAM wcf4b - text " went" - line "to @" - TX_RAM wGrassRate - text "." - done - -_TradeForText:: - text "For 's" - line "@" - TX_RAM wcf4b - text "," - done - -_TradeSendsText:: - TX_RAM wGrassRate - text " sends" - line "@" - TX_RAM wcd6d - text "." - done - -_TradeWavesFarewellText:: - TX_RAM wGrassRate - text " waves" - line "farewell as" - done - -_TradeTransferredText:: - TX_RAM wcd6d - text " is" - line "transferred." - done - -_TradeTakeCareText:: - text "Take good care of" - line "@" - TX_RAM wcd6d - text "." - done - -_TradeWillTradeText:: - TX_RAM wGrassRate - text " will" - line "trade @" - TX_RAM wcd6d - text "" - done - -_TradeforText:: - text "for 's" - line "@" - TX_RAM wcf4b - text "." - done - -_PlaySlotMachineText:: - text "A slot machine!" - line "Want to play?" - done - -_OutOfCoinsSlotMachineText:: - text "Darn!" - line "Ran out of coins!" - done - -_BetHowManySlotMachineText:: - text "Bet how many" - line "coins?" - done - -_StartSlotMachineText:: - text "Start!" - done - -_NotEnoughCoinsSlotMachineText:: - text "Not enough" - line "coins!" - prompt - -_OneMoreGoSlotMachineText:: - text "One more " - line "go?" - done - -_LinedUpText:: - text " lined up!" - line "Scored @" - TX_RAM wcf4b - text " coins!" - done - -_NotThisTimeText:: - text "Not this time!" - prompt - -_YeahText:: - text "Yeah!@@" - -_DexSeenOwnedText:: - text "#DEX Seen:@" - TX_NUM wDexRatingNumMonsSeen, 1, 3 - text "" - line " Owned:@" - TX_NUM wDexRatingNumMonsOwned, 1, 3 - db "@" - -_DexRatingText:: - text "#DEX Rating", $6d - done - -_GymStatueText1:: - TX_RAM wGymCityName - text "" - line "#MON GYM" - cont "LEADER: @" - TX_RAM wGymLeaderName - text "" - - para "WINNING TRAINERS:" - line "" - done - -_GymStatueText2:: - TX_RAM wGymCityName - text "" - line "#MON GYM" - cont "LEADER: @" - TX_RAM wGymLeaderName - text "" - - para "WINNING TRAINERS:" - line "" - cont "" - done - -_ViridianCityPokecenterGuyText:: - text "#MON CENTERs" - line "heal your tired," - cont "hurt or fainted" - cont "#MON!" - done - -_PewterCityPokecenterGuyText:: - text "Yawn!" - - para "When JIGGLYPUFF" - line "sings, #MON" - cont "get drowsy..." - - para "...Me too..." - line "Snore..." - done - -_CeruleanPokecenterGuyText:: - text "BILL has lots of" - line "#MON!" - - para "He collects rare" - line "ones too!" - done - -_LavenderPokecenterGuyText:: - text "CUBONEs wear" - line "skulls, right?" - - para "People will pay a" - line "lot for one!" - done - -_MtMoonPokecenterBenchGuyText:: - text "If you have too" - line "many #MON, you" - cont "should store them" - cont "via PC!" - done - -_RockTunnelPokecenterGuyText:: - text "I heard that" - line "GHOSTs haunt" - cont "LAVENDER TOWN!" - done - -_UnusedBenchGuyText1:: - text "I wish I could" - line "catch #MON." - done - -_UnusedBenchGuyText2:: - text "I'm tired from" - line "all the fun..." - done - -_UnusedBenchGuyText3:: - text "SILPH's manager" - line "is hiding in the" - cont "SAFARI ZONE." - done - -_VermilionPokecenterGuyText:: - text "It is true that a" - line "higher level" - cont "#MON will be" - cont "more powerful..." - - para "But, all #MON" - line "will have weak" - cont "points against" - cont "specific types." - - para "So, there is no" - line "universally" - cont "strong #MON." - done - -_CeladonCityPokecenterGuyText:: - text "If I had a BIKE," - line "I would go to" - cont "CYCLING ROAD!" - done - -_FuchsiaCityPokecenterGuyText:: - text "If you're studying " - line "#MON, visit" - cont "the SAFARI ZONE." - - para "It has all sorts" - line "of rare #MON." - done - -_CinnabarPokecenterGuyText:: - text "#MON can still" - line "learn techniques" - cont "after canceling" - cont "evolution." - - para "Evolution can wait" - line "until new moves" - cont "have been learned." - done - -_SaffronCityPokecenterGuyText1:: - text "It would be great" - line "if the ELITE FOUR" - cont "came and stomped" - cont "TEAM ROCKET!" - done - -_SaffronCityPokecenterGuyText2:: - text "TEAM ROCKET took" - line "off! We can go" - cont "out safely again!" - cont "That's great!" - done - -_CeladonCityHotelText:: - text "My sis brought me" - line "on this vacation!" - done - -_BookcaseText:: - text "Crammed full of" - line "#MON books!" - done - -_NewBicycleText:: - text "A shiny new" - line "BICYCLE!" - done - -_PushStartText:: - text "Push START to" - line "open the MENU!" - done - -_SaveOptionText:: - text "The SAVE option is" - line "on the MENU" - cont "screen." - done - -_StrengthsAndWeaknessesText:: - text "All #MON types" - line "have strong and" - cont "weak points" - cont "against others." - done - -_TimesUpText:: - text "PA: Ding-dong!" - - para "Time's up!" - prompt - -_GameOverText:: - text "PA: Your SAFARI" - line "GAME is over!" - done - -_CinnabarGymQuizIntroText:: - text "#MON Quiz!" - - para "Get it right and" - line "the door opens to" - cont "the next room!" - - para "Get it wrong and" - line "face a trainer!" - - para "If you want to" - line "conserve your" - cont "#MON for the" - cont "GYM LEADER..." - - para "Then get it right!" - line "Here we go!" - prompt - -_CinnabarQuizQuestionsText1:: - text "CATERPIE evolves" - line "into BUTTERFREE?" - done - -_CinnabarQuizQuestionsText2:: - text "There are 9" - line "certified #MON" - cont "LEAGUE BADGEs?" - done - -_CinnabarQuizQuestionsText3:: - text "POLIWAG evolves 3" - line "times?" - done - -_CinnabarQuizQuestionsText4:: - text "Are thunder moves" - line "effective against" - cont "ground element-" - cont "type #MON?" - done - -_CinnabarQuizQuestionsText5:: - text "#MON of the" - line "same kind and" - cont "level are not" - cont "identical?" - done - -_CinnabarQuizQuestionsText6:: - text "TM28 contains" - line "TOMBSTONER?" - done - -_CinnabarGymQuizCorrectText:: - text "You're absolutely" - line "correct!" - - para "Go on through!@@" - -_CinnabarGymQuizIncorrectText:: - text "Sorry! Bad call!" - prompt - -_MagazinesText:: - text "#MON magazines!" - - para "#MON notebooks!" - - para "#MON graphs!" - done - -_BillsHouseMonitorText:: - text "TELEPORTER is" - line "displayed on the" - cont "PC monitor." - done - -_BillsHouseInitiatedText:: - text " initiated" - line "TELEPORTER's Cell" - cont "Separator!@@" - -_BillsHousePokemonListText1:: - text "BILL's favorite" - line "#MON list!" - prompt - -_BillsHousePokemonListText2:: - text "Which #MON do" - line "you want to see?" - done - -_OakLabEmailText:: - text "There's an e-mail" - line "message here!" - - para "..." - - para "Calling all" - line "#MON trainers!" - - para "The elite trainers" - line "of #MON LEAGUE" - cont "are ready to take" - cont "on all comers!" - - para "Bring your best" - line "#MON and see" - cont "how you rate as a" - cont "trainer!" - - para "#MON LEAGUE HQ" - line "INDIGO PLATEAU" - - para "PS: PROF.OAK," - line "please visit us!" - cont "..." - done - -_GameCornerCoinCaseText:: - text "A COIN CASE is" - line "required!" - done - -_GameCornerNoCoinsText:: - text "You don't have" - line "any coins!" - done - -_GameCornerOutOfOrderText:: - text "OUT OF ORDER" - line "This is broken." - done - -_GameCornerOutToLunchText:: - text "OUT TO LUNCH" - line "This is reserved." - done - -_GameCornerSomeonesKeysText:: - text "Someone's keys!" - line "They'll be back." - done - -_JustAMomentText:: - text "Just a moment." - done - -TMNotebookText:: - text "It's a pamphlet" - line "on TMs." - - para "..." - - para "There are 50 TMs" - line "in all." - - para "There are also 5" - line "HMs that can be" - cont "used repeatedly." - - para "SILPH CO.@@" - -_TurnPageText:: - text "Turn the page?" - done - -_ViridianSchoolNotebookText5:: - text "GIRL: Hey! Don't" - line "look at my notes!@@" - -_ViridianSchoolNotebookText1:: - text "Looked at the" - line "notebook!" - - para "First page..." - - para "# BALLs are" - line "used to catch" - cont "#MON." - - para "Up to 6 #MON" - line "can be carried." - - para "People who raise" - line "and make #MON" - cont "fight are called" - cont "#MON trainers." - prompt - -_ViridianSchoolNotebookText2:: - text "Second page..." - - para "A healthy #MON" - line "may be hard to" - cont "catch, so weaken" - cont "it first!" - - para "Poison, burns and" - line "other damage are" - cont "effective!" - prompt - -_ViridianSchoolNotebookText3:: - text "Third page..." - - para "#MON trainers" - line "seek others to" - cont "engage in #MON" - cont "fights." - - para "Battles are" - line "constantly fought" - cont "at #MON GYMs." - prompt - -_ViridianSchoolNotebookText4:: - text "Fourth page..." - - para "The goal for" - line "#MON trainers" - cont "is to beat the " - cont "top 8 #MON" - cont "GYM LEADERs." - - para "Do so to earn the" - line "right to face..." - - para "The ELITE FOUR of" - line "#MON LEAGUE!" - prompt - -_EnemiesOnEverySideText:: - text "Enemies on every" - line "side!" - done - -_WhatGoesAroundComesAroundText:: - text "What goes around" - line "comes around!" - done - -_FightingDojoText:: - text "FIGHTING DOJO" - done - -_IndigoPlateauHQText:: - text "INDIGO PLATEAU" - line "#MON LEAGUE HQ" - done - -_RedBedroomSNESText:: - text " is" - line "playing the SNES!" - cont "...Okay!" - cont "It's time to go!" - done - -_Route15UpstairsBinocularsText:: - text "Looked into the" - line "binoculars..." - - para "A large, shining" - line "bird is flying" - cont "toward the sea." - done - -_AerodactylFossilText:: - text "AERODACTYL Fossil" - line "A primitive and" - cont "rare #MON." - done - -_KabutopsFossilText:: - text "KABUTOPS Fossil" - line "A primitive and" - cont "rare #MON." - done - -_LinkCableHelpText1:: - text "TRAINER TIPS" - - para "Using a Game Link" - line "Cable" - prompt - -_LinkCableHelpText2:: - text "Which heading do" - line "you want to read?" - done - -_LinkCableInfoText1:: - text "When you have" - line "linked your GAME" - cont "BOY with another" - cont "GAME BOY, talk to" - cont "the attendant on" - cont "the right in any" - cont "#MON CENTER." - prompt - -_LinkCableInfoText2:: - text "COLOSSEUM lets" - line "you play against" - cont "a friend." - prompt - -_LinkCableInfoText3:: - text "TRADE CENTER is" - line "used for trading" - cont "#MON." - prompt - -_ViridianSchoolBlackboardText1:: - text "The blackboard" - line "describes #MON" - cont "STATUS changes" - cont "during battles." - prompt - -_ViridianSchoolBlackboardText2:: - text "Which heading do" - line "you want to read?" - done - -_ViridianBlackboardSleepText:: - text "A #MON can't" - line "attack if it's" - cont "asleep!" - - para "#MON will stay" - line "asleep even after" - cont "battles." - - para "Use AWAKENING to" - line "wake them up!" - prompt - -_ViridianBlackboardPoisonText:: - text "When poisoned, a" - line "#MON's health" - cont "steadily drops." - - para "Poison lingers" - line "after battles." - - para "Use an ANTIDOTE" - line "to cure poison!" - prompt - -_ViridianBlackboardPrlzText:: - text "Paralysis could" - line "make #MON" - cont "moves misfire!" - - para "Paralysis remains" - line "after battles." - - para "Use PARLYZ HEAL" - line "for treatment!" - prompt - -_ViridianBlackboardBurnText:: - text "A burn reduces" - line "power and speed." - cont "It also causes" - cont "ongoing damage." - - para "Burns remain" - line "after battles." - - para "Use BURN HEAL to" - line "cure a burn!" - prompt - -_ViridianBlackboardFrozenText:: - text "If frozen, a" - line "#MON becomes" - cont "totally immobile!" - - para "It stays frozen" - line "even after the" - cont "battle ends." - - para "Use ICE HEAL to" - line "thaw out #MON!" - prompt - -_VermilionGymTrashText:: - text "Nope, there's" - line "only trash here." - done - -_VermilionGymTrashSuccessText1:: - text "Hey! There's a" - line "switch under the" - cont "trash!" - cont "Turn it on!" - - para "The 1st electric" - line "lock opened!@@" - -_VermilionGymTrashSuccessText2:: - text "Hey! There's" - line "another switch" - cont "under the trash!" - cont "Turn it on!" - prompt - -_VermilionGymTrashSuccessText3:: - text "The 2nd electric" - line "lock opened!" - - para "The motorized door" - line "opened!@@" - -_VermilionGymTrashFailText:: - text "Nope! There's" - line "only trash here." - cont "Hey! The electric" - cont "locks were reset!@@" - -_FoundHiddenItemText:: - text " found" - line "@" - TX_RAM wcd6d - text "!@@" - -_HiddenItemBagFullText:: - text "But, has" - line "no more room for" - cont "other items!" - done - -_FoundHiddenCoinsText:: - text " found" - line "@" - TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN - text " coins!@@" - -_FoundHiddenCoins2Text:: - text " found" - line "@" - TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN - text " coins!@@" - -_DroppedHiddenCoinsText:: - text "" - para "Oops! Dropped" - line "some coins!" - done - -_IndigoPlateauStatuesText1:: - text "INDIGO PLATEAU" - prompt - -_IndigoPlateauStatuesText2:: - text "The ultimate goal" - line "of trainers!" - cont "#MON LEAGUE HQ" - done - -_IndigoPlateauStatuesText3:: - text "The highest" - line "#MON authority" - cont "#MON LEAGUE HQ" - done - -_PokemonBooksText:: - text "Crammed full of" - line "#MON books!" - done - -_DiglettSculptureText:: - text "It's a sculpture" - line "of DIGLETT." - done - -_ElevatorText:: - text "This is an" - line "elevator." - done - -_TownMapText:: - text "A TOWN MAP.@@" - -_PokemonStuffText:: - text "Wow! Tons of" - line "#MON stuff!" - done - -_OutOfSafariBallsText:: - text "PA: Ding-dong!" - - para "You are out of" - line "SAFARI BALLs!" - prompt - -_WildRanText:: - text "Wild @" - TX_RAM wEnemyMonNick - text "" - line "ran!" - prompt - -_EnemyRanText:: - text "Enemy @" - TX_RAM wEnemyMonNick - text "" - line "ran!" - prompt - -_HurtByPoisonText:: - text "'s" - line "hurt by poison!" - prompt - -_HurtByBurnText:: - text "'s" - line "hurt by the burn!" - prompt - -_HurtByLeechSeedText:: - text "LEECH SEED saps" - line "!" - prompt - -_EnemyMonFaintedText:: - text "Enemy @" - TX_RAM wEnemyMonNick - text "" - line "fainted!" - prompt - -_MoneyForWinningText:: - text " got ¥@" - TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN - text "" - line "for winning!" - prompt - -_TrainerDefeatedText:: - text " defeated" - line "@" - TX_RAM wTrainerName - text "!" - prompt - -_PlayerMonFaintedText:: - TX_RAM wBattleMonNick - text "" - line "fainted!" - prompt - -_UseNextMonText:: - text "Use next #MON?" - done - -_Sony1WinText:: - text ": Yeah! Am" - line "I great or what?" - prompt - -_PlayerBlackedOutText2:: - text " is out of" - line "useable #MON!" - - para " blacked" - line "out!" - prompt - -_LinkBattleLostText:: - text " lost to" - line "@" - TX_RAM wTrainerName - text "!" - prompt - -_TrainerAboutToUseText:: - TX_RAM wTrainerName - text " is" - line "about to use" - cont"@" - TX_RAM wEnemyMonNick - text "!" - - para "Will " - line "change #MON?" - done - -_TrainerSentOutText:: - TX_RAM wTrainerName - text " sent" - line "out @" - TX_RAM wEnemyMonNick - text "!" - done - -_NoWillText:: - text "There's no will" - line "to fight!" - prompt - -_CantEscapeText:: - text "Can't escape!" - prompt - -_NoRunningText:: - text "No! There's no" - line "running from a" - cont "trainer battle!" - prompt - -_GotAwayText:: - text "Got away safely!" - prompt - -_ItemsCantBeUsedHereText:: - text "Items can't be" - line "used here." - prompt - -_AlreadyOutText:: - TX_RAM wBattleMonNick - text " is" - line "already out!" - prompt - -_MoveNoPPText:: - text "No PP left for" - line "this move!" - prompt - -_MoveDisabledText:: - text "The move is" - line "disabled!" - prompt - -_NoMovesLeftText:: - TX_RAM wBattleMonNick - text " has no" - line "moves left!" - done - -_MultiHitText:: - text "Hit the enemy" - line "@" - TX_NUM wPlayerNumHits,1,1 - text " times!" - prompt - -_ScaredText:: - TX_RAM wBattleMonNick - text " is too" - line "scared to move!" - prompt - -_GetOutText:: - text "GHOST: Get out..." - line "Get out..." - prompt - -_FastAsleepText:: - text "" - line "is fast asleep!" - prompt - -_WokeUpText:: - text "" - line "woke up!" - prompt - -_IsFrozenText:: - text "" - line "is frozen solid!" - prompt - -_FullyParalyzedText:: - text "'s" - line "fully paralyzed!" - prompt - -_FlinchedText:: - text "" - line "flinched!" - prompt - -_MustRechargeText:: - text "" - line "must recharge!" - prompt - -_DisabledNoMoreText:: - text "'s" - line "disabled no more!" - prompt - -_IsConfusedText:: - text "" - line "is confused!" - prompt - -_HurtItselfText:: - text "It hurt itself in" - line "its confusion!" - prompt - -_ConfusedNoMoreText:: - text "'s" - line "confused no more!" - prompt - -_SavingEnergyText:: - text "" - line "is saving energy!" - prompt - -_UnleashedEnergyText:: - text "" - line "unleashed energy!" - prompt - -_ThrashingAboutText:: - text "'s" - line "thrashing about!" - done - -_AttackContinuesText:: - text "'s" - line "attack continues!" - done - -_CantMoveText:: - text "" - line "can't move!" - prompt - -_MoveIsDisabledText:: - text "'s" - line "@" - TX_RAM wcd6d - text " is" - cont "disabled!" - prompt - -_MonName1Text:: - text "@@" - -_Used1Text:: - text "" - line "used @@" - -_Used2Text:: - text "" - line "used @@" - -_InsteadText:: - text "instead," - cont "@@" - -_CF4BText:: - TX_RAM wcf4b - text "@" - -_ExclamationPoint1Text:: - text "!" - done - -_ExclamationPoint2Text:: - text "!" - done - -_ExclamationPoint3Text:: - text "!" - done - -_ExclamationPoint4Text:: - text "!" - done - -_ExclamationPoint5Text:: - text "!" - done - -_AttackMissedText:: - text "'s" - line "attack missed!" - prompt - -_KeptGoingAndCrashedText:: - text "" - line "kept going and" - cont "crashed!" - prompt - -_UnaffectedText:: - text "'s" - line "unaffected!" - prompt - -_DoesntAffectMonText:: - text "It doesn't affect" - line "!" - prompt - -_CriticalHitText:: - text "Critical hit!" - prompt - -_OHKOText:: - text "One-hit KO!" - prompt - -_LoafingAroundText:: - TX_RAM wBattleMonNick - text " is" - line "loafing around." - prompt - -_BeganToNapText:: - TX_RAM wBattleMonNick - text " began" - line "to nap!" - prompt - -_WontObeyText:: - TX_RAM wBattleMonNick - text " won't" - line "obey!" - prompt - -_TurnedAwayText:: - TX_RAM wBattleMonNick - text " turned" - line "away!" - prompt - -_IgnoredOrdersText:: - TX_RAM wBattleMonNick - text "" - line "ignored orders!" - prompt - -_SubstituteTookDamageText:: - text "The SUBSTITUTE" - line "took damage for" - cont "!" - prompt - -_SubstituteBrokeText:: - text "'s" - line "SUBSTITUTE broke!" - prompt - -_BuildingRageText:: - text "'s" - line "RAGE is building!" - prompt - -_MirrorMoveFailedText:: - text "The MIRROR MOVE" - next "failed!" - prompt - -_HitXTimesText:: - text "Hit @" - TX_NUM wEnemyNumHits, 1, 1 - text " times!" - prompt - -_GainedText:: - TX_RAM wcd6d - text " gained" - line "@@" - -_WithExpAllText:: - text "with EXP.ALL," - cont "@@" - -_BoostedText:: - text "a boosted" - cont "@@" - -_ExpPointsText:: - TX_NUM wExpAmountGained, 2, 4 - text " EXP. Points!" - prompt - -_GrewLevelText:: - TX_RAM wcd6d - text " grew" - line "to level @" - TX_NUM wCurEnemyLVL, 1, 3 - text "!@@" - -_WildMonAppearedText:: - text "Wild @" - TX_RAM wEnemyMonNick - text "" - line "appeared!" - prompt - -_HookedMonAttackedText:: - text "The hooked" - line "@" - TX_RAM wEnemyMonNick - text "" - cont "attacked!" - prompt - -_EnemyAppearedText:: - TX_RAM wEnemyMonNick - text "" - line "appeared!" - prompt - -_TrainerWantsToFightText:: - TX_RAM wTrainerName - text " wants" - line "to fight!" - prompt - -_UnveiledGhostText:: - text "SILPH SCOPE" - line "unveiled the" - cont "GHOST's identity!" - prompt - -_GhostCantBeIDdText:: - text "Darn! The GHOST" - line "can't be ID'd!" - prompt - -_GoText:: - text "Go! @@" - -_DoItText:: - text "Do it! @@" - -_GetmText:: - text "Get'm! @@" - -_EnemysWeakText:: - text "The enemy's weak!" - line "Get'm! @@" - -_PlayerMon1Text:: - TX_RAM wBattleMonNick - text "!" - done - -_PlayerMon2Text:: - TX_RAM wBattleMonNick - text " @@" - -_EnoughText:: - text "enough!@@" - -_OKExclamationText:: - text "OK!@@" - -_GoodText:: - text "good!@@" - -_ComeBackText:: - text "" - line "Come back!" - done - -_SuperEffectiveText:: - text "It's super" - line "effective!" - prompt - -_NotVeryEffectiveText:: - text "It's not very" - line "effective..." - prompt - -_SafariZoneEatingText:: - text "Wild @" - TX_RAM wEnemyMonNick - text "" - line "is eating!" - prompt - -_SafariZoneAngryText:: - text "Wild @" - TX_RAM wEnemyMonNick - text "" - line "is angry!" - prompt - -; money related -_PickUpPayDayMoneyText:: - text " picked up" - line "¥@" - TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN - text "!" - prompt - -_ClearSaveDataText:: - text "Clear all saved" - line "data?" - done - -_WhichFloorText:: - text "Which floor do" - line "you want? " - done - -_PartyMenuNormalText:: - text "Choose a #MON." - done - -_PartyMenuItemUseText:: - text "Use item on which" - line "#MON?" - done - -_PartyMenuBattleText:: - text "Bring out which" - line "#MON?" - done - -_PartyMenuUseTMText:: - text "Use TM on which" - line "#MON?" - done - -_PartyMenuSwapMonText:: - text "Move #MON" - line "where?" - done - -_PotionText:: - TX_RAM wcd6d - text "" - line "recovered by @" - TX_NUM wHPBarHPDifference, 2, 3 - text "!" - done - -_AntidoteText:: - TX_RAM wcd6d - text " was" - line "cured of poison!" - done - -_ParlyzHealText:: - TX_RAM wcd6d - text "'s" - line "rid of paralysis!" - done - -_BurnHealText:: - TX_RAM wcd6d - text "'s" - line "burn was healed!" - done - -_IceHealText:: - TX_RAM wcd6d - text " was" - line "defrosted!" - done - -_AwakeningText:: - TX_RAM wcd6d - text "" - line "woke up!" - done - -_FullHealText:: - TX_RAM wcd6d - text "'s" - line "health returned!" - done - -_ReviveText:: - TX_RAM wcd6d - text "" - line "is revitalized!" - done - -_RareCandyText:: - TX_RAM wcd6d - text " grew" - line "to level @" - TX_NUM wCurEnemyLVL, 1, 3 - text "!@@" - -_TurnedOnPC1Text:: - text " turned on" - line "the PC." - prompt - -_AccessedBillsPCText:: - text "Accessed BILL's" - line "PC." - - para "Accessed #MON" - line "Storage System." - prompt - -_AccessedSomeonesPCText:: - text "Accessed someone's" - line "PC." - - para "Accessed #MON" - line "Storage System." - prompt - -_AccessedMyPCText:: - text "Accessed my PC." - - para "Accessed Item" - line "Storage System." - prompt - -_TurnedOnPC2Text:: - text " turned on" - line "the PC." - prompt - -_WhatDoYouWantText:: - text "What do you want" - line "to do?" - done - -_WhatToDepositText:: - text "What do you want" - line "to deposit?" - done - -_DepositHowManyText:: - text "How many?" - done - -_ItemWasStoredText:: - TX_RAM wcd6d - text " was" - line "stored via PC." - prompt - -_NothingToDepositText:: - text "You have nothing" - line "to deposit." - prompt - -_NoRoomToStoreText:: - text "No room left to" - line "store items." - prompt - -_WhatToWithdrawText:: - text "What do you want" - line "to withdraw?" - done - -_WithdrawHowManyText:: - text "How many?" - done - -_WithdrewItemText:: - text "Withdrew" - line "@" - TX_RAM wcd6d - text "." - prompt - -_NothingStoredText:: - text "There is nothing" - line "stored." - prompt - -_CantCarryMoreText:: - text "You can't carry" - line "any more items." - prompt - -_WhatToTossText:: - text "What do you want" - line "to toss away?" - done - -_TossHowManyText:: - text "How many?" - done - -_AccessedHoFPCText:: - text "Accessed #MON" - line "LEAGUE's site." - - para "Accessed the HALL" - line "OF FAME List." - prompt - -_SwitchOnText:: - text "Switch on!" - prompt - -_WhatText:: - text "What?" - done - -_DepositWhichMonText:: - text "Deposit which" - line "#MON?" - done - -_MonWasStoredText:: - TX_RAM wcf4b - text " was" - line "stored in Box @" - TX_RAM wBoxNumString - text "." - prompt - -_CantDepositLastMonText:: - text "You can't deposit" - line "the last #MON!" - prompt - -_BoxFullText:: - text "Oops! This Box is" - line "full of #MON." - prompt - -_MonIsTakenOutText:: - TX_RAM wcf4b - text " is" - line "taken out." - cont "Got @" - TX_RAM wcf4b - text "." - prompt - -_NoMonText:: - text "What? There are" - line "no #MON here!" - prompt - -_CantTakeMonText:: - text "You can't take" - line "any more #MON." - - para "Deposit #MON" - line "first." - prompt - -_ReleaseWhichMonText:: - text "Release which" - line "#MON?" - done - -_OnceReleasedText:: - text "Once released," - line "@" - TX_RAM wcf4b - text " is" - cont "gone forever. OK?" - done - -_MonWasReleasedText:: - TX_RAM wcf4b - text " was" - line "released outside." - cont "Bye @" - -_CF4BExclamationText:: - TX_RAM wcf4b - text "!" - prompt - -_RequireCoinCaseText:: - text "A COIN CASE is" - line "required!@@" - -_ExchangeCoinsForPrizesText:: - text "We exchange your" - line "coins for prizes." - prompt - -_WhichPrizeText:: - text "Which prize do" - line "you want?" - done - -_HereYouGoText:: - text "Here you go!@@" - -_SoYouWantPrizeText:: - text "So, you want" - line "@" - TX_RAM wcd6d - text "?" - done - -_SorryNeedMoreCoinsText:: - text "Sorry, you need" - line "more coins.@@" - -_OopsYouDontHaveEnoughRoomText:: - text "Oops! You don't" - line "have enough room.@@" - -_OhFineThenText:: - text "Oh, fine then.@@" - -_GetDexRatedText:: - text "Want to get your" - line "#DEX rated?" - done - -_ClosedOaksPCText:: - text "Closed link to" - line "PROF.OAK's PC.@@" - -_AccessedOaksPCText:: - text "Accessed PROF." - line "OAK's PC." - - para "Accessed #DEX" - line "Rating System." - prompt - -_WhereWouldYouLikeText:: - text "Where would you" - line "like to go?" - done - -_PleaseWaitText:: - text "OK, please wait" - line "just a moment." - done - -_LinkCanceledText:: - text "The link was" - line "canceled." - done - -INCLUDE "text/oakspeech.asm" - -_DoYouWantToNicknameText:: - text "Do you want to" - line "give a nickname" - cont "to @" - TX_RAM wcd6d - text "?" - done - -_YourNameIsText:: - text "Right! So your" - line "name is !" - prompt - -_HisNameIsText:: - text "That's right! I" - line "remember now! His" - cont "name is !" - prompt - -_WillBeTradedText:: - TX_RAM wNameOfPlayerMonToBeTraded - text " and" - line "@" - TX_RAM wcd6d - text " will" - cont "be traded." - done - -_Char00Text:: - TX_NUM hSpriteIndexOrTextID,1,2 - text " ERROR." - done - -_Char55Text:: - text $4B,"@@" - -INCLUDE "text/maps/DiglettsCaveRoute2.asm" -INCLUDE "text/maps/ViridianForestNorthGate.asm" -INCLUDE "text/maps/Route2TradeHouse.asm" -INCLUDE "text/maps/Route2Gate.asm" -INCLUDE "text/maps/ViridianForestSouthGate.asm" -INCLUDE "text/maps/MtMoonPokecenter.asm" -INCLUDE "text/maps/SaffronGates.asm" -INCLUDE "text/maps/Daycare.asm" - - -SECTION "Text 4", ROMX ; BANK $23 - -INCLUDE "text/maps/Daycare_2.asm" -INCLUDE "text/maps/UndergroundPathRoute6.asm" -INCLUDE "text/maps/UndergroundPathRoute7.asm" -INCLUDE "text/maps/UndergroundPathRoute7Copy.asm" -INCLUDE "text/maps/UndergroundPathRoute8.asm" -INCLUDE "text/maps/RockTunnelPokecenter.asm" -INCLUDE "text/maps/RockTunnel1F.asm" -INCLUDE "text/maps/PowerPlant.asm" -INCLUDE "text/maps/Route11Gate1F.asm" -INCLUDE "text/maps/Route11Gate2F.asm" -INCLUDE "text/maps/DiglettsCaveRoute11.asm" -INCLUDE "text/maps/Route12Gate1F.asm" -INCLUDE "text/maps/Route12Gate2F.asm" -INCLUDE "text/maps/Route12SuperRodHouse.asm" -INCLUDE "text/maps/Route15Gate1F.asm" -INCLUDE "text/maps/Route15Gate2F.asm" -INCLUDE "text/maps/Route16Gate1F.asm" -INCLUDE "text/maps/Route16Gate2F.asm" -INCLUDE "text/maps/Route16FlyHouse.asm" -INCLUDE "text/maps/Route18Gate1F.asm" -INCLUDE "text/maps/Route18Gate2F.asm" -INCLUDE "text/maps/Route22Gate.asm" -INCLUDE "text/maps/VictoryRoad2F.asm" -INCLUDE "text/maps/BillsHouse.asm" -INCLUDE "text/maps/Route1.asm" -INCLUDE "text/maps/Route2.asm" -INCLUDE "text/maps/Route3.asm" -INCLUDE "text/maps/Route4.asm" -INCLUDE "text/maps/Route5.asm" -INCLUDE "text/maps/Route6.asm" -INCLUDE "text/maps/Route7.asm" -INCLUDE "text/maps/Route8.asm" -INCLUDE "text/maps/Route9.asm" -INCLUDE "text/maps/Route10.asm" -INCLUDE "text/maps/Route11.asm" - - -SECTION "Text 5", ROMX ; BANK $24 - -INCLUDE "text/maps/Route11_2.asm" -INCLUDE "text/maps/Route12.asm" -INCLUDE "text/maps/Route13.asm" -INCLUDE "text/maps/Route14.asm" -INCLUDE "text/maps/Route15.asm" -INCLUDE "text/maps/Route16.asm" -INCLUDE "text/maps/Route17.asm" -INCLUDE "text/maps/Route18.asm" -INCLUDE "text/maps/Route19.asm" -INCLUDE "text/maps/Route20.asm" -INCLUDE "text/maps/Route21.asm" -INCLUDE "text/maps/Route22.asm" -INCLUDE "text/maps/Route23.asm" -INCLUDE "text/maps/Route24.asm" - - -SECTION "Text 6", ROMX ; BANK $25 - -INCLUDE "text/maps/Route24_2.asm" -INCLUDE "text/maps/Route25.asm" - -_FileDataDestroyedText:: - text "The file data is" - line "destroyed!" - prompt - -_WouldYouLikeToSaveText:: - text "Would you like to" - line "SAVE the game?" - done - -_GameSavedText:: - text " saved" - line "the game!" - done - -_OlderFileWillBeErasedText:: - text "The older file" - line "will be erased to" - cont "save. Okay?" - done - -_WhenYouChangeBoxText:: - text "When you change a" - line "#MON BOX, data" - cont "will be saved." - - para "Is that okay?" - done - -_ChooseABoxText:: - text "Choose a" - line " BOX.@@" - -_EvolvedText:: - TX_RAM wcf4b - text " evolved" - done - -_IntoText:: - text "" - line "into @" - TX_RAM wcd6d - text "!" - done - -_StoppedEvolvingText:: - text "Huh? @" - TX_RAM wcf4b - text "" - line "stopped evolving!" - prompt - -_IsEvolvingText:: - text "What? @" - TX_RAM wcf4b - text "" - line "is evolving!" - done - -_FellAsleepText:: - text "" - line "fell asleep!" - prompt - -_AlreadyAsleepText:: - text "'s" - line "already asleep!" - prompt - -_PoisonedText:: - text "" - line "was poisoned!" - prompt - -_BadlyPoisonedText:: - text "'s" - line "badly poisoned!" - prompt - -_BurnedText:: - text "" - line "was burned!" - prompt - -_FrozenText:: - text "" - line "was frozen solid!" - prompt - -_FireDefrostedText:: - text "Fire defrosted" - line "!" - prompt - -_MonsStatsRoseText:: - text "'s" - line "@" - TX_RAM wcf4b - text "@@" - -_GreatlyRoseText:: - text $4c, "greatly@@" - -_RoseText:: - text " rose!" - prompt - -_MonsStatsFellText:: - text "'s" - line "@" - TX_RAM wcf4b - text "@@" - -_GreatlyFellText:: - text $4c, "greatly@@" - -_FellText:: - text " fell!" - prompt - -_RanFromBattleText:: - text "" - line "ran from battle!" - prompt - -_RanAwayScaredText:: - text "" - line "ran away scared!" - prompt - -_WasBlownAwayText:: - text "" - line "was blown away!" - prompt - -_ChargeMoveEffectText:: - text "@@" - -_MadeWhirlwindText:: - text "" - line "made a whirlwind!" - prompt - -_TookInSunlightText:: - text "" - line "took in sunlight!" - prompt - -_LoweredItsHeadText:: - text "" - line "lowered its head!" - prompt - -_SkyAttackGlowingText:: - text "" - line "is glowing!" - prompt - -_FlewUpHighText:: - text "" - line "flew up high!" - prompt - -_DugAHoleText:: - text "" - line "dug a hole!" - prompt - -_BecameConfusedText:: - text "" - line "became confused!" - prompt - -_MimicLearnedMoveText:: - text "" - line "learned" - cont "@" - TX_RAM wcd6d - text "!" - prompt - -_MoveWasDisabledText:: - text "'s" - line "@" - TX_RAM wcd6d - text " was" - cont "disabled!" - prompt - -_NothingHappenedText:: - text "Nothing happened!" - prompt - -_NoEffectText:: - text "No effect!" - prompt - -_ButItFailedText:: - text "But, it failed! " - prompt - -_DidntAffectText:: - text "It didn't affect" - line "!" - prompt - -_IsUnaffectedText:: - text "" - line "is unaffected!" - prompt - -_ParalyzedMayNotAttackText:: - text "'s" - line "paralyzed! It may" - cont "not attack!" - prompt - -_SubstituteText:: - text "It created a" - line "SUBSTITUTE!" - prompt - -_HasSubstituteText:: - text "" - line "has a SUBSTITUTE!" - prompt - -_TooWeakSubstituteText:: - text "Too weak to make" - line "a SUBSTITUTE!" - prompt - -_CoinsScatteredText:: - text "Coins scattered" - line "everywhere!" - prompt - -_GettingPumpedText:: - text "'s" - line "getting pumped!" - prompt - -_WasSeededText:: - text "" - line "was seeded!" - prompt - -_EvadedAttackText:: - text "" - line "evaded attack!" - prompt - -_HitWithRecoilText:: - text "'s" - line "hit with recoil!" - prompt - -_ConvertedTypeText:: - text "Converted type to" - line "'s!" - prompt - -_StatusChangesEliminatedText:: - text "All STATUS changes" - line "are eliminated!" - prompt - -_StartedSleepingEffect:: - text "" - line "started sleeping!" - done - -_FellAsleepBecameHealthyText:: - text "" - line "fell asleep and" - cont "became healthy!" - done - -_RegainedHealthText:: - text "" - line "regained health!" - prompt - -_TransformedText:: - text "" - line "transformed into" - cont "@" - TX_RAM wcd6d - text "!" - prompt - -_LightScreenProtectedText:: - text "'s" - line "protected against" - cont "special attacks!" - prompt - -_ReflectGainedArmorText:: - text "" - line "gained armor!" - prompt - -_ShroudedInMistText:: - text "'s" - line "shrouded in mist!" - prompt - -_SuckedHealthText:: - text "Sucked health from" - line "!" - prompt - -_DreamWasEatenText:: - text "'s" - line "dream was eaten!" - prompt - -_TradeCenterText1:: - text "!" - done - -_ColosseumText1:: - text "!" - done - -INCLUDE "text/maps/RedsHouse1F.asm" -INCLUDE "text/maps/BluesHouse.asm" -INCLUDE "text/maps/OaksLab.asm" -INCLUDE "text/maps/ViridianPokecenter.asm" -INCLUDE "text/maps/ViridianMart.asm" -INCLUDE "text/maps/ViridianSchoolHouse.asm" -INCLUDE "text/maps/ViridianNicknameHouse.asm" -INCLUDE "text/maps/ViridianGym.asm" -INCLUDE "text/maps/Museum1F.asm" -INCLUDE "text/maps/Museum2F.asm" -INCLUDE "text/maps/PewterGym.asm" - - -SECTION "Text 7", ROMX ; BANK $26 - -INCLUDE "text/maps/PewterGym_2.asm" -INCLUDE "text/maps/PewterNidoranHouse.asm" -INCLUDE "text/maps/PewterMart.asm" -INCLUDE "text/maps/PewterSpeechHouse.asm" -INCLUDE "text/maps/PewterPokecenter.asm" -INCLUDE "text/maps/CeruleanTrashedHouse.asm" -INCLUDE "text/maps/CeruleanTradeHouse.asm" -INCLUDE "text/maps/CeruleanPokecenter.asm" -INCLUDE "text/maps/CeruleanGym.asm" -INCLUDE "text/maps/BikeShop.asm" -INCLUDE "text/maps/CeruleanMart.asm" -INCLUDE "text/maps/CeruleanBadgeHouse.asm" -INCLUDE "text/maps/LavenderPokecenter.asm" -INCLUDE "text/maps/PokemonTower1F.asm" -INCLUDE "text/maps/PokemonTower2F.asm" -INCLUDE "text/maps/PokemonTower3F.asm" -INCLUDE "text/maps/PokemonTower4F.asm" -INCLUDE "text/maps/PokemonTower5F.asm" -INCLUDE "text/maps/PokemonTower6F.asm" -INCLUDE "text/maps/PokemonTower7F.asm" -INCLUDE "text/maps/MrFujisHouse.asm" -INCLUDE "text/maps/LavenderMart.asm" -INCLUDE "text/maps/LavenderCuboneHouse.asm" -INCLUDE "text/maps/NameRatersHouse.asm" -INCLUDE "text/maps/VermilionPokecenter.asm" -INCLUDE "text/maps/PokemonFanClub.asm" -INCLUDE "text/maps/VermilionMart.asm" -INCLUDE "text/maps/VermilionGym.asm" - - -SECTION "Text 8", ROMX ; BANK $27 - -INCLUDE "text/maps/VermilionGym_2.asm" -INCLUDE "text/maps/VermilionPidgeyHouse.asm" -INCLUDE "text/maps/VermilionDock.asm" -INCLUDE "text/maps/VermilionOldRodHouse.asm" -INCLUDE "text/maps/CeladonMart1F.asm" -INCLUDE "text/maps/CeladonMart2F.asm" -INCLUDE "text/maps/CeladonMart3F.asm" -INCLUDE "text/maps/CeladonMart4F.asm" -INCLUDE "text/maps/CeladonMartRoof.asm" -INCLUDE "text/maps/CeladonMansion1F.asm" -INCLUDE "text/maps/CeladonMansion2F.asm" -INCLUDE "text/maps/CeladonMansion3F.asm" -INCLUDE "text/maps/CeladonMansionRoof.asm" -INCLUDE "text/maps/CeladonMansionRoofHouse.asm" -INCLUDE "text/maps/CeladonPokecenter.asm" -INCLUDE "text/maps/CeladonGym.asm" -INCLUDE "text/maps/GameCorner.asm" -INCLUDE "text/maps/CeladonMart5F.asm" -INCLUDE "text/maps/GameCornerPrizeRoom.asm" -INCLUDE "text/maps/CeladonDiner.asm" -INCLUDE "text/maps/CeladonChiefHouse.asm" -INCLUDE "text/maps/CeladonHotel.asm" -INCLUDE "text/maps/FuchsiaMart.asm" -INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm" -INCLUDE "text/maps/FuchsiaPokecenter.asm" -INCLUDE "text/maps/WardensHouse.asm" -INCLUDE "text/maps/SafariZoneGate.asm" -INCLUDE "text/maps/FuchsiaGym.asm" - - -SECTION "Text 9", ROMX ; BANK $28 - -INCLUDE "text/maps/FuchsiaGym_2.asm" -INCLUDE "text/maps/FuchsiaMeetingRoom.asm" -INCLUDE "text/maps/FuchsiaGoodRodHouse.asm" -INCLUDE "text/maps/PokemonMansion1F.asm" -INCLUDE "text/maps/CinnabarGym.asm" -INCLUDE "text/maps/CinnabarLab.asm" -INCLUDE "text/maps/CinnabarLabTradeRoom.asm" -INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm" -INCLUDE "text/maps/CinnabarLabFossilRoom.asm" -INCLUDE "text/maps/CinnabarPokecenter.asm" -INCLUDE "text/maps/CinnabarMart.asm" -INCLUDE "text/maps/IndigoPlateauLobby.asm" -INCLUDE "text/maps/CopycatsHouse1F.asm" -INCLUDE "text/maps/CopycatsHouse2F.asm" -INCLUDE "text/maps/FightingDojo.asm" -INCLUDE "text/maps/SaffronGym.asm" -INCLUDE "text/maps/SaffronPidgeyHouse.asm" -INCLUDE "text/maps/SaffronMart.asm" -INCLUDE "text/maps/SilphCo1F.asm" -INCLUDE "text/maps/SaffronPokecenter.asm" -INCLUDE "text/maps/MrPsychicsHouse.asm" - -_PokemartGreetingText:: - text "Hi there!" - next "May I help you?" - done - -_PokemonFaintedText:: - TX_RAM wcd6d - text "" - line "fainted!" - done - -_PlayerBlackedOutText:: - text " is out of" - line "useable #MON!" - - para " blacked" - line "out!" - prompt - -_RepelWoreOffText:: - text "REPEL's effect" - line "wore off." - done - -_PokemartBuyingGreetingText:: - text "Take your time." - done - -_PokemartTellBuyPriceText:: - TX_RAM wcf4b - text "?" - line "That will be" - cont "¥@" - TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN - text ". OK?" - done - -_PokemartBoughtItemText:: - text "Here you are!" - line "Thank you!" - prompt - -_PokemartNotEnoughMoneyText:: - text "You don't have" - line "enough money." - prompt - -_PokemartItemBagFullText:: - text "You can't carry" - line "any more items." - prompt - -_PokemonSellingGreetingText:: - text "What would you" - line "like to sell?" - done - -_PokemartTellSellPriceText:: - text "I can pay you" - line "¥@" - TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN - text " for that." - done - -_PokemartItemBagEmptyText:: - text "You don't have" - line "anything to sell." - prompt - -_PokemartUnsellableItemText:: - text "I can't put a" - line "price on that." - prompt - -_PokemartThankYouText:: - text "Thank you!" - done - -_PokemartAnythingElseText:: - text "Is there anything" - line "else I can do?" - done - -_LearnedMove1Text:: - TX_RAM wLearnMoveMonName - text " learned" - line "@" - TX_RAM wcf4b - text "!@@" - -_WhichMoveToForgetText:: - text "Which move should" - next "be forgotten?" - done - -_AbandonLearningText:: - text "Abandon learning" - line "@" - TX_RAM wcf4b - text "?" - done - -_DidNotLearnText:: - TX_RAM wLearnMoveMonName - text "" - line "did not learn" - cont "@" - TX_RAM wcf4b - text "!" - prompt - -_TryingToLearnText:: - TX_RAM wLearnMoveMonName - text " is" - line "trying to learn" - cont "@" - TX_RAM wcf4b - text "!" - - para "But, @" - TX_RAM wLearnMoveMonName - text "" - line "can't learn more" - cont "than 4 moves!" - - para "Delete an older" - line "move to make room" - cont "for @" - TX_RAM wcf4b - text "?" - done - -_OneTwoAndText:: - text "1, 2 and...@@" - -_PoofText:: - text " Poof!@@" - -_ForgotAndText:: - text "" - para "@" - TX_RAM wLearnMoveMonName - text " forgot" - line "@" - TX_RAM wcd6d - text "!" - - para "And..." - prompt - -_HMCantDeleteText:: - text "HM techniques" - line "can't be deleted!" - prompt - -_PokemonCenterWelcomeText:: - text "Welcome to our" - line "#MON CENTER!" - - para "We heal your" - line "#MON back to" - cont "perfect health!" - prompt - -_ShallWeHealYourPokemonText:: - text "Shall we heal your" - line "#MON?" - done - -_NeedYourPokemonText:: - text "OK. We'll need" - line "your #MON." - done - -_PokemonFightingFitText:: - text "Thank you!" - line "Your #MON are" - cont "fighting fit!" - prompt - -_PokemonCenterFarewellText:: - text "We hope to see" - line "you again!" - done - -_CableClubNPCAreaReservedFor2FriendsLinkedByCableText:: - text "This area is" - line "reserved for 2" - cont "friends who are" - cont "linked by cable." - done - -_CableClubNPCWelcomeText:: - text "Welcome to the" - line "Cable Club!" - done - -_CableClubNPCPleaseApplyHereHaveToSaveText:: - text "Please apply here." - - para "Before opening" - line "the link, we have" - cont "to save the game." - done - -_CableClubNPCPleaseWaitText:: - text "Please wait.@@" - -_CableClubNPCLinkClosedBecauseOfInactivityText:: - text "The link has been" - line "closed because of" - cont "inactivity." - - para "Please contact" - line "your friend and" - cont "come again!" - done - - -SECTION "Text 10", ROMX ; BANK $29 - -_CableClubNPCPleaseComeAgainText:: - text "Please come again!" - done - -_CableClubNPCMakingPreparationsText:: - text "We're making" - line "preparations." - cont "Please wait." - done - -_UsedStrengthText:: - TX_RAM wcd6d - text " used" - line "STRENGTH.@@" - -_CanMoveBouldersText:: - TX_RAM wcd6d - text " can" - line "move boulders." - prompt - -_CurrentTooFastText:: - text "The current is" - line "much too fast!" - prompt - -_CyclingIsFunText:: - text "Cycling is fun!" - line "Forget SURFing!" - prompt - -_FlashLightsAreaText:: - text "A blinding FLASH" - line "lights the area!" - prompt - -_WarpToLastPokemonCenterText:: - text "Warp to the last" - line "#MON CENTER." - done - -_CannotUseTeleportNowText:: - TX_RAM wcd6d - text " can't" - line "use TELEPORT now." - prompt - -_CannotFlyHereText:: - TX_RAM wcd6d - text " can't" - line "FLY here." - prompt - -_NotHealthyEnoughText:: - text "Not healthy" - line "enough." - prompt - -_NewBadgeRequiredText:: - text "No! A new BADGE" - line "is required." - prompt - -_CannotUseItemsHereText:: - text "You can't use items" - line "here." - prompt - -_CannotGetOffHereText:: - text "You can't get off" - line "here." - prompt - -_GotMonText:: - text " got" - line "@" - TX_RAM wcd6d - text "!@@" - -_SetToBoxText:: - text "There's no more" - line "room for #MON!" - cont "@" - TX_RAM wBoxMonNicks - text " was" - cont "sent to #MON" - cont "BOX @" - TX_RAM wcf4b - text " on PC!" - done - -_BoxIsFullText:: - text "There's no more" - line "room for #MON!" - - para "The #MON BOX" - line "is full and can't" - cont "accept any more!" - - para "Change the BOX at" - line "a #MON CENTER!" - done - -INCLUDE "text/maps/PalletTown.asm" -INCLUDE "text/maps/ViridianCity.asm" -INCLUDE "text/maps/PewterCity.asm" -INCLUDE "text/maps/CeruleanCity.asm" -INCLUDE "text/maps/LavenderTown.asm" -INCLUDE "text/maps/VermilionCity.asm" -INCLUDE "text/maps/CeladonCity.asm" -INCLUDE "text/maps/FuchsiaCity.asm" -INCLUDE "text/maps/CinnabarIsland.asm" -INCLUDE "text/maps/SaffronCity.asm" - -_ItemUseBallText00:: - text "It dodged the" - line "thrown BALL!" - - para "This #MON" - line "can't be caught!" - prompt - -_ItemUseBallText01:: - text "You missed the" - line "#MON!" - prompt - -_ItemUseBallText02:: - text "Darn! The #MON" - line "broke free!" - prompt - -_ItemUseBallText03:: - text "Aww! It appeared" - line "to be caught! " - prompt - -_ItemUseBallText04:: - text "Shoot! It was so" - line "close too!" - prompt - -_ItemUseBallText05:: - text "All right!" - line "@" - TX_RAM wEnemyMonNick - text " was" - cont "caught!@@" - -_ItemUseBallText07:: - TX_RAM wBoxMonNicks - text " was" - line "transferred to" - cont "BILL's PC!" - prompt - -_ItemUseBallText08:: - TX_RAM wBoxMonNicks - text " was" - line "transferred to" - cont "someone's PC!" - prompt - -_ItemUseBallText06:: - text "New #DEX data" - line "will be added for" - cont "@" - TX_RAM wEnemyMonNick - text "!@@" - -_SurfingGotOnText:: - text " got on" - line "@" - TX_RAM wcd6d - text "!" - prompt - -_SurfingNoPlaceToGetOffText:: - text "There's no place" - line "to get off!" - prompt - -_VitaminStatRoseText:: - TX_RAM wcd6d - text "'s" - line "@" - TX_RAM wcf4b - text " rose." - prompt - -_VitaminNoEffectText:: - text "It won't have any" - line "effect." - prompt - -_ThrewBaitText:: - text " threw" - line "some BAIT." - done - -_ThrewRockText:: - text " threw a" - line "ROCK." - done - -_PlayedFluteNoEffectText:: - text "Played the #" - line "FLUTE." - - para "Now, that's a" - line "catchy tune!" - prompt - -_FluteWokeUpText:: - text "All sleeping" - line "#MON woke up." - prompt - -_PlayedFluteHadEffectText:: - text " played the" - line "# FLUTE.@@" - -_CoinCaseNumCoinsText:: - text "Coins" - line "@" - TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN - text " " - prompt - -_ItemfinderFoundItemText:: - text "Yes! ITEMFINDER" - line "indicates there's" - cont "an item nearby." - prompt - -_ItemfinderFoundNothingText:: - text "Nope! ITEMFINDER" - line "isn't responding." - prompt - -_RaisePPWhichTechniqueText:: - text "Raise PP of which" - line "technique?" - done - -_RestorePPWhichTechniqueText:: - text "Restore PP of" - line "which technique?" - done - -_PPMaxedOutText:: - TX_RAM wcf4b - text "'s PP" - line "is maxed out." - prompt - -_PPIncreasedText:: - TX_RAM wcf4b - text "'s PP" - line "increased." - prompt - -_PPRestoredText:: - text "PP was restored." - prompt - -_BootedUpTMText:: - text "Booted up a TM!" - prompt - -_BootedUpHMText:: - text "Booted up an HM!" - prompt - -_TeachMachineMoveText:: - text "It contained" - line "@" - TX_RAM wcf4b - text "!" - - para "Teach @" - TX_RAM wcf4b - text "" - line "to a #MON?" - done - -_MonCannotLearnMachineMoveText:: - TX_RAM wcd6d - text " is not" - line "compatible with" - cont "@" - TX_RAM wcf4b - text "." - - para "It can't learn" - line "@" - TX_RAM wcf4b - text "." - prompt - -_ItemUseNotTimeText:: - text "OAK: !" - line "This isn't the" - cont "time to use that! " - prompt - -_ItemUseNotYoursToUseText:: - text "This isn't yours" - line "to use!" - prompt - -_ItemUseNoEffectText:: - text "It won't have any" - line "effect." - prompt - -_ThrowBallAtTrainerMonText1:: - text "The trainer" - line "blocked the BALL!" - prompt - -_ThrowBallAtTrainerMonText2:: - text "Don't be a thief!" - prompt - -_NoCyclingAllowedHereText:: - text "No cycling" - next "allowed here." - prompt - -_NoSurfingHereText:: - text "No SURFing on" - line "@" - TX_RAM wcd6d - text " here!" - prompt - -_BoxFullCannotThrowBallText:: - text "The #MON BOX" - line "is full! Can't" - cont "use that item!" - prompt - - -SECTION "Text 11", ROMX ; BANK $2a - -_ItemUseText001:: - text " used@@" - -_ItemUseText002:: - TX_RAM wcf4b - text "!" - done - -_GotOnBicycleText1:: - text " got on the@@" - -_GotOnBicycleText2:: - TX_RAM wcf4b - text "!" - prompt - -_GotOffBicycleText1:: - text " got off@@" - -_GotOffBicycleText2:: - text "the @" - TX_RAM wcf4b - text "." - prompt - -_ThrewAwayItemText:: - text "Threw away" - line "@" - TX_RAM wcd6d - text "." - prompt - -_IsItOKToTossItemText:: - text "Is it OK to toss" - line "@" - TX_RAM wcf4b - text "?" - prompt - -_TooImportantToTossText:: - text "That's too impor-" - line "tant to toss!" - prompt - -_AlreadyKnowsText:: - TX_RAM wcd6d - text " knows" - line "@" - TX_RAM wcf4b - text "!" - prompt - -_ConnectCableText:: - text "Okay, connect the" - line "cable like so!" - prompt - -_TradedForText:: - text " traded" - line "@" - TX_RAM wInGameTradeGiveMonName - text " for" - cont "@" - TX_RAM wInGameTradeReceiveMonName - text "!@@" - -_WannaTrade1Text:: - text "I'm looking for" - line "@" - TX_RAM wInGameTradeGiveMonName - text "! Wanna" - - para "trade one for" - line "@" - TX_RAM wInGameTradeReceiveMonName - text "? " - done - -_NoTrade1Text:: - text "Awww!" - line "Oh well..." - done - -_WrongMon1Text:: - text "What? That's not" - line "@" - TX_RAM wInGameTradeGiveMonName - text "!" - - para "If you get one," - line "come back here!" - done - -_Thanks1Text:: - text "Hey thanks!" - done - -_AfterTrade1Text:: - text "Isn't my old" - line "@" - TX_RAM wInGameTradeReceiveMonName - text " great?" - done - -_WannaTrade2Text:: - text "Hello there! Do" - line "you want to trade" - - para "your @" - TX_RAM wInGameTradeGiveMonName - text "" - line "for @" - TX_RAM wInGameTradeReceiveMonName - text "?" - done - -_NoTrade2Text:: - text "Well, if you" - line "don't want to..." - done - -_WrongMon2Text:: - text "Hmmm? This isn't" - line "@" - TX_RAM wInGameTradeGiveMonName - text "." - - para "Think of me when" - line "you get one." - done - -_Thanks2Text:: - text "Thanks!" - done - -_AfterTrade2Text:: - text "The @" - TX_RAM wInGameTradeGiveMonName - text " you" - line "traded to me" - - para "went and evolved!" - done - -_WannaTrade3Text:: - text "Hi! Do you have" - line "@" - TX_RAM wInGameTradeGiveMonName - text "?" - - para "Want to trade it" - line "for @" - TX_RAM wInGameTradeReceiveMonName - text "?" - done - -_NoTrade3Text:: - text "That's too bad." - done - -_WrongMon3Text:: - text "...This is no" - line "@" - TX_RAM wInGameTradeGiveMonName - text "." - - para "If you get one," - line "trade it with me!" - done - -_Thanks3Text:: - text "Thanks pal!" - done - -_AfterTrade3Text:: - text "How is my old" - line "@" - TX_RAM wInGameTradeReceiveMonName - text "?" - - para "My @" - TX_RAM wInGameTradeGiveMonName - text " is" - line "doing great!" - done - -_NothingToCutText:: - text "There isn't" - line "anything to CUT!" - prompt - -_UsedCutText:: - TX_RAM wcd6d - text " hacked" - line "away with CUT!" - prompt - - -SECTION "Pokedex Text", ROMX ; BANK $2b - -INCLUDE "text/pokedex.asm" - - -SECTION "Move Names", ROMX ; BANK $2c - -INCLUDE "text/move_names.asm" +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/text_1.asm" + +INCLUDE "text/ViridianForest.asm" +INCLUDE "text/MtMoon1F.asm" +INCLUDE "text/MtMoonB1F.asm" +INCLUDE "text/MtMoonB2F.asm" +INCLUDE "text/SSAnne1F.asm" +INCLUDE "text/SSAnne2F.asm" +INCLUDE "text/SSAnne3F.asm" +INCLUDE "text/SSAnneBow.asm" +INCLUDE "text/SSAnneKitchen.asm" +INCLUDE "text/SSAnneCaptainsRoom.asm" +INCLUDE "text/SSAnne1FRooms.asm" +INCLUDE "text/SSAnne2FRooms.asm" +INCLUDE "text/SSAnneB1FRooms.asm" +INCLUDE "text/VictoryRoad3F.asm" +INCLUDE "text/RocketHideoutB1F.asm" +INCLUDE "text/RocketHideoutB2F.asm" +INCLUDE "text/RocketHideoutB3F.asm" +INCLUDE "text/RocketHideoutB4F.asm" +INCLUDE "text/RocketHideoutElevator.asm" +INCLUDE "text/SilphCo2F.asm" +INCLUDE "text/SilphCo3F.asm" +INCLUDE "text/SilphCo4F.asm" +INCLUDE "text/SilphCo5F.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "text/SilphCo5F_2.asm" +INCLUDE "text/SilphCo6F.asm" +INCLUDE "text/SilphCo7F.asm" +INCLUDE "text/SilphCo8F.asm" +INCLUDE "text/SilphCo9F.asm" +INCLUDE "text/SilphCo10F.asm" +INCLUDE "text/SilphCo11F.asm" +INCLUDE "text/PokemonMansion2F.asm" +INCLUDE "text/PokemonMansion3F.asm" +INCLUDE "text/PokemonMansionB1F.asm" +INCLUDE "text/SafariZoneEast.asm" +INCLUDE "text/SafariZoneNorth.asm" +INCLUDE "text/SafariZoneWest.asm" +INCLUDE "text/SafariZoneCenter.asm" +INCLUDE "text/SafariZoneCenterRestHouse.asm" +INCLUDE "text/SafariZoneSecretHouse.asm" +INCLUDE "text/SafariZoneWestRestHouse.asm" +INCLUDE "text/SafariZoneEastRestHouse.asm" +INCLUDE "text/SafariZoneNorthRestHouse.asm" +INCLUDE "text/CeruleanCaveB1F.asm" +INCLUDE "text/VictoryRoad1F.asm" +INCLUDE "text/LancesRoom.asm" +INCLUDE "text/HallOfFame.asm" +INCLUDE "text/ChampionsRoom.asm" +INCLUDE "text/LoreleisRoom.asm" +INCLUDE "text/BrunosRoom.asm" +INCLUDE "text/AgathasRoom.asm" +INCLUDE "text/RockTunnelB1F.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "text/RockTunnelB1F_2.asm" +INCLUDE "text/SeafoamIslandsB4F.asm" + +INCLUDE "data/text/text_2.asm" + +INCLUDE "text/DiglettsCaveRoute2.asm" +INCLUDE "text/ViridianForestNorthGate.asm" +INCLUDE "text/Route2TradeHouse.asm" +INCLUDE "text/Route2Gate.asm" +INCLUDE "text/ViridianForestSouthGate.asm" +INCLUDE "text/MtMoonPokecenter.asm" +INCLUDE "text/SaffronGates.asm" +INCLUDE "text/Daycare.asm" + + +SECTION "Text 4", ROMX + +INCLUDE "text/Daycare_2.asm" +INCLUDE "text/UndergroundPathRoute6.asm" +INCLUDE "text/UndergroundPathRoute7.asm" +INCLUDE "text/UndergroundPathRoute7Copy.asm" +INCLUDE "text/UndergroundPathRoute8.asm" +INCLUDE "text/RockTunnelPokecenter.asm" +INCLUDE "text/RockTunnel1F.asm" +INCLUDE "text/PowerPlant.asm" +INCLUDE "text/Route11Gate1F.asm" +INCLUDE "text/Route11Gate2F.asm" +INCLUDE "text/DiglettsCaveRoute11.asm" +INCLUDE "text/Route12Gate1F.asm" +INCLUDE "text/Route12Gate2F.asm" +INCLUDE "text/Route12SuperRodHouse.asm" +INCLUDE "text/Route15Gate1F.asm" +INCLUDE "text/Route15Gate2F.asm" +INCLUDE "text/Route16Gate1F.asm" +INCLUDE "text/Route16Gate2F.asm" +INCLUDE "text/Route16FlyHouse.asm" +INCLUDE "text/Route18Gate1F.asm" +INCLUDE "text/Route18Gate2F.asm" +INCLUDE "text/Route22Gate.asm" +INCLUDE "text/VictoryRoad2F.asm" +INCLUDE "text/BillsHouse.asm" +INCLUDE "text/Route1.asm" +INCLUDE "text/Route2.asm" +INCLUDE "text/Route3.asm" +INCLUDE "text/Route4.asm" +INCLUDE "text/Route5.asm" +INCLUDE "text/Route6.asm" +INCLUDE "text/Route7.asm" +INCLUDE "text/Route8.asm" +INCLUDE "text/Route9.asm" +INCLUDE "text/Route10.asm" +INCLUDE "text/Route11.asm" + + +SECTION "Text 5", ROMX + +INCLUDE "text/Route11_2.asm" +INCLUDE "text/Route12.asm" +INCLUDE "text/Route13.asm" +INCLUDE "text/Route14.asm" +INCLUDE "text/Route15.asm" +INCLUDE "text/Route16.asm" +INCLUDE "text/Route17.asm" +INCLUDE "text/Route18.asm" +INCLUDE "text/Route19.asm" +INCLUDE "text/Route20.asm" +INCLUDE "text/Route21.asm" +INCLUDE "text/Route22.asm" +INCLUDE "text/Route23.asm" +INCLUDE "text/Route24.asm" + + +SECTION "Text 6", ROMX + +INCLUDE "text/Route24_2.asm" +INCLUDE "text/Route25.asm" + +INCLUDE "data/text/text_3.asm" + +INCLUDE "text/RedsHouse1F.asm" +INCLUDE "text/BluesHouse.asm" +INCLUDE "text/OaksLab.asm" +INCLUDE "text/ViridianPokecenter.asm" +INCLUDE "text/ViridianMart.asm" +INCLUDE "text/ViridianSchoolHouse.asm" +INCLUDE "text/ViridianNicknameHouse.asm" +INCLUDE "text/ViridianGym.asm" +INCLUDE "text/Museum1F.asm" +INCLUDE "text/Museum2F.asm" +INCLUDE "text/PewterGym.asm" + + +SECTION "Text 7", ROMX + +INCLUDE "text/PewterGym_2.asm" +INCLUDE "text/PewterNidoranHouse.asm" +INCLUDE "text/PewterMart.asm" +INCLUDE "text/PewterSpeechHouse.asm" +INCLUDE "text/PewterPokecenter.asm" +INCLUDE "text/CeruleanTrashedHouse.asm" +INCLUDE "text/CeruleanTradeHouse.asm" +INCLUDE "text/CeruleanPokecenter.asm" +INCLUDE "text/CeruleanGym.asm" +INCLUDE "text/BikeShop.asm" +INCLUDE "text/CeruleanMart.asm" +INCLUDE "text/CeruleanBadgeHouse.asm" +INCLUDE "text/LavenderPokecenter.asm" +INCLUDE "text/PokemonTower1F.asm" +INCLUDE "text/PokemonTower2F.asm" +INCLUDE "text/PokemonTower3F.asm" +INCLUDE "text/PokemonTower4F.asm" +INCLUDE "text/PokemonTower5F.asm" +INCLUDE "text/PokemonTower6F.asm" +INCLUDE "text/PokemonTower7F.asm" +INCLUDE "text/MrFujisHouse.asm" +INCLUDE "text/LavenderMart.asm" +INCLUDE "text/LavenderCuboneHouse.asm" +INCLUDE "text/NameRatersHouse.asm" +INCLUDE "text/VermilionPokecenter.asm" +INCLUDE "text/PokemonFanClub.asm" +INCLUDE "text/VermilionMart.asm" +INCLUDE "text/VermilionGym.asm" + + +SECTION "Text 8", ROMX + +INCLUDE "text/VermilionGym_2.asm" +INCLUDE "text/VermilionPidgeyHouse.asm" +INCLUDE "text/VermilionDock.asm" +INCLUDE "text/VermilionOldRodHouse.asm" +INCLUDE "text/CeladonMart1F.asm" +INCLUDE "text/CeladonMart2F.asm" +INCLUDE "text/CeladonMart3F.asm" +INCLUDE "text/CeladonMart4F.asm" +INCLUDE "text/CeladonMartRoof.asm" +INCLUDE "text/CeladonMansion1F.asm" +INCLUDE "text/CeladonMansion2F.asm" +INCLUDE "text/CeladonMansion3F.asm" +INCLUDE "text/CeladonMansionRoof.asm" +INCLUDE "text/CeladonMansionRoofHouse.asm" +INCLUDE "text/CeladonPokecenter.asm" +INCLUDE "text/CeladonGym.asm" +INCLUDE "text/GameCorner.asm" +INCLUDE "text/CeladonMart5F.asm" +INCLUDE "text/GameCornerPrizeRoom.asm" +INCLUDE "text/CeladonDiner.asm" +INCLUDE "text/CeladonChiefHouse.asm" +INCLUDE "text/CeladonHotel.asm" +INCLUDE "text/FuchsiaMart.asm" +INCLUDE "text/FuchsiaBillsGrandpasHouse.asm" +INCLUDE "text/FuchsiaPokecenter.asm" +INCLUDE "text/WardensHouse.asm" +INCLUDE "text/SafariZoneGate.asm" +INCLUDE "text/FuchsiaGym.asm" + + +SECTION "Text 9", ROMX + +INCLUDE "text/FuchsiaGym_2.asm" +INCLUDE "text/FuchsiaMeetingRoom.asm" +INCLUDE "text/FuchsiaGoodRodHouse.asm" +INCLUDE "text/PokemonMansion1F.asm" +INCLUDE "text/CinnabarGym.asm" +INCLUDE "text/CinnabarLab.asm" +INCLUDE "text/CinnabarLabTradeRoom.asm" +INCLUDE "text/CinnabarLabMetronomeRoom.asm" +INCLUDE "text/CinnabarLabFossilRoom.asm" +INCLUDE "text/CinnabarPokecenter.asm" +INCLUDE "text/CinnabarMart.asm" +INCLUDE "text/IndigoPlateauLobby.asm" +INCLUDE "text/CopycatsHouse1F.asm" +INCLUDE "text/CopycatsHouse2F.asm" +INCLUDE "text/FightingDojo.asm" +INCLUDE "text/SaffronGym.asm" +INCLUDE "text/SaffronPidgeyHouse.asm" +INCLUDE "text/SaffronMart.asm" +INCLUDE "text/SilphCo1F.asm" +INCLUDE "text/SaffronPokecenter.asm" +INCLUDE "text/MrPsychicsHouse.asm" + +INCLUDE "data/text/text_4.asm" + + +SECTION "Text 10", ROMX + +INCLUDE "data/text/text_5.asm" + +INCLUDE "text/PalletTown.asm" +INCLUDE "text/ViridianCity.asm" +INCLUDE "text/PewterCity.asm" +INCLUDE "text/CeruleanCity.asm" +INCLUDE "text/LavenderTown.asm" +INCLUDE "text/VermilionCity.asm" +INCLUDE "text/CeladonCity.asm" +INCLUDE "text/FuchsiaCity.asm" +INCLUDE "text/CinnabarIsland.asm" +INCLUDE "text/SaffronCity.asm" + +INCLUDE "data/text/text_6.asm" + + +SECTION "Text 11", ROMX + +INCLUDE "data/text/text_7.asm" + + +SECTION "Pokédex Text", ROMX + +INCLUDE "data/pokemon/dex_text.asm" + + +SECTION "Move Names", ROMX + +INCLUDE "data/moves/names.asm" diff --git a/text/maps/AgathasRoom.asm b/text/AgathasRoom.asm similarity index 100% rename from text/maps/AgathasRoom.asm rename to text/AgathasRoom.asm diff --git a/text/BikeShop.asm b/text/BikeShop.asm new file mode 100644 index 00000000..5d71133c --- /dev/null +++ b/text/BikeShop.asm @@ -0,0 +1,71 @@ +_BikeShopText_1d810:: + text "Hi! Welcome to" + line "our BIKE SHOP." + + para "Have we got just" + line "the BIKE for you!" + prompt + +_BikeShopText_1d815:: + text "It's a cool BIKE!" + line "Do you want it?" + done + +_BikeShopCantAffordText:: + text "Sorry! You can't" + line "afford it!" + prompt + +_BikeShopText_1d81f:: + text "Oh, that's..." + + para "A BIKE VOUCHER!" + + para "OK! Here you go!" + prompt + +_BikeShopText_1d824:: + text " exchanged" + line "the BIKE VOUCHER" + cont "for a BICYCLE.@" + text_end + +_BikeShopComeAgainText:: + text "Come back again" + line "some time!" + done + +_BikeShopText_1d82f:: + text "How do you like" + line "your new BICYCLE?" + + para "You can take it" + line "on CYCLING ROAD" + cont "and in caves!" + done + +_BikeShopText_1d834:: + text "You better make" + line "room for this!" + done + +_BikeShopText_1d843:: + text "A plain city BIKE" + line "is good enough" + cont "for me!" + + para "You can't put a" + line "shopping basket" + cont "on an MTB!" + done + +_BikeShopText_1d85c:: + text "These BIKEs are" + line "cool, but they're" + cont "way expensive!" + done + +_BikeShopText_1d861:: + text "Wow. Your BIKE is" + line "really cool!" + done diff --git a/text/BillsHouse.asm b/text/BillsHouse.asm new file mode 100644 index 00000000..11bb3200 --- /dev/null +++ b/text/BillsHouse.asm @@ -0,0 +1,88 @@ +_BillsHouseText_1e865:: + text "Hiya! I'm a" + line "#MON..." + cont "...No I'm not!" + + para "Call me BILL!" + line "I'm a true blue" + cont "#MANIAC! Hey!" + cont "What's with that" + cont "skeptical look?" + + para "I'm not joshing" + line "you, I screwed up" + cont "an experiment and" + cont "got combined with" + cont "a #MON!" + + para "So, how about it?" + line "Help me out here!" + done + +_BillsHouseText_1e86a:: + text "When I'm in the" + line "TELEPORTER, go to" + cont "my PC and run the" + cont "Cell Separation" + cont "System!" + done + +_BillsHouseText_1e86f:: + text "No!? Come on, you" + line "gotta help a guy" + cont "in deep trouble!" + + para "What do you say," + line "chief? Please?" + cont "OK? All right!" + prompt + +_BillThankYouText:: + text "BILL: Yeehah!" + line "Thanks, bud! I" + cont "owe you one!" + + para "So, did you come" + line "to see my #MON" + cont "collection?" + cont "You didn't?" + cont "That's a bummer." + + para "I've got to thank" + line "you... Oh here," + cont "maybe this'll do." + prompt + +_SSTicketReceivedText:: + text " received" + line "an @" + text_ram wcf4b + text "!@" + text_end + +_SSTicketNoRoomText:: + text "You've got too" + line "much stuff, bud!" + done + +_BillsHouseText_1e8cb:: + text "That cruise ship," + line "S.S.ANNE, is in" + cont "VERMILION CITY." + cont "Its passengers" + cont "are all trainers!" + + para "They invited me" + line "to their party," + cont "but I can't stand" + cont "fancy do's. Why" + cont "don't you go" + cont "instead of me?" + done + +_BillsHouseText_1e8da:: + text "BILL: Look, bud," + line "just check out" + cont "some of my rare" + cont "#MON on my PC!" + done diff --git a/text/BluesHouse.asm b/text/BluesHouse.asm new file mode 100644 index 00000000..6e57cb21 --- /dev/null +++ b/text/BluesHouse.asm @@ -0,0 +1,42 @@ +_DaisyInitialText:: + text "Hi !" + line " is out at" + cont "Grandpa's lab." + done + +_DaisyOfferMapText:: + text "Grandpa asked you" + line "to run an errand?" + cont "Here, this will" + cont "help you!" + prompt + +_GotMapText:: + text " got a" + line "@" + text_ram wcf4b + text "!@" + text_end + +_DaisyBagFullText:: + text "You have too much" + line "stuff with you." + done + +_DaisyUseMapText:: + text "Use the TOWN MAP" + line "to find out where" + cont "you are." + done + +_BluesHouseDaisyWalkingText:: + text "#MON are living" + line "things! If they" + cont "get tired, give" + cont "them a rest!" + done + +_BluesHouseTownMapText:: + text "It's a big map!" + line "This is useful!" + done diff --git a/text/maps/BrunosRoom.asm b/text/BrunosRoom.asm similarity index 100% rename from text/maps/BrunosRoom.asm rename to text/BrunosRoom.asm diff --git a/text/maps/CeladonChiefHouse.asm b/text/CeladonChiefHouse.asm similarity index 100% rename from text/maps/CeladonChiefHouse.asm rename to text/CeladonChiefHouse.asm diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm new file mode 100644 index 00000000..76fa1775 --- /dev/null +++ b/text/CeladonCity.asm @@ -0,0 +1,154 @@ +_CeladonCityText1:: + text "I got my KOFFING" + line "in CINNABAR!" + + para "It's nice, but it" + line "breathes poison" + cont "when it's angry!" + done + +_CeladonCityText2:: + text "Heheh! This GYM" + line "is great! It's" + cont "full of women!" + done + +_CeladonCityText3:: + text "The GAME CORNER" + line "is bad for our" + cont "city's image!" + done + +_CeladonCityText4:: + text "Moan! I blew it" + line "all at the slots!" + + para "I knew I should" + line "have cashed in my" + cont "coins for prizes!" + done + +_TM41PreText:: + text "Hello, there!" + + para "I've seen you," + line "but I never had a" + cont "chance to talk!" + + para "Here's a gift for" + line "dropping by!" + prompt + +_ReceivedTM41Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM41ExplanationText:: + text "TM41 teaches" + line "SOFTBOILED!" + + para "Only one #MON" + line "can use it!" + + para "That #MON is" + line "CHANSEY!" + done + +_TM41NoRoomText:: + text "Oh, your pack is" + line "full of items!" + done + +_CeladonCityText6:: + text "This is my trusted" + line "pal, POLIWRATH!" + + para "It evolved from" + line "POLIWHIRL when I" + cont "used WATER STONE!" + done + +_CeladonCityText7:: + text "POLIWRATH: Ribi" + line "ribit!@" + text_end + +_CeladonCityText8:: + text "What are you" + line "staring at?" + done + +_CeladonCityText9:: + text "Keep out of TEAM" + line "ROCKET's way!" + done + +_CeladonCityText10:: + text "TRAINER TIPS" + + para "X ACCURACY boosts" + line "the accuracy of" + cont "techniques!" + + para "DIRE HIT jacks up" + line "the likelihood of" + cont "critical hits!" + + para "Get your items at" + line "CELADON DEPT." + cont "STORE!" + done + +_CeladonCityText11:: + text "CELADON CITY" + line "The City of" + cont "Rainbow Dreams" + done + +_CeladonCityText13:: + text "CELADON CITY" + line "#MON GYM" + cont "LEADER: ERIKA" + + para "The Nature Loving" + line "Princess!" + done + +_CeladonCityText14:: + text "CELADON MANSION" + done + +_CeladonCityText15:: + text "Find what you" + line "need at CELADON" + cont "DEPT. STORE!" + done + +_CeladonCityText16:: + text "TRAINER TIPS" + + para "GUARD SPEC." + line "protects #MON" + cont "against SPECIAL" + cont "attacks such as" + cont "fire and water!" + + para "Get your items at" + line "CELADON DEPT." + cont "STORE!" + done + +_CeladonCityText17:: + text "Coins exchanged" + line "for prizes!" + cont "PRIZE EXCHANGE" + done + +_CeladonCityText18:: + text "ROCKET GAME CORNER" + line "The playground" + cont "for grown-ups!" + done diff --git a/text/CeladonDiner.asm b/text/CeladonDiner.asm new file mode 100644 index 00000000..dd86a0c1 --- /dev/null +++ b/text/CeladonDiner.asm @@ -0,0 +1,60 @@ +_CeladonDinerText1:: + text "Hi!" + + para "We're taking a" + line "break now." + done + +_CeladonDinerText2:: + text "My #MON are" + line "weak, so I often" + cont "have to go to the" + cont "DRUG STORE." + done + +_CeladonDinerText3:: + text "Psst! There's a" + line "basement under" + cont "the GAME CORNER." + done + +_CeladonDinerText4:: + text "Munch..." + + para "The man at that" + line "table lost it all" + cont "at the slots." + done + +_CeladonDinerText_491a7:: + text "Go ahead! Laugh!" + + para "I'm flat out" + line "busted!" + + para "No more slots for" + line "me! I'm going" + cont "straight!" + + para "Here! I won't be" + line "needing this any-" + cont "more!" + prompt + +_ReceivedCoinCaseText:: + text " received" + line "a @" + text_ram wcf4b + text "!@" + text_end + +_CoinCaseNoRoomText:: + text "Make room for" + line "this!" + done + +_CeladonDinerText_491b7:: + text "I always thought" + line "I was going to" + cont "win it back..." + done diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm new file mode 100644 index 00000000..5d354bbb --- /dev/null +++ b/text/CeladonGym.asm @@ -0,0 +1,220 @@ +_CeladonGymText_48a5e:: + text "Hello. Lovely" + line "weather isn't it?" + cont "It's so pleasant." + + para "...Oh dear..." + line "I must have dozed" + cont "off. Welcome." + + para "My name is ERIKA." + line "I am the LEADER" + cont "of CELADON GYM." + + para "I teach the art of" + line "flower arranging." + cont "My #MON are of" + cont "the grass-type." + + para "Oh, I'm sorry, I" + line "had no idea that" + cont "you wished to" + cont "challenge me." + + para "Very well, but I" + line "shall not lose." + done + +_CeladonGymText_48a63:: + text "Oh!" + line "I concede defeat." + + para "You are remarkably" + line "strong." + + para "I must confer you" + line "the RAINBOWBADGE." + prompt + +_CeladonGymText_48a68:: + text "You are cataloging" + line "#MON? I must" + cont "say I'm impressed." + + para "I would never" + line "collect #MON" + cont "if they were" + cont "unattractive." + done + +_CeladonGymText9:: + text "The RAINBOWBADGE" + line "will make #MON" + cont "up to L50 obey." + + para "It also allows" + line "#MON to use" + cont "STRENGTH in and" + cont "out of battle." + + para "Please also take" + line "this with you." + done + +_ReceivedTM21Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM21ExplanationText:: + text_start + + para "TM21 contains" + line "MEGA DRAIN." + + para "Half the damage" + line "it inflicts is" + cont "drained to heal" + cont "your #MON!" + done + +_TM21NoRoomText:: + text "You should make" + line "room for this." + done + +_CeladonGymBattleText2:: + text "Hey!" + + para "You are not" + line "allowed in here!" + done + +_CeladonGymEndBattleText2:: + text "You're" + line "too rough!" + prompt + +_CeladonGymAfterBattleText2:: + text "Bleaah!" + line "I hope ERIKA" + cont "wipes you out!" + done + +_CeladonGymBattleText3:: + text "I was getting" + line "bored." + done + +_CeladonGymEndBattleText3:: + text "My" + line "makeup!" + prompt + +_CeladonGymAfterBattleText3:: + text "Grass-type #MON" + line "are tough against" + cont "the water-type!" + + para "They also have an" + line "edge on rock and" + cont "ground #MON!" + done + +_CeladonGymBattleText4:: + text "Aren't you the" + line "peeping Tom?" + done + +_CeladonGymEndBattleText4:: + text "I'm" + line "in shock!" + prompt + +_CeladonGymAfterBattleText4:: + text "Oh, you weren't" + line "peeping? We get a" + cont "lot of gawkers!" + done + +_CeladonGymBattleText5:: + text "Look at my grass" + line "#MON!" + + para "They're so easy" + line "to raise!" + done + +_CeladonGymEndBattleText5:: + text "No!" + prompt + +_CeladonGymAfterBattleText5:: + text "We only use grass-" + line "type #MON at" + cont "our GYM!" + + para "We also use them" + line "for making flower" + cont "arrangements!" + done + +_CeladonGymBattleText6:: + text "Don't bring any" + line "bugs or fire" + cont "#MON in here!" + done + +_CeladonGymEndBattleText6:: + text "Oh!" + line "You!" + prompt + +_CeladonGymAfterBattleText6:: + text "Our LEADER, ERIKA," + line "might be quiet," + cont "but she's also" + cont "very skilled!" + done + +_CeladonGymBattleText7:: + text "Pleased to meet" + line "you. My hobby is" + cont "#MON training." + done + +_CeladonGymEndBattleText7:: + text "Oh!" + line "Splendid!" + prompt + +_CeladonGymAfterBattleText7:: + text "I have a blind" + line "date coming up." + cont "I have to learn" + cont "to be polite." + done + +_CeladonGymBattleText8:: + text "Welcome to" + line "CELADON GYM!" + + para "You better not" + line "underestimate" + cont "girl power!" + done + +_CeladonGymEndBattleText8:: + text "Oh!" + line "Beaten!" + prompt + +_CeladonGymAfterBattleText8:: + text "I didn't bring my" + line "best #MON!" + + para "Wait 'til next" + line "time!" + done diff --git a/text/maps/CeladonHotel.asm b/text/CeladonHotel.asm similarity index 100% rename from text/maps/CeladonHotel.asm rename to text/CeladonHotel.asm diff --git a/text/CeladonMansion1F.asm b/text/CeladonMansion1F.asm new file mode 100644 index 00000000..14a48a81 --- /dev/null +++ b/text/CeladonMansion1F.asm @@ -0,0 +1,26 @@ +_CeladonMansion1Text1:: + text "MEOWTH: Meow!@" + text_end + +_CeladonMansion1Text2:: + text "My dear #MON" + line "keep me company." + + para "MEOWTH even brings" + line "money home!" + done + +_CeladonMansion1Text3:: + text "CLEFAIRY: Pi" + line "pippippi!@" + text_end + +_CeladonMansion1Text4:: + text "NIDORAN: Kya" + line "kyaoo!@" + text_end + +_CeladonMansion1Text5:: + text "CELADON MANSION" + line "Manager's Suite" + done diff --git a/text/maps/CeladonMansion2F.asm b/text/CeladonMansion2F.asm similarity index 100% rename from text/maps/CeladonMansion2F.asm rename to text/CeladonMansion2F.asm diff --git a/text/CeladonMansion3F.asm b/text/CeladonMansion3F.asm new file mode 100644 index 00000000..714ecf19 --- /dev/null +++ b/text/CeladonMansion3F.asm @@ -0,0 +1,67 @@ +_ProgrammerText:: + text "Me? I'm the" + line "programmer!" + done + +_GraphicArtistText:: + text "I'm the graphic" + line "artist!" + cont "I drew you!" + done + +_WriterText:: + text "I wrote the story!" + line "Isn't ERIKA cute?" + + para "I like MISTY a" + line "lot too!" + + para "Oh, and SABRINA," + line "I like her!" + done + +_GameDesignerText:: + text "Is that right?" + + para "I'm the game" + line "designer!" + + para "Filling up your" + line "#DEX is tough," + cont "but don't quit!" + + para "When you finish," + line "come tell me!" + done + +_CompletedDexText:: + text "Wow! Excellent!" + line "You completed" + cont "your #DEX!" + cont "Congratulations!" + cont "...@" + text_end + +_CeladonMansion3Text5:: + text "It's the game" + line "program! Messing" + cont "with it could bug" + cont "out the game!" + done + +_CeladonMansion3Text6:: + text "Someone's playing" + line "a game instead of" + cont "working!" + done + +_CeladonMansion3Text7:: + text "It's the script!" + line "Better not look" + cont "at the ending!" + done + +_CeladonMansion3Text8:: + text "GAME FREAK" + line "Development Room" + done diff --git a/text/maps/CeladonMansionRoof.asm b/text/CeladonMansionRoof.asm similarity index 100% rename from text/maps/CeladonMansionRoof.asm rename to text/CeladonMansionRoof.asm diff --git a/text/maps/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm similarity index 100% rename from text/maps/CeladonMansionRoofHouse.asm rename to text/CeladonMansionRoofHouse.asm diff --git a/text/maps/CeladonMart1F.asm b/text/CeladonMart1F.asm similarity index 100% rename from text/maps/CeladonMart1F.asm rename to text/CeladonMart1F.asm diff --git a/text/maps/CeladonMart2F.asm b/text/CeladonMart2F.asm similarity index 100% rename from text/maps/CeladonMart2F.asm rename to text/CeladonMart2F.asm diff --git a/text/CeladonMart3F.asm b/text/CeladonMart3F.asm new file mode 100644 index 00000000..9871a5ae --- /dev/null +++ b/text/CeladonMart3F.asm @@ -0,0 +1,99 @@ +_TM18PreReceiveText:: + text "Oh, hi! I finally" + line "finished #MON!" + + para "Not done yet?" + line "This might be" + cont "useful!" + prompt + +_ReceivedTM18Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM18ExplanationText:: + text "TM18 is COUNTER!" + line "Not like the one" + cont "I'm leaning on," + cont "mind you!" + done + +_TM18NoRoomText:: + text "Your pack is full" + line "of items!" + done + +_CeladonMart3Text2:: + text "Captured #MON" + line "are registered" + cont "with an ID No." + cont "and OT, the name" + cont "of the Original" + cont "Trainer that" + cont "caught it!" + done + +_CeladonMart3Text3:: + text "All right!" + + para "My buddy's going" + line "to trade me his" + cont "KANGASKHAN for my" + cont "GRAVELER!" + done + +_CeladonMart3Text4:: + text "Come on GRAVELER!" + + para "I love GRAVELER!" + line "I collect them!" + + para "Huh?" + + para "GRAVELER turned" + line "into a different" + cont "#MON!" + done + +_CeladonMart3Text5:: + text "You can identify" + line "#MON you got" + cont "in trades by" + cont "their ID Numbers!" + done + +_CeladonMart3Text6:: + text "It's an SNES!" + done + +_CeladonMart3Text7:: + text "An RPG! There's" + line "no time for that!" + done + +_CeladonMart3Text9:: + text "A sports game!" + line "Dad'll like that!" + done + +_CeladonMart3Text11:: + text "A puzzle game!" + line "Looks addictive!" + done + +_CeladonMart3Text13:: + text "A fighting game!" + line "Looks tough!" + done + +_CeladonMart3Text14:: + text "3F: TV GAME SHOP" + done + +_CeladonMart3Text15:: + text "Red and Blue!" + line "Both are #MON!" + done diff --git a/text/maps/CeladonMart4F.asm b/text/CeladonMart4F.asm similarity index 100% rename from text/maps/CeladonMart4F.asm rename to text/CeladonMart4F.asm diff --git a/text/maps/CeladonMart5F.asm b/text/CeladonMart5F.asm similarity index 100% rename from text/maps/CeladonMart5F.asm rename to text/CeladonMart5F.asm diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm new file mode 100644 index 00000000..15bf8c04 --- /dev/null +++ b/text/CeladonMartRoof.asm @@ -0,0 +1,152 @@ +_CeladonMartRoofText_484ee:: + text "Give her which" + line "drink?" + done + +_CeladonMartRoofText_484f3:: + text "Yay!" + + para "FRESH WATER!" + + para "Thank you!" + + para "You can have this" + line "from me!@" + text_end + +_CeladonMartRoofText_484f9:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_CeladonMartRoofText_484fe:: + text_start + + para "@" + text_ram wcf4b + text " contains" + line "ICE BEAM!" + + para "It can freeze the" + line "target sometimes!@" + text_end + +_CeladonMartRoofText_48504:: + text "Yay!" + + para "SODA POP!" + + para "Thank you!" + + para "You can have this" + line "from me!@" + text_end + +_CeladonMartRoofText_4850a:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_CeladonMartRoofText_4850f:: + text_start + + para "@" + text_ram wcf4b + text " contains" + line "ROCK SLIDE!" + + para "It can spook the" + line "target sometimes!@" + text_end + +_CeladonMartRoofText_48515:: + text "Yay!" + + para "LEMONADE!" + + para "Thank you!" + + para "You can have this" + line "from me!@" + text_end + +_ReceivedTM49Text:: + text " received" + line "TM49!@" + text_end + +_CeladonMartRoofText_48520:: + text_start + + para "TM49 contains" + line "TRI ATTACK!@" + text_end + +_CeladonMartRoofText_48526:: + text "You don't have" + line "space for this!@" + text_end + +_CeladonMartRoofText_4852c:: + text "No thank you!" + line "I'm not thirsty" + cont "after all!@" + text_end + +_CeladonMartRoofText1:: + text "My sister is a" + line "trainer, believe" + cont "it or not." + + para "But, she's so" + line "immature, she" + cont "drives me nuts!" + done + +_CeladonMartRoofText_48598:: + text "I'm thirsty!" + line "I want something" + cont "to drink!" + done + +_CeladonMartRoofText4:: + text "I'm thirsty!" + line "I want something" + cont "to drink!" + + para "Give her a drink?" + done + +_CeladonMartRoofText6:: + text "ROOFTOP SQUARE:" + line "VENDING MACHINES" + done + +_VendingMachineText1:: + text "A vending machine!" + line "Here's the menu!" + prompt + +_VendingMachineText4:: + text "Oops, not enough" + line "money!" + done + +_VendingMachineText5:: + text_ram wcf4b + text_start + line "popped out!" + done + +_VendingMachineText6:: + text "There's no more" + line "room for stuff!" + done + +_VendingMachineText7:: + text "Not thirsty!" + done diff --git a/text/maps/CeladonPokecenter.asm b/text/CeladonPokecenter.asm similarity index 100% rename from text/maps/CeladonPokecenter.asm rename to text/CeladonPokecenter.asm diff --git a/text/maps/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm similarity index 100% rename from text/maps/CeruleanBadgeHouse.asm rename to text/CeruleanBadgeHouse.asm diff --git a/text/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm new file mode 100644 index 00000000..cb407c60 --- /dev/null +++ b/text/CeruleanCaveB1F.asm @@ -0,0 +1,3 @@ +_MewtwoBattleText:: + text "Mew!@" + text_end diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm new file mode 100644 index 00000000..d0884a39 --- /dev/null +++ b/text/CeruleanCity.asm @@ -0,0 +1,235 @@ +_CeruleanCityText_19668:: + text ": Yo!" + line "!" + + para "You're still" + line "struggling along" + cont "back here?" + + para "I'm doing great!" + line "I caught a bunch" + cont "of strong and" + cont "smart #MON!" + + para "Here, let me see" + line "what you caught," + cont "!" + done + +_CeruleanCityText_1966d:: + text "Hey!" + line "Take it easy!" + cont "You won already!" + prompt + +_CeruleanCityText_19672:: + text "Heh!" + line "You're no match" + cont "for my genius!" + prompt + +_CeruleanCityText_19677:: + text ": Hey," + line "guess what?" + + para "I went to BILL's" + line "and got him to" + cont "show me his rare" + cont "#MON!" + + para "That added a lot" + line "of pages to my" + cont "#DEX!" + + para "After all, BILL's" + line "world famous as a" + cont "#MANIAC!" + + para "He invented the" + line "#MON Storage" + cont "System on PC!" + + para "Since you're using" + line "his system, go" + cont "thank him!" + + para "Well, I better" + line "get rolling!" + cont "Smell ya later!" + done + +_CeruleanCityText_196d9:: + text "Hey! Stay out!" + line "It's not your" + cont "yard! Huh? Me?" + + para "I'm an innocent" + line "bystander! Don't" + cont "you believe me?" + done + +_ReceivedTM28Text:: + text " recovered" + line "TM28!@" + text_end + +_ReceivedTM28Text2:: + text_start + + para "I better get" + line "moving! Bye!@" + text_end + +_TM28NoRoomText:: + text "Make room for" + line "this!" + + para "I can't run until" + line "I give it to you!" + done + +_CeruleanCityText_196ee:: + text "Stop!" + line "I give up! I'll" + cont "leave quietly!" + prompt + +_CeruleanCityText_196f3:: + text "OK! I'll return" + line "the TM I stole!" + prompt + +_CeruleanCityText3:: + text "You're a trainer" + line "too? Collecting," + cont "fighting, it's a" + cont "tough life." + done + +_CeruleanCityText4:: + text "That bush in" + line "front of the shop" + cont "is in the way." + + para "There might be a" + line "way around." + done + +_CeruleanCityText5:: + text "You're making an" + line "encyclopedia on" + cont "#MON? That" + cont "sounds amusing." + done + +_CeruleanCityText6:: + text "The people here" + line "were robbed." + + para "It's obvious that" + line "TEAM ROCKET is" + cont "behind this most" + cont "heinous crime!" + + para "Even our POLICE" + line "force has trouble" + cont "with the ROCKETs!" + done + +_CeruleanCityText_19730:: + text "OK! SLOWBRO!" + line "Use SONICBOOM!" + cont "Come on, SLOWBRO" + cont "pay attention!" + done + +_CeruleanCityText_19735:: + text "SLOWBRO punch!" + line "No! You blew it" + cont "again!" + done + +_CeruleanCityText_1973a:: + text "SLOWBRO, WITHDRAW!" + line "No! That's wrong!" + + para "It's so hard to" + line "control #MON!" + + para "Your #MON's" + line "obedience depends" + cont "on your abilities" + cont "as a trainer!" + done + +_CeruleanCityText_1976f:: + text "SLOWBRO took a" + line "snooze..." + done + +_CeruleanCityText_19774:: + text "SLOWBRO is" + line "loafing around..." + done + +_CeruleanCityText_19779:: + text "SLOWBRO turned" + line "away..." + done + +_CeruleanCityText_1977e:: + text "SLOWBRO" + line "ignored orders..." + done + +_CeruleanCityText9:: + text "I want a bright" + line "red BICYCLE!" + + para "I'll keep it at" + line "home, so it won't" + cont "get dirty!" + done + +_CeruleanCityText10:: + text "This is CERULEAN" + line "CAVE! Horribly" + cont "strong #MON" + cont "live in there!" + + para "The #MON LEAGUE" + line "champion is the" + cont "only person who" + cont "is allowed in!" + done + +_CeruleanCityText12:: + text "CERULEAN CITY" + line "A Mysterious," + cont "Blue Aura" + cont "Surrounds It" + done + +_CeruleanCityText13:: + text "TRAINER TIPS" + + para "Pressing B Button" + line "during evolution" + cont "cancels the whole" + cont "process." + done + +_CeruleanCityText16:: + text "Grass and caves" + line "handled easily!" + cont "BIKE SHOP" + done + +_CeruleanCityText17:: + text "CERULEAN CITY" + line "#MON GYM" + cont "LEADER: MISTY" + + para "The Tomboyish" + line "Mermaid!" + done diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm new file mode 100644 index 00000000..d302ec3a --- /dev/null +++ b/text/CeruleanGym.asm @@ -0,0 +1,133 @@ +_CeruleanGymText_5c7be:: + text "Hi, you're a new" + line "face!" + + para "Trainers who want" + line "to turn pro have" + cont "to have a policy" + cont "about #MON!" + + para "What is your" + line "approach when you" + cont "catch #MON?" + + para "My policy is an" + line "all-out offensive" + cont "with water-type" + cont "#MON!" + done + +_CeruleanGymText_5c7c3:: + text "TM11 teaches" + line "BUBBLEBEAM!" + + para "Use it on an" + line "aquatic #MON!" + done + +_CeruleanGymText_5c7c8:: + text "The CASCADEBADGE" + line "makes all #MON" + cont "up to L30 obey!" + + para "That includes" + line "even outsiders!" + + para "There's more, you" + line "can now use CUT" + cont "any time!" + + para "You can CUT down" + line "small bushes to" + cont "open new paths!" + + para "You can also have" + line "my favorite TM!" + done + +_ReceivedTM11Text:: + text " received" + line "TM11!@" + text_end + +_CeruleanGymText_5c7d3:: + text "You better make" + line "room for this!" + done + +_CeruleanGymText_5c7d8:: + text "Wow!" + line "You're too much!" + + para "All right!" + + para "You can have the" + line "CASCADEBADGE to" + cont "show you beat me!@" + text_end + +_CeruleanGymBattleText1:: + text "I'm more than good" + line "enough for you!" + + para "MISTY can wait!" + done + +_CeruleanGymEndBattleText1:: + text "You" + line "overwhelmed me!" + prompt + +_CeruleanGymAfterBattleText1:: + text "You have to face" + line "other trainers to" + cont "find out how good" + cont "you really are." + done + +_CeruleanGymBattleText2:: + text "Splash!" + + para "I'm first up!" + line "Let's do it!" + done + +_CeruleanGymEndBattleText2:: + text "That" + line "can't be!" + prompt + +_CeruleanGymAfterBattleText2:: + text "MISTY is going to" + line "keep improving!" + + para "She won't lose to" + line "someone like you!" + done + +_CeruleanGymText_5c82a:: + text "Yo! Champ in" + line "making!" + + para "Here's my advice!" + + para "The LEADER, MISTY," + line "is a pro who uses" + cont "water #MON!" + + para "You can drain all" + line "their water with" + cont "plant #MON!" + + para "Or, zap them with" + line "electricity!" + done + +_CeruleanGymText_5c82f:: + text "You beat MISTY!" + line "What'd I tell ya?" + + para "You and me kid," + line "we make a pretty" + cont "darn good team!" + done diff --git a/text/maps/CeruleanMart.asm b/text/CeruleanMart.asm similarity index 100% rename from text/maps/CeruleanMart.asm rename to text/CeruleanMart.asm diff --git a/text/maps/CeruleanPokecenter.asm b/text/CeruleanPokecenter.asm similarity index 100% rename from text/maps/CeruleanPokecenter.asm rename to text/CeruleanPokecenter.asm diff --git a/text/maps/CeruleanTradeHouse.asm b/text/CeruleanTradeHouse.asm similarity index 100% rename from text/maps/CeruleanTradeHouse.asm rename to text/CeruleanTradeHouse.asm diff --git a/text/maps/CeruleanTrashedHouse.asm b/text/CeruleanTrashedHouse.asm similarity index 100% rename from text/maps/CeruleanTrashedHouse.asm rename to text/CeruleanTrashedHouse.asm diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm new file mode 100644 index 00000000..575b7da4 --- /dev/null +++ b/text/ChampionsRoom.asm @@ -0,0 +1,146 @@ +_GaryChampionIntroText:: + text ": Hey!" + + para "I was looking" + line "forward to seeing" + cont "you, !" + + para "My rival should" + line "be strong to keep" + cont "me sharp!" + + para "While working on" + line "#DEX, I looked" + cont "all over for" + cont "powerful #MON!" + + para "Not only that, I" + line "assembled teams" + cont "that would beat" + cont "any #MON type!" + + para "And now!" + + para "I'm the #MON" + line "LEAGUE champion!" + + para "! Do you" + line "know what that" + cont "means?" + + para "I'll tell you!" + + para "I am the most" + line "powerful trainer" + cont "in the world!" + done + +_GaryDefeatedText:: + text "NO!" + line "That can't be!" + cont "You beat my best!" + + para "After all that" + line "work to become" + cont "LEAGUE champ?" + + para "My reign is over" + line "already?" + cont "It's not fair!" + prompt + +_GaryVictoryText:: + text "Hahaha!" + line "I won, I won!" + + para "I'm too good for" + line "you, !" + + para "You did well to" + line "even reach me," + cont ", the" + cont "#MON genius!" + + para "Nice try, loser!" + line "Hahaha!" + prompt + +_GaryText_76103:: + text "Why?" + line "Why did I lose?" + + para "I never made any" + line "mistakes raising" + cont "my #MON..." + + para "Darn it! You're" + line "the new #MON" + cont "LEAGUE champion!" + + para "Although I don't" + line "like to admit it." + done + +_GaryText2:: + text "OAK: !" + done + +_GaryText_76120:: + text "OAK: So, you won!" + line "Congratulations!" + cont "You're the new" + cont "#MON LEAGUE" + cont "champion!" + + para "You've grown up so" + line "much since you" + cont "first left with" + cont "@" + text_ram wcd6d + text "!" + + para ", you have" + line "come of age!" + done + +_GaryText_76125:: + text "OAK: ! I'm" + line "disappointed!" + + para "I came when I" + line "heard you beat" + cont "the ELITE FOUR!" + + para "But, when I got" + line "here, you had" + cont "already lost!" + + para "! Do you" + line "understand why" + cont "you lost?" + + para "You have forgotten" + line "to treat your" + cont "#MON with" + cont "trust and love!" + + para "Without them, you" + line "will never become" + cont "a champ again!" + done + +_GaryText_7612a:: + text "OAK: !" + + para "You understand" + line "that your victory" + cont "was not just your" + cont "own doing!" + + para "The bond you share" + line "with your #MON" + cont "is marvelous!" + + para "!" + line "Come with me!" + done diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm new file mode 100644 index 00000000..bf6cc0fb --- /dev/null +++ b/text/CinnabarGym.asm @@ -0,0 +1,212 @@ +_BlaineBattleText:: + text "Hah!" + + para "I am BLAINE! I" + line "am the LEADER of" + cont "CINNABAR GYM!" + + para "My fiery #MON" + line "will incinerate" + cont "all challengers!" + + para "Hah! You better" + line "have BURN HEAL!" + done + +_BlaineEndBattleText:: + text "I have" + line "burnt out!" + + para "You have earned" + line "the VOLCANOBADGE!@" + text_end + +_BlaineFireBlastText:: + text "FIRE BLAST is the" + line "ultimate fire" + cont "technique!" + + para "Don't waste it on" + line "water #MON!" + done + +_BlaineBadgeText:: + text "Hah!" + + para "The VOLCANOBADGE" + line "heightens the" + cont "SPECIAL abilities" + cont "of your #MON!" + + para "Here, you can" + line "have this too!" + done + +_ReceivedTM38Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM38ExplanationText:: + text_start + + para "TM38 contains" + line "FIRE BLAST!" + + para "Teach it to fire-" + line "type #MON!" + + para "CHARMELEON or" + line "PONYTA would be" + cont "good bets!" + done + +_TM38NoRoomText:: + text "Make room for my" + line "gift!" + done + +_CinnabarGymText_7595f:: + text "Do you know how" + line "hot #MON fire" + cont "breath can get?" + done + +_CinnabarGymText_75964:: + text "Yow!" + line "Hot, hot, hot!" + prompt + +_CinnabarGymText_75969:: + text "Fire, or to be" + line "more precise," + cont "combustion..." + + para "Blah, blah, blah," + line "blah..." + done + +_CinnabarGymText_75994:: + text "I was a thief, but" + line "I became straight" + cont "as a trainer!" + done + +_CinnabarGymText_75999:: + text "I" + line "surrender!" + prompt + +_CinnabarGymText_7599e:: + text "I can't help" + line "stealing other" + cont "people's #MON!" + done + +_CinnabarGymText_759c9:: + text "You can't win!" + line "I have studied" + cont "#MON totally!" + done + +_CinnabarGymText_759ce:: + text "Waah!" + line "My studies!" + prompt + +_CinnabarGymText_759d3:: + text "My theories are" + line "too complicated" + cont "for you!" + done + +_CinnabarGymText_759fe:: + text "I just like using" + line "fire #MON!" + done + +_CinnabarGymText_75a03:: + text "Too hot" + line "to handle!" + prompt + +_CinnabarGymText_75a08:: + text "I wish there was" + line "a thief #MON!" + cont "I'd use that!" + done + +_CinnabarGymText_75a33:: + text "I know why BLAINE" + line "became a trainer!" + done + +_CinnabarGymText_75a38:: + text "Ow!" + prompt + +_CinnabarGymText_75a3d:: + text "BLAINE was lost" + line "in the mountains" + cont "when a fiery bird" + cont "#MON appeared." + + para "Its light enabled" + line "BLAINE to find" + cont "his way down!" + done + +_CinnabarGymText_75a68:: + text "I've been to many" + line "GYMs, but this is" + cont "my favorite!" + done + +_CinnabarGymText_75a6d:: + text "Yowza!" + line "Too hot!" + prompt + +_CinnabarGymText_75a72:: + text "Us fire #MON" + line "fans like PONYTA" + cont "and NINETALES!" + done + +_CinnabarGymText_75a9d:: + text "Fire is weak" + line "against H2O!" + done + +_CinnabarGymText_75aa2:: + text "Oh!" + line "Snuffed out!" + prompt + +_CinnabarGymText_75aa7:: + text "Water beats fire!" + line "But, fire melts" + cont "ice #MON!" + done + +_CinnabarGymText_75ac2:: + text "Yo! Champ in" + line "making!" + + para "The hot-headed" + line "BLAINE is a fire" + cont "#MON pro!" + + para "Douse his spirits" + line "with water!" + + para "You better take" + line "some BURN HEALs!" + done + +_CinnabarGymText_75ac7:: + text "! You beat" + line "that fire brand!" + done diff --git a/text/maps/CinnabarIsland.asm b/text/CinnabarIsland.asm similarity index 100% rename from text/maps/CinnabarIsland.asm rename to text/CinnabarIsland.asm diff --git a/text/maps/CinnabarLab.asm b/text/CinnabarLab.asm similarity index 100% rename from text/maps/CinnabarLab.asm rename to text/CinnabarLab.asm diff --git a/text/CinnabarLabFossilRoom.asm b/text/CinnabarLabFossilRoom.asm new file mode 100644 index 00000000..e7983fe9 --- /dev/null +++ b/text/CinnabarLabFossilRoom.asm @@ -0,0 +1,78 @@ +_Lab4Text_75dc6:: + text "Hiya!" + + para "I am important" + line "doctor!" + + para "I study here rare" + line "#MON fossils!" + + para "You! Have you a" + line "fossil for me?" + prompt + +_Lab4Text_75dcb:: + text "No! Is too bad!" + done + +_Lab4Text_75dd0:: + text "I take a little" + line "time!" + + para "You go for walk a" + line "little while!" + done + +_Lab4Text_75dd5:: + text "Where were you?" + + para "Your fossil is" + line "back to life!" + + para "It was @" + text_ram wcf4b + text_start + line "like I think!" + prompt + +_Lab4Text_610ae:: + text "Oh! That is" + line "@" + text_ram wcd6d + text "!" + + para "It is fossil of" + line "@" + text_ram wcf4b + text ", a" + cont "#MON that is" + cont "already extinct!" + + para "My Resurrection" + line "Machine will make" + cont "that #MON live" + cont "again!" + done + +_Lab4Text_610b3:: + text "So! You hurry and" + line "give me that!" + + para " handed" + line "over @" + text_ram wcd6d + text "!" + prompt + +_Lab4Text_610b8:: + text "I take a little" + line "time!" + + para "You go for walk a" + line "little while!" + done + +_Lab4Text_610bd:: + text "Aiyah! You come" + line "again!" + done diff --git a/text/CinnabarLabMetronomeRoom.asm b/text/CinnabarLabMetronomeRoom.asm new file mode 100644 index 00000000..f9b2c5d5 --- /dev/null +++ b/text/CinnabarLabMetronomeRoom.asm @@ -0,0 +1,64 @@ +_TM35PreReceiveText:: + text "Tch-tch-tch!" + line "I made a cool TM!" + + para "It can cause all" + line "kinds of fun!" + prompt + +_ReceivedTM35Text:: + text " received " + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM35ExplanationText:: + text "Tch-tch-tch!" + line "That's the sound" + cont "of a METRONOME!" + + para "It tweaks your" + line "#MON's brain" + cont "into using moves" + cont "it doesn't know!" + done + +_TM35NoRoomText:: + text "Your pack is" + line "crammed full!" + done + +_Lab3Text2:: + text "EEVEE can evolve" + line "into 1 of 3 kinds" + cont "of #MON." + done + +_Lab3Text3:: + text "There's an e-mail" + line "message!" + + para "..." + + para "The 3 legendary" + line "bird #MON are" + cont "ARTICUNO, ZAPDOS" + cont "and MOLTRES." + + para "Their whereabouts" + line "are unknown." + + para "We plan to explore" + line "the cavern close" + cont "to CERULEAN." + + para "From: #MON" + line "RESEARCH TEAM" + + para "..." + done + +_Lab3Text5:: + text "An amber pipe!" + done diff --git a/text/maps/CinnabarLabTradeRoom.asm b/text/CinnabarLabTradeRoom.asm similarity index 100% rename from text/maps/CinnabarLabTradeRoom.asm rename to text/CinnabarLabTradeRoom.asm diff --git a/text/maps/CinnabarMart.asm b/text/CinnabarMart.asm similarity index 100% rename from text/maps/CinnabarMart.asm rename to text/CinnabarMart.asm diff --git a/text/maps/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm similarity index 100% rename from text/maps/CinnabarPokecenter.asm rename to text/CinnabarPokecenter.asm diff --git a/text/CopycatsHouse1F.asm b/text/CopycatsHouse1F.asm new file mode 100644 index 00000000..0bf84558 --- /dev/null +++ b/text/CopycatsHouse1F.asm @@ -0,0 +1,21 @@ +_CopycatsHouse1FText1:: + text "My daughter is so" + line "self-centered." + cont "She only has a" + cont "few friends." + done + +_CopycatsHouse1FText2:: + text "My daughter likes" + line "to mimic people." + + para "Her mimicry has" + line "earned her the" + cont "nickname COPYCAT" + cont "around here!" + done + +_CopycatsHouse1FText3:: + text "CHANSEY: Chaan!" + line "Sii!@" + text_end diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm new file mode 100644 index 00000000..7d1aa0ad --- /dev/null +++ b/text/CopycatsHouse2F.asm @@ -0,0 +1,100 @@ +_CopycatsHouse2FText_5ccd4:: + text ": Hi! Do" + line "you like #MON?" + + para ": Uh no, I" + line "just asked you." + + para ": Huh?" + line "You're strange!" + + para "COPYCAT: Hmm?" + line "Quit mimicking?" + + para "But, that's my" + line "favorite hobby!" + prompt + +_TM31PreReceiveText:: + text "Oh wow!" + line "A # DOLL!" + + para "For me?" + line "Thank you!" + + para "You can have" + line "this, then!" + prompt + +_ReceivedTM31Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM31ExplanationText1:: + text_start + + para "TM31 contains my" + line "favorite, MIMIC!" + + para "Use it on a good" + line "#MON!@" + text_end + +_TM31ExplanationText2:: + text ": Hi!" + line "Thanks for TM31!" + + para ": Pardon?" + + para ": Is it" + line "that fun to mimic" + cont "my every move?" + + para "COPYCAT: You bet!" + line "It's a scream!" + done + +_TM31NoRoomText:: + text "Don't you want" + line "this?@" + text_end + +_CopycatsHouse2FText2:: + text "DODUO: Giiih!" + + para "MIRROR MIRROR ON" + line "THE WALL, WHO IS" + cont "THE FAIREST ONE" + cont "OF ALL?" + done + +_CopycatsHouse2FText3:: + text "This is a rare" + line "#MON! Huh?" + cont "It's only a doll!" + done + +_CopycatsHouse2FText6:: + text "A game with MARIO" + line "wearing a bucket" + cont "on his head!" + done + +_CopycatsHouse2FText_5cd17:: + text "..." + + para "My Secrets!" + + para "Skill: Mimicry!" + line "Hobby: Collecting" + cont "dolls!" + cont "Favorite #MON:" + cont "CLEFAIRY!" + done + +_CopycatsHouse2FText_5cd1c:: + text "Huh? Can't see!" + done diff --git a/text/Daycare.asm b/text/Daycare.asm new file mode 100644 index 00000000..197927dd --- /dev/null +++ b/text/Daycare.asm @@ -0,0 +1,62 @@ +_DayCareIntroText:: + text "I run a DAYCARE." + line "Would you like me" + cont "to raise one of" + cont "your #MON?" + done + +_DayCareWhichMonText:: + text "Which #MON" + line "should I raise?" + prompt + +_DayCareWillLookAfterMonText:: + text "Fine, I'll look" + line "after @" + text_ram wcd6d + text_start + cont "for a while." + prompt + +_DayCareComeSeeMeInAWhileText:: + text "Come see me in" + line "a while." + done + +_DayCareMonHasGrownText:: + text "Your @" + text_ram wcd6d + text_start + line "has grown a lot!" + + para "By level, it's" + line "grown by @" + text_decimal wDayCareNumLevelsGrown, 1, 3 + text "!" + + para "Aren't I great?" + prompt + +_DayCareOweMoneyText:: + text "You owe me ¥@" + text_bcd wDayCareTotalCost, 2 | LEADING_ZEROES | LEFT_ALIGN + text_start + line "for the return" + cont "of this #MON." + done + +_DayCareGotMonBackText:: + text " got" + line "@" + text_ram wDayCareMonName + text " back!" + done + +_DayCareMonNeedsMoreTimeText:: + text "Back already?" + line "Your @" + text_ram wcd6d + text_start + cont "needs some more" + cont "time with me." + prompt diff --git a/text/maps/Daycare_2.asm b/text/Daycare_2.asm similarity index 96% rename from text/maps/Daycare_2.asm rename to text/Daycare_2.asm index 20c0e5ad..7efb200e 100644 --- a/text/maps/Daycare_2.asm +++ b/text/Daycare_2.asm @@ -1,6 +1,7 @@ _DayCareAllRightThenText:: text "All right then," - line "@@" + line "@" + text_end _DayCareComeAgainText:: text "come again." diff --git a/text/maps/DiglettsCaveRoute11.asm b/text/DiglettsCaveRoute11.asm similarity index 100% rename from text/maps/DiglettsCaveRoute11.asm rename to text/DiglettsCaveRoute11.asm diff --git a/text/maps/DiglettsCaveRoute2.asm b/text/DiglettsCaveRoute2.asm similarity index 100% rename from text/maps/DiglettsCaveRoute2.asm rename to text/DiglettsCaveRoute2.asm diff --git a/text/maps/FightingDojo.asm b/text/FightingDojo.asm similarity index 100% rename from text/maps/FightingDojo.asm rename to text/FightingDojo.asm diff --git a/text/maps/FuchsiaBillsGrandpasHouse.asm b/text/FuchsiaBillsGrandpasHouse.asm similarity index 100% rename from text/maps/FuchsiaBillsGrandpasHouse.asm rename to text/FuchsiaBillsGrandpasHouse.asm diff --git a/text/maps/FuchsiaCity.asm b/text/FuchsiaCity.asm similarity index 100% rename from text/maps/FuchsiaCity.asm rename to text/FuchsiaCity.asm diff --git a/text/FuchsiaGoodRodHouse.asm b/text/FuchsiaGoodRodHouse.asm new file mode 100644 index 00000000..142c2837 --- /dev/null +++ b/text/FuchsiaGoodRodHouse.asm @@ -0,0 +1,44 @@ +_FuchsiaHouse3Text_561bd:: + text "I'm the FISHING" + line "GURU's older" + cont "brother!" + + para "I simply Looove" + line "fishing!" + + para "Do you like to" + line "fish?" + done + +_FuchsiaHouse3Text_561c2:: + text "Grand! I like" + line "your style!" + + para "Take this and" + line "fish, young one!" + + para " received" + line "a @" + text_ram wcf4b + text "!@" + text_end + +_FuchsiaHouse3Text_56212:: + text "Oh... That's so" + line "disappointing..." + done + +_FuchsiaHouse3Text_56217:: + text "Hello there," + line "!" + + para "How are the fish" + line "biting?" + done + +_FuchsiaHouse3Text_5621c:: + text "Oh no!" + + para "You have no room" + line "for my gift!" + done diff --git a/text/maps/FuchsiaGym.asm b/text/FuchsiaGym.asm similarity index 100% rename from text/maps/FuchsiaGym.asm rename to text/FuchsiaGym.asm diff --git a/text/maps/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm similarity index 98% rename from text/maps/FuchsiaGym_2.asm rename to text/FuchsiaGym_2.asm index f7b39d9c..e8043e24 100644 --- a/text/maps/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -27,11 +27,12 @@ _FuchsiaGymText9:: _ReceivedTM06Text:: text " received" line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM06ExplanationText:: - text "" + text_start para "TM06 contains" line "TOXIC!" diff --git a/text/maps/FuchsiaMart.asm b/text/FuchsiaMart.asm similarity index 100% rename from text/maps/FuchsiaMart.asm rename to text/FuchsiaMart.asm diff --git a/text/maps/FuchsiaMeetingRoom.asm b/text/FuchsiaMeetingRoom.asm similarity index 100% rename from text/maps/FuchsiaMeetingRoom.asm rename to text/FuchsiaMeetingRoom.asm diff --git a/text/maps/FuchsiaPokecenter.asm b/text/FuchsiaPokecenter.asm similarity index 100% rename from text/maps/FuchsiaPokecenter.asm rename to text/FuchsiaPokecenter.asm diff --git a/text/GameCorner.asm b/text/GameCorner.asm new file mode 100644 index 00000000..1868daf8 --- /dev/null +++ b/text/GameCorner.asm @@ -0,0 +1,190 @@ +_CeladonGameCornerText1:: + text "Welcome!" + + para "You can exchange" + line "your coins for" + cont "fabulous prizes" + cont "next door." + done + +_CeladonGameCornerText_48d22:: + text "Welcome to ROCKET" + line "GAME CORNER!" + + para "Do you need some" + line "game coins?" + + para "It's ¥1000 for 50" + line "coins. Would you" + cont "like some?" + done + +_CeladonGameCornerText_48d27:: + text "Thanks! Here are" + line "your 50 coins!" + done + +_CeladonGameCornerText_48d2c:: + text "No? Please come" + line "play sometime!" + done + +_CeladonGameCornerText_48d31:: + text "You can't afford" + line "the coins!" + done + +_CeladonGameCornerText_48d36:: + text "Oops! Your COIN" + line "CASE is full." + done + +_CeladonGameCornerText_48d3b:: + text "You don't have a" + line "COIN CASE!" + done + +_CeladonGameCornerText3:: + text "Keep this quiet." + + para "It's rumored that" + line "this place is run" + cont "by TEAM ROCKET." + done + +_CeladonGameCornerText4:: + text "I think these" + line "machines have" + cont "different odds." + done + +_CeladonGameCornerText_48d9c:: + text "Kid, do you want" + line "to play?" + prompt + +_Received10CoinsText:: + text " received" + line "10 coins!@" + text_end + +_CeladonGameCornerText_48da7:: + text "You don't need my" + line "coins!" + done + +_CeladonGameCornerText_48dac:: + text "Wins seem to come" + line "and go." + done + +_CeladonGameCornerText6:: + text "I'm having a" + line "wonderful time!" + done + +_CeladonGameCornerText_48dca:: + text "Hey!" + + para "You have better" + line "things to do," + cont "champ in making!" + + para "CELADON GYM's" + line "LEADER is ERIKA!" + cont "She uses grass-" + cont "type #MON!" + + para "She might appear" + line "docile, but don't" + cont "be fooled!" + done + +_CeladonGameCornerText_48dcf:: + text "They offer rare" + line "#MON that can" + cont "be exchanged for" + cont "your coins." + + para "But, I just can't" + line "seem to win!" + done + +_CeladonGameCornerText8:: + text "Games are scary!" + line "It's so easy to" + cont "get hooked!" + done + +_CeladonGameCornerText_48e26:: + text "What's up? Want" + line "some coins?" + prompt + +_Received20CoinsText:: + text " received" + line "20 coins!@" + text_end + +_CeladonGameCornerText_48e31:: + text "You have lots of" + line "coins!" + done + +_CeladonGameCornerText_48e36:: + text "Darn! I need more" + line "coins for the" + cont "#MON I want!" + done + +_CeladonGameCornerText_48e88:: + text "Hey, what? You're" + line "throwing me off!" + cont "Here are some" + cont "coins, shoo!" + prompt + +_CeladonGameCornerText_48e8d:: + text " received" + line "20 coins!@" + text_end + +_CeladonGameCornerText_48e93:: + text "You've got your" + line "own coins!" + done + +_CeladonGameCornerText_48e98:: + text "The trick is to" + line "watch the reels" + cont "closely!" + done + +_CeladonGameCornerText_48ece:: + text "I'm guarding this" + line "poster!" + cont "Go away, or else!" + done + +_CeladonGameCornerText_48ed3:: + text "Dang!" + prompt + +_CeladonGameCornerText_48ed8:: + text "Our hideout might" + line "be discovered! I" + cont "better tell BOSS!" + done + +_CeladonGameCornerText_48f09:: + text "Hey!" + + para "A switch behind" + line "the poster!?" + cont "Let's push it!@" + text_end + +_CeladonGameCornerText_48f19:: + text "Oops! Forgot the" + line "COIN CASE!" + done diff --git a/text/maps/GameCornerPrizeRoom.asm b/text/GameCornerPrizeRoom.asm similarity index 100% rename from text/maps/GameCornerPrizeRoom.asm rename to text/GameCornerPrizeRoom.asm diff --git a/text/maps/HallOfFame.asm b/text/HallOfFame.asm similarity index 100% rename from text/maps/HallOfFame.asm rename to text/HallOfFame.asm diff --git a/text/maps/IndigoPlateauLobby.asm b/text/IndigoPlateauLobby.asm similarity index 100% rename from text/maps/IndigoPlateauLobby.asm rename to text/IndigoPlateauLobby.asm diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm new file mode 100644 index 00000000..2531b638 --- /dev/null +++ b/text/LancesRoom.asm @@ -0,0 +1,64 @@ +_LanceBeforeBattleText:: + text "Ah! I heard about" + line "you !" + + para "I lead the ELITE" + line "FOUR! You can" + cont "call me LANCE the" + cont "dragon trainer!" + + para "You know that" + line "dragons are" + cont "mythical #MON!" + + para "They're hard to" + line "catch and raise," + cont "but their powers" + cont "are superior!" + + para "They're virtually" + line "indestructible!" + + para "Well, are you" + line "ready to lose?" + + para "Your LEAGUE" + line "challenge ends" + cont "with me, !" + done + +_LanceEndBattleText:: + text "That's it!" + + para "I hate to admit" + line "it, but you are a" + cont "#MON master!" + prompt + +_LanceAfterBattleText:: + text "I still can't" + line "believe my" + cont "dragons lost to" + cont "you, !" + + para "You are now the" + line "#MON LEAGUE" + cont "champion!" + + para "...Or, you would" + line "have been, but" + cont "you have one more" + cont "challenge ahead." + + para "You have to face" + line "another trainer!" + cont "His name is..." + + para "!" + line "He beat the ELITE" + cont "FOUR before you!" + + para "He is the real" + line "#MON LEAGUE" + cont "champion!@" + text_end diff --git a/text/LavenderCuboneHouse.asm b/text/LavenderCuboneHouse.asm new file mode 100644 index 00000000..77b8598d --- /dev/null +++ b/text/LavenderCuboneHouse.asm @@ -0,0 +1,25 @@ +_LavenderHouse2Text1:: + text "CUBONE: Kyarugoo!@" + text_end + +_LavenderHouse2Text_1d9dc:: + text "I hate those" + line "horrible ROCKETs!" + + para "That poor CUBONE's" + line "mother..." + + para "It was killed" + line "trying to escape" + cont "from TEAM ROCKET!" + done + +_LavenderHouse2Text_1d9e1:: + text "The GHOST of" + line "#MON TOWER is" + cont "gone!" + + para "Someone must have" + line "soothed its" + cont "restless soul!" + done diff --git a/text/maps/LavenderMart.asm b/text/LavenderMart.asm similarity index 100% rename from text/maps/LavenderMart.asm rename to text/LavenderMart.asm diff --git a/text/maps/LavenderPokecenter.asm b/text/LavenderPokecenter.asm similarity index 100% rename from text/maps/LavenderPokecenter.asm rename to text/LavenderPokecenter.asm diff --git a/text/maps/LavenderTown.asm b/text/LavenderTown.asm similarity index 100% rename from text/maps/LavenderTown.asm rename to text/LavenderTown.asm diff --git a/text/maps/LoreleisRoom.asm b/text/LoreleisRoom.asm similarity index 100% rename from text/maps/LoreleisRoom.asm rename to text/LoreleisRoom.asm diff --git a/text/MrFujisHouse.asm b/text/MrFujisHouse.asm new file mode 100644 index 00000000..2f76ad94 --- /dev/null +++ b/text/MrFujisHouse.asm @@ -0,0 +1,89 @@ +_LavenderHouse1Text_1d8d1:: + text "That's odd, MR.FUJI" + line "isn't here." + cont "Where'd he go?" + done + +_LavenderHouse1Text_1d8d6:: + text "MR.FUJI had been" + line "praying alone for" + cont "CUBONE's mother." + done + +_LavenderHouse1Text_1d8f4:: + text "This is really" + line "MR.FUJI's house." + + para "He's really kind!" + + para "He looks after" + line "abandoned and" + cont "orphaned #MON!" + done + +_LavenderHouse1Text_1d8f9:: + text "It's so warm!" + line "#MON are so" + cont "nice to hug!" + done + +_LavenderHouse1Text3:: + text "PSYDUCK: Gwappa!@" + text_end + +_LavenderHouse1Text4:: + text "NIDORINO: Gaoo!@" + text_end + +_LavenderHouse1Text_1d94c:: + text "MR.FUJI: ." + + para "Your #DEX quest" + line "may fail without" + cont "love for your" + cont "#MON." + + para "I think this may" + line "help your quest." + prompt + +_ReceivedFluteText:: + text " received" + line "a @" + text_ram wcf4b + text "!@" + text_end + +_FluteExplanationText:: + text_start + + para "Upon hearing #" + line "FLUTE, sleeping" + cont "#MON will" + cont "spring awake." + + para "It works on all" + line "sleeping #MON." + done + +_FluteNoRoomText:: + text "You must make" + line "room for this!" + done + +_MrFujiAfterFluteText:: + text "MR.FUJI: Has my" + line "FLUTE helped you?" + done + +_LavenderHouse1Text6:: + text "#MON Monthly" + line "Grand Prize" + cont "Drawing!" + + para "The application" + line "form is..." + + para "Gone! It's been" + line "clipped out!" + done diff --git a/text/MrPsychicsHouse.asm b/text/MrPsychicsHouse.asm new file mode 100644 index 00000000..5ac2c9af --- /dev/null +++ b/text/MrPsychicsHouse.asm @@ -0,0 +1,26 @@ +_TM29PreReceiveText:: + text "...Wait! Don't" + line "say a word!" + + para "You wanted this!" + prompt + +_ReceivedTM29Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM29ExplanationText:: + text "TM29 is PSYCHIC!" + + para "It can lower the" + line "target's SPECIAL" + cont "abilities." + done + +_TM29NoRoomText:: + text "Where do you plan" + line "to put this?" + done diff --git a/text/maps/MtMoon1F.asm b/text/MtMoon1F.asm similarity index 100% rename from text/maps/MtMoon1F.asm rename to text/MtMoon1F.asm diff --git a/text/MtMoonB1F.asm b/text/MtMoonB1F.asm new file mode 100644 index 00000000..968b845f --- /dev/null +++ b/text/MtMoonB1F.asm @@ -0,0 +1,3 @@ +_MtMoonText1:: + text_start + done diff --git a/text/MtMoonB2F.asm b/text/MtMoonB2F.asm new file mode 100644 index 00000000..f920e0fb --- /dev/null +++ b/text/MtMoonB2F.asm @@ -0,0 +1,125 @@ +_MtMoon3Text_49f24:: + text "You want the" + line "DOME FOSSIL?" + done + +_MtMoon3Text_49f64:: + text "You want the" + line "HELIX FOSSIL?" + done + +_MtMoon3Text_49f6f:: + text " got the" + line "@" + text_ram wcf4b + text "!@" + text_end + +_MtMoon3Text_49f7f:: + text "Look, you've got" + line "no room for this.@" + text_end + +_MtMoon3Text_49f85:: + text "Hey, stop!" + + para "I found these" + line "fossils! They're" + cont "both mine!" + done + +_MtMoon3Text_49f8a:: + text "OK!" + line "I'll share!" + prompt + +_MtMoon3Text_49f8f:: + text "We'll each take" + line "one!" + cont "No being greedy!" + done + +_MtMoon3Text_49f94:: + text "Far away, on" + line "CINNABAR ISLAND," + cont "there's a #MON" + cont "LAB." + + para "They do research" + line "on regenerating" + cont "fossils." + done + +_MtMoon3Text_49f99:: + text "All right. Then" + line "this is mine!@" + text_end + +_MtMoon3BattleText2:: + text "TEAM ROCKET will" + line "find the fossils," + cont "revive and sell" + cont "them for cash!" + done + +_MtMoon3EndBattleText2:: + text "Urgh!" + line "Now I'm mad!" + prompt + +_MtMoon3AfterBattleText2:: + text "You made me mad!" + line "TEAM ROCKET will" + cont "blacklist you!" + done + +_MtMoon3BattleText3:: + text "We, TEAM ROCKET," + line "are #MON" + cont "gangsters!" + done + +_MtMoon3EndBattleText3:: + text "I blew" + line "it!" + prompt + +_MtMoon3AfterBattleText3:: + text "Darn it all! My" + line "associates won't" + cont "stand for this!" + done + +_MtMoon3BattleText4:: + text "We're pulling a" + line "big job here!" + cont "Get lost, kid!" + done + +_MtMoon3EndBattleText4:: + text "So, you" + line "are good." + prompt + +_MtMoon3AfterBattleText4:: + text "If you find a" + line "fossil, give it" + cont "to me and scram!" + done + +_MtMoon3BattleText5:: + text "Little kids" + line "should leave" + cont "grown-ups alone!" + done + +_MtMoon3EndBattleText5:: + text "I'm" + line "steamed!" + prompt + +_MtMoon3AfterBattleText5:: + text "#MON lived" + line "here long before" + cont "people came." + done diff --git a/text/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm new file mode 100644 index 00000000..dda62044 --- /dev/null +++ b/text/MtMoonPokecenter.asm @@ -0,0 +1,48 @@ +_MtMoonPokecenterText1:: + text "I've 6 # BALLs" + line "set in my belt." + + para "At most, you can" + line "carry 6 #MON." + done + +_MtMoonPokecenterText3:: + text "TEAM ROCKET" + line "attacks CERULEAN" + cont "citizens..." + + para "TEAM ROCKET is" + line "always in the" + cont "news!" + done + +_MagikarpSalesmanText1:: + text "MAN: Hello, there!" + line "Have I got a deal" + cont "just for you!" + + para "I'll let you have" + line "a swell MAGIKARP" + cont "for just ¥500!" + cont "What do you say?" + done + +_MagikarpSalesmanNoText:: + text "No? I'm only" + line "doing this as a" + cont "favor to you!" + done + +_MagikarpSalesmanNoMoneyText:: + text "You'll need more" + line "money than that!" + done + +_MagikarpSalesmanText2:: + text "MAN: Well, I don't" + line "give refunds!" + done + +_MtMoonPokecenterText5:: + text_start + done diff --git a/text/Museum1F.asm b/text/Museum1F.asm new file mode 100644 index 00000000..be1bb2f7 --- /dev/null +++ b/text/Museum1F.asm @@ -0,0 +1,108 @@ +_Museum1FText_5c21a:: + text "Come again!" + done + +_Museum1FText_5c21f:: + text "It's ¥50 for a" + line "child's ticket." + + para "Would you like to" + line "come in?" + done + +_Museum1FText_5c224:: + text "Right, ¥50!" + line "Thank you!" + done + +_Museum1FText_5c229:: + text "You don't have" + line "enough money." + prompt + +_Museum1FText_5c22e:: + text "You can't sneak" + line "in the back way!" + + para "Oh, whatever!" + line "Do you know what" + cont "AMBER is?" + done + +_Museum1FText_5c233:: + text "There's a lab" + line "somewhere trying" + cont "to resurrect" + cont "ancient #MON" + cont "from AMBER." + done + +_Museum1FText_5c238:: + text "AMBER is fossil-" + line "ized tree sap." + done + +_Museum1FText_5c23d:: + text "Please go to the" + line "other side!" + done + +_Museum1FText_5c242:: + text "Take plenty of" + line "time to look!" + done + +_Museum1FText_5c251:: + text "That is one" + line "magnificent" + cont "fossil!" + done + +_Museum1FText_5c28e:: + text "Ssh! I think that" + line "this chunk of" + cont "AMBER contains" + cont "#MON DNA!" + + para "It would be great" + line "if #MON could" + cont "be resurrected" + cont "from it!" + + para "But, my colleagues" + line "just ignore me!" + + para "So I have a favor" + line "to ask!" + + para "Take this to a" + line "#MON LAB and" + cont "get it examined!" + prompt + +_ReceivedOldAmberText:: + text " received" + line "OLD AMBER!@" + text_end + +_Museum1FText_5c299:: + text "Ssh! Get the OLD" + line "AMBER checked!" + done + +_Museum1FText_5c29e:: + text "You don't have" + line "space for this!" + done + +_Museum1FText_5c2ad:: + text "We are proud of 2" + line "fossils of very" + cont "rare, prehistoric" + cont "#MON!" + done + +_Museum1FText_5c2bc:: + text "The AMBER is" + line "clear and gold!" + done diff --git a/text/maps/Museum2F.asm b/text/Museum2F.asm similarity index 100% rename from text/maps/Museum2F.asm rename to text/Museum2F.asm diff --git a/text/NameRatersHouse.asm b/text/NameRatersHouse.asm new file mode 100644 index 00000000..b5032144 --- /dev/null +++ b/text/NameRatersHouse.asm @@ -0,0 +1,60 @@ +_NameRaterText_1dab3:: + text "Hello, hello!" + line "I am the official" + cont "NAME RATER!" + + para "Want me to rate" + line "the nicknames of" + cont "your #MON?" + done + +_NameRaterText_1dab8:: + text "Which #MON" + line "should I look at?" + prompt + +_NameRaterText_1dabd:: + text_ram wcd6d + text ", is it?" + line "That is a decent" + cont "nickname!" + + para "But, would you" + line "like me to give" + cont "it a nicer name?" + + para "How about it?" + done + +_NameRaterText_1dac2:: + text "Fine! What should" + line "we name it?" + prompt + +_NameRaterText_1dac7:: + text "OK! This #MON" + line "has been renamed" + cont "@" + text_ram wBuffer + text "!" + + para "That's a better" + line "name than before!" + done + +_NameRaterText_1dacc:: + text "Fine! Come any" + line "time you like!" + done + +_NameRaterText_1dad1:: + text_ram wcd6d + text ", is it?" + line "That is a truly" + cont "impeccable name!" + + para "Take good care of" + line "@" + text_ram wcd6d + text "!" + done diff --git a/text/OaksLab.asm b/text/OaksLab.asm new file mode 100644 index 00000000..18ecadb7 --- /dev/null +++ b/text/OaksLab.asm @@ -0,0 +1,482 @@ +_OaksLabGaryText1:: + text ": Yo" + line "! Gramps" + cont "isn't around!" + done + +_OaksLabText40:: + text ": Heh, I" + line "don't need to be" + cont "greedy like you!" + + para "Go ahead and" + line "choose, !" + done + +_OaksLabText41:: + text ": My" + line "#MON looks a" + cont "lot stronger." + done + +_OaksLabText39:: + text "Those are #" + line "BALLs. They" + cont "contain #MON!" + done + +_OaksLabCharmanderText:: + text "So! You want the" + line "fire #MON," + cont "CHARMANDER?" + done + +_OaksLabSquirtleText:: + text "So! You want the" + line "water #MON," + cont "SQUIRTLE?" + done + +_OaksLabBulbasaurText:: + text "So! You want the" + line "plant #MON," + cont "BULBASAUR?" + done + +_OaksLabMonEnergeticText:: + text "This #MON is" + line "really energetic!" + prompt + +_OaksLabReceivedMonText:: + text " received" + line "a @" + text_ram wcd6d + text "!@" + text_end + +_OaksLabLastMonText:: + text "That's PROF.OAK's" + line "last #MON!" + done + +_OaksLabText_1d2f0:: + text "OAK: Now, ," + line "which #MON do" + cont "you want?" + done + +_OaksLabText_1d2f5:: + text "OAK: If a wild" + line "#MON appears," + cont "your #MON can" + cont "fight against it!" + done + +_OaksLabText_1d2fa:: + text "OAK: ," + line "raise your young" + cont "#MON by making" + cont "it fight!" + done + +_OaksLabDeliverParcelText1:: + text "OAK: Oh, !" + + para "How is my old" + line "#MON?" + + para "Well, it seems to" + line "like you a lot." + + para "You must be" + line "talented as a" + cont "#MON trainer!" + + para "What? You have" + line "something for me?" + + para " delivered" + line "OAK's PARCEL.@" + text_end + +_OaksLabDeliverParcelText2:: + text_start + para "Ah! This is the" + line "custom # BALL" + cont "I ordered!" + cont "Thank you!" + done + +_OaksLabAroundWorldText:: + text "#MON around the" + line "world wait for" + cont "you, !" + done + +_OaksLabGivePokeballsText1:: + text "OAK: You can't get" + line "detailed data on" + cont "#MON by just" + cont "seeing them." + + para "You must catch" + line "them! Use these" + cont "to capture wild" + cont "#MON." + + para " got 5" + line "# BALLs!@" + text_end + +_OaksLabGivePokeballsText2:: + text_start + para "When a wild" + line "#MON appears," + cont "it's fair game." + + para "Just throw a #" + line "BALL at it and try" + line "to catch it!" + + para "This won't always" + line "work, though." + + para "A healthy #MON" + line "could escape. You" + cont "have to be lucky!" + done + +_OaksLabPleaseVisitText:: + text "OAK: Come see me" + line "sometimes." + + para "I want to know how" + line "your #DEX is" + cont "coming along." + done + +_OaksLabText_1d31d:: + text "OAK: Good to see " + line "you! How is your " + cont "#DEX coming? " + cont "Here, let me take" + cont "a look!" + prompt + +_OaksLabText_1d32c:: + text "It's encyclopedia-" + line "like, but the" + cont "pages are blank!" + done + +_OaksLabText8:: + text "?" + done + +_OaksLabText_1d340:: + text "PROF.OAK is the" + line "authority on" + cont "#MON!" + + para "Many #MON" + line "trainers hold him" + cont "in high regard!" + done + +_OaksLabRivalWaitingText:: + text ": Gramps!" + line "I'm fed up with" + cont "waiting!" + done + +_OaksLabChooseMonText:: + text "OAK: ?" + line "Let me think..." + + para "Oh, that's right," + line "I told you to" + cont "come! Just wait!" + + para "Here, !" + + para "There are 3" + line "#MON here!" + + para "Haha!" + + para "They are inside" + line "the # BALLs." + + para "When I was young," + line "I was a serious" + cont "#MON trainer!" + + para "In my old age, I" + line "have only 3 left," + cont "but you can have" + cont "one! Choose!" + done + +_OaksLabRivalInterjectionText:: + text ": Hey!" + line "Gramps! What" + cont "about me?" + done + +_OaksLabBePatientText:: + text "OAK: Be patient!" + line ", you can" + cont "have one too!" + done + +_OaksLabLeavingText:: + text "OAK: Hey! Don't go" + line "away yet!" + done + +_OaksLabRivalPickingMonText:: + text ": I'll take" + line "this one, then!" + done + +_OaksLabRivalReceivedMonText:: + text " received" + line "a @" + text_ram wcd6d + text "!@" + text_end + +_OaksLabRivalChallengeText:: + text ": Wait" + line "!" + cont "Let's check out" + cont "our #MON!" + + para "Come on, I'll take" + line "you on!" + done + +_OaksLabText_1d3be:: + text "WHAT?" + line "Unbelievable!" + cont "I picked the" + cont "wrong #MON!" + prompt + +_OaksLabText_1d3c3:: + text ": Yeah! Am" + line "I great or what?" + prompt + +_OaksLabRivalToughenUpText:: + text ": Okay!" + line "I'll make my" + cont "#MON fight to" + cont "toughen it up!" + + para "! Gramps!" + line "Smell you later!" + done + +_OaksLabText21:: + text ": Gramps!" + done + +_OaksLabText22:: + text ": What did" + line "you call me for?" + done + +_OaksLabText23:: + text "OAK: Oh right! I" + line "have a request" + cont "of you two." + done + +_OaksLabText24:: + text "On the desk there" + line "is my invention," + cont "#DEX!" + + para "It automatically" + line "records data on" + cont "#MON you've" + cont "seen or caught!" + + para "It's a hi-tech" + line "encyclopedia!" + done + +_OaksLabText25:: + text "OAK: and" + line "! Take" + cont "these with you!" + + para " got" + line "#DEX from OAK!@" + text_end + +_OaksLabText26:: + text "To make a complete" + line "guide on all the" + cont "#MON in the" + cont "world..." + + para "That was my dream!" + + para "But, I'm too old!" + line "I can't do it!" + + para "So, I want you two" + line "to fulfill my" + cont "dream for me!" + + para "Get moving, you" + line "two!" + + para "This is a great" + line "undertaking in" + cont "#MON history!" + done + +_OaksLabText27:: + text ": Alright" + line "Gramps! Leave it" + cont "all to me!" + + para ", I hate to" + line "say it, but I" + cont "don't need you!" + + para "I know! I'll" + line "borrow a TOWN MAP" + cont "from my sis!" + + para "I'll tell her not" + line "to lend you one," + cont "! Hahaha!" + done + +_OaksLabText_1d405:: + text "I study #MON as" + line "PROF.OAK's AIDE." + done + +_OaksLabText_441cc:: + text "#DEX comp-" + line "letion is:" + + para "@" + text_decimal hDexRatingNumMonsSeen, 1, 3 + text " #MON seen" + line "@" + text_decimal hDexRatingNumMonsOwned, 1, 3 + text " #MON owned" + + para "PROF.OAK's" + line "Rating:" + prompt + +_OaksLabText_44201:: + text "You still have" + line "lots to do." + cont "Look for #MON" + cont "in grassy areas!" + done + +_OaksLabText_44206:: + text "You're on the" + line "right track! " + cont "Get a FLASH HM" + cont "from my AIDE!" + done + +_OaksLabText_4420b:: + text "You still need" + line "more #MON!" + cont "Try to catch" + cont "other species!" + done + +_OaksLabText_44210:: + text "Good, you're" + line "trying hard!" + cont "Get an ITEMFINDER" + cont "from my AIDE!" + done + +_OaksLabText_44215:: + text "Looking good!" + line "Go find my AIDE" + cont "when you get 50!" + done + +_OaksLabText_4421a:: + text "You finally got at" + line "least 50 species!" + cont "Be sure to get" + cont "EXP.ALL from my" + cont "AIDE!" + done + +_OaksLabText_4421f:: + text "Ho! This is geting" + line "even better!" + done + +_OaksLabText_44224:: + text "Very good!" + line "Go fish for some" + cont "marine #MON!" + done + +_OaksLabText_44229:: + text "Wonderful!" + line "Do you like to" + cont "collect things?" + done + +_OaksLabText_4422e:: + text "I'm impressed!" + line "It must have been" + cont "difficult to do!" + done + +_OaksLabText_44233:: + text "You finally got at" + line "least 100 species!" + cont "I can't believe" + cont "how good you are!" + done + +_OaksLabText_44238:: + text "You even have the" + line "evolved forms of" + cont "#MON! Super!" + done + +_OaksLabText_4423d:: + text "Excellent! Trade" + line "with friends to" + cont "get some more!" + done + +_OaksLabText_44242:: + text "Outstanding!" + line "You've become a" + cont "real pro at this!" + done + +_OaksLabText_44247:: + text "I have nothing" + line "left to say!" + cont "You're the" + cont "authority now!" + done + +_OaksLabText_4424c:: + text "Your #DEX is" + line "entirely complete!" + cont "Congratulations!" + done diff --git a/text/PalletTown.asm b/text/PalletTown.asm new file mode 100644 index 00000000..caaed3ac --- /dev/null +++ b/text/PalletTown.asm @@ -0,0 +1,56 @@ +_OakAppearsText:: + text "OAK: Hey! Wait!" + line "Don't go out!@" + text_end + +_OakWalksUpText:: + text "OAK: It's unsafe!" + line "Wild #MON live" + cont "in tall grass!" + + para "You need your own" + line "#MON for your" + cont "protection." + cont "I know!" + + para "Here, come with" + line "me!" + done + +_PalletTownText2:: + text "I'm raising" + line "#MON too!" + + para "When they get" + line "strong, they can" + cont "protect me!" + done + +_PalletTownText3:: + text "Technology is" + line "incredible!" + + para "You can now store" + line "and recall items" + cont "and #MON as" + cont "data via PC!" + done + +_PalletTownText4:: + text "OAK #MON" + line "RESEARCH LAB" + done + +_PalletTownText5:: + text "PALLET TOWN" + line "Shades of your" + cont "journey await!" + done + +_PalletTownText6:: + text "'s house " + done + +_PalletTownText7:: + text "'s house " + done diff --git a/text/maps/PewterCity.asm b/text/PewterCity.asm similarity index 100% rename from text/maps/PewterCity.asm rename to text/PewterCity.asm diff --git a/text/maps/PewterGym.asm b/text/PewterGym.asm similarity index 100% rename from text/maps/PewterGym.asm rename to text/PewterGym.asm diff --git a/text/maps/PewterGym_2.asm b/text/PewterGym_2.asm similarity index 96% rename from text/maps/PewterGym_2.asm rename to text/PewterGym_2.asm index 5312e4f2..b3c079a4 100644 --- a/text/maps/PewterGym_2.asm +++ b/text/PewterGym_2.asm @@ -19,10 +19,11 @@ _TM34PreReceiveText:: _ReceivedTM34Text:: text " received" - line "TM34!@@" + line "TM34!@" + text_end _TM34ExplanationText:: - text "" + text_start para "A TM contains a" line "technique that" @@ -59,10 +60,11 @@ _PewterGymText_5c4bc:: cont "the BOULDERBADGE!" para " received" - line "the BOULDERBADGE!@@" + line "the BOULDERBADGE!@" + text_end _PewterGymText_5c4c1:: - text "" + text_start para "That's an official" line "#MON LEAGUE" diff --git a/text/maps/PewterMart.asm b/text/PewterMart.asm similarity index 100% rename from text/maps/PewterMart.asm rename to text/PewterMart.asm diff --git a/text/PewterNidoranHouse.asm b/text/PewterNidoranHouse.asm new file mode 100644 index 00000000..d4a092c8 --- /dev/null +++ b/text/PewterNidoranHouse.asm @@ -0,0 +1,25 @@ +_PewterHouse1Text1:: + text "NIDORAN: Bowbow!@" + text_end + +_PewterHouse1Text2:: + text "NIDORAN sit!" + done + +_PewterHouse1Text3:: + text "Our #MON's an" + line "outsider, so it's" + cont "hard to handle." + + para "An outsider is a" + line "#MON that you" + cont "get in a trade." + + para "It grows fast, but" + line "it may ignore an" + cont "unskilled trainer" + cont "in battle!" + + para "If only we had" + line "some BADGEs..." + done diff --git a/text/maps/PewterPokecenter.asm b/text/PewterPokecenter.asm similarity index 100% rename from text/maps/PewterPokecenter.asm rename to text/PewterPokecenter.asm diff --git a/text/maps/PewterSpeechHouse.asm b/text/PewterSpeechHouse.asm similarity index 100% rename from text/maps/PewterSpeechHouse.asm rename to text/PewterSpeechHouse.asm diff --git a/text/PokemonFanClub.asm b/text/PokemonFanClub.asm new file mode 100644 index 00000000..87c273a6 --- /dev/null +++ b/text/PokemonFanClub.asm @@ -0,0 +1,144 @@ +PikachuFanText:: + text "Won't you admire" + line "my PIKACHU's" + cont "adorable tail?" + done + +PikachuFanBetterText:: + text "Humph! My PIKACHU" + line "is twice as cute" + cont "as that one!" + done + +SeelFanText:: + text "I just love my" + line "SEEL!" + + para "It squeals when I" + line "hug it!" + done + +SeelFanBetterText:: + text "Oh dear!" + + para "My SEEL is far" + line "more attractive!" + done + +FanClubPikachuText:: + text "PIKACHU: Chu!" + line "Pikachu!" + done + +FanClubSeelText:: + text "SEEL: Kyuoo!" + done + +FanClubMeetChairText:: + text "I chair the" + line "#MON Fan Club!" + + para "I have collected" + line "over 100 #MON!" + + para "I'm very fussy" + line "when it comes to" + cont "#MON!" + + para "So..." + + para "Did you come" + line "visit to hear" + cont "about my #MON?" + done + +FanClubChairStoryText:: + text "Good!" + line "Then listen up!" + + para "My favorite" + line "RAPIDASH..." + + para "It...cute..." + line "lovely...smart..." + cont "plus...amazing..." + cont "you think so?..." + cont "oh yes...it..." + cont "stunning..." + cont "kindly..." + cont "love it!" + + para "Hug it...when..." + cont "sleeping...warm" + cont "and cuddly..." + cont "spectacular..." + cont "ravishing..." + cont "...Oops! Look at" + cont "the time! I kept" + cont "you too long!" + + para "Thanks for hearing" + line "me out! I want" + cont "you to have this!" + prompt + +ReceivedBikeVoucherText:: + text " received" + line "a @" + text_ram wcf4b + text "!@" + text_end + +ExplainBikeVoucherText:: + text_start + para "Exchange that for" + line "a BICYCLE!" + + para "Don't worry, my" + line "FEAROW will FLY" + cont "me anywhere!" + + para "So, I don't need a" + line "BICYCLE!" + + para "I hope you like" + line "cycling!" + done + +FanClubNoStoryText:: + text "Oh. Come back" + line "when you want to" + cont "hear my story!" + done + +FanClubChairFinalText:: + text "Hello, !" + + para "Did you come see" + line "me about my" + cont "#MON again?" + + para "No? Too bad!" + done + +FanClubBagFullText:: + text "Make room for" + line "this!" + done + +_FanClubText6:: + text "Our Chairman is" + line "very vocal about" + cont "#MON." + done + +_FanClubText7:: + text "Let's all listen" + line "politely to other" + cont "trainers!" + done + +_FanClubText8:: + text "If someone brags," + line "brag right back!" + done diff --git a/text/maps/PokemonMansion1F.asm b/text/PokemonMansion1F.asm similarity index 100% rename from text/maps/PokemonMansion1F.asm rename to text/PokemonMansion1F.asm diff --git a/text/maps/PokemonMansion2F.asm b/text/PokemonMansion2F.asm similarity index 100% rename from text/maps/PokemonMansion2F.asm rename to text/PokemonMansion2F.asm diff --git a/text/maps/PokemonMansion3F.asm b/text/PokemonMansion3F.asm similarity index 100% rename from text/maps/PokemonMansion3F.asm rename to text/PokemonMansion3F.asm diff --git a/text/maps/PokemonMansionB1F.asm b/text/PokemonMansionB1F.asm similarity index 100% rename from text/maps/PokemonMansionB1F.asm rename to text/PokemonMansionB1F.asm diff --git a/text/maps/PokemonTower1F.asm b/text/PokemonTower1F.asm similarity index 100% rename from text/maps/PokemonTower1F.asm rename to text/PokemonTower1F.asm diff --git a/text/maps/PokemonTower2F.asm b/text/PokemonTower2F.asm similarity index 100% rename from text/maps/PokemonTower2F.asm rename to text/PokemonTower2F.asm diff --git a/text/maps/PokemonTower3F.asm b/text/PokemonTower3F.asm similarity index 100% rename from text/maps/PokemonTower3F.asm rename to text/PokemonTower3F.asm diff --git a/text/maps/PokemonTower4F.asm b/text/PokemonTower4F.asm similarity index 100% rename from text/maps/PokemonTower4F.asm rename to text/PokemonTower4F.asm diff --git a/text/maps/PokemonTower5F.asm b/text/PokemonTower5F.asm similarity index 100% rename from text/maps/PokemonTower5F.asm rename to text/PokemonTower5F.asm diff --git a/text/maps/PokemonTower6F.asm b/text/PokemonTower6F.asm similarity index 100% rename from text/maps/PokemonTower6F.asm rename to text/PokemonTower6F.asm diff --git a/text/maps/PokemonTower7F.asm b/text/PokemonTower7F.asm similarity index 100% rename from text/maps/PokemonTower7F.asm rename to text/PokemonTower7F.asm diff --git a/text/PowerPlant.asm b/text/PowerPlant.asm new file mode 100644 index 00000000..dcdcd739 --- /dev/null +++ b/text/PowerPlant.asm @@ -0,0 +1,7 @@ +_VoltorbBattleText:: + text "Bzzzt!" + done + +_ZapdosBattleText:: + text "Gyaoo!@" + text_end diff --git a/text/maps/RedsHouse1F.asm b/text/RedsHouse1F.asm similarity index 100% rename from text/maps/RedsHouse1F.asm rename to text/RedsHouse1F.asm diff --git a/text/maps/RockTunnel1F.asm b/text/RockTunnel1F.asm similarity index 100% rename from text/maps/RockTunnel1F.asm rename to text/RockTunnel1F.asm diff --git a/text/maps/RockTunnelB1F.asm b/text/RockTunnelB1F.asm similarity index 100% rename from text/maps/RockTunnelB1F.asm rename to text/RockTunnelB1F.asm diff --git a/text/maps/RockTunnelB1F_2.asm b/text/RockTunnelB1F_2.asm similarity index 100% rename from text/maps/RockTunnelB1F_2.asm rename to text/RockTunnelB1F_2.asm diff --git a/text/maps/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm similarity index 100% rename from text/maps/RockTunnelPokecenter.asm rename to text/RockTunnelPokecenter.asm diff --git a/text/RocketHideoutB1F.asm b/text/RocketHideoutB1F.asm new file mode 100644 index 00000000..c4fcb4b1 --- /dev/null +++ b/text/RocketHideoutB1F.asm @@ -0,0 +1,74 @@ +_RocketHideout1EndBattleText6:: + text "Why...?@" + text_end + +_RocketHideout1BattleText2:: + text "Who are you? How" + line "did you get here?" + done + +_RocketHideout1EndBattleText2:: + text "Oww!" + line "Beaten!" + prompt + +_RocketHideout1AfterBattleTxt2:: + text "Are you dissing" + line "TEAM ROCKET?" + done + +_RocketHideout1BattleText3:: + text "You broke into" + line "our operation?" + done + +_RocketHideout1EndBattleText3:: + text "Burnt!" + prompt + +_RocketHideout1AfterBattleTxt3:: + text "You're not going" + line "to get away with" + cont "this, brat!" + done + +_RocketHideout1BattleText4:: + text "Intruder alert!" + done + +_RocketHideout1EndBattleText4:: + text "I" + line "can't do it!" + prompt + +_RocketHideout1AfterBattleTxt4:: + text "SILPH SCOPE?" + line "I don't know" + cont "where it is!" + done + +_RocketHideout1BattleText5:: + text "Why did you come" + line "here?" + done + +_RocketHideout1EndBattleText5:: + text "This" + line "won't do!" + prompt + +_RocketHideout1AfterBattleTxt5:: + text "OK, I'll talk!" + line "Take the elevator" + cont "to see my BOSS!" + done + +_RocketHideout1BattleText6:: + text "Are you lost, you" + line "little rat?" + done + +_RocketHideout1AfterBattleTxt6:: + text "Uh-oh, that fight" + line "opened the door!" + done diff --git a/text/maps/RocketHideoutB2F.asm b/text/RocketHideoutB2F.asm similarity index 100% rename from text/maps/RocketHideoutB2F.asm rename to text/RocketHideoutB2F.asm diff --git a/text/maps/RocketHideoutB3F.asm b/text/RocketHideoutB3F.asm similarity index 100% rename from text/maps/RocketHideoutB3F.asm rename to text/RocketHideoutB3F.asm diff --git a/text/maps/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm similarity index 100% rename from text/maps/RocketHideoutB4F.asm rename to text/RocketHideoutB4F.asm diff --git a/text/RocketHideoutElevator.asm b/text/RocketHideoutElevator.asm new file mode 100644 index 00000000..1b8ba561 --- /dev/null +++ b/text/RocketHideoutElevator.asm @@ -0,0 +1,4 @@ +_RocketElevatorText_4578b:: + text "It appears to" + line "need a key.@" + text_end diff --git a/text/Route1.asm b/text/Route1.asm new file mode 100644 index 00000000..bf32af26 --- /dev/null +++ b/text/Route1.asm @@ -0,0 +1,50 @@ +_Route1ViridianMartSampleText:: + text "Hi! I work at a" + line "#MON MART." + + para "It's a convenient" + line "shop, so please" + cont "visit us in" + cont "VIRIDIAN CITY." + + para "I know, I'll give" + line "you a sample!" + cont "Here you go!" + prompt + +_Route1Text_1cae8:: + text " got" + line "@" + text_ram wcf4b + text "!@" + text_end + +_Route1Text_1caee:: + text "We also carry" + line "# BALLs for" + cont "catching #MON!" + done + +_Route1Text_1caf3:: + text "You have too much" + line "stuff with you!" + done + +_Route1Text2:: + text "See those ledges" + line "along the road?" + + para "It's a bit scary," + line "but you can jump" + cont "from them." + + para "You can get back" + line "to PALLET TOWN" + cont "quicker that way." + done + +_Route1Text3:: + text "ROUTE 1" + line "PALLET TOWN -" + cont "VIRIDIAN CITY" + done diff --git a/text/maps/Route10.asm b/text/Route10.asm similarity index 100% rename from text/maps/Route10.asm rename to text/Route10.asm diff --git a/text/maps/Route11.asm b/text/Route11.asm similarity index 100% rename from text/maps/Route11.asm rename to text/Route11.asm diff --git a/text/maps/Route11Gate1F.asm b/text/Route11Gate1F.asm similarity index 100% rename from text/maps/Route11Gate1F.asm rename to text/Route11Gate1F.asm diff --git a/text/maps/Route11Gate2F.asm b/text/Route11Gate2F.asm similarity index 100% rename from text/maps/Route11Gate2F.asm rename to text/Route11Gate2F.asm diff --git a/text/maps/Route11_2.asm b/text/Route11_2.asm similarity index 100% rename from text/maps/Route11_2.asm rename to text/Route11_2.asm diff --git a/text/maps/Route12.asm b/text/Route12.asm similarity index 100% rename from text/maps/Route12.asm rename to text/Route12.asm diff --git a/text/maps/Route12Gate1F.asm b/text/Route12Gate1F.asm similarity index 100% rename from text/maps/Route12Gate1F.asm rename to text/Route12Gate1F.asm diff --git a/text/Route12Gate2F.asm b/text/Route12Gate2F.asm new file mode 100644 index 00000000..b5a6465f --- /dev/null +++ b/text/Route12Gate2F.asm @@ -0,0 +1,43 @@ +_TM39PreReceiveText:: + text "My #MON's" + line "ashes are stored" + cont "in #MON TOWER." + + para "You can have this" + line "TM. I don't need" + cont "it any more..." + prompt + +_ReceivedTM39Text:: + text " received" + line "TM39!@" + text_end + +_TM39ExplanationText:: + text "TM39 is a move" + line "called SWIFT." + + para "It's very accurate," + line "so use it during" + cont "battles you can't" + cont "afford to lose." + done + +_TM39NoRoomText:: + text "You don't have" + line "room for this." + done + +_Route12GateUpstairsText_495b8:: + text "Looked into the" + line "binoculars." + + para "A man fishing!" + done + +_Route12GateUpstairsText_495c4:: + text "Looked into the" + line "binoculars." + + para "It's #MON TOWER!" + done diff --git a/text/Route12SuperRodHouse.asm b/text/Route12SuperRodHouse.asm new file mode 100644 index 00000000..ff633d3a --- /dev/null +++ b/text/Route12SuperRodHouse.asm @@ -0,0 +1,62 @@ +_Route12HouseText_564c0:: + text "I'm the FISHING" + line "GURU's brother!" + + para "I simply Looove" + line "fishing!" + + para "Do you like to" + line "fish?" + done + +_Route12HouseText_564c5:: + text "Grand! I like" + line "your style!" + + para "Take this and" + line "fish, young one!" + + para " received" + line "a @" + text_ram wcf4b + text "!@" + text_end + +_Route12HouseText_564ca:: + text_start + + para "Fishing is a way" + line "of life!" + + para "From the seas to" + line "rivers, go out" + cont "and land the big" + cont "one!" + done + +_Route12HouseText_564cf:: + text "Oh... That's so" + line "disappointing..." + done + +_Route12HouseText_564d4:: + text "Hello there," + line "!" + + para "Use the SUPER ROD" + line "in any water!" + cont "You can catch" + cont "different kinds" + cont "of #MON." + + para "Try fishing" + line "wherever you can!" + done + +_Route12HouseText_564d9:: + text "Oh no!" + + para "I had a gift for" + line "you, but you have" + cont "no room for it!" + done diff --git a/text/maps/Route13.asm b/text/Route13.asm similarity index 100% rename from text/maps/Route13.asm rename to text/Route13.asm diff --git a/text/maps/Route14.asm b/text/Route14.asm similarity index 100% rename from text/maps/Route14.asm rename to text/Route14.asm diff --git a/text/Route15.asm b/text/Route15.asm new file mode 100644 index 00000000..9dc0e6ba --- /dev/null +++ b/text/Route15.asm @@ -0,0 +1,172 @@ +_Route15BattleText1:: + text "Let me try out the" + line "#MON I just" + cont "got in a trade!" + done + +_Route15EndBattleText1:: + text "Not" + line "good enough!" + prompt + +_Route15AfterBattleText1:: + text "You can't change" + line "the nickname of" + cont "any #MON you" + cont "get in a trade." + + para "Only the Original" + line "Trainer can." + done + +_Route15BattleText2:: + text "You look gentle," + line "so I think I can" + cont "beat you!" + done + +_Route15EndBattleText2:: + text "No," + line "wrong!" + prompt + +_Route15AfterBattleText2:: + text "I'm afraid of" + line "BIKERs, they look" + cont "so ugly and mean!" + done + +_Route15BattleText3:: + text "When I whistle, I" + line "can summon bird" + cont "#MON!" + done + +_Route15EndBattleText3:: + text "Ow!" + line "That's tragic!" + prompt + +_Route15AfterBattleText3:: + text "Maybe I'm not cut" + line "out for battles." + done + +_Route15BattleText4:: + text "Hmm? My birds are" + line "shivering! You're" + cont "good, aren't you?" + done + +_Route15EndBattleText4:: + text "Just" + line "as I thought!" + prompt + +_Route15AfterBattleText4:: + text "Did you know moves" + line "like EARTHQUAKE" + cont "don't have any" + cont "effect on birds?" + done + +_Route15BattleText5:: + text "Oh, you're a" + line "little cutie!" + done + +_Route15EndBattleText5:: + text "You looked" + line "so cute too!" + prompt + +_Route15AfterBattleText5:: + text "I forgive you!" + line "I can take it!" + done + +_Route15BattleText6:: + text "I raise #MON" + line "because I live" + cont "alone!" + done + +_Route15EndBattleText6:: + text "I didn't" + line "ask for this!" + prompt + +_Route15AfterBattleText6:: + text "I just like going" + line "home to be with" + cont "my #MON!" + done + +_Route15BattleText7:: + text "Hey kid! C'mon!" + line "I just got these!" + done + +_Route15EndBattleText7:: + text "Why" + line "not?" + prompt + +_Route15AfterBattleText7:: + text "You only live" + line "once, so I live" + cont "as an outlaw!" + cont "TEAM ROCKET RULES!" + done + +_Route15BattleText8:: + text "Fork over all your" + line "cash when you" + cont "lose to me, kid!" + done + +_Route15EndBattleText8:: + text "That" + line "can't be true!" + prompt + +_Route15AfterBattleText8:: + text "I was just joking" + line "about the money!" + done + +_Route15BattleText9:: + text "What's cool?" + line "Trading #MON!" + done + +_Route15EndBattleText9:: + text "I" + line "said trade!" + prompt + +_Route15AfterBattleText9:: + text "I trade #MON" + line "with my friends!" + done + +_Route15BattleText10:: + text "Want to play with" + line "my #MON?" + done + +_Route15EndBattleText10:: + text "I was" + line "too impatient!" + prompt + +_Route15AfterBattleText10:: + text "I'll go train with" + line "weaker people.@" + text_end + +_Route15Text12:: + text "ROUTE 15" + line "West to FUCHSIA" + cont "CITY" + done diff --git a/text/maps/Route15Gate1F.asm b/text/Route15Gate1F.asm similarity index 100% rename from text/maps/Route15Gate1F.asm rename to text/Route15Gate1F.asm diff --git a/text/maps/Route15Gate2F.asm b/text/Route15Gate2F.asm similarity index 100% rename from text/maps/Route15Gate2F.asm rename to text/Route15Gate2F.asm diff --git a/text/maps/Route16.asm b/text/Route16.asm similarity index 100% rename from text/maps/Route16.asm rename to text/Route16.asm diff --git a/text/Route16FlyHouse.asm b/text/Route16FlyHouse.asm new file mode 100644 index 00000000..89f76e51 --- /dev/null +++ b/text/Route16FlyHouse.asm @@ -0,0 +1,32 @@ +_Route16HouseText3:: + text "Oh, you found my" + line "secret retreat!" + + para "Please don't tell" + line "anyone I'm here." + cont "I'll make it up" + cont "to you with this!" + prompt + +_ReceivedHM02Text:: + text " received" + line "HM02!@" + text_end + +_HM02ExplanationText:: + text "HM02 is FLY." + line "It will take you" + cont "back to any town." + + para "Put it to good" + line "use!" + done + +_HM02NoRoomText:: + text "You don't have any" + line "room for this." + done + +_Route16HouseText_1e652:: + text "FEAROW: Kyueen!" + done diff --git a/text/maps/Route16Gate1F.asm b/text/Route16Gate1F.asm similarity index 100% rename from text/maps/Route16Gate1F.asm rename to text/Route16Gate1F.asm diff --git a/text/maps/Route16Gate2F.asm b/text/Route16Gate2F.asm similarity index 100% rename from text/maps/Route16Gate2F.asm rename to text/Route16Gate2F.asm diff --git a/text/maps/Route17.asm b/text/Route17.asm similarity index 100% rename from text/maps/Route17.asm rename to text/Route17.asm diff --git a/text/maps/Route18.asm b/text/Route18.asm similarity index 100% rename from text/maps/Route18.asm rename to text/Route18.asm diff --git a/text/maps/Route18Gate1F.asm b/text/Route18Gate1F.asm similarity index 100% rename from text/maps/Route18Gate1F.asm rename to text/Route18Gate1F.asm diff --git a/text/maps/Route18Gate2F.asm b/text/Route18Gate2F.asm similarity index 100% rename from text/maps/Route18Gate2F.asm rename to text/Route18Gate2F.asm diff --git a/text/maps/Route19.asm b/text/Route19.asm similarity index 100% rename from text/maps/Route19.asm rename to text/Route19.asm diff --git a/text/maps/Route2.asm b/text/Route2.asm similarity index 100% rename from text/maps/Route2.asm rename to text/Route2.asm diff --git a/text/maps/Route20.asm b/text/Route20.asm similarity index 100% rename from text/maps/Route20.asm rename to text/Route20.asm diff --git a/text/maps/Route21.asm b/text/Route21.asm similarity index 100% rename from text/maps/Route21.asm rename to text/Route21.asm diff --git a/text/maps/Route22.asm b/text/Route22.asm similarity index 100% rename from text/maps/Route22.asm rename to text/Route22.asm diff --git a/text/Route22Gate.asm b/text/Route22Gate.asm new file mode 100644 index 00000000..33893d6e --- /dev/null +++ b/text/Route22Gate.asm @@ -0,0 +1,22 @@ +_Route22GateText_1e704:: + text "Only truly skilled" + line "trainers are" + cont "allowed through." + + para "You don't have the" + line "BOULDERBADGE yet!@" + text_end + +_Route22GateText_1e715:: + text_start + + para "The rules are" + line "rules. I can't" + cont "let you pass." + done + +_Route22GateText_1e71a:: + text "Oh! That is the" + line "BOULDERBADGE!" + cont "Go right ahead!@" + text_end diff --git a/text/Route23.asm b/text/Route23.asm new file mode 100644 index 00000000..f21857b3 --- /dev/null +++ b/text/Route23.asm @@ -0,0 +1,41 @@ +_VictoryRoadGuardText1:: + text "You can pass here" + line "only if you have" + cont "the @" + text_ram wcd6d + text "!" + + para "You don't have the" + line "@" + text_ram wcd6d + text " yet!" + + para "You have to have" + line "it to get to" + cont "#MON LEAGUE!@" + text_end + +_VictoryRoadGuardText2:: + text "You can pass here" + line "only if you have" + cont "the @" + text_ram wcd6d + text "!" + + para "Oh! That is the" + line "@" + text_ram wcd6d + text "!@" + text_end + +_VictoryRoadGuardText_513a3:: + text_start + + para "OK then! Please," + line "go right ahead!" + done + +_Route23Text8:: + text "VICTORY ROAD GATE" + line "- #MON LEAGUE" + done diff --git a/text/Route24.asm b/text/Route24.asm new file mode 100644 index 00000000..6792c401 --- /dev/null +++ b/text/Route24.asm @@ -0,0 +1,67 @@ +_Route24Text_51510:: + text "Congratulations!" + line "You beat our 5" + cont "contest trainers!@" + text_end + +_Route24Text_51515:: + text_start + + para "You just earned a" + line "fabulous prize!" + prompt + +_Route24Text_5151a:: + text " received" + line "a @" + text_ram wcf4b + text "!@" + text_end + +_Route24Text_51521:: + text "You don't have" + line "any room!" + done + +_Route24Text_51526:: + text "By the way, would" + line "you like to join" + cont "TEAM ROCKET?" + + para "We're a group" + line "dedicated to evil" + cont "using #MON!" + + para "Want to join?" + + para "Are you sure?" + + para "Come on, join us!" + + para "I'm telling you" + line "to join!" + + para "OK, you need" + line "convincing!" + + para "I'll make you an" + line "offer you can't" + cont "refuse!" + done + +_Route24Text_5152b:: + text "Arrgh!" + line "You are good!" + prompt + +_Route24Text_51530:: + text "With your ability," + line "you could become" + cont "a top leader in" + cont "TEAM ROCKET!" + done + +_Route24BattleText1:: + text "I saw your feat" + line "from the grass!" + done diff --git a/text/maps/Route24_2.asm b/text/Route24_2.asm similarity index 100% rename from text/maps/Route24_2.asm rename to text/Route24_2.asm diff --git a/text/maps/Route25.asm b/text/Route25.asm similarity index 100% rename from text/maps/Route25.asm rename to text/Route25.asm diff --git a/text/maps/Route2Gate.asm b/text/Route2Gate.asm similarity index 100% rename from text/maps/Route2Gate.asm rename to text/Route2Gate.asm diff --git a/text/maps/Route2TradeHouse.asm b/text/Route2TradeHouse.asm similarity index 100% rename from text/maps/Route2TradeHouse.asm rename to text/Route2TradeHouse.asm diff --git a/text/maps/Route3.asm b/text/Route3.asm similarity index 100% rename from text/maps/Route3.asm rename to text/Route3.asm diff --git a/text/maps/Route4.asm b/text/Route4.asm similarity index 100% rename from text/maps/Route4.asm rename to text/Route4.asm diff --git a/text/maps/Route5.asm b/text/Route5.asm similarity index 100% rename from text/maps/Route5.asm rename to text/Route5.asm diff --git a/text/maps/Route6.asm b/text/Route6.asm similarity index 100% rename from text/maps/Route6.asm rename to text/Route6.asm diff --git a/text/maps/Route7.asm b/text/Route7.asm similarity index 100% rename from text/maps/Route7.asm rename to text/Route7.asm diff --git a/text/maps/Route8.asm b/text/Route8.asm similarity index 100% rename from text/maps/Route8.asm rename to text/Route8.asm diff --git a/text/maps/Route9.asm b/text/Route9.asm similarity index 100% rename from text/maps/Route9.asm rename to text/Route9.asm diff --git a/text/maps/SSAnne1F.asm b/text/SSAnne1F.asm similarity index 100% rename from text/maps/SSAnne1F.asm rename to text/SSAnne1F.asm diff --git a/text/SSAnne1FRooms.asm b/text/SSAnne1FRooms.asm new file mode 100644 index 00000000..da672f8d --- /dev/null +++ b/text/SSAnne1FRooms.asm @@ -0,0 +1,105 @@ +_SSAnne8Text8:: + text "WIGGLYTUFF: Puup" + line "pupuu!@" + text_end + +_SSAnne8BattleText1:: + text "I travel alone" + line "on my journeys!" + + para "My #MON are my" + line "only friends!" + done + +_SSAnne8EndBattleText1:: + text "My, my" + line "friends..." + prompt + +_SSAnne8AfterBattleText1:: + text "You should be" + line "nice to friends!" + done + +_SSAnne8BattleText2:: + text "You pup! How dare" + line "you barge in!" + done + +_SSAnne8EndBattleText2:: + text "Humph!" + line "You rude child!" + prompt + +_SSAnne8AfterBattleText2:: + text "I wish to be left" + line "alone! Get out!" + done + +_SSAnne8BattleText3:: + text "I love #MON!" + line "Do you?" + done + +_SSAnne8EndBattleText3:: + text "Wow! " + line "You're great!" + prompt + +_SSAnne8AfterBattleText3:: + text "Let me be your" + line "friend, OK?" + + para "Then we can trade" + line "#MON!" + done + +_SSAnne8BattleText4:: + text "I collected these" + line "#MON from all" + cont "around the world!" + done + +_SSAnne8EndBattleText4:: + text "Oh no!" + line "I went around the" + cont "world for these!" + prompt + +_SSAnne8AfterBattleText4:: + text "You hurt my poor" + line "worldly #MON!" + + para "I demand that you" + line "heal them at a" + cont "#MON CENTER!" + done + +_SSAnne8Text5:: + text "Waiter, I would" + line "like a cherry pie" + cont "please!" + done + +_SSAnne8Text6:: + text "A cruise is so" + line "elegant yet cozy!" + done + +_SSAnne8Text7:: + text "I always travel" + line "with WIGGLYTUFF!" + done + +_SSAnne8Text9:: + text "We are cruising" + line "around the world." + done + +_SSAnne8Text11:: + text "Ssh! I'm a GLOBAL" + line "POLICE agent!" + + para "I'm on the trail" + line "of TEAM ROCKET!" + done diff --git a/text/maps/SSAnne2F.asm b/text/SSAnne2F.asm similarity index 100% rename from text/maps/SSAnne2F.asm rename to text/SSAnne2F.asm diff --git a/text/maps/SSAnne2FRooms.asm b/text/SSAnne2FRooms.asm similarity index 100% rename from text/maps/SSAnne2FRooms.asm rename to text/SSAnne2FRooms.asm diff --git a/text/maps/SSAnne3F.asm b/text/SSAnne3F.asm similarity index 100% rename from text/maps/SSAnne3F.asm rename to text/SSAnne3F.asm diff --git a/text/SSAnneB1FRooms.asm b/text/SSAnneB1FRooms.asm new file mode 100644 index 00000000..8072fc85 --- /dev/null +++ b/text/SSAnneB1FRooms.asm @@ -0,0 +1,114 @@ +_SSAnne10Text8:: + text "MACHOKE: Gwoh!" + line "Goggoh!@" + text_end + +_SSAnne10BattleText1:: + text "You know what they" + line "say about sailors" + cont "and fighting!" + done + +_SSAnne10EndBattleText1:: + text "Right!" + line "Good fight, mate!" + prompt + +_SSAnne10AfterBattleText1:: + text "Haha! Want to be" + line "a sailor, mate?" + done + +_SSAnne10BattleText2:: + text "My sailor's pride" + line "is at stake!" + done + +_SSAnne10EndBattleText2:: + text "Your" + line "spirit sank me!" + prompt + +_SSAnne10AfterBattleText2:: + text "Did you see the" + line "FISHING GURU in" + cont "VERMILION CITY?" + done + +_SSAnne10BattleText3:: + text "Us sailors have" + line "#MON too!" + done + +_SSAnne10EndBattleText3:: + text "OK, " + line "you're not bad." + prompt + +_SSAnne10AfterBattleText3:: + text "We caught all our" + line "#MON while" + cont "out at sea!" + done + +_SSAnne10BattleText4:: + text "I like feisty" + line "kids like you!@" + text_end + +_SSAnne10EndBattleText4:: + text "Argh!" + line "Lost it!" + prompt + +_SSAnne10AfterBattleText4:: + text "Sea #MON live" + line "in deep water." + cont "You'll need a ROD!" + done + +_SSAnne10BattleText5:: + text "Matey, you're" + line "walking the plank" + cont "if you lose!" + done + +_SSAnne10EndBattleText5:: + text "Argh!" + line "Beaten by a kid!" + prompt + +_SSAnne10AfterBattleText5:: + text "Jellyfish some-" + line "times drift into" + cont "the ship." + done + +_SSAnne10BattleText6:: + text "Hello stranger!" + line "Stop and chat!" + + para "All my #MON" + line "are from the sea!" + done + +_SSAnne10EndBattleText6:: + text "Darn!" + line "I let that one" + cont "get away!" + prompt + +_SSAnne10AfterBattleText6:: + text "I was going to" + line "make you my" + cont "assistant too!" + done + +_SSAnne10Text7:: + text "My buddy, MACHOKE," + line "is super strong!" + + para "He has enough" + line "STRENGTH to move" + cont "big rocks!" + done diff --git a/text/maps/SSAnneBow.asm b/text/SSAnneBow.asm similarity index 100% rename from text/maps/SSAnneBow.asm rename to text/SSAnneBow.asm diff --git a/text/SSAnneCaptainsRoom.asm b/text/SSAnneCaptainsRoom.asm new file mode 100644 index 00000000..5216cf04 --- /dev/null +++ b/text/SSAnneCaptainsRoom.asm @@ -0,0 +1,64 @@ +_SSAnne7RubText:: + text "CAPTAIN: Ooargh..." + line "I feel hideous..." + cont "Urrp! Seasick..." + + para " rubbed" + line "the CAPTAIN's" + cont "back!" + + para "Rub-rub..." + line "Rub-rub...@" + text_end + +_ReceivingHM01Text:: + text "CAPTAIN: Whew!" + line "Thank you! I" + cont "feel much better!" + + para "You want to see" + line "my CUT technique?" + + para "I could show you" + line "if I wasn't ill..." + + para "I know! You can" + line "have this!" + + para "Teach it to your" + line "#MON and you" + cont "can see it CUT" + cont "any time!" + prompt + +_ReceivedHM01Text:: + text " got" + line "@" + text_ram wcf4b + text "!@" + text_end + +_SSAnne7Text_61932:: + text "CAPTAIN: Whew!" + + para "Now that I'm not" + line "sick any more, I" + cont "guess it's time." + done + +_HM01NoRoomText:: + text "Oh no! You have" + line "no room for this!" + done + +_SSAnne7Text2:: + text "Yuck! Shouldn't" + line "have looked!" + done + +_SSAnne7Text3:: + text "How to Conquer" + line "Seasickness..." + cont "The CAPTAIN's" + cont "reading this!" + done diff --git a/text/maps/SSAnneKitchen.asm b/text/SSAnneKitchen.asm similarity index 100% rename from text/maps/SSAnneKitchen.asm rename to text/SSAnneKitchen.asm diff --git a/text/maps/SafariZoneCenter.asm b/text/SafariZoneCenter.asm similarity index 100% rename from text/maps/SafariZoneCenter.asm rename to text/SafariZoneCenter.asm diff --git a/text/maps/SafariZoneCenterRestHouse.asm b/text/SafariZoneCenterRestHouse.asm similarity index 100% rename from text/maps/SafariZoneCenterRestHouse.asm rename to text/SafariZoneCenterRestHouse.asm diff --git a/text/maps/SafariZoneEast.asm b/text/SafariZoneEast.asm similarity index 100% rename from text/maps/SafariZoneEast.asm rename to text/SafariZoneEast.asm diff --git a/text/maps/SafariZoneEastRestHouse.asm b/text/SafariZoneEastRestHouse.asm similarity index 100% rename from text/maps/SafariZoneEastRestHouse.asm rename to text/SafariZoneEastRestHouse.asm diff --git a/text/SafariZoneGate.asm b/text/SafariZoneGate.asm new file mode 100644 index 00000000..59a7c2af --- /dev/null +++ b/text/SafariZoneGate.asm @@ -0,0 +1,97 @@ +_SafariZoneEntranceText1:: + text "Welcome to the" + line "SAFARI ZONE!" + done + +SafariZoneEntranceText_9e6e4:: + text "For just ¥500," + line "you can catch all" + cont "the #MON you" + cont "want in the park!" + + para "Would you like to" + line "join the hunt?@" + text_end + +SafariZoneEntranceText_9e747:: + text "That'll be ¥500" + line "please!" + + para "We only use a" + line "special # BALL" + cont "here." + + para " received" + line "30 SAFARI BALLs!@" + text_end + +_SafariZoneEntranceText_75360:: + text_start + + para "We'll call you on" + line "the PA when you" + cont "run out of time" + cont "or SAFARI BALLs!" + done + +_SafariZoneEntranceText_75365:: + text "OK! Please come" + line "again!" + done + +_SafariZoneEntranceText_7536a:: + text "Oops! Not enough" + line "money!" + done + +SafariZoneEntranceText_9e814:: + text "Leaving early?@" + text_end + +_SafariZoneEntranceText_753bb:: + text "Please return any" + line "SAFARI BALLs you" + cont "have left." + done + +_SafariZoneEntranceText_753c0:: + text "Good Luck!" + done + +_SafariZoneEntranceText_753c5:: + text "Did you get a" + line "good haul?" + cont "Come again!" + done + +_SafariZoneEntranceText_753e6:: + text "Hi! Is it your" + line "first time here?" + done + +_SafariZoneEntranceText_753eb:: + text "SAFARI ZONE has 4" + line "zones in it." + + para "Each zone has" + line "different kinds" + cont "of #MON. Use" + cont "SAFARI BALLs to" + cont "catch them!" + + para "When you run out" + line "of time or SAFARI" + cont "BALLs, it's game" + cont "over for you!" + + para "Before you go," + line "open an unused" + cont "#MON BOX so" + cont "there's room for" + cont "new #MON!" + done + +_SafariZoneEntranceText_753f0:: + text "Sorry, you're a" + line "regular here!" + done diff --git a/text/maps/SafariZoneNorth.asm b/text/SafariZoneNorth.asm similarity index 100% rename from text/maps/SafariZoneNorth.asm rename to text/SafariZoneNorth.asm diff --git a/text/maps/SafariZoneNorthRestHouse.asm b/text/SafariZoneNorthRestHouse.asm similarity index 100% rename from text/maps/SafariZoneNorthRestHouse.asm rename to text/SafariZoneNorthRestHouse.asm diff --git a/text/SafariZoneSecretHouse.asm b/text/SafariZoneSecretHouse.asm new file mode 100644 index 00000000..8aff18b7 --- /dev/null +++ b/text/SafariZoneSecretHouse.asm @@ -0,0 +1,45 @@ +_SecretHouseText_4a350:: + text "Ah! Finally!" + + para "You're the first" + line "person to reach" + cont "the SECRET HOUSE!" + + para "I was getting" + line "worried that no" + cont "one would win our" + cont "campaign prize." + + para "Congratulations!" + line "You have won!" + prompt + +_ReceivedHM03Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_HM03ExplanationText:: + text "HM03 is SURF!" + + para "#MON will be" + line "able to ferry you" + cont "across water!" + + para "And, this HM isn't" + line "disposable! You" + cont "can use it over" + cont "and over!" + + para "You're super lucky" + line "for winning this" + cont "fabulous prize!" + done + +_HM03NoRoomText:: + text "You don't have" + line "room for this" + cont "fabulous prize!" + done diff --git a/text/maps/SafariZoneWest.asm b/text/SafariZoneWest.asm similarity index 100% rename from text/maps/SafariZoneWest.asm rename to text/SafariZoneWest.asm diff --git a/text/maps/SafariZoneWestRestHouse.asm b/text/SafariZoneWestRestHouse.asm similarity index 100% rename from text/maps/SafariZoneWestRestHouse.asm rename to text/SafariZoneWestRestHouse.asm diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm new file mode 100644 index 00000000..ae9c44f2 --- /dev/null +++ b/text/SaffronCity.asm @@ -0,0 +1,152 @@ +_SaffronCityText1:: + text "What do you want?" + line "Get lost!" + done + +_SaffronCityText2:: + text "BOSS said he'll" + line "take this town!" + done + +_SaffronCityText3:: + text "Get out of the" + line "way!" + done + +_SaffronCityText4:: + text "SAFFRON belongs" + line "to TEAM ROCKET!" + done + +_SaffronCityText5:: + text "Being evil makes" + line "me feel so alive!" + done + +_SaffronCityText6:: + text "Ow! Watch where" + line "you're walking!" + done + +_SaffronCityText7:: + text "With SILPH under" + line "control, we can" + cont "exploit #MON" + cont "around the world!" + done + +_SaffronCityText8:: + text "You beat TEAM" + line "ROCKET all alone?" + cont "That's amazing!" + done + +_SaffronCityText9:: + text "Yeah! TEAM ROCKET" + line "is gone!" + cont "It's safe to go" + cont "out again!" + done + +_SaffronCityText10:: + text "People should be" + line "flocking back to" + cont "SAFFRON now." + done + +_SaffronCityText11:: + text "I flew here on my" + line "PIDGEOT when I" + cont "read about SILPH." + + para "It's already over?" + line "I missed the" + cont "media action." + done + +_SaffronCityText12:: + text "PIDGEOT: Bi bibii!@" + text_end + +_SaffronCityText13:: + text "I saw ROCKET" + line "BOSS escaping" + cont "SILPH's building." + done + +_SaffronCityText14:: + text "I'm a security" + line "guard." + + para "Suspicious kids I" + line "don't allow in!" + done + +_SaffronCityText15:: + text "..." + line "Snore..." + + para "Hah! He's taking" + line "a snooze!" + done + +_SaffronCityText16:: + text "SAFFRON CITY" + line "Shining, Golden" + cont "Land of Commerce" + done + +_SaffronCityText17:: + text "FIGHTING DOJO" + done + +_SaffronCityText18:: + text "SAFFRON CITY" + line "#MON GYM" + cont "LEADER: SABRINA" + + para "The Master of" + line "Psychic #MON!" + done + +_SaffronCityText20:: + text "TRAINER TIPS" + + para "FULL HEAL cures" + line "all ailments like" + cont "sleep and burns." + + para "It costs a bit" + line "more, but it's" + cont "more convenient." + done + +_SaffronCityText21:: + text "TRAINER TIPS" + + para "New GREAT BALL" + line "offers improved" + cont "capture rates." + + para "Try it on those" + line "hard-to-catch" + cont "#MON." + done + +_SaffronCityText22:: + text "SILPH CO." + line "OFFICE BUILDING" + done + +_SaffronCityText24:: + text "MR.PSYCHIC's" + line "HOUSE" + done + +_SaffronCityText25:: + text "SILPH's latest" + line "product!" + + para "Release to be" + line "determined..." + done diff --git a/text/maps/SaffronGates.asm b/text/SaffronGates.asm similarity index 93% rename from text/maps/SaffronGates.asm rename to text/SaffronGates.asm index 9bb4601f..4f53553a 100644 --- a/text/maps/SaffronGates.asm +++ b/text/SaffronGates.asm @@ -13,10 +13,11 @@ _SaffronGateText_8aaa9:: cont "..." cont "Huh? I can have" cont "this drink?" - cont "Gee, thanks!@@" + cont "Gee, thanks!@" + text_end _SaffronGateText_1dff1:: - text "" + text_start para "..." line "Glug glug..." diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm new file mode 100644 index 00000000..ae8556c0 --- /dev/null +++ b/text/SaffronGym.asm @@ -0,0 +1,239 @@ +_SaffronGymText_5d162:: + text "I had a vision of" + line "your arrival!" + + para "I have had psychic" + line "powers since I" + cont "was a child." + + para "I first learned" + line "to bend spoons" + cont "with my mind." + + para "I dislike fight-" + line "ing, but if you" + cont "wish, I will show" + cont "you my powers!" + done + +_SaffronGymText_5d167:: + text "I'm" + line "shocked!" + cont "But, a loss is a" + cont "loss." + + para "I admit I didn't" + line "work hard enough" + cont "to win!" + + para "You earned the" + line "MARSHBADGE!@" + text_end + +_SaffronGymText_5d16e:: + text "Everyone has" + line "psychic power!" + cont "People just don't" + cont "realize it!" + done + +_SaffronGymText_5d173:: + text "The MARSHBADGE" + line "makes #MON up" + cont "to L70 obey you!" + + para "Stronger #MON" + line "will become wild," + cont "ignoring your" + cont "orders in battle!" + + para "Just don't raise" + line "your #MON too" + cont "much!" + + para "Wait, please take" + line "this TM with you!" + done + +ReceivedTM46Text:: + text " received" + line "TM46!@" + text_end + +_TM46ExplanationText:: + text_start + + para "TM46 is PSYWAVE!" + line "It uses powerful" + cont "psychic waves to" + cont "inflict damage!" + done + +_TM46NoRoomText:: + text "Your pack is full" + line "of other items!" + done + +_SaffronGymText_5d1e6:: + text "Yo! Champ in" + line "making!" + + para "SABRINA's #MON" + line "use psychic power" + cont "instead of force!" + + para "Fighting #MON" + line "are weak against" + cont "psychic #MON!" + + para "They get creamed" + line "before they can" + cont "even aim a punch!" + done + +_SaffronGymText_5d1eb:: + text "Psychic power," + line "huh?" + + para "If I had that," + line "I'd make a bundle" + cont "at the slots!" + done + +_SaffronGymBattleText1:: + text "SABRINA is younger" + line "than I, but I" + cont "respect her!" + done + +_SaffronGymEndBattleText1:: + text "Not" + line "good enough!" + prompt + +_SaffronGymAfterBattleText1:: + text "In a battle of" + line "equals, the one" + cont "with the stronger" + cont "will wins!" + + para "If you wish" + line "to beat SABRINA," + cont "focus on winning!" + done + +_SaffronGymBattleText2:: + text "Does our unseen" + line "power scare you?" + done + +_SaffronGymEndBattleText2:: + text "I never" + line "foresaw this!" + prompt + +_SaffronGymAfterBattleText2:: + text "Psychic #MON" + line "fear only ghosts" + cont "and bugs!" + done + +_SaffronGymBattleText3:: + text "#MON take on" + line "the appearance of" + cont "their trainers." + + para "Your #MON must" + line "be tough, then!" + done + +_SaffronGymEndBattleText3:: + text "I knew" + line "it!" + prompt + +_SaffronGymAfterBattleText3:: + text "I must teach" + line "better techniques" + cont "to my #MON!" + done + +_SaffronGymBattleText4:: + text "You know that" + line "power alone isn't" + cont "enough!" + done + +_SaffronGymEndBattleText4:: + text "I don't" + line "believe this!" + prompt + +_SaffronGymAfterBattleText4:: + text "SABRINA just wiped" + line "out the KARATE" + cont "MASTER next door!" + done + +_SaffronGymBattleText5:: + text "You and I, our" + line "#MON shall" + cont "fight!" + done + +_SaffronGymEndBattleText5:: + text "I lost" + line "after all!" + prompt + +_SaffronGymAfterBattleText5:: + text "I knew that this" + line "was going to take" + cont "place." + done + +_SaffronGymBattleText6:: + text "SABRINA is young," + line "but she's also" + cont "our LEADER!" + + para "You won't reach" + line "her easily!" + done + +_SaffronGymEndBattleText6:: + text "I lost" + line "my concentration!" + prompt + +_SaffronGymAfterBattleText6:: + text "There used to be" + line "2 #MON GYMs in" + cont "SAFFRON." + + para "The FIGHTING DOJO" + line "next door lost" + cont "its GYM status" + cont "when we went and" + cont "creamed them!" + done + +_SaffronGymBattleText7:: + text "SAFFRON #MON" + line "GYM is famous for" + cont "its psychics!" + + para "You want to see" + line "SABRINA!" + cont "I can tell!" + done + +_SaffronGymEndBattleText7:: + text "Arrrgh!" + prompt + +_SaffronGymAfterBattleText7:: + text "That's right! I" + line "used telepathy to" + cont "read your mind!" + done diff --git a/text/maps/SaffronMart.asm b/text/SaffronMart.asm similarity index 100% rename from text/maps/SaffronMart.asm rename to text/SaffronMart.asm diff --git a/text/SaffronPidgeyHouse.asm b/text/SaffronPidgeyHouse.asm new file mode 100644 index 00000000..d8666a07 --- /dev/null +++ b/text/SaffronPidgeyHouse.asm @@ -0,0 +1,27 @@ +_SaffronHouse1Text1:: + text "Thank you for" + line "writing. I hope" + cont "to see you soon!" + + para "Hey! Don't look" + line "at my letter!" + done + +_SaffronHouse1Text2:: + text "PIDGEY: Kurukkoo!@" + text_end + +_SaffronHouse1Text3:: + text "The COPYCAT is" + line "cute! I'm getting" + cont "her a # DOLL!" + done + +_SaffronHouse1Text4:: + text "I was given a PP" + line "UP as a gift." + + para "It's used for" + line "increasing the PP" + cont "of techniques!" + done diff --git a/text/maps/SaffronPokecenter.asm b/text/SaffronPokecenter.asm similarity index 100% rename from text/maps/SaffronPokecenter.asm rename to text/SaffronPokecenter.asm diff --git a/text/SeafoamIslandsB4F.asm b/text/SeafoamIslandsB4F.asm new file mode 100644 index 00000000..ea7eeaa2 --- /dev/null +++ b/text/SeafoamIslandsB4F.asm @@ -0,0 +1,14 @@ +_ArticunoBattleText:: + text "Gyaoo!@" + text_end + +_SeafoamIslands5Text4:: + text "Boulders might" + line "change the flow" + cont "of water!" + done + +_SeafoamIslands5Text5:: + text "DANGER" + line "Fast current!" + done diff --git a/text/maps/SilphCo10F.asm b/text/SilphCo10F.asm similarity index 100% rename from text/maps/SilphCo10F.asm rename to text/SilphCo10F.asm diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm new file mode 100644 index 00000000..36adf7d9 --- /dev/null +++ b/text/SilphCo11F.asm @@ -0,0 +1,135 @@ +_SilphCoPresidentText:: + text "PRESIDENT: Thank" + line "you for saving" + cont "SILPH!" + + para "I will never" + line "forget you saved" + cont "us in our moment" + cont "of peril!" + + para "I have to thank" + line "you in some way!" + + para "Because I am rich," + line "I can give you" + cont "anything!" + + para "Here, maybe this" + line "will do!" + prompt + +_ReceivedSilphCoMasterBallText:: + text " got a" + line "@" + text_ram wcf4b + text "!@" + text_end + +_SilphCo10Text_6231c:: + text "PRESIDENT: You" + line "can't buy that" + cont "anywhere!" + + para "It's our secret" + line "prototype MASTER" + cont "BALL!" + + para "It will catch any" + line "#MON without" + cont "fail!" + + para "You should be" + line "quiet about using" + cont "it, though." + done + +_SilphCoMasterBallNoRoomText:: + text "You have no" + line "room for this." + done + +_SilphCo11Text2:: + text "SECRETARY: Thank" + line "you for rescuing" + cont "all of us!" + + para "We admire your" + line "courage." + done + +_SilphCo11Text3:: + text "Ah !" + line "So we meet again!" + + para "The PRESIDENT and" + line "I are discussing" + cont "a vital business" + cont "proposition." + + para "Keep your nose" + line "out of grown-up" + cont "matters..." + + para "Or, experience a" + line "world of pain!" + done + +_SilphCo10Text_62330:: + text "Arrgh!!" + line "I lost again!?" + prompt + +_SilphCo10Text_62335:: + text "Blast it all!" + line "You ruined our" + cont "plans for SILPH!" + + para "But, TEAM ROCKET" + line "will never fall!" + + para "! Never" + line "forget that all" + cont "#MON exist" + cont "for TEAM ROCKET!" + + para "I must go, but I" + line "shall return!" + done + +_SilphCo11BattleText1:: + text "Stop right there!" + line "Don't you move!" + done + +_SilphCo11EndBattleText1:: + text "Don't..." + line "Please!" + prompt + +_SilphCo11AfterBattleText1:: + text "So, you want to" + line "see my BOSS?" + done + +_SilphCo11BattleText2:: + text "Halt! Do you have" + line "an appointment" + cont "with my BOSS?" + done + +_SilphCo11EndBattleText2:: + text "Gaah!" + line "Demolished!" + prompt + +_SilphCo11AfterBattleText2:: + text "Watch your step," + line "my BOSS likes his" + cont "#MON tough!" + done + +_SilphCo10Text_6237b:: + text "The monitor has" + line "#MON on it!" + done diff --git a/text/maps/SilphCo1F.asm b/text/SilphCo1F.asm similarity index 100% rename from text/maps/SilphCo1F.asm rename to text/SilphCo1F.asm diff --git a/text/SilphCo2F.asm b/text/SilphCo2F.asm new file mode 100644 index 00000000..b0cce269 --- /dev/null +++ b/text/SilphCo2F.asm @@ -0,0 +1,97 @@ +_SilphCo2Text_59ded:: + text "Eeek!" + line "No! Stop! Help!" + + para "Oh, you're not" + line "with TEAM ROCKET." + cont "I thought..." + cont "I'm sorry. Here," + cont "please take this!" + prompt + +_ReceivedTM36Text:: + text " got" + line "@" + text_ram wcf4b + text "!@" + text_end + +_TM36ExplanationText:: + text "TM36 is" + line "SELFDESTRUCT!" + + para "It's powerful, but" + line "the #MON that" + cont "uses it faints!" + cont "Be careful." + done + +_TM36NoRoomText:: + text "You don't have any" + line "room for this." + done + +_SilphCo2BattleText1:: + text "Help! I'm a SILPH" + line "employee." + done + +_SilphCo2EndBattleText1:: + text "How" + line "did you know I" + cont "was a ROCKET?" + prompt + +_SilphCo2AfterBattleText1:: + text "I work for both" + line "SILPH and TEAM" + cont "ROCKET!" + done + +_SilphCo2BattleText2:: + text "It's off limits" + line "here! Go home!" + done + +_SilphCo2EndBattleText2:: + text "You're" + line "good." + prompt + +_SilphCo2AfterBattleText2:: + text "Can you solve the" + line "maze in here?" + done + +_SilphCo2BattleText3:: + text "No kids are" + line "allowed in here!" + done + +_SilphCo2EndBattleText3:: + text "Tough!" + prompt + +_SilphCo2AfterBattleText3:: + text "Diamond shaped" + line "tiles are" + cont "teleport blocks!" + + para "They're hi-tech" + line "transporters!" + done + +_SilphCo2BattleText4:: + text "Hey kid! What are" + line "you doing here?" + done + +_SilphCo2EndBattleText4:: + text "I goofed!" + prompt + +_SilphCo2AfterBattleText4:: + text "SILPH CO. will" + line "be merged with" + cont "TEAM ROCKET!" + done diff --git a/text/maps/SilphCo3F.asm b/text/SilphCo3F.asm similarity index 100% rename from text/maps/SilphCo3F.asm rename to text/SilphCo3F.asm diff --git a/text/maps/SilphCo4F.asm b/text/SilphCo4F.asm similarity index 100% rename from text/maps/SilphCo4F.asm rename to text/SilphCo4F.asm diff --git a/text/maps/SilphCo5F.asm b/text/SilphCo5F.asm similarity index 100% rename from text/maps/SilphCo5F.asm rename to text/SilphCo5F.asm diff --git a/text/maps/SilphCo5F_2.asm b/text/SilphCo5F_2.asm similarity index 100% rename from text/maps/SilphCo5F_2.asm rename to text/SilphCo5F_2.asm diff --git a/text/maps/SilphCo6F.asm b/text/SilphCo6F.asm similarity index 100% rename from text/maps/SilphCo6F.asm rename to text/SilphCo6F.asm diff --git a/text/maps/SilphCo7F.asm b/text/SilphCo7F.asm similarity index 100% rename from text/maps/SilphCo7F.asm rename to text/SilphCo7F.asm diff --git a/text/maps/SilphCo8F.asm b/text/SilphCo8F.asm similarity index 100% rename from text/maps/SilphCo8F.asm rename to text/SilphCo8F.asm diff --git a/text/maps/SilphCo9F.asm b/text/SilphCo9F.asm similarity index 100% rename from text/maps/SilphCo9F.asm rename to text/SilphCo9F.asm diff --git a/text/maps/UndergroundPathRoute6.asm b/text/UndergroundPathRoute6.asm similarity index 100% rename from text/maps/UndergroundPathRoute6.asm rename to text/UndergroundPathRoute6.asm diff --git a/text/maps/UndergroundPathRoute7.asm b/text/UndergroundPathRoute7.asm similarity index 100% rename from text/maps/UndergroundPathRoute7.asm rename to text/UndergroundPathRoute7.asm diff --git a/text/maps/UndergroundPathRoute7Copy.asm b/text/UndergroundPathRoute7Copy.asm similarity index 100% rename from text/maps/UndergroundPathRoute7Copy.asm rename to text/UndergroundPathRoute7Copy.asm diff --git a/text/maps/UndergroundPathRoute8.asm b/text/UndergroundPathRoute8.asm similarity index 100% rename from text/maps/UndergroundPathRoute8.asm rename to text/UndergroundPathRoute8.asm diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm new file mode 100644 index 00000000..2f60eb97 --- /dev/null +++ b/text/VermilionCity.asm @@ -0,0 +1,127 @@ +_VermilionCityText1:: + text "We're careful" + line "about pollution!" + + para "We've heard GRIMER" + line "multiplies in" + cont "toxic sludge!" + done + +_VermilionCityTextDidYouSee:: + text "Did you see S.S." + line "ANNE moored in" + cont "the harbor?" + done + +_VermilionCityTextSSAnneDeparted:: + text "So, S.S.ANNE has" + line "departed!" + + para "She'll be back in" + line "about a year." + done + +_SSAnneWelcomeText4:: + text "Welcome to S.S." + line "ANNE!" + done + +_SSAnneWelcomeText9:: + text "Welcome to S.S." + line "ANNE!" + + para "Excuse me, do you" + line "have a ticket?" + prompt + +_SSAnneFlashedTicketText:: + text " flashed" + line "the S.S.TICKET!" + + para "Great! Welcome to" + line "S.S.ANNE!" + done + +_SSAnneNoTicketText:: + text " doesn't" + line "have the needed" + cont "S.S.TICKET." + + para "Sorry!" + + para "You need a ticket" + line "to get aboard." + done + +_SSAnneNotHereText:: + text "The ship set sail." + done + +_VermilionCityText4:: + text "I'm putting up a" + line "building on this" + cont "plot of land." + + para "My #MON is" + line "tamping the land." + done + +_VermilionCityText5:: + text "MACHOP: Guoh!" + line "Gogogoh!@" + text_end + +_VermilionCityText14:: + text_start + para "A MACHOP is" + line "stomping the land" + cont "flat." + done + +_VermilionCityText6:: + text "S.S.ANNE is a" + line "famous luxury" + cont "cruise ship." + + para "We visit VERMILION" + line "once a year." + done + +_VermilionCityText7:: + text "VERMILION CITY" + line "The Port of" + cont "Exquisite Sunsets" + done + +_VermilionCityText8:: + text "NOTICE!" + + para "ROUTE 12 may be" + line "blocked off by a" + cont "sleeping #MON." + + para "Detour through" + line "ROCK TUNNEL to" + cont "LAVENDER TOWN." + + para "VERMILION POLICE" + done + +_VermilionCityText11:: + text "#MON FAN CLUB" + line "All #MON fans" + cont "welcome!" + done + +_VermilionCityText12:: + text "VERMILION CITY" + line "#MON GYM" + cont "LEADER: LT.SURGE" + + para "The Lightning " + line "American!" + done + +_VermilionCityText13:: + text "VERMILION HARBOR" + done diff --git a/text/VermilionDock.asm b/text/VermilionDock.asm new file mode 100644 index 00000000..aaf1ed34 --- /dev/null +++ b/text/VermilionDock.asm @@ -0,0 +1,3 @@ +_VermilionDockText1:: + text_start + done diff --git a/text/VermilionGym.asm b/text/VermilionGym.asm new file mode 100644 index 00000000..14e0bcea --- /dev/null +++ b/text/VermilionGym.asm @@ -0,0 +1,21 @@ +_LTSurgePreBattleText:: + text "Hey, kid! What do" + line "you think you're" + cont "doing here?" + + para "You won't live" + line "long in combat!" + cont "That's for sure!" + + para "I tell you kid," + line "electric #MON" + cont "saved me during" + cont "the war!" + + para "They zapped my" + line "enemies into" + cont "paralysis!" + + para "The same as I'll" + line "do to you!" + done diff --git a/text/maps/VermilionGym_2.asm b/text/VermilionGym_2.asm similarity index 92% rename from text/maps/VermilionGym_2.asm rename to text/VermilionGym_2.asm index 7f645d59..bf50422d 100644 --- a/text/maps/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -1,4 +1,4 @@ -_VermilionGymText_5cb72:: +_LTSurgePostBattleAdviceText:: text "A little word of" line "advice, kid!" @@ -10,7 +10,7 @@ _VermilionGymText_5cb72:: cont "type #MON!" done -_VermilionGymText_5cb77:: +_LTSurgeThunderbadgeInfoText:: text "The THUNDERBADGE" line "cranks up your" cont "#MON's SPEED!" @@ -26,11 +26,12 @@ _VermilionGymText_5cb77:: _ReceivedTM24Text:: text " received " line "@" - TX_RAM wcf4b - text "!@@" + text_ram wcf4b + text "!@" + text_end _TM24ExplanationText:: - text "" + text_start para "TM24 contains" line "THUNDERBOLT!" @@ -112,7 +113,7 @@ _VermilionGymAfterBattleText3:: cont "next to it!" done -_VermilionGymText_5cbf4:: +_VermilionGymFanPreBattleText:: text "Yo! Champ in" line "making!" @@ -138,7 +139,7 @@ _VermilionGymText_5cbf4:: cont "get to him!" done -_VermilionGymText_5cbf9:: +_VermilionGymFanPostBattleText:: text "Whew! That match" line "was electric!" done diff --git a/text/maps/VermilionMart.asm b/text/VermilionMart.asm similarity index 100% rename from text/maps/VermilionMart.asm rename to text/VermilionMart.asm diff --git a/text/VermilionOldRodHouse.asm b/text/VermilionOldRodHouse.asm new file mode 100644 index 00000000..d9a94cd4 --- /dev/null +++ b/text/VermilionOldRodHouse.asm @@ -0,0 +1,55 @@ +_VermilionHouse2Text_560b1:: + text "I'm the FISHING" + line "GURU!" + + para "I simply Looove" + line "fishing!" + + para "Do you like to" + line "fish?" + done + +_VermilionHouse2Text_560b6:: + text "Grand! I like" + line "your style!" + + para "Take this and" + line "fish, young one!" + + para " received" + line "an @" + text_ram wcf4b + text "!@" + text_end + +_VermilionHouse2Text_560bb:: + text_start + + para "Fishing is a way" + line "of life!" + + para "From the seas to" + line "rivers, go out" + cont "and land the big" + cont "one, young one!" + done + +_VermilionHouse2Text_560c0:: + text "Oh... That's so" + line "disappointing..." + done + +_VermilionHouse2Text_560c5:: + text "Hello there," + line "!" + + para "How are the fish" + line "biting?" + done + +_VermilionHouse2Text_560ca:: + text "Oh no!" + + para "You have no room" + line "for my gift!" + done diff --git a/text/VermilionPidgeyHouse.asm b/text/VermilionPidgeyHouse.asm new file mode 100644 index 00000000..858e84f3 --- /dev/null +++ b/text/VermilionPidgeyHouse.asm @@ -0,0 +1,22 @@ +_VermilionHouse1Text1:: + text "I'm getting my" + line "PIDGEY to fly a" + cont "letter to SAFFRON" + cont "in the north!" + done + +_VermilionHouse1Text2:: + text "PIDGEY: Kurukkoo!@" + text_end + +_VermilionHouse1Text3:: + text "Dear PIPPI, I hope" + line "to see you soon." + + para "I heard SAFFRON" + line "has problems with" + cont "TEAM ROCKET." + + para "VERMILION appears" + line "to be safe." + done diff --git a/text/maps/VermilionPokecenter.asm b/text/VermilionPokecenter.asm similarity index 100% rename from text/maps/VermilionPokecenter.asm rename to text/VermilionPokecenter.asm diff --git a/text/maps/VictoryRoad1F.asm b/text/VictoryRoad1F.asm similarity index 100% rename from text/maps/VictoryRoad1F.asm rename to text/VictoryRoad1F.asm diff --git a/text/VictoryRoad2F.asm b/text/VictoryRoad2F.asm new file mode 100644 index 00000000..ff72afaa --- /dev/null +++ b/text/VictoryRoad2F.asm @@ -0,0 +1,86 @@ +_MoltresBattleText:: + text "Gyaoo!@" + text_end + +_VictoryRoad2BattleText1:: + text "VICTORY ROAD is" + line "the final test" + cont "for trainers!" + done + +_VictoryRoad2EndBattleText1:: + text "Aiyah!" + prompt + +_VictoryRoad2AfterBattleText1:: + text "If you get stuck," + line "try moving some" + cont "boulders around!" + done + +_VictoryRoad2BattleText2:: + text "Ah, so you wish" + line "to challenge the" + cont "ELITE FOUR?" + done + +_VictoryRoad2EndBattleText2:: + text "You" + line "got me!" + prompt + +_VictoryRoad2AfterBattleText2:: + text " also came" + line "through here!" + done + +_VictoryRoad2BattleText3:: + text "Come on!" + line "I'll whip you!" + done + +_VictoryRoad2EndBattleText3:: + text "I got" + line "whipped!" + prompt + +_VictoryRoad2AfterBattleText3:: + text "You earned the" + line "right to be on" + cont "VICTORY ROAD!" + done + +_VictoryRoad2BattleText4:: + text "If you can get" + line "through here, you" + cont "can go meet the" + cont "ELITE FOUR!" + done + +_VictoryRoad2EndBattleText4:: + text "No!" + line "Unbelievable!" + prompt + +_VictoryRoad2AfterBattleText4:: + text "I can beat you" + line "when it comes to" + cont "knowledge about" + cont "#MON!" + done + +_VictoryRoad2BattleText5:: + text "Is VICTORY ROAD" + line "too tough?" + done + +_VictoryRoad2EndBattleText5:: + text "Well" + line "done!" + prompt + +_VictoryRoad2AfterBattleText5:: + text "Many trainers give" + line "up the challenge" + cont "here." + done diff --git a/text/maps/VictoryRoad3F.asm b/text/VictoryRoad3F.asm similarity index 100% rename from text/maps/VictoryRoad3F.asm rename to text/VictoryRoad3F.asm diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm new file mode 100644 index 00000000..8ee81348 --- /dev/null +++ b/text/ViridianCity.asm @@ -0,0 +1,181 @@ +_ViridianCityText1:: + text "Those # BALLs" + line "at your waist!" + cont "You have #MON!" + + para "It's great that" + line "you can carry and" + cont "use #MON any" + cont "time, anywhere!" + done + +_ViridianCityText_19122:: + text "This #MON GYM" + line "is always closed." + + para "I wonder who the" + line "LEADER is?" + done + +_ViridianCityText_19127:: + text "VIRIDIAN GYM's" + line "LEADER returned!" + done + +_ViridianCityText_1914d:: + text "You want to know" + line "about the 2 kinds" + cont "of caterpillar" + cont "#MON?" + done + +_ViridianCityText_19152:: + text "Oh, OK then!" + done + +_ViridianCityText_19157:: + text "CATERPIE has no" + line "poison, but" + cont "WEEDLE does." + + para "Watch out for its" + line "POISON STING!" + done + +_ViridianCityText_19175:: + text "Oh Grandpa! Don't" + line "be so mean!" + cont "He hasn't had his" + cont "coffee yet." + done + +_ViridianCityText_1917a:: + text "When I go shop in" + line "PEWTER CITY, I" + cont "have to take the" + cont "winding trail in" + cont "VIRIDIAN FOREST." + done + +_ViridianCityText_19191:: + text "You can't go" + line "through here!" + + para "This is private" + line "property!" + done + +_ViridianCityText_191ca:: + text "Yawn!" + line "I must have dozed" + cont "off in the sun." + + para "I had this dream" + line "about a DROWZEE" + cont "eating my dream." + cont "What's this?" + cont "Where did this TM" + cont "come from?" + + para "This is spooky!" + line "Here, you can" + cont "have this TM." + prompt + +_ReceivedTM42Text:: + text " received" + line "TM42!@" + text_end + +_TM42Explanation:: + text "TM42 contains" + line "DREAM EATER..." + cont "...Snore..." + done + +_TM42NoRoomText:: + text "You have too much" + line "stuff already." + done + +_ViridianCityText_1920a:: + text "Ahh, I've had my" + line "coffee now and I" + cont "feel great!" + + para "Sure you can go" + line "through!" + + para "Are you in a" + line "hurry?" + done + +_ViridianCityText_1920f:: + text "I see you're using" + line "a #DEX." + + para "When you catch a" + line "#MON, #DEX" + cont "is automatically" + cont "updated." + + para "What? Don't you" + line "know how to catch" + cont "#MON?" + + para "I'll show you" + line "how to then." + done + +_ViridianCityText_19214:: + text "Time is money..." + line "Go along then." + done + +_ViridianCityText_19219:: + text "First, you need" + line "to weaken the" + cont "target #MON." + done + +_ViridianCityText8:: + text "VIRIDIAN CITY " + line "The Eternally" + cont "Green Paradise" + done + +_ViridianCityText9:: + text "TRAINER TIPS" + + para "Catch #MON" + line "and expand your" + cont "collection!" + + para "The more you have," + line "the easier it is" + cont "to fight!" + done + +_ViridianCityText10:: + text "TRAINER TIPS" + + para "The battle moves" + line "of #MON are" + cont "limited by their" + cont "POWER POINTs, PP." + + para "To replenish PP," + line "rest your tired" + cont "#MON at a" + cont "#MON CENTER!" + done + +_ViridianCityText13:: + text "VIRIDIAN CITY" + line "#MON GYM" + done + +_ViridianCityText14:: + text "The GYM's doors" + line "are locked..." + done diff --git a/text/maps/ViridianForest.asm b/text/ViridianForest.asm similarity index 100% rename from text/maps/ViridianForest.asm rename to text/ViridianForest.asm diff --git a/text/maps/ViridianForestNorthGate.asm b/text/ViridianForestNorthGate.asm similarity index 100% rename from text/maps/ViridianForestNorthGate.asm rename to text/ViridianForestNorthGate.asm diff --git a/text/maps/ViridianForestSouthGate.asm b/text/ViridianForestSouthGate.asm similarity index 100% rename from text/maps/ViridianForestSouthGate.asm rename to text/ViridianForestSouthGate.asm diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm new file mode 100644 index 00000000..2b1f67ae --- /dev/null +++ b/text/ViridianGym.asm @@ -0,0 +1,240 @@ +_ViridianGymText_74ace:: + text "Fwahahaha! This is" + line "my hideout!" + + para "I planned to" + line "resurrect TEAM" + cont "ROCKET here!" + + para "But, you have" + line "caught me again!" + cont "So be it! This" + cont "time, I'm not" + cont "holding back!" + + para "Once more, you" + line "shall face" + cont "GIOVANNI, the" + cont "greatest trainer!" + done + +_ViridianGymText_74ad3:: + text "Ha!" + line "That was a truly" + cont "intense fight!" + cont "You have won!" + cont "As proof, here is" + cont "the EARTHBADGE!@" + text_end + +_ViridianGymText_74ad9:: + text "Having lost, I" + line "cannot face my" + cont "underlings!" + cont "TEAM ROCKET is" + cont "finished forever!" + + para "I will dedicate my" + line "life to the study" + cont "of #MON!" + + para "Let us meet again" + line "some day!" + cont "Farewell!@" + text_end + +_ViridianGymText12:: + text "The EARTHBADGE" + line "makes #MON of" + cont "any level obey!" + + para "It is evidence of" + line "your mastery as a" + cont "#MON trainer!" + + para "With it, you can" + line "enter the #MON" + cont "LEAGUE!" + + para "It is my gift for" + line "your #MON" + cont "LEAGUE challenge!" + done + +_ReceivedTM27Text:: + text " received" + line "TM27!@" + text_end + +_TM27ExplanationText:: + text_start + + para "TM27 is FISSURE!" + line "It will take out" + cont "#MON with just" + cont "one hit!" + + para "I made it when I" + line "ran the GYM here," + cont "too long ago..." + done + +_TM27NoRoomText:: + text "You do not have" + line "space for this!" + done + +_ViridianGymBattleText1:: + text "Heh! You must be" + line "running out of" + cont "steam by now!" + done + +_ViridianGymEndBattleText1:: + text "I" + line "ran out of gas!" + prompt + +_ViridianGymAfterBattleText1:: + text "You need power to" + line "keep up with our" + cont "GYM LEADER!" + done + +_ViridianGymBattleText2:: + text "Rrrroar! I'm" + line "working myself" + cont "into a rage!" + done + +_ViridianGymEndBattleText2:: + text "Wargh!" + prompt + +_ViridianGymAfterBattleText2:: + text "I'm still not" + line "worthy!" + done + +_ViridianGymBattleText3:: + text "#MON and I, we" + line "make wonderful" + cont "music together!" + done + +_ViridianGymEndBattleText3:: + text "You are in" + line "perfect harmony!" + prompt + +_ViridianGymAfterBattleText3:: + text "Do you know the" + line "identity of our" + cont "GYM LEADER?" + done + +_ViridianGymBattleText4:: + text "Karate is the" + line "ultimate form of" + cont "martial arts!" + done + +_ViridianGymEndBattleText4:: + text "Atcho!" + prompt + +_ViridianGymAfterBattleText4:: + text "If my #MON" + line "were as good at" + cont "Karate as I..." + done + +_ViridianGymBattleText5:: + text "The truly talented" + line "win with style!" + done + +_ViridianGymEndBattleText5:: + text "I" + line "lost my grip!" + prompt + +_ViridianGymAfterBattleText5:: + text "The LEADER will" + line "scold me!" + done + +_ViridianGymBattleText6:: + text "I'm the KARATE" + line "KING! Your fate" + cont "rests with me!" + done + +_ViridianGymEndBattleText6:: + text "Ayah!" + prompt + +_ViridianGymAfterBattleText6:: + text "#MON LEAGUE?" + line "You? Don't get" + cont "cocky!" + done + +_ViridianGymBattleText7:: + text "Your #MON will" + line "cower at the" + cont "crack of my whip!" + done + +_ViridianGymEndBattleText7:: + text "Yowch!" + line "Whiplash!" + prompt + +_ViridianGymAfterBattleText7:: + text "Wait! I was just" + line "careless!" + done + +_ViridianGymBattleText8:: + text "VIRIDIAN GYM was" + line "closed for a long" + cont "time, but now our" + cont "LEADER is back!" + done + +_ViridianGymEndBattleText8:: + text "I" + line "was beaten?" + prompt + +_ViridianGymAfterBattleText8:: + text "You can go onto" + line "#MON LEAGUE" + cont "only by defeating" + cont "our GYM LEADER!" + done + +_ViridianGymText_74bd4:: + text "Yo! Champ in" + line "making!" + + para "Even I don't know" + line "VIRIDIAN LEADER's" + cont "identity!" + + para "This will be the" + line "toughest of all" + cont "the GYM LEADERs!" + + para "I heard that the" + line "trainers here" + cont "like ground-type" + cont "#MON!" + done + +_ViridianGymText_74bd9:: + text "Blow me away!" + line "GIOVANNI was the" + cont "GYM LEADER here?" + done diff --git a/text/ViridianMart.asm b/text/ViridianMart.asm new file mode 100644 index 00000000..640d7fd1 --- /dev/null +++ b/text/ViridianMart.asm @@ -0,0 +1,31 @@ +_ViridianMartText1:: + text "Okay! Say hi to" + line "PROF.OAK for me!" + done + +_ViridianMartText4:: + text "Hey! You came from" + line "PALLET TOWN?" + done + +ViridianMartParcelQuestText:: + text "You know PROF." + line "OAK, right?" + + para "His order came in." + line "Will you take it" + cont "to him?" + + para " got" + line "OAK's PARCEL!@" + text_end + +_ViridianMartText2:: + text "This shop sells" + line "many ANTIDOTEs." + done + +_ViridianMartText3:: + text "No! POTIONs are" + line "all sold out." + done diff --git a/text/maps/ViridianNicknameHouse.asm b/text/ViridianNicknameHouse.asm similarity index 100% rename from text/maps/ViridianNicknameHouse.asm rename to text/ViridianNicknameHouse.asm diff --git a/text/maps/ViridianPokecenter.asm b/text/ViridianPokecenter.asm similarity index 100% rename from text/maps/ViridianPokecenter.asm rename to text/ViridianPokecenter.asm diff --git a/text/maps/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm similarity index 100% rename from text/maps/ViridianSchoolHouse.asm rename to text/ViridianSchoolHouse.asm diff --git a/text/WardensHouse.asm b/text/WardensHouse.asm new file mode 100644 index 00000000..47612904 --- /dev/null +++ b/text/WardensHouse.asm @@ -0,0 +1,86 @@ +_WardenGibberishText1:: + text "WARDEN: Hif fuff" + line "hefifoo!" + + para "Ha lof ha feef ee" + line "hafahi ho. Heff" + cont "hee fwee!" + done + +_WardenGibberishText2:: + text "Ah howhee ho hoo!" + line "Eef ee hafahi ho!" + done + +_WardenGibberishText3:: + text "Ha? He ohay heh" + line "ha hoo ee haheh!" + done + +_WardenTeethText1:: + text " gave the" + line "GOLD TEETH to the" + cont "WARDEN!@" + text_end + +_WardenTeethText2:: + text_start + + para "The WARDEN popped" + line "in his teeth!" + prompt + +_WardenThankYouText:: + text "WARDEN: Thanks," + line "kid! No one could" + cont "understand a word" + cont "that I said." + + para "I couldn't work" + line "that way." + cont "Let me give you" + cont "something for" + cont "your trouble." + prompt + +_ReceivedHM04Text:: + text " received" + line "@" + text_ram wcf4b + text "!@" + text_end + +_HM04ExplanationText:: + text "WARDEN: HM04" + line "teaches STRENGTH!" + + para "It lets #MON" + line "move boulders" + cont "when you're out-" + cont "side of battle." + + para "Oh yes, did you" + line "find SECRET HOUSE" + cont "in SAFARI ZONE?" + + para "If you do, you" + line "win an HM!" + + para "I hear it's the" + line "rare SURF HM." + done + +_HM04NoRoomText:: + text "Your pack is" + line "stuffed full!" + done + +_FuchsiaHouse2Text_75176:: + text "#MON photos" + line "and fossils." + done + +_FuchsiaHouse2Text_7517b:: + text "Old #MON" + line "merchandise." + done diff --git a/text/item_names.asm b/text/item_names.asm deleted file mode 100755 index e436d74d..00000000 --- a/text/item_names.asm +++ /dev/null @@ -1,98 +0,0 @@ -ItemNames: - db "MASTER BALL@" - db "ULTRA BALL@" - db "GREAT BALL@" - db "POKé BALL@" - db "TOWN MAP@" - db "BICYCLE@" - db "?????@" - db "SAFARI BALL@" - db "POKéDEX@" - db "MOON STONE@" - db "ANTIDOTE@" - db "BURN HEAL@" - db "ICE HEAL@" - db "AWAKENING@" - db "PARLYZ HEAL@" - db "FULL RESTORE@" - db "MAX POTION@" - db "HYPER POTION@" - db "SUPER POTION@" - db "POTION@" - db "BOULDERBADGE@" - db "CASCADEBADGE@" - db "THUNDERBADGE@" - db "RAINBOWBADGE@" - db "SOULBADGE@" - db "MARSHBADGE@" - db "VOLCANOBADGE@" - db "EARTHBADGE@" - db "ESCAPE ROPE@" - db "REPEL@" - db "OLD AMBER@" - db "FIRE STONE@" - db "THUNDERSTONE@" - db "WATER STONE@" - db "HP UP@" - db "PROTEIN@" - db "IRON@" - db "CARBOS@" - db "CALCIUM@" - db "RARE CANDY@" - db "DOME FOSSIL@" - db "HELIX FOSSIL@" - db "SECRET KEY@" - db "?????@" - db "BIKE VOUCHER@" - db "X ACCURACY@" - db "LEAF STONE@" - db "CARD KEY@" - db "NUGGET@" - db "PP UP@" - db "POKé DOLL@" - db "FULL HEAL@" - db "REVIVE@" - db "MAX REVIVE@" - db "GUARD SPEC.@" - db "SUPER REPEL@" - db "MAX REPEL@" - db "DIRE HIT@" - db "COIN@" - db "FRESH WATER@" - db "SODA POP@" - db "LEMONADE@" - db "S.S.TICKET@" - db "GOLD TEETH@" - db "X ATTACK@" - db "X DEFEND@" - db "X SPEED@" - db "X SPECIAL@" - db "COIN CASE@" - db "OAK's PARCEL@" - db "ITEMFINDER@" - db "SILPH SCOPE@" - db "POKé FLUTE@" - db "LIFT KEY@" - db "EXP.ALL@" - db "OLD ROD@" - db "GOOD ROD@" - db "SUPER ROD@" - db "PP UP@" - db "ETHER@" - db "MAX ETHER@" - db "ELIXER@" - db "MAX ELIXER@" - db "B2F@" - db "B1F@" - db "1F@" - db "2F@" - db "3F@" - db "4F@" - db "5F@" - db "6F@" - db "7F@" - db "8F@" - db "9F@" - db "10F@" - db "11F@" - db "B4F@" diff --git a/text/map_names.asm b/text/map_names.asm deleted file mode 100755 index cd9f6640..00000000 --- a/text/map_names.asm +++ /dev/null @@ -1,107 +0,0 @@ -MapNames: -PalletTownName: - db "PALLET TOWN@" -ViridianCityName: - db "VIRIDIAN CITY@" -PewterCityName: - db "PEWTER CITY@" -CeruleanCityName: - db "CERULEAN CITY@" -LavenderTownName: - db "LAVENDER TOWN@" -VermilionCityName: - db "VERMILION CITY@" -CeladonCityName: - db "CELADON CITY@" -FuchsiaCityName: - db "FUCHSIA CITY@" -CinnabarIslandName: - db "CINNABAR ISLAND@" -IndigoPlateauName: - db "INDIGO PLATEAU@" -SaffronCityName: - db "SAFFRON CITY@" -Route1Name: - db "ROUTE 1@" -Route2Name: - db "ROUTE 2@" -Route3Name: - db "ROUTE 3@" -Route4Name: - db "ROUTE 4@" -Route5Name: - db "ROUTE 5@" -Route6Name: - db "ROUTE 6@" -Route7Name: - db "ROUTE 7@" -Route8Name: - db "ROUTE 8@" -Route9Name: - db "ROUTE 9@" -Route10Name: - db "ROUTE 10@" -Route11Name: - db "ROUTE 11@" -Route12Name: - db "ROUTE 12@" -Route13Name: - db "ROUTE 13@" -Route14Name: - db "ROUTE 14@" -Route15Name: - db "ROUTE 15@" -Route16Name: - db "ROUTE 16@" -Route17Name: - db "ROUTE 17@" -Route18Name: - db "ROUTE 18@" -Route19Name: - db "SEA ROUTE 19@" -Route20Name: - db "SEA ROUTE 20@" -Route21Name: - db "SEA ROUTE 21@" -Route22Name: - db "ROUTE 22@" -Route23Name: - db "ROUTE 23@" -Route24Name: - db "ROUTE 24@" -Route25Name: - db "ROUTE 25@" -ViridianForestName: - db "VIRIDIAN FOREST@" -MountMoonName: - db "MT.MOON@" -RockTunnelName: - db "ROCK TUNNEL@" -SeaCottageName: - db "SEA COTTAGE@" -SSAnneName: - db "S.S.ANNE@" -PokemonLeagueName: - db "#MON LEAGUE@" -UndergroundPathName: - db "UNDERGROUND PATH@" -PokemonTowerName: - db "#MON TOWER@" -SeafoamIslandsName: - db "SEAFOAM ISLANDS@" -VictoryRoadName: - db "VICTORY ROAD@" -DiglettsCaveName: - db "DIGLETT's CAVE@" -RocketHQName: - db "ROCKET HQ@" -SilphCoName: - db "SILPH CO.@" -PokemonMansionName: - db $4a," MANSION@" -SafariZoneName: - db "SAFARI ZONE@" -CeruleanCaveName: - db "CERULEAN CAVE@" -PowerPlantName: - db "POWER PLANT@" diff --git a/text/maps/BikeShop.asm b/text/maps/BikeShop.asm deleted file mode 100644 index 86799865..00000000 --- a/text/maps/BikeShop.asm +++ /dev/null @@ -1,70 +0,0 @@ -_BikeShopText_1d810:: - text "Hi! Welcome to" - line "our BIKE SHOP." - - para "Have we got just" - line "the BIKE for you!" - prompt - -_BikeShopText_1d815:: - text "It's a cool BIKE!" - line "Do you want it?" - done - -_BikeShopCantAffordText:: - text "Sorry! You can't" - line "afford it!" - prompt - -_BikeShopText_1d81f:: - text "Oh, that's..." - - para "A BIKE VOUCHER!" - - para "OK! Here you go!" - prompt - -_BikeShopText_1d824:: - text " exchanged" - line "the BIKE VOUCHER" - cont "for a BICYCLE.@@" - -_BikeShopComeAgainText:: - text "Come back again" - line "some time!" - done - -_BikeShopText_1d82f:: - text "How do you like" - line "your new BICYCLE?" - - para "You can take it" - line "on CYCLING ROAD" - cont "and in caves!" - done - -_BikeShopText_1d834:: - text "You better make" - line "room for this!" - done - -_BikeShopText_1d843:: - text "A plain city BIKE" - line "is good enough" - cont "for me!" - - para "You can't put a" - line "shopping basket" - cont "on an MTB!" - done - -_BikeShopText_1d85c:: - text "These BIKEs are" - line "cool, but they're" - cont "way expensive!" - done - -_BikeShopText_1d861:: - text "Wow. Your BIKE is" - line "really cool!" - done diff --git a/text/maps/BillsHouse.asm b/text/maps/BillsHouse.asm deleted file mode 100644 index 5ece48d7..00000000 --- a/text/maps/BillsHouse.asm +++ /dev/null @@ -1,87 +0,0 @@ -_BillsHouseText_1e865:: - text "Hiya! I'm a" - line "#MON..." - cont "...No I'm not!" - - para "Call me BILL!" - line "I'm a true blue" - cont "#MANIAC! Hey!" - cont "What's with that" - cont "skeptical look?" - - para "I'm not joshing" - line "you, I screwed up" - cont "an experiment and" - cont "got combined with" - cont "a #MON!" - - para "So, how about it?" - line "Help me out here!" - done - -_BillsHouseText_1e86a:: - text "When I'm in the" - line "TELEPORTER, go to" - cont "my PC and run the" - cont "Cell Separation" - cont "System!" - done - -_BillsHouseText_1e86f:: - text "No!? Come on, you" - line "gotta help a guy" - cont "in deep trouble!" - - para "What do you say," - line "chief? Please?" - cont "OK? All right!" - prompt - -_BillThankYouText:: - text "BILL: Yeehah!" - line "Thanks, bud! I" - cont "owe you one!" - - para "So, did you come" - line "to see my #MON" - cont "collection?" - cont "You didn't?" - cont "That's a bummer." - - para "I've got to thank" - line "you... Oh here," - cont "maybe this'll do." - prompt - -_SSTicketReceivedText:: - text " received" - line "an @" - TX_RAM wcf4b - text "!@@" - -_SSTicketNoRoomText:: - text "You've got too" - line "much stuff, bud!" - done - -_BillsHouseText_1e8cb:: - text "That cruise ship," - line "S.S.ANNE, is in" - cont "VERMILION CITY." - cont "Its passengers" - cont "are all trainers!" - - para "They invited me" - line "to their party," - cont "but I can't stand" - cont "fancy do's. Why" - cont "don't you go" - cont "instead of me?" - done - -_BillsHouseText_1e8da:: - text "BILL: Look, bud," - line "just check out" - cont "some of my rare" - cont "#MON on my PC!" - done diff --git a/text/maps/BluesHouse.asm b/text/maps/BluesHouse.asm deleted file mode 100644 index 1898636a..00000000 --- a/text/maps/BluesHouse.asm +++ /dev/null @@ -1,41 +0,0 @@ -_DaisyInitialText:: - text "Hi !" - line " is out at" - cont "Grandpa's lab." - done - -_DaisyOfferMapText:: - text "Grandpa asked you" - line "to run an errand?" - cont "Here, this will" - cont "help you!" - prompt - -_GotMapText:: - text " got a" - line "@" - TX_RAM wcf4b - text "!@@" - -_DaisyBagFullText:: - text "You have too much" - line "stuff with you." - done - -_DaisyUseMapText:: - text "Use the TOWN MAP" - line "to find out where" - cont "you are." - done - -_BluesHouseText2:: - text "#MON are living" - line "things! If they" - cont "get tired, give" - cont "them a rest!" - done - -_BluesHouseText3:: - text "It's a big map!" - line "This is useful!" - done diff --git a/text/maps/CeladonCity.asm b/text/maps/CeladonCity.asm deleted file mode 100644 index 1dbd5cdf..00000000 --- a/text/maps/CeladonCity.asm +++ /dev/null @@ -1,152 +0,0 @@ -_CeladonCityText1:: - text "I got my KOFFING" - line "in CINNABAR!" - - para "It's nice, but it" - line "breathes poison" - cont "when it's angry!" - done - -_CeladonCityText2:: - text "Heheh! This GYM" - line "is great! It's" - cont "full of women!" - done - -_CeladonCityText3:: - text "The GAME CORNER" - line "is bad for our" - cont "city's image!" - done - -_CeladonCityText4:: - text "Moan! I blew it" - line "all at the slots!" - - para "I knew I should" - line "have cashed in my" - cont "coins for prizes!" - done - -_TM41PreText:: - text "Hello, there!" - - para "I've seen you," - line "but I never had a" - cont "chance to talk!" - - para "Here's a gift for" - line "dropping by!" - prompt - -_ReceivedTM41Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM41ExplanationText:: - text "TM41 teaches" - line "SOFTBOILED!" - - para "Only one #MON" - line "can use it!" - - para "That #MON is" - line "CHANSEY!" - done - -_TM41NoRoomText:: - text "Oh, your pack is" - line "full of items!" - done - -_CeladonCityText6:: - text "This is my trusted" - line "pal, POLIWRATH!" - - para "It evolved from" - line "POLIWHIRL when I" - cont "used WATER STONE!" - done - -_CeladonCityText7:: - text "POLIWRATH: Ribi" - line "ribit!@@" - -_CeladonCityText8:: - text "What are you" - line "staring at?" - done - -_CeladonCityText9:: - text "Keep out of TEAM" - line "ROCKET's way!" - done - -_CeladonCityText10:: - text "TRAINER TIPS" - - para "X ACCURACY boosts" - line "the accuracy of" - cont "techniques!" - - para "DIRE HIT jacks up" - line "the likelihood of" - cont "critical hits!" - - para "Get your items at" - line "CELADON DEPT." - cont "STORE!" - done - -_CeladonCityText11:: - text "CELADON CITY" - line "The City of" - cont "Rainbow Dreams" - done - -_CeladonCityText13:: - text "CELADON CITY" - line "#MON GYM" - cont "LEADER: ERIKA" - - para "The Nature Loving" - line "Princess!" - done - -_CeladonCityText14:: - text "CELADON MANSION" - done - -_CeladonCityText15:: - text "Find what you" - line "need at CELADON" - cont "DEPT. STORE!" - done - -_CeladonCityText16:: - text "TRAINER TIPS" - - para "GUARD SPEC." - line "protects #MON" - cont "against SPECIAL" - cont "attacks such as" - cont "fire and water!" - - para "Get your items at" - line "CELADON DEPT." - cont "STORE!" - done - -_CeladonCityText17:: - text "Coins exchanged" - line "for prizes!" - cont "PRIZE EXCHANGE" - done - -_CeladonCityText18:: - text "ROCKET GAME CORNER" - line "The playground" - cont "for grown-ups!" - done diff --git a/text/maps/CeladonDiner.asm b/text/maps/CeladonDiner.asm deleted file mode 100644 index dc5e9350..00000000 --- a/text/maps/CeladonDiner.asm +++ /dev/null @@ -1,59 +0,0 @@ -_CeladonDinerText1:: - text "Hi!" - - para "We're taking a" - line "break now." - done - -_CeladonDinerText2:: - text "My #MON are" - line "weak, so I often" - cont "have to go to the" - cont "DRUG STORE." - done - -_CeladonDinerText3:: - text "Psst! There's a" - line "basement under" - cont "the GAME CORNER." - done - -_CeladonDinerText4:: - text "Munch..." - - para "The man at that" - line "table lost it all" - cont "at the slots." - done - -_CeladonDinerText_491a7:: - text "Go ahead! Laugh!" - - para "I'm flat out" - line "busted!" - - para "No more slots for" - line "me! I'm going" - cont "straight!" - - para "Here! I won't be" - line "needing this any-" - cont "more!" - prompt - -_ReceivedCoinCaseText:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_CoinCaseNoRoomText:: - text "Make room for" - line "this!" - done - -_CeladonDinerText_491b7:: - text "I always thought" - line "I was going to" - cont "win it back..." - done diff --git a/text/maps/CeladonGym.asm b/text/maps/CeladonGym.asm deleted file mode 100644 index d6586035..00000000 --- a/text/maps/CeladonGym.asm +++ /dev/null @@ -1,219 +0,0 @@ -_CeladonGymText_48a5e:: - text "Hello. Lovely" - line "weather isn't it?" - cont "It's so pleasant." - - para "...Oh dear..." - line "I must have dozed" - cont "off. Welcome." - - para "My name is ERIKA." - line "I am the LEADER" - cont "of CELADON GYM." - - para "I teach the art of" - line "flower arranging." - cont "My #MON are of" - cont "the grass-type." - - para "Oh, I'm sorry, I" - line "had no idea that" - cont "you wished to" - cont "challenge me." - - para "Very well, but I" - line "shall not lose." - done - -_CeladonGymText_48a63:: - text "Oh!" - line "I concede defeat." - - para "You are remarkably" - line "strong." - - para "I must confer you" - line "the RAINBOWBADGE." - prompt - -_CeladonGymText_48a68:: - text "You are cataloging" - line "#MON? I must" - cont "say I'm impressed." - - para "I would never" - line "collect #MON" - cont "if they were" - cont "unattractive." - done - -_CeladonGymText9:: - text "The RAINBOWBADGE" - line "will make #MON" - cont "up to L50 obey." - - para "It also allows" - line "#MON to use" - cont "STRENGTH in and" - cont "out of battle." - - para "Please also take" - line "this with you." - done - -_ReceivedTM21Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM21ExplanationText:: - text "" - - para "TM21 contains" - line "MEGA DRAIN." - - para "Half the damage" - line "it inflicts is" - cont "drained to heal" - cont "your #MON!" - done - -_TM21NoRoomText:: - text "You should make" - line "room for this." - done - -_CeladonGymBattleText2:: - text "Hey!" - - para "You are not" - line "allowed in here!" - done - -_CeladonGymEndBattleText2:: - text "You're" - line "too rough!" - prompt - -_CeladonGymAfterBattleText2:: - text "Bleaah!" - line "I hope ERIKA" - cont "wipes you out!" - done - -_CeladonGymBattleText3:: - text "I was getting" - line "bored." - done - -_CeladonGymEndBattleText3:: - text "My" - line "makeup!" - prompt - -_CeladonGymAfterBattleText3:: - text "Grass-type #MON" - line "are tough against" - cont "the water-type!" - - para "They also have an" - line "edge on rock and" - cont "ground #MON!" - done - -_CeladonGymBattleText4:: - text "Aren't you the" - line "peeping Tom?" - done - -_CeladonGymEndBattleText4:: - text "I'm" - line "in shock!" - prompt - -_CeladonGymAfterBattleText4:: - text "Oh, you weren't" - line "peeping? We get a" - cont "lot of gawkers!" - done - -_CeladonGymBattleText5:: - text "Look at my grass" - line "#MON!" - - para "They're so easy" - line "to raise!" - done - -_CeladonGymEndBattleText5:: - text "No!" - prompt - -_CeladonGymAfterBattleText5:: - text "We only use grass-" - line "type #MON at" - cont "our GYM!" - - para "We also use them" - line "for making flower" - cont "arrangements!" - done - -_CeladonGymBattleText6:: - text "Don't bring any" - line "bugs or fire" - cont "#MON in here!" - done - -_CeladonGymEndBattleText6:: - text "Oh!" - line "You!" - prompt - -_CeladonGymAfterBattleText6:: - text "Our LEADER, ERIKA," - line "might be quiet," - cont "but she's also" - cont "very skilled!" - done - -_CeladonGymBattleText7:: - text "Pleased to meet" - line "you. My hobby is" - cont "#MON training." - done - -_CeladonGymEndBattleText7:: - text "Oh!" - line "Splendid!" - prompt - -_CeladonGymAfterBattleText7:: - text "I have a blind" - line "date coming up." - cont "I have to learn" - cont "to be polite." - done - -_CeladonGymBattleText8:: - text "Welcome to" - line "CELADON GYM!" - - para "You better not" - line "underestimate" - cont "girl power!" - done - -_CeladonGymEndBattleText8:: - text "Oh!" - line "Beaten!" - prompt - -_CeladonGymAfterBattleText8:: - text "I didn't bring my" - line "best #MON!" - - para "Wait 'til next" - line "time!" - done diff --git a/text/maps/CeladonMansion1F.asm b/text/maps/CeladonMansion1F.asm deleted file mode 100644 index fc175cd5..00000000 --- a/text/maps/CeladonMansion1F.asm +++ /dev/null @@ -1,23 +0,0 @@ -_CeladonMansion1Text1:: - text "MEOWTH: Meow!@@" - -_CeladonMansion1Text2:: - text "My dear #MON" - line "keep me company." - - para "MEOWTH even brings" - line "money home!" - done - -_CeladonMansion1Text3:: - text "CLEFAIRY: Pi" - line "pippippi!@@" - -_CeladonMansion1Text4:: - text "NIDORAN: Kya" - line "kyaoo!@@" - -_CeladonMansion1Text5:: - text "CELADON MANSION" - line "Manager's Suite" - done diff --git a/text/maps/CeladonMansion3F.asm b/text/maps/CeladonMansion3F.asm deleted file mode 100644 index c8858281..00000000 --- a/text/maps/CeladonMansion3F.asm +++ /dev/null @@ -1,66 +0,0 @@ -_ProgrammerText:: - text "Me? I'm the" - line "programmer!" - done - -_GraphicArtistText:: - text "I'm the graphic" - line "artist!" - cont "I drew you!" - done - -_WriterText:: - text "I wrote the story!" - line "Isn't ERIKA cute?" - - para "I like MISTY a" - line "lot too!" - - para "Oh, and SABRINA," - line "I like her!" - done - -_GameDesignerText:: - text "Is that right?" - - para "I'm the game" - line "designer!" - - para "Filling up your" - line "#DEX is tough," - cont "but don't quit!" - - para "When you finish," - line "come tell me!" - done - -_CompletedDexText:: - text "Wow! Excellent!" - line "You completed" - cont "your #DEX!" - cont "Congratulations!" - cont "...@@" - -_CeladonMansion3Text5:: - text "It's the game" - line "program! Messing" - cont "with it could bug" - cont "out the game!" - done - -_CeladonMansion3Text6:: - text "Someone's playing" - line "a game instead of" - cont "working!" - done - -_CeladonMansion3Text7:: - text "It's the script!" - line "Better not look" - cont "at the ending!" - done - -_CeladonMansion3Text8:: - text "GAME FREAK" - line "Development Room" - done diff --git a/text/maps/CeladonMart3F.asm b/text/maps/CeladonMart3F.asm deleted file mode 100644 index 8211750d..00000000 --- a/text/maps/CeladonMart3F.asm +++ /dev/null @@ -1,98 +0,0 @@ -_TM18PreReceiveText:: - text "Oh, hi! I finally" - line "finished #MON!" - - para "Not done yet?" - line "This might be" - cont "useful!" - prompt - -_ReceivedTM18Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM18ExplanationText:: - text "TM18 is COUNTER!" - line "Not like the one" - cont "I'm leaning on," - cont "mind you!" - done - -_TM18NoRoomText:: - text "Your pack is full" - line "of items!" - done - -_CeladonMart3Text2:: - text "Captured #MON" - line "are registered" - cont "with an ID No." - cont "and OT, the name" - cont "of the Original" - cont "Trainer that" - cont "caught it!" - done - -_CeladonMart3Text3:: - text "All right!" - - para "My buddy's going" - line "to trade me his" - cont "KANGASKHAN for my" - cont "GRAVELER!" - done - -_CeladonMart3Text4:: - text "Come on GRAVELER!" - - para "I love GRAVELER!" - line "I collect them!" - - para "Huh?" - - para "GRAVELER turned" - line "into a different" - cont "#MON!" - done - -_CeladonMart3Text5:: - text "You can identify" - line "#MON you got" - cont "in trades by" - cont "their ID Numbers!" - done - -_CeladonMart3Text6:: - text "It's an SNES!" - done - -_CeladonMart3Text7:: - text "An RPG! There's" - line "no time for that!" - done - -_CeladonMart3Text9:: - text "A sports game!" - line "Dad'll like that!" - done - -_CeladonMart3Text11:: - text "A puzzle game!" - line "Looks addictive!" - done - -_CeladonMart3Text13:: - text "A fighting game!" - line "Looks tough!" - done - -_CeladonMart3Text14:: - text "3F: TV GAME SHOP" - done - -_CeladonMart3Text15:: - text "Red and Blue!" - line "Both are #MON!" - done diff --git a/text/maps/CeladonMartRoof.asm b/text/maps/CeladonMartRoof.asm deleted file mode 100644 index 1ed52e86..00000000 --- a/text/maps/CeladonMartRoof.asm +++ /dev/null @@ -1,141 +0,0 @@ -_CeladonMartRoofText_484ee:: - text "Give her which" - line "drink?" - done - -_CeladonMartRoofText_484f3:: - text "Yay!" - - para "FRESH WATER!" - - para "Thank you!" - - para "You can have this" - line "from me!@@" - -_CeladonMartRoofText_484f9:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_CeladonMartRoofText_484fe:: - text "" - - para "@" - TX_RAM wcf4b - text " contains" - line "ICE BEAM!" - - para "It can freeze the" - line "target sometimes!@@" - -_CeladonMartRoofText_48504:: - text "Yay!" - - para "SODA POP!" - - para "Thank you!" - - para "You can have this" - line "from me!@@" - -_CeladonMartRoofText_4850a:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_CeladonMartRoofText_4850f:: - text "" - - para "@" - TX_RAM wcf4b - text " contains" - line "ROCK SLIDE!" - - para "It can spook the" - line "target sometimes!@@" - -_CeladonMartRoofText_48515:: - text "Yay!" - - para "LEMONADE!" - - para "Thank you!" - - para "You can have this" - line "from me!@@" - -_ReceivedTM49Text:: - text " received" - line "TM49!@@" - -_CeladonMartRoofText_48520:: - text "" - - para "TM49 contains" - line "TRI ATTACK!@@" - -_CeladonMartRoofText_48526:: - text "You don't have" - line "space for this!@@" - -_CeladonMartRoofText_4852c:: - text "No thank you!" - line "I'm not thirsty" - cont "after all!@@" - -_CeladonMartRoofText1:: - text "My sister is a" - line "trainer, believe" - cont "it or not." - - para "But, she's so" - line "immature, she" - cont "drives me nuts!" - done - -_CeladonMartRoofText_48598:: - text "I'm thirsty!" - line "I want something" - cont "to drink!" - done - -_CeladonMartRoofText4:: - text "I'm thirsty!" - line "I want something" - cont "to drink!" - - para "Give her a drink?" - done - -_CeladonMartRoofText6:: - text "ROOFTOP SQUARE:" - line "VENDING MACHINES" - done - -_VendingMachineText1:: - text "A vending machine!" - line "Here's the menu!" - prompt - -_VendingMachineText4:: - text "Oops, not enough" - line "money!" - done - -_VendingMachineText5:: - TX_RAM wcf4b - text "" - line "popped out!" - done - -_VendingMachineText6:: - text "There's no more" - line "room for stuff!" - done - -_VendingMachineText7:: - text "Not thirsty!" - done diff --git a/text/maps/CeruleanCaveB1F.asm b/text/maps/CeruleanCaveB1F.asm deleted file mode 100644 index 0918a3ce..00000000 --- a/text/maps/CeruleanCaveB1F.asm +++ /dev/null @@ -1,2 +0,0 @@ -_MewtwoBattleText:: - text "Mew!@@" diff --git a/text/maps/CeruleanCity.asm b/text/maps/CeruleanCity.asm deleted file mode 100644 index f0d2c29e..00000000 --- a/text/maps/CeruleanCity.asm +++ /dev/null @@ -1,233 +0,0 @@ -_CeruleanCityText_19668:: - text ": Yo!" - line "!" - - para "You're still" - line "struggling along" - cont "back here?" - - para "I'm doing great!" - line "I caught a bunch" - cont "of strong and" - cont "smart #MON!" - - para "Here, let me see" - line "what you caught," - cont "!" - done - -_CeruleanCityText_1966d:: - text "Hey!" - line "Take it easy!" - cont "You won already!" - prompt - -_CeruleanCityText_19672:: - text "Heh!" - line "You're no match" - cont "for my genius!" - prompt - -_CeruleanCityText_19677:: - text ": Hey," - line "guess what?" - - para "I went to BILL's" - line "and got him to" - cont "show me his rare" - cont "#MON!" - - para "That added a lot" - line "of pages to my" - cont "#DEX!" - - para "After all, BILL's" - line "world famous as a" - cont "#MANIAC!" - - para "He invented the" - line "#MON Storage" - cont "System on PC!" - - para "Since you're using" - line "his system, go" - cont "thank him!" - - para "Well, I better" - line "get rolling!" - cont "Smell ya later!" - done - -_CeruleanCityText_196d9:: - text "Hey! Stay out!" - line "It's not your" - cont "yard! Huh? Me?" - - para "I'm an innocent" - line "bystander! Don't" - cont "you believe me?" - done - -_ReceivedTM28Text:: - text " recovered" - line "TM28!@@" - -_ReceivedTM28Text2:: - text "" - - para "I better get" - line "moving! Bye!@@" - -_TM28NoRoomText:: - text "Make room for" - line "this!" - - para "I can't run until" - line "I give it to you!" - done - -_CeruleanCityText_196ee:: - text "Stop!" - line "I give up! I'll" - cont "leave quietly!" - prompt - -_CeruleanCityText_196f3:: - text "OK! I'll return" - line "the TM I stole!" - prompt - -_CeruleanCityText3:: - text "You're a trainer" - line "too? Collecting," - cont "fighting, it's a" - cont "tough life." - done - -_CeruleanCityText4:: - text "That bush in" - line "front of the shop" - cont "is in the way." - - para "There might be a" - line "way around." - done - -_CeruleanCityText5:: - text "You're making an" - line "encyclopedia on" - cont "#MON? That" - cont "sounds amusing." - done - -_CeruleanCityText6:: - text "The people here" - line "were robbed." - - para "It's obvious that" - line "TEAM ROCKET is" - cont "behind this most" - cont "heinous crime!" - - para "Even our POLICE" - line "force has trouble" - cont "with the ROCKETs!" - done - -_CeruleanCityText_19730:: - text "OK! SLOWBRO!" - line "Use SONICBOOM!" - cont "Come on, SLOWBRO" - cont "pay attention!" - done - -_CeruleanCityText_19735:: - text "SLOWBRO punch!" - line "No! You blew it" - cont "again!" - done - -_CeruleanCityText_1973a:: - text "SLOWBRO, WITHDRAW!" - line "No! That's wrong!" - - para "It's so hard to" - line "control #MON!" - - para "Your #MON's" - line "obedience depends" - cont "on your abilities" - cont "as a trainer!" - done - -_CeruleanCityText_1976f:: - text "SLOWBRO took a" - line "snooze..." - done - -_CeruleanCityText_19774:: - text "SLOWBRO is" - line "loafing around..." - done - -_CeruleanCityText_19779:: - text "SLOWBRO turned" - line "away..." - done - -_CeruleanCityText_1977e:: - text "SLOWBRO" - line "ignored orders..." - done - -_CeruleanCityText9:: - text "I want a bright" - line "red BICYCLE!" - - para "I'll keep it at" - line "home, so it won't" - cont "get dirty!" - done - -_CeruleanCityText10:: - text "This is CERULEAN" - line "CAVE! Horribly" - cont "strong #MON" - cont "live in there!" - - para "The #MON LEAGUE" - line "champion is the" - cont "only person who" - cont "is allowed in!" - done - -_CeruleanCityText12:: - text "CERULEAN CITY" - line "A Mysterious," - cont "Blue Aura" - cont "Surrounds It" - done - -_CeruleanCityText13:: - text "TRAINER TIPS" - - para "Pressing B Button" - line "during evolution" - cont "cancels the whole" - cont "process." - done - -_CeruleanCityText16:: - text "Grass and caves" - line "handled easily!" - cont "BIKE SHOP" - done - -_CeruleanCityText17:: - text "CERULEAN CITY" - line "#MON GYM" - cont "LEADER: MISTY" - - para "The Tomboyish" - line "Mermaid!" - done diff --git a/text/maps/CeruleanGym.asm b/text/maps/CeruleanGym.asm deleted file mode 100644 index 1d1d6d1c..00000000 --- a/text/maps/CeruleanGym.asm +++ /dev/null @@ -1,131 +0,0 @@ -_CeruleanGymText_5c7be:: - text "Hi, you're a new" - line "face!" - - para "Trainers who want" - line "to turn pro have" - cont "to have a policy" - cont "about #MON!" - - para "What is your" - line "approach when you" - cont "catch #MON?" - - para "My policy is an" - line "all-out offensive" - cont "with water-type" - cont "#MON!" - done - -_CeruleanGymText_5c7c3:: - text "TM11 teaches" - line "BUBBLEBEAM!" - - para "Use it on an" - line "aquatic #MON!" - done - -_CeruleanGymText_5c7c8:: - text "The CASCADEBADGE" - line "makes all #MON" - cont "up to L30 obey!" - - para "That includes" - line "even outsiders!" - - para "There's more, you" - line "can now use CUT" - cont "any time!" - - para "You can CUT down" - line "small bushes to" - cont "open new paths!" - - para "You can also have" - line "my favorite TM!" - done - -_ReceivedTM11Text:: - text " received" - line "TM11!@@" - -_CeruleanGymText_5c7d3:: - text "You better make" - line "room for this!" - done - -_CeruleanGymText_5c7d8:: - text "Wow!" - line "You're too much!" - - para "All right!" - - para "You can have the" - line "CASCADEBADGE to" - cont "show you beat me!@@" - -_CeruleanGymBattleText1:: - text "I'm more than good" - line "enough for you!" - - para "MISTY can wait!" - done - -_CeruleanGymEndBattleText1:: - text "You" - line "overwhelmed me!" - prompt - -_CeruleanGymAfterBattleText1:: - text "You have to face" - line "other trainers to" - cont "find out how good" - cont "you really are." - done - -_CeruleanGymBattleText2:: - text "Splash!" - - para "I'm first up!" - line "Let's do it!" - done - -_CeruleanGymEndBattleText2:: - text "That" - line "can't be!" - prompt - -_CeruleanGymAfterBattleText2:: - text "MISTY is going to" - line "keep improving!" - - para "She won't lose to" - line "someone like you!" - done - -_CeruleanGymText_5c82a:: - text "Yo! Champ in" - line "making!" - - para "Here's my advice!" - - para "The LEADER, MISTY," - line "is a pro who uses" - cont "water #MON!" - - para "You can drain all" - line "their water with" - cont "plant #MON!" - - para "Or, zap them with" - line "electricity!" - done - -_CeruleanGymText_5c82f:: - text "You beat MISTY!" - line "What'd I tell ya?" - - para "You and me kid," - line "we make a pretty" - cont "darn good team!" - done diff --git a/text/maps/ChampionsRoom.asm b/text/maps/ChampionsRoom.asm deleted file mode 100644 index 61050565..00000000 --- a/text/maps/ChampionsRoom.asm +++ /dev/null @@ -1,146 +0,0 @@ -_GaryChampionIntroText:: - text ": Hey!" - - para "I was looking" - line "forward to seeing" - cont "you, !" - - para "My rival should" - line "be strong to keep" - cont "me sharp!" - - para "While working on" - line "#DEX, I looked" - cont "all over for" - cont "powerful #MON!" - - para "Not only that, I" - line "assembled teams" - cont "that would beat" - cont "any #MON type!" - - para "And now!" - - para "I'm the #MON" - line "LEAGUE champion!" - - para "! Do you" - line "know what that" - cont "means?" - - para "I'll tell you!" - - para "I am the most" - line "powerful trainer" - cont "in the world!" - done - -_GaryDefeatedText:: - text "NO!" - line "That can't be!" - cont "You beat my best!" - - para "After all that" - line "work to become" - cont "LEAGUE champ?" - - para "My reign is over" - line "already?" - cont "It's not fair!" - prompt - -_GaryVictoryText:: - text "Hahaha!" - line "I won, I won!" - - para "I'm too good for" - line "you, !" - - para "You did well to" - line "even reach me," - cont ", the" - cont "#MON genius!" - - para "Nice try, loser!" - line "Hahaha!" - prompt - -_GaryText_76103:: - text "Why?" - line "Why did I lose?" - - para "I never made any" - line "mistakes raising" - cont "my #MON..." - - para "Darn it! You're" - line "the new #MON" - cont "LEAGUE champion!" - - para "Although I don't" - line "like to admit it." - done - -_GaryText2:: - text "OAK: !" - done - -_GaryText_76120:: - text "OAK: So, you won!" - line "Congratulations!" - cont "You're the new" - cont "#MON LEAGUE" - cont "champion!" - - para "You've grown up so" - line "much since you" - cont "first left with" - cont "@" - TX_RAM wcd6d - text "!" - - para ", you have" - line "come of age!" - done - -_GaryText_76125:: - text "OAK: ! I'm" - line "disappointed!" - - para "I came when I" - line "heard you beat" - cont "the ELITE FOUR!" - - para "But, when I got" - line "here, you had" - cont "already lost!" - - para "! Do you" - line "understand why" - cont "you lost?" - - para "You have forgotten" - line "to treat your" - cont "#MON with" - cont "trust and love!" - - para "Without them, you" - line "will never become" - cont "a champ again!" - done - -_GaryText_7612a:: - text "OAK: !" - - para "You understand" - line "that your victory" - cont "was not just your" - cont "own doing!" - - para "The bond you share" - line "with your #MON" - cont "is marvelous!" - - para "!" - line "Come with me!" - done diff --git a/text/maps/CinnabarGym.asm b/text/maps/CinnabarGym.asm deleted file mode 100644 index 1b531571..00000000 --- a/text/maps/CinnabarGym.asm +++ /dev/null @@ -1,210 +0,0 @@ -_BlaineBattleText:: - text "Hah!" - - para "I am BLAINE! I" - line "am the LEADER of" - cont "CINNABAR GYM!" - - para "My fiery #MON" - line "will incinerate" - cont "all challengers!" - - para "Hah! You better" - line "have BURN HEAL!" - done - -_BlaineEndBattleText:: - text "I have" - line "burnt out!" - - para "You have earned" - line "the VOLCANOBADGE!@@" - -_BlaineFireBlastText:: - text "FIRE BLAST is the" - line "ultimate fire" - cont "technique!" - - para "Don't waste it on" - line "water #MON!" - done - -_BlaineBadgeText:: - text "Hah!" - - para "The VOLCANOBADGE" - line "heightens the" - cont "SPECIAL abilities" - cont "of your #MON!" - - para "Here, you can" - line "have this too!" - done - -_ReceivedTM38Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM38ExplanationText:: - text "" - - para "TM38 contains" - line "FIRE BLAST!" - - para "Teach it to fire-" - line "type #MON!" - - para "CHARMELEON or" - line "PONYTA would be" - cont "good bets!" - done - -_TM38NoRoomText:: - text "Make room for my" - line "gift!" - done - -_CinnabarGymText_7595f:: - text "Do you know how" - line "hot #MON fire" - cont "breath can get?" - done - -_CinnabarGymText_75964:: - text "Yow!" - line "Hot, hot, hot!" - prompt - -_CinnabarGymText_75969:: - text "Fire, or to be" - line "more precise," - cont "combustion..." - - para "Blah, blah, blah," - line "blah..." - done - -_CinnabarGymText_75994:: - text "I was a thief, but" - line "I became straight" - cont "as a trainer!" - done - -_CinnabarGymText_75999:: - text "I" - line "surrender!" - prompt - -_CinnabarGymText_7599e:: - text "I can't help" - line "stealing other" - cont "people's #MON!" - done - -_CinnabarGymText_759c9:: - text "You can't win!" - line "I have studied" - cont "#MON totally!" - done - -_CinnabarGymText_759ce:: - text "Waah!" - line "My studies!" - prompt - -_CinnabarGymText_759d3:: - text "My theories are" - line "too complicated" - cont "for you!" - done - -_CinnabarGymText_759fe:: - text "I just like using" - line "fire #MON!" - done - -_CinnabarGymText_75a03:: - text "Too hot" - line "to handle!" - prompt - -_CinnabarGymText_75a08:: - text "I wish there was" - line "a thief #MON!" - cont "I'd use that!" - done - -_CinnabarGymText_75a33:: - text "I know why BLAINE" - line "became a trainer!" - done - -_CinnabarGymText_75a38:: - text "Ow!" - prompt - -_CinnabarGymText_75a3d:: - text "BLAINE was lost" - line "in the mountains" - cont "when a fiery bird" - cont "#MON appeared." - - para "Its light enabled" - line "BLAINE to find" - cont "his way down!" - done - -_CinnabarGymText_75a68:: - text "I've been to many" - line "GYMs, but this is" - cont "my favorite!" - done - -_CinnabarGymText_75a6d:: - text "Yowza!" - line "Too hot!" - prompt - -_CinnabarGymText_75a72:: - text "Us fire #MON" - line "fans like PONYTA" - cont "and NINETALES!" - done - -_CinnabarGymText_75a9d:: - text "Fire is weak" - line "against H2O!" - done - -_CinnabarGymText_75aa2:: - text "Oh!" - line "Snuffed out!" - prompt - -_CinnabarGymText_75aa7:: - text "Water beats fire!" - line "But, fire melts" - cont "ice #MON!" - done - -_CinnabarGymText_75ac2:: - text "Yo! Champ in" - line "making!" - - para "The hot-headed" - line "BLAINE is a fire" - cont "#MON pro!" - - para "Douse his spirits" - line "with water!" - - para "You better take" - line "some BURN HEALs!" - done - -_CinnabarGymText_75ac7:: - text "! You beat" - line "that fire brand!" - done diff --git a/text/maps/CinnabarLabFossilRoom.asm b/text/maps/CinnabarLabFossilRoom.asm deleted file mode 100644 index 95bde685..00000000 --- a/text/maps/CinnabarLabFossilRoom.asm +++ /dev/null @@ -1,78 +0,0 @@ -_Lab4Text_75dc6:: - text "Hiya!" - - para "I am important" - line "doctor!" - - para "I study here rare" - line "#MON fossils!" - - para "You! Have you a" - line "fossil for me?" - prompt - -_Lab4Text_75dcb:: - text "No! Is too bad!" - done - -_Lab4Text_75dd0:: - text "I take a little" - line "time!" - - para "You go for walk a" - line "little while!" - done - -_Lab4Text_75dd5:: - text "Where were you?" - - para "Your fossil is" - line "back to life!" - - para "It was @" - TX_RAM wcf4b - text "" - line "like I think!" - prompt - -_Lab4Text_610ae:: - text "Oh! That is" - line "@" - TX_RAM wcd6d - text "!" - - para "It is fossil of" - line "@" - TX_RAM wcf4b - text ", a" - cont "#MON that is" - cont "already extinct!" - - para "My Resurrection" - line "Machine will make" - cont "that #MON live" - cont "again!" - done - -_Lab4Text_610b3:: - text "So! You hurry and" - line "give me that!" - - para " handed" - line "over @" - TX_RAM wcd6d - text "!" - prompt - -_Lab4Text_610b8:: - text "I take a little" - line "time!" - - para "You go for walk a" - line "little while!" - done - -_Lab4Text_610bd:: - text "Aiyah! You come" - line "again!" - done diff --git a/text/maps/CinnabarLabMetronomeRoom.asm b/text/maps/CinnabarLabMetronomeRoom.asm deleted file mode 100644 index fa04677f..00000000 --- a/text/maps/CinnabarLabMetronomeRoom.asm +++ /dev/null @@ -1,63 +0,0 @@ -_TM35PreReceiveText:: - text "Tch-tch-tch!" - line "I made a cool TM!" - - para "It can cause all" - line "kinds of fun!" - prompt - -_ReceivedTM35Text:: - text " received " - line "@" - TX_RAM wcf4b - text "!@@" - -_TM35ExplanationText:: - text "Tch-tch-tch!" - line "That's the sound" - cont "of a METRONOME!" - - para "It tweaks your" - line "#MON's brain" - cont "into using moves" - cont "it doesn't know!" - done - -_TM35NoRoomText:: - text "Your pack is" - line "crammed full!" - done - -_Lab3Text2:: - text "EEVEE can evolve" - line "into 1 of 3 kinds" - cont "of #MON." - done - -_Lab3Text3:: - text "There's an e-mail" - line "message!" - - para "..." - - para "The 3 legendary" - line "bird #MON are" - cont "ARTICUNO, ZAPDOS" - cont "and MOLTRES." - - para "Their whereabouts" - line "are unknown." - - para "We plan to explore" - line "the cavern close" - cont "to CERULEAN." - - para "From: #MON" - line "RESEARCH TEAM" - - para "..." - done - -_Lab3Text5:: - text "An amber pipe!" - done diff --git a/text/maps/CopycatsHouse1F.asm b/text/maps/CopycatsHouse1F.asm deleted file mode 100644 index 3ec2b151..00000000 --- a/text/maps/CopycatsHouse1F.asm +++ /dev/null @@ -1,20 +0,0 @@ -_CopycatsHouse1FText1:: - text "My daughter is so" - line "self-centered." - cont "She only has a" - cont "few friends." - done - -_CopycatsHouse1FText2:: - text "My daughter likes" - line "to mimic people." - - para "Her mimicry has" - line "earned her the" - cont "nickname COPYCAT" - cont "around here!" - done - -_CopycatsHouse1FText3:: - text "CHANSEY: Chaan!" - line "Sii!@@" diff --git a/text/maps/CopycatsHouse2F.asm b/text/maps/CopycatsHouse2F.asm deleted file mode 100644 index 561b2ac5..00000000 --- a/text/maps/CopycatsHouse2F.asm +++ /dev/null @@ -1,97 +0,0 @@ -_CopycatsHouse2FText_5ccd4:: - text ": Hi! Do" - line "you like #MON?" - - para ": Uh no, I" - line "just asked you." - - para ": Huh?" - line "You're strange!" - - para "COPYCAT: Hmm?" - line "Quit mimicking?" - - para "But, that's my" - line "favorite hobby!" - prompt - -_TM31PreReceiveText:: - text "Oh wow!" - line "A # DOLL!" - - para "For me?" - line "Thank you!" - - para "You can have" - line "this, then!" - prompt - -_ReceivedTM31Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM31ExplanationText1:: - text "" - - para "TM31 contains my" - line "favorite, MIMIC!" - - para "Use it on a good" - line "#MON!@@" - -_TM31ExplanationText2:: - text ": Hi!" - line "Thanks for TM31!" - - para ": Pardon?" - - para ": Is it" - line "that fun to mimic" - cont "my every move?" - - para "COPYCAT: You bet!" - line "It's a scream!" - done - -_TM31NoRoomText:: - text "Don't you want" - line "this?@@" - -_CopycatsHouse2FText2:: - text "DODUO: Giiih!" - - para "MIRROR MIRROR ON" - line "THE WALL, WHO IS" - cont "THE FAIREST ONE" - cont "OF ALL?" - done - -_CopycatsHouse2FText3:: - text "This is a rare" - line "#MON! Huh?" - cont "It's only a doll!" - done - -_CopycatsHouse2FText6:: - text "A game with MARIO" - line "wearing a bucket" - cont "on his head!" - done - -_CopycatsHouse2FText_5cd17:: - text "..." - - para "My Secrets!" - - para "Skill: Mimicry!" - line "Hobby: Collecting" - cont "dolls!" - cont "Favorite #MON:" - cont "CLEFAIRY!" - done - -_CopycatsHouse2FText_5cd1c:: - text "Huh? Can't see!" - done diff --git a/text/maps/Daycare.asm b/text/maps/Daycare.asm deleted file mode 100644 index 2759c798..00000000 --- a/text/maps/Daycare.asm +++ /dev/null @@ -1,62 +0,0 @@ -_DayCareIntroText:: - text "I run a DAYCARE." - line "Would you like me" - cont "to raise one of" - cont "your #MON?" - done - -_DayCareWhichMonText:: - text "Which #MON" - line "should I raise?" - prompt - -_DayCareWillLookAfterMonText:: - text "Fine, I'll look" - line "after @" - TX_RAM wcd6d - text "" - cont "for a while." - prompt - -_DayCareComeSeeMeInAWhileText:: - text "Come see me in" - line "a while." - done - -_DayCareMonHasGrownText:: - text "Your @" - TX_RAM wcd6d - text "" - line "has grown a lot!" - - para "By level, it's" - line "grown by @" - TX_NUM wDayCareNumLevelsGrown,$1,$3 - text "!" - - para "Aren't I great?" - prompt - -_DayCareOweMoneyText:: - text "You owe me ¥@" - TX_BCD wDayCareTotalCost, $c2 - text "" - line "for the return" - cont "of this #MON." - done - -_DayCareGotMonBackText:: - text " got" - line "@" - TX_RAM wDayCareMonName - text " back!" - done - -_DayCareMonNeedsMoreTimeText:: - text "Back already?" - line "Your @" - TX_RAM wcd6d - text "" - cont "needs some more" - cont "time with me." - prompt diff --git a/text/maps/FuchsiaGoodRodHouse.asm b/text/maps/FuchsiaGoodRodHouse.asm deleted file mode 100644 index b1b8b2f2..00000000 --- a/text/maps/FuchsiaGoodRodHouse.asm +++ /dev/null @@ -1,43 +0,0 @@ -_FuchsiaHouse3Text_561bd:: - text "I'm the FISHING" - line "GURU's older" - cont "brother!" - - para "I simply Looove" - line "fishing!" - - para "Do you like to" - line "fish?" - done - -_FuchsiaHouse3Text_561c2:: - text "Grand! I like" - line "your style!" - - para "Take this and" - line "fish, young one!" - - para " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_FuchsiaHouse3Text_56212:: - text "Oh... That's so" - line "disappointing..." - done - -_FuchsiaHouse3Text_56217:: - text "Hello there," - line "!" - - para "How are the fish" - line "biting?" - done - -_FuchsiaHouse3Text_5621c:: - text "Oh no!" - - para "You have no room" - line "for my gift!" - done diff --git a/text/maps/GameCorner.asm b/text/maps/GameCorner.asm deleted file mode 100644 index 1e59f83e..00000000 --- a/text/maps/GameCorner.asm +++ /dev/null @@ -1,186 +0,0 @@ -_CeladonGameCornerText1:: - text "Welcome!" - - para "You can exchange" - line "your coins for" - cont "fabulous prizes" - cont "next door." - done - -_CeladonGameCornerText_48d22:: - text "Welcome to ROCKET" - line "GAME CORNER!" - - para "Do you need some" - line "game coins?" - - para "It's ¥1000 for 50" - line "coins. Would you" - cont "like some?" - done - -_CeladonGameCornerText_48d27:: - text "Thanks! Here are" - line "your 50 coins!" - done - -_CeladonGameCornerText_48d2c:: - text "No? Please come" - line "play sometime!" - done - -_CeladonGameCornerText_48d31:: - text "You can't afford" - line "the coins!" - done - -_CeladonGameCornerText_48d36:: - text "Oops! Your COIN" - line "CASE is full." - done - -_CeladonGameCornerText_48d3b:: - text "You don't have a" - line "COIN CASE!" - done - -_CeladonGameCornerText3:: - text "Keep this quiet." - - para "It's rumored that" - line "this place is run" - cont "by TEAM ROCKET." - done - -_CeladonGameCornerText4:: - text "I think these" - line "machines have" - cont "different odds." - done - -_CeladonGameCornerText_48d9c:: - text "Kid, do you want" - line "to play?" - prompt - -_Received10CoinsText:: - text " received" - line "10 coins!@@" - -_CeladonGameCornerText_48da7:: - text "You don't need my" - line "coins!" - done - -_CeladonGameCornerText_48dac:: - text "Wins seem to come" - line "and go." - done - -_CeladonGameCornerText6:: - text "I'm having a" - line "wonderful time!" - done - -_CeladonGameCornerText_48dca:: - text "Hey!" - - para "You have better" - line "things to do," - cont "champ in making!" - - para "CELADON GYM's" - line "LEADER is ERIKA!" - cont "She uses grass-" - cont "type #MON!" - - para "She might appear" - line "docile, but don't" - cont "be fooled!" - done - -_CeladonGameCornerText_48dcf:: - text "They offer rare" - line "#MON that can" - cont "be exchanged for" - cont "your coins." - - para "But, I just can't" - line "seem to win!" - done - -_CeladonGameCornerText8:: - text "Games are scary!" - line "It's so easy to" - cont "get hooked!" - done - -_CeladonGameCornerText_48e26:: - text "What's up? Want" - line "some coins?" - prompt - -_Received20CoinsText:: - text " received" - line "20 coins!@@" - -_CeladonGameCornerText_48e31:: - text "You have lots of" - line "coins!" - done - -_CeladonGameCornerText_48e36:: - text "Darn! I need more" - line "coins for the" - cont "#MON I want!" - done - -_CeladonGameCornerText_48e88:: - text "Hey, what? You're" - line "throwing me off!" - cont "Here are some" - cont "coins, shoo!" - prompt - -_CeladonGameCornerText_48e8d:: - text " received" - line "20 coins!@@" - -_CeladonGameCornerText_48e93:: - text "You've got your" - line "own coins!" - done - -_CeladonGameCornerText_48e98:: - text "The trick is to" - line "watch the reels" - cont "closely!" - done - -_CeladonGameCornerText_48ece:: - text "I'm guarding this" - line "poster!" - cont "Go away, or else!" - done - -_CeladonGameCornerText_48ed3:: - text "Dang!" - prompt - -_CeladonGameCornerText_48ed8:: - text "Our hideout might" - line "be discovered! I" - cont "better tell BOSS!" - done - -_CeladonGameCornerText_48f09:: - text "Hey!" - - para "A switch behind" - line "the poster!?" - cont "Let's push it!@@" - -_CeladonGameCornerText_48f19:: - text "Oops! Forgot the" - line "COIN CASE!" - done diff --git a/text/maps/LancesRoom.asm b/text/maps/LancesRoom.asm deleted file mode 100644 index ed3dcada..00000000 --- a/text/maps/LancesRoom.asm +++ /dev/null @@ -1,63 +0,0 @@ -_LanceBeforeBattleText:: - text "Ah! I heard about" - line "you !" - - para "I lead the ELITE" - line "FOUR! You can" - cont "call me LANCE the" - cont "dragon trainer!" - - para "You know that" - line "dragons are" - cont "mythical #MON!" - - para "They're hard to" - line "catch and raise," - cont "but their powers" - cont "are superior!" - - para "They're virtually" - line "indestructible!" - - para "Well, are you" - line "ready to lose?" - - para "Your LEAGUE" - line "challenge ends" - cont "with me, !" - done - -_LanceEndBattleText:: - text "That's it!" - - para "I hate to admit" - line "it, but you are a" - cont "#MON master!" - prompt - -_LanceAfterBattleText:: - text "I still can't" - line "believe my" - cont "dragons lost to" - cont "you, !" - - para "You are now the" - line "#MON LEAGUE" - cont "champion!" - - para "...Or, you would" - line "have been, but" - cont "you have one more" - cont "challenge ahead." - - para "You have to face" - line "another trainer!" - cont "His name is..." - - para "!" - line "He beat the ELITE" - cont "FOUR before you!" - - para "He is the real" - line "#MON LEAGUE" - cont "champion!@@" diff --git a/text/maps/LavenderCuboneHouse.asm b/text/maps/LavenderCuboneHouse.asm deleted file mode 100644 index 66cc85a5..00000000 --- a/text/maps/LavenderCuboneHouse.asm +++ /dev/null @@ -1,24 +0,0 @@ -_LavenderHouse2Text1:: - text "CUBONE: Kyarugoo!@@" - -_LavenderHouse2Text_1d9dc:: - text "I hate those" - line "horrible ROCKETs!" - - para "That poor CUBONE's" - line "mother..." - - para "It was killed" - line "trying to escape" - cont "from TEAM ROCKET!" - done - -_LavenderHouse2Text_1d9e1:: - text "The GHOST of" - line "#MON TOWER is" - cont "gone!" - - para "Someone must have" - line "soothed its" - cont "restless soul!" - done diff --git a/text/maps/MrFujisHouse.asm b/text/maps/MrFujisHouse.asm deleted file mode 100644 index f903eb6a..00000000 --- a/text/maps/MrFujisHouse.asm +++ /dev/null @@ -1,86 +0,0 @@ -_LavenderHouse1Text_1d8d1:: - text "That's odd, MR.FUJI" - line "isn't here." - cont "Where'd he go?" - done - -_LavenderHouse1Text_1d8d6:: - text "MR.FUJI had been" - line "praying alone for" - cont "CUBONE's mother." - done - -_LavenderHouse1Text_1d8f4:: - text "This is really" - line "MR.FUJI's house." - - para "He's really kind!" - - para "He looks after" - line "abandoned and" - cont "orphaned #MON!" - done - -_LavenderHouse1Text_1d8f9:: - text "It's so warm!" - line "#MON are so" - cont "nice to hug!" - done - -_LavenderHouse1Text3:: - text "PSYDUCK: Gwappa!@@" - -_LavenderHouse1Text4:: - text "NIDORINO: Gaoo!@@" - -_LavenderHouse1Text_1d94c:: - text "MR.FUJI: ." - - para "Your #DEX quest" - line "may fail without" - cont "love for your" - cont "#MON." - - para "I think this may" - line "help your quest." - prompt - -_ReceivedFluteText:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_FluteExplanationText:: - text "" - - para "Upon hearing #" - line "FLUTE, sleeping" - cont "#MON will" - cont "spring awake." - - para "It works on all" - line "sleeping #MON." - done - -_FluteNoRoomText:: - text "You must make" - line "room for this!" - done - -_MrFujiAfterFluteText:: - text "MR.FUJI: Has my" - line "FLUTE helped you?" - done - -_LavenderHouse1Text6:: - text "#MON Monthly" - line "Grand Prize" - cont "Drawing!" - - para "The application" - line "form is..." - - para "Gone! It's been" - line "clipped out!" - done diff --git a/text/maps/MrPsychicsHouse.asm b/text/maps/MrPsychicsHouse.asm deleted file mode 100644 index 7be2e11e..00000000 --- a/text/maps/MrPsychicsHouse.asm +++ /dev/null @@ -1,25 +0,0 @@ -_TM29PreReceiveText:: - text "...Wait! Don't" - line "say a word!" - - para "You wanted this!" - prompt - -_ReceivedTM29Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM29ExplanationText:: - text "TM29 is PSYCHIC!" - - para "It can lower the" - line "target's SPECIAL" - cont "abilities." - done - -_TM29NoRoomText:: - text "Where do you plan" - line "to put this?" - done diff --git a/text/maps/MtMoonB1F.asm b/text/maps/MtMoonB1F.asm deleted file mode 100644 index 755fa583..00000000 --- a/text/maps/MtMoonB1F.asm +++ /dev/null @@ -1,3 +0,0 @@ -_MtMoonText1:: - text "" - done diff --git a/text/maps/MtMoonB2F.asm b/text/maps/MtMoonB2F.asm deleted file mode 100644 index 472649b9..00000000 --- a/text/maps/MtMoonB2F.asm +++ /dev/null @@ -1,122 +0,0 @@ -_MtMoon3Text_49f24:: - text "You want the" - line "DOME FOSSIL?" - done - -_MtMoon3Text_49f64:: - text "You want the" - line "HELIX FOSSIL?" - done - -_MtMoon3Text_49f6f:: - text " got the" - line "@" - TX_RAM wcf4b - text "!@@" - -_MtMoon3Text_49f7f:: - text "Look, you've got" - line "no room for this.@@" - -_MtMoon3Text_49f85:: - text "Hey, stop!" - - para "I found these" - line "fossils! They're" - cont "both mine!" - done - -_MtMoon3Text_49f8a:: - text "OK!" - line "I'll share!" - prompt - -_MtMoon3Text_49f8f:: - text "We'll each take" - line "one!" - cont "No being greedy!" - done - -_MtMoon3Text_49f94:: - text "Far away, on" - line "CINNABAR ISLAND," - cont "there's a #MON" - cont "LAB." - - para "They do research" - line "on regenerating" - cont "fossils." - done - -_MtMoon3Text_49f99:: - text "All right. Then" - line "this is mine!@@" - -_MtMoon3BattleText2:: - text "TEAM ROCKET will" - line "find the fossils," - cont "revive and sell" - cont "them for cash!" - done - -_MtMoon3EndBattleText2:: - text "Urgh!" - line "Now I'm mad!" - prompt - -_MtMoon3AfterBattleText2:: - text "You made me mad!" - line "TEAM ROCKET will" - cont "blacklist you!" - done - -_MtMoon3BattleText3:: - text "We, TEAM ROCKET," - line "are #MON" - cont "gangsters!" - done - -_MtMoon3EndBattleText3:: - text "I blew" - line "it!" - prompt - -_MtMoon3AfterBattleText3:: - text "Darn it all! My" - line "associates won't" - cont "stand for this!" - done - -_MtMoon3BattleText4:: - text "We're pulling a" - line "big job here!" - cont "Get lost, kid!" - done - -_MtMoon3EndBattleText4:: - text "So, you" - line "are good." - prompt - -_MtMoon3AfterBattleText4:: - text "If you find a" - line "fossil, give it" - cont "to me and scram!" - done - -_MtMoon3BattleText5:: - text "Little kids" - line "should leave" - cont "grown-ups alone!" - done - -_MtMoon3EndBattleText5:: - text "I'm" - line "steamed!" - prompt - -_MtMoon3AfterBattleText5:: - text "#MON lived" - line "here long before" - cont "people came." - done diff --git a/text/maps/MtMoonPokecenter.asm b/text/maps/MtMoonPokecenter.asm deleted file mode 100644 index 7bc99dae..00000000 --- a/text/maps/MtMoonPokecenter.asm +++ /dev/null @@ -1,48 +0,0 @@ -_MtMoonPokecenterText1:: - text "I've 6 # BALLs" - line "set in my belt." - - para "At most, you can" - line "carry 6 #MON." - done - -_MtMoonPokecenterText3:: - text "TEAM ROCKET" - line "attacks CERULEAN" - cont "citizens..." - - para "TEAM ROCKET is" - line "always in the" - cont "news!" - done - -_MagikarpSalesmanText1:: - text "MAN: Hello, there!" - line "Have I got a deal" - cont "just for you!" - - para "I'll let you have" - line "a swell MAGIKARP" - cont "for just ¥500!" - cont "What do you say?" - done - -_MagikarpSalesmanNoText:: - text "No? I'm only" - line "doing this as a" - cont "favor to you!" - done - -_MagikarpSalesmanNoMoneyText:: - text "You'll need more" - line "money than that!" - done - -_MagikarpSalesmanText2:: - text "MAN: Well, I don't" - line "give refunds!" - done - -_MtMoonPokecenterText5:: - text "" - done diff --git a/text/maps/Museum1F.asm b/text/maps/Museum1F.asm deleted file mode 100644 index 16431bda..00000000 --- a/text/maps/Museum1F.asm +++ /dev/null @@ -1,107 +0,0 @@ -_Museum1FText_5c21a:: - text "Come again!" - done - -_Museum1FText_5c21f:: - text "It's ¥50 for a" - line "child's ticket." - - para "Would you like to" - line "come in?" - done - -_Museum1FText_5c224:: - text "Right, ¥50!" - line "Thank you!" - done - -_Museum1FText_5c229:: - text "You don't have" - line "enough money." - prompt - -_Museum1FText_5c22e:: - text "You can't sneak" - line "in the back way!" - - para "Oh, whatever!" - line "Do you know what" - cont "AMBER is?" - done - -_Museum1FText_5c233:: - text "There's a lab" - line "somewhere trying" - cont "to resurrect" - cont "ancient #MON" - cont "from AMBER." - done - -_Museum1FText_5c238:: - text "AMBER is fossil-" - line "ized tree sap." - done - -_Museum1FText_5c23d:: - text "Please go to the" - line "other side!" - done - -_Museum1FText_5c242:: - text "Take plenty of" - line "time to look!" - done - -_Museum1FText_5c251:: - text "That is one" - line "magnificent" - cont "fossil!" - done - -_Museum1FText_5c28e:: - text "Ssh! I think that" - line "this chunk of" - cont "AMBER contains" - cont "#MON DNA!" - - para "It would be great" - line "if #MON could" - cont "be resurrected" - cont "from it!" - - para "But, my colleagues" - line "just ignore me!" - - para "So I have a favor" - line "to ask!" - - para "Take this to a" - line "#MON LAB and" - cont "get it examined!" - prompt - -_ReceivedOldAmberText:: - text " received" - line "OLD AMBER!@@" - -_Museum1FText_5c299:: - text "Ssh! Get the OLD" - line "AMBER checked!" - done - -_Museum1FText_5c29e:: - text "You don't have" - line "space for this!" - done - -_Museum1FText_5c2ad:: - text "We are proud of 2" - line "fossils of very" - cont "rare, prehistoric" - cont "#MON!" - done - -_Museum1FText_5c2bc:: - text "The AMBER is" - line "clear and gold!" - done diff --git a/text/maps/NameRatersHouse.asm b/text/maps/NameRatersHouse.asm deleted file mode 100644 index 65d3e8a4..00000000 --- a/text/maps/NameRatersHouse.asm +++ /dev/null @@ -1,60 +0,0 @@ -_NameRaterText_1dab3:: - text "Hello, hello!" - line "I am the official" - cont "NAME RATER!" - - para "Want me to rate" - line "the nicknames of" - cont "your #MON?" - done - -_NameRaterText_1dab8:: - text "Which #MON" - line "should I look at?" - prompt - -_NameRaterText_1dabd:: - TX_RAM wcd6d - text ", is it?" - line "That is a decent" - cont "nickname!" - - para "But, would you" - line "like me to give" - cont "it a nicer name?" - - para "How about it?" - done - -_NameRaterText_1dac2:: - text "Fine! What should" - line "we name it?" - prompt - -_NameRaterText_1dac7:: - text "OK! This #MON" - line "has been renamed" - cont "@" - TX_RAM wBuffer - text "!" - - para "That's a better" - line "name than before!" - done - -_NameRaterText_1dacc:: - text "Fine! Come any" - line "time you like!" - done - -_NameRaterText_1dad1:: - TX_RAM wcd6d - text ", is it?" - line "That is a truly" - cont "impeccable name!" - - para "Take good care of" - line "@" - TX_RAM wcd6d - text "!" - done diff --git a/text/maps/OaksLab.asm b/text/maps/OaksLab.asm deleted file mode 100644 index 7a6f57b7..00000000 --- a/text/maps/OaksLab.asm +++ /dev/null @@ -1,477 +0,0 @@ -_OaksLabGaryText1:: - text ": Yo" - line "! Gramps" - cont "isn't around!" - done - -_OaksLabText40:: - text ": Heh, I" - line "don't need to be" - cont "greedy like you!" - - para "Go ahead and" - line "choose, !" - done - -_OaksLabText41:: - text ": My" - line "#MON looks a" - cont "lot stronger." - done - -_OaksLabText39:: - text "Those are #" - line "BALLs. They" - cont "contain #MON!" - done - -_OaksLabCharmanderText:: - text "So! You want the" - line "fire #MON," - cont "CHARMANDER?" - done - -_OaksLabSquirtleText:: - text "So! You want the" - line "water #MON," - cont "SQUIRTLE?" - done - -_OaksLabBulbasaurText:: - text "So! You want the" - line "plant #MON," - cont "BULBASAUR?" - done - -_OaksLabMonEnergeticText:: - text "This #MON is" - line "really energetic!" - prompt - -_OaksLabReceivedMonText:: - text " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabLastMonText:: - text "That's PROF.OAK's" - line "last #MON!" - done - -_OaksLabText_1d2f0:: - text "OAK: Now, ," - line "which #MON do" - cont "you want?" - done - -_OaksLabText_1d2f5:: - text "OAK: If a wild" - line "#MON appears," - cont "your #MON can" - cont "fight against it!" - done - -_OaksLabText_1d2fa:: - text "OAK: ," - line "raise your young" - cont "#MON by making" - cont "it fight!" - done - -_OaksLabDeliverParcelText1:: - text "OAK: Oh, !" - - para "How is my old" - line "#MON?" - - para "Well, it seems to" - line "like you a lot." - - para "You must be" - line "talented as a" - cont "#MON trainer!" - - para "What? You have" - line "something for me?" - - para " delivered" - line "OAK's PARCEL.@@" - -_OaksLabDeliverParcelText2:: - text "" - para "Ah! This is the" - line "custom # BALL" - cont "I ordered!" - cont "Thank you!" - done - -_OaksLabAroundWorldText:: - text "#MON around the" - line "world wait for" - cont "you, !" - done - -_OaksLabGivePokeballsText1:: - text "OAK: You can't get" - line "detailed data on" - cont "#MON by just" - cont "seeing them." - - para "You must catch" - line "them! Use these" - cont "to capture wild" - cont "#MON." - - para " got 5" - line "# BALLs!@@" - -_OaksLabGivePokeballsText2:: - text "" - para "When a wild" - line "#MON appears," - cont "it's fair game." - - para "Just throw a #" - line "BALL at it and try" - line "to catch it!" - - para "This won't always" - line "work, though." - - para "A healthy #MON" - line "could escape. You" - cont "have to be lucky!" - done - -_OaksLabPleaseVisitText:: - text "OAK: Come see me" - line "sometimes." - - para "I want to know how" - line "your #DEX is" - cont "coming along." - done - -_OaksLabText_1d31d:: - text "OAK: Good to see " - line "you! How is your " - cont "#DEX coming? " - cont "Here, let me take" - cont "a look!" - prompt - -_OaksLabText_1d32c:: - text "It's encyclopedia-" - line "like, but the" - cont "pages are blank!" - done - -_OaksLabText8:: - text "?" - done - -_OaksLabText_1d340:: - text "PROF.OAK is the" - line "authority on" - cont "#MON!" - - para "Many #MON" - line "trainers hold him" - cont "in high regard!" - done - -_OaksLabRivalWaitingText:: - text ": Gramps!" - line "I'm fed up with" - cont "waiting!" - done - -_OaksLabChooseMonText:: - text "OAK: ?" - line "Let me think..." - - para "Oh, that's right," - line "I told you to" - cont "come! Just wait!" - - para "Here, !" - - para "There are 3" - line "#MON here!" - - para "Haha!" - - para "They are inside" - line "the # BALLs." - - para "When I was young," - line "I was a serious" - cont "#MON trainer!" - - para "In my old age, I" - line "have only 3 left," - cont "but you can have" - cont "one! Choose!" - done - -_OaksLabRivalInterjectionText:: - text ": Hey!" - line "Gramps! What" - cont "about me?" - done - -_OaksLabBePatientText:: - text "OAK: Be patient!" - line ", you can" - cont "have one too!" - done - -_OaksLabLeavingText:: - text "OAK: Hey! Don't go" - line "away yet!" - done - -_OaksLabRivalPickingMonText:: - text ": I'll take" - line "this one, then!" - done - -_OaksLabRivalReceivedMonText:: - text " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabRivalChallengeText:: - text ": Wait" - line "!" - cont "Let's check out" - cont "our #MON!" - - para "Come on, I'll take" - line "you on!" - done - -_OaksLabText_1d3be:: - text "WHAT?" - line "Unbelievable!" - cont "I picked the" - cont "wrong #MON!" - prompt - -_OaksLabText_1d3c3:: - text ": Yeah! Am" - line "I great or what?" - prompt - -_OaksLabRivalToughenUpText:: - text ": Okay!" - line "I'll make my" - cont "#MON fight to" - cont "toughen it up!" - - para "! Gramps!" - line "Smell you later!" - done - -_OaksLabText21:: - text ": Gramps!" - done - -_OaksLabText22:: - text ": What did" - line "you call me for?" - done - -_OaksLabText23:: - text "OAK: Oh right! I" - line "have a request" - cont "of you two." - done - -_OaksLabText24:: - text "On the desk there" - line "is my invention," - cont "#DEX!" - - para "It automatically" - line "records data on" - cont "#MON you've" - cont "seen or caught!" - - para "It's a hi-tech" - line "encyclopedia!" - done - -_OaksLabText25:: - text "OAK: and" - line "! Take" - cont "these with you!" - - para " got" - line "#DEX from OAK!@@" - -_OaksLabText26:: - text "To make a complete" - line "guide on all the" - cont "#MON in the" - cont "world..." - - para "That was my dream!" - - para "But, I'm too old!" - line "I can't do it!" - - para "So, I want you two" - line "to fulfill my" - cont "dream for me!" - - para "Get moving, you" - line "two!" - - para "This is a great" - line "undertaking in" - cont "#MON history!" - done - -_OaksLabText27:: - text ": Alright" - line "Gramps! Leave it" - cont "all to me!" - - para ", I hate to" - line "say it, but I" - cont "don't need you!" - - para "I know! I'll" - line "borrow a TOWN MAP" - cont "from my sis!" - - para "I'll tell her not" - line "to lend you one," - cont "! Hahaha!" - done - -_OaksLabText_1d405:: - text "I study #MON as" - line "PROF.OAK's AIDE." - done - -_OaksLabText_441cc:: - text "#DEX comp-" - line "letion is:" - - para "@" - TX_NUM hDexRatingNumMonsSeen, 1, 3 - text " #MON seen" - line "@" - TX_NUM hDexRatingNumMonsOwned, 1, 3 - text " #MON owned" - - para "PROF.OAK's" - line "Rating:" - prompt - -_OaksLabText_44201:: - text "You still have" - line "lots to do." - cont "Look for #MON" - cont "in grassy areas!" - done - -_OaksLabText_44206:: - text "You're on the" - line "right track! " - cont "Get a FLASH HM" - cont "from my AIDE!" - done - -_OaksLabText_4420b:: - text "You still need" - line "more #MON!" - cont "Try to catch" - cont "other species!" - done - -_OaksLabText_44210:: - text "Good, you're" - line "trying hard!" - cont "Get an ITEMFINDER" - cont "from my AIDE!" - done - -_OaksLabText_44215:: - text "Looking good!" - line "Go find my AIDE" - cont "when you get 50!" - done - -_OaksLabText_4421a:: - text "You finally got at" - line "least 50 species!" - cont "Be sure to get" - cont "EXP.ALL from my" - cont "AIDE!" - done - -_OaksLabText_4421f:: - text "Ho! This is geting" - line "even better!" - done - -_OaksLabText_44224:: - text "Very good!" - line "Go fish for some" - cont "marine #MON!" - done - -_OaksLabText_44229:: - text "Wonderful!" - line "Do you like to" - cont "collect things?" - done - -_OaksLabText_4422e:: - text "I'm impressed!" - line "It must have been" - cont "difficult to do!" - done - -_OaksLabText_44233:: - text "You finally got at" - line "least 100 species!" - cont "I can't believe" - cont "how good you are!" - done - -_OaksLabText_44238:: - text "You even have the" - line "evolved forms of" - cont "#MON! Super!" - done - -_OaksLabText_4423d:: - text "Excellent! Trade" - line "with friends to" - cont "get some more!" - done - -_OaksLabText_44242:: - text "Outstanding!" - line "You've become a" - cont "real pro at this!" - done - -_OaksLabText_44247:: - text "I have nothing" - line "left to say!" - cont "You're the" - cont "authority now!" - done - -_OaksLabText_4424c:: - text "Your #DEX is" - line "entirely complete!" - cont "Congratulations!" - done diff --git a/text/maps/PalletTown.asm b/text/maps/PalletTown.asm deleted file mode 100644 index d5eda74f..00000000 --- a/text/maps/PalletTown.asm +++ /dev/null @@ -1,55 +0,0 @@ -_OakAppearsText:: - text "OAK: Hey! Wait!" - line "Don't go out!@@" - -_OakWalksUpText:: - text "OAK: It's unsafe!" - line "Wild #MON live" - cont "in tall grass!" - - para "You need your own" - line "#MON for your" - cont "protection." - cont "I know!" - - para "Here, come with" - line "me!" - done - -_PalletTownText2:: - text "I'm raising" - line "#MON too!" - - para "When they get" - line "strong, they can" - cont "protect me!" - done - -_PalletTownText3:: - text "Technology is" - line "incredible!" - - para "You can now store" - line "and recall items" - cont "and #MON as" - cont "data via PC!" - done - -_PalletTownText4:: - text "OAK #MON" - line "RESEARCH LAB" - done - -_PalletTownText5:: - text "PALLET TOWN" - line "Shades of your" - cont "journey await!" - done - -_PalletTownText6:: - text "'s house " - done - -_PalletTownText7:: - text "'s house " - done diff --git a/text/maps/PewterNidoranHouse.asm b/text/maps/PewterNidoranHouse.asm deleted file mode 100644 index 450e8372..00000000 --- a/text/maps/PewterNidoranHouse.asm +++ /dev/null @@ -1,24 +0,0 @@ -_PewterHouse1Text1:: - text "NIDORAN: Bowbow!@@" - -_PewterHouse1Text2:: - text "NIDORAN sit!" - done - -_PewterHouse1Text3:: - text "Our #MON's an" - line "outsider, so it's" - cont "hard to handle." - - para "An outsider is a" - line "#MON that you" - cont "get in a trade." - - para "It grows fast, but" - line "it may ignore an" - cont "unskilled trainer" - cont "in battle!" - - para "If only we had" - line "some BADGEs..." - done diff --git a/text/maps/PokemonFanClub.asm b/text/maps/PokemonFanClub.asm deleted file mode 100644 index 4827f2e8..00000000 --- a/text/maps/PokemonFanClub.asm +++ /dev/null @@ -1,143 +0,0 @@ -PikachuFanText:: - text "Won't you admire" - line "my PIKACHU's" - cont "adorable tail?" - done - -PikachuFanBetterText:: - text "Humph! My PIKACHU" - line "is twice as cute" - cont "as that one!" - done - -SeelFanText:: - text "I just love my" - line "SEEL!" - - para "It squeals when I" - line "hug it!" - done - -SeelFanBetterText:: - text "Oh dear!" - - para "My SEEL is far" - line "more attractive!" - done - -FanClubPikachuText:: - text "PIKACHU: Chu!" - line "Pikachu!" - done - -FanClubSeelText:: - text "SEEL: Kyuoo!" - done - -FanClubMeetChairText:: - text "I chair the" - line "#MON Fan Club!" - - para "I have collected" - line "over 100 #MON!" - - para "I'm very fussy" - line "when it comes to" - cont "#MON!" - - para "So..." - - para "Did you come" - line "visit to hear" - cont "about my #MON?" - done - -FanClubChairStoryText:: - text "Good!" - line "Then listen up!" - - para "My favorite" - line "RAPIDASH..." - - para "It...cute..." - line "lovely...smart..." - cont "plus...amazing..." - cont "you think so?..." - cont "oh yes...it..." - cont "stunning..." - cont "kindly..." - cont "love it!" - - para "Hug it...when..." - cont "sleeping...warm" - cont "and cuddly..." - cont "spectacular..." - cont "ravishing..." - cont "...Oops! Look at" - cont "the time! I kept" - cont "you too long!" - - para "Thanks for hearing" - line "me out! I want" - cont "you to have this!" - prompt - -ReceivedBikeVoucherText:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -ExplainBikeVoucherText:: - text "" - para "Exchange that for" - line "a BICYCLE!" - - para "Don't worry, my" - line "FEAROW will FLY" - cont "me anywhere!" - - para "So, I don't need a" - line "BICYCLE!" - - para "I hope you like" - line "cycling!" - done - -FanClubNoStoryText:: - text "Oh. Come back" - line "when you want to" - cont "hear my story!" - done - -FanClubChairFinalText:: - text "Hello, !" - - para "Did you come see" - line "me about my" - cont "#MON again?" - - para "No? Too bad!" - done - -FanClubBagFullText:: - text "Make room for" - line "this!" - done - -_FanClubText6:: - text "Our Chairman is" - line "very vocal about" - cont "#MON." - done - -_FanClubText7:: - text "Let's all listen" - line "politely to other" - cont "trainers!" - done - -_FanClubText8:: - text "If someone brags," - line "brag right back!" - done diff --git a/text/maps/PowerPlant.asm b/text/maps/PowerPlant.asm deleted file mode 100644 index e5df6674..00000000 --- a/text/maps/PowerPlant.asm +++ /dev/null @@ -1,6 +0,0 @@ -_VoltorbBattleText:: - text "Bzzzt!" - done - -_ZapdosBattleText:: - text "Gyaoo!@@" diff --git a/text/maps/RocketHideoutB1F.asm b/text/maps/RocketHideoutB1F.asm deleted file mode 100644 index 36117804..00000000 --- a/text/maps/RocketHideoutB1F.asm +++ /dev/null @@ -1,73 +0,0 @@ -_RocketHideout1EndBattleText6:: - text "Why...?@@" - -_RocketHideout1BattleText2:: - text "Who are you? How" - line "did you get here?" - done - -_RocketHideout1EndBattleText2:: - text "Oww!" - line "Beaten!" - prompt - -_RocketHideout1AfterBattleTxt2:: - text "Are you dissing" - line "TEAM ROCKET?" - done - -_RocketHideout1BattleText3:: - text "You broke into" - line "our operation?" - done - -_RocketHideout1EndBattleText3:: - text "Burnt!" - prompt - -_RocketHideout1AfterBattleTxt3:: - text "You're not going" - line "to get away with" - cont "this, brat!" - done - -_RocketHideout1BattleText4:: - text "Intruder alert!" - done - -_RocketHideout1EndBattleText4:: - text "I" - line "can't do it!" - prompt - -_RocketHideout1AfterBattleTxt4:: - text "SILPH SCOPE?" - line "I don't know" - cont "where it is!" - done - -_RocketHideout1BattleText5:: - text "Why did you come" - line "here?" - done - -_RocketHideout1EndBattleText5:: - text "This" - line "won't do!" - prompt - -_RocketHideout1AfterBattleTxt5:: - text "OK, I'll talk!" - line "Take the elevator" - cont "to see my BOSS!" - done - -_RocketHideout1BattleText6:: - text "Are you lost, you" - line "little rat?" - done - -_RocketHideout1AfterBattleTxt6:: - text "Uh-oh, that fight" - line "opened the door!" - done diff --git a/text/maps/RocketHideoutElevator.asm b/text/maps/RocketHideoutElevator.asm deleted file mode 100644 index 6f2aa638..00000000 --- a/text/maps/RocketHideoutElevator.asm +++ /dev/null @@ -1,3 +0,0 @@ -_RocketElevatorText_4578b:: - text "It appears to" - line "need a key.@@" diff --git a/text/maps/Route1.asm b/text/maps/Route1.asm deleted file mode 100644 index 73188f09..00000000 --- a/text/maps/Route1.asm +++ /dev/null @@ -1,49 +0,0 @@ -_Route1ViridianMartSampleText:: - text "Hi! I work at a" - line "#MON MART." - - para "It's a convenient" - line "shop, so please" - cont "visit us in" - cont "VIRIDIAN CITY." - - para "I know, I'll give" - line "you a sample!" - cont "Here you go!" - prompt - -_Route1Text_1cae8:: - text " got" - line "@" - TX_RAM wcf4b - text "!@@" - -_Route1Text_1caee:: - text "We also carry" - line "# BALLs for" - cont "catching #MON!" - done - -_Route1Text_1caf3:: - text "You have too much" - line "stuff with you!" - done - -_Route1Text2:: - text "See those ledges" - line "along the road?" - - para "It's a bit scary," - line "but you can jump" - cont "from them." - - para "You can get back" - line "to PALLET TOWN" - cont "quicker that way." - done - -_Route1Text3:: - text "ROUTE 1" - line "PALLET TOWN -" - cont "VIRIDIAN CITY" - done diff --git a/text/maps/Route12Gate2F.asm b/text/maps/Route12Gate2F.asm deleted file mode 100644 index 95a89527..00000000 --- a/text/maps/Route12Gate2F.asm +++ /dev/null @@ -1,42 +0,0 @@ -_TM39PreReceiveText:: - text "My #MON's" - line "ashes are stored" - cont "in #MON TOWER." - - para "You can have this" - line "TM. I don't need" - cont "it any more..." - prompt - -_ReceivedTM39Text:: - text " received" - line "TM39!@@" - -_TM39ExplanationText:: - text "TM39 is a move" - line "called SWIFT." - - para "It's very accurate," - line "so use it during" - cont "battles you can't" - cont "afford to lose." - done - -_TM39NoRoomText:: - text "You don't have" - line "room for this." - done - -_Route12GateUpstairsText_495b8:: - text "Looked into the" - line "binoculars." - - para "A man fishing!" - done - -_Route12GateUpstairsText_495c4:: - text "Looked into the" - line "binoculars." - - para "It's #MON TOWER!" - done diff --git a/text/maps/Route12SuperRodHouse.asm b/text/maps/Route12SuperRodHouse.asm deleted file mode 100644 index 7dfaa74f..00000000 --- a/text/maps/Route12SuperRodHouse.asm +++ /dev/null @@ -1,61 +0,0 @@ -_Route12HouseText_564c0:: - text "I'm the FISHING" - line "GURU's brother!" - - para "I simply Looove" - line "fishing!" - - para "Do you like to" - line "fish?" - done - -_Route12HouseText_564c5:: - text "Grand! I like" - line "your style!" - - para "Take this and" - line "fish, young one!" - - para " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_Route12HouseText_564ca:: - text "" - - para "Fishing is a way" - line "of life!" - - para "From the seas to" - line "rivers, go out" - cont "and land the big" - cont "one!" - done - -_Route12HouseText_564cf:: - text "Oh... That's so" - line "disappointing..." - done - -_Route12HouseText_564d4:: - text "Hello there," - line "!" - - para "Use the SUPER ROD" - line "in any water!" - cont "You can catch" - cont "different kinds" - cont "of #MON." - - para "Try fishing" - line "wherever you can!" - done - -_Route12HouseText_564d9:: - text "Oh no!" - - para "I had a gift for" - line "you, but you have" - cont "no room for it!" - done diff --git a/text/maps/Route15.asm b/text/maps/Route15.asm deleted file mode 100644 index a23b8500..00000000 --- a/text/maps/Route15.asm +++ /dev/null @@ -1,171 +0,0 @@ -_Route15BattleText1:: - text "Let me try out the" - line "#MON I just" - cont "got in a trade!" - done - -_Route15EndBattleText1:: - text "Not" - line "good enough!" - prompt - -_Route15AfterBattleText1:: - text "You can't change" - line "the nickname of" - cont "any #MON you" - cont "get in a trade." - - para "Only the Original" - line "Trainer can." - done - -_Route15BattleText2:: - text "You look gentle," - line "so I think I can" - cont "beat you!" - done - -_Route15EndBattleText2:: - text "No," - line "wrong!" - prompt - -_Route15AfterBattleText2:: - text "I'm afraid of" - line "BIKERs, they look" - cont "so ugly and mean!" - done - -_Route15BattleText3:: - text "When I whistle, I" - line "can summon bird" - cont "#MON!" - done - -_Route15EndBattleText3:: - text "Ow!" - line "That's tragic!" - prompt - -_Route15AfterBattleText3:: - text "Maybe I'm not cut" - line "out for battles." - done - -_Route15BattleText4:: - text "Hmm? My birds are" - line "shivering! You're" - cont "good, aren't you?" - done - -_Route15EndBattleText4:: - text "Just" - line "as I thought!" - prompt - -_Route15AfterBattleText4:: - text "Did you know moves" - line "like EARTHQUAKE" - cont "don't have any" - cont "effect on birds?" - done - -_Route15BattleText5:: - text "Oh, you're a" - line "little cutie!" - done - -_Route15EndBattleText5:: - text "You looked" - line "so cute too!" - prompt - -_Route15AfterBattleText5:: - text "I forgive you!" - line "I can take it!" - done - -_Route15BattleText6:: - text "I raise #MON" - line "because I live" - cont "alone!" - done - -_Route15EndBattleText6:: - text "I didn't" - line "ask for this!" - prompt - -_Route15AfterBattleText6:: - text "I just like going" - line "home to be with" - cont "my #MON!" - done - -_Route15BattleText7:: - text "Hey kid! C'mon!" - line "I just got these!" - done - -_Route15EndBattleText7:: - text "Why" - line "not?" - prompt - -_Route15AfterBattleText7:: - text "You only live" - line "once, so I live" - cont "as an outlaw!" - cont "TEAM ROCKET RULES!" - done - -_Route15BattleText8:: - text "Fork over all your" - line "cash when you" - cont "lose to me, kid!" - done - -_Route15EndBattleText8:: - text "That" - line "can't be true!" - prompt - -_Route15AfterBattleText8:: - text "I was just joking" - line "about the money!" - done - -_Route15BattleText9:: - text "What's cool?" - line "Trading #MON!" - done - -_Route15EndBattleText9:: - text "I" - line "said trade!" - prompt - -_Route15AfterBattleText9:: - text "I trade #MON" - line "with my friends!" - done - -_Route15BattleText10:: - text "Want to play with" - line "my #MON?" - done - -_Route15EndBattleText10:: - text "I was" - line "too impatient!" - prompt - -_Route15AfterBattleText10:: - text "I'll go train with" - line "weaker people.@@" - -_Route15Text12:: - text "ROUTE 15" - line "West to FUCHSIA" - cont "CITY" - done diff --git a/text/maps/Route16FlyHouse.asm b/text/maps/Route16FlyHouse.asm deleted file mode 100644 index 77efde87..00000000 --- a/text/maps/Route16FlyHouse.asm +++ /dev/null @@ -1,31 +0,0 @@ -_Route16HouseText3:: - text "Oh, you found my" - line "secret retreat!" - - para "Please don't tell" - line "anyone I'm here." - cont "I'll make it up" - cont "to you with this!" - prompt - -_ReceivedHM02Text:: - text " received" - line "HM02!@@" - -_HM02ExplanationText:: - text "HM02 is FLY." - line "It will take you" - cont "back to any town." - - para "Put it to good" - line "use!" - done - -_HM02NoRoomText:: - text "You don't have any" - line "room for this." - done - -_Route16HouseText_1e652:: - text "FEAROW: Kyueen!" - done diff --git a/text/maps/Route22Gate.asm b/text/maps/Route22Gate.asm deleted file mode 100644 index ce3f6824..00000000 --- a/text/maps/Route22Gate.asm +++ /dev/null @@ -1,20 +0,0 @@ -_Route22GateText_1e704:: - text "Only truly skilled" - line "trainers are" - cont "allowed through." - - para "You don't have the" - line "BOULDERBADGE yet!@@" - -_Route22GateText_1e715:: - text "" - - para "The rules are" - line "rules. I can't" - cont "let you pass." - done - -_Route22GateText_1e71a:: - text "Oh! That is the" - line "BOULDERBADGE!" - cont "Go right ahead!@@" diff --git a/text/maps/Route23.asm b/text/maps/Route23.asm deleted file mode 100644 index a7e534de..00000000 --- a/text/maps/Route23.asm +++ /dev/null @@ -1,39 +0,0 @@ -_VictoryRoadGuardText1:: - text "You can pass here" - line "only if you have" - cont "the @" - TX_RAM wcd6d - text "!" - - para "You don't have the" - line "@" - TX_RAM wcd6d - text " yet!" - - para "You have to have" - line "it to get to" - cont "#MON LEAGUE!@@" - -_VictoryRoadGuardText2:: - text "You can pass here" - line "only if you have" - cont "the @" - TX_RAM wcd6d - text "!" - - para "Oh! That is the" - line "@" - TX_RAM wcd6d - text "!@@" - -_VictoryRoadGuardText_513a3:: - text "" - - para "OK then! Please," - line "go right ahead!" - done - -_Route23Text8:: - text "VICTORY ROAD GATE" - line "- #MON LEAGUE" - done diff --git a/text/maps/Route24.asm b/text/maps/Route24.asm deleted file mode 100644 index c14b689a..00000000 --- a/text/maps/Route24.asm +++ /dev/null @@ -1,65 +0,0 @@ -_Route24Text_51510:: - text "Congratulations!" - line "You beat our 5" - cont "contest trainers!@@" - -_Route24Text_51515:: - text "" - - para "You just earned a" - line "fabulous prize!" - prompt - -_Route24Text_5151a:: - text " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_Route24Text_51521:: - text "You don't have" - line "any room!" - done - -_Route24Text_51526:: - text "By the way, would" - line "you like to join" - cont "TEAM ROCKET?" - - para "We're a group" - line "dedicated to evil" - cont "using #MON!" - - para "Want to join?" - - para "Are you sure?" - - para "Come on, join us!" - - para "I'm telling you" - line "to join!" - - para "OK, you need" - line "convincing!" - - para "I'll make you an" - line "offer you can't" - cont "refuse!" - done - -_Route24Text_5152b:: - text "Arrgh!" - line "You are good!" - prompt - -_Route24Text_51530:: - text "With your ability," - line "you could become" - cont "a top leader in" - cont "TEAM ROCKET!" - done - -_Route24BattleText1:: - text "I saw your feat" - line "from the grass!" - done diff --git a/text/maps/SSAnne1FRooms.asm b/text/maps/SSAnne1FRooms.asm deleted file mode 100644 index 7a09303e..00000000 --- a/text/maps/SSAnne1FRooms.asm +++ /dev/null @@ -1,104 +0,0 @@ -_SSAnne8Text8:: - text "WIGGLYTUFF: Puup" - line "pupuu!@@" - -_SSAnne8BattleText1:: - text "I travel alone" - line "on my journeys!" - - para "My #MON are my" - line "only friends!" - done - -_SSAnne8EndBattleText1:: - text "My, my" - line "friends..." - prompt - -_SSAnne8AfterBattleText1:: - text "You should be" - line "nice to friends!" - done - -_SSAnne8BattleText2:: - text "You pup! How dare" - line "you barge in!" - done - -_SSAnne8EndBattleText2:: - text "Humph!" - line "You rude child!" - prompt - -_SSAnne8AfterBattleText2:: - text "I wish to be left" - line "alone! Get out!" - done - -_SSAnne8BattleText3:: - text "I love #MON!" - line "Do you?" - done - -_SSAnne8EndBattleText3:: - text "Wow! " - line "You're great!" - prompt - -_SSAnne8AfterBattleText3:: - text "Let me be your" - line "friend, OK?" - - para "Then we can trade" - line "#MON!" - done - -_SSAnne8BattleText4:: - text "I collected these" - line "#MON from all" - cont "around the world!" - done - -_SSAnne8EndBattleText4:: - text "Oh no!" - line "I went around the" - cont "world for these!" - prompt - -_SSAnne8AfterBattleText4:: - text "You hurt my poor" - line "worldly #MON!" - - para "I demand that you" - line "heal them at a" - cont "#MON CENTER!" - done - -_SSAnne8Text5:: - text "Waiter, I would" - line "like a cherry pie" - cont "please!" - done - -_SSAnne8Text6:: - text "A cruise is so" - line "elegant yet cozy!" - done - -_SSAnne8Text7:: - text "I always travel" - line "with WIGGLYTUFF!" - done - -_SSAnne8Text9:: - text "We are cruising" - line "around the world." - done - -_SSAnne8Text11:: - text "Ssh! I'm a GLOBAL" - line "POLICE agent!" - - para "I'm on the trail" - line "of TEAM ROCKET!" - done diff --git a/text/maps/SSAnneB1FRooms.asm b/text/maps/SSAnneB1FRooms.asm deleted file mode 100644 index 7df629b5..00000000 --- a/text/maps/SSAnneB1FRooms.asm +++ /dev/null @@ -1,112 +0,0 @@ -_SSAnne10Text8:: - text "MACHOKE: Gwoh!" - line "Goggoh!@@" - -_SSAnne10BattleText1:: - text "You know what they" - line "say about sailors" - cont "and fighting!" - done - -_SSAnne10EndBattleText1:: - text "Right!" - line "Good fight, mate!" - prompt - -_SSAnne10AfterBattleText1:: - text "Haha! Want to be" - line "a sailor, mate?" - done - -_SSAnne10BattleText2:: - text "My sailor's pride" - line "is at stake!" - done - -_SSAnne10EndBattleText2:: - text "Your" - line "spirit sank me!" - prompt - -_SSAnne10AfterBattleText2:: - text "Did you see the" - line "FISHING GURU in" - cont "VERMILION CITY?" - done - -_SSAnne10BattleText3:: - text "Us sailors have" - line "#MON too!" - done - -_SSAnne10EndBattleText3:: - text "OK, " - line "you're not bad." - prompt - -_SSAnne10AfterBattleText3:: - text "We caught all our" - line "#MON while" - cont "out at sea!" - done - -_SSAnne10BattleText4:: - text "I like feisty" - line "kids like you!@@" - -_SSAnne10EndBattleText4:: - text "Argh!" - line "Lost it!" - prompt - -_SSAnne10AfterBattleText4:: - text "Sea #MON live" - line "in deep water." - cont "You'll need a ROD!" - done - -_SSAnne10BattleText5:: - text "Matey, you're" - line "walking the plank" - cont "if you lose!" - done - -_SSAnne10EndBattleText5:: - text "Argh!" - line "Beaten by a kid!" - prompt - -_SSAnne10AfterBattleText5:: - text "Jellyfish some-" - line "times drift into" - cont "the ship." - done - -_SSAnne10BattleText6:: - text "Hello stranger!" - line "Stop and chat!" - - para "All my #MON" - line "are from the sea!" - done - -_SSAnne10EndBattleText6:: - text "Darn!" - line "I let that one" - cont "get away!" - prompt - -_SSAnne10AfterBattleText6:: - text "I was going to" - line "make you my" - cont "assistant too!" - done - -_SSAnne10Text7:: - text "My buddy, MACHOKE," - line "is super strong!" - - para "He has enough" - line "STRENGTH to move" - cont "big rocks!" - done diff --git a/text/maps/SSAnneCaptainsRoom.asm b/text/maps/SSAnneCaptainsRoom.asm deleted file mode 100644 index 7bf004da..00000000 --- a/text/maps/SSAnneCaptainsRoom.asm +++ /dev/null @@ -1,62 +0,0 @@ -_SSAnne7RubText:: - text "CAPTAIN: Ooargh..." - line "I feel hideous..." - cont "Urrp! Seasick..." - - para " rubbed" - line "the CAPTAIN's" - cont "back!" - - para "Rub-rub..." - line "Rub-rub...@@" - -_ReceivingHM01Text:: - text "CAPTAIN: Whew!" - line "Thank you! I" - cont "feel much better!" - - para "You want to see" - line "my CUT technique?" - - para "I could show you" - line "if I wasn't ill..." - - para "I know! You can" - line "have this!" - - para "Teach it to your" - line "#MON and you" - cont "can see it CUT" - cont "any time!" - prompt - -_ReceivedHM01Text:: - text " got" - line "@" - TX_RAM wcf4b - text "!@@" - -_SSAnne7Text_61932:: - text "CAPTAIN: Whew!" - - para "Now that I'm not" - line "sick any more, I" - cont "guess it's time." - done - -_HM01NoRoomText:: - text "Oh no! You have" - line "no room for this!" - done - -_SSAnne7Text2:: - text "Yuck! Shouldn't" - line "have looked!" - done - -_SSAnne7Text3:: - text "How to Conquer" - line "Seasickness..." - cont "The CAPTAIN's" - cont "reading this!" - done diff --git a/text/maps/SafariZoneGate.asm b/text/maps/SafariZoneGate.asm deleted file mode 100644 index 5c143891..00000000 --- a/text/maps/SafariZoneGate.asm +++ /dev/null @@ -1,94 +0,0 @@ -_SafariZoneEntranceText1:: - text "Welcome to the" - line "SAFARI ZONE!" - done - -SafariZoneEntranceText_9e6e4:: - text "For just ¥500," - line "you can catch all" - cont "the #MON you" - cont "want in the park!" - - para "Would you like to" - line "join the hunt?@@" - -SafariZoneEntranceText_9e747:: - text "That'll be ¥500" - line "please!" - - para "We only use a" - line "special # BALL" - cont "here." - - para " received" - line "30 SAFARI BALLs!@@" - -_SafariZoneEntranceText_75360:: - text "" - - para "We'll call you on" - line "the PA when you" - cont "run out of time" - cont "or SAFARI BALLs!" - done - -_SafariZoneEntranceText_75365:: - text "OK! Please come" - line "again!" - done - -_SafariZoneEntranceText_7536a:: - text "Oops! Not enough" - line "money!" - done - -SafariZoneEntranceText_9e814:: - text "Leaving early?@@" - -_SafariZoneEntranceText_753bb:: - text "Please return any" - line "SAFARI BALLs you" - cont "have left." - done - -_SafariZoneEntranceText_753c0:: - text "Good Luck!" - done - -_SafariZoneEntranceText_753c5:: - text "Did you get a" - line "good haul?" - cont "Come again!" - done - -_SafariZoneEntranceText_753e6:: - text "Hi! Is it your" - line "first time here?" - done - -_SafariZoneEntranceText_753eb:: - text "SAFARI ZONE has 4" - line "zones in it." - - para "Each zone has" - line "different kinds" - cont "of #MON. Use" - cont "SAFARI BALLs to" - cont "catch them!" - - para "When you run out" - line "of time or SAFARI" - cont "BALLs, it's game" - cont "over for you!" - - para "Before you go," - line "open an unused" - cont "#MON BOX so" - cont "there's room for" - cont "new #MON!" - done - -_SafariZoneEntranceText_753f0:: - text "Sorry, you're a" - line "regular here!" - done diff --git a/text/maps/SafariZoneSecretHouse.asm b/text/maps/SafariZoneSecretHouse.asm deleted file mode 100644 index 3df79d90..00000000 --- a/text/maps/SafariZoneSecretHouse.asm +++ /dev/null @@ -1,44 +0,0 @@ -_SecretHouseText_4a350:: - text "Ah! Finally!" - - para "You're the first" - line "person to reach" - cont "the SECRET HOUSE!" - - para "I was getting" - line "worried that no" - cont "one would win our" - cont "campaign prize." - - para "Congratulations!" - line "You have won!" - prompt - -_ReceivedHM03Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_HM03ExplanationText:: - text "HM03 is SURF!" - - para "#MON will be" - line "able to ferry you" - cont "across water!" - - para "And, this HM isn't" - line "disposable! You" - cont "can use it over" - cont "and over!" - - para "You're super lucky" - line "for winning this" - cont "fabulous prize!" - done - -_HM03NoRoomText:: - text "You don't have" - line "room for this" - cont "fabulous prize!" - done diff --git a/text/maps/SaffronCity.asm b/text/maps/SaffronCity.asm deleted file mode 100644 index a0422c8c..00000000 --- a/text/maps/SaffronCity.asm +++ /dev/null @@ -1,151 +0,0 @@ -_SaffronCityText1:: - text "What do you want?" - line "Get lost!" - done - -_SaffronCityText2:: - text "BOSS said he'll" - line "take this town!" - done - -_SaffronCityText3:: - text "Get out of the" - line "way!" - done - -_SaffronCityText4:: - text "SAFFRON belongs" - line "to TEAM ROCKET!" - done - -_SaffronCityText5:: - text "Being evil makes" - line "me feel so alive!" - done - -_SaffronCityText6:: - text "Ow! Watch where" - line "you're walking!" - done - -_SaffronCityText7:: - text "With SILPH under" - line "control, we can" - cont "exploit #MON" - cont "around the world!" - done - -_SaffronCityText8:: - text "You beat TEAM" - line "ROCKET all alone?" - cont "That's amazing!" - done - -_SaffronCityText9:: - text "Yeah! TEAM ROCKET" - line "is gone!" - cont "It's safe to go" - cont "out again!" - done - -_SaffronCityText10:: - text "People should be" - line "flocking back to" - cont "SAFFRON now." - done - -_SaffronCityText11:: - text "I flew here on my" - line "PIDGEOT when I" - cont "read about SILPH." - - para "It's already over?" - line "I missed the" - cont "media action." - done - -_SaffronCityText12:: - text "PIDGEOT: Bi bibii!@@" - -_SaffronCityText13:: - text "I saw ROCKET" - line "BOSS escaping" - cont "SILPH's building." - done - -_SaffronCityText14:: - text "I'm a security" - line "guard." - - para "Suspicious kids I" - line "don't allow in!" - done - -_SaffronCityText15:: - text "..." - line "Snore..." - - para "Hah! He's taking" - line "a snooze!" - done - -_SaffronCityText16:: - text "SAFFRON CITY" - line "Shining, Golden" - cont "Land of Commerce" - done - -_SaffronCityText17:: - text "FIGHTING DOJO" - done - -_SaffronCityText18:: - text "SAFFRON CITY" - line "#MON GYM" - cont "LEADER: SABRINA" - - para "The Master of" - line "Psychic #MON!" - done - -_SaffronCityText20:: - text "TRAINER TIPS" - - para "FULL HEAL cures" - line "all ailments like" - cont "sleep and burns." - - para "It costs a bit" - line "more, but it's" - cont "more convenient." - done - -_SaffronCityText21:: - text "TRAINER TIPS" - - para "New GREAT BALL" - line "offers improved" - cont "capture rates." - - para "Try it on those" - line "hard-to-catch" - cont "#MON." - done - -_SaffronCityText22:: - text "SILPH CO." - line "OFFICE BUILDING" - done - -_SaffronCityText24:: - text "MR.PSYCHIC's" - line "HOUSE" - done - -_SaffronCityText25:: - text "SILPH's latest" - line "product!" - - para "Release to be" - line "determined..." - done diff --git a/text/maps/SaffronGym.asm b/text/maps/SaffronGym.asm deleted file mode 100644 index 6f49a331..00000000 --- a/text/maps/SaffronGym.asm +++ /dev/null @@ -1,237 +0,0 @@ -_SaffronGymText_5d162:: - text "I had a vision of" - line "your arrival!" - - para "I have had psychic" - line "powers since I" - cont "was a child." - - para "I first learned" - line "to bend spoons" - cont "with my mind." - - para "I dislike fight-" - line "ing, but if you" - cont "wish, I will show" - cont "you my powers!" - done - -_SaffronGymText_5d167:: - text "I'm" - line "shocked!" - cont "But, a loss is a" - cont "loss." - - para "I admit I didn't" - line "work hard enough" - cont "to win!" - - para "You earned the" - line "MARSHBADGE!@@" - -_SaffronGymText_5d16e:: - text "Everyone has" - line "psychic power!" - cont "People just don't" - cont "realize it!" - done - -_SaffronGymText_5d173:: - text "The MARSHBADGE" - line "makes #MON up" - cont "to L70 obey you!" - - para "Stronger #MON" - line "will become wild," - cont "ignoring your" - cont "orders in battle!" - - para "Just don't raise" - line "your #MON too" - cont "much!" - - para "Wait, please take" - line "this TM with you!" - done - -ReceivedTM46Text:: - text " received" - line "TM46!@@" - -_TM46ExplanationText:: - text "" - - para "TM46 is PSYWAVE!" - line "It uses powerful" - cont "psychic waves to" - cont "inflict damage!" - done - -_TM46NoRoomText:: - text "Your pack is full" - line "of other items!" - done - -_SaffronGymText_5d1e6:: - text "Yo! Champ in" - line "making!" - - para "SABRINA's #MON" - line "use psychic power" - cont "instead of force!" - - para "Fighting #MON" - line "are weak against" - cont "psychic #MON!" - - para "They get creamed" - line "before they can" - cont "even aim a punch!" - done - -_SaffronGymText_5d1eb:: - text "Psychic power," - line "huh?" - - para "If I had that," - line "I'd make a bundle" - cont "at the slots!" - done - -_SaffronGymBattleText1:: - text "SABRINA is younger" - line "than I, but I" - cont "respect her!" - done - -_SaffronGymEndBattleText1:: - text "Not" - line "good enough!" - prompt - -_SaffronGymAfterBattleText1:: - text "In a battle of" - line "equals, the one" - cont "with the stronger" - cont "will wins!" - - para "If you wish" - line "to beat SABRINA," - cont "focus on winning!" - done - -_SaffronGymBattleText2:: - text "Does our unseen" - line "power scare you?" - done - -_SaffronGymEndBattleText2:: - text "I never" - line "foresaw this!" - prompt - -_SaffronGymAfterBattleText2:: - text "Psychic #MON" - line "fear only ghosts" - cont "and bugs!" - done - -_SaffronGymBattleText3:: - text "#MON take on" - line "the appearance of" - cont "their trainers." - - para "Your #MON must" - line "be tough, then!" - done - -_SaffronGymEndBattleText3:: - text "I knew" - line "it!" - prompt - -_SaffronGymAfterBattleText3:: - text "I must teach" - line "better techniques" - cont "to my #MON!" - done - -_SaffronGymBattleText4:: - text "You know that" - line "power alone isn't" - cont "enough!" - done - -_SaffronGymEndBattleText4:: - text "I don't" - line "believe this!" - prompt - -_SaffronGymAfterBattleText4:: - text "SABRINA just wiped" - line "out the KARATE" - cont "MASTER next door!" - done - -_SaffronGymBattleText5:: - text "You and I, our" - line "#MON shall" - cont "fight!" - done - -_SaffronGymEndBattleText5:: - text "I lost" - line "after all!" - prompt - -_SaffronGymAfterBattleText5:: - text "I knew that this" - line "was going to take" - cont "place." - done - -_SaffronGymBattleText6:: - text "SABRINA is young," - line "but she's also" - cont "our LEADER!" - - para "You won't reach" - line "her easily!" - done - -_SaffronGymEndBattleText6:: - text "I lost" - line "my concentration!" - prompt - -_SaffronGymAfterBattleText6:: - text "There used to be" - line "2 #MON GYMs in" - cont "SAFFRON." - - para "The FIGHTING DOJO" - line "next door lost" - cont "its GYM status" - cont "when we went and" - cont "creamed them!" - done - -_SaffronGymBattleText7:: - text "SAFFRON #MON" - line "GYM is famous for" - cont "its psychics!" - - para "You want to see" - line "SABRINA!" - cont "I can tell!" - done - -_SaffronGymEndBattleText7:: - text "Arrrgh!" - prompt - -_SaffronGymAfterBattleText7:: - text "That's right! I" - line "used telepathy to" - cont "read your mind!" - done diff --git a/text/maps/SaffronPidgeyHouse.asm b/text/maps/SaffronPidgeyHouse.asm deleted file mode 100644 index 214bf089..00000000 --- a/text/maps/SaffronPidgeyHouse.asm +++ /dev/null @@ -1,26 +0,0 @@ -_SaffronHouse1Text1:: - text "Thank you for" - line "writing. I hope" - cont "to see you soon!" - - para "Hey! Don't look" - line "at my letter!" - done - -_SaffronHouse1Text2:: - text "PIDGEY: Kurukkoo!@@" - -_SaffronHouse1Text3:: - text "The COPYCAT is" - line "cute! I'm getting" - cont "her a # DOLL!" - done - -_SaffronHouse1Text4:: - text "I was given a PP" - line "UP as a gift." - - para "It's used for" - line "increasing the PP" - cont "of techniques!" - done diff --git a/text/maps/SeafoamIslandsB4F.asm b/text/maps/SeafoamIslandsB4F.asm deleted file mode 100644 index 608d165f..00000000 --- a/text/maps/SeafoamIslandsB4F.asm +++ /dev/null @@ -1,13 +0,0 @@ -_ArticunoBattleText:: - text "Gyaoo!@@" - -_SeafoamIslands5Text4:: - text "Boulders might" - line "change the flow" - cont "of water!" - done - -_SeafoamIslands5Text5:: - text "DANGER" - line "Fast current!" - done diff --git a/text/maps/SilphCo11F.asm b/text/maps/SilphCo11F.asm deleted file mode 100644 index fbaa6086..00000000 --- a/text/maps/SilphCo11F.asm +++ /dev/null @@ -1,134 +0,0 @@ -_SilphCoPresidentText:: - text "PRESIDENT: Thank" - line "you for saving" - cont "SILPH!" - - para "I will never" - line "forget you saved" - cont "us in our moment" - cont "of peril!" - - para "I have to thank" - line "you in some way!" - - para "Because I am rich," - line "I can give you" - cont "anything!" - - para "Here, maybe this" - line "will do!" - prompt - -_ReceivedSilphCoMasterBallText:: - text " got a" - line "@" - TX_RAM wcf4b - text "!@@" - -_SilphCo10Text_6231c:: - text "PRESIDENT: You" - line "can't buy that" - cont "anywhere!" - - para "It's our secret" - line "prototype MASTER" - cont "BALL!" - - para "It will catch any" - line "#MON without" - cont "fail!" - - para "You should be" - line "quiet about using" - cont "it, though." - done - -_SilphCoMasterBallNoRoomText:: - text "You have no" - line "room for this." - done - -_SilphCo11Text2:: - text "SECRETARY: Thank" - line "you for rescuing" - cont "all of us!" - - para "We admire your" - line "courage." - done - -_SilphCo11Text3:: - text "Ah !" - line "So we meet again!" - - para "The PRESIDENT and" - line "I are discussing" - cont "a vital business" - cont "proposition." - - para "Keep your nose" - line "out of grown-up" - cont "matters..." - - para "Or, experience a" - line "world of pain!" - done - -_SilphCo10Text_62330:: - text "Arrgh!!" - line "I lost again!?" - prompt - -_SilphCo10Text_62335:: - text "Blast it all!" - line "You ruined our" - cont "plans for SILPH!" - - para "But, TEAM ROCKET" - line "will never fall!" - - para "! Never" - line "forget that all" - cont "#MON exist" - cont "for TEAM ROCKET!" - - para "I must go, but I" - line "shall return!" - done - -_SilphCo11BattleText1:: - text "Stop right there!" - line "Don't you move!" - done - -_SilphCo11EndBattleText1:: - text "Don't..." - line "Please!" - prompt - -_SilphCo11AfterBattleText1:: - text "So, you want to" - line "see my BOSS?" - done - -_SilphCo11BattleText2:: - text "Halt! Do you have" - line "an appointment" - cont "with my BOSS?" - done - -_SilphCo11EndBattleText2:: - text "Gaah!" - line "Demolished!" - prompt - -_SilphCo11AfterBattleText2:: - text "Watch your step," - line "my BOSS likes his" - cont "#MON tough!" - done - -_SilphCo10Text_6237b:: - text "The monitor has" - line "#MON on it!" - done diff --git a/text/maps/SilphCo2F.asm b/text/maps/SilphCo2F.asm deleted file mode 100644 index bd87630a..00000000 --- a/text/maps/SilphCo2F.asm +++ /dev/null @@ -1,96 +0,0 @@ -_SilphCo2Text_59ded:: - text "Eeek!" - line "No! Stop! Help!" - - para "Oh, you're not" - line "with TEAM ROCKET." - cont "I thought..." - cont "I'm sorry. Here," - cont "please take this!" - prompt - -_ReceivedTM36Text:: - text " got" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM36ExplanationText:: - text "TM36 is" - line "SELFDESTRUCT!" - - para "It's powerful, but" - line "the #MON that" - cont "uses it faints!" - cont "Be careful." - done - -_TM36NoRoomText:: - text "You don't have any" - line "room for this." - done - -_SilphCo2BattleText1:: - text "Help! I'm a SILPH" - line "employee." - done - -_SilphCo2EndBattleText1:: - text "How" - line "did you know I" - cont "was a ROCKET?" - prompt - -_SilphCo2AfterBattleText1:: - text "I work for both" - line "SILPH and TEAM" - cont "ROCKET!" - done - -_SilphCo2BattleText2:: - text "It's off limits" - line "here! Go home!" - done - -_SilphCo2EndBattleText2:: - text "You're" - line "good." - prompt - -_SilphCo2AfterBattleText2:: - text "Can you solve the" - line "maze in here?" - done - -_SilphCo2BattleText3:: - text "No kids are" - line "allowed in here!" - done - -_SilphCo2EndBattleText3:: - text "Tough!" - prompt - -_SilphCo2AfterBattleText3:: - text "Diamond shaped" - line "tiles are" - cont "teleport blocks!" - - para "They're hi-tech" - line "transporters!" - done - -_SilphCo2BattleText4:: - text "Hey kid! What are" - line "you doing here?" - done - -_SilphCo2EndBattleText4:: - text "I goofed!" - prompt - -_SilphCo2AfterBattleText4:: - text "SILPH CO. will" - line "be merged with" - cont "TEAM ROCKET!" - done diff --git a/text/maps/VermilionCity.asm b/text/maps/VermilionCity.asm deleted file mode 100644 index b060a123..00000000 --- a/text/maps/VermilionCity.asm +++ /dev/null @@ -1,126 +0,0 @@ -_VermilionCityText1:: - text "We're careful" - line "about pollution!" - - para "We've heard GRIMER" - line "multiplies in" - cont "toxic sludge!" - done - -_VermilionCityText_198a7:: - text "Did you see S.S." - line "ANNE moored in" - cont "the harbor?" - done - -_VermilionCityText_198ac:: - text "So, S.S.ANNE has" - line "departed!" - - para "She'll be back in" - line "about a year." - done - -_SSAnneWelcomeText4:: - text "Welcome to S.S." - line "ANNE!" - done - -_SSAnneWelcomeText9:: - text "Welcome to S.S." - line "ANNE!" - - para "Excuse me, do you" - line "have a ticket?" - prompt - -_SSAnneFlashedTicketText:: - text " flashed" - line "the S.S.TICKET!" - - para "Great! Welcome to" - line "S.S.ANNE!" - done - -_SSAnneNoTicketText:: - text " doesn't" - line "have the needed" - cont "S.S.TICKET." - - para "Sorry!" - - para "You need a ticket" - line "to get aboard." - done - -_SSAnneNotHereText:: - text "The ship set sail." - done - -_VermilionCityText4:: - text "I'm putting up a" - line "building on this" - cont "plot of land." - - para "My #MON is" - line "tamping the land." - done - -_VermilionCityText5:: - text "MACHOP: Guoh!" - line "Gogogoh!@@" - -_VermilionCityText14:: - text "" - para "A MACHOP is" - line "stomping the land" - cont "flat." - done - -_VermilionCityText6:: - text "S.S.ANNE is a" - line "famous luxury" - cont "cruise ship." - - para "We visit VERMILION" - line "once a year." - done - -_VermilionCityText7:: - text "VERMILION CITY" - line "The Port of" - cont "Exquisite Sunsets" - done - -_VermilionCityText8:: - text "NOTICE!" - - para "ROUTE 12 may be" - line "blocked off by a" - cont "sleeping #MON." - - para "Detour through" - line "ROCK TUNNEL to" - cont "LAVENDER TOWN." - - para "VERMILION POLICE" - done - -_VermilionCityText11:: - text "#MON FAN CLUB" - line "All #MON fans" - cont "welcome!" - done - -_VermilionCityText12:: - text "VERMILION CITY" - line "#MON GYM" - cont "LEADER: LT.SURGE" - - para "The Lightning " - line "American!" - done - -_VermilionCityText13:: - text "VERMILION HARBOR" - done diff --git a/text/maps/VermilionDock.asm b/text/maps/VermilionDock.asm deleted file mode 100644 index 5d998e82..00000000 --- a/text/maps/VermilionDock.asm +++ /dev/null @@ -1,3 +0,0 @@ -_VermilionDockText1:: - text "" - done diff --git a/text/maps/VermilionGym.asm b/text/maps/VermilionGym.asm deleted file mode 100644 index f718d899..00000000 --- a/text/maps/VermilionGym.asm +++ /dev/null @@ -1,21 +0,0 @@ -_VermilionGymText_5cb6d:: - text "Hey, kid! What do" - line "you think you're" - cont "doing here?" - - para "You won't live" - line "long in combat!" - cont "That's for sure!" - - para "I tell you kid," - line "electric #MON" - cont "saved me during" - cont "the war!" - - para "They zapped my" - line "enemies into" - cont "paralysis!" - - para "The same as I'll" - line "do to you!" - done diff --git a/text/maps/VermilionOldRodHouse.asm b/text/maps/VermilionOldRodHouse.asm deleted file mode 100644 index 32526e36..00000000 --- a/text/maps/VermilionOldRodHouse.asm +++ /dev/null @@ -1,54 +0,0 @@ -_VermilionHouse2Text_560b1:: - text "I'm the FISHING" - line "GURU!" - - para "I simply Looove" - line "fishing!" - - para "Do you like to" - line "fish?" - done - -_VermilionHouse2Text_560b6:: - text "Grand! I like" - line "your style!" - - para "Take this and" - line "fish, young one!" - - para " received" - line "an @" - TX_RAM wcf4b - text "!@@" - -_VermilionHouse2Text_560bb:: - text "" - - para "Fishing is a way" - line "of life!" - - para "From the seas to" - line "rivers, go out" - cont "and land the big" - cont "one, young one!" - done - -_VermilionHouse2Text_560c0:: - text "Oh... That's so" - line "disappointing..." - done - -_VermilionHouse2Text_560c5:: - text "Hello there," - line "!" - - para "How are the fish" - line "biting?" - done - -_VermilionHouse2Text_560ca:: - text "Oh no!" - - para "You have no room" - line "for my gift!" - done diff --git a/text/maps/VermilionPidgeyHouse.asm b/text/maps/VermilionPidgeyHouse.asm deleted file mode 100644 index 91c18708..00000000 --- a/text/maps/VermilionPidgeyHouse.asm +++ /dev/null @@ -1,21 +0,0 @@ -_VermilionHouse1Text1:: - text "I'm getting my" - line "PIDGEY to fly a" - cont "letter to SAFFRON" - cont "in the north!" - done - -_VermilionHouse1Text2:: - text "PIDGEY: Kurukkoo!@@" - -_VermilionHouse1Text3:: - text "Dear PIPPI, I hope" - line "to see you soon." - - para "I heard SAFFRON" - line "has problems with" - cont "TEAM ROCKET." - - para "VERMILION appears" - line "to be safe." - done diff --git a/text/maps/VictoryRoad2F.asm b/text/maps/VictoryRoad2F.asm deleted file mode 100644 index ec9dcf4f..00000000 --- a/text/maps/VictoryRoad2F.asm +++ /dev/null @@ -1,85 +0,0 @@ -_MoltresBattleText:: - text "Gyaoo!@@" - -_VictoryRoad2BattleText1:: - text "VICTORY ROAD is" - line "the final test" - cont "for trainers!" - done - -_VictoryRoad2EndBattleText1:: - text "Aiyah!" - prompt - -_VictoryRoad2AfterBattleText1:: - text "If you get stuck," - line "try moving some" - cont "boulders around!" - done - -_VictoryRoad2BattleText2:: - text "Ah, so you wish" - line "to challenge the" - cont "ELITE FOUR?" - done - -_VictoryRoad2EndBattleText2:: - text "You" - line "got me!" - prompt - -_VictoryRoad2AfterBattleText2:: - text " also came" - line "through here!" - done - -_VictoryRoad2BattleText3:: - text "Come on!" - line "I'll whip you!" - done - -_VictoryRoad2EndBattleText3:: - text "I got" - line "whipped!" - prompt - -_VictoryRoad2AfterBattleText3:: - text "You earned the" - line "right to be on" - cont "VICTORY ROAD!" - done - -_VictoryRoad2BattleText4:: - text "If you can get" - line "through here, you" - cont "can go meet the" - cont "ELITE FOUR!" - done - -_VictoryRoad2EndBattleText4:: - text "No!" - line "Unbelievable!" - prompt - -_VictoryRoad2AfterBattleText4:: - text "I can beat you" - line "when it comes to" - cont "knowledge about" - cont "#MON!" - done - -_VictoryRoad2BattleText5:: - text "Is VICTORY ROAD" - line "too tough?" - done - -_VictoryRoad2EndBattleText5:: - text "Well" - line "done!" - prompt - -_VictoryRoad2AfterBattleText5:: - text "Many trainers give" - line "up the challenge" - cont "here." - done diff --git a/text/maps/ViridianCity.asm b/text/maps/ViridianCity.asm deleted file mode 100644 index 67ab5c40..00000000 --- a/text/maps/ViridianCity.asm +++ /dev/null @@ -1,180 +0,0 @@ -_ViridianCityText1:: - text "Those # BALLs" - line "at your waist!" - cont "You have #MON!" - - para "It's great that" - line "you can carry and" - cont "use #MON any" - cont "time, anywhere!" - done - -_ViridianCityText_19122:: - text "This #MON GYM" - line "is always closed." - - para "I wonder who the" - line "LEADER is?" - done - -_ViridianCityText_19127:: - text "VIRIDIAN GYM's" - line "LEADER returned!" - done - -_ViridianCityText_1914d:: - text "You want to know" - line "about the 2 kinds" - cont "of caterpillar" - cont "#MON?" - done - -_ViridianCityText_19152:: - text "Oh, OK then!" - done - -_ViridianCityText_19157:: - text "CATERPIE has no" - line "poison, but" - cont "WEEDLE does." - - para "Watch out for its" - line "POISON STING!" - done - -_ViridianCityText_19175:: - text "Oh Grandpa! Don't" - line "be so mean!" - cont "He hasn't had his" - cont "coffee yet." - done - -_ViridianCityText_1917a:: - text "When I go shop in" - line "PEWTER CITY, I" - cont "have to take the" - cont "winding trail in" - cont "VIRIDIAN FOREST." - done - -_ViridianCityText_19191:: - text "You can't go" - line "through here!" - - para "This is private" - line "property!" - done - -_ViridianCityText_191ca:: - text "Yawn!" - line "I must have dozed" - cont "off in the sun." - - para "I had this dream" - line "about a DROWZEE" - cont "eating my dream." - cont "What's this?" - cont "Where did this TM" - cont "come from?" - - para "This is spooky!" - line "Here, you can" - cont "have this TM." - prompt - -_ReceivedTM42Text:: - text " received" - line "TM42!@@" - -_TM42Explanation:: - text "TM42 contains" - line "DREAM EATER..." - cont "...Snore..." - done - -_TM42NoRoomText:: - text "You have too much" - line "stuff already." - done - -_ViridianCityText_1920a:: - text "Ahh, I've had my" - line "coffee now and I" - cont "feel great!" - - para "Sure you can go" - line "through!" - - para "Are you in a" - line "hurry?" - done - -_ViridianCityText_1920f:: - text "I see you're using" - line "a #DEX." - - para "When you catch a" - line "#MON, #DEX" - cont "is automatically" - cont "updated." - - para "What? Don't you" - line "know how to catch" - cont "#MON?" - - para "I'll show you" - line "how to then." - done - -_ViridianCityText_19214:: - text "Time is money..." - line "Go along then." - done - -_ViridianCityText_19219:: - text "First, you need" - line "to weaken the" - cont "target #MON." - done - -_ViridianCityText8:: - text "VIRIDIAN CITY " - line "The Eternally" - cont "Green Paradise" - done - -_ViridianCityText9:: - text "TRAINER TIPS" - - para "Catch #MON" - line "and expand your" - cont "collection!" - - para "The more you have," - line "the easier it is" - cont "to fight!" - done - -_ViridianCityText10:: - text "TRAINER TIPS" - - para "The battle moves" - line "of #MON are" - cont "limited by their" - cont "POWER POINTs, PP." - - para "To replenish PP," - line "rest your tired" - cont "#MON at a" - cont "#MON CENTER!" - done - -_ViridianCityText13:: - text "VIRIDIAN CITY" - line "#MON GYM" - done - -_ViridianCityText14:: - text "The GYM's doors" - line "are locked..." - done diff --git a/text/maps/ViridianGym.asm b/text/maps/ViridianGym.asm deleted file mode 100644 index 4c7b5207..00000000 --- a/text/maps/ViridianGym.asm +++ /dev/null @@ -1,237 +0,0 @@ -_ViridianGymText_74ace:: - text "Fwahahaha! This is" - line "my hideout!" - - para "I planned to" - line "resurrect TEAM" - cont "ROCKET here!" - - para "But, you have" - line "caught me again!" - cont "So be it! This" - cont "time, I'm not" - cont "holding back!" - - para "Once more, you" - line "shall face" - cont "GIOVANNI, the" - cont "greatest trainer!" - done - -_ViridianGymText_74ad3:: - text "Ha!" - line "That was a truly" - cont "intense fight!" - cont "You have won!" - cont "As proof, here is" - cont "the EARTHBADGE!@@" - -_ViridianGymText_74ad9:: - text "Having lost, I" - line "cannot face my" - cont "underlings!" - cont "TEAM ROCKET is" - cont "finished forever!" - - para "I will dedicate my" - line "life to the study" - cont "of #MON!" - - para "Let us meet again" - line "some day!" - cont "Farewell!@@" - -_ViridianGymText12:: - text "The EARTHBADGE" - line "makes #MON of" - cont "any level obey!" - - para "It is evidence of" - line "your mastery as a" - cont "#MON trainer!" - - para "With it, you can" - line "enter the #MON" - cont "LEAGUE!" - - para "It is my gift for" - line "your #MON" - cont "LEAGUE challenge!" - done - -_ReceivedTM27Text:: - text " received" - line "TM27!@@" - -_TM27ExplanationText:: - text "" - - para "TM27 is FISSURE!" - line "It will take out" - cont "#MON with just" - cont "one hit!" - - para "I made it when I" - line "ran the GYM here," - cont "too long ago..." - done - -_TM27NoRoomText:: - text "You do not have" - line "space for this!" - done - -_ViridianGymBattleText1:: - text "Heh! You must be" - line "running out of" - cont "steam by now!" - done - -_ViridianGymEndBattleText1:: - text "I" - line "ran out of gas!" - prompt - -_ViridianGymAfterBattleText1:: - text "You need power to" - line "keep up with our" - cont "GYM LEADER!" - done - -_ViridianGymBattleText2:: - text "Rrrroar! I'm" - line "working myself" - cont "into a rage!" - done - -_ViridianGymEndBattleText2:: - text "Wargh!" - prompt - -_ViridianGymAfterBattleText2:: - text "I'm still not" - line "worthy!" - done - -_ViridianGymBattleText3:: - text "#MON and I, we" - line "make wonderful" - cont "music together!" - done - -_ViridianGymEndBattleText3:: - text "You are in" - line "perfect harmony!" - prompt - -_ViridianGymAfterBattleText3:: - text "Do you know the" - line "identity of our" - cont "GYM LEADER?" - done - -_ViridianGymBattleText4:: - text "Karate is the" - line "ultimate form of" - cont "martial arts!" - done - -_ViridianGymEndBattleText4:: - text "Atcho!" - prompt - -_ViridianGymAfterBattleText4:: - text "If my #MON" - line "were as good at" - cont "Karate as I..." - done - -_ViridianGymBattleText5:: - text "The truly talented" - line "win with style!" - done - -_ViridianGymEndBattleText5:: - text "I" - line "lost my grip!" - prompt - -_ViridianGymAfterBattleText5:: - text "The LEADER will" - line "scold me!" - done - -_ViridianGymBattleText6:: - text "I'm the KARATE" - line "KING! Your fate" - cont "rests with me!" - done - -_ViridianGymEndBattleText6:: - text "Ayah!" - prompt - -_ViridianGymAfterBattleText6:: - text "#MON LEAGUE?" - line "You? Don't get" - cont "cocky!" - done - -_ViridianGymBattleText7:: - text "Your #MON will" - line "cower at the" - cont "crack of my whip!" - done - -_ViridianGymEndBattleText7:: - text "Yowch!" - line "Whiplash!" - prompt - -_ViridianGymAfterBattleText7:: - text "Wait! I was just" - line "careless!" - done - -_ViridianGymBattleText8:: - text "VIRIDIAN GYM was" - line "closed for a long" - cont "time, but now our" - cont "LEADER is back!" - done - -_ViridianGymEndBattleText8:: - text "I" - line "was beaten?" - prompt - -_ViridianGymAfterBattleText8:: - text "You can go onto" - line "#MON LEAGUE" - cont "only by defeating" - cont "our GYM LEADER!" - done - -_ViridianGymText_74bd4:: - text "Yo! Champ in" - line "making!" - - para "Even I don't know" - line "VIRIDIAN LEADER's" - cont "identity!" - - para "This will be the" - line "toughest of all" - cont "the GYM LEADERs!" - - para "I heard that the" - line "trainers here" - cont "like ground-type" - cont "#MON!" - done - -_ViridianGymText_74bd9:: - text "Blow me away!" - line "GIOVANNI was the" - cont "GYM LEADER here?" - done diff --git a/text/maps/ViridianMart.asm b/text/maps/ViridianMart.asm deleted file mode 100644 index 61750afe..00000000 --- a/text/maps/ViridianMart.asm +++ /dev/null @@ -1,30 +0,0 @@ -_ViridianMartText1:: - text "Okay! Say hi to" - line "PROF.OAK for me!" - done - -_ViridianMartText4:: - text "Hey! You came from" - line "PALLET TOWN?" - done - -ViridianMartParcelQuestText:: - text "You know PROF." - line "OAK, right?" - - para "His order came in." - line "Will you take it" - cont "to him?" - - para " got" - line "OAK's PARCEL!@@" - -_ViridianMartText2:: - text "This shop sells" - line "many ANTIDOTEs." - done - -_ViridianMartText3:: - text "No! POTIONs are" - line "all sold out." - done diff --git a/text/maps/WardensHouse.asm b/text/maps/WardensHouse.asm deleted file mode 100644 index 7efddb90..00000000 --- a/text/maps/WardensHouse.asm +++ /dev/null @@ -1,84 +0,0 @@ -_WardenGibberishText1:: - text "WARDEN: Hif fuff" - line "hefifoo!" - - para "Ha lof ha feef ee" - line "hafahi ho. Heff" - cont "hee fwee!" - done - -_WardenGibberishText2:: - text "Ah howhee ho hoo!" - line "Eef ee hafahi ho!" - done - -_WardenGibberishText3:: - text "Ha? He ohay heh" - line "ha hoo ee haheh!" - done - -_WardenTeethText1:: - text " gave the" - line "GOLD TEETH to the" - cont "WARDEN!@@" - -_WardenTeethText2:: - text "" - - para "The WARDEN popped" - line "in his teeth!" - prompt - -_WardenThankYouText:: - text "WARDEN: Thanks," - line "kid! No one could" - cont "understand a word" - cont "that I said." - - para "I couldn't work" - line "that way." - cont "Let me give you" - cont "something for" - cont "your trouble." - prompt - -_ReceivedHM04Text:: - text " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_HM04ExplanationText:: - text "WARDEN: HM04" - line "teaches STRENGTH!" - - para "It lets #MON" - line "move boulders" - cont "when you're out-" - cont "side of battle." - - para "Oh yes, did you" - line "find SECRET HOUSE" - cont "in SAFARI ZONE?" - - para "If you do, you" - line "win an HM!" - - para "I hear it's the" - line "rare SURF HM." - done - -_HM04NoRoomText:: - text "Your pack is" - line "stuffed full!" - done - -_FuchsiaHouse2Text_75176:: - text "#MON photos" - line "and fossils." - done - -_FuchsiaHouse2Text_7517b:: - text "Old #MON" - line "merchandise." - done diff --git a/text/monster_names.asm b/text/monster_names.asm deleted file mode 100755 index a62b1bd9..00000000 --- a/text/monster_names.asm +++ /dev/null @@ -1,191 +0,0 @@ -MonsterNames: - db "RHYDON@@@@" - db "KANGASKHAN" - db "NIDORAN♂@@" - db "CLEFAIRY@@" - db "SPEAROW@@@" - db "VOLTORB@@@" - db "NIDOKING@@" - db "SLOWBRO@@@" - db "IVYSAUR@@@" - db "EXEGGUTOR@" - db "LICKITUNG@" - db "EXEGGCUTE@" - db "GRIMER@@@@" - db "GENGAR@@@@" - db "NIDORAN♀@@" - db "NIDOQUEEN@" - db "CUBONE@@@@" - db "RHYHORN@@@" - db "LAPRAS@@@@" - db "ARCANINE@@" - db "MEW@@@@@@@" - db "GYARADOS@@" - db "SHELLDER@@" - db "TENTACOOL@" - db "GASTLY@@@@" - db "SCYTHER@@@" - db "STARYU@@@@" - db "BLASTOISE@" - db "PINSIR@@@@" - db "TANGELA@@@" - db "MISSINGNO." - db "MISSINGNO." - db "GROWLITHE@" - db "ONIX@@@@@@" - db "FEAROW@@@@" - db "PIDGEY@@@@" - db "SLOWPOKE@@" - db "KADABRA@@@" - db "GRAVELER@@" - db "CHANSEY@@@" - db "MACHOKE@@@" - db "MR.MIME@@@" - db "HITMONLEE@" - db "HITMONCHAN" - db "ARBOK@@@@@" - db "PARASECT@@" - db "PSYDUCK@@@" - db "DROWZEE@@@" - db "GOLEM@@@@@" - db "MISSINGNO." - db "MAGMAR@@@@" - db "MISSINGNO." - db "ELECTABUZZ" - db "MAGNETON@@" - db "KOFFING@@@" - db "MISSINGNO." - db "MANKEY@@@@" - db "SEEL@@@@@@" - db "DIGLETT@@@" - db "TAUROS@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "FARFETCH'D" - db "VENONAT@@@" - db "DRAGONITE@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "DODUO@@@@@" - db "POLIWAG@@@" - db "JYNX@@@@@@" - db "MOLTRES@@@" - db "ARTICUNO@@" - db "ZAPDOS@@@@" - db "DITTO@@@@@" - db "MEOWTH@@@@" - db "KRABBY@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "VULPIX@@@@" - db "NINETALES@" - db "PIKACHU@@@" - db "RAICHU@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "DRATINI@@@" - db "DRAGONAIR@" - db "KABUTO@@@@" - db "KABUTOPS@@" - db "HORSEA@@@@" - db "SEADRA@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "SANDSHREW@" - db "SANDSLASH@" - db "OMANYTE@@@" - db "OMASTAR@@@" - db "JIGGLYPUFF" - db "WIGGLYTUFF" - db "EEVEE@@@@@" - db "FLAREON@@@" - db "JOLTEON@@@" - db "VAPOREON@@" - db "MACHOP@@@@" - db "ZUBAT@@@@@" - db "EKANS@@@@@" - db "PARAS@@@@@" - db "POLIWHIRL@" - db "POLIWRATH@" - db "WEEDLE@@@@" - db "KAKUNA@@@@" - db "BEEDRILL@@" - db "MISSINGNO." - db "DODRIO@@@@" - db "PRIMEAPE@@" - db "DUGTRIO@@@" - db "VENOMOTH@@" - db "DEWGONG@@@" - db "MISSINGNO." - db "MISSINGNO." - db "CATERPIE@@" - db "METAPOD@@@" - db "BUTTERFREE" - db "MACHAMP@@@" - db "MISSINGNO." - db "GOLDUCK@@@" - db "HYPNO@@@@@" - db "GOLBAT@@@@" - db "MEWTWO@@@@" - db "SNORLAX@@@" - db "MAGIKARP@@" - db "MISSINGNO." - db "MISSINGNO." - db "MUK@@@@@@@" - db "MISSINGNO." - db "KINGLER@@@" - db "CLOYSTER@@" - db "MISSINGNO." - db "ELECTRODE@" - db "CLEFABLE@@" - db "WEEZING@@@" - db "PERSIAN@@@" - db "MAROWAK@@@" - db "MISSINGNO." - db "HAUNTER@@@" - db "ABRA@@@@@@" - db "ALAKAZAM@@" - db "PIDGEOTTO@" - db "PIDGEOT@@@" - db "STARMIE@@@" - db "BULBASAUR@" - db "VENUSAUR@@" - db "TENTACRUEL" - db "MISSINGNO." - db "GOLDEEN@@@" - db "SEAKING@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "PONYTA@@@@" - db "RAPIDASH@@" - db "RATTATA@@@" - db "RATICATE@@" - db "NIDORINO@@" - db "NIDORINA@@" - db "GEODUDE@@@" - db "PORYGON@@@" - db "AERODACTYL" - db "MISSINGNO." - db "MAGNEMITE@" - db "MISSINGNO." - db "MISSINGNO." - db "CHARMANDER" - db "SQUIRTLE@@" - db "CHARMELEON" - db "WARTORTLE@" - db "CHARIZARD@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "ODDISH@@@@" - db "GLOOM@@@@@" - db "VILEPLUME@" - db "BELLSPROUT" - db "WEEPINBELL" - db "VICTREEBEL" diff --git a/text/move_names.asm b/text/move_names.asm deleted file mode 100644 index f8706ee3..00000000 --- a/text/move_names.asm +++ /dev/null @@ -1,167 +0,0 @@ -MoveNames:: - db "POUND@" - db "KARATE CHOP@" - db "DOUBLESLAP@" - db "COMET PUNCH@" - db "MEGA PUNCH@" - db "PAY DAY@" - db "FIRE PUNCH@" - db "ICE PUNCH@" - db "THUNDERPUNCH@" - db "SCRATCH@" - db "VICEGRIP@" - db "GUILLOTINE@" - db "RAZOR WIND@" - db "SWORDS DANCE@" - db "CUT@" - db "GUST@" - db "WING ATTACK@" - db "WHIRLWIND@" - db "FLY@" - db "BIND@" - db "SLAM@" - db "VINE WHIP@" - db "STOMP@" - db "DOUBLE KICK@" - db "MEGA KICK@" - db "JUMP KICK@" - db "ROLLING KICK@" - db "SAND-ATTACK@" - db "HEADBUTT@" - db "HORN ATTACK@" - db "FURY ATTACK@" - db "HORN DRILL@" - db "TACKLE@" - db "BODY SLAM@" - db "WRAP@" - db "TAKE DOWN@" - db "THRASH@" - db "DOUBLE-EDGE@" - db "TAIL WHIP@" - db "POISON STING@" - db "TWINEEDLE@" - db "PIN MISSILE@" - db "LEER@" - db "BITE@" - db "GROWL@" - db "ROAR@" - db "SING@" - db "SUPERSONIC@" - db "SONICBOOM@" - db "DISABLE@" - db "ACID@" - db "EMBER@" - db "FLAMETHROWER@" - db "MIST@" - db "WATER GUN@" - db "HYDRO PUMP@" - db "SURF@" - db "ICE BEAM@" - db "BLIZZARD@" - db "PSYBEAM@" - db "BUBBLEBEAM@" - db "AURORA BEAM@" - db "HYPER BEAM@" - db "PECK@" - db "DRILL PECK@" - db "SUBMISSION@" - db "LOW KICK@" - db "COUNTER@" - db "SEISMIC TOSS@" - db "STRENGTH@" - db "ABSORB@" - db "MEGA DRAIN@" - db "LEECH SEED@" - db "GROWTH@" - db "RAZOR LEAF@" - db "SOLARBEAM@" - db "POISONPOWDER@" - db "STUN SPORE@" - db "SLEEP POWDER@" - db "PETAL DANCE@" - db "STRING SHOT@" - db "DRAGON RAGE@" - db "FIRE SPIN@" - db "THUNDERSHOCK@" - db "THUNDERBOLT@" - db "THUNDER WAVE@" - db "THUNDER@" - db "ROCK THROW@" - db "EARTHQUAKE@" - db "FISSURE@" - db "DIG@" - db "TOXIC@" - db "CONFUSION@" - db "PSYCHIC@" - db "HYPNOSIS@" - db "MEDITATE@" - db "AGILITY@" - db "QUICK ATTACK@" - db "RAGE@" - db "TELEPORT@" - db "NIGHT SHADE@" - db "MIMIC@" - db "SCREECH@" - db "DOUBLE TEAM@" - db "RECOVER@" - db "HARDEN@" - db "MINIMIZE@" - db "SMOKESCREEN@" - db "CONFUSE RAY@" - db "WITHDRAW@" - db "DEFENSE CURL@" - db "BARRIER@" - db "LIGHT SCREEN@" - db "HAZE@" - db "REFLECT@" - db "FOCUS ENERGY@" - db "BIDE@" - db "METRONOME@" - db "MIRROR MOVE@" - db "SELFDESTRUCT@" - db "EGG BOMB@" - db "LICK@" - db "SMOG@" - db "SLUDGE@" - db "BONE CLUB@" - db "FIRE BLAST@" - db "WATERFALL@" - db "CLAMP@" - db "SWIFT@" - db "SKULL BASH@" - db "SPIKE CANNON@" - db "CONSTRICT@" - db "AMNESIA@" - db "KINESIS@" - db "SOFTBOILED@" - db "HI JUMP KICK@" - db "GLARE@" - db "DREAM EATER@" - db "POISON GAS@" - db "BARRAGE@" - db "LEECH LIFE@" - db "LOVELY KISS@" - db "SKY ATTACK@" - db "TRANSFORM@" - db "BUBBLE@" - db "DIZZY PUNCH@" - db "SPORE@" - db "FLASH@" - db "PSYWAVE@" - db "SPLASH@" - db "ACID ARMOR@" - db "CRABHAMMER@" - db "EXPLOSION@" - db "FURY SWIPES@" - db "BONEMERANG@" - db "REST@" - db "ROCK SLIDE@" - db "HYPER FANG@" - db "SHARPEN@" - db "CONVERSION@" - db "TRI ATTACK@" - db "SUPER FANG@" - db "SLASH@" - db "SUBSTITUTE@" - db "STRUGGLE@" - diff --git a/text/oakspeech.asm b/text/oakspeech.asm deleted file mode 100644 index e006d16f..00000000 --- a/text/oakspeech.asm +++ /dev/null @@ -1,55 +0,0 @@ -_OakSpeechText1:: - text "Hello there!" - line "Welcome to the" - cont "world of #MON!" - - para "My name is OAK!" - line "People call me" - cont "the #MON PROF!" - prompt - -_OakSpeechText2A:: - text "This world is" - line "inhabited by" - cont "creatures called" - cont "#MON!@@" - -_OakSpeechText2B:: - text $51,"For some people," - line "#MON are" - cont "pets. Others use" - cont "them for fights." - - para "Myself..." - - para "I study #MON" - line "as a profession." - prompt - -_IntroducePlayerText:: - text "First, what is" - line "your name?" - prompt - -_IntroduceRivalText:: - text "This is my grand-" - line "son. He's been" - cont "your rival since" - cont "you were a baby." - - para "...Erm, what is" - line "his name again?" - prompt - -_OakSpeechText3:: - text "!" - - para "Your very own" - line "#MON legend is" - cont "about to unfold!" - - para "A world of dreams" - line "and adventures" - cont "with #MON" - cont "awaits! Let's go!" - done diff --git a/text/pokedex.asm b/text/pokedex.asm deleted file mode 100644 index 65f3d89d..00000000 --- a/text/pokedex.asm +++ /dev/null @@ -1,1510 +0,0 @@ -_RhydonDexEntry:: - text "Protected by an" - next "armor-like hide," - next "it is capable of" - - page "living in molten" - next "lava of 3,600" - next "degrees" - dex - -_KangaskhanDexEntry:: - text "The infant rarely" - next "ventures out of" - next "its mother's" - - page "protective pouch" - next "until it is 3" - next "years old" - dex - -_NidoranMDexEntry:: - text "Stiffens its ears" - next "to sense danger." - next "The larger its" - - page "horns, the more" - next "powerful its" - next "secreted venom" - dex - -_ClefairyDexEntry:: - text "Its magical and" - next "cute appeal has" - next "many admirers." - - page "It is rare and" - next "found only in" - next "certain areas" - dex - -_SpearowDexEntry:: - text "Eats bugs in" - next "grassy areas. It" - next "has to flap its" - - page "short wings at" - next "high speed to" - next "stay airborne" - dex - -_VoltorbDexEntry:: - text "Usually found in" - next "power plants." - next "Easily mistaken" - - page "for a # BALL," - next "they have zapped" - next "many people" - dex - -_NidokingDexEntry:: - text "It uses its" - next "powerful tail in" - next "battle to smash," - - page "constrict, then" - next "break the prey's" - next "bones" - dex - -_SlowbroDexEntry:: - text "The SHELLDER that" - next "is latched onto" - next "SLOWPOKE's tail" - - page "is said to feed" - next "on the host's left" - next "over scraps" - dex - -_IvysaurDexEntry:: - text "When the bulb on" - next "its back grows" - next "large, it appears" - - page "to lose the" - next "ability to stand" - next "on its hind legs" - dex - -_ExeggutorDexEntry:: - text "Legend has it that" - next "on rare occasions," - next "one of its heads" - - page "will drop off and" - next "continue on as an" - next "EXEGGCUTE" - dex - -_LickitungDexEntry:: - text "Its tongue can be" - next "extended like a" - next "chameleon's. It" - - page "leaves a tingling" - next "sensation when it" - next "licks enemies" - dex - -_ExeggcuteDexEntry:: - text "Often mistaken" - next "for eggs." - next "When disturbed," - - page "they quickly" - next "gather and attack" - next "in swarms" - dex - -_GrimerDexEntry:: - text "Appears in filthy" - next "areas. Thrives by" - next "sucking up" - - page "polluted sludge" - next "that is pumped" - next "out of factories" - dex - -_GengarDexEntry:: - text "Under a full moon," - next "this #MON" - next "likes to mimic" - - page "the shadows of" - next "people and laugh" - next "at their fright" - dex - -_NidoranFDexEntry:: - text "Although small," - next "its venomous" - next "barbs render this" - - page "#MON dangerous." - next "The female has" - next "smaller horns" - dex - -_NidoqueenDexEntry:: - text "Its hard scales" - next "provide strong" - next "protection. It" - - page "uses its hefty" - next "bulk to execute" - next "powerful moves" - dex - -_CuboneDexEntry:: - text "Because it never" - next "removes its skull" - next "helmet, no one" - - page "has ever seen" - next "this #MON's" - next "real face" - dex - -_RhyhornDexEntry:: - text "Its massive bones" - next "are 1000 times" - next "harder than human" - - page "bones. It can" - next "easily knock a" - next "trailer flying" - dex - -_LaprasDexEntry:: - text "A #MON that" - next "has been over-" - next "hunted almost to" - - page "extinction. It" - next "can ferry people" - next "across the water" - dex - -_ArcanineDexEntry:: - text "A #MON that" - next "has been admired" - next "since the past" - - page "for its beauty." - next "It runs agilely" - next "as if on wings" - dex - -_MewDexEntry:: - text "So rare that it" - next "is still said to" - next "be a mirage by" - - page "many experts. Only" - next "a few people have" - next "seen it worldwide" - dex - -_GyaradosDexEntry:: - text "Rarely seen in" - next "the wild. Huge" - next "and vicious, it" - - page "is capable of" - next "destroying entire" - next "cities in a rage" - dex - -_ShellderDexEntry:: - text "Its hard shell" - next "repels any kind" - next "of attack." - - page "It is vulnerable" - next "only when its" - next "shell is open" - dex - -_TentacoolDexEntry:: - text "Drifts in shallow" - next "seas. Anglers who" - next "hook them by" - - page "accident are" - next "often punished by" - next "its stinging acid" - dex - -_GastlyDexEntry:: - text "Almost invisible," - next "this gaseous" - next "#MON cloaks" - - page "the target and" - next "puts it to sleep" - next "without notice" - dex - -_ScytherDexEntry:: - text "With ninja-like" - next "agility and speed," - next "it can create the" - - page "illusion that" - next "there is more" - next "than one" - dex - -_StaryuDexEntry:: - text "An enigmatic" - next "#MON that can" - next "effortlessly" - - page "regenerate any" - next "appendage it" - next "loses in battle" - dex - -_BlastoiseDexEntry:: - text "A brutal #MON" - next "with pressurized" - next "water jets on its" - - page "shell. They are" - next "used for high" - next "speed tackles" - dex - -_PinsirDexEntry:: - text "If it fails to" - next "crush the victim" - next "in its pincers," - - page "it will swing it" - next "around and toss" - next "it hard" - dex - -_TangelaDexEntry:: - text "The whole body is" - next "swathed with wide" - next "vines that are" - - page "similar to sea-" - next "weed. Its vines" - next "shake as it walks" - dex - -_GrowlitheDexEntry:: - text "Very protective" - next "of its territory." - next "It will bark and" - - page "bite to repel" - next "intruders from" - next "its space" - dex - -_OnixDexEntry:: - text "As it grows, the" - next "stone portions of" - next "its body harden" - - page "to become similar" - next "to a diamond, but" - next "colored black" - dex - -_FearowDexEntry:: - text "With its huge and" - next "magnificent wings," - next "it can keep aloft" - - page "without ever" - next "having to land" - next "for rest" - dex - -_PidgeyDexEntry:: - text "A common sight in" - next "forests and woods." - next "It flaps its" - - page "wings at ground" - next "level to kick up" - next "blinding sand" - dex - -_SlowpokeDexEntry:: - text "Incredibly slow" - next "and dopey. It" - next "takes 5 seconds" - - page "for it to feel" - next "pain when under" - next "attack" - dex - -_KadabraDexEntry:: - text "It emits special" - next "alpha waves from" - next "its body that" - - page "induce headaches" - next "just by being" - next "close by" - dex - -_GravelerDexEntry:: - text "Rolls down slopes" - next "to move. It rolls" - next "over any obstacle" - - page "without slowing" - next "or changing its" - next "direction" - dex - -_ChanseyDexEntry:: - text "A rare and elusive" - next "#MON that is" - next "said to bring" - - page "happiness to those" - next "who manage to get" - next "it" - dex - -_MachokeDexEntry:: - text "Its muscular body" - next "is so powerful, it" - next "must wear a power" - - page "save belt to be" - next "able to regulate" - next "its motions" - dex - -_MrMimeDexEntry:: - text "If interrupted" - next "while it is" - next "miming, it will" - - page "slap around the" - next "offender with its" - next "broad hands" - dex - -_HitmonleeDexEntry:: - text "When in a hurry," - next "its legs lengthen" - next "progressively." - - page "It runs smoothly" - next "with extra long," - next "loping strides" - dex - -_HitmonchanDexEntry:: - text "While apparently" - next "doing nothing, it" - next "fires punches in" - - page "lightning fast" - next "volleys that are" - next "impossible to see" - dex - -_ArbokDexEntry:: - text "It is rumored that" - next "the ferocious" - next "warning markings" - - page "on its belly" - next "differ from area" - next "to area" - dex - -_ParasectDexEntry:: - text "A host-parasite" - next "pair in which the" - next "parasite mushroom" - - page "has taken over the" - next "host bug. Prefers" - next "damp places" - dex - -_PsyduckDexEntry:: - text "While lulling its" - next "enemies with its" - next "vacant look, this" - - page "wily #MON will" - next "use psychokinetic" - next "powers" - dex - -_DrowzeeDexEntry:: - text "Puts enemies to" - next "sleep then eats" - next "their dreams." - - page "Occasionally gets" - next "sick from eating" - next "bad dreams" - dex - -_GolemDexEntry:: - text "Its boulder-like" - next "body is extremely" - next "hard. It can" - - page "easily withstand" - next "dynamite blasts" - next "without damage" - dex - -_MagmarDexEntry:: - text "Its body always" - next "burns with an" - next "orange glow that" - - page "enables it to" - next "hide perfectly" - next "among flames" - dex - -_ElectabuzzDexEntry:: - text "Normally found" - next "near power plants," - next "they can wander" - - page "away and cause" - next "major blackouts" - next "in cities" - dex - -_MagnetonDexEntry:: - text "Formed by several" - next "MAGNEMITEs linked" - next "together. They" - - page "frequently appear" - next "when sunspots" - next "flare up" - dex - -_KoffingDexEntry:: - text "Because it stores" - next "several kinds of" - next "toxic gases in" - - page "its body, it is" - next "prone to exploding" - next "without warning" - dex - -_MankeyDexEntry:: - text "Extremely quick to" - next "anger. It could" - next "be docile one" - - page "moment then" - next "thrashing away" - next "the next instant" - dex - -_SeelDexEntry:: - text "The protruding" - next "horn on its head" - next "is very hard." - - page "It is used for" - next "bashing through" - next "thick ice" - dex - -_DiglettDexEntry:: - text "Lives about one" - next "yard underground" - next "where it feeds on" - - page "plant roots. It" - next "sometimes appears" - next "above ground" - dex - -_TaurosDexEntry:: - text "When it targets" - next "an enemy, it" - next "charges furiously" - - page "while whipping its" - next "body with its" - next "long tails" - dex - -_FarfetchdDexEntry:: - text "The sprig of" - next "green onions it" - next "holds is its" - - page "weapon. It is" - next "used much like a" - next "metal sword" - dex - -_VenonatDexEntry:: - text "Lives in the" - next "shadows of tall" - next "trees where it" - - page "eats insects. It" - next "is attracted by" - next "light at night" - dex - -_DragoniteDexEntry:: - text "An extremely" - next "rarely seen" - next "marine #MON." - - page "Its intelligence" - next "is said to match" - next "that of humans" - dex - -_DoduoDexEntry:: - text "A bird that makes" - next "up for its poor" - next "flying with its" - - page "fast foot speed." - next "Leaves giant" - next "footprints" - dex - -_PoliwagDexEntry:: - text "Its newly grown" - next "legs prevent it" - next "from running. It" - - page "appears to prefer" - next "swimming than" - next "trying to stand" - dex - -_JynxDexEntry:: - text "It seductively" - next "wiggles its hips" - next "as it walks. It" - - page "can cause people" - next "to dance in" - next "unison with it" - dex - -_MoltresDexEntry:: - text "Known as the" - next "legendary bird of" - next "fire. Every flap" - - page "of its wings" - next "creates a dazzling" - next "flash of flames" - dex - -_ArticunoDexEntry:: - text "A legendary bird" - next "#MON that is" - next "said to appear to" - - page "doomed people who" - next "are lost in icy" - next "mountains" - dex - -_ZapdosDexEntry:: - text "A legendary bird" - next "#MON that is" - next "said to appear" - - page "from clouds while" - next "dropping enormous" - next "lightning bolts" - dex - -_DittoDexEntry:: - text "Capable of copying" - next "an enemy's genetic" - next "code to instantly" - - page "transform itself" - next "into a duplicate" - next "of the enemy" - dex - -_MeowthDexEntry:: - text "Adores circular" - next "objects. Wanders" - next "the streets on a" - - page "nightly basis to" - next "look for dropped" - next "loose change" - dex - -_KrabbyDexEntry:: - text "Its pincers are" - next "not only powerful" - next "weapons, they are" - - page "used for balance" - next "when walking" - next "sideways" - dex - -_VulpixDexEntry:: - text "At the time of" - next "birth, it has" - next "just one tail." - - page "The tail splits" - next "from its tip as" - next "it grows older" - dex - -_NinetalesDexEntry:: - text "Very smart and" - next "very vengeful." - next "Grabbing one of" - - page "its many tails" - next "could result in a" - next "1000-year curse" - dex - -_PikachuDexEntry:: - text "When several of" - next "these #MON" - next "gather, their" - - page "electricity could" - next "build and cause" - next "lightning storms" - dex - -_RaichuDexEntry:: - text "Its long tail" - next "serves as a" - next "ground to protect" - - page "itself from its" - next "own high voltage" - next "power" - dex - -_DratiniDexEntry:: - text "Long considered a" - next "mythical #MON" - next "until recently" - - page "when a small" - next "colony was found" - next "living underwater" - dex - -_DragonairDexEntry:: - text "A mystical #MON" - next "that exudes a" - next "gentle aura." - - page "Has the ability" - next "to change climate" - next "conditions" - dex - -_KabutoDexEntry:: - text "A #MON that" - next "was resurrected" - next "from a fossil" - - page "found in what was" - next "once the ocean" - next "floor eons ago" - dex - -_KabutopsDexEntry:: - text "Its sleek shape is" - next "perfect for swim-" - next "ming. It slashes" - - page "prey with its" - next "claws and drains" - next "the body fluids" - dex - -_HorseaDexEntry:: - text "Known to shoot" - next "down flying bugs" - next "with precision" - - page "blasts of ink" - next "from the surface" - next "of the water" - dex - -_SeadraDexEntry:: - text "Capable of swim-" - next "ming backwards by" - next "rapidly flapping" - - page "its wing-like" - next "pectoral fins and" - next "stout tail" - dex - -_SandshrewDexEntry:: - text "Burrows deep" - next "underground in" - next "arid locations" - - page "far from water." - next "It only emerges" - next "to hunt for food" - dex - -_SandslashDexEntry:: - text "Curls up into a" - next "spiny ball when" - next "threatened. It" - - page "can roll while" - next "curled up to" - next "attack or escape" - dex - -_OmanyteDexEntry:: - text "Although long" - next "extinct, in rare" - next "cases, it can be" - - page "genetically" - next "resurrected from" - next "fossils" - dex - -_OmastarDexEntry:: - text "A prehistoric" - next "#MON that died" - next "out when its" - - page "heavy shell made" - next "it impossible to" - next "catch prey" - dex - -_JigglypuffDexEntry:: - text "When its huge eyes" - next "light up, it sings" - next "a mysteriously" - - page "soothing melody" - next "that lulls its" - next "enemies to sleep" - dex - -_WigglytuffDexEntry:: - text "The body is soft" - next "and rubbery. When" - next "angered, it will" - - page "suck in air and" - next "inflate itself to" - next "an enormous size" - dex - -_EeveeDexEntry:: - text "Its genetic code" - next "is irregular." - next "It may mutate if" - - page "it is exposed to" - next "radiation from" - next "element STONEs" - dex - -_FlareonDexEntry:: - text "When storing" - next "thermal energy in" - next "its body, its" - - page "temperature could" - next "soar to over 1600" - next "degrees" - dex - -_JolteonDexEntry:: - text "It accumulates" - next "negative ions in" - next "the atmosphere to" - - page "blast out 10000-" - next "volt lightning" - next "bolts" - dex - -_VaporeonDexEntry:: - text "Lives close to" - next "water. Its long" - next "tail is ridged" - - page "with a fin which" - next "is often mistaken" - next "for a mermaid's" - dex - -_MachopDexEntry:: - text "Loves to build" - next "its muscles." - next "It trains in all" - - page "styles of martial" - next "arts to become" - next "even stronger" - dex - -_ZubatDexEntry:: - text "Forms colonies in" - next "perpetually dark" - next "places. Uses" - - page "ultrasonic waves" - next "to identify and" - next "approach targets" - dex - -_EkansDexEntry:: - text "Moves silently" - next "and stealthily." - next "Eats the eggs of" - - page "birds, such as" - next "PIDGEY and" - next "SPEAROW, whole" - dex - -_ParasDexEntry:: - text "Burrows to suck" - next "tree roots. The" - next "mushrooms on its" - - page "back grow by draw-" - next "ing nutrients from" - next "the bug host" - dex - -_PoliwhirlDexEntry:: - text "Capable of living" - next "in or out of" - next "water. When out" - - page "of water, it" - next "sweats to keep" - next "its body slimy" - dex - -_PoliwrathDexEntry:: - text "An adept swimmer" - next "at both the front" - next "crawl and breast" - - page "stroke. Easily" - next "overtakes the best" - next "human swimmers" - dex - -_WeedleDexEntry:: - text "Often found in" - next "forests, eating" - next "leaves." - - page "It has a sharp" - next "venomous stinger" - next "on its head" - dex - -_KakunaDexEntry:: - text "Almost incapable" - next "of moving, this" - next "#MON can only" - - page "harden its shell" - next "to protect itself" - next "from predators" - dex - -_BeedrillDexEntry:: - text "Flies at high" - next "speed and attacks" - next "using its large" - - page "venomous stingers" - next "on its forelegs" - next "and tail" - dex - -_DodrioDexEntry:: - text "Uses its three" - next "brains to execute" - next "complex plans." - - page "While two heads" - next "sleep, one head" - next "stays awake" - dex - -_PrimeapeDexEntry:: - text "Always furious" - next "and tenacious to" - next "boot. It will not" - - page "abandon chasing" - next "its quarry until" - next "it is caught" - dex - -_DugtrioDexEntry:: - text "A team of DIGLETT" - next "triplets." - next "It triggers huge" - - page "earthquakes by" - next "burrowing 60 miles" - next "underground" - dex - -_VenomothDexEntry:: - text "The dust-like" - next "scales covering" - next "its wings are" - - page "color coded to" - next "indicate the kinds" - next "of poison it has" - dex - -_DewgongDexEntry:: - text "Stores thermal" - next "energy in its" - next "body. Swims at a" - - page "steady 8 knots" - next "even in intensely" - next "cold waters" - dex - -_CaterpieDexEntry:: - text "Its short feet" - next "are tipped with" - next "suction pads that" - - page "enable it to" - next "tirelessly climb" - next "slopes and walls" - dex - -_MetapodDexEntry:: - text "This #MON is" - next "vulnerable to" - next "attack while its" - - page "shell is soft," - next "exposing its weak" - next "and tender body" - dex - -_ButterfreeDexEntry:: - text "In battle, it" - next "flaps its wings" - next "at high speed to" - - page "release highly" - next "toxic dust into" - next "the air" - dex - -_MachampDexEntry:: - text "Using its heavy" - next "muscles, it throws" - next "powerful punches" - - page "that can send the" - next "victim clear over" - next "the horizon" - dex - -_GolduckDexEntry:: - text "Often seen swim-" - next "ming elegantly by" - next "lake shores. It" - - page "is often mistaken" - next "for the Japanese" - next "monster, Kappa" - dex - -_HypnoDexEntry:: - text "When it locks eyes" - next "with an enemy, it" - next "will use a mix of" - - page "PSI moves such as" - next "HYPNOSIS and" - next "CONFUSION" - dex - -_GolbatDexEntry:: - text "Once it strikes," - next "it will not stop" - next "draining energy" - - page "from the victim" - next "even if it gets" - next "too heavy to fly" - dex - -_MewtwoDexEntry:: - text "It was created by" - next "a scientist after" - next "years of horrific" - - page "gene splicing and" - next "DNA engineering" - next "experiments" - dex - -_SnorlaxDexEntry:: - text "Very lazy. Just" - next "eats and sleeps." - next "As its rotund" - - page "bulk builds, it" - next "becomes steadily" - next "more slothful" - dex - -_MagikarpDexEntry:: - text "In the distant" - next "past, it was" - next "somewhat stronger" - - page "than the horribly" - next "weak descendants" - next "that exist today" - dex - -_MukDexEntry:: - text "Thickly covered" - next "with a filthy," - next "vile sludge. It" - - page "is so toxic, even" - next "its footprints" - next "contain poison" - dex - -_KinglerDexEntry:: - text "The large pincer" - next "has 10000 hp of" - next "crushing power." - - page "However, its huge" - next "size makes it" - next "unwieldy to use" - dex - -_CloysterDexEntry:: - text "When attacked, it" - next "launches its" - next "horns in quick" - - page "volleys. Its" - next "innards have" - next "never been seen" - dex - -_ElectrodeDexEntry:: - text "It stores electric" - next "energy under very" - next "high pressure." - - page "It often explodes" - next "with little or no" - next "provocation" - dex - -_ClefableDexEntry:: - text "A timid fairy" - next "#MON that is" - next "rarely seen. It" - - page "will run and hide" - next "the moment it" - next "senses people" - dex - -_WeezingDexEntry:: - text "Where two kinds" - next "of poison gases" - next "meet, 2 KOFFINGs" - - page "can fuse into a" - next "WEEZING over many" - next "years" - dex - -_PersianDexEntry:: - text "Although its fur" - next "has many admirers," - next "it is tough to" - - page "raise as a pet" - next "because of its" - next "fickle meanness" - dex - -_MarowakDexEntry:: - text "The bone it holds" - next "is its key weapon." - next "It throws the" - - page "bone skillfully" - next "like a boomerang" - next "to KO targets" - dex - -_HaunterDexEntry:: - text "Because of its" - next "ability to slip" - next "through block" - - page "walls, it is said" - next "to be from an-" - next "other dimension" - dex - -_AbraDexEntry:: - text "Using its ability" - next "to read minds, it" - next "will identify" - - page "impending danger" - next "and TELEPORT to" - next "safety" - dex - -_AlakazamDexEntry:: - text "Its brain can out-" - next "perform a super-" - next "computer." - - page "Its intelligence" - next "quotient is said" - next "to be 5,000" - dex - -_PidgeottoDexEntry:: - text "Very protective" - next "of its sprawling" - next "territorial area," - - page "this #MON will" - next "fiercely peck at" - next "any intruder" - dex - -_PidgeotDexEntry:: - text "When hunting, it" - next "skims the surface" - next "of water at high" - - page "speed to pick off" - next "unwary prey such" - next "as MAGIKARP" - dex - -_StarmieDexEntry:: - text "Its central core" - next "glows with the" - next "seven colors of" - - page "the rainbow. Some" - next "people value the" - next "core as a gem" - dex - -_BulbasaurDexEntry:: - text "A strange seed was" - next "planted on its" - next "back at birth." - - page "The plant sprouts" - next "and grows with" - next "this #MON" - dex - -_VenusaurDexEntry:: - text "The plant blooms" - next "when it is" - next "absorbing solar" - - page "energy. It stays" - next "on the move to" - next "seek sunlight" - dex - -_TentacruelDexEntry:: - text "The tentacles are" - next "normally kept" - next "short. On hunts," - - page "they are extended" - next "to ensnare and" - next "immobilize prey" - dex - -_GoldeenDexEntry:: - text "Its tail fin" - next "billows like an" - next "elegant ballroom" - - page "dress, giving it" - next "the nickname of" - next "the Water Queen" - dex - -_SeakingDexEntry:: - text "In the autumn" - next "spawning season," - next "they can be seen" - - page "swimming power-" - next "fully up rivers" - next "and creeks" - dex - -_PonytaDexEntry:: - text "Its hooves are 10" - next "times harder than" - next "diamonds. It can" - - page "trample anything" - next "completely flat" - next "in little time" - dex - -_RapidashDexEntry:: - text "Very competitive," - next "this #MON will" - next "chase anything" - - page "that moves fast" - next "in the hopes of" - next "racing it" - dex - -_RattataDexEntry:: - text "Bites anything" - next "when it attacks." - next "Small and very" - - page "quick, it is a" - next "common sight in" - next "many places" - dex - -_RaticateDexEntry:: - text "It uses its whis-" - next "kers to maintain" - next "its balance." - - page "It apparently" - next "slows down if" - next "they are cut off" - dex - -_NidorinoDexEntry:: - text "An aggressive" - next "#MON that is" - next "quick to attack." - - page "The horn on its" - next "head secretes a" - next "powerful venom" - dex - -_NidorinaDexEntry:: - text "The female's horn" - next "develops slowly." - next "Prefers physical" - - page "attacks such as" - next "clawing and" - next "biting" - dex - -_GeodudeDexEntry:: - text "Found in fields" - next "and mountains." - next "Mistaking them" - - page "for boulders," - next "people often step" - next "or trip on them" - dex - -_PorygonDexEntry:: - text "A #MON that" - next "consists entirely" - next "of programming" - - page "code. Capable of" - next "moving freely in" - next "cyberspace" - dex - -_AerodactylDexEntry:: - text "A ferocious, pre-" - next "historic #MON" - next "that goes for the" - - page "enemy's throat" - next "with its serrated" - next "saw-like fangs" - dex - -_MagnemiteDexEntry:: - text "Uses anti-gravity" - next "to stay suspended." - next "Appears without" - - page "warning and uses" - next "THUNDER WAVE and" - next "similar moves" - dex - -_CharmanderDexEntry:: - text "Obviously prefers" - next "hot places. When" - next "it rains, steam" - - page "is said to spout" - next "from the tip of" - next "its tail" - dex - -_SquirtleDexEntry:: - text "After birth, its" - next "back swells and" - next "hardens into a" - - page "shell. Powerfully" - next "sprays foam from" - next "its mouth" - dex - -_CharmeleonDexEntry:: - text "When it swings" - next "its burning tail," - next "it elevates the" - - page "temperature to" - next "unbearably high" - next "levels" - dex - -_WartortleDexEntry:: - text "Often hides in" - next "water to stalk" - next "unwary prey. For" - - page "swimming fast, it" - next "moves its ears to" - next "maintain balance" - dex - -_CharizardDexEntry:: - text "Spits fire that" - next "is hot enough to" - next "melt boulders." - - page "Known to cause" - next "forest fires" - next "unintentionally" - dex - -_OddishDexEntry:: - text "During the day," - next "it keeps its face" - next "buried in the" - - page "ground. At night," - next "it wanders around" - next "sowing its seeds" - dex - -_GloomDexEntry:: - text "The fluid that" - next "oozes from its" - next "mouth isn't drool." - - page "It is a nectar" - next "that is used to" - next "attract prey" - dex - -_VileplumeDexEntry:: - text "The larger its" - next "petals, the more" - next "toxic pollen it" - - page "contains. Its big" - next "head is heavy and" - next "hard to hold up" - dex - -_BellsproutDexEntry:: - text "A carnivorous" - next "#MON that traps" - next "and eats bugs." - - page "It uses its root" - next "feet to soak up" - next "needed moisture" - dex - -_WeepinbellDexEntry:: - text "It spits out" - next "POISONPOWDER to" - next "immobilize the" - - page "enemy and then" - next "finishes it with" - next "a spray of ACID" - dex - -_VictreebelDexEntry:: - text "Said to live in" - next "huge colonies" - next "deep in jungles," - - page "although no one" - next "has ever returned" - next "from there" - dex - diff --git a/text/trainer_names.asm b/text/trainer_names.asm deleted file mode 100755 index 7736738b..00000000 --- a/text/trainer_names.asm +++ /dev/null @@ -1,48 +0,0 @@ -TrainerNames: - db "YOUNGSTER@" - db "BUG CATCHER@" - db "LASS@" - db "SAILOR@" - db "JR.TRAINER♂@" - db "JR.TRAINER♀@" - db "POKéMANIAC@" - db "SUPER NERD@" - db "HIKER@" - db "BIKER@" - db "BURGLAR@" - db "ENGINEER@" - db "JUGGLER@" - db "FISHERMAN@" - db "SWIMMER@" - db "CUE BALL@" - db "GAMBLER@" - db "BEAUTY@" - db "PSYCHIC@" - db "ROCKER@" - db "JUGGLER@" - db "TAMER@" - db "BIRD KEEPER@" - db "BLACKBELT@" - db "RIVAL1@" - db "PROF.OAK@" - db "CHIEF@" - db "SCIENTIST@" - db "GIOVANNI@" - db "ROCKET@" - db "COOLTRAINER♂@" - db "COOLTRAINER♀@" - db "BRUNO@" - db "BROCK@" - db "MISTY@" - db "LT.SURGE@" - db "ERIKA@" - db "KOGA@" - db "BLAINE@" - db "SABRINA@" - db "GENTLEMAN@" - db "RIVAL2@" - db "RIVAL3@" - db "LORELEI@" - db "CHANNELER@" - db "AGATHA@" - db "LANCE@" diff --git a/text/type_names.asm b/text/type_names.asm deleted file mode 100755 index d94675b8..00000000 --- a/text/type_names.asm +++ /dev/null @@ -1,48 +0,0 @@ -TypeNames: - - dw .Normal - dw .Fighting - dw .Flying - dw .Poison - dw .Ground - dw .Rock - dw .Bird - dw .Bug - dw .Ghost - - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - dw .Normal - - dw .Fire - dw .Water - dw .Grass - dw .Electric - dw .Psychic - dw .Ice - dw .Dragon - -.Normal: db "NORMAL@" -.Fighting: db "FIGHTING@" -.Flying: db "FLYING@" -.Poison: db "POISON@" -.Fire: db "FIRE@" -.Water: db "WATER@" -.Grass: db "GRASS@" -.Electric: db "ELECTRIC@" -.Psychic: db "PSYCHIC@" -.Ice: db "ICE@" -.Ground: db "GROUND@" -.Rock: db "ROCK@" -.Bird: db "BIRD@" -.Bug: db "BUG@" -.Ghost: db "GHOST@" -.Dragon: db "DRAGON@" diff --git a/text/unused_names.asm b/text/unused_names.asm deleted file mode 100644 index 4aca7ca2..00000000 --- a/text/unused_names.asm +++ /dev/null @@ -1,20 +0,0 @@ -UnusedNames:: - db "かみなりバッヂ@" - db "かいがらバッヂ@" - db "おじぞうバッヂ@" - db "はやぶさバッヂ@" - db "ひんやりバッヂ@" - db "なかよしバッヂ@" - db "バラバッヂ@" - db "ひのたまバッヂ@" - db "ゴールドバッヂ@" - db "たまご@" - db "ひよこ@" - db "ブロンズ@" - db "シルバー@" - db "ゴールド@" - db "プチキャプテン@" - db "キャプテン@" - db "プチマスター@" - db "マスター@" - db "エクセレント" diff --git a/tools/Makefile b/tools/Makefile index 13bab1fb..a9906fad 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,7 +1,7 @@ .PHONY: all clean CC := gcc -CFLAGS := -O3 -std=c99 -Wall -Wextra +CFLAGS := -O3 -std=c99 -Wall -Wextra -pedantic tools := scan_includes gfx pkmncompress diff --git a/tools/gfx.c b/tools/gfx.c index 8c4066ab..7d6dd0ee 100644 --- a/tools/gfx.c +++ b/tools/gfx.c @@ -8,7 +8,7 @@ #include "common.h" static void usage(void) { - fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--png filename] [-d depth] [-h] [-o outfile] infile\n"); + fprintf(stderr, "Usage: gfx [--trim-whitespace] [--remove-whitespace] [--interleave] [--remove-duplicates [--keep-whitespace]] [--remove-xflip] [--remove-yflip] [--preserve indexes] [--png filename] [-d depth] [-h] [-o outfile] infile\n"); } static void error(char *message) { @@ -27,6 +27,8 @@ struct Options { int keep_whitespace; int remove_xflip; int remove_yflip; + int *preserved; + int num_preserved; char *png_file; }; @@ -43,11 +45,13 @@ void get_args(int argc, char *argv[]) { {"keep-whitespace", no_argument, &Options.keep_whitespace, 1}, {"remove-xflip", no_argument, &Options.remove_xflip, 1}, {"remove-yflip", no_argument, &Options.remove_yflip, 1}, + {"preserve", required_argument, 0, 'r'}, {"png", required_argument, 0, 'p'}, {"depth", required_argument, 0, 'd'}, {"help", no_argument, 0, 'h'}, {0} }; + char *token; for (int opt = 0; opt != -1;) { switch (opt = getopt_long(argc, argv, "ho:d:p:", long_options)) { case 'h': @@ -59,6 +63,15 @@ void get_args(int argc, char *argv[]) { case 'd': Options.depth = strtoul(optarg, NULL, 0); break; + case 'r': + token = strtok(optarg, ","); + while (token) { + Options.num_preserved++; + Options.preserved = realloc(Options.preserved, Options.num_preserved * sizeof(int)); + Options.preserved[Options.num_preserved-1] = strtoul(token, NULL, 0); + token = strtok(NULL, ","); + } + break; case 'p': Options.png_file = optarg; break; @@ -73,6 +86,23 @@ void get_args(int argc, char *argv[]) { } } +bool is_preserved(int index) { + for (int i = 0; i < Options.num_preserved; i++) { + if (Options.preserved[i] == index) { + return true; + } + } + return false; +} + +void shift_preserved(int removed_index) { + for (int i = 0; i < Options.num_preserved; i++) { + if (Options.preserved[i] >= removed_index) { + Options.preserved[i]--; + } + } +} + struct Graphic { int size; uint8_t *data; @@ -91,7 +121,7 @@ bool is_whitespace(uint8_t *tile, int tile_size) { void trim_whitespace(struct Graphic *graphic) { int tile_size = Options.depth * 8; for (int i = graphic->size - tile_size; i > 0; i -= tile_size) { - if (is_whitespace(&graphic->data[i], tile_size)) { + if (is_whitespace(&graphic->data[i], tile_size) && !is_preserved(i / tile_size)) { graphic->size = i; } else { break; @@ -102,9 +132,15 @@ void trim_whitespace(struct Graphic *graphic) { void remove_whitespace(struct Graphic *graphic) { int tile_size = Options.depth * 8; if (Options.interleave) tile_size *= 2; + + // Make sure we have a whole number of tiles, round down if required + graphic->size &= ~(tile_size - 1); + int i = 0; - for (int j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { - while (is_whitespace(&graphic->data[j], tile_size)) { + for (int j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (j < graphic->size && is_whitespace(&graphic->data[j], tile_size) && !is_preserved(j / tile_size - d)) { + shift_preserved(j / tile_size - d); + d++; j += tile_size; } if (j >= graphic->size) { @@ -136,11 +172,17 @@ void remove_duplicates(struct Graphic *graphic) { int tile_size = Options.depth * 8; if (Options.interleave) tile_size *= 2; int num_tiles = 0; - for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { - while (tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { - if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + + // Make sure we have a whole number of tiles, round down if required + graphic->size &= ~(tile_size - 1); + + for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (j < graphic->size && tile_exists(&graphic->data[j], graphic->data, tile_size, num_tiles)) { + if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) { break; } + shift_preserved(j / tile_size - d); + d++; j += tile_size; } if (j >= graphic->size) { @@ -155,7 +197,8 @@ void remove_duplicates(struct Graphic *graphic) { } bool flip_exists(uint8_t *tile, uint8_t *tiles, int tile_size, int num_tiles, bool xflip, bool yflip) { - uint8_t *flip = calloc(tile_size, 1); + uint8_t flip[tile_size]; + memset(flip, 0, sizeof(flip)); int half_size = tile_size / 2; for (int i = 0; i < tile_size; i++) { int byte = i; @@ -183,11 +226,17 @@ void remove_flip(struct Graphic *graphic, bool xflip, bool yflip) { int tile_size = Options.depth * 8; if (Options.interleave) tile_size *= 2; int num_tiles = 0; - for (int i = 0, j = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { - while (flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { - if (Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) { + + // Make sure we have a whole number of tiles, round down if required + graphic->size &= ~(tile_size - 1); + + for (int i = 0, j = 0, d = 0; i < graphic->size && j < graphic->size; i += tile_size, j += tile_size) { + while (j < graphic->size && flip_exists(&graphic->data[j], graphic->data, tile_size, num_tiles, xflip, yflip)) { + if ((Options.keep_whitespace && is_whitespace(&graphic->data[j], tile_size)) || is_preserved(j / tile_size - d)) { break; } + shift_preserved(j / tile_size - d); + d++; j += tile_size; } if (j >= graphic->size) { diff --git a/tools/pic.py b/tools/pic.py new file mode 100644 index 00000000..afc34c90 --- /dev/null +++ b/tools/pic.py @@ -0,0 +1,491 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +""" +A library for use with compressed monster and trainer pics in pokered. +""" +from __future__ import absolute_import +from __future__ import division + +import os +import sys +import argparse +from math import sqrt + +from pokemontools import gfx + + +def bitflip(x, n): + r = 0 + while n: + r = (r << 1) | (x & 1) + x >>= 1 + n -= 1 + return r + + +class Decompressor: + """ + pokered pic decompression. + + Ported to python 2.7 from the python 3 code at https://github.com/magical/pokemon-sprites-rby. + """ + + table1 = [(2 << i) - 1 for i in range(16)] + table2 = [ + [0x0, 0x1, 0x3, 0x2, 0x7, 0x6, 0x4, 0x5, 0xf, 0xe, 0xc, 0xd, 0x8, 0x9, 0xb, 0xa], + [0xf, 0xe, 0xc, 0xd, 0x8, 0x9, 0xb, 0xa, 0x0, 0x1, 0x3, 0x2, 0x7, 0x6, 0x4, 0x5], # prev ^ 0xf + [0x0, 0x8, 0xc, 0x4, 0xe, 0x6, 0x2, 0xa, 0xf, 0x7, 0x3, 0xb, 0x1, 0x9, 0xd, 0x5], + [0xf, 0x7, 0x3, 0xb, 0x1, 0x9, 0xd, 0x5, 0x0, 0x8, 0xc, 0x4, 0xe, 0x6, 0x2, 0xa], # prev ^ 0xf + ] + table3 = [bitflip(i, 4) for i in range(16)] + + tilesize = 8 + + + def __init__(self, f, mirror=False, planar=True): + self.bs = fbitstream(f) + self.mirror = mirror + self.planar = planar + self.data = None + + def decompress(self): + rams = [[], []] + + self.sizex = self._readint(4) * self.tilesize + self.sizey = self._readint(4) + + self.size = self.sizex * self.sizey + + self.ramorder = self._readbit() + + r1 = self.ramorder + r2 = self.ramorder ^ 1 + + self._fillram(rams[r1]) + mode = self._readbit() + if mode: + mode += self._readbit() + self._fillram(rams[r2]) + + rams[0] = bytearray(bitgroups_to_bytes(rams[0])) + rams[1] = bytearray(bitgroups_to_bytes(rams[1])) + + if mode == 0: + self._decode(rams[0]) + self._decode(rams[1]) + elif mode == 1: + self._decode(rams[r1]) + self._xor(rams[r1], rams[r2]) + elif mode == 2: + self._decode(rams[r2], mirror=False) + self._decode(rams[r1]) + self._xor(rams[r1], rams[r2]) + else: + raise Exception("Invalid deinterlace mode!") + + data = [] + if self.planar: + for a, b in zip(rams[0], rams[1]): + data += [a, b] + self.data = bytearray(data) + else: + for a, b in zip(bitstream(rams[0]), bitstream(rams[1])): + data.append(a | (b << 1)) + self.data = bitgroups_to_bytes(data) + + def _fillram(self, ram): + mode = ['rle', 'data'][self._readbit()] + size = self.size * 4 + while len(ram) < size: + if mode == 'rle': + self._read_rle_chunk(ram) + mode = 'data' + elif mode == 'data': + self._read_data_chunk(ram, size) + mode = 'rle' + if len(ram) > size: + #ram = ram[:size] + raise ValueError(size, len(ram)) + + ram[:] = self._deinterlace_bitgroups(ram) + + def _read_rle_chunk(self, ram): + + i = 0 + while self._readbit(): + i += 1 + + n = self.table1[i] + a = self._readint(i + 1) + n += a + + for i in range(n): + ram.append(0) + + def _read_data_chunk(self, ram, size): + while 1: + bitgroup = self._readint(2) + if bitgroup == 0: + break + ram.append(bitgroup) + + if size <= len(ram): + break + + def _decode(self, ram, mirror=None): + if mirror is None: + mirror = self.mirror + + for x in range(self.sizex): + bit = 0 + for y in range(self.sizey): + i = y * self.sizex + x + a = (ram[i] >> 4) & 0xf + b = ram[i] & 0xf + + a = self.table2[bit][a] + bit = a & 1 + if mirror: + a = self.table3[a] + + b = self.table2[bit][b] + bit = b & 1 + if mirror: + b = self.table3[b] + + ram[i] = (a << 4) | b + + def _xor(self, ram1, ram2, mirror=None): + if mirror is None: + mirror = self.mirror + + for i in range(len(ram2)): + if mirror: + a = (ram2[i] >> 4) & 0xf + b = ram2[i] & 0xf + a = self.table3[a] + b = self.table3[b] + ram2[i] = (a << 4) | b + + ram2[i] ^= ram1[i] + + def _deinterlace_bitgroups(self, bits): + l = [] + for y in range(self.sizey): + for x in range(self.sizex): + i = 4 * y * self.sizex + x + for j in range(4): + l.append(bits[i]) + i += self.sizex + return l + + + def _readbit(self): + return next(self.bs) + + def _readint(self, count): + return readint(self.bs, count) + + +def fbitstream(f): + while 1: + char = f.read(1) + if not char: + break + byte = ord(char) + + for i in range(7, -1, -1): + yield (byte >> i) & 1 + +def bitstream(b): + for byte in b: + for i in range(7, -1, -1): + yield (byte >> i) & 1 + +def readint(bs, count): + n = 0 + while count: + n <<= 1 + n |= next(bs) + count -= 1 + return n + +def bitgroups_to_bytes(bits): + l = [] + for i in range(0, len(bits) - 3, 4): + n = ((bits[i + 0] << 6) + | (bits[i + 1] << 4) + | (bits[i + 2] << 2) + | (bits[i + 3] << 0)) + l.append(n) + return bytearray(l) + + +def bytes_to_bits(bytelist): + return list(bitstream(bytelist)) + + +class Compressor: + """ + pokered pic compression. + + Adapted from stag019's C compressor. + """ + + table1 = [(2 << i) - 1 for i in range(16)] + table2 = [ + [0x0, 0x1, 0x3, 0x2, 0x6, 0x7, 0x5, 0x4, 0xc, 0xd, 0xf, 0xe, 0xa, 0xb, 0x9, 0x8], + [0x8, 0x9, 0xb, 0xa, 0xe, 0xf, 0xd, 0xc, 0x4, 0x5, 0x7, 0x6, 0x2, 0x3, 0x1, 0x0], # reverse + ] + table3 = [bitflip(i, 4) for i in range(16)] + + def __init__(self, image, width=None, height=None): + self.image = bytearray(image) + self.size = len(self.image) + + planar_tile = 8 * 8 // 4 + tile_size = self.size // planar_tile + if height and not width: width = tile_size // height + elif width and not height: height = tile_size // width + elif not width and not height: width = height = int(sqrt(tile_size)) + self.width, self.height = width, height + + def compress(self): + """ + Compress the image five times (twice for each mode, except 0) + and use the smallest one (in bits). + """ + rams = [[],[]] + datas = [] + + for mode in range(3): + + # Order is redundant for mode 0. + + # While this seems like an optimization, + # it's actually required for 1:1 compression + # to the original compressed pics. + + # This appears to be the algorithm + # that Game Freak's compressor used. + + # Using order 0 instead of 1 breaks this feature. + + for order in range(2): + if mode == 0 and order == 0: + continue + for i in range(2): + rams[i] = self.image[i::2] + self._interpret_compress(rams, mode, order) + datas += [(self.data[:], int(self.which_bit))] + + # Pick the smallest pic, measured in bits. + datas = sorted(datas, key=lambda data_bit: (len(data_bit[0]), -data_bit[1])) + self.data, self.which_bit = datas[0] + + def _interpret_compress(self, rams, mode, order): + self.data = [] + self.which_bit = 0 + + r1 = order + r2 = order ^ 1 + + if mode == 0: + self._encode(rams[1]) + self._encode(rams[0]) + elif mode == 1: + self._xor(rams[r1], rams[r2]) + self._encode(rams[r1]) + elif mode == 2: + self._xor(rams[r1], rams[r2]) + self._encode(rams[r1]) + self._encode(rams[r2], mirror=False) + else: + raise Exception('invalid interlace mode!') + + self._writeint(self.height, 4) + self._writeint(self.width, 4) + + self._writebit(order) + + self._fillram(rams[r1]) + if mode == 0: + self._writebit(0) + else: + self._writebit(1) + self._writebit(mode - 1) + self._fillram(rams[r2]) + + def _fillram(self, ram): + rle = 0 + nums = 0 + bitgroups = [] + + for x in range(self.width): + for bit in range(0, 8, 2): + byte = x * self.height * 8 + for y in range(self.height * 8): + bitgroup = (ram[byte] >> (6 - bit)) & 3 + if bitgroup == 0: + if rle == 0: + self._writebit(0) + elif rle == 1: + nums += 1 + else: + self._data_packet(bitgroups) + self._writebit(0) + self._writebit(0) + rle = 1 + bitgroups = [] + else: + if rle == 0: + self._writebit(1) + elif rle == 1: + self._rle(nums) + rle = -1 + bitgroups += [bitgroup] + nums = 0 + byte += 1 + + if rle == 1: + self._rle(nums) + else: + self._data_packet(bitgroups) + + def _data_packet(self, bitgroups): + for bitgroup in bitgroups: + self._writebit((bitgroup >> 1) & 1) + self._writebit((bitgroup >> 0) & 1) + + def _rle(self, nums): + nums += 1 + + # Get the previous power of 2. + # Deriving the bitcount from that seems to be + # faster on average than using the lookup table. + v = nums + v += 1 + v |= v >> 1 + v |= v >> 2 + v |= v >> 4 + v |= v >> 8 + v |= v >> 16 + v -= v >> 1 + v -= 1 + number = nums - v + + bitcount = -1 + while v: + v >>= 1 + bitcount += 1 + + for j in range(bitcount): + self._writebit(1) + self._writebit(0) + for j in range(bitcount, -1, -1): + self._writebit((number >> j) & 1) + + def _encode(self, ram, mirror=None): + a = b = 0 + for i in range(len(ram)): + j = i // self.height + j += i % self.height * self.width * 8 + if i % self.height == 0: + b = 0 + + a = (ram[j] >> 4) & 0xf + table = b & 1 + code_1 = self.table2[table][a] + + b = ram[j] & 0xf + table = a & 1 + code_2 = self.table2[table][b] + + ram[j] = (code_1 << 4) | code_2 + + def _xor(self, ram1, ram2): + for i in range(len(ram2)): + ram2[i] ^= ram1[i] + + def _writebit(self, bit): + self.which_bit -= 1 + if self.which_bit == -1: + self.which_bit = 7 + self.data += [0] + if bit: self.data[-1] |= bit << self.which_bit + + def _writeint(self, num, size=None): + bits = [] + if size: + for i in range(size): + bits += [num & 1] + num >>= 1 + else: + while num > 0: + bits += [num & 1] + num >>= 1 + for bit in reversed(bits): + self._writebit(bit) + + +def decompress(f, offset=None, mirror=False): + """ + Decompress a pic given a file object. Return a planar 2bpp image. + + Optional: offset (for roms). + """ + if offset is not None: + f.seek(offset) + dcmp = Decompressor(f, mirror=mirror) + dcmp.decompress() + return dcmp.data + + +def compress(f): + """ + Compress a planar 2bpp into a pic. + """ + comp = Compressor(f) + comp.compress() + return comp.data + + +def decompress_file(filename): + """ + Decompress a pic given a filename. + Export the resulting planar 2bpp image to + """ + pic = open(filename, 'rb') + image = decompress(pic) + image = gfx.transpose_tiles(image) + image = bytearray(image) + output_filename = os.path.splitext(filename)[0] + '.2bpp' + with open(output_filename, 'wb') as out: + out.write(image) + +def compress_file(filename): + image = open(filename, 'rb').read() + image = gfx.transpose_tiles(image) + pic = compress(image) + pic = bytearray(pic) + output_filename = os.path.splitext(filename)[0] + '.pic' + with open(output_filename, 'wb') as out: + out.write(pic) + + +def main(): + ap = argparse.ArgumentParser() + ap.add_argument('mode') + ap.add_argument('filenames', nargs='*') + args = ap.parse_args() + + for filename in args.filenames: + if args.mode == 'decompress': + decompress_file(filename) + elif args.mode == 'compress': + compress_file(filename) + +if __name__ == '__main__': + main() + diff --git a/tools/unnamed.py b/tools/unnamed.py new file mode 100755 index 00000000..f99a38d8 --- /dev/null +++ b/tools/unnamed.py @@ -0,0 +1,130 @@ +#!/usr/bin/env python3 + +from sys import stderr, exit +from subprocess import Popen, PIPE +from struct import unpack, calcsize +from enum import Enum + +class symtype(Enum): + LOCAL = 0 + IMPORT = 1 + EXPORT = 2 + +def unpack_file(fmt, file): + size = calcsize(fmt) + return unpack(fmt, file.read(size)) + +def read_string(file): + buf = bytearray() + while True: + b = file.read(1) + if b is None or b == b'\0': + return buf.decode() + else: + buf += b + + +# Fix broken pipe when using `head` +from signal import signal, SIGPIPE, SIG_DFL +signal(SIGPIPE,SIG_DFL) + +import argparse +parser = argparse.ArgumentParser(description="Parse the symfile to find unnamed symbols") +parser.add_argument('symfile', type=argparse.FileType('r'), help="the list of symbols") +parser.add_argument('-r', '--rootdir', type=str, help="scan the output files to obtain a list of files with unnamed symbols (NOTE: will rebuild objects as necessary)") +parser.add_argument('-l', '--list', type=int, default=0, help="output this many of each file's unnamed symbols (NOTE: requires -r)") +args = parser.parse_args() + +# Get list of object files +objects = None +if args.rootdir: + for line in Popen(["make", "-C", args.rootdir, "-s", "-p", "DEBUG=1"], + stdout=PIPE).stdout.read().decode().split("\n"): + if line.startswith("pokered_obj := "): + objects = line[15:].strip().split() + break + else: + print("Error: Object files not found!", file=stderr) + exit(1) + +# Scan all unnamed symbols from the symfile +symbols_total = 0 +symbols = set() +for line in args.symfile: + line = line.split(";")[0].strip() + split = line.split(" ") + if len(split) < 2: + continue + + symbols_total += 1 + + symbol = " ".join(split[1:]).strip() + if symbol[-3:].lower() == split[0][-3:].lower(): + symbols.add(symbol) + +# If no object files were provided, just print what we know and exit +print("Unnamed pokered symbols: %d (%.2f%% complete)" % (len(symbols), + (symbols_total - len(symbols)) / symbols_total * 100)) +if not objects: + for sym in symbols: + print(sym) + exit() + +# Count the amount of symbols in each file +files = {} +for objfile in objects: + f = open(objfile, "rb") + obj_ver = None + + magic = unpack_file("4s", f)[0] + if magic == b'RGB6': + obj_ver = 6 + elif magic == b'RGB9': + obj_ver = 10 + unpack_file("= 9) -wBattleTransitionCopyTilesOffset:: ; cd3d +wBattleTransitionCopyTilesOffset:: ; 2 bytes ; after 1 row/column has been copied, the offset to the next one to copy from -wInwardSpiralUpdateScreenCounter:: ; cd3d +wInwardSpiralUpdateScreenCounter:: ; counts down from 7 so that every time 7 more tiles of the spiral have been ; placed, the tile map buffer is copied to VRAM so that progress is visible -wHoFTeamIndex:: ; cd3d +wHoFTeamIndex:: -wSSAnneSmokeDriftAmount:: ; cd3d +wSSAnneSmokeDriftAmount:: ; multiplied by 16 to get the number of times to go right by 2 pixels -wRivalStarterTemp:: ; cd3d +wRivalStarterTemp:: -wBoxMonCounts:: ; cd3d +wBoxMonCounts:: ; 12 bytes ; array of the number of mons in each box -wDexMaxSeenMon:: ; cd3d +wDexMaxSeenMon:: -wPPRestoreItem:: ; cd3d +wPPRestoreItem:: -wWereAnyMonsAsleep:: ; cd3d +wWereAnyMonsAsleep:: -wCanPlaySlots:: ; cd3d +wCanPlaySlots:: -wNumShakes:: ; cd3d +wNumShakes:: -wDayCareStartLevel:: ; cd3d +wDayCareStartLevel:: ; the level of the mon at the time it entered day care -wWhichBadge:: ; cd3d +wWhichBadge:: -wPriceTemp:: ; cd3d +wPriceTemp:: ; 3-byte BCD number -wTitleMonSpecies:: ; cd3d +wTitleMonSpecies:: -wPlayerCharacterOAMTile:: ; cd3d +wPlayerCharacterOAMTile:: -wMoveDownSmallStarsOAMCount:: ; cd3d +wMoveDownSmallStarsOAMCount:: ; the number of small stars OAM entries to move down -wChargeMoveNum:: ; cd3d +wChargeMoveNum:: -wCoordIndex:: ; cd3d +wCoordIndex:: -wOptionsTextSpeedCursorX:: ; cd3d +wOptionsTextSpeedCursorX:: -wBoxNumString:: ; cd3d +wTrainerInfoTextBoxWidthPlus1:: -wTrainerInfoTextBoxWidthPlus1:: ; cd3d +wSwappedMenuItem:: -wSwappedMenuItem:: ; cd3d +wHoFMonSpecies:: -wHoFMonSpecies:: ; cd3d - -wFieldMoves:: ; cd3d +wFieldMoves:: ; 4 bytes ; the current mon's field moves -wBadgeNumberTile:: ; cd3d +wBadgeNumberTile:: ; tile ID of the badge number being drawn -wRodResponse:: ; cd3d +wRodResponse:: ; 0 = no bite ; 1 = bite ; 2 = no fish on map -wWhichTownMapLocation:: ; cd3d +wWhichTownMapLocation:: -wStoppingWhichSlotMachineWheel:: ; cd3d +wStoppingWhichSlotMachineWheel:: ; which wheel the player is trying to stop ; 0 = none, 1 = wheel 1, 2 = wheel 2, 3 or greater = wheel 3 -wTradedPlayerMonSpecies:: ; cd3d +wTradedPlayerMonSpecies:: -wTradingWhichPlayerMon:: ; cd3d +wTradingWhichPlayerMon:: -wChangeBoxSavedMapTextPointer:: ; cd3d +wChangeBoxSavedMapTextPointer:: -wFlyAnimUsingCoordList:: ; cd3d +wFlyAnimUsingCoordList:: -wPlayerSpinInPlaceAnimFrameDelay:: ; cd3d +wPlayerSpinInPlaceAnimFrameDelay:: -wPlayerSpinWhileMovingUpOrDownAnimDeltaY:: ; cd3d +wPlayerSpinWhileMovingUpOrDownAnimDeltaY:: -wHiddenObjectFunctionArgument:: ; cd3d +wBoxNumString:: -wWhichTrade:: ; cd3d +wHiddenObjectFunctionArgument:: + +wWhichTrade:: ; which entry from TradeMons to select -wTrainerSpriteOffset:: ; cd3d +wTrainerSpriteOffset:: -wUnusedCD3D:: ; cd3d +wUnusedCD3D:: ds 1 -wHUDPokeballGfxOffsetX:: ; cd3e +wHUDPokeballGfxOffsetX:: ; difference in X between the next ball and the current one -wBattleTransitionCircleScreenQuadrantX:: ; cd3e +wBattleTransitionCircleScreenQuadrantX:: ; 0 = left half (X < 10) ; 1 = right half (X >= 10) -wSSAnneSmokeX:: ; cd3e +wSSAnneSmokeX:: -wRivalStarterBallSpriteIndex:: ; cd3e +wRivalStarterBallSpriteIndex:: -wDayCareNumLevelsGrown:: ; cd3e +wDayCareNumLevelsGrown:: -wOptionsBattleAnimCursorX:: ; cd3e +wOptionsBattleAnimCursorX:: -wTrainerInfoTextBoxWidth:: ; cd3e +wTrainerInfoTextBoxWidth:: -wHoFPartyMonIndex:: ; cd3e +wHoFPartyMonIndex:: -wNumCreditsMonsDisplayed:: ; cd3e +wNumCreditsMonsDisplayed:: ; the number of credits mons that have been displayed so far -wBadgeNameTile:: ; cd3e +wBadgeNameTile:: ; first tile ID of the name being drawn -wFlyLocationsList:: ; cd3e -; 11 bytes plus $ff sentinel values at each end +wFlyLocationsList:: +; NUM_CITY_MAPS bytes plus $ff sentinel values at each end -wSlotMachineWheel1Offset:: ; cd3e +wSlotMachineWheel1Offset:: -wTradedEnemyMonSpecies:: ; cd3e +wTradedEnemyMonSpecies:: -wTradingWhichEnemyMon:: ; cd3e +wTradingWhichEnemyMon:: -wFlyAnimCounter:: ; cd3e +wFlyAnimCounter:: -wPlayerSpinInPlaceAnimFrameDelayDelta:: ; cd3e +wPlayerSpinInPlaceAnimFrameDelayDelta:: -wPlayerSpinWhileMovingUpOrDownAnimMaxY:: ; cd3e +wPlayerSpinWhileMovingUpOrDownAnimMaxY:: -wHiddenObjectFunctionRomBank:: ; cd3e +wHiddenObjectFunctionRomBank:: -wTrainerEngageDistance:: ; cd3e +wTrainerEngageDistance:: ds 1 -wHUDGraphicsTiles:: ; cd3f +wHUDGraphicsTiles:: ; 3 bytes -wDayCareTotalCost:: ; cd3f +wDayCareTotalCost:: ; 2-byte BCD number -wJigglypuffFacingDirections:: ; cd3f +wJigglypuffFacingDirections:: -wOptionsBattleStyleCursorX:: ; cd3f +wOptionsBattleStyleCursorX:: -wTrainerInfoTextBoxNextRowOffset:: ; cd3f +wTrainerInfoTextBoxNextRowOffset:: -wHoFMonLevel:: ; cd3f +wHoFMonLevel:: -wBadgeOrFaceTiles:: ; cd3f +wBadgeOrFaceTiles:: ; 8 bytes ; a list of the first tile IDs of each badge or face (depending on whether the ; badge is owned) to be drawn on the trainer screen -wSlotMachineWheel2Offset:: ; cd3f +wSlotMachineWheel2Offset:: -wNameOfPlayerMonToBeTraded:: ; cd3f +wNameOfPlayerMonToBeTraded:: -wFlyAnimBirdSpriteImageIndex:: ; cd3f +wFlyAnimBirdSpriteImageIndex:: -wPlayerSpinInPlaceAnimFrameDelayEndValue:: ; cd3f +wPlayerSpinInPlaceAnimFrameDelayEndValue:: -wPlayerSpinWhileMovingUpOrDownAnimFrameDelay:: ; cd3f +wPlayerSpinWhileMovingUpOrDownAnimFrameDelay:: -wHiddenObjectIndex:: ; cd3f +wHiddenObjectIndex:: -wTrainerFacingDirection:: ; cd3f +wTrainerFacingDirection:: ds 1 -wHoFMonOrPlayer:: ; cd40 +wHoFMonOrPlayer:: ; show mon or show player? ; 0 = mon ; 1 = player -wSlotMachineWheel3Offset:: ; cd40 +wSlotMachineWheel3Offset:: -wPlayerSpinInPlaceAnimSoundID:: ; cd40 +wPlayerSpinInPlaceAnimSoundID:: -wHiddenObjectY:: ; cd40 +wHiddenObjectY:: -wTrainerScreenY:: ; cd40 +wTrainerScreenY:: -wUnusedCD40:: ; cd40 +wOptionsCancelCursorX:: ds 1 -wDayCarePerLevelCost:: ; cd41 -; 2-byte BCD number (always set to $0100) +wDayCarePerLevelCost:: +; 2-byte BCD number (always set to $100) -wHoFTeamIndex2:: ; cd41 +wHoFTeamIndex2:: -wHiddenItemOrCoinsIndex:: ; cd41 +wHiddenItemOrCoinsIndex:: -wTradedPlayerMonOT:: ; cd41 +wTradedPlayerMonOT:: -wHiddenObjectX:: ; cd41 +wHiddenObjectX:: -wSlotMachineWinningSymbol:: ; cd41 +wSlotMachineWinningSymbol:: ; the OAM tile number of the upper left corner of the winning symbol minus 2 -wNumFieldMoves:: ; cd41 +wNumFieldMoves:: -wSlotMachineWheel1BottomTile:: ; cd41 +wSlotMachineWheel1BottomTile:: -wTrainerScreenX:: ; cd41 +wTrainerScreenX:: ds 1 ; a lot of the uses for these values use more than the said address -wHoFTeamNo:: ; cd42 +wHoFTeamNo:: -wSlotMachineWheel1MiddleTile:: ; cd42 +wSlotMachineWheel1MiddleTile:: -wFieldMovesLeftmostXCoord:: ; cd42 +wFieldMovesLeftmostXCoord:: ds 1 -wLastFieldMoveID:: ; cd43 +wLastFieldMoveID:: ; unused -wSlotMachineWheel1TopTile:: ; cd43 +wSlotMachineWheel1TopTile:: ds 1 -wSlotMachineWheel2BottomTile:: ; cd44 +wSlotMachineWheel2BottomTile:: ds 1 -wSlotMachineWheel2MiddleTile:: ; cd45 +wSlotMachineWheel2MiddleTile:: ds 1 -wTempCoins1:: ; cd46 +wTempCoins1:: ; 2 bytes ; temporary variable used to add payout amount to the player's coins -wSlotMachineWheel2TopTile:: ; cd46 +wSlotMachineWheel2TopTile:: ds 1 -wBattleTransitionSpiralDirection:: ; cd47 +wBattleTransitionSpiralDirection:: ; 0 = outward, 1 = inward -wSlotMachineWheel3BottomTile:: ; cd47 +wSlotMachineWheel3BottomTile:: ds 1 -wSlotMachineWheel3MiddleTile:: ; cd48 +wSlotMachineWheel3MiddleTile:: -wFacingDirectionList:: ; cd48 -; 4 bytes (also, the byte before the start of the list (cd47) is used a temp -; variable when the list is rotated) +wFacingDirectionList:: +; 4 bytes (also, the byte before the start of the list (wSlotMachineWheel3BottomTile) +; is used a temp variable when the list is rotated) ; used when spinning the player's sprite ds 1 -wSlotMachineWheel3TopTile:: ; cd49 +wSlotMachineWheel3TopTile:: wTempObtainedBadgesBooleans:: ; 8 bytes @@ -1120,85 +1054,85 @@ wTempObtainedBadgesBooleans:: ; one byte for each badge; 0 = not obtained, 1 = obtained ds 1 -wTempCoins2:: ; cd4a +wTempCoins2:: ; 2 bytes ; temporary variable used to subtract the bet amount from the player's coins -wPayoutCoins:: ; cd4a +wPayoutCoins:: ; 2 bytes ds 2 -wTradedPlayerMonOTID:: ; cd4c +wTradedPlayerMonOTID:: -wSlotMachineFlags:: ; cd4c +wSlotMachineFlags:: ; These flags are set randomly and control when the wheels stop. ; bit 6: allow the player to win in general ; bit 7: allow the player to win with 7 or bar (plus the effect of bit 6) ds 1 -wSlotMachineWheel1SlipCounter:: ; cd4d +wSlotMachineWheel1SlipCounter:: ; wheel 1 can "slip" while this is non-zero -wCutTile:: ; cd4d +wCutTile:: ; $3d = tree tile ; $52 = grass tile ds 1 -wSlotMachineWheel2SlipCounter:: ; cd4e +wSlotMachineWheel2SlipCounter:: ; wheel 2 can "slip" while this is non-zero -wTradedEnemyMonOT:: ; cd4e +wTradedEnemyMonOT:: ds 1 -wSavedPlayerScreenY:: ; cd4f +wSavedPlayerScreenY:: -wSlotMachineRerollCounter:: ; cd4f +wSlotMachineRerollCounter:: ; The remaining number of times wheel 3 will roll down a symbol until a match is ; found, when winning is enabled. It's initialized to 4 each bet. -wEmotionBubbleSpriteIndex:: ; cd4f +wEmotionBubbleSpriteIndex:: ; the index of the sprite the emotion bubble is to be displayed above ds 1 -wWhichEmotionBubble:: ; cd50 +wWhichEmotionBubble:: -wSlotMachineBet:: ; cd50 +wSlotMachineBet:: ; how many coins the player bet on the slot machine (1 to 3) -wSavedPlayerFacingDirection:: ; cd50 +wSavedPlayerFacingDirection:: -wWhichAnimationOffsets:: ; cd50 +wWhichAnimationOffsets:: ; 0 = cut animation, 1 = boulder dust animation ds 9 -wTradedEnemyMonOTID:: ; cd59 +wTradedEnemyMonOTID:: ds 2 -wStandingOnWarpPadOrHole:: ; cd5b +wStandingOnWarpPadOrHole:: ; 0 = neither ; 1 = warp pad ; 2 = hole -wOAMBaseTile:: ; cd5b +wOAMBaseTile:: -wGymTrashCanIndex:: ; cd5b +wGymTrashCanIndex:: ds 1 -wSymmetricSpriteOAMAttributes:: ; cd5c +wSymmetricSpriteOAMAttributes:: ds 1 -wMonPartySpriteSpecies:: ; cd5d +wMonPartySpriteSpecies:: ds 1 -wLeftGBMonSpecies:: ; cd5e +wLeftGBMonSpecies:: ; in the trade animation, the mon that leaves the left gameboy ds 1 -wRightGBMonSpecies:: ; cd5f +wRightGBMonSpecies:: ; in the trade animation, the mon that leaves the right gameboy ds 1 -wFlags_0xcd60:: ; cd60 +wFlags_0xcd60:: ; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaneously) ; bit 1: boulder dust animation (from using Strength) pending ; bit 3: using generic PC @@ -1208,7 +1142,7 @@ wFlags_0xcd60:: ; cd60 ds 9 -wActionResultOrTookBattleTurn:: ; cd6a +wActionResultOrTookBattleTurn:: ; This has overlapping related uses. ; When the player tries to use an item or use certain field moves, 0 is stored ; when the attempt fails and 1 is stored when the attempt succeeds. @@ -1220,16 +1154,16 @@ wActionResultOrTookBattleTurn:: ; cd6a ; and the player is not allowed to make a move and the two uses are compatible. ds 1 -wJoyIgnore:: ; cd6b +wJoyIgnore:: ; Set buttons are ignored. ds 1 -wDownscaledMonSize:: ; cd6c +wDownscaledMonSize:: ; size of downscaled mon pic used in pokeball entering/exiting animation ; $00 = 5×5 ; $01 = 3×3 -wNumMovesMinusOne:: ; cd6c +wNumMovesMinusOne:: ; FormatMovesString stores the number of moves minus one here ds 1 @@ -1237,13 +1171,13 @@ UNION wcd6d:: ds 4 ; buffer for various data -wStatusScreenCurrentPP:: ; cd71 +wStatusScreenCurrentPP:: ; temp variable used to print a move's current PP on the status screen ds 1 ds 6 -wNormalMaxPPList:: ; cd78 +wNormalMaxPPList:: ; list of normal max PP (without PP up) values ds 9 @@ -1254,269 +1188,271 @@ wEvosMoves:: ds MAX_EVOLUTIONS * EVOLUTION_SIZE + 1 ENDU -wSerialOtherGameboyRandomNumberListBlock:: ; cd81 +wSerialOtherGameboyRandomNumberListBlock:: ; buffer for transferring the random number list generated by the other gameboy -wTileMapBackup2:: ; cd81 +wTileMapBackup2:: ; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top) ds 20 * 18 -wNamingScreenNameLength:: ; cee9 +wNamingScreenNameLength:: -wEvoOldSpecies:: ; cee9 +wEvoOldSpecies:: -wBuffer:: ; cee9 +wBuffer:: ; Temporary storage area of 30 bytes. -wTownMapCoords:: ; cee9 +wTownMapCoords:: ; lower nybble is x, upper nybble is y -wLearningMovesFromDayCare:: ; cee9 +wLearningMovesFromDayCare:: ; whether WriteMonMoves is being used to make a mon learn moves from day care ; non-zero if so -wChangeMonPicEnemyTurnSpecies:: ; cee9 +wChangeMonPicEnemyTurnSpecies:: -wHPBarMaxHP:: ; cee9 +wHPBarMaxHP:: ds 1 -wNamingScreenSubmitName:: ; ceea +wNamingScreenSubmitName:: ; non-zero when the player has chosen to submit the name -wChangeMonPicPlayerTurnSpecies:: ; ceea +wChangeMonPicPlayerTurnSpecies:: -wEvoNewSpecies:: ; ceea +wEvoNewSpecies:: ds 1 -wAlphabetCase:: ; ceeb +wAlphabetCase:: ; 0 = upper case ; 1 = lower case -wEvoMonTileOffset:: ; ceeb +wEvoMonTileOffset:: -wHPBarOldHP:: ; ceeb +wHPBarOldHP:: ds 1 -wEvoCancelled:: ; ceec +wEvoCancelled:: ds 1 -wNamingScreenLetter:: ; ceed +wNamingScreenLetter:: -wHPBarNewHP:: ; ceed +wHPBarNewHP:: ds 2 -wHPBarDelta:: ; ceef +wHPBarDelta:: ds 1 -wHPBarTempHP:: ; cef0 +wHPBarTempHP:: ds 2 ds 11 -wHPBarHPDifference:: ; cefd +wHPBarHPDifference:: ds 1 ds 7 -wAIItem:: ; cf05 +wAIItem:: ; the item that the AI used ds 1 -wUsedItemOnWhichPokemon:: ; cf05 +wUsedItemOnWhichPokemon:: ds 1 -wAnimSoundID:: ; cf07 +wAnimSoundID:: ; sound ID during battle animations ds 1 -wBankswitchHomeSavedROMBank:: ; cf08 +wBankswitchHomeSavedROMBank:: ; used as a storage value for the bank to return to after a BankswitchHome (bankswitch in homebank) ds 1 -wBankswitchHomeTemp:: ; cf09 +wBankswitchHomeTemp:: ; used as a temp storage value for the bank to switch to ds 1 -wBoughtOrSoldItemInMart:: ; cf0a +wBoughtOrSoldItemInMart:: ; 0 = nothing bought or sold in pokemart ; 1 = bought or sold something in pokemart ; this value is not used for anything ds 1 -wBattleResult:: ; cf0b +wBattleResult:: ; $00 - win ; $01 - lose ; $02 - draw ds 1 -wAutoTextBoxDrawingControl:: ; cf0c +wAutoTextBoxDrawingControl:: ; bit 0: if set, DisplayTextID automatically draws a text box ds 1 wcf0d:: ds 1 ; used with some overworld scripts (not exactly sure what it's used for) -wTilePlayerStandingOn:: ; cf0e +wTilePlayerStandingOn:: ; used in CheckForTilePairCollisions2 to store the tile the player is on ds 1 -wNPCNumScriptedSteps:: ds 1 ; cf0f +wNPCNumScriptedSteps:: ds 1 -wNPCMovementScriptFunctionNum:: ; cf10 +wNPCMovementScriptFunctionNum:: ; which script function within the pointer table indicated by ; wNPCMovementScriptPointerTableNum ds 1 -wTextPredefFlag:: ; cf11 +wTextPredefFlag:: ; bit 0: set when printing a text predef so that DisplayTextID doesn't switch ; to the current map's bank ds 1 -wPredefParentBank:: ; cf12 +wPredefParentBank:: ds 1 wSpriteIndex:: ds 1 -wCurSpriteMovement2:: ; cf14 +wCurSpriteMovement2:: ; movement byte 2 of current sprite ds 1 ds 2 -wNPCMovementScriptSpriteOffset:: ; cf17 +wNPCMovementScriptSpriteOffset:: ; sprite offset of sprite being controlled by NPC movement script ds 1 -wScriptedNPCWalkCounter:: ; cf18 +wScriptedNPCWalkCounter:: ds 1 ds 1 -wGBC:: ; cf1a +wGBC:: ds 1 -wOnSGB:: ; cf1b +wOnSGB:: ; if running on SGB, it's 1, else it's 0 ds 1 -wDefaultPaletteCommand:: ; cf1c +wDefaultPaletteCommand:: ds 1 -wPlayerHPBarColor:: ; cf1d +wPlayerHPBarColor:: -wWholeScreenPaletteMonSpecies:: ; cf1d +wWholeScreenPaletteMonSpecies:: ; species of the mon whose palette is used for the whole screen ds 1 -wEnemyHPBarColor:: ; cf1e +wEnemyHPBarColor:: ds 1 ; 0: green ; 1: yellow ; 2: red -wPartyMenuHPBarColors:: ; cf1f +wPartyMenuHPBarColors:: ds 6 -wStatusScreenHPBarColor:: ; cf25 +wStatusScreenHPBarColor:: ds 1 ds 7 -wCopyingSGBTileData:: ; cf2d +wCopyingSGBTileData:: -wWhichPartyMenuHPBar:: ; cf2d +wWhichPartyMenuHPBar:: -wPalPacket:: ; cf2d +wPalPacket:: ds 1 -wPartyMenuBlkPacket:: ; cf2e +wPartyMenuBlkPacket:: ; $30 bytes ds 29 -wExpAmountGained:: ; cf4b +wExpAmountGained:: ; 2-byte big-endian number ; the total amount of exp a mon gained -wcf4b:: ds 2 ; storage buffer for various strings +wcf4b:: +; storage buffer for various strings + ds 2 -wGainBoostedExp:: ; cf4d +wGainBoostedExp:: ds 1 ds 17 -wGymCityName:: ; cf5f +wGymCityName:: ds 17 -wGymLeaderName:: ; cf70 +wGymLeaderName:: ds NAME_LENGTH -wItemList:: ; cf7b +wItemList:: ds 16 -wListPointer:: ; cf8b +wListPointer:: ds 2 -wUnusedCF8D:: ; cf8d +wUnusedCF8D:: ; 2 bytes ; used to store pointers, but never read ds 2 -wItemPrices:: ; cf8f +wItemPrices:: ds 2 wcf91:: ds 1 ; used with a lot of things (too much to list here) -wWhichPokemon:: ; cf92 +wWhichPokemon:: ; which pokemon you selected ds 1 -wPrintItemPrices:: ; cf93 +wPrintItemPrices:: ; if non-zero, then print item prices when displaying lists ds 1 -wHPBarType:: ; cf94 +wHPBarType:: ; type of HP bar ; $00 = enemy HUD in battle ; $01 = player HUD in battle / status screen ; $02 = party menu -wListMenuID:: ; cf94 +wListMenuID:: ; ID used by DisplayListMenuID ds 1 -wRemoveMonFromBox:: ; cf95 +wRemoveMonFromBox:: ; if non-zero, RemovePokemon will remove the mon from the current box, ; else it will remove the mon from the party -wMoveMonType:: ; cf95 +wMoveMonType:: ; 0 = move from box to party ; 1 = move from party to box ; 2 = move from daycare to party ; 3 = move from party to daycare ds 1 -wItemQuantity:: ; cf96 +wItemQuantity:: ds 1 -wMaxItemQuantity:: ; cf97 +wMaxItemQuantity:: ds 1 ; LoadMonData copies mon data here -wLoadedMon:: party_struct wLoadedMon ; cf98 +wLoadedMon:: party_struct wLoadedMon -wFontLoaded:: ; cfc4 +wFontLoaded:: ; bit 0: The space in VRAM that is used to store walk animation tile patterns ; for the player and NPCs is in use for font tile patterns. ; This means that NPC movement must be disabled. ; The other bits are unused. ds 1 -wWalkCounter:: ; cfc5 +wWalkCounter:: ; walk animation counter ds 1 -wTileInFrontOfPlayer:: ; cfc6 +wTileInFrontOfPlayer:: ; background tile number in front of the player (either 1 or 2 steps ahead) ds 1 -wAudioFadeOutControl:: ; cfc7 +wAudioFadeOutControl:: ; The desired fade counter reload value is stored here prior to calling ; PlaySound in order to cause the current music to fade out before the new ; music begins playing. Storing 0 causes no fade out to occur and the new music @@ -1528,13 +1464,13 @@ wAudioFadeOutControl:: ; cfc7 ; audio, it zeroes this variable and starts playing the sound ID stored in it. ds 1 -wAudioFadeOutCounterReloadValue:: ; cfc8 +wAudioFadeOutCounterReloadValue:: ds 1 -wAudioFadeOutCounter:: ; cfc9 +wAudioFadeOutCounter:: ds 1 -wLastMusicSoundID:: ; cfca +wLastMusicSoundID:: ; This is used to determine whether the default music is already playing when ; attempting to play the default music (in order to avoid restarting the same ; music) and whether the music has already been stopped when attempting to @@ -1546,110 +1482,110 @@ wLastMusicSoundID:: ; cfca ; the music). ds 1 -wUpdateSpritesEnabled:: ; cfcb +wUpdateSpritesEnabled:: ; $00 = causes sprites to be hidden and the value to change to $ff ; $01 = enabled ; $ff = disabled ; other values aren't used ds 1 -wEnemyMoveNum:: ; cfcc +wEnemyMoveNum:: ds 1 -wEnemyMoveEffect:: ; cfcd +wEnemyMoveEffect:: ds 1 -wEnemyMovePower:: ; cfce +wEnemyMovePower:: ds 1 -wEnemyMoveType:: ; cfcf +wEnemyMoveType:: ds 1 -wEnemyMoveAccuracy:: ; cfd0 +wEnemyMoveAccuracy:: ds 1 -wEnemyMoveMaxPP:: ; cfd1 +wEnemyMoveMaxPP:: ds 1 -wPlayerMoveNum:: ; cfd2 +wPlayerMoveNum:: ds 1 -wPlayerMoveEffect:: ; cfd3 +wPlayerMoveEffect:: ds 1 -wPlayerMovePower:: ; cfd4 +wPlayerMovePower:: ds 1 -wPlayerMoveType:: ; cfd5 +wPlayerMoveType:: ds 1 -wPlayerMoveAccuracy:: ; cfd6 +wPlayerMoveAccuracy:: ds 1 -wPlayerMoveMaxPP:: ; cfd7 +wPlayerMoveMaxPP:: ds 1 -wEnemyMonSpecies2:: ; cfd8 +wEnemyMonSpecies2:: ds 1 -wBattleMonSpecies2:: ; cfd9 +wBattleMonSpecies2:: ds 1 -wEnemyMonNick:: ds NAME_LENGTH ; cfda +wEnemyMonNick:: ds NAME_LENGTH -wEnemyMon:: battle_struct wEnemyMon ; cfe5 +wEnemyMon:: battle_struct wEnemyMon wEnemyMonBaseStats:: ds 5 wEnemyMonActualCatchRate:: ds 1 wEnemyMonBaseExp:: ds 1 -wBattleMonNick:: ds NAME_LENGTH ; d009 -wBattleMon:: battle_struct wBattleMon ; d014 +wBattleMonNick:: ds NAME_LENGTH +wBattleMon:: battle_struct wBattleMon -wTrainerClass:: ; d031 +wTrainerClass:: ds 1 ds 1 -wTrainerPicPointer:: ; d033 +wTrainerPicPointer:: ds 2 ds 1 -wTempMoveNameBuffer:: ; d036 +wTempMoveNameBuffer:: -wLearnMoveMonName:: ; d036 +wLearnMoveMonName:: ; The name of the mon that is learning a move. ds 16 -wTrainerBaseMoney:: ; d046 +wTrainerBaseMoney:: ; 2-byte BCD number ; money received after battle = base money × level of highest-level enemy mon ds 2 -wMissableObjectCounter:: ; d048 +wMissableObjectCounter:: ds 1 ds 1 -wTrainerName:: ; d04a +wTrainerName:: ; 13 bytes for the letters of the opposing trainer ; the name is terminated with $50 with possible ; unused trailing letters ds 13 -wIsInBattle:: ; d057 +wIsInBattle:: ; lost battle, this is -1 ; no battle, this is 0 ; wild battle, this is 1 ; trainer battle, this is 2 ds 1 -wPartyGainExpFlags:: ; d058 +wPartyGainExpFlags:: ; flags that indicate which party members should be be given exp when GainExperience is called flag_array 6 -wCurOpponent:: ; d059 +wCurOpponent:: ; in a wild battle, this is the species of pokemon -; in a trainer battle, this is the trainer class + 200 +; in a trainer battle, this is the trainer class + OPP_ID_OFFSET ds 1 -wBattleType:: ; d05a +wBattleType:: ; in normal battle, this is 0 ; in old man battle, this is 1 ; in safari battle, this is 2 ds 1 -wDamageMultipliers:: ; d05b +wDamageMultipliers:: ; bits 0-6: Effectiveness ; $0 = immune ; $5 = not very effective @@ -1658,34 +1594,34 @@ wDamageMultipliers:: ; d05b ; bit 7: STAB ds 1 -wLoneAttackNo:: ; d05c +wLoneAttackNo:: ; which entry in LoneAttacks to use -wGymLeaderNo:: ; d05c +wGymLeaderNo:: ; it's actually the same thing as ^ ds 1 -wTrainerNo:: ; d05d +wTrainerNo:: ; which instance of [youngster, lass, etc] is this? ds 1 -wCriticalHitOrOHKO:: ; d05e +wCriticalHitOrOHKO:: ; $00 = normal attack ; $01 = critical hit ; $02 = successful OHKO ; $ff = failed OHKO ds 1 -wMoveMissed:: ; d05f +wMoveMissed:: ds 1 -wPlayerStatsToDouble:: ; d060 +wPlayerStatsToDouble:: ; always 0 ds 1 -wPlayerStatsToHalve:: ; d061 +wPlayerStatsToHalve:: ; always 0 ds 1 -wPlayerBattleStatus1:: ; d062 +wPlayerBattleStatus1:: ; bit 0 - bide ; bit 1 - thrash / petal dance ; bit 2 - attacking multiple times (e.g. double kick) @@ -1696,7 +1632,7 @@ wPlayerBattleStatus1:: ; d062 ; bit 7 - confusion ds 1 -wPlayerBattleStatus2:: ; d063 +wPlayerBattleStatus2:: ; bit 0 - X Accuracy effect ; bit 1 - protected by "mist" ; bit 2 - focus energy effect @@ -1706,69 +1642,69 @@ wPlayerBattleStatus2:: ; d063 ; bit 7 - leech seeded ds 1 -wPlayerBattleStatus3:: ; d064 +wPlayerBattleStatus3:: ; bit 0 - toxic ; bit 1 - light screen ; bit 2 - reflect ; bit 3 - transformed ds 1 -wEnemyStatsToDouble:: ; d065 +wEnemyStatsToDouble:: ; always 0 ds 1 -wEnemyStatsToHalve:: ; d066 +wEnemyStatsToHalve:: ; always 0 ds 1 -wEnemyBattleStatus1:: ; d067 +wEnemyBattleStatus1:: ds 1 -wEnemyBattleStatus2:: ; d068 +wEnemyBattleStatus2:: ds 1 -wEnemyBattleStatus3:: ; d069 +wEnemyBattleStatus3:: ds 1 wPlayerNumAttacksLeft:: ; when the player is attacking multiple times, the number of attacks left ds 1 -wPlayerConfusedCounter:: ; d06b +wPlayerConfusedCounter:: ds 1 -wPlayerToxicCounter:: ; d06c +wPlayerToxicCounter:: ds 1 -wPlayerDisabledMove:: ; d06d +wPlayerDisabledMove:: ; high nibble: which move is disabled (1-4) ; low nibble: disable turns left ds 1 ds 1 -wEnemyNumAttacksLeft:: ; d06f +wEnemyNumAttacksLeft:: ; when the enemy is attacking multiple times, the number of attacks left ds 1 -wEnemyConfusedCounter:: ; d070 +wEnemyConfusedCounter:: ds 1 -wEnemyToxicCounter:: ; d071 +wEnemyToxicCounter:: ds 1 -wEnemyDisabledMove:: ; d072 +wEnemyDisabledMove:: ; high nibble: which move is disabled (1-4) ; low nibble: disable turns left ds 1 ds 1 -wPlayerNumHits:: ; d074 +wPlayerNumHits:: ; number of hits by player in attacks like Double Slap, etc. -wPlayerBideAccumulatedDamage:: ; d074 +wPlayerBideAccumulatedDamage:: ; the amount of damage accumulated by the player while biding (2 bytes) -wUnknownSerialCounter2:: ; d075 +wUnknownSerialCounter2:: ; 2 bytes ds 4 @@ -1777,35 +1713,35 @@ wEscapedFromBattle:: ; non-zero when an item or move that allows escape from battle was used ds 1 -wAmountMoneyWon:: ; d079 +wAmountMoneyWon:: ; 3-byte BCD number -wObjectToHide:: ; d079 +wObjectToHide:: ds 1 -wObjectToShow:: ; d07a +wObjectToShow:: ds 1 ds 1 -wDefaultMap:: ; d07c +wDefaultMap:: ; the map you will start at when the debug bit is set -wMenuItemOffset:: ; d07c +wMenuItemOffset:: -wAnimationID:: ; d07c +wAnimationID:: ; ID number of the current battle animation ds 1 -wNamingScreenType:: ; d07d +wNamingScreenType:: -wPartyMenuTypeOrMessageID:: ; d07d +wPartyMenuTypeOrMessageID:: -wTempTilesetNumTiles:: ; d07d +wTempTilesetNumTiles:: ; temporary storage for the number of tiles in a tileset ds 1 -wSavedListScrollOffset:: ; d07e +wSavedListScrollOffset:: ; used by the pokemart code to save the existing value of wListScrollOffset ; so that it can be restored when the player is done with the pokemart NPC ds 1 @@ -1813,71 +1749,71 @@ wSavedListScrollOffset:: ; d07e ds 2 ; base coordinates of frame block -wBaseCoordX:: ; d081 +wBaseCoordX:: ds 1 -wBaseCoordY:: ; d082 +wBaseCoordY:: ds 1 ; low health alarm counter/enable ; high bit = enable, others = timer to cycle frequencies -wLowHealthAlarm:: ds 1 ; d083 +wLowHealthAlarm:: ds 1 -wFBTileCounter:: ; d084 +wFBTileCounter:: ; counts how many tiles of the current frame block have been drawn ds 1 -wMovingBGTilesCounter2:: ; d085 +wMovingBGTilesCounter2:: ds 1 -wSubAnimFrameDelay:: ; d086 +wSubAnimFrameDelay:: ; duration of each frame of the current subanimation in terms of screen refreshes ds 1 -wSubAnimCounter:: ; d087 +wSubAnimCounter:: ; counts the number of subentries left in the current subanimation ds 1 -wSaveFileStatus:: ; d088 +wSaveFileStatus:: ; 1 = no save file or save file is corrupted ; 2 = save file exists and no corruption has been detected ds 1 -wNumFBTiles:: ; d089 +wNumFBTiles:: ; number of tiles in current battle animation frame block ds 1 -wFlashScreenLongCounter:: ; d08a +wFlashScreenLongCounter:: -wSpiralBallsBaseY:: ; d08a +wSpiralBallsBaseY:: -wFallingObjectMovementByte:: ; d08a +wFallingObjectMovementByte:: ; bits 0-6: index into FallingObjects_DeltaXs array (0 - 8) ; bit 7: direction; 0 = right, 1 = left -wNumShootingBalls:: ; d08a +wNumShootingBalls:: -wTradedMonMovingRight:: ; d08a +wTradedMonMovingRight:: ; $01 if mon is moving from left gameboy to right gameboy; $00 if vice versa -wOptionsInitialized:: ; d08a +wOptionsInitialized:: -wNewSlotMachineBallTile:: ; d08a +wNewSlotMachineBallTile:: -wCoordAdjustmentAmount:: ; d08a +wCoordAdjustmentAmount:: ; how much to add to the X/Y coord -wUnusedD08A:: ; d08a +wUnusedD08A:: ds 1 -wSpiralBallsBaseX:: ; d08b +wSpiralBallsBaseX:: -wNumFallingObjects:: ; d08b +wNumFallingObjects:: -wSlideMonDelay:: ; d08b +wSlideMonDelay:: -wAnimCounter:: ; d08b +wAnimCounter:: ; generic counter variable for various animations -wSubAnimTransform:: ; d08b +wSubAnimTransform:: ; controls what transformations are applied to the subanimation ; 01: flip horizontally and vertically ; 02: flip horizontally and translate downwards 40 pixels @@ -1885,52 +1821,52 @@ wSubAnimTransform:: ; d08b ; 04: reverse the subanimation ds 1 -wEndBattleWinTextPointer:: ; d08c +wEndBattleWinTextPointer:: ds 2 -wEndBattleLoseTextPointer:: ; d08e +wEndBattleLoseTextPointer:: ds 2 ds 2 -wEndBattleTextRomBank:: ; d092 +wEndBattleTextRomBank:: ds 1 ds 1 -wSubAnimAddrPtr:: ; d094 +wSubAnimAddrPtr:: ; the address _of the address_ of the current subanimation entry ds 2 -wSlotMachineAllowMatchesCounter:: ; d096 +wSlotMachineAllowMatchesCounter:: ; If non-zero, the allow matches flag is always set. ; There is a 1/256 (~0.4%) chance that this value will be set to 60, which is ; the only way it can increase. Winning certain payout amounts will decrement it ; or zero it. -wSubAnimSubEntryAddr:: ; d096 +wSubAnimSubEntryAddr:: ; the address of the current subentry of the current subanimation ds 2 ds 2 -wOutwardSpiralTileMapPointer:: ; d09a +wOutwardSpiralTileMapPointer:: ds 1 -wPartyMenuAnimMonEnabled:: ; d09b +wPartyMenuAnimMonEnabled:: -wTownMapSpriteBlinkingEnabled:: ; d09b +wTownMapSpriteBlinkingEnabled:: ; non-zero when enabled. causes nest locations to blink on and off. ; the town selection cursor will blink regardless of what this value is -wUnusedD09B:: ; d09b +wUnusedD09B:: ds 1 -wFBDestAddr:: ; d09c +wFBDestAddr:: ; current destination address in OAM for frame blocks (big endian) ds 2 -wFBMode:: ; d09e +wFBMode:: ; controls how the frame blocks are put together to form frames ; specifically, after finishing drawing the frame block, the frame block's mode determines what happens ; 00: clean OAM buffer and delay @@ -1939,173 +1875,173 @@ wFBMode:: ; d09e ; 04: delay, without cleaning OAM buffer, and do not advance [wFBDestAddr], so that the next frame block will overwrite this one ds 1 -wLinkCableAnimBulgeToggle:: ; d09f +wLinkCableAnimBulgeToggle:: ; 0 = small ; 1 = big -wIntroNidorinoBaseTile:: ; d09f +wIntroNidorinoBaseTile:: -wOutwardSpiralCurrentDirection:: ; d09f +wOutwardSpiralCurrentDirection:: -wDropletTile:: ; d09f +wDropletTile:: -wNewTileBlockID:: ; d09f +wNewTileBlockID:: -wWhichBattleAnimTileset:: ; d09f +wWhichBattleAnimTileset:: -wSquishMonCurrentDirection:: ; d09f +wSquishMonCurrentDirection:: ; 0 = left ; 1 = right -wSlideMonUpBottomRowLeftTile:: ; d09f +wSlideMonUpBottomRowLeftTile:: ; the tile ID of the leftmost tile in the bottom row in AnimationSlideMonUp_ ds 1 wDisableVBlankWYUpdate:: ds 1 ; if non-zero, don't update WY during V-blank -wSpriteCurPosX:: ; d0a1 +wSpriteCurPosX:: ds 1 -wSpriteCurPosY:: ; d0a2 +wSpriteCurPosY:: ds 1 -wSpriteWidth:: ; d0a3 +wSpriteWidth:: ds 1 -wSpriteHeight:: ; d0a4 +wSpriteHeight:: ds 1 -wSpriteInputCurByte:: ; d0a5 +wSpriteInputCurByte:: ; current input byte ds 1 -wSpriteInputBitCounter:: ; d0a6 +wSpriteInputBitCounter:: ; bit offset of last read input bit ds 1 -wSpriteOutputBitOffset:: ; d0a7; determines where in the output byte the two bits are placed. Each byte contains four columns (2bpp data) +wSpriteOutputBitOffset:: ; determines where in the output byte the two bits are placed. Each byte contains four columns (2bpp data) ; 3 -> XX000000 1st column ; 2 -> 00XX0000 2nd column ; 1 -> 0000XX00 3rd column ; 0 -> 000000XX 4th column ds 1 -wSpriteLoadFlags:: ; d0a8 -; bit 0 determines used buffer (0 -> $a188, 1 -> $a310) +wSpriteLoadFlags:: +; bit 0 determines used buffer (0 -> sSpriteBuffer1, 1 -> sSpriteBuffer2) ; bit 1 loading last sprite chunk? (there are at most 2 chunks per load operation) ds 1 -wSpriteUnpackMode:: ; d0a9 +wSpriteUnpackMode:: ds 1 -wSpriteFlipped:: ; d0aa +wSpriteFlipped:: ds 1 -wSpriteInputPtr:: ; d0ab +wSpriteInputPtr:: ; pointer to next input byte ds 2 -wSpriteOutputPtr:: ; d0ad +wSpriteOutputPtr:: ; pointer to current output byte ds 2 -wSpriteOutputPtrCached:: ; d0af +wSpriteOutputPtrCached:: ; used to revert pointer for different bit offsets ds 2 -wSpriteDecodeTable0Ptr:: ; d0b1 +wSpriteDecodeTable0Ptr:: ; pointer to differential decoding table (assuming initial value 0) ds 2 -wSpriteDecodeTable1Ptr:: ; d0b3 +wSpriteDecodeTable1Ptr:: ; pointer to differential decoding table (assuming initial value 1) ds 2 wd0b5:: ds 1 ; used as a temp storage area for Pokemon Species, and other Pokemon/Battle related things -wNameListType:: ; d0b6 +wNameListType:: ds 1 -wPredefBank:: ; d0b7 +wPredefBank:: ds 1 -wMonHeader:: ; d0b8 +wMonHeader:: -wMonHIndex:: ; d0b8 +wMonHIndex:: ; In the ROM base stats data structure, this is the dex number, but it is ; overwritten with the internal index number after the header is copied to WRAM. ds 1 -wMonHBaseStats:: ; d0b9 -wMonHBaseHP:: ; d0b9 +wMonHBaseStats:: +wMonHBaseHP:: ds 1 -wMonHBaseAttack:: ; d0ba +wMonHBaseAttack:: ds 1 -wMonHBaseDefense:: ; d0bb +wMonHBaseDefense:: ds 1 -wMonHBaseSpeed:: ; d0bc +wMonHBaseSpeed:: ds 1 -wMonHBaseSpecial:: ; d0bd +wMonHBaseSpecial:: ds 1 -wMonHTypes:: ; d0be -wMonHType1:: ; d0be +wMonHTypes:: +wMonHType1:: ds 1 -wMonHType2:: ; d0bf +wMonHType2:: ds 1 -wMonHCatchRate:: ; d0c0 +wMonHCatchRate:: ds 1 -wMonHBaseEXP:: ; d0c1 +wMonHBaseEXP:: ds 1 -wMonHSpriteDim:: ; d0c2 +wMonHSpriteDim:: ds 1 -wMonHFrontSprite:: ; d0c3 +wMonHFrontSprite:: ds 2 -wMonHBackSprite:: ; d0c5 +wMonHBackSprite:: ds 2 -wMonHMoves:: ; d0c7 +wMonHMoves:: ds NUM_MOVES -wMonHGrowthRate:: ; d0cb +wMonHGrowthRate:: ds 1 -wMonHLearnset:: ; d0cc +wMonHLearnset:: ; bit field - flag_array 50 + 5 + flag_array NUM_TMS + NUM_HMS ds 1 +wMonHeaderEnd:: -wSavedTilesetType:: ; d0d4 +wSavedTileAnimations:: ; saved at the start of a battle and then written back at the end of the battle ds 1 ds 2 - -wDamage:: ; d0d7 +wDamage:: ds 2 ds 2 -wRepelRemainingSteps:: ; d0db +wRepelRemainingSteps:: ds 1 -wMoves:: ; d0dc +wMoves:: ; list of moves for FormatMovesString ds 4 -wMoveNum:: ; d0e0 +wMoveNum:: ds 1 -wMovesString:: ; d0e1 +wMovesString:: ds 56 -wUnusedD119:: ; d119 +wUnusedD119:: ds 1 -wWalkBikeSurfStateCopy:: ; d11a +wWalkBikeSurfStateCopy:: ; wWalkBikeSurfState is sometimes copied here, but it doesn't seem to be used for anything ds 1 -wInitListType:: ; d11b +wInitListType:: ; the type of list for InitList to init ds 1 -wCapturedMonSpecies:: ; d11c +wCapturedMonSpecies:: ; 0 if no mon was captured ds 1 -wFirstMonsNotOutYet:: ; d11d +wFirstMonsNotOutYet:: ; Non-zero when the first player mon and enemy mon haven't been sent out yet. ; It prevents the game from asking if the player wants to choose another mon ; when the enemy sends out their first mon and suppresses the "no will to fight" @@ -2113,28 +2049,28 @@ wFirstMonsNotOutYet:: ; d11d ; which will be the first mon sent out. ds 1 -wPokeBallCaptureCalcTemp:: ; d11e +wPokeBallCaptureCalcTemp:: ; lower nybble: number of shakes ; upper nybble: number of animations to play -wPokeBallAnimData:: ; d11e +wPokeBallAnimData:: -wUsingPPUp:: ; d11e +wUsingPPUp:: -wMaxPP:: ; d11e +wMaxPP:: ; 0 for player, non-zero for enemy -wCalculateWhoseStats:: ; d11e +wCalculateWhoseStats:: -wTypeEffectiveness:: ; d11e +wTypeEffectiveness:: -wMoveType:: ; d11e +wMoveType:: -wNumSetBits:: ; d11e +wNumSetBits:: wd11e:: ds 1 ; used as a Pokemon and Item storage value. Also used as an output value for CountSetBits -wForcePlayerToChooseMon:: ; d11f +wForcePlayerToChooseMon:: ; When this value is non-zero, the player isn't allowed to exit the party menu ; by pressing B and not choosing a mon. ds 1 @@ -2143,26 +2079,26 @@ wNumRunAttempts:: ; number of times the player has tried to run from battle ds 1 -wEvolutionOccurred:: ; d121 +wEvolutionOccurred:: ds 1 -wVBlankSavedROMBank:: ; d122 +wVBlankSavedROMBank:: ds 1 ds 1 -wIsKeyItem:: ; d124 +wIsKeyItem:: ds 1 -wTextBoxID:: ; d125 +wTextBoxID:: ds 1 wCurrentMapScriptFlags:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value -wCurEnemyLVL:: ; d127 +wCurEnemyLVL:: ds 1 -wItemListPointer:: ; d128 +wItemListPointer:: ; pointer to list of items terminated by $FF ds 2 @@ -2170,20 +2106,20 @@ wListCount:: ; number of entries in a list ds 1 -wLinkState:: ; d12b +wLinkState:: ds 1 -wTwoOptionMenuID:: ; d12c +wTwoOptionMenuID:: ds 1 -wChosenMenuItem:: ; d12d +wChosenMenuItem:: ; the id of the menu item the player ultimately chose -wOutOfBattleBlackout:: ; d12d +wOutOfBattleBlackout:: ; non-zero when the whole party has fainted due to out-of-battle poison damage ds 1 -wMenuExitMethod:: ; d12e +wMenuExitMethod:: ; the way the user exited a menu ; for list menus and the buy/sell/quit menu: ; $01 = the user pressed A to choose a menu item @@ -2193,147 +2129,148 @@ wMenuExitMethod:: ; d12e ; $02 = the user pressed B or pressed A with the second menu item selected ds 1 -wDungeonWarpDataEntrySize:: ; d12f +wDungeonWarpDataEntrySize:: ; the size is always 6, so they didn't need a variable in RAM for this -wWhichPewterGuy:: ; d12f +wWhichPewterGuy:: ; 0 = museum guy ; 1 = gym guy -wWhichPrizeWindow:: ; d12f +wWhichPrizeWindow:: ; there are 3 windows, from 0 to 2 -wGymGateTileBlock:: ; d12f +wGymGateTileBlock:: ; a horizontal or vertical gate block ds 1 -wSavedSpriteScreenY:: ; d130 +wSavedSpriteScreenY:: ds 1 -wSavedSpriteScreenX:: ; d131 +wSavedSpriteScreenX:: ds 1 -wSavedSpriteMapY:: ; d132 +wSavedSpriteMapY:: ds 1 -wSavedSpriteMapX:: ; d133 +wSavedSpriteMapX:: ds 1 ds 5 -wWhichPrize:: ; d139 +wWhichPrize:: ds 1 -wIgnoreInputCounter:: ; d13a +wIgnoreInputCounter:: ; counts downward each frame ; when it hits 0, bit 5 (ignore input bit) of wd730 is reset ds 1 -wStepCounter:: ; d13b +wStepCounter:: ; counts down once every step ds 1 -wNumberOfNoRandomBattleStepsLeft:: ; d13c +wNumberOfNoRandomBattleStepsLeft:: ; after a battle, you have at least 3 steps before a random battle can occur ds 1 -wPrize1:: ; d13d +wPrize1:: ds 1 -wPrize2:: ; d13e +wPrize2:: ds 1 -wPrize3:: ; d13f +wPrize3:: ds 1 ds 1 -wSerialRandomNumberListBlock:: ; d141 +wSerialRandomNumberListBlock:: ; the first 7 bytes are the preamble -wPrize1Price:: ; d141 +wPrize1Price:: ds 2 -wPrize2Price:: ; d143 +wPrize2Price:: ds 2 -wPrize3Price:: ; d145 +wPrize3Price:: ds 2 ds 1 -wLinkBattleRandomNumberList:: ; d148 +wLinkBattleRandomNumberList:: ; shared list of 9 random numbers, indexed by wLinkBattleRandomNumberListIndex ds 10 -wSerialPlayerDataBlock:: ; d152 +wSerialPlayerDataBlock:: ; the first 6 bytes are the preamble -wPseudoItemID:: ; d152 +wPseudoItemID:: ; When a real item is being used, this is 0. ; When a move is acting as an item, this is the ID of the item it's acting as. ; For example, out-of-battle Dig is executed using a fake Escape Rope item. In ; that case, this would be ESCAPE_ROPE. ds 1 -wUnusedD153:: ; d153 +wUnusedD153:: ds 1 ds 2 -wEvoStoneItemID:: ; d156 +wEvoStoneItemID:: ds 1 -wSavedNPCMovementDirections2Index:: ; d157 +wSavedNPCMovementDirections2Index:: ds 1 -wPlayerName:: ; d158 +wPlayerName:: ds NAME_LENGTH wPartyDataStart:: -wPartyCount:: ds 1 ; d163 -wPartySpecies:: ds PARTY_LENGTH ; d164 -wPartyEnd:: ds 1 ; d16a +wPartyCount:: ds 1 +wPartySpecies:: ds PARTY_LENGTH +wPartyEnd:: ds 1 wPartyMons:: -wPartyMon1:: party_struct wPartyMon1 ; d16b -wPartyMon2:: party_struct wPartyMon2 ; d197 -wPartyMon3:: party_struct wPartyMon3 ; d1c3 -wPartyMon4:: party_struct wPartyMon4 ; d1ef -wPartyMon5:: party_struct wPartyMon5 ; d21b -wPartyMon6:: party_struct wPartyMon6 ; d247 +wPartyMon1:: party_struct wPartyMon1 +wPartyMon2:: party_struct wPartyMon2 +wPartyMon3:: party_struct wPartyMon3 +wPartyMon4:: party_struct wPartyMon4 +wPartyMon5:: party_struct wPartyMon5 +wPartyMon6:: party_struct wPartyMon6 -wPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d273 -wPartyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d2b5 +wPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH +wPartyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH +wPartyMonNicksEnd:: wPartyDataEnd:: wMainDataStart:: -wPokedexOwned:: ; d2f7 +wPokedexOwned:: flag_array NUM_POKEMON wPokedexOwnedEnd:: -wPokedexSeen:: ; d30a +wPokedexSeen:: flag_array NUM_POKEMON wPokedexSeenEnd:: -wNumBagItems:: ; d31d +wNumBagItems:: ds 1 -wBagItems:: ; d31e +wBagItems:: ; item, quantity ds BAG_ITEM_CAPACITY * 2 ds 1 ; end -wPlayerMoney:: ; d347 +wPlayerMoney:: ds 3 ; BCD -wRivalName:: ; d34a +wRivalName:: ds NAME_LENGTH -wOptions:: ; d355 +wOptions:: ; bit 7 = battle animation ; 0: On ; 1: Off @@ -2346,539 +2283,540 @@ wOptions:: ; d355 ; 5: Slow ds 1 -wObtainedBadges:: ; d356 +wObtainedBadges:: flag_array 8 ds 1 -wLetterPrintingDelayFlags:: ; d358 +wLetterPrintingDelayFlags:: ; bit 0: If 0, limit the delay to 1 frame. Note that this has no effect if ; the delay has been disabled entirely through bit 1 of this variable ; or bit 6 of wd730. ; bit 1: If 0, no delay. ds 1 -wPlayerID:: ; d359 +wPlayerID:: ds 2 -wMapMusicSoundID:: ; d35b +wMapMusicSoundID:: ds 1 -wMapMusicROMBank:: ; d35c +wMapMusicROMBank:: ds 1 -wMapPalOffset:: ; d35d +wMapPalOffset:: ; offset subtracted from FadePal4 to get the background and object palettes for the current map ; normally, it is 0. it is 6 when Flash is needed, causing FadePal2 to be used instead of FadePal4 ds 1 -wCurMap:: ; d35e +wCurMap:: ds 1 -wCurrentTileBlockMapViewPointer:: ; d35f +wCurrentTileBlockMapViewPointer:: ; pointer to the upper left corner of the current view in the tile block map ds 2 -wYCoord:: ; d361 -; player’s position on the current map +wYCoord:: +; player's position on the current map ds 1 -wXCoord:: ; d362 +wXCoord:: ds 1 -wYBlockCoord:: ; d363 +wYBlockCoord:: ; player's y position (by block) ds 1 -wXBlockCoord:: ; d364 +wXBlockCoord:: ds 1 -wLastMap:: ; d365 +wLastMap:: ds 1 -wUnusedD366:: ; d366 +wUnusedD366:: ds 1 -wCurMapTileset:: ; d367 +wCurMapTileset:: ds 1 -wCurMapHeight:: ; d368 +wCurMapHeight:: ; blocks ds 1 -wCurMapWidth:: ; d369 +wCurMapWidth:: ; blocks ds 1 -wMapDataPtr:: ; d36a +wMapDataPtr:: ds 2 -wMapTextPtr:: ; d36c +wMapTextPtr:: ds 2 -wMapScriptPtr:: ; d36e +wMapScriptPtr:: ds 2 -wMapConnections:: ; d370 +wMapConnections:: ; connection byte ds 1 -wMapConn1Ptr:: ; d371 +wMapConn1Ptr:: ds 1 -wNorthConnectionStripSrc:: ; d372 +wNorthConnectionStripSrc:: ds 2 -wNorthConnectionStripDest:: ; d374 +wNorthConnectionStripDest:: ds 2 -wNorthConnectionStripWidth:: ; d376 +wNorthConnectionStripWidth:: ds 1 -wNorthConnectedMapWidth:: ; d377 +wNorthConnectedMapWidth:: ds 1 -wNorthConnectedMapYAlignment:: ; d378 +wNorthConnectedMapYAlignment:: ds 1 -wNorthConnectedMapXAlignment:: ; d379 +wNorthConnectedMapXAlignment:: ds 1 -wNorthConnectedMapViewPointer:: ; d37a +wNorthConnectedMapViewPointer:: ds 2 -wMapConn2Ptr:: ; d37c +wMapConn2Ptr:: ds 1 -wSouthConnectionStripSrc:: ; d37d +wSouthConnectionStripSrc:: ds 2 -wSouthConnectionStripDest:: ; d37f: +wSouthConnectionStripDest:: ds 2 -wSouthConnectionStripWidth:: ; d381 +wSouthConnectionStripWidth:: ds 1 -wSouthConnectedMapWidth:: ; d382 +wSouthConnectedMapWidth:: ds 1 -wSouthConnectedMapYAlignment:: ; d383 +wSouthConnectedMapYAlignment:: ds 1 -wSouthConnectedMapXAlignment:: ; d384 +wSouthConnectedMapXAlignment:: ds 1 -wSouthConnectedMapViewPointer:: ; d385 +wSouthConnectedMapViewPointer:: ds 2 -wMapConn3Ptr:: ; d387 +wMapConn3Ptr:: ds 1 -wWestConnectionStripSrc:: ; d388 +wWestConnectionStripSrc:: ds 2 -wWestConnectionStripDest:: ; d38a +wWestConnectionStripDest:: ds 2 -wWestConnectionStripHeight:: ; d38c +wWestConnectionStripHeight:: ds 1 -wWestConnectedMapWidth:: ; d38d +wWestConnectedMapWidth:: ds 1 -wWestConnectedMapYAlignment:: ; d38e +wWestConnectedMapYAlignment:: ds 1 -wWestConnectedMapXAlignment:: ; d38f +wWestConnectedMapXAlignment:: ds 1 -wWestConnectedMapViewPointer:: ; d390 +wWestConnectedMapViewPointer:: ds 2 -wMapConn4Ptr:: ; d392 +wMapConn4Ptr:: ds 1 -wEastConnectionStripSrc:: ; d393 +wEastConnectionStripSrc:: ds 2 -wEastConnectionStripDest:: ; d395 +wEastConnectionStripDest:: ds 2 -wEastConnectionStripHeight:: ; d397 +wEastConnectionStripHeight:: ds 1 -wEastConnectedMapWidth:: ; d398 +wEastConnectedMapWidth:: ds 1 -wEastConnectedMapYAlignment:: ; d399 +wEastConnectedMapYAlignment:: ds 1 -wEastConnectedMapXAlignment:: ; d39a +wEastConnectedMapXAlignment:: ds 1 -wEastConnectedMapViewPointer:: ; d39b +wEastConnectedMapViewPointer:: ds 2 -wSpriteSet:: ; d39d +wSpriteSet:: ; sprite set for the current map (11 sprite picture ID's) ds 11 -wSpriteSetID:: ; d3a8 +wSpriteSetID:: ; sprite set ID for the current map ds 1 -wObjectDataPointerTemp:: ; d3a9 +wObjectDataPointerTemp:: ds 2 ds 2 -wMapBackgroundTile:: ; d3ad +wMapBackgroundTile:: ; the tile shown outside the boundaries of the map ds 1 -wNumberOfWarps:: ; d3ae +wNumberOfWarps:: ; number of warps in current map ds 1 -wWarpEntries:: ; d3af +wWarpEntries:: ; current map warp entries ds 128 -wDestinationWarpID:: ; d42f +wDestinationWarpID:: ; if $ff, the player's coordinates are not updated when entering the map ds 1 ds 128 -wNumSigns:: ; d4b0 +wNumSigns:: ; number of signs in the current map (up to 16) ds 1 -wSignCoords:: ; d4b1 +wSignCoords:: ; 2 bytes each ; Y, X ds 32 -wSignTextIDs:: ; d4d1 +wSignTextIDs:: ds 16 -wNumSprites:: ; d4e1 +wNumSprites:: ; number of sprites on the current map ds 1 ; these two variables track the X and Y offset in blocks from the last special warp used ; they don't seem to be used for anything -wYOffsetSinceLastSpecialWarp:: ; d4e2 +wYOffsetSinceLastSpecialWarp:: ds 1 -wXOffsetSinceLastSpecialWarp:: ; d4e3 +wXOffsetSinceLastSpecialWarp:: ds 1 -wMapSpriteData:: ; d4e4 +wMapSpriteData:: ; two bytes per sprite (movement byte 2, text ID) ds 32 -wMapSpriteExtraData:: ; d504 +wMapSpriteExtraData:: ; two bytes per sprite (trainer class/item ID, trainer set ID) ds 32 -wCurrentMapHeight2:: ; d524 +wCurrentMapHeight2:: ; map height in 2x2 meta-tiles ds 1 -wCurrentMapWidth2:: ; d525 +wCurrentMapWidth2:: ; map width in 2x2 meta-tiles ds 1 -wMapViewVRAMPointer:: ; d526 +wMapViewVRAMPointer:: ; the address of the upper left corner of the visible portion of the BG tile map in VRAM ds 2 ; In the comments for the player direction variables below, "moving" refers to ; both walking and changing facing direction without taking a step. -wPlayerMovingDirection:: ; d528 +wPlayerMovingDirection:: ; if the player is moving, the current direction ; if the player is not moving, zero ; map scripts write to this in order to change the player's facing direction ds 1 -wPlayerLastStopDirection:: ; d529 +wPlayerLastStopDirection:: ; the direction in which the player was moving before the player last stopped ds 1 -wPlayerDirection:: ; d52a +wPlayerDirection:: ; if the player is moving, the current direction ; if the player is not moving, the last the direction in which the player moved ds 1 -wTilesetBank:: ; d52b +wTilesetBank:: ds 1 -wTilesetBlocksPtr:: ; d52c +wTilesetBlocksPtr:: ; maps blocks (4x4 tiles) to tiles ds 2 -wTilesetGfxPtr:: ; d52e +wTilesetGfxPtr:: ds 2 -wTilesetCollisionPtr:: ; d530 +wTilesetCollisionPtr:: ; list of all walkable tiles ds 2 -wTilesetTalkingOverTiles:: ; d532 +wTilesetTalkingOverTiles:: ds 3 -wGrassTile:: ; d535 +wGrassTile:: ds 1 ds 4 -wNumBoxItems:: ; d53a +wNumBoxItems:: ds 1 -wBoxItems:: ; d53b +wBoxItems:: ; item, quantity ds PC_ITEM_CAPACITY * 2 ds 1 ; end -wCurrentBoxNum:: ; d5a0 +wCurrentBoxNum:: ; bits 0-6: box number ; bit 7: whether the player has changed boxes before ds 2 -wNumHoFTeams:: ; d5a2 +wNumHoFTeams:: ; number of HOF teams ds 1 -wUnusedD5A3:: ; d5a3 +wUnusedD5A3:: ds 1 -wPlayerCoins:: ; d5a4 +wPlayerCoins:: ds 2 ; BCD -wMissableObjectFlags:: ; d5a6 +wMissableObjectFlags:: ; bit array of missable objects. set = removed ds 32 wMissableObjectFlagsEnd:: ds 7 -wd5cd:: ds 1 ; temp copy of c1x2 (sprite facing/anim) +wd5cd:: ds 1 ; temp copy of SPRITESTATEDATA1_IMAGEINDEX (used for sprite facing/anim) -wMissableObjectList:: ; d5ce +wMissableObjectList:: ; each entry consists of 2 bytes ; * the sprite ID (depending on the current map) ; * the missable object index (global, used for wMissableObjectFlags) ; terminated with $FF ds 17 * 2 -wGameProgressFlags:: ; d5f0 +wGameProgressFlags:: ; $c8 bytes -wOaksLabCurScript:: ; d5f0 +wOaksLabCurScript:: ds 1 -wPalletTownCurScript:: ; d5f1 +wPalletTownCurScript:: ds 1 ds 1 -wBluesHouseCurScript:: ; d5f3 +wBluesHouseCurScript:: ds 1 -wViridianCityCurScript:: ; d5f4 +wViridianCityCurScript:: ds 1 ds 2 -wPewterCityCurScript:: ; d5f7 +wPewterCityCurScript:: ds 1 -wRoute3CurScript:: ; d5f8 +wRoute3CurScript:: ds 1 -wRoute4CurScript:: ; d5f9 +wRoute4CurScript:: ds 1 ds 1 -wViridianGymCurScript:: ; d5fb +wViridianGymCurScript:: ds 1 -wPewterGymCurScript:: ; d5fc +wPewterGymCurScript:: ds 1 -wCeruleanGymCurScript:: ; d5fd +wCeruleanGymCurScript:: ds 1 -wVermilionGymCurScript:: ; d5fe +wVermilionGymCurScript:: ds 1 -wCeladonGymCurScript:: ; d5ff +wCeladonGymCurScript:: ds 1 -wRoute6CurScript:: ; d600 +wRoute6CurScript:: ds 1 -wRoute8CurScript:: ; d601 +wRoute8CurScript:: ds 1 -wRoute24CurScript:: ; d602 +wRoute24CurScript:: ds 1 -wRoute25CurScript:: ; d603 +wRoute25CurScript:: ds 1 -wRoute9CurScript:: ; d604 +wRoute9CurScript:: ds 1 -wRoute10CurScript:: ; d605 +wRoute10CurScript:: ds 1 -wMtMoon1FCurScript:: ; d606 +wMtMoon1FCurScript:: ds 1 -wMtMoonB2FCurScript:: ; d607 +wMtMoonB2FCurScript:: ds 1 -wSSAnne1FRoomsCurScript:: ; d608 +wSSAnne1FRoomsCurScript:: ds 1 -wSSAnne2FRoomsCurScript:: ; d609 +wSSAnne2FRoomsCurScript:: ds 1 -wRoute22CurScript:: ; d60a +wRoute22CurScript:: ds 1 ds 1 -wRedsHouse2FCurScript:: ; d60c +wRedsHouse2FCurScript:: ds 1 -wViridianMartCurScript:: ; d60d +wViridianMartCurScript:: ds 1 -wRoute22GateCurScript:: ; d60e +wRoute22GateCurScript:: ds 1 -wCeruleanCityCurScript:: ; d60f +wCeruleanCityCurScript:: ds 1 ds 7 -wSSAnneBowCurScript:: ; d617 +wSSAnneBowCurScript:: ds 1 -wViridianForestCurScript:: ; d618 +wViridianForestCurScript:: ds 1 -wMuseum1FCurScript:: ; d619 +wMuseum1FCurScript:: ds 1 -wRoute13CurScript:: ; d61a +wRoute13CurScript:: ds 1 -wRoute14CurScript:: ; d61b +wRoute14CurScript:: ds 1 -wRoute17CurScript:: ; d61c +wRoute17CurScript:: ds 1 -wRoute19CurScript:: ; d61d +wRoute19CurScript:: ds 1 -wRoute21CurScript:: ; d61e +wRoute21CurScript:: ds 1 -wSafariZoneGateCurScript:: ; d61f +wSafariZoneGateCurScript:: ds 1 -wRockTunnelB1FCurScript:: ; d620 +wRockTunnelB1FCurScript:: ds 1 -wRockTunnel1FCurScript:: ; d621 +wRockTunnel1FCurScript:: ds 1 ds 1 -wRoute11CurScript:: ; d623 +wRoute11CurScript:: ds 1 -wRoute12CurScript:: ; d624 +wRoute12CurScript:: ds 1 -wRoute15CurScript:: ; d625 +wRoute15CurScript:: ds 1 -wRoute16CurScript:: ; d626 +wRoute16CurScript:: ds 1 -wRoute18CurScript:: ; d627 +wRoute18CurScript:: ds 1 -wRoute20CurScript:: ; d628 +wRoute20CurScript:: ds 1 -wSSAnneB1FRoomsCurScript:: ; d629 +wSSAnneB1FRoomsCurScript:: ds 1 -wVermilionCityCurScript:: ; d62a +wVermilionCityCurScript:: ds 1 -wPokemonTower2FCurScript:: ; d62b +wPokemonTower2FCurScript:: ds 1 -wPokemonTower3FCurScript:: ; d62c +wPokemonTower3FCurScript:: ds 1 -wPokemonTower4FCurScript:: ; d62d +wPokemonTower4FCurScript:: ds 1 -wPokemonTower5FCurScript:: ; d62e +wPokemonTower5FCurScript:: ds 1 -wPokemonTower6FCurScript:: ; d62f +wPokemonTower6FCurScript:: ds 1 -wPokemonTower7FCurScript:: ; d630 +wPokemonTower7FCurScript:: ds 1 -wRocketHideoutB1FCurScript:: ; d631 +wRocketHideoutB1FCurScript:: ds 1 -wRocketHideoutB2FCurScript:: ; d632 +wRocketHideoutB2FCurScript:: ds 1 -wRocketHideoutB3FCurScript:: ; d633 +wRocketHideoutB3FCurScript:: ds 1 -wRocketHideoutB4FCurScript:: ; d634 +wRocketHideoutB4FCurScript:: ds 2 -wRoute6GateCurScript:: ; d636 +wRoute6GateCurScript:: ds 1 -wRoute8GateCurScript:: ; d637 +wRoute8GateCurScript:: ds 2 -wCinnabarIslandCurScript:: ; d639 +wCinnabarIslandCurScript:: ds 1 -wPokemonMansion1FCurScript:: ; d63a +wPokemonMansion1FCurScript:: ds 2 -wPokemonMansion2FCurScript:: ; d63c +wPokemonMansion2FCurScript:: ds 1 -wPokemonMansion3FCurScript:: ; d63d +wPokemonMansion3FCurScript:: ds 1 -wPokemonMansionB1FCurScript:: ; d63e +wPokemonMansionB1FCurScript:: ds 1 -wVictoryRoad2FCurScript:: ; d63f +wVictoryRoad2FCurScript:: ds 1 -wVictoryRoad3FCurScript:: ; d640 - ds 2 -wFightingDojoCurScript:: ; d642 - ds 1 -wSilphCo2FCurScript:: ; d643 - ds 1 -wSilphCo3FCurScript:: ; d644 - ds 1 -wSilphCo4FCurScript:: ; d645 - ds 1 -wSilphCo5FCurScript:: ; d646 - ds 1 -wSilphCo6FCurScript:: ; d647 - ds 1 -wSilphCo7FCurScript:: ; d648 - ds 1 -wSilphCo8FCurScript:: ; d649 - ds 1 -wSilphCo9FCurScript:: ; d64a - ds 1 -wHallOfFameCurScript:: ; d64b - ds 1 -wChampionsRoomCurScript:: ; d64c - ds 1 -wLoreleisRoomCurScript:: ; d64d - ds 1 -wBrunosRoomCurScript:: ; d64e - ds 1 -wAgathasRoomCurScript:: ; d64f - ds 1 -wCeruleanCaveB1FCurScript:: ; d650 - ds 1 -wVictoryRoad1FCurScript:: ; d651 +wVictoryRoad3FCurScript:: ds 1 ds 1 -wLancesRoomCurScript:: ; d653 +wFightingDojoCurScript:: + ds 1 +wSilphCo2FCurScript:: + ds 1 +wSilphCo3FCurScript:: + ds 1 +wSilphCo4FCurScript:: + ds 1 +wSilphCo5FCurScript:: + ds 1 +wSilphCo6FCurScript:: + ds 1 +wSilphCo7FCurScript:: + ds 1 +wSilphCo8FCurScript:: + ds 1 +wSilphCo9FCurScript:: + ds 1 +wHallOfFameCurScript:: + ds 1 +wChampionsRoomCurScript:: + ds 1 +wLoreleisRoomCurScript:: + ds 1 +wBrunosRoomCurScript:: + ds 1 +wAgathasRoomCurScript:: + ds 1 +wCeruleanCaveB1FCurScript:: + ds 1 +wVictoryRoad1FCurScript:: + ds 1 + ds 1 +wLancesRoomCurScript:: ds 1 ds 4 -wSilphCo10FCurScript:: ; d658 +wSilphCo10FCurScript:: ds 1 -wSilphCo11FCurScript:: ; d659 +wSilphCo11FCurScript:: ds 1 ds 1 -wFuchsiaGymCurScript:: ; d65b +wFuchsiaGymCurScript:: ds 1 -wSaffronGymCurScript:: ; d65c +wSaffronGymCurScript:: ds 1 ds 1 -wCinnabarGymCurScript:: ; d65e +wCinnabarGymCurScript:: ds 1 -wGameCornerCurScript:: ; d65f +wGameCornerCurScript:: ds 1 -wRoute16Gate1FCurScript:: ; d660 +wRoute16Gate1FCurScript:: ds 1 -wBillsHouseCurScript:: ; d661 +wBillsHouseCurScript:: ds 1 -wRoute5GateCurScript:: ; d662 +wRoute5GateCurScript:: ds 1 -wPowerPlantCurScript:: ; d663 -wRoute7GateCurScript:: ; d663 +wPowerPlantCurScript:: +wRoute7GateCurScript:: ; overload ds 1 ds 1 -wSSAnne2FCurScript:: ; d665 +wSSAnne2FCurScript:: ds 1 -wSeafoamIslandsB3FCurScript:: ; d666 +wSeafoamIslandsB3FCurScript:: ds 1 -wRoute23CurScript:: ; d667 +wRoute23CurScript:: ds 1 -wSeafoamIslandsB4FCurScript:: ; d668 +wSeafoamIslandsB4FCurScript:: ds 1 -wRoute18Gate1FCurScript:: ; d669 +wRoute18Gate1FCurScript:: ds 1 ds 78 @@ -2892,7 +2830,7 @@ wObtainedHiddenItemsFlags:: wObtainedHiddenCoinsFlags:: ds 2 -wWalkBikeSurfState:: ; d700 +wWalkBikeSurfState:: ; $00 = walking ; $01 = biking ; $02 = surfing @@ -2900,71 +2838,71 @@ wWalkBikeSurfState:: ; d700 ds 10 -wTownVisitedFlag:: ; d70b - flag_array 13 +wTownVisitedFlag:: + flag_array NUM_CITY_MAPS -wSafariSteps:: ; d70d +wSafariSteps:: ; starts at 502 ds 2 -wFossilItem:: ; d70f +wFossilItem:: ; item given to cinnabar lab ds 1 -wFossilMon:: ; d710 +wFossilMon:: ; mon that will result from the item ds 1 ds 2 -wEnemyMonOrTrainerClass:: ; d713 -; trainer classes start at 200 +wEnemyMonOrTrainerClass:: +; trainer classes start at OPP_ID_OFFSET ds 1 -wPlayerJumpingYScreenCoordsIndex:: ; d714 +wPlayerJumpingYScreenCoordsIndex:: ds 1 -wRivalStarter:: ; d715 +wRivalStarter:: ds 1 ds 1 -wPlayerStarter:: ; d717 +wPlayerStarter:: ds 1 -wBoulderSpriteIndex:: ; d718 +wBoulderSpriteIndex:: ; sprite index of the boulder the player is trying to push ds 1 -wLastBlackoutMap:: ; d719 +wLastBlackoutMap:: ds 1 -wDestinationMap:: ; d71a +wDestinationMap:: ; destination map (for certain types of special warps, not ordinary walking) ds 1 -wUnusedD71B:: ; d71b +wUnusedD71B:: ds 1 -wTileInFrontOfBoulderAndBoulderCollisionResult:: ; d71c +wTileInFrontOfBoulderAndBoulderCollisionResult:: ; used to store the tile in front of the boulder when trying to push a boulder ; also used to store the result of the collision check ($ff for a collision and $00 for no collision) ds 1 -wDungeonWarpDestinationMap:: ; d71d +wDungeonWarpDestinationMap:: ; destination map for dungeon warps ds 1 -wWhichDungeonWarp:: ; d71e +wWhichDungeonWarp:: ; which dungeon warp within the source map was used ds 1 -wUnusedD71F:: ; d71f +wUnusedD71F:: ds 1 ds 8 -wd728:: ; d728 +wd728:: ; bit 0: using Strength outside of battle ; bit 1: set by IsSurfingAllowed when surfing's allowed, but the caller resets it after checking the result ; bit 3: received Old Rod @@ -2976,19 +2914,19 @@ wd728:: ; d728 ds 1 -wBeatGymFlags:: ; d72a +wBeatGymFlags:: ; redundant because it matches wObtainedBadges ; used to determine whether to show name on statue and in two NPC text scripts ds 1 ds 1 -wd72c:: ; d72c +wd72c:: ; bit 0: if not set, the 3 minimum steps between random battles have passed ; bit 1: prevent audio fade out ds 1 -wd72d:: ; d72d +wd72d:: ; This variable is used for temporary flags and as the destination map when ; warping to the Trade Center or Colosseum. ; bit 0: sprite facing directions have been initialised in the Trade Center @@ -3001,7 +2939,7 @@ wd72d:: ; d72d ; battles anyway). ds 1 -wd72e:: ; d72e +wd72e:: ; bit 0: the player has received Lapras in the Silph Co. building ; bit 1: set in various places, but doesn't appear to have an effect ; bit 2: the player has healed pokemon at a pokemon center at least once @@ -3014,7 +2952,7 @@ wd72e:: ; d72e ds 1 -wd730:: ; d730 +wd730:: ; bit 0: NPC sprite being moved by script ; bit 5: ignore joypad input ; bit 6: print text with no delay between each letter @@ -3023,13 +2961,19 @@ wd730:: ; d730 ds 1 -wd732:: ; d732 +wd732:: ; bit 0: play time being counted -; bit 1: remnant of debug mode? not set by the game code. -; if it is set +; bit 1: remnant of debug mode; only set by the debug build. +; if it is set: ; 1. skips most of Prof. Oak's speech, and uses NINTEN as the player's name and SONY as the rival's name ; 2. does not have the player start in floor two of the player's house (instead sending them to [wLastMap]) ; 3. allows wild battles to be avoided by holding down B +; furthermore, in the debug build: +; 4. allows trainers to be avoided by holding down B +; 5. skips Safari Zone step counter by holding down B +; 6. skips the NPC who blocks Route 3 before beating Brock by holding down B +; 7. skips Cerulean City rival battle by holding down B +; 8. skips Pokémon Tower rival battle by holding down B ; bit 2: the target warp is a fly warp (bit 3 set or blacked out) or a dungeon warp (bit 4 set) ; bit 3: used warp pad, escape rope, dig, teleport, or fly, so the target warp is a "fly warp" ; bit 4: jumped into hole (Pokemon Mansion, Seafoam Islands, Victory Road) or went down waterfall (Seafoam Islands), so the target warp is a "dungeon warp" @@ -3037,7 +2981,7 @@ wd732:: ; d732 ; bit 6: map destination is [wLastBlackoutMap] (usually the last used pokemon center, but could be the player's house) ds 1 -wFlags_D733:: ; d733 +wFlags_D733:: ; bit 0: running a test battle ; bit 1: prevent music from changing when entering new map ; bit 2: skip the joypad check in CheckWarpsNoCollision (used for the forced warp down the waterfall in the Seafoam Islands) @@ -3046,12 +2990,14 @@ wFlags_D733:: ; d733 ; bit 7: used fly out of battle ds 1 -wBeatLorelei:: ; d734 +wBeatLorelei:: ; bit 1: set when you beat Lorelei and reset in Indigo Plateau lobby ; the game uses this to tell when Elite 4 events need to be reset - ds 2 + ds 1 -wd736:: ; d736 + ds 1 + +wd736:: ; bit 0: check if the player is standing on a door and make him walk down a step if so ; bit 1: the player is currently stepping down from a door ; bit 2: standing on a warp @@ -3059,63 +3005,66 @@ wd736:: ; d736 ; bit 7: player sprite spinning due to spin tiles (Rocket hideout / Viridian Gym) ds 1 -wCompletedInGameTradeFlags:: ; d737 +wCompletedInGameTradeFlags:: ds 2 ds 2 -wWarpedFromWhichWarp:: ; d73b +wWarpedFromWhichWarp:: ds 1 -wWarpedFromWhichMap:: ; d73c +wWarpedFromWhichMap:: ds 1 ds 2 -wCardKeyDoorY:: ; d73f +wCardKeyDoorY:: ds 1 -wCardKeyDoorX:: ; d740 +wCardKeyDoorX:: ds 1 ds 2 -wFirstLockTrashCanIndex:: ; d743 +wFirstLockTrashCanIndex:: ds 1 -wSecondLockTrashCanIndex:: ; d743 +wSecondLockTrashCanIndex:: ds 1 ds 2 -wEventFlags:: ; d747 - ds 320 -wLinkEnemyTrainerName:: ; d887 -; linked game's trainer name +wEventFlags:: + flag_array NUM_EVENTS -wGrassRate:: ; d887 - ds 1 -wGrassMons:: ; d888 - ;ds 20 - - ds 11 -; Overload wGrassMons -wSerialEnemyDataBlock:: ; d893 - ds 9 - -wEnemyPartyCount:: ds 1 ; d89c -wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d - -; Overload enemy party data UNION +wGrassRate:: db +wGrassMons:: + ds 10 * 2 -wWaterRate:: db ; d8a4 -wWaterMons:: db ; d8a5 + ds 8 + +wWaterRate:: db +wWaterMons:: + ds 10 * 2 NEXTU +wLinkEnemyTrainerName:: +; linked game's trainer name + ds NAME_LENGTH -wEnemyMons:: ; d8a4 + ds 1 + +wSerialEnemyDataBlock:: +; ds $1a8 + + ds 9 + +wEnemyPartyCount:: ds 1 +wEnemyPartyMons:: ds PARTY_LENGTH + 1 + +wEnemyMons:: wEnemyMon1:: party_struct wEnemyMon1 wEnemyMon2:: party_struct wEnemyMon2 wEnemyMon3:: party_struct wEnemyMon3 @@ -3123,123 +3072,124 @@ wEnemyMon4:: party_struct wEnemyMon4 wEnemyMon5:: party_struct wEnemyMon5 wEnemyMon6:: party_struct wEnemyMon6 -wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac -wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee +wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH +wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ENDU -wTrainerHeaderPtr:: ; da30 +wTrainerHeaderPtr:: ds 2 ds 6 -wOpponentAfterWrongAnswer:: ; da38 +wOpponentAfterWrongAnswer:: ; the trainer the player must face after getting a wrong answer in the Cinnabar ; gym quiz -wUnusedDA38:: ; da38 +wUnusedDA38:: ds 1 -wCurMapScript:: ; da39 +wCurMapScript:: ; index of current map script, mostly used as index for function pointer array ; mostly copied from map-specific map script pointer and written back later ds 1 ds 7 -wPlayTimeHours:: ; da41 +wPlayTimeHours:: ds 1 -wPlayTimeMaxed:: ; da42 +wPlayTimeMaxed:: ds 1 -wPlayTimeMinutes:: ; da43 +wPlayTimeMinutes:: ds 1 -wPlayTimeSeconds:: ; da44 +wPlayTimeSeconds:: ds 1 -wPlayTimeFrames:: ; da45 +wPlayTimeFrames:: ds 1 -wSafariZoneGameOver:: ; da46 +wSafariZoneGameOver:: ds 1 -wNumSafariBalls:: ; da47 +wNumSafariBalls:: ds 1 -wDayCareInUse:: ; da48 +wDayCareInUse:: ; 0 if no pokemon is in the daycare ; 1 if pokemon is in the daycare ds 1 -wDayCareMonName:: ds NAME_LENGTH ; da49 -wDayCareMonOT:: ds NAME_LENGTH ; da54 +wDayCareMonName:: ds NAME_LENGTH +wDayCareMonOT:: ds NAME_LENGTH -wDayCareMon:: box_struct wDayCareMon ; da5f +wDayCareMon:: box_struct wDayCareMon wMainDataEnd:: wBoxDataStart:: -wNumInBox:: ds 1 ; da80 +wNumInBox:: ds 1 wBoxSpecies:: ds MONS_PER_BOX + 1 wBoxMons:: -wBoxMon1:: box_struct wBoxMon1 ; da96 -wBoxMon2:: ds box_struct_length * (MONS_PER_BOX + -1) ; dab7 +wBoxMon1:: box_struct wBoxMon1 +wBoxMon2:: ds BOX_STRUCT_LENGTH * (MONS_PER_BOX - 1) -wBoxMonOT:: ds NAME_LENGTH * MONS_PER_BOX ; dd2a -wBoxMonNicks:: ds NAME_LENGTH * MONS_PER_BOX ; de06 -wBoxMonNicksEnd:: ; dee2 +wBoxMonOT:: ds NAME_LENGTH * MONS_PER_BOX +wBoxMonNicks:: ds NAME_LENGTH * MONS_PER_BOX +wBoxMonNicksEnd:: wBoxDataEnd:: -; dee2 SECTION "Stack", WRAM0 -wStack:: ; dfff + +wStack:: INCLUDE "sram.asm" +INCLUDE "hram.asm" + SECTION "crysaudio", SRAM, BANK[0] channel_struct: MACRO -; Addreses are wChannel1 (c101). \1MusicID:: dw \1MusicBank:: db -\1Flags1:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest -\1Flags2:: db ; 0:vibrato on/off 2:duty 4:cry pitch -\1Flags3:: db ; 0:vibrato up/down +\1Flags1:: db ; 0:on/off 1:subroutine 2:looping 3:sfx 4:noise 5:rest +\1Flags2:: db ; 0:vibrato on/off 1:pitch slide 2:duty cycle pattern 4:pitch offset +\1Flags3:: db ; 0:vibrato up/down 1:pitch slide direction \1MusicAddress:: dw \1LastMusicAddress:: dw dw \1NoteFlags:: db ; 5:rest \1Condition:: db ; conditional jumps \1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) -\1Intensity:: db ; hi:pressure lo:velocity +\1VolumeEnvelope:: db ; hi:volume lo:fade \1Frequency:: dw ; 11 bits \1Pitch:: db ; 0:rest 1-c:note \1Octave:: db ; 7-0 (0 is highest) -\1PitchOffset:: db ; raises existing octaves (to repeat phrases) +\1Transposition:: db ; raises existing octaves (to repeat phrases) \1NoteDuration:: db ; frames remaining for the current note \1Field16:: ds 1 ds 1 \1LoopCount:: db \1Tempo:: dw \1Tracks:: db ; hi:left lo:right -\1SFXDutyLoop:: db +\1DutyCyclePattern:: db \1VibratoDelayCount:: db ; initialized by \1VibratoDelay \1VibratoDelay:: db ; number of frames a note plays until vibrato starts \1VibratoExtent:: db \1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt -\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel -\1PitchWheelAmount:: db -\1PitchWheelAmountFraction:: db +\1PitchSlideTarget:: dw ; frequency endpoint for pitch slide +\1PitchSlideAmount:: db +\1PitchSlideAmountFraction:: db \1Field25:: db ds 1 -\1CryPitch:: dw +\1PitchOffset:: dw \1Field29:: ds 1 \1Field2a:: ds 2 \1Field2c:: ds 1 @@ -3253,31 +3203,29 @@ ENDM wMusic:: ; nonzero if playing -wMusicPlaying:: db ; c100 +wMusicPlaying:: db -wChannels:: -wChannel1:: channel_struct wChannel1 ; c101 -wChannel2:: channel_struct wChannel2 ; c133 -wChannel3:: channel_struct wChannel3 ; c165 -wChannel4:: channel_struct wChannel4 ; c197 +wAudio:: +wChannel1:: channel_struct wChannel1 +wChannel2:: channel_struct wChannel2 +wChannel3:: channel_struct wChannel3 +wChannel4:: channel_struct wChannel4 +wChannel5:: channel_struct wChannel5 +wChannel6:: channel_struct wChannel6 +wChannel7:: channel_struct wChannel7 +wChannel8:: channel_struct wChannel8 -wSFXChannels:: -wChannel5:: channel_struct wChannel5 ; c1c9 -wChannel6:: channel_struct wChannel6 ; c1fb -wChannel7:: channel_struct wChannel7 ; c22d -wChannel8:: channel_struct wChannel8 ; c25f - - ds 1 ; c291 + ds 1 wCurTrackDuty:: db -wCurTrackIntensity:: db +wCurTrackVolumeEnvelope:: db wCurTrackFrequency:: dw wUnusedBCDNumber:: db ; BCD value, dummied out wCurNoteDuration:: db ; used in MusicE0 and LoadNote -wCurMusicByte:: db ; c298 -wCurChannel:: db ; c299 -wVolume:: ; c29a +wCurMusicByte:: db +wCurChannel:: db +wVolume:: ; corresponds to rNR50 ; Channel control / ON-OFF / Volume (R/W) ; bit 7 - Vin->SO2 ON/OFF @@ -3285,53 +3233,52 @@ wVolume:: ; c29a ; bit 3 - Vin->SO1 ON/OFF ; bit 2-0 - SO1 output level (volume) (# 0-7) db -wSoundOutput:: ; c29b +wSoundOutput:: ; corresponds to rNR51 ; bit 4-7: ch1-4 so2 on/off ; bit 0-3: ch1-4 so1 on/off db -wSoundInput:: ; c29c -; corresponds to rNR52 -; bit 7: global on/off -; bit 0: ch1 on/off -; bit 1: ch2 on/off -; bit 2: ch3 on/off -; bit 3: ch4 on/off +wPitchSweep:: +; corresponds to rNR10 +; bit 7: unused +; bit 4-6: sweep time +; bit 3: sweep direction +; but 0-2: sweep shift db -wMusicID:: dw ; c29d -wMusicBank:: db ; c29f -wNoiseSampleAddress:: dw ; c2a0 -wNoiseSampleDelay:: db ; c2a2 - ds 1 ; c2a3 -wMusicNoiseSampleSet:: db ; c2a4 -wSFXNoiseSampleSet:: db ; c2a5 +wMusicID:: dw +wMusicBank:: db +wNoiseSampleAddress:: dw +wNoiseSampleDelay:: db + ds 1 +wMusicNoiseSampleSet:: db +wSFXNoiseSampleSet:: db -;wLowHealthAlarm:: ; c2a6 +;wLowHealthAlarm:: wDanger:: ; bit 7: on/off ; bit 4: pitch ; bit 0-3: counter db -wMusicFade:: ; c2a7 +wMusicFade:: ; fades volume over x frames ; bit 7: fade in/out ; bit 0-5: number of frames for each volume level ; $00 = none (default) db -wMusicFadeCount:: db ; c2a8 -wMusicFadeID:: dw ; c2a9 +wMusicFadeCount:: db +wMusicFadeID:: dw ds 5 -wCryPitch:: dw ; c2b0 -wCryLength:: dw ; c2b2 +wCryPitch:: dw +wCryLength:: dw -wLastVolume:: db ; c2b4 -wUnusedMusicF9Flag:: db ; c2b5 +wLastVolume:: db +wUnusedMusicF9Flag:: db -wSFXPriority:: ; c2b6 +wSFXPriority:: ; if nonzero, turn off music when playing sfx db @@ -3342,20 +3289,21 @@ wChannel2JumpCondition:: db wChannel3JumpCondition:: db wChannel4JumpCondition:: db -wStereoPanningMask:: db ; c2bc +wStereoPanningMask:: db -wCryTracks:: ; c2bd +wCryTracks:: ; plays only in left or right track depending on what side the monster is on ; both tracks active outside of battle db wSFXDuration:: db -wCurSFX:: ; c2bf +wCurSFX:: ; id of sfx currently playing db -wChannelsEnd:: -wMapMusic:: db ; c2c0 +wAudioEnd:: + +wMapMusic:: db ;wDontPlayMapMusicOnReload:: db wMusicEnd::